@remkoj/optimizely-cms-nextjs 1.0.3 → 2.0.0-pre1

package/dist/metadata.js

@@ -1,6 +1,5 @@
 import createClient, { isContentGraphClient } from '@remkoj/optimizely-graph-client';
 import { isOptimizelyNextPageWithMetaData } from './page';
-const DEBUG = process.env.DXP_DEBUG == '1';
 export class MetaDataResolver {
     _cgClient;
     constructor(clientOrConfig) {
@@ -16,16 +15,16 @@ export class MetaDataResolver {
      * @returns             A Promise for the metadata of the given content type & instance
      */
     async resolve(factory, contentLink, contentType, locale) {
-        if (DEBUG)
+        if (this._cgClient.debug)
             console.log("[MetaDataResolver] Resolving metadata for:", contentLink, contentType, locale);
-        if (locale.includes("-"))
+        if (locale && locale.includes("-"))
             throw new Error("Invalid character detected within the locale");
         const Component = factory.resolve(contentType);
         if (!Component)
             return {};
         if (isOptimizelyNextPageWithMetaData(Component) && Component.getMetaData) {
             const meta = await Component.getMetaData(contentLink, locale, this._cgClient);
-            if (DEBUG)
+            if (this._cgClient.debug)
                 console.log("[MetaDataResolver] Resolved metadata to:", meta);
             return meta;
         }

package/dist/metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,EAAE,EAAE,oBAAoB,EAAqD,MAAM,iCAAiC,CAAA;AAEvI,OAAO,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAA;AAEzD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAA;AAE1C,MAAM,OAAO,gBAAgB;IAEjB,SAAS,CAAmB;IAEpC,YAAmB,cAAyD;QAExE,IAAI,CAAC,SAAS,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;IACzG,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,OAAO,CAAC,OAAyB,EAAE,WAAwB,EAAE,WAAqB,EAAE,MAAc;QAE3G,IAAI,KAAK;YACL,OAAO,CAAC,GAAG,CAAC,4CAA4C,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;QAE/F,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QAEnE,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS;YACV,OAAO,EAAE,CAAA;QAEb,IAAI,gCAAgC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACvE,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAC7E,IAAI,KAAK;gBACL,OAAO,CAAC,GAAG,CAAC,0CAA0C,EAAE,IAAI,CAAC,CAAA;YACjE,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAED,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,EAAE,EAAE,oBAAoB,EAAqD,MAAM,iCAAiC,CAAA;AAEvI,OAAO,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAA;AAEzD,MAAM,OAAO,gBAAgB;IAEjB,SAAS,CAAmB;IAEpC,YAAmB,cAAyD;QAExE,IAAI,CAAC,SAAS,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;IACzG,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,OAAO,CAAC,OAAyB,EAAE,WAAwB,EAAE,WAAqB,EAAE,MAAsB;QAEnH,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK;YACpB,OAAO,CAAC,GAAG,CAAC,4CAA4C,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;QAE/F,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QAEnE,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS;YACV,OAAO,EAAE,CAAA;QAEb,IAAI,gCAAgC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACvE,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAC7E,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK;gBACpB,OAAO,CAAC,GAAG,CAAC,0CAA0C,EAAE,IAAI,CAAC,CAAA;YACjE,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAED,eAAe,gBAAgB,CAAA"}

package/dist/ope/data.js

@@ -2,26 +2,26 @@ import { gql } from 'graphql-request';
 export const getContentById = async (client, variables) => {
     return await client.request(gqlQuery, variables);
 };
-const gqlQuery = gql `query getContentByIdBase($id: Int, $workId: Int, $guidValue: String, $locale: [Locales!], $isCommonDraft: Boolean) {
-    Content(
+const gqlQuery = gql `query getContentByIdBase($key: String!, $version: String, $locale: [Locales!], $path: String, $domain: String) {
+    content: Content(
         where: {
-            ContentLink: { Id: { eq: $id }, WorkId: { eq: $workId }, GuidValue: { eq: $guidValue } }
-            IsCommonDraft: { eq: $isCommonDraft }
+            _or: [
+                { _metadata: { key: { eq: $key }, version: { eq: $version } } }
+                { _metadata: { url: { hierarchical: { eq: $path }, base: { eq: $domain } }, version: { eq: $version } } }
+            ]
         }
         locale: $locale
     ) {
         total
         items {
-            contentType: ContentType
-            id: ContentLink {
-                id: Id
-                workId: WorkId
-                guidValue: GuidValue
+            _metadata {
+                key
+                locale
+                types
+                displayName
+                version
             }
-            locale: Language {
-                name: Name
-            }
-            path: RelativePath
+            _type: __typename
         }
     }
 }`;

package/dist/ope/data.js.map

@@ -1 +1 @@
-{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/ope/data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AAErC,MAAM,CAAC,MAAM,cAAc,GAA0B,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;IAE7E,OAAO,MAAM,MAAM,CAAC,OAAO,CAA8C,QAAQ,EAAE,SAAS,CAAC,CAAA;AACjG,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;EAsBlB,CAAA"}
+{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/ope/data.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,GAAG,EAAE,MAAM,iBAAiB,CAAA;AAE1D,MAAM,CAAC,MAAM,cAAc,GAA0B,KAAK,EAAuB,MAAqB,EAAE,SAAwC,EAAE,EAAE;IAEhJ,OAAO,MAAM,MAAM,CAAC,OAAO,CAAgE,QAAQ,EAAE,SAAS,CAAC,CAAA;AACnH,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;EAsBlB,CAAA"}

package/dist/ope/page.d.ts

@@ -1,6 +1,5 @@
 import 'server-only';
 import type { EditPageComponent, EditViewOptions } from './types';
-import { type Services } from '@remkoj/optimizely-graph-client';
 import { type ComponentFactory } from '@remkoj/optimizely-cms-react/rsc';
 /**
  * Create the EditPage component needed by Next.JS to render the "On Page
@@ -8,10 +7,9 @@ import { type ComponentFactory } from '@remkoj/optimizely-cms-react/rsc';
  *
  * @param   dxpUrl      The domain of the CMS instance
  * @param   client      The Apollo GraphQL client to use
- * @param   channel     The static site definition to use
  * @param   factory     The component factory to be used
  * @param   options     The optional options to use to control the edit page
  * @returns The React Component that can be used by Next.JS to render the page
  */
-export declare function createEditPageComponent(channel: Readonly<Services.ChannelDefinition>, factory: ComponentFactory, options?: Partial<EditViewOptions>): EditPageComponent;
+export declare function createEditPageComponent(factory: ComponentFactory, options?: Partial<EditViewOptions>): EditPageComponent;
 export default createEditPageComponent;

package/dist/ope/page.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import 'server-only';
 import { AuthMode } from '@remkoj/optimizely-graph-client';
+import { contentLinkToString } from '@remkoj/optimizely-graph-client/utils';
 import { Utils } from '@remkoj/optimizely-cms-react';
 import { CmsContent, getServerContext } from '@remkoj/optimizely-cms-react/rsc';
 import { notFound } from 'next/navigation';
@@ -9,29 +10,81 @@ import { getAuthorizedServerClient } from '../client';
 import React from 'react';
 import Script from 'next/script';
 import { getContentById } from './data';
+function readValue(variableName, defaultValue) {
+    try {
+        const stringValue = process?.env ? process.env[variableName] : undefined;
+        return stringValue || defaultValue;
+    }
+    catch {
+        return defaultValue;
+    }
+}
+function readValueAsInt(variableName, defaultValue) {
+    const stringValue = readValue(variableName);
+    if (!stringValue)
+        return defaultValue;
+    try {
+        return parseInt(stringValue);
+    }
+    catch {
+        return defaultValue;
+    }
+}
 const defaultOptions = {
     refreshDelay: 2000,
     refreshNotice: () => _jsx("div", { className: 'optly-refresh-notice', children: "Updating preview, please wait...." }),
     errorNotice: props => _jsxs("div", { className: 'optly-error-notice', children: [_jsx("div", { className: 'optly-error-title', children: props.title }), _jsx("div", { className: 'optly-error-message', children: props.message })] }),
     layout: props => _jsx("div", { className: 'optly-edit-page', "data-locale": props.locale, children: props.children }),
     loader: getContentById,
-    clientFactory: (token) => getAuthorizedServerClient(token)
+    clientFactory: (token) => getAuthorizedServerClient(token),
+    communicationInjectorPath: '/util/javascript/communicationinjector.js'
 };
+// Helper function to read the ContentID & WorkID
+function getContentRequest(path = "", searchParams) {
+    try {
+        if (searchParams.preview_token == AuthMode.HMAC || searchParams.preview_token == AuthMode.Basic) {
+            console.error("[OnPageEdit] 🦺 Edit mode requested with developer tokens, falling back to URL parsing to determine content");
+            const fullPath = Array.isArray(path) ? path.map(p => decodeURIComponent(p)).join('/') : decodeURI(path);
+            const [cmsPath, contentString] = fullPath.split(',,', 3);
+            const [contentKey, contentVersion] = (contentString ?? '').split('_', 3);
+            const contentPath = (cmsPath.startsWith('/') ? cmsPath.substring(1) : cmsPath).replace(/^(ui\/){0,1}(CMS\/){0,1}(Content\/){0,1}/gi, "");
+            const firstSlug = contentPath.split('/')[0];
+            const contentLocale = firstSlug?.length == 2 || firstSlug?.length == 5 ? firstSlug : undefined;
+            return {
+                key: contentKey,
+                version: contentVersion,
+                locale: contentLocale,
+                path: '/' + contentPath + (contentPath.endsWith('/') ? '' : '/')
+            };
+        }
+        else {
+            const tokenInfo = JSON.parse(atob(searchParams.preview_token.split('.')[1]));
+            return {
+                key: tokenInfo.key,
+                version: tokenInfo.ver,
+                locale: tokenInfo.loc,
+                path: ''
+            };
+        }
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Create the EditPage component needed by Next.JS to render the "On Page
  * Editing" variant of the content item selected by the editor.
  *
  * @param   dxpUrl      The domain of the CMS instance
  * @param   client      The Apollo GraphQL client to use
- * @param   channel     The static site definition to use
  * @param   factory     The component factory to be used
  * @param   options     The optional options to use to control the edit page
  * @returns The React Component that can be used by Next.JS to render the page
  */
-export function createEditPageComponent(channel, factory, options) {
-    const { layout: PageLayout, refreshNotice: RefreshNotice, refreshDelay, errorNotice: ErrorNotice, loader: getContentById, clientFactory } = { ...defaultOptions, ...options };
-    const dxpUrl = channel.getCmsUrl();
-    async function EditPage({ params, searchParams }) {
+export function createEditPageComponent(factory, options) {
+    const envRefreshDelay = readValueAsInt("OPTIMIZELY_CONTENTGRAPH_UPDATE_DELAY", defaultOptions.refreshDelay);
+    const { layout: PageLayout, refreshNotice: RefreshNotice, refreshDelay, errorNotice: ErrorNotice, loader: getContentById, clientFactory, communicationInjectorPath } = { ...defaultOptions, refreshDelay: envRefreshDelay, ...options };
+    async function EditPage({ params: { path }, searchParams }) {
         // Create context
         const context = getServerContext();
         // Validate the search parameters
@@ -49,85 +102,56 @@ export function createEditPageComponent(channel, factory, options) {
         }
         if (context.isDebug)
             console.log(`[OnPageEdit] Valid edit mode request: EpiEditMode=${searchParams.epieditmode}`);
-        // Helper function to read the ContentID & WorkID
-        function getContentIds() {
-            try {
-                // When using HMAC authentication, fall back to information in the URL
-                if (validDev) {
-                    const contentString = slugs.join('/').split(',,').pop() ?? '';
-                    const [contentId, workId] = contentString.split('_', 3);
-                    return [Number.parseInt(contentId), workId ? Number.parseInt(workId) : null];
-                }
-                // Normally take the information from the token
-                const jwt = JSON.parse(Buffer.from((token || '..').split('.', 3)[1], 'base64').toString());
-                const contentId = Number.parseInt(jwt?.c_id || '-1', 10);
-                const workId = Number.parseInt(jwt?.c_ver || '0') || null;
-                if ((jwt.exp * 1000) < Date.now())
-                    console.warn("[OnPageEdit] Token has expired, it is unlikely that you are able to fetch content with it");
-                return [contentId, workId];
-            }
-            catch {
-                return [-1, null];
-            }
-        }
         // Build context
         const client = clientFactory(token);
         context.setOptimizelyGraphClient(client);
         context.setComponentFactory(factory);
         context.setInEditMode(epiEditMode == 'true');
         // Get information from the Request URI
-        const requestPath = ('/' + params.path.map(decodeURIComponent).join('/')).replace(/^(\/ui){0,1}(\/cms){0,1}(\/content){0,1}\//i, '');
-        const slugs = requestPath.split('/');
-        const locale = channel.locales.some(x => x.slug == slugs[0]) ? slugs[0] : channel.defaultLocale;
-        if (context.isDebug)
-            console.log(`[OnPageEdit] Inferred content locale from path: ${locale}`);
-        const [contentId, workId] = getContentIds();
-        context.setLocale(channel.localeToGraphLocale(locale));
-        const contentLink = {
-            id: contentId,
-            workId: workId,
-            guidValue: null,
-            locale: locale
-        };
-        const variables = {
-            ...contentLink,
-            locale: contentLink.locale,
-            isCommonDraft: !contentLink.workId ? true : null
-        };
+        const contentRequest = getContentRequest(path, searchParams);
+        if (!contentRequest) {
+            console.error("[OnPageEdit] Unable to resolve requested content");
+            return notFound();
+        }
         if (context.isDebug) {
-            console.log("[OnPageEdit] Requested content:", JSON.stringify(variables));
+            console.log("[OnPageEdit] Requested content:", JSON.stringify(contentRequest));
             console.log("[OnPageEdit] Creating GraphQL Client:", token);
         }
         try {
-            const contentInfo = await getContentById(client, variables);
-            const contentItem = (contentInfo?.Content?.items ?? [])[0];
-            const contentType = Utils.normalizeContentType(contentItem?.contentType);
+            const contentInfo = await getContentById(client, contentRequest);
+            if ((contentInfo?.content?.total ?? 0) > 1) {
+                console.warn("[OnPageEdit] Content request " + JSON.stringify(contentRequest) + " yielded more then one item, picking first matching");
+            }
+            const contentItem = (contentInfo?.content?.items ?? [])[0];
+            const contentType = Utils.normalizeContentType(contentItem?._metadata.types);
             // Return a 404 if the content item or type could not be resolved
             if (!contentItem) {
-                console.warn(`[OnPageEdit] The content item for ${JSON.stringify(variables)} could not be loaded from Optimizely Graph`);
+                console.warn(`[OnPageEdit] The content item for ${JSON.stringify(contentRequest)} could not be loaded from Optimizely Graph`);
                 return notFound();
             }
             if (!contentType) {
-                console.warn(`[OnPageEdit] The content item for ${JSON.stringify(variables)} did not contain content type information`);
+                console.warn(`[OnPageEdit] The content item for ${JSON.stringify(contentRequest)} did not contain content type information`);
                 return notFound();
             }
+            const contentLink = {
+                key: contentItem._metadata.key,
+                locale: contentItem._metadata.locale,
+                version: contentItem._metadata.version
+            };
             if (context.isDebug) {
-                const contentItemId = contentItem?.id;
                 console.log("[OnPageEdit] Resolved content:", JSON.stringify({
-                    id: contentItemId?.id,
-                    workId: contentItemId?.workId,
-                    guidValue: contentItemId?.guidValue,
-                    locale: contentItem.locale?.name,
-                    type: (contentItem.contentType ?? []).slice(0, -1).join('/')
+                    ...contentLink,
+                    type: (contentItem.contentType ?? []).join('/')
                 }));
             }
             // Store the editable content so it can be tested
             context.setEditableContentId(contentLink);
+            if (contentLink.locale)
+                context.setLocale(contentLink.locale);
             // Render the content, with edit mode context
-            const isPage = contentItem.contentType?.some(x => x?.toLowerCase() == "page") ?? false;
-            const loadedContentId = Utils.normalizeContentLinkWithLocale({ ...contentItem?.id, locale: contentItem?.locale?.name });
+            const isPage = contentType.some(x => x?.toLowerCase() == "page") ?? false;
             const Layout = isPage ? PageLayout : React.Fragment;
-            const output = _jsxs(_Fragment, { children: [context.inEditMode && _jsx(Script, { src: `${dxpUrl}/ui/CMS/latest/clientresources/communicationinjector.js`, strategy: 'afterInteractive' }), _jsxs(Layout, { locale: locale, children: [_jsx(OnPageEdit, { timeout: refreshDelay, mode: context.inEditMode ? 'edit' : 'preview', className: 'bg-slate-900 absolute top-0 left-0 w-screen h-screen opacity-60 z-50', children: _jsx(RefreshNotice, {}) }), _jsx(CmsContent, { contentType: contentType, contentLink: contentLink, fragmentData: contentItem })] }), _jsxs("div", { className: 'optly-contentLink', children: ["ID: ", loadedContentId?.id ?? "-", " | Version: ", loadedContentId?.workId ?? "-", " | Global ID: ", loadedContentId?.guidValue ?? "-", " | Locale: ", loadedContentId?.locale ?? ""] })] });
+            const output = _jsxs(_Fragment, { children: [_jsx(Script, { src: new URL(communicationInjectorPath, client.siteInfo.cmsURL).href, strategy: 'afterInteractive' }), _jsxs(Layout, { locale: contentItem.locale?.name ?? '', children: [_jsx(OnPageEdit, { timeout: refreshDelay, mode: context.inEditMode ? 'edit' : 'preview', children: _jsx(RefreshNotice, {}) }), _jsx(CmsContent, { contentType: contentType, contentLink: contentLink, fragmentData: contentItem })] }), _jsxs("div", { className: 'optly-contentLink', children: ["ContentItem: ", contentLink ? contentLinkToString(contentLink) : "Invalid content link returned from Optimizely Graph"] })] });
             return output;
         }
         catch (e) {

package/dist/ope/page.js.map

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

package/dist/ope/types.d.ts

@@ -1,6 +1,8 @@
-import type { ComponentType, PropsWithChildren } from 'react';
-import type { ClientFactory } from '@remkoj/optimizely-graph-client';
-import type { GraphQLClient } from 'graphql-request';
+import { type ComponentType, type PropsWithChildren } from 'react';
+import { type ClientFactory } from '@remkoj/optimizely-graph-client';
+import { type GraphQLClient } from 'graphql-request';
+import { type ContentQueryProps } from '@remkoj/optimizely-cms-react';
+export { type ContentQueryProps } from '@remkoj/optimizely-cms-react';
 type ServerPageProps = {
     params: Record<string, string | Array<string>>;
     searchParams: Record<string, string>;
@@ -44,30 +46,35 @@ export type EditViewOptions = {
      * The base content loader to be used for the edit view
      */
     loader: GetContentByIdMethod;
+    /**
+     * The factory used to create a new Optimizely Graph Client
+     */
     clientFactory: ClientFactory;
+    /**
+     * If provided, this allows to override the CommunicationInjector
+     * path.
+     */
+    communicationInjectorPath: string;
 };
-export type GetContentByIdVariables = {
-    id?: number;
-    workId?: number | null;
-    guidValue?: string | null;
-    locale?: string | Array<string>;
-    isCommonDraft?: boolean | null;
-};
-export type GetContentByIdData = {
-    Content: {
-        items: {
-            contentType?: Array<string | null> | null;
-            id: {
-                id?: number | null;
-                workId?: number | null;
-                guidValue?: string | null;
+export type GetContentByIdData<LocaleType = string> = {
+    content: {
+        total: number;
+        items: Array<{
+            _metadata: {
+                key: string;
+                locale: LocaleType;
+                types: Array<string>;
+                displayName: string;
+                version?: string | null;
+                url?: {
+                    base?: string | null;
+                    hierarchical?: string | null;
+                    default?: string | null;
+                } | null;
             };
-            locale?: {
-                name?: string | null;
-            } | null;
-            path?: string | null;
-        }[];
+            _type: string;
+            [fieldName: string]: any;
+        }>;
     };
 };
-export type GetContentByIdMethod = (client: GraphQLClient, variables: GetContentByIdVariables) => Promise<GetContentByIdData>;
-export {};
+export type GetContentByIdMethod = <LocaleType = string>(client: GraphQLClient, variables: ContentQueryProps<LocaleType>) => Promise<GetContentByIdData<LocaleType>>;

package/dist/publish/index.d.ts

@@ -1,10 +1,27 @@
-import { type NextRequest, NextResponse } from 'next/server';
-import { type IOptiGraphClient } from "@remkoj/optimizely-graph-client";
-export type PublishApiResponse = {
-    status: "success" | "no-publish";
-    paths?: string[];
-} | {
-    error: string;
+import { type NextRequest, NextResponse } from "next/server";
+import { revalidatePath } from "next/cache";
+import { type IOptiGraphClient, type OptimizelyGraphConfig, type ClientFactory } from "@remkoj/optimizely-graph-client";
+type PublishScopes = NonNullable<Parameters<typeof revalidatePath>[1]>;
+type OptiGraphClientFactory = IOptiGraphClient | OptimizelyGraphConfig | ClientFactory;
+type PublishApiOptions = {
+    /**
+     * The list of paths that your implementation uses with Optimizely CMS managed
+     * content
+     */
+    paths: Array<string>;
+    /**
+     * The scopes for which to revalidate the cache
+     */
+    scopes?: Array<PublishScopes>;
+    /**
+     * The tags to revalidate the cache for
+     */
+    tags?: Array<string>;
+    /**
+     * The Optimizely Graph client to use for Graph Operations needed to publish
+     * content
+     */
+    client?: OptiGraphClientFactory;
 };
-export declare function createPublishApi(client?: IOptiGraphClient): (req: NextRequest) => Promise<NextResponse<PublishApiResponse>>;
+export declare function createPublishApi(options: PublishApiOptions): (request: NextRequest) => Promise<NextResponse>;
 export default createPublishApi;

package/dist/publish/index.js

@@ -1,11 +1,14 @@
-import { NextResponse } from 'next/server';
+import { NextResponse } from "next/server";
+import { revalidatePath, revalidateTag } from "next/cache";
+import { isContentGraphClient, ContentGraphClient } from "@remkoj/optimizely-graph-client";
 import { getServerClient } from '../client';
-import { revalidatePath } from 'next/cache';
-const editPaths = ['/ui/[[...path]]'];
-const publishedPaths = ['/[lang]', '/[lang]/[[...path]]', '/sitemap', '/sitemap.xml'];
-const paths = [...editPaths, ...publishedPaths];
-export function createPublishApi(client) {
-    const graphClient = client ?? getServerClient();
+export function createPublishApi(options) {
+    const defaultOptions = {
+        paths: [],
+        client: getServerClient,
+        scopes: ['page', 'layout'],
+        tags: []
+    };
     function tryJsonParse(data) {
         if (typeof (data) != 'string')
             return null;
@@ -16,14 +19,19 @@ export function createPublishApi(client) {
             return null;
         }
     }
-    const publishHandler = async (req) => {
-        // Validate access
-        const xAuthToken = req.headers.get("X-OPTLY-PUBLISH") ??
-            req.nextUrl.searchParams.get("token") ??
+    const { client: clientFactory, paths, scopes, tags } = {
+        ...defaultOptions,
+        ...options
+    };
+    const client = typeof clientFactory == 'function' ? clientFactory() : (isContentGraphClient(clientFactory) ? clientFactory : new ContentGraphClient(clientFactory));
+    return async function (request) {
+        // Authorize the request
+        const xAuthToken = request.headers.get("X-OPTLY-PUBLISH") ??
+            request.nextUrl.searchParams.get("token") ??
             undefined;
-        const serverToken = graphClient.siteInfo.publishToken;
+        const serverToken = client.siteInfo.publishToken;
         if (!serverToken || serverToken == "") {
-            console.error("No authentication configured, publishing has been disabled");
+            console.error("[Publish-API] No authentication configured, publishing has been disabled");
             return NextResponse.json({ error: "Not authorized" }, { status: 401 });
         }
         if (serverToken != xAuthToken) {
@@ -31,24 +39,24 @@ export function createPublishApi(client) {
             return NextResponse.json({ error: "Not authorized" }, { status: 401 });
         }
         // Get request data
-        const requestBody = tryJsonParse(await req.text());
-        // Don't publish if we're in selective mode and there's no data
-        if (!requestBody) {
-            console.log("Not flushing due to missing request body");
-            return NextResponse.json({ status: "no-publish" });
-        }
-        const action = requestBody.type?.action;
-        const subject = requestBody.type?.subject;
-        // Only publish on updated documents
-        if (subject != "doc" || action != "updated") {
-            console.log("Not flushing due to incorrect subject or type", JSON.stringify(requestBody));
-            return NextResponse.json({ status: "no-publish" });
-        }
-        paths.forEach(p => revalidatePath(p, 'page'));
-        console.log("Publishing => Revalidated (paths)", paths);
-        return NextResponse.json({ status: "success", paths });
+        const requestBody = tryJsonParse(await request.text());
+        console.log("[Publish-API] Graph Event: " + JSON.stringify(requestBody, undefined, 4));
+        // Keep track of what has been revalidated
+        const revalidated = [];
+        // Flush all
+        scopes.forEach(scope => {
+            paths.forEach(path => {
+                revalidatePath(path, scope);
+                revalidated.push({ path, scope });
+            });
+        });
+        tags.forEach(tag => {
+            revalidateTag(tag);
+            revalidated.push({ tag });
+        });
+        // Return result
+        return NextResponse.json({ success: true, revalidated });
     };
-    return publishHandler;
 }
 export default createPublishApi;
 //# sourceMappingURL=index.js.map

package/dist/publish/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/publish/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/publish/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1D,OAAO,EAAqD,oBAAoB,EAAsB,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AACjK,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AA4B3C,MAAM,UAAU,gBAAgB,CAAC,OAA0B;IAEvD,MAAM,cAAc,GAAiC;QACjD,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,CAAC,MAAM,EAAC,QAAQ,CAAC;QACzB,IAAI,EAAE,EAAE;KACX,CAAA;IAED,SAAS,YAAY,CAA6B,IAAoB;QAElE,IAAI,OAAM,CAAC,IAAI,CAAC,IAAI,QAAQ;YACxB,OAAO,IAAI,CAAA;QACf,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAM,CAAA;QAChC,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAA;QACf,CAAC;IACL,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;QACnD,GAAG,cAAc;QACjB,GAAG,OAAO;KACkB,CAAA;IAChC,MAAM,MAAM,GAAG,OAAO,aAAa,IAAI,UAAU,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnK,OAAO,KAAK,WAAU,OAAoB;QAEtC,wBAAwB;QACxB,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACrD,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC;YACzC,SAAS,CAAA;QACb,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAA;QAChD,IAAI,CAAC,WAAW,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;YACpC,OAAO,CAAC,KAAK,CAAC,0EAA0E,CAAC,CAAA;YACzF,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QACzE,CAAC;QACD,IAAI,WAAW,IAAI,UAAU,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,wDAAwD,EAAE,UAAU,CAAC,CAAA;YACnF,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QACzE,CAAC;QAED,mBAAmB;QACnB,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;QACtD,OAAO,CAAC,GAAG,CAAC,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;QAEtF,0CAA0C;QAC1C,MAAM,WAAW,GAAqE,EAAE,CAAA;QAExF,YAAY;QACZ,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACjB,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC3B,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YACrC,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACf,aAAa,CAAC,GAAG,CAAC,CAAA;YAClB,WAAW,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;QAEF,gBAAgB;QAChB,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAA;IAC5D,CAAC,CAAA;AACL,CAAC;AAED,eAAe,gBAAgB,CAAA"}

package/dist/types.d.ts

@@ -2,5 +2,5 @@ import type { IOptiGraphClient } from "@remkoj/optimizely-graph-client";
 import type { CmsComponent, ContentLink } from "@remkoj/optimizely-cms-react";
 import type { Metadata } from 'next';
 export type OptimizelyNextPage<T = {}> = CmsComponent<T> & {
-    getMetaData?: (contentLink: ContentLink, locale: string, client: IOptiGraphClient) => Promise<Metadata>;
+    getMetaData?: (contentLink: ContentLink, locale: string | null | undefined, client: IOptiGraphClient) => Promise<Metadata>;
 };