create-pkgbld 1.7.0 → 1.7.1

package/dist/index.cjs

@@ -11,6 +11,7 @@ var kleur = require('kleur');
 var stringArgv = require('string-argv');
 var childProcess = require('node:child_process');
 var util = require('node:util');
+var options = require('options');
 var lodash = require('lodash');
 
 async function getGitRoot() {
@@ -19,206 +20,6 @@ async function getGitRoot() {
     return stdout.trim();
 }
 
-function isPackageJson(value) {
-    return (input => {
-        const $io0 = input => (undefined === input.private || "boolean" === typeof input.private) && (undefined === input.version || "string" === typeof input.version) && (undefined === input.name || "string" === typeof input.name) && (undefined === input.license || "string" === typeof input.license) && (undefined === input.readme || "string" === typeof input.readme) && (null !== input.author && (undefined === input.author || "string" === typeof input.author || "object" === typeof input.author && null !== input.author && false === Array.isArray(input.author) && $io1(input.author))) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.scripts || "object" === typeof input.scripts && null !== input.scripts && false === Array.isArray(input.scripts) && $io2(input.scripts)) && (undefined === input.repository || "object" === typeof input.repository && null !== input.repository && false === Array.isArray(input.repository) && $io3(input.repository)) && (undefined === input.bugs || "string" === typeof input.bugs) && (undefined === input.homepage || "string" === typeof input.homepage) && (undefined === input.dependencies || "object" === typeof input.dependencies && null !== input.dependencies && false === Array.isArray(input.dependencies) && $io4(input.dependencies)) && (undefined === input.devDependencies || "object" === typeof input.devDependencies && null !== input.devDependencies && false === Array.isArray(input.devDependencies) && $io4(input.devDependencies)) && (undefined === input.peerDependencies || "object" === typeof input.peerDependencies && null !== input.peerDependencies && false === Array.isArray(input.peerDependencies) && $io4(input.peerDependencies));
-        const $io1 = input => (undefined === input.name || "string" === typeof input.name) && (undefined === input.email || "string" === typeof input.email) && (undefined === input.url || "string" === typeof input.url);
-        const $io2 = input => Object.keys(input).every(key => {
-            const value = input[key];
-            if (undefined === value)
-                return true;
-            if (RegExp(/(.*)/).test(key))
-                return "string" === typeof value;
-            return true;
-        });
-        const $io3 = input => (undefined === input.type || "string" === typeof input.type) && (undefined === input.url || "string" === typeof input.url);
-        const $io4 = input => Object.keys(input).every(key => {
-            const value = input[key];
-            if (undefined === value)
-                return true;
-            if (RegExp(/(.*)/).test(key))
-                return "string" === typeof value;
-            return true;
-        });
-        return "object" === typeof input && null !== input && false === Array.isArray(input) && $io0(input);
-    })(value);
-}
-function CommaSeparatedString(value) {
-    return value.split(',').map((arg) => arg.trim());
-}
-function CommaSeparatedStringOrBoolean(value) {
-    if (typeof value === 'boolean') {
-        return value;
-    }
-    if (Array.isArray(value) && value.length === 0) {
-        return true;
-    }
-    return CommaSeparatedString(value);
-}
-const cliFlagsDefaults = {
-    formats: ['es', 'cjs'],
-    umd: [],
-    compress: ['umd'],
-    sourcemaps: ['umd'],
-    preprocess: [],
-    dest: 'dist',
-    src: 'src',
-    bin: undefined,
-    includeExternals: false,
-    eject: false,
-    noTsConfig: false,
-    noUpdatePackageJson: false,
-    commonjsPattern: '[name].cjs',
-    esmPattern: '[name].mjs',
-    umdPattern: '[name].umd.js',
-    formatPackageJson: false
-};
-const cliFlags = {
-    umd: {
-        type: CommaSeparatedString,
-        description: 'Package subpath exports in UMD format',
-        default: cliFlagsDefaults.umd
-    },
-    compress: {
-        type: CommaSeparatedString,
-        description: 'Compress formats using terser',
-        default: cliFlagsDefaults.compress
-    },
-    sourcemaps: {
-        type: CommaSeparatedString,
-        description: 'Emit sourcemaps for the specified formats',
-        default: cliFlagsDefaults.sourcemaps
-    },
-    formats: {
-        type: CommaSeparatedString,
-        description: 'Formats to emit',
-        default: cliFlagsDefaults.formats
-    },
-    preprocess: {
-        type: CommaSeparatedString,
-        description: 'Preprocess entry points / subpath exports',
-        default: cliFlagsDefaults.preprocess
-    },
-    dest: {
-        type: String,
-        description: 'Output directory',
-        default: cliFlagsDefaults.dest
-    },
-    src: {
-        type: String,
-        description: 'Source directory',
-        default: cliFlagsDefaults.src
-    },
-    bin: {
-        type: CommaSeparatedString,
-        description: 'Executable files',
-        default: cliFlagsDefaults.bin
-    },
-    includeExternals: {
-        type: CommaSeparatedStringOrBoolean,
-        description: 'Include all/specified externals into result bundle(s)',
-        default: cliFlagsDefaults.includeExternals
-    },
-    eject: {
-        type: Boolean,
-        description: 'Eject config',
-        default: cliFlagsDefaults.eject
-    },
-    noTsConfig: {
-        type: Boolean,
-        description: 'Do not create / update tsconfig.json',
-        default: cliFlagsDefaults.noTsConfig
-    },
-    noUpdatePackageJson: {
-        type: Boolean,
-        description: 'Do not create / update package.json',
-        default: cliFlagsDefaults.noUpdatePackageJson
-    },
-    commonjsPattern: {
-        type: String,
-        description: 'CommonJS output file name pattern',
-        default: cliFlagsDefaults.commonjsPattern
-    },
-    esmPattern: {
-        type: String,
-        description: 'ES output file name pattern',
-        default: cliFlagsDefaults.esmPattern
-    },
-    umdPattern: {
-        type: String,
-        description: 'UMD output file name pattern',
-        default: cliFlagsDefaults.umdPattern
-    },
-    formatPackageJson: {
-        type: Boolean,
-        description: 'Format package.json',
-        default: cliFlagsDefaults.formatPackageJson
-    }
-};
-const packageJsonFieldsOrder = new Set([
-    'private',
-    'type',
-    'version',
-    'name',
-    'scope',
-    'description',
-    'license',
-    'author',
-    'contributors',
-    'funding',
-    'bin',
-    'main',
-    'browser',
-    'unpkg',
-    'module',
-    'exports',
-    'imports',
-    'types',
-    'typings',
-    'files',
-    'packageManager',
-    'sideEffects',
-    'engines',
-    'os',
-    'cpu',
-    'man',
-    'directories',
-    'repository',
-    'bugs',
-    'homepage',
-    'readme',
-    'keywords',
-    'scripts',
-    'config',
-    'dependencies',
-    'devDependencies',
-    'peerDependencies',
-    'peerDependenciesMeta',
-    'bundleDependencies',
-    'bundledDependencies',
-    'optionalDependencies',
-    'overrides',
-    'publishConfig',
-    'workspaces'
-]);
-function processPackageJson(pkg, needTreatment, treatKey) {
-    const newPkg = {};
-    for (const key of packageJsonFieldsOrder) {
-        if (needTreatment(key)) {
-            newPkg[key] = treatKey(key);
-        }
-    }
-    for (const key in pkg) {
-        if (!packageJsonFieldsOrder.has(key)) {
-            newPkg[key] = pkg[key];
-        }
-    }
-    return newPkg;
-}
-function toFormattedJson(json) {
-    return JSON.stringify(json, null, 2) + '\n';
-}
-
 const done = Symbol('done');
 const formats = ['amd', 'cjs', 'es', 'iife', 'system', 'umd'];
 const pkgbldBinaries = ['pkgbld', 'pkgbld-internal', 'node ../pkgbld/dist/index.js'];
@@ -302,14 +103,14 @@ async function execute() {
     }
 }
 execute();
-function updatePackage(pkg, options) {
-    pkg.pkg = processPackageJson(pkg.pkg, (key) => (key in options || key in pkg.pkg), treatKey);
+function updatePackage(pkg, options$1) {
+    pkg.pkg = options.processPackageJson(pkg.pkg, (key) => (key in options$1 || key in pkg.pkg), treatKey);
     function treatKey(key) {
         if (key === 'scripts') {
             ({ ...pkg.pkg.scripts });
-            getScriptValue(options.pkgbld);
+            getScriptValue(options$1.pkgbld);
         }
-        return options[key] ?? pkg.pkg[key];
+        return options$1[key] ?? pkg.pkg[key];
     }
 }
 function getScriptValue(pkgbld) {
@@ -318,7 +119,7 @@ function getScriptValue(pkgbld) {
     const pkgBldCopy = { ...pkgbld };
     delete pkgBldCopy['pkgbldBinary'];
     delete pkgBldCopy['extraParameters'];
-    return `${binary} ${asCommandLineArgs(pkgBldCopy, cliFlagsDefaults)} ${extraArgs}`.trimEnd();
+    return `${binary} ${asCommandLineArgs(pkgBldCopy, options.cliFlagsDefaults)} ${extraArgs}`.trimEnd();
 }
 function getPromptOption(option, mutateObject) {
     const value = mutateObject[option.field];
@@ -443,7 +244,7 @@ async function getGitOptions(targetDir, packageJson) {
     return [];
 }
 function getPkgbldOptions(pkg) {
-    let args = cliFlagsDefaults;
+    let args = options.cliFlagsDefaults;
     const cmd = pkg.scripts?.build ?? '';
     let binary = 'pkgbld';
     if (cmd) {
@@ -464,7 +265,7 @@ function getPkgbldOptions(pkg) {
         }
         const parsedArgs = cleye.cli({
             help: false,
-            flags: cliFlags
+            flags: options.cliFlags
         }, undefined, stringArgv.parseArgsStringToArgv(cmd));
         args = parsedArgs.flags;
         args.extraParameters = asCommandLineArgs(parsedArgs.unknownFlags);
@@ -630,7 +431,7 @@ async function readPackage(dir) {
         const pkgFile = await fs.readFile(packageFileName);
         const readmeFile = await fs.readFile(readmeFileName);
         const pkg = JSON.parse(pkgFile.toString());
-        const isValidPackageJson = isPackageJson(pkg);
+        const isValidPackageJson = options.isPackageJson(pkg);
         if (!isValidPackageJson) {
             console.error('Invalid package.json');
             throw new Error('Invalid package.json');
@@ -653,7 +454,7 @@ async function writePackage(dir, pkg) {
     const readmeFileName = path.resolve(dir, 'README.md');
     try {
         await fs.mkdir(dir, { recursive: true });
-        await fs.writeFile(packageFileName, toFormattedJson(pkg.pkg));
+        await fs.writeFile(packageFileName, options.toFormattedJson(pkg.pkg));
         await fs.writeFile(readmeFileName, pkg.readme);
     }
     catch (e) {

package/dist/index.mjs

@@ -8,6 +8,7 @@ import kleur from 'kleur';
 import { parseArgsStringToArgv } from 'string-argv';
 import childProcess from 'node:child_process';
 import util from 'node:util';
+import { processPackageJson, cliFlags, isPackageJson, toFormattedJson, cliFlagsDefaults } from 'options';
 import { isEqual } from 'lodash';
 
 async function getGitRoot() {
@@ -16,206 +17,6 @@ async function getGitRoot() {
     return stdout.trim();
 }
 
-function isPackageJson(value) {
-    return (input => {
-        const $io0 = input => (undefined === input.private || "boolean" === typeof input.private) && (undefined === input.version || "string" === typeof input.version) && (undefined === input.name || "string" === typeof input.name) && (undefined === input.license || "string" === typeof input.license) && (undefined === input.readme || "string" === typeof input.readme) && (null !== input.author && (undefined === input.author || "string" === typeof input.author || "object" === typeof input.author && null !== input.author && false === Array.isArray(input.author) && $io1(input.author))) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.scripts || "object" === typeof input.scripts && null !== input.scripts && false === Array.isArray(input.scripts) && $io2(input.scripts)) && (undefined === input.repository || "object" === typeof input.repository && null !== input.repository && false === Array.isArray(input.repository) && $io3(input.repository)) && (undefined === input.bugs || "string" === typeof input.bugs) && (undefined === input.homepage || "string" === typeof input.homepage) && (undefined === input.dependencies || "object" === typeof input.dependencies && null !== input.dependencies && false === Array.isArray(input.dependencies) && $io4(input.dependencies)) && (undefined === input.devDependencies || "object" === typeof input.devDependencies && null !== input.devDependencies && false === Array.isArray(input.devDependencies) && $io4(input.devDependencies)) && (undefined === input.peerDependencies || "object" === typeof input.peerDependencies && null !== input.peerDependencies && false === Array.isArray(input.peerDependencies) && $io4(input.peerDependencies));
-        const $io1 = input => (undefined === input.name || "string" === typeof input.name) && (undefined === input.email || "string" === typeof input.email) && (undefined === input.url || "string" === typeof input.url);
-        const $io2 = input => Object.keys(input).every(key => {
-            const value = input[key];
-            if (undefined === value)
-                return true;
-            if (RegExp(/(.*)/).test(key))
-                return "string" === typeof value;
-            return true;
-        });
-        const $io3 = input => (undefined === input.type || "string" === typeof input.type) && (undefined === input.url || "string" === typeof input.url);
-        const $io4 = input => Object.keys(input).every(key => {
-            const value = input[key];
-            if (undefined === value)
-                return true;
-            if (RegExp(/(.*)/).test(key))
-                return "string" === typeof value;
-            return true;
-        });
-        return "object" === typeof input && null !== input && false === Array.isArray(input) && $io0(input);
-    })(value);
-}
-function CommaSeparatedString(value) {
-    return value.split(',').map((arg) => arg.trim());
-}
-function CommaSeparatedStringOrBoolean(value) {
-    if (typeof value === 'boolean') {
-        return value;
-    }
-    if (Array.isArray(value) && value.length === 0) {
-        return true;
-    }
-    return CommaSeparatedString(value);
-}
-const cliFlagsDefaults = {
-    formats: ['es', 'cjs'],
-    umd: [],
-    compress: ['umd'],
-    sourcemaps: ['umd'],
-    preprocess: [],
-    dest: 'dist',
-    src: 'src',
-    bin: undefined,
-    includeExternals: false,
-    eject: false,
-    noTsConfig: false,
-    noUpdatePackageJson: false,
-    commonjsPattern: '[name].cjs',
-    esmPattern: '[name].mjs',
-    umdPattern: '[name].umd.js',
-    formatPackageJson: false
-};
-const cliFlags = {
-    umd: {
-        type: CommaSeparatedString,
-        description: 'Package subpath exports in UMD format',
-        default: cliFlagsDefaults.umd
-    },
-    compress: {
-        type: CommaSeparatedString,
-        description: 'Compress formats using terser',
-        default: cliFlagsDefaults.compress
-    },
-    sourcemaps: {
-        type: CommaSeparatedString,
-        description: 'Emit sourcemaps for the specified formats',
-        default: cliFlagsDefaults.sourcemaps
-    },
-    formats: {
-        type: CommaSeparatedString,
-        description: 'Formats to emit',
-        default: cliFlagsDefaults.formats
-    },
-    preprocess: {
-        type: CommaSeparatedString,
-        description: 'Preprocess entry points / subpath exports',
-        default: cliFlagsDefaults.preprocess
-    },
-    dest: {
-        type: String,
-        description: 'Output directory',
-        default: cliFlagsDefaults.dest
-    },
-    src: {
-        type: String,
-        description: 'Source directory',
-        default: cliFlagsDefaults.src
-    },
-    bin: {
-        type: CommaSeparatedString,
-        description: 'Executable files',
-        default: cliFlagsDefaults.bin
-    },
-    includeExternals: {
-        type: CommaSeparatedStringOrBoolean,
-        description: 'Include all/specified externals into result bundle(s)',
-        default: cliFlagsDefaults.includeExternals
-    },
-    eject: {
-        type: Boolean,
-        description: 'Eject config',
-        default: cliFlagsDefaults.eject
-    },
-    noTsConfig: {
-        type: Boolean,
-        description: 'Do not create / update tsconfig.json',
-        default: cliFlagsDefaults.noTsConfig
-    },
-    noUpdatePackageJson: {
-        type: Boolean,
-        description: 'Do not create / update package.json',
-        default: cliFlagsDefaults.noUpdatePackageJson
-    },
-    commonjsPattern: {
-        type: String,
-        description: 'CommonJS output file name pattern',
-        default: cliFlagsDefaults.commonjsPattern
-    },
-    esmPattern: {
-        type: String,
-        description: 'ES output file name pattern',
-        default: cliFlagsDefaults.esmPattern
-    },
-    umdPattern: {
-        type: String,
-        description: 'UMD output file name pattern',
-        default: cliFlagsDefaults.umdPattern
-    },
-    formatPackageJson: {
-        type: Boolean,
-        description: 'Format package.json',
-        default: cliFlagsDefaults.formatPackageJson
-    }
-};
-const packageJsonFieldsOrder = new Set([
-    'private',
-    'type',
-    'version',
-    'name',
-    'scope',
-    'description',
-    'license',
-    'author',
-    'contributors',
-    'funding',
-    'bin',
-    'main',
-    'browser',
-    'unpkg',
-    'module',
-    'exports',
-    'imports',
-    'types',
-    'typings',
-    'files',
-    'packageManager',
-    'sideEffects',
-    'engines',
-    'os',
-    'cpu',
-    'man',
-    'directories',
-    'repository',
-    'bugs',
-    'homepage',
-    'readme',
-    'keywords',
-    'scripts',
-    'config',
-    'dependencies',
-    'devDependencies',
-    'peerDependencies',
-    'peerDependenciesMeta',
-    'bundleDependencies',
-    'bundledDependencies',
-    'optionalDependencies',
-    'overrides',
-    'publishConfig',
-    'workspaces'
-]);
-function processPackageJson(pkg, needTreatment, treatKey) {
-    const newPkg = {};
-    for (const key of packageJsonFieldsOrder) {
-        if (needTreatment(key)) {
-            newPkg[key] = treatKey(key);
-        }
-    }
-    for (const key in pkg) {
-        if (!packageJsonFieldsOrder.has(key)) {
-            newPkg[key] = pkg[key];
-        }
-    }
-    return newPkg;
-}
-function toFormattedJson(json) {
-    return JSON.stringify(json, null, 2) + '\n';
-}
-
 const done = Symbol('done');
 const formats = ['amd', 'cjs', 'es', 'iife', 'system', 'umd'];
 const pkgbldBinaries = ['pkgbld', 'pkgbld-internal', 'node ../pkgbld/dist/index.js'];

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0",
+  "version": "1.7.1",
   "name": "create-pkgbld",
   "license": "MIT",
   "author": "Konstantin Shutkin",
@@ -8,6 +8,8 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
@@ -45,11 +47,11 @@
   "devDependencies": {
     "@types/git-user-name": "2.0.1",
     "@types/parse-git-config": "3.0.2",
-    "@types/prompts": "2.4.5",
+    "@types/prompts": "2.4.6",
     "@types/lodash": "4.14.199",
     "@total-typescript/ts-reset": "0.5.1",
-    "pkgbld": "1.22.0",
-    "options": "0.0.1"
+    "pkgbld": "1.24.0",
+    "options": "0.2.0"
   },
   "scripts": {
     "build": "node ../pkgbld/dist/index.js --include-externals=options",