zova-ui-empty 5.0.277 → 5.0.280

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-ui-empty",
-  "version": "5.0.277",
+  "version": "5.0.280",
   "description": "A vue3 empty framework with ioc",
   "publishConfig": {
     "access": "public"
@@ -52,7 +52,7 @@
     "vue": "^3.5.6",
     "vue-router": "^4.4.5",
     "zod": "^3.23.8",
-    "zova": "^5.0.202",
+    "zova": "^5.0.204",
     "zova-module-a-core": "^5.0.44",
     "zova-module-a-demo": "^5.0.0",
     "zova-module-a-model": "^5.0.26",
@@ -61,6 +61,7 @@
     "zova-module-a-style": "^5.0.38",
     "zova-module-a-tabs": "^5.0.20",
     "zova-module-home-api": "^5.0.0",
+    "zova-module-home-base": "^5.0.0",
     "zova-module-home-component": "^5.0.0",
     "zova-module-home-icon": "^5.0.0",
     "zova-module-home-index": "^5.0.0",
@@ -76,13 +77,13 @@
     "@types/node": "^20.14.2",
     "@vitejs/plugin-vue": "^5.0.5",
     "concurrently": "^8.2.2",
-    "quasar-app-extension-zova": "^1.1.165",
+    "quasar-app-extension-zova": "^1.1.167",
     "sass": "^1.77.5",
     "typescript": "^5.4.5",
     "vite": "^5.3.1",
     "vue-tsc": "^2.0.29",
-    "zova-vite": "^1.0.167"
+    "zova-vite": "^1.0.169"
   },
   "license": "MIT",
-  "gitHead": "62f882d65935a34eb02b395d9b818e0c1576312c"
+  "gitHead": "b89efc4131f17bc884c12d2921ac69cda4b799e1"
 }

package/package.original.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-ui-empty",
-  "version": "5.0.276",
+  "version": "5.0.279",
   "description": "A vue3 empty framework with ioc",
   "publishConfig": {
     "access": "public"
@@ -45,7 +45,7 @@
     "typestyle": "^2.4.0",
     "vue": "^3.5.6",
     "zod": "^3.23.8",
-    "zova": "^5.0.202"
+    "zova": "^5.0.204"
   },
   "devDependencies": {
     "@cabloy/lint": "^4.0.11",
@@ -53,13 +53,13 @@
     "@types/node": "^20.14.2",
     "@vitejs/plugin-vue": "^5.0.5",
     "concurrently": "^8.2.2",
-    "quasar-app-extension-zova": "^1.1.165",
+    "quasar-app-extension-zova": "^1.1.167",
     "sass": "^1.77.5",
     "typescript": "^5.4.5",
     "vite": "^5.3.1",
     "vue-tsc": "^2.0.29",
-    "zova-vite": "^1.0.167"
+    "zova-vite": "^1.0.169"
   },
   "license": "MIT",
-  "gitHead": "2e4d9bb972eb659ee729924bf7df496635c734a0"
+  "gitHead": "05d23697b757afe62aff4ff5de98a9babdd326e2"
 }

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

@@ -21,8 +21,8 @@ export * from '../routes.js';
 import 'zova';
 declare module 'zova' {
   export interface IPagePathRecord {
-    '/a/demo/component': never;
-    '/a/demo/state': never;
+    '/a/demo/component': undefined;
+    '/a/demo/state': undefined;
   }
   export interface IPageNameRecord {}
 }

package/src/suite/a-home/modules/home-api/src/monkey.ts

@@ -3,12 +3,12 @@ import axios from 'axios';
 import { BeanApi } from './bean/bean.api.js';
 
 export class Monkey extends BeanSimple implements IMonkeySystem {
-  async appInitialize(bean: BeanContainer) {
+  async appInitialize() {
     this.app.meta.$axios = axios;
-    this.app.meta.$api = (await bean._getBean('home-api.bean.api', false)) as BeanApi;
+    this.app.meta.$api = (await this.bean._getBean('home-api.bean.api', false)) as BeanApi;
   }
-  async appInitialized(_bean: BeanContainer) {}
-  async appReady(_bean: BeanContainer) {}
+  async appInitialized() {}
+  async appReady() {}
   async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
     const self = this;
     bean.defineProperty(beanInstance, '$api', {

package/src/suite/a-home/modules/home-base/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "zova-module-home-base",
+  "version": "5.0.0",
+  "title": "home-base",
+  "zovaModule": {
+    "capabilities": {
+      "monkey": true
+    },
+    "dependencies": {
+      "a-core": "5.0.0"
+    },
+    "bundle": {
+      "vendors": [
+        {
+          "match": [
+            "axios"
+          ],
+          "output": "axios"
+        }
+      ]
+    }
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./*": "./*"
+  },
+  "description": "",
+  "keywords": [
+    "Zova Module"
+  ],
+  "author": "",
+  "files": [
+    "mock",
+    "dist"
+  ],
+  "scripts": {},
+  "dependencies": {
+    "axios": "^1.6.8"
+  }
+}

package/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -0,0 +1,63 @@
+/** beans: begin */
+export * from '../bean/bean.api.js';
+export * from '../bean/style.default.js';
+export * from '../bean/theme.default.js';
+import { BeanApi } from '../bean/bean.api.js';
+import { StyleDefault } from '../bean/style.default.js';
+import { ThemeDefault } from '../bean/theme.default.js';
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecord {
+    'home-base.bean.api': BeanApi;
+    'home-base.style.default': StyleDefault;
+    'home-base.theme.default': ThemeDefault;
+  }
+}
+/** beans: end */
+/** components: begin */
+export * as NSControllerPage from '../component/page/controller.js';
+import * as NSControllerPage from '../component/page/controller.js';
+import component_page from '../component/page/index.vue';
+export const components = {
+  page: component_page,
+};
+import 'zova';
+declare module 'zova' {
+  export interface IComponentRecord {
+    'home-base:page': NSControllerPage.ControllerPage;
+  }
+}
+/** components: end */
+/** pages: begin */
+export * as NSControllerPageErrorNotFound from '../page/errorNotFound/controller.js';
+
+export * from '../routes.js';
+
+import 'zova';
+declare module 'zova' {
+  export interface IPagePathRecord {
+    '/home/base//:catchAll(.*)*': undefined;
+  }
+  export interface IPageNameRecord {}
+}
+export const pagePathSchemas = {};
+export const pageNameSchemas = {};
+/** pages: end */
+/** monkey: begin */
+export * from '../monkey.js';
+/** monkey: end */
+/** scope: begin */
+import { BeanScopeBase, Scope, TypeModuleResource } from 'zova';
+
+@Scope()
+export class ScopeModuleHomeBase extends BeanScopeBase {}
+
+export interface ScopeModuleHomeBase extends TypeModuleResource<typeof components, any, any, any, any, any> {}
+
+import 'zova';
+declare module 'zova' {
+  export interface IBeanScopeRecord {
+    'home-base': ScopeModuleHomeBase;
+  }
+}
+/** scope: end */

package/src/suite/a-home/modules/home-base/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'home-base';
+export { ScopeModuleHomeBase as ScopeModule } from './index.js';

package/src/suite/a-home/modules/home-base/src/bean/bean.api.ts

@@ -0,0 +1,63 @@
+import { Bean, BeanBase, Use } from 'zova';
+import axios, { AxiosInstance } from 'axios';
+import { markRaw } from 'vue';
+import type { ModelAuth } from 'zova-module-home-user';
+
+const SymbolApi = Symbol('SymbolApi');
+
+export interface BeanApi extends AxiosInstance {}
+
+@Bean()
+export class BeanApi extends BeanBase {
+  @Use('home-user.model.auth')
+  $$modelAuth: ModelAuth;
+
+  private [SymbolApi]: AxiosInstance;
+
+  protected async __init__() {
+    const baseURL = this.app.meta.util.getApiBaseURL();
+    this[SymbolApi] = markRaw(axios.create({ baseURL }));
+    this._addInterceptors(this[SymbolApi]);
+  }
+
+  protected __get__(prop) {
+    return this[SymbolApi] && this[SymbolApi][prop];
+  }
+
+  private _addInterceptors(api: AxiosInstance) {
+    // request
+    api.interceptors.request.use(
+      config => {
+        if (this.app.config.base.jwt) {
+          config.headers.Authorization = `Bearer ${this.$$modelAuth.jwtAuthorization || ''}`;
+        }
+        return config;
+      },
+      error => {
+        return Promise.reject(error);
+      },
+    );
+    // response
+    api.interceptors.response.use(
+      response => {
+        const contentType = response.headers['content-type'];
+        if (!contentType || contentType.indexOf('application/json') === -1) return response;
+        if (response.data.code !== 0) {
+          const error = new Error();
+          error.code = response.data.code;
+          error.message = response.data.message;
+          return Promise.reject(error);
+        }
+        // return data
+        return response.data.data;
+      },
+      error => {
+        if (error.response) {
+          error.code = (error.response.data && error.response.data.code) || error.response.status;
+          error.message = (error.response.data && error.response.data.message) || error.response.statusText;
+        }
+        return Promise.reject(error);
+      },
+    );
+  }
+}

package/src/suite/a-home/modules/home-base/src/bean/local.router.ts

@@ -0,0 +1,18 @@
+import { Local, Use } from 'zova';
+import { ScopeModule } from '../.metadata/this.js';
+import { BeanRouter, BeanRouterBase } from 'zova-module-a-router';
+import type { ModelAuth } from 'zova-module-home-user';
+
+@Local()
+export class LocalRouter extends BeanRouterBase<ScopeModule> {
+  @Use('home-user.model.auth')
+  $$modelAuth: ModelAuth;
+
+  protected onRouterGuards(router: BeanRouter) {
+    router.beforeEach(async to => {
+      if (to.meta.requiresAuth !== false && !this.$$modelAuth.isAuthenticated) {
+        return '/login';
+      }
+    });
+  }
+}

package/src/suite/a-home/modules/home-base/src/bean/local.ssr.ts

@@ -0,0 +1,25 @@
+import { BeanBase, Local } from 'zova';
+import { ScopeModule } from '../.metadata/this.js';
+
+@Local()
+export class LocalSSR extends BeanBase<ScopeModule> {
+  public async initialize() {
+    // ssr hydrated
+    if (process.env.CLIENT) {
+      this.ctx.meta.ssr.onHydrated(() => {
+        // do something
+      });
+    }
+    // ssr theme
+    if (process.env.SERVER) {
+      this.ctx.meta.ssr.context.onRendered(() => {
+        if (!this.app.config.ssr.cookieThemeDark) {
+          this.ctx.meta.ssr.context._meta.bodyTags += `<script id="__prefersColorSchemeDarkJS">
+            document.body.setAttribute('data-theme', window.ssr_themedark_data);
+            document.querySelector('#__prefersColorSchemeDarkJS').remove();
+          </script>`.replaceAll('\n', '');
+        }
+      });
+    }
+  }
+}

package/src/suite/a-home/modules/home-base/src/bean/style.default.ts

@@ -0,0 +1,18 @@
+import { BeanBase, Style, useComputed } from 'zova';
+import { ScopeModule } from '../.metadata/this.js';
+
+@Style()
+export class StyleDefault extends BeanBase<ScopeModule> {
+  textCenter: string;
+  buttonPrimary: string;
+
+  protected async __init__() {
+    this.textCenter = this.$style({ textAlign: 'center' });
+    this.buttonPrimary = useComputed(() => {
+      return this.$style({
+        color: this.$token.color.primary,
+        borderColor: this.$token.var.borderColor,
+      });
+    });
+  }
+}

package/src/suite/a-home/modules/home-base/src/bean/theme.default.ts

@@ -0,0 +1,25 @@
+import { BeanBase, Theme } from 'zova';
+import { ScopeModule } from '../.metadata/this.js';
+import { ThemeApplyParams, ThemeApplyResult, ThemeBase } from 'zova-module-a-style';
+import { ThemeToken } from 'zova-module-a-devui';
+
+@Theme()
+export class ThemeDefault extends BeanBase<ScopeModule> implements ThemeBase {
+  async apply({ name: _name, dark }: ThemeApplyParams): Promise<ThemeApplyResult> {
+    const token: ThemeToken = {
+      color: {
+        primary: '#1976d2',
+      },
+      var: {
+        borderColor: '#297acc',
+      },
+      component: {
+        page: {
+          background: dark ? '#121212' : '#fff',
+          color: dark ? '#fff' : '#000',
+        },
+      },
+    };
+    return { token };
+  }
+}

package/src/suite/a-home/modules/home-base/src/component/page/controller.ts

@@ -0,0 +1,18 @@
+import { BeanControllerBase, Local, PropsBase } from 'zova';
+import { ScopeModule } from '../../.metadata/this.js';
+import { JSX } from 'vue/jsx-runtime';
+
+export interface Props extends PropsBase<ControllerPage, Slots> {}
+
+export type Emits = {};
+
+export interface Slots {
+  default?(): JSX.Element;
+}
+
+@Local()
+export class ControllerPage extends BeanControllerBase<ScopeModule, Props, Emits, Slots> {
+  static $propsDefault = {};
+
+  protected async __init__() {}
+}

package/src/suite/a-home/modules/home-base/src/component/page/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <template></template>
+</template>
+
+<script setup lang="ts">
+import { useController } from 'zova';
+import { ControllerPage, Props, Emits } from './controller.js';
+import { RenderPage } from './render.jsx';
+import { StylePage } from './style.js';
+const props = withDefaults(defineProps<Props>(), ControllerPage.$propsDefault);
+const emit = defineEmits<Emits>();
+useController(props, emit, ControllerPage, RenderPage, StylePage);
+</script>

package/src/suite/a-home/modules/home-base/src/component/page/render.tsx

@@ -0,0 +1,12 @@
+import { BeanRenderBase, Local } from 'zova';
+import type { StylePage } from './style.js';
+import { ScopeModule } from '../../.metadata/this.js';
+
+export interface RenderPage extends StylePage {}
+
+@Local()
+export class RenderPage extends BeanRenderBase<ScopeModule> {
+  render() {
+    return <div class={this.cPage}>{this.$slots.default?.()}</div>;
+  }
+}

package/src/suite/a-home/modules/home-base/src/component/page/style.ts

@@ -0,0 +1,16 @@
+import { BeanStyleBase, Local } from 'zova';
+import type { ControllerPage } from './controller.js';
+import { ScopeModule } from '../../.metadata/this.js';
+
+export interface StylePage extends ControllerPage {}
+
+@Local()
+export class StylePage extends BeanStyleBase<ScopeModule> {
+  cPage: string;
+
+  protected async __init__() {
+    this.cPage = this.$style({
+      padding: '16px',
+    });
+  }
+}

package/src/suite/a-home/modules/home-base/src/index.ts

@@ -0,0 +1,2 @@
+export * from './.metadata/index.js';
+export * from './types.js';

package/src/suite/a-home/modules/home-base/src/monkey.ts

@@ -0,0 +1,31 @@
+import { BeanBase, BeanContainer, BeanSimple, IMonkeyAppInitialize, IMonkeyBeanInit } from 'zova';
+import axios from 'axios';
+import { BeanApi } from './bean/bean.api.js';
+import { LocalRouter } from './bean/local.router.js';
+import { LocalSSR } from './bean/local.ssr.js';
+
+export class Monkey extends BeanSimple implements IMonkeyAppInitialize, IMonkeyBeanInit {
+  localRouter: LocalRouter;
+  localSSR: LocalSSR;
+
+  async appInitialize() {
+    // api
+    this.app.meta.$axios = axios;
+    this.app.meta.$api = (await this.bean._getBean('home-base.bean.api', false)) as BeanApi;
+    // router
+    this.localRouter = await this.bean._newBean(LocalRouter, false);
+    // ssr
+    this.localSSR = await this.bean._newBean(LocalSSR, false);
+    await this.localSSR.initialize();
+  }
+  async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
+    const self = this;
+    bean.defineProperty(beanInstance, '$api', {
+      enumerable: false,
+      configurable: true,
+      get() {
+        return self.app.meta.$api;
+      },
+    });
+  }
+}

package/src/suite/a-home/modules/home-base/src/page/errorNotFound/controller.ts

@@ -0,0 +1,7 @@
+import { BeanControllerPageBase, Local } from 'zova';
+import { ScopeModule } from '../../.metadata/this.js';
+
+@Local()
+export class ControllerPageErrorNotFound extends BeanControllerPageBase<ScopeModule> {
+  protected async __init__() {}
+}

package/src/suite/a-home/modules/home-base/src/page/errorNotFound/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <template></template>
+</template>
+
+<script setup lang="ts">
+import { useControllerPage } from 'zova';
+import { ControllerPageErrorNotFound } from './controller.js';
+import { RenderErrorNotFound } from './render.jsx';
+import { StyleErrorNotFound } from './style.js';
+useControllerPage(ControllerPageErrorNotFound, RenderErrorNotFound, StyleErrorNotFound);
+</script>

package/src/suite/a-home/modules/home-base/src/page/errorNotFound/render.tsx

@@ -0,0 +1,25 @@
+import { BeanRenderBase, Local } from 'zova';
+import type { StyleErrorNotFound } from './style.js';
+import { ScopeModule } from '../../.metadata/this.js';
+import { RouterLink } from 'vue-router';
+
+export interface RenderErrorNotFound extends StyleErrorNotFound {}
+
+@Local()
+export class RenderErrorNotFound extends BeanRenderBase<ScopeModule> {
+  render() {
+    return (
+      <div class="fill-height bg-blue text-white text-center">
+        <div>
+          <div style="font-size: 30vh">404</div>
+
+          <div class="text-h2" style="opacity:.4">
+            Oops. Nothing here...
+          </div>
+
+          <RouterLink to="/">Go Home</RouterLink>
+        </div>
+      </div>
+    );
+  }
+}

package/src/suite/a-home/modules/home-base/src/page/errorNotFound/style.ts

@@ -0,0 +1,10 @@
+import { BeanStyleBase, Local } from 'zova';
+import type { ControllerPageErrorNotFound } from './controller.js';
+import { ScopeModule } from '../../.metadata/this.js';
+
+export interface StyleErrorNotFound extends ControllerPageErrorNotFound {}
+
+@Local()
+export class StyleErrorNotFound extends BeanStyleBase<ScopeModule> {
+  protected async __init__() {}
+}

package/src/suite/a-home/modules/home-base/src/routes.ts

@@ -0,0 +1,15 @@
+import ErrorNotFound from './page/errorNotFound/index.vue';
+import { IModuleRoute } from 'zova-module-a-router';
+
+export const routes: IModuleRoute[] = [
+  {
+    path: '/:catchAll(.*)*',
+    component: ErrorNotFound,
+    meta: {
+      absolute: true,
+      layout: 'empty',
+      requiresAuth: false,
+    },
+  },
+  { path: 'errorNotFound', component: ErrorNotFound },
+];

package/src/suite/a-home/modules/home-base/src/types.ts

@@ -0,0 +1,17 @@
+import { AxiosInstance } from 'axios';
+import { BeanApi } from './bean/bean.api.js';
+import { StyleDefault } from './bean/style.default.js';
+import { components } from './.metadata/index.js';
+import 'zova';
+
+declare module 'zova' {
+  export interface AppMeta {
+    $axios: AxiosInstance;
+    $api: BeanApi;
+  }
+  export interface BeanBase {
+    $api: BeanApi;
+    $class: StyleDefault;
+    $component: typeof components;
+  }
+}

package/src/suite/a-home/modules/home-index/src/.metadata/index.ts

@@ -6,7 +6,7 @@ export * from '../routes.js';
 import 'zova';
 declare module 'zova' {
   export interface IPagePathRecord {
-    '/home/index': never;
+    '/home/index': undefined;
   }
   export interface IPageNameRecord {}
 }

package/src/suite/a-home/modules/home-pagesystem/src/.metadata/index.ts

@@ -6,7 +6,7 @@ export * from '../routes.js';
 import 'zova';
 declare module 'zova' {
   export interface IPagePathRecord {
-    '/home/pagesystem//:catchAll(.*)*': never;
+    '/home/pagesystem//:catchAll(.*)*': undefined;
   }
   export interface IPageNameRecord {}
 }

package/src/suite/a-home/modules/home-router/src/monkey.ts

@@ -4,12 +4,12 @@ import { LocalRouter } from './bean/local.router.js';
 export class Monkey extends BeanSimple implements IMonkeySystem {
   localRouter: LocalRouter;
 
-  async appInitialize(bean: BeanContainer) {
+  async appInitialize() {
     // router
-    this.localRouter = await bean._newBean(LocalRouter, false);
+    this.localRouter = await this.bean._newBean(LocalRouter, false);
   }
-  async appInitialized(_bean: BeanContainer) {}
-  async appReady(_bean: BeanContainer) {}
+  async appInitialized() {}
+  async appReady() {}
 
   async beanInit(_bean: BeanContainer, _beanInstance: BeanBase) {}
   async beanInited(_bean: BeanContainer, _beanInstance: BeanBase) {}

package/src/suite/a-home/package.json

@@ -12,6 +12,7 @@
     "zova-module-home-layout": "workspace:^",
     "zova-module-home-router": "workspace:^",
     "zova-module-home-api": "workspace:^",
-    "zova-module-home-component": "workspace:^"
+    "zova-module-home-component": "workspace:^",
+    "zova-module-home-base": "workspace:^"
   }
 }

package/tsconfig.base.json

@@ -1,6 +1,10 @@
 {
   "extends": "./tsconfig.base.esm",
   "compilerOptions": {
-    "noEmit": true
+    "noEmit": true,
+    "baseUrl": "./",
+    "paths": {
+      "@/*": ["src/legacy/*"]
+    }
   }
 }

package/src/front/config/monkey.ts

@@ -1,25 +0,0 @@
-import {
-  BeanBase,
-  BeanContainer,
-  BeanSimple,
-  IModule,
-  IMonkeyApp,
-  IMonkeyController,
-  IMonkeySystem,
-  IControllerData,
-} from 'zova';
-
-export class AppMonkey extends BeanSimple implements IMonkeyApp, IMonkeySystem, IMonkeyController {
-  async moduleLoading(_module: IModule) {}
-  async moduleLoaded(_module: IModule) {}
-  async configLoaded(_module: IModule, _config) {}
-  async appInitialize(_bean: BeanContainer) {}
-  async appInitialized(_bean: BeanContainer) {}
-  async appReady(_bean: BeanContainer) {}
-  async beanInit(_bean: BeanContainer, _beanInstance: BeanBase) {}
-  async beanInited(_bean: BeanContainer, _beanInstance: BeanBase) {}
-  beanDispose(_bean: BeanContainer, _beanInstance: BeanBase) {}
-  beanDisposed(_bean: BeanContainer, _beanInstance: BeanBase) {}
-  controllerDataPrepare(_controllerData: IControllerData) {}
-  controllerDataInit(_controllerData: IControllerData, _controller: BeanBase) {}
-}