@sitecore-content-sdk/core 1.2.0-canary.2 → 1.2.0-canary.20

package/dist/cjs/client/sitecore-client.js

@@ -10,6 +10,7 @@ const site_1 = require("../site");
 const utils_2 = require("./utils");
 const native_fetcher_1 = require("../native-fetcher");
 const robots_service_1 = require("../site/robots-service");
+const models_1 = require("../editing/models");
 /**
  * Error page codes
  */
@@ -102,8 +103,9 @@ class SitecoreClient {
      */
     getHeadLinks(layoutData, options = {}) {
         const { enableStyles = true, enableThemes = true } = options;
-        const { contextId, edgeUrl } = this.initOptions.api.edge;
+        const { contextId: serverContextId, clientContextId, edgeUrl } = this.initOptions.api.edge;
         const headLinks = [];
+        const contextId = serverContextId || clientContextId;
         if (enableStyles) {
             const contentStyles = (0, layout_1.getContentStylesheetLink)(layoutData, contextId, edgeUrl);
             if (contentStyles)
@@ -149,7 +151,10 @@ class SitecoreClient {
             return null;
         }
         // If we're in Pages preview (editing) mode, prefetch the editing data
-        const { site, itemId, language, version, variantIds, layoutKind, mode } = previewData;
+        const { site, itemId, language, version, layoutKind, mode } = previewData;
+        const variantIds = Array.isArray(previewData.variantIds)
+            ? previewData.variantIds
+            : previewData.variantIds.split(',');
         const data = await this.editingService.fetchEditingData({
             itemId,
             language,
@@ -181,17 +186,14 @@ class SitecoreClient {
         if (!this.initOptions.api.local) {
             throw new Error('Component Library requires Sitecore apiHost and apiKey to be provided');
         }
-        const { itemId, componentUid, site, language, renderingId, dataSourceId, version, mode } = designLibData;
-        const componentData = await this.componentService.fetchComponentData({
-            siteName: site,
-            itemId,
+        const { itemId, componentUid, site, language, renderingId, dataSourceId, version, mode, generation, } = designLibData;
+        const componentData = await this.componentService.fetchComponentData(Object.assign({ siteName: site, itemId,
             language,
             componentUid,
             renderingId,
             dataSourceId,
             version,
-            mode,
-        }, fetchOptions);
+            mode }, (generation ? { generation } : {})), fetchOptions);
         if (!componentData) {
             throw new Error(`Unable to fetch editing data for preview ${JSON.stringify(designLibData)}`);
         }
@@ -199,7 +201,7 @@ class SitecoreClient {
             locale: designLibData.language,
             layout: componentData,
             siteName: ((_a = componentData.sitecore.context.site) === null || _a === void 0 ? void 0 : _a.name) || site,
-            mode: this.getPageMode(mode),
+            mode: this.getPageMode(mode, generation),
         };
         return page;
     }
@@ -333,18 +335,17 @@ class SitecoreClient {
     /**
      * Get page mode based on mode name
      * @param {PageModeName} mode - The mode name to get the page mode for
+     * @param { DesignLibraryVariantGeneration} generation - The variant generation mode, if applicable
      * @returns {PageMode} The page mode
      */
-    getPageMode(mode) {
+    getPageMode(mode, generation) {
         const pageMode = {
             name: mode,
             isNormal: false,
             isPreview: false,
             isEditing: false,
             isDesignLibrary: false,
-            designLibrary: {
-                isVariantGeneration: false,
-            },
+            designLibrary: { isVariantGeneration: false },
         };
         switch (mode) {
             case layout_1.LayoutServicePageState.Normal:
@@ -363,14 +364,13 @@ class SitecoreClient {
                 pageMode.isDesignLibrary = true;
                 pageMode.isEditing = true;
                 break;
-            case editing_1.DesignLibraryMode.VariantGeneration:
-                pageMode.isDesignLibrary = true;
-                pageMode.isEditing = true;
-                pageMode.designLibrary.isVariantGeneration = true;
-                break;
             default:
                 break;
         }
+        if (pageMode.isDesignLibrary && generation === models_1.DesignLibraryVariantGeneration.Variant) {
+            pageMode.designLibrary.isVariantGeneration = true;
+            pageMode.isEditing = true;
+        }
         return pageMode;
     }
     getClientFactory() {

package/dist/cjs/debug.js

@@ -40,6 +40,7 @@ exports.default = {
     robots: (0, debug_1.default)(`${rootNamespace}:robots`),
     redirects: (0, debug_1.default)(`${rootNamespace}:redirects`),
     personalize: (0, debug_1.default)(`${rootNamespace}:personalize`),
+    locale: (0, debug_1.default)(`${rootNamespace}:locale`),
     errorpages: (0, debug_1.default)(`${rootNamespace}:errorpages`),
     proxy: (0, debug_1.default)(`${rootNamespace}:proxy`),
 };

package/dist/cjs/editing/design-library.js

@@ -122,7 +122,5 @@ function getDesignLibraryScriptLink(sitecoreEdgeUrl = constants_1.SITECORE_EDGE_
  * @returns {boolean} True if the mode is a Design Library mode, false otherwise.
  */
 function isDesignLibraryMode(mode) {
-    return (mode === models_1.DesignLibraryMode.Normal ||
-        mode === models_1.DesignLibraryMode.Metadata ||
-        mode === models_1.DesignLibraryMode.VariantGeneration);
+    return mode === models_1.DesignLibraryMode.Normal || mode === models_1.DesignLibraryMode.Metadata;
 }

package/dist/cjs/editing/metadata.js

@@ -10,12 +10,14 @@ const trackedScopes = [
 ];
 /**
  * Get application metadata
+ * @param {boolean} allowWorkspaces - Whether to allow workspaces in the metadata generation.
+ * @returns {Metadata} The generated metadata.
  */
-function getMetadata() {
+function getMetadata(allowWorkspaces = false) {
     const metadata = { packages: {} };
     let queryResult = [];
     try {
-        queryResult = JSON.parse((0, child_process_1.execSync)('npm query [name*=@sitecore] --workspaces false').toString());
+        queryResult = JSON.parse((0, child_process_1.execSync)(`npm query [name*=@sitecore] --workspaces ${allowWorkspaces}`).toString());
     }
     catch (error) {
         console.error('Failed to retrieve sitecore packages using npm query', error);

package/dist/cjs/editing/models.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DesignLibraryMode = exports.MetadataKind = exports.LayoutKind = void 0;
+exports.DesignLibraryVariantGeneration = exports.DesignLibraryMode = exports.MetadataKind = exports.LayoutKind = void 0;
 /**
  * Represents the Editing Layout variant.
  * - shared - shared layout
@@ -28,6 +28,11 @@ var DesignLibraryMode;
     DesignLibraryMode["Normal"] = "library";
     /** Metadata mode */
     DesignLibraryMode["Metadata"] = "library-metadata";
-    /** Variant generation mode */
-    DesignLibraryMode["VariantGeneration"] = "library-variant-generation";
 })(DesignLibraryMode || (exports.DesignLibraryMode = DesignLibraryMode = {}));
+/**
+ * Variant generation mode for Design Library
+ */
+var DesignLibraryVariantGeneration;
+(function (DesignLibraryVariantGeneration) {
+    DesignLibraryVariantGeneration["Variant"] = "variant";
+})(DesignLibraryVariantGeneration || (exports.DesignLibraryVariantGeneration = DesignLibraryVariantGeneration = {}));

package/dist/cjs/i18n/index.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DictionaryService = void 0;
+exports.getLocaleRewrite = exports.DictionaryService = void 0;
 var dictionary_service_1 = require("./dictionary-service");
 Object.defineProperty(exports, "DictionaryService", { enumerable: true, get: function () { return dictionary_service_1.DictionaryService; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "getLocaleRewrite", { enumerable: true, get: function () { return utils_1.getLocaleRewrite; } });

package/dist/cjs/i18n/utils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocaleRewrite = getLocaleRewrite;
+/**
+ * Get a locale rewrite path for given pathname
+ * @param {string} pathname the pathname
+ * @param {string} locale the site data to include in the rewrite
+ * @returns {string} the rewrite path
+ */
+function getLocaleRewrite(pathname, locale) {
+    const path = pathname.startsWith('/') ? pathname : '/' + pathname;
+    return `/${locale}${path}`;
+}

package/dist/cjs/personalize/utils.js

@@ -14,8 +14,8 @@ exports.VARIANT_PREFIX = '_variantId_';
  * @returns {string} the rewrite path
  */
 function getPersonalizedRewrite(pathname, variantIds) {
-    const path = pathname.startsWith('/') ? pathname : '/' + pathname;
-    return `${variantIds.map((variantId) => `/${exports.VARIANT_PREFIX}${variantId}`).join('')}${path}`;
+    const path = pathname.endsWith('/') ? pathname.slice(0, -1) : pathname;
+    return `${path}${variantIds.map((variantId) => `/${exports.VARIANT_PREFIX}${variantId}`).join('')}`;
 }
 /**
  * Get personalize data from the rewrite path

package/dist/cjs/tools/generateMetadata.js

@@ -11,13 +11,13 @@ const ensurePath_1 = require("../utils/ensurePath");
 /**
  * Generate application metadata
  * @param {GenerateMetadataConfig} config - Optional configuration for generating metadata.
- * If not provided, the default '.sitecore/metadata.json' will be used.
+ * If not provided, the default '.sitecore/metadata.json' will be used and allowWorkspaces will be set to false.
  * @returns {Promise<void>} A promise that resolves when the metadata generation is complete.
  */
 const generateMetadata = (config) => {
     return async () => {
         var _a;
-        const metadata = (0, metadata_1.getMetadata)();
+        const metadata = (0, metadata_1.getMetadata)(!!(config === null || config === void 0 ? void 0 : config.allowWorkspaces));
         writeMetadata(metadata, (_a = config === null || config === void 0 ? void 0 : config.destinationPath) !== null && _a !== void 0 ? _a : '.sitecore/metadata.json');
     };
 };

package/dist/cjs/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tryParseEnvValue = exports.mergeURLSearchParams = exports.escapeNonSpecialQuestionMarks = exports.areURLSearchParamsEqual = exports.isRegexOrUrl = exports.getAllowedOriginsFromEnv = exports.enforceCors = exports.isTimeoutError = exports.isAbsoluteUrl = exports.resolveUrl = exports.isServer = void 0;
+exports.tryParseEnvValue = exports.mergeURLSearchParams = exports.escapeNonSpecialQuestionMarks = exports.areURLSearchParamsEqual = exports.isRegexOrUrl = exports.getAllowedOriginsFromEnv = exports.getEnforcedCorsHeaders = exports.enforceCors = exports.isTimeoutError = exports.isAbsoluteUrl = exports.resolveUrl = exports.isServer = void 0;
 var is_server_1 = require("./is-server");
 Object.defineProperty(exports, "isServer", { enumerable: true, get: function () { return __importDefault(is_server_1).default; } });
 var utils_1 = require("./utils");
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "resolveUrl", { enumerable: true, get: function (
 Object.defineProperty(exports, "isAbsoluteUrl", { enumerable: true, get: function () { return utils_1.isAbsoluteUrl; } });
 Object.defineProperty(exports, "isTimeoutError", { enumerable: true, get: function () { return utils_1.isTimeoutError; } });
 Object.defineProperty(exports, "enforceCors", { enumerable: true, get: function () { return utils_1.enforceCors; } });
+Object.defineProperty(exports, "getEnforcedCorsHeaders", { enumerable: true, get: function () { return utils_1.getEnforcedCorsHeaders; } });
 Object.defineProperty(exports, "getAllowedOriginsFromEnv", { enumerable: true, get: function () { return utils_1.getAllowedOriginsFromEnv; } });
 Object.defineProperty(exports, "isRegexOrUrl", { enumerable: true, get: function () { return utils_1.isRegexOrUrl; } });
 Object.defineProperty(exports, "areURLSearchParamsEqual", { enumerable: true, get: function () { return utils_1.areURLSearchParamsEqual; } });

package/dist/cjs/utils/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeURLSearchParams = exports.escapeNonSpecialQuestionMarks = exports.areURLSearchParamsEqual = exports.isRegexOrUrl = exports.enforceCors = exports.getAllowedOriginsFromEnv = exports.isTimeoutError = exports.isAbsoluteUrl = void 0;
+exports.mergeURLSearchParams = exports.escapeNonSpecialQuestionMarks = exports.areURLSearchParamsEqual = exports.isRegexOrUrl = exports.getEnforcedCorsHeaders = exports.enforceCors = exports.getAllowedOriginsFromEnv = exports.isTimeoutError = exports.isAbsoluteUrl = void 0;
 exports.resolveUrl = resolveUrl;
 const is_server_1 = __importDefault(require("./is-server"));
 /**
@@ -94,6 +94,7 @@ exports.getAllowedOriginsFromEnv = getAllowedOriginsFromEnv;
  * @param {OutgoingMessage} res response to set CORS headers for
  * @param {string[]} [allowedOrigins] additional list of origins to test against
  * @returns true if incoming origin matches the allowed lists, false when it does not
+ * @deprecated use getEnforcedCorsHeaders instead
  */
 const enforceCors = (req, res, allowedOrigins) => {
     // origin in not present for non-CORS requests (e.g. server-side) - so we skip the checks
@@ -124,6 +125,38 @@ const enforceCors = (req, res, allowedOrigins) => {
     return false;
 };
 exports.enforceCors = enforceCors;
+const getEnforcedCorsHeaders = ({ requestMethod, headers, presetCorsHeader, allowedOrigins = [], }) => {
+    // ugly but gotta satisfy both node.js and web fetch Headers interface somehow
+    const origin = headers.get
+        ? headers.get('origin')
+        : headers.origin;
+    if (!origin) {
+        return {};
+    }
+    // 3 sources of allowed origins are considered:
+    // the env value
+    const defaultAllowedOrigins = (0, exports.getAllowedOriginsFromEnv)();
+    // the allowedOrigins prop
+    allowedOrigins = defaultAllowedOrigins.concat(allowedOrigins || []);
+    // and the existing CORS header, if provided (i.e. from nextjs config)
+    if (presetCorsHeader) {
+        allowedOrigins.push(presetCorsHeader);
+    }
+    if (origin &&
+        allowedOrigins.some((allowedOrigin) => origin === allowedOrigin || new RegExp(convertToWildcardRegex(allowedOrigin)).test(origin))) {
+        const corsHeaders = {
+            'Access-Control-Allow-Origin': origin,
+            'Access-Control-Allow-Methods': 'GET, POST, OPTIONS, DELETE, PUT, PATCH',
+        };
+        // set the allowed headers for preflight requests
+        if (requestMethod === 'OPTIONS') {
+            corsHeaders['Access-Control-Allow-Headers'] = 'Content-Type, Authorization';
+        }
+        return corsHeaders;
+    }
+    return null;
+};
+exports.getEnforcedCorsHeaders = getEnforcedCorsHeaders;
 /**
  * Determines whether the given input is a regular expression or resembles a URL.
  * @param {string} input - The input string to evaluate.

package/dist/esm/client/sitecore-client.js

@@ -7,6 +7,7 @@ import { ErrorPagesService, SitePathService, SitemapXmlService } from '../site';
 import { createGraphQLClientFactory } from './utils';
 import { NativeDataFetcher } from '../native-fetcher';
 import { RobotsService } from '../site/robots-service';
+import { DesignLibraryVariantGeneration } from '../editing/models';
 /**
  * Error page codes
  */
@@ -99,8 +100,9 @@ export class SitecoreClient {
      */
     getHeadLinks(layoutData, options = {}) {
         const { enableStyles = true, enableThemes = true } = options;
-        const { contextId, edgeUrl } = this.initOptions.api.edge;
+        const { contextId: serverContextId, clientContextId, edgeUrl } = this.initOptions.api.edge;
         const headLinks = [];
+        const contextId = serverContextId || clientContextId;
         if (enableStyles) {
             const contentStyles = getContentStylesheetLink(layoutData, contextId, edgeUrl);
             if (contentStyles)
@@ -146,7 +148,10 @@ export class SitecoreClient {
             return null;
         }
         // If we're in Pages preview (editing) mode, prefetch the editing data
-        const { site, itemId, language, version, variantIds, layoutKind, mode } = previewData;
+        const { site, itemId, language, version, layoutKind, mode } = previewData;
+        const variantIds = Array.isArray(previewData.variantIds)
+            ? previewData.variantIds
+            : previewData.variantIds.split(',');
         const data = await this.editingService.fetchEditingData({
             itemId,
             language,
@@ -178,17 +183,14 @@ export class SitecoreClient {
         if (!this.initOptions.api.local) {
             throw new Error('Component Library requires Sitecore apiHost and apiKey to be provided');
         }
-        const { itemId, componentUid, site, language, renderingId, dataSourceId, version, mode } = designLibData;
-        const componentData = await this.componentService.fetchComponentData({
-            siteName: site,
-            itemId,
+        const { itemId, componentUid, site, language, renderingId, dataSourceId, version, mode, generation, } = designLibData;
+        const componentData = await this.componentService.fetchComponentData(Object.assign({ siteName: site, itemId,
             language,
             componentUid,
             renderingId,
             dataSourceId,
             version,
-            mode,
-        }, fetchOptions);
+            mode }, (generation ? { generation } : {})), fetchOptions);
         if (!componentData) {
             throw new Error(`Unable to fetch editing data for preview ${JSON.stringify(designLibData)}`);
         }
@@ -196,7 +198,7 @@ export class SitecoreClient {
             locale: designLibData.language,
             layout: componentData,
             siteName: ((_a = componentData.sitecore.context.site) === null || _a === void 0 ? void 0 : _a.name) || site,
-            mode: this.getPageMode(mode),
+            mode: this.getPageMode(mode, generation),
         };
         return page;
     }
@@ -330,18 +332,17 @@ export class SitecoreClient {
     /**
      * Get page mode based on mode name
      * @param {PageModeName} mode - The mode name to get the page mode for
+     * @param { DesignLibraryVariantGeneration} generation - The variant generation mode, if applicable
      * @returns {PageMode} The page mode
      */
-    getPageMode(mode) {
+    getPageMode(mode, generation) {
         const pageMode = {
             name: mode,
             isNormal: false,
             isPreview: false,
             isEditing: false,
             isDesignLibrary: false,
-            designLibrary: {
-                isVariantGeneration: false,
-            },
+            designLibrary: { isVariantGeneration: false },
         };
         switch (mode) {
             case LayoutServicePageState.Normal:
@@ -360,14 +361,13 @@ export class SitecoreClient {
                 pageMode.isDesignLibrary = true;
                 pageMode.isEditing = true;
                 break;
-            case DesignLibraryMode.VariantGeneration:
-                pageMode.isDesignLibrary = true;
-                pageMode.isEditing = true;
-                pageMode.designLibrary.isVariantGeneration = true;
-                break;
             default:
                 break;
         }
+        if (pageMode.isDesignLibrary && generation === DesignLibraryVariantGeneration.Variant) {
+            pageMode.designLibrary.isVariantGeneration = true;
+            pageMode.isEditing = true;
+        }
         return pageMode;
     }
     getClientFactory() {

package/dist/esm/debug.js

@@ -33,6 +33,7 @@ export default {
     robots: debug(`${rootNamespace}:robots`),
     redirects: debug(`${rootNamespace}:redirects`),
     personalize: debug(`${rootNamespace}:personalize`),
+    locale: debug(`${rootNamespace}:locale`),
     errorpages: debug(`${rootNamespace}:errorpages`),
     proxy: debug(`${rootNamespace}:proxy`),
 };

package/dist/esm/editing/design-library.js

@@ -113,7 +113,5 @@ export function getDesignLibraryScriptLink(sitecoreEdgeUrl = SITECORE_EDGE_URL_D
  * @returns {boolean} True if the mode is a Design Library mode, false otherwise.
  */
 export function isDesignLibraryMode(mode) {
-    return (mode === DesignLibraryMode.Normal ||
-        mode === DesignLibraryMode.Metadata ||
-        mode === DesignLibraryMode.VariantGeneration);
+    return mode === DesignLibraryMode.Normal || mode === DesignLibraryMode.Metadata;
 }

package/dist/esm/editing/metadata.js

@@ -7,12 +7,14 @@ const trackedScopes = [
 ];
 /**
  * Get application metadata
+ * @param {boolean} allowWorkspaces - Whether to allow workspaces in the metadata generation.
+ * @returns {Metadata} The generated metadata.
  */
-export function getMetadata() {
+export function getMetadata(allowWorkspaces = false) {
     const metadata = { packages: {} };
     let queryResult = [];
     try {
-        queryResult = JSON.parse(execSync('npm query [name*=@sitecore] --workspaces false').toString());
+        queryResult = JSON.parse(execSync(`npm query [name*=@sitecore] --workspaces ${allowWorkspaces}`).toString());
     }
     catch (error) {
         console.error('Failed to retrieve sitecore packages using npm query', error);

package/dist/esm/editing/models.js

@@ -25,6 +25,11 @@ export var DesignLibraryMode;
     DesignLibraryMode["Normal"] = "library";
     /** Metadata mode */
     DesignLibraryMode["Metadata"] = "library-metadata";
-    /** Variant generation mode */
-    DesignLibraryMode["VariantGeneration"] = "library-variant-generation";
 })(DesignLibraryMode || (DesignLibraryMode = {}));
+/**
+ * Variant generation mode for Design Library
+ */
+export var DesignLibraryVariantGeneration;
+(function (DesignLibraryVariantGeneration) {
+    DesignLibraryVariantGeneration["Variant"] = "variant";
+})(DesignLibraryVariantGeneration || (DesignLibraryVariantGeneration = {}));

package/dist/esm/i18n/index.js

@@ -1 +1,2 @@
 export { DictionaryService, } from './dictionary-service';
+export { getLocaleRewrite } from './utils';

package/dist/esm/i18n/utils.js

@@ -0,0 +1,10 @@
+/**
+ * Get a locale rewrite path for given pathname
+ * @param {string} pathname the pathname
+ * @param {string} locale the site data to include in the rewrite
+ * @returns {string} the rewrite path
+ */
+export function getLocaleRewrite(pathname, locale) {
+    const path = pathname.startsWith('/') ? pathname : '/' + pathname;
+    return `/${locale}${path}`;
+}

package/dist/esm/personalize/utils.js

@@ -7,8 +7,8 @@ export const VARIANT_PREFIX = '_variantId_';
  * @returns {string} the rewrite path
  */
 export function getPersonalizedRewrite(pathname, variantIds) {
-    const path = pathname.startsWith('/') ? pathname : '/' + pathname;
-    return `${variantIds.map((variantId) => `/${VARIANT_PREFIX}${variantId}`).join('')}${path}`;
+    const path = pathname.endsWith('/') ? pathname.slice(0, -1) : pathname;
+    return `${path}${variantIds.map((variantId) => `/${VARIANT_PREFIX}${variantId}`).join('')}`;
 }
 /**
  * Get personalize data from the rewrite path

package/dist/esm/tools/generateMetadata.js

@@ -5,13 +5,13 @@ import { ensurePathExists } from '../utils/ensurePath';
 /**
  * Generate application metadata
  * @param {GenerateMetadataConfig} config - Optional configuration for generating metadata.
- * If not provided, the default '.sitecore/metadata.json' will be used.
+ * If not provided, the default '.sitecore/metadata.json' will be used and allowWorkspaces will be set to false.
  * @returns {Promise<void>} A promise that resolves when the metadata generation is complete.
  */
 export const generateMetadata = (config) => {
     return async () => {
         var _a;
-        const metadata = getMetadata();
+        const metadata = getMetadata(!!(config === null || config === void 0 ? void 0 : config.allowWorkspaces));
         writeMetadata(metadata, (_a = config === null || config === void 0 ? void 0 : config.destinationPath) !== null && _a !== void 0 ? _a : '.sitecore/metadata.json');
     };
 };

package/dist/esm/utils/index.js

@@ -1,3 +1,3 @@
 export { default as isServer } from './is-server';
-export { resolveUrl, isAbsoluteUrl, isTimeoutError, enforceCors, getAllowedOriginsFromEnv, isRegexOrUrl, areURLSearchParamsEqual, escapeNonSpecialQuestionMarks, mergeURLSearchParams, } from './utils';
+export { resolveUrl, isAbsoluteUrl, isTimeoutError, enforceCors, getEnforcedCorsHeaders, getAllowedOriginsFromEnv, isRegexOrUrl, areURLSearchParamsEqual, escapeNonSpecialQuestionMarks, mergeURLSearchParams, } from './utils';
 export { tryParseEnvValue } from './env';

package/dist/esm/utils/utils.js

@@ -84,6 +84,7 @@ export const getAllowedOriginsFromEnv = () => process.env.JSS_ALLOWED_ORIGINS
  * @param {OutgoingMessage} res response to set CORS headers for
  * @param {string[]} [allowedOrigins] additional list of origins to test against
  * @returns true if incoming origin matches the allowed lists, false when it does not
+ * @deprecated use getEnforcedCorsHeaders instead
  */
 export const enforceCors = (req, res, allowedOrigins) => {
     // origin in not present for non-CORS requests (e.g. server-side) - so we skip the checks
@@ -113,6 +114,37 @@ export const enforceCors = (req, res, allowedOrigins) => {
     }
     return false;
 };
+export const getEnforcedCorsHeaders = ({ requestMethod, headers, presetCorsHeader, allowedOrigins = [], }) => {
+    // ugly but gotta satisfy both node.js and web fetch Headers interface somehow
+    const origin = headers.get
+        ? headers.get('origin')
+        : headers.origin;
+    if (!origin) {
+        return {};
+    }
+    // 3 sources of allowed origins are considered:
+    // the env value
+    const defaultAllowedOrigins = getAllowedOriginsFromEnv();
+    // the allowedOrigins prop
+    allowedOrigins = defaultAllowedOrigins.concat(allowedOrigins || []);
+    // and the existing CORS header, if provided (i.e. from nextjs config)
+    if (presetCorsHeader) {
+        allowedOrigins.push(presetCorsHeader);
+    }
+    if (origin &&
+        allowedOrigins.some((allowedOrigin) => origin === allowedOrigin || new RegExp(convertToWildcardRegex(allowedOrigin)).test(origin))) {
+        const corsHeaders = {
+            'Access-Control-Allow-Origin': origin,
+            'Access-Control-Allow-Methods': 'GET, POST, OPTIONS, DELETE, PUT, PATCH',
+        };
+        // set the allowed headers for preflight requests
+        if (requestMethod === 'OPTIONS') {
+            corsHeaders['Access-Control-Allow-Headers'] = 'Content-Type, Authorization';
+        }
+        return corsHeaders;
+    }
+    return null;
+};
 /**
  * Determines whether the given input is a regular expression or resembles a URL.
  * @param {string} input - The input string to evaluate.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/core",
-  "version": "1.2.0-canary.2",
+  "version": "1.2.0-canary.20",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -85,7 +85,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "91681af284f72808222c3648de790d2bba5c5953",
+  "gitHead": "c37f5159bbc1ade9567748eee4ca47e0158e2d89",
   "files": [
     "dist",
     "types",

package/types/client/sitecore-client.d.ts

@@ -294,6 +294,7 @@ export declare class SitecoreClient implements BaseSitecoreClient {
     /**
      * Get page mode based on mode name
      * @param {PageModeName} mode - The mode name to get the page mode for
+     * @param { DesignLibraryVariantGeneration} generation - The variant generation mode, if applicable
      * @returns {PageMode} The page mode
      */
     private getPageMode;

package/types/debug.d.ts

@@ -21,6 +21,7 @@ declare const _default: {
     robots: debug.Debugger;
     redirects: debug.Debugger;
     personalize: debug.Debugger;
+    locale: debug.Debugger;
     errorpages: debug.Debugger;
     proxy: debug.Debugger;
 };

package/types/editing/component-layout-service.d.ts

@@ -1,5 +1,5 @@
 import { LayoutServiceData } from '../layout/models';
-import { DesignLibraryMode } from './models';
+import { DesignLibraryMode, DesignLibraryVariantGeneration } from './models';
 import { FetchOptions } from '../models';
 /**
  * Params for requesting component data in Design Library mode
@@ -14,6 +14,10 @@ export interface ComponentLayoutRequestParams {
      * an arbitrary one (component renderingId and datasource would be used for identification then)
      */
     componentUid: string;
+    /**
+     * site name to be used as context for rendering the component
+     */
+    siteName: string;
     /**
      * language to render component in
      */
@@ -30,14 +34,14 @@ export interface ComponentLayoutRequestParams {
      * version of the context item (latest by default)
      */
     version?: string;
-    /**
-     * site name to be used as context for rendering the component
-     */
-    siteName: string;
     /**
      * mode to be used for rendering the component
      */
     mode?: DesignLibraryMode;
+    /**
+     * design library variant generation mode
+     */
+    generation?: DesignLibraryVariantGeneration;
 }
 /**
  * Config for ComponentLayoutService.

package/types/editing/metadata.d.ts

@@ -1,5 +1,7 @@
 import { Metadata } from './';
 /**
  * Get application metadata
+ * @param {boolean} allowWorkspaces - Whether to allow workspaces in the metadata generation.
+ * @returns {Metadata} The generated metadata.
  */
-export declare function getMetadata(): Metadata;
+export declare function getMetadata(allowWorkspaces?: boolean): Metadata;

package/types/editing/models.d.ts

@@ -58,7 +58,7 @@ export type EditingPreviewData = {
     itemId: string;
     language: string;
     mode: Exclude<LayoutServicePageState, 'Normal'>;
-    variantIds: string[];
+    variantIds: string[] | string;
     version?: string;
     layoutKind?: LayoutKind;
 };
@@ -67,9 +67,13 @@ export declare enum DesignLibraryMode {
     /** Normal mode */
     Normal = "library",
     /** Metadata mode */
-    Metadata = "library-metadata",
-    /** Variant generation mode */
-    VariantGeneration = "library-variant-generation"
+    Metadata = "library-metadata"
+}
+/**
+ * Variant generation mode for Design Library
+ */
+export declare enum DesignLibraryVariantGeneration {
+    Variant = "variant"
 }
 /**
  * Data for Design Library rendering mode
@@ -84,4 +88,5 @@ export interface DesignLibraryRenderPreviewData {
     variant?: string;
     version?: string;
     dataSourceId?: string;
+    generation?: DesignLibraryVariantGeneration;
 }

package/types/i18n/index.d.ts

@@ -1 +1,2 @@
 export { DictionaryPhrases, DictionaryServiceConfig, DictionaryService, } from './dictionary-service';
+export { getLocaleRewrite } from './utils';

package/types/i18n/utils.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Get a locale rewrite path for given pathname
+ * @param {string} pathname the pathname
+ * @param {string} locale the site data to include in the rewrite
+ * @returns {string} the rewrite path
+ */
+export declare function getLocaleRewrite(pathname: string, locale: string): string;

package/types/tools/generateMetadata.d.ts

@@ -7,11 +7,16 @@ export type GenerateMetadataConfig = {
      * If not provided, the default '.sitecore/metadata.json' will be used.
      */
     destinationPath?: string;
+    /**
+     * Optional flag to allow npm workspaces in the metadata generation. Should be kept as false for non-npm monorepos.
+     * If not provided, the default is false.
+     */
+    allowWorkspaces?: boolean;
 };
 /**
  * Generate application metadata
  * @param {GenerateMetadataConfig} config - Optional configuration for generating metadata.
- * If not provided, the default '.sitecore/metadata.json' will be used.
+ * If not provided, the default '.sitecore/metadata.json' will be used and allowWorkspaces will be set to false.
  * @returns {Promise<void>} A promise that resolves when the metadata generation is complete.
  */
 export declare const generateMetadata: (config?: GenerateMetadataConfig) => (() => Promise<void>);

package/types/utils/index.d.ts

@@ -1,3 +1,3 @@
 export { default as isServer } from './is-server';
-export { resolveUrl, isAbsoluteUrl, isTimeoutError, enforceCors, EnhancedOmit, getAllowedOriginsFromEnv, isRegexOrUrl, areURLSearchParamsEqual, escapeNonSpecialQuestionMarks, mergeURLSearchParams, } from './utils';
+export { resolveUrl, isAbsoluteUrl, isTimeoutError, enforceCors, getEnforcedCorsHeaders, EnhancedOmit, getAllowedOriginsFromEnv, isRegexOrUrl, areURLSearchParamsEqual, escapeNonSpecialQuestionMarks, mergeURLSearchParams, } from './utils';
 export { tryParseEnvValue } from './env';

package/types/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { IncomingMessage, OutgoingMessage } from 'http';
+import { IncomingHttpHeaders, IncomingMessage, OutgoingMessage } from 'http';
 import { ParsedUrlQueryInput } from 'querystring';
 /**
  * Omit properties from T that are in K. This is a simplified version of TypeScript's built-in `Omit` utility type.
@@ -38,8 +38,17 @@ export declare const getAllowedOriginsFromEnv: () => string[];
  * @param {OutgoingMessage} res response to set CORS headers for
  * @param {string[]} [allowedOrigins] additional list of origins to test against
  * @returns true if incoming origin matches the allowed lists, false when it does not
+ * @deprecated use getEnforcedCorsHeaders instead
  */
 export declare const enforceCors: (req: IncomingMessage, res: OutgoingMessage, allowedOrigins?: string[]) => boolean;
+export declare const getEnforcedCorsHeaders: ({ requestMethod, headers, presetCorsHeader, allowedOrigins, }: {
+    requestMethod: string | undefined;
+    headers: IncomingHttpHeaders | Headers;
+    presetCorsHeader?: string | string[];
+    allowedOrigins?: string[];
+}) => {
+    [key: string]: string;
+} | null;
 /**
  * Determines whether the given input is a regular expression or resembles a URL.
  * @param {string} input - The input string to evaluate.