@klerick/json-api-nestjs 10.0.0-beta.4 → 10.0.0-beta.6

package/src/lib/modules/mixin/zod/zod-input-query-schema/fields.js

@@ -4,26 +4,32 @@ exports.zodFieldsInputQuery = zodFieldsInputQuery;
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const zod_1 = require("zod");
 const zod_utils_1 = require("../zod-utils");
+const map_transform_to_json_shema_1 = require("../map-transform-to-json-shema");
 function getZodRules() {
     return zod_1.z
         .string()
         .optional()
-        .transform((input) => (input ? input.split(',') : undefined));
+        .transform(map_transform_to_json_shema_1.transformStringToArray);
 }
 function zodFieldsInputQuery(entityParamMapService) {
-    const target = zod_1.z.object({
-        target: getZodRules(),
-    });
-    const relation = entityParamMapService.entityParaMap.relations.reduce((acum, item) => ({
+    const { relations } = entityParamMapService.entityParaMap;
+    const relation = relations.reduce((acum, item) => ({
         ...acum,
         [item]: getZodRules(),
     }), {});
-    return target
-        .merge(zod_1.z.object(relation))
-        .strict((0, zod_utils_1.getValidationErrorForStrict)([
-        'target',
-        ...entityParamMapService.entityParaMap.relations,
-    ], 'Fields'))
+    return (zod_1.z
+        .strictObject({
+        target: getZodRules(),
+        ...relation,
+    }, {
+        error: (err) => err.code === 'unrecognized_keys'
+            ? (0, zod_utils_1.getValidationErrorForStrict)([
+                'target',
+                ...entityParamMapService.entityParaMap
+                    .relations,
+            ], 'Fields')
+            : err.message,
+    })
         .refine((0, zod_utils_1.nonEmptyObject)(), {
         message: 'Validation error: Need select field for target or relation',
     })
@@ -31,7 +37,8 @@ function zodFieldsInputQuery(entityParamMapService) {
         .transform((input) => {
         if (!input)
             return null;
-        const result = json_api_nestjs_shared_1.ObjectTyped.entries(input).reduce((acum, [key, value]) => {
+        const result = json_api_nestjs_shared_1.ObjectTyped.entries(input).reduce((acum, entries) => {
+            const [key, value] = entries;
             if (!value || value.length === 0)
                 return acum;
             return {
@@ -40,6 +47,6 @@ function zodFieldsInputQuery(entityParamMapService) {
             };
         }, {});
         return Object.keys(result).length > 0 ? result : null;
-    });
+    }));
 }
 //# sourceMappingURL=fields.js.map

package/src/lib/modules/mixin/zod/zod-input-query-schema/fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-query-schema/fields.ts"],"names":[],"mappings":";;AAgBA,kDA8CC;AA9DD,4EAA8D;AAC9D,6BAAwB;AAGxB,4CAA2E;AAG3E,SAAS,WAAW;IAClB,OAAO,OAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAClE,CAAC;AAID,SAAgB,mBAAmB,CACjC,qBAAsD;IAEtD,MAAM,MAAM,GAAG,OAAC,CAAC,MAAM,CAAC;QACtB,MAAM,EAAE,WAAW,EAAE;KACtB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CACnE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,WAAW,EAAE;KACrC,CAAC,EACF,EAEC,CACF,CAAC;IAEF,OAAO,MAAM;SACV,KAAK,CAAC,OAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACzB,MAAM,CACL,IAAA,uCAA2B,EACzB;QACE,QAAQ;QACR,GAAI,qBAAqB,CAAC,aAAa,CAAC,SAAsB;KAC/D,EACD,QAAQ,CACT,CACF;SACA,MAAM,CAAC,IAAA,0BAAc,GAAE,EAAE;QACxB,OAAO,EAAE,4DAA4D;KACtE,CAAC;SACD,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;QACnB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,MAAM,GAAG,oCAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACtE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAE9C,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,GAAG,CAAC,EAAE,KAAK;aACb,CAAC;QACJ,CAAC,EAAE,EAAkB,CAAC,CAAC;QAEvB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-query-schema/fields.ts"],"names":[],"mappings":";;AAmBA,kDA0DC;AA7ED,4EAA8D;AAC9D,6BAAwB;AAGxB,4CAA2E;AAE3E,gFAAwE;AAExE,SAAS,WAAW;IAClB,OAAO,OAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,SAAS,CAAC,oDAAsB,CAAC,CAAC;AACvC,CAAC;AAMD,SAAgB,mBAAmB,CACjC,qBAAsD;IAEtD,MAAM,EAAC,SAAS,EAAC,GAAG,qBAAqB,CAAC,aAAa,CAAC;IAExD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAC/B,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,WAAW,EAAE;KACrC,CAAC,EACF,EAA+B,CAChC,CAAC;IAEF,OAAO,CACL,OAAC;SACE,YAAY,CACX;QACE,MAAM,EAAE,WAAW,EAAE;QACrB,GAAG,QAAQ;KACZ,EACD;QACE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,GAAG,CAAC,IAAI,KAAK,mBAAmB;YAC9B,CAAC,CAAC,IAAA,uCAA2B,EAC3B;gBACE,QAAQ;gBACR,GAAI,qBAAqB,CAAC,aAAa;qBACpC,SAAsB;aAC1B,EACD,QAAQ,CACT;YACD,CAAC,CAAC,GAAG,CAAC,OAAO;KAClB,CACF;SACA,MAAM,CAAC,IAAA,0BAAc,GAAE,EAAE;QACxB,OAAO,EAAE,4DAA4D;KACtE,CAAC;SACD,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;QACnB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,MAAM,GAAG,oCAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAC9C,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAChB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,OAAiE,CAAC;YAEvF,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAE9C,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,GAAG,CAAC,EAAE,KAAK;aACb,CAAC;QACJ,CAAC,EACD,EAAkB,CACnB,CAAC;QAEF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,CAAC,CAAC,CACL,CAAC;AACJ,CAAC"}