cabloy 5.1.248 → 5.1.250

package/vona/src/suite-vendor/a-vona/modules/a-web/src/lib/analysisFilter.ts

@@ -0,0 +1,69 @@
+import type { Constructable } from 'vona';
+import type { ISchemaObjectExtensionField } from 'vona-module-a-openapi';
+import type { IAnalysisPolicy, TypeAnalysisMode } from 'vona-module-a-orm';
+import type z from 'zod';
+
+import { ZodMetadata } from '@cabloy/zod-openapi';
+import { appResource } from 'vona';
+import { $schema } from 'vona-module-a-openapiutils';
+import { analysisCapabilities, analysisControlSchemas } from 'vona-module-a-orm';
+
+import type { IDecoratorDtoOptions } from '../types/dto.ts';
+
+export interface IArgFilterOptions {
+  mode?: TypeAnalysisMode;
+}
+
+export function prepareAnalysisFilter(
+  schemaLike: z.ZodType | Constructable,
+  options?: IArgFilterOptions,
+) {
+  const schema = $schema(schemaLike as Constructable);
+  if (!options?.mode) return { schema };
+  const policy = (
+    appResource.getBean(schemaLike as Constructable)?.options as IDecoratorDtoOptions | undefined
+  )?.analysis;
+  if (!policy) throw new Error('Analysis filter requires a DTO analysis policy');
+  return {
+    schema: createAnalysisFilterSchema(schema, policy, options.mode),
+    analysis: policy,
+    analysisMode: options.mode,
+  };
+}
+
+function createAnalysisFilterSchema(
+  schema: z.ZodType,
+  policy: IAnalysisPolicy,
+  mode: TypeAnalysisMode,
+) {
+  const inner = ZodMetadata.unwrapChained(schema);
+  if (inner.type !== 'object') throw new Error('Analysis filter requires an object DTO schema');
+  const object = schema as z.ZodObject;
+  if (typeof object.safeExtend !== 'function') {
+    throw new TypeError('Analysis filter requires an extensible object DTO schema');
+  }
+  for (const key of ['groups', 'aggrs', 'having', 'joins', 'distinct']) {
+    if (key in object.shape) throw new Error(`Analysis control conflicts with DTO field: ${key}`);
+  }
+  const controls = analysisControlSchemas(policy, mode);
+  const capabilities = analysisCapabilities(policy, mode);
+  const metadata: ISchemaObjectExtensionField = {
+    filter: { capabilities: { analysis: capabilities } },
+  };
+  const shape: Record<string, z.ZodType> = {
+    aggrs: controls.aggrs.openapi(metadata),
+  };
+  if (controls.groups) shape.groups = controls.groups.openapi(metadata);
+  const derived = object.safeExtend(shape);
+  const original = ZodMetadata.getOpenapiMetadata(schema) as
+    | ISchemaObjectExtensionField
+    | undefined;
+  const ref = ZodMetadata.getRefId(schema);
+  return derived.openapi(`${ref ?? 'filter'}_${mode}`, {
+    ...original,
+    filter: {
+      ...original?.filter,
+      capabilities: { ...original?.filter?.capabilities, analysis: capabilities },
+    },
+  });
+}

package/vona/src/suite-vendor/a-vona/modules/a-web/src/lib/decorator/arguments.ts

@@ -3,8 +3,10 @@ import type { SchemaLike } from 'vona-module-a-openapiutils';
 import type z from 'zod';
 
 import { setArgumentPipe } from 'vona-module-a-aspect';
-import { $schema } from 'vona-module-a-openapiutils';
 
+import type { IArgFilterOptions } from '../analysisFilter.ts';
+
+import { prepareAnalysisFilter } from '../analysisFilter.ts';
 import { createPipesArgumentDecorator } from './pipesArgument.ts';
 
 function Param(): ParameterDecorator;
@@ -71,10 +73,10 @@ function RbacScopeCurrent(): ParameterDecorator {
   return createPipesArgumentDecorator('rbacScopeCurrent')();
 }
 
-function ArgFilter(schemaLike: z.ZodType | Constructable): any {
+function ArgFilter(schemaLike: z.ZodType | Constructable, options?: IArgFilterOptions): any {
   return function (target: object, prop: MetadataKey | undefined, index: number) {
-    const schema = $schema(schemaLike as any);
-    setArgumentPipe('a-web:filter', { type: 'query', schema }, target, prop, index);
+    const prepared = prepareAnalysisFilter(schemaLike, options);
+    setArgumentPipe('a-web:filter', { type: 'query', ...prepared }, target, prop, index);
   };
 }
 

package/vona/src/suite-vendor/a-vona/modules/a-web/src/lib/index.ts

@@ -1,3 +1,4 @@
+export * from './analysisFilter.ts';
 export * from './const.ts';
 export * from './decorator/index.ts';
 export * from './middleware/index.ts';

package/vona/src/suite-vendor/a-vona/modules/a-web/src/types/dto.ts

@@ -2,7 +2,7 @@ import type { OmitNever } from 'vona';
 import type { ServiceOnion } from 'vona-module-a-onion';
 import type { ISchemaObjectExtensionField, TypeSchemaScene } from 'vona-module-a-openapi';
 import type { SchemaLike } from 'vona-module-a-openapiutils';
-import type { SymbolKeyFieldsMore } from 'vona-module-a-orm';
+import type { IAnalysisPolicy, SymbolKeyFieldsMore } from 'vona-module-a-orm';
 
 export interface IDtoRecord {}
 
@@ -10,6 +10,7 @@ export interface IDecoratorDtoOptions<FieldsMore = never> {
   [SymbolKeyFieldsMore]?: FieldsMore;
   independent?: boolean;
   schemaScene?: TypeSchemaScene;
+  analysis?: IAnalysisPolicy;
   openapi?: ISchemaObjectExtensionField;
   pipes?: SchemaLike | SchemaLike[];
   blocks?: any[];

package/vona/src/suite-vendor/a-vona/modules/a-web/src/types/filter.ts

@@ -1,4 +1,9 @@
-import type { IModelSelectParamsJoinType, ITableRecord, TypeOpsNormal } from 'vona-module-a-orm';
+import type {
+  IAnalysisCapabilities,
+  IModelSelectParamsJoinType,
+  ITableRecord,
+  TypeOpsNormal,
+} from 'vona-module-a-orm';
 
 import type {
   IDecoratorFilterTransformOptions,
@@ -15,7 +20,7 @@ export interface ISchemaObjectExtensionFieldFilterCapabilities {
   where?: boolean;
   // filter?: boolean;
   order?: boolean;
-  // group?: boolean;
+  analysis?: IAnalysisCapabilities;
 }
 
 export type TypeSchemaObjectExtensionFieldFilterTransform = [

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

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

package/zova/package.original.json

@@ -31,7 +31,6 @@
     "format:fix": "oxfmt --write",
     "lint": "oxlint",
     "lint:fix": "oxlint --fix",
-    "docs:fix": "textlint --fix ./packages-docs/**/*.md",
     "dev:ssr:admin": "npm run prerun && quasar dev --mode ssr --flavor admin",
     "build:ssr:admin": "npm run prerun && quasar build --mode ssr --flavor admin",
     "preview:ssr:admin": "concurrently \"node ./dist-mock/index.js\" \"node ./dist/ssr-admin/index.js\"",
@@ -89,11 +88,6 @@
     "vite": "^8.3.4",
     "vite-plugin-fake-server-turbo": "^3.0.18",
     "zova-vite": "workspace:^",
-    "textlint": "^15.7.0",
-    "textlint-rule-en-no-mixed-period": "^3.0.2",
-    "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.74.0",
     "oxlint": "^1.89.0"
   },

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.123",
+  "version": "1.2.124",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.9",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.121"
+    "zova-cli-set-front": "^1.2.122"
   },
   "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.121",
+  "version": "1.2.122",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -70,7 +70,7 @@
     "vite": "^8.3.4",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.52"
+    "zova-vite": "^1.1.53"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.95",
+  "version": "1.1.96",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.95"
+    "zova-core": "^5.1.96"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-vite",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "zova vite",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.179",
+  "version": "5.1.180",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.95",
-    "zova-suite-a-zova": "^5.1.178"
+    "zova-core": "^5.1.96",
+    "zova-suite-a-zova": "^5.1.179"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.95",
+  "version": "5.1.96",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [