@uniformdev/canvas 19.35.1 → 19.35.3-alpha.82

package/dist/index.mjs

@@ -557,10 +557,53 @@ var UncachedCanvasClient = class extends CanvasClient {
   }
 };
 
-// src/CompositionRelationshipClient.ts
+// src/CategoryClient.ts
 import { ApiClient as ApiClient2 } from "@uniformdev/context/api";
+var CATEGORIES_URL = "/api/v1/categories";
+var CategoryClient = class extends ApiClient2 {
+  constructor(options) {
+    if (!options.limitPolicy) {
+      options.limitPolicy = createLimitPolicy({});
+    }
+    super(options);
+  }
+  /** Fetches all categories created in given project */
+  async getCategories(options) {
+    const { projectId } = this.options;
+    const fetchUri = this.createUrl("/api/v1/categories", { ...options, projectId });
+    return await this.apiClient(fetchUri);
+  }
+  /** Updates or creates a category, also used to re-order them */
+  async upsertCategories(categories) {
+    const { projectId } = this.options;
+    const fetchUri = this.createUrl(CATEGORIES_URL);
+    return await this.apiClient(fetchUri, {
+      method: "PUT",
+      body: JSON.stringify({ categories, projectId }),
+      expectNoContent: true
+    });
+  }
+  /** Deletes a category */
+  async removeCategory(options) {
+    const { projectId } = this.options;
+    const fetchUri = this.createUrl(CATEGORIES_URL);
+    return await this.apiClient(fetchUri, {
+      method: "DELETE",
+      body: JSON.stringify({ projectId, categoryId: options.categoryId }),
+      expectNoContent: true
+    });
+  }
+};
+var UncachedCategoryClient = class extends CategoryClient {
+  constructor(options) {
+    super({ ...options, bypassCache: true });
+  }
+};
+
+// src/CompositionRelationshipClient.ts
+import { ApiClient as ApiClient3 } from "@uniformdev/context/api";
 var COMPOSITION_RELATIONSHIP_URL = "/api/v1/composition-relationships";
-var unstable_CompositionRelationshipClient = class extends ApiClient2 {
+var unstable_CompositionRelationshipClient = class extends ApiClient3 {
   constructor(options) {
     super(options);
     this.getDefinitionsRelationships = async ({
@@ -621,10 +664,10 @@ var unstable_CompositionRelationshipClient = class extends ApiClient2 {
 };
 
 // src/DataSourceClient.ts
-import { ApiClient as ApiClient3 } from "@uniformdev/context/api";
+import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
 var dataSourceUrl = "/api/v1/data-source";
 var dataSourcesUrl = "/api/v1/data-sources";
-var DataSourceClient = class extends ApiClient3 {
+var DataSourceClient = class extends ApiClient4 {
   constructor(options) {
     super(options);
   }
@@ -661,9 +704,9 @@ var DataSourceClient = class extends ApiClient3 {
 };
 
 // src/DataTypeClient.ts
-import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
+import { ApiClient as ApiClient5 } from "@uniformdev/context/api";
 var _url;
-var _DataTypeClient = class _DataTypeClient extends ApiClient4 {
+var _DataTypeClient = class _DataTypeClient extends ApiClient5 {
   constructor(options) {
     super(options);
   }
@@ -1580,9 +1623,9 @@ function subscribeToComposition({
 }
 
 // src/RouteClient.ts
-import { ApiClient as ApiClient5 } from "@uniformdev/context/api";
+import { ApiClient as ApiClient6 } from "@uniformdev/context/api";
 var ROUTE_URL = "/api/v1/route";
-var RouteClient = class extends ApiClient5 {
+var RouteClient = class extends ApiClient6 {
   constructor(options) {
     var _a;
     if (!options.limitPolicy) {
@@ -1599,7 +1642,157 @@ var RouteClient = class extends ApiClient5 {
   }
 };
 
-// src/utils/bindVariables.ts
+// src/utils/createApiEnhancer.ts
+var createUniformApiEnhancer = ({ apiUrl }) => {
+  return async (message) => {
+    const response = await fetch(apiUrl, {
+      method: "post",
+      body: JSON.stringify({
+        composition: message.composition,
+        hash: message.hash
+      }),
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    const json = await response.json();
+    if (!response.ok) {
+      throw new Error("Error reading enhanced composition");
+    }
+    const body = json;
+    return body.composition;
+  };
+};
+
+// src/utils/getParameterAttributes.ts
+var ATTRIBUTE_COMPONENT_ID = "data-uniform-component-id";
+var ATTRIBUTE_PARAMETER_ID = "data-uniform-parameter-id";
+var ATTRIBUTE_PARAMETER_VALUE = "data-uniform-parameter-value";
+var ATTRIBUTE_PARAMETER_TYPE = "data-uniform-parameter-type";
+var ATTRIBUTE_PLACEHOLDER = "data-uniform-placeholder";
+var ATTRIBUTE_MULTILINE = "data-uniform-is-multiline";
+var getParameterAttributes = ({
+  id,
+  component,
+  placeholder,
+  isMultiline = false
+}) => {
+  var _a, _b, _c;
+  const componentId = component == null ? void 0 : component._id;
+  const parameter = (_a = component == null ? void 0 : component.parameters) == null ? void 0 : _a[id];
+  const value = parameter == null ? void 0 : parameter.value;
+  const type = parameter == null ? void 0 : parameter.type;
+  const isEditable = (_c = (_b = parameter == null ? void 0 : parameter._contextualEditing) == null ? void 0 : _b.isEditable) != null ? _c : false;
+  return {
+    [ATTRIBUTE_COMPONENT_ID]: componentId,
+    [ATTRIBUTE_PARAMETER_ID]: id,
+    [ATTRIBUTE_PARAMETER_VALUE]: String(value != null ? value : ""),
+    [ATTRIBUTE_PARAMETER_TYPE]: type,
+    [ATTRIBUTE_PLACEHOLDER]: placeholder,
+    [ATTRIBUTE_MULTILINE]: type === "text" ? isMultiline : void 0,
+    contentEditable: type === "text" ? isEditable : void 0
+  };
+};
+
+// src/utils/isSystemComponentDefinition.ts
+var isSystemComponentDefinition = (componentType) => {
+  return componentType.startsWith("$");
+};
+
+// src/utils/mapSlotToPersonalizedVariations.ts
+function mapSlotToPersonalizedVariations(slot) {
+  if (!slot)
+    return [];
+  return slot.map((v, i) => {
+    var _a, _b;
+    const contextTag = (_b = (_a = v.parameters) == null ? void 0 : _a[CANVAS_PERSONALIZATION_PARAM]) == null ? void 0 : _b.value;
+    const id = (contextTag == null ? void 0 : contextTag.name) || `pz-${i}-${v.type}`;
+    return {
+      ...v,
+      id,
+      pz: contextTag
+    };
+  });
+}
+
+// src/utils/mapSlotToTestVariations.ts
+function mapSlotToTestVariations(slot) {
+  if (!slot)
+    return [];
+  return slot.map((v, i) => {
+    var _a, _b, _c;
+    const contextTag = (_b = (_a = v.parameters) == null ? void 0 : _a[CANVAS_TEST_VARIANT_PARAM]) == null ? void 0 : _b.value;
+    const id = (_c = contextTag == null ? void 0 : contextTag.id) != null ? _c : "testId" in v ? v.testId : `ab-${i}-${v.type}`;
+    return {
+      ...v,
+      id
+      //testDistribution: contextTag?.testDistribution,
+    };
+  });
+}
+
+// src/utils/variables/parseVariableExpression.ts
+var escapeCharacter = "\\";
+var variablePrefix = "${";
+var variableSuffix = "}";
+function parseVariableExpression(serialized, onToken) {
+  let bufferStartIndex = 0;
+  let bufferEndIndex = 0;
+  let tokenCount = 0;
+  const handleToken = (token, type) => {
+    tokenCount++;
+    return onToken == null ? void 0 : onToken(token, type);
+  };
+  let state = "text";
+  for (let index = 0; index < serialized.length; index++) {
+    const char = serialized[index];
+    if (bufferStartIndex > bufferEndIndex) {
+      bufferEndIndex = bufferStartIndex;
+    }
+    if (char === variablePrefix[0] && serialized[index + 1] === variablePrefix[1]) {
+      if (serialized[index - 1] === escapeCharacter) {
+        bufferEndIndex -= escapeCharacter.length;
+        if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text") === false) {
+          return tokenCount;
+        }
+        bufferStartIndex = index;
+        bufferEndIndex = index + 1;
+        continue;
+      }
+      state = "variable";
+      if (bufferEndIndex > bufferStartIndex) {
+        if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text") === false) {
+          return tokenCount;
+        }
+        bufferStartIndex = bufferEndIndex;
+      }
+      index += variablePrefix.length - 1;
+      bufferStartIndex += variablePrefix.length;
+      continue;
+    }
+    if (char === variableSuffix && state === "variable") {
+      state = "text";
+      if (bufferEndIndex > bufferStartIndex) {
+        if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "variable") === false) {
+          return tokenCount;
+        }
+        bufferStartIndex = bufferEndIndex + variableSuffix.length;
+      }
+      continue;
+    }
+    bufferEndIndex++;
+  }
+  if (bufferEndIndex > bufferStartIndex) {
+    if (state === "variable") {
+      state = "text";
+      bufferStartIndex -= variablePrefix.length;
+    }
+    handleToken(serialized.substring(bufferStartIndex), state);
+  }
+  return tokenCount;
+}
+
+// src/utils/variables/bindVariables.ts
 function bindVariables({
   variables,
   value,
@@ -1607,6 +1800,7 @@ function bindVariables({
   handleBinding
 }) {
   let boundCount = 0;
+  let tokenCount = 0;
   const errors = [];
   const defaultHandleBinding = (variableName, variables2, errors2) => {
     const variableValue = variables2[variableName];
@@ -1616,16 +1810,33 @@ function bindVariables({
     }
     return variableValue;
   };
-  const result = value.replace(/(?<!\\)\${([^}]+)}/g, (_match, variableName) => {
-    const variableValue = (handleBinding != null ? handleBinding : defaultHandleBinding)(variableName, variables, errors);
+  const result = [];
+  parseVariableExpression(value, (token, tokenType) => {
+    tokenCount++;
+    if (tokenType === "text") {
+      result.push(token);
+      return;
+    }
+    const variableValue = (handleBinding != null ? handleBinding : defaultHandleBinding)(token, variables, errors);
     boundCount++;
-    return variableValue;
+    result.push(variableValue);
   });
-  return { result, boundCount, errors: errors.length > 0 ? errors : void 0 };
+  return {
+    result: tokenCount === 1 ? result[0] : result.join(""),
+    boundCount,
+    errors: errors.length > 0 ? errors : void 0
+  };
 }
 
-// src/utils/bindVariablesToObject.ts
+// src/utils/variables/bindVariablesToObject.ts
 import { produce } from "immer";
+
+// src/utils/variables/createVariableReference.ts
+function createVariableReference(variableName) {
+  return `\${${variableName}}`;
+}
+
+// src/utils/variables/bindVariablesToObject.ts
 function bindVariablesToObject(options) {
   return bindVariablesToObjectRecursive(options);
 }
@@ -1642,6 +1853,10 @@ function bindVariablesToObjectRecursive({
   if (typeof value !== "object" || value === null) {
     return { boundCount: 0, result: value };
   }
+  const richTextNodeResult = handleRichTextNodeBinding(value, bindVariablesOptions);
+  if (richTextNodeResult !== void 0) {
+    return richTextNodeResult;
+  }
   const result = produce(value, (draft) => {
     Object.entries(draft).forEach(([property, oldValue]) => {
       const currentObjectPath = recursivePath ? `${recursivePath}.${property}` : property;
@@ -1665,77 +1880,41 @@ function bindVariablesToObjectRecursive({
         boundCount += childBind.boundCount;
         draft[property] = childBind.result;
         if (childBind.errors) {
-          errors.push(...childBind.errors.map((e) => `${currentObjectPath}: ${e}`));
+          errors.push(...childBind.errors);
         }
       }
     });
   });
   return { boundCount, result, errors: errors.length > 0 ? errors : void 0 };
 }
-
-// src/utils/createApiEnhancer.ts
-var createUniformApiEnhancer = ({ apiUrl }) => {
-  return async (message) => {
-    const response = await fetch(apiUrl, {
-      method: "post",
-      body: JSON.stringify({
-        composition: message.composition,
-        hash: message.hash
-      }),
-      headers: {
-        "Content-Type": "application/json"
-      }
-    });
-    const json = await response.json();
-    if (!response.ok) {
-      throw new Error("Error reading enhanced composition");
-    }
-    const body = json;
-    return body.composition;
-  };
-};
-
-// src/utils/isSystemComponentDefinition.ts
-var isSystemComponentDefinition = (componentType) => {
-  return componentType.startsWith("$");
-};
-
-// src/utils/mapSlotToPersonalizedVariations.ts
-function mapSlotToPersonalizedVariations(slot) {
-  if (!slot)
-    return [];
-  return slot.map((v, i) => {
-    var _a, _b;
-    const contextTag = (_b = (_a = v.parameters) == null ? void 0 : _a[CANVAS_PERSONALIZATION_PARAM]) == null ? void 0 : _b.value;
-    const id = (contextTag == null ? void 0 : contextTag.name) || `pz-${i}-${v.type}`;
-    return {
-      ...v,
-      id,
-      pz: contextTag
-    };
-  });
-}
-
-// src/utils/mapSlotToTestVariations.ts
-function mapSlotToTestVariations(slot) {
-  if (!slot)
-    return [];
-  return slot.map((v, i) => {
-    var _a, _b, _c;
-    const contextTag = (_b = (_a = v.parameters) == null ? void 0 : _a[CANVAS_TEST_VARIANT_PARAM]) == null ? void 0 : _b.value;
-    const id = (_c = contextTag == null ? void 0 : contextTag.id) != null ? _c : "testId" in v ? v.testId : `ab-${i}-${v.type}`;
-    return {
-      ...v,
-      id
-      //testDistribution: contextTag?.testDistribution,
+function handleRichTextNodeBinding(object, options) {
+  if ("type" in object && object.type === "variable" && "reference" in object && typeof object.reference === "string" && "version" in object && object.version === 1) {
+    const value = createVariableReference(object.reference);
+    const bindResult = bindVariables({ ...options, value });
+    const bindResultAsTextNode = {
+      detail: 0,
+      format: 0,
+      mode: "normal",
+      style: "",
+      text: bindResult.result,
+      type: "text",
+      version: 1
     };
-  });
+    return { ...bindResult, result: bindResultAsTextNode };
+  }
+  return void 0;
 }
 
 // src/index.ts
 import { ApiClientError } from "@uniformdev/context/api";
 var CanvasClientError = ApiClientError;
 export {
+  ATTRIBUTE_COMPONENT_ID,
+  ATTRIBUTE_MULTILINE,
+  ATTRIBUTE_PARAMETER_ID,
+  ATTRIBUTE_PARAMETER_TYPE,
+  ATTRIBUTE_PARAMETER_VALUE,
+  ATTRIBUTE_PLACEHOLDER,
   ApiClientError,
   BatchEntry,
   CANVAS_DRAFT_STATE,
@@ -1753,6 +1932,7 @@ export {
   CANVAS_TEST_VARIANT_PARAM,
   CanvasClient,
   CanvasClientError,
+  CategoryClient,
   ChildEnhancerBuilder,
   DataSourceClient,
   DataTypeClient,
@@ -1773,6 +1953,7 @@ export {
   PLACEHOLDER_ID,
   RouteClient,
   UncachedCanvasClient,
+  UncachedCategoryClient,
   UniqueBatchEntries,
   bindVariables,
   bindVariablesToObject,
@@ -1782,12 +1963,14 @@ export {
   createEventBus,
   createLimitPolicy,
   createUniformApiEnhancer,
+  createVariableReference,
   enhance,
   extractLocales,
   generateHash,
   getChannelName,
   getComponentJsonPointer,
   getComponentPath,
+  getParameterAttributes,
   isAddComponentMessage,
   isDismissPlaceholderMessage,
   isMovingComponentMessage,
@@ -1806,6 +1989,7 @@ export {
   mapSlotToPersonalizedVariations,
   mapSlotToTestVariations,
   nullLimitPolicy,
+  parseVariableExpression,
   subscribeToComposition,
   unstable_CompositionRelationshipClient,
   walkComponentTree

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "19.35.1",
+  "version": "19.35.3-alpha.82+4bc341093",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -38,7 +38,7 @@
     "pusher-js": "8.2.0"
   },
   "dependencies": {
-    "@uniformdev/context": "19.35.1",
+    "@uniformdev/context": "19.35.3-alpha.82+4bc341093",
     "immer": "9.0.21"
   },
   "files": [
@@ -47,5 +47,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a85462ec75d379c5447dc625135f828e9d4d7dd6"
+  "gitHead": "4bc341093bc946900df2646fe53eca4bcddc693c"
 }