vona-module-a-web 5.1.23 → 5.1.25

package/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/dist/.metadata/index.d.ts

@@ -1,3 +1,32 @@
+/** filterTransform: begin */
+export * from '../bean/filterTransform.base.ts';
+export * from '../bean/filterTransform.dateRange.ts';
+import type { IFilterTransformOptionsBase } from '../bean/filterTransform.base.ts';
+import type { IFilterTransformOptionsDateRange } from '../bean/filterTransform.dateRange.ts';
+import 'vona-module-a-web';
+declare module 'vona-module-a-web' {
+    interface IFilterTransformRecord {
+        'a-web:base': IFilterTransformOptionsBase;
+        'a-web:dateRange': IFilterTransformOptionsDateRange;
+    }
+}
+declare module 'vona-module-a-web' {
+    interface FilterTransformBase {
+    }
+    interface FilterTransformBase {
+        get $beanFullName(): 'a-web.filterTransform.base';
+        get $onionName(): 'a-web:base';
+        get $onionOptions(): IFilterTransformOptionsBase;
+    }
+    interface FilterTransformDateRange {
+    }
+    interface FilterTransformDateRange {
+        get $beanFullName(): 'a-web.filterTransform.dateRange';
+        get $onionName(): 'a-web:dateRange';
+        get $onionOptions(): IFilterTransformOptionsDateRange;
+    }
+}
+/** filterTransform: end */
 /** pipe: begin */
 export * from '../bean/pipe.filter.ts';
 export * from '../bean/pipe.valid.ts';
@@ -120,35 +149,6 @@ declare module 'vona-module-a-web' {
     }
 }
 /** startup: end */
-/** filterTransform: begin */
-export * from '../bean/filterTransform.base.ts';
-export * from '../bean/filterTransform.dateRange.ts';
-import type { IFilterTransformOptionsBase } from '../bean/filterTransform.base.ts';
-import type { IFilterTransformOptionsDateRange } from '../bean/filterTransform.dateRange.ts';
-import 'vona-module-a-web';
-declare module 'vona-module-a-web' {
-    interface IFilterTransformRecord {
-        'a-web:base': IFilterTransformOptionsBase;
-        'a-web:dateRange': IFilterTransformOptionsDateRange;
-    }
-}
-declare module 'vona-module-a-web' {
-    interface FilterTransformBase {
-    }
-    interface FilterTransformBase {
-        get $beanFullName(): 'a-web.filterTransform.base';
-        get $onionName(): 'a-web:base';
-        get $onionOptions(): IFilterTransformOptionsBase;
-    }
-    interface FilterTransformDateRange {
-    }
-    interface FilterTransformDateRange {
-        get $beanFullName(): 'a-web.filterTransform.dateRange';
-        get $onionName(): 'a-web:dateRange';
-        get $onionOptions(): IFilterTransformOptionsDateRange;
-    }
-}
-/** filterTransform: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';

package/dist/.metadata/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"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"}

package/dist/bean/pipe.filter.d.ts

@@ -1,14 +1,18 @@
 import type { IDecoratorPipeOptions, IDecoratorPipeOptionsArgument, IPipeTransform } from 'vona-module-a-aspect';
 import type { ITableQuery, RouteHandlerArgumentMeta } from 'vona-module-a-openapi';
+import type { IAnalysisPolicy, TypeAnalysisMode } from 'vona-module-a-orm';
 import type { ValidatorOptions } from 'vona-module-a-validation';
 import { BeanBase } from 'vona';
 import type { TypeQueryParamsPatch } from '../types/filterTransform.ts';
 export type TypePipeFilterData = ITableQuery;
 export type TypePipeFilterResult = TypeQueryParamsPatch;
 export interface IPipeOptionsFilter extends IDecoratorPipeOptions, IDecoratorPipeOptionsArgument, ValidatorOptions {
+    analysis?: IAnalysisPolicy;
+    analysisMode?: TypeAnalysisMode;
 }
 export declare class PipeFilter extends BeanBase implements IPipeTransform<TypePipeFilterData, TypePipeFilterResult> {
     transform(value: TypePipeFilterData, metadata: RouteHandlerArgumentMeta, options: IPipeOptionsFilter): Promise<TypePipeFilterResult>;
+    private _prepareAnalysisControls;
     private _transform;
     private _transformSystem;
     private _transformOrders;

package/dist/bean/pipe.filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipe.filter.d.ts","sourceRoot":"","sources":["../../src/bean/pipe.filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,6BAA6B,EAC7B,cAAc,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAEV,WAAW,EACX,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAKjE,OAAO,EAAE,QAAQ,EAAmC,MAAM,MAAM,CAAC;AAGjE,OAAO,KAAK,EAGV,oBAAoB,EACrB,MAAM,6BAA6B,CAAC;AAErC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC;AAE7C,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAGxD,MAAM,WAAW,kBACf,SAAQ,qBAAqB,EAAE,6BAA6B,EAAE,gBAAgB;CAAG;AAInF,qBAOa,UACX,SAAQ,QACR,YAAW,cAAc,CAAC,kBAAkB,EAAE,oBAAoB,CAAC;IAE7D,SAAS,CACb,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,wBAAwB,EAClC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;YAmBlB,UAAU;IAexB,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,aAAa;IAyCrB,OAAO,CAAC,QAAQ;YAQF,eAAe;YAuDf,gBAAgB;CAW/B;AAED,eAAO,MAAM,YAAY,4DAAqC,CAAC"}
+{"version":3,"file":"pipe.filter.d.ts","sourceRoot":"","sources":["../../src/bean/pipe.filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,6BAA6B,EAC7B,cAAc,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAEV,WAAW,EACX,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAKjE,OAAO,EAAE,QAAQ,EAA4D,MAAM,MAAM,CAAC;AAI1F,OAAO,KAAK,EAGV,oBAAoB,EACrB,MAAM,6BAA6B,CAAC;AAErC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC;AAE7C,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAGxD,MAAM,WAAW,kBACf,SAAQ,qBAAqB,EAAE,6BAA6B,EAAE,gBAAgB;IAC9E,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CACjC;AAKD,qBAOa,UACX,SAAQ,QACR,YAAW,cAAc,CAAC,kBAAkB,EAAE,oBAAoB,CAAC;IAE7D,SAAS,CACb,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,wBAAwB,EAClC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAoBhC,OAAO,CAAC,wBAAwB;YA6BlB,UAAU;IAmBxB,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,aAAa;IAyCrB,OAAO,CAAC,QAAQ;YAQF,eAAe;YAwDf,gBAAgB;CAW/B;AAED,eAAO,MAAM,YAAY,4DAAqC,CAAC"}

package/dist/index.js

@@ -1,28 +1,117 @@
-import { BeanInfo, BeanBase, cast, beanFullNameFromOnionName, appMetadata, appResource, deepExtend, compose, createBeanDecorator, BeanSimple, BeanScopeBase, onionNameFromBeanFullName, useApp } from 'vona';
+import { createBeanDecorator, BeanInfo, BeanBase, runWithZodQueryCoercion, cast, beanFullNameFromOnionName, appMetadata, appResource, deepExtend, compose, BeanSimple, BeanScopeBase, onionNameFromBeanFullName, useApp } from 'vona';
 import { __decorate } from 'tslib';
+import { DateTime } from 'luxon';
+import 'vona-module-a-web';
 import { isNil, isNilOrEmptyString } from '@cabloy/utils';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import { isNullableSchema } from '@cabloy/zod-query';
 import { Pipe, createArgumentPipe, SymbolCacheComposeGuards, SymbolCacheComposeInterceptors, SymbolCacheComposePipes, SymbolCacheComposeMiddlewares, clearCacheComposesRouter, SymbolCacheComposeMiddlewareSystems, setArgumentPipe } from 'vona-module-a-aspect';
+import { analysisFailure, resolveAnalysis, analysisControlSchemas, analysisCapabilities } from 'vona-module-a-orm';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { SymbolUseOnionOptions, SymbolUseOnionOptionsRouteReal } from 'vona-module-a-onion';
-import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, makeSchemaLikes, $schema, SymbolOpenApiOptions, SymbolControllerResource, mergeDtoFieldsOpenapiMetadata, getTargetDecoratorDtoOpenapi, mergeTargetDecoratorDtoOpenapi, getTargetDecoratorDtoPipes, setTargetDecoratorDtoPipes } from 'vona-module-a-openapiutils';
+import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, $schema, makeSchemaLikes, SymbolOpenApiOptions, SymbolControllerResource, mergeDtoFieldsOpenapiMetadata, getTargetDecoratorDtoOpenapi, mergeTargetDecoratorDtoOpenapi, getTargetDecoratorDtoPipes, setTargetDecoratorDtoPipes } from 'vona-module-a-openapiutils';
 import { SymbolUploadValue } from 'vona-module-a-upload';
 import { Hmr } from 'vona-module-a-hmrbase';
 import http from 'node:http';
 import { Startup } from 'vona-module-a-startup';
-import { DateTime } from 'luxon';
-import 'vona-module-a-web';
 import Router from 'find-my-way';
 import { SymbolRouterMiddleware } from 'vona-module-a-executor';
 import { z } from 'zod';
 
+function FilterTransform(options) {
+  return createBeanDecorator('filterTransform', options);
+}
+
+let FilterTransformBase = class FilterTransformBase extends BeanBase {
+  async where(info, _options) {
+    const {
+      value,
+      type,
+      openapi
+    } = info;
+    let op = openapi?.filter?.op;
+    if (!op) {
+      if (type === 'string') {
+        op = '_includesI_';
+      } else {
+        op = '_eq_';
+      }
+    }
+    if (value === null) {
+      if (op === '_is_' || op === '_isNot_') {
+        return {
+          [op]: null
+        };
+      }
+      return null;
+    }
+    let where;
+    if (op === '_eq_') {
+      where = value;
+    } else {
+      where = {
+        [op]: value
+      };
+    }
+    return where;
+  }
+};
+FilterTransformBase = __decorate([FilterTransform(), BeanInfo({
+  module: "a-web"
+})], FilterTransformBase);
+
+let FilterTransformDateRange = class FilterTransformDateRange extends BeanBase {
+  async where(info, options) {
+    const {
+      value
+    } = info;
+    if (value === null) return null;
+    const [dateStartStr, dateEndStr] = value.split(options.separator);
+    if (!dateStartStr && !dateEndStr) return;
+    //
+    const where = {};
+    if (dateStartStr) {
+      const dateStart = this._parseDate(dateStartStr);
+      where._gte_ = dateStart.toJSDate();
+    }
+    if (dateEndStr) {
+      const dateEnd = this._parseDate(dateEndStr).plus({
+        day: 1
+      });
+      where._lt_ = dateEnd.toJSDate();
+    }
+    return where;
+  }
+  _parseDate(str) {
+    let date = DateTime.fromISO(str, {
+      zone: this.ctx.tz
+    });
+    if (!date.isValid) {
+      for (const format of ['yyyy/MM/dd', 'yyyy/MM/d', 'yyyy/M/dd', 'yyyy/M/d', 'MM/dd/yyyy', 'MM/d/yyyy', 'M/dd/yyyy', 'M/d/yyyy']) {
+        date = DateTime.fromFormat(str, format, {
+          zone: this.ctx.tz
+        });
+        if (date.isValid) break;
+      }
+    }
+    if (!date.isValid) throw new Error(`invalid date: ${str}`);
+    return date;
+  }
+};
+FilterTransformDateRange = __decorate([FilterTransform({
+  separator: '~'
+}), BeanInfo({
+  module: "a-web"
+})], FilterTransformDateRange);
+
 const __FieldsSystem = ['columns', 'where', 'orders', 'pageNo', 'pageSize'];
+const __AnalysisControls = ['groups', 'aggrs', 'having', 'joins', 'distinct', 'include', 'with'];
 let PipeFilter = class PipeFilter extends BeanBase {
   async transform(value, metadata, options) {
     if (!options.schema) {
       throw new Error(`should specify the schema of pipeFilter: ${metadata.controller.name}.${metadata.method}#${metadata.index}`);
     }
+    value = this._prepareAnalysisControls(value, options);
     // validateSchema
     value = await this.bean.validator.validateSchema(options.schema, value, options, metadata.field);
     // transform
@@ -30,6 +119,34 @@ let PipeFilter = class PipeFilter extends BeanBase {
     // ok
     return params;
   }
+  _prepareAnalysisControls(value, options) {
+    if (!!options.analysis !== !!options.analysisMode) {
+      throw new Error('Analysis filter requires both a policy and an action mode');
+    }
+    if (!value || typeof value !== 'object') return value;
+    const prepared = {
+      ...value
+    };
+    for (const key of __AnalysisControls) {
+      if (!Object.hasOwn(value, key)) continue;
+      if (!options.analysisMode) analysisFailure(`Select does not support ${key}`);
+      if (key !== 'aggrs' && !(key === 'groups' && options.analysisMode === 'group')) {
+        analysisFailure(`Analysis ${options.analysisMode} does not support ${key}`);
+      }
+      if (typeof value[key] === 'string') {
+        try {
+          prepared[key] = JSON.parse(value[key]);
+        } catch {
+          analysisFailure(`Analysis ${key} must be valid JSON`);
+        }
+      }
+    }
+    if (options.analysis && options.analysisMode) {
+      // Validate native shapes before permissive generic query coercion runs.
+      runWithZodQueryCoercion(false, () => resolveAnalysis(options.analysis, options.analysisMode, prepared));
+    }
+    return prepared;
+  }
   async _transform(value, options) {
     // 1. system: columns/where/orders/pageNo/pageSize
     const params = this._transformSystem(value);
@@ -38,6 +155,10 @@ let PipeFilter = class PipeFilter extends BeanBase {
     await this._transformFields(params, value, options, rootOpenapi);
     // 3. system: orders
     this._transformOrders(params, options, rootOpenapi);
+    if (options.analysis && options.analysisMode) {
+      if (params.joins?.length) analysisFailure('Analysis does not support joined filters');
+      Object.assign(params, resolveAnalysis(options.analysis, options.analysisMode, value));
+    }
     // ok
     return params;
   }
@@ -124,7 +245,7 @@ let PipeFilter = class PipeFilter extends BeanBase {
     }
   }
   async _transformField(key, fieldValue, params, value, options, rootOpenapi) {
-    if (__FieldsSystem.includes(key)) return;
+    if (__FieldsSystem.includes(key) || options.analysisMode && __AnalysisControls.includes(key)) return;
     const info = this._resolveField(key, options, rootOpenapi);
     if (!info) return;
     const {
@@ -644,92 +765,6 @@ StartupListen = __decorate([Startup({
   module: "a-web"
 })], StartupListen);
 
-function FilterTransform(options) {
-  return createBeanDecorator('filterTransform', options);
-}
-
-let FilterTransformBase = class FilterTransformBase extends BeanBase {
-  async where(info, _options) {
-    const {
-      value,
-      type,
-      openapi
-    } = info;
-    let op = openapi?.filter?.op;
-    if (!op) {
-      if (type === 'string') {
-        op = '_includesI_';
-      } else {
-        op = '_eq_';
-      }
-    }
-    if (value === null) {
-      if (op === '_is_' || op === '_isNot_') {
-        return {
-          [op]: null
-        };
-      }
-      return null;
-    }
-    let where;
-    if (op === '_eq_') {
-      where = value;
-    } else {
-      where = {
-        [op]: value
-      };
-    }
-    return where;
-  }
-};
-FilterTransformBase = __decorate([FilterTransform(), BeanInfo({
-  module: "a-web"
-})], FilterTransformBase);
-
-let FilterTransformDateRange = class FilterTransformDateRange extends BeanBase {
-  async where(info, options) {
-    const {
-      value
-    } = info;
-    if (value === null) return null;
-    const [dateStartStr, dateEndStr] = value.split(options.separator);
-    if (!dateStartStr && !dateEndStr) return;
-    //
-    const where = {};
-    if (dateStartStr) {
-      const dateStart = this._parseDate(dateStartStr);
-      where._gte_ = dateStart.toJSDate();
-    }
-    if (dateEndStr) {
-      const dateEnd = this._parseDate(dateEndStr).plus({
-        day: 1
-      });
-      where._lt_ = dateEnd.toJSDate();
-    }
-    return where;
-  }
-  _parseDate(str) {
-    let date = DateTime.fromISO(str, {
-      zone: this.ctx.tz
-    });
-    if (!date.isValid) {
-      for (const format of ['yyyy/MM/dd', 'yyyy/MM/d', 'yyyy/M/dd', 'yyyy/M/d', 'MM/dd/yyyy', 'MM/d/yyyy', 'M/dd/yyyy', 'M/d/yyyy']) {
-        date = DateTime.fromFormat(str, format, {
-          zone: this.ctx.tz
-        });
-        if (date.isValid) break;
-      }
-    }
-    if (!date.isValid) throw new Error(`invalid date: ${str}`);
-    return date;
-  }
-};
-FilterTransformDateRange = __decorate([FilterTransform({
-  separator: '~'
-}), BeanInfo({
-  module: "a-web"
-})], FilterTransformDateRange);
-
 function config(_app) {
   return {
     router: {
@@ -818,6 +853,57 @@ ScopeModuleAWeb = __decorate([Scope(), BeanInfo({
 })], ScopeModuleAWeb);
 /** scope: end */
 
+function prepareAnalysisFilter(schemaLike, options) {
+  const schema = $schema(schemaLike);
+  if (!options?.mode) return {
+    schema
+  };
+  const policy = appResource.getBean(schemaLike)?.options?.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, policy, mode) {
+  const inner = ZodMetadata.unwrapChained(schema);
+  if (inner.type !== 'object') throw new Error('Analysis filter requires an object DTO schema');
+  const object = schema;
+  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 = {
+    filter: {
+      capabilities: {
+        analysis: capabilities
+      }
+    }
+  };
+  const shape = {
+    aggrs: controls.aggrs.openapi(metadata)
+  };
+  if (controls.groups) shape.groups = controls.groups.openapi(metadata);
+  const derived = object.safeExtend(shape);
+  const original = ZodMetadata.getOpenapiMetadata(schema);
+  const ref = ZodMetadata.getRefId(schema);
+  return derived.openapi(`${ref ?? 'filter'}_${mode}`, {
+    ...original,
+    filter: {
+      ...original?.filter,
+      capabilities: {
+        ...original?.filter?.capabilities,
+        analysis: capabilities
+      }
+    }
+  });
+}
+
 function createPipesArgumentDecorator(paramType, extractValue) {
   return function (field, ...schemaLikes) {
     return function (target, prop, index) {
@@ -880,12 +966,12 @@ function User(...schemaLikes) {
 function RbacScopeCurrent() {
   return createPipesArgumentDecorator('rbacScopeCurrent')();
 }
-function ArgFilter(schemaLike) {
+function ArgFilter(schemaLike, options) {
   return function (target, prop, index) {
-    const schema = $schema(schemaLike);
+    const prepared = prepareAnalysisFilter(schemaLike, options);
     setArgumentPipe('a-web:filter', {
       type: 'query',
-      schema
+      ...prepared
     }, target, prop, index);
   };
 }
@@ -1044,5 +1130,5 @@ const Web = {
   head: Head
 };
 
-export { Arg, ArgFilterPro, ArgValid, BeanRouter, Controller, Dto, FilterTransform, FilterTransformBase, FilterTransformDateRange, HmrController, HmrDto, Main, PipeFilter, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolCacheControllerRoutes, SymbolRequestMappingHandler, Web, composeGuards, config, createPipesArgumentDecorator, getCacheControllerRoutes, mergeControllerActionsOpenapiMetadata, mergeDtoBlocksOpenapiMetadata, mergeDtoPipesOpenapiMetadata, recordResourceNameToRoutePath };
+export { Arg, ArgFilterPro, ArgValid, BeanRouter, Controller, Dto, FilterTransform, FilterTransformBase, FilterTransformDateRange, HmrController, HmrDto, Main, PipeFilter, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolCacheControllerRoutes, SymbolRequestMappingHandler, Web, composeGuards, config, createPipesArgumentDecorator, getCacheControllerRoutes, mergeControllerActionsOpenapiMetadata, mergeDtoBlocksOpenapiMetadata, mergeDtoPipesOpenapiMetadata, prepareAnalysisFilter, recordResourceNameToRoutePath };
 //# sourceMappingURL=index.js.map