@sitecore-content-sdk/nextjs 2.1.0 → 2.1.1-canary.20260512111718

package/LICENSE.txt

@@ -1,202 +1,202 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/cjs/tools/generate-map.js

@@ -33,11 +33,39 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMap = exports.defaultClientMapTemplate = void 0;
+exports.generateMap = exports.defaultClientMapTemplate = exports.defaultServerMapTemplate = void 0;
 const tools_1 = require("@sitecore-content-sdk/content/tools");
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const utils_1 = require("./templating/utils");
+const DEFAULT_HEADER_COMMENT = "Below are built-in components that are available in the app, it's recommended to keep them as is";
+const APP_ROUTER_BUILTIN_IMPORTS = `
+import { BYOCServerWrapper, NextjsContentSdkComponent, FEaaSServerWrapper } from '@sitecore-content-sdk/nextjs';
+import { Form } from '@sitecore-content-sdk/nextjs';
+`;
+const APP_ROUTER_BUILTIN_ENTRIES = [
+    `['BYOCWrapper', BYOCServerWrapper]`,
+    `['FEaaSWrapper', FEaaSServerWrapper]`,
+    `['Form', { ...Form, componentType: 'client' }]`,
+];
+const PAGES_ROUTER_BUILTIN_IMPORTS = `
+import { BYOCWrapper, NextjsContentSdkComponent, FEaaSWrapper } from '@sitecore-content-sdk/nextjs';
+import { Form } from '@sitecore-content-sdk/nextjs';
+`;
+const PAGES_ROUTER_BUILTIN_ENTRIES = [
+    `['BYOCWrapper', BYOCWrapper]`,
+    `['FEaaSWrapper', FEaaSWrapper]`,
+    `['Form', Form]`,
+];
+const CLIENT_MAP_BUILTIN_IMPORTS = `
+import { BYOCClientWrapper, NextjsContentSdkComponent, FEaaSClientWrapper } from '@sitecore-content-sdk/nextjs';
+import { Form } from '@sitecore-content-sdk/nextjs';
+`;
+const CLIENT_MAP_BUILTIN_ENTRIES = [
+    `['BYOCWrapper', BYOCClientWrapper]`,
+    `['FEaaSWrapper', FEaaSClientWrapper]`,
+    `['Form', Form]`,
+];
 // Common builder for Next.js component map content
 const prepareComponentsForMap = (components, opts) => {
     const groups = new Map();
@@ -113,21 +141,16 @@ const prepareComponentsForMap = (components, opts) => {
     }
     return entries;
 };
-const buildNextjsMapContent = (entries, componentImports, options = {}) => {
-    const isAppRouter = (0, utils_1.detectRouterType)() === 'app';
-    const { headerComment = "Below are built-in components that are available in the app, it's recommended to keep them as is", isClientMap = false, } = options;
+/**
+ * Distinguishes the simple 2-arity ComponentMapTemplate from the 3-arity EnhancedComponentMapTemplate.
+ * @param {ComponentMapTemplate | EnhancedComponentMapTemplate} fn The template function to check.
+ * @internal
+ */
+const isComponentMapTemplate = (fn) => fn.length === 2;
+const buildNextjsMapContent = (entries, componentImports, options) => {
+    const { headerComment = DEFAULT_HEADER_COMMENT, isClientMap = false, builtInImports, builtInMapEntries, } = options;
     const wildcardImports = [];
     const namedImports = [];
-    const builtInImports = options.builtInImports ||
-        `
-import { BYOCWrapper, NextjsContentSdkComponent, FEaaSWrapper } from '@sitecore-content-sdk/nextjs';
-import { Form } from '@sitecore-content-sdk/nextjs';
-`;
-    const builtInMapEntries = options.builtInMapEntries || [
-        `['BYOCWrapper', BYOCWrapper]`,
-        `['FEaaSWrapper', FEaaSWrapper]`,
-        `['Form', ${isAppRouter ? '{ ...Form, componentType: \'client\' }' : 'Form'}]`,
-    ];
     // Add per-entry imports
     entries.forEach((e) => wildcardImports.push(...e.imports));
     // Handle package imports
@@ -145,8 +168,8 @@ import { Form } from '@sitecore-content-sdk/nextjs';
         ...namedImports,
     ].filter(Boolean);
     const importsSection = importLines.length ? `\n${importLines.join('\n')}` : '';
-    // Build entry lines (package named imports are appended below)
-    const componentMapEntries = builtInMapEntries;
+    // Clone to avoid mutating the caller's array
+    const componentMapEntries = structuredClone(builtInMapEntries);
     for (const e of entries) {
         const value = !isClientMap && e.annotateClient
             ? `{ ${e.valueExpr}, componentType: 'client' }`
@@ -179,26 +202,31 @@ ${componentMapEntries
 export default componentMap;
 `;
 };
-// default client template
+// Default App Router (server) component map template
+const defaultServerMapTemplate = (components, componentImports, ctx) => {
+    var _a, _b;
+    const entries = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.entries) !== null && _a !== void 0 ? _a : prepareComponentsForMap(components, {
+        includeVariants: (_b = ctx === null || ctx === void 0 ? void 0 : ctx.includeVariants) !== null && _b !== void 0 ? _b : true,
+    });
+    return buildNextjsMapContent(entries, componentImports, {
+        headerComment: DEFAULT_HEADER_COMMENT,
+        isClientMap: false,
+        builtInImports: APP_ROUTER_BUILTIN_IMPORTS,
+        builtInMapEntries: APP_ROUTER_BUILTIN_ENTRIES,
+    });
+};
+exports.defaultServerMapTemplate = defaultServerMapTemplate;
+// Default client-safe component map template for App Router
 const defaultClientMapTemplate = (components, componentImports, ctx) => {
     var _a, _b;
-    const builtInImports = `
-import { BYOCClientWrapper, NextjsContentSdkComponent, FEaaSClientWrapper } from '@sitecore-content-sdk/nextjs';
-import { Form } from '@sitecore-content-sdk/nextjs';
-`;
-    const builtInMapEntries = [
-        `['BYOCWrapper', BYOCClientWrapper]`,
-        `['FEaaSWrapper', FEaaSClientWrapper]`,
-        `['Form', Form]`,
-    ];
     const entries = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.entries) !== null && _a !== void 0 ? _a : prepareComponentsForMap(components, {
         includeVariants: (_b = ctx === null || ctx === void 0 ? void 0 : ctx.includeVariants) !== null && _b !== void 0 ? _b : true,
     });
     return buildNextjsMapContent(entries, componentImports, {
         headerComment: 'Client-safe component map for App Router',
         isClientMap: true,
-        builtInImports,
-        builtInMapEntries,
+        builtInImports: CLIENT_MAP_BUILTIN_IMPORTS,
+        builtInMapEntries: CLIENT_MAP_BUILTIN_ENTRIES,
     });
 };
 exports.defaultClientMapTemplate = defaultClientMapTemplate;
@@ -219,116 +247,93 @@ const collectComponents = (opts) => {
 /**
  * Generate and write componentMap.ts files based on provided params.
  *
- * When clientComponentMap is true, generates:
+ * Pages Router:
+ * - component-map.ts          : Single component map with Pages Router wrappers
+ *
+ * App Router (clientComponentMap=true or undefined):
  * - component-map.ts          : Full component map with all components (server, client, universal)
- * - component-map.client.ts   : Client-safe map with only client + universal components
+ * - component-map.client.ts   : Client-safe map with client + universal components
  *
- * When clientComponentMap is false, generates:
- * - component-map.ts          : Single component map (traditional behavior)
+ * App Router (clientComponentMap=false):
+ * - component-map.ts          : Full component map with all components (server, client, universal)
+ * - component-map.client.ts   : Client-safe map with built-in components only (no user components)
  *
- * When includeVariants is true (in either mode):
+ * When includeVariants is true:
  * - Includes component **variants** in the generated map(s) alongside base components
  * - Preserves the same client/server filtering rules (variants obey clientComponentMap filtering)
  * - Variant entries are emitted using the same naming/keys convention as their base components
  *
  * Template Customization:
  * - mapTemplate: Custom template for main component map (works for both single and dual map modes)
- * - clientMapTemplate: Custom template for client component map (only used when clientComponentMap is true)
+ * - clientMapTemplate: Custom template for client component map (App Router only)
  * @param {GenerateMapArgs} params - The parameters for the generateMap function.
  * @public
  */
 const generateMap = ({ paths, destination = '.sitecore', exclude, componentImports, mapTemplate, clientMapTemplate, clientComponentMap, includeVariants = true, }) => {
-    const isAppRouter = (0, utils_1.detectRouterType)() === 'app';
-    const shouldGenerateClientMap = clientComponentMap !== null && clientComponentMap !== void 0 ? clientComponentMap : isAppRouter;
-    if (shouldGenerateClientMap) {
-        // App Router case, main map
-        const getComponents = collectComponents({ paths, exclude, includeVariants, filter: 'all' });
-        let mainContent;
-        if (mapTemplate) {
-            mainContent = mapTemplate(getComponents.raw, componentImports, {
-                entries: getComponents.entries,
+    const routerType = (0, utils_1.detectRouterType)();
+    const allComponents = collectComponents({ paths, exclude, includeVariants, filter: 'all' });
+    if (routerType === utils_1.ROUTER_TYPE.PAGES) {
+        const content = mapTemplate
+            ? mapTemplate(allComponents.raw, componentImports, {
+                entries: allComponents.entries,
                 includeVariants,
                 isClientMap: false,
-            });
-        }
-        else {
-            // default app router server map
-            const builtInImports = `
-import { BYOCServerWrapper, NextjsContentSdkComponent, FEaaSServerWrapper } from '@sitecore-content-sdk/nextjs';
-import { Form } from '@sitecore-content-sdk/nextjs';
-`;
-            const builtInMapEntries = [
-                `['BYOCWrapper', BYOCServerWrapper]`,
-                `['FEaaSWrapper', FEaaSServerWrapper]`,
-                `['Form', { ...Form, componentType: 'client' }]`,
-            ];
-            mainContent = buildNextjsMapContent(getComponents.entries, componentImports, {
-                headerComment: "Below are built-in components that are available in the app, it's recommended to keep them as is",
+            })
+            : buildNextjsMapContent(allComponents.entries, componentImports, {
                 isClientMap: false,
-                builtInImports,
-                builtInMapEntries,
+                builtInImports: PAGES_ROUTER_BUILTIN_IMPORTS,
+                builtInMapEntries: PAGES_ROUTER_BUILTIN_ENTRIES,
             });
+        try {
+            fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), content, 'utf8');
         }
-        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), mainContent, 'utf8');
-        // App Router, client map
-        const clientComponents = collectComponents({
-            paths,
-            exclude,
-            includeVariants,
-            filter: 'client',
-        });
-        const clientTemplate = clientMapTemplate || exports.defaultClientMapTemplate;
-        let clientContent;
-        if (clientTemplate.length >= 2) {
-            clientContent = clientTemplate(clientComponents.raw, componentImports);
-        }
-        else {
-            clientContent = clientTemplate(clientComponents.raw, componentImports, {
-                entries: clientComponents.entries,
-                includeVariants,
-                isClientMap: true,
-            });
+        catch (error) {
+            console.error(`Component Map generation failed. Error writing to file ${destination}:`, error);
+            throw error;
         }
-        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.client.ts'), clientContent, 'utf8');
+        return;
     }
-    else {
-        // Either in pages/app router or clientComponentMap = false
-        const components = collectComponents({
-            paths,
-            exclude,
+    const mainContent = mapTemplate
+        ? mapTemplate(allComponents.raw, componentImports, {
+            entries: allComponents.entries,
+            includeVariants,
+            isClientMap: false,
+        })
+        : (0, exports.defaultServerMapTemplate)(allComponents.raw, componentImports, {
+            entries: allComponents.entries,
             includeVariants,
-            filter: 'all',
-        }).entries;
-        const content = buildNextjsMapContent(components, componentImports, {
-            headerComment: "Below are built-in components that are available in the app, it's recommended to keep them as is",
             isClientMap: false,
         });
-        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), content, 'utf8');
-        // For App Router compatibility, always generate client map file even when clientComponentMap is false
-        // When clientComponentMap is false, only include built-in components (no custom client components)
-        if (shouldGenerateClientMap || isAppRouter) {
-            const clientMapTemplateToUse = clientMapTemplate || exports.defaultClientMapTemplate;
-            const components = collectComponents({ paths: [], includeVariants, filter: 'all' });
-            let clientMapContent;
-            if (clientMapTemplateToUse.length >= 2) {
-                clientMapContent = clientMapTemplateToUse([], componentImports);
-            }
-            else {
-                clientMapContent = clientMapTemplateToUse([], componentImports, {
-                    entries: components.entries,
-                    includeVariants,
-                    isClientMap: true,
-                });
-            }
-            const clientMapFile = path.join(process.cwd(), destination, 'component-map.client.ts');
-            try {
-                fs.writeFileSync(clientMapFile, clientMapContent, { encoding: 'utf8' });
-            }
-            catch (error) {
-                console.error(`Client Component Map generation failed. Error writing to file ${destination}:`, error);
-                throw error;
-            }
-        }
+    try {
+        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), mainContent, 'utf8');
+    }
+    catch (error) {
+        console.error(`Main Component Map generation failed. Error writing to file ${destination}:`, error);
+        throw error;
+    }
+    // clientComponentMap=true  -> include user client+universal components
+    // clientComponentMap=undefined  -> include user client+universal components
+    // clientComponentMap=false -> built-ins only
+    const shouldGenerateClientMap = clientComponentMap !== null && clientComponentMap !== void 0 ? clientComponentMap : true;
+    const clientComponents = shouldGenerateClientMap
+        ? collectComponents({ paths, exclude, includeVariants, filter: 'client' })
+        : { raw: [], entries: [] };
+    const clientTemplate = clientMapTemplate || exports.defaultClientMapTemplate;
+    let clientContent;
+    if (isComponentMapTemplate(clientTemplate))
+        clientContent = clientTemplate(clientComponents.raw, componentImports);
+    else
+        clientContent = clientTemplate(clientComponents.raw, componentImports, {
+            entries: clientComponents.entries,
+            includeVariants,
+            isClientMap: true,
+        });
+    try {
+        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.client.ts'), clientContent, 'utf8');
+    }
+    catch (error) {
+        console.error(`Client Component Map generation failed. Error writing to file ${destination}:`, error);
+        throw error;
     }
 };
 exports.generateMap = generateMap;

package/dist/cjs/tools/templating/utils.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ROUTER_TYPE = void 0;
 exports.detectRouterType = detectRouterType;
 exports.detectComponentType = detectComponentType;
 exports.getComponentListWithTypes = getComponentListWithTypes;
@@ -12,6 +13,17 @@ exports.nextjsDefaultMapTemplate = nextjsDefaultMapTemplate;
 const node_tools_1 = require("@sitecore-content-sdk/content/node-tools");
 const typescript_1 = __importDefault(require("typescript"));
 const fs_1 = __importDefault(require("fs"));
+/**
+ * Constants for Next.js router types. Used for consistent detection and comparison throughout the codebase.
+ * Values are based on Next.js conventions:
+ * - 'app' for App Router (src/app or app directory)
+ * - 'pages' for Pages Router (src/pages or pages directory)
+ * @internal
+ */
+exports.ROUTER_TYPE = {
+    APP: 'app',
+    PAGES: 'pages',
+};
 /**
  * Detects the Next.js router type (App Router or Pages Router) based on directory structure.
  * @param {string} projectRoot - The project root directory. Defaults to current working directory.
@@ -19,15 +31,15 @@ const fs_1 = __importDefault(require("fs"));
  * @internal
  */
 function detectRouterType(projectRoot = process.cwd()) {
-    const appDirExists = fs_1.default.existsSync(`${projectRoot}/src/app`) || fs_1.default.existsSync(`${projectRoot}/app`);
-    const pagesDirExists = fs_1.default.existsSync(`${projectRoot}/src/pages`) || fs_1.default.existsSync(`${projectRoot}/pages`);
-    if (appDirExists) {
-        return 'app';
-    }
-    if (pagesDirExists) {
-        return 'pages';
-    }
-    return 'pages';
+    const appDirExists = fs_1.default.existsSync(`${projectRoot}/src/${exports.ROUTER_TYPE.APP}`) ||
+        fs_1.default.existsSync(`${projectRoot}/${exports.ROUTER_TYPE.APP}`);
+    const pagesDirExists = fs_1.default.existsSync(`${projectRoot}/src/${exports.ROUTER_TYPE.PAGES}`) ||
+        fs_1.default.existsSync(`${projectRoot}/${exports.ROUTER_TYPE.PAGES}`);
+    if (appDirExists)
+        return exports.ROUTER_TYPE.APP;
+    if (pagesDirExists)
+        return exports.ROUTER_TYPE.PAGES;
+    return exports.ROUTER_TYPE.PAGES;
 }
 /**
  * Detects the component type based on directives, imports, and router context.
@@ -155,7 +167,7 @@ function detectComponentType(filePath, routerType) {
         // Router-aware defaults:
         // - App Router: defaults to server (RSC by default)
         // - Pages Router: defaults to universal (isomorphic by default)
-        if (detectedRouterType === 'app') {
+        if (detectedRouterType === exports.ROUTER_TYPE.APP) {
             return 'server';
         }
         else {

package/dist/esm/tools/generate-map.js

@@ -1,7 +1,35 @@
 import { filterComponentsByType, } from '@sitecore-content-sdk/content/tools';
 import * as path from 'path';
 import * as fs from 'fs';
-import { detectRouterType, getComponentListWithTypes } from './templating/utils';
+import { detectRouterType, getComponentListWithTypes, ROUTER_TYPE } from './templating/utils';
+const DEFAULT_HEADER_COMMENT = "Below are built-in components that are available in the app, it's recommended to keep them as is";
+const APP_ROUTER_BUILTIN_IMPORTS = `
+import { BYOCServerWrapper, NextjsContentSdkComponent, FEaaSServerWrapper } from '@sitecore-content-sdk/nextjs';
+import { Form } from '@sitecore-content-sdk/nextjs';
+`;
+const APP_ROUTER_BUILTIN_ENTRIES = [
+    `['BYOCWrapper', BYOCServerWrapper]`,
+    `['FEaaSWrapper', FEaaSServerWrapper]`,
+    `['Form', { ...Form, componentType: 'client' }]`,
+];
+const PAGES_ROUTER_BUILTIN_IMPORTS = `
+import { BYOCWrapper, NextjsContentSdkComponent, FEaaSWrapper } from '@sitecore-content-sdk/nextjs';
+import { Form } from '@sitecore-content-sdk/nextjs';
+`;
+const PAGES_ROUTER_BUILTIN_ENTRIES = [
+    `['BYOCWrapper', BYOCWrapper]`,
+    `['FEaaSWrapper', FEaaSWrapper]`,
+    `['Form', Form]`,
+];
+const CLIENT_MAP_BUILTIN_IMPORTS = `
+import { BYOCClientWrapper, NextjsContentSdkComponent, FEaaSClientWrapper } from '@sitecore-content-sdk/nextjs';
+import { Form } from '@sitecore-content-sdk/nextjs';
+`;
+const CLIENT_MAP_BUILTIN_ENTRIES = [
+    `['BYOCWrapper', BYOCClientWrapper]`,
+    `['FEaaSWrapper', FEaaSClientWrapper]`,
+    `['Form', Form]`,
+];
 // Common builder for Next.js component map content
 const prepareComponentsForMap = (components, opts) => {
     const groups = new Map();
@@ -77,21 +105,16 @@ const prepareComponentsForMap = (components, opts) => {
     }
     return entries;
 };
-const buildNextjsMapContent = (entries, componentImports, options = {}) => {
-    const isAppRouter = detectRouterType() === 'app';
-    const { headerComment = "Below are built-in components that are available in the app, it's recommended to keep them as is", isClientMap = false, } = options;
+/**
+ * Distinguishes the simple 2-arity ComponentMapTemplate from the 3-arity EnhancedComponentMapTemplate.
+ * @param {ComponentMapTemplate | EnhancedComponentMapTemplate} fn The template function to check.
+ * @internal
+ */
+const isComponentMapTemplate = (fn) => fn.length === 2;
+const buildNextjsMapContent = (entries, componentImports, options) => {
+    const { headerComment = DEFAULT_HEADER_COMMENT, isClientMap = false, builtInImports, builtInMapEntries, } = options;
     const wildcardImports = [];
     const namedImports = [];
-    const builtInImports = options.builtInImports ||
-        `
-import { BYOCWrapper, NextjsContentSdkComponent, FEaaSWrapper } from '@sitecore-content-sdk/nextjs';
-import { Form } from '@sitecore-content-sdk/nextjs';
-`;
-    const builtInMapEntries = options.builtInMapEntries || [
-        `['BYOCWrapper', BYOCWrapper]`,
-        `['FEaaSWrapper', FEaaSWrapper]`,
-        `['Form', ${isAppRouter ? '{ ...Form, componentType: \'client\' }' : 'Form'}]`,
-    ];
     // Add per-entry imports
     entries.forEach((e) => wildcardImports.push(...e.imports));
     // Handle package imports
@@ -109,8 +132,8 @@ import { Form } from '@sitecore-content-sdk/nextjs';
         ...namedImports,
     ].filter(Boolean);
     const importsSection = importLines.length ? `\n${importLines.join('\n')}` : '';
-    // Build entry lines (package named imports are appended below)
-    const componentMapEntries = builtInMapEntries;
+    // Clone to avoid mutating the caller's array
+    const componentMapEntries = structuredClone(builtInMapEntries);
     for (const e of entries) {
         const value = !isClientMap && e.annotateClient
             ? `{ ${e.valueExpr}, componentType: 'client' }`
@@ -143,26 +166,30 @@ ${componentMapEntries
 export default componentMap;
 `;
 };
-// default client template
+// Default App Router (server) component map template
+export const defaultServerMapTemplate = (components, componentImports, ctx) => {
+    var _a, _b;
+    const entries = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.entries) !== null && _a !== void 0 ? _a : prepareComponentsForMap(components, {
+        includeVariants: (_b = ctx === null || ctx === void 0 ? void 0 : ctx.includeVariants) !== null && _b !== void 0 ? _b : true,
+    });
+    return buildNextjsMapContent(entries, componentImports, {
+        headerComment: DEFAULT_HEADER_COMMENT,
+        isClientMap: false,
+        builtInImports: APP_ROUTER_BUILTIN_IMPORTS,
+        builtInMapEntries: APP_ROUTER_BUILTIN_ENTRIES,
+    });
+};
+// Default client-safe component map template for App Router
 export const defaultClientMapTemplate = (components, componentImports, ctx) => {
     var _a, _b;
-    const builtInImports = `
-import { BYOCClientWrapper, NextjsContentSdkComponent, FEaaSClientWrapper } from '@sitecore-content-sdk/nextjs';
-import { Form } from '@sitecore-content-sdk/nextjs';
-`;
-    const builtInMapEntries = [
-        `['BYOCWrapper', BYOCClientWrapper]`,
-        `['FEaaSWrapper', FEaaSClientWrapper]`,
-        `['Form', Form]`,
-    ];
     const entries = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.entries) !== null && _a !== void 0 ? _a : prepareComponentsForMap(components, {
         includeVariants: (_b = ctx === null || ctx === void 0 ? void 0 : ctx.includeVariants) !== null && _b !== void 0 ? _b : true,
     });
     return buildNextjsMapContent(entries, componentImports, {
         headerComment: 'Client-safe component map for App Router',
         isClientMap: true,
-        builtInImports,
-        builtInMapEntries,
+        builtInImports: CLIENT_MAP_BUILTIN_IMPORTS,
+        builtInMapEntries: CLIENT_MAP_BUILTIN_ENTRIES,
     });
 };
 // Collect components from specified paths, apply exclude and type filter, and prepare map entries.
@@ -182,115 +209,92 @@ const collectComponents = (opts) => {
 /**
  * Generate and write componentMap.ts files based on provided params.
  *
- * When clientComponentMap is true, generates:
+ * Pages Router:
+ * - component-map.ts          : Single component map with Pages Router wrappers
+ *
+ * App Router (clientComponentMap=true or undefined):
  * - component-map.ts          : Full component map with all components (server, client, universal)
- * - component-map.client.ts   : Client-safe map with only client + universal components
+ * - component-map.client.ts   : Client-safe map with client + universal components
  *
- * When clientComponentMap is false, generates:
- * - component-map.ts          : Single component map (traditional behavior)
+ * App Router (clientComponentMap=false):
+ * - component-map.ts          : Full component map with all components (server, client, universal)
+ * - component-map.client.ts   : Client-safe map with built-in components only (no user components)
  *
- * When includeVariants is true (in either mode):
+ * When includeVariants is true:
  * - Includes component **variants** in the generated map(s) alongside base components
  * - Preserves the same client/server filtering rules (variants obey clientComponentMap filtering)
  * - Variant entries are emitted using the same naming/keys convention as their base components
  *
  * Template Customization:
  * - mapTemplate: Custom template for main component map (works for both single and dual map modes)
- * - clientMapTemplate: Custom template for client component map (only used when clientComponentMap is true)
+ * - clientMapTemplate: Custom template for client component map (App Router only)
  * @param {GenerateMapArgs} params - The parameters for the generateMap function.
  * @public
  */
 export const generateMap = ({ paths, destination = '.sitecore', exclude, componentImports, mapTemplate, clientMapTemplate, clientComponentMap, includeVariants = true, }) => {
-    const isAppRouter = detectRouterType() === 'app';
-    const shouldGenerateClientMap = clientComponentMap !== null && clientComponentMap !== void 0 ? clientComponentMap : isAppRouter;
-    if (shouldGenerateClientMap) {
-        // App Router case, main map
-        const getComponents = collectComponents({ paths, exclude, includeVariants, filter: 'all' });
-        let mainContent;
-        if (mapTemplate) {
-            mainContent = mapTemplate(getComponents.raw, componentImports, {
-                entries: getComponents.entries,
+    const routerType = detectRouterType();
+    const allComponents = collectComponents({ paths, exclude, includeVariants, filter: 'all' });
+    if (routerType === ROUTER_TYPE.PAGES) {
+        const content = mapTemplate
+            ? mapTemplate(allComponents.raw, componentImports, {
+                entries: allComponents.entries,
                 includeVariants,
                 isClientMap: false,
-            });
-        }
-        else {
-            // default app router server map
-            const builtInImports = `
-import { BYOCServerWrapper, NextjsContentSdkComponent, FEaaSServerWrapper } from '@sitecore-content-sdk/nextjs';
-import { Form } from '@sitecore-content-sdk/nextjs';
-`;
-            const builtInMapEntries = [
-                `['BYOCWrapper', BYOCServerWrapper]`,
-                `['FEaaSWrapper', FEaaSServerWrapper]`,
-                `['Form', { ...Form, componentType: 'client' }]`,
-            ];
-            mainContent = buildNextjsMapContent(getComponents.entries, componentImports, {
-                headerComment: "Below are built-in components that are available in the app, it's recommended to keep them as is",
+            })
+            : buildNextjsMapContent(allComponents.entries, componentImports, {
                 isClientMap: false,
-                builtInImports,
-                builtInMapEntries,
+                builtInImports: PAGES_ROUTER_BUILTIN_IMPORTS,
+                builtInMapEntries: PAGES_ROUTER_BUILTIN_ENTRIES,
             });
+        try {
+            fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), content, 'utf8');
         }
-        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), mainContent, 'utf8');
-        // App Router, client map
-        const clientComponents = collectComponents({
-            paths,
-            exclude,
-            includeVariants,
-            filter: 'client',
-        });
-        const clientTemplate = clientMapTemplate || defaultClientMapTemplate;
-        let clientContent;
-        if (clientTemplate.length >= 2) {
-            clientContent = clientTemplate(clientComponents.raw, componentImports);
-        }
-        else {
-            clientContent = clientTemplate(clientComponents.raw, componentImports, {
-                entries: clientComponents.entries,
-                includeVariants,
-                isClientMap: true,
-            });
+        catch (error) {
+            console.error(`Component Map generation failed. Error writing to file ${destination}:`, error);
+            throw error;
         }
-        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.client.ts'), clientContent, 'utf8');
+        return;
     }
-    else {
-        // Either in pages/app router or clientComponentMap = false
-        const components = collectComponents({
-            paths,
-            exclude,
+    const mainContent = mapTemplate
+        ? mapTemplate(allComponents.raw, componentImports, {
+            entries: allComponents.entries,
+            includeVariants,
+            isClientMap: false,
+        })
+        : defaultServerMapTemplate(allComponents.raw, componentImports, {
+            entries: allComponents.entries,
             includeVariants,
-            filter: 'all',
-        }).entries;
-        const content = buildNextjsMapContent(components, componentImports, {
-            headerComment: "Below are built-in components that are available in the app, it's recommended to keep them as is",
             isClientMap: false,
         });
-        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), content, 'utf8');
-        // For App Router compatibility, always generate client map file even when clientComponentMap is false
-        // When clientComponentMap is false, only include built-in components (no custom client components)
-        if (shouldGenerateClientMap || isAppRouter) {
-            const clientMapTemplateToUse = clientMapTemplate || defaultClientMapTemplate;
-            const components = collectComponents({ paths: [], includeVariants, filter: 'all' });
-            let clientMapContent;
-            if (clientMapTemplateToUse.length >= 2) {
-                clientMapContent = clientMapTemplateToUse([], componentImports);
-            }
-            else {
-                clientMapContent = clientMapTemplateToUse([], componentImports, {
-                    entries: components.entries,
-                    includeVariants,
-                    isClientMap: true,
-                });
-            }
-            const clientMapFile = path.join(process.cwd(), destination, 'component-map.client.ts');
-            try {
-                fs.writeFileSync(clientMapFile, clientMapContent, { encoding: 'utf8' });
-            }
-            catch (error) {
-                console.error(`Client Component Map generation failed. Error writing to file ${destination}:`, error);
-                throw error;
-            }
-        }
+    try {
+        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.ts'), mainContent, 'utf8');
+    }
+    catch (error) {
+        console.error(`Main Component Map generation failed. Error writing to file ${destination}:`, error);
+        throw error;
+    }
+    // clientComponentMap=true  -> include user client+universal components
+    // clientComponentMap=undefined  -> include user client+universal components
+    // clientComponentMap=false -> built-ins only
+    const shouldGenerateClientMap = clientComponentMap !== null && clientComponentMap !== void 0 ? clientComponentMap : true;
+    const clientComponents = shouldGenerateClientMap
+        ? collectComponents({ paths, exclude, includeVariants, filter: 'client' })
+        : { raw: [], entries: [] };
+    const clientTemplate = clientMapTemplate || defaultClientMapTemplate;
+    let clientContent;
+    if (isComponentMapTemplate(clientTemplate))
+        clientContent = clientTemplate(clientComponents.raw, componentImports);
+    else
+        clientContent = clientTemplate(clientComponents.raw, componentImports, {
+            entries: clientComponents.entries,
+            includeVariants,
+            isClientMap: true,
+        });
+    try {
+        fs.writeFileSync(path.join(process.cwd(), destination, 'component-map.client.ts'), clientContent, 'utf8');
+    }
+    catch (error) {
+        console.error(`Client Component Map generation failed. Error writing to file ${destination}:`, error);
+        throw error;
     }
 };

package/dist/esm/tools/templating/utils.js

@@ -1,6 +1,17 @@
 import { getComponentList, defaultImportMapTemplate, } from '@sitecore-content-sdk/content/node-tools';
 import ts from 'typescript';
 import fs from 'fs';
+/**
+ * Constants for Next.js router types. Used for consistent detection and comparison throughout the codebase.
+ * Values are based on Next.js conventions:
+ * - 'app' for App Router (src/app or app directory)
+ * - 'pages' for Pages Router (src/pages or pages directory)
+ * @internal
+ */
+export const ROUTER_TYPE = {
+    APP: 'app',
+    PAGES: 'pages',
+};
 /**
  * Detects the Next.js router type (App Router or Pages Router) based on directory structure.
  * @param {string} projectRoot - The project root directory. Defaults to current working directory.
@@ -8,15 +19,15 @@ import fs from 'fs';
  * @internal
  */
 export function detectRouterType(projectRoot = process.cwd()) {
-    const appDirExists = fs.existsSync(`${projectRoot}/src/app`) || fs.existsSync(`${projectRoot}/app`);
-    const pagesDirExists = fs.existsSync(`${projectRoot}/src/pages`) || fs.existsSync(`${projectRoot}/pages`);
-    if (appDirExists) {
-        return 'app';
-    }
-    if (pagesDirExists) {
-        return 'pages';
-    }
-    return 'pages';
+    const appDirExists = fs.existsSync(`${projectRoot}/src/${ROUTER_TYPE.APP}`) ||
+        fs.existsSync(`${projectRoot}/${ROUTER_TYPE.APP}`);
+    const pagesDirExists = fs.existsSync(`${projectRoot}/src/${ROUTER_TYPE.PAGES}`) ||
+        fs.existsSync(`${projectRoot}/${ROUTER_TYPE.PAGES}`);
+    if (appDirExists)
+        return ROUTER_TYPE.APP;
+    if (pagesDirExists)
+        return ROUTER_TYPE.PAGES;
+    return ROUTER_TYPE.PAGES;
 }
 /**
  * Detects the component type based on directives, imports, and router context.
@@ -144,7 +155,7 @@ export function detectComponentType(filePath, routerType) {
         // Router-aware defaults:
         // - App Router: defaults to server (RSC by default)
         // - Pages Router: defaults to universal (isomorphic by default)
-        if (detectedRouterType === 'app') {
+        if (detectedRouterType === ROUTER_TYPE.APP) {
             return 'server';
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/nextjs",
-  "version": "2.1.0",
+  "version": "2.1.1-canary.20260512111718",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -178,7 +178,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "c505c331a61f4ebf65f1bd5fe514cb0ab9192c56",
+  "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
   "files": [
     "dist",
     "types",

package/types/tools/generate-map.d.ts

@@ -1,24 +1,29 @@
 import { GenerateMapFunction, EnhancedComponentMapTemplate } from '@sitecore-content-sdk/content/tools';
+export declare const defaultServerMapTemplate: EnhancedComponentMapTemplate;
 export declare const defaultClientMapTemplate: EnhancedComponentMapTemplate;
 export type CollectFilter = 'all' | 'client' | 'server' | 'universal';
 /**
  * Generate and write componentMap.ts files based on provided params.
  *
- * When clientComponentMap is true, generates:
+ * Pages Router:
+ * - component-map.ts          : Single component map with Pages Router wrappers
+ *
+ * App Router (clientComponentMap=true or undefined):
  * - component-map.ts          : Full component map with all components (server, client, universal)
- * - component-map.client.ts   : Client-safe map with only client + universal components
+ * - component-map.client.ts   : Client-safe map with client + universal components
  *
- * When clientComponentMap is false, generates:
- * - component-map.ts          : Single component map (traditional behavior)
+ * App Router (clientComponentMap=false):
+ * - component-map.ts          : Full component map with all components (server, client, universal)
+ * - component-map.client.ts   : Client-safe map with built-in components only (no user components)
  *
- * When includeVariants is true (in either mode):
+ * When includeVariants is true:
  * - Includes component **variants** in the generated map(s) alongside base components
  * - Preserves the same client/server filtering rules (variants obey clientComponentMap filtering)
  * - Variant entries are emitted using the same naming/keys convention as their base components
  *
  * Template Customization:
  * - mapTemplate: Custom template for main component map (works for both single and dual map modes)
- * - clientMapTemplate: Custom template for client component map (only used when clientComponentMap is true)
+ * - clientMapTemplate: Custom template for client component map (App Router only)
  * @param {GenerateMapArgs} params - The parameters for the generateMap function.
  * @public
  */

package/types/tools/generate-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-map.d.ts","sourceRoot":"","sources":["../../src/tools/generate-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,EAInB,4BAA4B,EAG7B,MAAM,qCAAqC,CAAC;AAuM7C,eAAO,MAAM,wBAAwB,EAAE,4BA4BtC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,CAAC;AA6BtE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,WAAW,EAAE,mBAkIzB,CAAC"}
+{"version":3,"file":"generate-map.d.ts","sourceRoot":"","sources":["../../src/tools/generate-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,EAInB,4BAA4B,EAG7B,MAAM,qCAAqC,CAAC;AAyO7C,eAAO,MAAM,wBAAwB,EAAE,4BAiBtC,CAAC;AAGF,eAAO,MAAM,wBAAwB,EAAE,4BAiBtC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,CAAC;AA6BtE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,WAAW,EAAE,mBAiGzB,CAAC"}

package/types/tools/templating/utils.d.ts

@@ -1,5 +1,16 @@
 import { ComponentFileWithType, ComponentType, RouterType } from '@sitecore-content-sdk/content/tools';
 import { ModuleExports } from '@sitecore-content-sdk/content/node-tools';
+/**
+ * Constants for Next.js router types. Used for consistent detection and comparison throughout the codebase.
+ * Values are based on Next.js conventions:
+ * - 'app' for App Router (src/app or app directory)
+ * - 'pages' for Pages Router (src/pages or pages directory)
+ * @internal
+ */
+export declare const ROUTER_TYPE: {
+    readonly APP: "app";
+    readonly PAGES: "pages";
+};
 /**
  * Detects the Next.js router type (App Router or Pages Router) based on directory structure.
  * @param {string} projectRoot - The project root directory. Defaults to current working directory.

package/types/tools/templating/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tools/templating/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,UAAU,EACX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,0CAA0C,CAAC;AAIlD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,GAAE,MAAsB,GAAG,UAAU,CAehF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,aAAa,CA0J5F;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,eAAe,CAAC,EAAE,OAAO,EACzB,UAAU,CAAC,EAAE,UAAU,GACtB,qBAAqB,EAAE,CAQzB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,UAGnF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,UAEpF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,UAEpF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tools/templating/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,UAAU,EACX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,0CAA0C,CAAC;AAIlD;;;;;;GAMG;AACH,eAAO,MAAM,WAAW;;;CAGd,CAAC;AAEX;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,GAAE,MAAsB,GAAG,UAAU,CAahF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,aAAa,CA0J5F;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,eAAe,CAAC,EAAE,OAAO,EACzB,UAAU,CAAC,EAAE,UAAU,GACtB,qBAAqB,EAAE,CAQzB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,UAGnF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,UAEpF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,UAEpF"}