@jskit-ai/resource-crud-core 0.1.187 → 0.1.188

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/resource-crud-core",
-  "version": "0.1.187",
+  "version": "0.1.188",
   "type": "module",
   "scripts": {
     "test": "node --test --test-concurrency=1"
@@ -13,7 +13,7 @@
     "./shared/crudResource": "./src/shared/crudResource.js"
   },
   "dependencies": {
-    "@jskit-ai/resource-core": "0.1.187"
+    "@jskit-ai/resource-core": "0.1.188"
   },
   "description": "Shared CRUD resource, field, lookup, filter, and namespace contracts.",
   "jskit": {
@@ -34,6 +34,6 @@
     }
   },
   "peerDependencies": {
-    "@jskit-ai/kernel": "0.1.245"
+    "@jskit-ai/kernel": "0.1.246"
   }
 }

package/src/shared/crudFieldContract.js

@@ -1,4 +1,4 @@
-import { normalizeSchemaDefinition } from "@jskit-ai/kernel/shared/validators";
+import { normalizeSingleSchemaDefinition } from "@jskit-ai/kernel/shared/validators";
 import {
   normalizeObject,
   normalizeText
@@ -71,7 +71,7 @@ function resolveCrudFieldSchemaProperties(value, { context = "crud resource fiel
     return {};
   }
 
-  const normalized = normalizeSchemaDefinition(value, {
+  const normalized = normalizeSingleSchemaDefinition(value, {
     context,
     defaultMode: "patch"
   });

package/src/shared/crudListFilters.js

@@ -424,6 +424,19 @@ function normalizeCrudListNumberRangeQueryValue(value) {
   };
 }
 
+function parseCrudListFilterMultiQueryValue(value, normalizeEntry, { invalidValues }) {
+  const normalizedEntries = (Array.isArray(value) ? value : [value]).map(normalizeEntry);
+  const acceptedValues = Array.from(new Set(normalizedEntries.filter(Boolean)));
+
+  if (invalidValues === CRUD_LIST_FILTER_INVALID_VALUES_DISCARD) {
+    return acceptedValues.length > 0 ? acceptedValues : null;
+  }
+
+  return acceptedValues.length > 0 && normalizedEntries.every(Boolean)
+    ? acceptedValues
+    : INVALID_CRUD_LIST_FILTER_QUERY_VALUE;
+}
+
 function parseCrudListFilterQueryValue(
   filter = {},
   value,
@@ -468,16 +481,11 @@ function parseCrudListFilterQueryValue(
   }
 
   if (type === CRUD_LIST_FILTER_TYPE_ENUM_MANY) {
-    const values = Array.isArray(value) ? value : [value];
-    const normalizedValues = normalizeAllowedFilterTextValues(value, allowedValues);
-
-    if (invalidValues === CRUD_LIST_FILTER_INVALID_VALUES_DISCARD) {
-      return normalizedValues.length > 0 ? normalizedValues : null;
-    }
-
-    return normalizedValues.length > 0 && normalizedValues.length === values.length
-      ? normalizedValues
-      : INVALID_CRUD_LIST_FILTER_QUERY_VALUE;
+    return parseCrudListFilterMultiQueryValue(
+      value,
+      (entry) => normalizeAllowedFilterTextValue(entry, allowedValues),
+      { invalidValues }
+    );
   }
 
   if (type === CRUD_LIST_FILTER_TYPE_RECORD_ID) {
@@ -487,16 +495,11 @@ function parseCrudListFilterQueryValue(
   }
 
   if (type === CRUD_LIST_FILTER_TYPE_RECORD_ID_MANY) {
-    const values = Array.isArray(value) ? value : [value];
-    const normalizedValues = normalizeCanonicalRecordIdList(value);
-
-    if (invalidValues === CRUD_LIST_FILTER_INVALID_VALUES_DISCARD) {
-      return normalizedValues.length > 0 ? normalizedValues : null;
-    }
-
-    return normalizedValues.length > 0 && normalizedValues.length === values.length
-      ? normalizedValues
-      : INVALID_CRUD_LIST_FILTER_QUERY_VALUE;
+    return parseCrudListFilterMultiQueryValue(
+      value,
+      (entry) => normalizeCanonicalRecordIdText(entry, { fallback: "" }),
+      { invalidValues }
+    );
   }
 
   if (type === CRUD_LIST_FILTER_TYPE_DATE) {

package/src/shared/crudResource.js

@@ -3,7 +3,7 @@ import {
   createCursorListValidator,
   RECORD_ID_PATTERN
 } from "@jskit-ai/kernel/shared/validators";
-import { buildCrudOperationSchemaFields } from "@jskit-ai/resource-crud-core/shared/crudFieldContract";
+import { buildCrudOperationSchemaFields } from "./crudFieldContract.js";
 import { deepFreeze } from "@jskit-ai/kernel/shared/support/deepFreeze";
 import { normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import {
@@ -76,7 +76,9 @@ function createCrudRecordIdFieldDefinition() {
   };
 }
 
-function resolveCrudLookupContainerKey(resource = {}) {
+// Only an explicitly configured container key adds a lookup field to the derived output;
+// unlike crudLookup.js resolveCrudLookupContainerKey, the default "lookups" key is not applied.
+function resolveConfiguredLookupContainerKey(resource = {}) {
   return normalizeText(resource?.contract?.lookup?.containerKey);
 }
 
@@ -96,7 +98,7 @@ function createDerivedCrudRecordOutputDefinition(resource = {}) {
     id: createCrudRecordIdFieldDefinition(),
     ...outputFields
   };
-  const lookupContainerKey = resolveCrudLookupContainerKey(resource);
+  const lookupContainerKey = resolveConfiguredLookupContainerKey(resource);
 
   if (lookupContainerKey) {
     fields[lookupContainerKey] = {
@@ -110,7 +112,7 @@ function createDerivedCrudRecordOutputDefinition(resource = {}) {
   });
 }
 
-function createDerivedCrudBodyDefinition(resource = {}, operationName = "patch") {
+function createDerivedCrudBodyDefinition(resource = {}, operationName = "patch", bodyMode = "patch") {
   let fields = resolveFieldEntries(resource, operationName);
 
   if (operationName === "replace" && Object.keys(fields).length === 0) {
@@ -126,13 +128,7 @@ function createDerivedCrudBodyDefinition(resource = {}, operationName = "patch")
     );
   }
 
-  const defaultMode = operationName === "create"
-    ? "create"
-    : operationName === "replace"
-      ? "replace"
-      : "patch";
-
-  return createSchemaDefinition(createSchema(fields), defaultMode, {
+  return createSchemaDefinition(createSchema(fields), bodyMode, {
     context: `defineCrudResource derived ${operationName} body`
   });
 }
@@ -169,8 +165,7 @@ function requireCrudOperationSpec(operationName = "") {
 }
 
 function resolveCrudOperationNames(resource = {}) {
-  const hasConfiguredOperations = Array.isArray(resource?.crudOperations);
-  const configuredOperations = hasConfiguredOperations
+  const configuredOperations = Array.isArray(resource?.crudOperations)
     ? resource.crudOperations
     : DEFAULT_CRUD_OPERATION_NAMES;
   const names = [];
@@ -187,11 +182,7 @@ function resolveCrudOperationNames(resource = {}) {
     names.push(operationName);
   }
 
-  if (hasConfiguredOperations) {
-    return names;
-  }
-
-  return names.length > 0 ? names : [...DEFAULT_CRUD_OPERATION_NAMES];
+  return names;
 }
 
 function resolveFirstPresentValue(source = {}, keys = []) {
@@ -271,7 +262,7 @@ function resolveCrudBodyDefinition(spec, resource = {}, crudConfig = {}) {
     return explicitBody;
   }
 
-  return createDerivedCrudBodyDefinition(resource, spec.bodyOperation);
+  return createDerivedCrudBodyDefinition(resource, spec.bodyOperation, spec.bodyMode);
 }
 
 function resolveCrudOutputDefinition(spec, resolveRecordOutputDefinition, crudConfig = {}) {

package/test/crudListFilters.test.js

@@ -215,6 +215,35 @@ test("crud list range helpers parse and format single-key range expressions", ()
   );
 });
 
+test("multi-value filters accept repeated valid values in reject mode and return them once", () => {
+  const filters = defineCrudListFilters({
+    status: {
+      type: "enumMany",
+      label: "Status",
+      options: [
+        { value: "active", label: "Active" },
+        { value: "archived", label: "Archived" }
+      ]
+    },
+    supplierContactId: {
+      type: "recordIdMany",
+      label: "Supplier"
+    }
+  });
+  const reject = { invalidValues: CRUD_LIST_FILTER_INVALID_VALUES_REJECT };
+
+  assert.deepEqual(parseCrudListFilterQueryValue(filters.status, ["active", "active"], reject), ["active"]);
+  assert.deepEqual(parseCrudListFilterQueryValue(filters.supplierContactId, ["5", "5", 7], reject), ["5", "7"]);
+  assert.equal(
+    parseCrudListFilterQueryValue(filters.status, ["active", "active", "unexpected"], reject),
+    INVALID_CRUD_LIST_FILTER_QUERY_VALUE
+  );
+  assert.equal(
+    parseCrudListFilterQueryValue(filters.supplierContactId, ["5", "", "5"], reject),
+    INVALID_CRUD_LIST_FILTER_QUERY_VALUE
+  );
+});
+
 test("crud list filter helpers share canonical UI and query normalization", () => {
   const filters = defineCrudListFilters({
     status: {