@azure-net/cli 1.3.5 → 1.3.6

package/package.json

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

package/src/commands/generateCrud.js

@@ -48,52 +48,62 @@ export default async function generateCrud() {
     const selectedModule = answers.module;
 
     const baseArch = path.join(process.cwd(), 'src/app/contexts');
-    const basePath = selectedModule ? path.join(baseArch, selectedModule) : baseArch;
+    const basePath = selectedModule ? path.join(baseArch, selectedModule) : path.join(baseArch, 'app-context');
 
-    const domainPath = path.join(basePath, 'domain', lower);
-    const serviceDir = path.join(basePath, 'application', 'services');
-    const repoPath = path.join(basePath, 'infra', 'repo');
+    const domainPath = path.join(basePath, 'Domain', lower);
+    const serviceDir = path.join(basePath, 'Application', 'Services');
+    const repoPath = path.join(basePath, 'Infra', 'Repo');
+
+    const aliasCurrent = selectedModule ? `$${selectedModule}` : '$app-context';
+    const aliasShared = '$shared-context';
+
+    const templateData = {
+        className: capital,
+        domainName: lower,
+        endpoint,
+        datasource,
+        aliasDomain: `${aliasCurrent}/Domain`,
+        aliasShared: aliasShared,
+        aliasApplication: `${aliasCurrent}/Application`,
+        aliasInfra: `${aliasCurrent}/Infra`
+    };
 
     // === 1) Abstracts
-    const abstractsDir = path.join(domainPath, '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 });
+        const result = ejs.render(tpl, templateData);
         await writeIfNotExists(path.join(abstractsDir, `${capital}${file.replace('Class', '')}.ts`), result);
     }
     await updateIndexTs(abstractsDir);
 
     // === 2) Request
-    const requestDir = path.join(domainPath, '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 });
+        const result = ejs.render(tpl, templateData);
         await writeIfNotExists(path.join(requestDir, `${capital}${file.replace('Class', '')}.ts`), result);
     }
     await updateIndexTs(requestDir);
 
     // === 3) 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 });
+    const serviceResult = ejs.render(serviceTpl, templateData);
     await writeIfNotExists(path.join(serviceDir, `${capital}Service.ts`), serviceResult);
     await updateIndexTs(serviceDir);
 
     // === 4) Domain Index
     await writeIfNotExists(
         path.join(domainPath, 'index.ts'),
-        [`export * from './abstracts';`, `export * from './request';`].join('\n') + '\n'
+        [`export * from './Abstracts';`, `export * from './Request';`].join('\n') + '\n'
     );
+    await updateIndexTs(domainPath);
 
     // === 5) 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,
-        datasource
-    });
+    const repoResult = ejs.render(repoTpl, templateData);
     await writeIfNotExists(path.join(repoPath, `${capital}Repo.ts`), repoResult);
     await updateIndexTs(repoPath);
 
-    console.log(`✅ CRUD for ${capital} generated in ${selectedModule || 'monolith'} structure`);
-}
+    console.log(`✅ CRUD for ${capital} generated in ${selectedModule || 'app-context'} structure`);
+}

package/src/commands/generateStructure.js

@@ -2,9 +2,9 @@ import fs from 'fs/promises';
 import path from 'path';
 import { loadUserConfig } from '../utils/loadConfig.js';
 
-const BASE_STRUCTURE = ['domain', 'infra', 'application', 'presentation'];
+const BASE_STRUCTURE = ['Domain', 'Infra', 'Application', 'Presentation'];
 const APP_ROOT = path.join(process.cwd(), 'src', 'app');
-const ARCHITECTURE_PATH = path.join(APP_ROOT, 'contexts');
+const CONTEXTS_PATH = path.join(APP_ROOT, 'contexts');
 
 async function createDirIfNotExists(dirPath) {
     try {
@@ -21,12 +21,11 @@ async function createBaseStructure(root) {
         await createDirIfNotExists(sectionPath);
 
         if (section === 'infra') {
-            await createDirIfNotExists(path.join(sectionPath, 'repo'));
+            await createDirIfNotExists(path.join(sectionPath, 'Repo'));
         }
-
         if (section === 'application') {
-            await createDirIfNotExists(path.join(sectionPath, 'services'));
-            await createDirIfNotExists(path.join(sectionPath, 'orchestrators'));
+            await createDirIfNotExists(path.join(sectionPath, 'Services'));
+            await createDirIfNotExists(path.join(sectionPath, 'Orchestrators'));
         }
     }
 }
@@ -34,21 +33,29 @@ async function createBaseStructure(root) {
 export default async function initStructure() {
     const config = await loadUserConfig();
     const modules = config.modules;
+    const hasModules = Array.isArray(modules) && modules.length > 0;
 
-    if (!modules || modules.length === 0) {
-        // Без модулей
-        console.log('📦 Generating monolithic architecture...');
-        await createBaseStructure(ARCHITECTURE_PATH);
-    } else {
-        // С модулями
-        console.log('📦 Generating modular architecture...');
+    console.log('📦 Generating architecture in: /contexts');
+
+    // всегда shared-kernel
+    const sharedKernelPath = path.join(CONTEXTS_PATH, 'shared-context');
+    await createBaseStructure(sharedKernelPath);
+
+    if (hasModules) {
+        // по модулям
+        console.log('🔧 Creating module contexts...');
         for (const mod of modules) {
-            const modRoot = path.join(ARCHITECTURE_PATH, mod);
-            await createBaseStructure(modRoot);
+            const modPath = path.join(CONTEXTS_PATH, mod);
+            await createBaseStructure(modPath);
         }
+    } else {
+        // fallback-контекст
+        console.log('🧱 No modules found — using default "app" context...');
+        const corePath = path.join(CONTEXTS_PATH, 'app-context');
+        await createBaseStructure(corePath);
     }
 
-    // shared и ui вне modules
+    // доп. папки вне contexts
     await createDirIfNotExists(path.join(APP_ROOT, 'shared'));
     await createDirIfNotExists(path.join(APP_ROOT, 'ui'));
 

package/src/commands/initAliases.js

@@ -10,17 +10,15 @@ function generateAliases(config) {
     const hasModules = Array.isArray(config.modules) && config.modules.length > 0;
 
     if (hasModules) {
+        config.modules.push('shared-context');
         return Object.fromEntries(
             config.modules.map(m => [`$${m}`, `./src/app/contexts/${m}`])
         );
     }
 
     return {
-        '$domain': './src/app/contexts/domain',
-        '$infra': './src/app/contexts/infra',
-        '$application': './src/app/contexts/application',
-        '$presentation': './src/app/contexts/presentation',
-        '$services': './src/app/contexts/application/services'
+        '$app-context': './src/app/contexts/app-context',
+        '$shared-context': './src/app/contexts/shared-context'
     };
 }
 

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

@@ -1,10 +1,10 @@
-import { <%= datasource %> } from '$data/datasources';
+import { <%= datasource %> } from '<%= aliasShared %>/datasources';
 import type {
     I<%= className %>Collection,
     I<%= className %>Resource,
     I<%= className %>CreateRequest,
     I<%= className %>UpdateRequest
-} from '$domain/<%= domainName %>';
+} from '<%= aliasDomain %>/<%= domainName %>';
 
 export class <%= className %>Repo {
     private endpoint = '<%= endpoint %>';
@@ -29,4 +29,4 @@ export class <%= className %>Repo {
     public async remove(id: number) {
         return await this.source.createRequest<never>(({ http }) => http.delete(`${this.endpoint}/${id}`));
     }
-}
+}

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

@@ -1,6 +1,6 @@
 import { BaseService } from '@azure-net/kit';
-import { <%= className %>Repo } from '$data/repo';
-import type { <%= className %>CreateRequest, <%= className %>UpdateRequest } from '$domain/<%= domainName %>';
+import { <%= className %>Repo } from '<%= aliasRepo %>';
+import type { <%= className %>CreateRequest, <%= className %>UpdateRequest } from '<%= aliasDomain %>/<%= domainName %>';
 
 export class <%= className %>Service extends BaseService {
     constructor(private <%= domainName %>Repo = new <%= className %>Repo()) {
@@ -26,4 +26,4 @@ export class <%= className %>Service extends BaseService {
     async remove(id: number) {
         return await this.transformResponse(this.<%= domainName %>Repo.remove(id));
     }
-}
+}