@azure-net/cli 2.0.1 → 2.0.3

package/package.json

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

package/src/commands/generate/generateCrud.js

@@ -13,7 +13,9 @@ const entityTemplate = `export interface I{{name}} {
 \tupdated_at: string;
 }`;
 
-const portsIndexTemplate = `export interface I{{name}}Collection {
+const portsIndexTemplate = `import type { I{{name}} } from '../../Entities/{{name}}';
+
+export interface I{{name}}Collection {
 \tdata: I{{name}}[];
 \ttotal: number;
 }
@@ -33,13 +35,13 @@ export interface I{{name}}UpdateRequest {
 }`;
 
 const repositoryTemplate = `import { {{datasource}} } from '{{datasourceImport}}';
-import type { I{{name}} } from '${{context}}/Domain/Entities/{{name}}';
+import type { I{{name}} } from '\${{context}}/Domain/Entities/{{name}}';
 import type { 
 \tI{{name}}Collection,
 \tI{{name}}CollectionQuery,
 \tI{{name}}CreateRequest,
 \tI{{name}}UpdateRequest
-} from '${{context}}/Domain/Ports/{{name}}';
+} from '\${{context}}/Domain/Ports/{{name}}';
 
 export class {{name}}Repository {
 \tprivate endpoint = '{{endpoint}}';
@@ -93,7 +95,7 @@ export class {{name}}Service extends ClassMirror<{{name}}Repository> {
 }`;
 
 const createSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}}';
-import type { I{{name}}CreateRequest } from '${{context}}/Domain/Ports/{{name}}';
+import type { I{{name}}CreateRequest } from '\${{context}}/Domain/Ports/{{name}}';
 
 export const Create{{name}}Schema = {{schemaFactory}}<I{{name}}CreateRequest>()
 \t.rules((rules) => ({
@@ -102,7 +104,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/Ports/{{name}}';
+import type { I{{name}}UpdateRequest } from '\${{context}}/Domain/Ports/{{name}}';
 
 export const Update{{name}}Schema = {{schemaFactory}}<I{{name}}UpdateRequest>()
 \t.rules((rules) => ({
@@ -111,13 +113,13 @@ export const Update{{name}}Schema = {{schemaFactory}}<I{{name}}UpdateRequest>()
 \t.create();`;
 
 const presenterTemplate = `import { {{presenterFactory}} } from '{{presenterImport}}';
-import { ApplicationProvider } from '${{context}}/Application';
+import { ApplicationProvider } from '\${{context}}/Application';
 import { Create{{name}}Schema, Update{{name}}Schema } from './Schema';
 import type { 
 \tI{{name}}CollectionQuery,
 \tI{{name}}CreateRequest,
 \tI{{name}}UpdateRequest
-} from '${{context}}/Domain/Ports/{{name}}';
+} from '\${{context}}/Domain/Ports/{{name}}';
 
 export const {{name}}Presenter = {{presenterFactory}}('{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
 \tconst { {{name}}Service } = ApplicationProvider();
@@ -236,7 +238,7 @@ export default async function generateCrud() {
     const repoPath = path.join(contextPath, 'Infrastructure', 'Http', 'Repositories');
     const datasourceImport = datasource.from === 'core'
         ? '$core/Datasource'
-        : `$${context}/Infrastructure/Http/Datasource`;
+        : `\$${context}/Infrastructure/Http/Datasource`;
 
     await writeIfNotExists(
         path.join(repoPath, `${pascalName}Repository.ts`),
@@ -265,28 +267,54 @@ export default async function generateCrud() {
     const schemaPath = path.join(deliveryModulePath, 'Schema');
 
     // Create schemas
-    const schemaFactory = schemaType === 'package' ? 'createSchemaFactory' : schemaType;
+    const schemaFactory = schemaType === 'package' ? 'Schema' : schemaType;
     const schemaImport = schemaType === 'package'
         ? '@azure-net/kit'
         : '$core/Schema';
 
-    await writeIfNotExists(
-        path.join(schemaPath, `Create${pascalName}Schema.ts`),
-        createSchemaTemplate
-            .replace(/{{name}}/g, pascalName)
-            .replace(/{{context}}/g, context)
-            .replace(/{{schemaFactory}}/g, schemaFactory)
-            .replace(/{{schemaImport}}/g, schemaImport)
-    );
-
-    await writeIfNotExists(
-        path.join(schemaPath, `Update${pascalName}Schema.ts`),
-        updateSchemaTemplate
-            .replace(/{{name}}/g, pascalName)
-            .replace(/{{context}}/g, context)
-            .replace(/{{schemaFactory}}/g, schemaFactory)
-            .replace(/{{schemaImport}}/g, schemaImport)
-    );
+    if (schemaType === 'package') {
+        // Add the import for createSchemaFactory and rules
+        const schemaImportFull = `import { createSchemaFactory } from '@azure-net/kit';
+import { createRules, validationMessagesI18n } from '@azure-net/kit/schema';
+
+const Schema = createSchemaFactory(createRules(validationMessagesI18n));`;
+
+        await writeIfNotExists(
+            path.join(schemaPath, `Create${pascalName}Schema.ts`),
+            schemaImportFull + '\n' + createSchemaTemplate
+                .replace('import { {{schemaFactory}} } from \'{{schemaImport}}\';\n', '')
+                .replace(/{{name}}/g, pascalName)
+                .replace(/{{context}}/g, context)
+                .replace(/{{schemaFactory}}/g, 'Schema')
+        );
+
+        await writeIfNotExists(
+            path.join(schemaPath, `Update${pascalName}Schema.ts`),
+            schemaImportFull + '\n' + updateSchemaTemplate
+                .replace('import { {{schemaFactory}} } from \'{{schemaImport}}\';\n', '')
+                .replace(/{{name}}/g, pascalName)
+                .replace(/{{context}}/g, context)
+                .replace(/{{schemaFactory}}/g, 'Schema')
+        );
+    } else {
+        await writeIfNotExists(
+            path.join(schemaPath, `Create${pascalName}Schema.ts`),
+            createSchemaTemplate
+                .replace(/{{name}}/g, pascalName)
+                .replace(/{{context}}/g, context)
+                .replace(/{{schemaFactory}}/g, schemaFactory)
+                .replace(/{{schemaImport}}/g, schemaImport)
+        );
+
+        await writeIfNotExists(
+            path.join(schemaPath, `Update${pascalName}Schema.ts`),
+            updateSchemaTemplate
+                .replace(/{{name}}/g, pascalName)
+                .replace(/{{context}}/g, context)
+                .replace(/{{schemaFactory}}/g, schemaFactory)
+                .replace(/{{schemaImport}}/g, schemaImport)
+        );
+    }
     await updateIndexTs(schemaPath);
 
     // 6. Create Presenter

package/src/commands/generate/generatePresenter.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { selectContext, getContextPath, toPascalCase, getAvailableFiles } from '../../utils/contextUtils.js';
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
-const presenterWithCoreTemplate = `import { {{corePresenter}} } from '$core/Presenter';
+const presenterWithCoreTemplate = `import { {{corePresenter}} } from '\$core/Presenter';
 {{serviceImport}}
 
 export const {{name}}Presenter = {{corePresenter}}('{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
@@ -85,7 +85,7 @@ export default async function generatePresenter() {
     const filePath = path.join(modulePath, `${pascalName}Presenter.ts`);
 
     const serviceImport = service
-        ? `import { ApplicationProvider } from '$${context}/Application';`
+        ? `import { ApplicationProvider } from '\$${context}/Application';`
         : '';
 
     const serviceInit = service

package/src/commands/generate/generateSchema.js

@@ -1,10 +1,11 @@
 import prompts from 'prompts';
 import path from 'path';
+import fs from 'fs/promises';
 import { selectContext, getContextPath, toPascalCase, getAvailableFiles } from '../../utils/contextUtils.js';
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
-const schemaWithCoreTemplate = `import { {{coreSchema}} } from '$core/Schema';
-import type { I{{name}}Request } from '${{context}}/Domain/Ports/{{entity}}';
+const schemaWithCoreTemplate = `import { {{coreSchema}} } from '\$core/Schema';
+import type { I{{name}}Request } from '\${{context}}/Domain/Ports/{{entity}}';
 
 export const {{name}}Schema = {{coreSchema}}<I{{name}}Request>()
 \t.rules((rules) => ({
@@ -14,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/Ports/{{entity}}';
+import type { I{{name}}Request } from '\${{context}}/Domain/Ports/{{entity}}';
 
 const Schema = createSchemaFactory(createRules(validationMessagesI18n));
 

package/src/commands/generate/generateService.js

@@ -6,7 +6,7 @@ import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 import { ensureProvider, addToProvider } from '../../utils/providerUtils.js';
 
 const serviceTemplate = `import { ClassMirror } from '@azure-net/kit';
-import { {{repository}} } from '../../Infrastructure/Repositories/index.js';
+import { {{repository}} } from '../../Infrastructure/Http/Repositories';
 
 export class {{name}}Service extends ClassMirror<{{repository}}> {
 \tconstructor(private {{repositoryVar}}: {{repository}}) {
@@ -42,12 +42,12 @@ export default async function generateService() {
     // Get available repositories
     const contextPath = getContextPath(context);
     const repositories = await getAvailableFiles(
-        path.join(contextPath, 'Infrastructure', 'Repositories')
+        path.join(contextPath, 'Infrastructure', 'Http', 'Repositories')
     );
 
     const choices = [
         { title: 'Without repository', value: null },
-        ...repositories.map(r => ({ title: `${r}Repository`, value: `${r}Repository` }))
+        ...repositories.map(r => ({ title: `${r}`, value: r }))
     ];
 
     const { repository } = await prompts({
@@ -74,19 +74,20 @@ export default async function generateService() {
 
     // Ensure ApplicationProvider exists and add service
     const appProvider = await ensureProvider(context, 'Application', { infrastructure: true });
-    await addToProvider(
-        appProvider.path,
-        `${pascalName}Service`,
-        '../Services/index.js'
-    );
 
-    // Add repository dependency if selected
     if (repository) {
-        let providerContent = await fs.readFile(appProvider.path, 'utf-8');
-        const serviceFactory = `${pascalName}Service: () => new ${pascalName}Service()`;
-        const serviceWithRepo = `${pascalName}Service: () => new ${pascalName}Service(InfrastructureProvider.${repository})`;
-        providerContent = providerContent.replace(serviceFactory, serviceWithRepo);
-        await fs.writeFile(appProvider.path, providerContent, 'utf-8');
+        await addToProvider(
+            appProvider.path,
+            `${pascalName}Service`,
+            '../Services',
+            `InfrastructureProvider.${repository}`
+        );
+    } else {
+        await addToProvider(
+            appProvider.path,
+            `${pascalName}Service`,
+            '../Services'
+        );
     }
 
     console.log(`✅ Service created at ${filePath}`);

package/src/commands/init/initSchema.js

@@ -1,7 +1,7 @@
 import { writeIfNotExists } from '../../utils/fileUtils.js';
 import path from 'path';
 
-const schemaPath = path.join(process.cwd(), 'src/app/core/Schemas/Schema.ts');
+const schemaPath = path.join(process.cwd(), 'src/app/core/Schema/Schema.ts');
 
 const schemaTemplate = `import { createSchemaFactory } from '@azure-net/kit';
 import { createRules, validationMessagesI18n } from '@azure-net/kit/schema';
@@ -11,7 +11,7 @@ export const Schema = createSchemaFactory(createRules(validationMessagesI18n));`
 export default async function initSchema() {
     await writeIfNotExists(schemaPath, schemaTemplate);
     await writeIfNotExists(
-        path.join(process.cwd(), 'src/app/core/Schemas/index.ts'),
+        path.join(process.cwd(), 'src/app/core/Schema/index.ts'),
         `export * from './Schema';`
     );
 

package/src/utils/providerUtils.js

@@ -43,7 +43,7 @@ function generateProviderContent(context, layer, dependencies) {
     }
 
     if (dependencies.infrastructure && layer === 'Application') {
-        imports.push(`import { InfrastructureProvider } from '$${context}/Infrastructure';`);
+        imports.push(`import { InfrastructureProvider } from '\$${context}/Infrastructure';`);
         deps.push('InfrastructureProvider');
     }