@lwrjs/static 0.19.0-alpha.4 → 0.19.0-alpha.6

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

@@ -62,16 +62,14 @@ var StaticBundleProvider = class {
   async bundle(moduleId, runtimeEnvironment, runtimeParams) {
     const {specifier, version} = moduleId;
     const {
+      debug,
       i18n: {defaultLocale}
     } = runtimeEnvironment;
     const localeId = runtimeParams?.locale || defaultLocale;
     const ssr = runtimeParams?.ssr;
-    let debug = runtimeEnvironment.debug;
     let metadata = this.getBundleMetadata({moduleId, localeId, debug, ssr});
     if (!metadata && debug) {
       metadata = this.getBundleMetadata({moduleId, localeId, debug: false, ssr});
-      if (metadata)
-        debug = false;
     }
     if (!metadata && (0, import_shared_utils.isExternalSpecifier)(moduleId.specifier, this.bundleConfig)) {
       const {specifier: unversionedSepcifier} = (0, import_shared_utils.explodeSpecifier)(moduleId.specifier);
@@ -88,7 +86,8 @@ var StaticBundleProvider = class {
       return void 0;
     }
     const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
-    const codePromiser = this.getCodePromiser(bundlePath, {
+    const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
+    const codePromiser = this.getCodePromiser(resolvedBundlePath, {
       specifier,
       version,
       locale: localeId,
@@ -222,5 +221,26 @@ var StaticBundleProvider = class {
       label: "static-bundle-provider"
     });
   }
+  getCodePath(bundlePath, debug, specifier, version, localeId, ssr) {
+    const isLambda = (0, import_shared_utils.isLambdaEnv)() || process.env.FORCE_DEBUG_FALLBACK === "true";
+    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: `debug-to-prod fallback missing metadata for specifier: ${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/utils/decision-tree.cjs

@@ -125,7 +125,7 @@ var DecisionTreeImpl = class {
     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 ssr = (0, import_shared_utils.getFeatureFlags)().SSR_COMPILER_ENABLED ? [ssrChoice] : match.variants[import_shared_utils.SSR_SIGIL] ? [CHOICE_TRUE, CHOICE_EMPTY] : [CHOICE_EMPTY, CHOICE_TRUE];
     const localeChoice = match.variants[import_shared_utils.LOCALE_SIGIL];
     const localeId = localeFallbacks?.[localeChoice] ?? [CHOICE_WILDCARD];
     return this.getOrderedChoices([specifier], envChoice, ssr, versions, localeId);

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

@@ -43,5 +43,17 @@ export default class StaticBundleProvider implements BundleProvider {
      * @param {boolean} ssr - Indicates whether the bundle is for server-side rendering (SSR).
      */
     logBundleError(moduleId: Partial<AbstractModuleId>, localeId: string, debug: boolean, ssr: boolean): void;
+    /**
+     * 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
+     */
+    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

@@ -41,18 +41,15 @@ export default class StaticBundleProvider {
     }
     async bundle(moduleId, runtimeEnvironment, runtimeParams) {
         const { specifier, version } = moduleId;
-        const { i18n: { defaultLocale }, } = runtimeEnvironment;
+        const { debug, i18n: { defaultLocale }, } = runtimeEnvironment;
         const localeId = (runtimeParams?.locale || defaultLocale);
         const ssr = runtimeParams?.ssr;
-        let debug = runtimeEnvironment.debug;
         let metadata = this.getBundleMetadata({ moduleId, localeId, debug, ssr });
         if (!metadata && debug) {
             // Fallback to use prod bundles if the debug variant does not exist
             // eg: debug bundles are not shipped to the Lambda
             // eg: locally, an MRT bundle may or may not have debug metadata, depending on how it's generated
             metadata = this.getBundleMetadata({ moduleId, localeId, debug: false, ssr });
-            if (metadata)
-                debug = false;
         }
         if (!metadata && isExternalSpecifier(moduleId.specifier, this.bundleConfig)) {
             const { specifier: unversionedSepcifier } = explodeSpecifier(moduleId.specifier);
@@ -71,7 +68,8 @@ export default class StaticBundleProvider {
         // Default bundle source path
         const bundlePath = path.join(this.siteRootDir, metadata.path);
         // Get the associated bundle source code
-        const codePromiser = this.getCodePromiser(bundlePath, {
+        const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
+        const codePromiser = this.getCodePromiser(resolvedBundlePath, {
             specifier,
             version,
             locale: localeId,
@@ -223,5 +221,43 @@ export default class StaticBundleProvider {
             label: 'static-bundle-provider',
         });
     }
+    /**
+     * 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
+     */
+    getCodePath(bundlePath, debug, specifier, version, localeId, ssr) {
+        // Flag is used to indicate that we are running on a lambda
+        const isLambda = isLambdaEnv() || process.env.FORCE_DEBUG_FALLBACK === 'true'; // Env variable for testing purposes only
+        // Default source code path determined from metadata based on debug mode
+        let bundleSourcePath = bundlePath;
+        // 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: `debug-to-prod fallback missing metadata for specifier: ${specifier}`,
+                });
+                return BUNDLE_SOURCE_NOT_FOUND;
+            }
+            // 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/utils/decision-tree.d.ts

@@ -16,7 +16,7 @@ export default class DecisionTreeImpl<Artifact extends SiteArtifact> implements
     private deepInsert;
     find(siteArtifactId: string, debug?: boolean, ssr?: boolean, localeId?: string): Artifact | undefined;
     /**
-     * Create a decision tree patch to look up the most appropriate bundle
+     * Create a decision tree path to look up the most appropriate bundle
      *
      * @param specifier Bundle specifier
      * @param version known version or will add the choice ''

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

@@ -119,7 +119,7 @@ export default class DecisionTreeImpl {
         return currentNode.artifact;
     }
     /**
-     * Create a decision tree patch to look up the most appropriate bundle
+     * Create a decision tree path to look up the most appropriate bundle
      *
      * @param specifier Bundle specifier
      * @param version known version or will add the choice ''
@@ -162,9 +162,10 @@ export default class DecisionTreeImpl {
         const ssrChoice = match.variants[SSR_SIGIL] || CHOICE_EMPTY;
         const ssr = getFeatureFlags().SSR_COMPILER_ENABLED
             ? [ssrChoice]
-            : ssrChoice
-                ? [ssrChoice, CHOICE_WILDCARD]
-                : [CHOICE_WILDCARD];
+            : // For SSR V1 |ssr will prefer true non ssr will prefer empty
+                match.variants[SSR_SIGIL]
+                    ? [CHOICE_TRUE, CHOICE_EMPTY]
+                    : [CHOICE_EMPTY, CHOICE_TRUE];
         const localeChoice = match.variants[LOCALE_SIGIL];
         // If there are no fallbacks, or localeChoice is not in fallbacks use the ['*'] wildcard choice
         const localeId = localeFallbacks?.[localeChoice] ?? [CHOICE_WILDCARD];

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.19.0-alpha.4",
+    "version": "0.19.0-alpha.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -56,13 +56,13 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.19.0-alpha.4",
-        "@lwrjs/instrumentation": "0.19.0-alpha.4",
-        "@lwrjs/shared-utils": "0.19.0-alpha.4",
+        "@lwrjs/diagnostics": "0.19.0-alpha.6",
+        "@lwrjs/instrumentation": "0.19.0-alpha.6",
+        "@lwrjs/shared-utils": "0.19.0-alpha.6",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.19.0-alpha.4",
+        "@lwrjs/types": "0.19.0-alpha.6",
         "@types/express": "^4.17.21",
         "jest": "29.7.0",
         "jest-express": "^1.12.0",
@@ -76,5 +76,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "83466768b57a140e1eefae560be386277b7100a9"
+    "gitHead": "25933a335c7f2f6ebc39381feda5f47e07e43faa"
 }