@alevnyacow/nzmt 0.10.1 → 0.11.0

package/bin/cli.js

@@ -388,7 +388,7 @@ function generateStores(lowerCase, upperCase, withEntityPreset) {
 
     fs.mkdirSync(folder, { recursive: true })
 
-    const withEntity = withEntityPreset || !(options ?? []).includes('dont-import-entity')
+    const withEntity = withEntityPreset || (options ?? []).includes('import-entity')
 
     // Contract
 
@@ -743,10 +743,10 @@ function toKebabFromPascal(str) {
     .toLowerCase()
 }
 
-function generateService(lowerCase, upperCase) {
+function generateService(lowerCase, upperCase, store) {
     const folder = config?.paths?.services ? path.resolve(process.cwd(), `${config.coreFolder}${config?.paths?.services}`, entityName) : path.resolve(process.cwd(), entityName);
 
-    const proxiedStore = options.find(x => x.startsWith('p:'))?.split(':')?.at(-1)
+    const proxiedStore = store || options.find(x => x.startsWith('p:'))?.split(':')?.at(-1)
     if (proxiedStore && !proxiedStore.endsWith('Store')) {
         throw 'Only stores can be proxied in services!'
     }
@@ -933,4 +933,18 @@ if (command.toLowerCase() === 'controller' || command === 'c') {
     var [lowerCase, upperCase] = camelizeVariants(entityName)
     generateController(upperCase, lowerCase)
     process.exit(0)
-}
+}
+
+if (command.toLowerCase() === 'stored-entity' || command === 'se') {
+    var [lowerCase, upperCase] = camelizeVariants(entityName)
+    generateEntity(upperCase)
+    generateStores(lowerCase, upperCase, true)
+    process.exit(0)
+}
+
+if (command.toLowerCase() === 'crud-service') {
+    var [lowerCase, upperCase] = camelizeVariants(entityName)
+    generateEntity(upperCase)
+    generateStores(lowerCase, upperCase, true)
+    generateService(lowerCase, upperCase, upperCase + 'Store')
+}

package/dist/zod-controller.utils.d.ts

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server';
-import z, { ZodType, type ZodObject } from 'zod';
+import z, { type ZodType, type ZodObject, type ZodUnion } from 'zod';
 import { type ControllerErrorModel, type ErrorBaseCreatingPayload } from './errors.utils';
 export declare enum DefaultErrorCodes {
     REQUEST_PARSING = "ZOD-CONTROLLER___REQUEST-PARSING",
@@ -7,8 +7,8 @@ export declare enum DefaultErrorCodes {
 }
 type SuccessResponse<ResponseZodSchema> = ResponseZodSchema extends undefined ? {} : z.infer<ResponseZodSchema>;
 type ZodAPISchemas = {
-    body?: ZodObject;
-    query?: ZodObject;
+    body?: ZodObject | ZodUnion<[ZodObject<any>, ...ZodObject<any>[]]>;
+    query?: ZodObject | ZodUnion<[ZodObject<any>, ...ZodObject<any>[]]>;
     response?: ZodType;
 };
 type ErrorResponse = {
@@ -26,7 +26,7 @@ export type OnErrorHandler = (request: {
     req: NextRequest;
 }) => Promise<void>;
 type EndpointLogic<T extends ZodAPISchemas> = {
-    handler: (payload: (T['query'] extends ZodObject ? z.infer<T['query']> : {}) & (T['body'] extends ZodObject ? z.infer<T['body']> : {}), request: {
+    handler: (payload: (T['query'] extends ZodType ? z.infer<T['query']> : {}) & (T['body'] extends ZodType ? z.infer<T['body']> : {}), request: {
         request: NextRequest;
         flags: Record<string, boolean>;
         endpointError: EndpointErrorGenerator;
@@ -34,9 +34,9 @@ type EndpointLogic<T extends ZodAPISchemas> = {
     guards?: Guard[];
     eventHandlers?: {
         onSuccess?: Array<(data: {
-            requestPayload: (T['query'] extends ZodObject ? z.infer<T['query']> : {}) & (T['body'] extends ZodObject ? z.infer<T['body']> : {});
+            requestPayload: (T['query'] extends ZodType ? z.infer<T['query']> : {}) & (T['body'] extends ZodType ? z.infer<T['body']> : {});
             request: NextRequest;
-            result: T['response'] extends ZodObject ? z.infer<T['response']> : undefined;
+            result: T['response'] extends ZodType ? z.infer<T['response']> : undefined;
             flags: Record<string, boolean>;
         }) => Promise<void>>;
         onError?: Array<OnErrorHandler>;

package/package.json

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