@azure-net/cli 1.0.3 → 1.1.4

package/bin/azure-net.js

@@ -2,7 +2,7 @@
 
 import { Command } from 'commander';
 import generateRepository from '../src/commands/generateCrudRepo.js';
-import generateService from '../src/commands/generateCrudService.js';
+import generateCrud from '../src/commands/generateCrud.js';
 
 const program = new Command();
 
@@ -15,8 +15,9 @@ program.command('generate:crud-repo')
     .description('Generate a CRUD repository')
     .action(generateRepository);
 
-program.command('generate:crud-service')
-    .description('Generate a service class')
-    .action(generateService);
+program
+    .command('generate:crud')
+    .description('Generate CRUD Domain/Repo/Service')
+    .action(generateCrud);
 
 program.parse();

package/package.json

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

package/src/commands/generateCrud.js

@@ -0,0 +1,110 @@
+import prompts from 'prompts';
+import fs from 'fs/promises';
+import path from 'path';
+import ejs from 'ejs';
+import { loadUserConfig } from "../utils/loadConfig.js";
+
+const __dirname = path.dirname(new URL(import.meta.url).pathname);
+
+async function writeIfNotExists(filepath, content) {
+    try {
+        await fs.access(filepath);
+        console.log(`⚠️  Skip existing: ${filepath}`);
+    } catch {
+        await fs.mkdir(path.dirname(filepath), { recursive: true });
+        await fs.writeFile(filepath, content, 'utf-8');
+        console.log(`✅ Created: ${filepath}`);
+    }
+}
+
+export default async function generateCrud() {
+    const config = await loadUserConfig();
+    const answers = await prompts([
+        { type: 'text', name: 'className', message: 'Class name (PascalCase):' },
+        { type: 'text', name: 'endpoint', message: 'API endpoint:' }
+    ]);
+
+    const rawName = answers.className.trim();
+    const capital = rawName[0].toUpperCase() + rawName.slice(1);
+    const lower = rawName[0].toLowerCase() + rawName.slice(1);
+    const endpoint = answers.endpoint.trim();
+
+    // === Domain lowercase folder ===
+    const domainPath = path.join(process.cwd(), config.output.domain, lower);
+    const repoPath = path.join(process.cwd(), config.output.repo);
+
+    // 1) Abstracts
+    const abstractsDir = path.join(domainPath, 'abstracts');
+    for (const file of ['Class', 'ClassCreateRequest', 'ClassUpdateRequest']) {
+        const tpl = await fs.readFile(path.join(__dirname, `../templates/domain/abstracts/${file}.ejs`), 'utf-8');
+        const result = ejs.render(tpl, { className: capital });
+        await writeIfNotExists(path.join(abstractsDir, `${capital}${file.replace('Class', '')}.ts`), result);
+    }
+    await writeIfNotExists(
+        path.join(abstractsDir, `index.ts`),
+        [
+            `export * from './${capital}';`,
+            `export * from './${capital}CreateRequest';`,
+            `export * from './${capital}UpdateRequest';`
+        ].join('\n')
+    );
+
+    // 2) Request
+    const requestDir = path.join(domainPath, 'request');
+    for (const file of ['ClassCreateRequest', 'ClassUpdateRequest']) {
+        const tpl = await fs.readFile(path.join(__dirname, `../templates/domain/request/${file}.ejs`), 'utf-8');
+        const result = ejs.render(tpl, { className: capital });
+        await writeIfNotExists(path.join(requestDir, `${capital}${file.replace('Class', '')}.ts`), result);
+    }
+    await writeIfNotExists(
+        path.join(requestDir, `index.ts`),
+        [
+            `export * from './${capital}CreateRequest';`,
+            `export * from './${capital}UpdateRequest';`
+        ].join('\n')
+    );
+
+    // === 3) Services ===
+    const serviceDir = path.join(domainPath, 'services');
+    const serviceTpl = await fs.readFile(path.join(__dirname, '../templates/domain/services/ClassService.ejs'), 'utf-8');
+    const serviceResult = ejs.render(serviceTpl, {
+        className: capital,
+        domainName: lower
+    });
+    await writeIfNotExists(path.join(serviceDir, `${capital}Service.ts`), serviceResult);
+
+// ✅ Новый файл index.ts в services
+    await writeIfNotExists(
+        path.join(serviceDir, 'index.ts'),
+        `export * from './${capital}Service';\n`
+    );
+
+    // 4) Domain Index
+    await writeIfNotExists(
+        path.join(domainPath, 'index.ts'),
+        [
+            `export * from './abstracts';`,
+            `export * from './request';`,
+            `export * from './services';`
+        ].join('\n')
+    );
+
+    // === Generate Repo ===
+    const repoTpl = await fs.readFile(path.join(__dirname, '../templates/data/repo/ClassRepo.ejs'), 'utf-8');
+    const repoResult = ejs.render(repoTpl, {
+        className: capital,
+        endpoint,
+        domainName: lower
+    });
+    await writeIfNotExists(path.join(repoPath, `${capital}Repo.ts`), repoResult);
+
+    // === Repo Index ===
+    const files = await fs.readdir(repoPath);
+    const exports = files
+        .filter(f => f.endsWith('Repo.ts') && f !== 'index.ts')
+        .map(f => `export * from './${f.replace('.ts', '')}';`)
+        .join('\n');
+    await fs.writeFile(path.join(repoPath, 'index.ts'), exports, 'utf-8');
+
+    console.log(`✅ CRUD for ${capital} generated successfully!`);
+}

package/src/templates/data/repo/ClassRepo.ejs

@@ -0,0 +1,32 @@
+import { BaseDatasource } from '@azure-net/kit';
+import {
+    I<%= className %>Collection,
+    I<%= className %>Resource,
+    I<%= className %>CreateRequest,
+    I<%= className %>UpdateRequest
+} from '$domain/<%= domainName %>';
+
+export class <%= className %>Repo {
+    private endpoint = '<%= endpoint %>';
+    constructor(private source: BaseDatasource) {}
+
+    public async collection() {
+        return await this.source.createRequest<I<%= className %>Collection>(({ http }) => http.get(this.endpoint));
+    }
+
+    public async resource(id: number) {
+        return await this.source.createRequest<I<%= className %>Resource>(({ http }) => http.get(`${this.endpoint}/${id}`));
+    }
+
+    public async create(data: I<%= className %>CreateRequest) {
+        return await this.source.createRequest<I<%= className %>Resource>(({ http }) => http.post(this.endpoint, { json: data }));
+    }
+
+    public async update(id: number, data: I<%= className %>UpdateRequest) {
+        return await this.source.createRequest<I<%= className %>Resource>(({ http }) => http.put(`${this.endpoint}/${id}`, { json: data }));
+    }
+
+    public async remove(id: number) {
+        return await this.source.createRequest<void>(({ http }) => http.delete(`${this.endpoint}/${id}`));
+    }
+}

package/src/templates/domain/abstracts/Class.ejs

@@ -0,0 +1,3 @@
+export interface I<%= className %>Resource {}
+
+export type I<%= className %>Collection = I<%= className %>Resource[];

package/src/templates/domain/abstracts/ClassCreateRequest.ejs

@@ -0,0 +1 @@
+export interface I<%= className %>CreateRequest {}

package/src/templates/domain/abstracts/ClassUpdateRequest.ejs

@@ -0,0 +1 @@
+export interface I<%= className %>UpdateRequest {}

package/src/templates/domain/request/ClassCreateRequest.ejs

@@ -0,0 +1,8 @@
+import { BaseRequest } from '@azure-net/kit';
+import { I<%= className %>CreateRequest } from '../abstracts';
+
+export class <%= className %>CreateRequest extends BaseRequest<I<%= className %>CreateRequest> {
+    override rules() {
+        return {};
+    }
+}

package/src/templates/domain/request/ClassUpdateRequest.ejs

@@ -0,0 +1,8 @@
+import { BaseRequest } from '@azure-net/kit';
+import { I<%= className %>UpdateRequest } from '../abstracts';
+
+export class <%= className %>UpdateRequest extends BaseRequest<I<%= className %>UpdateRequest> {
+    override rules() {
+        return {};
+    }
+}

package/src/templates/domain/services/ClassService.ejs

@@ -0,0 +1,29 @@
+import { BaseService } from '@azure-net/kit';
+import { <%= className %>Repo } from '$data/repo';
+import { <%= className %>CreateRequest, <%= className %>UpdateRequest } from '$domain/<%= domainName %>/request';
+
+export class <%= className %>Service extends BaseService {
+    constructor(private <%= domainName %>Repo = new <%= className %>Repo()) {
+        super();
+    }
+
+    async collection() {
+        return await this.transformResponse(this.<%= className %>Repo.collection());
+    }
+
+    async resource(id: number) {
+        return await this.transformResponse(this.<%= className %>Repo.resource(id));
+    }
+
+    async create(request: <%= className %>CreateRequest) {
+        return await this.transformResponse(this.<%= className %>Repo.create(request.json()));
+    }
+
+    async update(id: number, request: <%= className %>UpdateRequest) {
+        return await this.transformResponse(this.<%= className %>Repo.update(request.json()));
+    }
+
+    async remove(id: number) {
+        return await this.transformResponse(this.<%= className %>Repo.remove());
+    }
+}

package/src/utils/loadConfig.js

@@ -9,8 +9,8 @@ export async function loadUserConfig() {
     } catch {
         return {
             output: {
-                repository: 'src/repositories',
-                service: 'src/services'
+                domain: 'src/app/layers/domain',
+                repo: 'src/app/layers/data/repo'
             }
         };
     }

package/src/commands/generateCrudService.js

@@ -1,27 +0,0 @@
-import prompts from 'prompts';
-import ejs from 'ejs';
-import fs from 'fs/promises';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { loadUserConfig } from "../utils/loadConfig.js";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-export default async function generateCrudService() {
-    const config = await loadUserConfig();
-    const answers = await prompts([
-        { type: 'text', name: 'className', message: 'Class name:' },
-        { type: 'text', name: 'endpoint', message: 'API endpoint:' },
-    ]);
-
-    const templatePath = path.join(__dirname, '../templates/generateCrudRepo.ejs');
-    const template = await fs.readFile(templatePath, 'utf-8');
-    const result = ejs.render(template, answers);
-
-    const outputDir = config.output.repository;
-    const outFile = path.join(process.cwd(), outputDir, `${answers.className}Repo.ts`);
-    await fs.mkdir(path.dirname(outFile), { recursive: true });
-    await fs.writeFile(outFile, result, 'utf-8');
-
-    console.log(`✅ Created: ${outFile}`);
-}