zova-cli-set-front 1.1.180 → 1.1.182

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

@@ -1,7 +1,7 @@
 module.exports = {
   file: 'controller.ts',
   parseOptions: { language: 'plain' },
-  async transform({ ast }) {
+  async transform({ cli, ast }) {
     if (ast.includes('export type Emits')) throw new Error('Emits exists');
     const matchController = ast.match(/export class ([^< ]*)(.*?) extends/);
     // const className = matchController[1];
@@ -11,8 +11,8 @@ module.exports = {
     //
     ast = ast.replace('@Local', `export type Emits${genericT2} = {};\n\n@Local`);
     // BeanControllerBase
-    ast = ast.replace(/BeanControllerBase<(.*?)> \{/, (_, $1) => {
-      const parts = $1.split(',');
+    ast = ast.replace(/BeanControllerBase<([\s\S]*?)> \{/, (_, $1) => {
+      const parts = cli.helper.safeSplit($1, ',');
       if (!parts[1]) parts[1] = ' unknown';
       parts[2] = ` Emits${genericT}`;
       return `BeanControllerBase<${parts.join(',')}> {`;

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

@@ -1,7 +1,7 @@
 module.exports = {
   file: 'controller.ts',
   parseOptions: { language: 'plain' },
-  async transform({ ast }) {
+  async transform({ cli, ast }) {
     if (ast.includes('export interface Props<')) return;
     const matchController = ast.match(/export class (.*?) extends/);
     const className = matchController[1];
@@ -13,11 +13,11 @@ module.exports = {
       .replace('export interface Slots', 'export interface Slots<_T>')
       .replace(`export class ${className}`, `export class ${className}<T = unknown>`);
     // BeanControllerBase
-    ast = ast.replace(/BeanControllerBase<(.*?)> \{/, (_, $1) => {
-      const parts = $1.split(',');
-      if (parts[1] === ' Props') parts[1] = ' Props<T>';
-      if (parts[2] === ' Emits') parts[2] = ' Emits<T>';
-      if (parts[3] === ' Slots') parts[3] = ' Slots<T>';
+    ast = ast.replace(/BeanControllerBase<([\s\S]*?)> \{/, (_, $1) => {
+      const parts = cli.helper.safeSplit($1, ',');
+      if (parts[1]?.includes('Props')) parts[1] = parts[1].replace('Props', 'Props<T>');
+      if (parts[2]?.includes('Emits')) parts[2] = parts[2].replace('Emits', 'Emits<T>');
+      if (parts[3]?.includes('Slots')) parts[3] = parts[3].replace('Slots', 'Slots<T>');
       return `BeanControllerBase<${parts.join(',')}> {`;
     });
     // ok

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

@@ -23,7 +23,7 @@ module.exports = {
       return `${localName}: number;\n\n    ${$0}`;
     });
     ast = ast.replace(/protected async __init__([^\{]*) \{/, $0 => {
-      return `${$0}\n      this.${localName} = this.$useModel(${modelName === 'modelValue' ? '' : `'${modelName}'`})!;`;
+      return `${$0}\n      this.${localName} = this.$useModel(${modelName === 'modelValue' ? '' : `'${modelName}'`});`;
     });
     // ok
     return ast;

package/cli/templates/refactor/componentProps/snippets/2-controller.cjs

@@ -1,7 +1,7 @@
 module.exports = {
   file: 'controller.ts',
   parseOptions: { language: 'plain' },
-  async transform({ ast }) {
+  async transform({ cli, ast }) {
     if (ast.includes('export interface Props')) throw new Error('Props exists');
     const matchController = ast.match(/export class ([^< ]*)(.*?) extends/);
     const className = matchController[1];
@@ -15,14 +15,21 @@ module.exports = {
         return `import { ${$1}, PropsBase } from 'zova';`;
       });
     }
+    // RequiredSome
+    if (!ast.match(/import \{[^\}]*RequiredSome[^\}]*\} from 'zova';/)) {
+      ast = ast.replace(/import \{ ([^\}]*) \} from 'zova';/, (_, $1) => {
+        return `import { ${$1}, RequiredSome } from 'zova';`;
+      });
+    }
+    // Props
     ast = ast.replace(
       '@Local',
       `export interface Props${hasSlots ? genericT : genericT2} extends PropsBase<${className}${genericT}${hasSlots ? `, Slots${genericT}` : ''}> {}\n\n@Local`,
     );
     // BeanControllerBase
-    ast = ast.replace(/BeanControllerBase<(.*?)> \{/, (_, $1) => {
-      const parts = $1.split(',');
-      parts[1] = ` Props${genericT}`;
+    ast = ast.replace(/BeanControllerBase<([\s\S]*?)> \{/, (_, $1) => {
+      const parts = cli.helper.safeSplit($1, ',');
+      parts[1] = ` RequiredSome<Props${genericT}, keyof typeof ${className}.$propsDefault>`;
       return `BeanControllerBase<${parts.join(',')}> {\n  static $propsDefault = {};\n\n`;
     });
     // ok

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

@@ -1,7 +1,7 @@
 module.exports = {
   file: 'controller.ts',
   parseOptions: { language: 'plain' },
-  async transform({ ast }) {
+  async transform({ cli, ast }) {
     if (ast.includes('export interface Slots')) throw new Error('Slots exists');
     const matchController = ast.match(/export class ([^< ]*)(.*?) extends/);
     // const className = matchController[1];
@@ -22,8 +22,8 @@ module.exports = {
     // Slots
     ast = ast.replace('@Local', `export interface Slots${genericT2} {}\n\n@Local`);
     // BeanControllerBase
-    ast = ast.replace(/BeanControllerBase<(.*?)> \{/, (_, $1) => {
-      const parts = $1.split(',');
+    ast = ast.replace(/BeanControllerBase<([\s\S]*?)> \{/, (_, $1) => {
+      const parts = cli.helper.safeSplit($1, ',');
       if (!parts[1]) parts[1] = ' unknown';
       if (!parts[2]) parts[2] = ' unknown';
       parts[3] = ` Slots${genericT}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.1.180",
+  "version": "1.1.182",
   "description": "zova cli-set-front",
   "publishConfig": {
     "access": "public"
@@ -48,5 +48,5 @@
     "zova-shared": "^1.0.4",
     "zova-vite": "^1.0.176"
   },
-  "gitHead": "2b22e9148dc8348edb6321e415184a7b83ace284"
+  "gitHead": "e9e4c722b0aa3d259dd1d3d89a5868171154de43"
 }