@azure-net/cli 1.3.10 → 1.3.12

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@azure-net/cli",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "type": "module",
   "bin": {
     "azure-net": "bin/azure-net.js"
   },
   "dependencies": {
-    "@azure-net/kit": "^0.1.3",
+    "@azure-net/kit": "^0.3.3",
     "commander": "^11",
     "ejs": "^3",
     "prompts": "^2"

package/src/commands/generateCrud.js

@@ -96,7 +96,7 @@ export default async function generateCrud() {
 
     // === 1) Abstracts
     const abstractsDir = path.join(domainPath, 'Abstracts');
-    for (const file of ['Class', 'ClassCreateRequest', 'ClassUpdateRequest']) {
+    for (const file of ['Class', 'ClassCreateRequest', 'ClassUpdateRequest', 'ClassCollectionQuery']) {
         const tpl = await fs.readFile(path.join(__dirname, `../templates/domain/abstracts/${file}.ejs`), 'utf-8');
         const result = ejs.render(tpl, templateData);
         await writeIfNotExists(path.join(abstractsDir, `${capital}${file.replace('Class', '')}.ts`), result);
@@ -123,7 +123,7 @@ export default async function generateCrud() {
         path.join(domainPath, 'index.ts'),
         [`export * from './Abstracts';`, `export * from './Request';`].join('\n')
     );
-    await updateIndexTs(domainPath);
+    //await updateIndexTs(domainPath);
 
     // === 5) Repo
     const repoTpl = await fs.readFile(path.join(__dirname, '../templates/data/repo/ClassRepo.ejs'), 'utf-8');

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

@@ -1,17 +1,18 @@
-import { <%= datasource %> } from '<%= aliasShared %>/datasources';
+import { <%= datasource %> } from '$core/datasources';
 import type {
     I<%= pascalCaseName %>Collection,
     I<%= pascalCaseName %>Resource,
     I<%= pascalCaseName %>CreateRequest,
-    I<%= pascalCaseName %>UpdateRequest
+    I<%= pascalCaseName %>UpdateRequest,
+    I<%= pascalCaseName %>CollectionQuery,
 } from '<%= aliasDomain %>/<%= pascalCaseName %>';
 
 export class <%= pascalCaseName %>Repo {
     private endpoint = '<%= endpoint %>';
     constructor(private source = new <%= datasource %>()) {}
 
-    public async collection() {
-        return await this.source.createRequest<I<%= pascalCaseName %>Collection>(({ http }) => http.get(this.endpoint));
+    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) {

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

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

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

@@ -1,14 +1,14 @@
 import { BaseService } from '@azure-net/kit';
 import { <%= pascalCaseName %>Repo } from '<%= aliasRepo %>';
-import type { <%= pascalCaseName %>CreateRequest, <%= pascalCaseName %>UpdateRequest } from '<%= aliasDomain %>/<%= pascalCaseName %>';
+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() {
-        return await this.transformResponse(this.<%= camelCaseName %>Repo.collection());
+    async collection(queryParams?: I<%= pascalCaseName %>CollectionQuery) {
+        return await this.transformResponse(this.<%= camelCaseName %>Repo.collection(queryParams));
     }
 
     async resource(id: number) {