cabloy 5.1.225 → 5.1.227

package/vona/src/suite-vendor/a-vona/modules/a-security/test/origin.test.ts

@@ -177,6 +177,7 @@ async function withWhiteList(whiteList: string | string[], fn: () => Promise<voi
   await app.bean.executor.mockCtx(async () => {
     const options =
       app.bean.onion.middlewareSystem.getOnionSlice('a-security:cors').beanOptions.options;
+    assert.ok(options);
     const whiteListPrevious = options.whiteList;
     options.whiteList = Array.isArray(whiteList) ? [...whiteList] : whiteList;
     try {

package/vona/src/suite-vendor/a-vona/modules/a-web/cli/controller/metadata/generate.ts

@@ -1,10 +1,11 @@
+import type { types as t } from '@babel/core';
 import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
 
 import { combineApiPathControllerAndActionRaw } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 
 export default async function (options: IMetadataCustomGenerateOptions): Promise<string> {
-  const { sceneName, moduleName, globFiles } = options;
+  const { sceneName, moduleName, globFiles, cli } = options;
   const contentResources: string[] = [];
   const contentImports: string[] = [];
   const contentActions: string[] = [];
@@ -22,11 +23,25 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
     export interface ${opionsName} {
       actions?: TypeControllerOptionsActions<${className}>;
     }`);
+    const file = cli.helper.gogocode(fileContent, {
+      parseOptions: { sourceType: 'module', plugins: ['typescript', 'decorators-legacy'] },
+    }).node as t.File;
+    const declaration = file.program.body
+      .map(statement =>
+        statement.type === 'ExportNamedDeclaration' || statement.type === 'ExportDefaultDeclaration'
+          ? statement.declaration
+          : statement,
+      )
+      .find(
+        (node): node is t.ClassDeclaration =>
+          node?.type === 'ClassDeclaration' && node.id?.name === className,
+      );
+    if (!declaration) continue;
     // controllerPath
-    const controllerPath = __parseControllerPath(fileContent);
+    const controllerPath = __parseControllerPath(declaration);
     if (controllerPath === false) continue;
     // actionPath;
-    const actionPaths = __parseActionPaths(fileContent);
+    const actionPaths = __parseActionPaths(declaration);
     for (const [method, actionPath] of actionPaths) {
       if (!contentPaths[method]) contentPaths[method] = [];
       const apiPath = __combineApiPath(moduleName, controllerPath, actionPath);
@@ -81,36 +96,65 @@ ${contentResources2}
   return content;
 }
 
-function __parseControllerPath(fileContent: string): string | false {
-  let matched = fileContent.match(
-    /@Controller<.*?>\(\{[\s\S]*?path: ('[^']*')[\s\S]*?\}[\s\S]*?\)\s*export class/,
-  );
-  if (!matched) {
-    matched = fileContent.match(/@Controller<.*?>\(([^)]*)\)/);
+function __parseControllerPath(declaration: t.ClassDeclaration): string | false {
+  for (const decorator of declaration.decorators ?? []) {
+    const call = decorator.expression;
+    if (
+      call.type !== 'CallExpression' ||
+      call.callee.type !== 'Identifier' ||
+      call.callee.name !== 'Controller'
+    ) {
+      continue;
+    }
+    const argument = call.arguments[0];
+    if (!argument) return '';
+    if (argument.type === 'StringLiteral') return argument.value;
+    if (argument.type !== 'ObjectExpression') return false;
+    // Read the last explicit path; a later spread/computed key makes it dynamic.
+    for (const property of argument.properties.toReversed()) {
+      if (property.type === 'SpreadElement' || property.computed) return false;
+      const key = property.key;
+      if (
+        (key.type === 'Identifier' && key.name === 'path') ||
+        (key.type === 'StringLiteral' && key.value === 'path')
+      ) {
+        return property.type === 'ObjectProperty' && property.value.type === 'StringLiteral'
+          ? property.value.value
+          : false;
+      }
+    }
+    return '';
   }
-  if (!matched) return false;
-  const controllerPath = matched[1];
-  if (controllerPath === '') return '';
-  return controllerPath.split(',')[0].replaceAll("'", '');
+  return false;
 }
 
-function __parseActionPaths(fileContent: string): [string, string][] {
+function __parseActionPaths(declaration: t.ClassDeclaration): [string, string][] {
   const actionPaths: [string, string][] = [];
-  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);
+  for (const member of declaration.body.body) {
+    if (member.type !== 'ClassMethod') continue;
+    for (const decorator of member.decorators ?? []) {
+      const call = decorator.expression;
+      if (call.type !== 'CallExpression') continue;
+      const callee = call.callee;
+      if (
+        callee.type !== 'MemberExpression' ||
+        callee.computed ||
+        callee.object.type !== 'Identifier' ||
+        callee.object.name !== 'Web' ||
+        callee.property.type !== 'Identifier' ||
+        !['get', 'post', 'delete', 'put', 'patch'].includes(callee.property.name)
+      ) {
+        continue;
+      }
+      const argument = call.arguments[0];
+      // Options-only and no-argument decorators map to the root action route.
+      // RegExp and other dynamic expressions cannot supply static route metadata.
+      if (!argument || argument.type === 'ObjectExpression') {
+        actionPaths.push([toUpperCaseFirstChar(callee.property.name), '']);
+      } else if (argument.type === 'StringLiteral') {
+        actionPaths.push([toUpperCaseFirstChar(callee.property.name), argument.value]);
+      }
     }
-    const method = toUpperCaseFirstChar(matches2[1].substring(4));
-    actionPaths.push([method, actionPath]);
   }
   return actionPaths;
 }

package/vona/src/suite-vendor/a-vona/modules/a-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-web",
-  "version": "5.1.23",
+  "version": "5.1.24",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-web/test/controllerMetadataParser.test.ts

@@ -0,0 +1,156 @@
+import gogocode from 'gogocode';
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+
+import generate from '../cli/controller/metadata/generate.ts';
+
+async function routes(controller: string, methods: string, extra = '') {
+  const content = await generate({
+    cli: { helper: { gogocode } },
+    sceneName: 'controller',
+    moduleName: 'test-parser',
+    globFiles: [
+      {
+        className: 'ControllerExample',
+        beanName: 'example',
+        fileNameJSRelative: '../controller/example.ts',
+        fileContent: `${extra}
+${controller}
+export class ControllerExample extends BeanBase {
+${methods}
+}`,
+      },
+    ],
+  } as never);
+  return Object.fromEntries(
+    Array.from(content.matchAll(/export interface IApiPath(\w+)Record\{([\s\S]*?)\}/g), match => [
+      match[1],
+      Array.from(match[2].matchAll(/'([^']+)': undefined;/g), entry => entry[1]),
+    ]),
+  );
+}
+
+test('options-only Web get/post decorators produce root action routes', async () => {
+  assert.deepEqual(
+    await routes(
+      "@Controller<IControllerOptions>('trainingRecord')",
+      `@Web.get({ summary: 'List records (current)', meta: { label: makeLabel('list') } })
+      async list() {}
+      @Web.post({ summary: 'Create record', meta: { nested: { enabled: true } } })
+      async create() {}`,
+    ),
+    {
+      Get: ['/test/parser/trainingRecord'],
+      Post: ['/test/parser/trainingRecord'],
+    },
+  );
+});
+
+test('object Controller path survives nested metadata and following Api.exclude', async () => {
+  for (const typeArguments of ['', '<IControllerOptions>']) {
+    assert.deepEqual(
+      await routes(
+        `@Controller${typeArguments}({
+          meta: { path: 'notTheControllerPath', guard: makeGuard({ enabled: true }) },
+          path: 'passportTest',
+        })
+        @Api.exclude()`,
+        `@Web.get({ summary: 'Passport test (root)' })
+        async read() {}
+        @Web.post('login', { summary: 'Login' })
+        async login() {}`,
+      ),
+      {
+        Get: ['/test/parser/passportTest'],
+        Post: ['/test/parser/passportTest/login'],
+      },
+    );
+  }
+});
+
+test('string paths and all existing action verbs remain supported', async () => {
+  assert.deepEqual(
+    await routes(
+      '@Controller<IControllerOptions>("records", { meta: { nested: true } })',
+      `@Web.get('items/:id', { summary: 'Read (one)' })
+      read() {}
+      @Web.post( 'items' )
+      create() {}
+      @Web.put("items/:id")
+      replace() {}
+      @Web.patch('/absolute/:id')
+      update() {}
+      @Web.delete('//external/:id')
+      remove() {}`,
+    ),
+    {
+      Get: ['/test/parser/records/items/:id'],
+      Post: ['/test/parser/records/items'],
+      Put: ['/test/parser/records/items/:id'],
+      Patch: ['/absolute/:id'],
+      Delete: ['//external/:id'],
+    },
+  );
+});
+
+test('no-path Controller and Web decorators preserve root routes', async () => {
+  for (const controller of [
+    '@Controller()',
+    '@Controller<IControllerOptions>()',
+    "@Controller({ meta: { path: 'nestedOnly' } })",
+    "@Controller<IControllerOptions>({ meta: { path: 'nestedOnly' } })",
+    "@Controller('')",
+  ]) {
+    assert.deepEqual(
+      await routes(controller, '@Web.get()\nread() {}\n@Web.post()\ncreate() {}'),
+      { Get: ['/test/parser'], Post: ['/test/parser'] },
+      controller,
+    );
+  }
+});
+
+test('RegExp and dynamic action routes stay excluded, without evaluating expressions', async () => {
+  assert.deepEqual(
+    await routes(
+      "@Controller('records')",
+      `@Web.get(/items\\/(.*)/)
+      regex() {}
+      @Web.post(new RegExp('items'))
+      regexConstructor() {}
+      @Web.put(dynamicPath)
+      identifier() {}
+      @Web.patch(resolvePath())
+      expression() {}
+      @Web.delete(\`items/\${id}\`)
+      template() {}
+      @Web.get('kept')
+      kept() {}`,
+    ),
+    { Get: ['/test/parser/records/kept'] },
+  );
+  for (const controller of [
+    '@Controller(dynamicPath)',
+    '@Controller({ path: resolvePath() })',
+    '@Controller({ path: /items/ })',
+    "@Controller({ path: 'records', ...dynamicOptions })",
+  ]) {
+    assert.deepEqual(await routes(controller, '@Web.get()\nread() {}'), {}, controller);
+  }
+});
+
+test('only real decorators on the owning controller contribute routes', async () => {
+  assert.deepEqual(
+    await routes(
+      "@Controller({ 'path': 'records' })",
+      `// @Web.get('comment')
+      @Web.get('kept')
+      kept() { return "@Web.post('string')"; }`,
+      `@Controller('unrelated')
+      class ControllerOther {
+        @Web.get('other')
+        other() {}
+      }`,
+    ),
+    { Get: ['/test/parser/records/kept'] },
+  );
+});

package/vona/src/suite-vendor/a-vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.105",
+  "version": "5.1.107",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/tsconfig.json

@@ -1,41 +1,25 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
+    "composite": false,
+    "declaration": false,
+    "declarationMap": false,
     "noEmit": true
   },
-  "references": [
-    {
-      "path": "packages-utils/compose"
-    },
-    {
-      "path": "packages-utils/deps"
-    },
-    {
-      "path": "packages-utils/json5"
-    },
-    {
-      "path": "packages-utils/localeutil"
-    },
-    {
-      "path": "packages-vona/vona-shared"
-    },
-    {
-      "path": "packages-vona/vona-core"
-    },
-    {
-      "path": "packages-vona/vona"
-    },
-    {
-      "path": "packages-vona/vona-mock"
-    }
-  ],
-  "include": [
-    ".vona/**/*.ts",
-    ".vona-test-*/**/*.ts",
-    "src/backend/package.json",
-    "src/backend/config",
-    "src/backend/play",
-    "src/backend/typing"
-  ],
-  "exclude": []
+  "exclude": [
+    "**/cli/**",
+    "**/dist/**",
+    "./dist",
+    "./dist-releases",
+    "./coverage",
+    "./.app",
+    "./.app-test-*",
+    "./.vona",
+    "./.vona-test-*",
+    "./.zova-rest",
+    "./node_modules",
+    "./packages-cli",
+    "./packages-utils",
+    "./packages-vona"
+  ]
 }

package/zova/oxlint.config.ts

@@ -1,7 +1,9 @@
 import { oxcLintConfigVue } from '@cabloy/lint';
 import { defineConfig } from 'oxlint';
 
-export default defineConfig(
+import { resolveOxlintPlugins } from '../scripts/oxlintPlugins.ts';
+
+const config = defineConfig(
   oxcLintConfigVue({
     ignorePatterns: [
       '**/node_modules',
@@ -60,3 +62,5 @@ export default defineConfig(
     ],
   }),
 );
+
+export default resolveOxlintPlugins(config);

package/zova/package.original.json

@@ -23,10 +23,10 @@
     "dev:spa": "npm run prerun && quasar dev --mode spa --flavor admin",
     "build:spa": "npm run prerun && quasar build --mode spa --flavor admin",
     "preview:spa": "vite preview --outDir=dist/spa-admin",
-    "prerun": "npm run zova :tools:deps && npm run tsc",
-    "tsc": "tsc --noEmit --project tsconfig.vue-tsc.json",
-    "tsc:native": "node ../scripts/typecheck.ts native zova --noEmit --incremental false --project tsconfig.vue-tsc.json",
-    "tsc:legacy": "node ../scripts/typecheck.ts typescript zova --noEmit --incremental false --project tsconfig.vue-tsc.json",
+    "prerun": "npm run zova :tools:deps",
+    "tsc": "npm run tsc:native",
+    "tsc:native": "npm run prerun && node ../scripts/typecheck.ts native zova --noEmit --incremental false --project tsconfig.vue-tsc.json",
+    "tsc:legacy": "npm run prerun && node ../scripts/typecheck.ts typescript zova --noEmit --incremental false --project tsconfig.vue-tsc.json",
     "format": "oxfmt --check",
     "format:fix": "oxfmt --write",
     "lint": "oxlint",
@@ -93,8 +93,8 @@
     "textlint-rule-ja-no-mixed-period": "^3.0.2",
     "textlint-rule-ja-space-between-half-and-full-width": "^2.4.2",
     "textlint-rule-period-in-list-item": "^1.0.1",
-    "oxfmt": "^0.62.0",
-    "oxlint": "^1.77.0"
+    "oxfmt": "^0.74.0",
+    "oxlint": "^1.89.0"
   },
   "engines": {
     "node": ">=24.4.0",

package/zova/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.118",
+  "version": "1.2.120",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -40,11 +40,11 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/cli": "^3.1.30",
+    "@cabloy/cli": "^3.1.31",
     "@cabloy/process-helper": "^3.1.9",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.116"
+    "zova-cli-set-front": "^1.2.118"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.116",
+  "version": "1.2.118",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -41,7 +41,7 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/cli": "^3.1.30",
+    "@cabloy/cli": "^3.1.31",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/module-info": "^2.0.3",
     "@cabloy/openapi-typescript": "^7.9.2",
@@ -49,7 +49,7 @@
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",
     "@cabloy/word-utils": "^2.1.14",
-    "@typescript/native-preview": "^7.0.0-dev.20260320.1",
+    "@typescript/native-preview": "npm:typescript@7.0.2",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "babel-plugin-transform-typescript-metadata": "^0.4.0",
     "babel-plugin-zova-bean-module": "^1.2.15",
@@ -70,7 +70,7 @@
     "vite": "^8.3.4",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.49"
+    "zova-vite": "^1.1.50"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-utils/zova-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-vite",
-  "version": "1.1.49",
+  "version": "1.1.50",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "zova vite",
   "keywords": [
@@ -42,7 +42,7 @@
     "@babel/plugin-transform-typescript": "^7.28.6",
     "@cabloy/dotenv": "^1.2.9",
     "@cabloy/extend": "^3.2.8",
-    "@cabloy/module-glob": "^5.3.18",
+    "@cabloy/module-glob": "^5.3.19",
     "@cabloy/module-info": "^2.0.3",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.173",
+  "version": "5.1.174",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.93",
-    "zova-suite-a-zova": "^5.1.172"
+    "zova-suite-a-zova": "^5.1.173"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",