create-pkgbld 1.6.0 → 1.7.1

package/dist/index.cjs

@@ -11,6 +11,8 @@ 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() {
     const exec = util.promisify(childProcess.exec);
@@ -18,196 +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.dependencies || "object" === typeof input.dependencies && null !== input.dependencies && false === Array.isArray(input.dependencies) && $io3(input.dependencies)) && (undefined === input.devDependencies || "object" === typeof input.devDependencies && null !== input.devDependencies && false === Array.isArray(input.devDependencies) && $io3(input.devDependencies)) && (undefined === input.peerDependencies || "object" === typeof input.peerDependencies && null !== input.peerDependencies && false === Array.isArray(input.peerDependencies) && $io3(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 => 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'],
-    umdInputs: [],
-    compressFormats: ['umd'],
-    sourcemapFormats: ['umd'],
-    preprocess: [],
-    dir: 'dist',
-    sourceDir: 'src',
-    includeExternals: false,
-    eject: false,
-    noTsConfig: false,
-    noUpdatePackageJson: false,
-    commonjsPattern: '[name].cjs',
-    esPattern: '[name].mjs',
-    umdPattern: '[name].umd.js'
-};
-const cliFlags = {
-    umd: {
-        type: CommaSeparatedString,
-        description: 'Package subpath exports in UMD format',
-        default: cliFlagsDefaults.umdInputs
-    },
-    compress: {
-        type: CommaSeparatedString,
-        description: 'Compress formats using terser',
-        default: cliFlagsDefaults.compressFormats
-    },
-    sourcemaps: {
-        type: CommaSeparatedString,
-        description: 'Emit sourcemaps for the specified formats',
-        default: cliFlagsDefaults.sourcemapFormats
-    },
-    formats: {
-        type: CommaSeparatedString,
-        description: 'Formats to emit',
-        default: cliFlagsDefaults.formats
-    },
-    preprocess: {
-        type: CommaSeparatedString,
-        description: 'Preprocess entry points / subpath exports',
-        default: cliFlagsDefaults.preprocess
-    },
-    dir: {
-        type: String,
-        description: 'Output directory',
-        default: cliFlagsDefaults.dir
-    },
-    sourceDir: {
-        type: String,
-        description: 'Source directory',
-        default: cliFlagsDefaults.sourceDir
-    },
-    bin: {
-        type: CommaSeparatedString,
-        description: 'Executable files'
-    },
-    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.esPattern
-    },
-    umdPattern: {
-        type: String,
-        description: 'UMD output file name pattern',
-        default: cliFlagsDefaults.umdPattern
-    }
-};
-const packageJsonFieldsOrder = new Set([
-    'private',
-    'type',
-    'version',
-    'name',
-    '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'];
@@ -235,7 +47,7 @@ async function execute() {
     const packageName = path.basename(targetDir);
     let cancelled = false;
     const options = getBasicOptions(packageName, pkg);
-    options.push(...await getGitOptions(targetDir));
+    options.push(...await getGitOptions(targetDir, pkg.pkg));
     options.push(...getPkgbldOptions(pkg.pkg));
     const state = getOptionsValue(options);
     if (!args.flags.quiet) {
@@ -291,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) {
@@ -307,7 +119,7 @@ function getScriptValue(pkgbld) {
     const pkgBldCopy = { ...pkgbld };
     delete pkgBldCopy['pkgbldBinary'];
     delete pkgBldCopy['extraParameters'];
-    return `${binary} ${asCommandLineArgs(pkgBldCopy)} ${extraArgs}`;
+    return `${binary} ${asCommandLineArgs(pkgBldCopy, options.cliFlagsDefaults)} ${extraArgs}`.trimEnd();
 }
 function getPromptOption(option, mutateObject) {
     const value = mutateObject[option.field];
@@ -338,16 +150,19 @@ function mapOption(state) {
     return (option) => {
         const fieldValue = state[option.field];
         return {
-            title: pad16plus(option.title) + kleur.grey('items' in option ? getPrintString(option.items, (option.mutateInnerObject ? fieldValue : state)) : fieldValue ?? ''),
+            title: pad16plus(option.title) + kleur.grey('items' in option ? getPrintString(option, (option.mutateInnerObject ? fieldValue : state)) : fieldValue ?? ''),
             value: option.field
         };
     };
 }
-function getPrintString(items, json) {
-    return items
+function getPrintString(option, json) {
+    if (option.render) {
+        return option.render(option, json);
+    }
+    return option.items
         .filter(item => item.field in json && json[item.field] && (Array.isArray(json[item.field]) ? json[item.field].length > 0 : true))
         .map(item => kleur.grey(item.title) + ' ' + (kleur.white('items' in item ?
-        `[${getPrintString(item.items, (item.mutateInnerObject ? json[item.field] :
+        `[${getPrintString(item, (item.mutateInnerObject ? json[item.field] :
             json))}]` : json[item.field])))
         .join(', ');
 }
@@ -374,7 +189,7 @@ async function reportVersion() {
     const version = createPkgBldPackage.pkg.version ?? '<unknown>';
     return version;
 }
-async function getGitOptions(targetDir) {
+async function getGitOptions(targetDir, packageJson) {
     try {
         const gitCfg = await gitConfig();
         if (gitCfg) {
@@ -385,6 +200,15 @@ async function getGitOptions(targetDir) {
                     title: 'Git',
                     field: 'git',
                     mutateInnerObject: false,
+                    render: (_option, value) => lodash.isEqual(removeEmpty({
+                        repository: value.repository,
+                        bugs: value.bugs,
+                        homepage: value.homepage
+                    }), removeEmpty({
+                        repository: packageJson.repository,
+                        bugs: packageJson.bugs,
+                        homepage: packageJson.homepage
+                    })) ? `[${kleur.green('Ok')}]` : `[${kleur.blue('Updated')}]`,
                     items: [{
                             title: 'Homepage',
                             field: 'homepage',
@@ -420,20 +244,7 @@ async function getGitOptions(targetDir) {
     return [];
 }
 function getPkgbldOptions(pkg) {
-    let args = {
-        formats: ['es', 'cjs'],
-        umd: [],
-        compress: ['umd'],
-        sourcemaps: ['umd'],
-        preprocess: [],
-        dir: 'dist',
-        sourceDir: 'src',
-        bin: undefined,
-        includeExternals: false,
-        eject: false,
-        noTsConfig: false,
-        noUpdatePackageJson: false
-    };
+    let args = options.cliFlagsDefaults;
     const cmd = pkg.scripts?.build ?? '';
     let binary = 'pkgbld';
     if (cmd) {
@@ -454,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);
@@ -463,14 +274,15 @@ function getPkgbldOptions(pkg) {
             title: 'pkgbld',
             field: 'pkgbld',
             mutateInnerObject: true,
+            render: (_option, value) => cmd === getScriptValue(value) ? `[${kleur.green('Ok')}]` : `[${kleur.blue('Updated')}]`,
             items: [{
                     title: 'Destination folder',
                     field: 'dest',
-                    initialValue: args.dir
+                    initialValue: args.dest
                 }, {
                     title: 'Source folder',
                     field: 'src',
-                    initialValue: args.sourceDir
+                    initialValue: args.src
                 }, {
                     title: 'UMD exports',
                     field: 'umd',
@@ -516,15 +328,15 @@ function getPkgbldOptions(pkg) {
                     type: 'toggle',
                     initialValue: args.eject
                 }, {
-                    title: 'Create tsconfig',
-                    field: 'tsConfig',
+                    title: 'Do not create tsconfig',
+                    field: 'noTsConfig',
                     type: 'toggle',
-                    initialValue: !args.noTsConfig
+                    initialValue: args.noTsConfig
                 }, {
-                    title: 'Update package.json',
-                    field: 'updatePackageJson',
+                    title: 'Do not update package.json',
+                    field: 'noUpdatePackageJson',
                     type: 'toggle',
-                    initialValue: !args.noUpdatePackageJson
+                    initialValue: args.noUpdatePackageJson
                 }, {
                     title: 'Extra parameters',
                     field: 'extraParameters',
@@ -539,11 +351,12 @@ function getPkgbldOptions(pkg) {
                 }]
         }];
 }
-function asCommandLineArgs(parsedArgs) {
+function asCommandLineArgs(parsedArgs, defaultArgs = {}) {
     return Object.entries(parsedArgs)
-        .flatMap(([key, value]) => asArray(value)
+        .filter(([key, value]) => !lodash.isEqual(value, defaultArgs[key]))
+        .map(([key, value]) => `--${kebabize(key)}${typeof value === 'string' || Array.isArray(value) ? `=${asArray(value).join(',')}` : ''}`)
         .filter(Boolean)
-        .map(value => `--${key}${typeof value === 'string' ? `=${value}` : ''}`)).join(' ');
+        .join(' ');
 }
 function asArray(value) {
     return Array.isArray(value) ? value : [value];
@@ -552,6 +365,21 @@ function getBasicOptions(packageName, pkg) {
     return [{
             title: 'General',
             field: 'general',
+            render: (_option, value) => lodash.isEqual(removeEmpty({
+                name: value.name,
+                version: value.version,
+                description: value.description,
+                license: value.license,
+                author: value.author,
+                readme: value.readme
+            }), removeEmpty({
+                name: pkg.pkg.name,
+                version: pkg.pkg.version,
+                description: pkg.pkg.description,
+                license: pkg.pkg.license,
+                author: pkg.pkg.author,
+                readme: pkg.pkg.readme
+            })) ? `[${kleur.green('Ok')}]` : `[${kleur.blue('Updated')}]`,
             items: [{
                     title: 'Package Name',
                     field: 'name',
@@ -603,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');
@@ -626,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) {
@@ -634,3 +462,9 @@ async function writePackage(dir, pkg) {
         process.exit(-1);
     }
 }
+function removeEmpty(data) {
+    return JSON.parse(JSON.stringify(data));
+}
+function kebabize(value) {
+    return value.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase());
+}

package/dist/index.mjs

@@ -8,6 +8,8 @@ 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() {
     const exec = util.promisify(childProcess.exec);
@@ -15,196 +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.dependencies || "object" === typeof input.dependencies && null !== input.dependencies && false === Array.isArray(input.dependencies) && $io3(input.dependencies)) && (undefined === input.devDependencies || "object" === typeof input.devDependencies && null !== input.devDependencies && false === Array.isArray(input.devDependencies) && $io3(input.devDependencies)) && (undefined === input.peerDependencies || "object" === typeof input.peerDependencies && null !== input.peerDependencies && false === Array.isArray(input.peerDependencies) && $io3(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 => 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'],
-    umdInputs: [],
-    compressFormats: ['umd'],
-    sourcemapFormats: ['umd'],
-    preprocess: [],
-    dir: 'dist',
-    sourceDir: 'src',
-    includeExternals: false,
-    eject: false,
-    noTsConfig: false,
-    noUpdatePackageJson: false,
-    commonjsPattern: '[name].cjs',
-    esPattern: '[name].mjs',
-    umdPattern: '[name].umd.js'
-};
-const cliFlags = {
-    umd: {
-        type: CommaSeparatedString,
-        description: 'Package subpath exports in UMD format',
-        default: cliFlagsDefaults.umdInputs
-    },
-    compress: {
-        type: CommaSeparatedString,
-        description: 'Compress formats using terser',
-        default: cliFlagsDefaults.compressFormats
-    },
-    sourcemaps: {
-        type: CommaSeparatedString,
-        description: 'Emit sourcemaps for the specified formats',
-        default: cliFlagsDefaults.sourcemapFormats
-    },
-    formats: {
-        type: CommaSeparatedString,
-        description: 'Formats to emit',
-        default: cliFlagsDefaults.formats
-    },
-    preprocess: {
-        type: CommaSeparatedString,
-        description: 'Preprocess entry points / subpath exports',
-        default: cliFlagsDefaults.preprocess
-    },
-    dir: {
-        type: String,
-        description: 'Output directory',
-        default: cliFlagsDefaults.dir
-    },
-    sourceDir: {
-        type: String,
-        description: 'Source directory',
-        default: cliFlagsDefaults.sourceDir
-    },
-    bin: {
-        type: CommaSeparatedString,
-        description: 'Executable files'
-    },
-    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.esPattern
-    },
-    umdPattern: {
-        type: String,
-        description: 'UMD output file name pattern',
-        default: cliFlagsDefaults.umdPattern
-    }
-};
-const packageJsonFieldsOrder = new Set([
-    'private',
-    'type',
-    'version',
-    'name',
-    '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'];
@@ -232,7 +44,7 @@ async function execute() {
     const packageName = path.basename(targetDir);
     let cancelled = false;
     const options = getBasicOptions(packageName, pkg);
-    options.push(...await getGitOptions(targetDir));
+    options.push(...await getGitOptions(targetDir, pkg.pkg));
     options.push(...getPkgbldOptions(pkg.pkg));
     const state = getOptionsValue(options);
     if (!args.flags.quiet) {
@@ -304,7 +116,7 @@ function getScriptValue(pkgbld) {
     const pkgBldCopy = { ...pkgbld };
     delete pkgBldCopy['pkgbldBinary'];
     delete pkgBldCopy['extraParameters'];
-    return `${binary} ${asCommandLineArgs(pkgBldCopy)} ${extraArgs}`;
+    return `${binary} ${asCommandLineArgs(pkgBldCopy, cliFlagsDefaults)} ${extraArgs}`.trimEnd();
 }
 function getPromptOption(option, mutateObject) {
     const value = mutateObject[option.field];
@@ -335,16 +147,19 @@ function mapOption(state) {
     return (option) => {
         const fieldValue = state[option.field];
         return {
-            title: pad16plus(option.title) + kleur.grey('items' in option ? getPrintString(option.items, (option.mutateInnerObject ? fieldValue : state)) : fieldValue ?? ''),
+            title: pad16plus(option.title) + kleur.grey('items' in option ? getPrintString(option, (option.mutateInnerObject ? fieldValue : state)) : fieldValue ?? ''),
             value: option.field
         };
     };
 }
-function getPrintString(items, json) {
-    return items
+function getPrintString(option, json) {
+    if (option.render) {
+        return option.render(option, json);
+    }
+    return option.items
         .filter(item => item.field in json && json[item.field] && (Array.isArray(json[item.field]) ? json[item.field].length > 0 : true))
         .map(item => kleur.grey(item.title) + ' ' + (kleur.white('items' in item ?
-        `[${getPrintString(item.items, (item.mutateInnerObject ? json[item.field] :
+        `[${getPrintString(item, (item.mutateInnerObject ? json[item.field] :
             json))}]` : json[item.field])))
         .join(', ');
 }
@@ -371,7 +186,7 @@ async function reportVersion() {
     const version = createPkgBldPackage.pkg.version ?? '<unknown>';
     return version;
 }
-async function getGitOptions(targetDir) {
+async function getGitOptions(targetDir, packageJson) {
     try {
         const gitCfg = await gitConfig();
         if (gitCfg) {
@@ -382,6 +197,15 @@ async function getGitOptions(targetDir) {
                     title: 'Git',
                     field: 'git',
                     mutateInnerObject: false,
+                    render: (_option, value) => isEqual(removeEmpty({
+                        repository: value.repository,
+                        bugs: value.bugs,
+                        homepage: value.homepage
+                    }), removeEmpty({
+                        repository: packageJson.repository,
+                        bugs: packageJson.bugs,
+                        homepage: packageJson.homepage
+                    })) ? `[${kleur.green('Ok')}]` : `[${kleur.blue('Updated')}]`,
                     items: [{
                             title: 'Homepage',
                             field: 'homepage',
@@ -417,20 +241,7 @@ async function getGitOptions(targetDir) {
     return [];
 }
 function getPkgbldOptions(pkg) {
-    let args = {
-        formats: ['es', 'cjs'],
-        umd: [],
-        compress: ['umd'],
-        sourcemaps: ['umd'],
-        preprocess: [],
-        dir: 'dist',
-        sourceDir: 'src',
-        bin: undefined,
-        includeExternals: false,
-        eject: false,
-        noTsConfig: false,
-        noUpdatePackageJson: false
-    };
+    let args = cliFlagsDefaults;
     const cmd = pkg.scripts?.build ?? '';
     let binary = 'pkgbld';
     if (cmd) {
@@ -460,14 +271,15 @@ function getPkgbldOptions(pkg) {
             title: 'pkgbld',
             field: 'pkgbld',
             mutateInnerObject: true,
+            render: (_option, value) => cmd === getScriptValue(value) ? `[${kleur.green('Ok')}]` : `[${kleur.blue('Updated')}]`,
             items: [{
                     title: 'Destination folder',
                     field: 'dest',
-                    initialValue: args.dir
+                    initialValue: args.dest
                 }, {
                     title: 'Source folder',
                     field: 'src',
-                    initialValue: args.sourceDir
+                    initialValue: args.src
                 }, {
                     title: 'UMD exports',
                     field: 'umd',
@@ -513,15 +325,15 @@ function getPkgbldOptions(pkg) {
                     type: 'toggle',
                     initialValue: args.eject
                 }, {
-                    title: 'Create tsconfig',
-                    field: 'tsConfig',
+                    title: 'Do not create tsconfig',
+                    field: 'noTsConfig',
                     type: 'toggle',
-                    initialValue: !args.noTsConfig
+                    initialValue: args.noTsConfig
                 }, {
-                    title: 'Update package.json',
-                    field: 'updatePackageJson',
+                    title: 'Do not update package.json',
+                    field: 'noUpdatePackageJson',
                     type: 'toggle',
-                    initialValue: !args.noUpdatePackageJson
+                    initialValue: args.noUpdatePackageJson
                 }, {
                     title: 'Extra parameters',
                     field: 'extraParameters',
@@ -536,11 +348,12 @@ function getPkgbldOptions(pkg) {
                 }]
         }];
 }
-function asCommandLineArgs(parsedArgs) {
+function asCommandLineArgs(parsedArgs, defaultArgs = {}) {
     return Object.entries(parsedArgs)
-        .flatMap(([key, value]) => asArray(value)
+        .filter(([key, value]) => !isEqual(value, defaultArgs[key]))
+        .map(([key, value]) => `--${kebabize(key)}${typeof value === 'string' || Array.isArray(value) ? `=${asArray(value).join(',')}` : ''}`)
         .filter(Boolean)
-        .map(value => `--${key}${typeof value === 'string' ? `=${value}` : ''}`)).join(' ');
+        .join(' ');
 }
 function asArray(value) {
     return Array.isArray(value) ? value : [value];
@@ -549,6 +362,21 @@ function getBasicOptions(packageName, pkg) {
     return [{
             title: 'General',
             field: 'general',
+            render: (_option, value) => isEqual(removeEmpty({
+                name: value.name,
+                version: value.version,
+                description: value.description,
+                license: value.license,
+                author: value.author,
+                readme: value.readme
+            }), removeEmpty({
+                name: pkg.pkg.name,
+                version: pkg.pkg.version,
+                description: pkg.pkg.description,
+                license: pkg.pkg.license,
+                author: pkg.pkg.author,
+                readme: pkg.pkg.readme
+            })) ? `[${kleur.green('Ok')}]` : `[${kleur.blue('Updated')}]`,
             items: [{
                     title: 'Package Name',
                     field: 'name',
@@ -631,3 +459,9 @@ async function writePackage(dir, pkg) {
         process.exit(-1);
     }
 }
+function removeEmpty(data) {
+    return JSON.parse(JSON.stringify(data));
+}
+function kebabize(value) {
+    return value.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase());
+}

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import { PackageJson } from 'options';
 export type Option = ({
     title: string;
     field: string;
@@ -17,26 +18,8 @@ export type Option = ({
 } | {
     items: Option[];
     mutateInnerObject: boolean;
+    render?: (option: Option, value: OptionsValue) => string;
 });
-export type PackageJson = {
-    private?: boolean;
-    version?: string;
-    name?: string;
-    license?: string;
-    readme?: string;
-    author?: string | {
-        name?: string;
-        email?: string;
-        url?: string;
-    };
-    description?: string;
-    scripts?: {
-        [key: string]: string;
-    };
-    dependencies?: Record<string, string>;
-    devDependencies?: Record<string, string>;
-    peerDependencies?: Record<string, string>;
-};
 export type PkgInfo = {
     readme: string;
     pkg: PackageJson;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.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"
     },
@@ -34,20 +36,22 @@
     "init"
   ],
   "dependencies": {
-    "string-argv": "^0.3.2",
+    "string-argv": "0.3.2",
     "git-user-name": "2.0.0",
-    "cleye": "^1.3.2",
+    "cleye": "1.3.2",
     "parse-git-config": "3.0.0",
     "prompts": "2.4.2",
-    "kleur": "4.1.5"
+    "kleur": "4.1.5",
+    "lodash": "4.17.21"
   },
   "devDependencies": {
     "@types/git-user-name": "2.0.1",
     "@types/parse-git-config": "3.0.2",
-    "@types/prompts": "2.4.5",
-    "@total-typescript/ts-reset": "^0.5.1",
-    "pkgbld": "1.20.0",
-    "options": "0.0.0"
+    "@types/prompts": "2.4.6",
+    "@types/lodash": "4.14.199",
+    "@total-typescript/ts-reset": "0.5.1",
+    "pkgbld": "1.24.0",
+    "options": "0.2.0"
   },
   "scripts": {
     "build": "node ../pkgbld/dist/index.js --include-externals=options",