@jxsuite/parser 4.1.2 → 4.2.0

package/dist/content.js

@@ -332,8 +332,65 @@ function parseComparable(a, b) {
 function includesValue(items, value) {
   return items.includes(value);
 }
+function fieldValue(entry, field) {
+  if (field === "id") {
+    return entry.id;
+  }
+  if (!field.includes(".") || Object.hasOwn(entry.data, field)) {
+    return entry.data[field];
+  }
+  let found = [entry.data];
+  let crossed = false;
+  for (const key of field.split(".")) {
+    const next = [];
+    for (const value of found) {
+      const items = Array.isArray(value) ? value : [value];
+      crossed ||= Array.isArray(value);
+      for (const item of items) {
+        if (isNonNullObject(item) && !Array.isArray(item) && Object.hasOwn(item, key)) {
+          next.push(item[key]);
+        }
+      }
+    }
+    found = next;
+  }
+  if (!crossed) {
+    return found[0];
+  }
+  return found.flatMap((value) => Array.isArray(value) ? value : [value]);
+}
+function resolveRuleValue(value, document) {
+  if (!isRef(value)) {
+    return value;
+  }
+  const ref = value.$ref;
+  if (ref.startsWith("#/$params/")) {
+    return document?.route?._pathParams?.[ref.slice("#/$params/".length)];
+  }
+  if (!ref.startsWith("#/state/")) {
+    return value;
+  }
+  let current = document?.state;
+  for (const token of ref.slice("#/state/".length).split("/")) {
+    const key = token.replaceAll("~1", "/").replaceAll("~0", "~");
+    if (Array.isArray(current) && /^(0|[1-9]\d*)$/.test(key)) {
+      current = current[Number(key)];
+    } else if (isJsonObject(current) && Object.hasOwn(current, key)) {
+      current = current[key];
+    } else {
+      return;
+    }
+  }
+  return current;
+}
+function filterRules(filter) {
+  if (Array.isArray(filter)) {
+    return filter;
+  }
+  return Object.entries(filter).map(([field, value]) => ({ field, op: "==", value }));
+}
 function evaluateFilterRule(rule, entry) {
-  const actual = rule.field === "id" ? entry.id : entry.data[rule.field];
+  const actual = fieldValue(entry, rule.field);
   switch (rule.op) {
     case "==": {
       return actual === rule.value;
@@ -357,6 +414,9 @@ function evaluateFilterRule(rule, entry) {
       if (Array.isArray(actual)) {
         return !includesValue(actual, rule.value);
       }
+      if (actual == null) {
+        return true;
+      }
       return isString(actual) && !actual.includes(String(rule.value ?? ""));
     }
     case ">": {
@@ -383,26 +443,15 @@ function evaluateFilterRule(rule, entry) {
 function queryContentType(entries, query = {}) {
   let result = [...entries];
   if (query.filter) {
-    let rules;
-    if (Array.isArray(query.filter)) {
-      rules = query.filter;
-    } else if (isNonNullObject(query.filter)) {
-      rules = Object.entries(query.filter).map(([field, value]) => ({
-        field,
-        op: "==",
-        value
-      }));
-    } else {
-      rules = [];
-    }
+    const rules = isNonNullObject(query.filter) ? filterRules(query.filter) : [];
     result = result.filter((entry) => rules.every((rule) => evaluateFilterRule(rule, entry)));
   }
   if (query.sort) {
     const sortRules = Array.isArray(query.sort) ? query.sort : [query.sort];
     result.sort((a, b) => {
       for (const { field, order = "asc" } of sortRules) {
-        const aVal = field === "id" ? a.id : a.data[field] ?? "";
-        const bVal = field === "id" ? b.id : b.data[field] ?? "";
+        const aVal = fieldValue(a, field) ?? "";
+        const bVal = fieldValue(b, field) ?? "";
         if (aVal < bVal) {
           return order === "asc" ? -1 : 1;
         }
@@ -429,14 +478,21 @@ class ContentCollection {
     this.config = config;
   }
   async resolve() {
-    const { contentType, filter, sort, limit, _project } = this.config;
-    const entries = await entriesOf(_project?.content, contentType ?? "");
-    if (!entries) {
+    const { contentType, filter, sort, limit, _project, _document } = this.config;
+    const entries = [];
+    for (const type of Array.isArray(contentType) ? contentType : [contentType ?? ""]) {
+      entries.push(...await entriesOf(_project?.content, type) ?? []);
+    }
+    if (entries.length === 0) {
       return [];
     }
     const query = {};
-    if (filter != null) {
-      query.filter = filter;
+    if (isNonNullObject(filter)) {
+      query.filter = filterRules(filter).map((rule) => ({
+        field: rule.field,
+        op: rule.op,
+        value: resolveRuleValue(rule.value, _document)
+      }));
     }
     if (sort != null) {
       query.sort = sort;
@@ -505,6 +561,8 @@ export {
   ContentCollection,
   ContentEntry,
   evaluateFilterRule,
+  fieldValue,
   findEntry,
-  queryContentType
+  queryContentType,
+  resolveRuleValue
 };