@azure-net/cli 1.3.8 → 1.3.10

package/package.json

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

package/src/commands/generateCrud.js

@@ -2,9 +2,10 @@ import prompts from 'prompts';
 import fs from 'fs/promises';
 import path from 'path';
 import ejs from 'ejs';
-import { loadUserConfig } from "../utils/loadConfig.js";
+import { loadUserConfig } from '../utils/loadConfig.js';
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
+const CORE_DATASOURCES_PATH = path.join(process.cwd(), 'src/app/core/datasources');
 
 async function writeIfNotExists(filepath, content) {
     try {
@@ -23,8 +24,20 @@ async function updateIndexTs(dir, filePattern = '.ts', ignore = ['index.ts']) {
     await fs.writeFile(path.join(dir, 'index.ts'), content, 'utf-8');
 }
 
+async function getAvailableDatasources() {
+    try {
+        const files = await fs.readdir(CORE_DATASOURCES_PATH);
+        return files
+            .filter(f => f.endsWith('.ts') && !f.startsWith('_'))
+            .map(f => f.replace('.ts', ''));
+    } catch {
+        return [];
+    }
+}
+
 export default async function generateCrud() {
     const config = await loadUserConfig();
+    const datasources = await getAvailableDatasources();
 
     const answers = await prompts([
         config.modules?.length
@@ -40,11 +53,17 @@ export default async function generateCrud() {
             : null,
         { type: 'text', name: 'className', message: 'Class name (PascalCase):' },
         { type: 'text', name: 'endpoint', message: 'API endpoint:' },
-        { type: 'text', name: 'datasource', message: 'Datasource name:', initial: 'BaseDatasource' }
+        {
+            type: 'select',
+            name: 'datasource',
+            message: 'Select datasource:',
+            choices: datasources.map(d => ({ title: d, value: d }))
+        }
     ].filter(Boolean));
 
     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();
     const datasource = answers.datasource.trim();
     const selectedModule = answers.module;
@@ -64,15 +83,15 @@ export default async function generateCrud() {
     const aliasShared = '$shared-context';
 
     const templateData = {
-        className: capital,
-        domainName: capital,
+        camelCaseName: lower,
+        pascalCaseName: capital,
         endpoint,
         datasource,
         aliasDomain: `${aliasCurrent}/Domain`,
-        aliasShared: aliasShared,
+        aliasShared,
         aliasApplication: `${aliasCurrent}/Application`,
         aliasInfra: `${aliasCurrent}/Infra`,
-        aliasRepo: `${aliasCurrent}/Infra/Repo`,
+        aliasRepo: `${aliasCurrent}/Infra/Repo`
     };
 
     // === 1) Abstracts
@@ -102,8 +121,9 @@ export default async function generateCrud() {
     // === 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')
     );
+    await updateIndexTs(domainPath);
 
     // === 5) Repo
     const repoTpl = await fs.readFile(path.join(__dirname, '../templates/data/repo/ClassRepo.ejs'), 'utf-8');
@@ -112,4 +132,4 @@ export default async function generateCrud() {
     await updateIndexTs(repoPath);
 
     console.log(`✅ CRUD for ${capital} generated in ${selectedModule || 'app-context'} structure`);
-}
+}

package/src/commands/generateStructure.js

@@ -5,6 +5,7 @@ import { loadUserConfig } from '../utils/loadConfig.js';
 const BASE_STRUCTURE = ['Domain', 'Infra', 'Application', 'Presentation'];
 const APP_ROOT = path.join(process.cwd(), 'src', 'app');
 const CONTEXTS_PATH = path.join(APP_ROOT, 'contexts');
+const CORE_PATH = path.join(APP_ROOT, 'core');
 
 async function createDirIfNotExists(dirPath) {
     try {
@@ -20,10 +21,10 @@ async function createBaseStructure(root) {
         const sectionPath = path.join(root, section);
         await createDirIfNotExists(sectionPath);
 
-        if (section === 'infra') {
+        if (section === 'Infra') {
             await createDirIfNotExists(path.join(sectionPath, 'Repo'));
         }
-        if (section === 'application') {
+        if (section === 'Application') {
             await createDirIfNotExists(path.join(sectionPath, 'Services'));
             await createDirIfNotExists(path.join(sectionPath, 'Orchestrators'));
         }
@@ -37,7 +38,7 @@ export default async function initStructure() {
 
     console.log('📦 Generating architecture in: /contexts');
 
-    // всегда shared-kernel
+    // всегда shared-context
     const sharedKernelPath = path.join(CONTEXTS_PATH, 'shared-context');
     await createBaseStructure(sharedKernelPath);
 
@@ -50,13 +51,14 @@ export default async function initStructure() {
         }
     } else {
         // fallback-контекст
-        console.log('🧱 No modules found — using default "app" context...');
-        const corePath = path.join(CONTEXTS_PATH, 'app-context');
-        await createBaseStructure(corePath);
+        console.log('🧱 No modules found — using default "app-context"...');
+        const fallbackPath = path.join(CONTEXTS_PATH, 'app-context');
+        await createBaseStructure(fallbackPath);
     }
 
-    // доп. папки вне contexts
-    await createDirIfNotExists(path.join(APP_ROOT, 'shared'));
+    // Доп. слои вне contexts
+    await createDirIfNotExists(CORE_PATH);
+    await createDirIfNotExists(path.join(CORE_PATH, 'datasources'));
     await createDirIfNotExists(path.join(APP_ROOT, 'ui'));
 
     console.log('✅ Structure initialization complete!');

package/src/commands/initAliases.js

@@ -12,13 +12,19 @@ function generateAliases(config) {
     if (hasModules) {
         config.modules.push('shared-context');
         return Object.fromEntries(
-            config.modules.map(m => [`$${m}`, `./src/app/contexts/${m}`])
+            [
+                ...config.modules.map(m => [`$${m}`, `./src/app/contexts/${m}`]),
+                ['$core', './src/app/core'],
+                ['$ui', './src/app/ui']
+            ]
         );
     }
 
     return {
         '$app-context': './src/app/contexts/app-context',
-        '$shared-context': './src/app/contexts/shared-context'
+        '$shared-context': './src/app/contexts/shared-context',
+        '$core': './src/app/core',
+        '$ui': './src/app/ui'
     };
 }
 

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

@@ -1,29 +1,29 @@
 import { <%= datasource %> } from '<%= aliasShared %>/datasources';
 import type {
-    I<%= className %>Collection,
-    I<%= className %>Resource,
-    I<%= className %>CreateRequest,
-    I<%= className %>UpdateRequest
-} from '<%= aliasDomain %>/<%= domainName %>';
+    I<%= pascalCaseName %>Collection,
+    I<%= pascalCaseName %>Resource,
+    I<%= pascalCaseName %>CreateRequest,
+    I<%= pascalCaseName %>UpdateRequest
+} from '<%= aliasDomain %>/<%= pascalCaseName %>';
 
-export class <%= className %>Repo {
+export class <%= pascalCaseName %>Repo {
     private endpoint = '<%= endpoint %>';
     constructor(private source = new <%= datasource %>()) {}
 
     public async collection() {
-        return await this.source.createRequest<I<%= className %>Collection>(({ http }) => http.get(this.endpoint));
+        return await this.source.createRequest<I<%= pascalCaseName %>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}`));
+        return await this.source.createRequest<I<%= pascalCaseName %>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 create(data: I<%= pascalCaseName %>CreateRequest) {
+        return await this.source.createRequest<I<%= pascalCaseName %>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 update(id: number, data: I<%= pascalCaseName %>UpdateRequest) {
+        return await this.source.createRequest<I<%= pascalCaseName %>Resource>(({ http }) => http.put(`${this.endpoint}/${id}`, { json: data }));
     }
 
     public async remove(id: number) {

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

@@ -1,6 +1,6 @@
-export interface I<%= className %>Resource {
+export interface I<%= pascalCaseName %>Resource {
     // TODO: define fields
     [key: string]: unknown;
 }
 
-export type I<%= className %>Collection = I<%= className %>Resource[];
+export type I<%= pascalCaseName %>Collection = I<%= pascalCaseName %>Resource[];

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

@@ -1,4 +1,4 @@
-export interface I<%= className %>CreateRequest {
+export interface I<%= pascalCaseName %>CreateRequest {
     // TODO: define fields
     [key: string]: unknown;
 }

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

@@ -1,4 +1,4 @@
-export interface I<%= className %>UpdateRequest {
+export interface I<%= pascalCaseName %>UpdateRequest {
     // TODO: define fields
     [key: string]: unknown;
 }

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

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

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

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

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

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

package/src/utils/loadConfig.js

@@ -8,7 +8,8 @@ export async function loadUserConfig() {
         return userConfig.default || {};
     } catch {
         return {
-            modules: ['admin', 'auth']
+            modules: ['admin', 'auth'],
+            datasourceAlias: ''
         };
     }
 }