@deot/dev-cli 1.0.6 → 1.0.8

package/dist/{index.js → index.es.js}

@@ -106,6 +106,10 @@ class Shared {
             pre[packageFolderName$] = require$$2(path.resolve(packageDir, packageFolderName$, 'package.json'));
             return pre;
         }, {});
+        const packageDirsMap = packageFolderNames.reduce((pre, packageFolderName$) => {
+            pre[packageFolderName$] = path.resolve(packageDir, packageFolderName$);
+            return pre;
+        }, {});
         const packageRelation = packageFolderNames.reduce((pre, packageFolderName$) => {
             let packagesOptions = packageOptionsMap[packageFolderName$];
             let deps = {
@@ -120,6 +124,7 @@ class Shared {
             .map(i => i.replace(new RegExp(`${packageName}-?`), '') || packageFolderName);
         const homepage = (rootPackageOptions.repository || packageOptions.repository || {}).url || '';
         const config = {
+            cwd,
             workspace,
             homepage: homepage.replace(/(.*)(https?:\/\/.*)(#|\.git)/, '$2'),
             packageFolderName,
@@ -129,6 +134,7 @@ class Shared {
             packageVersion,
             packageFolderNames,
             packageOptionsMap,
+            packageDirsMap,
             packageRelation,
             normalizePackageNames,
             normalizePackageFolderNames
@@ -345,9 +351,18 @@ const run$3 = (options) => Utils.autoCatch(async () => {
             ...promptOptions
         };
     }
+    const { cwd, workspace, packageOptionsMap, packageDirsMap } = locals;
     const { packageName, watch, dryRun } = options;
     options.packageFolderName = Shared.getPackageFolderName(options.packageName) || options.packageFolderName;
-    options.workspace = locals.workspace;
+    options.workspace = workspace;
+    const packageOptions = packageOptionsMap[options.packageFolderName];
+    const packageDir = packageDirsMap[options.packageFolderName];
+    if (workspace
+        && cwd !== packageDir
+        && packageOptions?.scripts?.['test']) {
+        await Shell.spawn(`npm`, ['run', 'test']);
+        return;
+    }
     if (!options.packageFolderName)
         delete options.packageFolderName;
     if (!options.workspace)
@@ -377,14 +392,34 @@ const run$3 = (options) => Utils.autoCatch(async () => {
 });
 
 const run$2 = (options) => Utils.autoCatch(async () => {
+    const locals = Shared.impl();
     if (typeof options.dryRun === 'undefined') {
         options.dryRun = process.env.NODE_ENV === 'UNIT';
     }
     if (options.dryRun)
         return Shell.spawn(`echo development`);
-    process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+    const { cwd, workspace, packageOptionsMap, packageDirsMap } = locals;
+    const { packageName } = options;
+    const getPackageFolderName = Shared.getPackageFolderName(packageName);
+    const packageOptions = packageOptionsMap[getPackageFolderName];
+    const packageDir = packageDirsMap[getPackageFolderName];
     options.watch = true;
-    await run$3(options);
+    if (!workspace
+        && packageName
+        && packageName !== '**'
+        && cwd !== packageDir
+        && packageOptions?.scripts?.['dev']) {
+        await Shell.spawn(`npm`, ['run', 'dev']);
+        return;
+    }
+    await Shell.spawn(`cross-env`, [
+        'NODE_ENV=development',
+        'npm',
+        'run',
+        'test',
+        '--',
+        packageName ? `--package-name ${packageName}` : ''
+    ]);
 });
 
 const require$$1 = createRequire(import.meta.url);
@@ -393,7 +428,8 @@ class Builder {
     packageName;
     packageOptions;
     config;
-    constructor(config) {
+    commandOptions;
+    constructor(config, commandOptions) {
         const { workspace, packageDir, packageName } = Shared.impl();
         if (typeof config === 'string') {
             let packageFolderName = config;
@@ -402,12 +438,25 @@ class Builder {
                 dir: packageDir$,
                 name: packageFolderName || 'index',
                 input: packageDir$ + '/src/index.ts',
-                output: {
-                    file: packageDir$ + '/dist/index.js',
-                    format: 'es',
-                    exports: 'named',
-                    sourcemap: false
-                }
+                output: [
+                    {
+                        file: packageDir$ + '/dist/index.es.js',
+                        format: 'es',
+                        exports: 'named',
+                        sourcemap: false
+                    },
+                    {
+                        file: packageDir$ + '/dist/index.iife.js',
+                        format: 'iife',
+                        name: packageName,
+                    },
+                    {
+                        file: packageDir$ + '/dist/index.cjs.js',
+                        format: 'cjs'
+                    }
+                ].filter(i => {
+                    return commandOptions.output.includes(i.format);
+                })
             };
         }
         this.packageDir = path.resolve(packageDir, workspace ? `./${config.name}` : '');
@@ -416,24 +465,37 @@ class Builder {
             : `${packageName}-${config.name}`;
         this.packageOptions = require$$1(`${this.packageDir}/package.json`);
         this.config = config;
+        this.commandOptions = commandOptions;
     }
     async process() {
-        const { packageName, packageDir } = this;
+        const { cwd, workspace } = Shared.impl();
+        const { packageOptions, packageName, packageDir } = this;
+        if (workspace
+            && packageOptions?.scripts?.build
+            && packageDir !== cwd) {
+            await Shell.spawn(`npm`, ['run', 'build'], {
+                cwd: packageDir
+            });
+            return;
+        }
         const spinner = ora(`${packageName} Build ...`);
         try {
             spinner.start();
             await fs.emptyDir(`${packageDir}/dist`);
-            const stat = await this.buildSourceAsES();
+            const stats = await this.buildSources();
             await this.buildTypes();
             spinner.stop();
-            Logger.log(`${chalk.cyan(`${packageName}`)} ${chalk.green('Success')} ES: ${Utils.formatBytes(stat.size)}`);
+            Logger.log(`${chalk.cyan(`${packageName}`)}: ${chalk.green('Success')}`);
+            stats.forEach((stat) => {
+                Logger.log(`${chalk.green(stat.format.toUpperCase())}: ${Utils.formatBytes(stat.size)}`);
+            });
         }
         catch (e) {
             Logger.log('Error!', e);
             throw e;
         }
     }
-    async buildSourceAsES() {
+    async buildSources() {
         const { workspace } = Shared.impl();
         const { name, input, output } = this.config;
         const { packageOptions } = this;
@@ -466,19 +528,36 @@ class Builder {
                 commonjs({ extensions: ['.js', '.ts'] }),
                 nodeResolve(),
                 replace({
-                    '1.0.5': `'${packageOptions.version}'`,
+                    '1.0.6': `'${packageOptions.version}'`,
                     false: 'false',
                     true: true
                 })
             ]
         });
-        await builder.write(output);
-        const stat = await fs.stat(output.file);
-        return stat;
+        await Promise.all(output.map(builder.write));
+        const stats = [];
+        await output.reduce((pre, cur, index) => {
+            pre
+                .then(() => fs.stat(cur.file))
+                .then((stat) => {
+                stats[index] = {
+                    format: cur.format,
+                    size: stat.size
+                };
+            });
+            return pre;
+        }, Promise.resolve());
+        return stats;
     }
     async buildTypes() {
         const { workspace } = Shared.impl();
-        const { packageDir } = this;
+        const { packageDir, packageOptions } = this;
+        if (workspace && packageOptions?.scripts?.['build:types']) {
+            await Shell.spawn(`npm`, ['run', 'build:types'], {
+                cwd: packageDir
+            });
+            return;
+        }
         const config = path.resolve(packageDir, `api-extractor.json`);
         if (fs.existsSync(config)) {
             const result = Extractor.invoke(ExtractorConfig.loadFileAndPrepare(config), {
@@ -493,8 +572,8 @@ class Builder {
         await fs.remove(`${packageDir}/dist/${workspace || 'src'}`);
     }
 }
-const builder = (options) => {
-    return new Builder(options);
+const builder = (options, commandOptions) => {
+    return new Builder(options, commandOptions);
 };
 
 const run$1 = (options) => Utils.autoCatch(async () => {
@@ -515,7 +594,7 @@ const run$1 = (options) => Utils.autoCatch(async () => {
         return Shell.spawn(`echo ${inputs.join(' ')}`);
     await inputs
         .reduce((preProcess, packageFolderName$) => {
-        preProcess = preProcess.then(() => builder(packageFolderName$).process());
+        preProcess = preProcess.then(() => builder(packageFolderName$, options).process());
         return preProcess;
     }, Promise.resolve());
 }, {
@@ -596,12 +675,13 @@ class Releaser {
             }
             ({ stdout } = await Shell.exec('git', params));
         }
-        const rePlugin = new RegExp(`^[\\w\\!]+\\(([\\w,-]+)?${packageFolderName}([\\w,-]+)?\\)`, 'i');
-        const commits = stdout
-            .split(SUFFIX)
+        const allowTypes = ['feat', `fix`, `break change`, `style`, `perf`, `types`, `refactor`, `chore`];
+        const rePlugin = new RegExp(`^(${allowTypes.join('|')})${workspace ? `\\(${packageFolderName}\\)` : '(\\(.+\\))?'}: .*`, 'i');
+        const allCommits = stdout.split(SUFFIX);
+        const commits = allCommits
             .filter((commit) => {
             const chunk = commit.trim();
-            return chunk && (!workspace || rePlugin.test(chunk));
+            return chunk && rePlugin.test(chunk);
         })
             .map((commit) => {
             const node = parser.sync(commit);
@@ -619,7 +699,11 @@ class Releaser {
             Logger.log(chalk.red(`No Commits Found.`));
         }
         else {
-            Logger.log(chalk.yellow(`Found `) + chalk.bold(`${commits.length}`) + ` Commits`);
+            Logger.log(chalk.yellow(`Found `)
+                + chalk.bold(`${allCommits.length}`)
+                + ` Commits, `
+                + chalk.bold(`${commits.length}`)
+                + ' Commits Valid');
         }
         const { skipUpdatePackage } = commandOptions;
         if (commits.length && skipUpdatePackage) {
@@ -1051,7 +1135,7 @@ program
     .usage('<cmd>');
 program
     .command('link')
-    .alias('d')
+    .alias('l')
     .description('pnpm link')
     .option('--dry-run [boolean]', 'Dry Run')
     .action(run$5);
@@ -1072,7 +1156,8 @@ program
     .command('build')
     .alias('b')
     .description('build')
-    .option('-p, --package-name <string>', 'select packageName')
+    .option('-p, --package-name <string>', 'Select packageName')
+    .option('--output <string>', 'Output', 'es,cjs')
     .option('--dry-run [boolean]', 'Dry Run')
     .action(run$1);
 program

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@deot/dev-cli",
-  "version": "1.0.6",
-  "main": "dist/index.js",
+  "version": "1.0.8",
+  "main": "dist/index.es.js",
+  "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "files": [