@sitecore-content-sdk/core 0.2.0-beta.2 → 0.2.0-beta.21

package/dist/esm/tools/auth/renewal.js

@@ -0,0 +1,124 @@
+import { getActiveTenant, clearActiveTenant } from './tenant-state';
+import { clientCredentialsFlow } from './flow';
+import { writeTenantAuthInfo, readTenantAuthInfo, deleteTenantAuthInfo, readTenantInfo, } from './tenant-store';
+import { deleteKey } from './encryption';
+import { DEFAULT_SITECORE_AUTH_DOMAIN, REFRESH_GRANT_TYPE } from './../../constants';
+import { decodeJwtPayload } from './tenant-store';
+import { sendPostRequest } from './fetcher';
+/**
+ * Requests a new access token using the OAuth 2.0 refresh token grant type.
+ * This is used to "upgrade" an initial device flow token by including tenant-specific context.
+ * @param {RefreshTokenRequest} options - Configuration for the refresh token request.
+ * @returns {Promise<any>} A promise that resolves to the refreshed token data including tenant context.
+ * @throws {Error} If the token request fails or returns an error response.
+ */
+export let getRefreshAccessToken = _getRefreshAccessToken;
+export const unitMocks = {
+    get getRefreshAccessToken() {
+        return _getRefreshAccessToken;
+    },
+    set getRefreshAccessToken(mockFn) {
+        getRefreshAccessToken = mockFn;
+    },
+};
+/**
+ * Validates whether a given auth config is still valid (i.e., not expired).
+ * @param {TenantAuth} authInfo - The tenant auth configuration.
+ * @returns True if the token is still valid, false if expired.
+ */
+export function validateAuthInfo(authInfo) {
+    const now = new Date();
+    const expiry = new Date(authInfo.expires_at);
+    return now < expiry;
+}
+/**
+ * Renews the token for a given tenant using stored credentials.
+ * @param {TenantAuth} authInfo - Current authentication info for the tenant.
+ * @param {TenantInfo} tenantInfo - Public metadata about the tenant (e.g., clientId).
+ * @returns {Promise<void>} resolving when the token is successfully renewed.
+ * @throws If credentials are missing or renewal fails.
+ */
+export async function renewClientToken(authInfo, tenantInfo) {
+    const result = await clientCredentialsFlow({
+        clientId: tenantInfo.clientId,
+        clientSecret: authInfo.clientSecret,
+        organizationId: tenantInfo.organizationId,
+        tenantId: tenantInfo.tenantId,
+        audience: tenantInfo.audience,
+        authority: tenantInfo.authority,
+        baseUrl: tenantInfo.baseUrl,
+    });
+    const tenantId = tenantInfo.tenantId;
+    await writeTenantAuthInfo(tenantId, {
+        clientSecret: authInfo.clientSecret,
+        access_token: result.data.access_token,
+        expires_in: result.data.expires_in,
+        expires_at: new Date(Date.now() + result.data.expires_in * 1000).toISOString(),
+    });
+    console.log(`\n Token for tenant ${tenantId} renewed.`);
+}
+/**
+ * Ensures a valid token exists, renews it if expired.
+ * @returns {Promise<{ tenantId: string } | null>} returns tenant context if successful, otherwise null.
+ * @throws If renewal fails or credentials are missing.
+ */
+export async function validateAndRenewAuthIfExpired() {
+    const tenantId = getActiveTenant();
+    if (!tenantId)
+        return null;
+    const authInfo = await readTenantAuthInfo(tenantId);
+    if (!authInfo)
+        return null;
+    const isValid = validateAuthInfo(authInfo);
+    if (isValid) {
+        return { tenantId };
+    }
+    const tenantInfo = await readTenantInfo(tenantId);
+    if (!tenantInfo)
+        return null;
+    console.log(`\n Token for tenant ${tenantId} is expired. Renewing...`);
+    try {
+        if (authInfo.clientSecret) {
+            await renewClientToken(authInfo, tenantInfo);
+            return { tenantId };
+        }
+        else if (authInfo.refresh_token) {
+            const refreshTokenResponse = await getRefreshAccessToken({
+                clientId: tenantInfo.clientId,
+                refreshToken: authInfo.refresh_token,
+                tenantId: tenantId,
+                organizationId: tenantInfo.organizationId,
+                authority: tenantInfo.authority,
+            });
+            await writeTenantAuthInfo(tenantId, Object.assign({ expires_at: new Date(Date.now() + refreshTokenResponse.expires_in * 1000).toISOString() }, refreshTokenResponse));
+            console.log(`\n Token for tenant ${tenantId} renewed.`);
+            return { tenantId };
+        }
+        else {
+            throw new Error('\n No valid credentials found for token renewal.');
+        }
+    }
+    catch (err) {
+        const errorMessage = err instanceof Error ? err.message : 'Unknown error occurred';
+        console.error(`\n Failed to renew token for tenant '${tenantId}: ${errorMessage}'`);
+        console.log(`\n Cleaning up stale authentication data for tenant '${tenantId}'...`);
+        await deleteTenantAuthInfo(tenantId);
+        await deleteKey(tenantId);
+        clearActiveTenant();
+        return null;
+    }
+}
+// eslint-disable-next-line jsdoc/require-jsdoc
+async function _getRefreshAccessToken({ clientId, refreshToken, tenantId, organizationId, authority = DEFAULT_SITECORE_AUTH_DOMAIN, }) {
+    const params = new URLSearchParams({
+        client_id: clientId,
+        grant_type: REFRESH_GRANT_TYPE,
+        refresh_token: refreshToken,
+        tenant_id: tenantId,
+        organization_id: organizationId,
+    });
+    const url = `${authority}/oauth/token`;
+    const data = await sendPostRequest(url, params);
+    const { tokenTenantName } = decodeJwtPayload(data.access_token) || {};
+    return Object.assign(Object.assign({}, data), { tenantName: tokenTenantName });
+}

package/dist/esm/tools/auth/tenant-state.js

@@ -0,0 +1,73 @@
+/* eslint-disable jsdoc/require-jsdoc */
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+const configDir = path.join(os.homedir(), '.sitecore', 'sitecore-tools');
+const settingsFile = path.join(configDir, 'settings.json');
+/**
+ * Gets the ID of the currently active tenant from settings.json.
+ * @returns The active tenant ID if present, otherwise null.
+ */
+export let getActiveTenant = _getActiveTenant;
+/**
+ * Clears the currently active tenant from settings.json by deleting the file.
+ */
+export let clearActiveTenant = _clearActiveTenant;
+// mock setup for unit tests to make sinon happy and mock-able with esbuild/tsx
+// https://sinonjs.org/how-to/typescript-swc/
+// This, plus the `_` names make the exports writable for sinon
+export const unitMocks = {
+    set clearActiveTenant(mockImplementation) {
+        clearActiveTenant = mockImplementation;
+    },
+    get clearActiveTenant() {
+        return _clearActiveTenant;
+    },
+    set getActiveTenant(mockImplementation) {
+        getActiveTenant = mockImplementation;
+    },
+    get getActiveTenant() {
+        return _getActiveTenant;
+    },
+};
+function _getActiveTenant() {
+    var _a;
+    if (!fs.existsSync(settingsFile)) {
+        return null;
+    }
+    try {
+        const content = fs.readFileSync(settingsFile, 'utf-8');
+        const data = JSON.parse(content);
+        return (_a = data.activeTenant) !== null && _a !== void 0 ? _a : null;
+    }
+    catch (error) {
+        console.error(`\n Failed to read active tenant: ${error.message}`);
+        return null;
+    }
+}
+/**
+ * Sets the currently active tenant by writing to settings.json.
+ * @param {string} tenantId - The tenant ID to set as active.
+ */
+export function setActiveTenant(tenantId) {
+    try {
+        if (!fs.existsSync(configDir)) {
+            fs.mkdirSync(configDir, { recursive: true });
+        }
+        const data = { activeTenant: tenantId };
+        fs.writeFileSync(settingsFile, JSON.stringify(data, null, 2));
+    }
+    catch (error) {
+        console.error(`\n Failed to set active tenant '${tenantId}': ${error.message}`);
+    }
+}
+function _clearActiveTenant() {
+    try {
+        if (fs.existsSync(settingsFile)) {
+            fs.unlinkSync(settingsFile);
+        }
+    }
+    catch (error) {
+        console.error(`\n Failed to clear active tenant: ${error.message}`);
+    }
+}

package/dist/esm/tools/auth/tenant-store.js

@@ -0,0 +1,213 @@
+/* eslint-disable jsdoc/require-jsdoc */
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+import { encryptData, decryptData } from './encryption';
+import { CLAIMS } from './../../constants';
+const rootDir = path.join(os.homedir(), '.sitecore', 'sitecore-tools');
+/**
+ * Decodes a JWT without verifying its signature.
+ * @param {string} token - The access token string.
+ * @returns Decoded payload object or null if invalid.
+ */
+export let decodeJwtPayload = _decodeJwtPayload;
+/**
+ * Write the authentication configuration for a tenant.
+ * @param {string} tenantId - The tenant ID.
+ * @param {TenantAuth} authInfo - The tenant's auth data.
+ */
+export let writeTenantAuthInfo = _writeTenantAuthInfo;
+/**
+ * Read the authentication configuration for a tenant.
+ * @param {string} tenantId - The tenant ID.
+ * @returns Parsed auth config or null if not found or failed to read.
+ */
+export let readTenantAuthInfo = _readTenantAuthInfo;
+/**
+ * Write the public metadata information for a tenant.
+ * @param {TenantInfo} info - The tenant info object.
+ */
+export let writeTenantInfo = _writeTenantInfo;
+/**
+ * Read the public metadata information for a tenant.
+ * @param {string} tenantId - The tenant ID.
+ * @returns Parsed tenant info or null if not found or failed to read.
+ */
+export let readTenantInfo = _readTenantInfo;
+/**
+ * Deletes the stored auth.json file for the given tenant.
+ * @param {string} tenantId - The tenant ID.
+ */
+export let deleteTenantAuthInfo = _deleteTenantAuthInfo;
+/**
+ * Scans the CLI root directory and returns all valid tenant infos.
+ * @returns A list of TenantInfo objects found in {tenant-id}/info.json files.
+ */
+export let getAllTenantsInfo = _getAllTenantsInfo;
+// mock setup for unit tests to make sinon happy and mock-able with esbuild/tsx
+// https://sinonjs.org/how-to/typescript-swc/
+// This, plus the `_` names make the exports writable for sinon
+export const unitMocks = {
+    set decodeJwtPayload(mockImplementation) {
+        decodeJwtPayload = mockImplementation;
+    },
+    get decodeJwtPayload() {
+        return _decodeJwtPayload;
+    },
+    set writeTenantAuthInfo(mockImplementation) {
+        writeTenantAuthInfo = mockImplementation;
+    },
+    get writeTenantAuthInfo() {
+        return _writeTenantAuthInfo;
+    },
+    set readTenantAuthInfo(mockImplementation) {
+        readTenantAuthInfo = mockImplementation;
+    },
+    get readTenantAuthInfo() {
+        return _readTenantAuthInfo;
+    },
+    set writeTenantInfo(mockImplementation) {
+        writeTenantInfo = mockImplementation;
+    },
+    get writeTenantInfo() {
+        return _writeTenantInfo;
+    },
+    set readTenantInfo(mockImplementation) {
+        readTenantInfo = mockImplementation;
+    },
+    get readTenantInfo() {
+        return _readTenantInfo;
+    },
+    set deleteTenantAuthInfo(mockImplementation) {
+        deleteTenantAuthInfo = mockImplementation;
+    },
+    get deleteTenantAuthInfo() {
+        return _deleteTenantAuthInfo;
+    },
+    set getAllTenantsInfo(mockImplementation) {
+        getAllTenantsInfo = mockImplementation;
+    },
+    get getAllTenantsInfo() {
+        return _getAllTenantsInfo;
+    },
+};
+/**
+ * Get the full path to the tenant-specific folder.
+ * @param {string} tenantId - The tenant ID.
+ * @returns The absolute path to the tenant directory.
+ */
+export function getTenantPath(tenantId) {
+    return path.join(rootDir, tenantId);
+}
+async function _writeTenantAuthInfo(tenantId, authInfo) {
+    try {
+        const dir = getTenantPath(tenantId);
+        fs.mkdirSync(dir, { recursive: true });
+        const encrypted = await encryptData(JSON.stringify(authInfo), tenantId);
+        fs.writeFileSync(path.join(dir, 'auth.json'), JSON.stringify(encrypted));
+    }
+    catch (error) {
+        console.error(`\n Failed to write auth.json for tenant '${tenantId}': ${error.message}`);
+    }
+}
+async function _readTenantAuthInfo(tenantId) {
+    const filePath = path.join(getTenantPath(tenantId), 'auth.json');
+    if (!fs.existsSync(filePath))
+        return null;
+    try {
+        const encryptedPayloadRaw = fs.readFileSync(filePath, 'utf8');
+        const encryptedPayload = JSON.parse(encryptedPayloadRaw);
+        const decryptedData = await decryptData(encryptedPayload, tenantId, true);
+        if (decryptedData === null) {
+            return null;
+        }
+        return JSON.parse(decryptedData);
+    }
+    catch (error) {
+        console.error(`\n Failed to read auth.json for tenant '${tenantId}': ${error.message}`);
+        return null;
+    }
+}
+async function _writeTenantInfo(info) {
+    try {
+        const dir = getTenantPath(info.tenantId);
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(path.join(dir, 'info.json'), JSON.stringify(info, null, 2));
+    }
+    catch (error) {
+        console.error(`\n Failed to write info.json for tenant '${info.tenantId}': ${error.message}`);
+    }
+}
+async function _readTenantInfo(tenantId) {
+    const infoFilePath = path.join(getTenantPath(tenantId), 'info.json');
+    if (!fs.existsSync(infoFilePath)) {
+        return null;
+    }
+    try {
+        const content = fs.readFileSync(infoFilePath, 'utf-8');
+        return JSON.parse(content);
+    }
+    catch (error) {
+        console.error(`\n Failed to read info.json for tenant '${tenantId}': ${error.message}`);
+        return null;
+    }
+}
+async function _deleteTenantAuthInfo(tenantId) {
+    const filePath = path.join(getTenantPath(tenantId), 'auth.json');
+    try {
+        if (fs.existsSync(filePath)) {
+            fs.unlinkSync(filePath);
+        }
+    }
+    catch (error) {
+        console.error(`\n Failed to delete auth.json for tenant '${tenantId}': ${error.message}`);
+    }
+}
+function _getAllTenantsInfo() {
+    if (!fs.existsSync(rootDir))
+        return [];
+    const subDirs = fs
+        .readdirSync(rootDir)
+        .filter((entry) => fs.statSync(path.join(rootDir, entry)).isDirectory());
+    const tenants = [];
+    for (const dir of subDirs) {
+        const infoPath = path.join(rootDir, dir, 'info.json');
+        if (fs.existsSync(infoPath)) {
+            try {
+                const content = fs.readFileSync(infoPath, 'utf-8');
+                const data = JSON.parse(content);
+                if (data.tenantId && data.tenantName && data.organizationId) {
+                    tenants.push({
+                        tenantId: data.tenantId,
+                        tenantName: data.tenantName,
+                        organizationId: data.organizationId,
+                        clientId: data.clientId,
+                        authority: data.authority,
+                        audience: data.audience,
+                        baseUrl: data.baseUrl,
+                    });
+                }
+            }
+            catch (error) {
+                console.error('\n Failed to read tenant info file', error.message);
+            }
+        }
+    }
+    return tenants;
+}
+function _decodeJwtPayload(token) {
+    try {
+        const base64Payload = token.split('.')[1];
+        const payload = Buffer.from(base64Payload, 'base64').toString('utf-8');
+        const decoded = JSON.parse(payload);
+        return {
+            tokenTenantId: decoded === null || decoded === void 0 ? void 0 : decoded[`${CLAIMS}/tenant_id`],
+            tokenOrgId: decoded === null || decoded === void 0 ? void 0 : decoded[`${CLAIMS}/org_id`],
+            tokenTenantName: decoded === null || decoded === void 0 ? void 0 : decoded[`${CLAIMS}/tenant_name`],
+        };
+    }
+    catch (error) {
+        console.error('\n Failed to decode access token:', error.message);
+        return null;
+    }
+}

package/dist/esm/tools/index.js

@@ -2,3 +2,6 @@ export { generateSites } from './generateSites';
 export { generateMetadata } from './generateMetadata';
 export { scaffoldComponent } from './scaffold';
 export * from './templating';
+export * from './auth/models';
+import * as auth from './auth';
+export { auth };

package/dist/esm/utils/normalize-url.js

@@ -0,0 +1 @@
+export const normalizeUrl = (url) => (url.endsWith('/') ? url.slice(0, -1) : url);

package/dist/esm/utils/utils.js

@@ -160,7 +160,7 @@ export const areURLSearchParamsEqual = (params1, params2) => {
  * @returns {string} - The modified string or regex with non-special "?" characters escaped.
  */
 export const escapeNonSpecialQuestionMarks = (input) => {
-    const regexPattern = /(?<!\\)\?/g; // Match unescaped "?" characters
+    const regexPattern = /(\\)?\?/g; // Match "?" that may or may not be preceded by a backslash
     const negativeLookaheadPattern = /\(\?!$/; // Detect the start of a Negative Lookahead pattern
     const specialRegexSymbols = /[.*+)\[\]|\(]$/; // Check for special regex symbols before "?"
     let result = '';
@@ -169,12 +169,14 @@ export const escapeNonSpecialQuestionMarks = (input) => {
     while ((match = regexPattern.exec(input)) !== null) {
         const index = match.index; // Position of the "?" in the string
         const before = input.slice(lastIndex, index); // Context before the "?"
+        // Check if "?" is preceded by a backslash (escaped)
+        const isEscaped = match[1] !== undefined; // match[1] is the backslash group
         // Check if "?" is part of a Negative Lookahead
         const isNegativeLookahead = negativeLookaheadPattern.test(before.slice(-3));
         // Check if "?" follows a special regex symbol
         const isSpecialRegexSymbol = specialRegexSymbols.test(before.slice(-1));
-        if (isNegativeLookahead || isSpecialRegexSymbol) {
-            // If it's a special case, keep the "?" as is
+        if (isEscaped || isNegativeLookahead || isSpecialRegexSymbol) {
+            // If it's escaped, part of a Negative Lookahead, or follows a special regex symbol, keep the "?" as is
             result += input.slice(lastIndex, index + 1);
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/core",
-  "version": "0.2.0-beta.2",
+  "version": "0.2.0-beta.21",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -15,7 +15,7 @@
     "test": "mocha \"./src/**/*.test.ts\"",
     "prepublishOnly": "npm run build",
     "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/form/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"
+    "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 src/content/index.ts --githubPages false"
   },
   "engines": {
     "node": ">=22"
@@ -34,50 +34,51 @@
     "url": "https://github.com/sitecore/content-sdk/issues"
   },
   "devDependencies": {
-    "@sitecore-cloudsdk/events": "^0.5.0",
-    "@types/chai": "^5.0.1",
+    "@sitecore-cloudsdk/events": "^0.5.1",
+    "@types/chai": "^5.2.2",
     "@types/chai-spies": "^1.0.6",
     "@types/chai-string": "^1.4.5",
     "@types/debug": "^4.1.12",
     "@types/jsdom": "^21.1.7",
     "@types/memory-cache": "^0.2.6",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^22.12.0",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.15.14",
     "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.3",
+    "@types/sinon": "^17.0.4",
     "@types/sinon-chai": "^4.0.0",
     "@types/url-parse": "1.4.11",
-    "chai": "^4.2.0",
+    "chai": "^4.4.1",
     "chai-spies": "^1.1.0",
-    "chai-string": "^1.5.0",
+    "chai-string": "^1.6.0",
     "del-cli": "^6.0.0",
     "eslint": "^8.56.0",
-    "eslint-plugin-jsdoc": "48.7.0",
-    "jsdom": "^26.0.0",
-    "mocha": "^11.1.0",
+    "eslint-plugin-jsdoc": "50.6.11",
+    "jsdom": "^26.1.0",
+    "mocha": "^11.2.2",
     "nock": "14.0.0-beta.7",
     "nyc": "^17.1.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^19.0.2",
+    "sinon": "^20.0.0",
     "tslib": "^2.8.1",
-    "tsx": "^4.19.2",
-    "typescript": "~5.7.3"
+    "tsx": "^4.19.4",
+    "typescript": "~5.8.3"
   },
   "peerDependencies": {
-    "@sitecore-cloudsdk/events": "^0.5.0"
+    "@sitecore-cloudsdk/events": "^0.5.1"
   },
   "dependencies": {
     "chalk": "^4.1.2",
     "debug": "^4.4.0",
-    "graphql": "^16.10.0",
+    "graphql": "^16.11.0",
     "graphql-request": "^6.1.0",
+    "keytar": "^7.9.0",
     "memory-cache": "^0.2.0",
     "sinon-chai": "^4.0.0",
     "url-parse": "^1.5.10"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "6414b2a03a72e9a7c96a4a20de79ede4bafb0290",
+  "gitHead": "09fafe89fe05ef49b349bfc139ed6174940564ba",
   "files": [
     "dist",
     "types",

package/types/client/index.d.ts

@@ -4,4 +4,4 @@ export { RetryStrategy, PageInfo, FetchOptions } from '../models';
 export { getEdgeProxyContentUrl, getEdgeProxyFormsUrl } from './graphql-edge-proxy';
 export { SitecoreClient, Page, PageOptions, SitemapXmlOptions } from './sitecore-client';
 export { SitecoreClientInit } from './models';
-export { createGraphQLClientFactory } from './utils';
+export { createGraphQLClientFactory, GraphQLClientOptions } from './utils';

package/types/client/models.d.ts

@@ -1,5 +1,21 @@
 import { SitecoreConfig } from '../config';
-import { SiteInfo } from '../site';
+import { GraphQLEditingService } from '../editing/graphql-editing-service';
+import { RestComponentLayoutService } from '../editing/rest-component-layout-service';
+import { GraphQLDictionaryService } from '../i18n/graphql-dictionary-service';
+import { GraphQLLayoutService } from '../layout/graphql-layout-service';
+import { GraphQLErrorPagesService, GraphQLSitePathService, SiteInfo, SiteResolver } from '../site';
+/**
+ * Init options for Sitecore Client that allows you to override services too
+ */
 export type SitecoreClientInit = Omit<SitecoreConfig, 'multisite' | 'redirects' | 'personalize'> & {
     sites: SiteInfo[];
+    custom?: {
+        layoutService?: GraphQLLayoutService;
+        dictionaryService?: GraphQLDictionaryService;
+        siteResolver?: SiteResolver;
+        editingService?: GraphQLEditingService;
+        errorPagesService?: GraphQLErrorPagesService;
+        componentService?: RestComponentLayoutService;
+        sitePathService?: GraphQLSitePathService;
+    };
 };