@lwrjs/static 0.15.0-alpha.9 → 0.15.1

package/build/cjs/providers/static-bundle-provider.cjs

@@ -30,9 +30,13 @@ var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
+var import_lru_cache = __toModule(require("lru-cache"));
 var import_site_metadata = __toModule(require("../site-metadata.cjs"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
+var import_instrumentation2 = __toModule(require("@lwrjs/instrumentation"));
+var BUNDLE_SOURCE_NOT_FOUND = "Bundle Source Path Not Found";
 var StaticBundleProvider = class {
-  constructor(_config, context) {
+  constructor(config, context) {
     this.name = "static-bundle-provider";
     if (!context.siteMetadata) {
       throw new Error(`[${this.name}] Site metadata was not found`);
@@ -41,6 +45,19 @@ var StaticBundleProvider = class {
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
     this.bundleConfig = context.config.bundleConfig;
     this.i18n = context.config.i18n;
+    this.bundleCacheSize = config.bundleCacheSize ?? parseInt(process.env.BUNDLE_CACHE_SIZE ?? "500", 10);
+    if (this.bundleCacheSize > 0) {
+      this.codeCache = new import_lru_cache.LRUCache({
+        max: this.bundleCacheSize,
+        dispose: (_value, key) => {
+          if ((0, import_shared_utils.isLambdaEnv)()) {
+            import_diagnostics.logger.warn(`Bundle Code evicted from cache ${key}`);
+          } else {
+            import_diagnostics.logger.verbose(`Bundle Code evicted from cache ${key}`);
+          }
+        }
+      });
+    }
   }
   async bundle(moduleId, runtimeEnvironment, runtimeParams) {
     const {specifier, name, namespace, version} = moduleId;
@@ -49,25 +66,33 @@ var StaticBundleProvider = class {
       i18n: {defaultLocale}
     } = runtimeEnvironment;
     const localeId = runtimeParams?.locale || defaultLocale;
-    const metadata = this.getBundleMetadata(moduleId, localeId, debug);
+    const ssr = runtimeParams?.ssr;
+    const metadata = this.getBundleMetadata({moduleId, localeId, debug, ssr});
     if (!metadata) {
       return void 0;
     }
     const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
-    const code = await this.getCode(bundlePath, debug, specifier, version, localeId);
-    const imports = metadata.imports.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug));
-    const dynamicImports = metadata.dynamicImports?.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug));
+    const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
+    const codePromiser = this.getCodePromiser(resolvedBundlePath, {
+      specifier,
+      version,
+      locale: localeId,
+      ssr,
+      debug
+    });
+    const imports = metadata.imports.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug, false));
+    const dynamicImports = metadata.dynamicImports?.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug, false));
     const id = (0, import_shared_utils.getSpecifier)(moduleId);
     const exploded = (0, import_shared_utils.explodeSpecifier)(id);
     const resolvedName = name ?? exploded.name;
     const resolvedNamespace = namespace ?? exploded.namespace;
     const resolvedVersion = (0, import_site_metadata.resolveStaticBundleVersion)(metadata.version, version);
     const includedModules = metadata.includedModules?.map((includedId) => {
-      const includedModule = this.getModuleReference(includedId, localeId, debug);
+      const includedModule = this.getModuleReference(includedId, localeId, debug, ssr);
       return (0, import_shared_utils.getSpecifier)(includedModule);
     }) || [];
     return {
-      code,
+      getCode: codePromiser,
       id: (0, import_shared_utils.getSpecifier)({
         specifier,
         version: resolvedVersion,
@@ -88,44 +113,92 @@ var StaticBundleProvider = class {
       src: bundlePath
     };
   }
-  getBundleMetadata(moduleId, localeId, debug) {
-    const siteBundleId = (0, import_site_metadata.getSiteBundleId)(moduleId, localeId, this.i18n);
+  getBundleMetadata({
+    moduleId,
+    localeId,
+    debug,
+    ssr
+  }) {
+    const siteBundleId = (0, import_site_metadata.getSiteBundleId)(moduleId, localeId, ssr, this.i18n);
     return this.siteMetadata.getSiteBundlesDecisionTree().find(siteBundleId, debug);
   }
-  getModuleReference(siteBundleIdStr, localeId, debug) {
+  getModuleReference(siteBundleIdStr, localeId, debug, ssr) {
     const siteBundleId = (0, import_site_metadata.parseSiteId)(siteBundleIdStr);
     const includedModule = (0, import_shared_utils.explodeSpecifier)(siteBundleId.specifier);
     if (!siteBundleId.variants[import_shared_utils.VERSION_SIGIL]) {
-      const importBundleMetadata = this.siteMetadata.getSiteBundlesDecisionTree().find(siteBundleIdStr, debug, localeId);
+      const importBundleMetadata = this.siteMetadata.getSiteBundlesDecisionTree().find(siteBundleIdStr, debug, ssr, localeId);
       includedModule.version = (0, import_site_metadata.resolveStaticBundleVersion)(importBundleMetadata?.version);
     } else {
       includedModule.version = siteBundleId.variants[import_shared_utils.VERSION_SIGIL];
     }
     return includedModule;
   }
-  async getCode(bundlePath, debug, specifier, version, localeId) {
-    const isLambda = (0, import_shared_utils.isLambdaEnv)();
-    let bundleSourcePath = bundlePath;
-    try {
-      if (debug && isLambda) {
-        const metadata = this.getBundleMetadata({specifier, version}, localeId, false);
-        if (!metadata) {
+  getCodePromiser(bundleSourcePath, {
+    specifier,
+    version,
+    locale,
+    ssr,
+    debug
+  }) {
+    const cache = this.codeCache;
+    return async () => {
+      let code = cache?.get(bundleSourcePath);
+      if (!code) {
+        try {
+          if (bundleSourcePath === BUNDLE_SOURCE_NOT_FOUND) {
+            throw new Error(BUNDLE_SOURCE_NOT_FOUND);
+          }
+          import_instrumentation.cacheCountStore.incrementCacheKey("missedReads");
+          await (0, import_instrumentation2.getTracer)().trace({
+            name: import_instrumentation2.BundleSpan.ReadBundle,
+            attributes: {
+              specifier,
+              version: version ?? "",
+              locale,
+              ssr: ssr ? "TRUE" : "FALSE",
+              debug: debug ? "TRUE" : "FALSE",
+              bundleSourcePath
+            }
+          }, async () => {
+            code = await import_fs_extra.default.readFile(import_path.default.join(bundleSourcePath), "utf-8");
+            if (cache) {
+              cache.set(bundleSourcePath, code);
+            }
+          });
+        } catch (err) {
           import_diagnostics.logger.warn({
             label: "static-bundle-provider",
-            message: `Unexpected code reference: ${specifier}`
-          });
-          return `throw new Error('Unexpected code reference: ${specifier}');`;
+            message: `Unexpected code reference: ${specifier} ${bundleSourcePath}`
+          }, err);
+          code = `throw new Error('Unexpected code reference: ${specifier} ${bundleSourcePath}');`;
+          if (cache) {
+            cache.set(bundleSourcePath, code);
+          }
         }
-        bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
       }
-      return await import_fs_extra.default.readFile(bundleSourcePath, "utf-8");
-    } catch (err) {
-      import_diagnostics.logger.warn({
-        label: "static-bundle-provider",
-        message: `Unexpected code reference: ${specifier} ${bundleSourcePath}`
-      }, err);
-      return `throw new Error('Unexpected code reference: ${specifier} ${bundleSourcePath}');`;
+      return code;
+    };
+  }
+  getCodePath(bundlePath, debug, specifier, version, localeId, ssr) {
+    const isLambda = (0, import_shared_utils.isLambdaEnv)();
+    let bundleSourcePath = bundlePath;
+    if (debug && isLambda) {
+      const metadata = this.getBundleMetadata({
+        moduleId: {specifier, version},
+        localeId,
+        debug: false,
+        ssr
+      });
+      if (!metadata) {
+        import_diagnostics.logger.error({
+          label: "static-bundle-provider",
+          message: `Unexpected code reference: ${specifier}`
+        });
+        return BUNDLE_SOURCE_NOT_FOUND;
+      }
+      bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
     }
+    return bundleSourcePath;
   }
 };
 var static_bundle_provider_default = StaticBundleProvider;

package/build/cjs/providers/static-module-provider.cjs

@@ -44,7 +44,8 @@ var StaticModuleProvider = class {
   }
   async getModule(moduleId, runtimeParams) {
     const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
-    const metadata = this.getBundleMetadata(moduleId, localeId, false);
+    const ssr = runtimeParams?.ssr;
+    const metadata = this.getBundleMetadata({moduleId, localeId, debug: false, ssr});
     if (metadata && (0, import_shared_utils.isLambdaEnv)()) {
       import_diagnostics.logger.warn({
         label: `${this.name}`,
@@ -57,7 +58,8 @@ var StaticModuleProvider = class {
   async getModuleEntry(moduleId, runtimeParams) {
     const {specifier, version} = moduleId;
     const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
-    const metadata = this.getBundleMetadata(moduleId, localeId, false);
+    const ssr = runtimeParams?.ssr;
+    const metadata = this.getBundleMetadata({moduleId, localeId, ssr, debug: false});
     if (metadata) {
       import_diagnostics.logger.debug({
         label: `${this.name}`,
@@ -87,8 +89,13 @@ var StaticModuleProvider = class {
     const versionedSpecifier = (0, import_shared_utils.getSpecifier)(moduleId);
     return this.fingerprintIndex[versionedSpecifier] || this.fingerprintIndex[moduleId.specifier];
   }
-  getBundleMetadata(moduleId, localeId, debug) {
-    const siteBundleId = (0, import_site_metadata.getSiteBundleId)(moduleId, localeId, this.i18n);
+  getBundleMetadata({
+    moduleId,
+    localeId,
+    debug,
+    ssr
+  }) {
+    const siteBundleId = (0, import_site_metadata.getSiteBundleId)(moduleId, localeId, ssr, this.i18n);
     return this.siteMetadata.getSiteBundlesDecisionTree().find(siteBundleId, debug);
   }
 };

package/build/cjs/site-metadata.cjs

@@ -25,6 +25,7 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   SITE_LOCALE_PREFIX: () => SITE_LOCALE_PREFIX,
+  SITE_SSR_PREFIX: () => SITE_SSR_PREFIX,
   SITE_VERSION_PREFIX: () => SITE_VERSION_PREFIX,
   SiteMetadataImpl: () => SiteMetadataImpl,
   getSiteBundleId: () => getSiteBundleId,
@@ -45,6 +46,7 @@ var DEBUG_STATIC_RESOURCE_METADATA_PATH = import_path.default.join(SITE_METADATA
 var STATIC_ASSET_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/asset-metadata.json");
 var SITE_VERSION_PREFIX = `|${import_shared_utils.VERSION_SIGIL}/`;
 var SITE_LOCALE_PREFIX = `|${import_shared_utils.LOCALE_SIGIL}/`;
+var SITE_SSR_PREFIX = `|${import_shared_utils.SSR_SIGIL}`;
 var SiteMetadataImpl = class {
   constructor(options) {
     this.options = options;
@@ -190,6 +192,8 @@ function parseSiteId(input) {
     const [sigil, value] = parts[i].split("/");
     if (sigil && value) {
       variants[sigil] = value;
+    } else if (sigil) {
+      variants[sigil] = "true";
     }
   }
   return {
@@ -197,12 +201,13 @@ function parseSiteId(input) {
     variants
   };
 }
-function getSiteBundleId({specifier, namespace, name = "", version}, locale, i18n) {
+function getSiteBundleId({specifier, namespace, name = "", version}, locale, ssr, i18n) {
   if (!specifier) {
     specifier = namespace ? `${namespace}/${name}` : name;
   }
   const versionedSpecifier = version && version !== import_shared_utils.VERSION_NOT_PROVIDED ? `${specifier}${SITE_VERSION_PREFIX}${(0, import_shared_utils.normalizeVersionToUri)(version)}` : specifier;
-  return i18n?.defaultLocale === locale ? versionedSpecifier : `${versionedSpecifier}${SITE_LOCALE_PREFIX}${locale}`;
+  const ssrSpecifier = ssr ? `${versionedSpecifier}${SITE_SSR_PREFIX}` : versionedSpecifier;
+  return i18n?.defaultLocale === locale ? ssrSpecifier : `${ssrSpecifier}${SITE_LOCALE_PREFIX}${locale}`;
 }
 function getSiteResourceId({specifier, version}) {
   const versionedSpecifier = version && version !== import_shared_utils.VERSION_NOT_PROVIDED ? `${specifier}${SITE_VERSION_PREFIX}${(0, import_shared_utils.normalizeVersionToUri)(version)}` : specifier;

package/build/cjs/tools/dedupe-bundles.cjs

@@ -56,7 +56,7 @@ async function dedupeBundles(rootDir, i18n) {
     });
     const locale = i18n.locales.find((l) => l.id === localeId);
     const fallBackLocale = locale?.fallback ?? i18n.defaultLocale;
-    const fallbackMetadata = decisionTree.find(siteIdStr, false, fallBackLocale);
+    const fallbackMetadata = decisionTree.find(siteIdStr, false, false, fallBackLocale);
     if (fallbackMetadata) {
       const fallbackSrc = import_fs_extra.default.readFileSync(import_path.default.join(rootDir, fallbackMetadata.path));
       import_diagnostics.logger.debug({

package/build/cjs/utils/decision-tree.cjs

@@ -32,6 +32,7 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_site_metadata = __toModule(require("../site-metadata.cjs"));
 var CHOICE_WILDCARD = "*";
 var CHOICE_EMPTY = "";
+var CHOICE_TRUE = "true";
 var CHOICE_PROD = "prod";
 var CHOICE_DEBUG = "debug";
 var DecisionTreeImpl = class {
@@ -77,11 +78,12 @@ var DecisionTreeImpl = class {
       }
     }
   }
-  find(siteArtifactId, debug, localeId) {
+  find(siteArtifactId, debug, ssr, localeId) {
     const parsedArtifactId = (0, import_site_metadata.parseSiteId)(siteArtifactId);
     const decisionPath = this.createArtifactChoices({
       specifier: parsedArtifactId.specifier,
       version: parsedArtifactId.variants[import_shared_utils.VERSION_SIGIL],
+      ssr: ssr ?? import_shared_utils.SSR_SIGIL in parsedArtifactId.variants,
       localeId: localeId ?? parsedArtifactId.variants[import_shared_utils.LOCALE_SIGIL],
       debug
     });
@@ -99,11 +101,15 @@ var DecisionTreeImpl = class {
     }
     return currentNode.artifact;
   }
-  createArtifactChoices({specifier, version, localeId, debug}) {
+  createArtifactChoices({specifier, version, localeId, debug, ssr}) {
     const envChoice = debug ? CHOICE_DEBUG : CHOICE_PROD;
     const versionChoice = getVersionChoice(version);
     const uriVersion = (0, import_shared_utils.normalizeVersionToUri)(versionChoice);
-    return [specifier, envChoice, uriVersion, localeId || CHOICE_WILDCARD];
+    const ssrChoice = ssr ? CHOICE_TRUE : CHOICE_EMPTY;
+    return this.getOrderedChoices(specifier, envChoice, ssrChoice, uriVersion, localeId);
+  }
+  getOrderedChoices(specifier, envChoice, ssrChoice, uriVersion, localeId) {
+    return [specifier, envChoice, ssrChoice, uriVersion, localeId || CHOICE_WILDCARD];
   }
   createPossibleArtifactChoices({
     id,
@@ -118,9 +124,11 @@ var DecisionTreeImpl = class {
     const versionChoice = getVersionChoice(match.variants[import_shared_utils.VERSION_SIGIL]);
     const versions = versionChoice === CHOICE_EMPTY ? [...new Set([CHOICE_EMPTY, CHOICE_WILDCARD])] : [...new Set([versionChoice, CHOICE_EMPTY])];
     const envChoice = debug ? [CHOICE_DEBUG] : [CHOICE_PROD];
+    const ssrChoice = match.variants[import_shared_utils.SSR_SIGIL] || CHOICE_EMPTY;
+    const ssr = (0, import_shared_utils.getFeatureFlags)().SSR_COMPILER_ENABLED ? [ssrChoice] : ssrChoice ? [ssrChoice, CHOICE_WILDCARD] : [CHOICE_WILDCARD];
     const localeChoice = match.variants[import_shared_utils.LOCALE_SIGIL];
-    const localeId = localeChoice && localeFallbacks ? localeFallbacks[localeChoice] : [CHOICE_WILDCARD];
-    return [[specifier], envChoice, versions, localeId];
+    const localeId = localeFallbacks?.[localeChoice] ?? [CHOICE_WILDCARD];
+    return this.getOrderedChoices([specifier], envChoice, ssr, versions, localeId);
   }
 };
 var decision_tree_default = DecisionTreeImpl;

package/build/es/providers/static-bundle-provider.d.ts

@@ -1,26 +1,45 @@
 import type { AbstractModuleId, BundleDefinition, BundleProvider, ProviderContext, RuntimeEnvironment, RuntimeParams, SiteBundle, SiteMetadata } from '@lwrjs/types';
+import { LRUCache } from 'lru-cache';
 export default class StaticBundleProvider implements BundleProvider {
     name: string;
+    codeCache: LRUCache<string, string, unknown> | undefined;
     siteRootDir: string;
     bundleConfig: import("@lwrjs/types").BundleConfig;
     i18n: import("@lwrjs/types").I18NConfig;
     siteMetadata: SiteMetadata;
-    constructor(_config: {}, context: ProviderContext);
+    bundleCacheSize: number;
+    constructor(config: {
+        bundleCacheSize?: number;
+    }, context: ProviderContext);
     bundle<BundleIdentifier extends AbstractModuleId, RE extends RuntimeEnvironment>(moduleId: BundleIdentifier, runtimeEnvironment: RE, runtimeParams: RuntimeParams): Promise<BundleDefinition | undefined>;
-    getBundleMetadata(moduleId: Partial<AbstractModuleId>, localeId: string, debug: boolean): SiteBundle | undefined;
+    getBundleMetadata({ moduleId, localeId, debug, ssr, }: {
+        moduleId: Partial<AbstractModuleId>;
+        localeId: string;
+        debug: boolean;
+        ssr: boolean;
+    }): SiteBundle | undefined;
     /**
      * Takes a key from the site bundle metadata and creates an appropriate runtime BaseModuleReference to use in the LWR runtime.
      */
     private getModuleReference;
+    getCodePromiser(bundleSourcePath: string, { specifier, version, locale, ssr, debug, }: {
+        specifier: string;
+        version?: string;
+        locale: string;
+        ssr: boolean;
+        debug: boolean;
+    }): () => Promise<string>;
     /**
-     * Get the source code for the a static bundle
+     * Get the local source code path for the a static bundle
      * If we are running in a lambda and the mode is debug we will return the prod source code instead of the debug source code
      *
      * @param bundlePath The default path for the bundle for prod read from .metadata/bundle-metadata.json, for debug .metadata/bundle-metadata-debug.json
      * @param debug Is the request in debug mode?
      * @param specifier Root specifier for the requested bundle
+     * @param version Root specifier version
      * @param localeId Locale id (e.g. en-US) for the current request
+     * @param ssr True if this is a server bundle
      */
-    getCode(bundlePath: string, debug: boolean, specifier: string, version: string | undefined, localeId: string): Promise<string>;
+    getCodePath(bundlePath: string, debug: boolean, specifier: string, version: string | undefined, localeId: string, ssr: boolean): string;
 }
 //# sourceMappingURL=static-bundle-provider.d.ts.map

package/build/es/providers/static-bundle-provider.js

@@ -2,9 +2,13 @@ import { logger } from '@lwrjs/diagnostics';
 import { VERSION_SIGIL, explodeSpecifier, getSpecifier, isLambdaEnv } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
+import { LRUCache } from 'lru-cache';
 import { getSiteBundleId, parseSiteId, resolveStaticBundleVersion } from '../site-metadata.js';
+import { cacheCountStore } from '@lwrjs/instrumentation';
+import { getTracer, BundleSpan } from '@lwrjs/instrumentation';
+const BUNDLE_SOURCE_NOT_FOUND = 'Bundle Source Path Not Found';
 export default class StaticBundleProvider {
-    constructor(_config, context) {
+    constructor(config, context) {
         this.name = 'static-bundle-provider';
         if (!context.siteMetadata) {
             throw new Error(`[${this.name}] Site metadata was not found`);
@@ -13,21 +17,43 @@ export default class StaticBundleProvider {
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
         this.bundleConfig = context.config.bundleConfig;
         this.i18n = context.config.i18n;
+        this.bundleCacheSize = config.bundleCacheSize ?? parseInt(process.env.BUNDLE_CACHE_SIZE ?? '500', 10);
+        if (this.bundleCacheSize > 0) {
+            this.codeCache = new LRUCache({
+                max: this.bundleCacheSize,
+                dispose: (_value, key) => {
+                    if (isLambdaEnv()) {
+                        logger.warn(`Bundle Code evicted from cache ${key}`);
+                    }
+                    else {
+                        logger.verbose(`Bundle Code evicted from cache ${key}`);
+                    }
+                },
+            });
+        }
     }
     async bundle(moduleId, runtimeEnvironment, runtimeParams) {
         const { specifier, name, namespace, version } = moduleId;
         const { debug, i18n: { defaultLocale }, } = runtimeEnvironment;
         const localeId = (runtimeParams?.locale || defaultLocale);
-        const metadata = this.getBundleMetadata(moduleId, localeId, debug);
+        const ssr = runtimeParams?.ssr;
+        const metadata = this.getBundleMetadata({ moduleId, localeId, debug, ssr });
         if (!metadata) {
             return undefined;
         }
         // Default bundle source path
         const bundlePath = path.join(this.siteRootDir, metadata.path);
         // Get the associated bundle source code
-        const code = await this.getCode(bundlePath, debug, specifier, version, localeId);
-        const imports = metadata.imports.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug));
-        const dynamicImports = metadata.dynamicImports?.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug));
+        const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
+        const codePromiser = this.getCodePromiser(resolvedBundlePath, {
+            specifier,
+            version,
+            locale: localeId,
+            ssr,
+            debug,
+        });
+        const imports = metadata.imports.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug, false));
+        const dynamicImports = metadata.dynamicImports?.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug, false));
         const id = getSpecifier(moduleId);
         const exploded = explodeSpecifier(id);
         // Seem unlikely name was not in the moduleId but just incase set it form the exploded id
@@ -35,11 +61,11 @@ export default class StaticBundleProvider {
         const resolvedNamespace = namespace ?? exploded.namespace;
         const resolvedVersion = resolveStaticBundleVersion(metadata.version, version);
         const includedModules = metadata.includedModules?.map((includedId) => {
-            const includedModule = this.getModuleReference(includedId, localeId, debug);
+            const includedModule = this.getModuleReference(includedId, localeId, debug, ssr);
             return getSpecifier(includedModule);
         }) || [];
         return {
-            code,
+            getCode: codePromiser,
             id: getSpecifier({
                 specifier: specifier,
                 version: resolvedVersion,
@@ -61,20 +87,20 @@ export default class StaticBundleProvider {
             src: bundlePath,
         };
     }
-    getBundleMetadata(moduleId, localeId, debug) {
-        const siteBundleId = getSiteBundleId(moduleId, localeId, this.i18n);
+    getBundleMetadata({ moduleId, localeId, debug, ssr, }) {
+        const siteBundleId = getSiteBundleId(moduleId, localeId, ssr, this.i18n);
         return this.siteMetadata.getSiteBundlesDecisionTree().find(siteBundleId, debug);
     }
     /**
      * Takes a key from the site bundle metadata and creates an appropriate runtime BaseModuleReference to use in the LWR runtime.
      */
-    getModuleReference(siteBundleIdStr, localeId, debug) {
+    getModuleReference(siteBundleIdStr, localeId, debug, ssr) {
         const siteBundleId = parseSiteId(siteBundleIdStr);
         const includedModule = explodeSpecifier(siteBundleId.specifier);
         if (!siteBundleId.variants[VERSION_SIGIL]) {
             const importBundleMetadata = this.siteMetadata
                 .getSiteBundlesDecisionTree()
-                .find(siteBundleIdStr, debug, localeId);
+                .find(siteBundleIdStr, debug, ssr, localeId);
             includedModule.version = resolveStaticBundleVersion(importBundleMetadata?.version);
         }
         else {
@@ -82,49 +108,88 @@ export default class StaticBundleProvider {
         }
         return includedModule;
     }
+    getCodePromiser(bundleSourcePath, { specifier, version, locale, ssr, debug, }) {
+        const cache = this.codeCache;
+        return async () => {
+            let code = cache?.get(bundleSourcePath);
+            if (!code) {
+                try {
+                    // Debug metadata was not found
+                    if (bundleSourcePath === BUNDLE_SOURCE_NOT_FOUND) {
+                        throw new Error(BUNDLE_SOURCE_NOT_FOUND);
+                    }
+                    // Increment the cache count store
+                    cacheCountStore.incrementCacheKey('missedReads');
+                    await getTracer().trace({
+                        name: BundleSpan.ReadBundle,
+                        attributes: {
+                            specifier,
+                            version: version ?? '',
+                            locale,
+                            ssr: ssr ? 'TRUE' : 'FALSE',
+                            debug: debug ? 'TRUE' : 'FALSE',
+                            bundleSourcePath,
+                        },
+                    }, async () => {
+                        code = await fs.readFile(path.join(bundleSourcePath), 'utf-8');
+                        if (cache) {
+                            cache.set(bundleSourcePath, code);
+                        }
+                    });
+                }
+                catch (err) {
+                    // Ran it an un-expected error reading the bundle source code
+                    logger.warn({
+                        label: 'static-bundle-provider',
+                        message: `Unexpected code reference: ${specifier} ${bundleSourcePath}`,
+                    }, err);
+                    // Returning source code that throws and error is someone tries to evaluate it
+                    code = `throw new Error('Unexpected code reference: ${specifier} ${bundleSourcePath}');`;
+                    if (cache) {
+                        cache.set(bundleSourcePath, code);
+                    }
+                }
+            }
+            return code;
+        };
+    }
     /**
-     * Get the source code for the a static bundle
+     * Get the local source code path for the a static bundle
      * If we are running in a lambda and the mode is debug we will return the prod source code instead of the debug source code
      *
      * @param bundlePath The default path for the bundle for prod read from .metadata/bundle-metadata.json, for debug .metadata/bundle-metadata-debug.json
      * @param debug Is the request in debug mode?
      * @param specifier Root specifier for the requested bundle
+     * @param version Root specifier version
      * @param localeId Locale id (e.g. en-US) for the current request
+     * @param ssr True if this is a server bundle
      */
-    async getCode(bundlePath, debug, specifier, version, localeId) {
+    getCodePath(bundlePath, debug, specifier, version, localeId, ssr) {
         // Flag is used to indicate that we are running on a lambda
         const isLambda = isLambdaEnv();
         // Default source code path determined from metadata based on debug mode
         let bundleSourcePath = bundlePath;
-        try {
-            // This is the special case where the request is in debug mode and we are on the lambda
-            // So we will look up the prod source code instead of the debug source code
-            if (debug && isLambda) {
-                const metadata = this.getBundleMetadata({ specifier, version }, localeId, false);
-                if (!metadata) {
-                    // We did not find the bundle prod bundle even though we did find it in the debug metadata before
-                    logger.warn({
-                        label: 'static-bundle-provider',
-                        message: `Unexpected code reference: ${specifier}`,
-                    });
-                    // Returning source code that throws and error is someone tries to evaluate it
-                    return `throw new Error('Unexpected code reference: ${specifier}');`;
-                }
-                // Overwrite the default source code path the prod source code path
-                bundleSourcePath = path.join(this.siteRootDir, metadata.path);
+        // This is the special case where the request is in debug mode and we are on the lambda
+        // So we will look up the prod source code instead of the debug source code
+        if (debug && isLambda) {
+            const metadata = this.getBundleMetadata({
+                moduleId: { specifier, version },
+                localeId,
+                debug: false,
+                ssr,
+            });
+            if (!metadata) {
+                // We did not find the bundle prod bundle even though we did find it in the debug metadata before
+                logger.error({
+                    label: 'static-bundle-provider',
+                    message: `Unexpected code reference: ${specifier}`,
+                });
+                return BUNDLE_SOURCE_NOT_FOUND;
             }
-            // Read the bundle source code.
-            return await fs.readFile(bundleSourcePath, 'utf-8');
-        }
-        catch (err) {
-            // Ran it an un-expected error reading the bundle source code
-            logger.warn({
-                label: 'static-bundle-provider',
-                message: `Unexpected code reference: ${specifier} ${bundleSourcePath}`,
-            }, err);
-            // Returning source code that throws and error is someone tries to evaluate it
-            return `throw new Error('Unexpected code reference: ${specifier} ${bundleSourcePath}');`;
+            // Overwrite the default source code path the prod source code path
+            bundleSourcePath = path.join(this.siteRootDir, metadata.path);
         }
+        return bundleSourcePath;
     }
 }
 //# sourceMappingURL=static-bundle-provider.js.map

package/build/es/providers/static-module-provider.js

@@ -17,7 +17,8 @@ export default class StaticModuleProvider {
     }
     async getModule(moduleId, runtimeParams) {
         const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
-        const metadata = this.getBundleMetadata(moduleId, localeId, false);
+        const ssr = runtimeParams?.ssr;
+        const metadata = this.getBundleMetadata({ moduleId, localeId, debug: false, ssr });
         if (metadata && isLambdaEnv()) {
             logger.warn({
                 label: `${this.name}`,
@@ -33,7 +34,8 @@ export default class StaticModuleProvider {
         // TODO shouldn't we be passing the runtime environment here to test?
         const { specifier, version } = moduleId;
         const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
-        const metadata = this.getBundleMetadata(moduleId, localeId, false);
+        const ssr = runtimeParams?.ssr;
+        const metadata = this.getBundleMetadata({ moduleId, localeId, ssr, debug: false });
         if (metadata) {
             logger.debug({
                 label: `${this.name}`,
@@ -67,8 +69,8 @@ export default class StaticModuleProvider {
         const versionedSpecifier = getSpecifier(moduleId);
         return this.fingerprintIndex[versionedSpecifier] || this.fingerprintIndex[moduleId.specifier];
     }
-    getBundleMetadata(moduleId, localeId, debug) {
-        const siteBundleId = getSiteBundleId(moduleId, localeId, this.i18n);
+    getBundleMetadata({ moduleId, localeId, debug, ssr, }) {
+        const siteBundleId = getSiteBundleId(moduleId, localeId, ssr, this.i18n);
         return this.siteMetadata.getSiteBundlesDecisionTree().find(siteBundleId, debug);
     }
 }

package/build/es/site-metadata.d.ts

@@ -1,13 +1,14 @@
 import type { AbstractModuleId, I18NConfig, ResourceIdentifier, SiteAssets, SiteBundle, SiteBundles, SiteMetadata, SiteResource, SiteResources } from '@lwrjs/types';
 import DecisionTree from './utils/decision-tree.js';
-import { LOCALE_SIGIL, VERSION_SIGIL } from '@lwrjs/shared-utils';
+import { LOCALE_SIGIL, SSR_SIGIL, VERSION_SIGIL } from '@lwrjs/shared-utils';
 type Options = {
     rootDir: string;
     i18n: I18NConfig;
 };
 export declare const SITE_VERSION_PREFIX: string;
 export declare const SITE_LOCALE_PREFIX: string;
-type SIGIL = typeof VERSION_SIGIL | typeof LOCALE_SIGIL;
+export declare const SITE_SSR_PREFIX: string;
+type SIGIL = typeof VERSION_SIGIL | typeof SSR_SIGIL | typeof LOCALE_SIGIL;
 interface SiteArtifactId {
     specifier: string;
     variants: Record<SIGIL, string>;
@@ -64,9 +65,10 @@ export declare function parseSiteId(input: string): SiteArtifactId;
  *
  * @param moduleId - Root Module Id
  * @param locale - Current locale
+ * @param ssr - Component variant is required for SSR
  * @returns Site Bundle Identifier
  */
-export declare function getSiteBundleId({ specifier, namespace, name, version }: Partial<AbstractModuleId>, locale?: string, i18n?: I18NConfig): string;
+export declare function getSiteBundleId({ specifier, namespace, name, version }: Partial<AbstractModuleId>, locale?: string, ssr?: boolean, i18n?: I18NConfig): string;
 /**
  * Get a  Site Resource Identifier from a Resource Identifier
  *

package/build/es/site-metadata.js

@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs-extra';
 import { logger } from '@lwrjs/diagnostics';
 import DecisionTree, { createFallbackMap } from './utils/decision-tree.js';
-import { LOCALE_SIGIL, VERSION_NOT_PROVIDED, VERSION_SIGIL, normalizeVersionToUri, } from '@lwrjs/shared-utils';
+import { LOCALE_SIGIL, SSR_SIGIL, VERSION_NOT_PROVIDED, VERSION_SIGIL, normalizeVersionToUri, } from '@lwrjs/shared-utils';
 const SITE_METADATA_PATH = '.metadata';
 const STATIC_BUNDLE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/bundle-metadata.json');
 const DEBUG_STATIC_BUNDLE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/bundle-metadata-debug.json');
@@ -11,6 +11,7 @@ const DEBUG_STATIC_RESOURCE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/reso
 const STATIC_ASSET_METADATA_PATH = path.join(SITE_METADATA_PATH, '/asset-metadata.json');
 export const SITE_VERSION_PREFIX = `|${VERSION_SIGIL}/`;
 export const SITE_LOCALE_PREFIX = `|${LOCALE_SIGIL}/`;
+export const SITE_SSR_PREFIX = `|${SSR_SIGIL}`;
 export class SiteMetadataImpl {
     constructor(options) {
         this.options = options;
@@ -198,6 +199,9 @@ export function parseSiteId(input) {
         if (sigil && value) {
             variants[sigil] = value;
         }
+        else if (sigil) {
+            variants[sigil] = 'true';
+        }
     }
     return {
         specifier: specifier,
@@ -209,9 +213,10 @@ export function parseSiteId(input) {
  *
  * @param moduleId - Root Module Id
  * @param locale - Current locale
+ * @param ssr - Component variant is required for SSR
  * @returns Site Bundle Identifier
  */
-export function getSiteBundleId({ specifier, namespace, name = '', version }, locale, i18n) {
+export function getSiteBundleId({ specifier, namespace, name = '', version }, locale, ssr, i18n) {
     if (!specifier) {
         specifier = namespace ? `${namespace}/${name}` : name;
     }
@@ -219,9 +224,8 @@ export function getSiteBundleId({ specifier, namespace, name = '', version }, lo
     const versionedSpecifier = version && version !== VERSION_NOT_PROVIDED
         ? `${specifier}${SITE_VERSION_PREFIX}${normalizeVersionToUri(version)}`
         : specifier;
-    return i18n?.defaultLocale === locale
-        ? versionedSpecifier
-        : `${versionedSpecifier}${SITE_LOCALE_PREFIX}${locale}`;
+    const ssrSpecifier = ssr ? `${versionedSpecifier}${SITE_SSR_PREFIX}` : versionedSpecifier;
+    return i18n?.defaultLocale === locale ? ssrSpecifier : `${ssrSpecifier}${SITE_LOCALE_PREFIX}${locale}`;
 }
 /**
  * Get a  Site Resource Identifier from a Resource Identifier

package/build/es/tools/dedupe-bundles.js

@@ -31,7 +31,7 @@ export async function dedupeBundles(rootDir, i18n) {
         // Find the current locale
         const locale = i18n.locales.find((l) => l.id === localeId);
         const fallBackLocale = locale?.fallback ?? i18n.defaultLocale;
-        const fallbackMetadata = decisionTree.find(siteIdStr, false, fallBackLocale);
+        const fallbackMetadata = decisionTree.find(siteIdStr, false, false, fallBackLocale);
         if (fallbackMetadata) {
             // Read the content of the fallback metadata
             const fallbackSrc = fs.readFileSync(path.join(rootDir, fallbackMetadata.path));

package/build/es/utils/decision-tree.d.ts

@@ -4,16 +4,17 @@ export interface ArtifactVariantId {
     version?: string;
     localeId?: string;
     debug?: boolean;
+    ssr?: boolean;
 }
 export default class DecisionTreeImpl<Artifact extends SiteArtifact> implements DecisionTree<Artifact> {
-    private root;
+    private readonly root;
     insert(siteArtifactId: string, artifact: Artifact, debug?: boolean, localeFallbacks?: Record<string, string[]>): void;
     /**
      * A method to handle deeper insertions, preserving the unique paths.
      * This will be called for each node in the decision path.
      */
     private deepInsert;
-    find(siteArtifactId: string, debug?: boolean, localeId?: string): Artifact | undefined;
+    find(siteArtifactId: string, debug?: boolean, ssr?: boolean, localeId?: string): Artifact | undefined;
     /**
      * Create a decision tree patch to look up the most appropriate bundle
      *
@@ -21,8 +22,13 @@ export default class DecisionTreeImpl<Artifact extends SiteArtifact> implements
      * @param version known version or will add the choice ''
      * @param localeId preferred bundle locale or will add '' for default locale
      * @param debug flag if debug bundle is preferred
+     * @param ssr flag if server bundle is requested
      */
     private createArtifactChoices;
+    /**
+     * Get the choices in a consistent order for possible choices or choices for lookup
+     */
+    private getOrderedChoices;
     private createPossibleArtifactChoices;
 }
 export declare function createFallbackMap(config: I18NConfig): Record<string, string[]>;

package/build/es/utils/decision-tree.js

@@ -7,18 +7,18 @@
  *
  * The tree is populated once by providing a set of possible matching conditions.
  *
- * tree.insert('bundle/foo|v/7_0|l/en', {metadata}, isDebug, {en-MX: [en-MX, en-US, en], en: [en], ...})
+ * tree.insert('bundle/foo|v/7_0|ssr|l/en', {metadata}, isDebug, forSsr, {en-MX: [en-MX, en-US, en], en: [en], ...})
  *
- * The tree currently makes decisions in the following order: specifier, isDebug, version, and then locale.
+ * The tree currently makes decisions in the following order: specifier, isDebug, version, forSsr and then locale.
  *
  * To find matching metadata, use the following commands:
  *
- * tree.find('bundle/foo|v/7_0|l/en-MX')
+ * tree.find('bundle/foo|v/7_0|ssr|l/en-MX')
  *
- * tree.find('bundle/foo', isDebug, 'en-US')
+ * tree.find('bundle/foo', isDebug, forSsr, 'en-US')
  */
 import { logger } from '@lwrjs/diagnostics';
-import { LOCALE_SIGIL, VERSION_NOT_PROVIDED, VERSION_SIGIL, normalizeVersionToUri, } from '@lwrjs/shared-utils';
+import { LOCALE_SIGIL, SSR_SIGIL, VERSION_NOT_PROVIDED, VERSION_SIGIL, getFeatureFlags, normalizeVersionToUri, } from '@lwrjs/shared-utils';
 import { parseSiteId } from '../site-metadata.js';
 // Choice wildcard means I want to match anything
 // Examples are any locale and match the default locale
@@ -27,6 +27,8 @@ const CHOICE_WILDCARD = '*';
 // This is useful for scenarios like an empty version can match any version
 // This cannot be wildcard since we want an explicit version to also not match this choice.
 const CHOICE_EMPTY = '';
+// Boolean choice set available it marked true without requiring a value
+const CHOICE_TRUE = 'true';
 const CHOICE_PROD = 'prod';
 const CHOICE_DEBUG = 'debug';
 // Tree of decisions to lead you to the right artifact
@@ -36,8 +38,8 @@ export default class DecisionTreeImpl {
     }
     // Insert an artifact into the tree based on a path of decisions
     insert(siteArtifactId, artifact, debug, localeFallbacks) {
-        //  The decision path is the set of choices needed to get to the right metadata
-        // Currently this is hard coded to [specifier, isDebug, version, locale]
+        // The decision path is the set of choices needed to get to the right metadata
+        // Currently this is hard coded to [specifier, isDebug, version, ssr, locale]
         const decisionPath = this.createPossibleArtifactChoices({
             id: siteArtifactId,
             localeFallbacks,
@@ -95,11 +97,12 @@ export default class DecisionTreeImpl {
         }
     }
     // Retrieve an artifact from the tree based on a path of decisions
-    find(siteArtifactId, debug, localeId) {
+    find(siteArtifactId, debug, ssr, localeId) {
         const parsedArtifactId = parseSiteId(siteArtifactId);
         const decisionPath = this.createArtifactChoices({
             specifier: parsedArtifactId.specifier,
             version: parsedArtifactId.variants[VERSION_SIGIL],
+            ssr: ssr ?? SSR_SIGIL in parsedArtifactId.variants,
             localeId: localeId ?? parsedArtifactId.variants[LOCALE_SIGIL],
             debug,
         });
@@ -124,13 +127,21 @@ export default class DecisionTreeImpl {
      * @param version known version or will add the choice ''
      * @param localeId preferred bundle locale or will add '' for default locale
      * @param debug flag if debug bundle is preferred
+     * @param ssr flag if server bundle is requested
      */
-    createArtifactChoices({ specifier, version, localeId, debug }) {
+    createArtifactChoices({ specifier, version, localeId, debug, ssr }) {
         const envChoice = debug ? CHOICE_DEBUG : CHOICE_PROD;
         // Versions are stored in the bundle id in URL normalized form
         const versionChoice = getVersionChoice(version);
         const uriVersion = normalizeVersionToUri(versionChoice);
-        return [specifier, envChoice, uriVersion, localeId || CHOICE_WILDCARD];
+        const ssrChoice = ssr ? CHOICE_TRUE : CHOICE_EMPTY;
+        return this.getOrderedChoices(specifier, envChoice, ssrChoice, uriVersion, localeId);
+    }
+    /**
+     * Get the choices in a consistent order for possible choices or choices for lookup
+     */
+    getOrderedChoices(specifier, envChoice, ssrChoice, uriVersion, localeId) {
+        return [specifier, envChoice, ssrChoice, uriVersion, localeId || CHOICE_WILDCARD];
     }
     createPossibleArtifactChoices({ id, localeFallbacks, debug, }) {
         const match = parseSiteId(id);
@@ -149,9 +160,17 @@ export default class DecisionTreeImpl {
             ? [...new Set([CHOICE_EMPTY, CHOICE_WILDCARD])]
             : [...new Set([versionChoice, CHOICE_EMPTY])];
         const envChoice = debug ? [CHOICE_DEBUG] : [CHOICE_PROD];
+        // If there is an ssr sigil always prefer it during SSR
+        const ssrChoice = match.variants[SSR_SIGIL] || CHOICE_EMPTY;
+        const ssr = getFeatureFlags().SSR_COMPILER_ENABLED
+            ? [ssrChoice]
+            : ssrChoice
+                ? [ssrChoice, CHOICE_WILDCARD]
+                : [CHOICE_WILDCARD];
         const localeChoice = match.variants[LOCALE_SIGIL];
-        const localeId = localeChoice && localeFallbacks ? localeFallbacks[localeChoice] : [CHOICE_WILDCARD];
-        return [[specifier], envChoice, versions, localeId];
+        // If there are no fallbacks, or localeChoice is not in fallbacks use the ['*'] wildcard choice
+        const localeId = localeFallbacks?.[localeChoice] ?? [CHOICE_WILDCARD];
+        return this.getOrderedChoices([specifier], envChoice, ssr, versions, localeId);
     }
 }
 /**

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.9",
+    "version": "0.15.1",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -52,15 +52,17 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.15.0-alpha.9",
-        "@lwrjs/shared-utils": "0.15.0-alpha.9"
+        "@lwrjs/diagnostics": "0.15.1",
+        "@lwrjs/instrumentation": "0.15.1",
+        "@lwrjs/shared-utils": "0.15.1",
+        "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.9",
+        "@lwrjs/types": "0.15.1",
         "@types/express": "^4.17.21",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
-        "memfs": "^4.9.3",
+        "memfs": "^4.13.0",
         "mock-res": "^0.6.0",
         "ts-jest": "^26.5.6"
     },
@@ -70,5 +72,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "9783b817b11c29ca385457683fcb87e8179f7902"
+    "gitHead": "9ae4002fdab4f55caea2f8de8a7139a6b64ebad1"
 }