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

package/dist/index.esm.js

@@ -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/dist/index.js

@@ -460,10 +460,13 @@ __export(src_exports, {
   UncachedContentClient: () => UncachedContentClient,
   UniqueBatchEntries: () => UniqueBatchEntries,
   WorkflowClient: () => WorkflowClient,
+  bindExpressionEscapeChars: () => bindExpressionEscapeChars,
+  bindExpressionPrefix: () => bindExpressionPrefix,
   bindVariables: () => bindVariables,
   bindVariablesToObject: () => bindVariablesToObject,
   compose: () => compose,
   convertEntryToPutEntry: () => convertEntryToPutEntry,
+  convertToBindExpression: () => convertToBindExpression,
   createBatchEnhancer: () => createBatchEnhancer,
   createCanvasChannel: () => createCanvasChannel,
   createDynamicInputVisibilityRule: () => createDynamicInputVisibilityRule,
@@ -474,6 +477,7 @@ __export(src_exports, {
   createUniformApiEnhancer: () => createUniformApiEnhancer,
   createVariableReference: () => createVariableReference,
   enhance: () => enhance,
+  escapeBindExpressionDefaultValue: () => escapeBindExpressionDefaultValue,
   evaluateNodeVisibilityParameter: () => evaluateNodeVisibilityParameter,
   evaluatePropertyCriteria: () => evaluatePropertyCriteria,
   evaluateVisibilityCriteriaGroup: () => evaluateVisibilityCriteriaGroup,
@@ -488,6 +492,7 @@ __export(src_exports, {
   getComponentJsonPointer: () => getComponentJsonPointer,
   getComponentPath: () => getComponentPath,
   getDataSourceVariantFromRouteGetParams: () => getDataSourceVariantFromRouteGetParams,
+  getEffectivePropertyValue: () => getEffectivePropertyValue,
   getLocalizedPropertyValues: () => getLocalizedPropertyValues,
   getNounForLocation: () => getNounForLocation,
   getNounForNode: () => getNounForNode,
@@ -529,7 +534,8 @@ __export(src_exports, {
   nullLimitPolicy: () => nullLimitPolicy,
   parseComponentPlaceholderId: () => parseComponentPlaceholderId,
   parseVariableExpression: () => parseVariableExpression,
-  walkNodeTree: () => walkNodeTree
+  walkNodeTree: () => walkNodeTree,
+  walkPropertyValues: () => walkPropertyValues
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -959,6 +965,9 @@ var _ContentClient = class _ContentClient extends import_api4.ApiClient {
   }
   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 }),
@@ -2009,6 +2018,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;
@@ -2510,6 +2614,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
 var import_api7 = require("@uniformdev/context/api");
 var releaseContentsUrl = "/api/v1/entity-releases";
@@ -2755,6 +2886,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,
@@ -2874,6 +3019,8 @@ var createCanvasChannel = ({
     updateComponentReferences,
     requestComponentSuggestion,
     suggestComponent,
+    requestPageHtml,
+    sendPageHtml,
     contextStorageUpdated
   };
 };
@@ -3293,13 +3440,6 @@ function bindVariables({
 
 // src/utils/variables/bindVariablesToObject.ts
 var import_immer = require("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);
 }
@@ -3492,10 +3632,13 @@ var CanvasClientError = import_api16.ApiClientError;
   UncachedContentClient,
   UniqueBatchEntries,
   WorkflowClient,
+  bindExpressionEscapeChars,
+  bindExpressionPrefix,
   bindVariables,
   bindVariablesToObject,
   compose,
   convertEntryToPutEntry,
+  convertToBindExpression,
   createBatchEnhancer,
   createCanvasChannel,
   createDynamicInputVisibilityRule,
@@ -3506,6 +3649,7 @@ var CanvasClientError = import_api16.ApiClientError;
   createUniformApiEnhancer,
   createVariableReference,
   enhance,
+  escapeBindExpressionDefaultValue,
   evaluateNodeVisibilityParameter,
   evaluatePropertyCriteria,
   evaluateVisibilityCriteriaGroup,
@@ -3520,6 +3664,7 @@ var CanvasClientError = import_api16.ApiClientError;
   getComponentJsonPointer,
   getComponentPath,
   getDataSourceVariantFromRouteGetParams,
+  getEffectivePropertyValue,
   getLocalizedPropertyValues,
   getNounForLocation,
   getNounForNode,
@@ -3561,5 +3706,6 @@ var CanvasClientError = import_api16.ApiClientError;
   nullLimitPolicy,
   parseComponentPlaceholderId,
   parseVariableExpression,
-  walkNodeTree
+  walkNodeTree,
+  walkPropertyValues
 });