vona-module-a-web 5.0.33 → 5.0.34

package/dist-cli/controller/metadata/generate.d.ts

@@ -0,0 +1,2 @@
+import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
+export default function (options: IMetadataCustomGenerateOptions): Promise<string>;

package/dist-cli/controller/metadata/generate.js

@@ -0,0 +1,101 @@
+import { combineApiPathControllerAndActionRaw } from '@cabloy/utils';
+import { toUpperCaseFirstChar } from '@cabloy/word-utils';
+export default async function (options) {
+    const { sceneName, moduleName, globFiles } = options;
+    const contentImports = [];
+    const contentActions = [];
+    const contentPaths = {};
+    for (const globFile of globFiles) {
+        const { className, beanName, fileNameJSRelative, fileContent } = globFile;
+        const opionsName = `IControllerOptions${toUpperCaseFirstChar(beanName)}`;
+        contentImports.push(`// @ts-ignore ignore\nimport type { ${className} } from '${fileNameJSRelative}';`);
+        contentActions.push(`
+    export interface ${opionsName} {
+      actions?: TypeControllerOptionsActions<${className}>;
+    }`);
+        // controllerPath
+        const controllerPath = __parseControllerPath(fileContent);
+        if (controllerPath === false)
+            continue;
+        // actionPath;
+        const actionPaths = __parseActionPaths(fileContent);
+        for (const [method, actionPath] of actionPaths) {
+            if (!contentPaths[method])
+                contentPaths[method] = [];
+            const apiPath = __combineApiPath(moduleName, controllerPath, actionPath);
+            if (!apiPath.includes(':')) {
+                contentPaths[method].push(`'${apiPath}': undefined;`);
+            }
+            else {
+                // const apiPath1 = apiPath.replace(/(:[^/]+)/g, (_, _part) => {
+                //   return ':_string_';
+                // });
+                // const apiPath2 = apiPath.replace(/(\/:[^/]+)/g, (_, part) => {
+                //   return `:{${part.substring(2)}}`;
+                // });
+                // const apiPath3 = apiPath.replace(/(:[^/]+)/g, (_, _part) => {
+                //   return '${string}';
+                // });
+                // contentPaths[method].push(`'${apiPath1}': '${apiPath2}'`);
+                contentPaths[method].push(`'${apiPath}': undefined;`);
+            }
+        }
+    }
+    let contentRecord = '';
+    for (const method in contentPaths) {
+        contentRecord += `export interface IApiPath${method}Record{
+        ${contentPaths[method].join('\n')}
+    }\n`;
+    }
+    const contentRecord2 = contentRecord
+        ? `declare module 'vona-module-a-web' {
+  ${contentRecord}
+}`
+        : '';
+    // combine
+    const content = `/** ${sceneName}: begin */
+${contentImports.join('\n')}
+declare module 'vona-module-${moduleName}' {
+  ${contentActions.join('\n')}
+}
+${contentRecord2}
+/** ${sceneName}: end */
+`;
+    return content;
+}
+function __parseControllerPath(fileContent) {
+    let matched = fileContent.match(/@Controller<.*?>\(\{[\s\S]*?path: ('[^']*')[\s\S]*?\}[\s\S]*?\)\s*export class/);
+    if (!matched) {
+        matched = fileContent.match(/@Controller<.*?>\(([^)]*)\)/);
+    }
+    if (!matched)
+        return false;
+    const controllerPath = matched[1];
+    if (controllerPath === '')
+        return '';
+    return controllerPath.split(',')[0].replaceAll("'", '');
+}
+function __parseActionPaths(fileContent) {
+    const actionPaths = [];
+    const matches = fileContent.match(/(@Web\.get|@Web\.post|@Web\.delete|@Web\.put|@Web\.patch)\([\s\S]*?\)/g);
+    if (!matches)
+        return [];
+    for (const match of matches) {
+        const matches2 = match.match(/@([^(]*)\(([\s\S]*?)\)/);
+        if (!matches2)
+            throw new Error('parse action path error');
+        let actionPath = matches2[2];
+        if (actionPath !== '' && !actionPath.startsWith("'"))
+            continue; // exclude regexp
+        if (actionPath.startsWith("'")) {
+            const pos = actionPath.indexOf("'", 1);
+            actionPath = actionPath.substring(1, pos);
+        }
+        const method = toUpperCaseFirstChar(matches2[1].substring(4));
+        actionPaths.push([method, actionPath]);
+    }
+    return actionPaths;
+}
+function __combineApiPath(moduleName, controllerPath, actionPath) {
+    return combineApiPathControllerAndActionRaw(moduleName, controllerPath, actionPath, true);
+}

package/dist-cli/dto/metadata/generate.d.ts

@@ -0,0 +1,2 @@
+import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
+export default function (options: IMetadataCustomGenerateOptions): Promise<string>;

package/dist-cli/dto/metadata/generate.js

@@ -0,0 +1,26 @@
+import { toUpperCaseFirstChar } from '@cabloy/word-utils';
+export default async function (options) {
+    const { sceneName, moduleName, globFiles } = options;
+    const contentImports = [];
+    const contentFields = [];
+    for (const globFile of globFiles) {
+        const { className, beanName, fileNameJSRelative } = globFile;
+        const opionsName = `IDtoOptions${toUpperCaseFirstChar(beanName)}`;
+        contentImports.push(`import type { ${className} } from '${fileNameJSRelative}';`);
+        contentFields.push(`
+    export interface ${opionsName} {
+      fields?: TypeEntityOptionsFields<${className}, ${opionsName}[TypeSymbolKeyFieldsMore]>;
+    }`);
+    }
+    if (contentFields.length === 0)
+        return '';
+    // combine
+    const content = `/** ${sceneName}: begin */
+${contentImports.join('\n')} 
+declare module 'vona-module-${moduleName}' {
+  ${contentFields.join('\n')}
+}
+/** ${sceneName}: end */
+`;
+    return content;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-web",
   "type": "module",
-  "version": "5.0.33",
+  "version": "5.0.34",
   "title": "a-web",
   "vonaModule": {
     "capabilities": {
@@ -13,20 +13,20 @@
         "sceneIsolate": true,
         "optionsGlobalInterfaceName": "IDecoratorDtoOptions",
         "optionsGlobalInterfaceFrom": "vona-module-a-web",
-        "boilerplate": "cli/dto/boilerplate",
-        "metadataCustom": "cli/dto/metadata/generate.ts"
+        "boilerplate": "dto/boilerplate",
+        "metadataCustom": "dto/metadata/generate.ts"
       },
       "controller": {
         "sceneIsolate": true,
         "optionsGlobalInterfaceName": "IDecoratorControllerOptions",
         "optionsGlobalInterfaceFrom": "vona-module-a-web",
-        "boilerplate": "cli/controller/boilerplate",
-        "metadataCustom": "cli/controller/metadata/generate.ts"
+        "boilerplate": "controller/boilerplate",
+        "metadataCustom": "controller/metadata/generate.ts"
       },
       "filterTransform": {
         "optionsGlobalInterfaceName": "IDecoratorFilterTransformOptions",
         "optionsGlobalInterfaceFrom": "vona-module-a-web",
-        "boilerplate": "cli/filterTransform/boilerplate"
+        "boilerplate": "filterTransform/boilerplate"
       }
     }
   },
@@ -48,7 +48,8 @@
   "files": [
     "assets",
     "cli",
-    "dist"
+    "dist",
+    "dist-cli"
   ],
   "dependencies": {
     "find-my-way": "^9.2.0"
@@ -58,7 +59,7 @@
     "rimraf": "^6.0.1"
   },
   "scripts": {
-    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json"
+    "clean": "rimraf dist dist-cli tsconfig.build.tsbuildinfo tsconfig.cli.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json && tsc -p tsconfig.cli.json"
   }
 }