@remkoj/optimizely-cms-react 5.1.5 → 6.0.0-pre10

package/dist/utilities.js

@@ -1,7 +1,37 @@
+import { OptiCmsSchema } from '@remkoj/optimizely-graph-client';
 import { TYPE_MERGE_SYMBOL } from './factory/index.js';
 import { localeToGraphLocale } from '@remkoj/optimizely-graph-client/utils';
 //Export the Rich-Text utilities
 export * from './components/rich-text/utils.js';
+/**
+ * Safeguard filter to remove default properties from the CmsComponent, intended
+ * to prevent these properties to be passed to client components. It will also
+ * remove all properties where the name starts with a `_`.
+ *
+ * @param     toFilter  The object to filter the
+ * @returns   W
+ */
+export function filterCmsComponentProps(toFilter) {
+    const _CmsComponentProps = ['children', 'contentLink', 'ctx', 'data', 'editProps', 'inEditMode', 'layoutProps'];
+    function shouldKeep(currentPropName) {
+        if (typeof currentPropName === 'string' && currentPropName.startsWith('_'))
+            return false;
+        if (_CmsComponentProps.includes(currentPropName))
+            return false;
+        return true;
+    }
+    return Object.getOwnPropertyNames(toFilter).reduce((newProps, currentPropName) => {
+        if (shouldKeep(currentPropName))
+            newProps[currentPropName] = toFilter[currentPropName];
+        return newProps;
+    }, {});
+}
+/**
+ *
+ *
+ * @param     toTest
+ * @returns
+ */
 export function isNonEmptyString(toTest) {
     return typeof (toTest) == 'string' && toTest.length > 0;
 }
@@ -88,15 +118,50 @@ export function validatesFragment(toTest) {
         return toTest.validateFragment && typeof (toTest.validateFragment) == 'function' ? true : false;
     return false;
 }
-export function contentLinkToRequestVariables(contentLink) {
-    const variables = {
+/**
+ * Take a ContentLink and transform it into the normalized set of request variables used query for content across
+ * multiple components.
+ *
+ * @param     contentLink     The contentlink to transform
+ * @param     client          If provided, the the configuration of the client is applied to the variables
+ * @returns   The request variables to use for querying Optimizely Graph
+ */
+export function contentLinkToRequestVariables(contentLink, client) {
+    const gqlVariables = {
         key: contentLink.key ?? '-no-content-selected-',
-        locale: contentLink.locale ? localeToGraphLocale(contentLink.locale) : undefined,
-        version: contentLink.version
+        locale: ifNonEmptyString(contentLink.locale, localeToGraphLocale),
+        version: ifNonEmptyString(contentLink.version),
+        changeset: ifNonEmptyString(contentLink.changeset),
+        variation: ifNonEmptyString(contentLink.variation, (variation) => { return { include: "SOME", value: [variation] }; })
     };
-    if (variables.version == undefined || variables.version == '')
-        variables.version = null;
-    return variables;
+    // CMS 12 Requires the version number to be an Int
+    if (client && client.currentOptiCmsSchema == OptiCmsSchema.CMS12)
+        gqlVariables.version = tryParsePositiveInt(gqlVariables.version);
+    // If the CMS Preview mode has been enabled, make sure we include that specific
+    // changeset in the query. This overrides the changeset that my be inferred from
+    // the contentLink
+    if (client && client.isPreviewEnabled())
+        gqlVariables.changeset = client.getChangeset();
+    // Make sure we can load any version by releasing access to any variation when a
+    // version has been explicitly requested. If no version has been requested, the
+    // variation will not be modified from the contentLink.
+    if (gqlVariables.version)
+        gqlVariables.variation = { include: "ALL" };
+    // Return the processed outcome
+    return gqlVariables;
+}
+/**
+ * Normalizes a string|null|undefined input to a non-empty string or undefined. This ensures that a
+ * non-empty string is considered insignificant and will not yield an empty result. When provided,
+ * the transformer function is applied *after* the non-empty check and the outcome of the transformer
+ * is returned.
+ *
+ * @param     inputValue    The current value to check
+ * @param     transformer   The transformer to apply to a non-empty string value
+ * @returns   The output of the transformer when the input is a non-empty string, `undefined` otherwise
+ */
+export function ifNonEmptyString(inputValue, transformer = (iv) => iv) {
+    return inputValue && typeof (inputValue) == 'string' && inputValue.length > 0 ? transformer(inputValue) : undefined;
 }
 export function toUniqueValues(value, index, array) {
     return array.indexOf(value) == index;
@@ -106,7 +171,16 @@ export function trim(valueToTrim) {
         return valueToTrim.trim();
     return valueToTrim;
 }
+/**
+ * Extract the identifier needed for the edit HTML properties from the contentLink. This will ensure
+ * that inline content links don't output an identifier.
+ *
+ * @param contentLink
+ * @returns
+ */
 export function getContentEditId(contentLink) {
+    if (!contentLink?.key || contentLink.key.length == 0)
+        return undefined;
     return contentLink.key;
 }
 /**
@@ -129,4 +203,23 @@ export function getRandomKey(prefix = "rnd") {
         return `${prefix}::${Math.round(Math.random() * 10000)}::${Math.round(Math.random() * 10000)}`;
     }
 }
+/**
+ * Parse the provided string to determine if it's a valid positive (i.e. larger then 0) number,
+ * return the number if it is, `undefined` or the `defaultValue` otherwise.
+ *
+ * @param     value
+ * @param     defaultValue
+ * @returns
+ */
+export function tryParsePositiveInt(value, defaultValue) {
+    try {
+        const versionNr = value ? Number.parseInt(value) : 0;
+        if (!isNaN(versionNr) && versionNr > 0)
+            return versionNr;
+    }
+    catch {
+        // Ignore
+    }
+    return defaultValue;
+}
 //# sourceMappingURL=utilities.js.map

package/dist/utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remkoj/optimizely-cms-react",
   "license": "Apache-2.0",
-  "version": "5.1.5",
+  "version": "6.0.0-pre10",
   "repository": "https://github.com/remkoj/optimizely-dxp-clients.git",
   "author": "Remko Jantzen <693172+remkoj@users.noreply.github.com>",
   "homepage": "https://github.com/remkoj/optimizely-dxp-clients/tree/main/packages/optimizely-cms-react",
@@ -13,50 +13,48 @@
   ],
   "exports": {
     ".": "./dist/index.js",
-    "./components": "./dist/components.js",
-    "./rsc": "./dist/rsc.js"
+    "./rsc": "./dist/rsc.js",
+    "./utils": "./dist/utilities.js"
   },
   "typesVersions": {
     "*": {
-      "components": [
-        "dist/components.d.ts"
-      ],
       "rsc": [
         "dist/rsc.d.ts"
+      ],
+      "utils": [
+        "dist/utilities.d.ts"
       ]
     }
   },
   "devDependencies": {
-    "@remkoj/optimizely-graph-client": "5.1.5",
+    "@remkoj/optimizely-graph-client": "6.0.0-pre10",
     "@types/crypto-js": "^4.2.2",
-    "@types/node": "^22.16.5",
-    "@types/react": "^18.3.23",
-    "@types/react-dom": "18.3.7",
-    "entities": "^6.0.1",
-    "graphql": "^16.11.0",
-    "graphql-request": "^6.1.0",
+    "@types/node": "^22.18.12",
+    "@types/react": "^19.2.2",
+    "@types/react-dom": "^19.2.2",
     "prop-types": "^15.8.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "scheduler": "^0.26.0",
-    "typescript": "^5.8.3"
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
+    "scheduler": "^0.27.0",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "@graphql-typed-document-node/core": "^3.2.0",
-    "crypto-js": "^4.2.0"
+    "@remkoj/optimizely-graph-client": "^6.0.0-pre10",
+    "crypto-js": "^4.2.0",
+    "entities": "^7.0.0",
+    "graphql": "^16.11.0",
+    "graphql-request": "^7.3.1"
   },
   "peerDependencies": {
-    "@remkoj/optimizely-graph-client": "^5",
-    "entities": "^6",
-    "graphql": "^16",
-    "graphql-request": "^6",
-    "react": "^18",
-    "react-dom": "^18"
+    "react": "^19",
+    "react-dom": "^19"
   },
   "scripts": {
     "clean": "tsc --build --clean",
     "prepare": "yarn tsc --build --force",
     "watch": "tsc --watch",
     "recompile": "tsc --build --clean && tsc --build --force"
-  }
+  },
+  "stableVersion": "5.1.0"
 }

package/dist/components.d.ts

@@ -1,29 +0,0 @@
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been
- *             deprecated, use either `@remkoj/optimizely-cms-react` or
- *             `@remkoj/optimizely-cms-react/rsc`, dependingn on your context
- */
-export declare const RichText: import("react").ComponentType<import("./rsc.js").PropsWithOptionalContext<Omit<import("./components/rich-text/types.js").RichTextImplProps<import("./components/type-utils.js").ElementWithChildrenType>, "ctx">>>;
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export { DefaultComponents, DefaultTextNode, createHtmlComponent } from "./components/rich-text/components.js";
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export * as Utils from "./components/rich-text/utils.js";
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export type * from "./components/rich-text/types.js";
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export type { BaseStyleDefinition, ElementStyleDefinition, LayoutProps, LayoutPropsSetting, LayoutPropsSettingChoices, LayoutPropsSettingKeys, LayoutPropsSettingValues, NodeStyleDefinition, StyleDefinition, StyleSetting } from "./components/cms-styles/index.js";
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export { extractSettings, readSetting } from "./components/cms-styles/index.js";

package/dist/components.js

@@ -1,24 +0,0 @@
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-import { RichText as BaseRichText } from "./components/rich-text/index.js";
-import { serverContextAware } from "./rsc.js";
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been
- *             deprecated, use either `@remkoj/optimizely-cms-react` or
- *             `@remkoj/optimizely-cms-react/rsc`, dependingn on your context
- */
-export const RichText = serverContextAware(BaseRichText);
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export { DefaultComponents, DefaultTextNode, createHtmlComponent } from "./components/rich-text/components.js";
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export * as Utils from "./components/rich-text/utils.js";
-/**
- * @deprecated The `@remkoj/optimizely-cms-react/components` export has been deprecated
- */
-export { extractSettings, readSetting } from "./components/cms-styles/index.js";
-//# sourceMappingURL=components.js.map

package/dist/components.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"components.js","sourceRoot":"","sources":["../src/components.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAA;AACxD;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAC9G;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,iCAAiC,CAAA;AASxD;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA"}