@cabloy/cli 3.0.5 → 3.0.7

package/dist/lib/cli.d.ts

@@ -28,7 +28,7 @@ export declare class CliCommand extends BaseCommand {
         key: any;
         context: any;
         propName: any;
-    }): ((value: any) => any) | null;
+    }): ((value: any) => unknown) | null;
     _prepareQuestion({ group, question, key, context }: {
         group: any;
         question: any;
@@ -38,5 +38,5 @@ export declare class CliCommand extends BaseCommand {
     _checkGroupCondition({ group, context }: {
         group: any;
         context: any;
-    }): any;
+    }): unknown;
 }

package/dist/lib/cli.js

@@ -1,6 +1,6 @@
+import { evaluate } from '@cabloy/utils';
 import BaseCommand from '@zhennann/common-bin';
 import chalk from 'chalk';
-import eggBornUtils from 'egg-born-utils';
 import enquirer from 'enquirer';
 import is from 'is-type-of';
 import { BeanCli } from "./bean.cli.js";
@@ -136,7 +136,7 @@ export class CliCommand extends BaseCommand {
         if (!expression)
             return null;
         return function (value) {
-            return eggBornUtils.tools.evaluateExpression({ expression, scope: { value, group, question, key, context } });
+            return evaluate(expression, { value, group, question, key, context });
         };
     }
     _prepareQuestion({ group, question, key, context }) {
@@ -192,6 +192,6 @@ export class CliCommand extends BaseCommand {
         const expression = group.condition && group.condition.expression;
         if (!expression)
             return true;
-        return eggBornUtils.tools.evaluateExpression({ expression, scope: { group, context } });
+        return evaluate(expression, { group, context });
     }
 }

package/dist/lib/local.helper.d.ts

@@ -1,3 +1,4 @@
+import type { IProcessHelperSpawnOptions } from '@cabloy/process-helper';
 import type { TableConstructorOptions } from 'cli-table3';
 import type { NameMeta } from '../types/helper.ts';
 import type { BeanCliBase } from './bean.cli.base.ts';
@@ -84,13 +85,25 @@ export declare class LocalHelper {
     ensureDir(dir: any): Promise<any>;
     pnpmInstall(): Promise<void>;
     formatFile({ fileName, logPrefix }: any): Promise<void>;
-    spawnBin({ cmd, args, options }: any): Promise<string>;
-    spawnCmd({ cmd, args, options }: any): Promise<string>;
-    spawnExe({ cmd, args, options }: any): Promise<string>;
+    spawnBin({ cmd, args, options }: {
+        cmd: string;
+        args?: string[];
+        options?: IProcessHelperSpawnOptions;
+    }): Promise<string>;
+    spawnCmd({ cmd, args, options }: {
+        cmd: string;
+        args?: string[];
+        options?: IProcessHelperSpawnOptions;
+    }): Promise<string>;
+    spawnExe({ cmd, args, options }: {
+        cmd: string;
+        args?: string[];
+        options?: IProcessHelperSpawnOptions;
+    }): Promise<string>;
     spawn({ cmd, args, options }: {
-        cmd: any;
-        args?: never[] | undefined;
-        options?: {} | undefined;
+        cmd: string;
+        args?: string[];
+        options?: IProcessHelperSpawnOptions;
     }): Promise<string>;
     gitCommit({ cwd, message }: any): Promise<void>;
     getRegistry(): Promise<string>;
@@ -105,6 +118,5 @@ export declare class LocalHelper {
     requireDynamic(file: string): any;
     private _requireDynamic_getFileTime;
     tempFile<RESULT>(fn: (fileTemp: string) => Promise<RESULT>, options?: ITempFileOptions): Promise<RESULT>;
-    private _createEsbuildConfig;
-    private _pathToHref;
+    pathToHref(fileName: string): string;
 }

package/dist/lib/local.helper.js

@@ -1,3 +1,11 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
@@ -7,7 +15,6 @@ import { combineWordsDeduplicate, parseFirstWord } from '@cabloy/word-utils';
 import Boxen from 'boxen';
 import Chalk from 'chalk';
 import TableClass from 'cli-table3';
-import { build as esBuild } from 'esbuild';
 import fse from 'fs-extra';
 import gogocode from 'gogocode';
 import tmp from 'tmp';
@@ -179,7 +186,7 @@ export class LocalHelper {
     async invokeCli(args, options) {
         await this.processHelper.spawnExe({
             cmd: 'node',
-            args: [this.parseBrandPath()].concat(args),
+            args: ['--experimental-transform-types', this.parseBrandPath()].concat(args),
             options,
         });
     }
@@ -236,18 +243,9 @@ export class LocalHelper {
         return name;
     }
     async importDynamic(fileName, fn) {
-        return await this.tempFile(async (fileTemp) => {
-            // build
-            const esBuildConfig = this._createEsbuildConfig(fileName, fileTemp);
-            await esBuild(esBuildConfig);
-            // load
-            const instance = await import(this._pathToHref(fileTemp));
-            return await fn(instance);
-        }, {
-            tmpdir: path.dirname(fileName),
-            prefix: '.temp-dynamic-',
-            postfix: '.mjs',
-        });
+        // load
+        const instance = await import(__rewriteRelativeImportExtension(this.pathToHref(fileName)));
+        return await fn(instance);
     }
     requireDynamic(file) {
         if (!file)
@@ -287,18 +285,35 @@ export class LocalHelper {
             fileTempObj.removeCallback();
         }
     }
-    _createEsbuildConfig(fileSrc, fileDest) {
-        return {
-            platform: 'node',
-            format: 'esm',
-            bundle: true,
-            packages: 'external',
-            resolveExtensions: ['.mjs', '.js', '.mts', '.ts', '.json'],
-            entryPoints: [fileSrc],
-            outfile: fileDest,
-        };
-    }
-    _pathToHref(fileName) {
-        return path.sep === '\\' ? pathToFileURL(fileName).href : fileName;
+    pathToHref(fileName) {
+        return pathToFileURL(fileName).href;
     }
 }
+// async importDynamic<RESULT>(fileName: string, fn: (instance: any) => Promise<RESULT>): Promise<RESULT> {
+//   return await this.tempFile(
+//     async fileTemp => {
+//       // build
+//       const esBuildConfig = this._createEsbuildConfig(fileName, fileTemp);
+//       await esBuild(esBuildConfig as any);
+//       // load
+//       const instance = await import(this._pathToHref(fileTemp));
+//       return await fn(instance);
+//     },
+//     {
+//       tmpdir: path.dirname(fileName),
+//       prefix: '.temp-dynamic-',
+//       postfix: '.mjs',
+//     },
+//   );
+// }
+// private _createEsbuildConfig(fileSrc: string, fileDest: string) {
+//   return {
+//     platform: 'node',
+//     format: 'esm',
+//     bundle: true,
+//     packages: 'external',
+//     resolveExtensions: ['.mjs', '.js', '.mts', '.ts', '.json'],
+//     entryPoints: [fileSrc],
+//     outfile: fileDest,
+//   };
+// }

package/dist/lib/local.template.d.ts

@@ -76,7 +76,7 @@ export declare class LocalTemplate {
         snippetsPath?: string | null | undefined;
         boilerplatePath?: string | null | undefined;
     }): Promise<void>;
-    renderDir(targetDir: string, templateDir: string): Promise<any>;
+    renderDir(targetDir: string, templateDir: string): Promise<string[]>;
     replaceTemplate(content: any, scope: any): any;
     getProperty(obj: any, name: any, sep?: any): any;
     _getProperty(obj: any, name: any, sep: any, forceObject: any): any;

package/dist/lib/local.template.js

@@ -1,7 +1,8 @@
 import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import path from 'node:path';
 import ejs from '@zhennann/ejs';
-import eggBornUtils from 'egg-born-utils';
+import { globby } from 'globby';
 import gogocode from 'gogocode';
 import isTextOrBinary from 'istextorbinary';
 import { commandsConfig } from "../config.js";
@@ -35,6 +36,7 @@ export class LocalTemplate {
         if (path.isAbsolute(_path))
             return _path;
         const sets = this.moduleConfig.sets;
+        const require = createRequire(import.meta.url);
         const modulePath = require.resolve(`${sets[process.env.CabloyCliBrandName][setName]}/package.json`);
         return path.join(path.dirname(modulePath), 'cli/templates', _path);
     }
@@ -53,11 +55,10 @@ export class LocalTemplate {
     async renderDir(targetDir, templateDir) {
         const { argv } = this.context;
         // files
-        const files = eggBornUtils.tools.globbySync('**/*', {
+        const files = await globby('**/*', {
             cwd: templateDir,
             dot: true,
             onlyFiles: false,
-            followSymlinkedDirectories: false,
         });
         // loop
         for (const file of files) {
@@ -182,7 +183,7 @@ export class LocalTemplate {
     }
     async applySnippets(targetDir, snippetsDir) {
         // snippets
-        let files = eggBornUtils.tools.globbySync('*.{cjs,ts}', {
+        let files = await globby('*.{cjs,ts}', {
             cwd: snippetsDir,
             onlyFiles: true,
         });
@@ -217,9 +218,9 @@ export class LocalTemplate {
     async _loadSnippetInstance(snippetTemplatePath, fn) {
         if (snippetTemplatePath.endsWith('.cjs')) {
             const instance = this.helper.requireDynamic(snippetTemplatePath);
-            await fn(instance);
+            return await fn(instance);
         }
-        await this.helper.importDynamic(snippetTemplatePath, instance => {
+        return await this.helper.importDynamic(snippetTemplatePath, instance => {
             return fn(instance.default);
         });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/cli",
   "type": "module",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "@cabloy/cli",
   "publishConfig": {
     "access": "public"
@@ -34,19 +34,19 @@
     "boxen": "^4.2.0",
     "chalk": "^3.0.0",
     "cli-table3": "^0.6.5",
-    "egg-born-utils": "^1.2.0",
     "enquirer": "^2.3.6",
-    "esbuild": "^0.23.0",
     "fs-extra": "^11.2.0",
+    "globby": "^14.1.0",
     "gogocode": "^1.0.53",
     "is-type-of": "^2.1.0",
     "istextorbinary": "^3.3.0",
     "semver": "^7.6.2",
     "tmp": "^0.2.3",
     "urllib": "^3.24.0",
-    "@cabloy/module-info": "^1.2.10",
-    "@cabloy/module-glob": "^5.1.12",
-    "@cabloy/process-helper": "^2.0.3"
+    "@cabloy/module-info": "^1.3.1",
+    "@cabloy/module-glob": "^5.2.0",
+    "@cabloy/process-helper": "^2.0.3",
+    "@cabloy/utils": "^1.0.6"
   },
   "gitHead": "2d40c063c115b230fdbc89f5a78b4412ebd0dfc9"
 }