@alevnyacow/nzmt 0.9.5 → 0.10.0

package/README.md

@@ -32,7 +32,7 @@ npx nzmt init prismaClientPath:@/app/generated/prisma/client
 
 4. Scaffold your first entity. Example for a `Product` with `title` and `price`:
 ```bash
-# Field syntax: f:<name>-<type>[.<zod-validators>]
+# Field syntax: f:<name>-<zod-rules>
 npx nzmt entity product f:title-string,price-int.positive
 ```
 This will generate the entity, its Zod schema and related types.
@@ -41,8 +41,8 @@ This will generate the entity, its Zod schema and related types.
 ```bash
 # product store (with Prisma implementation, RAM implementation and DI)
 npx nzmt store product
-# product service with injected product store (with DI)
-npx nzmt service product i:ProductStore
+# product service proxying all product store methods (with DI)
+npx nzmt service product p:ProductStore
 # shop controller with injected product service and logger (with DI)
 npx nzmt controller shop i:Logger,ProductService
 ```

package/bin/cli.js

@@ -393,7 +393,7 @@ function generateStores(lowerCase, upperCase, withEntityPreset) {
     // Contract
 
     fs.writeFileSync(path.resolve(folder, `${entityName}.store.ts`), [
-        "import type { Store } from '@alevnyacow/nzmt'",
+        "import { Store } from '@alevnyacow/nzmt'",
         withEntity ? `import { ${upperCase} } from '@${config?.paths?.entities}/${entityName}'` : undefined,
         "",
         `export const ${lowerCase}StoreMetadata = {`,
@@ -415,6 +415,8 @@ function generateStores(lowerCase, upperCase, withEntityPreset) {
         `\tname: '${upperCase}Store'`,
         "} satisfies Store.Metadata",
         "",
+        `export const { schemas: ${lowerCase}StoreSchemas } = Store.toModuleMetadata(${lowerCase}StoreMetadata)`,
+        "",
         `export type ${upperCase}Store = Store.Contract<typeof ${lowerCase}StoreMetadata>`
     ].filter(x => typeof x === 'string').join('\n'))
 
@@ -744,7 +746,15 @@ function toKebabFromPascal(str) {
 function generateService(lowerCase, upperCase) {
     const folder = config?.paths?.services ? path.resolve(process.cwd(), `${config.coreFolder}${config?.paths?.services}`, entityName) : path.resolve(process.cwd(), entityName);
 
-    const injections = options.filter(x => x.startsWith('i:')).flatMap(x => x.split(':')[1]).join(',').split(',').filter(x => !!x.length)
+    const proxiedStore = options.find(x => x.startsWith('p:'))?.split(':')?.at(-1)
+    if (proxiedStore && !proxiedStore.endsWith('Store')) {
+        throw 'Only stores can be proxied in services!'
+    }
+
+    let injections = options.filter(x => x.startsWith('i:')).flatMap(x => x.split(':')[1]).join(',').split(',').filter(x => !!x.length)
+    if (proxiedStore && !injections.includes(proxiedStore)) {
+        injections = injections.concat(proxiedStore)
+    }
 
     const importInjections = injections.map((i) => {
         if (i.endsWith('Service') || i.endsWith('Controller')) {
@@ -752,10 +762,10 @@ function generateService(lowerCase, upperCase) {
         }
 
         if (i.endsWith('Store')) {
-            return `import { ${i} } from '@${config?.paths?.stores}/${toKebabFromPascal(i).slice(0, -'-store'.length)}'`
+            return `import type { ${i} } from '@${config?.paths?.stores}/${toKebabFromPascal(i).slice(0, -'-store'.length)}'`
         }
 
-        return `import { ${i} } from '@${config?.paths?.infrastructure}/${toKebabFromPascal(i)}'`
+        return `import type { ${i} } from '@${config?.paths?.infrastructure}/${toKebabFromPascal(i)}'`
     })
 
     fs.mkdirSync(folder, { recursive: true })
@@ -764,10 +774,11 @@ function generateService(lowerCase, upperCase) {
 
     fs.writeFileSync(path.resolve(folder, `${entityName}.service.metadata.ts`), [
         "import type { Module } from '@alevnyacow/nzmt'",
+        proxiedStore ? `import { ${proxiedStore.substring(0, 1).toLowerCase() + proxiedStore.substring(1)}Schemas } from '@${config?.paths?.stores}/${toKebabFromPascal(proxiedStore).slice(0, -'-store'.length)}'` : undefined,
         "",
         `export const ${lowerCase}ServiceMetadata = {`,
         `\tname: '${upperCase}Service',`,
-        "\tschemas: {}",
+        proxiedStore ? `\tschemas: { ...${proxiedStore.substring(0, 1).toLowerCase() + proxiedStore.substring(1)}Schemas }` : "\tschemas: {}",
         "} satisfies Module.Metadata",
         "",
         `export type ${upperCase}ServiceDTOs = Module.DTOs<typeof ${lowerCase}ServiceMetadata>`
@@ -791,6 +802,11 @@ function generateService(lowerCase, upperCase) {
         ...injections.map(x => `\t\t@inject('${x}' satisfies DITokens) private readonly ${x.charAt(0).toLowerCase() + x.slice(1)}: ${x},`),
         `\t) {}`,
         ``,
+        proxiedStore ? `\tgetList = this.methods('list', this.${proxiedStore.charAt(0).toLowerCase() + proxiedStore.slice(1)}.list)` : undefined,
+        proxiedStore ? `\tgetDetails = this.methods('details', this.${proxiedStore.charAt(0).toLowerCase() + proxiedStore.slice(1)}.details)` : undefined,
+        proxiedStore ? `\tcreate = this.methods('create', this.${proxiedStore.charAt(0).toLowerCase() + proxiedStore.slice(1)}.create)` : undefined,
+        proxiedStore ? `\tupdate = this.methods('updateOne', this.${proxiedStore.charAt(0).toLowerCase() + proxiedStore.slice(1)}.updateOne)` : undefined,
+        proxiedStore ? `\tdelete = this.methods('deleteOne', this.${proxiedStore.charAt(0).toLowerCase() + proxiedStore.slice(1)}.deleteOne)` : undefined,
         "}"
     ].filter(x => typeof x === 'string').join('\n'))
     
@@ -836,14 +852,14 @@ function generateController(upperCase, lowerCase) {
         }
 
         if (i.endsWith('Store')) {
-            return `import { ${i} } from '@${config?.paths?.stores}/${toKebabFromPascal(i).slice(0, -'-store'.length)}'`
+            return `import type { ${i} } from '@${config?.paths?.stores}/${toKebabFromPascal(i).slice(0, -'-store'.length)}'`
         }
 
         if (i.endsWith('Service')) {
-            return `import { ${i} } from '@${config?.paths?.services}/${toKebabFromPascal(i).slice(0, -'-service'.length)}'`
+            return `import type { ${i} } from '@${config?.paths?.services}/${toKebabFromPascal(i).slice(0, -'-service'.length)}'`
         }
 
-        return `import { ${i} } from '@${config?.paths?.infrastructure}/${toKebabFromPascal(i)}'`
+        return `import type { ${i} } from '@${config?.paths?.infrastructure}/${toKebabFromPascal(i)}'`
     })
 
     fs.mkdirSync(folder, { recursive: true })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alevnyacow/nzmt",
-  "version": "0.9.5",
+  "version": "0.10.0",
   "description": "Next Zod Modules Toolkit",
   "repository": {
     "type": "git",