@azure-net/cli 1.4.1 → 2.0.0

package/bin/azure-net.js

@@ -1,30 +1,90 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander';
-import generateDatasource from '../src/commands/generateDatasource.js';
-import generateRepo from '../src/commands/generateRepo.js';
-import generateService from '../src/commands/generateService.js';
-import generateCrud from '../src/commands/generateCrud.js';
-import initLint from '../src/commands/initLint.js';
-import initStructure from '../src/commands/generateStructure.js';
-import initAliases from '../src/commands/initAliases.js';
+import {
+    initStructure,
+    initAliases,
+    initMiddleware,
+    initEdges,
+    initTranslations,
+    initSchema
+} from '../src/commands/init/index.js';
+import {
+    generateDatasource,
+    generateResponse,
+    generateRepository,
+    generateService,
+    generateSchema,
+    generatePresenter,
+    generateModule,
+    generateCrud
+} from '../src/commands/generate/index.js';
 
 const program = new Command();
 
 program
     .name('azure-net')
-    .description('Universal code generator')
-    .version('1.0.0');
+    .description('Azure-Net CLI generator')
+    .version('2.0.0');
 
+// Init commands
+program
+    .command('init:structure')
+    .description('Generate base folder structure')
+    .action(initStructure);
+
+program
+    .command('init:aliases')
+    .description('Generate alias mappings')
+    .action(initAliases);
+
+program
+    .command('init:middleware')
+    .description('Initialize middleware')
+    .action(initMiddleware);
+
+program
+    .command('init:edges')
+    .description('Initialize edges-svelte')
+    .action(initEdges);
+
+program
+    .command('init:translations')
+    .description('Initialize translations')
+    .action(initTranslations);
+
+program
+    .command('init:schema')
+    .description('Initialize schema factory')
+    .action(initSchema);
+
+program
+    .command('init')
+    .description('Run all initialization steps')
+    .action(async () => {
+        await initStructure();
+        await initAliases();
+        await initEdges();
+        await initMiddleware();
+        await initTranslations();
+        await initSchema();
+    });
+
+// Generate commands
 program
     .command('make:datasource')
     .description('Generate datasource')
     .action(generateDatasource);
 
+program
+    .command('make:response')
+    .description('Generate response builder')
+    .action(generateResponse);
+
 program
     .command('make:repo')
-    .description('Generate repo')
-    .action(generateRepo);
+    .description('Generate repository')
+    .action(generateRepository);
 
 program
     .command('make:service')
@@ -32,32 +92,23 @@ program
     .action(generateService);
 
 program
-    .command('make:crud')
-    .description('Generate CRUD Domain/Repo/Service')
-    .action(generateCrud);
+    .command('make:schema')
+    .description('Generate schema')
+    .action(generateSchema);
 
 program
-    .command('init:lint')
-    .description('Setup linting and commit tools')
-    .action(initLint)
-
-program
-    .command('init:structure')
-    .description('Generate base folder structure based on config')
-    .action(initStructure);
+    .command('make:presenter')
+    .description('Generate presenter')
+    .action(generatePresenter);
 
 program
-    .command('init:aliases')
-    .description('Generate alias mappings for modules or default architecture')
-    .action(initAliases);
+    .command('make:module')
+    .description('Generate complete module')
+    .action(generateModule);
 
 program
-    .command('init')
-    .description('Run all initialization steps: structure, aliases, lint')
-    .action(async () => {
-        await initStructure();
-        await initAliases();
-        await initLint();
-    });
+    .command('make:crud')
+    .description('Generate CRUD module')
+    .action(generateCrud);
 
 program.parse();

package/package.json

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

package/src/commands/generate/generateCrud.js

@@ -0,0 +1,323 @@
+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 { 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;
+}
+
+export type I{{name}}Collection = I{{name}}[];`;
+
+const requestTemplate = `import type { I{{name}} } from '../../Entities/{{name}}/index.js';
+
+export type I{{name}}CreateRequest = Omit<I{{name}}, 'id'>;
+export type I{{name}}UpdateRequest = Partial<I{{name}}CreateRequest>;
+export interface I{{name}}CollectionQuery {
+\t[key: string]: unknown;
+}`;
+
+const repositoryTemplate = `import { {{datasource}} } from '{{datasourceImport}}';
+import type {
+\tI{{name}}Collection,
+\tI{{name}},
+\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';
+
+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);
+\t}
+\t
+\tpublic async resource(id: number) {
+\t\treturn await this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
+\t\t\thttp.get(\`\${this.endpoint}/\${id}\`)
+\t\t);
+\t}
+\t
+\tpublic async create(data: CreateRequest) {
+\t\treturn await this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
+\t\t\thttp.post(this.endpoint, { json: data })
+\t\t);
+\t}
+\t
+\tpublic async update(id: number, data: UpdateRequest) {
+\t\treturn await this.{{datasourceVar}}.createRequest<I{{name}}>(({ http }) => 
+\t\t\thttp.put(\`\${this.endpoint}/\${id}\`, { json: data })
+\t\t);
+\t}
+\t
+\tpublic async remove(id: number) {
+\t\treturn await this.{{datasourceVar}}.createRequest<never>(({ http }) => 
+\t\t\thttp.delete(\`\${this.endpoint}/\${id}\`)
+\t\t);
+\t}
+}`;
+
+const serviceTemplate = `import { ClassMirror } from '@azure-net/kit';
+import { {{name}}Repository } from '../../Infrastructure/Repositories/index.js';
+
+export class {{name}}Service extends ClassMirror<{{name}}Repository> {
+\tconstructor(private {{camelName}}Repository: {{name}}Repository) {
+\t\tsuper({{camelName}}Repository);
+\t}
+\t
+\tdeclare collection: {{name}}Repository['collection'];
+\tdeclare resource: {{name}}Repository['resource'];
+\tdeclare create: {{name}}Repository['create'];
+\tdeclare update: {{name}}Repository['update'];
+\tdeclare remove: {{name}}Repository['remove'];
+}`;
+
+const createSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}}';
+import type { I{{name}}CreateRequest } from '../../Domain/Ports/{{name}}/index.js';
+
+export const Create{{name}}Schema = {{schemaFactory}}<I{{name}}CreateRequest>()
+\t.rules((rules) => ({
+\t\t// Add validation rules here
+\t}))
+\t.create();`;
+
+const updateSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}}';
+import type { I{{name}}UpdateRequest } from '../../Domain/Ports/{{name}}/index.js';
+
+export const Update{{name}}Schema = {{schemaFactory}}<I{{name}}UpdateRequest>()
+\t.rules((rules) => ({
+\t\t// Add validation rules here
+\t}))
+\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';
+
+export const {{contextName}}{{name}}Presenter = {{presenterFactory}}('{{contextName}}{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
+\tconst { {{name}}Service } = ApplicationProvider();
+\t
+\tconst collection = async (queryParams?: I{{name}}CollectionQuery) => 
+\t\tawait createAsyncResource({{name}}Service.collection(queryParams));
+\t
+\tconst resource = async (id: number) => 
+\t\tawait createAsyncResource({{name}}Service.resource(id));
+\t
+\tconst create = async (request: I{{name}}CreateRequest) =>
+\t\tawait createAsyncAction({{name}}Service.create(Create{{name}}Schema.from(request).json()));
+\t
+\tconst update = async (id: number, request: I{{name}}UpdateRequest) =>
+\t\tawait createAsyncAction({{name}}Service.update(id, Update{{name}}Schema.from(request).json()));
+\t
+\tconst remove = async (id: number) => 
+\t\tawait createAsyncAction({{name}}Service.remove(id));
+\t
+\treturn { collection, resource, create, update, remove };
+});`;
+
+export default async function generateCrud() {
+    const context = await selectContext('Select context for CRUD module:');
+
+    if (context === 'core') {
+        console.error('❌ Cannot create CRUD in core. Choose a specific context.');
+        return;
+    }
+
+    const { name } = await prompts({
+        type: 'text',
+        name: 'name',
+        message: 'Entity name (PascalCase):'
+    });
+
+    const { endpoint } = await prompts({
+        type: 'text',
+        name: 'endpoint',
+        message: 'API endpoint (e.g. /api/users):'
+    });
+
+    // Get available datasources
+    const contextPath = getContextPath(context);
+    const coreDatasources = await getAvailableFiles(
+        path.join(process.cwd(), 'src/app/core/Datasources')
+    );
+    const contextDatasources = await getAvailableFiles(
+        path.join(contextPath, 'Infrastructure', 'Datasources')
+    );
+
+    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 } }))
+    ];
+
+    const { datasource } = await prompts({
+        type: 'select',
+        name: 'datasource',
+        message: 'Select datasource:',
+        choices: allDatasources
+    });
+
+    // Get schema and presenter factories
+    const coreSchemas = await getAvailableFiles(
+        path.join(process.cwd(), 'src/app/core/Schemas')
+    );
+
+    const { schemaType } = await prompts({
+        type: 'select',
+        name: 'schemaType',
+        message: 'Select schema factory:',
+        choices: [
+            { title: 'Use schema 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')
+    );
+
+    const { presenterType } = await prompts({
+        type: 'select',
+        name: 'presenterType',
+        message: 'Select presenter factory:',
+        choices: [
+            { title: 'Use createPresenter from package', value: 'package' },
+            ...corePresenters.map(p => ({ title: `Use ${p} from core`, value: p }))
+        ]
+    });
+
+    const pascalName = toPascalCase(name);
+    const camelName = toCamelCase(name);
+    const contextName = toPascalCase(context);
+
+    console.log('\n🚀 Generating CRUD module...\n');
+
+    // 1. Create Entity
+    const entityPath = path.join(contextPath, 'Domain', 'Entities', pascalName);
+    await writeIfNotExists(
+        path.join(entityPath, 'index.ts'),
+        entityTemplate.replace(/{{name}}/g, pascalName)
+    );
+
+    // 2. Create Ports (Requests/Responses)
+    const portsPath = path.join(contextPath, 'Domain', 'Ports', pascalName);
+    await writeIfNotExists(
+        path.join(portsPath, 'index.ts'),
+        requestTemplate.replace(/{{name}}/g, pascalName)
+    );
+
+    // 3. Create Repository
+    const repoPath = path.join(contextPath, 'Infrastructure', 'Repositories');
+    const datasourceImport = datasource.from === 'core'
+        ? '$core/Datasources/index.js'
+        : '../Datasources/index.js';
+
+    await writeIfNotExists(
+        path.join(repoPath, `${pascalName}Repository.ts`),
+        repositoryTemplate
+            .replace(/{{name}}/g, pascalName)
+            .replace(/{{endpoint}}/g, endpoint)
+            .replace(/{{datasource}}/g, datasource.name)
+            .replace(/{{datasourceImport}}/g, datasourceImport)
+            .replace(/{{datasourceVar}}/g, toCamelCase(datasource.name))
+    );
+    await updateIndexTs(repoPath);
+
+    // 4. Create Service
+    const servicePath = path.join(contextPath, 'Application', 'Services');
+    await writeIfNotExists(
+        path.join(servicePath, `${pascalName}Service.ts`),
+        serviceTemplate
+            .replace(/{{name}}/g, pascalName)
+            .replace(/{{camelName}}/g, camelName)
+    );
+    await updateIndexTs(servicePath);
+
+    // 5. Create Schemas
+    const schemaPath = path.join(contextPath, 'Delivery', '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)
+    );
+    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';
+
+    await writeIfNotExists(
+        path.join(presenterPath, `${pascalName}Presenter.ts`),
+        presenterTemplate
+            .replace(/{{name}}/g, pascalName)
+            .replace(/{{contextName}}/g, contextName)
+            .replace(/{{presenterFactory}}/g, presenterFactory)
+            .replace(/{{presenterImport}}/g, presenterImport)
+    );
+    await updateIndexTs(presenterPath);
+
+    // 7. Setup Providers
+    // Ensure DatasourceProvider
+    await ensureProvider(context, 'Infrastructure', { datasource: datasource.name });
+
+    // Ensure InfrastructureProvider and add repository
+    const infraProvider = await ensureProvider(context, 'Infrastructure', {});
+    await addToProvider(
+        infraProvider.path,
+        `${pascalName}Repository`,
+        '../Repositories/index.js'
+    );
+
+    // 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
+    const appProvider = await ensureProvider(context, 'Application', { infrastructure: true });
+    await addToProvider(
+        appProvider.path,
+        `${pascalName}Service`,
+        '../Services/index.js'
+    );
+
+    // 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');
+
+    console.log(`✅ CRUD module for ${pascalName} created successfully!`);
+}

package/src/commands/generate/generateDatasource.js

@@ -0,0 +1,36 @@
+import prompts from 'prompts';
+import { selectContext, getContextPath, toPascalCase } from '../../utils/contextUtils.js';
+import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
+import path from 'path';
+
+const datasourceTemplate = `import { BaseHttpDatasource, HttpService } from '@azure-net/kit';
+
+export class {{name}}Datasource extends BaseHttpDatasource {
+\tconstructor() {
+\t\tsuper({ http: new HttpService({ baseUrl: '' }) });
+\t}
+}`;
+
+export default async function generateDatasource() {
+    const context = await selectContext();
+
+    const { name } = await prompts({
+        type: 'text',
+        name: 'name',
+        message: 'Datasource name (PascalCase):'
+    });
+
+    const pascalName = toPascalCase(name);
+    const contextPath = getContextPath(context);
+    const datasourcePath = context === 'core'
+        ? path.join(contextPath, 'Datasources')
+        : path.join(contextPath, 'Infrastructure', 'Datasources');
+
+    const content = datasourceTemplate.replace(/{{name}}/g, pascalName);
+    const filePath = path.join(datasourcePath, `${pascalName}Datasource.ts`);
+
+    await writeIfNotExists(filePath, content);
+    await updateIndexTs(datasourcePath);
+
+    console.log(`✅ Datasource created at ${filePath}`);
+}

package/src/commands/generate/generateModule.js

@@ -0,0 +1,23 @@
+import prompts from 'prompts';
+import generateRepository from './generateRepository.js';
+import generateService from './generateService.js';
+import generatePresenter from './generatePresenter.js';
+import generateSchema from './generateSchema.js';
+
+export default async function generateModule() {
+    console.log('🚀 Generating complete module...\n');
+
+    const { confirm } = await prompts({
+        type: 'confirm',
+        name: 'confirm',
+        message: 'This will create repository, service, presenter and schemas. Continue?'
+    });
+
+    if (confirm) {
+        await generateRepository();
+        await generateService();
+        await generatePresenter();
+        await generateSchema(); // Create schema
+        await generateSchema(); // Update schema
+    }
+}

package/src/commands/generate/generatePresenter.js

@@ -0,0 +1,113 @@
+import prompts from 'prompts';
+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';
+{{serviceImport}}
+
+export const {{contextName}}{{name}}Presenter = {{corePresenter}}('{{contextName}}{{name}}Presenter', ({ createAsyncResource, createAsyncAction }) => {
+\t{{serviceInit}}
+\t
+\tconst example = async () => {
+\t\t// Implement presenter logic
+\t\treturn {};
+\t};
+\t
+\treturn { example };
+});`;
+
+const presenterWithPackageTemplate = `import { createPresenter } from '@azure-net/kit';
+{{serviceImport}}
+
+export const {{contextName}}{{name}}Presenter = createPresenter('{{contextName}}{{name}}Presenter', () => {
+\t{{serviceInit}}
+\t
+\tconst example = async () => {
+\t\t// Implement presenter logic
+\t\treturn {};
+\t};
+\t
+\treturn { example };
+});`;
+
+export default async function generatePresenter() {
+    const context = await selectContext('Select context for presenter:');
+
+    if (context === 'core') {
+        console.error('❌ Cannot create presenter in core. Choose a specific context.');
+        return;
+    }
+
+    const { name } = await prompts({
+        type: 'text',
+        name: 'name',
+        message: 'Presenter name (without "Presenter" suffix):'
+    });
+
+    // Check for core presenters
+    const corePresenters = await getAvailableFiles(
+        path.join(process.cwd(), 'src/app/core/Presenters')
+    );
+
+    const presenterChoices = [
+        { title: 'Use createPresenter from package', value: 'package' },
+        ...corePresenters.map(p => ({ title: `Use ${p} from core`, value: p }))
+    ];
+
+    const { presenterType } = await prompts({
+        type: 'select',
+        name: 'presenterType',
+        message: 'Select presenter factory:',
+        choices: presenterChoices
+    });
+
+    // Get available services
+    const contextPath = getContextPath(context);
+    const services = await getAvailableFiles(
+        path.join(contextPath, 'Application', 'Services')
+    );
+
+    const serviceChoices = [
+        { title: 'Without service', value: null },
+        ...services.map(s => ({ title: `${s}Service`, value: `${s}Service` }))
+    ];
+
+    const { service } = await prompts({
+        type: 'select',
+        name: 'service',
+        message: 'Select service (optional):',
+        choices: serviceChoices
+    });
+
+    const pascalName = toPascalCase(name);
+    const contextName = toPascalCase(context);
+    const presenterPath = path.join(contextPath, 'Delivery', 'Presenters');
+    const filePath = path.join(presenterPath, `${pascalName}Presenter.ts`);
+
+    const serviceImport = service
+        ? `import { ApplicationProvider } from '../../Application/index.js';`
+        : '';
+
+    const serviceInit = service
+        ? `const { ${service} } = ApplicationProvider();`
+        : '';
+
+    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);
+
+    console.log(`✅ Presenter created at ${filePath}`);
+}