@alevnyacow/nzmt 0.0.34 → 0.0.36

package/bin/cli.js

@@ -108,7 +108,6 @@ function generateStores(lowerCase, upperCase) {
     // Contract
 
     fs.writeFileSync(path.resolve(folder, `${entityName}.store.ts`), [
-        "import z from 'zod'",
         "import type { Store } from '@alevnyacow/nzmt'",
         config?.paths?.entities ? `import { ${upperCase} } from '${config?.paths?.entities.replace('./src', '@')}/${entityName}'` : undefined,
         "",
@@ -367,11 +366,11 @@ function generateService(lowerCase, upperCase, withCrud) {
             `\t\t\t\tfilter: ${lowerCase}StoreMetadata.searchPayload.specific`,
             `\t\t\t}),`,
             `\t\t\tresponse: z.object({})`,
-            `\t\t}),`,
+            `\t\t},`,
             "\t}",
             "} satisfies Module.Metadata",
             "",
-            `export type ${upperCase}sServiceDTOs = Module.DTOs<typeof ${lowerCase}sServiceMetadata>"`
+            `export type ${upperCase}sServiceDTOs = Module.DTOs<typeof ${lowerCase}sServiceMetadata>`
         ].filter(x => typeof x === 'string').join('\n'))
     } else {
         fs.writeFileSync(path.resolve(folder, `${serviceName}.service.metadata.ts`), [
@@ -389,17 +388,18 @@ function generateService(lowerCase, upperCase, withCrud) {
     // Service body
 
     if (withCrud) {
+        const [upperCaseService, lowerCaseService] = camelizeVariants(serviceName) 
         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 { ${lowerCaseService}ServiceMetadata } from './${serviceName}.service.metadata'`,
             "import { Module } from '@alevnyacow/nzmt'",
-            config?.dependencyInjection === 'inversifyjs' ? "@injectable()" : undefined,
-            `export class ${upperCase}Service {`,
+            config?.dependencyInjection?.inversifyjs ? "@injectable()" : undefined,
+            `export class ${upperCaseService}Service {`,
             `\tconstructor(`,
-            config?.dependencyInjection?.storeTokensPrefix ? `\t\t@inject(${getImportName(config?.dependencyInjection?.storeTokensPrefix)}.${lowerCase}s)` : undefined,
-            `\t\tprivate readonly ${lowerCase}s: ${upperCase}Store))`,
+            config?.dependencyInjection?.inversifyjs?.storeTokensPrefix ? `\t\t@inject(${getImportName(config?.dependencyInjection?.inversifyjs?.storeTokensPrefix)}.${lowerCase}s)` : undefined,
+            `\t\tprivate readonly ${lowerCase}s: ${upperCase}Store`,
             '\t) { }',
             '\t',
             `\tprivate method = Module.methods(${lowerCase}ServiceMetadata)`,
@@ -443,8 +443,8 @@ function generateService(lowerCase, upperCase, withCrud) {
     // Barrel
 
     fs.writeFileSync(path.resolve(folder, 'index.ts'), [
-        `export * from ${serviceName}.service.metadata`,
-        `export * from ${serviceName}.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.34",
+  "version": "0.0.36",
   "description": "Next Zod Modules Toolkit",
   "type": "module",
   "exports": {