@azure-net/cli 2.1.7 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-net/cli",
-  "version": "2.1.7",
+  "version": "2.2.1",
   "type": "module",
   "bin": {
     "azure-net": "bin/azure-net.js"

package/src/commands/generate/generateCrudBase.js

@@ -1,6 +1,13 @@
 import prompts from 'prompts';
 import path from 'path';
-import { selectContext, getContextPath, toPascalCase, toCamelCase, getAvailableFiles } from '../../utils/contextUtils.js';
+import {
+    selectContext,
+    getContextPath,
+    toPascalCase,
+    toCamelCase,
+    getAvailableFiles,
+    toKebabCase
+} from '../../utils/contextUtils.js';
 import { writeIfNotExists, updateIndexTs, updateCoreIndex } from '../../utils/fileUtils.js';
 
 // Templates for CRUD base generation
@@ -11,7 +18,7 @@ const entityTemplate = `export interface I{{name}} {
 \tupdated_at: string;
 }`;
 
-const portsIndexTemplate = `import type { I{{name}} } from '\${{context}}/domain/{{name}}/model';
+const portsIndexTemplate = `import type { I{{name}} } from '\${{context}}/domain/{{entityLower}}/model';
 
 export interface I{{name}}Collection {
 \tdata: I{{name}}[];
@@ -41,7 +48,7 @@ import type {
 \tI{{name}}CollectionQuery,
 \tI{{name}}CreateRequest,
 \tI{{name}}UpdateRequest
-} from '\${{context}}/domain/{{name}}';
+} from '\${{context}}/domain/{{entityLower}}';
 
 export class {{name}}Repository {
 \tprivate endpoint = '{{endpoint}}';
@@ -132,11 +139,12 @@ export default async function generateCrudBase() {
 
     const pascalName = toPascalCase(name);
     const camelName = toCamelCase(name);
+    const entityLower = toKebabCase(pascalName);
 
     console.log('\n🚀 Generating CRUD base (repository & service)...\n');
 
     // 1. Create Domain structure
-    const domainPath = path.join(contextPath, 'domain', pascalName);
+    const domainPath = path.join(contextPath, 'domain', entityLower);
     const modelPath = path.join(domainPath, 'model');
     const portsPath = path.join(domainPath, 'ports');
 
@@ -152,6 +160,7 @@ export default async function generateCrudBase() {
         portsIndexTemplate
             .replace(/{{name}}/g, pascalName)
             .replace(/{{context}}/g, context)
+            .replace(/{{entityLower}}/g, entityLower)
     );
 
     // Create Domain module index
@@ -175,6 +184,7 @@ export default async function generateCrudBase() {
             .replace(/{{datasource}}/g, datasource.name)
             .replace(/{{datasourceImport}}/g, datasourceImport)
             .replace(/{{datasourceVar}}/g, toCamelCase(datasource.name))
+            .replace(/{{entityLower}}/g, entityLower)
     );
     await updateIndexTs(repoPath);
 

package/src/commands/generate/generateCrudPresenter.js

@@ -1,10 +1,17 @@
 import prompts from 'prompts';
 import path from 'path';
-import { selectContext, getContextPath, toPascalCase, getAvailableFiles, getApplicationProviderServices } from '../../utils/contextUtils.js';
+import {
+    selectContext,
+    getContextPath,
+    toPascalCase,
+    getAvailableFiles,
+    getApplicationProviderServices,
+    toKebabCase
+} from '../../utils/contextUtils.js';
 import { updateIndexTs, writeIfNotExists, updateCoreIndex } from '../../utils/fileUtils.js';
 
 const createSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}}';
-import type { I{{name}}CreateRequest } from '\${{context}}/domain/{{entity}}';
+import type { I{{name}}CreateRequest } from '\${{context}}/domain/{{entityLower}}';
 
 export const Create{{name}}Schema = {{schemaFactory}}<I{{name}}CreateRequest>()
 \t.rules((rules) => ({
@@ -13,7 +20,7 @@ export const Create{{name}}Schema = {{schemaFactory}}<I{{name}}CreateRequest>()
 \t.create();`;
 
 const updateSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}}';
-import type { I{{name}}UpdateRequest } from '\${{context}}/domain/{{entity}}';
+import type { I{{name}}UpdateRequest } from '\${{context}}/domain/{{entityLower}}';
 
 export const Update{{name}}Schema = {{schemaFactory}}<I{{name}}UpdateRequest>()
 \t.rules((rules) => ({
@@ -28,7 +35,7 @@ import type {
 \tI{{name}}CollectionQuery,
 \tI{{name}}CreateRequest,
 \tI{{name}}UpdateRequest
-} from '\${{context}}/domain/{{name}}';
+} from '\${{context}}/domain/{{entityLower}}';
 
 export const {{name}}Presenter = {{presenterFactory}}('{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
 \tconst { {{serviceName}} } = ApplicationProvider();
@@ -58,7 +65,7 @@ import type {
 \tI{{name}}CollectionQuery,
 \tI{{name}}CreateRequest,
 \tI{{name}}UpdateRequest
-} from '\${{context}}/domain/{{name}}';
+} from '\${{context}}/domain/{{entityLower}}';
 
 export const {{name}}Presenter = createPresenter('{{name}}Presenter', () => {
 \tconst { {{serviceName}} } = ApplicationProvider();
@@ -102,6 +109,7 @@ export default async function generateCrudPresenter() {
     // Extract entity name from service name
     const entityName = service.replace('Service', '');
     const pascalName = toPascalCase(entityName);
+    const entityLower = toKebabCase(pascalName);
 
     // Get schema factory
     const coreSchemas = await getAvailableFiles(
@@ -134,7 +142,7 @@ export default async function generateCrudPresenter() {
     });
 
     const contextPath = getContextPath(context);
-    const deliveryModulePath = path.join(contextPath, 'delivery', pascalName);
+    const deliveryModulePath = path.join(contextPath, 'delivery', entityLower);
     const schemaPath = path.join(deliveryModulePath, 'schema');
 
     console.log('\n🚀 Generating CRUD presenter...\n');
@@ -157,7 +165,7 @@ const Schema = createSchemaFactory(createRules(validationMessagesI18n));`;
                 .replace('import { {{schemaFactory}} } from \'{{schemaImport}}\';\n', '')
                 .replace(/{{name}}/g, pascalName)
                 .replace(/{{context}}/g, context)
-                .replace(/{{entity}}/g, pascalName)
+                .replace(/{{entityLower}}/g, entityLower)
                 .replace(/{{schemaFactory}}/g, 'Schema')
         );
 
@@ -167,7 +175,7 @@ const Schema = createSchemaFactory(createRules(validationMessagesI18n));`;
                 .replace('import { {{schemaFactory}} } from \'{{schemaImport}}\';\n', '')
                 .replace(/{{name}}/g, pascalName)
                 .replace(/{{context}}/g, context)
-                .replace(/{{entity}}/g, pascalName)
+                .replace(/{{entityLower}}/g, entityLower)
                 .replace(/{{schemaFactory}}/g, 'Schema')
         );
     } else {
@@ -176,7 +184,7 @@ const Schema = createSchemaFactory(createRules(validationMessagesI18n));`;
             createSchemaTemplate
                 .replace(/{{name}}/g, pascalName)
                 .replace(/{{context}}/g, context)
-                .replace(/{{entity}}/g, pascalName)
+                .replace(/{{entityLower}}/g, entityLower)
                 .replace(/{{schemaFactory}}/g, schemaFactory)
                 .replace(/{{schemaImport}}/g, schemaImport)
         );
@@ -186,7 +194,7 @@ const Schema = createSchemaFactory(createRules(validationMessagesI18n));`;
             updateSchemaTemplate
                 .replace(/{{name}}/g, pascalName)
                 .replace(/{{context}}/g, context)
-                .replace(/{{entity}}/g, pascalName)
+                .replace(/{{entityLower}}/g, entityLower)
                 .replace(/{{schemaFactory}}/g, schemaFactory)
                 .replace(/{{schemaImport}}/g, schemaImport)
         );
@@ -207,6 +215,7 @@ const Schema = createSchemaFactory(createRules(validationMessagesI18n));`;
             .replace(/{{context}}/g, context)
             .replace(/{{serviceName}}/g, service)
             .replace(/{{presenterFactory}}/g, presenterFactory)
+            .replace(/{{entityLower}}/g, entityLower)
     );
 
     // Create module index

package/src/commands/generate/generatePresenter.js

@@ -58,8 +58,9 @@ export default async function generatePresenter() {
     });
 
     const pascalName = toPascalCase(name);
+    const moduleLower = pascalName.toLowerCase();
     const contextPath = getContextPath(context);
-    const modulePath = path.join(contextPath, 'delivery', pascalName);
+    const modulePath = path.join(contextPath, 'delivery', moduleLower);
     const filePath = path.join(modulePath, `${pascalName}Presenter.ts`);
 
     const content = presenterType === 'package'

package/src/commands/generate/generateSchema.js

@@ -5,7 +5,7 @@ import { selectContext, getContextPath, toPascalCase, getAvailableFiles } from '
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
 const schemaWithCoreTemplate = `import { {{coreSchema}} } from '\$core/schemas';
-import type { I{{name}}Request } from '\${{context}}/domain/{{entity}}';
+import type { I{{name}}Request } from '\${{context}}/domain/{{entityLower}}';
 
 export const {{name}}Schema = {{coreSchema}}<I{{name}}Request>()
 \t.rules((rules) => ({
@@ -15,7 +15,7 @@ export const {{name}}Schema = {{coreSchema}}<I{{name}}Request>()
 
 const schemaWithPackageTemplate = `import { createSchemaFactory } from '@azure-net/kit';
 import { createRules, validationMessagesI18n } from '@azure-net/kit/schema';
-import type { I{{name}}Request } from '\${{context}}/domain/{{entity}}';
+import type { I{{name}}Request } from '\${{context}}/domain/{{entityLower}}';
 
 const Schema = createSchemaFactory(createRules(validationMessagesI18n));
 
@@ -64,26 +64,28 @@ export default async function generateSchema() {
 
     const pascalName = toPascalCase(name);
     const moduleName = toPascalCase(module);
+    const moduleLower = moduleName.toLowerCase();
+    const entityLower = moduleName.toLowerCase();
     const contextPath = getContextPath(context);
-    const schemaPath = path.join(contextPath, 'delivery', moduleName, 'schema');
+    const schemaPath = path.join(contextPath, 'delivery', moduleLower, 'schema');
     const filePath = path.join(schemaPath, `${pascalName}Schema.ts`);
 
     const content = schemaType === 'package'
         ? schemaWithPackageTemplate
             .replace(/{{name}}/g, pascalName)
             .replace(/{{context}}/g, context)
-            .replace(/{{entity}}/g, moduleName)
+            .replace(/{{entityLower}}/g, entityLower)
         : schemaWithCoreTemplate
             .replace(/{{name}}/g, pascalName)
             .replace(/{{context}}/g, context)
-            .replace(/{{entity}}/g, moduleName)
+            .replace(/{{entityLower}}/g, entityLower)
             .replace(/{{coreSchema}}/g, schemaType);
 
     await writeIfNotExists(filePath, content);
     await updateIndexTs(schemaPath);
 
     // Update module index
-    const moduleIndexPath = path.join(contextPath, 'delivery', moduleName, 'index.ts');
+    const moduleIndexPath = path.join(contextPath, 'delivery', moduleLower, 'index.ts');
     if (await fs.access(moduleIndexPath).then(() => true).catch(() => false)) {
         let indexContent = await fs.readFile(moduleIndexPath, 'utf-8');
         if (!indexContent.includes(`export * from './schema'`)) {

package/src/utils/contextUtils.js

@@ -72,3 +72,10 @@ export function toCamelCase(str) {
     const pascal = toPascalCase(str);
     return pascal.charAt(0).toLowerCase() + pascal.slice(1);
 }
+
+export function toKebabCase(str) {
+    return str
+        .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+        .replace(/([A-Z])([A-Z][a-z])/g, '$1-$2')
+        .toLowerCase();
+}