@azure-net/cli 2.0.0 → 2.0.2

package/bin/azure-net.js

@@ -7,7 +7,8 @@ import {
     initMiddleware,
     initEdges,
     initTranslations,
-    initSchema
+    initSchema,
+    initLint
 } from '../src/commands/init/index.js';
 import {
     generateDatasource,
@@ -28,6 +29,11 @@ program
     .version('2.0.0');
 
 // Init commands
+program
+    .command('init:lint')
+    .description('Setup linting and commit tools')
+    .action(initLint)
+
 program
     .command('init:structure')
     .description('Generate base folder structure')

package/package.json

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

package/src/commands/generate/generateCrud.js

@@ -2,74 +2,85 @@ import prompts from 'prompts';
 import fs from 'fs/promises';
 import path from 'path';
 import { selectContext, getContextPath, toPascalCase, toCamelCase, getAvailableFiles } from '../../utils/contextUtils.js';
-import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
+import { writeIfNotExists, updateIndexTs, ensureIndexExports } from '../../utils/fileUtils.js';
 import { ensureProvider, addToProvider } from '../../utils/providerUtils.js';
 
 // Templates for CRUD generation
 const entityTemplate = `export interface I{{name}} {
 \tid: number;
 \t// Add entity fields here
-\t[key: string]: unknown;
-}
+\tcreated_at: string;
+\tupdated_at: string;
+}`;
 
-export type I{{name}}Collection = I{{name}}[];`;
+const portsIndexTemplate = `import type { I{{name}} } from '../../Entities/{{name}}';
 
-const requestTemplate = `import type { I{{name}} } from '../../Entities/{{name}}/index.js';
+export interface I{{name}}Collection {
+\tdata: I{{name}}[];
+\ttotal: number;
+}
 
-export type I{{name}}CreateRequest = Omit<I{{name}}, 'id'>;
-export type I{{name}}UpdateRequest = Partial<I{{name}}CreateRequest>;
 export interface I{{name}}CollectionQuery {
+\tpage?: number;
+\tperPage?: number;
 \t[key: string]: unknown;
+}
+
+export interface I{{name}}CreateRequest {
+\t// Add request fields here
+}
+
+export interface I{{name}}UpdateRequest {
+\t// Add request fields here  
 }`;
 
 const repositoryTemplate = `import { {{datasource}} } from '{{datasourceImport}}';
-import type {
+import type { I{{name}} } from '\${{context}}/Domain/Entities/{{name}}';
+import type { 
 \tI{{name}}Collection,
-\tI{{name}},
+\tI{{name}}CollectionQuery,
 \tI{{name}}CreateRequest,
-\tI{{name}}UpdateRequest,
-\tI{{name}}CollectionQuery
-} from '../../Domain/Entities/{{name}}/index.js';
-import type { I{{name}}CreateRequest as CreateRequest, I{{name}}UpdateRequest as UpdateRequest } from '../../Domain/Ports/{{name}}/index.js';
+\tI{{name}}UpdateRequest
+} from '\${{context}}/Domain/Ports/{{name}}';
 
 export class {{name}}Repository {
 \tprivate endpoint = '{{endpoint}}';
 \t
 \tconstructor(private {{datasourceVar}}: {{datasource}}) {}
 \t
-\tpublic async collection(queryParams?: I{{name}}CollectionQuery) {
-\t\treturn await this.{{datasourceVar}}.createRequest<I{{name}}Collection>(({ http, query }) => 
-\t\t\thttp.get(\`\${this.endpoint}\${query.build(queryParams)}\`)
-\t\t);
+\tpublic async collection(query?: I{{name}}CollectionQuery) {
+\t\treturn this.{{datasourceVar}}.createRequest<I{{name}}Collection>(({ http, query: q }) => 
+\t\t\thttp.get(\`\${this.endpoint}\${q.build(query || {})}\`)
+\t\t).then(res => res.getData());
 \t}
 \t
 \tpublic async resource(id: number) {
-\t\treturn await this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
+\t\treturn this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
 \t\t\thttp.get(\`\${this.endpoint}/\${id}\`)
-\t\t);
+\t\t).then(res => res.getData());
 \t}
 \t
-\tpublic async create(data: CreateRequest) {
-\t\treturn await this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
+\tpublic async create(data: I{{name}}CreateRequest) {
+\t\treturn this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
 \t\t\thttp.post(this.endpoint, { json: data })
-\t\t);
+\t\t).then(res => res.getData());
 \t}
 \t
-\tpublic async update(id: number, data: UpdateRequest) {
-\t\treturn await this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
+\tpublic async update(id: number, data: I{{name}}UpdateRequest) {
+\t\treturn this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
 \t\t\thttp.put(\`\${this.endpoint}/\${id}\`, { json: data })
-\t\t);
+\t\t).then(res => res.getData());
 \t}
 \t
 \tpublic async remove(id: number) {
-\t\treturn await this.{{datasourceVar}}.createRequest<never>(({ http }) => 
+\t\treturn this.{{datasourceVar}}.createRequest<void>(({ http }) => 
 \t\t\thttp.delete(\`\${this.endpoint}/\${id}\`)
-\t\t);
+\t\t).then(() => undefined);
 \t}
 }`;
 
 const serviceTemplate = `import { ClassMirror } from '@azure-net/kit';
-import { {{name}}Repository } from '../../Infrastructure/Repositories/index.js';
+import { {{name}}Repository } from '../../Infrastructure/Http/Repositories';
 
 export class {{name}}Service extends ClassMirror<{{name}}Repository> {
 \tconstructor(private {{camelName}}Repository: {{name}}Repository) {
@@ -84,7 +95,7 @@ export class {{name}}Service extends ClassMirror<{{name}}Repository> {
 }`;
 
 const createSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}}';
-import type { I{{name}}CreateRequest } from '../../Domain/Ports/{{name}}/index.js';
+import type { I{{name}}CreateRequest } from '\${{context}}/Domain/Ports/{{name}}';
 
 export const Create{{name}}Schema = {{schemaFactory}}<I{{name}}CreateRequest>()
 \t.rules((rules) => ({
@@ -93,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 '../../Domain/Ports/{{name}}/index.js';
+import type { I{{name}}UpdateRequest } from '\${{context}}/Domain/Ports/{{name}}';
 
 export const Update{{name}}Schema = {{schemaFactory}}<I{{name}}UpdateRequest>()
 \t.rules((rules) => ({
@@ -102,15 +113,19 @@ export const Update{{name}}Schema = {{schemaFactory}}<I{{name}}UpdateRequest>()
 \t.create();`;
 
 const presenterTemplate = `import { {{presenterFactory}} } from '{{presenterImport}}';
-import { ApplicationProvider } from '../../Application/index.js';
-import { Create{{name}}Schema, Update{{name}}Schema } from '../Schemas/index.js';
-import type { I{{name}}CreateRequest, I{{name}}UpdateRequest, I{{name}}CollectionQuery } from '../../Domain/Ports/{{name}}/index.js';
+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}}';
 
-export const {{contextName}}{{name}}Presenter = {{presenterFactory}}('{{contextName}}{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
+export const {{name}}Presenter = {{presenterFactory}}('{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
 \tconst { {{name}}Service } = ApplicationProvider();
 \t
-\tconst collection = async (queryParams?: I{{name}}CollectionQuery) => 
-\t\tawait createAsyncResource({{name}}Service.collection(queryParams));
+\tconst collection = async (query?: I{{name}}CollectionQuery) => 
+\t\tawait createAsyncResource({{name}}Service.collection(query));
 \t
 \tconst resource = async (id: number) => 
 \t\tawait createAsyncResource({{name}}Service.resource(id));
@@ -150,15 +165,15 @@ export default async function generateCrud() {
     // Get available datasources
     const contextPath = getContextPath(context);
     const coreDatasources = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/Datasources')
+        path.join(process.cwd(), 'src/app/core/Datasource')
     );
     const contextDatasources = await getAvailableFiles(
-        path.join(contextPath, 'Infrastructure', 'Datasources')
+        path.join(contextPath, 'Infrastructure/Http/Datasource')
     );
 
     const allDatasources = [
-        ...coreDatasources.map(d => ({ title: `${d}Datasource (core)`, value: { name: `${d}Datasource`, from: 'core' } })),
-        ...contextDatasources.map(d => ({ title: `${d}Datasource (${context})`, value: { name: `${d}Datasource`, from: context } }))
+        ...coreDatasources.map(d => ({ title: `${d} (core)`, value: { name: d, from: 'core' } })),
+        ...contextDatasources.map(d => ({ title: `${d} (${context})`, value: { name: d, from: context } }))
     ];
 
     const { datasource } = await prompts({
@@ -170,7 +185,7 @@ export default async function generateCrud() {
 
     // Get schema and presenter factories
     const coreSchemas = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/Schemas')
+        path.join(process.cwd(), 'src/app/core/Schema')
     );
 
     const { schemaType } = await prompts({
@@ -178,13 +193,13 @@ export default async function generateCrud() {
         name: 'schemaType',
         message: 'Select schema factory:',
         choices: [
-            { title: 'Use schema from package', value: 'package' },
+            { title: 'Use createSchemaFactory from package', value: 'package' },
             ...coreSchemas.map(s => ({ title: `Use ${s} from core`, value: s }))
         ]
     });
 
     const corePresenters = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/Presenters')
+        path.join(process.cwd(), 'src/app/core/Presenter')
     );
 
     const { presenterType } = await prompts({
@@ -210,23 +225,26 @@ export default async function generateCrud() {
         entityTemplate.replace(/{{name}}/g, pascalName)
     );
 
-    // 2. Create Ports (Requests/Responses)
+    // 2. Create Ports
     const portsPath = path.join(contextPath, 'Domain', 'Ports', pascalName);
     await writeIfNotExists(
         path.join(portsPath, 'index.ts'),
-        requestTemplate.replace(/{{name}}/g, pascalName)
+        portsIndexTemplate
+            .replace(/{{name}}/g, pascalName)
+            .replace(/{{context}}/g, context)
     );
 
     // 3. Create Repository
-    const repoPath = path.join(contextPath, 'Infrastructure', 'Repositories');
+    const repoPath = path.join(contextPath, 'Infrastructure', 'Http', 'Repositories');
     const datasourceImport = datasource.from === 'core'
-        ? '$core/Datasources/index.js'
-        : '../Datasources/index.js';
+        ? '$core/Datasource'
+        : `\$${context}/Infrastructure/Http/Datasource`;
 
     await writeIfNotExists(
         path.join(repoPath, `${pascalName}Repository.ts`),
         repositoryTemplate
             .replace(/{{name}}/g, pascalName)
+            .replace(/{{context}}/g, context)
             .replace(/{{endpoint}}/g, endpoint)
             .replace(/{{datasource}}/g, datasource.name)
             .replace(/{{datasourceImport}}/g, datasourceImport)
@@ -244,80 +262,117 @@ export default async function generateCrud() {
     );
     await updateIndexTs(servicePath);
 
-    // 5. Create Schemas
-    const schemaPath = path.join(contextPath, 'Delivery', 'Schemas');
-    const schemaFactory = schemaType === 'package' ? 'schema' : schemaType;
+    // 5. Create Delivery module structure
+    const deliveryModulePath = path.join(contextPath, 'Delivery', pascalName);
+    const schemaPath = path.join(deliveryModulePath, 'Schema');
+
+    // Create schemas
+    const schemaFactory = schemaType === 'package' ? 'Schema' : schemaType;
     const schemaImport = schemaType === 'package'
         ? '@azure-net/kit'
-        : '$core/Schemas/index.js';
-
-    await writeIfNotExists(
-        path.join(schemaPath, `Create${pascalName}Schema.ts`),
-        createSchemaTemplate
-            .replace(/{{name}}/g, pascalName)
-            .replace(/{{schemaFactory}}/g, schemaFactory)
-            .replace(/{{schemaImport}}/g, schemaImport)
-    );
-
-    await writeIfNotExists(
-        path.join(schemaPath, `Update${pascalName}Schema.ts`),
-        updateSchemaTemplate
-            .replace(/{{name}}/g, pascalName)
-            .replace(/{{schemaFactory}}/g, schemaFactory)
-            .replace(/{{schemaImport}}/g, schemaImport)
-    );
+        : '$core/Schema';
+
+    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
-    const presenterPath = path.join(contextPath, 'Delivery', 'Presenters');
     const presenterFactory = presenterType === 'package' ? 'createPresenter' : presenterType;
     const presenterImport = presenterType === 'package'
         ? '@azure-net/kit'
-        : '$core/Presenters/index.js';
+        : '$core/Presenter';
 
     await writeIfNotExists(
-        path.join(presenterPath, `${pascalName}Presenter.ts`),
+        path.join(deliveryModulePath, `${pascalName}Presenter.ts`),
         presenterTemplate
             .replace(/{{name}}/g, pascalName)
-            .replace(/{{contextName}}/g, contextName)
+            .replace(/{{context}}/g, context)
             .replace(/{{presenterFactory}}/g, presenterFactory)
             .replace(/{{presenterImport}}/g, presenterImport)
     );
-    await updateIndexTs(presenterPath);
+
+    // Create module index
+    await writeIfNotExists(
+        path.join(deliveryModulePath, 'index.ts'),
+        `export * from './${pascalName}Presenter';\nexport * from './Schema';`
+    );
 
     // 7. Setup Providers
     // Ensure DatasourceProvider
-    await ensureProvider(context, 'Infrastructure', { datasource: datasource.name });
+    const datasourceProviderPath = path.join(contextPath, 'Infrastructure', 'Providers', 'DatasourceProvider.ts');
+    if (!(await fs.access(datasourceProviderPath).then(() => true).catch(() => false))) {
+        const datasourceProviderContent = `import { createBoundaryProvider } from '@azure-net/kit';
+import { ${datasource.name} } from '${datasource.from === 'core' ? '$core/Datasource' : '../Http/Datasource'}';
+
+export const DatasourceProvider = createBoundaryProvider('${contextName}DatasourceProvider', () => ({
+\t${datasource.name}: () => new ${datasource.name}()
+}));`;
+        await writeIfNotExists(datasourceProviderPath, datasourceProviderContent);
+        await updateIndexTs(path.dirname(datasourceProviderPath));
+    }
 
-    // Ensure InfrastructureProvider and add repository
+    // Ensure InfrastructureProvider
     const infraProvider = await ensureProvider(context, 'Infrastructure', {});
     await addToProvider(
         infraProvider.path,
         `${pascalName}Repository`,
-        '../Repositories/index.js'
+        '../Http/Repositories',
+        `DatasourceProvider.${datasource.name}`
     );
 
-    // Update provider with datasource dependency
-    let infraContent = await fs.readFile(infraProvider.path, 'utf-8');
-    const repoFactory = `${pascalName}Repository: () => new ${pascalName}Repository()`;
-    const repoWithDatasource = `${pascalName}Repository: () => new ${pascalName}Repository(DatasourceProvider.${datasource.name})`;
-    infraContent = infraContent.replace(repoFactory, repoWithDatasource);
-    await fs.writeFile(infraProvider.path, infraContent, 'utf-8');
-
-    // Ensure ApplicationProvider and add service
+    // Ensure ApplicationProvider
     const appProvider = await ensureProvider(context, 'Application', { infrastructure: true });
     await addToProvider(
         appProvider.path,
         `${pascalName}Service`,
-        '../Services/index.js'
+        '../Services',
+        `InfrastructureProvider.${pascalName}Repository`
     );
 
-    // Update provider with repository dependency
-    let appContent = await fs.readFile(appProvider.path, 'utf-8');
-    const serviceFactory = `${pascalName}Service: () => new ${pascalName}Service()`;
-    const serviceWithRepo = `${pascalName}Service: () => new ${pascalName}Service(InfrastructureProvider.${pascalName}Repository)`;
-    appContent = appContent.replace(serviceFactory, serviceWithRepo);
-    await fs.writeFile(appProvider.path, appContent, 'utf-8');
+    // Update all layer indexes
+    await ensureIndexExports(path.join(contextPath, 'Infrastructure'));
+    await ensureIndexExports(path.join(contextPath, 'Application'));
 
     console.log(`✅ CRUD module for ${pascalName} created successfully!`);
 }

package/src/commands/generate/generateDatasource.js

@@ -3,11 +3,16 @@ import { selectContext, getContextPath, toPascalCase } from '../../utils/context
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 import path from 'path';
 
-const datasourceTemplate = `import { BaseHttpDatasource, HttpService } from '@azure-net/kit';
+const datasourceTemplate = `import { BaseHttpDatasource } from '@azure-net/kit/infra';
+import { HttpService } from '@azure-net/kit/infra';
 
 export class {{name}}Datasource extends BaseHttpDatasource {
 \tconstructor() {
-\t\tsuper({ http: new HttpService({ baseUrl: '' }) });
+\t\tsuper({ 
+\t\t\thttp: new HttpService({ 
+\t\t\t\tbaseUrl: 'https://api.example.com'
+\t\t\t}) 
+\t\t});
 \t}
 }`;
 
@@ -17,14 +22,14 @@ export default async function generateDatasource() {
     const { name } = await prompts({
         type: 'text',
         name: 'name',
-        message: 'Datasource name (PascalCase):'
+        message: 'Datasource name (without "Datasource" suffix):'
     });
 
     const pascalName = toPascalCase(name);
     const contextPath = getContextPath(context);
     const datasourcePath = context === 'core'
-        ? path.join(contextPath, 'Datasources')
-        : path.join(contextPath, 'Infrastructure', 'Datasources');
+        ? path.join(contextPath, 'Datasource')
+        : path.join(contextPath, 'Infrastructure', 'Http', 'Datasource');
 
     const content = datasourceTemplate.replace(/{{name}}/g, pascalName);
     const filePath = path.join(datasourcePath, `${pascalName}Datasource.ts`);

package/src/commands/generate/generatePresenter.js

@@ -3,15 +3,15 @@ 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/Presenters/index.js';
+const presenterWithCoreTemplate = `import { {{corePresenter}} } from '\$core/Presenter';
 {{serviceImport}}
 
-export const {{contextName}}{{name}}Presenter = {{corePresenter}}('{{contextName}}{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
+export const {{name}}Presenter = {{corePresenter}}('{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
 \t{{serviceInit}}
 \t
 \tconst example = async () => {
 \t\t// Implement presenter logic
-\t\treturn {};
+\t\treturn await createAsyncResource(Promise.resolve({}));
 \t};
 \t
 \treturn { example };
@@ -20,7 +20,7 @@ export const {{contextName}}{{name}}Presenter = {{corePresenter}}('{{contextName
 const presenterWithPackageTemplate = `import { createPresenter } from '@azure-net/kit';
 {{serviceImport}}
 
-export const {{contextName}}{{name}}Presenter = createPresenter('{{contextName}}{{name}}Presenter', () => {
+export const {{name}}Presenter = createPresenter('{{name}}Presenter', () => {
 \t{{serviceInit}}
 \t
 \tconst example = async () => {
@@ -42,12 +42,12 @@ export default async function generatePresenter() {
     const { name } = await prompts({
         type: 'text',
         name: 'name',
-        message: 'Presenter name (without "Presenter" suffix):'
+        message: 'Module name (will create folder in Delivery):'
     });
 
     // Check for core presenters
     const corePresenters = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/Presenters')
+        path.join(process.cwd(), 'src/app/core/Presenter')
     );
 
     const presenterChoices = [
@@ -70,7 +70,7 @@ export default async function generatePresenter() {
 
     const serviceChoices = [
         { title: 'Without service', value: null },
-        ...services.map(s => ({ title: `${s}Service`, value: `${s}Service` }))
+        ...services.map(s => ({ title: `${s}`, value: s }))
     ];
 
     const { service } = await prompts({
@@ -81,12 +81,11 @@ export default async function generatePresenter() {
     });
 
     const pascalName = toPascalCase(name);
-    const contextName = toPascalCase(context);
-    const presenterPath = path.join(contextPath, 'Delivery', 'Presenters');
-    const filePath = path.join(presenterPath, `${pascalName}Presenter.ts`);
+    const modulePath = path.join(contextPath, 'Delivery', pascalName);
+    const filePath = path.join(modulePath, `${pascalName}Presenter.ts`);
 
     const serviceImport = service
-        ? `import { ApplicationProvider } from '../../Application/index.js';`
+        ? `import { ApplicationProvider } from '\$${context}/Application';`
         : '';
 
     const serviceInit = service
@@ -95,19 +94,20 @@ export default async function generatePresenter() {
 
     const content = presenterType === 'package'
         ? presenterWithPackageTemplate
-            .replace(/{{contextName}}/g, contextName)
             .replace(/{{name}}/g, pascalName)
             .replace(/{{serviceImport}}/g, serviceImport)
             .replace(/{{serviceInit}}/g, serviceInit)
         : presenterWithCoreTemplate
-            .replace(/{{contextName}}/g, contextName)
             .replace(/{{name}}/g, pascalName)
             .replace(/{{corePresenter}}/g, presenterType)
             .replace(/{{serviceImport}}/g, serviceImport)
             .replace(/{{serviceInit}}/g, serviceInit);
 
     await writeIfNotExists(filePath, content);
-    await updateIndexTs(presenterPath);
+    await writeIfNotExists(
+        path.join(modulePath, 'index.ts'),
+        `export * from './${pascalName}Presenter';`
+    );
 
     console.log(`✅ Presenter created at ${filePath}`);
 }

package/src/commands/generate/generateRepository.js

@@ -1,7 +1,7 @@
 import prompts from 'prompts';
 import fs from 'fs/promises';
 import path from 'path';
-import { selectContext, getContextPath, toPascalCase, getAvailableFiles } from '../../utils/contextUtils.js';
+import { selectContext, getContextPath, toPascalCase, getAvailableFiles, toCamelCase } from '../../utils/contextUtils.js';
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 import { ensureProvider, addToProvider } from '../../utils/providerUtils.js';
 
@@ -34,15 +34,15 @@ export default async function generateRepository() {
     // Get available datasources
     const contextPath = getContextPath(context);
     const coreDatasources = await getAvailableFiles(
-        path.join(process.cwd(), 'src/app/core/Datasources')
+        path.join(process.cwd(), 'src/app/core/Datasource')
     );
     const contextDatasources = await getAvailableFiles(
-        path.join(contextPath, 'Infrastructure', 'Datasources')
+        path.join(contextPath, 'Infrastructure', 'Http', 'Datasource')
     );
 
     const allDatasources = [
-        ...coreDatasources.map(d => ({ title: `${d}Datasource (core)`, value: { name: `${d}Datasource`, from: 'core' } })),
-        ...contextDatasources.map(d => ({ title: `${d}Datasource (${context})`, value: { name: `${d}Datasource`, from: context } }))
+        ...coreDatasources.map(d => ({ title: `${d} (core)`, value: { name: d, from: 'core' } })),
+        ...contextDatasources.map(d => ({ title: `${d} (${context})`, value: { name: d, from: context } }))
     ];
 
     if (allDatasources.length === 0) {
@@ -58,40 +58,45 @@ export default async function generateRepository() {
     });
 
     const pascalName = toPascalCase(name);
-    const repoPath = path.join(contextPath, 'Infrastructure', 'Repositories');
+    const contextName = toPascalCase(context);
+    const repoPath = path.join(contextPath, 'Infrastructure', 'Http', 'Repositories');
     const filePath = path.join(repoPath, `${pascalName}Repository.ts`);
 
     // Generate repository
     const datasourceImport = datasource.from === 'core'
-        ? '$core/Datasources/index.js'
-        : '../Datasources/index.js';
+        ? '$core/Datasource'
+        : '../Datasource';
 
     const content = repositoryTemplate
         .replace(/{{name}}/g, pascalName)
         .replace(/{{datasource}}/g, datasource.name)
         .replace(/{{datasourceImport}}/g, datasourceImport)
-        .replace(/{{datasourceVar}}/g, toPascalCase(datasource.name).charAt(0).toLowerCase() + toPascalCase(datasource.name).slice(1));
+        .replace(/{{datasourceVar}}/g, toCamelCase(datasource.name));
 
     await writeIfNotExists(filePath, content);
     await updateIndexTs(repoPath);
 
     // Ensure DatasourceProvider exists
-    const datasourceProvider = await ensureProvider(context, 'Infrastructure', { datasource: datasource.name });
+    const datasourceProviderPath = path.join(contextPath, 'Infrastructure', 'Providers', 'DatasourceProvider.ts');
+    if (!(await fs.access(datasourceProviderPath).then(() => true).catch(() => false))) {
+        const datasourceProviderContent = `import { createBoundaryProvider } from '@azure-net/kit';
+import { ${datasource.name} } from '${datasource.from === 'core' ? '$core/Datasource' : '../Http/Datasource'}';
+
+export const DatasourceProvider = createBoundaryProvider('${contextName}DatasourceProvider', () => ({
+\t${datasource.name}: () => new ${datasource.name}()
+}));`;
+        await writeIfNotExists(datasourceProviderPath, datasourceProviderContent);
+        await updateIndexTs(path.dirname(datasourceProviderPath));
+    }
 
-    // Ensure InfrastructureProvider exists and add repository
-    const infraProvider = await ensureProvider(context, 'Infrastructure', { datasource: datasource.name });
+    // Ensure InfrastructureProvider and add repository
+    const infraProvider = await ensureProvider(context, 'Infrastructure', { hasDatasource: true });
     await addToProvider(
         infraProvider.path,
         `${pascalName}Repository`,
-        '../Repositories/index.js'
+        '../Http/Repositories',
+        `DatasourceProvider.${datasource.name}`
     );
 
-    // Add datasource dependency to repository in provider
-    let providerContent = await fs.readFile(infraProvider.path, 'utf-8');
-    const repoFactory = `${pascalName}Repository: () => new ${pascalName}Repository()`;
-    const repoWithDatasource = `${pascalName}Repository: () => new ${pascalName}Repository(DatasourceProvider.${datasource.name})`;
-    providerContent = providerContent.replace(repoFactory, repoWithDatasource);
-    await fs.writeFile(infraProvider.path, providerContent, 'utf-8');
-
     console.log(`✅ Repository created at ${filePath}`);
 }