@uniformdev/canvas 20.1.1-alpha.2 → 20.3.1-alpha.0

package/dist/index.mjs

@@ -805,6 +805,9 @@ var _ContentClient = class _ContentClient extends ApiClient3 {
   }
   async upsertContentType(body, opts = {}) {
     const fetchUri = this.createUrl(__privateGet(_ContentClient, _contentTypesUrl));
+    if (typeof body.contentType.slugSettings === "object" && body.contentType.slugSettings !== null && Object.keys(body.contentType.slugSettings).length === 0) {
+      delete body.contentType.slugSettings;
+    }
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -1855,6 +1858,101 @@ function findParameterInNodeTree(data, predicate) {
   return results;
 }
 
+// src/utils/variables/convertToBindExpression.ts
+var bindExpressionPrefix = "#";
+var bindExpressionEscapeChars = /* @__PURE__ */ new Set(["#", "\\", "[", "]", ":"]);
+function convertToBindExpression(binding) {
+  if (binding.syntax === "jptr") {
+    const expressionComponents = [
+      `${bindExpressionPrefix}${binding.syntax}:${escapeNestedVariableExpressions(
+        escapeBindExpressionReservedChars(binding.pointer)
+      )}`
+    ];
+    if (binding.failureAction && binding.failureAction !== "t") {
+      expressionComponents.push(`fa=${binding.failureAction}`);
+    }
+    if (binding.failureLogLevel && binding.failureLogLevel !== "w") {
+      expressionComponents.push(`fl=${binding.failureLogLevel}`);
+    }
+    if (binding.failureDefault) {
+      expressionComponents.push(`fd=${escapeBindExpressionDefaultValue(binding.failureDefault)}`);
+    }
+    return expressionComponents.join(":");
+  }
+  throw new Error(`Unsupported dynamic token binding syntax '${binding.syntax}'`);
+}
+function escapeNestedVariableExpressions(pointer) {
+  return pointer.replace(/\$\{([^}]+)\}/g, "$[$1]");
+}
+function escapeBindExpressionReservedChars(pointer) {
+  return pointer.split("").map((c) => bindExpressionEscapeChars.has(c) ? `\\${c === ":" ? ";" : c}` : c).join("");
+}
+function escapeBindExpressionDefaultValue(defaultValue) {
+  return escapeBindExpressionReservedChars(defaultValue).replace("=", "\\+");
+}
+
+// src/utils/variables/createVariableReference.ts
+function createVariableReference(variableName) {
+  return `\${${variableName.replace(/([${}])/g, "\\$1")}}`;
+}
+
+// src/enhancement/getEffectivePropertyValue.ts
+function getEffectivePropertyValue({
+  property,
+  conditionIndex,
+  locale,
+  strict,
+  greedyLocaleMatching
+}) {
+  var _a, _b, _c, _d;
+  if (!property) {
+    return void 0;
+  }
+  let effectiveValue = property.value;
+  if (conditionIndex >= 0) {
+    const conditionalValue = (_b = (_a = property.conditions) == null ? void 0 : _a[conditionIndex]) == null ? void 0 : _b.value;
+    if (conditionalValue === null) {
+      return void 0;
+    }
+    if (conditionalValue !== void 0 || strict) {
+      effectiveValue = conditionalValue;
+    }
+  }
+  if (locale) {
+    const localeValue = getLocaleMatch(property.locales, locale, greedyLocaleMatching);
+    if (localeValue !== void 0 || strict) {
+      effectiveValue = localeValue;
+    }
+    if (conditionIndex >= 0) {
+      const localeConditionalValue = (_d = (_c = getLocaleMatch(
+        property.localesConditions,
+        locale,
+        greedyLocaleMatching
+      )) == null ? void 0 : _c[conditionIndex]) == null ? void 0 : _d.value;
+      if (localeConditionalValue === null) {
+        return void 0;
+      }
+      if (localeConditionalValue !== void 0 || strict) {
+        effectiveValue = localeConditionalValue;
+      }
+    }
+  }
+  if (property.connectedData) {
+    effectiveValue = createVariableReference(convertToBindExpression(property.connectedData));
+  }
+  return effectiveValue;
+}
+function getLocaleMatch(index, locale, greedy) {
+  if (!index) {
+    return void 0;
+  }
+  const match = index[locale];
+  if (match === void 0 && greedy) {
+    return Object.values(index)[0];
+  }
+  return match;
+}
+
 // src/enhancement/visibility/evaluateVisibilityCriteriaGroup.ts
 function evaluateVisibilityCriteriaGroup(options) {
   const { criteriaGroup, simplifyCriteria } = options;
@@ -2356,6 +2454,33 @@ var UniqueBatchEntries = class {
   }
 };
 
+// src/enhancement/walkPropertyValues.ts
+function walkPropertyValues(property, visitor) {
+  var _a, _b;
+  const definedLocales = /* @__PURE__ */ new Set([
+    ...Object.keys((_a = property.locales) != null ? _a : {}),
+    ...Object.keys((_b = property.localesConditions) != null ? _b : {})
+  ]);
+  const propertyLocales = [void 0, ...definedLocales];
+  propertyLocales.forEach((locale) => {
+    var _a2, _b2;
+    const conditionalValues = (_b2 = locale === void 0 ? property.conditions : (_a2 = property.localesConditions) == null ? void 0 : _a2[locale]) != null ? _b2 : [];
+    for (let conditionIndex = conditionalValues.length - 1; conditionIndex >= -1; conditionIndex--) {
+      const value = getEffectivePropertyValue({
+        property,
+        locale,
+        conditionIndex,
+        strict: true
+      });
+      visitor({
+        locale,
+        conditionIndex,
+        value
+      });
+    }
+  });
+}
+
 // src/EntityReleasesClient.ts
 import { ApiClient as ApiClient6 } from "@uniformdev/context/api";
 var releaseContentsUrl = "/api/v1/entity-releases";
@@ -2601,6 +2726,20 @@ var createCanvasChannel = ({
     };
     postMessage(message);
   };
+  const requestPageHtml = (options) => {
+    const message = {
+      ...options,
+      type: "request-page-html"
+    };
+    postMessage(message);
+  };
+  const sendPageHtml = (options) => {
+    const message = {
+      ...options,
+      type: "send-page-html"
+    };
+    postMessage(message);
+  };
   const updateContextualEditingStateInternal = (options) => {
     const message = {
       ...options,
@@ -2720,6 +2859,8 @@ var createCanvasChannel = ({
     updateComponentReferences,
     requestComponentSuggestion,
     suggestComponent,
+    requestPageHtml,
+    sendPageHtml,
     contextStorageUpdated
   };
 };
@@ -3139,13 +3280,6 @@ function bindVariables({
 
 // src/utils/variables/bindVariablesToObject.ts
 import { isDraft, produce } from "immer";
-
-// src/utils/variables/createVariableReference.ts
-function createVariableReference(variableName) {
-  return `\${${variableName.replace(/([${}])/g, "\\$1")}}`;
-}
-
-// src/utils/variables/bindVariablesToObject.ts
 function bindVariablesToObject(options) {
   return bindVariablesToObjectRecursive(options);
 }
@@ -3337,10 +3471,13 @@ export {
   UncachedContentClient,
   UniqueBatchEntries,
   WorkflowClient,
+  bindExpressionEscapeChars,
+  bindExpressionPrefix,
   bindVariables,
   bindVariablesToObject,
   compose,
   convertEntryToPutEntry,
+  convertToBindExpression,
   createBatchEnhancer,
   createCanvasChannel,
   createDynamicInputVisibilityRule,
@@ -3351,6 +3488,7 @@ export {
   createUniformApiEnhancer,
   createVariableReference,
   enhance,
+  escapeBindExpressionDefaultValue,
   evaluateNodeVisibilityParameter,
   evaluatePropertyCriteria,
   evaluateVisibilityCriteriaGroup,
@@ -3365,6 +3503,7 @@ export {
   getComponentJsonPointer,
   getComponentPath,
   getDataSourceVariantFromRouteGetParams,
+  getEffectivePropertyValue,
   getLocalizedPropertyValues,
   getNounForLocation,
   getNounForNode,
@@ -3406,5 +3545,6 @@ export {
   nullLimitPolicy,
   parseComponentPlaceholderId,
   parseVariableExpression,
-  walkNodeTree
+  walkNodeTree,
+  walkPropertyValues
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "20.1.1-alpha.2+1e066734ed",
+  "version": "20.3.1-alpha.0+86ebe90984",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -38,9 +38,9 @@
     "p-throttle": "5.0.0"
   },
   "dependencies": {
-    "@uniformdev/assets": "20.1.1-alpha.2+1e066734ed",
-    "@uniformdev/context": "20.1.1-alpha.2+1e066734ed",
-    "@uniformdev/richtext": "20.1.1-alpha.2+1e066734ed",
+    "@uniformdev/assets": "20.3.1-alpha.0+86ebe90984",
+    "@uniformdev/context": "20.3.1-alpha.0+86ebe90984",
+    "@uniformdev/richtext": "20.3.1-alpha.0+86ebe90984",
     "immer": "10.1.1"
   },
   "files": [
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1e066734ed23e5a51205896b47c92566380d52bc"
+  "gitHead": "86ebe909840ce1e8a9ecabc93298b5243a7b6179"
 }