vona-cli-set-api 1.0.8 → 1.0.11

package/dist/lib/bean/cli.init.config.d.ts

@@ -0,0 +1,8 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+    }
+}
+export declare class CliInitConfig extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.config.js

@@ -0,0 +1,36 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+import { __ThisSetName__ } from "../this.js";
+export class CliInitConfig extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv._[0];
+        if (!moduleName)
+            return;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        const configFile = path.join(targetDir, 'src/config/config.ts');
+        if (fse.existsSync(configFile)) {
+            throw new Error(`config exists: ${moduleName}`);
+        }
+        // render boilerplate
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir: path.join(targetDir, 'src'),
+            setName: __ThisSetName__,
+            snippetsPath: null,
+            boilerplatePath: 'init/config/boilerplate',
+        });
+        // tools.metadata
+        await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

package/dist/lib/bean/cli.init.constant.d.ts

@@ -0,0 +1,8 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+    }
+}
+export declare class CliInitConstant extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.constant.js

@@ -0,0 +1,36 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+import { __ThisSetName__ } from "../this.js";
+export class CliInitConstant extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv._[0];
+        if (!moduleName)
+            return;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        const constantFile = path.join(targetDir, 'src/config/constants.ts');
+        if (fse.existsSync(constantFile)) {
+            throw new Error(`constant exists: ${moduleName}`);
+        }
+        // render boilerplate
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir: path.join(targetDir, 'src'),
+            setName: __ThisSetName__,
+            snippetsPath: null,
+            boilerplatePath: 'init/constant/boilerplate',
+        });
+        // tools.metadata
+        await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

package/dist/lib/bean/cli.init.error.d.ts

@@ -0,0 +1,8 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+    }
+}
+export declare class CliInitError extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.error.js

@@ -0,0 +1,47 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+import { __ThisSetName__ } from "../this.js";
+export class CliInitError extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv._[0];
+        if (!moduleName)
+            return;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        const errorFile = path.join(targetDir, 'src/config/errors.ts');
+        if (fse.existsSync(errorFile)) {
+            throw new Error(`error exists: ${moduleName}`);
+        }
+        // render boilerplate
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir: path.join(targetDir, 'src'),
+            setName: __ThisSetName__,
+            snippetsPath: null,
+            boilerplatePath: 'init/error/boilerplate',
+        });
+        // special for locale
+        const localeFile = path.join(targetDir, 'src/config/locale');
+        if (!fse.existsSync(localeFile)) {
+            // render boilerplate
+            await this.template.renderBoilerplateAndSnippets({
+                targetDir: path.join(targetDir, 'src'),
+                setName: __ThisSetName__,
+                snippetsPath: null,
+                boilerplatePath: 'init/locale/boilerplate',
+            });
+        }
+        // tools.metadata
+        await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

package/dist/lib/bean/cli.init.locale.d.ts

@@ -0,0 +1,8 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+    }
+}
+export declare class CliInitLocale extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.locale.js

@@ -0,0 +1,36 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+import { __ThisSetName__ } from "../this.js";
+export class CliInitLocale extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv._[0];
+        if (!moduleName)
+            return;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        const localeFile = path.join(targetDir, 'src/config/locale');
+        if (fse.existsSync(localeFile)) {
+            throw new Error(`locale exists: ${moduleName}`);
+        }
+        // render boilerplate
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir: path.join(targetDir, 'src'),
+            setName: __ThisSetName__,
+            snippetsPath: null,
+            boilerplatePath: 'init/locale/boilerplate',
+        });
+        // tools.metadata
+        await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

package/dist/lib/bean/cli.init.main.d.ts

@@ -6,4 +6,3 @@ declare module '@cabloy/cli' {
 export declare class CliInitMain extends BeanCliBase {
     execute(): Promise<void>;
 }
-//# sourceMappingURL=cli.init.main.d.ts.map

package/dist/lib/bean/cli.init.main.js

@@ -1,7 +1,7 @@
+import path from 'node:path';
 import { BeanCliBase } from '@cabloy/cli';
 import fse from 'fs-extra';
-import { __ThisSetName__ } from '../this.js';
-import path from 'node:path';
+import { __ThisSetName__ } from "../this.js";
 export class CliInitMain extends BeanCliBase {
     async execute() {
         const { argv } = this.context;
@@ -34,4 +34,3 @@ export class CliInitMain extends BeanCliBase {
         await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
     }
 }
-//# sourceMappingURL=cli.init.main.js.map

package/dist/lib/bean/cli.init.monkey.d.ts

@@ -7,4 +7,3 @@ export declare class CliInitMonkey extends BeanCliBase {
     execute(): Promise<void>;
     _setPackageInfo(modulePath: string): Promise<void>;
 }
-//# sourceMappingURL=cli.init.monkey.d.ts.map

package/dist/lib/bean/cli.init.monkey.js

@@ -1,7 +1,7 @@
+import path from 'node:path';
 import { BeanCliBase } from '@cabloy/cli';
 import fse from 'fs-extra';
-import { __ThisSetName__ } from '../this.js';
-import path from 'node:path';
+import { __ThisSetName__ } from "../this.js";
 export class CliInitMonkey extends BeanCliBase {
     async execute() {
         const { argv } = this.context;
@@ -48,17 +48,15 @@ export class CliInitMonkey extends BeanCliBase {
             pkg.vonaModule.capabilities.monkey = true;
             changed = true;
         }
-        // dependencies
-        if (!pkg.vonaModule.dependencies)
-            pkg.vonaModule.dependencies = {};
-        if (!pkg.vonaModule.dependencies['a-vona']) {
-            pkg.vonaModule.dependencies['a-vona'] = '5.0.0';
-            changed = true;
-        }
+        // // dependencies
+        // if (!pkg.vonaModule.dependencies) pkg.vonaModule.dependencies = {};
+        // if (!pkg.vonaModule.dependencies['a-vona']) {
+        //   pkg.vonaModule.dependencies['a-vona'] = '5.0.0';
+        //   changed = true;
+        // }
         // save
         if (changed) {
             await this.helper.saveJSONFile(pkgFile, pkg);
         }
     }
 }
-//# sourceMappingURL=cli.init.monkey.js.map

package/dist/lib/bean/cli.init.static.d.ts

@@ -0,0 +1,8 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+    }
+}
+export declare class CliInitStatic extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.static.js

@@ -0,0 +1,36 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+import { __ThisSetName__ } from "../this.js";
+export class CliInitStatic extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv._[0];
+        if (!moduleName)
+            return;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        const staticDir = path.join(targetDir, 'static');
+        if (fse.existsSync(staticDir)) {
+            throw new Error(`static exists: ${moduleName}`);
+        }
+        // render boilerplate
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir,
+            setName: __ThisSetName__,
+            snippetsPath: null,
+            boilerplatePath: 'init/static/boilerplate',
+        });
+        // // tools.metadata
+        // await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

package/dist/lib/bean/cli.tools.crud.d.ts

@@ -0,0 +1,15 @@
+import type { IModuleInfo } from '@cabloy/module-info';
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        module: string;
+        moduleInfo: IModuleInfo;
+        resourceName: string;
+        resourceNameCapitalize: string;
+        moduleResourceName: string;
+        moduleActionPathRaw: string;
+    }
+}
+export declare class CliToolsCrud extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.tools.crud.js

@@ -0,0 +1,42 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import { combineApiPathControllerAndActionRaw } from '@cabloy/utils';
+import { __ThisSetName__ } from "../this.js";
+export class CliToolsCrud extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv.module;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        // resourceName
+        const resourceName = argv.resourceName;
+        argv.resourceNameCapitalize = this.helper.firstCharToUpperCase(resourceName);
+        // moduleResourceName
+        argv.moduleResourceName = this.helper.combineModuleNameAndResource(argv.moduleInfo.relativeName, argv.resourceName);
+        argv.moduleActionPathRaw = combineApiPathControllerAndActionRaw(moduleName, resourceName, '', true);
+        // controller
+        const controllerFile = path.join(targetDir, 'src/controller', `${resourceName}.ts`);
+        if (fs.existsSync(controllerFile)) {
+            throw new Error(`resource exists: ${resourceName}`);
+        }
+        // render
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir,
+            setName: __ThisSetName__,
+            snippetsPath: 'tools/crud/snippets',
+            boilerplatePath: 'tools/crud/boilerplate',
+        });
+        // tools.metadata
+        await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

package/dist/lib/bean/cli.tools.deps.d.ts

@@ -1,20 +1,12 @@
 import { BeanCliBase } from '@cabloy/cli';
 declare module '@cabloy/cli' {
     interface ICommandArgv {
-        tsc: boolean;
-        force: boolean;
     }
 }
 export declare class CliToolsDeps extends BeanCliBase {
     execute(): Promise<void>;
-    _generate(projectPath: string, tsc: boolean, force: boolean): Promise<void>;
+    _generate(projectPath: string): Promise<void>;
     _getProjectMode(projectPath: string): "source" | "project";
-    _getVonaPath(projectPath: string): any;
-    _resolveTemplatePath(file: string): import("url").URL;
+    _getVonaPath(projectPath: string): string | undefined;
     _generateTypeProjectFile(projectPath: string): Promise<void>;
-    _generateTypeModulesFile(projectPath: string, force: boolean): Promise<void>;
-    _generatePkgFromPkgOriginal(pkgOriginal: any, pkgFile: any): Promise<void>;
-    _saveBackVersions(pkg: any, pkgOriginal: any, pkgOriginalFile: any): Promise<void>;
-    _tsc(): Promise<void>;
 }
-//# sourceMappingURL=cli.tools.deps.d.ts.map

package/dist/lib/bean/cli.tools.deps.js

@@ -1,149 +1,42 @@
 import path from 'node:path';
 import { BeanCliBase } from '@cabloy/cli';
 import fse from 'fs-extra';
-import eggBornUtils from 'egg-born-utils';
+import { resolveTemplatePath } from "../utils.js";
 export class CliToolsDeps extends BeanCliBase {
     async execute() {
         const { argv } = this.context;
         // super
         await super.execute();
         const projectPath = argv.projectPath;
-        const tsc = argv.tsc;
-        const force = argv.force;
         // generate
-        await this._generate(projectPath, tsc, force);
+        await this._generate(projectPath);
     }
-    async _generate(projectPath, tsc, force) {
-        const pkgFile = path.join(projectPath, 'package.json');
-        const pkgOriginalFile = path.join(projectPath, 'package.original.json');
-        // check original
-        if (!fse.existsSync(pkgOriginalFile)) {
-            await fse.copyFile(pkgFile, pkgOriginalFile);
-        }
-        // pkg/pkgOriginal
-        const pkgOriginal = await this.helper.loadJSONFile(pkgOriginalFile);
-        if (fse.existsSync(pkgFile)) {
-            const pkg = await this.helper.loadJSONFile(pkgFile);
-            // save back versions
-            await this._saveBackVersions(pkg, pkgOriginal, pkgOriginalFile);
-        }
-        // generate pkg from pkgOriginal
-        await this._generatePkgFromPkgOriginal(pkgOriginal, pkgFile);
+    async _generate(projectPath) {
+        // generate package.json
+        await this.common._generatePackageJson(projectPath);
         // generate type modules file
-        await this._generateTypeModulesFile(projectPath, force);
+        await this.common._generateTypeModulesFile(projectPath);
         // generate type project file
         await this._generateTypeProjectFile(projectPath);
-        // tsc
-        if (tsc) {
-            await this._tsc();
-        }
     }
     _getProjectMode(projectPath) {
         const vonaPath = this._getVonaPath(projectPath);
-        return vonaPath.indexOf('packages-vona') > -1 ? 'source' : 'project';
+        return vonaPath.includes('packages-vona') ? 'source' : 'project';
     }
     _getVonaPath(projectPath) {
-        return eggBornUtils.tools._getVonaPath(projectPath);
-    }
-    _resolveTemplatePath(file) {
-        return new URL(path.join('../../../templates', file), import.meta.url);
+        let vonaPath = path.join(projectPath, 'packages-vona/vona');
+        if (fse.existsSync(vonaPath))
+            return vonaPath;
+        vonaPath = path.join(projectPath, 'node_modules/vona');
+        if (fse.existsSync(vonaPath))
+            return vonaPath;
     }
     async _generateTypeProjectFile(projectPath) {
         const projectMode = this._getProjectMode(projectPath);
-        const fileTemplate = this._resolveTemplatePath(`_tsconfig_${projectMode}.json`);
+        const fileTemplate = resolveTemplatePath(`config/_tsconfig_${projectMode}.json`);
         const fileConfig = path.join(projectPath, 'tsconfig.json');
-        // content
-        let contentOld;
-        const exists = fse.existsSync(fileConfig);
-        if (exists) {
-            contentOld = (await fse.readFile(fileConfig)).toString();
-        }
-        else {
-            contentOld = (await fse.readFile(fileTemplate)).toString();
-        }
-        const content = JSON.parse(contentOld);
-        const referencesOld = content.references;
-        // remove old
-        const referencesNew = referencesOld.filter(item => !['src/suite/', 'src/module/', 'src/suite-vendor/', 'src/module-vendor/'].some(item2 => item.path.indexOf(item2) > -1));
-        //
-        if (exists && JSON.stringify(referencesNew, null, 2) === JSON.stringify(referencesOld, null, 2))
-            return;
-        const contentNew = { ...content, references: referencesNew };
-        await fse.outputFile(fileConfig, JSON.stringify(contentNew, null, 2));
-    }
-    async _generateTypeModulesFile(projectPath, force) {
-        const typeFile = path.join(projectPath, 'src/backend/typing/modules.d.ts');
-        let content = '';
-        // // all suites
-        // for (const key in this.modulesMeta.suites) {
-        //   const suite = this.modulesMeta.suites[key];
-        //   content += `import '${suite.package.name}';\n`;
-        // }
-        // all modules
-        this.modulesMeta.modulesArray.forEach(module => {
-            content += `import '${module.package.name}';\n`;
-        });
-        await fse.writeFile(typeFile, content);
-        // all modules: type file
-        for (const module of this.modulesMeta.modulesArray) {
-            if (module.info.node_modules)
-                continue;
-            const moduleTypeFile = path.join(module.root, 'src/.metadata/modules.d.ts');
-            if (force || !fse.existsSync(moduleTypeFile)) {
-                await fse.ensureLink(typeFile, moduleTypeFile);
-            }
+        if (!fse.existsSync(fileConfig)) {
+            await fse.copyFile(fileTemplate, fileConfig);
         }
     }
-    async _generatePkgFromPkgOriginal(pkgOriginal, pkgFile) {
-        const depsOriginal = pkgOriginal.dependencies;
-        // all modules
-        this.modulesMeta.modulesArray.forEach(module => {
-            if (!depsOriginal[module.package.name]) {
-                const version = module.info.node_modules ? '^' + module.package.version : 'workspace:^';
-                depsOriginal[module.package.name] = version;
-            }
-        });
-        // all globalDependencies of modules
-        this.modulesMeta.modulesArray.forEach(module => {
-            const deps = module.package.dependencies;
-            const globalDependencies = module.package.vonaModule?.globalDependencies;
-            if (globalDependencies) {
-                for (const key in globalDependencies) {
-                    let version = globalDependencies[key];
-                    if (version !== false && !depsOriginal[key]) {
-                        if (version === true)
-                            version = deps[key];
-                        depsOriginal[key] = version;
-                    }
-                }
-            }
-        });
-        await this.helper.saveJSONFile(pkgFile, pkgOriginal);
-    }
-    async _saveBackVersions(pkg, pkgOriginal, pkgOriginalFile) {
-        let changed = false;
-        for (const key of ['version', 'gitHead']) {
-            if (pkgOriginal[key] !== pkg[key]) {
-                pkgOriginal[key] = pkg[key];
-                changed = true;
-            }
-        }
-        for (const field of ['dependencies', 'devDependencies']) {
-            const fieldObj = pkg[field];
-            const fieldObjOriginal = pkgOriginal[field];
-            for (const key in fieldObjOriginal) {
-                if (fieldObjOriginal[key] !== fieldObj[key]) {
-                    fieldObjOriginal[key] = fieldObj[key];
-                    changed = true;
-                }
-            }
-        }
-        if (changed) {
-            await this.helper.saveJSONFile(pkgOriginalFile, pkgOriginal);
-        }
-    }
-    async _tsc() {
-        await this.helper.processHelper.tsc();
-    }
 }
-//# sourceMappingURL=cli.tools.deps.js.map

package/dist/lib/bean/cli.tools.metadata.d.ts

@@ -7,7 +7,7 @@ declare module '@cabloy/cli' {
 export declare class CliToolsMetadata extends BeanCliBase {
     execute(): Promise<void>;
     _generateMetadata(moduleName: string, force: boolean): Promise<void>;
+    _generatePatch(content: string): string;
     _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string): Promise<void>;
     _generateIndex(modulePath: string): Promise<void>;
 }
-//# sourceMappingURL=cli.tools.metadata.d.ts.map