cabloy 5.1.155 → 5.1.157

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/.metadata/index.ts

@@ -109,6 +109,32 @@ declare module 'vona-module-a-event' {
   }
 }
 /** event: end */
+/** eventListener: begin */
+export * from '../bean/eventListener.roleMembershipChanged.ts';
+
+import { type IDecoratorEventListenerOptions } from 'vona-module-a-event';
+declare module 'vona-module-a-event' {
+
+    export interface IEventListenerRecord {
+      'a-rbac:roleMembershipChanged': IDecoratorEventListenerOptions;
+    }
+
+
+}
+declare module 'vona-module-a-rbac' {
+
+        export interface EventListenerRoleMembershipChanged {
+          /** @internal */
+          get scope(): ScopeModuleARbac;
+        }
+
+          export interface EventListenerRoleMembershipChanged {
+            get $beanFullName(): 'a-rbac.eventListener.roleMembershipChanged';
+            get $onionName(): 'a-rbac:roleMembershipChanged';
+            get $onionOptions(): IDecoratorEventListenerOptions;
+          }
+}
+/** eventListener: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/src/bean/eventListener.roleMembershipChanged.ts

@@ -0,0 +1,25 @@
+import type { IEventExecute, NextEvent } from 'vona-module-a-event';
+import type {
+  TypeEventRoleMembershipChangedData,
+  TypeEventRoleMembershipChangedResult,
+} from 'vona-module-a-user';
+
+import { BeanBase } from 'vona';
+import { EventListener } from 'vona-module-a-event';
+
+type TypeEventData = TypeEventRoleMembershipChangedData;
+type TypeEventResult = TypeEventRoleMembershipChangedResult;
+
+@EventListener({ match: 'a-user:roleMembershipChanged' })
+export class EventListenerRoleMembershipChanged
+  extends BeanBase
+  implements IEventExecute<TypeEventData, TypeEventResult>
+{
+  async execute(
+    data: TypeEventData,
+    next: NextEvent<TypeEventData, TypeEventResult>,
+  ): Promise<TypeEventResult> {
+    await this.scope.event.policyInvalidated.emit({ kind: 'role' });
+    return await next(data);
+  }
+}

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.48",
+  "version": "5.1.50",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -9,7 +9,7 @@
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.2",
+    "vona-module-a-rbac": "^5.0.4",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.51",
+  "version": "5.1.52",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.30",
+  "version": "5.1.31",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/service/databaseDialectBase_.ts

@@ -15,17 +15,17 @@ import type {
 } from '../types/dialect.ts';
 
 const BOOLEAN_COLUMN_TYPES = ['bit', 'bool', 'boolean'];
-const NUMBER_COLUMN_TYPES = ['int'];
-const TIMESTAMP_COLUMN_TYPE_PREFIXES = ['timestamp'];
-const FLOAT_COLUMN_TYPE_PREFIXES = ['float', 'double'];
-const INTEGER_COLUMN_TYPE_PREFIXES = [
-  'tinyint',
-  'smallint',
-  'mediumint',
-  'bigint',
-  'numeric',
-  'integer',
-];
+const INTEGER_COLUMN_TYPES = ['tinyint', 'smallint', 'mediumint', 'int', 'integer'];
+const FLOAT_COLUMN_TYPES = ['float', 'double'];
+const GENERATED_DEFAULT_PATTERN =
+  /^(?:current_timestamp\b(?:\s*\(\s*\d*\s*\))?|current_date\b|current_time\b(?:\s*\(\s*\d*\s*\))?|now\s*\(\s*\)|nextval\s*\()/i;
+const NUMBER_LITERAL_PATTERN = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i;
+const QUOTED_LITERAL_PATTERN = /^'((?:''|[^'])*)'$/;
+
+type ColumnDefaultLiteral =
+  | { kind: 'string'; value: string }
+  | { kind: 'boolean'; value: boolean }
+  | { kind: 'number'; value: string };
 
 @Service()
 @Virtual()
@@ -96,13 +96,13 @@ export class ServiceDatabaseDialectBase extends BeanBase {
 
   coerceColumn(column: Knex.ColumnInfo): ITableColumn {
     const result = { type: column.type } as ITableColumn;
-    result.default = this._coerceColumnValue(column.type, column.defaultValue);
     const columnType = (column as Knex.ColumnInfo & { columnType?: string }).columnType;
     if (columnType) result.columnType = columnType;
+    result.default = this._coerceColumnValue(result, column.defaultValue);
     return result;
   }
 
-  protected _isMysqlBooleanColumn(column: ITableColumn) {
+  protected _isMysqlBooleanColumn(column: Pick<ITableColumn, 'columnType'>) {
     return column.columnType?.trim().toLowerCase() === 'tinyint(1)';
   }
 
@@ -191,34 +191,105 @@ export class ServiceDatabaseDialectBase extends BeanBase {
     return [items.map(item => item.id), builder];
   }
 
-  protected _coerceColumnValue(type: string, value) {
+  protected _coerceColumnValue(column: Pick<ITableColumn, 'type' | 'columnType'>, value: unknown) {
     if (isNil(value)) return undefined;
-    if (BOOLEAN_COLUMN_TYPES.includes(type)) return safeBoolean(value);
-    if (NUMBER_COLUMN_TYPES.includes(type)) return this._safeNumber(value);
-    if (
-      this._columnTypePrefixes(type, TIMESTAMP_COLUMN_TYPE_PREFIXES) &&
-      value === 'CURRENT_TIMESTAMP'
-    ) {
-      return undefined; // new Date();
+    if (typeof value !== 'string') {
+      return this._isBooleanColumn(column) ? safeBoolean(value as any) : value;
     }
-    if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) {
-      return this._safeNumber(value);
+
+    const literal = this._coerceColumnLiteral(value);
+    if (literal === undefined) return undefined;
+    if (this._isBooleanColumn(column)) return safeBoolean(literal.value);
+    if (literal.kind === 'boolean') return literal.value;
+
+    const type = this._columnTypeName(column.type);
+    if (literal.kind === 'string') return literal.value;
+    if (INTEGER_COLUMN_TYPES.includes(type)) return this._safeInteger(literal.value);
+    if (FLOAT_COLUMN_TYPES.includes(type)) return this._safeNumber(literal.value);
+    return literal.value;
+  }
+
+  protected _isBooleanColumn(column: Pick<ITableColumn, 'type' | 'columnType'>) {
+    return (
+      this._isMysqlBooleanColumn(column) ||
+      BOOLEAN_COLUMN_TYPES.includes(this._columnTypeName(column.type))
+    );
+  }
+
+  protected _columnTypeName(type: string) {
+    return type.trim().toLowerCase().match(/^\w+/)?.[0] ?? '';
+  }
+
+  protected _coerceColumnLiteral(value: string): ColumnDefaultLiteral | undefined {
+    const literal = this._unwrapColumnDefault(value);
+    if (literal === '') return undefined;
+    const literalLower = literal.toLowerCase();
+    if (literalLower === 'null' || GENERATED_DEFAULT_PATTERN.test(literal)) return undefined;
+    const quoted = literal.match(QUOTED_LITERAL_PATTERN);
+    if (quoted) return { kind: 'string', value: quoted[1].replaceAll("''", "'") };
+    if (literalLower === 'true' || literalLower === 't') return { kind: 'boolean', value: true };
+    if (literalLower === 'false' || literalLower === 'f') return { kind: 'boolean', value: false };
+    if (NUMBER_LITERAL_PATTERN.test(literal)) return { kind: 'number', value: literal };
+    if (this._isExpressionColumnDefault(literal)) return undefined;
+    return { kind: 'string', value: literal };
+  }
+
+  protected _unwrapColumnDefault(value: string) {
+    let literal = value.trim();
+    while (literal.startsWith('(') && literal.endsWith(')')) {
+      const inner = literal.slice(1, -1).trim();
+      if (!inner || !this._isColumnDefaultBalanced(inner)) break;
+      literal = inner;
     }
-    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) {
-      return this._safeNumber(value);
+    const castIndex = literal.indexOf('::');
+    if (castIndex > 0 && this._isScalarColumnDefault(literal.slice(0, castIndex).trim())) {
+      literal = literal.slice(0, castIndex).trim();
     }
-    // pg: NULL::character varying
-    if (value.indexOf('NULL::') === 0) return undefined;
-    return value;
+    return literal;
   }
 
-  // pg: nextval
-  protected _safeNumber(value) {
+  protected _isScalarColumnDefault(value: string) {
+    return (
+      value.toLowerCase() === 'null' ||
+      QUOTED_LITERAL_PATTERN.test(value) ||
+      value.toLowerCase() === 'true' ||
+      value.toLowerCase() === 'false' ||
+      NUMBER_LITERAL_PATTERN.test(value)
+    );
+  }
+
+  protected _isColumnDefaultBalanced(value: string) {
+    let depth = 0;
+    let quoted = false;
+    for (let index = 0; index < value.length; index++) {
+      const char = value[index];
+      if (char === "'") {
+        if (quoted && value[index + 1] === "'") {
+          index++;
+        } else {
+          quoted = !quoted;
+        }
+      } else if (!quoted && char === '(') {
+        depth++;
+      } else if (!quoted && char === ')') {
+        if (depth === 0) return false;
+        depth--;
+      }
+    }
+    return !quoted && depth === 0;
+  }
+
+  protected _isExpressionColumnDefault(value: string) {
+    return /[()*/+\-\s]/.test(value);
+  }
+
+  protected _safeInteger(value: string) {
     const num = Number(value);
-    return Number.isNaN(num) ? undefined : num;
+    return Number.isSafeInteger(num) ? num : value;
   }
 
-  protected _columnTypePrefixes(type: string, prefixes: string[]) {
-    return prefixes.some(prefix => type.includes(prefix));
+  protected _safeNumber(value: string) {
+    const num = Number(value);
+    return Number.isFinite(num) ? num : undefined;
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.18",
+  "version": "5.1.20",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-queue",
-  "version": "5.1.15",
+  "version": "5.1.16",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-queue/src/lib/beanQueueBase.ts

@@ -11,7 +11,7 @@ export class BeanQueueBase<DATA = unknown, RESULT = unknown> extends BeanBase {
     );
   }
 
-  push(data: DATA, options?: IQueuePushOptions) {
+  push(data: DATA, options?: IQueuePushOptions): Promise<void> {
     return this.$scope.queue.service.queue.push(
       this.$scope.queue.service.queue.prepareJobInfo(this.$onionName as any, data, options),
     );

package/vona/src/suite-vendor/a-vona/modules/a-queue/src/service/queue.ts

@@ -24,9 +24,9 @@ export class ServiceQueue extends BeanBase {
   _queues: IQueueQueues = {};
   _queueCallbacks: IQueueCallbacks = {};
 
-  push<DATA>(info: IQueueJobContext<DATA>) {
+  push<DATA>(info: IQueueJobContext<DATA>): Promise<void> {
     if (!info.options?.dbInfo) throw new Error('should specify the options.dbInfo');
-    this._queuePush(info, false);
+    return this._queuePush(info, false);
   }
 
   // { locale, instanceName, module, queueName,queueNameSub,data }

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

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

package/vona/src/suite-vendor/a-vona/modules/a-user/src/.metadata/index.ts

@@ -174,6 +174,7 @@ export interface IModuleCacheRedis {
 export * from '../bean/event.activate.ts';
 export * from '../bean/event.createAnonymous.ts';
 export * from '../bean/event.register.ts';
+export * from '../bean/event.roleMembershipChanged.ts';
 export * from '../bean/event.signin.ts';
 export * from '../bean/event.signout.ts';
 
@@ -214,6 +215,16 @@ declare module 'vona-module-a-user' {
             get $onionName(): 'a-user:register';
           }
 
+        export interface EventRoleMembershipChanged {
+          /** @internal */
+          get scope(): ScopeModuleAUser;
+        }
+
+          export interface EventRoleMembershipChanged {
+            get $beanFullName(): 'a-user.event.roleMembershipChanged';
+            get $onionName(): 'a-user:roleMembershipChanged';
+          }
+
         export interface EventSignin {
           /** @internal */
           get scope(): ScopeModuleAUser;
@@ -239,12 +250,14 @@ declare module 'vona-module-a-user' {
 import type { EventActivate } from '../bean/event.activate.ts';
 import type { EventCreateAnonymous } from '../bean/event.createAnonymous.ts';
 import type { EventRegister } from '../bean/event.register.ts';
+import type { EventRoleMembershipChanged } from '../bean/event.roleMembershipChanged.ts';
 import type { EventSignin } from '../bean/event.signin.ts';
 import type { EventSignout } from '../bean/event.signout.ts';
 export interface IModuleEvent {
   'activate': EventActivate;
 'createAnonymous': EventCreateAnonymous;
 'register': EventRegister;
+'roleMembershipChanged': EventRoleMembershipChanged;
 'signin': EventSignin;
 'signout': EventSignout;
 }
@@ -253,6 +266,7 @@ export interface IModuleEvent {
 import type { TypeEventActivateData, TypeEventActivateResult } from '../bean/event.activate.ts';
 import type { TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult } from '../bean/event.createAnonymous.ts';
 import type { TypeEventRegisterData, TypeEventRegisterResult } from '../bean/event.register.ts';
+import type { TypeEventRoleMembershipChangedData, TypeEventRoleMembershipChangedResult } from '../bean/event.roleMembershipChanged.ts';
 import type { TypeEventSigninData, TypeEventSigninResult } from '../bean/event.signin.ts';
 import type { TypeEventSignoutData, TypeEventSignoutResult } from '../bean/event.signout.ts';
 import type { EventOn } from 'vona-module-a-event';
@@ -261,6 +275,7 @@ declare module 'vona-module-a-event' {
     'a-user:activate': EventOn<TypeEventActivateData, TypeEventActivateResult>;
 'a-user:createAnonymous': EventOn<TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult>;
 'a-user:register': EventOn<TypeEventRegisterData, TypeEventRegisterResult>;
+'a-user:roleMembershipChanged': EventOn<TypeEventRoleMembershipChangedData, TypeEventRoleMembershipChangedResult>;
 'a-user:signin': EventOn<TypeEventSigninData, TypeEventSigninResult>;
 'a-user:signout': EventOn<TypeEventSignoutData, TypeEventSignoutResult>;
   }

package/vona/src/suite-vendor/a-vona/modules/a-user/src/bean/bean.role.ts

@@ -2,8 +2,9 @@ import type { TableIdentity } from 'table-identity';
 
 import { BeanBase, beanFullNameFromOnionName } from 'vona';
 import { Bean } from 'vona-module-a-bean';
+import { Core } from 'vona-module-a-core';
 
-import type { IRole, IRoleAdapter } from '../types/role.ts';
+import type { IRole, IRoleAdapter, IRoleMembershipReplaceResult } from '../types/role.ts';
 
 @Bean()
 export class BeanRole extends BeanBase {
@@ -33,7 +34,47 @@ export class BeanRole extends BeanBase {
     return this.roleAdapter.findAllByUserId(userId);
   }
 
-  addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity> {
-    return this.roleAdapter.addUserId(id, userId);
+  @Core.transaction()
+  async addUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean> {
+    const changed = await this.roleAdapter.addUserId(id, userId);
+    if (changed) await this.emitMembershipChanged(userId, [id]);
+    return changed;
+  }
+
+  @Core.transaction()
+  async removeUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean> {
+    const changed = await this.roleAdapter.removeUserId(id, userId);
+    if (changed) await this.emitMembershipChanged(userId, [id]);
+    return changed;
+  }
+
+  @Core.transaction()
+  async replaceUserRoleIds(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+    options?: { preserveRoleIds?: TableIdentity[] },
+  ): Promise<IRoleMembershipReplaceResult> {
+    const result = await this.roleAdapter.replaceUserRoleIds(userId, roleIds, options);
+    const changedRoleIds = [...result.addedRoleIds, ...result.removedRoleIds];
+    if (changedRoleIds.length) await this.emitMembershipChanged(userId, changedRoleIds);
+    return result;
+  }
+
+  private async emitMembershipChanged(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+  ): Promise<void> {
+    await this.scope.event.roleMembershipChanged.emit({
+      userIds: this.uniqueIds([userId]),
+      roleIds: this.uniqueIds(roleIds),
+    });
+  }
+
+  private uniqueIds(ids: TableIdentity[]): TableIdentity[] {
+    const values = new Map<string, TableIdentity>();
+    for (const id of ids) values.set(String(id), id);
+    return [...values.entries()]
+      .toSorted(([left], [right]) => left.localeCompare(right))
+      .map(([, id]) => id);
   }
 }

package/vona/src/suite-vendor/a-vona/modules/a-user/src/bean/event.roleMembershipChanged.ts

@@ -0,0 +1,16 @@
+import type { TableIdentity } from 'table-identity';
+
+import { BeanEventBase, Event } from 'vona-module-a-event';
+
+export interface TypeEventRoleMembershipChangedData {
+  userIds: TableIdentity[];
+  roleIds: TableIdentity[];
+}
+
+export type TypeEventRoleMembershipChangedResult = void;
+
+@Event()
+export class EventRoleMembershipChanged extends BeanEventBase<
+  TypeEventRoleMembershipChangedData,
+  TypeEventRoleMembershipChangedResult
+> {}

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/role.ts

@@ -18,9 +18,20 @@ export interface IRole {
   builtin?: boolean;
 }
 
+export interface IRoleMembershipReplaceResult {
+  addedRoleIds: TableIdentity[];
+  removedRoleIds: TableIdentity[];
+}
+
 export interface IRoleAdapter {
   findOneByName(name: string): Promise<IRole | undefined>;
   findOne(role: Partial<IRole>): Promise<IRole | undefined>;
   findAllByUserId(userId: TableIdentity): Promise<IRole[] | undefined>;
-  addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity>;
+  addUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean>;
+  removeUserId(id: TableIdentity, userId: TableIdentity): Promise<boolean>;
+  replaceUserRoleIds(
+    userId: TableIdentity,
+    roleIds: TableIdentity[],
+    options?: { preserveRoleIds?: TableIdentity[] },
+  ): Promise<IRoleMembershipReplaceResult>;
 }

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.104",
+  "version": "1.2.105",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.102"
+    "zova-cli-set-front": "^1.2.103"
   },
   "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.102",
+  "version": "1.2.103",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -70,7 +70,7 @@
     "vite": "^8.0.14",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.44"
+    "zova-vite": "^1.1.45"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-vite",
-  "version": "1.1.44",
+  "version": "1.1.45",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "zova vite",
   "keywords": [
@@ -40,7 +40,7 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/dotenv": "^1.2.8",
+    "@cabloy/dotenv": "^1.2.9",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/module-glob": "^5.3.18",
     "@cabloy/module-info": "^2.0.3",

package/zova/pnpm-lock.yaml

@@ -977,7 +977,7 @@ importers:
         specifier: ^5.0.1
         version: link:modules/a-rbac
       zova-module-rest-resource:
-        specifier: ^5.1.48
+        specifier: ^5.1.49
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/a-rbac:

package/.claude/scheduled_tasks.lock

@@ -1 +0,0 @@
-{"sessionId":"834e10b3-c7de-4e46-8255-347f58ac99c9","pid":21283,"procStart":"Tue Sep  1 21:20:05 2026","acquiredAt":1788301241462}

package/vona/packages-utils/cascade-extend/LICENSE

@@ -1,3 +0,0 @@
-MIT License
-
-Copyright (c) 2016-present CabloyJS