cabloy 5.1.98 → 5.1.99

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/model/resource.ts

@@ -13,7 +13,7 @@ import { hashkey, isNil } from '@cabloy/utils';
 import { SchemaObject } from 'openapi3-ts/oas31';
 import { UseScope } from 'zova';
 import { formSceneFromFormMeta } from 'zova-module-a-form';
-import { $QueryAutoLoad, BeanModelBase, Model } from 'zova-module-a-model';
+import { $QueryEnsureLoaded, BeanModelBase, Model } from 'zova-module-a-model';
 import { ScopeModuleAOpenapi, SymbolOpenapiSchemaName } from 'zova-module-a-openapi';
 
 export interface IModelOptionsResource extends IDecoratorModelOptions {}
@@ -147,7 +147,9 @@ export class ModelResource<
     });
   }
 
-  mutationItem<TData = void, TVariables = void>(options: IModelResourceMutationItemOptions<TData, TVariables>) {
+  mutationItem<TData = void, TVariables = void>(
+    options: IModelResourceMutationItemOptions<TData, TVariables>,
+  ) {
     const { id, action, mutationFn, onSuccess, invalidateSelect = true } = options;
     if (isNil(id)) throw new Error('row id cannot empty');
     return this.$useMutationData<TData, TVariables>({
@@ -264,7 +266,7 @@ export class ModelResource<
   }
 
   private async _bootstrap() {
-    const queryBootstrap = await $QueryAutoLoad(() => this.$sdk.getBootstrap(this.resource));
+    const queryBootstrap = await $QueryEnsureLoaded(() => this.$sdk.getBootstrap(this.resource));
     if (!queryBootstrap?.data) {
       throw new Error(`not found sdk of resource: ${this.resource}`);
     }

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/page/entry/controller.tsx

@@ -12,7 +12,7 @@ import { BeanControllerPageBase, deepExtend, Use, usePrepareArg } from 'zova';
 import { ZovaJsx } from 'zova-jsx';
 import { Controller } from 'zova-module-a-bean';
 import { formMetaFromFormScene } from 'zova-module-a-form';
-import { $QueryAutoLoad } from 'zova-module-a-model';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ZPage } from 'zova-module-home-base';
 
 import type { ModelResource } from '../../model/resource.js';
@@ -63,7 +63,7 @@ export class ControllerPageEntry extends BeanControllerPageBase {
     // jsx
     this._prepareJsx();
     // load schema
-    await $QueryAutoLoad(() => this.$$modelResource.getFormApiSchemas(this.formMeta)?.sdk);
+    await $QueryEnsureLoaded(() => this.$$modelResource.getFormApiSchemas(this.formMeta)?.sdk);
   }
 
   private _prepareJsx() {

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/page/resource/controller.tsx

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { BeanControllerPageBase, deepExtend, Use, usePrepareArg } from 'zova';
 import { ZovaJsx } from 'zova-jsx';
 import { Controller } from 'zova-module-a-bean';
-import { $QueryAutoLoad } from 'zova-module-a-model';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ZPage } from 'zova-module-home-base';
 
 import type { ModelResource } from '../../model/resource.js';
@@ -29,7 +29,7 @@ export class ControllerPageResource extends BeanControllerPageBase {
     // jsx
     this._prepareJsx();
     // load schema/data
-    await $QueryAutoLoad(() => this.$$modelResource.apiSchemasSelect.sdk);
+    await $QueryEnsureLoaded(() => this.$$modelResource.apiSchemasSelect.sdk);
   }
 
   private _prepareJsx() {

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

@@ -1,13 +1,13 @@
 {
   "name": "zova-suite-a-cabloy",
-  "version": "5.1.41",
+  "version": "5.1.42",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "author": "",
   "files": [],
   "type": "module",
   "dependencies": {
-    "zova-module-rest-resource": "^5.1.40"
+    "zova-module-rest-resource": "^5.1.41"
   },
   "title": "a-cabloy"
 }

package/zova/src/suite-vendor/a-zova/modules/a-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-model",
-  "version": "5.1.30",
+  "version": "5.1.31",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "core",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-model/src/lib/utils.ts

@@ -1,18 +1,18 @@
 import type { DataQuery } from '../types/query.js';
 
-export type TypeQueryAutoLoadFn<T> = () => DataQuery<T> | undefined;
+export type TypeQueryEnsureLoadedFn<T> = () => DataQuery<T> | undefined;
 
-export async function $QueryAutoLoad<T = any>(fn: TypeQueryAutoLoadFn<T>) {
-  return _QueryAutoLoadInner<T>(fn);
+export async function $QueryEnsureLoaded<T = any>(fn: TypeQueryEnsureLoadedFn<T>) {
+  return _QueryEnsureLoadedInner<T>(fn);
 }
 
-export async function $QueriesAutoLoad<T1 = any, T2 = any, T3 = any, T4 = any, T5 = any>(
-  fn1?: TypeQueryAutoLoadFn<T1>,
-  fn2?: TypeQueryAutoLoadFn<T2>,
-  fn3?: TypeQueryAutoLoadFn<T3>,
-  fn4?: TypeQueryAutoLoadFn<T4>,
-  fn5?: TypeQueryAutoLoadFn<T5>,
-  ...fns: TypeQueryAutoLoadFn<any>[]
+export async function $QueriesEnsureLoaded<T1 = any, T2 = any, T3 = any, T4 = any, T5 = any>(
+  fn1?: TypeQueryEnsureLoadedFn<T1>,
+  fn2?: TypeQueryEnsureLoadedFn<T2>,
+  fn3?: TypeQueryEnsureLoadedFn<T3>,
+  fn4?: TypeQueryEnsureLoadedFn<T4>,
+  fn5?: TypeQueryEnsureLoadedFn<T5>,
+  ...fns: TypeQueryEnsureLoadedFn<any>[]
 ): Promise<
   [
     DataQuery<T1> | undefined,
@@ -24,19 +24,19 @@ export async function $QueriesAutoLoad<T1 = any, T2 = any, T3 = any, T4 = any, T
   ]
 > {
   let promises: any[] = [
-    _QueryAutoLoadInner<T1>(fn1),
-    _QueryAutoLoadInner<T2>(fn2),
-    _QueryAutoLoadInner<T3>(fn3),
-    _QueryAutoLoadInner<T4>(fn4),
-    _QueryAutoLoadInner<T5>(fn5),
+    _QueryEnsureLoadedInner<T1>(fn1),
+    _QueryEnsureLoadedInner<T2>(fn2),
+    _QueryEnsureLoadedInner<T3>(fn3),
+    _QueryEnsureLoadedInner<T4>(fn4),
+    _QueryEnsureLoadedInner<T5>(fn5),
   ];
   if (fns.length > 0) {
-    promises = promises.concat(fns.map(fn => _QueryAutoLoadInner(fn)));
+    promises = promises.concat(fns.map(fn => _QueryEnsureLoadedInner(fn)));
   }
   return (await Promise.all(promises)) as any;
 }
 
-async function _QueryAutoLoadInner<T = any>(fn?: TypeQueryAutoLoadFn<T>) {
+async function _QueryEnsureLoadedInner<T = any>(fn?: TypeQueryEnsureLoadedFn<T>) {
   if (!fn) return;
   const query = fn();
   if (query && query.data === undefined) {

package/zova/src/suite-vendor/a-zova/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.42",
+  "version": "5.1.43",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/model/sdk.ts

@@ -3,7 +3,12 @@ import { SchemaObject } from 'openapi3-ts/oas31';
 import z from 'zod';
 import { cast, ILocaleRecord, TypeEventOff, Use, usePrepareArg } from 'zova';
 import { IApiSchemaOptions } from 'zova-module-a-api';
-import { $QueryAutoLoad, BeanModelBase, IDecoratorModelOptions, Model } from 'zova-module-a-model';
+import {
+  $QueryEnsureLoaded,
+  BeanModelBase,
+  IDecoratorModelOptions,
+  Model,
+} from 'zova-module-a-model';
 
 import { SysSdk } from '../bean/sys.sdk.js';
 import {
@@ -60,7 +65,7 @@ export class ModelSdk extends BeanModelBase {
         const bootstrap = await this.$$sysSdk.loadBootstrap(this.$fetch, resource);
         if (!bootstrap) throw new Error('load bootstrap error');
         if (process.env.SERVER) {
-          await $QueryAutoLoad(() => this.getPermissions(resource));
+          await $QueryEnsureLoaded(() => this.getPermissions(resource));
         } else {
           await this.$refetchQueries({ queryKey: ['permissions', resource] });
         }
@@ -98,7 +103,7 @@ export class ModelSdk extends BeanModelBase {
         if (!sdk) throw new Error('load sdk error');
         for (const schemaName of sdk.schemas) {
           if (process.env.SERVER) {
-            await $QueryAutoLoad(() => this.getSchema(schemaName));
+            await $QueryEnsureLoaded(() => this.getSchema(schemaName));
           } else {
             await this.$refetchQueries({ queryKey: ['schema', schemaName] });
           }

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.91",
+  "version": "5.1.92",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.76"
+    "zova-jsx": "^1.1.77"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.28",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.130",
+  "version": "5.1.131",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -21,8 +21,8 @@
     "zova-module-a-interceptor": "^5.1.29",
     "zova-module-a-logger": "^5.1.26",
     "zova-module-a-meta": "^5.1.21",
-    "zova-module-a-model": "^5.1.30",
-    "zova-module-a-openapi": "^5.1.42",
+    "zova-module-a-model": "^5.1.31",
+    "zova-module-a-openapi": "^5.1.43",
     "zova-module-a-router": "^5.1.29",
     "zova-module-a-routerstack": "^5.1.26",
     "zova-module-a-routertabs": "^5.1.32",
@@ -32,7 +32,7 @@
     "zova-module-a-style": "^5.1.32",
     "zova-module-a-table": "^5.1.37",
     "zova-module-a-zod": "^5.1.36",
-    "zova-module-a-zova": "^5.1.91"
+    "zova-module-a-zova": "^5.1.92"
   },
   "title": "a-zova"
 }

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/bean/summerCache.permission.ts

@@ -1,17 +0,0 @@
-import type { ISummerCacheGet, TSummerCacheActionOptions } from 'vona-module-a-summer';
-
-import { ServiceSummerCacheBase, SummerCache } from 'vona-module-a-summer';
-
-export type TSummerCachePermissionKey = any;
-export type TSummerCachePermissionData = any;
-
-@SummerCache({ preset: 'mem' })
-export class SummerCachePermission
-  extends ServiceSummerCacheBase<TSummerCachePermissionKey, TSummerCachePermissionData>
-  implements ISummerCacheGet<TSummerCachePermissionKey, TSummerCachePermissionData>
-{
-  async getNative(
-    _key?: TSummerCachePermissionKey,
-    _options?: TSummerCacheActionOptions<TSummerCachePermissionKey, TSummerCachePermissionData>,
-  ): Promise<TSummerCachePermissionData | undefined> {}
-}

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

@@ -1,35 +0,0 @@
-import type { Next } from 'vona';
-import type { IDecoratorGuardOptions, IGuardExecute } from 'vona-module-a-aspect';
-
-import { BeanBase } from 'vona';
-import { Guard } from 'vona-module-a-aspect';
-
-import type { IUserNameRecord } from '../types/user.ts';
-
-export interface IGuardOptionsUserName extends IDecoratorGuardOptions {
-  name?: keyof IUserNameRecord | (keyof IUserNameRecord)[];
-  passWhenMatched: boolean;
-  rejectWhenDismatched: boolean;
-}
-
-@Guard<IGuardOptionsUserName>({
-  passWhenMatched: true,
-  rejectWhenDismatched: true,
-})
-export class GuardUserName extends BeanBase implements IGuardExecute {
-  async execute(options: IGuardOptionsUserName, next: Next): Promise<boolean> {
-    const result = await this._check(options);
-    if (!result) {
-      if (options.rejectWhenDismatched) return this.app.throw(403);
-    } else {
-      if (options.passWhenMatched) return true;
-    }
-    // next
-    return next();
-  }
-
-  private async _check(options: IGuardOptionsUserName) {
-    if (!options.name) return false;
-    return this.bean.passport.checkUserName(options.name);
-  }
-}