zova-module-a-bean 5.1.12 → 5.1.13

package/cli/controller/metadata/generateFileComponent.ts

@@ -1,8 +1,6 @@
 import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
 import type { IGlobBeanFile } from '@cabloy/module-info';
 
-import { combineResourceName } from '@cabloy/utils';
-import { toLowerCaseFirstChar, toUpperCaseFirstChar } from '@cabloy/word-utils';
 import fse from 'fs-extra';
 import path from 'node:path';
 
@@ -133,6 +131,31 @@ export async function generateFileComponent(options: IMetadataCustomGenerateOpti
     },
     prepareComponentOptions(${componentOptions}),
   );`;
+  // rest props
+  let contentRestPropsType = '';
+  if (hasProps) {
+    contentRestPropsType += `${nameProps}`;
+  }
+  if (hasModels) {
+    if (hasProps) {
+      contentRestPropsType += ' & ';
+    }
+    contentRestPropsType += `${nameModels} &
+{
+  [KEY in keyof ${nameModels} as TypePropValueFromModel<KEY>]: ${nameModels}[KEY];
+} &
+{
+  [KEY in keyof ${nameModels} as TypePropUpdateFromModel<KEY>]: (value: ${nameModels}[KEY]) => void;
+}`;
+  }
+  let contentRestProps = '';
+  if (contentRestPropsType) {
+    contentRestProps = `declare module 'zova-module-a-bean' {
+  export interface IVonaComponentRecord {
+    '${moduleName}:${name}': ${contentRestPropsType};
+  }
+}`;
+  }
   // content
   const content = `${contentImports.join('\n')}
 ${contentTypeControllerPublicProps}
@@ -141,96 +164,21 @@ ${contentControllerInnerProps}
 ${contentControllerInterface}
 ${combineContentRenderAndStyle(controllerInfo, moduleName, className, genericDeclare, genericArguments)}
 ${contentComponent}
+${contentRestProps}
 `;
   // restComponent
-  await generateRestComponent(options, globFile, controllerInfo, genericDeclare, genericArguments, generateImports, _contentImportTypeController);
+  await generateRestComponent(options);
   // ok
   return content;
 }
 
-async function generateRestComponent(
-  options: IMetadataCustomGenerateOptions,
-  _globFile: IGlobBeanFile,
-  controllerInfo: IControllerInfo,
-  genericDeclare: string,
-  genericArguments: string,
-  generateImports: string[] | null | undefined,
-  _contentImportTypeController: string[],
-) {
-  const { cli, moduleName, modulePath } = options;
-  // const { className } = globFile;
-  const { name, nameCapitalize, hasProps, nameProps, hasModels, nameModels } = controllerInfo;
-  // TypeControllerPublicProps
-  const typeControllerPublicPropsName = `TypeController${nameCapitalize}PublicProps`;
-  let contentTypeControllerPublicProps = `type ${typeControllerPublicPropsName}${genericDeclare} = TypeRenderComponentJsxPropsPublic`;
-  if (hasProps) {
-    contentTypeControllerPublicProps += `\n  & ${nameProps}${genericArguments}`;
-  }
-  if (hasModels) {
-    contentTypeControllerPublicProps += `\n  & ${nameModels}${genericArguments} &
-  {
-    [KEY in keyof ${nameModels}${genericArguments} as TypePropValueFromModel<KEY>]: ${nameModels}${genericArguments}[KEY];
-  } &
-  {
-    [KEY in keyof ${nameModels}${genericArguments} as TypePropUpdateFromModel<KEY>]: (value: ${nameModels}${genericArguments}[KEY]) => void;
-  }`;
-  }
-  contentTypeControllerPublicProps = `${contentTypeControllerPublicProps};`;
-  // import
-  const contentImports: string[] = [];
-  if (generateImports) {
-    contentImports.push(...generateImports);
-  }
-  const _contentImportTypeZova: string[] = [];
-  if (hasModels) _contentImportTypeZova.push('TypePropUpdateFromModel', 'TypePropValueFromModel');
-  if (_contentImportTypeZova.length > 0) {
-    contentImports.push(`import type { ${_contentImportTypeZova.join(', ')} } from 'zova';`);
-  }
-  contentImports.push("import type { TypeRenderComponentJsxPropsPublic } from 'zova-jsx';");
-  if (_contentImportTypeController.length > 0) {
-    contentImports.push(`import type { ${_contentImportTypeController.join(', ')} } from 'zova-module-${moduleName}';`);
-  }
-  // component
-  let componentNamePrefix;
-  let componentName;
-  if (name !== 'formField' && name.startsWith('formField')) {
-    componentNamePrefix = 'BBF';
-    componentName = toLowerCaseFirstChar(name.substring('formField'.length));
-  } else if (name.startsWith('restPage')) {
-    componentNamePrefix = 'BBP';
-    componentName = toLowerCaseFirstChar(name.substring('restPage'.length));
-  } else {
-    componentNamePrefix = 'BBZ';
-    componentName = name;
-  }
-  const componentNameFull = `${componentNamePrefix}${toUpperCaseFirstChar(combineResourceName(componentName, moduleName, true, true))}`;
-  const contentComponent = `export function ${componentNameFull}${genericDeclare}(
-  _props: ${typeControllerPublicPropsName}${genericArguments},
-) {
-  return '${moduleName}:${name}';
-}`;
-  // content
-  const content = `${contentImports.join('\n')}
-
-${contentTypeControllerPublicProps}
-${contentComponent}
-`;
-  // output
-  const fileDest = path.join(modulePath, `rest/component/${name}.ts`);
-  await fse.outputFile(fileDest, content);
-  await cli.helper.formatFile({ fileName: fileDest });
+async function generateRestComponent(options: IMetadataCustomGenerateOptions) {
+  const { moduleName, modulePath } = options;
   // components
   const fileComponents = path.join(modulePath, 'rest/components.ts');
-  let contentComponents = '';
-  if (fse.existsSync(fileComponents)) {
-    contentComponents = (await fse.readFile(fileComponents)).toString();
-  }
-  const exportContent = `export * from './component/${name}.js';`;
-  if (!contentComponents.includes(exportContent)) {
-    contentComponents = `${contentComponents}${exportContent}\n`;
-    await fse.outputFile(fileComponents, contentComponents);
-    await cli.helper.formatFile({ fileName: fileComponents });
-  }
+  if (fse.existsSync(fileComponents)) return;
+  const contentComponents = `export * from 'zova-module-${moduleName}';`;
+  await fse.outputFile(fileComponents, contentComponents);
   // index
   const exportIndexContent = "export * from './components.js';";
   await generateRestIndex(options, modulePath, exportIndexContent);

package/dist/types/component.d.ts

@@ -0,0 +1,13 @@
+import { types } from 'typestyle';
+import { TypeRenderComponentJsxPropsPublic } from 'zova-jsx';
+export interface IVonaComponentRecord {
+}
+export type TypeComponentOptions<K extends keyof IVonaComponentRecord> = {
+    name: K;
+    options?: IVonaComponentRecord[K];
+} & TypeComponentOptionsProps;
+export interface TypeComponentOptionsProps extends TypeRenderComponentJsxPropsPublic {
+    class?: any;
+    style?: types.NestedCSSProperties;
+}
+//# sourceMappingURL=component.d.ts.map

package/dist/types/component.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../src/types/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAE7D,MAAM,WAAW,oBAAoB;CAAG;AAExC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,MAAM,oBAAoB,IAAI;IACvE,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;CACnC,GAAG,yBAAyB,CAAC;AAE9B,MAAM,WAAW,yBAA0B,SAAQ,iCAAiC;IAClF,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,KAAK,CAAC,mBAAmB,CAAC;CACnC"}

package/dist/types/index.d.ts

@@ -3,4 +3,5 @@ export * from './aopMethod.js';
 export * from './bean.js';
 export * from './onion.js';
 export * from './service.js';
+export * from './component.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC"}

package/dist-cli/controller/metadata/generateFileComponent.js

@@ -1,5 +1,3 @@
-import { combineResourceName } from '@cabloy/utils';
-import { toLowerCaseFirstChar, toUpperCaseFirstChar } from '@cabloy/word-utils';
 import fse from 'fs-extra';
 import path from 'node:path';
 import { combineContentRenderAndStyle, generateRestIndex } from "./utils.js";
@@ -106,6 +104,31 @@ export async function generateFileComponent(options, globFile, controllerInfo) {
     },
     prepareComponentOptions(${componentOptions}),
   );`;
+    // rest props
+    let contentRestPropsType = '';
+    if (hasProps) {
+        contentRestPropsType += `${nameProps}`;
+    }
+    if (hasModels) {
+        if (hasProps) {
+            contentRestPropsType += ' & ';
+        }
+        contentRestPropsType += `${nameModels} &
+{
+  [KEY in keyof ${nameModels} as TypePropValueFromModel<KEY>]: ${nameModels}[KEY];
+} &
+{
+  [KEY in keyof ${nameModels} as TypePropUpdateFromModel<KEY>]: (value: ${nameModels}[KEY]) => void;
+}`;
+    }
+    let contentRestProps = '';
+    if (contentRestPropsType) {
+        contentRestProps = `declare module 'zova-module-a-bean' {
+  export interface IVonaComponentRecord {
+    '${moduleName}:${name}': ${contentRestPropsType};
+  }
+}`;
+    }
     // content
     const content = `${contentImports.join('\n')}
 ${contentTypeControllerPublicProps}
@@ -114,90 +137,21 @@ ${contentControllerInnerProps}
 ${contentControllerInterface}
 ${combineContentRenderAndStyle(controllerInfo, moduleName, className, genericDeclare, genericArguments)}
 ${contentComponent}
+${contentRestProps}
 `;
     // restComponent
-    await generateRestComponent(options, globFile, controllerInfo, genericDeclare, genericArguments, generateImports, _contentImportTypeController);
+    await generateRestComponent(options);
     // ok
     return content;
 }
-async function generateRestComponent(options, _globFile, controllerInfo, genericDeclare, genericArguments, generateImports, _contentImportTypeController) {
-    const { cli, moduleName, modulePath } = options;
-    // const { className } = globFile;
-    const { name, nameCapitalize, hasProps, nameProps, hasModels, nameModels } = controllerInfo;
-    // TypeControllerPublicProps
-    const typeControllerPublicPropsName = `TypeController${nameCapitalize}PublicProps`;
-    let contentTypeControllerPublicProps = `type ${typeControllerPublicPropsName}${genericDeclare} = TypeRenderComponentJsxPropsPublic`;
-    if (hasProps) {
-        contentTypeControllerPublicProps += `\n  & ${nameProps}${genericArguments}`;
-    }
-    if (hasModels) {
-        contentTypeControllerPublicProps += `\n  & ${nameModels}${genericArguments} &
-  {
-    [KEY in keyof ${nameModels}${genericArguments} as TypePropValueFromModel<KEY>]: ${nameModels}${genericArguments}[KEY];
-  } &
-  {
-    [KEY in keyof ${nameModels}${genericArguments} as TypePropUpdateFromModel<KEY>]: (value: ${nameModels}${genericArguments}[KEY]) => void;
-  }`;
-    }
-    contentTypeControllerPublicProps = `${contentTypeControllerPublicProps};`;
-    // import
-    const contentImports = [];
-    if (generateImports) {
-        contentImports.push(...generateImports);
-    }
-    const _contentImportTypeZova = [];
-    if (hasModels)
-        _contentImportTypeZova.push('TypePropUpdateFromModel', 'TypePropValueFromModel');
-    if (_contentImportTypeZova.length > 0) {
-        contentImports.push(`import type { ${_contentImportTypeZova.join(', ')} } from 'zova';`);
-    }
-    contentImports.push("import type { TypeRenderComponentJsxPropsPublic } from 'zova-jsx';");
-    if (_contentImportTypeController.length > 0) {
-        contentImports.push(`import type { ${_contentImportTypeController.join(', ')} } from 'zova-module-${moduleName}';`);
-    }
-    // component
-    let componentNamePrefix;
-    let componentName;
-    if (name !== 'formField' && name.startsWith('formField')) {
-        componentNamePrefix = 'BBF';
-        componentName = toLowerCaseFirstChar(name.substring('formField'.length));
-    }
-    else if (name.startsWith('restPage')) {
-        componentNamePrefix = 'BBP';
-        componentName = toLowerCaseFirstChar(name.substring('restPage'.length));
-    }
-    else {
-        componentNamePrefix = 'BBZ';
-        componentName = name;
-    }
-    const componentNameFull = `${componentNamePrefix}${toUpperCaseFirstChar(combineResourceName(componentName, moduleName, true, true))}`;
-    const contentComponent = `export function ${componentNameFull}${genericDeclare}(
-  _props: ${typeControllerPublicPropsName}${genericArguments},
-) {
-  return '${moduleName}:${name}';
-}`;
-    // content
-    const content = `${contentImports.join('\n')}
-
-${contentTypeControllerPublicProps}
-${contentComponent}
-`;
-    // output
-    const fileDest = path.join(modulePath, `rest/component/${name}.ts`);
-    await fse.outputFile(fileDest, content);
-    await cli.helper.formatFile({ fileName: fileDest });
+async function generateRestComponent(options) {
+    const { moduleName, modulePath } = options;
     // components
     const fileComponents = path.join(modulePath, 'rest/components.ts');
-    let contentComponents = '';
-    if (fse.existsSync(fileComponents)) {
-        contentComponents = (await fse.readFile(fileComponents)).toString();
-    }
-    const exportContent = `export * from './component/${name}.js';`;
-    if (!contentComponents.includes(exportContent)) {
-        contentComponents = `${contentComponents}${exportContent}\n`;
-        await fse.outputFile(fileComponents, contentComponents);
-        await cli.helper.formatFile({ fileName: fileComponents });
-    }
+    if (fse.existsSync(fileComponents))
+        return;
+    const contentComponents = `export * from 'zova-module-${moduleName}';`;
+    await fse.outputFile(fileComponents, contentComponents);
     // index
     const exportIndexContent = "export * from './components.js';";
     await generateRestIndex(options, modulePath, exportIndexContent);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-module-a-bean",
-  "version": "5.1.12",
-  "gitHead": "a247f88a55c663d313296039f874560ee5a13e01",
+  "version": "5.1.13",
+  "gitHead": "6162f8e212146d3e5f98145fcf43adc52912694e",
   "description": "",
   "keywords": [
     "Zova Module"

package/src/types/component.ts

@@ -0,0 +1,14 @@
+import { types } from 'typestyle';
+import { TypeRenderComponentJsxPropsPublic } from 'zova-jsx';
+
+export interface IVonaComponentRecord {}
+
+export type TypeComponentOptions<K extends keyof IVonaComponentRecord> = {
+  name: K;
+  options?: IVonaComponentRecord[K];
+} & TypeComponentOptionsProps;
+
+export interface TypeComponentOptionsProps extends TypeRenderComponentJsxPropsPublic {
+  class?: any;
+  style?: types.NestedCSSProperties;
+}

package/src/types/index.ts

@@ -3,3 +3,4 @@ export * from './aopMethod.js';
 export * from './bean.js';
 export * from './onion.js';
 export * from './service.js';
+export * from './component.js';