@klerick/json-api-nestjs 10.0.0-beta.1 → 10.0.0-beta.10

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

@@ -40,10 +40,11 @@ function getZodRulesForFilterOperator() {
         .strict()
         .partial()
         .refine((0, zod_utils_1.oneOf)(Object.values(json_api_nestjs_shared_1.FilterOperand)), {
-        message: `Must have one of: "${Object.values(json_api_nestjs_shared_1.FilterOperand).join('","')}"`,
+        error: `Must have one of: "${Object.values(json_api_nestjs_shared_1.FilterOperand).join('","')}"`,
     });
     return zod_1.z.union([filterConditional, conditional]).optional();
 }
+const zodRulesForFilterOperator = getZodRulesForFilterOperator();
 function getZodRulesForRelation() {
     return zod_1.z
         .union([
@@ -64,6 +65,7 @@ function getZodRulesForRelation() {
     ])
         .optional();
 }
+const zodRulesForRelation = getZodRulesForRelation();
 function getTupleConcatRelationFields(relationList) {
     const result = [];
     for (const [key, val] of json_api_nestjs_shared_1.ObjectTyped.entries(relationList)) {
@@ -81,13 +83,15 @@ function shapeForArray(fields, zodSchema) {
     }), {});
 }
 function zodFilterInputQuery(entityParamMapService) {
-    const target = zod_1.z.object(shapeForArray(entityParamMapService.entityParaMap.props, getZodRulesForFilterOperator()));
-    const relations = zod_1.z.object(shapeForArray(entityParamMapService.entityParaMap.relations, getZodRulesForRelation()));
+    const target = shapeForArray(entityParamMapService.entityParaMap.props, zodRulesForFilterOperator);
+    const relations = shapeForArray(entityParamMapService.entityParaMap.relations, zodRulesForRelation);
     const relationList = (0, zod_utils_1.getRelationProps)(entityParamMapService);
-    const relationFields = zod_1.z.object(shapeForArray(getTupleConcatRelationFields(relationList), getZodRulesForFilterOperator()));
-    return target
-        .merge(relations)
-        .merge(relationFields)
+    const relationFields = shapeForArray(getTupleConcatRelationFields(relationList), zodRulesForFilterOperator);
+    return zod_1.z.object({
+        ...target,
+        ...relations,
+        ...relationFields
+    })
         .optional()
         .transform((data) => {
         if (!data) {

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

@@ -1 +1 @@
-{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-query-schema/filter.ts"],"names":[],"mappings":";;AAmIA,sCAeC;AAED,kDAmEC;AAvND,4EAIyC;AACzC,6BAAiC;AAGjC,4CAAyE;AAgBzE,MAAM,OAAO,GAAG;IACd,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,IAAI;IACxB,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,IAAI;IACzB,CAAC,sCAAa,CAAC,IAAI,CAAC,EAAE,IAAI;CAC3B,CAAC;AAEF,SAAS,qBAAqB,CAC5B,KAAsC;IAItC,IAAI,IAAA,iCAAQ,EAA0C,KAAK,CAAC,EAAE,CAAC;QAC7D,OAAO;YACL,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,KAAK;SAC1B,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YACxD,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAA,iCAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1E,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;YACnB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAuC,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAED,SAAS,4BAA4B;IACnC,MAAM,iBAAiB,GAAG,OAAC;SACxB,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAA,4BAAgB,GAAE,CAAC,EAAE,OAAC,CAAC,IAAI,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SACpE,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAE5B,MAAM,WAAW,GAAG,OAAC;SAClB,MAAM,CACL,oCAAW,CAAC,MAAM,CAAC,sCAAa,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACtD,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAkE,CAAC,CACvE;SACA,MAAM,EAAE;SACR,OAAO,EAAE;SACT,MAAM,CAAC,IAAA,iBAAK,EAAC,MAAM,CAAC,MAAM,CAAC,sCAAa,CAAC,CAAC,EAAE;QAC3C,OAAO,EAAE,sBAAsB,MAAM,CAAC,MAAM,CAAC,sCAAa,CAAC,CAAC,IAAI,CAC9D,KAAK,CACN,GAAG;KACL,CAAC,CAAC;IAEL,OAAO,OAAC,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9D,CAAC;AAMD,SAAS,sBAAsB;IAC7B,OAAO,OAAC;SACL,KAAK,CAAC;QACL,OAAC;aACE,MAAM,CAAC;YACN,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,OAAC;iBAClB,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAC,CAAC,IAAI,EAAE,CAAC,CAAC;iBACpC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;SACzB,CAAC;aACD,MAAM,EAAE;QACX,OAAC;aACE,MAAM,CAAC;YACN,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,OAAC;iBAClB,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAC,CAAC,IAAI,EAAE,CAAC,CAAC;iBACpC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;SACzB,CAAC;aACD,MAAM,EAAE;KACZ,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC;AAcD,SAAS,4BAA4B,CACnC,YAA2C;IAE3C,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,oCAAW,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,OAAO,MAAuC,CAAC;AACjD,CAAC;AAOD,SAAgB,aAAa,CAK3B,MAAiB,EAAE,SAAY;IAC/B,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,SAAS;KACjC,CAAC,EACF,EAEC,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CACjC,qBAAsD;IAEtD,MAAM,MAAM,GAAG,OAAC,CAAC,MAAM,CACrB,aAAa,CAKX,qBAAqB,CAAC,aAAa,CAAC,KAAK,EAAE,4BAA4B,EAAE,CAAC,CAC7E,CAAC;IAEF,MAAM,SAAS,GAAG,OAAC,CAAC,MAAM,CACxB,aAAa,CAKX,qBAAqB,CAAC,aAAa,CAAC,SAAS,EAAE,sBAAsB,EAAE,CAAC,CAC3E,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC,qBAAqB,CAAC,CAAC;IAE7D,MAAM,cAAc,GAAG,OAAC,CAAC,MAAM,CAC7B,aAAa,CAMX,4BAA4B,CAAC,YAAY,CAAC,EAC1C,4BAA4B,EAAE,CAC/B,CACF,CAAC;IACF,OAAO,MAAM;SACV,KAAK,CAAC,SAAS,CAAC;SAChB,KAAK,CAAC,cAAc,CAAC;SACrB,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;QAClB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,IAAI;aACb,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAgB,EAAE,EAAE;YACtC,MAAM,aAAa,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC5B,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC7D,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC9D,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvD,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC;YACxC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAkB,CACjD,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/zod/zod-input-query-schema/filter.ts"],"names":[],"mappings":";;AAoIA,sCAaC;AAED,kDA4DC;AA/MD,4EAIyC;AACzC,6BAAiC;AAGjC,4CAAyE;AAgBzE,MAAM,OAAO,GAAG;IACd,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,IAAI;IACxB,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,IAAI;IACzB,CAAC,sCAAa,CAAC,IAAI,CAAC,EAAE,IAAI;CAC3B,CAAC;AAEF,SAAS,qBAAqB,CAC5B,KAAsC;IAItC,IAAI,IAAA,iCAAQ,EAA0C,KAAK,CAAC,EAAE,CAAC;QAC7D,OAAO;YACL,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,KAAK;SAC1B,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YACxD,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAA,iCAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1E,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;YACnB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAuC,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAED,SAAS,4BAA4B;IACnC,MAAM,iBAAiB,GAAG,OAAC;SACxB,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAA,4BAAgB,GAAE,CAAC,EAAE,OAAC,CAAC,IAAI,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SACpE,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAE5B,MAAM,WAAW,GAAG,OAAC;SAClB,MAAM,CACL,oCAAW,CAAC,MAAM,CAAC,sCAAa,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACtD,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAkE,CAAC,CACvE;SACA,MAAM,EAAE;SACR,OAAO,EAAE;SACT,MAAM,CAAC,IAAA,iBAAK,EAAC,MAAM,CAAC,MAAM,CAAC,sCAAa,CAAC,CAAC,EAAE;QAC3C,KAAK,EAAE,sBAAsB,MAAM,CAAC,MAAM,CAAC,sCAAa,CAAC,CAAC,IAAI,CAC5D,KAAK,CACN,GAAG;KACL,CAAC,CAAC;IAEL,OAAO,OAAC,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9D,CAAC;AACD,MAAM,yBAAyB,GAAG,4BAA4B,EAAE,CAAC;AAKjE,SAAS,sBAAsB;IAC7B,OAAO,OAAC;SACL,KAAK,CAAC;QACL,OAAC;aACE,MAAM,CAAC;YACN,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,OAAC;iBAClB,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAC,CAAC,IAAI,EAAE,CAAC,CAAC;iBACpC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;SACzB,CAAC;aACD,MAAM,EAAE;QACX,OAAC;aACE,MAAM,CAAC;YACN,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,OAAC;iBAClB,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAC,CAAC,IAAI,EAAE,CAAC,CAAC;iBACpC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;SACzB,CAAC;aACD,MAAM,EAAE;KACZ,CAAC;SACD,QAAQ,EAAE,CAAC;AAChB,CAAC;AACD,MAAM,mBAAmB,GAAG,sBAAsB,EAAE,CAAC;AAcrD,SAAS,4BAA4B,CACnC,YAA2C;IAE3C,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,oCAAW,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,OAAO,MAAuC,CAAC;AACjD,CAAC;AAOD,SAAgB,aAAa,CAK3B,MAAiB,EAAE,SAAY;IAC/B,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,CAAC,IAAmB,CAAC,EAAE,SAAS;KACjC,CAAC,EACF,EAAmD,CACpD,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CACjC,qBAAsD;IAEtD,MAAM,MAAM,GAAG,aAAa,CAK1B,qBAAqB,CAAC,aAAa,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;IAExE,MAAM,SAAS,GAAG,aAAa,CAK7B,qBAAqB,CAAC,aAAa,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAEtE,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC,qBAAqB,CAAC,CAAC;IAE7D,MAAM,cAAc,GAAG,aAAa,CAKlC,4BAA4B,CAAC,YAAY,CAAC,EAAE,yBAAyB,CAAC,CAAC;IACzE,OAAO,OAAC,CAAC,MAAM,CAAC;QACd,GAAG,MAAM;QACT,GAAG,SAAS;QACZ,GAAG,cAAc;KAClB,CAAC;SACC,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;QAClB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,IAAI;aACb,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAgB,EAAE,EAAE;YACtC,MAAM,aAAa,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC5B,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC7D,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC9D,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvD,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC;YACxC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAkB,CACjD,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC"}

package/src/lib/modules/mixin/zod/zod-input-query-schema/include.d.ts

@@ -1,3 +1,3 @@
 import { z } from 'zod';
-export declare function zodIncludeInputQuery(): z.ZodEffects<z.ZodOptional<z.ZodString>, string[] | null, string | undefined>;
+export declare function zodIncludeInputQuery(): z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string[] | null, string | undefined>>;
 export type ZodIncludeInputQuery = z.infer<ReturnType<typeof zodIncludeInputQuery>>;