cabloy 5.1.111 → 5.1.113

package/zova/pnpm-lock.yaml

@@ -76,7 +76,7 @@ importers:
         specifier: ^10.4.27
         version: 10.5.2(postcss@8.5.15)
       axios:
-        specifier: ^1.16.1
+        specifier: ^1.18.1
         version: 1.18.1(supports-color@10.2.2)
       compression:
         specifier: ^1.8.1
@@ -425,7 +425,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.5
       zova-cli-set-front:
-        specifier: ^1.2.96
+        specifier: ^1.2.97
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -846,7 +846,7 @@ importers:
         specifier: ^5.1.78
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.137
+        specifier: ^5.1.138
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -944,7 +944,7 @@ importers:
   src/suite-vendor/a-cabloy:
     dependencies:
       zova-module-rest-resource:
-        specifier: ^5.1.41
+        specifier: ^5.1.42
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/rest-resource:
@@ -965,7 +965,7 @@ importers:
         specifier: ^5.1.25
         version: link:modules/a-app
       zova-module-a-bean:
-        specifier: ^5.1.31
+        specifier: ^5.1.32
         version: link:modules/a-bean
       zova-module-a-behavior:
         specifier: ^5.1.25
@@ -980,7 +980,7 @@ importers:
         specifier: ^5.1.33
         version: link:modules/a-command
       zova-module-a-fetch:
-        specifier: ^5.1.23
+        specifier: ^5.1.24
         version: link:modules/a-fetch
       zova-module-a-form:
         specifier: ^5.1.45
@@ -1001,10 +1001,10 @@ importers:
         specifier: ^5.1.33
         version: link:modules/a-model
       zova-module-a-openapi:
-        specifier: ^5.1.45
+        specifier: ^5.1.46
         version: link:modules/a-openapi
       zova-module-a-router:
-        specifier: ^5.1.30
+        specifier: ^5.1.31
         version: link:modules/a-router
       zova-module-a-routerstack:
         specifier: ^5.1.26
@@ -1104,7 +1104,7 @@ importers:
   src/suite-vendor/a-zova/modules/a-fetch:
     dependencies:
       axios:
-        specifier: ^1.16.1
+        specifier: ^1.18.1
         version: 1.18.1(supports-color@10.2.2)
     devDependencies:
       clean-package:

package/zova/src/front/config/config/config.cabloyCommerce.ts

@@ -8,7 +8,11 @@ export default function (_sys: ZovaSys) {
       '/home/indexadmin/dashboard': undefined,
     },
     name: {
-      'home-indexweb:home': { alias: '/:locale(zh-cn)?' },
+      'commerce-catalog:catalogue': { alias: '/:locale(zh-cn)?' },
+      'commerce-catalog:product': { alias: '/:locale(zh-cn)?/product/:id' },
+      'commerce-member:address': { alias: '/:locale(zh-cn)?/address' },
+      'commerce-trade:cart': { alias: '/:locale(zh-cn)?/cart' },
+      'home-indexweb:home': undefined,
     },
   };
 

package/zova/src/front/config/config/config.cabloyCommerceAdmin.ts

@@ -5,7 +5,8 @@ export default function (_sys: ZovaSys) {
 
   config.routes = {
     path: {
-      '/home/indexadmin/dashboard': { alias: '/' },
+      '/commerce/siteadmin/dashboard': { alias: '/' },
+      '/home/indexadmin/dashboard': undefined,
     },
   };
 

package/zova/src/suite/a-commerce/modules/commerce-catalog/cli/openapi.config.ts

@@ -0,0 +1,9 @@
+import type { ZovaOpenapiConfigModule } from 'zova-openapi';
+
+export default function (): ZovaOpenapiConfigModule {
+  return {
+    operations: {
+      match: [/^CommerceCatalogProduct_(selectPublic|viewPublic)$/],
+    },
+  };
+}

package/zova/src/suite/a-commerce/modules/commerce-catalog/package.json

@@ -11,7 +11,8 @@
     "dist",
     "src",
     "icons",
-    "assets"
+    "assets",
+    "cli"
   ],
   "type": "module",
   "exports": {

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/index.ts

@@ -1,6 +1,197 @@
 // eslint-disable
+/** model: begin */
+export * from '../model/catalogue.js';
+import { IModelOptionsCatalogue } from '../model/catalogue.js';
+import 'zova-module-a-model';
+declare module 'zova-module-a-model' {
+  
+    export interface IModelRecord {
+      'commerce-catalog:catalogue': IModelOptionsCatalogue;
+    }
+
+  
+}
+declare module 'zova-module-commerce-catalog' {
+  
+        export interface ModelCatalogue {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+        export interface ModelCatalogue {
+          get $beanFullName(): 'commerce-catalog.model.catalogue';
+          get $onionName(): 'commerce-catalog:catalogue';
+          get $onionOptions(): IModelOptionsCatalogue;
+        } 
+}
+/** model: end */
+/** model: begin */
+import { ModelCatalogue } from '../model/catalogue.js';
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecordGeneral {
+    'commerce-catalog.model.catalogue': ModelCatalogue;
+  }
+}
+/** model: end */
+/** api: begin */
+export * from '../api/commerceCatalogProduct.js';
+
+import 'zova';
+declare module 'zova' {
+  
+  
+}
+declare module 'zova-module-commerce-catalog' {
+  
+        export interface ApiCommerceCatalogProduct {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+        export interface ApiCommerceCatalogProduct {
+          get $beanFullName(): 'commerce-catalog.api.commerceCatalogProduct';
+          get $onionName(): 'commerce-catalog:commerceCatalogProduct';
+          
+        } 
+}
+/** api: end */
+/** api: begin */
+import { ApiCommerceCatalogProduct } from '../api/commerceCatalogProduct.js';
+export interface IModuleApi {
+  'commerceCatalogProduct': ApiCommerceCatalogProduct;
+}
+/** api: end */
+/** api: begin */
+
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecordGeneral {
+    'commerce-catalog.api.commerceCatalogProduct': ApiCommerceCatalogProduct;
+  }
+}
+/** api: end */
+/** openapi: begin */
+export * from '../api/openapi/index.js';
+/** openapi: end */
+/** apiSchema: begin */
+export * from '../apiSchema/commerceCatalogProduct.js';
+
+import 'zova';
+declare module 'zova' {
+  
+  
+}
+declare module 'zova-module-commerce-catalog' {
+  
+        export interface ApiSchemaCommerceCatalogProduct {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+        export interface ApiSchemaCommerceCatalogProduct {
+          get $beanFullName(): 'commerce-catalog.apiSchema.commerceCatalogProduct';
+          get $onionName(): 'commerce-catalog:commerceCatalogProduct';
+          
+        } 
+}
+/** apiSchema: end */
+/** apiSchema: begin */
+import { ApiSchemaCommerceCatalogProduct } from '../apiSchema/commerceCatalogProduct.js';
+export interface IModuleApiSchema {
+  'commerceCatalogProduct': ApiSchemaCommerceCatalogProduct;
+}
+/** apiSchema: end */
+/** apiSchema: begin */
+
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecordGeneral {
+    'commerce-catalog.apiSchema.commerceCatalogProduct': ApiSchemaCommerceCatalogProduct;
+  }
+}
+/** apiSchema: end */
+/** controller: begin */
+export * from '../page/catalogue/controller.jsx';
+export * from '../page/product/controller.jsx';
+
+import 'zova';
+declare module 'zova' {
+  
+  
+}
+declare module 'zova-module-commerce-catalog' {
+  
+        export interface ControllerPageCatalogue {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+        export interface ControllerPageProduct {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        } 
+}
+/** controller: end */
+/** controller: begin */
+import { ControllerPageCatalogue } from '../page/catalogue/controller.jsx';
+import { ControllerPageProduct } from '../page/product/controller.jsx';
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecordLocal {
+    'commerce-catalog.controller.pageCatalogue': ControllerPageCatalogue;
+'commerce-catalog.controller.pageProduct': ControllerPageProduct;
+  }
+}
+/** controller: end */
+/** pages: begin */
+export * from './page/catalogue.js';
+import { NSControllerPageCatalogue } from './page/catalogue.js';
+export * from './page/product.js';
+import { NSControllerPageProduct } from './page/product.js';
+export * from '../routes.js';
+import { TypePagePathSchema } from 'zova-module-a-router';
+import 'zova';
+declare module 'zova-module-a-router' {
+export interface IPagePathRecord {
+  '/commerce/catalog/catalogue/:locale?': TypePagePathSchema<NSControllerPageCatalogue.ParamsInput,NSControllerPageCatalogue.QueryInput>;
+'/commerce/catalog/product/:id/:locale?': TypePagePathSchema<NSControllerPageProduct.ParamsInput,NSControllerPageProduct.QueryInput>;
+}
+export interface IPageNameRecord {
+  'commerce-catalog:catalogue': TypePagePathSchema<NSControllerPageCatalogue.ParamsInput,NSControllerPageCatalogue.QueryInput>;
+'commerce-catalog:product': TypePagePathSchema<NSControllerPageProduct.ParamsInput,NSControllerPageProduct.QueryInput>;
+}
+}
+export const pagePathSchemas = {
+
+};
+export const pageNameSchemas = {
+'commerce-catalog:catalogue': {
+          params: NSControllerPageCatalogue.paramsSchema,
+          query: NSControllerPageCatalogue.querySchema,
+        },
+'commerce-catalog:product': {
+          params: NSControllerPageProduct.paramsSchema,
+          query: NSControllerPageProduct.querySchema,
+        },
+};
+declare module 'zova-module-commerce-catalog' {
+  export interface ControllerPageCatalogue {
+        $params: NSControllerPageCatalogue.ParamsOutput;
+$query: NSControllerPageCatalogue.QueryOutput;
+      }
+export interface ControllerPageProduct {
+        $params: NSControllerPageProduct.ParamsOutput;
+$query: NSControllerPageProduct.QueryOutput;
+      }
+}
+/** pages: end */
+
+/** locale: begin */
+import { locales } from './locales.js';
+/** locale: end */
 /** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil } from 'zova';
+import { BeanScopeBase, type BeanScopeUtil, TypeModuleLocales, TypeLocaleBase } from 'zova';
 import { Scope } from 'zova-module-a-bean';
 
 @Scope()
@@ -8,6 +199,9 @@ export class ScopeModuleCommerceCatalog extends BeanScopeBase {}
 
 export interface ScopeModuleCommerceCatalog {
   util: BeanScopeUtil;
+locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
+api: IModuleApi;
+apiSchema: IModuleApiSchema;
 }
 
 import 'zova';
@@ -18,9 +212,14 @@ declare module 'zova' {
   
   
 
-  
+  export interface IBeanScopeLocale {
+    'commerce-catalog': (typeof locales)[TypeLocaleBase];
+  }
 
   
 }
-  
+
+export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `commerce-catalog::${K}` {
+  return `commerce-catalog::${key}`;
+}
 /** scope: end */

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/locales.ts

@@ -0,0 +1,7 @@
+import locale_en_us from '../config/locale/en-us.js';
+import locale_zh_cn from '../config/locale/zh-cn.js';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/page/catalogue.ts

@@ -0,0 +1,23 @@
+import { z } from 'zod';
+import { createZovaComponentPage } from 'zova';
+
+import { ControllerPageCatalogue } from '../../page/catalogue/controller.jsx';
+import {
+  ControllerPageCatalogueSchemaParams,
+  ControllerPageCatalogueSchemaQuery,
+} from '../../page/catalogue/controller.jsx';
+export namespace NSControllerPageCatalogue {
+  export const paramsSchema = ControllerPageCatalogueSchemaParams;
+  export type ParamsInput = z.input<typeof ControllerPageCatalogueSchemaParams>;
+  export type ParamsOutput = z.output<typeof ControllerPageCatalogueSchemaParams>;
+
+  export const querySchema = ControllerPageCatalogueSchemaQuery;
+  export type QueryInput = z.input<typeof ControllerPageCatalogueSchemaQuery>;
+  export type QueryOutput = z.output<typeof ControllerPageCatalogueSchemaQuery>;
+}
+
+export const ZPageCatalogue = createZovaComponentPage(
+  ControllerPageCatalogue,
+  undefined,
+  undefined,
+);

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/page/product.ts

@@ -0,0 +1,19 @@
+import { z } from 'zod';
+import { createZovaComponentPage } from 'zova';
+
+import { ControllerPageProduct } from '../../page/product/controller.jsx';
+import {
+  ControllerPageProductSchemaParams,
+  ControllerPageProductSchemaQuery,
+} from '../../page/product/controller.jsx';
+export namespace NSControllerPageProduct {
+  export const paramsSchema = ControllerPageProductSchemaParams;
+  export type ParamsInput = z.input<typeof ControllerPageProductSchemaParams>;
+  export type ParamsOutput = z.output<typeof ControllerPageProductSchemaParams>;
+
+  export const querySchema = ControllerPageProductSchemaQuery;
+  export type QueryInput = z.input<typeof ControllerPageProductSchemaQuery>;
+  export type QueryOutput = z.output<typeof ControllerPageProductSchemaQuery>;
+}
+
+export const ZPageProduct = createZovaComponentPage(ControllerPageProduct, undefined, undefined);

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/api/commerceCatalogProduct.ts

@@ -0,0 +1,52 @@
+import type { IApiActionOptions } from 'zova-module-a-api';
+
+import { Api, BeanApiBase } from 'zova-module-a-api';
+
+import type { paths } from './openapi/index.js';
+
+import { OpenApiBaseURL } from './openapi/index.js';
+
+/** CommerceCatalogProduct_selectPublic */
+export const ApiApiCommerceCatalogProductselectPublicPath = '/api/commerce/catalog/product/public';
+export type ApiApiCommerceCatalogProductselectPublicPath = '/api/commerce/catalog/product/public';
+export type ApiApiCommerceCatalogProductselectPublicMethod = 'get';
+export type ApiApiCommerceCatalogProductselectPublicRequestQuery =
+  paths[ApiApiCommerceCatalogProductselectPublicPath][ApiApiCommerceCatalogProductselectPublicMethod]['parameters']['query'];
+export type ApiApiCommerceCatalogProductselectPublicResponseBody =
+  paths[ApiApiCommerceCatalogProductselectPublicPath][ApiApiCommerceCatalogProductselectPublicMethod]['responses']['200']['content']['application/json']['data'];
+
+/** CommerceCatalogProduct_viewPublic */
+export const ApiApiCommerceCatalogProductviewPublicPath =
+  '/api/commerce/catalog/product/public/{id}';
+export type ApiApiCommerceCatalogProductviewPublicPath =
+  '/api/commerce/catalog/product/public/{id}';
+export type ApiApiCommerceCatalogProductviewPublicMethod = 'get';
+export type ApiApiCommerceCatalogProductviewPublicRequestParams =
+  paths[ApiApiCommerceCatalogProductviewPublicPath][ApiApiCommerceCatalogProductviewPublicMethod]['parameters']['path'];
+export type ApiApiCommerceCatalogProductviewPublicResponseBody =
+  paths[ApiApiCommerceCatalogProductviewPublicPath][ApiApiCommerceCatalogProductviewPublicMethod]['responses']['200']['content']['application/json']['data'];
+
+@Api()
+export class ApiCommerceCatalogProduct extends BeanApiBase {
+  selectPublic(
+    options?: {
+      query?: ApiApiCommerceCatalogProductselectPublicRequestQuery;
+    } & IApiActionOptions,
+  ) {
+    return this.$fetch.get<any, ApiApiCommerceCatalogProductselectPublicResponseBody>(
+      ApiApiCommerceCatalogProductselectPublicPath,
+      this.$configPrepare(OpenApiBaseURL(this.sys), options),
+    );
+  }
+
+  viewPublic(
+    options: {
+      params: ApiApiCommerceCatalogProductviewPublicRequestParams;
+    } & IApiActionOptions,
+  ) {
+    return this.$fetch.get<any, ApiApiCommerceCatalogProductviewPublicResponseBody>(
+      this.$pathTranslate(ApiApiCommerceCatalogProductviewPublicPath, options.params),
+      this.$configPrepare(OpenApiBaseURL(this.sys), options),
+    );
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/api/openapi/baseURL.ts

@@ -0,0 +1,5 @@
+import type { ZovaSys } from 'zova';
+
+export const OpenApiBaseURL = (sys: ZovaSys) => {
+  return sys.util.getOpenApiBaseURL('OPENAPI_BASE_URL_COMMERCE_CATALOG');
+};

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/api/openapi/index.ts

@@ -0,0 +1,3 @@
+export * from './baseURL.js';
+export * from './schemas.js';
+export * from './types.js';