Merge branch 'upgrade-ts-to-4.4'

Author: uhyo

TypeScript

@@ -4,7 +4,7 @@ import ts from "typescript";
 import { replacement } from "./replacement";
 
 const projectDir = process.env.PROJECT || process.cwd();
-const distDir = path.join(projectDir, "dist", "lib");
+const distDir = path.join(projectDir, "generated");
 const tsDir = path.join(projectDir, "TypeScript");
 
 async function main() {
@@ -45,6 +45,10 @@ async function main() {
         const res = checkStatement(statement, repl);
         if (res) {
           result += res.getFullText(file);
+        } else {
+          // Replaced statements are emitted as comments
+          // to make it easier to detect original lib changes
+          result += "\n" + commentOut(statement.getFullText(file)) + "\n";
         }
       }
     }
@@ -92,6 +96,12 @@ function checkStatement(
   return statement;
 }
 
+function commentOut(code: string): string {
+  const lines = code.split("\n");
+  const result = lines.map((line) => `// ${line}`);
+  return result.join("\n");
+}
+
 main().catch((err) => {
   console.error(err);
   process.exit(1);

build/build.ts

@@ -2,7 +2,7 @@ import { mkdir, readdir, readFile, rm, writeFile } from "fs/promises";
 import path from "path";
 
 const projectDir = process.env.PROJECT || process.cwd();
-const libDir = path.join(projectDir, "dist", "lib");
+const libDir = path.join(projectDir, "generated");
 const betterDir = path.join(projectDir, "lib");
 const templateDir = path.join(projectDir, "package-template");
 const packageDir = path.join(projectDir, "dist-package");

build/package.ts

@@ -45,6 +45,6 @@ export const replacement = new Map([
   ["es2018.asyncgenerator.d.ts", new Set(["AsyncGenerator"])],
   ["es2018.asynciterable.d.ts", new Set(["AsyncIterator"])],
   ["es2019.object.d.ts", new Set(["ObjectConstructor"])],
-  ["esnext.promise.d.ts", new Set(["AggregateError"])],
-  ["esnext.string.d.ts", new Set(["String"])],
+  ["es2021.promise.d.ts", new Set(["AggregateError"])],
+  ["es2021.string.d.ts", new Set(["String"])],
 ]);

build/replacement.ts

@@ -0,0 +1 @@
+/Users/JP25309/personal/better-typescript-lib/lib