@azure-net/cli 2.0.8 → 2.1.0

package/bin/azure-net.js

@@ -110,11 +110,6 @@ program
     .description('Generate presenter')
     .action(generatePresenter);
 
-program
-    .command('make:module')
-    .description('Generate complete module')
-    .action(generateModule);
-
 program
     .command('make:crud-base')
     .description('Generate CRUD repository and service')
@@ -125,11 +120,6 @@ program
     .description('Generate CRUD presenter for existing service')
     .action(generateCrudPresenter);
 
-program
-    .command('make:presenter-by-service')
-    .description('Generate presenter from existing service')
-    .action(generatePresenterByService);
-
 program
     .command('make:service-by-repo')
     .description('Generate service from existing repository')

package/package.json

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

package/src/commands/generate/generateDatasource.js

@@ -4,11 +4,11 @@ import { selectContext, getContextPath, toPascalCase, getAvailableFiles } from '
 import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
 const datasourceWithResponseTemplate = `import { BaseHttpDatasource, type CreateRequestCallbackType } from '@azure-net/kit/infra';
-import { {{responseClass}}, type {{responseInterface}} } from '{{responseImport}}';
+import { {{responseClass}} } from '{{responseImport}}';
 
 export class {{name}}Datasource extends BaseHttpDatasource {
-\tasync createRequest<T>(callback: CreateRequestCallbackType<{{responseInterface}}<T>>) {
-\t\treturn new {{responseClass}}<T>(await this.createRawRequest<{{responseInterface}}<T>>(callback));
+\tasync createRequest<T>(callback: CreateRequestCallbackType<T>) {
+\t\treturn new {{responseClass}}<T>(await this.createRawRequest<T>(callback));
 \t}
 }`;
 

package/src/commands/generate/generateResponse.js

@@ -5,7 +5,7 @@ import { writeIfNotExists, updateIndexTs } from '../../utils/fileUtils.js';
 
 const responseTemplate = `import { ResponseBuilder } from '@azure-net/kit/infra';
 
-export class {{name}}Response<TData = unknown, TMeta = unknown> extends ResponseBuilder<TData, TMeta, I{{name}}Response<TData>> {
+export class {{name}}Response<TData = unknown, TMeta = unknown> extends ResponseBuilder<TData, TMeta, TData> {
 }`;
 
 export default async function generateResponse() {

package/src/commands/init/initStructure.js

@@ -5,6 +5,7 @@ import { loadUserConfig } from '../../utils/loadConfig.js';
 const APP_ROOT = path.join(process.cwd(), 'src', 'app');
 const CONTEXTS_PATH = path.join(APP_ROOT, 'contexts');
 const SHARED_PATH = path.join(APP_ROOT, 'shared');
+const CORE_PATH = path.join(APP_ROOT, 'shared', 'core');
 
 async function createDirIfNotExists(dirPath) {
     try {

package/src/utils/loadConfig.js

@@ -8,8 +8,8 @@ export async function loadUserConfig() {
         return userConfig.default || {};
     } catch {
         return {
-            contexts: ['app'],
-            defaultContext: 'app'
+            contexts: ['public'],
+            defaultContext: 'public'
         };
     }
 }

package/src/templates/data/datasource/ClassDatasource.ejs

@@ -1,7 +0,0 @@
-import { BaseHttpDatasource, HttpService } from '@azure-net/kit';
-
-export class <%= name %>Datasource extends BaseHttpDatasource {
-	constructor() {
-		super({ http: new HttpService({ baseUrl: '' }) });
-	}
-}

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

@@ -1,33 +0,0 @@
-import { <%= datasource %> } from '$core/datasources';
-import type {
-    I<%= pascalCaseName %>Collection,
-    I<%= pascalCaseName %>Resource,
-    I<%= pascalCaseName %>CreateRequest,
-    I<%= pascalCaseName %>UpdateRequest,
-    I<%= pascalCaseName %>CollectionQuery,
-} from '<%= aliasDomain %>/<%= pascalCaseName %>';
-
-export class <%= pascalCaseName %>Repo {
-    private endpoint = '<%= endpoint %>';
-    constructor(private source = new <%= datasource %>()) {}
-
-    public async collection(queryParams?: I<%= pascalCaseName %>CollectionQuery) {
-        return await this.source.createRequest<I<%= pascalCaseName %>Collection>(({ http, query }) => http.get(`${this.endpoint}${query.build(queryParams)}`));
-    }
-
-    public async resource(id: number) {
-        return await this.source.createRequest<I<%= pascalCaseName %>Resource>(({ http }) => http.get(`${this.endpoint}/${id}`));
-    }
-
-    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<%= pascalCaseName %>UpdateRequest) {
-        return await this.source.createRequest<I<%= pascalCaseName %>Resource>(({ http }) => http.put(`${this.endpoint}/${id}`, { json: data }));
-    }
-
-    public async remove(id: number) {
-        return await this.source.createRequest<never>(({ http }) => http.delete(`${this.endpoint}/${id}`));
-    }
-}

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

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

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

@@ -1,3 +0,0 @@
-export interface I<%= pascalCaseName %>CollectionQuery {
-    [key: string]: unknown;
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,29 +0,0 @@
-import { BaseService } from '@azure-net/kit';
-import { <%= pascalCaseName %>Repo } from '<%= aliasRepo %>';
-import type { <%= pascalCaseName %>CreateRequest, <%= pascalCaseName %>UpdateRequest, I<%= pascalCaseName %>CollectionQuery } from '<%= aliasDomain %>/<%= pascalCaseName %>';
-
-export class <%= pascalCaseName %>Service extends BaseService {
-    constructor(private <%= camelCaseName %>Repo = new <%= pascalCaseName %>Repo()) {
-        super();
-    }
-
-    async collection(queryParams?: I<%= pascalCaseName %>CollectionQuery) {
-        return await this.transformResponse(this.<%= camelCaseName %>Repo.collection(queryParams));
-    }
-
-    async resource(id: number) {
-        return await this.transformResponse(this.<%= camelCaseName %>Repo.resource(id));
-    }
-
-    async create(request: <%= pascalCaseName %>CreateRequest) {
-        return await this.transformResponse(this.<%= camelCaseName %>Repo.create(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.<%= camelCaseName %>Repo.remove(id));
-    }
-}