zova-cli-set-front 1.2.34 → 1.2.35

package/cli/templates/create/component/boilerplateActionBulk/controller.tsx_

@@ -0,0 +1,21 @@
+import type { IJsxRenderContextPage, IResourceActionBulkOptionsBase } from 'zova-module-a-openapi';
+
+import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceActionBulkOptionsBase {}
+
+@Controller()
+export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextPage;
+
+  protected async __init__() {}
+
+  protected render() {
+    return null;
+  }
+}

package/cli/templates/create/component/boilerplateActionRow/controller.tsx_

@@ -0,0 +1,21 @@
+import type { IJsxRenderContextPageEntry, IResourceActionRowOptionsBase } from 'zova-module-a-openapi';
+
+import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceActionRowOptionsBase {}
+
+@Controller()
+export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextPageEntry;
+
+  protected async __init__() {}
+
+  protected render() {
+    return null;
+  }
+}

package/cli/templates/create/component/boilerplateBlockPage/controller.tsx_

@@ -0,0 +1,21 @@
+import type { IResourceBlockOptionsBase, IJsxRenderContextPage } from 'zova-module-a-openapi';
+
+import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceBlockOptionsBase {}
+
+@Controller()
+export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextPage;
+
+  protected async __init__() {}
+
+  protected render() {
+    return null;
+  }
+}

package/cli/templates/create/component/boilerplateBlockPageEntry/controller.tsx_

@@ -0,0 +1,21 @@
+import type { IResourceBlockOptionsBase, IJsxRenderContextPageEntry } from 'zova-module-a-openapi';
+
+import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceBlockOptionsBase {}
+
+@Controller()
+export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {
+  static $propsDefault = {};
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextPageEntry;
+
+  protected async __init__() {}
+
+  protected render() {
+    return null;
+  }
+}

package/cli/templates/create/component/boilerplateFormField/controller.tsx_

@@ -1,15 +1,15 @@
 import type { IComponentOptions } from 'zova';
-import type { IFormFieldOptions } from 'zova-module-a-form';
+import type { IFormFieldComponentOptions } from 'zova-module-a-form';
 import { BeanControllerBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { ZFormField } from 'zova-module-a-form';
 
-export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IFormFieldOptions {}
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IFormFieldComponentOptions {}
 
 @Controller()
 export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {
   static $propsDefault = {};
-  static $componentOptions: IComponentOptions = { inheritAttrs: false };
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
 
   protected async __init__() {}
 

package/cli/templates/refactor/componentEmits/snippets/2-controller.ts

@@ -7,7 +7,7 @@ declare module '@cabloy/cli' {
   }
 }
 
-const __regProps = /interface [^<]*Props<(.*?)> \{/;
+const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 
 export default metadataCustomSnippet({
   file: ({ argv }) => {

package/cli/templates/refactor/componentGeneric/snippets/2-controller.ts

@@ -1,8 +1,14 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
 
-const __regPropsReplace = /(interface [^<]*Props) \{/;
+const __regPropsReplace = /(interface [^<]*Props) ([(extends)|{])/;
 const __regModelsReplace = /(interface [^<]*Models) \{/;
 
+declare module '@cabloy/cli' {
+  export interface ICommandArgv {
+    controllerFileName: string;
+  }
+}
+
 export default metadataCustomSnippet({
   file: ({ argv }) => {
     return argv.controllerFileName;
@@ -10,8 +16,8 @@ export default metadataCustomSnippet({
   language: 'plain',
   async transform({ ast }) {
     // Props
-    ast = ast.replace(__regPropsReplace, (_, $1) => {
-      return `${$1}<_T = unknown> {`;
+    ast = ast.replace(__regPropsReplace, (_, $1, $2) => {
+      return `${$1}<_T = unknown> ${$2}`;
     });
     // Models
     ast = ast.replace(__regModelsReplace, (_, $1) => {

package/cli/templates/refactor/componentModel/snippets/1-controller.ts

@@ -6,7 +6,7 @@ declare module '@cabloy/cli' {
   }
 }
 
-const __regProps = /interface [^<]*Props<(.*?)> \{/;
+const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 const __regModelsReplace = /interface [^<]*Models([^{]*) \{/;
 const __regModelValue = /import \{[^}]*ModelValue[^}]*\} from 'zova';/;
 const __regModelValueReplace = /import \{ ([^}]*) \} from 'zova';/;

package/cli/templates/refactor/componentSlots/snippets/1-controller.ts

@@ -1,6 +1,6 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
 
-const __regProps = /interface [^<]*Props<(.*?)> \{/;
+const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 
 export default metadataCustomSnippet({
   file: ({ argv }) => {

package/dist/index.js

@@ -364,16 +364,25 @@ class CliBinBuildRest extends BeanCliBase {
     await fse.writeFile(path.join(srcDir, 'package.json'), pkgContent);
   }
   async _prepareResourcesIndex({
-    srcDir
+    srcDir,
+    projectPath
   }) {
     let indexContent = `import type { IIconRecord } from 'zova-module-a-icon';
-import type { TypePagePathSchema } from 'zova-module-a-router';
 export type { IIconRecord } from 'zova-module-a-icon';
+import type { TypePagePathSchema } from 'zova-module-a-router';
 export type { IPagePathRecord } from 'zova-module-a-router';
+export type {
+  IResourceComponentActionBulkRecord,
+  IResourceComponentActionRowRecord,
+  IResourceComponentBlockRecord,
+  IResourceComponentFormFieldRecord,
+  IResourceComponentTableCellRecord,
+} from 'zova-module-a-openapi';
 `;
     indexContent += await this._prepareResourcesIndex_rest(srcDir);
     indexContent += await this._prepareResourcesIndex_icons(srcDir);
     indexContent += await this._prepareResourcesIndex_pages(srcDir);
+    indexContent += await this._prepareResourcesIndex_providers(srcDir, projectPath);
     await fse.writeFile(path.join(srcDir, 'index.ts'), indexContent);
   }
   async _prepareResourcesIndex_rest(srcDir) {
@@ -404,6 +413,17 @@ export type { IPagePathRecord } from 'zova-module-a-router';
 `;
     return content;
   }
+  async _prepareResourcesIndex_providers(_srcDir, projectPath) {
+    const dirBasicOpenapi = path.join(projectPath, './src/suite/cabloy-basic/modules/basic-openapi');
+    const dirStartOpenapi = path.join(projectPath, './src/suite/cabloy-start/modules/start-openapi');
+    let content = '';
+    if (fse.existsSync(dirBasicOpenapi)) {
+      content += `import 'zova-module-basic-openapi';\n`;
+    } else if (fse.existsSync(dirStartOpenapi)) {
+      content += `import 'zova-module-start-openapi';\n`;
+    }
+    return content;
+  }
   async _prepareResourcesIndex_pages(_srcDir) {
     const content = `declare module 'zova-module-a-router' {
   export interface IPagePathRecord {

package/dist/lib/bean/cli.bin.buildRest.d.ts

@@ -21,9 +21,10 @@ export declare class CliBinBuildRest extends BeanCliBase {
     _buildDts({ srcDir, outDir }: IBinBuildRestContext): Promise<void>;
     _build(buildContext: IBinBuildRestContext): Promise<void>;
     _prepareResourcesPackage({ projectPath, flavor, bundleName, srcDir }: IBinBuildRestContext): Promise<void>;
-    _prepareResourcesIndex({ srcDir }: IBinBuildRestContext): Promise<void>;
+    _prepareResourcesIndex({ srcDir, projectPath }: IBinBuildRestContext): Promise<void>;
     _prepareResourcesIndex_rest(srcDir: string): Promise<string>;
     _prepareResourcesIndex_icons(_srcDir: string): Promise<string>;
+    _prepareResourcesIndex_providers(_srcDir: string, projectPath: string): Promise<string>;
     _prepareResourcesIndex_pages(_srcDir: string): Promise<string>;
 }
 export {};

package/dist-cli/templates/refactor/componentEmits/snippets/2-controller.js

@@ -1,5 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
-const __regProps = /interface [^<]*Props<(.*?)> \{/;
+const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 export default metadataCustomSnippet({
     file: ({ argv }) => {
         return argv.controllerFileName;

package/dist-cli/templates/refactor/componentGeneric/snippets/2-controller.js

@@ -1,5 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
-const __regPropsReplace = /(interface [^<]*Props) \{/;
+const __regPropsReplace = /(interface [^<]*Props) ([(extends)|{])/;
 const __regModelsReplace = /(interface [^<]*Models) \{/;
 export default metadataCustomSnippet({
     file: ({ argv }) => {
@@ -8,8 +8,8 @@ export default metadataCustomSnippet({
     language: 'plain',
     async transform({ ast }) {
         // Props
-        ast = ast.replace(__regPropsReplace, (_, $1) => {
-            return `${$1}<_T = unknown> {`;
+        ast = ast.replace(__regPropsReplace, (_, $1, $2) => {
+            return `${$1}<_T = unknown> ${$2}`;
         });
         // Models
         ast = ast.replace(__regModelsReplace, (_, $1) => {

package/dist-cli/templates/refactor/componentModel/snippets/1-controller.js

@@ -1,5 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
-const __regProps = /interface [^<]*Props<(.*?)> \{/;
+const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 const __regModelsReplace = /interface [^<]*Models([^{]*) \{/;
 const __regModelValue = /import \{[^}]*ModelValue[^}]*\} from 'zova';/;
 const __regModelValueReplace = /import \{ ([^}]*) \} from 'zova';/;

package/dist-cli/templates/refactor/componentSlots/snippets/1-controller.js

@@ -1,5 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
-const __regProps = /interface [^<]*Props<(.*?)> \{/;
+const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 export default metadataCustomSnippet({
     file: ({ argv }) => {
         return argv.controllerFileName;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.34",
-  "gitHead": "8d42f31a8ee23be4564814a901d770307635c849",
+  "version": "1.2.35",
+  "gitHead": "a247f88a55c663d313296039f874560ee5a13e01",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",
@@ -40,17 +40,17 @@
     "@cabloy/extend": "^3.1.0",
     "@cabloy/module-info": "^2.0.0",
     "@cabloy/openapi-typescript": "^7.9.2",
-    "@cabloy/utils": "^2.1.9",
+    "@cabloy/utils": "^2.1.15",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",
-    "@cabloy/word-utils": "^2.1.8",
+    "@cabloy/word-utils": "^2.1.9",
     "@typescript/native-preview": "^7.0.0-dev.20260320.1",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "babel-plugin-transform-typescript-metadata": "^0.4.0",
-    "babel-plugin-zova-bean-module": "^1.2.8",
-    "babel-plugin-zova-bean-use": "^1.1.8",
-    "babel-plugin-zova-behavior": "^1.1.8",
-    "babel-plugin-zova-component": "^1.1.8",
+    "babel-plugin-zova-bean-module": "^1.2.9",
+    "babel-plugin-zova-bean-use": "^1.1.9",
+    "babel-plugin-zova-behavior": "^1.1.9",
+    "babel-plugin-zova-component": "^1.1.9",
     "compressing": "^1.10.0",
     "fs-extra": "^11.3.4",
     "globby": "^14.1.0",
@@ -64,7 +64,7 @@
     "urllib": "^4.6.11",
     "vite": "^8.0.2",
     "yaml": "^2.8.3",
-    "zova-openapi": "^1.1.8",
-    "zova-vite": "^1.1.19"
+    "zova-openapi": "^1.1.9",
+    "zova-vite": "^1.1.20"
   }
 }