@alevnyacow/nzmt 0.0.31 → 0.0.33

package/bin/cli.js

@@ -308,14 +308,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}.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}'`,
@@ -325,8 +327,8 @@ function generateService(lowerCase, upperCase, withCrud) {
             "\tschemas: {",
             "\t\tgetSpecific: {",
             `\t\t\tpayload: z.object({`,
-            `\t\t\tfilter: ${lowerCase}StoreMetadata.searchPayload.specific`,
-            `\t\t}),`,
+            `\t\t\t\tfilter: ${lowerCase}StoreMetadata.searchPayload.specific`,
+            `\t\t\t}),`,
             `\t\t\tresponse: z.object({`,
             `\t\t\t\titem: ${lowerCase}StoreMetadata.models.details.nullable()`,
             `\t\t\t})`,
@@ -335,7 +337,7 @@ function generateService(lowerCase, upperCase, withCrud) {
             `\t\t\tpayload: z.object({`,
             `\t\t\t\tfilter: ${lowerCase}StoreMetadata.searchPayload.list,`,
             `\t\t\t\tpagination: Entities.Pagination.schema.optional()`,
-            `\t\t\t})`,
+            `\t\t\t}),`,
             `\t\t\tresponse: z.object({`,
             `\t\t\t\titems: z.array(${lowerCase}StoreMetadata.models.list)`,
             `\t\t\t})`,
@@ -343,14 +345,14 @@ function generateService(lowerCase, upperCase, withCrud) {
             `\t\tupdateOne: {`,
             `\t\t\tpayload: z.object({`,
             `\t\t\t\tfilter: ${lowerCase}StoreMetadata.searchPayload.specific,`,
-            `\t\t\t\tpayload: userStoreMetadata.actionsPayload.update`,
+            `\t\t\t\tpayload: ${lowerCase}StoreMetadata.actionsPayload.update`,
             `\t\t\t}),`,
             `\t\t\tresponse: z.object({})`,
             `\t\t},`,
             `\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 +369,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,7 +383,7 @@ function generateService(lowerCase, upperCase, withCrud) {
 
     // Service body
 
-    fs.writeFileSync(path.resolve(folder, `${entityName}.service.ts`), [
+    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'",
@@ -395,8 +397,8 @@ function generateService(lowerCase, upperCase, withCrud) {
     // 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'))
 }
 
@@ -411,5 +413,5 @@ if (command === 'crud') {
     var [lowerCase, upperCase] = camelizeVariants(entityName)
     generateEntity(upperCase)
     generateStores(lowerCase, upperCase)
-    generateService(entityName + 's', lowerCase, upperCase, true)
+    generateService(lowerCase, upperCase, true)
 }

package/package.json

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