zova-cli-set-front 1.2.60 → 1.2.61

package/dist/index.js

@@ -2867,7 +2867,7 @@ declare module 'zova' {
 
 async function generateConfig(modulePath) {
   const configFile = path.join(modulePath, 'src/config/config.ts');
-  if (!fse.existsSync(configFile)) return '';
+  if (!(await fse.pathExists(configFile))) return '';
   // combine
   const content = `/** config: begin */
 export * from '../config/config.js';
@@ -2878,7 +2878,7 @@ import { config } from '../config/config.js';
 }
 async function generateConstant(modulePath) {
   const constantFile = path.join(modulePath, 'src/config/constants.ts');
-  if (!fse.existsSync(constantFile)) return '';
+  if (!(await fse.pathExists(constantFile))) return '';
   // combine
   const content = `/** constant: begin */
 export * from '../config/constants.js';
@@ -2931,7 +2931,7 @@ import { locales } from './locales.js';
 }
 async function generateError(modulePath) {
   const errorFile = path.join(modulePath, 'src/config/errors.ts');
-  if (!fse.existsSync(errorFile)) return '';
+  if (!(await fse.pathExists(errorFile))) return '';
   // combine
   const content = `/** error: begin */
 export * from '../config/errors.js';
@@ -3065,7 +3065,7 @@ async function generateMetadataCustom(cli, globFiles, sceneName, sceneMeta, modu
   if (globFiles.length === 0) return '';
   // custom
   let jsFile = path.join(sceneMeta.module.root, 'dist-cli', sceneMeta.metadataCustom.replace('.ts', '.js'));
-  if (!fse.existsSync(jsFile)) {
+  if (!(await fse.pathExists(jsFile))) {
     jsFile = path.join(sceneMeta.module.root, 'cli', sceneMeta.metadataCustom);
   }
   return await cli.helper.importDynamic(jsFile, async instance => {
@@ -3096,7 +3096,7 @@ async function generateMainSys(modulePath) {
 }
 async function generateMonkey_common(modulePath, commandName) {
   const monkeyFile = path.join(modulePath, `src/${commandName}.ts`);
-  if (!fse.existsSync(monkeyFile)) return '';
+  if (!(await fse.pathExists(monkeyFile))) return '';
   // combine
   const content = `/** ${commandName}: begin */
 export * from '../${commandName}.js';
@@ -3106,7 +3106,7 @@ export * from '../${commandName}.js';
 }
 async function generateMain_common(modulePath, commandName) {
   const monkeyFile = path.join(modulePath, `src/${commandName}.ts`);
-  if (!fse.existsSync(monkeyFile)) return '';
+  if (!(await fse.pathExists(monkeyFile))) return '';
   // combine
   const content = `/** ${commandName}: begin */
 export * from '../${commandName}.js';
@@ -3115,6 +3115,9 @@ export * from '../${commandName}.js';
   return content;
 }
 
+function escapeRegExp(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 function checkIgnoreOfParts(parts) {
   const indexLast = parts.length - 1;
   if (parts[indexLast].endsWith('_')) {
@@ -3182,12 +3185,12 @@ function extractBeanInfo(sceneName, fileContent, sceneMeta) {
   // optionsCustomInterface
   let optionsCustomInterface;
   let optionsCustomInterfaceFrom;
-  let reg = new RegExp(`@${sceneNameCapitalize}<(I${sceneNameCapitalize}Options[^>]*)>`);
+  let reg = new RegExp(`@${escapeRegExp(sceneNameCapitalize)}<(I${escapeRegExp(sceneNameCapitalize)}Options[^>]*)>`);
   let matches = fileContent.match(reg);
   if (matches) {
     optionsCustomInterface = matches[1];
     // optionsCustomInterfaceFrom
-    reg = new RegExp(`import {[\\s\\S]*?${optionsCustomInterface}[, ][\\s\\S]*?} from '([^']*)'`);
+    reg = new RegExp(`import {[\\s\\S]*?${escapeRegExp(optionsCustomInterface)}[, ][\\s\\S]*?} from '([^']*)'`);
     matches = fileContent.match(reg);
     if (matches) {
       optionsCustomInterfaceFrom = matches[1];
@@ -3338,7 +3341,7 @@ async function generateOptionsPackage(cli, globFiles, onionScenesMeta, _moduleNa
     if (!sceneMeta) throw new Error(`sceneMeta not exists: ${sceneName}`);
     if (!sceneMeta.optionsPackage) continue;
     changed = true;
-    const matches = fileContent.match(new RegExp(`@${sceneNameCapitalize}[\\S]*?\\(([\\s\\S]*?)\\)\\s*?export class`));
+    const matches = fileContent.match(new RegExp(`@${escapeRegExp(sceneNameCapitalize)}[\\S]*?\\(([\\s\\S]*?)\\)\\s*?export class`));
     if (!matches) throw new Error(`${sceneName} options parser error: ${beanNameFull}`);
     const onionOptionsStr = matches[1];
     const onionOptions = onionOptionsStr ? evaluateSimple(matches[1]) : {};
@@ -3513,13 +3516,14 @@ class CliToolsMetadata extends BeanCliBase {
     const modulePath = module.root;
     const metaDir = path.join(modulePath, 'src/.metadata');
     const metaIndexFile = path.join(metaDir, 'index.ts');
-    if (fse.existsSync(metaIndexFile) && !force) {
+    if ((await fse.pathExists(metaIndexFile)) && !force) {
       // do nothing
       return;
     }
-    // rest
-    await rimraf(path.join(modulePath, 'rest'));
     // metaDir
+    await fse.remove(path.join(metaDir, 'component'));
+    await fse.remove(path.join(metaDir, 'page'));
+    await fse.remove(path.join(metaDir, 'icons'));
     await this.helper.ensureDir(metaDir);
     // relativeNameCapitalize
     const relativeNameCapitalize = this.helper.stringToCapitalize(moduleName, '-');
@@ -3605,7 +3609,6 @@ class CliToolsMetadata extends BeanCliBase {
     }
     // save
     await fse.writeFile(metaIndexFile, content);
-    // await this.helper.formatFile({ fileName: metaIndexFile, logPrefix: 'format: ' });
     // locales
     await this._generateLocales(modulePath, contentLocales1);
     // generate this
@@ -3627,43 +3630,30 @@ class CliToolsMetadata extends BeanCliBase {
   }
   async _generateThis(moduleName, relativeNameCapitalize, modulePath) {
     const thisDest = path.join(modulePath, 'src/.metadata/this.ts');
-    if (fse.existsSync(thisDest)) return;
+    if (await fse.pathExists(thisDest)) return;
     const content = `export const __ThisModule__ = '${moduleName}';
 export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.js';
 `;
     // save
     await fse.writeFile(thisDest, content);
   }
+  async _prependExportIfNeeded(jsContent, exportLine, sourceFile, modulePath) {
+    const sourcePath = path.join(modulePath, sourceFile);
+    if ((await fse.pathExists(sourcePath)) && !jsContent.includes(exportLine)) {
+      return `${exportLine}\n${jsContent}`;
+    }
+    return jsContent;
+  }
   async _generateIndex(modulePath) {
     let jsContent = '';
     const jsFile = path.join(modulePath, 'src/index.ts');
-    if (fse.existsSync(jsFile)) {
+    if (await fse.pathExists(jsFile)) {
       jsContent = (await fse.readFile(jsFile)).toString();
     }
-    // jsTypes
-    const jsTypes = "export * from './types/index.js';";
-    const jsTypesFile = path.join(modulePath, 'src/types/index.ts');
-    if (fse.existsSync(jsTypesFile) && !jsContent.includes(jsTypes)) {
-      jsContent = `${jsTypes}\n${jsContent}`;
-    }
-    // jsLib
-    const jsLib = "export * from './lib/index.js';";
-    const jsLibFile = path.join(modulePath, 'src/lib/index.ts');
-    if (fse.existsSync(jsLibFile) && !jsContent.includes(jsLib)) {
-      jsContent = `${jsLib}\n${jsContent}`;
-    }
-    // jsLocales
-    const jsLocales = "export * from './.metadata/locales.js';";
-    const jsLocalesFile = path.join(modulePath, 'src/.metadata/locales.ts');
-    if (fse.existsSync(jsLocalesFile) && !jsContent.includes(jsLocales)) {
-      jsContent = `${jsLocales}\n${jsContent}`;
-    }
-    // jsMetadata
-    const jsMetadata = "export * from './.metadata/index.js';";
-    const jsMetadataFile = path.join(modulePath, 'src/.metadata/index.ts');
-    if (fse.existsSync(jsMetadataFile) && !jsContent.includes(jsMetadata)) {
-      jsContent = `${jsMetadata}\n${jsContent}`;
-    }
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './types/index.js';", 'src/types/index.ts', modulePath);
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './lib/index.js';", 'src/lib/index.ts', modulePath);
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './.metadata/locales.js';", 'src/.metadata/locales.ts', modulePath);
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './.metadata/index.js';", 'src/.metadata/index.ts', modulePath);
     // trim empty
     jsContent = jsContent.replace('export {};\n', '');
     // write
@@ -3693,11 +3683,12 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.js'
         pkg.zovaModule.beansPreload = beansPreload;
       }
     }
-    // cli/rest
-    for (const name of ['cli', 'icons', 'rest']) {
+    // cli
+    for (const name of ['cli', 'icons']) {
       const cli = path.join(modulePath, name);
-      if (fse.existsSync(cli)) {
+      if (await fse.pathExists(cli)) {
         pkg = await _loadPkg();
+        pkg.files ??= [];
         const index = pkg.files.indexOf(name);
         if (index === -1) {
           changed = true;

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

@@ -9,6 +9,7 @@ export declare class CliToolsMetadata extends BeanCliBase {
     _generateMetadata(moduleName: string, force: boolean): Promise<void>;
     _generateLocales(modulePath: string, contentLocales: any): Promise<void>;
     _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string): Promise<void>;
+    _prependExportIfNeeded(jsContent: string, exportLine: string, sourceFile: string, modulePath: string): Promise<string>;
     _generateIndex(modulePath: string): Promise<void>;
     _generatePackage(modulePath: string, beansPreload: string[]): Promise<void>;
 }

package/dist/lib/bean/toolsMetadata/utils.d.ts

@@ -1,4 +1,5 @@
 import type { IGlobBeanFile, OnionSceneMeta } from '@cabloy/module-info';
+export declare function escapeRegExp(str: string): string;
 export declare function checkIgnoreOfParts(parts: string[]): boolean;
 export declare function getScopeModuleName(moduleName: string): string;
 export declare function globAllTsFiles(moduleName: string, modulePath: string): Promise<IGlobBeanFile[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.60",
+  "version": "1.2.61",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [