@azure-net/cli 2.3.1 → 2.3.3

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@azure-net/cli",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "type": "module",
   "bin": {
     "azure-net": "bin/azure-net.js"
   },
   "peerDependencies": {
-    "@azure-net/kit": "^1.3.0"
+    "@azure-net/kit": "^1.3.3"
   },
   "dependencies": {
-    "@azure-net/kit": "^1.2.0",
+    "@azure-net/kit": "^1.3.3",
     "commander": "^11",
-    "ejs": "^3",
     "prompts": "^2"
   },
   "devDependencies": {

package/src/commands/generate/generateCrudBase.js

@@ -20,10 +20,7 @@ const entityTemplate = `export interface I{{name}} {
 
 const portsIndexTemplate = `import type { I{{name}} } from '\${{context}}/domain/{{entityLower}}/model';
 
-export interface I{{name}}Collection {
-\tdata: I{{name}}[];
-\ttotal: number;
-}
+export type I{{name}}Collection = I{{name}}[];
 
 export interface I{{name}}CollectionQuery {
 \tpage?: number;
@@ -79,7 +76,7 @@ export class {{name}}Repository {
 \t\t).then(res => res.getData());
 \t}
 \t
-\tpublic async remove(id: number) {
+\tpublic async destroy(id: number) {
 \t\treturn this.{{datasourceVar}}.createRequest<void>(({ http }) => 
 \t\t\thttp.delete(\`\${this.endpoint}/\${id}\`)
 \t\t).then(() => undefined);
@@ -98,7 +95,7 @@ export class {{name}}Service extends ClassMirror<{{name}}Repository> {
 \tdeclare resource: {{name}}Repository['resource'];
 \tdeclare create: {{name}}Repository['create'];
 \tdeclare update: {{name}}Repository['update'];
-\tdeclare remove: {{name}}Repository['remove'];
+\tdeclare destroy: {{name}}Repository['destroy'];
 }`;
 
 export default async function generateCrudBase() {

package/src/commands/generate/generateCrudPresenter.js

@@ -14,7 +14,7 @@ const createSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}
 import type { I{{name}}CreateRequest } from '\${{context}}/domain/{{entityLower}}';
 
 export const Create{{name}}Schema = {{schemaFactory}}<I{{name}}CreateRequest>()
-\t.rules((rules) => ({
+\t.rules(() => ({
 \t\t// Add validation rules here
 \t}))
 \t.create();`;
@@ -23,7 +23,7 @@ const updateSchemaTemplate = `import { {{schemaFactory}} } from '{{schemaImport}
 import type { I{{name}}UpdateRequest } from '\${{context}}/domain/{{entityLower}}';
 
 export const Update{{name}}Schema = {{schemaFactory}}<I{{name}}UpdateRequest>()
-\t.rules((rules) => ({
+\t.rules(() => ({
 \t\t// Add validation rules here
 \t}))
 \t.create();`;
@@ -53,10 +53,10 @@ export const {{name}}Presenter = {{presenterFactory}}('{{name}}Presenter', ({ cr
 \tconst update = async (id: number, request: I{{name}}UpdateRequest) =>
 \t\tawait createAsyncAction<I{{name}}, I{{name}}UpdateRequest>(() => {{serviceName}}.update(id, Update{{name}}Schema.from(request).json()));
 \t
-\tconst remove = async (id: number) => 
-\t\tawait createAsyncAction(() => {{serviceName}}.remove(id));
+\tconst destroy = async (id: number) => 
+\t\tawait createAsyncAction(() => {{serviceName}}.destroy(id));
 \t
-\treturn { collection, resource, create, update, remove };
+\treturn { collection, resource, create, update, destroy };
 });`;
 
 const presenterWithoutCoreTemplate = `import { createPresenter } from '@azure-net/kit';
@@ -83,10 +83,10 @@ export const {{name}}Presenter = createPresenter('{{name}}Presenter', () => {
 \tconst update = async (id: number, request: I{{name}}UpdateRequest) =>
 \t\tawait {{serviceName}}.update(id, Update{{name}}Schema.from(request).json()));
 \t
-\tconst remove = async (id: number) => 
-\t\tawait {{serviceName}}.remove(id);
+\tconst destroy = async (id: number) => 
+\t\tawait {{serviceName}}.destroy(id);
 \t
-\treturn { collection, resource, create, update, remove };
+\treturn { collection, resource, create, update, destroy };
 });`;
 
 export default async function generateCrudPresenter() {

package/src/commands/init/initStructure.js

@@ -75,7 +75,7 @@ export const ApplicationProvider = createBoundaryProvider(
 \t'${contextName}ApplicationProvider',
 \t{
 \t\tdependsOn: { InfrastructureProvider },
-\t\tregister: ({ InfrastructureProvider }) => ({
+\t\tregister: () => ({
 \t\t// Application services will be added here manually
 \t\t}),
 \t}