pkgbld 1.24.2 → 1.26.0

package/dist/index.js

@@ -294,9 +294,9 @@ async function externals (provider, config, inputs) {
     const allowGenericUmd = config.umdInputs.length === 1 && inputs.length === 1;
     if (config.formats.length > 0) {
         const format = (allowGenericUmd ? undefined : config.formats.filter(format => format !== 'umd'));
-        provider.provide(() => pluginExternals(config.includeExternals === false ? {} : {
-            external: (id, external, importer) => includeExternals(importer, external, id, config)
-        }), 2000 /* Priority.externals */, { format });
+        provider.provide(() => pluginExternals(config.includeExternals === false
+            ? {}
+            : (id, external, importer) => includeExternals(importer, external, id, config)), 2000 /* Priority.externals */, { format });
         // for eject config
         provider.globalImport('path', 'path');
         provider.globalSetup(includeExternals);
@@ -305,9 +305,7 @@ async function externals (provider, config, inputs) {
         const curry = (await provider.import('lodash/curry.js'));
         for (const currentInput of config.umdInputs) {
             const isExternal = curry((currentInput, id, external, importer) => includeExternals(importer, external, id, config) || isExternalInput(currentInput, inputs, id, config))(currentInput);
-            provider.provide(() => pluginExternals({
-                external: isExternal
-            }), 2000 /* Priority.externals */, { format: 'umd', inputs: [`./${config.sourceDir}/${currentInput}.ts`] });
+            provider.provide(() => pluginExternals(isExternal), 2000 /* Priority.externals */, { format: 'umd', inputs: [`./${config.sourceDir}/${currentInput}.ts`] });
         }
         // for eject config
         if (config.formats.length === 0) {
@@ -660,7 +658,18 @@ async function getRollupConfigs([provider, plugins$1], inputs, config, helpers,
 
 const mainLoggerText = (sourceDir, dir, configsCount, startingTime, finishedCount = 0) => (final = false) => `${sourceDir} → ${dir} ${final ? configsCount : finishedCount++} / ${configsCount}${final ? (' in ' + getTimeDiff(startingTime)) : ''}`;
 
+const emptySet = new Set;
 function processPackage(pkg, config, plugins) {
+    const exportsFields = new Set([
+        'types',
+        'import',
+        'require',
+        'svelte',
+        'default'
+    ]);
+    const typingsFilePattern = '[name].d.ts';
+    const indexId = 'index';
+    const typesVersionsLastFields = new Set(['*']);
     const inputs = [];
     const logger$1 = logger.createLogger();
     const allowEsm = (config.formatsOverridden && config.formats.includes('es') || !config.formatsOverridden);
@@ -702,9 +711,9 @@ function processPackage(pkg, config, plugins) {
     }
     pkg.types = `./${config.dir}/index.d.ts`;
     if (allowUmd && typeof pkg.umd === 'string') {
-        pkg.umd = `./${config.dir}/${patternToName(config.umdPattern, 'index')}`;
-        if (!config.umdInputs.includes('index')) {
-            config.umdInputs.push('index');
+        pkg.umd = `./${config.dir}/${patternToName(config.umdPattern, indexId)}`;
+        if (!config.umdInputs.includes(indexId)) {
+            config.umdInputs.push(indexId);
         }
     }
     if (config.bin) {
@@ -728,45 +737,57 @@ function processPackage(pkg, config, plugins) {
         delete pkg.bin;
     }
     if (allowCjs) {
-        pkg.main = `./${config.dir}/${patternToName(config.commonjsPattern, 'index')}`;
+        pkg.main = `./${config.dir}/${patternToName(config.commonjsPattern, indexId)}`;
     }
     if (allowEsm && !allowCjs) {
-        pkg.main = `./${config.dir}/${patternToName(config.esPattern, 'index')}`;
+        pkg.main = `./${config.dir}/${patternToName(config.esPattern, indexId)}`;
     }
     if (allowCjs && pkg.main !== pkg.exports['.'].require) {
         pkg.exports['.'].require = pkg.main;
     }
     if (allowCjs && allowEsm && typeof pkg.module !== 'string') {
-        pkg.module = `./${config.dir}/${patternToName(config.esPattern, 'index')}`;
+        pkg.module = `./${config.dir}/${patternToName(config.esPattern, indexId)}`;
     }
     if (pkg.module !== pkg.exports['.']?.default) {
         pkg.exports['.'].default = pkg.module;
     }
-    if (allowUmd && config.umdInputs.includes('index')) {
-        pkg.unpkg = `./${config.dir}/${patternToName(config.umdPattern, 'index')}`;
+    if (allowUmd && config.umdInputs.includes(indexId)) {
+        pkg.unpkg = `./${config.dir}/${patternToName(config.umdPattern, indexId)}`;
+    }
+    if (typeof pkg.typesVersions !== 'object' && pkg.typesVersions !== null) {
+        pkg.typesVersions = {};
+    }
+    if (typeof pkg.typesVersions['*'] !== 'object' && pkg.typesVersions['*'] !== null) {
+        pkg.typesVersions['*'] = {};
     }
     for (const id in pkg.exports) {
         if (id === './package.json')
             continue;
-        const basename = id == '.' ? 'index' : path.basename(id);
+        const basename = id == '.' ? indexId : path.basename(id);
         if (typeof pkg.exports[id] !== 'object') {
             pkg.exports[id] = {};
         }
-        pkg.exports[id].types = `./${config.dir}/${patternToName('[name].d.ts', basename)}`;
+        pkg.typesVersions['*'][id] = [`${config.dir}/${patternToName(typingsFilePattern, basename)}`];
+        pkg.exports[id].types = `./${config.dir}/${patternToName(typingsFilePattern, basename)}`;
         if (allowEsm) {
             pkg.exports[id].import = `./${config.dir}/${patternToName(config.esPattern, basename)}`;
         }
         if (allowCjs) {
             pkg.exports[id].require = `./${config.dir}/${patternToName(config.commonjsPattern, basename)}`;
         }
-        pkg.exports[id] = orderFields(pkg.exports[id]);
-        if (basename !== 'index') {
+        pkg.exports[id] = orderFields(exportsFields, pkg.exports[id]);
+        if (basename !== indexId) {
             if (!pkg.files.includes(basename)) {
                 pkg.files.push(basename);
             }
         }
         inputs.push(`./${config.sourceDir}/${basename}.ts`);
     }
+    pkg.typesVersions['*']['*'] = [
+        `${config.dir}/${patternToName(typingsFilePattern, indexId)}`,
+        `${config.dir}/*`
+    ];
+    pkg.typesVersions['*'] = orderFields(emptySet, pkg.typesVersions['*'], typesVersionsLastFields);
     if (allowUmd && config.umdInputs.length > 0 && !config.formats.includes('umd')) {
         config.formats.push('umd');
     }
@@ -778,22 +799,20 @@ function processPackage(pkg, config, plugins) {
 function patternToName(pattern, input) {
     return pattern.replace('[name]', input);
 }
-const fieldsOrder = new Set([
-    'types',
-    'import',
-    'require',
-    'svelte',
-    'default'
-]);
-function orderFields(exports) {
+function orderFields(firstFields, exports, lastFields = emptySet) {
     const ordered = {};
-    for (const key of fieldsOrder) {
+    for (const key of firstFields) {
         if (key in exports) {
             ordered[key] = exports[key];
         }
     }
     for (const key in exports) {
-        if (!fieldsOrder.has(key)) {
+        if (!firstFields.has(key) && !lastFields.has(key)) {
+            ordered[key] = exports[key];
+        }
+    }
+    for (const key of lastFields) {
+        if (key in exports) {
             ordered[key] = exports[key];
         }
     }
@@ -804,7 +823,7 @@ async function writeJson(path, json) {
     await fs.writeFile(path, toFormattedJson(json));
 }
 
-var version = "1.24.2";
+var version = "1.26.0";
 var name = "pkgbld";
 var license = "MIT";
 var author = "Konstantin Shutkin";
@@ -849,7 +868,7 @@ var dependencies = {
 	"@rollup/plugin-node-resolve": "^15.2.2",
 	"@rollup-extras/plugin-clean": "^1.3.8",
 	"@rollup-extras/plugin-binify": "^1.1.9",
-	"@rollup-extras/plugin-externals": "^1.1.11",
+	"@rollup-extras/plugin-externals": "^1.2.0",
 	"@slimlib/refine-partition": "^1.0.2",
 	"@slimlib/smart-mock": "^0.1.5",
 	"is-builtin-module": "^3.2.1",

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.24.2",
+  "version": "1.26.0",
   "name": "pkgbld",
   "license": "MIT",
   "author": "Konstantin Shutkin",
@@ -39,7 +39,7 @@
     "@rollup/plugin-node-resolve": "^15.2.2",
     "@rollup-extras/plugin-clean": "^1.3.8",
     "@rollup-extras/plugin-binify": "^1.1.9",
-    "@rollup-extras/plugin-externals": "^1.1.11",
+    "@rollup-extras/plugin-externals": "^1.2.0",
     "@slimlib/refine-partition": "^1.0.2",
     "@slimlib/smart-mock": "^0.1.5",
     "is-builtin-module": "^3.2.1",