vona-cli-set-api 1.1.153 → 1.1.155

package/cli/templates/tools/crudBasic/snippets/2-meta.index.ts

@@ -1,4 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
+import { mergeMetaIndex } from 'vona-cli-set-api/mergeMetaIndex';
 import { catchError } from '@cabloy/utils';
 import fs from 'node:fs';
 
@@ -9,7 +10,7 @@ declare module '@cabloy/cli' {
 }
 
 const __snippet_import1 = "import { $tableColumns } from 'vona-module-a-ormutils';";
-const __snippet_update = "...$tableColumns('<%=argv.moduleResourceName%>', 'name'),";
+const __snippet_table = '<%=argv.moduleResourceName%>';
 
 export default metadataCustomSnippet({
   file: 'src/bean/meta.index.ts',
@@ -35,14 +36,7 @@ export default metadataCustomSnippet({
         `import { Meta } from 'vona-module-a-meta';\n${code}`,
       );
     }
-    // update
-    const code = await cli.template.renderContent({ content: __snippet_update });
-    if (ast.includes('indexes: {}')) {
-      ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
-    } else {
-      ast = ast.replace('indexes: {', `indexes: {\n    ${code}`);
-    }
-    // ok
-    return ast;
+    const table = await cli.template.renderContent({ content: __snippet_table });
+    return mergeMetaIndex(ast, table, 'name');
   },
 });

package/cli/templates/tools/crudStart/snippets/2-meta.index.ts

@@ -1,4 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
+import { mergeMetaIndex } from 'vona-cli-set-api/mergeMetaIndex';
 import { catchError } from '@cabloy/utils';
 import fs from 'node:fs';
 
@@ -9,7 +10,7 @@ declare module '@cabloy/cli' {
 }
 
 const __snippet_import1 = "import { $tableColumns } from 'vona-module-a-ormutils';";
-const __snippet_update = "...$tableColumns('<%=argv.moduleResourceName%>', 'name'),";
+const __snippet_table = '<%=argv.moduleResourceName%>';
 
 export default metadataCustomSnippet({
   file: 'src/bean/meta.index.ts',
@@ -35,14 +36,7 @@ export default metadataCustomSnippet({
         `import { Meta } from 'vona-module-a-meta';\n${code}`,
       );
     }
-    // update
-    const code = await cli.template.renderContent({ content: __snippet_update });
-    if (ast.includes('indexes: {}')) {
-      ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
-    } else {
-      ast = ast.replace('indexes: {', `indexes: {\n    ${code}`);
-    }
-    // ok
-    return ast;
+    const table = await cli.template.renderContent({ content: __snippet_table });
+    return mergeMetaIndex(ast, table, 'name');
   },
 });

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './lib/beans.ts';
 export * from './lib/commands.ts';
 export * from './lib/utils.ts';
+export { mergeMetaIndex } from './lib/mergeMetaIndex.ts';

package/dist/index.js

@@ -25,6 +25,7 @@ import { catchError, combineApiPathControllerAndActionRaw, replaceTemplate } fro
 import { getOnionScenesMeta, getOnionMetasMeta, relativeNameToCapitalize } from '@cabloy/module-info';
 import { toUpperCaseFirstChar, stringToCapitalize, replaceTemplate as replaceTemplate$1 } from '@cabloy/word-utils';
 import fs from 'node:fs';
+import gogocode from 'gogocode';
 import { beanFullNameFromOnionName } from 'vona-core';
 
 function getEnvMeta(configMeta) {
@@ -2018,6 +2019,120 @@ class CliToolsDeps extends BeanCliBase {
   }
 }
 
+function propertyName(node) {
+  if (node.computed) return;
+  if (node.key?.type === 'Identifier') return node.key.name;
+  if (node.key?.type === 'StringLiteral') return node.key.value;
+}
+function literalValue(node) {
+  return node?.type === 'StringLiteral' ? node.value : undefined;
+}
+function indexObject(source) {
+  const file = gogocode(source, {
+    parseOptions: {
+      sourceType: 'module',
+      plugins: ['typescript', 'decorators-legacy']
+    }
+  }).node;
+  const objects = [];
+  for (const statement of file.program.body) {
+    const declaration = statement.declaration ?? statement;
+    for (const decorator of declaration.decorators ?? []) {
+      const call = decorator.expression;
+      if (call.type !== 'CallExpression' || call.callee.name !== 'Meta') continue;
+      const options = call.arguments[0];
+      if (options?.type !== 'ObjectExpression') continue;
+      for (const property of options.properties) {
+        if (property.type === 'ObjectProperty' && propertyName(property) === 'indexes') {
+          if (property.value.type !== 'ObjectExpression') {
+            throw new Error('meta.index indexes must be an object literal');
+          }
+          objects.push(property.value);
+        }
+      }
+    }
+  }
+  if (objects.length !== 1) throw new Error('expected exactly one @Meta indexes object');
+  return objects[0];
+}
+function quote(value) {
+  return `'${value.replaceAll('\\', '\\\\').replaceAll("'", "\\'")}'`;
+}
+function mergeMetaIndex(source, tableName, field) {
+  const indexes = indexObject(source);
+  const declarations = [];
+  const fields = [];
+  for (const property of indexes.properties) {
+    if (property.type === 'ObjectProperty') {
+      const key = propertyName(property);
+      if (!key || key === tableName) {
+        throw new Error(`unsupported index property for ${tableName}`);
+      }
+      continue;
+    }
+    if (property.type !== 'SpreadElement') {
+      throw new Error(`unsupported index declaration for ${tableName}`);
+    }
+    const call = property.argument;
+    if (call.type !== 'CallExpression' || call.callee.name !== '$tableColumns') {
+      throw new Error(`unsupported index spread for ${tableName}`);
+    }
+    const name = literalValue(call.arguments[0]);
+    if (!name) throw new Error(`index table name must be a string literal: ${tableName}`);
+    if (name !== tableName) continue;
+    const value = call.arguments[1];
+    let values;
+    if (value?.type === 'StringLiteral') values = [value];else if (value?.type === 'ArrayExpression') values = value.elements;else throw new Error(`unsupported index fields for ${tableName}`);
+    for (const item of values) {
+      const text = literalValue(item);
+      if (text === undefined) throw new Error(`unsupported index fields for ${tableName}`);
+      for (const spec of text.split(',')) {
+        if (!fields.includes(spec)) fields.push(spec);
+      }
+    }
+    declarations.push(property);
+  }
+  if (!fields.includes(field)) fields.push(field);
+  if (declarations.length === 1) {
+    const value = declarations[0].argument.arguments[1];
+    if (value.type === 'StringLiteral' && fields.length === 1 && value.value === field) return source;
+    if (value.type === 'ArrayExpression') {
+      const values = value.elements.map(literalValue);
+      if (values.length === fields.length && values.every((item, index) => item === fields[index])) {
+        return source;
+      }
+    }
+  }
+  const columns = fields.length === 1 ? quote(fields[0]) : `[${fields.map(quote).join(', ')}]`;
+  const declaration = `...$tableColumns(${quote(tableName)}, ${columns})`;
+  if (!declarations.length) {
+    const content = source.slice(indexes.start + 1, indexes.end - 1);
+    if (content.trim() && !content.trimEnd().endsWith(',')) {
+      throw new Error(`indexes object must use trailing commas before adding ${tableName}`);
+    }
+    return `${source.slice(0, indexes.start + 1)}\n    ${declaration},${source.slice(indexes.start + 1)}`;
+  }
+  const patches = declarations.map((item, index) => {
+    if (!index) return {
+      start: item.start,
+      end: item.end,
+      text: declaration
+    };
+    let end = item.end;
+    while (/\s/.test(source[end]) && end < indexes.end) end++;
+    if (source[end] === ',') end++;
+    return {
+      start: item.start,
+      end,
+      text: ''
+    };
+  });
+  for (const patch of patches.reverse()) {
+    source = `${source.slice(0, patch.start)}${patch.text}${source.slice(patch.end)}`;
+  }
+  return source;
+}
+
 class CliToolsMasterDetail extends BeanCliBase {
   async execute() {
     await super.execute();
@@ -2153,13 +2268,11 @@ class CliToolsMasterDetail extends BeanCliBase {
     const {
       argv
     } = this.context;
-    await this._patchFileByMarker({
-      fileName: this._detailPaths().metaIndex,
-      existsNeedle: `'${argv.fk}'`,
-      marker: '  indexes: {\n',
-      line: this._detailMetaIndexLine(),
-      shapeName: 'detail meta.index'
-    });
+    const fileName = this._detailPaths().metaIndex;
+    const content = this._readFile(fileName);
+    const table = this.helper.combineModuleNameAndResource(argv.detailModuleInfo.relativeName, argv.detailResourceName);
+    const updated = mergeMetaIndex(content, table, argv.fk);
+    if (updated !== content) await this._saveFile(fileName, updated);
   }
   _detailMetaVersionLine() {
     const {
@@ -2167,12 +2280,6 @@ class CliToolsMasterDetail extends BeanCliBase {
     } = this.context;
     return `        table.tableIdentity(entity${argv.detailResourceNameCapitalize}.${argv.fk}).comment(entity${argv.detailResourceNameCapitalize}.$comment.${argv.fk});\n`;
   }
-  _detailMetaIndexLine() {
-    const {
-      argv
-    } = this.context;
-    return `    ...$tableColumns('${this.helper.combineModuleNameAndResource(argv.detailModuleInfo.relativeName, argv.detailResourceName)}', '${argv.fk}'),\n`;
-  }
   async _patchFileByMarker({
     fileName,
     existsNeedle,
@@ -3994,4 +4101,4 @@ const commands = {
   }
 };
 
-export { beans, commands, copyTemplateFile, copyTemplateIfNeed, generateConfigDefine, getAbsolutePathOfModule, getEnvMeta, getImportEsm, getNodeEnv, getOutDir, getOutReleasesDir, loadJSONFile, pathToHref, requireModule, saveJSONFile };
+export { beans, commands, copyTemplateFile, copyTemplateIfNeed, generateConfigDefine, getAbsolutePathOfModule, getEnvMeta, getImportEsm, getNodeEnv, getOutDir, getOutReleasesDir, loadJSONFile, mergeMetaIndex, pathToHref, requireModule, saveJSONFile };

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

@@ -44,7 +44,6 @@ export declare class CliToolsMasterDetail extends BeanCliBase {
     private _patchDetailMetaVersion;
     private _patchDetailMetaIndex;
     private _detailMetaVersionLine;
-    private _detailMetaIndexLine;
     private _patchFileByMarker;
     private _patchFileContent;
     private _renderMasterDetailDtos;

package/dist/lib/mergeMetaIndex.d.ts

@@ -0,0 +1 @@
+export declare function mergeMetaIndex(source: string, tableName: string, field: string): string;

package/dist-cli/templates/tools/crudBasic/snippets/2-meta.index.js

@@ -1,8 +1,9 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
+import { mergeMetaIndex } from 'vona-cli-set-api/mergeMetaIndex';
 import { catchError } from '@cabloy/utils';
 import fs from 'node:fs';
 const __snippet_import1 = "import { $tableColumns } from 'vona-module-a-ormutils';";
-const __snippet_update = "...$tableColumns('<%=argv.moduleResourceName%>', 'name'),";
+const __snippet_table = '<%=argv.moduleResourceName%>';
 export default metadataCustomSnippet({
     file: 'src/bean/meta.index.ts',
     language: 'plain',
@@ -21,15 +22,7 @@ export default metadataCustomSnippet({
             const code = await cli.template.renderContent({ content: __snippet_import1 });
             ast = ast.replace("import { Meta } from 'vona-module-a-meta';", `import { Meta } from 'vona-module-a-meta';\n${code}`);
         }
-        // update
-        const code = await cli.template.renderContent({ content: __snippet_update });
-        if (ast.includes('indexes: {}')) {
-            ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
-        }
-        else {
-            ast = ast.replace('indexes: {', `indexes: {\n    ${code}`);
-        }
-        // ok
-        return ast;
+        const table = await cli.template.renderContent({ content: __snippet_table });
+        return mergeMetaIndex(ast, table, 'name');
     },
 });

package/dist-cli/templates/tools/crudStart/snippets/2-meta.index.js

@@ -1,8 +1,9 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
+import { mergeMetaIndex } from 'vona-cli-set-api/mergeMetaIndex';
 import { catchError } from '@cabloy/utils';
 import fs from 'node:fs';
 const __snippet_import1 = "import { $tableColumns } from 'vona-module-a-ormutils';";
-const __snippet_update = "...$tableColumns('<%=argv.moduleResourceName%>', 'name'),";
+const __snippet_table = '<%=argv.moduleResourceName%>';
 export default metadataCustomSnippet({
     file: 'src/bean/meta.index.ts',
     language: 'plain',
@@ -21,15 +22,7 @@ export default metadataCustomSnippet({
             const code = await cli.template.renderContent({ content: __snippet_import1 });
             ast = ast.replace("import { Meta } from 'vona-module-a-meta';", `import { Meta } from 'vona-module-a-meta';\n${code}`);
         }
-        // update
-        const code = await cli.template.renderContent({ content: __snippet_update });
-        if (ast.includes('indexes: {}')) {
-            ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
-        }
-        else {
-            ast = ast.replace('indexes: {', `indexes: {\n    ${code}`);
-        }
-        // ok
-        return ast;
+        const table = await cli.template.renderContent({ content: __snippet_table });
+        return mergeMetaIndex(ast, table, 'name');
     },
 });

package/dist-toolsIsolate/test.js

@@ -95,8 +95,8 @@ async function testRun(projectPath, coverage, patterns) {
             .on('test:coverage', data => {
             outputCoverageReport(data.summary.totals);
         })
-            .on('test:pass', t => {
-            if (t.name === '---done---') {
+            .on('test:pass', data => {
+            if (data.nesting === 0 && data.name === '---done---') {
                 void closeApplicationOnce();
             }
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.153",
-  "gitHead": "272f1bbefa6675ed28740dc7c5ce842151efaf33",
+  "version": "1.1.155",
+  "gitHead": "8d575dd958be6aa16daa249bdbdb024d20d0789d",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",
@@ -25,6 +25,10 @@
       ],
       "default": "./dist/index.js"
     },
+    "./mergeMetaIndex": {
+      "types": "./dist/lib/mergeMetaIndex.d.ts",
+      "default": "./dist/index.js"
+    },
     "./package.json": "./package.json"
   },
   "publishConfig": {
@@ -73,7 +77,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.9.0",
     "uuid": "^11.1.0",
-    "vona-core": "^5.1.41",
+    "vona-core": "^5.1.42",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   }