@remkoj/optimizely-graph-client 5.1.5 → 6.0.0-pre10

package/dist/services/routing/queries/cms13/index.js

@@ -1,36 +1,40 @@
 import * as GetAllRoutes from './getAllRoutes.js';
 import * as GetRouteById from './getRouteById.js';
 import * as GetRouteByPath from './getRouteByPath.js';
+import { isContentLinkWithLocale, localeToGraphLocale, } from '../../../utils.js';
 export class OptimizelyCms13Client {
     constructor() {
         this._changeset = null;
     }
-    enablePreview(changeset = "default") {
+    enablePreview(changeset = 'default') {
         this._changeset = changeset;
     }
     disablePreview() {
         this._changeset = null;
     }
-    async getRoutes(client, siteId, onlyWithDomain) {
+    async getRoutes(client, siteId, onlyWithDomain, includeVariants) {
         if (client.debug)
             console.log(`⚪ [RouteResolver] Loading routes for ${siteId ?? 'all applications'}${!siteId && onlyWithDomain ? ' that have a domain defined.' : ''}`);
         let totalRoutes = 0;
         let retrievedRoutes = 0;
         let currentPage = 0;
-        let pageSize = 50;
+        let pageSize = 100;
         const graphRoutes = [];
         do {
             if (client.debug)
                 console.log(`⚪ [RouteResolver] Fetching page ${currentPage + 1} with ${pageSize} routes, of ${totalRoutes > 0 ? Math.ceil(totalRoutes / pageSize) : 'unknown'}`);
-            const page = await client.request(GetAllRoutes.query, {
+            const page = await client
+                .request(GetAllRoutes.query, {
                 domain: siteId,
                 mustHaveDomain: onlyWithDomain ? true : null,
                 pageSize: pageSize,
                 skip: currentPage * pageSize,
-                changeset: this._changeset || client.getChangeset()
-            }).catch(e => {
+                changeset: this._changeset || client.getChangeset(),
+                variation: includeVariants ? { include: 'ALL' } : undefined,
+            })
+                .catch((e) => {
                 if (client.debug)
-                    console.error("🔴 [RouteResolver] Error while fetching routes", e);
+                    console.error('🔴 [RouteResolver] Error while fetching routes', e);
                 return undefined;
             });
             if (page) {
@@ -43,58 +47,150 @@ export class OptimizelyCms13Client {
                 totalRoutes = 0;
                 retrievedRoutes = 0;
             }
-        } while (totalRoutes > 0 && retrievedRoutes > 0 && graphRoutes.length < totalRoutes && retrievedRoutes == pageSize);
-        return graphRoutes.map(this.tryConvertResponse.bind(this)).filter(this.isNotNullOrUndefined);
+        } while (totalRoutes > 0 &&
+            retrievedRoutes > 0 &&
+            graphRoutes.length < totalRoutes &&
+            retrievedRoutes == pageSize);
+        return graphRoutes
+            .map(this.tryConvertResponse.bind(this))
+            .filter(this.isNotNullOrUndefined);
     }
-    async getRouteByPath(client, path, siteId) {
+    async getRouteByPath(client, path, siteId, variant) {
         if (client.debug)
-            console.log(`⚪ [RouteResolver] Resolving content info for ${path} on ${siteId ? siteId : "all domains"}`);
-        const paths = [path, path.endsWith('/') ? path.substring(0, path.length - 1) : path + '/'].filter(p => p);
+            console.log(`⚪ [RouteResolver] Resolving content info for ${path} on ${siteId ? siteId : 'all domains'}`);
+        // Calculate the paths
+        const paths = [
+            path,
+            path.endsWith('/') ? path.substring(0, path.length - 1) : path + '/',
+        ].filter((p) => p);
+        // Determine the changeset & status filters
+        const changeset = this._changeset || client.getChangeset();
+        const status = changeset ? null : "Published";
+        // Create the request variables
+        const variables = {
+            path: paths,
+            domain: siteId,
+            changeset,
+            status,
+            variation: variant && variant.length > 0
+                ? { include: 'SOME', value: [variant] }
+                : undefined,
+        };
         const resultSet = await client.request({
             document: GetRouteByPath.query,
-            variables: { path: paths, domain: siteId, changeset: this._changeset || client.getChangeset() }
+            variables,
+        }).catch(e => {
+            console.error(e);
+            return {
+                getRouteByPath: {
+                    total: 0,
+                    item: {}
+                }
+            };
         });
         if ((resultSet.getRouteByPath?.total ?? 0) === 0) {
             if (client.debug)
-                console.warn("🟠 [RouteResolver] No items in the resultset");
+                console.warn('🟠 [RouteResolver] No items in the resultset, request parameters', JSON.stringify(variables));
             return undefined;
         }
         if ((resultSet.getRouteByPath?.total ?? 0) > 1) {
             if (client.debug)
-                console.warn("🟠 [RouteResolver] Ambiguous URL provided - picking first match, did you omit the domain in a multi-site setup?");
+                console.warn('🟠 [RouteResolver] Ambiguous URL provided - picking first match, did you omit the domain in a multi-site setup?');
         }
         if (client.debug)
-            console.log(`⚪ [RouteResolver] Resolved content info for ${path} to: ${JSON.stringify(resultSet.getRouteByPath.items)}`);
-        return this.convertResponse(resultSet.getRouteByPath.items);
+            console.log(`⚪ [RouteResolver] Resolved content info for ${path} to: ${JSON.stringify(resultSet.getRouteByPath.item)}`);
+        return this.convertResponse(resultSet.getRouteByPath.item);
     }
     async getRouteById(client, contentId, locale, version) {
-        const variables = { key: contentId, version: version?.toString(), locale: locale?.replaceAll('-', '_'), changeset: this._changeset || client.getChangeset() };
+        const variables = {
+            key: contentId,
+            version: version?.toString(),
+            locale: localeToGraphLocale(locale),
+            changeset: this._changeset || client.getChangeset(),
+            variation: version ? { include: 'ALL' } : undefined,
+        };
         if (client.debug)
-            console.log("⚪ [RouteResolver] Resolving content by id:", JSON.stringify(variables));
+            console.log('⚪ [RouteResolver] Resolving content by id:', JSON.stringify(variables));
         const resultSet = await client.request({
             document: GetRouteById.query,
-            variables
+            variables,
         });
         if (resultSet.Content?.total >= 1) {
-            if (client.debug && resultSet.Content?.total > 1)
-                console.warn(`🟠 [RouteResolver] Received multiple entries with this ID, returning the first one from: ${(resultSet.Content?.items || []).map(x => { return `${x._metadata.key} (version: ${x._metadata.version}, locale: ${x._metadata.locale})`; }).join('; ')}`);
-            return this.convertResponse(resultSet.Content.items[0]);
+            let selectedItem = resultSet.Content.items[0];
+            if (client.debug && resultSet.Content?.total > 1) {
+                let firstEmptyVariantItem = resultSet.Content?.items
+                    ?.filter((x) => x._metadata?.variation === null ||
+                    x._metadata?.variation === undefined)
+                    ?.at(0);
+                selectedItem = firstEmptyVariantItem ?? selectedItem;
+                console.warn(`🟠 [RouteResolver] Received multiple entries with this ID, returning the first default variant from: ${(resultSet.Content?.items || [])
+                    .map((x) => {
+                    return `${x._metadata.key} (version: ${x._metadata.version}, locale: ${x._metadata.locale}, changeset: ${x._metadata.changeset}, variant: ${x._metadata.variation})`;
+                })
+                    .join('; ')}`);
+            }
+            return this.convertResponse(selectedItem);
+        }
+        return undefined;
+    }
+    async getRouteByLink(client, contentLink) {
+        if (!isContentLinkWithLocale(contentLink))
+            return undefined;
+        const variables = {
+            key: contentLink.key,
+            version: contentLink.version?.toString(),
+            locale: contentLink.locale
+                ? localeToGraphLocale(contentLink.locale)
+                : undefined,
+            changeset: contentLink.changeset || this._changeset || client.getChangeset(),
+            variation: contentLink.variation
+                ? { include: 'SOME', value: [contentLink.variation] }
+                : contentLink.version
+                    ? { include: 'ALL' }
+                    : undefined,
+        };
+        if (client.debug)
+            console.log('⚪ [RouteResolver] Resolving content by link:', JSON.stringify(variables));
+        const resultSet = await client.request({
+            document: GetRouteById.query,
+            variables,
+        });
+        if (resultSet.Content?.total >= 1) {
+            let selectedItem = resultSet.Content.items[0];
+            if (client.debug && resultSet.Content?.total > 1) {
+                let firstEmptyVariantItem = resultSet.Content?.items
+                    ?.filter((x) => x._metadata?.variation === null ||
+                    x._metadata?.variation === undefined)
+                    ?.at(0);
+                selectedItem = firstEmptyVariantItem ?? selectedItem;
+                console.warn(`🟠 [RouteResolver] Received multiple entries with this ID, returning the first default variant from: ${(resultSet.Content?.items || [])
+                    .map((x) => {
+                    return `${x._metadata.key} (version: ${x._metadata.version}, locale: ${x._metadata.locale}, changeset: ${x._metadata.changeset}, variant: ${x._metadata.variation})`;
+                })
+                    .join('; ')}`);
+            }
+            return this.convertResponse(selectedItem);
+        }
+        else {
+            console.warn(`🟠 [RouteResolver] Unable to locate the requested item (${JSON.stringify(variables)}) in Optimizely Graph`);
         }
         return undefined;
     }
     convertResponse(item) {
         if (!item)
-            throw new Error("RouteResolver.convertResponse(): mandatory parameter \"item\" not provided!");
+            throw new Error('RouteResolver.convertResponse(): mandatory parameter "item" not provided!');
         const itemUrl = new URL(item._metadata?.url?.path ?? '/', item._metadata?.url?.domain ?? 'https://example.com');
         return {
             locale: item._metadata.locale,
             path: item._metadata.url.path,
             url: itemUrl,
-            slug: item._metadata?.slug ?? "",
+            slug: item._metadata?.slug ?? '',
             changed: item.changed ? new Date(item.changed) : null,
             contentType: item._metadata.types,
             version: item._metadata.version,
-            key: item._metadata.key
+            key: item._metadata.key,
+            changeset: item._metadata.changeset,
+            variation: item._metadata.variation,
         };
     }
     tryConvertResponse(item) {

package/dist/services/routing/queries/cms13/index.js.map

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

package/dist/services/routing/queries/cms13/types.d.ts

@@ -0,0 +1,18 @@
+export type { VariationInput } from "../../types.js";
+export type Route = {
+    _metadata: {
+        key: string;
+        version: string;
+        locale: string;
+        displayName: string;
+        types: Array<string>;
+        variation?: string | null;
+        changeset?: string | null;
+        url: {
+            path: string;
+            domain: string;
+        };
+        slug?: string | null;
+    };
+    changed: string;
+};

package/dist/services/routing/queries/cms13/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/services/routing/queries/cms13/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/services/routing/queries/cms13/types.ts"],"names":[],"mappings":""}

package/dist/services/routing/queries/types.d.ts

@@ -1,11 +1,13 @@
 import type { Route } from '../types.js';
 import { type IOptiGraphClient as GraphQLClient } from '../../../client/types.js';
+import type { AnyContentLink } from '../../types.js';
 export interface OptimizelyCmsRoutingApi {
     enablePreview(changeset?: string): void;
     disablePreview(): void;
-    getRoutes(client: GraphQLClient, siteId?: string, onlyWithDomain?: boolean): Promise<Route[]>;
-    getRouteByPath(client: GraphQLClient, path: string, siteId?: string): Promise<undefined | Route>;
+    getRoutes(client: GraphQLClient, siteId?: string, onlyWithDomain?: boolean, includeVariants?: boolean): Promise<Route[]>;
+    getRouteByPath(client: GraphQLClient, path: string, siteId?: string, variant?: string): Promise<undefined | Route>;
     getRouteById(client: GraphQLClient, contentId: string, locale?: string, version?: string | number): Promise<undefined | Route>;
+    getRouteByLink(client: GraphQLClient, contentLink: AnyContentLink): Promise<undefined | Route>;
 }
 export type OptimizelyCmsRoutingApiClass = {
     new (): OptimizelyCmsRoutingApi;

package/dist/services/routing/resolver.d.ts

@@ -1,7 +1,7 @@
 import { type IOptiGraphClient, OptiCmsSchema } from '../../client/index.js';
 import { type OptimizelyGraphConfig } from '../../types.js';
 import type { Route, IRouteResolver } from "./types.js";
-import type { ContentLinkWithLocale } from '../types.js';
+import type { AnyContentLink, ContentLinkWithLocale } from '../types.js';
 /**
  * Default router implementation for Optimizely CMS
  */
@@ -30,24 +30,28 @@ export declare class RouteResolver implements IRouteResolver {
     /**
      * Retrieve all registered routes for the provided domain - all domains if none specified
      *
-     * @param       domain          The domain to filter on
-     * @param       onlyWithDomain  If set/kept to `undefined` will only filter by domain. When set
-     *                              to `true`, requires the domain (CMS SaaS/13 only) to be set. This
-     *                              allows to get all routes bound to a domain.
+     * @param       domainOrChannelId   The domain to filter on
+     * @param       onlyWithDomain      If set/kept to `undefined` will only filter by domain. When
+     *                                  set to `true`, requires the domain (CMS SaaS/13 only) to be
+     *                                  set. This allows to get all routes bound to a domain.
+     * @param       includeVariants     If set to `true` the output will include all variants for
+     *                                  each item in the CMS.
      * @returns     The list of routes
      */
-    getRoutes(domain?: string, onlyWithDomain?: boolean): Promise<Route[]>;
+    getRoutes(domain?: string, onlyWithDomain?: boolean, includeVariants?: boolean): Promise<Route[]>;
     /**
      * Resolve a path to route information, either from string or from URL
      * object.
      *
      * @param       path        The path to resolve for
      * @param       domain      The domain to filter the results by
+     * @param       variation   The name of the variation to filter the routes by
      * @returns     The route information for the path
      */
     getContentInfoByPath(path: URL): Promise<undefined | Route>;
-    getContentInfoByPath(path: string, domain?: string): Promise<undefined | Route>;
+    getContentInfoByPath(path: string, domain?: string, variation?: string): Promise<undefined | Route>;
     getContentInfoById(key: string, locale?: string, version?: string | number): Promise<undefined | Route>;
+    getRouteByLink(contentLink: AnyContentLink): Promise<undefined | Route>;
     /**
      * Extract a content link from a route definition
      *

package/dist/services/routing/resolver.js

@@ -58,23 +58,28 @@ export class RouteResolver {
     /**
      * Retrieve all registered routes for the provided domain - all domains if none specified
      *
-     * @param       domain          The domain to filter on
-     * @param       onlyWithDomain  If set/kept to `undefined` will only filter by domain. When set
-     *                              to `true`, requires the domain (CMS SaaS/13 only) to be set. This
-     *                              allows to get all routes bound to a domain.
+     * @param       domainOrChannelId   The domain to filter on
+     * @param       onlyWithDomain      If set/kept to `undefined` will only filter by domain. When
+     *                                  set to `true`, requires the domain (CMS SaaS/13 only) to be
+     *                                  set. This allows to get all routes bound to a domain.
+     * @param       includeVariants     If set to `true` the output will include all variants for
+     *                                  each item in the CMS.
      * @returns     The list of routes
      */
-    async getRoutes(domain, onlyWithDomain) {
-        return (await this.getResolver()).getRoutes(this._cgClient, domain, onlyWithDomain);
+    async getRoutes(domain, onlyWithDomain, includeVariants) {
+        return (await this.getResolver()).getRoutes(this._cgClient, domain, onlyWithDomain, includeVariants);
     }
-    async getContentInfoByPath(path, domain) {
+    async getContentInfoByPath(path, domain, variation) {
         const queryPath = typeof path == 'object' && path != null ? path.pathname : path;
         const queryDomain = typeof path == 'object' && path != null ? path.protocol + '//' + path.host : domain;
-        return (await this.getResolver()).getRouteByPath(this._cgClient, queryPath, queryDomain);
+        return (await this.getResolver()).getRouteByPath(this._cgClient, queryPath, queryDomain, variation);
     }
     async getContentInfoById(key, locale, version) {
         return (await this.getResolver()).getRouteById(this._cgClient, key, locale, version);
     }
+    async getRouteByLink(contentLink) {
+        return (await this.getResolver()).getRouteByLink(this._cgClient, contentLink);
+    }
     /**
      * Extract a content link from a route definition
      *
@@ -85,7 +90,10 @@ export class RouteResolver {
         return {
             key: route.key,
             version: route.version,
-            locale: route.locale
+            locale: route.locale,
+            isInline: false,
+            variation: route.variation,
+            changeset: route.changeset
         };
     }
 }

package/dist/services/routing/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/services/routing/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/services/routing/resolver.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,YAAY,EAAE,EAAyB,iBAAiB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAU7G;;GAEG;AACH,MAAM,OAAO,aAAa;IAMxB,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAED,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;IAED,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,aAAa,CAAA;IAC3B,CAAC;IAED;;;;;;;;;OASG;IACH,YACE,cAAyD,EACzD,UAAwB,qBAAqB,EAC7C,YAA4B;QAE5B,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;QAClG,IAAI,CAAC,eAAe,GAAG,OAAO,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,YAAY,IAAI,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAA;IAC1E,CAAC;IAEM,aAAa,CAAC,SAAkB;QACrC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK;gBACtB,OAAO,CAAC,GAAG,CAAC,wDAAwD,EAAE,SAAS,IAAI,SAAS,CAAC,CAAA;YAC/F,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QACnC,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,cAAc;QACnB,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK;gBACtB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;YACzD,QAAQ,CAAC,cAAc,EAAE,CAAA;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,aAA2C,CAAA;YAC/C,IAAI,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;gBAC9C,aAAa,GAAG,CAAC,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC,OAAO,CAAA;YACpE,CAAC;iBAAM,CAAC;gBACN,aAAa,GAAG,CAAC,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC,OAAO,CAAA;YACpE,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,IAAI,aAAa,EAAE,CAAA;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAED;;;;;;;;;;OAUG;IACI,KAAK,CAAC,SAAS,CAAC,MAAe,EAAE,cAAwB,EAAE,eAAyB;QACzF,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,CAAC,CAAA;IACtG,CAAC;IAaM,KAAK,CAAC,oBAAoB,CAAC,IAAkB,EAAE,MAAe,EAAE,SAAkB;QACvF,MAAM,SAAS,GAAG,OAAO,IAAI,IAAI,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAA;QAChF,MAAM,WAAW,GAAG,OAAO,IAAI,IAAI,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAA;QAEvG,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAA;IACrG,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,GAAW,EAAE,MAAe,EAAE,OAAyB;QACrF,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IACtF,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAA2B;QACrD,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;IAC/E,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,KAAY;QACpC,OAAO;YACL,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAA;IACH,CAAC;CACF;AAED,eAAe,aAAa,CAAA"}

package/dist/services/routing/types.d.ts

@@ -1,4 +1,4 @@
-import type { ContentLinkWithLocale } from '../types.js';
+import type { AnyContentLink, ContentLinkWithLocale } from '../types.js';
 export type Route = {
     locale: string;
     path: string;
@@ -7,8 +7,17 @@ export type Route = {
     changed: Date | null;
     contentType: string[];
     version?: string | null;
+    changeset?: string | null;
+    variation?: string | null;
     key: string;
 };
+export type VariationInput = {
+    include: "ALL" | "NONE";
+} | {
+    include: "SOME";
+    value: Array<string>;
+    includeOriginal?: boolean | null;
+};
 /**
  * Main Router pattern, allow for implementation specific overrides
  */
@@ -36,20 +45,30 @@ export interface IRouteResolver {
      * @param       onlyWithDomain      If set/kept to `undefined` will only filter by domain. When
      *                                  set to `true`, requires the domain (CMS SaaS/13 only) to be
      *                                  set. This allows to get all routes bound to a domain.
+     * @param       includeVariants     If set to `true` the output will include all variants for
+     *                                  each item in the CMS.
      * @returns     The list of routes
      */
-    getRoutes(domainOrChannelId?: string, onlyWithDomain?: boolean): Promise<Route[]>;
+    getRoutes(domainOrChannelId?: string, onlyWithDomain?: boolean, includeVariants?: boolean): Promise<Route[]>;
     /**
      * Resolve a path to route information, either from string or from URL
      * object.
      *
      * @param       path        The path to resolve for
      * @param       domain      The domain to filter the results by
+     * @param       variation   The name of the variation to filter the routes by
      * @returns     The route information for the path
      */
     getContentInfoByPath(path: URL): Promise<undefined | Route>;
-    getContentInfoByPath(path: string, domain?: string): Promise<undefined | Route>;
-    getContentInfoByPath(path: URL | string, domain?: string): Promise<undefined | Route>;
+    getContentInfoByPath(path: string, domain?: string, variation?: string): Promise<undefined | Route>;
+    getContentInfoByPath(path: URL | string, domain?: string, variation?: string): Promise<undefined | Route>;
+    /**
+     * Retrieve all route information based upon the contentLink given
+     *
+     * @param contentLink
+     * @returns The route information for the given contentLink
+     */
+    getRouteByLink(contentLink: AnyContentLink): Promise<undefined | Route>;
     /**
      * Extract a content link from a route definition
      *

package/dist/services/types.d.ts

@@ -2,11 +2,17 @@ export type ContentLink = {
     key: string;
     version?: string | null;
     isInline?: boolean;
+    variation?: string | null;
+    changeset?: string | null;
+    status?: string | null;
 };
 export type InlineContentLink = {
     key?: null | "";
     version?: null;
     isInline?: true;
+    variation?: string | null;
+    changeset?: string | null;
+    status?: string | null;
 };
 export type ContentLinkWithLocale<LocaleType = string> = ContentLink & {
     locale?: LocaleType;
@@ -14,3 +20,4 @@ export type ContentLinkWithLocale<LocaleType = string> = ContentLink & {
 export type InlineContentLinkWithLocale<LocaleType = string> = InlineContentLink & {
     locale?: LocaleType;
 };
+export type AnyContentLink = ContentLink | ContentLinkWithLocale | InlineContentLink | InlineContentLinkWithLocale;

package/dist/services/utils.d.ts

@@ -55,13 +55,14 @@ type Nullable<T> = {
     [K in keyof T]?: T[K] | null;
 } | null | undefined;
 /**
- * Take the normalizable value
+ * Take the input object and ensure that only the properties within ContentLink are actually
+ * retained.
  *
- * @param toNormalize
+ * @param     toNormalize
  * @returns
  */
 export declare function normalizeContentLink(toNormalize: Nullable<ContentLink | InlineContentLink>): ContentLink | InlineContentLink | undefined;
-export declare function normalizeContentLinkWithLocale<LT = string>(toNormalize: Nullable<ContentLinkWithLocale<LT>>): ContentLinkWithLocale<LT> | undefined;
+export declare function normalizeContentLinkWithLocale<LT = string>(toNormalize: Nullable<ContentLinkWithLocale<LT>>): ContentLinkWithLocale<LT> | InlineContentLinkWithLocale<LT> | undefined;
 /**
  * Create a textual representation of a content link
  *

package/dist/services/utils.js

@@ -63,6 +63,9 @@ export function isContentLink(toTest) {
     // It must be an object
     if (typeof (toTest) != 'object' || toTest == null)
         return false;
+    // Check if this is an explicit inline content item
+    if (toTest.isInline === true)
+        return false;
     // The object must have a key, string, miniumum length 1 char
     return typeof (toTest.key) == 'string' && toTest.key.length > 0;
 }
@@ -124,24 +127,30 @@ function isOptionalString(value) {
     return value === null || value === undefined || typeof (value) == 'string';
 }
 /**
- * Take the normalizable value
+ * Take the input object and ensure that only the properties within ContentLink are actually
+ * retained.
  *
- * @param toNormalize
+ * @param     toNormalize
  * @returns
  */
 export function normalizeContentLink(toNormalize) {
-    if (!(isContentLink(toNormalize) || isInlineContentLink(toNormalize)))
-        return undefined;
-    const newLink = {
-        key: toNormalize.key
-    };
-    if (toNormalize.version)
-        newLink.version = toNormalize.version.toString();
-    return toNormalize;
+    const newLink = isContentLink(toNormalize) ? {
+        key: toNormalize.key,
+        isInline: false,
+        changeset: toNormalize.changeset ?? undefined,
+        variation: toNormalize.variation ?? undefined,
+        version: toNormalize.version ? toNormalize.version.toString() : undefined
+    } : (isInlineContentLink(toNormalize) ? {
+        key: null,
+        isInline: true,
+        changeset: toNormalize.changeset ?? undefined,
+        variation: toNormalize.variation ?? undefined
+    } : undefined);
+    return newLink;
 }
 export function normalizeContentLinkWithLocale(toNormalize) {
     const normalized = normalizeContentLink(toNormalize);
-    if (normalized && toNormalize?.locale != undefined && !(typeof (toNormalize?.locale) == 'string' && (toNormalize.locale.length == 2 || toNormalize.locale.length == 5)))
+    if (normalized && typeof (toNormalize?.locale) == 'string' && (toNormalize.locale.length == 2 || toNormalize.locale.length == 5))
         normalized.locale = toNormalize.locale;
     return normalized;
 }

package/dist/services/utils.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remkoj/optimizely-graph-client",
   "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",
@@ -51,20 +51,17 @@
   },
   "devDependencies": {
     "@types/crypto-js": "^4.2.2",
-    "@types/node": "^22.16.5",
-    "graphql": "^16.11.0",
-    "graphql-request": "^6.1.0",
+    "@types/node": "^22.18.12",
     "openapi-typescript-codegen": "^0.29.0",
     "prop-types": "^15.8.1",
-    "scheduler": "^0.26.0",
-    "typescript": "^5.8.3"
+    "scheduler": "^0.27.0",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "crypto-js": "^4.2.0",
-    "uuid": "^11.1.0"
-  },
-  "peerDependencies": {
-    "graphql-request": "^6"
+    "graphql": "^16.11.0",
+    "graphql-request": "^7.3.1",
+    "uuid": "^13.0.0"
   },
   "scripts": {
     "clean": "tsc --build --clean",
@@ -73,5 +70,6 @@
     "watch": "yarn tsc --watch",
     "recompile": "tsc --build --clean && tsc --build --force",
     "generate": "openapi --input https://cg.optimizely.com/app/swagger/swagger.json --output ./src/admin-api/client --name OptimizelyGraphAdminApi && node ./scripts/update-imports.cjs"
-  }
+  },
+  "stableVersion": "5.1.0"
 }