@jskit-ai/crud-core 0.1.145 → 0.1.146

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/crud-core",
-  version: "0.1.145",
+  version: "0.1.146",
   kind: "runtime",
   description: "Shared CRUD helpers used by CRUD modules.",
   dependsOn: [
@@ -28,7 +28,7 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/crud-core": "0.1.145"
+        "@jskit-ai/crud-core": "0.1.146"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/crud-core",
-  "version": "0.1.145",
+  "version": "0.1.146",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -34,7 +34,7 @@
     "@jskit-ai/realtime": "0.1.133",
     "@jskit-ai/resource-crud-core": "0.1.79",
     "@jskit-ai/shell-web": "0.1.137",
-    "@jskit-ai/users-core": "0.1.148",
+    "@jskit-ai/users-core": "0.1.149",
     "@jskit-ai/users-web": "0.1.153"
   },
   "peerDependencies": {

package/src/server/listQueryValidators.js

@@ -105,11 +105,47 @@ function createCrudParentFilterQueryValidator(resource = {}) {
   });
 }
 
+function createStandardCrudListQueryValidators({
+  resource = {},
+  listFilterQueryValidator = null,
+  searchQueryValidator = listSearchQueryValidator,
+  includeQueryValidator = lookupIncludeQueryValidator
+} = {}) {
+  const resolvedListFilterQueryValidator =
+    listFilterQueryValidator
+    ?? resource?.contract?.listFilters?.queryValidator
+    ?? null;
+
+  return [
+    createCrudCursorPaginationQueryValidator({
+      orderBy: resource?.defaultSort
+    }),
+    searchQueryValidator,
+    createCrudParentFilterQueryValidator(resource),
+    ...(resolvedListFilterQueryValidator
+      ? [resolvedListFilterQueryValidator]
+      : []),
+    includeQueryValidator,
+    jsonApiFieldsetsQueryValidator
+  ];
+}
+
+function createStandardCrudViewQueryValidators({
+  includeQueryValidator = lookupIncludeQueryValidator
+} = {}) {
+  return [
+    includeQueryValidator,
+    jsonApiFieldsetsQueryValidator
+  ];
+}
+
 export {
   createCrudCursorPaginationQueryValidator,
   listSearchQueryValidator,
   lookupIncludeQueryValidator,
   jsonApiFieldsetsQueryValidator,
   resolveCrudParentFilterKeys,
-  createCrudParentFilterQueryValidator
+  createCrudParentFilterQueryValidator,
+  createStandardCrudListQueryValidators,
+  createStandardCrudViewQueryValidators
 };

package/src/server/routeContracts.js

@@ -8,11 +8,10 @@ import {
 } from "@jskit-ai/kernel/shared/validators";
 import { resolveCrudResourceScopeName } from "@jskit-ai/kernel/shared/support/crudLookup";
 import {
-  createCrudCursorPaginationQueryValidator,
+  createStandardCrudListQueryValidators,
+  createStandardCrudViewQueryValidators,
   listSearchQueryValidator as defaultListSearchQueryValidator,
-  lookupIncludeQueryValidator as defaultLookupIncludeQueryValidator,
-  jsonApiFieldsetsQueryValidator,
-  createCrudParentFilterQueryValidator
+  lookupIncludeQueryValidator as defaultLookupIncludeQueryValidator
 } from "./listQueryValidators.js";
 
 function isRecord(value) {
@@ -445,23 +444,19 @@ function createCrudJsonApiRouteContracts({
   lookupIncludeQueryValidator = defaultLookupIncludeQueryValidator,
   listFilterQueryValidator = null
 } = {}) {
-  const listCursorPaginationQueryValidator = createCrudCursorPaginationQueryValidator({
-    orderBy: resource?.defaultSort
-  });
-  const listParentFilterQueryValidator = createCrudParentFilterQueryValidator(resource);
-  const resolvedListFilterQueryValidator = listFilterQueryValidator || resource?.contract?.listFilters?.queryValidator || null;
-  const listRouteQueryValidator = composeSchemaDefinitions([
-    listCursorPaginationQueryValidator,
-    listSearchQueryValidator,
-    listParentFilterQueryValidator,
-    ...(resolvedListFilterQueryValidator ? [resolvedListFilterQueryValidator] : []),
-    lookupIncludeQueryValidator,
-    jsonApiFieldsetsQueryValidator
-  ]);
-  const viewRouteQueryValidator = composeSchemaDefinitions([
-    lookupIncludeQueryValidator,
-    jsonApiFieldsetsQueryValidator
-  ]);
+  const listRouteQueryValidator = composeSchemaDefinitions(
+    createStandardCrudListQueryValidators({
+      resource,
+      listFilterQueryValidator,
+      searchQueryValidator: listSearchQueryValidator,
+      includeQueryValidator: lookupIncludeQueryValidator
+    })
+  );
+  const viewRouteQueryValidator = composeSchemaDefinitions(
+    createStandardCrudViewQueryValidators({
+      includeQueryValidator: lookupIncludeQueryValidator
+    })
+  );
   const recordRouteParamsValidator = routeParamsValidator
     ? composeSchemaDefinitions([
         routeParamsValidator,

package/test/listQueryValidators.test.js

@@ -11,6 +11,8 @@ import {
   lookupIncludeQueryValidator,
   createCrudCursorPaginationQueryValidator,
   createCrudParentFilterQueryValidator,
+  createStandardCrudListQueryValidators,
+  createStandardCrudViewQueryValidators,
   resolveCrudParentFilterKeys
 } from "../src/server/listQueryValidators.js";
 
@@ -254,3 +256,49 @@ test("createCrudParentFilterQueryValidator keeps parent filters optional when me
   });
   assert.deepEqual(compiled.schema.querystring.required || [], []);
 });
+
+test("standard CRUD query validator groups remain plain and extensible", () => {
+  const listFilterQueryValidator = {
+    schema: createSchema({
+      currentness: {
+        type: "string",
+        required: false
+      }
+    }),
+    mode: "patch"
+  };
+  const resource = {
+    ...createCrudResource(),
+    defaultSort: ["-createdAt"],
+    contract: {
+      listFilters: {
+        queryValidator: listFilterQueryValidator
+      }
+    }
+  };
+
+  const listQueryValidator = composeSchemaDefinition(
+    ...createStandardCrudListQueryValidators({ resource }),
+    {
+      schema: createSchema({
+        archived: {
+          type: "boolean",
+          required: false
+        }
+      }),
+      mode: "patch"
+    }
+  );
+  assert.deepEqual(
+    Object.keys(listQueryValidator.schema.getFieldDefinitions()).sort(),
+    ["archived", "currentness", "cursor", "fields", "include", "limit", "q"]
+  );
+
+  const viewQueryValidator = composeSchemaDefinition(
+    ...createStandardCrudViewQueryValidators()
+  );
+  assert.deepEqual(
+    Object.keys(viewQueryValidator.schema.getFieldDefinitions()).sort(),
+    ["fields", "include"]
+  );
+});