cabloy 5.1.171 → 5.1.173

package/zova/src/suite-vendor/a-zova/modules/a-bean/cli/controller/metadata/generateFilePage.ts

@@ -22,6 +22,7 @@ export async function generateFilePage(
     importStyleFirst,
     hasStyleFirst,
     classNameStyleFirst,
+    hasComponentOptions,
   } = controllerInfo;
   const { nameSchemaParams, hasSchemaParams, nameSchemaQuery, hasSchemaQuery } = controllerInfo;
   const contentImports: string[] = [];
@@ -68,7 +69,8 @@ export async function generateFilePage(
     }`);
   }
   // page
-  const contentPage = `export const ZPage${nameCapitalize} = createZovaComponentPage(${className}, ${hasRenderFirst ? classNameRenderFirst : undefined}, ${hasStyleFirst ? classNameStyleFirst : undefined});`;
+  const componentOptions = hasComponentOptions ? `${className}.$componentOptions` : undefined;
+  const contentPage = `export const ZPage${nameCapitalize} = createZovaComponentPage(${className}, ${hasRenderFirst ? classNameRenderFirst : undefined}, ${hasStyleFirst ? classNameStyleFirst : undefined}${componentOptions ? `, ${componentOptions}` : ''});`;
   // content
   const content = `${contentImports.join('\n')}
   ${combineContentRenderAndStyle(controllerInfo, moduleName, className, '', '')}

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-bean",
-  "version": "5.1.35",
+  "version": "5.1.36",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

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

package/zova/src/suite-vendor/a-zova/modules/a-model/src/bean/bean.model/bean.model.useMutation.ts

@@ -41,17 +41,7 @@ export class BeanModelUseMutation extends BeanModelUseStateGeneral {
     mutationKey = this.self._forceQueryKeyPrefix(mutationKey);
     const mutationHash = hashKey(mutationKey);
     if (!this[SymbolUseMutations][mutationHash]) {
-      const optionsDefault: any = {};
-      if (!cast(mutationOptions).meta?.disableErrorEffect) {
-        optionsDefault.onError = (error, variables, context) => {
-          let errorInfo = cast(mutationOptions).meta?.errorInfo;
-          if (typeof errorInfo === 'function') {
-            errorInfo = errorInfo(error, variables, context);
-          }
-          this.$errorHandler(error, errorInfo ?? 'useMutationData');
-        };
-      }
-      mutationOptions = Object.assign(optionsDefault, mutationOptions, { mutationKey });
+      mutationOptions = Object.assign({}, mutationOptions, { mutationKey });
       this[SymbolUseMutations][mutationHash] = this.$useMutation(mutationOptions, queryClient);
     }
     return this[SymbolUseMutations][mutationHash] as UnwrapNestedRefs<

package/zova/src/suite-vendor/a-zova/modules/a-model/src/bean/bean.model/bean.model.useQuery.ts

@@ -1,8 +1,6 @@
 import type { DefaultError, QueryClient, QueryKey, UseQueryOptions } from '@tanstack/vue-query';
 
-import { checkErrorJwtExpired } from '@cabloy/utils';
 import { useQuery } from '@tanstack/vue-query';
-import { cast } from 'zova';
 
 import type {
   DefinedInitialQueryOptions,
@@ -45,21 +43,7 @@ export class BeanModelUseQuery extends BeanModelQuery {
   $useQuery(options, queryClient) {
     const queryKey = this.self._forceQueryKeyPrefix(options.queryKey);
     const persister = this._createPersister(options.meta?.persister);
-    const optionsDefault: any = {};
-    if (!cast(options).meta?.disableErrorEffect) {
-      optionsDefault.throwOnError = (error: Error, query) => {
-        let errorInfo = cast(options).meta?.errorInfo;
-        if (typeof errorInfo === 'function') {
-          errorInfo = errorInfo(error, query);
-        }
-        if (!error.message.includes('useQuery:') && !checkErrorJwtExpired(error)) {
-          error.message = `useQuery: [${queryKey.join(', ')}]: ${error.message}`;
-        }
-        this.$errorHandler(error, errorInfo ?? 'useQuery');
-        return false;
-      };
-    }
-    options = Object.assign(optionsDefault, options, { queryKey, persister });
+    options = Object.assign({}, options, { queryKey, persister });
     // staleTime
     const sync = typeof options.meta?.persister === 'object' && options.meta?.persister?.sync;
     if (sync !== true) {

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

@@ -68,7 +68,8 @@ async function _QueryEnsureLoadedInner<T = any>(fn?: TypeQueryEnsureLoadedFn<T>)
   if (!fn) return;
   const query = fn();
   if (query && query.data === undefined) {
-    await query.suspense();
+    const result = await query.suspense();
+    if (result.error) throw result.error;
   }
   return query;
 }

package/zova/src/suite-vendor/a-zova/modules/a-model/src/types/query.ts

@@ -59,17 +59,12 @@ export interface MyQueryMetaBase extends Record<string, unknown> {
   defaultData?: (() => any) | any;
   ssr?: QueryMetaSSR;
   persister?: QueryMetaPersister | boolean;
-  disableErrorEffect?: boolean;
   disableSuspenseOnInit?: boolean;
 }
 
-export interface MyQueryMeta extends MyQueryMetaBase {
-  errorInfo?: ((error, query) => string) | string;
-}
+export interface MyQueryMeta extends MyQueryMetaBase {}
 
-export interface MyMutationMeta extends MyQueryMetaBase {
-  errorInfo?: ((error, variables, context) => string) | string;
-}
+export interface MyMutationMeta extends Record<string, unknown> {}
 
 export interface QueryMetaSSR {
   /** default is true */

package/zova/src/suite-vendor/a-zova/modules/a-model/test/lib/mutation.types.ts

@@ -0,0 +1,14 @@
+import type { MutationObserverOptions } from '@tanstack/vue-query';
+
+import type { MyMutationMeta } from '../../src/types/query.ts';
+
+const mutationOptions: MutationObserverOptions<number, Error, { id: number }> = {
+  mutationKey: ['test:mutation'],
+  mutationFn: async variables => variables.id,
+  onError: (_error, _variables, _context) => {},
+};
+
+const mutationMeta: MyMutationMeta = { source: 'test' };
+
+void mutationOptions;
+void mutationMeta;

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

@@ -0,0 +1,56 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { $QueryEnsureLoaded } from '../../src/lib/utils.js';
+
+type QueryResult<T> = {
+  data: T | undefined;
+  error: Error | null;
+};
+
+function createQuery<T>(data: T | undefined, result: QueryResult<T>) {
+  let suspenseCalls = 0;
+  const query = {
+    data,
+    suspense: async () => {
+      suspenseCalls++;
+      return result;
+    },
+  };
+  return {
+    query,
+    get suspenseCalls() {
+      return suspenseCalls;
+    },
+  };
+}
+
+test('QueryEnsureLoaded throws an initial query error', async () => {
+  const error = new Error('Initial query load failed');
+  const fixture = createQuery(undefined, { data: undefined, error });
+
+  await assert.rejects(
+    $QueryEnsureLoaded(() => fixture.query as never),
+    caught => caught === error,
+  );
+  assert.equal(fixture.suspenseCalls, 1);
+});
+
+test('QueryEnsureLoaded accepts cached data when a background refresh has failed', async () => {
+  const error = new Error('Background refresh failed');
+  const fixture = createQuery({ value: 'cached' }, { data: { value: 'cached' }, error });
+
+  const result = await $QueryEnsureLoaded(() => fixture.query as never);
+
+  assert.equal(result, fixture.query);
+  assert.equal(fixture.suspenseCalls, 0);
+});
+
+test('QueryEnsureLoaded returns a query after an initial successful load', async () => {
+  const fixture = createQuery(undefined, { data: { value: 'loaded' }, error: null });
+
+  const result = await $QueryEnsureLoaded(() => fixture.query as never);
+
+  assert.equal(result, fixture.query);
+  assert.equal(fixture.suspenseCalls, 1);
+});

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.1.37",
+  "version": "5.1.38",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "router",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-router/src/monkey.ts

@@ -238,6 +238,9 @@ export class Monkey
   private _ssrErrorHandler() {
     if (!process.env.CLIENT) return;
     this.app.meta.event.on('app:errorHandler', (data, next) => {
+      if (_isLoadErrorHandledClient(data)) {
+        data.load!.disposition = 'handled';
+      }
       const err = next();
       if (!err || !(err instanceof Error)) return err;
       return this._errorHandlerDefaultClient(err, data);
@@ -265,3 +268,8 @@ export class Monkey
     return err;
   }
 }
+
+function _isLoadErrorHandledClient(data: IErrorHandlerEventData) {
+  if (data.load?.kind !== 'controller-load') return false;
+  return [301, 302, 401, 600].includes(Number((data.err as ErrorSSR).code));
+}

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.39",
+  "version": "5.1.40",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -1,5 +1,5 @@
 import type { ComponentInternalInstance, Ref, VNode } from 'vue';
-import type { Functionable, ILocaleRecord, ZovaContext } from 'zova';
+import type { Functionable, IControllerLoadEvent, ILocaleRecord, ZovaContext } from 'zova';
 
 import { RouteLocationNormalizedGeneric, RouteLocationResolvedGeneric } from '@cabloy/vue-router';
 import { includeBooleanAttr, isBooleanAttr, isString, stringifyStyle } from '@vue/shared';
@@ -14,6 +14,7 @@ import type {
   OnHydratePropHasMismatch,
   OnHydratePropHasMismatchResult,
   SSRContext,
+  SSRControllerLoadErrorSnapshot,
   TypeSsrProfile,
   TypeSsrSitePerformAction,
 } from '../types/ssr.js';
@@ -40,6 +41,7 @@ export class CtxSSR extends BeanSimple {
 
   private [SymbolHydratingCounter]: number = 0;
   private [SymbolServerContexts]: Set<ZovaContext> = new Set();
+  private _controllerLoadSequence: Record<string, number> = {};
 
   public metaStore: CtxSSRMetaStore;
 
@@ -132,6 +134,53 @@ export class CtxSSR extends BeanSimple {
     }
   }
 
+  /** @internal */
+  public controllerLoad(event: IControllerLoadEvent) {
+    if (event.phase === 'prepare') {
+      if (process.env.SERVER) {
+        event.ctx.meta.state.controllerLoadKey = this._allocateControllerLoadKey(event);
+        return;
+      }
+      if (!process.env.CLIENT || !this.isRuntimeSsrPreHydration) return;
+      const key = this._allocateControllerLoadKey(event);
+      const snapshot = this.stateDefer.controllerLoad?.[key];
+      if (
+        !snapshot ||
+        snapshot.version !== 1 ||
+        snapshot.controllerBeanName !== event.controllerBeanName
+      ) {
+        return;
+      }
+      delete this.stateDefer.controllerLoad![key];
+      event.replayError = _createControllerLoadError(snapshot);
+      event.replayControllerRecorded = snapshot.controllerRecorded;
+      return;
+    }
+    if (event.phase !== 'fallback' || !process.env.SERVER || !event.error) return;
+    const key = event.ctx.meta.state.controllerLoadKey;
+    if (!key) return;
+    const controllerLoad = (this.stateDefer.controllerLoad ??= {});
+    controllerLoad[key] = _createControllerLoadErrorSnapshot(event);
+  }
+
+  private _allocateControllerLoadKey(event: IControllerLoadEvent) {
+    const instance = event.ctx.instance;
+    const parts: string[] = [];
+    let current: ComponentInternalInstance | null = instance;
+    while (current) {
+      const componentType = current.type as any;
+      const name =
+        componentType.__file ?? componentType.name ?? componentType.__name ?? 'anonymous';
+      const key = current.vnode.key ?? '';
+      parts.unshift(`${name}:${String(key)}`);
+      current = current.parent;
+    }
+    const structuralKey = parts.join('/');
+    const occurrence = this._controllerLoadSequence[structuralKey] ?? 0;
+    this._controllerLoadSequence[structuralKey] = occurrence + 1;
+    return `${structuralKey}#${occurrence}:${event.controllerBeanName ?? ''}`;
+  }
+
   get profile(): TypeSsrProfile {
     return resolveSsrProfile(this.state.ssrProfile, this.sys.env.SSR_PROFILE);
   }
@@ -367,3 +416,38 @@ export class CtxSSR extends BeanSimple {
     this._serverContextsDispose();
   }
 }
+
+function _createControllerLoadErrorSnapshot(
+  event: IControllerLoadEvent,
+): SSRControllerLoadErrorSnapshot {
+  const error = event.error! as any;
+  const snapshot: SSRControllerLoadErrorSnapshot = {
+    version: 1,
+    controllerBeanName: event.controllerBeanName,
+    name: error.name || 'Error',
+    message: error.message || String(error),
+    controllerRecorded: event.controllerRecorded === true,
+  };
+  for (const key of ['code', 'status']) {
+    if (typeof error[key] === 'number' || typeof error[key] === 'string') {
+      snapshot[key] = error[key];
+    }
+  }
+  for (const key of ['pagePath', 'url']) {
+    if (typeof error[key] === 'string') {
+      snapshot[key] = error[key];
+    }
+  }
+  return snapshot;
+}
+
+function _createControllerLoadError(snapshot: SSRControllerLoadErrorSnapshot) {
+  const error = new Error(snapshot.message);
+  error.name = snapshot.name;
+  for (const key of ['code', 'status', 'pagePath', 'url']) {
+    if (snapshot[key] !== undefined) {
+      (error as any)[key] = snapshot[key];
+    }
+  }
+  return error;
+}

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/monkey.ts

@@ -2,6 +2,7 @@ import type { IModule } from '@cabloy/module-info';
 import type {
   BeanBase,
   BeanContainer,
+  IControllerLoadEvent,
   IMonkeyAppContextInitialize,
   IMonkeyAppInitialize,
   IMonkeyBeanInit,
@@ -23,11 +24,22 @@ export class Monkey
 {
   appContextInitialize(ctx: ZovaContext): void {
     ctx.meta.$ssr = ctx.app.ctx.meta.$ssr;
+    if (process.env.CLIENT) {
+      ctx.meta.$ssr.handleDirectOrOnHydrated(() => {
+        if (!ctx.disposed) {
+          ctx.meta.hooks.invokeHook('hydrated');
+        }
+      });
+    }
     if (process.env.SERVER) {
       ctx.meta.$ssr._registerServerContext(ctx);
     }
   }
 
+  controllerLoad(event: IControllerLoadEvent) {
+    event.ctx.meta.$ssr.controllerLoad(event);
+  }
+
   async appInitialize() {
     this.app.meta.event.on('a-router:routerGuards', async (router, next) => {
       if (process.env.CLIENT) {
@@ -104,8 +116,16 @@ export class Monkey
 
   private _ssrErrorHandler() {
     if (!process.env.SERVER) return;
-    const _eventErrorHandler = this.app.meta.event.on('app:errorHandler', (_data, next) => {
+    const _eventErrorHandler = this.app.meta.event.on('app:errorHandler', (data, next) => {
       const err = next();
+      if (data.load?.kind === 'controller-load') {
+        if (_isLoadErrorHandledServer(data.err)) {
+          data.load.disposition = 'handled';
+          if (!err || !(err instanceof Error)) return err;
+          return this._errorHandlerDefaultServer(err);
+        }
+        return err;
+      }
       if (!err || !(err instanceof Error)) return err;
       return this._errorHandlerDefaultServer(err);
     });
@@ -133,3 +153,7 @@ export class Monkey
     return undefined;
   }
 }
+
+function _isLoadErrorHandledServer(err: Error) {
+  return isNavigationFailure(err) || [301, 302, 401].includes(Number((err as any).code));
+}

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/types/ssr.ts

@@ -66,7 +66,21 @@ export interface SSRContextState {
   ssrProfile?: TypeSsrProfile;
   ssrProfileOptions?: Readonly<ISsrProfileOptions>;
 }
-export interface SSRContextStateDefer {}
+export interface SSRControllerLoadErrorSnapshot {
+  version: 1;
+  controllerBeanName?: string;
+  name: string;
+  message: string;
+  code?: number | string;
+  status?: number | string;
+  pagePath?: string;
+  url?: string;
+  controllerRecorded: boolean;
+}
+
+export interface SSRContextStateDefer {
+  controllerLoad?: Record<string, SSRControllerLoadErrorSnapshot>;
+}
 
 // from: quasar/dist/types/meta.d.ts
 // Cannot use `Record<string, string>` as TS would error out about `template` signature

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.104",
+  "version": "5.1.105",
   "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.89"
+    "zova-jsx": "^1.1.90"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.29",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.161",
+  "version": "5.1.162",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "dependencies": {
     "zova-module-a-api": "^5.1.22",
     "zova-module-a-app": "^5.1.26",
-    "zova-module-a-bean": "^5.1.35",
+    "zova-module-a-bean": "^5.1.36",
     "zova-module-a-behavior": "^5.1.26",
     "zova-module-a-behaviors": "^5.1.22",
     "zova-module-a-boundary": "^5.1.22",
@@ -21,18 +21,18 @@
     "zova-module-a-interceptor": "^5.1.31",
     "zova-module-a-logger": "^5.1.28",
     "zova-module-a-meta": "^5.1.22",
-    "zova-module-a-model": "^5.1.36",
+    "zova-module-a-model": "^5.1.37",
     "zova-module-a-openapi": "^5.1.54",
-    "zova-module-a-router": "^5.1.37",
+    "zova-module-a-router": "^5.1.38",
     "zova-module-a-routerstack": "^5.1.29",
     "zova-module-a-routertabs": "^5.1.34",
-    "zova-module-a-ssr": "^5.1.39",
+    "zova-module-a-ssr": "^5.1.40",
     "zova-module-a-ssrhmr": "^5.1.23",
     "zova-module-a-ssrserver": "^5.1.26",
     "zova-module-a-style": "^5.1.35",
     "zova-module-a-table": "^5.1.43",
     "zova-module-a-zod": "^5.1.37",
-    "zova-module-a-zova": "^5.1.104"
+    "zova-module-a-zova": "^5.1.105"
   },
   "title": "a-zova"
 }