@exdst-sitecore-content-sdk/astro 0.0.22 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exdst-sitecore-content-sdk/astro",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "type": "module",
   "sideEffects": false,
   "publishConfig": {
@@ -15,7 +15,7 @@
     "test:components": "vitest run --config ./vitest.config.ts",
     "coverage": "nyc npm test",
     "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --outputFileStrategy Members --parametersFormat table --readme none --out ../../ref-docs/core --entryPoints src/index.ts --entryPoints src/config/index.ts --entryPoints src/client/index.ts --entryPoints src/i18n/index.ts --entryPoints src/layout/index.ts --entryPoints src/media/index.ts --entryPoints src/personalize/index.ts --entryPoints src/site/index.ts --entryPoints src/tracking/index.ts --entryPoints src/utils/index.ts --entryPoints src/editing/index.ts --entryPoints src/tools/index.ts --githubPages false",
-    "api-extractor": "npm run build && api-extractor run --local --verbose",
+    "api-extractor": "api-extractor run --local --verbose",
     "api-extractor:verify": "api-extractor run"
   },
   "engines": {
@@ -49,7 +49,7 @@
     "@types/sinon-chai": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "8.39.0",
     "@typescript-eslint/parser": "8.39.0",
-    "astro": "^6.1.1",
+    "astro": "^6.1.3",
     "chai": "^4.4.1",
     "chai-spies": "^1.1.0",
     "chai-string": "^1.6.0",

package/src/client/sitecore-astro-client.test.ts

@@ -34,9 +34,14 @@ describe('SitecoreClient', () => {
     },
     defaultSite: 'default-site',
     defaultLanguage: 'en',
+    multisite: {
+      enabled: true,
+      useCookieResolution: () => true,
+    },
     layout: { formatLayoutQuery: sandbox.stub() },
     dictionary: { caching: { enabled: true, timeout: 60000 } },
     disableCodeGeneration: false,
+    rewriteMediaUrls: false,
   };
 
   let sitecoreClient = new SitecoreAstroClient(defaultInitOptions);
@@ -97,12 +102,6 @@ describe('SitecoreClient', () => {
       const path = `${VARIANT_PREFIX}variant1/${VARIANT_PREFIX}mountain_bike_audience/test/path`;
       const locale = 'en-US';
       const testLayoutData = structuredClone(layoutData);
-
-      const siteInfo = {
-        name: 'default-site',
-        hostName: 'example.com',
-        language: 'en',
-      };
       layoutServiceStub.fetchLayoutData.returns(testLayoutData);
       sandbox.stub(sitecoreClient, 'getHeadLinks').returns([]);
 
@@ -117,12 +116,6 @@ describe('SitecoreClient', () => {
       const path = `${VARIANT_PREFIX}variant1/${VARIANT_PREFIX}sand_bike_audience/test/path`;
       const locale = 'en-US';
       const testLayoutData = structuredClone(layoutData);
-
-      const siteInfo = {
-        name: 'default-site',
-        hostName: 'example.com',
-        language: 'en',
-      };
       layoutServiceStub.fetchLayoutData.returns(testLayoutData);
       sandbox.stub(sitecoreClient, 'getHeadLinks').returns([]);
 
@@ -248,45 +241,27 @@ describe('SitecoreClient', () => {
     });
   });
 
-  /*
-  describe('getComponentData', () => {
-    it('should return componentData when component has getComponentsProps method', async () => {
-      const context = {
-        params: { path: ['test', 'path'] },
-        query: {},
-        req: {},
-        res: {},
-        resolvedUrl: '/test/path',
-      } as unknown as GetServerSidePropsContext;
-      const layoutData = {
-        sitecore: {
-          context,
-          route: {
-            name: 'test',
-            placeholders: {
-              main: [
-                {
-                  componentName: 'TestComponent',
-                  uid: 'test-uid',
-                },
-              ],
-            },
-          },
-        },
-      };
-
-      const mockComponent = {
-        getComponentServerProps: sandbox.stub().resolves({ props: { data: 'test-data' } }),
-      };
+  describe('getPreview', () => {
+    it('should call base getPreview with preview data and fetch options', async () => {
+      const previewData = {
+        variantId: 'variant-a',
+        route: '/test/path',
+        language: 'en',
+      } as any;
+      const fetchOptions = {
+        retries: 2,
+      } as any;
 
-      const componentMap = new Map([['TestComponent', mockComponent]]);
+      const basePrototype = Object.getPrototypeOf(SitecoreAstroClient.prototype);
+      const superGetPreviewStub = sandbox.stub(basePrototype, 'getPreview').resolves(null);
 
-      const result = await sitecoreClient.getComponentData(layoutData, context, componentMap);
+      try {
+        await sitecoreClient.getPreview(previewData, fetchOptions);
 
-      expect(result).to.deep.equal({
-        'test-uid': { props: { data: 'test-data' } },
-      });
-      expect(mockComponent.getComponentServerProps.calledOnce).to.be.true;
+        expect(superGetPreviewStub).to.have.been.calledOnceWithExactly(previewData, fetchOptions);
+      } finally {
+        superGetPreviewStub.restore();
+      }
     });
-  });*/
+  });
 });

package/src/client/sitecore-astro-client.ts

@@ -7,7 +7,6 @@ import {
   SitecoreClientInit,
 } from '@sitecore-content-sdk/content/client';
 import { PreviewData } from '../sharedTypes/component-props';
-import { ComponentPropsService } from '../services/component-props-service';
 import { EditingPreviewData } from '@sitecore-content-sdk/content/editing';
 import { getSiteRewriteData, normalizeSiteRewrite } from '@sitecore-content-sdk/content/site';
 import {
@@ -27,10 +26,8 @@ export type SitecoreAstroClientInit = SitecoreClientInit & Pick<SitecoreConfig,
  * @public
  */
 export class SitecoreAstroClient extends SitecoreClient {
-  protected componentPropsService: ComponentPropsService;
   constructor(protected initOptions: SitecoreAstroClientInit) {
     super(initOptions);
-    this.componentPropsService = this.getComponentPropsService();
   }
 
   /**
@@ -109,46 +106,4 @@ export class SitecoreAstroClient extends SitecoreClient {
 
     return staticPaths;
   }
-
-  // /**
-  //  * Parses components from component map and layoutData, executes getServerProps/getStaticProps methods
-  //  * and returns resulting props from components
-  //  * @param {LayoutServiceData} layoutData layout data to parse compnents from
-  //  * @param {ComponentMap<AstroContentSdkComponent>} components component map to get props for
-  //  * @returns {ComponentPropsCollection} component props
-  //  */
-  // async getComponentData(
-  //   layoutData: LayoutServiceData,
-  //   // context: GetServerSidePropsContext | GetStaticPropsContext,
-  //   components: ComponentMap<AstroContentSdkComponent>
-  // ): Promise<ComponentPropsCollection> {
-  //   let componentProps: ComponentPropsCollection = {};
-  //   if (!layoutData.sitecore.route) return componentProps;
-  //   // Retrieve component props using side-effects defined on components level
-  //   componentProps = await this.componentPropsService.fetchComponentProps({
-  //     layoutData: layoutData,
-  //     // context,
-  //     components,
-  //   });
-
-  //   const errors = Object.keys(componentProps)
-  //     .map((id) => {
-  //       const component = componentProps[id] as ComponentPropsError;
-
-  //       return component.error
-  //         ? `\nUnable to get component props for ${component.componentName} (${id}): ${component.error}`
-  //         : '';
-  //     })
-  //     .join('');
-
-  //   if (errors.length) {
-  //     throw new Error(errors);
-  //   }
-
-  //   return componentProps;
-  // }
-
-  protected getComponentPropsService(): ComponentPropsService {
-    return new ComponentPropsService();
-  }
 }

package/src/config-cli/define-cli-config.test.ts

@@ -11,10 +11,7 @@ describe('defineCliConfig', () => {
   const validateDefaultTemplates = (result: SitecoreCliConfig) => {
     expect(result.scaffold.templates[0].name).to.equal(ComponentTemplateType.DEFAULT);
     const defaultTemplate = result.scaffold.templates[0].generateTemplate('ComponentName');
-    // expect(defaultTemplate).to.contain(
-    //   // eslint-disable-next-line quotes
-    //   `import { ComponentParams, ComponentRendering } from '@sitecore-content-sdk/nextjs';`
-    // );
+
     expect(defaultTemplate).to.contain('ComponentName');
     if (result.scaffold.templates[0].getNextSteps) {
       const componentpath = 'src/components/ComponentName.astro';
@@ -22,24 +19,6 @@ describe('defineCliConfig', () => {
         `* Implement the Astro component in ${chalk.green(componentpath)}`
       );
     }
-
-    // expect(result.scaffold.templates[1].name).to.equal(ComponentTemplateType.BYOC);
-    // const byocTemplate = result.scaffold.templates[1].generateTemplate('ByocComponentName');
-    // expect(byocTemplate).to.contain(
-    //   // eslint-disable-next-line quotes
-    //   `import * as FEAAS from '@sitecore-feaas/clientside/react';`
-    // );
-    // expect(byocTemplate).to.contain('ByocComponentName');
-
-    // expect(result.scaffold.templates[1].generateTemplate('comp name')).to.contain(
-    //   // eslint-disable-next-line quotes
-    //   `import * as FEAAS from '@sitecore-feaas/clientside/react';`
-    // );
-    // if (result.scaffold.templates[1].getNextSteps) {
-    //   expect(result.scaffold.templates[1].getNextSteps('componentpath')[0]).to.contain(
-    //     '* Modify component registration through FEAAS.External.registerComponent if needed'
-    //   );
-    // }
   };
 
   it('should add default and byoc scaffold templates', () => {

package/src/context.ts

@@ -12,7 +12,7 @@ export const SitecoreContext: any = map({});
 
 /**
  * Shape of values passed when updating {@link SitecoreContext} (page, API, and optional component map).
- * @internal
+ * @public
  */
 export interface SitecoreContextProps {
   /**
@@ -31,9 +31,9 @@ export interface SitecoreContextProps {
 
 /**
  * Shape of values passed when updating dictionary phrases on {@link SitecoreContext}.
- * @internal
+ * @public
  */
-export interface SitecoreDictionarytProps {
+export interface SitecoreDictionaryProps {
   /**
    * The dictionary data.
    */
@@ -42,10 +42,8 @@ export interface SitecoreDictionarytProps {
 
 /**
  * Writes page data, API config, and optional component map into {@link SitecoreContext}.
- * @param {Page} props.page - The page data.
- * @param {SitecoreConfig['api']} props.api - The API configuration.
- * @param {ComponentMap} [props.componentMap] - Component map.
- * @internal
+ * @param {SitecoreContextProps} props - Page, API, and optional component map.
+ * @public
  */
 export const updateSitecoreContext = ({ page, api, componentMap }: SitecoreContextProps) => {
   SitecoreContext.setKey('page', page);
@@ -55,11 +53,10 @@ export const updateSitecoreContext = ({ page, api, componentMap }: SitecoreConte
 
 /**
  * Writes dictionary phrases into {@link SitecoreContext} for {@link useDictionary}.
- * @param {SitecoreDictionarytProps} props
- * @param {DictionaryPhrases} props.dictionary
- * @internal
+ * @param {DictionaryPhrases} dictionary - The dictionary data.
+ * @public
  */
-export const updateSitecoreDictionary = ({ dictionary }: SitecoreDictionarytProps) => {
+export const updateSitecoreDictionary = ({ dictionary }: SitecoreDictionaryProps) => {
   SitecoreContext.setKey('dictionary', dictionary);
 };
 
@@ -68,9 +65,10 @@ export const updateSitecoreDictionary = ({ dictionary }: SitecoreDictionarytProp
  * @public
  */
 export const useSitecore = (): SitecoreContextProps => {
+  const context = SitecoreContext.get();
   return {
-    page: SitecoreContext.get()['page'],
-    api: SitecoreContext.get()['api'],
+    page: context.page,
+    api: context.api,
   };
 };
 
@@ -79,7 +77,7 @@ export const useSitecore = (): SitecoreContextProps => {
  * @public
  */
 export const useComponentMap = (): ComponentMap => {
-  return SitecoreContext.get()['componentMap'];
+  return SitecoreContext.get().componentMap;
 };
 
 /**
@@ -88,7 +86,7 @@ export const useComponentMap = (): ComponentMap => {
  */
 export const useDictionary = () => {
   const t = (key: string): string => {
-    const dictionary = SitecoreContext.get()['dictionary'];
+    const dictionary = SitecoreContext.get().dictionary;
     if (!dictionary) {
       return key;
     }

package/src/env.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable spaced-comment */
-/* eslint-disable @typescript-eslint/triple-slash-reference */
+/* eslint-disable no-unused-vars */
 /// <reference types="astro/client" />
 declare global {
   namespace App {

package/src/middleware/multisite-middleware.test.ts

@@ -202,6 +202,33 @@ describe('MultisiteMiddleware', () => {
       });
     });
 
+    describe('multisite disabled globally', () => {
+      it('should skip when enabled is false and request is not Sitecore preview', async () => {
+        const { middleware, siteResolver } = createMiddleware({
+          config: { ...defaultConfig, enabled: false },
+        });
+        const res = createResponse();
+
+        const context = createContext({
+          url: new URL(hostname),
+        });
+
+        const mockNext = async () => res;
+
+        const finalRes = await middleware.handle(context, mockNext);
+
+        validateDebugLog('multisite middleware start: %o', {
+          pathname: '/styleguide',
+          language: 'en',
+          hostname: 'foo.net',
+        });
+        validateDebugLog('skipped (multisite middleware is disabled globally)');
+
+        expect(finalRes).to.deep.equal(res);
+        expect(siteResolver.getByHost.called).to.be.false;
+      });
+    });
+
     describe('disabled in chain', () => {
       it('should skip if skipMiddleware local variable is true', async () => {
         const { middleware } = createMiddleware();
@@ -226,30 +253,33 @@ describe('MultisiteMiddleware', () => {
     });
   });
 
-  // describe('preview', () => {
-  //   it('preview data cookie is present', async () => {
-  //     const { middleware } = createMiddleware();
-  //     const res = createResponse();
+  describe('Vercel/Next preview (_preview_data cookie)', () => {
+    it('should skip multisite when preview data cookie is present', async () => {
+      const { middleware, siteResolver } = createMiddleware();
+      const res = createResponse();
 
-  //     const context = createContext({
-  //       url: new URL(hostname),
-  //       cookieValues: {
-  //         _preview_data: true,
-  //       },
-  //     });
+      const context = createContext({
+        url: new URL(hostname),
+        cookieValues: {
+          _preview_data: '1',
+        },
+      });
 
-  //     const mockNext = async () => {
-  //       return res;
-  //     };
+      const mockNext = async () => res;
 
-  //     const finalRes = await middleware.handle(context, mockNext);
+      const finalRes = await middleware.handle(context, mockNext);
 
-  //     validateDebugLog('skipped (preview)');
+      validateDebugLog('multisite middleware start: %o', {
+        pathname: '/styleguide',
+        language: 'en',
+        hostname: 'foo.net',
+      });
+      validateDebugLog('skipped (preview)');
 
-  //     const resCookies = (finalRes as Response).headers.getSetCookie();
-  //     expect(resCookies).to.contain('_preview_data=true');
-  //   });
-  // });
+      expect(finalRes).to.deep.equal(res);
+      expect(siteResolver.getByHost.called).to.be.false;
+    });
+  });
 
   describe('Sitecore Preview', () => {
     it('request is passed', async () => {
@@ -440,6 +470,45 @@ describe('MultisiteMiddleware', () => {
       expect(mockNext).calledWith(sinon.match({ pathname: '/_site_foo/styleguide' }));
     });
 
+    it('x-forwarded-host takes precedence over host for site resolution', async () => {
+      const context = createContext({
+        headerValues: {
+          'x-forwarded-host': 'forwarded.example.com',
+          host: 'foo.net',
+        },
+      });
+
+      const mockNext = sinon.stub().returns(
+        createResponse({
+          headers: [],
+        })
+      );
+
+      const { middleware, siteResolver } = createMiddleware();
+
+      const finalRes = await middleware.handle(context, mockNext);
+
+      validateDebugLog('multisite middleware start: %o', {
+        pathname: '/styleguide',
+        language: 'en',
+        hostname: 'forwarded.example.com',
+      });
+
+      validateEndMessageDebugLog('multisite middleware end in %dms: %o', {
+        rewritePath: '/_site_foo/styleguide',
+        siteName: 'foo',
+        headers: {
+          ...(finalRes as Response).headers,
+          'x-sc-rewrite': '/_site_foo/styleguide',
+        },
+        cookies: 'sc_site=foo; HttpOnly; Secure; SameSite=None',
+      });
+
+      expect(siteResolver.getByHost).to.be.calledWith('forwarded.example.com');
+
+      expect(mockNext).calledWith(sinon.match({ pathname: '/_site_foo/styleguide' }));
+    });
+
     it('custom response object is not provided', async () => {
       const context = createContext();
 

package/src/sharedTypes/component-props.ts

@@ -1,13 +1,3 @@
-export type ComponentPropsError = { error: string; componentName: string };
-
-/**
- * Shape of component props storage
- * @public
- */
-export type ComponentPropsCollection = {
-  [componentUid: string]: unknown | ComponentPropsError;
-};
-
 /**
  * Represents an Astro component import
  * @public

package/src/tests/test-components/generate-map/Button.astro

@@ -0,0 +1,4 @@
+---
+---
+
+<button type="button">Test Button</button>

package/src/tests/test-components/generate-map/Link.astro

@@ -0,0 +1,4 @@
+---
+---
+
+<a href="#">Test Link</a>

package/src/tools/generate-map.test.ts

@@ -0,0 +1,201 @@
+/* eslint-disable quotes */
+/* eslint-disable no-unused-expressions, @typescript-eslint/no-unused-expressions */
+
+import path from 'path';
+import * as chai from 'chai';
+import sinonChai from 'sinon-chai';
+import { expect } from 'chai';
+import sinon from 'sinon';
+
+chai.use(sinonChai);
+import { generateMap } from './generate-map';
+import fs from 'fs';
+import { ComponentImport } from '@sitecore-content-sdk/content/tools';
+
+describe('generateMap', () => {
+  const sandbox = sinon.createSandbox();
+
+  describe('generateMap', () => {
+    const fakePackages: ComponentImport[] = [
+      {
+        importName: 'MyLib',
+        importInfo: {
+          importFrom: '@my/lib',
+        },
+      },
+      {
+        importName: 'OtherLib',
+        importInfo: {
+          importFrom: '@other/lib',
+        },
+      },
+    ];
+
+    beforeEach(() => {
+      sandbox.stub(fs, 'writeFileSync');
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('should write componentMap.ts file with components from "paths" parameter', () => {
+      const paths = ['src/tests/test-components/generate-map'];
+      generateMap({ paths });
+
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+      const [dest, content] = (fs.writeFileSync as sinon.SinonStub).getCall(0).args;
+      expect(dest).to.equal(path.join(process.cwd(), '.sitecore', 'component-map.ts'));
+
+      expect(content).to.include(
+        "import type { AstroContentSdkComponent } from '@exdst-sitecore-content-sdk/astro';"
+      );
+
+      expect(content).to.include(
+        "import Button from 'src/tests/test-components/generate-map/Button.astro';"
+      );
+      expect(content).to.include(
+        "import Link from 'src/tests/test-components/generate-map/Link.astro';"
+      );
+
+      expect(content).to.include('new Map');
+      expect(content).to.include("['Button', Button]");
+      expect(content).to.include("['Link', Link]");
+      expect(content).to.include('export default componentMap;');
+    });
+
+    it('should use template from custom componentMap function, when provided', () => {
+      const paths = ['src/tests/test-components/generate-map'];
+      const customTemplate = sinon.stub().returns('// custom template output');
+      const fakePackages = [
+        {
+          importName: 'CustomLib',
+          importInfo: {
+            importFrom: '@custom/lib',
+          },
+        },
+      ];
+      generateMap({ paths, componentImports: fakePackages, mapTemplate: customTemplate });
+
+      expect(customTemplate).to.have.been.calledOnce;
+      const [componentsArg, packagesArg] = customTemplate.getCall(0).args;
+      expect(packagesArg).to.deep.equal(fakePackages);
+      expect(componentsArg.map((c: any) => c.componentName)).to.include.members(['Button', 'Link']);
+
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+      const [, content] = (fs.writeFileSync as sinon.SinonStub).getCall(0).args;
+      expect(content).to.equal('// custom template output');
+    });
+
+    it('should generate an empty component map if no components are found', () => {
+      const paths = ['src/tests/test-components/generate-map-empty'];
+      generateMap({ paths });
+
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+      const [, content] = (fs.writeFileSync as sinon.SinonStub).getCall(0).args;
+      expect(content).to.include(
+        'export const componentMap = new Map<string, AstroContentSdkComponent>(['
+      );
+      expect(content).to.not.match(/\['Button'[\s\S]*Button/);
+      expect(content).to.not.match(/\['Link'[\s\S]*Link/);
+      expect(content).to.include('export default componentMap;');
+    });
+
+    it('should handle multiple paths and merge their components', () => {
+      const paths = [
+        'src/tests/test-components/generate-map',
+        'src/tests/test-components/map-components',
+      ];
+
+      generateMap({ paths });
+
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+      const [mainDest, content] = (fs.writeFileSync as sinon.SinonStub).getCall(0).args;
+      expect(mainDest).to.equal(path.join(process.cwd(), '.sitecore', 'component-map.ts'));
+
+      expect(content).to.include('new Map');
+
+      expect(content).to.include(
+        "import Button from 'src/tests/test-components/generate-map/Button.astro';"
+      );
+      expect(content).to.include(
+        "import Link from 'src/tests/test-components/generate-map/Link.astro';"
+      );
+      expect(content).to.include(
+        "import Bar from 'src/tests/test-components/map-components/Bar.astro';"
+      );
+
+      expect(content).to.include("['Button', Button]");
+      expect(content).to.include("['Link', Link]");
+      expect(content).to.include("['Bar', Bar]");
+      expect(content).to.include('export default componentMap;');
+    });
+
+    it('should not fail if packages is undefined', () => {
+      const paths = ['src/components'];
+      expect(() => generateMap({ paths, componentImports: undefined })).to.not.throw();
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+    });
+
+    it('should write componentMap.ts file with components from "paths" and "packages" parameters, when provided', () => {
+      const paths = ['src/components'];
+      generateMap({ paths, componentImports: fakePackages });
+
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+      const [, content] = (fs.writeFileSync as sinon.SinonStub).getCall(0).args;
+      expect(content).to.include("import MyLib from '@my/lib';");
+      expect(content).to.include("import OtherLib from '@other/lib';");
+
+      expect(content).to.include(
+        'export const componentMap = new Map<string, AstroContentSdkComponent>(['
+      );
+      expect(content).to.include("['MyLib', MyLib],");
+      expect(content).to.include("['OtherLib', OtherLib],");
+    });
+
+    it('should use custom destination when provided', () => {
+      const paths = ['src/components'];
+      const customDir = path.join(process.cwd(), 'custom/path');
+      const mainDest = path.join(customDir, 'component-map.ts');
+
+      generateMap({ paths, destination: 'custom/path', includeVariants: false });
+
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+
+      const encodingArg = sinon.match.string.or(sinon.match.has('encoding'));
+
+      expect(fs.writeFileSync).to.have.been.calledWithMatch(
+        mainDest,
+        sinon.match.string,
+        encodingArg
+      );
+    });
+
+    it('should pass exclude param into component collection call', () => {
+      const paths = ['src/tests/test-components/generate-map'];
+      const exclude = ['src/tests/test-components/generate-map/Button.*'];
+      generateMap({ paths, exclude });
+
+      expect(fs.writeFileSync).to.have.been.calledOnce;
+      const [, content] = (fs.writeFileSync as sinon.SinonStub).getCall(0).args;
+
+      expect(content).to.include(
+        "import Link from 'src/tests/test-components/generate-map/Link.astro';"
+      );
+      expect(content).to.not.include('Button');
+    });
+
+    it('should throw error when destination cannot be written to', async () => {
+      (fs.writeFileSync as sinon.SinonStub).throws(new Error('Disk full'));
+      const paths = ['src/components'];
+      let errorCaught = null;
+      try {
+        generateMap({ paths });
+      } catch (err) {
+        errorCaught = err;
+      }
+      expect(errorCaught).to.be.an('error');
+      expect((errorCaught as Error).message).to.equal('Disk full');
+    });
+  });
+});

package/src/tools/generate-map.ts

@@ -36,40 +36,28 @@ export const generateMap: GenerateMapFunction = ({
 };
 
 const buildAstroMapContent: ComponentMapTemplate = (components, componentImports): string => {
-  const wildcardImports: string[] = [];
-  const namedImports: string[] = [];
-
+  const componentImportsList: string[] = [];
   const componentMapEntries: string[] = [];
 
   components.forEach((component) => {
-    wildcardImports.push(`import ${component.moduleName} from '${component.importPath}.astro';`);
+    componentImportsList.push(
+      `import ${component.moduleName} from '${component.importPath}.astro';`
+    );
     componentMapEntries.push(`['${component.moduleName}', ${component.moduleName}]`);
   });
 
   componentImports?.forEach((packageEntry) => {
-    if (packageEntry.importInfo.namedImports) {
-      namedImports.push(
-        `import { ${packageEntry.importInfo.namedImports.join(', ')} } from '${
-          packageEntry.importInfo.importFrom
-        }.astro';`
-      );
-      packageEntry.importInfo.namedImports.forEach((importName) => {
-        componentMapEntries.push(`['${importName}', ${importName}]`);
-      });
-    } else {
-      wildcardImports.push(
-        `import ${packageEntry.importName} from '${packageEntry.importInfo.importFrom}';`
-      );
-      componentMapEntries.push(`['${packageEntry.importName}', ${packageEntry.importName}]`);
-    }
+    componentImportsList.push(
+      `import ${packageEntry.importName} from '${packageEntry.importInfo.importFrom}';`
+    );
+    componentMapEntries.push(`['${packageEntry.importName}', ${packageEntry.importName}]`);
   });
 
   return `
 import type { AstroContentSdkComponent } from '@exdst-sitecore-content-sdk/astro';
 
 // Components imported from the app itself
-${wildcardImports.join('\n')}
-${namedImports.join('\n')}
+${componentImportsList.join('\n')}
 
 // Components must be registered within the map to match the string key with component name in Sitecore
 export const componentMap = new Map<string, AstroContentSdkComponent>([

package/src/utils/utils.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-expressions */
 import { expect, use } from 'chai';
 import spies from 'chai-spies';
-import { addClassName, getEditingSecret } from './utils';
+import { addClassName, extractPath, getEditingSecret, removeLanguageFromPath } from './utils';
 
 use(spies);
 
@@ -34,15 +34,78 @@ describe('addClassName', () => {
     expect(modifiableAttrs).to.deep.equal({
       className: 'first-class second-class',
     });
+  });
+
+  it('should convert class attribute value to className when className is absent', () => {
+    const modifiableAttrs = {
+      class: 'second-class',
+    };
+    addClassName(modifiableAttrs);
+    expect(modifiableAttrs).to.deep.equal({
+      className: 'second-class',
+    });
+  });
 
-    it('should convert class attribute value to className when className is absent', () => {
-      const modifiableAttrs = {
-        class: 'second-class',
-      };
-      addClassName(modifiableAttrs);
-      expect(modifiableAttrs).to.deep.equal({
-        className: 'second-class',
-      });
+  it('should keep attributes unchanged when class is absent', () => {
+    const modifiableAttrs = {
+      className: 'first-class',
+      id: 'image',
+    };
+    addClassName(modifiableAttrs);
+    expect(modifiableAttrs).to.deep.equal({
+      className: 'first-class',
+      id: 'image',
     });
   });
 });
+
+describe('extractPath', () => {
+  it('should return root slash when params are undefined', () => {
+    const result = extractPath(undefined as unknown as Record<string, string | undefined>);
+    expect(result).to.equal('/');
+  });
+
+  it('should join path segments when path is an array', () => {
+    const result = extractPath({ path: ['about', 'team'] as unknown as string });
+    expect(result).to.equal('about/team');
+  });
+
+  it('should return path when path is a string', () => {
+    const result = extractPath({ path: 'about' });
+    expect(result).to.equal('about');
+  });
+
+  it('should return root slash when path is missing', () => {
+    const result = extractPath({});
+    expect(result).to.equal('/');
+  });
+});
+
+describe('removeLanguageFromPath', () => {
+  const languages = ['en', 'fr', 'de-DE'];
+
+  it('should remove a leading language segment', () => {
+    const result = removeLanguageFromPath('en/About', languages);
+    expect(result).to.equal('About');
+  });
+
+  it('should remove a language segment following a _site_ segment', () => {
+    const result = removeLanguageFromPath('_site_Basic/en/About', languages);
+    expect(result).to.equal('_site_Basic/About');
+  });
+
+  it('should match languages case-insensitively', () => {
+    const result = removeLanguageFromPath('_site_Basic/FR/About', languages);
+    expect(result).to.equal('_site_Basic/About');
+  });
+
+  it('should return root slash when path only contains a language segment', () => {
+    const result = removeLanguageFromPath('en', languages);
+    expect(result).to.equal('/');
+  });
+
+  it('should leave path unchanged when no supported language is found', () => {
+    const result = removeLanguageFromPath('es/About', languages);
+    expect(result).to.equal('es/About');
+  });
+});

package/src/services/component-props-service.ts

@@ -1,183 +0,0 @@
-// import chalk from 'chalk';
-import {
-  LayoutServiceData,
-  ComponentRendering,
-  PlaceholdersData,
-} from '@sitecore-content-sdk/content/layout';
-import {
-  AstroContentSdkComponent,
-  ComponentMap,
-  ComponentPropsCollection,
-} from '../sharedTypes/component-props';
-
-export type FetchComponentPropsArguments = {
-  layoutData: LayoutServiceData;
-  // context: NextContext;
-  components: ComponentMap<AstroContentSdkComponent>;
-};
-
-export type ComponentPropsRequest = {
-  // fetch: ComponentPropsFetchFunction;
-  layoutData: LayoutServiceData;
-  rendering: ComponentRendering;
-  // context: NextContext;
-};
-
-/**
- * The service for fetching component props.
- * @public
- */
-export class ComponentPropsService {
-  async fetchComponentProps(
-    params: FetchComponentPropsArguments
-  ): Promise<ComponentPropsCollection> {
-    const { layoutData, components } = params;
-    const requests = await this.collectRequests({
-      placeholders: layoutData.sitecore.route?.placeholders,
-      components,
-      layoutData,
-      // context,
-    });
-    return await this.execRequests(requests);
-  }
-
-  /**
-   * Go through layout service data, check all renderings using displayName, which should make some side effects.
-   * Write result in requests variable
-   * @param {object} params params
-   * @param {PlaceholdersData} [params.placeholders]
-   * @param {ComponentMap} params.components
-   * @param {LayoutServiceData} params.layoutData
-   * @param {ComponentPropsRequest[]} params.requests
-   * @returns {ComponentPropsRequest[]} array of requests
-   */
-  protected async collectRequests(params: {
-    placeholders?: PlaceholdersData;
-    components: ComponentMap<AstroContentSdkComponent>;
-    layoutData: LayoutServiceData;
-    // context: NextContext;
-    requests?: ComponentPropsRequest[];
-  }): Promise<ComponentPropsRequest[]> {
-    const { placeholders = {}, layoutData } = params;
-
-    // Will be called on first round
-    if (!params.requests) {
-      params.requests = [];
-    }
-
-    const renderings = this.flatRenderings(placeholders);
-
-    const actions = renderings.map(async (r) => {
-      // const fetchFunc = (await this.getModule(components, r.componentName))
-      //  ?.getComponentServerProps;
-
-      const fetchFunc = ''; // getModule
-
-      if (fetchFunc) {
-        params.requests &&
-          params.requests.push({
-            // fetch: fetchFunc,
-            rendering: r,
-            layoutData: layoutData,
-            // context,
-          });
-      }
-
-      // If placeholders exist in current rendering
-      if (r.placeholders) {
-        await this.collectRequests({
-          ...params,
-          placeholders: r.placeholders,
-        });
-      }
-    });
-
-    await Promise.all(actions);
-
-    return params.requests;
-  }
-
-  /**
-   * Execute request for component props
-   * @param {ComponentPropsRequest[]} requests requests
-   * @returns {Promise<ComponentPropsCollection>} requests result
-   */
-  protected async execRequests(
-    requests: ComponentPropsRequest[]
-  ): Promise<ComponentPropsCollection> {
-    const componentProps: ComponentPropsCollection = {};
-
-    const promises = requests.map((req) => {
-      const { uid } = req.rendering;
-
-      if (!uid) {
-        console.log(
-          `Component ${req.rendering.componentName} doesn't have uid, can't store data for this component`
-        );
-        return;
-      }
-
-      // return req
-      //   .fetch(req.rendering, req.layoutData /*, req.context*/)
-      //   .then((result) => {
-      //     // Set component specific data in componentProps store
-      //     componentProps[uid] = result;
-      //   })
-      //   .catch((error) => {
-      //     const errLog = `Error during preload data for component ${
-      //       req.rendering.componentName
-      //     } (${uid}): ${error.message || error}`;
-
-      //     console.error(chalk.red(errLog));
-
-      //     componentProps[uid] = {
-      //       error: error.message || errLog,
-      //       componentName: req.rendering.componentName,
-      //     };
-      //   });
-    });
-
-    await Promise.all(promises);
-
-    return componentProps;
-  }
-
-  /**
-   * Take renderings from all placeholders and returns a flat array of renderings.
-   * @example
-   * const placeholders = {
-   *    x1: [{ uid: 1 }, { uid: 2 }],
-   *    x2: [{ uid: 11 }, { uid: 22 }]
-   * }
-   *
-   * flatRenderings(placeholders);
-   *
-   * RESULT: [{ uid: 1 }, { uid: 2 }, { uid: 11 }, { uid: 22 }]
-   * @param {PlaceholdersData} placeholders placeholders
-   * @returns {ComponentRendering[]} renderings
-   */
-  protected flatRenderings(placeholders: PlaceholdersData): ComponentRendering[] {
-    const allComponentRenderings: ComponentRendering[] = [];
-    const placeholdersArr = Object.values(placeholders);
-
-    placeholdersArr.forEach((pl) => {
-      const renderings = pl as ComponentRendering[];
-      allComponentRenderings.push(...renderings);
-    });
-
-    return allComponentRenderings;
-  }
-
-  // private async getModule(
-  //   components: ComponentMap<AstroContentSdkComponent>,
-  //   componentName: string
-  // ) {
-  //   const component = components.get(componentName);
-
-  //   if (!component) return null;
-
-  //   //const module = component.dynamicModule ? await component?.dynamicModule?.() : component;
-  //   const module = component;
-  //   return module as AstroContentSdkComponent;
-  // }
-}