@alevnyacow/nzmt 0.0.32 → 0.0.34

package/bin/cli.js

@@ -6,6 +6,11 @@ var args = process.argv.slice(2);
 
 var [command, entityName, options = ''] = args;
 
+function getImportName(str) {
+  const match = str.match(/import\s*{\s*([^}]+)\s*}/);
+  return match ? match[1].trim() : null;
+}
+
 function camelizeVariants(str) {
     if (!str.includes('-')) {
         return [str, str.substring(0, 1).toUpperCase() + str.substring(1)]
@@ -308,14 +313,16 @@ if (command === 'entity') {
 }
 
 function generateService(lowerCase, upperCase, withCrud) {
-    const folder = config?.paths?.services ? path.resolve(process.cwd(), config?.paths?.services, entityName) : path.resolve(process.cwd(), entityName);
+
+    const serviceName = withCrud ? entityName + 's' : entityName 
+    const folder = config?.paths?.services ? path.resolve(process.cwd(), config?.paths?.services, serviceName) : path.resolve(process.cwd(), serviceName);
 
     fs.mkdirSync(folder, { recursive: true })
 
     // Metadata
 
     if (withCrud) {
-        fs.writeFileSync(path.resolve(folder, `${entityName}s.service.metadata.ts`), [
+        fs.writeFileSync(path.resolve(folder, `${serviceName}.service.metadata.ts`), [
             "import { type Module, Entities } from '@alevnyacow/nzmt'",
             "import z from 'zod'",
             `import { ${lowerCase}StoreMetadata } from '${config?.paths?.stores?.replace('./src', '@')}/${entityName}'`,
@@ -350,7 +357,7 @@ function generateService(lowerCase, upperCase, withCrud) {
             `\t\tcreate: {`,
             `\t\t\tpayload: z.object({`,
             `\t\t\t\tpayload: ${lowerCase}StoreMetadata.actionsPayload.create`,
-            `\t\t\t},`,
+            `\t\t\t}),`,
             `\t\t\tresponse: z.object({`,
             `\t\t\t\tid: Entities.Identifier.schema`,
             `\t\t\t}),`,
@@ -367,7 +374,7 @@ function generateService(lowerCase, upperCase, withCrud) {
             `export type ${upperCase}sServiceDTOs = Module.DTOs<typeof ${lowerCase}sServiceMetadata>"`
         ].filter(x => typeof x === 'string').join('\n'))
     } else {
-        fs.writeFileSync(path.resolve(folder, `${entityName}.service.metadata.ts`), [
+        fs.writeFileSync(path.resolve(folder, `${serviceName}.service.metadata.ts`), [
             "import type { Module } from '@alevnyacow/nzmt'",
             "",
             `export const ${lowerCase}ServiceMetadata = {`,
@@ -381,22 +388,63 @@ function generateService(lowerCase, upperCase, withCrud) {
 
     // Service body
 
-    fs.writeFileSync(path.resolve(folder, `${entityName}.service.ts`), [
-        config?.dependencyInjection?.inversifyjs ? "import { injectable } from 'inversify'" : undefined,
-        `import { ${lowerCase}ServiceMetadata } from './${entityName}.service.metadata'`,
-        "import { Module } from '@alevnyacow/nzmt'",
-        "",
-        config?.dependencyInjection === 'inversifyjs' ? "@injectable()" : undefined,
-        `export class ${upperCase}Service {`,
-        `\tprivate methods = Module.methods(${lowerCase}ServiceMetadata)`,
-        "}"
-    ].filter(x => typeof x === 'string').join('\n'))
+    if (withCrud) {
+        fs.writeFileSync(path.resolve(folder, `${serviceName}.service.ts`), [
+            config?.dependencyInjection?.inversifyjs ? "import { injectable, inject } from 'inversify'" : undefined,
+            config?.dependencyInjection?.storeTokensPrefix ?? undefined,
+            `import type { ${upperCase}Store } from '${config?.paths?.stores?.replace('./src', '@')}/${entityName}'`,
+            `import { ${lowerCase}ServiceMetadata } from './${entityName}.service.metadata'`,
+            "import { Module } from '@alevnyacow/nzmt'",
+            config?.dependencyInjection === 'inversifyjs' ? "@injectable()" : undefined,
+            `export class ${upperCase}Service {`,
+            `\tconstructor(`,
+            config?.dependencyInjection?.storeTokensPrefix ? `\t\t@inject(${getImportName(config?.dependencyInjection?.storeTokensPrefix)}.${lowerCase}s)` : undefined,
+            `\t\tprivate readonly ${lowerCase}s: ${upperCase}Store))`,
+            '\t) { }',
+            '\t',
+            `\tprivate method = Module.methods(${lowerCase}ServiceMetadata)`,
+            '\t',
+            `\tcreate = this.method('create', this.${lowerCase}s.create);`,
+            '\t',
+            `\tgetSpecific = this.method('getSpecific', async (x) => {`,
+            `\t\tconst item = await this.${lowerCase}s.details(x);`,
+            `\t\treturn { item };`,
+            `\t})`,
+            `\t`,
+            `\tgetList = this.method('getList', async (x) => {`,
+            `\t\tconst items = await this.${lowerCase}s.list(x);`,
+            `\t\treturn { items };`,
+            `\t})`,
+            `\t`,
+            `\tupdateOne = this.method('updateOne', async (x) => {`,
+            `\t\tawait this.${lowerCase}s.updateOne(x);`,
+            `\t\treturn {};`,
+            `\t})`,
+            `\t`,
+            `\tdeleteOne = this.method('deleteOne', async (x) => {`,
+            `\t\tawait this.${lowerCase}s.deleteOne(x);`,
+            `\t\treturn {};`,
+            `\t})`,
+            "}"
+        ].filter(x => typeof x === 'string').join('\n'))
+    } else {
+        fs.writeFileSync(path.resolve(folder, `${serviceName}.service.ts`), [
+            config?.dependencyInjection?.inversifyjs ? "import { injectable } from 'inversify'" : undefined,
+            `import { ${lowerCase}ServiceMetadata } from './${entityName}.service.metadata'`,
+            "import { Module } from '@alevnyacow/nzmt'",
+            "",
+            config?.dependencyInjection === 'inversifyjs' ? "@injectable()" : undefined,
+            `export class ${upperCase}Service {`,
+            `\tprivate methods = Module.methods(${lowerCase}ServiceMetadata)`,
+            "}"
+        ].filter(x => typeof x === 'string').join('\n'))
+    }
 
     // Barrel
 
     fs.writeFileSync(path.resolve(folder, 'index.ts'), [
-        `export * from ${entityName}.service.metadata`,
-        `export * from ${entityName}.service`
+        `export * from ${serviceName}.service.metadata`,
+        `export * from ${serviceName}.service`
     ].join('\n'))
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alevnyacow/nzmt",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "Next Zod Modules Toolkit",
   "type": "module",
   "exports": {