cabloy 5.1.50 → 5.1.52

package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/index.ts

@@ -46,6 +46,7 @@ export * from '../page/routeQuery/controller.jsx';
 export * from '../page/routeQueryB/controller.jsx';
 export * from '../page/state/controller.jsx';
 export * from '../page/style/controller.jsx';
+export * from '../page/toolMinimal/controller.jsx';
 export * from '../page/toolOne/controller.jsx';
 export * from '../page/toolTwo/controller.jsx';
 
@@ -111,6 +112,11 @@ declare module 'zova-module-demo-basic' {
           get scope(): ScopeModuleDemoBasic;
         }
 
+        export interface ControllerPageToolMinimal {
+          /** @internal */
+          get scope(): ScopeModuleDemoBasic;
+        }
+
         export interface ControllerPageToolOne {
           /** @internal */
           get scope(): ScopeModuleDemoBasic;
@@ -134,6 +140,7 @@ import { ControllerPageRouteQuery } from '../page/routeQuery/controller.jsx';
 import { ControllerPageRouteQueryB } from '../page/routeQueryB/controller.jsx';
 import { ControllerPageState } from '../page/state/controller.jsx';
 import { ControllerPageStyle } from '../page/style/controller.jsx';
+import { ControllerPageToolMinimal } from '../page/toolMinimal/controller.jsx';
 import { ControllerPageToolOne } from '../page/toolOne/controller.jsx';
 import { ControllerPageToolTwo } from '../page/toolTwo/controller.jsx';
 import 'zova';
@@ -150,6 +157,7 @@ declare module 'zova' {
 'demo-basic.controller.pageRouteQueryB': ControllerPageRouteQueryB;
 'demo-basic.controller.pageState': ControllerPageState;
 'demo-basic.controller.pageStyle': ControllerPageStyle;
+'demo-basic.controller.pageToolMinimal': ControllerPageToolMinimal;
 'demo-basic.controller.pageToolOne': ControllerPageToolOne;
 'demo-basic.controller.pageToolTwo': ControllerPageToolTwo;
   }
@@ -166,6 +174,7 @@ export * from './page/routeQueryB.js';
 import { NSControllerPageRouteQueryB } from './page/routeQueryB.js';
 export * from './page/state.js';
 export * from './page/style.js';
+export * from './page/toolMinimal.js';
 export * from './page/toolOne.js';
 import { NSControllerPageToolOne } from './page/toolOne.js';
 export * from './page/toolTwo.js';
@@ -182,11 +191,13 @@ export interface IPagePathRecord {
 '/demo/basic/routeQueryB': TypePagePathSchema<NSControllerPageRouteQueryB.ParamsInput,NSControllerPageRouteQueryB.QueryInput>;
 '/demo/basic/state': TypePagePathSchema<undefined,undefined>;
 '/demo/basic/style': TypePagePathSchema<undefined,undefined>;
+'/demo/basic/toolMinimal': TypePagePathSchema<undefined,undefined>;
 '/demo/basic/toolOne/:id?': TypePagePathSchema<NSControllerPageToolOne.ParamsInput,NSControllerPageToolOne.QueryInput>;
 '/demo/basic/toolTwo/:id?': TypePagePathSchema<NSControllerPageToolTwo.ParamsInput,NSControllerPageToolTwo.QueryInput>;
 }
 export interface IPageNameRecord {
   'demo-basic:routeParams': undefined;
+'demo-basic:toolMinimal': undefined;
 'demo-basic:toolOne': undefined;
 'demo-basic:toolTwo': undefined;
 }

package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/page/toolMinimal.ts

@@ -0,0 +1,9 @@
+import { createZovaComponentPage } from 'zova';
+
+import { ControllerPageToolMinimal } from '../../page/toolMinimal/controller.jsx';
+
+export const ZPageToolMinimal = createZovaComponentPage(
+  ControllerPageToolMinimal,
+  undefined,
+  undefined,
+);

package/zova/src/suite/a-demo/modules/demo-basic/src/page/toolMinimal/controller.tsx

@@ -0,0 +1,11 @@
+import { BeanControllerPageBase } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+@Controller()
+export class ControllerPageToolMinimal extends BeanControllerPageBase {
+  protected async __init__() {}
+
+  protected render() {
+    return <div>minimal</div>;
+  }
+}

package/zova/src/suite/a-demo/modules/demo-basic/src/routes.ts

@@ -7,6 +7,7 @@ import { ZPageRouteQuery } from './.metadata/page/routeQuery.js';
 import { ZPageRouteQueryB } from './.metadata/page/routeQueryB.js';
 import { ZPageState } from './.metadata/page/state.js';
 import { ZPageStyle } from './.metadata/page/style.js';
+import { ZPageToolMinimal } from './.metadata/page/toolMinimal.js';
 import { ZPageToolOne } from './.metadata/page/toolOne.js';
 import { ZPageToolTwo } from './.metadata/page/toolTwo.js';
 
@@ -26,6 +27,15 @@ export const routes: IModuleRoute[] = [
     },
   },
   { path: 'routeQueryB', component: ZPageRouteQueryB, meta: { requiresAuth: false } },
+  {
+    name: 'toolMinimal',
+    path: 'toolMinimal',
+    component: ZPageToolMinimal,
+    meta: {
+      layout: 'empty',
+      requiresAuth: false,
+    },
+  },
   {
     name: 'toolOne',
     path: 'toolOne/:id?',

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

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

package/zova/src/suite-vendor/a-zova/modules/a-model/src/service/storage.ts

@@ -10,11 +10,10 @@ export class ServiceStorage extends BeanBase {
 
   async moduleLoaded() {
     // options
-    let options = this.scope.config.queryClientConfig.defaultOptions;
+    const options = deepExtend({}, this.scope.config.queryClientConfig.defaultOptions);
     if (process.env.SERVER) {
-      options = deepExtend({}, options, {
-        queries: { gcTime: Infinity },
-      });
+      options.queries ??= {};
+      options.queries.gcTime = Infinity;
     }
     // queryCache
     const queryCache = new QueryCache();
@@ -39,7 +38,7 @@ export class ServiceStorage extends BeanBase {
             },
           });
         }
-        this._queryClient.clear();
+        this._queryClient?.clear();
       });
     }
     // client

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

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

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

@@ -22,7 +22,7 @@ export class Monkey extends BeanSimple implements IMonkeyModule, IMonkeyBeanInit
     if (this._moduleSelf === module) {
       await this._loadSdk();
       this.ctx.util.instanceScope(() => {
-        return watch(
+        watch(
           () => {
             return this.app.meta.locale.current;
           },

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.18",
+  "version": "5.1.19",
   "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 } from 'zova';
+import type { Functionable, ZovaContext } from 'zova';
 
 import { includeBooleanAttr, isBooleanAttr, isString, stringifyStyle } from '@vue/shared';
 import { defu } from 'defu';
@@ -23,6 +23,7 @@ const SymbolOnHydrateds = Symbol('SymbolOnHydrateds');
 const SymbolOnHydratePropHasMismatches = Symbol('SymbolOnHydratePropHasMismatches');
 const SymbolInstanceUpdates = Symbol('SymbolInstanceUpdates');
 const SymbolHydratingCounter = Symbol('SymbolHydratingCounter');
+const SymbolServerContexts = Symbol('SymbolServerContexts');
 
 export class CtxSSR extends BeanSimple {
   private [SymbolIsRuntimeSsrPreHydration]: Ref<boolean> = ref(false);
@@ -33,11 +34,15 @@ export class CtxSSR extends BeanSimple {
   private [SymbolInstanceUpdates]: ComponentInternalInstance[] = [];
 
   private [SymbolHydratingCounter]: number = 0;
+  private [SymbolServerContexts]: Set<ZovaContext> = new Set();
 
   public metaStore: CtxSSRMetaStore;
 
   /** @internal */
   public initialize() {
+    if (process.env.SERVER) {
+      this._serverContextRegister();
+    }
     // ssr state
     this[SymbolSSRState] = this.sys.bean._getBeanSyncOnly('a-ssr.sys.ssrState');
     // SymbolIsRuntimeSsrPreHydration
@@ -63,6 +68,26 @@ export class CtxSSR extends BeanSimple {
     }
   }
 
+  private _serverContextRegister(currentContext: ZovaContext = this.ctx) {
+    const serverContexts = this[SymbolServerContexts];
+    serverContexts.add(currentContext);
+    this.context.onRendered(() => {
+      serverContexts.delete(currentContext);
+    });
+  }
+
+  private _serverContextsDispose() {
+    const serverContexts = this[SymbolServerContexts];
+    for (const serverContext of serverContexts) {
+      if (serverContext.disposed) continue;
+      if (serverContext.bean && serverContext.bean !== serverContext.app?.bean) {
+        serverContext.bean.dispose();
+      }
+      serverContext.dispose();
+    }
+    serverContexts.clear();
+  }
+
   get isRuntimeSsrPreHydration() {
     return this[SymbolIsRuntimeSsrPreHydration].value;
   }
@@ -265,4 +290,14 @@ export class CtxSSR extends BeanSimple {
     }
     return false;
   }
+
+  /** @internal */
+  public _registerServerContext(currentContext: ZovaContext) {
+    this._serverContextRegister(currentContext);
+  }
+
+  /** @internal */
+  public _disposeServerContexts() {
+    this._serverContextsDispose();
+  }
 }

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

@@ -32,13 +32,18 @@ export class CtxSSRMetaStore extends BeanSimple {
   }
 
   private _onRenderedLast(err?: Error) {
-    if (!err) {
+    const app = this.app;
+    try {
+      if (err) return;
+
       const ssrContext = this.ctx.meta.$ssr.context;
       this._injectContextState(ssrContext);
       this._injectContextStateDefer(ssrContext);
       this._injectServerMeta(ssrContext);
+    } finally {
+      this.ctx.meta.$ssr._disposeServerContexts();
+      app?.close();
     }
-    this.app.close();
   }
 
   addMetaOptions(metaOptionsWrapper: SSRMetaOptionsWrapper) {

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

@@ -22,6 +22,9 @@ export class Monkey
 {
   appContextInitialize(ctx: ZovaContext): void {
     ctx.meta.$ssr = ctx.app.ctx.meta.$ssr;
+    if (process.env.SERVER) {
+      ctx.meta.$ssr._registerServerContext(ctx);
+    }
   }
 
   async appInitialize() {

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssrserver",
-  "version": "5.1.15",
+  "version": "5.1.16",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-ssrserver/src/service/ssrHandler.ts

@@ -72,42 +72,83 @@ export class ServiceSsrHandler extends BeanBase {
         onRenderedList.push(fn);
       },
     };
-    // render
-    const renderFn = await serverEntry(ssrContext);
-    const [runtimePageContent, err] = await catchError(() => {
-      return renderToString(renderFn, ssrContext);
-    });
+    let renderFn;
+    let runtimePageContent = '';
+    let renderedError;
+    let onRenderedFlushed = false;
+    let renderedFinalized = false;
+    try {
+      // render
+      renderFn = await serverEntry(ssrContext);
+      const [runtimePageContentInner, err] = await catchError(() => {
+        return renderToString(renderFn, ssrContext);
+      });
+      if (runtimePageContentInner) {
+        runtimePageContent = runtimePageContentInner as string;
+      }
 
-    const error = ssrContext._meta.renderError ?? err;
-    onRenderedList.forEach(fn => {
-      fn(error);
-    });
-    cast(ssrContext).rendered(error);
-    if (error) {
-      if (error instanceof Error) throw error;
-      return error;
-    }
+      const error = ssrContext._meta.renderError ?? err;
+      renderedError = error;
+      onRenderedList.forEach(fn => {
+        fn(error);
+      });
+      onRenderedFlushed = true;
+      cast(ssrContext).rendered(error);
+      renderedFinalized = true;
+      if (error) {
+        if (error instanceof Error) throw error;
+        return error;
+      }
 
-    ssrContext._meta.runtimePageContent = runtimePageContent;
+      ssrContext._meta.runtimePageContent = runtimePageContent;
+
+      // @vitejs/plugin-vue injects code into a component's setup() that registers
+      // itself on ctx.modules. After the render, ctx.modules would contain all the
+      // components that have been instantiated during this render call.
+      const modules = cast(ssrContext).modules;
+      if (modules) {
+        ssrContext._meta.endingHeadTags += this._renderModulesPreload_zova(modules, {
+          ssrContext,
+        });
+        ssrContext._meta.endingHeadTags += this._renderModulesPreload(modules, {
+          ssrContext,
+        });
+      }
 
-    // @vitejs/plugin-vue injects code into a component's setup() that registers
-    // itself on ctx.modules. After the render, ctx.modules would contain all the
-    // components that have been instantiated during this render call.
-    ssrContext._meta.endingHeadTags += this._renderModulesPreload_zova(cast(ssrContext).modules, {
-      ssrContext,
-    });
-    ssrContext._meta.endingHeadTags += this._renderModulesPreload(cast(ssrContext).modules, {
-      ssrContext,
-    });
+      const html = renderTemplate(ssrContext);
 
-    const html = renderTemplate(ssrContext);
+      // transferCache
+      await this._renderTransferCache(options, route);
 
-    // transferCache
-    await this._renderTransferCache(options, route);
+      // todo: ssg
 
-    // todo: ssg
+      return html;
+    } finally {
+      const context = cast(ssrContext);
+      if (!onRenderedFlushed) {
+        onRenderedList.forEach(fn => {
+          fn(renderedError);
+        });
+      }
+      if (!renderedFinalized && typeof context.rendered === 'function') {
+        context.rendered(renderedError);
+      }
+      onRenderedList.length = 0;
+      this._clearSsrContext(context);
+      renderFn = undefined;
+    }
+  }
 
-    return html;
+  private _clearSsrContext(context): void {
+    context.modules?.clear?.();
+    if (context.__qMetaList?.length) {
+      context.__qMetaList.length = 0;
+    }
+    context.state = undefined;
+    context.stateDefer = undefined;
+    context.performAction = undefined;
+    context.rendered = undefined;
+    context._meta = undefined;
   }
 
   public async ensureReady(handlerNonce: number) {

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.60",
+  "version": "5.1.61",
   "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.54"
+    "zova-jsx": "^1.1.55"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.14",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.92",
+  "version": "5.1.93",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -21,18 +21,18 @@
     "zova-module-a-interceptor": "^5.1.22",
     "zova-module-a-logger": "^5.1.20",
     "zova-module-a-meta": "^5.1.15",
-    "zova-module-a-model": "^5.1.23",
-    "zova-module-a-openapi": "^5.1.30",
+    "zova-module-a-model": "^5.1.24",
+    "zova-module-a-openapi": "^5.1.31",
     "zova-module-a-router": "^5.1.23",
     "zova-module-a-routerstack": "^5.1.20",
     "zova-module-a-routertabs": "^5.1.25",
-    "zova-module-a-ssr": "^5.1.18",
+    "zova-module-a-ssr": "^5.1.19",
     "zova-module-a-ssrhmr": "^5.1.16",
-    "zova-module-a-ssrserver": "^5.1.15",
+    "zova-module-a-ssrserver": "^5.1.16",
     "zova-module-a-style": "^5.1.25",
     "zova-module-a-table": "^5.1.27",
     "zova-module-a-zod": "^5.1.23",
-    "zova-module-a-zova": "^5.1.60"
+    "zova-module-a-zova": "^5.1.61"
   },
   "title": "a-zova"
 }