@cabloy/cli 3.0.67 → 3.0.68

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

@@ -1,10 +1,12 @@
 import type { IModulePackage } from '@cabloy/module-info';
+import type { Stats } from 'fs-extra';
 import type { BeanCliBase } from './bean.cli.base.ts';
 type TypeDeps = Record<string, string>;
 export declare class LocalCommon {
     cli: BeanCliBase;
     constructor(cli: any);
     _generateTypeModulesFile(projectPath: string): Promise<void>;
+    _generateTypeModulesFileInner(typeFile: string, typeFileStat: Stats, moduleTypeFile: string): Promise<void>;
     _generatePackageJson(projectPath: string): Promise<void>;
     _generatePackageJson_prepareDeps(_projectPath: string): Promise<{
         deps: TypeDeps;

package/dist/types/template.d.ts

@@ -36,6 +36,7 @@ export type TypeParseResult<LANGUAGE extends TypeParseLanguage> = LANGUAGE exten
 export type TypeParseOptions<LANGUAGE extends TypeParseLanguage> = LANGUAGE extends 'plain' ? never : LANGUAGE extends 'json' ? never : ParserOptions;
 export interface ISnippet<LANGUAGE extends TypeParseLanguage = ''> {
     language: LANGUAGE;
+    format?: boolean;
     file: string | ((ejsData: IEjsData) => string);
     init?: string | ((initData: IInitData) => Promise<string>);
     parseOptions?: TypeParseOptions<LANGUAGE>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/cli",
   "type": "module",
-  "version": "3.0.67",
+  "version": "3.0.68",
   "description": "@cabloy/cli",
   "publishConfig": {
     "access": "public"
@@ -27,10 +27,10 @@
   ],
   "dependencies": {
     "@babel/parser": "^7.26.5",
-    "@cabloy/module-glob": "^5.2.34",
-    "@cabloy/module-info": "^1.3.31",
-    "@cabloy/process-helper": "^2.0.21",
-    "@cabloy/utils": "^1.0.48",
+    "@cabloy/module-glob": "^5.2.35",
+    "@cabloy/module-info": "^1.3.32",
+    "@cabloy/process-helper": "^2.0.22",
+    "@cabloy/utils": "^1.0.49",
     "@cabloy/word-utils": "^2.0.1",
     "@npmcli/config": "^10.4.2",
     "@zhennann/common-bin": "^4.0.0",
@@ -50,8 +50,7 @@
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {
-    "lint": "eslint .",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && tsc"
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc"
   }
 }

package/dist/config.js

@@ -1,38 +0,0 @@
-export const commandsConfig = {
-    sets: {
-        zova: {
-            front: 'zova-cli-set-front',
-        },
-        vona: {
-            api: 'vona-cli-set-api',
-        },
-    },
-    helper: {
-        chalk: {
-            options: { level: 2 },
-        },
-        boxen: {
-            options: { padding: 1, margin: 1, align: 'center', borderColor: 'yellow', borderStyle: 'round' },
-        },
-    },
-    template: {
-        render: {
-            fileMapping: {
-                'gitignore': '.gitignore',
-                '_gitignore': '.gitignore',
-                '_.gitignore': '.gitignore',
-                '_package.json': 'package.json',
-                '_.eslintrc': '.eslintrc',
-                '_.eslintignore': '.eslintignore',
-                '_.npmignore': '.npmignore',
-                '_.npmrc': '.npmrc',
-                '_.eslintrc.js': '.eslintrc.js',
-                '_jsconfig.json': 'jsconfig.json',
-                '_tsconfig.json': 'tsconfig.json',
-                '_tsconfig.base.json': 'tsconfig.base.json',
-                '_tsconfig.build.json': 'tsconfig.build.json',
-            },
-            ignore: ['.DS_Store'],
-        },
-    },
-};

package/dist/lib/bean.cli.base.js

@@ -1,144 +0,0 @@
-import { glob } from '@cabloy/module-glob';
-import { patchFlavor } from "../utils.js";
-import { LocalCommon } from "./local.common.js";
-import { LocalConsole } from "./local.console.js";
-import { LocalHelper } from "./local.helper.js";
-import { LocalTemplate } from "./local.template.js";
-export class BeanCliBase {
-    options;
-    terminal;
-    __console;
-    __helper;
-    __template;
-    __common;
-    modulesMeta;
-    constructor(options) {
-        this.options = options;
-        this.terminal = options.terminal !== false;
-    }
-    get console() {
-        if (!this.__console) {
-            this.__console = new LocalConsole(this);
-        }
-        return this.__console;
-    }
-    get helper() {
-        if (!this.__helper) {
-            this.__helper = new LocalHelper(this);
-        }
-        return this.__helper;
-    }
-    get template() {
-        if (!this.__template) {
-            this.__template = new LocalTemplate(this);
-        }
-        return this.__template;
-    }
-    get common() {
-        if (!this.__common) {
-            this.__common = new LocalCommon(this);
-        }
-        return this.__common;
-    }
-    get context() {
-        return this.options.context;
-    }
-    get cliFullName() {
-        return this.options.context.argv.cliFullName;
-    }
-    async meta() {
-        await this._loadModulesMeta();
-        const metaLocale = this._commandMeta();
-        return metaLocale;
-    }
-    async execute() {
-        const { argv } = this.context;
-        if (argv.flavor) {
-            argv.flavor = patchFlavor(argv.flavor);
-        }
-        await this._loadModulesMeta();
-    }
-    async _loadModulesMeta() {
-        //
-        if (this.modulesMeta)
-            return;
-        // all modules
-        this.modulesMeta = await glob({
-            projectPath: this.context.argv.projectPath,
-            disabledModules: undefined,
-            disabledSuites: undefined,
-            log: false,
-            projectMode: process.env.CabloyCliBrandName,
-        });
-    }
-    _commandMeta() {
-        const { command } = this.options;
-        const { argv } = this.context;
-        const meta = {};
-        meta.info = this._commandMeta_info({ info: command.info, argv });
-        meta.options = this._commandMeta_options({ options: command.options, argv });
-        meta.groups = this._commandMeta_groups({ groups: command.groups, argv });
-        return meta;
-    }
-    _commandMeta_groups({ groups }) {
-        const metaGroups = {};
-        if (groups) {
-            for (const groupName in groups) {
-                const group = groups[groupName];
-                metaGroups[groupName] = this._commandMeta_group({ group });
-            }
-        }
-        return metaGroups;
-    }
-    _commandMeta_group({ group }) {
-        const metaGroup = {
-            description: group.description,
-            condition: group.condition,
-            questions: {},
-        };
-        for (const key in group.questions) {
-            const question = group.questions[key];
-            metaGroup.questions[key] = {
-                ...question,
-                message: question.message,
-            };
-        }
-        return metaGroup;
-    }
-    _commandMeta_options({ options }) {
-        const metaOptions = {};
-        if (options) {
-            for (const key in options) {
-                const option = options[key];
-                metaOptions[key] = {
-                    ...option,
-                    description: option.description,
-                };
-            }
-        }
-        return metaOptions;
-    }
-    _commandMeta_info({ info, argv }) {
-        // info
-        const metaInfo = {
-            version: info.version,
-            title: info.title,
-            usage: info.usage,
-        };
-        // usage
-        if (!metaInfo.usage) {
-            metaInfo.usage = `${'Usage'}: ${process.env.CabloyCliBrandName} ${argv.cliFullName} [options] [-h] [-v]`;
-        }
-        // welcomes
-        metaInfo.welcomes = this._commandMeta_info_welcomes({ info });
-        // ok
-        return metaInfo;
-    }
-    _commandMeta_info_welcomes({ info }) {
-        let welcomes = info.welcomes || [];
-        if (!Array.isArray(welcomes))
-            welcomes = [welcomes];
-        welcomes = welcomes.map(item => item);
-        return welcomes;
-    }
-}

package/dist/lib/bean.cli.js

@@ -1,33 +0,0 @@
-import { findCommand } from "./commands.js";
-export class BeanCli {
-    async meta({ context }) {
-        // command
-        const { argv } = context;
-        const cliFullName = argv.cliFullName;
-        const { command, BeanClass } = await this._findCliCommand({ cliFullName });
-        // command bean
-        const beanCommand = new BeanClass({ command, context, terminal: false });
-        if (!beanCommand)
-            throw new Error(`cli command bean not found: ${command.beanFullName}`);
-        // meta
-        return await beanCommand.meta();
-    }
-    async execute({ context }) {
-        // command
-        const { argv } = context;
-        const cliFullName = argv.cliFullName;
-        const { command, BeanClass } = await this._findCliCommand({ cliFullName });
-        // command bean
-        const beanCommand = new BeanClass({ command, context, terminal: false });
-        if (!beanCommand)
-            throw new Error(`cli command bean not found: ${command.beanFullName}`);
-        // execute
-        await beanCommand.execute();
-    }
-    _findCliCommand({ cliFullName }) {
-        const commandInfo = findCommand(cliFullName);
-        if (!commandInfo || !commandInfo.command)
-            throw new Error(`cli command not found: ${cliFullName}`);
-        return commandInfo;
-    }
-}

package/dist/lib/cli.js

@@ -1,217 +0,0 @@
-import { evaluate } from '@cabloy/utils';
-import BaseCommand from '@zhennann/common-bin';
-import chalk from 'chalk';
-import enquirer from 'enquirer';
-import is from 'is-type-of';
-import { BeanCli } from "./bean.cli.js";
-const __envFields = ['TERM', 'TERM_PROGRAM', 'TERM_PROGRAM_VERSION', 'SHELL', 'COLOR', 'LANG', 'npm_config_registry'];
-const __comment_seperator = '====================================================================';
-export class CliCommand extends BaseCommand {
-    __meta;
-    __groups;
-    __argv;
-    constructor(rawArgv, { meta, argv }) {
-        super(rawArgv);
-        this.usage = meta.info.usage; // readonly
-        this.options = meta.options; // readonly
-        this.version = meta.info.version;
-        this.__meta = meta;
-        this.__groups = meta.groups;
-        this.__argv = argv;
-    }
-    async run(options) {
-        let { argv, cwd, env, rawArgv } = options;
-        // argv
-        argv = this._prepareArgv(argv);
-        // context
-        const context = {
-            brandName: process.env.CabloyCliBrandName,
-            argv,
-            cwd,
-            env: this._adjustEnv({ env }),
-            rawArgv,
-        };
-        // log start
-        if (!argv.dummy) {
-            // eslint-disable-next-line no-console
-            console.log(`${process.env.CabloyCliBrandName} ${chalk.cyan(argv.cliFullName)} at %s\n`, cwd);
-        }
-        // log meta welcomes
-        if (!argv.dummy) {
-            this._logMetaWelcomes();
-        }
-        // prompt
-        await this._promptGroups({ context, groups: this.__groups });
-        // execute
-        const beanCli = new BeanCli();
-        await beanCli.execute({ context });
-        // done: log cli docs
-        if (!argv.dummy) {
-            this._logCliDocs();
-        }
-        // done
-        // console.log(chalk.cyan('\n  cli successfully!\n'));
-    }
-    _getMetaWelcomes() {
-        let welcomes = this.__meta.info.welcomes;
-        if (!welcomes)
-            return null;
-        if (!Array.isArray(welcomes))
-            welcomes = [welcomes];
-        if (welcomes.length === 0)
-            return null;
-        return welcomes;
-    }
-    _logMetaWelcomes() {
-        const welcomes = this._getMetaWelcomes();
-        if (!welcomes)
-            return;
-        // eslint-disable-next-line no-console
-        console.log(__comment_seperator);
-        for (const welcome of welcomes) {
-            // eslint-disable-next-line no-console
-            console.log(welcome);
-        }
-        // eslint-disable-next-line no-console
-        console.log(__comment_seperator);
-        // eslint-disable-next-line no-console
-        console.log('');
-    }
-    _logCliDocs() {
-        const welcomes = this._getMetaWelcomes();
-        if (!welcomes)
-            return;
-        const welcome = welcomes[0];
-        if (!welcome || !welcome.includes('articles/cli-introduce.html'))
-            return;
-        // eslint-disable-next-line no-console
-        console.log('');
-        // eslint-disable-next-line no-console
-        console.log(__comment_seperator);
-        // eslint-disable-next-line no-console
-        console.log(welcome);
-        // eslint-disable-next-line no-console
-        console.log(__comment_seperator);
-    }
-    _adjustEnv({ env }) {
-        const res = {};
-        for (const field of __envFields) {
-            if (env[field])
-                res[field] = env[field];
-        }
-        return res;
-    }
-    async _promptGroups({ context, groups }) {
-        for (const groupName in groups) {
-            const group = groups[groupName];
-            await this._promptGroup({ group, context });
-        }
-    }
-    async _promptGroup({ group, context }) {
-        const { argv } = context;
-        // check
-        const check = this._checkGroupCondition({ group, context });
-        if (!check)
-            return;
-        // prepare
-        const varsWant = [];
-        for (const key in group.questions) {
-            const value = argv[key];
-            if (value !== undefined)
-                continue;
-            const question = group.questions[key];
-            const varWant = this._prepareQuestion({ group, question, key, context });
-            if (varWant) {
-                varsWant.push(varWant);
-            }
-        }
-        if (varsWant.length === 0)
-            return;
-        // log description
-        if (group.description) {
-            // eslint-disable-next-line no-console
-            console.log('===>', group.description);
-        }
-        // prompt
-        await enquirer.prompt(varsWant);
-    }
-    _prepareQuestionPropertyExpression({ group, question, key, context, propName }) {
-        // expression
-        const expression = question[propName] && question[propName].expression;
-        if (!expression)
-            return null;
-        return function (value) {
-            return evaluate(expression, { value, group, question, key, context });
-        };
-    }
-    _prepareQuestion({ group, question, key, context }) {
-        const { argv } = context;
-        // want
-        const varWant = {
-            name: key,
-            ...question,
-        };
-        // message/skip/initial/format/validate
-        for (const propName of ['message', 'skip', 'initial', 'format', 'validate']) {
-            const propFunction = this._prepareQuestionPropertyExpression({ group, question, key, context, propName });
-            if (propFunction) {
-                varWant[propName] = propFunction;
-            }
-        }
-        // special check initial
-        let initial = varWant.initial;
-        if (initial && is.function(initial)) {
-            initial = initial();
-            if (initial !== undefined) {
-                argv[key] = initial;
-                return null;
-            }
-        }
-        // result
-        varWant.result = value => {
-            const propFunction = this._prepareQuestionPropertyExpression({
-                group,
-                question,
-                key,
-                context,
-                propName: 'result',
-            });
-            if (propFunction) {
-                value = propFunction(value);
-            }
-            argv[key] = value;
-            return value;
-        };
-        // required
-        if (question.required) {
-            varWant.validate = value => {
-                if (!value)
-                    return 'Required';
-                return true;
-            };
-        }
-        // ok
-        return varWant;
-    }
-    _checkGroupCondition({ group, context }) {
-        const expression = group.condition && group.condition.expression;
-        if (!expression)
-            return true;
-        return evaluate(expression, { group, context });
-    }
-    _prepareArgv(argv) {
-        argv = Object.assign({}, argv, this.__argv);
-        delete argv.$0;
-        // alias
-        const options = this.__meta.options;
-        if (options) {
-            for (const key in options) {
-                const option = options[key];
-                if (option.alias && argv[key] === undefined) {
-                    argv[key] = argv[option.alias];
-                }
-            }
-        }
-        return argv;
-    }
-}

package/dist/lib/commands.js

@@ -1,52 +0,0 @@
-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 { commandsConfig } from "../config.js";
-let __commandsMeta;
-export async function getCommandsMeta() {
-    await collectCommands();
-    return __commandsMeta;
-}
-export function findCommand(cliFullName) {
-    return __commandsMeta.map[cliFullName];
-}
-export async function collectCommands() {
-    await _collectCommands();
-}
-async function _collectCommands() {
-    if (__commandsMeta)
-        return;
-    const _commandsMap = {};
-    const _commandsAll = {};
-    const sets = commandsConfig.sets[process.env.CabloyCliBrandName];
-    for (const setName in sets) {
-        const setModuleName = sets[setName];
-        const setModule = await import(__rewriteRelativeImportExtension(setModuleName)); // 270ms
-        const commands = setModule.commands;
-        if (!commands)
-            continue;
-        const _commandsSet = (_commandsAll[setName] = {});
-        for (const groupName in commands) {
-            const group = commands[groupName];
-            const _commandsGroup = (_commandsSet[groupName] = {});
-            for (const key in group) {
-                const command = group[key];
-                const fullKey = `${setName}:${groupName}:${key}`;
-                // command BeanClass
-                const BeanClass = setModule.beans[command.bean];
-                // ok
-                _commandsMap[fullKey] = _commandsGroup[key] = { command, BeanClass };
-            }
-        }
-    }
-    // ok
-    __commandsMeta = {
-        map: _commandsMap,
-        all: _commandsAll,
-    };
-}

package/dist/lib/index.js

@@ -1,7 +0,0 @@
-export * from "./bean.cli.base.js";
-export * from "./bean.cli.js";
-export * from "./cli.js";
-export * from "./commands.js";
-export * from "./local.console.js";
-export * from "./local.helper.js";
-export * from "./local.template.js";