@uniformdev/canvas 20.49.3-alpha.9 → 20.49.4-alpha.102

package/dist/index.esm.js

@@ -380,7 +380,7 @@ var require_retry2 = __commonJS({
 });
 
 // src/CanvasClient.ts
-import { ApiClient } from "@uniformdev/context/api";
+import { ApiClient, rewriteFiltersForApi } from "@uniformdev/context/api";
 
 // src/enhancement/createLimitPolicy.ts
 var import_p_limit = __toESM(require_p_limit());
@@ -584,22 +584,6 @@ function createLimitPolicy({
 }
 var nullLimitPolicy = async (func) => await func();
 
-// src/utils/rewriteFilters.ts
-var isPlainObject = (obj) => typeof obj === "object" && obj !== null && !Array.isArray(obj);
-function rewriteFilters(filters) {
-  return Object.entries(filters != null ? filters : {}).reduce(
-    (acc, [key, value]) => {
-      const lhs = `filters.${key}` + (isPlainObject(value) ? `[${Object.keys(value)[0]}]` : "");
-      const rhs = isPlainObject(value) ? Object.values(value)[0] : value;
-      return {
-        ...acc,
-        [lhs]: Array.isArray(rhs) ? rhs.map((v) => `${v}`.trim()).join(",") : `${rhs}`.trim()
-      };
-    },
-    {}
-  );
-}
-
 // src/CanvasClient.ts
 var CANVAS_URL = "/api/v1/canvas";
 var CanvasClient = class extends ApiClient {
@@ -616,7 +600,7 @@ var CanvasClient = class extends ApiClient {
   async getCompositionList(params = {}) {
     const { projectId } = this.options;
     const { resolveData, filters, ...originParams } = params;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = rewriteFiltersForApi(filters);
     if (!resolveData) {
       const fetchUri = this.createUrl(CANVAS_URL, { ...originParams, projectId, ...rewrittenFilters });
       return this.apiClient(fetchUri);
@@ -770,7 +754,7 @@ var UncachedCategoryClient = class extends CategoryClient {
 };
 
 // src/ContentClient.ts
-import { ApiClient as ApiClient3 } from "@uniformdev/context/api";
+import { ApiClient as ApiClient3, rewriteFiltersForApi as rewriteFiltersForApi2 } from "@uniformdev/context/api";
 var _contentTypesUrl, _entriesUrl;
 var _ContentClient = class _ContentClient extends ApiClient3 {
   constructor(options) {
@@ -786,7 +770,7 @@ var _ContentClient = class _ContentClient extends ApiClient3 {
   getEntries(options) {
     const { projectId } = this.options;
     const { skipDataResolution, filters, ...params } = options;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = rewriteFiltersForApi2(filters);
     if (skipDataResolution) {
       const url = this.createUrl(__privateGet(_ContentClient, _entriesUrl), { ...params, ...rewrittenFilters, projectId });
       return this.apiClient(url);
@@ -2241,11 +2225,34 @@ var stringOperatorEvaluators = {
   endswith: endsWithEvaluator,
   empty: emptyEvaluator
 };
+var numericOperatorEvaluators = {
+  gt: (left, right) => left > right,
+  lt: (left, right) => left < right
+};
+function evaluateNumericOperator(criteria, matchValue) {
+  const { op, value } = criteria;
+  const evaluator = numericOperatorEvaluators[op];
+  if (!evaluator) {
+    return null;
+  }
+  if (typeof matchValue === "string" && matchValue.trim() === "" || typeof value === "string" && value.trim() === "") {
+    return false;
+  }
+  const leftNum = Number(matchValue);
+  const rightNum = Number(value);
+  if (isNaN(leftNum) || isNaN(rightNum)) {
+    return false;
+  }
+  return evaluator(leftNum, rightNum);
+}
 function evaluateStringMatch(criteria, matchValue, allow) {
   const { op, value } = criteria;
   if (allow && !allow.has(op)) {
     return null;
   }
+  if (op in numericOperatorEvaluators) {
+    return evaluateNumericOperator(criteria, matchValue);
+  }
   let opMatch = op;
   const negation = op.startsWith("!");
   if (negation) {
@@ -2294,17 +2301,49 @@ var dynamicTokenVisibilityOperators = /* @__PURE__ */ new Set([
   "endswith",
   "!endswith",
   "empty",
-  "!empty"
+  "!empty",
+  "gt",
+  "lt"
 ]);
 var CANVAS_VIZ_DYNAMIC_TOKEN_RULE = "$dt";
+function toStringValue(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return "";
+}
+function toStringCriteriaValue(value) {
+  if (Array.isArray(value)) {
+    return value.map((v) => toStringValue(v));
+  }
+  return toStringValue(value);
+}
+function isUnbound(value) {
+  if (value === void 0 || value === null) {
+    return true;
+  }
+  if (typeof value === "string") {
+    return hasReferencedVariables(value) > 0;
+  }
+  return false;
+}
 function createDynamicTokenVisibilityRule() {
   return {
     [CANVAS_VIZ_DYNAMIC_TOKEN_RULE]: (criterion) => {
-      var _a;
-      if (typeof criterion.source !== "string" || hasReferencedVariables(criterion.source)) {
+      const { source, value } = criterion;
+      if (isUnbound(source)) {
         return null;
       }
-      return evaluateStringMatch(criterion, (_a = criterion.source) != null ? _a : "", dynamicTokenVisibilityOperators);
+      const stringSource = toStringValue(source);
+      const stringValue = toStringCriteriaValue(value);
+      const stringCriterion = {
+        ...criterion,
+        value: stringValue
+      };
+      return evaluateStringMatch(stringCriterion, stringSource, dynamicTokenVisibilityOperators);
     }
   };
 }
@@ -3551,7 +3590,7 @@ function handleRichTextNodeBinding(object, options) {
 import { ApiClientError as ApiClientError2 } from "@uniformdev/context/api";
 
 // src/.version.ts
-var version = "20.49.2";
+var version = "20.50.0";
 
 // src/WorkflowClient.ts
 import { ApiClient as ApiClient16 } from "@uniformdev/context/api";

package/dist/index.js

@@ -762,22 +762,6 @@ function createLimitPolicy({
 }
 var nullLimitPolicy = async (func) => await func();
 
-// src/utils/rewriteFilters.ts
-var isPlainObject = (obj) => typeof obj === "object" && obj !== null && !Array.isArray(obj);
-function rewriteFilters(filters) {
-  return Object.entries(filters != null ? filters : {}).reduce(
-    (acc, [key, value]) => {
-      const lhs = `filters.${key}` + (isPlainObject(value) ? `[${Object.keys(value)[0]}]` : "");
-      const rhs = isPlainObject(value) ? Object.values(value)[0] : value;
-      return {
-        ...acc,
-        [lhs]: Array.isArray(rhs) ? rhs.map((v) => `${v}`.trim()).join(",") : `${rhs}`.trim()
-      };
-    },
-    {}
-  );
-}
-
 // src/CanvasClient.ts
 var CANVAS_URL = "/api/v1/canvas";
 var CanvasClient = class extends import_api2.ApiClient {
@@ -794,7 +778,7 @@ var CanvasClient = class extends import_api2.ApiClient {
   async getCompositionList(params = {}) {
     const { projectId } = this.options;
     const { resolveData, filters, ...originParams } = params;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = (0, import_api2.rewriteFiltersForApi)(filters);
     if (!resolveData) {
       const fetchUri = this.createUrl(CANVAS_URL, { ...originParams, projectId, ...rewrittenFilters });
       return this.apiClient(fetchUri);
@@ -964,7 +948,7 @@ var _ContentClient = class _ContentClient extends import_api4.ApiClient {
   getEntries(options) {
     const { projectId } = this.options;
     const { skipDataResolution, filters, ...params } = options;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = (0, import_api4.rewriteFiltersForApi)(filters);
     if (skipDataResolution) {
       const url = this.createUrl(__privateGet(_ContentClient, _entriesUrl), { ...params, ...rewrittenFilters, projectId });
       return this.apiClient(url);
@@ -2419,11 +2403,34 @@ var stringOperatorEvaluators = {
   endswith: endsWithEvaluator,
   empty: emptyEvaluator
 };
+var numericOperatorEvaluators = {
+  gt: (left, right) => left > right,
+  lt: (left, right) => left < right
+};
+function evaluateNumericOperator(criteria, matchValue) {
+  const { op, value } = criteria;
+  const evaluator = numericOperatorEvaluators[op];
+  if (!evaluator) {
+    return null;
+  }
+  if (typeof matchValue === "string" && matchValue.trim() === "" || typeof value === "string" && value.trim() === "") {
+    return false;
+  }
+  const leftNum = Number(matchValue);
+  const rightNum = Number(value);
+  if (isNaN(leftNum) || isNaN(rightNum)) {
+    return false;
+  }
+  return evaluator(leftNum, rightNum);
+}
 function evaluateStringMatch(criteria, matchValue, allow) {
   const { op, value } = criteria;
   if (allow && !allow.has(op)) {
     return null;
   }
+  if (op in numericOperatorEvaluators) {
+    return evaluateNumericOperator(criteria, matchValue);
+  }
   let opMatch = op;
   const negation = op.startsWith("!");
   if (negation) {
@@ -2472,17 +2479,49 @@ var dynamicTokenVisibilityOperators = /* @__PURE__ */ new Set([
   "endswith",
   "!endswith",
   "empty",
-  "!empty"
+  "!empty",
+  "gt",
+  "lt"
 ]);
 var CANVAS_VIZ_DYNAMIC_TOKEN_RULE = "$dt";
+function toStringValue(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return "";
+}
+function toStringCriteriaValue(value) {
+  if (Array.isArray(value)) {
+    return value.map((v) => toStringValue(v));
+  }
+  return toStringValue(value);
+}
+function isUnbound(value) {
+  if (value === void 0 || value === null) {
+    return true;
+  }
+  if (typeof value === "string") {
+    return hasReferencedVariables(value) > 0;
+  }
+  return false;
+}
 function createDynamicTokenVisibilityRule() {
   return {
     [CANVAS_VIZ_DYNAMIC_TOKEN_RULE]: (criterion) => {
-      var _a;
-      if (typeof criterion.source !== "string" || hasReferencedVariables(criterion.source)) {
+      const { source, value } = criterion;
+      if (isUnbound(source)) {
         return null;
       }
-      return evaluateStringMatch(criterion, (_a = criterion.source) != null ? _a : "", dynamicTokenVisibilityOperators);
+      const stringSource = toStringValue(source);
+      const stringValue = toStringCriteriaValue(value);
+      const stringCriterion = {
+        ...criterion,
+        value: stringValue
+      };
+      return evaluateStringMatch(stringCriterion, stringSource, dynamicTokenVisibilityOperators);
     }
   };
 }
@@ -3729,7 +3768,7 @@ function handleRichTextNodeBinding(object, options) {
 var import_api18 = require("@uniformdev/context/api");
 
 // src/.version.ts
-var version = "20.49.2";
+var version = "20.50.0";
 
 // src/WorkflowClient.ts
 var import_api17 = require("@uniformdev/context/api");

package/dist/index.mjs

@@ -380,7 +380,7 @@ var require_retry2 = __commonJS({
 });
 
 // src/CanvasClient.ts
-import { ApiClient } from "@uniformdev/context/api";
+import { ApiClient, rewriteFiltersForApi } from "@uniformdev/context/api";
 
 // src/enhancement/createLimitPolicy.ts
 var import_p_limit = __toESM(require_p_limit());
@@ -584,22 +584,6 @@ function createLimitPolicy({
 }
 var nullLimitPolicy = async (func) => await func();
 
-// src/utils/rewriteFilters.ts
-var isPlainObject = (obj) => typeof obj === "object" && obj !== null && !Array.isArray(obj);
-function rewriteFilters(filters) {
-  return Object.entries(filters != null ? filters : {}).reduce(
-    (acc, [key, value]) => {
-      const lhs = `filters.${key}` + (isPlainObject(value) ? `[${Object.keys(value)[0]}]` : "");
-      const rhs = isPlainObject(value) ? Object.values(value)[0] : value;
-      return {
-        ...acc,
-        [lhs]: Array.isArray(rhs) ? rhs.map((v) => `${v}`.trim()).join(",") : `${rhs}`.trim()
-      };
-    },
-    {}
-  );
-}
-
 // src/CanvasClient.ts
 var CANVAS_URL = "/api/v1/canvas";
 var CanvasClient = class extends ApiClient {
@@ -616,7 +600,7 @@ var CanvasClient = class extends ApiClient {
   async getCompositionList(params = {}) {
     const { projectId } = this.options;
     const { resolveData, filters, ...originParams } = params;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = rewriteFiltersForApi(filters);
     if (!resolveData) {
       const fetchUri = this.createUrl(CANVAS_URL, { ...originParams, projectId, ...rewrittenFilters });
       return this.apiClient(fetchUri);
@@ -770,7 +754,7 @@ var UncachedCategoryClient = class extends CategoryClient {
 };
 
 // src/ContentClient.ts
-import { ApiClient as ApiClient3 } from "@uniformdev/context/api";
+import { ApiClient as ApiClient3, rewriteFiltersForApi as rewriteFiltersForApi2 } from "@uniformdev/context/api";
 var _contentTypesUrl, _entriesUrl;
 var _ContentClient = class _ContentClient extends ApiClient3 {
   constructor(options) {
@@ -786,7 +770,7 @@ var _ContentClient = class _ContentClient extends ApiClient3 {
   getEntries(options) {
     const { projectId } = this.options;
     const { skipDataResolution, filters, ...params } = options;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = rewriteFiltersForApi2(filters);
     if (skipDataResolution) {
       const url = this.createUrl(__privateGet(_ContentClient, _entriesUrl), { ...params, ...rewrittenFilters, projectId });
       return this.apiClient(url);
@@ -2241,11 +2225,34 @@ var stringOperatorEvaluators = {
   endswith: endsWithEvaluator,
   empty: emptyEvaluator
 };
+var numericOperatorEvaluators = {
+  gt: (left, right) => left > right,
+  lt: (left, right) => left < right
+};
+function evaluateNumericOperator(criteria, matchValue) {
+  const { op, value } = criteria;
+  const evaluator = numericOperatorEvaluators[op];
+  if (!evaluator) {
+    return null;
+  }
+  if (typeof matchValue === "string" && matchValue.trim() === "" || typeof value === "string" && value.trim() === "") {
+    return false;
+  }
+  const leftNum = Number(matchValue);
+  const rightNum = Number(value);
+  if (isNaN(leftNum) || isNaN(rightNum)) {
+    return false;
+  }
+  return evaluator(leftNum, rightNum);
+}
 function evaluateStringMatch(criteria, matchValue, allow) {
   const { op, value } = criteria;
   if (allow && !allow.has(op)) {
     return null;
   }
+  if (op in numericOperatorEvaluators) {
+    return evaluateNumericOperator(criteria, matchValue);
+  }
   let opMatch = op;
   const negation = op.startsWith("!");
   if (negation) {
@@ -2294,17 +2301,49 @@ var dynamicTokenVisibilityOperators = /* @__PURE__ */ new Set([
   "endswith",
   "!endswith",
   "empty",
-  "!empty"
+  "!empty",
+  "gt",
+  "lt"
 ]);
 var CANVAS_VIZ_DYNAMIC_TOKEN_RULE = "$dt";
+function toStringValue(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return "";
+}
+function toStringCriteriaValue(value) {
+  if (Array.isArray(value)) {
+    return value.map((v) => toStringValue(v));
+  }
+  return toStringValue(value);
+}
+function isUnbound(value) {
+  if (value === void 0 || value === null) {
+    return true;
+  }
+  if (typeof value === "string") {
+    return hasReferencedVariables(value) > 0;
+  }
+  return false;
+}
 function createDynamicTokenVisibilityRule() {
   return {
     [CANVAS_VIZ_DYNAMIC_TOKEN_RULE]: (criterion) => {
-      var _a;
-      if (typeof criterion.source !== "string" || hasReferencedVariables(criterion.source)) {
+      const { source, value } = criterion;
+      if (isUnbound(source)) {
         return null;
       }
-      return evaluateStringMatch(criterion, (_a = criterion.source) != null ? _a : "", dynamicTokenVisibilityOperators);
+      const stringSource = toStringValue(source);
+      const stringValue = toStringCriteriaValue(value);
+      const stringCriterion = {
+        ...criterion,
+        value: stringValue
+      };
+      return evaluateStringMatch(stringCriterion, stringSource, dynamicTokenVisibilityOperators);
     }
   };
 }
@@ -3551,7 +3590,7 @@ function handleRichTextNodeBinding(object, options) {
 import { ApiClientError as ApiClientError2 } from "@uniformdev/context/api";
 
 // src/.version.ts
-var version = "20.49.2";
+var version = "20.50.0";
 
 // src/WorkflowClient.ts
 import { ApiClient as ApiClient16 } from "@uniformdev/context/api";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "20.49.3-alpha.9+e5b9a8ca05",
+  "version": "20.49.4-alpha.102+140d1a56b4",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -41,9 +41,9 @@
     "svix": "1.71.0"
   },
   "dependencies": {
-    "@uniformdev/assets": "20.49.3-alpha.9+e5b9a8ca05",
-    "@uniformdev/context": "20.49.3-alpha.9+e5b9a8ca05",
-    "@uniformdev/richtext": "20.49.3-alpha.9+e5b9a8ca05",
+    "@uniformdev/assets": "20.49.4-alpha.102+140d1a56b4",
+    "@uniformdev/context": "20.49.4-alpha.102+140d1a56b4",
+    "@uniformdev/richtext": "20.49.4-alpha.102+140d1a56b4",
     "immer": "10.1.3"
   },
   "files": [
@@ -52,5 +52,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e5b9a8ca05d0b8b26886079b687417e53d44f9cb"
+  "gitHead": "140d1a56b4b45021216a166bcaf7ebe629681b0b"
 }