zova-module-a-bean 5.1.16 → 5.1.17

package/cli/controller/metadata/generateFileComponent.ts

@@ -1,12 +1,9 @@
 import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
 import type { IGlobBeanFile } from '@cabloy/module-info';
 
-import fse from 'fs-extra';
-import path from 'node:path';
-
 import type { IControllerInfo } from './types.ts';
 
-import { combineContentRenderAndStyle, generateRestIndex } from './utils.ts';
+import { combineContentRenderAndStyle } from './utils.ts';
 
 export async function generateFileComponent(options: IMetadataCustomGenerateOptions, globFile: IGlobBeanFile, controllerInfo: IControllerInfo) {
   const { moduleName } = options;
@@ -166,20 +163,6 @@ ${combineContentRenderAndStyle(controllerInfo, moduleName, className, genericDec
 ${contentComponent}
 ${contentRestProps}
 `;
-  // restComponent
-  await generateRestComponent(options);
   // ok
   return content;
 }
-
-async function generateRestComponent(options: IMetadataCustomGenerateOptions) {
-  const { moduleName, modulePath } = options;
-  // components
-  const fileComponents = path.join(modulePath, 'rest/components.ts');
-  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/generateMetaPage.ts

@@ -8,12 +8,7 @@ import path from 'node:path';
 
 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[] = [];
@@ -34,27 +29,16 @@ export async function generateMetaPage(
     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 {
@@ -124,36 +108,14 @@ declare module 'zova-module-${moduleName}' {
 }
 /** pages: end */
 `;
-  // restComponent
-  await generateRestMetaPage(options, contentImportsRest, contentPathRecordsRest);
   return content;
 }
 
-async function generateRestMetaPage(
-  options: IMetadataCustomGenerateOptions,
-  _contentImportsRest: string[],
-  contentPathRecordsRest: string[],
-) {
-  if (contentPathRecordsRest.length === 0) return;
-  const { moduleName, modulePath } = options;
-  // pages
-  const contentPages = `export * from 'zova-module-${moduleName}';\n`;
-  const filePages = path.join(modulePath, 'rest/pages.ts');
-  await fse.outputFile(filePages, contentPages);
-  // index
-  const exportIndexContent = "export * from './pages.js';";
-  await generateRestIndex(options, modulePath, exportIndexContent);
-}
-
 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');
@@ -168,8 +130,7 @@ function _extractRoutePathOrName(
     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}`)
       );
     });
   });
@@ -187,12 +148,7 @@ function _extractRoutePathOrName(
   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/utils.ts

@@ -1,8 +1,3 @@
-import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
-
-import fse from 'fs-extra';
-import path from 'node:path';
-
 import type { IControllerInfo } from './types.ts';
 
 export function combineContentRenderAndStyle(
@@ -12,24 +7,13 @@ 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) {
@@ -37,20 +21,14 @@ 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 '';
@@ -58,22 +36,3 @@ export function combineContentRenderAndStyle(
     ${contentControllerInterfaceRecords.join('\n')}
   }`;
 }
-
-export async function generateRestIndex(
-  options: IMetadataCustomGenerateOptions,
-  modulePath: string,
-  append: string,
-) {
-  const { cli } = options;
-  // index
-  const fileIndex = path.join(modulePath, 'rest/index.ts');
-  let contentIndex = '';
-  if (fse.existsSync(fileIndex)) {
-    contentIndex = (await fse.readFile(fileIndex)).toString();
-  }
-  if (!contentIndex.includes(append)) {
-    contentIndex = `${contentIndex}${append}\n`;
-    await fse.outputFile(fileIndex, contentIndex);
-    await cli.helper.formatFile({ fileName: fileIndex });
-  }
-}

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

@@ -1,6 +1,4 @@
-import fse from 'fs-extra';
-import path from 'node:path';
-import { combineContentRenderAndStyle, generateRestIndex } from "./utils.js";
+import { combineContentRenderAndStyle } from "./utils.js";
 export async function generateFileComponent(options, globFile, controllerInfo) {
     const { moduleName } = options;
     const { className } = globFile;
@@ -139,20 +137,6 @@ ${combineContentRenderAndStyle(controllerInfo, moduleName, className, genericDec
 ${contentComponent}
 ${contentRestProps}
 `;
-    // restComponent
-    await generateRestComponent(options);
     // ok
     return content;
 }
-async function generateRestComponent(options) {
-    const { moduleName, modulePath } = options;
-    // components
-    const fileComponents = path.join(modulePath, 'rest/components.ts');
-    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-cli/controller/metadata/generateMetaPage.js

@@ -2,7 +2,6 @@ import { combineResourceName } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import fse from 'fs-extra';
 import path from 'node:path';
-import { generateRestIndex } from "./utils.js";
 export async function generateMetaPage(options, globFiles) {
     if (globFiles.length === 0)
         return '';
@@ -31,9 +30,7 @@ export async function generateMetaPage(options, globFiles) {
         // 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));
@@ -110,22 +107,8 @@ declare module 'zova-module-${moduleName}' {
 }
 /** pages: end */
 `;
-    // restComponent
-    await generateRestMetaPage(options, contentImportsRest, contentPathRecordsRest);
     return content;
 }
-async function generateRestMetaPage(options, _contentImportsRest, contentPathRecordsRest) {
-    if (contentPathRecordsRest.length === 0)
-        return;
-    const { moduleName, modulePath } = options;
-    // pages
-    const contentPages = `export * from 'zova-module-${moduleName}';\n`;
-    const filePages = path.join(modulePath, 'rest/pages.ts');
-    await fse.outputFile(filePages, contentPages);
-    // index
-    const exportIndexContent = "export * from './pages.js';";
-    await generateRestIndex(options, modulePath, exportIndexContent);
-}
 function _combineModuleNameControllerName(moduleName, className) {
     return `NS${toUpperCaseFirstChar(combineResourceName(className, moduleName, false, false))}`;
 }
@@ -143,8 +126,7 @@ function _extractRoutePathOrName(options, _globFile, controllerInfo) {
     const astMatch = astMatches.find(item => {
         return item.node.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}`));
         });
     });
     if (!astMatch) {

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

@@ -1,7 +1,5 @@
-import fse from 'fs-extra';
-import path from 'node:path';
 export function combineContentRenderAndStyle(controllerInfo, moduleName, className, genericDeclare, genericArguments) {
-    const { hasRenderFirst, classNameRenderFirst, classNameRenderOthers, hasStyleFirst, classNameStyleFirst, classNameStyleOthers, } = controllerInfo;
+    const { hasRenderFirst, classNameRenderFirst, classNameRenderOthers, hasStyleFirst, classNameStyleFirst, classNameStyleOthers } = controllerInfo;
     const contentControllerInterfaceRecords = [];
     if (hasStyleFirst) {
         contentControllerInterfaceRecords.push(`export interface ${classNameStyleFirst}${genericDeclare} extends ${className}${genericArguments} {}`);
@@ -31,17 +29,3 @@ export function combineContentRenderAndStyle(controllerInfo, moduleName, classNa
     ${contentControllerInterfaceRecords.join('\n')}
   }`;
 }
-export async function generateRestIndex(options, modulePath, append) {
-    const { cli } = options;
-    // index
-    const fileIndex = path.join(modulePath, 'rest/index.ts');
-    let contentIndex = '';
-    if (fse.existsSync(fileIndex)) {
-        contentIndex = (await fse.readFile(fileIndex)).toString();
-    }
-    if (!contentIndex.includes(append)) {
-        contentIndex = `${contentIndex}${append}\n`;
-        await fse.outputFile(fileIndex, contentIndex);
-        await cli.helper.formatFile({ fileName: fileIndex });
-    }
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-module-a-bean",
-  "version": "5.1.16",
-  "gitHead": "6c7a09c8f0a8a0f41c5090b544a1667dbc689f0e",
+  "version": "5.1.17",
+  "gitHead": "343c61ad189fe3f0fc997ee9f4c710567657e05c",
   "description": "",
   "keywords": [
     "Zova Module"
@@ -14,7 +14,6 @@
     "src",
     "icons",
     "assets",
-    "rest",
     "dist-cli"
   ],
   "type": "module",