@lark-apaas/devtool-kits 1.2.2 → 1.2.4

package/dist/index.js

@@ -514,6 +514,9 @@ function postprocessDrizzleSchema(targetPath) {
 }
 __name(postprocessDrizzleSchema, "postprocessDrizzleSchema");
 
+// src/helpers/gen-nest-resource/generator.ts
+import { pluralize } from "inflection";
+
 // src/helpers/gen-nest-resource/utils.ts
 function mapDrizzleTypeToTS(field) {
   const typeMap = {
@@ -591,6 +594,10 @@ function toKebabCase(str) {
   return str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase().replace(/[_\s]/g, "-");
 }
 __name(toKebabCase, "toKebabCase");
+function toSnakeCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase().replace(/[-\s]/g, "_");
+}
+__name(toSnakeCase, "toSnakeCase");
 
 // src/helpers/gen-nest-resource/generator.ts
 function generateDTO(table) {
@@ -720,7 +727,8 @@ function generateValidationDecorators(field, { isUpdate = false, isResponse = fa
 __name(generateValidationDecorators, "generateValidationDecorators");
 function generateController(table) {
   const className = toPascalCase(table.variableName);
-  const routePath = toKebabCase(table.variableName);
+  const routePath = toKebabCase(pluralize(table.variableName));
+  const filePath = toSnakeCase(table.variableName);
   const pkField = table.fields.find((f) => f.isPrimaryKey);
   const pkType = pkField ? mapDrizzleTypeToTS(pkField) : "string";
   const pkName = pkField ? pkField.name : "id";
@@ -746,8 +754,8 @@ import {
   Create${className}Dto, 
   Update${className}Dto,
   ${className}ResponseDto
-} from './dtos/${routePath}.dto';
-import { ${className}Service } from './${routePath}.service';
+} from './dtos/${filePath}.dto';
+import { ${className}Service } from './${filePath}.service';
 
 @ApiTags('${toPascalCase(table.variableName)}')
 @Controller('api/${routePath}')
@@ -820,7 +828,7 @@ export class ${className}Controller {
 __name(generateController, "generateController");
 function generateService(table) {
   const className = toPascalCase(table.variableName);
-  const routePath = toKebabCase(table.variableName);
+  const filePath = toSnakeCase(table.variableName);
   const pkField = table.fields.find((f) => f.isPrimaryKey);
   const pkType = pkField ? mapDrizzleTypeToTS(pkField) : "string";
   const pkName = pkField ? pkField.name : "id";
@@ -834,7 +842,7 @@ import {
   Create${className}Dto, 
   Update${className}Dto,
   ${className}ResponseDto 
-} from './dtos/${routePath}.dto';
+} from './dtos/${filePath}.dto';
 
 @Injectable()
 export class ${className}Service {
@@ -911,11 +919,11 @@ export class ${className}Service {
 __name(generateService, "generateService");
 function generateModule(table) {
   const className = toPascalCase(table.variableName);
-  const routePath = toKebabCase(table.variableName);
+  const filePath = toSnakeCase(table.variableName);
   const module = `
 import { Module } from '@nestjs/common';
-import { ${className}Controller } from './${routePath}.controller';
-import { ${className}Service } from './${routePath}.service';
+import { ${className}Controller } from './${filePath}.controller';
+import { ${className}Service } from './${filePath}.service';
 
 @Module({
   controllers: [${className}Controller],
@@ -1151,18 +1159,19 @@ async function parseAndGenerateNestResourceTemplate(options) {
     console.warn("\u672A\u89E3\u6790\u5230\u4EFB\u4F55\u6570\u636E\u5E93\u8868\uFF0C\u65E0\u9700\u751F\u6210 Nest.js \u6A21\u5757\u6A21\u677F");
     return;
   }
+  tables.sort((a, b) => b.variableName.length - a.variableName.length);
   const table = tables[0];
   console.info(`\u751F\u6210 Nest.js ${table.variableName} \u6A21\u5757`);
-  const routePath = toKebabCase(table.variableName);
-  const moduleDir = join(options.moduleOutputDir, routePath);
+  const filePath = toSnakeCase(table.variableName);
+  const moduleDir = join(options.moduleOutputDir, filePath);
   if (existsSync(moduleDir)) {
-    console.info(`Nest.js \u6A21\u5757 ${routePath} \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7\u751F\u6210\u4EE3\u7801`);
+    console.info(`Nest.js \u6A21\u5757 ${filePath} \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7\u751F\u6210\u4EE3\u7801`);
     return;
   }
   const dto = generateDTO(table);
   const controller = generateController(table);
   const service = generateService(table);
-  const moduleFilePath = join(moduleDir, `${routePath}.module.ts`);
+  const moduleFilePath = join(moduleDir, `${filePath}.module.ts`);
   const module = generateModule(table);
   try {
     await mkdir(moduleDir, {
@@ -1171,12 +1180,12 @@ async function parseAndGenerateNestResourceTemplate(options) {
     await mkdir(join(moduleDir, "dtos"), {
       recursive: true
     });
-    await writeFile(join(moduleDir, "dtos", `${routePath}.dto.ts`), dto);
-    await writeFile(join(moduleDir, `${routePath}.controller.ts`), controller);
-    await writeFile(join(moduleDir, `${routePath}.service.ts`), service);
+    await writeFile(join(moduleDir, "dtos", `${filePath}.dto.ts`), dto);
+    await writeFile(join(moduleDir, `${filePath}.controller.ts`), controller);
+    await writeFile(join(moduleDir, `${filePath}.service.ts`), service);
     await writeFile(moduleFilePath, module);
   } catch (err) {
-    console.error(`\u751F\u6210 Nest.js ${routePath} \u6A21\u5757\u5931\u8D25: ${err.message}`);
+    console.error(`\u751F\u6210 Nest.js ${filePath} \u6A21\u5757\u5931\u8D25: ${err.message}`);
     await rm(moduleDir, {
       recursive: true
     });