@strapi/utils 5.0.0-beta.6 → 5.0.0-beta.7

package/dist/content-types.d.ts

@@ -28,6 +28,13 @@ declare const getOptions: (model: Model) => {
 });
 declare const hasDraftAndPublish: (model: Model) => boolean;
 declare const isDraft: <T extends object>(data: T, model: Model) => boolean;
+declare const isSchema: (data: unknown) => data is Model;
+declare const isComponentSchema: (data: unknown) => data is Model & {
+    modelType: 'component';
+};
+declare const isContentTypeSchema: (data: unknown) => data is Model & {
+    modelType: 'contentType';
+};
 declare const isSingleType: ({ kind }: {
     kind?: string | undefined;
 }) => boolean;
@@ -37,12 +44,13 @@ declare const isCollectionType: ({ kind }: {
 declare const isKind: (kind: Kind) => (model: Model) => boolean;
 declare const getPrivateAttributes: (model: Model) => string[];
 declare const isPrivateAttribute: (model: Model, attributeName: string) => boolean;
-declare const isScalarAttribute: (attribute: Attribute) => boolean;
-declare const isMediaAttribute: (attribute: Attribute) => boolean;
-declare const isRelationalAttribute: (attribute: Attribute) => attribute is RelationalAttribute;
+declare const isScalarAttribute: (attribute?: Attribute) => boolean | undefined;
+declare const isMediaAttribute: (attribute?: Attribute) => boolean;
+declare const isRelationalAttribute: (attribute?: Attribute) => attribute is RelationalAttribute;
+declare const hasRelationReordering: (attribute?: Attribute) => boolean;
 declare const isComponentAttribute: (attribute: Attribute) => attribute is ComponentAttribute | DynamicZoneAttribute;
-declare const isDynamicZoneAttribute: (attribute: Attribute) => attribute is DynamicZoneAttribute;
-declare const isMorphToRelationalAttribute: (attribute: Attribute) => boolean;
+declare const isDynamicZoneAttribute: (attribute?: Attribute) => attribute is DynamicZoneAttribute;
+declare const isMorphToRelationalAttribute: (attribute?: Attribute) => boolean;
 declare const getComponentAttributes: (schema: Model) => string[];
 declare const getScalarAttributes: (schema: Model) => string[];
 declare const getRelationalAttributes: (schema: Model) => string[];
@@ -58,5 +66,5 @@ declare const isTypedAttribute: (attribute: Attribute, type: string) => boolean;
  * @returns {string}
  */
 declare const getContentTypeRoutePrefix: (contentType: WithRequired<Model, 'info'>) => string;
-export { isScalarAttribute, isMediaAttribute, isRelationalAttribute, isComponentAttribute, isDynamicZoneAttribute, isMorphToRelationalAttribute, isTypedAttribute, getPrivateAttributes, isPrivateAttribute, constants, getNonWritableAttributes, getComponentAttributes, getScalarAttributes, getRelationalAttributes, getWritableAttributes, isWritableAttribute, getNonVisibleAttributes, getVisibleAttributes, getTimestamps, getCreatorFields, isVisibleAttribute, getOptions, isDraft, hasDraftAndPublish, isSingleType, isCollectionType, isKind, getContentTypeRoutePrefix, };
+export { isSchema, isContentTypeSchema, isComponentSchema, isScalarAttribute, isMediaAttribute, isRelationalAttribute, hasRelationReordering, isComponentAttribute, isDynamicZoneAttribute, isMorphToRelationalAttribute, isTypedAttribute, getPrivateAttributes, isPrivateAttribute, constants, getNonWritableAttributes, getComponentAttributes, getScalarAttributes, getRelationalAttributes, getWritableAttributes, isWritableAttribute, getNonVisibleAttributes, getVisibleAttributes, getTimestamps, getCreatorFields, isVisibleAttribute, getOptions, isDraft, hasDraftAndPublish, isSingleType, isCollectionType, isKind, getContentTypeRoutePrefix, };
 //# sourceMappingURL=content-types.d.ts.map

package/dist/content-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-types.d.ts","sourceRoot":"","sources":["../src/content-types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,KAAK,EACL,IAAI,EACJ,SAAS,EACT,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACb,MAAM,SAAS,CAAC;AAejB,QAAA,MAAM,SAAS;;;;;;;;;;CAUd,CAAC;AAEF,QAAA,MAAM,aAAa,UAAW,KAAK,aAYlC,CAAC;AAEF,QAAA,MAAM,gBAAgB,UAAW,KAAK,aAYrC,CAAC;AAEF,QAAA,MAAM,wBAAwB,UAAW,KAAK,aAe7C,CAAC;AAEF,QAAA,MAAM,qBAAqB,UAAW,KAAK,aAI1C,CAAC;AAEF,QAAA,MAAM,mBAAmB,UAAW,KAAK,iBAAiB,MAAM,YAE/D,CAAC;AAEF,QAAA,MAAM,uBAAuB,UAAW,KAAK,aAQ5C,CAAC;AAEF,QAAA,MAAM,oBAAoB,UAAW,KAAK,aAEzC,CAAC;AAEF,QAAA,MAAM,kBAAkB,UAAW,KAAK,iBAAiB,MAAM,YAE9D,CAAC;AAEF,QAAA,MAAM,UAAU,UAAW,KAAK;;;;;;;EACmC,CAAC;AAEpE,QAAA,MAAM,kBAAkB,UAAW,KAAK,YACiB,CAAC;AAE1D,QAAA,MAAM,OAAO,2BAA4B,CAAC,SAAS,KAAK,YACmB,CAAC;AAE5E,QAAA,MAAM,YAAY;;aAAuD,CAAC;AAC1E,QAAA,MAAM,gBAAgB;;aAA2D,CAAC;AAClF,QAAA,MAAM,MAAM,SAAU,IAAI,aAAa,KAAK,YAAwB,CAAC;AAQrE,QAAA,MAAM,oBAAoB,UAAW,KAAK,aAKzC,CAAC;AAEF,QAAA,MAAM,kBAAkB,UAAW,KAAK,iBAAiB,MAAM,YAK9D,CAAC;AAEF,QAAA,MAAM,iBAAiB,cAAe,SAAS,YAE9C,CAAC;AACF,QAAA,MAAM,gBAAgB,cAAe,SAAS,YAAgC,CAAC;AAC/E,QAAA,MAAM,qBAAqB,cAAe,SAAS,qCACnB,CAAC;AAEjC,QAAA,MAAM,oBAAoB,cACb,SAAS,2DAEkC,CAAC;AAEzD,QAAA,MAAM,sBAAsB,cAAe,SAAS,sCACjB,CAAC;AACpC,QAAA,MAAM,4BAA4B,cAAe,SAAS,YAEzD,CAAC;AAEF,QAAA,MAAM,sBAAsB,WAAY,KAAK,aAS5C,CAAC;AAEF,QAAA,MAAM,mBAAmB,WAAY,KAAK,aASzC,CAAC;AAEF,QAAA,MAAM,uBAAuB,WAAY,KAAK,aAS7C,CAAC;AAEF;;;;GAIG;AACH,QAAA,MAAM,gBAAgB,cAAe,SAAS,QAAQ,MAAM,YAE3D,CAAC;AAEF;;;;GAIG;AACH,QAAA,MAAM,yBAAyB,gBAAiB,aAAa,KAAK,EAAE,MAAM,CAAC,WAI1E,CAAC;AAEF,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,4BAA4B,EAC5B,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,wBAAwB,EACxB,sBAAsB,EACtB,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,EACpB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACV,OAAO,EACP,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,MAAM,EACN,yBAAyB,GAC1B,CAAC"}
+{"version":3,"file":"content-types.d.ts","sourceRoot":"","sources":["../src/content-types.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -310,6 +310,15 @@ const isVisibleAttribute = (model, attributeName) => {
 const getOptions = (model) => ___namespace.default.assign({ draftAndPublish: false }, ___namespace.default.get(model, "options", {}));
 const hasDraftAndPublish = (model) => ___namespace.default.get(model, "options.draftAndPublish", false) === true;
 const isDraft = (data, model) => hasDraftAndPublish(model) && ___namespace.default.get(data, PUBLISHED_AT_ATTRIBUTE$1) === null;
+const isSchema = (data) => {
+  return typeof data === "object" && data !== null && "modelType" in data && typeof data.modelType === "string" && ["component", "contentType"].includes(data.modelType);
+};
+const isComponentSchema = (data) => {
+  return isSchema(data) && data.modelType === "component";
+};
+const isContentTypeSchema = (data) => {
+  return isSchema(data) && data.modelType === "contentType";
+};
 const isSingleType = ({ kind = COLLECTION_TYPE }) => kind === SINGLE_TYPE;
 const isCollectionType = ({ kind = COLLECTION_TYPE }) => kind === COLLECTION_TYPE;
 const isKind = (kind) => (model) => model.kind === kind;
@@ -330,14 +339,16 @@ const isPrivateAttribute = (model, attributeName) => {
   return getStoredPrivateAttributes(model).includes(attributeName);
 };
 const isScalarAttribute = (attribute) => {
-  return !["media", "component", "relation", "dynamiczone"].includes(attribute?.type);
+  return attribute && !["media", "component", "relation", "dynamiczone"].includes(attribute.type);
 };
 const isMediaAttribute = (attribute) => attribute?.type === "media";
 const isRelationalAttribute = (attribute) => attribute?.type === "relation";
+const HAS_RELATION_REORDERING = ["manyToMany", "manyToOne", "oneToMany"];
+const hasRelationReordering = (attribute) => isRelationalAttribute(attribute) && HAS_RELATION_REORDERING.includes(attribute.relation);
 const isComponentAttribute = (attribute) => ["component", "dynamiczone"].includes(attribute?.type);
-const isDynamicZoneAttribute = (attribute) => attribute?.type === "dynamiczone";
+const isDynamicZoneAttribute = (attribute) => !!attribute && attribute.type === "dynamiczone";
 const isMorphToRelationalAttribute = (attribute) => {
-  return isRelationalAttribute(attribute) && attribute?.relation?.startsWith?.("morphTo");
+  return !!attribute && isRelationalAttribute(attribute) && attribute.relation?.startsWith?.("morphTo");
 };
 const getComponentAttributes = (schema) => {
   return ___namespace.default.reduce(
@@ -394,8 +405,11 @@ const contentTypes = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   getVisibleAttributes,
   getWritableAttributes,
   hasDraftAndPublish,
+  hasRelationReordering,
   isCollectionType,
   isComponentAttribute,
+  isComponentSchema,
+  isContentTypeSchema,
   isDraft,
   isDynamicZoneAttribute,
   isKind,
@@ -404,6 +418,7 @@ const contentTypes = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   isPrivateAttribute,
   isRelationalAttribute,
   isScalarAttribute,
+  isSchema,
   isSingleType,
   isTypedAttribute,
   isVisibleAttribute,
@@ -558,28 +573,29 @@ const providerFactory = (options = {}) => {
 };
 const traverseEntity = async (visitor2, options, entity) => {
   const { path = { raw: null, attribute: null }, schema, getModel } = options;
+  let parent = options.parent;
   const traverseMorphRelationTarget = async (visitor22, path2, entry) => {
     const targetSchema = getModel(entry.__type);
-    const traverseOptions = { schema: targetSchema, path: path2, getModel };
+    const traverseOptions = { schema: targetSchema, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const traverseRelationTarget = (schema2) => async (visitor22, path2, entry) => {
-    const traverseOptions = { schema: schema2, path: path2, getModel };
+    const traverseOptions = { schema: schema2, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const traverseMediaTarget = async (visitor22, path2, entry) => {
     const targetSchemaUID = "plugin::upload.file";
     const targetSchema = getModel(targetSchemaUID);
-    const traverseOptions = { schema: targetSchema, path: path2, getModel };
+    const traverseOptions = { schema: targetSchema, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const traverseComponent = async (visitor22, path2, schema2, entry) => {
-    const traverseOptions = { schema: schema2, path: path2, getModel };
+    const traverseOptions = { schema: schema2, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const visitDynamicZoneEntry = async (visitor22, path2, entry) => {
     const targetSchema = getModel(entry.__component);
-    const traverseOptions = { schema: targetSchema, path: path2, getModel };
+    const traverseOptions = { schema: targetSchema, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   if (!fp.isObject(entity) || fp.isNil(schema)) {
@@ -591,9 +607,6 @@ const traverseEntity = async (visitor2, options, entity) => {
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
     const attribute = schema.attributes[key];
-    if (fp.isNil(attribute)) {
-      continue;
-    }
     const newPath = { ...path };
     newPath.raw = fp.isNil(path.raw) ? key : `${path.raw}.${key}`;
     if (!fp.isNil(attribute)) {
@@ -606,13 +619,15 @@ const traverseEntity = async (visitor2, options, entity) => {
       value: copy[key],
       attribute,
       path: newPath,
-      getModel
+      getModel,
+      parent
     };
     await visitor2(visitorOptions, visitorUtils);
     const value = copy[key];
-    if (fp.isNil(value)) {
+    if (fp.isNil(value) || fp.isNil(attribute)) {
       continue;
     }
+    parent = { schema, key, attribute, path: newPath };
     if (isRelationalAttribute(attribute)) {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
       const method = isMorphRelation ? traverseMorphRelationTarget : traverseRelationTarget(getModel(attribute.target));
@@ -2180,13 +2195,16 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   sanitizers,
   visitors: index$4
 }, Symbol.toStringTag, { value: "Module" }));
-const throwInvalidParam = ({ key, path }) => {
-  const msg = path && path !== key ? `Invalid parameter ${key} at ${path}` : `Invalid parameter ${key}`;
-  throw new ValidationError(msg);
+const throwInvalidKey = ({ key, path }) => {
+  const msg = path && path !== key ? `Invalid key ${key} at ${path}` : `Invalid key ${key}`;
+  throw new ValidationError(msg, {
+    key,
+    path
+  });
 };
 const visitor$3 = ({ key, attribute, path }) => {
   if (attribute?.type === "password") {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const visitor$2 = ({ schema, key, attribute, path }) => {
@@ -2195,7 +2213,7 @@ const visitor$2 = ({ schema, key, attribute, path }) => {
   }
   const isPrivate = attribute.private === true || isPrivateAttribute(schema, key);
   if (isPrivate) {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const ACTIONS_TO_VERIFY = ["find"];
@@ -2213,7 +2231,7 @@ const throwRestrictedRelations = (auth) => async ({ data, key, attribute, schema
       const scopes = ACTIONS_TO_VERIFY.map((action) => `${element.__type}.${action}`);
       const isAllowed = await hasAccessToSomeScopes(scopes, auth);
       if (!isAllowed) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }
   };
@@ -2221,7 +2239,7 @@ const throwRestrictedRelations = (auth) => async ({ data, key, attribute, schema
     const scopes = ACTIONS_TO_VERIFY.map((action) => `${attribute.target}.${action}`);
     const isAllowed = await hasAccessToSomeScopes(scopes, auth);
     if (!isAllowed) {
-      throwInvalidParam({ key, path: path.attribute });
+      throwInvalidKey({ key, path: path.attribute });
     }
   };
   const isCreatorRelation = [CREATED_BY_ATTRIBUTE, UPDATED_BY_ATTRIBUTE].includes(key);
@@ -2247,12 +2265,12 @@ const hasAccessToSomeScopes = async (scopes, auth) => {
 };
 const visitor$1 = ({ key, attribute, path }) => {
   if (isMorphToRelationalAttribute(attribute)) {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const visitor = ({ key, attribute, path }) => {
   if (isDynamicZoneAttribute(attribute)) {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const throwDisallowedFields = (allowedFields = null) => ({ key, path: { attribute: path } }) => {
@@ -2274,7 +2292,7 @@ const throwDisallowedFields = (allowedFields = null) => ({ key, path: { attribut
   if (isPathAllowed) {
     return;
   }
-  throwInvalidParam({ key, path });
+  throwInvalidKey({ key, path });
 };
 const getContainedPaths = (path) => {
   const parts = fp.toPath(path);
@@ -2284,7 +2302,7 @@ const getContainedPaths = (path) => {
 };
 const throwRestrictedFields = (restrictedFields = null) => ({ key, path: { attribute: path } }) => {
   if (restrictedFields === null) {
-    throwInvalidParam({ key, path });
+    throwInvalidKey({ key, path });
   }
   if (!(fp.isArray(restrictedFields) && restrictedFields.every(fp.isString))) {
     throw new TypeError(
@@ -2292,15 +2310,45 @@ const throwRestrictedFields = (restrictedFields = null) => ({ key, path: { attri
     );
   }
   if (restrictedFields.includes(path)) {
-    throwInvalidParam({ key, path });
+    throwInvalidKey({ key, path });
   }
   const isRestrictedNested = restrictedFields.some(
     (allowedPath) => path?.toString().startsWith(`${allowedPath}.`)
   );
   if (isRestrictedNested) {
-    throwInvalidParam({ key, path });
+    throwInvalidKey({ key, path });
   }
 };
+const ID_FIELDS = [constants$1.DOC_ID_ATTRIBUTE, constants$1.DOC_ID_ATTRIBUTE];
+const ALLOWED_ROOT_LEVEL_FIELDS = [...ID_FIELDS];
+const MORPH_TO_ALLOWED_FIELDS = ["__type"];
+const DYNAMIC_ZONE_ALLOWED_FIELDS = ["__component"];
+const RELATION_REORDERING_FIELDS = ["connect", "disconnect", "set", "options"];
+const throwUnrecognizedFields = ({ key, attribute, path, schema, parent }) => {
+  if (attribute) {
+    return;
+  }
+  if (path.attribute === null) {
+    if (ALLOWED_ROOT_LEVEL_FIELDS.includes(key)) {
+      return;
+    }
+    return throwInvalidKey({ key, path: attribute });
+  }
+  if (isMorphToRelationalAttribute(parent?.attribute) && MORPH_TO_ALLOWED_FIELDS.includes(key)) {
+    return;
+  }
+  if (isComponentSchema(schema) && isDynamicZoneAttribute(parent?.attribute) && DYNAMIC_ZONE_ALLOWED_FIELDS.includes(key)) {
+    return;
+  }
+  if (hasRelationReordering(parent?.attribute) && RELATION_REORDERING_FIELDS.includes(key)) {
+    return;
+  }
+  const canUseID = isRelationalAttribute(parent?.attribute) || isMediaAttribute(parent?.attribute);
+  if (canUseID && !ID_FIELDS.includes(key)) {
+    return;
+  }
+  throwInvalidKey({ key, path: attribute });
+};
 const index$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   throwDisallowedFields,
@@ -2309,7 +2357,8 @@ const index$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   throwPassword: visitor$3,
   throwPrivate: visitor$2,
   throwRestrictedFields,
-  throwRestrictedRelations
+  throwRestrictedRelations,
+  throwUnrecognizedFields
 }, Symbol.toStringTag, { value: "Module" }));
 const { ID_ATTRIBUTE: ID_ATTRIBUTE$1, DOC_ID_ATTRIBUTE: DOC_ID_ATTRIBUTE$1 } = constants$1;
 const throwPasswords = (ctx) => async (entity) => {
@@ -2330,7 +2379,7 @@ const defaultValidateFilters = fp.curry((ctx, filters2) => {
       }
       const isAttribute = !!attribute;
       if (!isAttribute && !isOperator(key)) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx),
     // dynamic zones from filters
@@ -2355,7 +2404,7 @@ const defaultValidateSort = fp.curry((ctx, sort2) => {
         return;
       }
       if (!attribute) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx),
     // dynamic zones from sort
@@ -2372,7 +2421,7 @@ const defaultValidateSort = fp.curry((ctx, sort2) => {
         return;
       }
       if (!isScalarAttribute(attribute) && fp.isEmpty(value)) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx)
   )(sort2);
@@ -2388,7 +2437,7 @@ const defaultValidateFields = fp.curry((ctx, fields2) => {
         return;
       }
       if (fp.isNil(attribute) || !isScalarAttribute(attribute)) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx),
     // private fields
@@ -2483,15 +2532,18 @@ const createAPIValidators = (opts) => {
       (data2) => {
         if (fp.isObject(data2)) {
           if (ID_ATTRIBUTE in data2) {
-            throwInvalidParam({ key: ID_ATTRIBUTE });
+            throwInvalidKey({ key: ID_ATTRIBUTE });
           }
           if (DOC_ID_ATTRIBUTE in data2) {
-            throwInvalidParam({ key: DOC_ID_ATTRIBUTE });
+            throwInvalidKey({ key: DOC_ID_ATTRIBUTE });
           }
         }
+        return data2;
       },
       // non-writable attributes
-      traverseEntity$1(throwRestrictedFields(nonWritableAttributes), { schema, getModel })
+      traverseEntity$1(throwRestrictedFields(nonWritableAttributes), { schema, getModel }),
+      // unrecognized attributes
+      traverseEntity$1(throwUnrecognizedFields, { schema, getModel })
     ];
     if (auth) {
       transforms.push(
@@ -2502,7 +2554,14 @@ const createAPIValidators = (opts) => {
       );
     }
     opts?.validators?.input?.forEach((validator) => transforms.push(validator(schema)));
-    await pipe(...transforms)(data);
+    try {
+      await pipe(...transforms)(data);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "body";
+      }
+      throw e;
+    }
   };
   const validateQuery = async (query, schema, { auth } = {}) => {
     if (!schema) {
@@ -2539,7 +2598,15 @@ const createAPIValidators = (opts) => {
         })
       );
     }
-    await pipe(...transforms)(filters2);
+    try {
+      await pipe(...transforms)(filters2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "filters";
+      }
+      throw e;
+    }
   };
   const validateSort = async (sort2, schema, { auth } = {}) => {
     if (!schema) {
@@ -2554,14 +2621,30 @@ const createAPIValidators = (opts) => {
         })
       );
     }
-    await pipe(...transforms)(sort2);
+    try {
+      await pipe(...transforms)(sort2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "sort";
+      }
+      throw e;
+    }
   };
   const validateFields = async (fields2, schema) => {
     if (!schema) {
       throw new Error("Missing schema in validateFields");
     }
     const transforms = [defaultValidateFields({ schema, getModel })];
-    await pipe(...transforms)(fields2);
+    try {
+      await pipe(...transforms)(fields2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "fields";
+      }
+      throw e;
+    }
   };
   const validatePopulate = async (populate2, schema, { auth } = {}) => {
     if (!schema) {
@@ -2576,7 +2659,15 @@ const createAPIValidators = (opts) => {
         })
       );
     }
-    await pipe(...transforms)(populate2);
+    try {
+      await pipe(...transforms)(populate2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "populate";
+      }
+      throw e;
+    }
   };
   return {
     input: validateInput,
@@ -2660,8 +2751,57 @@ const withDefaultPagination = (args, { defaults = {}, maxLimit = -1 } = {}) => {
   );
   return replacePaginationAttributes(args);
 };
+const transformPagedPaginationInfo = (paginationInfo, total) => {
+  if (!fp.isNil(paginationInfo.page)) {
+    const page = paginationInfo.page;
+    const pageSize = paginationInfo.pageSize ?? total;
+    return {
+      page,
+      pageSize,
+      pageCount: pageSize > 0 ? Math.ceil(total / pageSize) : 0,
+      total
+    };
+  }
+  if (!fp.isNil(paginationInfo.start)) {
+    const start = paginationInfo.start;
+    const limit = paginationInfo.limit ?? total;
+    return {
+      page: Math.floor(start / limit) + 1,
+      pageSize: limit,
+      pageCount: limit > 0 ? Math.ceil(total / limit) : 0,
+      total
+    };
+  }
+  return {
+    ...paginationInfo,
+    page: 1,
+    pageSize: 10,
+    pageCount: 1,
+    total
+  };
+};
+const transformOffsetPaginationInfo = (paginationInfo, total) => {
+  if (!fp.isNil(paginationInfo.page)) {
+    const limit = paginationInfo.pageSize ?? total;
+    const start = (paginationInfo.page - 1) * limit;
+    return { start, limit, total };
+  }
+  if (!fp.isNil(paginationInfo.start)) {
+    const start = paginationInfo.start;
+    const limit = paginationInfo.limit ?? total;
+    return { start, limit, total };
+  }
+  return {
+    ...paginationInfo,
+    start: 0,
+    limit: 10,
+    total
+  };
+};
 const pagination = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
+  transformOffsetPaginationInfo,
+  transformPagedPaginationInfo,
   withDefaultPagination
 }, Symbol.toStringTag, { value: "Module" }));
 const SUPPORTED_PACKAGE_MANAGERS = ["npm", "yarn"];