Add index.d.ts & rebuild all type entry points & move test-type-definitions to test-raw command

Author: slowcheetah

package.json

@@ -40,8 +40,8 @@
     "debug-get-dependencies": "npm run zxi time tests/debug-get-dependencies/debug-get-dependencies.mjs",
     "lint": "run-s prepare lint-raw",
     "lint-raw": "run-s build-types test-eslint bundle-package test-publint",
-    "test": "run-s prepare test-raw test-type-definitions",
-    "test-raw": "run-s lint-raw bundle-tests test-unit test-promises test-entries test-compat-data test-compat-tools test-builder test-babel-plugin check",
+    "test": "run-s prepare test-raw",
+    "test-raw": "run-s lint-raw test-type-definitions bundle-tests test-unit test-promises test-entries test-compat-data test-compat-tools test-builder test-babel-plugin check",
     "test-eslint": "npm run zxi time tests/eslint/runner.mjs",
     "test-publint": "npm run zxi time tests/publint/runner.mjs",
     "test-unit": "run-s test-unit-karma test-unit-node test-unit-bun",

packages/core-js-types/package.json

@@ -25,7 +25,7 @@
     "email": "zloirock@zloirock.ru",
     "url": "http://zloirock.ru"
   },
-  "types": "./actual.d.ts",
+  "types": "./index.d.ts",
   "sideEffects": false,
   "typesVersions": {
     ">=5.6": {
@@ -41,9 +41,9 @@
   },
   "exports": {
     ".": {
-      "types@>=5.6": "./dist/ts5-6/actual.d.ts",
-      "types": "./dist/ts5-2/actual.d.ts",
-      "default": "./dist/ts5-6/actual.d.ts"
+      "types@>=5.6": "./dist/ts5-6/index.d.ts",
+      "types": "./dist/ts5-2/index.d.ts",
+      "default": "./dist/ts5-6/index.d.ts"
     },
     "./actual": {
       "types@>=5.6": "./dist/ts5-6/actual.d.ts",

scripts/build-types/index.mjs

@@ -25,6 +25,7 @@ const imports = {
   actual: new Set(),
   full: new Set(),
   pure: new Set(),
+  index: new Set(),
 };
 
 async function buildType(entry, options) {
@@ -68,22 +69,24 @@ async function buildType(entry, options) {
   if (filter) modules = modules.filter(it => filter.has(it));
 
   types.forEach(type => {
+    imports.index.add(type);
     imports[subset].add(type);
     imports.pure.add(path.join('pure', type));
   });
   if (customType) {
+    imports.index.add(customType);
     imports[subset].add(customType);
     imports.pure.add(customType);
   }
 
-  const filePath = buildFilePath(tsVersion, subset);
-  const filePathPure = buildFilePath(tsVersion, 'pure');
+  const indexPath = buildFilePath(tsVersion, 'index');
+  const purePath = buildFilePath(tsVersion, 'pure');
 
   const tplPure = template({ ...options, modules, rawModules, level, entry, types, packageName: PACKAGE_NAME_PURE, prefix: TYPE_PREFIX });
   const tpl = template({ ...options, modules, rawModules, level, entry, types, packageName: PACKAGE_NAME });
 
-  await outputFile(filePathPure, `${ tplPure.dts }${ tplPure.dts ? '\n\n' : '' }`, { flag: 'a' });
-  await outputFile(filePath, `${ tpl.dts }${ tpl.dts ? '\n\n' : '' }`, { flag: 'a' });
+  await outputFile(indexPath, `${ tpl.dts }${ tpl.dts ? '\n\n' : '' }`, { flag: 'a' });
+  await outputFile(purePath, `${ tplPure.dts }${ tplPure.dts ? '\n\n' : '' }`, { flag: 'a' });
 
   if (!entry.endsWith('/')) {
     const entryWithExt = `${ entry }.js`;
@@ -92,19 +95,19 @@ async function buildType(entry, options) {
     const tplWithExt = template({ ...options, modules, rawModules, level, types, entry: entryWithExt,
       packageName: PACKAGE_NAME });
 
-    await outputFile(filePathPure, `${ tplPureWithExt.dts }${ tplPureWithExt.dts ? '\n\n' : '' }`, { flag: 'a' });
-    await outputFile(filePath, `${ tplWithExt.dts }${ tplWithExt.dts ? '\n\n' : '' }`, { flag: 'a' });
+    await outputFile(indexPath, `${ tplWithExt.dts }${ tplWithExt.dts ? '\n\n' : '' }`, { flag: 'a' });
+    await outputFile(purePath, `${ tplPureWithExt.dts }${ tplPureWithExt.dts ? '\n\n' : '' }`, { flag: 'a' });
   }
 
   if (entry.endsWith('/index')) {
-    const entryWithoutIndex = entry.replace(/index$/, '');
+    const entryWithoutIndex = entry.replace(/\/index$/, '');
     const tplPureWithoutIndex = template({ ...options, modules, rawModules, level, entry: entryWithoutIndex, types,
       packageName: PACKAGE_NAME_PURE, prefix: TYPE_PREFIX });
     const tplWithoutIndex = template({ ...options, modules, rawModules, level, types, entry: entryWithoutIndex,
       packageName: PACKAGE_NAME });
 
-    await outputFile(filePathPure, `${ tplPureWithoutIndex.dts }${ tplPureWithoutIndex.dts ? '\n\n' : '' }`, { flag: 'a' });
-    await outputFile(filePath, `${ tplWithoutIndex.dts }${ tplWithoutIndex.dts ? '\n\n' : '' }`, { flag: 'a' });
+    await outputFile(indexPath, `${ tplWithoutIndex.dts }${ tplWithoutIndex.dts ? '\n\n' : '' }`, { flag: 'a' });
+    await outputFile(purePath, `${ tplPureWithoutIndex.dts }${ tplPureWithoutIndex.dts ? '\n\n' : '' }`, { flag: 'a' });
   }
 
   if (proposal) {
@@ -136,8 +139,11 @@ async function prependImports(version) {
   for (const subset of Object.keys(imports)) {
     const filePath = buildFilePath(version, subset);
     const importLines = buildImports(imports[subset]);
-    const originalContent = await fs.readFile(filePath, 'utf8');
-    await outputFile(filePath, `${ importLines }\n\n${ originalContent }`);
+    let originalContent = '';
+    if (await pathExists(filePath)) {
+      originalContent = await fs.readFile(filePath, 'utf8');
+    }
+    await outputFile(filePath, `${ importLines }\n\n${ originalContent }`, { flag: 'w' });
   }
 }
 
@@ -200,17 +206,14 @@ async function buildPackageJson(breakpoints, namespaces) {
   });
   packageJson.exports = {};
   Object.entries(namespaces).forEach(([namespace, options]) => {
-    const namespaceKey = namespace ? `./${ namespace }${ options.isDir ? '/*' : '' }` : '.';
+    const namespaceKey = namespace !== 'index' ? `./${ namespace }${ options.isDir ? '/*' : '' }` : '.';
     packageJson.exports[namespaceKey] = {};
     breakpoints.forEach((breakpoint, index) => {
       const isLast = index === breakpoints.length - 1;
       const breakpointString = `ts${ breakpoint.toString().replace('.', '-') }`;
       packageJson.exports[namespaceKey][`types${ isLast ? '' : `@>=${ breakpoint }` }`] = `./dist/${ breakpointString }/${ namespace }${ options.isDir ? '/*' : '' }.d.ts`;
     });
     packageJson.exports[namespaceKey].default = `./dist/ts${ defaultBreakpoint.toString().replace('.', '-') }/${ namespace }${ options.isDir ? '/*' : '' }.d.ts`;
-    if (options.default) {
-      packageJson.exports['.'] = packageJson.exports[namespaceKey];
-    }
   });
   const exportsKeys = Object.keys(packageJson.exports).sort();
   const exports = {};
@@ -228,12 +231,13 @@ if (VERSION) {
   await remove(BUILD_DIR);
   tsVersionBreakpoints.forEach(async version => await buildTypesForTSVersion(version));
   const namespaces = {
-    es: { isDir: false, default: false },
-    stable: { isDir: false, default: false },
-    actual: { isDir: false, default: true },
-    full: { isDir: false, default: false },
-    pure: { isDir: false, default: false },
-    proposals: { isDir: true, default: false },
+    es: { isDir: false },
+    stable: { isDir: false },
+    actual: { isDir: false },
+    full: { isDir: false },
+    pure: { isDir: false },
+    proposals: { isDir: true },
+    index: { isDir: false },
   };
   await buildPackageJson(tsVersionBreakpoints, namespaces);
 }

scripts/build-types/package.tpl.json

@@ -25,6 +25,6 @@
     "email": "zloirock@zloirock.ru",
     "url": "http://zloirock.ru"
   },
-  "types": "./actual.d.ts",
+  "types": "./index.d.ts",
   "sideEffects": false
 }

tests/type-definitions/entries.pure.ts

@@ -4,5 +4,5 @@ new $date();
 import $date2 from '@core-js/pure/full/date/index.js';
 new $date2();
 
-import $date3 from '@core-js/pure/full/date/';
+import $date3 from '@core-js/pure/full/date';
 new $date3();

tests/type-definitions/global/tsconfig.json

@@ -3,7 +3,7 @@
   "include": ["./**/*.ts"],
   "compilerOptions": {
     "types": [
-      "@core-js/types/full"
+      "@core-js/types"
     ]
   }
 }

tests/type-definitions/global/web/dom-exception.test.ts

@@ -1,6 +1,5 @@
 // todo add after it becomes possible to create a type
-// import '@core-js/full';
-// import '@core-js/types';
+// import 'core-js/full';
 //
 // const ex1 = new DOMException();
 // const ex2 = new DOMException('Some message');

tests/type-definitions/global/web/self.test.ts

@@ -1,6 +1,5 @@
 // todo add after it becomes possible to create a type
-// import '@core-js/full';
-// import '@core-js/types';
+// import 'core-js/full';
 //
 // const ref: typeof globalThis = self;
 //

tests/type-definitions/global/web/url-search-params.test.ts

@@ -1,6 +1,5 @@
 // todo add after it becomes possible to create a type
-// import '@core-js/full';
-// import '@core-js/types';
+// import 'core-js/full';
 //
 // const u0 = new URLSearchParams();
 // const u1 = new URLSearchParams('a=1&b=2');