fix: take TypeScript lib from correct position

Author: uhyo

build/build.ts

@@ -18,21 +18,24 @@ async function main() {
   await symlink(path.join(projectDir, "lib"), path.join(distDir, "better"));
 
   // copy TypeScript lib files
-  const libs = await readdir(path.join(tsDir, "lib"));
+  const tsLibDir = path.join(tsDir, "src", "lib");
+  const libs = await readdir(tsLibDir);
   const libFiles: string[] = libs.filter((libFile) =>
-    /(?:^|\/|\\)lib\..+\.d\.ts$/.test(libFile)
+    /(?:^|\/|\\).+\.d\.ts$/.test(libFile)
   );
 
   // modify each lib file
   for (const libFile of libFiles) {
-    const tsLibFile = path.join(tsDir, "lib", libFile);
+    const tsLibFile = path.join(tsLibDir, libFile);
     const program = ts.createProgram([tsLibFile], {});
     const file = program.getSourceFile(tsLibFile);
     if (!file) {
       continue;
     }
     const repl = replacement.get(libFile);
-    let result = repl ? `/// <reference path="./better/${libFile}" />\n` : "";
+    let result = repl
+      ? `/// <reference path="./better/lib.${libFile}" />\n`
+      : "";
     if (!repl) {
       for (const statement of file.statements) {
         result += statement.getFullText(file);
@@ -52,7 +55,7 @@ async function main() {
       (_, lib) => `/// <reference path="./lib.${lib}.d.ts" />`
     );
 
-    await writeFile(path.join(distDir, libFile), result);
+    await writeFile(path.join(distDir, "lib." + libFile), result);
     console.log(libFile);
   }
 }

build/replacement.ts

@@ -1,6 +1,6 @@
 export const replacement = new Map([
   [
-    "lib.es5.d.ts",
+    "es5.d.ts",
     new Set([
       "eval",
       "ObjectConstructor",
@@ -12,7 +12,7 @@ export const replacement = new Map([
     ]),
   ],
   [
-    "lib.es2015.collection.d.ts",
+    "es2015.collection.d.ts",
     new Set([
       "Map",
       "MapConstructor",
@@ -25,26 +25,26 @@ export const replacement = new Map([
     ]),
   ],
   [
-    "lib.es2015.core.d.ts",
+    "es2015.core.d.ts",
     new Set(["NumberConstructor", "ObjectConstructor", "String"]),
   ],
-  ["lib.es2015.generator.d.ts", new Set(["Generator"])],
+  ["es2015.generator.d.ts", new Set(["Generator"])],
   [
-    "lib.es2015.iterable.d.ts",
+    "es2015.iterable.d.ts",
     new Set([
       "Iterator",
       "IterableIterator",
       "IArguments",
       "PromiseConstructor",
     ]),
   ],
-  ["lib.es2015.promise.d.ts", new Set(["PromiseConstructor"])],
-  ["lib.es2015.proxy.d.ts", new Set(["ProxyHandler"])],
-  ["lib.es2015.reflect.d.ts", new Set(["Reflect"])],
-  ["lib.es2017.object.d.ts", new Set(["ObjectConstructor"])],
-  ["lib.es2018.asyncgenerator.d.ts", new Set(["AsyncGenerator"])],
-  ["lib.es2018.asynciterable.d.ts", new Set(["AsyncIterator"])],
-  ["lib.es2019.object.d.ts", new Set(["ObjectConstructor"])],
-  ["lib.esnext.promise.d.ts", new Set(["AggregateError"])],
-  ["lib.esnext.string.d.ts", new Set(["String"])],
+  ["es2015.promise.d.ts", new Set(["PromiseConstructor"])],
+  ["es2015.proxy.d.ts", new Set(["ProxyHandler"])],
+  ["es2015.reflect.d.ts", new Set(["Reflect"])],
+  ["es2017.object.d.ts", new Set(["ObjectConstructor"])],
+  ["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"])],
 ]);