@azure-net/cli 1.1.5 → 1.2.0

package/package.json

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

package/src/commands/generateCrud.js

@@ -19,15 +19,18 @@ async function writeIfNotExists(filepath, content) {
 
 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:' }
+        { type: 'text', name: 'endpoint', message: 'API endpoint:' },
+        { type: 'text', name: 'datasource', message: 'Datasource name:', initial: 'BaseDatasource' }
     ]);
 
     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();
 
     // === Domain lowercase folder ===
     const domainPath = path.join(process.cwd(), config.output.domain, lower);
@@ -73,13 +76,13 @@ export default async function generateCrud() {
     });
     await writeIfNotExists(path.join(serviceDir, `${capital}Service.ts`), serviceResult);
 
-// ✅ Новый файл index.ts в services
+    // ✅ Services index.ts
     await writeIfNotExists(
         path.join(serviceDir, 'index.ts'),
         `export * from './${capital}Service';\n`
     );
 
-    // 4) Domain Index
+    // === 4) Domain Index ===
     await writeIfNotExists(
         path.join(domainPath, 'index.ts'),
         [
@@ -89,16 +92,17 @@ export default async function generateCrud() {
         ].join('\n')
     );
 
-    // === Generate Repo ===
+    // === 5) 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
+        domainName: lower,
+        datasource // <-- 👈 Передаём!
     });
     await writeIfNotExists(path.join(repoPath, `${capital}Repo.ts`), repoResult);
 
-    // === Repo Index ===
+    // === 6) Repo Index ===
     const files = await fs.readdir(repoPath);
     const exports = files
         .filter(f => f.endsWith('Repo.ts') && f !== 'index.ts')

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

@@ -1,5 +1,5 @@
-import { BaseDatasource } from '@azure-net/kit';
-import {
+import { <%= datasource %> } from '$data/datasources';
+import type {
     I<%= className %>Collection,
     I<%= className %>Resource,
     I<%= className %>CreateRequest,
@@ -8,7 +8,7 @@ import {
 
 export class <%= className %>Repo {
     private endpoint = '<%= endpoint %>';
-    constructor(private source: BaseDatasource) {}
+    constructor(private source = new <%= datasource %>()) {}
 
     public async collection() {
         return await this.source.createRequest<I<%= className %>Collection>(({ http }) => http.get(this.endpoint));

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

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

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

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

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

@@ -1,6 +1,6 @@
 import { BaseService } from '@azure-net/kit';
 import { <%= className %>Repo } from '$data/repo';
-import { <%= className %>CreateRequest, <%= className %>UpdateRequest } from '$domain/<%= domainName %>/request';
+import type { <%= className %>CreateRequest, <%= className %>UpdateRequest } from '$domain/<%= domainName %>/request';
 
 export class <%= className %>Service extends BaseService {
     constructor(private <%= domainName %>Repo = new <%= className %>Repo()) {

package/src/templates/generateCrudRepo.ejs

@@ -23,4 +23,4 @@ export class <%= className %>Repo {
   public async delete(id: number) {
     return await this.source.createRequest<unknown>(({ http }) => http.delete(`${this.endpoint}/${id}`));
   }
-}
+}