zova-module-a-bean 5.1.11 → 5.1.13

package/cli/controller/metadata/_extractGenericParams.ts

@@ -0,0 +1,64 @@
+import fs from 'node:fs';
+import ts from 'typescript';
+
+export function extractGenericParamsAndImports(filePath: string, interfaceName: string) {
+  const sourceText = fs.readFileSync(filePath, 'utf-8');
+  const sourceFile = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
+
+  // 1. Find the target interface
+  let targetInterface: ts.InterfaceDeclaration | undefined;
+  ts.forEachChild(sourceFile, node => {
+    if (ts.isInterfaceDeclaration(node) && node.name.text === interfaceName) {
+      targetInterface = node;
+    }
+  });
+  if (!targetInterface?.typeParameters) {
+    return { genericParams: '', imports: [] as string[] };
+  }
+
+  // 2. Extract generic parameters text
+  const genericParams = targetInterface.typeParameters.map(tp => tp.getText(sourceFile)).join(', ');
+
+  // 3. Collect type reference identifiers within generic parameters
+  const typeRefNames = new Set<string>();
+  const visit = (node: ts.Node) => {
+    if (ts.isTypeReferenceNode(node)) {
+      // For qualified names like A.B, only take the leftmost identifier
+      const id = ts.isQualifiedName(node.typeName) ? node.typeName.left : node.typeName;
+      typeRefNames.add(id.getText(sourceFile));
+    }
+    ts.forEachChild(node, visit);
+  };
+  targetInterface.typeParameters.forEach(tp => visit(tp));
+
+  // Exclude the generic parameter names themselves (TParentData, TComponentName, etc.)
+  for (const tp of targetInterface.typeParameters) {
+    typeRefNames.delete(tp.name.text);
+  }
+
+  // 4. Match type references to import statements
+  const imports: string[] = [];
+  ts.forEachChild(sourceFile, node => {
+    if (!ts.isImportDeclaration(node)) return;
+    const clause = node.importClause;
+    if (!clause?.namedBindings || !ts.isNamedImports(clause.namedBindings)) return;
+
+    const matched = clause.namedBindings.elements.map(el => el.name.text).filter(name => typeRefNames.has(name));
+    if (matched.length === 0) return;
+
+    const specifier = (node.moduleSpecifier as ts.StringLiteral).text;
+    const prefix = clause.isTypeOnly ? 'type ' : '';
+    imports.push(`import ${prefix}{ ${matched.join(', ')} } from '${specifier}';`);
+  });
+
+  return { genericParams, imports };
+}
+
+// // --- Demo ---
+// const result = extractGenericParamsAndImports(
+//   import.meta.url.replace('file://', '').replace(/_extractGenericParams\.ts$/, 'controller.tsx'),
+//   'ControllerFormFieldPresetProps',
+// );
+// console.log('Generic params:', result.genericParams);
+// console.log('Imports:');
+// result.imports.forEach(imp => console.log(' ', imp));

package/cli/controller/metadata/generate.ts

@@ -8,10 +8,13 @@ import path from 'node:path';
 
 import type { IControllerInfo } from './types.ts';
 
+import { extractGenericParamsAndImports } from './_extractGenericParams.ts';
 import { generateFile } from './generateFile.ts';
 import { generateMetaComponent } from './generateMetaComponent.ts';
 import { generateMetaPage } from './generateMetaPage.ts';
 
+// const __regProps = /interface Controller[^<]*Props<(.*?)>/;
+
 export default async function (options: IMetadataCustomGenerateOptions): Promise<string> {
   const { globFiles } = options;
   const globFilesPage: [IGlobBeanFile, IControllerInfo][] = [];
@@ -34,7 +37,7 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
 }
 
 function _parseControllerInfo(options: IMetadataCustomGenerateOptions, globFile: IGlobBeanFile): IControllerInfo | undefined {
-  const { className, fileContent, fileNameJSRelative } = globFile;
+  const { className, fileContent, fileNameJSRelative, file } = globFile;
   const matches = fileNameJSRelative.match(/..\/(.+?)\/(.+?)\/controller(.jsx?)$/);
   if (!matches) return;
   const type = matches[1];
@@ -55,10 +58,11 @@ function _parseControllerInfo(options: IMetadataCustomGenerateOptions, globFile:
   const hasModels = fileContent.includes(nameModels);
   const hasModelValue = fileContent.includes("'vModel'");
   // generic
-  const matchGeneric = fileContent.match(/interface [^<]*Props<(.*?)> (extends|\{)/);
-  const hasGeneric = !!matchGeneric;
-  const generic = matchGeneric && matchGeneric[1];
-  const genericKeys = matchGeneric && matchGeneric[1].split(',').map(item => item.trim().split(' ')[0]);
+  const matchGeneric = hasProps && extractGenericParamsAndImports(file, nameProps); // fileContent.match(__regProps);
+  const hasGeneric = !!(matchGeneric && matchGeneric.genericParams);
+  const generic = hasGeneric ? matchGeneric.genericParams : undefined;
+  const genericKeys = hasGeneric ? matchGeneric.genericParams.split(',').map(item => item.trim().split(' ')[0]) : undefined;
+  const generateImports = hasGeneric ? matchGeneric.imports : undefined;
   // schemaParams
   const nameSchemaParams = `${className}SchemaParams`;
   const hasSchemaParams = fileContent.includes(nameSchemaParams);
@@ -70,7 +74,9 @@ function _parseControllerInfo(options: IMetadataCustomGenerateOptions, globFile:
   const hasRenderFirst = fse.existsSync(fileRenderFirst);
   const classNameRenderFirst = `Render${type === 'page' ? 'Page' : ''}${nameCapitalize}`;
   const importRenderFirst = `import { ${classNameRenderFirst} } from '../../${type}/${name}/render.jsx';`;
-  const fileRenderOthers = globbySync(`src/${type}/${name}/render.*.tsx`, { cwd: options.modulePath });
+  const fileRenderOthers = globbySync(`src/${type}/${name}/render.*.tsx`, {
+    cwd: options.modulePath,
+  });
   const nameRenderOthers: string[] = fileRenderOthers.map(item => /render\.(.*)\.tsx/.exec(item)![1]);
   const classNameRenderOthers: string[] = nameRenderOthers.map(item => `Render${type === 'page' ? 'Page' : ''}${toUpperCaseFirstChar(item)}`);
   const importRenderOthers: string[] = nameRenderOthers.map(
@@ -104,6 +110,7 @@ function _parseControllerInfo(options: IMetadataCustomGenerateOptions, globFile:
     hasGeneric,
     generic,
     genericKeys,
+    generateImports,
     nameSchemaParams,
     hasSchemaParams,
     nameSchemaQuery,

package/cli/controller/metadata/generateFile.ts

@@ -9,9 +9,16 @@ import type { IControllerInfo } from './types.ts';
 import { generateFileComponent } from './generateFileComponent.ts';
 import { generateFilePage } from './generateFilePage.ts';
 
-export async function generateFile(options: IMetadataCustomGenerateOptions, globFile: IGlobBeanFile, controllerInfo: IControllerInfo) {
+export async function generateFile(
+  options: IMetadataCustomGenerateOptions,
+  globFile: IGlobBeanFile,
+  controllerInfo: IControllerInfo,
+) {
   const cli = options.cli;
-  const fileDest = path.join(options.modulePath, `src/.metadata/${controllerInfo.type}/${controllerInfo.name}.ts`);
+  const fileDest = path.join(
+    options.modulePath,
+    `src/.metadata/${controllerInfo.type}/${controllerInfo.name}.ts`,
+  );
   const content =
     controllerInfo.type === 'page'
       ? await generateFilePage(options, globFile, controllerInfo)

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';
 
@@ -26,6 +24,7 @@ export async function generateFileComponent(options: IMetadataCustomGenerateOpti
     hasModelValue,
     generic,
     genericKeys,
+    generateImports,
     importRenderFirst,
     hasRenderFirst,
     classNameRenderFirst,
@@ -34,6 +33,9 @@ export async function generateFileComponent(options: IMetadataCustomGenerateOpti
     classNameStyleFirst,
   } = controllerInfo;
   const contentImports: string[] = [];
+  if (generateImports) {
+    contentImports.push(...generateImports);
+  }
   const genericDeclare = hasGeneric ? `<${generic}>` : '';
   const genericArguments = hasGeneric ? `<${genericKeys?.join(', ')}>` : '';
   const componentOptions = hasComponentOptions ? `Controller${nameCapitalize}.$componentOptions` : '';
@@ -129,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}
@@ -137,92 +164,21 @@ ${contentControllerInnerProps}
 ${contentControllerInterface}
 ${combineContentRenderAndStyle(controllerInfo, moduleName, className, genericDeclare, genericArguments)}
 ${contentComponent}
+${contentRestProps}
 `;
   // restComponent
-  await generateRestComponent(options, globFile, controllerInfo, genericDeclare, genericArguments, _contentImportTypeController);
+  await generateRestComponent(options);
   // ok
   return content;
 }
 
-async function generateRestComponent(
-  options: IMetadataCustomGenerateOptions,
-  _globFile: IGlobBeanFile,
-  controllerInfo: IControllerInfo,
-  genericDeclare: string,
-  genericArguments: string,
-  _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[] = [];
-  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/cli/controller/metadata/generateFilePage.ts

@@ -5,7 +5,11 @@ import type { IControllerInfo } from './types.ts';
 
 import { combineContentRenderAndStyle } from './utils.ts';
 
-export async function generateFilePage(options: IMetadataCustomGenerateOptions, globFile: IGlobBeanFile, controllerInfo: IControllerInfo) {
+export async function generateFilePage(
+  options: IMetadataCustomGenerateOptions,
+  globFile: IGlobBeanFile,
+  controllerInfo: IControllerInfo,
+) {
   const { moduleName } = options;
   const { className } = globFile;
   const {
@@ -23,7 +27,9 @@ export async function generateFilePage(options: IMetadataCustomGenerateOptions,
   const contentImports: string[] = [];
   // controller
   contentImports.push("import { createZovaComponentPage } from 'zova';");
-  contentImports.push(`import { ControllerPage${nameCapitalize} } from '../../page/${name}/controller${controllerExtJs}';`);
+  contentImports.push(
+    `import { ControllerPage${nameCapitalize} } from '../../page/${name}/controller${controllerExtJs}';`,
+  );
   // render
   if (hasRenderFirst) {
     contentImports.push(importRenderFirst);
@@ -37,7 +43,9 @@ export async function generateFilePage(options: IMetadataCustomGenerateOptions,
   if (hasSchemaParams) _contentImports_parts.push(nameSchemaParams);
   if (hasSchemaQuery) _contentImports_parts.push(nameSchemaQuery);
   if (_contentImports_parts.length > 0) {
-    contentImports.push(`import { ${_contentImports_parts.join(', ')} } from '../../page/${name}/controller${controllerExtJs}';`);
+    contentImports.push(
+      `import { ${_contentImports_parts.join(', ')} } from '../../page/${name}/controller${controllerExtJs}';`,
+    );
   }
   //
   const _contentRecords2_parts: string[] = [];

package/cli/controller/metadata/generateMetaPage.ts

@@ -10,7 +10,10 @@ import type { IControllerInfo } from './types.ts';
 
 import { generateRestIndex } from './utils.ts';
 
-export async function generateMetaPage(options: IMetadataCustomGenerateOptions, globFiles: [IGlobBeanFile, IControllerInfo][]) {
+export async function generateMetaPage(
+  options: IMetadataCustomGenerateOptions,
+  globFiles: [IGlobBeanFile, IControllerInfo][],
+) {
   if (globFiles.length === 0) return '';
   const { moduleName } = options;
   const contentImports: string[] = [];
@@ -31,16 +34,27 @@ export async function generateMetaPage(options: IMetadataCustomGenerateOptions,
     if (hasSchemaParams || hasSchemaQuery) {
       contentImports.push(`import { ${namespace} } from './page/${name}.js';`);
       // rest
-      const restIndexFileRelative = path.relative(srcDirRest, path.join(options.modulePath, `src/.metadata/page/${name}.js`));
-      contentImportsRest.push(`import { ${namespace} as ${namespaceRest} } from '${restIndexFileRelative}';`);
+      const restIndexFileRelative = path.relative(
+        srcDirRest,
+        path.join(options.modulePath, `src/.metadata/page/${name}.js`),
+      );
+      contentImportsRest.push(
+        `import { ${namespace} as ${namespaceRest} } from '${restIndexFileRelative}';`,
+      );
     }
     // controller.tsx
     const { routePath, routeName } = _extractRoutePathOrName(options, globFile, controllerInfo);
     // no matter that: route.meta?.absolute
-    const routePathFull = routePath ? `/${moduleName.replace('-', '/')}/${routePath}` : `/${moduleName.replace('-', '/')}`;
+    const routePathFull = routePath
+      ? `/${moduleName.replace('-', '/')}/${routePath}`
+      : `/${moduleName.replace('-', '/')}`;
     const routeNameFull = `${moduleName}:${routeName}`;
-    contentPathRecords.push(_combineContentPathRecord(routePathFull, hasSchemaParams, hasSchemaQuery, namespace));
-    contentPathRecordsRest.push(_combineContentPathRecord(routePathFull, hasSchemaParams, hasSchemaQuery, namespaceRest));
+    contentPathRecords.push(
+      _combineContentPathRecord(routePathFull, hasSchemaParams, hasSchemaQuery, namespace),
+    );
+    contentPathRecordsRest.push(
+      _combineContentPathRecord(routePathFull, hasSchemaParams, hasSchemaQuery, namespaceRest),
+    );
     if (!routeName) {
       // contentPathRecords.push(_combineContentPathRecord(routePathFull, hasSchemaParams, hasSchemaQuery, className));
     } else {
@@ -115,7 +129,11 @@ declare module 'zova-module-${moduleName}' {
   return content;
 }
 
-async function generateRestMetaPage(options: IMetadataCustomGenerateOptions, _contentImportsRest: string[], contentPathRecordsRest: string[]) {
+async function generateRestMetaPage(
+  options: IMetadataCustomGenerateOptions,
+  _contentImportsRest: string[],
+  contentPathRecordsRest: string[],
+) {
   if (contentPathRecordsRest.length === 0) return;
   const { moduleName, modulePath } = options;
   // pages
@@ -131,7 +149,11 @@ function _combineModuleNameControllerName(moduleName: string, className: string)
   return `NS${toUpperCaseFirstChar(combineResourceName(className, moduleName, false, false))}`;
 }
 
-function _extractRoutePathOrName(options: IMetadataCustomGenerateOptions, _globFile: IGlobBeanFile, controllerInfo: IControllerInfo) {
+function _extractRoutePathOrName(
+  options: IMetadataCustomGenerateOptions,
+  _globFile: IGlobBeanFile,
+  controllerInfo: IControllerInfo,
+) {
   const cli = options.cli;
   const targetFile = path.join(options.modulePath, 'src/routes.ts');
   const content = fse.readFileSync(targetFile).toString('utf8');
@@ -146,7 +168,8 @@ function _extractRoutePathOrName(options: IMetadataCustomGenerateOptions, _globF
     return (item.node as any).properties.some(prop => {
       return (
         prop.key.name === 'component' &&
-        (prop.value.name === controllerInfo.nameCapitalize || prop.value.name === `ZPage${controllerInfo.nameCapitalize}`)
+        (prop.value.name === controllerInfo.nameCapitalize ||
+          prop.value.name === `ZPage${controllerInfo.nameCapitalize}`)
       );
     });
   });
@@ -164,7 +187,12 @@ function _extractRoutePathOrName(options: IMetadataCustomGenerateOptions, _globF
   return { routePath, routeName };
 }
 
-function _combineContentPathRecord(key: string, hasSchemaParams, hasSchemaQuery: boolean, namespace: string) {
+function _combineContentPathRecord(
+  key: string,
+  hasSchemaParams,
+  hasSchemaQuery: boolean,
+  namespace: string,
+) {
   return `'${key}': TypePagePathSchema<${hasSchemaParams ? `${namespace}.ParamsInput` : 'undefined'},${hasSchemaQuery ? `${namespace}.QueryInput` : 'undefined'}>;`;
   // return `'${key}': {
   //   path: ${value},

package/cli/controller/metadata/types.ts

@@ -14,6 +14,7 @@ export interface IControllerInfo {
   hasGeneric: boolean;
   generic?: string | null;
   genericKeys?: string[] | null;
+  generateImports?: string[] | null;
   nameSchemaParams: string;
   hasSchemaParams: boolean;
   nameSchemaQuery: string;

package/cli/controller/metadata/utils.ts

@@ -12,13 +12,24 @@ export function combineContentRenderAndStyle(
   genericDeclare: string,
   genericArguments: string,
 ) {
-  const { hasRenderFirst, classNameRenderFirst, classNameRenderOthers, hasStyleFirst, classNameStyleFirst, classNameStyleOthers } = controllerInfo;
+  const {
+    hasRenderFirst,
+    classNameRenderFirst,
+    classNameRenderOthers,
+    hasStyleFirst,
+    classNameStyleFirst,
+    classNameStyleOthers,
+  } = controllerInfo;
   const contentControllerInterfaceRecords: string[] = [];
   if (hasStyleFirst) {
-    contentControllerInterfaceRecords.push(`export interface ${classNameStyleFirst}${genericDeclare} extends ${className}${genericArguments} {}`);
+    contentControllerInterfaceRecords.push(
+      `export interface ${classNameStyleFirst}${genericDeclare} extends ${className}${genericArguments} {}`,
+    );
   }
   for (const item of classNameStyleOthers) {
-    contentControllerInterfaceRecords.push(`export interface ${item}${genericDeclare} extends ${className}${genericArguments} {}`);
+    contentControllerInterfaceRecords.push(
+      `export interface ${item}${genericDeclare} extends ${className}${genericArguments} {}`,
+    );
   }
   if (hasRenderFirst) {
     if (hasStyleFirst) {
@@ -26,14 +37,20 @@ export function combineContentRenderAndStyle(
         `export interface ${classNameRenderFirst}${genericDeclare} extends ${classNameStyleFirst}${genericArguments} {}`,
       );
     } else {
-      contentControllerInterfaceRecords.push(`export interface ${classNameRenderFirst}${genericDeclare} extends ${className}${genericArguments} {}`);
+      contentControllerInterfaceRecords.push(
+        `export interface ${classNameRenderFirst}${genericDeclare} extends ${className}${genericArguments} {}`,
+      );
     }
   }
   for (const item of classNameRenderOthers) {
     if (hasStyleFirst) {
-      contentControllerInterfaceRecords.push(`export interface ${item}${genericDeclare} extends ${classNameStyleFirst}${genericArguments} {}`);
+      contentControllerInterfaceRecords.push(
+        `export interface ${item}${genericDeclare} extends ${classNameStyleFirst}${genericArguments} {}`,
+      );
     } else {
-      contentControllerInterfaceRecords.push(`export interface ${item}${genericDeclare} extends ${className}${genericArguments} {}`);
+      contentControllerInterfaceRecords.push(
+        `export interface ${item}${genericDeclare} extends ${className}${genericArguments} {}`,
+      );
     }
   }
   if (contentControllerInterfaceRecords.length === 0) return '';
@@ -42,7 +59,11 @@ export function combineContentRenderAndStyle(
   }`;
 }
 
-export async function generateRestIndex(options: IMetadataCustomGenerateOptions, modulePath: string, append: string) {
+export async function generateRestIndex(
+  options: IMetadataCustomGenerateOptions,
+  modulePath: string,
+  append: string,
+) {
   const { cli } = options;
   // index
   const fileIndex = path.join(modulePath, 'rest/index.ts');

package/dist/bean/sys.onion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sys.onion.d.ts","sourceRoot":"","sources":["../../src/bean/sys.onion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAgB,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAA8B,MAAM,mBAAmB,CAAC;AAKhI,qBAEa,QAAS,SAAQ,QAAQ;IACpC,OAAO,CAAC,WAAW,CAA2B;IAE9C,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;IAUvB,wBAAwB,CAC7B,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,CAAC,GAAG,CAAC,EACtD,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,EAC3B,SAAS,CAAC,EAAE,GAAG,EACf,GAAG,SAAS,EAAE,GAAG,EAAE;IAYd,qBAAqB,CAAC,IAAI,CAAC,EAAE,iBAAiB;CAGtD"}
+{"version":3,"file":"sys.onion.d.ts","sourceRoot":"","sources":["../../src/bean/sys.onion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAgB,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EAElB,MAAM,mBAAmB,CAAC;AAK3B,qBAEa,QAAS,SAAQ,QAAQ;IACpC,OAAO,CAAC,WAAW,CAA2B;IAE9C,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;IAUvB,wBAAwB,CAC7B,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,CAAC,GAAG,CAAC,EACtD,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,EAC3B,SAAS,CAAC,EAAE,GAAG,EACf,GAAG,SAAS,EAAE,GAAG,EAAE;IAcd,qBAAqB,CAAC,IAAI,CAAC,EAAE,iBAAiB;CAGtD"}