@lwrjs/module-bundler 0.15.0-alpha.9 → 0.15.0

package/build/cjs/amd-bundle-provider.cjs

@@ -45,12 +45,14 @@ var AmdBundlerProvider = class {
         env: {NODE_ENV: envMode} = {NODE_ENV: "production"}
       } = runtimeEnvironment;
       const minified = !!minify && !debug;
+      let bundleCode;
       if (minified) {
-        bundle.code = await (0, import_esbuild_utils.minifyJavascript)(bundle.code);
+        bundleCode = await (0, import_esbuild_utils.minifyJavascript)(await bundle.getCode());
       } else {
-        bundle.code = await (0, import_esbuild_utils.parseJavascript)(bundle.code, {envMode});
+        bundleCode = await (0, import_esbuild_utils.parseJavascript)(await bundle.getCode(), {envMode});
       }
-      bundle.integrity = (0, import_shared_utils.createIntegrityHash)(bundle.code);
+      bundle.integrity = (0, import_shared_utils.createIntegrityHash)(bundleCode);
+      bundle.getCode = () => Promise.resolve(bundleCode);
       return bundle;
     }
   }

package/build/cjs/amd-runtime-bundle-provider.cjs

@@ -41,7 +41,7 @@ var AmdBundlerProvider = class {
       const minified = minify && !debug;
       const bundle = await (0, import_amd_common.amdBundler)(moduleId, moduleRegistry, minified, runtimeEnvironment, runtimeParams, config, bundleConfigOverrides);
       if (bundle) {
-        bundle.integrity = (0, import_shared_utils.createIntegrityHash)(bundle.code);
+        bundle.integrity = (0, import_shared_utils.createIntegrityHash)(await bundle.getCode());
       }
       return bundle;
     }

package/build/cjs/esm-bundle-provider.cjs

@@ -102,7 +102,7 @@ async function esmBundler(moduleId, moduleRegistry, runtimeEnvironment, runtimeP
     namespace,
     name,
     version,
-    code,
+    getCode: () => Promise.resolve(code),
     config: {external, exclude},
     map: bundleMap,
     integrity: (0, import_shared_utils.createIntegrityHash)(code),

package/build/cjs/index.cjs

@@ -27,13 +27,23 @@ __export(exports, {
   LwrModuleBundler: () => LwrModuleBundler
 });
 var import_path = __toModule(require("path"));
+var import_lru_cache = __toModule(require("lru-cache"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var TASK_POOL = new import_shared_utils.TaskPool();
 var LwrModuleBundler = class {
   constructor(config, globalConfig) {
-    this.cache = new Map();
+    this.cache = new import_lru_cache.LRUCache({
+      max: parseInt(process.env.BUNDLE_CACHE_SIZE ?? "500", 10),
+      dispose: (_value, key) => {
+        if ((0, import_shared_utils.isLambdaEnv)()) {
+          import_diagnostics.logger.warn(`Bundle evicted from cache: "${key}"`);
+        } else {
+          import_diagnostics.logger.verbose(`Bundle evicted from cache: "${key}"`);
+        }
+      }
+    });
     this.providers = [];
     this.transformers = [];
     this.inflightBundleDefinitions = new import_shared_utils.InflightTasks();
@@ -55,12 +65,14 @@ var LwrModuleBundler = class {
   }
   async getModuleBundle(moduleId, runtimeEnvironment, runtimeParams = {}, bundleConfigOverrides) {
     const {format, minify, debug} = runtimeEnvironment;
+    const ssr = runtimeParams.ssr;
     const cacheKey = `${moduleId.specifier}|${moduleId.version}|${(0, import_shared_utils.getCacheKeyFromJson)({
       locale: runtimeParams.locale,
       format,
       minify,
       debug,
-      bundleConfigOverrides
+      bundleConfigOverrides,
+      ssr
     })}`;
     const cacheDisabled = process.env.NOCACHE === "true";
     if (!cacheDisabled) {
@@ -69,14 +81,19 @@ var LwrModuleBundler = class {
         return bundleDef;
       }
     }
-    return (0, import_instrumentation.getTracer)().trace({
-      name: import_instrumentation.BundleSpan.GetBundle,
-      attributes: {
-        specifier: moduleId.specifier
-      }
-    }, () => {
-      return this.inflightBundleDefinitions.execute(cacheKey, () => {
-        return TASK_POOL.execute(async () => {
+    return this.inflightBundleDefinitions.execute(cacheKey, () => {
+      return TASK_POOL.execute(async () => {
+        return (0, import_instrumentation.getTracer)().trace({
+          name: import_instrumentation.BundleSpan.GetBundle,
+          attributes: {
+            specifier: moduleId.specifier,
+            version: moduleId.version ?? "",
+            locale: runtimeParams.locale ?? "",
+            ssr: ssr ? "TRUE" : "FALSE",
+            debug: debug ? "TRUE" : "FALSE"
+          }
+        }, async () => {
+          import_instrumentation.cacheCountStore.incrementCacheKey("missedDefs");
           for (const bundler of this.providers) {
             const bundleDef = await bundler.bundle(moduleId, runtimeEnvironment, runtimeParams, bundleConfigOverrides);
             if (bundleDef) {
@@ -89,8 +106,8 @@ var LwrModuleBundler = class {
           throw (0, import_diagnostics.createSingleDiagnosticError)({
             description: import_diagnostics.descriptions.UNRESOLVABLE.BUNDLE(moduleId.specifier)
           }, import_diagnostics.LwrUnresolvableError);
-        }, this);
-      });
+        });
+      }, this);
     });
   }
   async resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
@@ -122,7 +139,7 @@ var LwrModuleBundler = class {
     };
     for (const transformPlugin of this.transformers) {
       const resolveUriResult = await transformPlugin.transformUri?.(bundleUri, bundleDefinition, runtimeEnvironment);
-      if (resolveUriResult && resolveUriResult.uri) {
+      if (resolveUriResult?.uri) {
         uri = resolveUriResult.uri;
       }
     }

package/build/cjs/utils/amd-common.cjs

@@ -210,13 +210,14 @@ async function amdBundler(rootModuleId, moduleRegistry, minify = false, runtimeE
     includedModules = cachedBundleGroupCode.includedModules;
   }
   const {id, name, namespace, version, specifier} = moduleGraphs.linkedDefinitions[rootModule.specifier];
+  const getCode = () => Promise.resolve(bundleCode);
   return {
     id,
     name,
     namespace,
     version,
     specifier,
-    code: bundleCode,
+    getCode,
     config: {external, exclude},
     bundleRecord: {
       imports: Array.from(requiredImports.values()),

package/build/es/amd-bundle-provider.js

@@ -15,13 +15,16 @@ export default class AmdBundlerProvider {
             // Minification via esbuild for performance
             const { minify, debug, env: { NODE_ENV: envMode } = { NODE_ENV: 'production' }, } = runtimeEnvironment;
             const minified = !!minify && !debug;
+            let bundleCode;
             if (minified) {
-                bundle.code = await minifyJavascript(bundle.code);
+                // TODO convert to getCode()
+                bundleCode = await minifyJavascript((await bundle.getCode()));
             }
             else {
-                bundle.code = await parseJavascript(bundle.code, { envMode });
+                bundleCode = await parseJavascript((await bundle.getCode()), { envMode });
             }
-            bundle.integrity = createIntegrityHash(bundle.code);
+            bundle.integrity = createIntegrityHash(bundleCode);
+            bundle.getCode = () => Promise.resolve(bundleCode);
             return bundle;
         }
     }

package/build/es/amd-runtime-bundle-provider.js

@@ -14,7 +14,7 @@ export default class AmdBundlerProvider {
             const bundle = await amdBundler(moduleId, moduleRegistry, minified, // will minify using rollup/terser if true - MRT runtime friendly
             runtimeEnvironment, runtimeParams, config, bundleConfigOverrides);
             if (bundle) {
-                bundle.integrity = createIntegrityHash(bundle.code);
+                bundle.integrity = createIntegrityHash((await bundle.getCode()));
             }
             return bundle;
         }

package/build/es/esm-bundle-provider.js

@@ -76,7 +76,7 @@ async function esmBundler(moduleId, moduleRegistry, runtimeEnvironment, runtimeP
         namespace,
         name,
         version,
-        code,
+        getCode: () => Promise.resolve(code),
         config: { external, exclude },
         map: bundleMap,
         integrity: createIntegrityHash(code),

package/build/es/index.d.ts

@@ -1,4 +1,5 @@
 import type { AbstractModuleId, BundleConfig, BundleConfigOverrides, BundleDefinition, BundleProvider, LwrAppObserver, ModuleBundler, ModuleId, ModuleRegistry, NormalizedLwrGlobalConfig, PublicModuleBundler, RuntimeEnvironment, RuntimeParams, SourceMapRuntimeEnvironment, UriTransformPlugin } from '@lwrjs/types';
+import { LRUCache } from 'lru-cache';
 interface LwrModuleBundlerConfig {
     moduleRegistry: ModuleRegistry;
     appObserver?: LwrAppObserver;
@@ -6,7 +7,7 @@ interface LwrModuleBundlerConfig {
 export declare class LwrModuleBundler implements ModuleBundler {
     moduleRegistry: ModuleRegistry;
     appObserver: LwrAppObserver | undefined;
-    cache: Map<string, BundleDefinition>;
+    cache: LRUCache<string, BundleDefinition, unknown>;
     providers: BundleProvider[];
     transformers: UriTransformPlugin[];
     bundleConfig: BundleConfig;
@@ -19,7 +20,7 @@ export declare class LwrModuleBundler implements ModuleBundler {
     /**
      * Resolve the URI to the bundle rooted at the `moduleId`
      * @param moduleId - The id of the root module for the bundle
-     * @param runtimeEnvironment  - The runtime operating environnment
+     * @param runtimeEnvironment  - The runtime operating environment
      * @param runtimeParams  - The available runtime parameters provided in context to the request
      * @param signature - The signature of the bundle instance being referenced
      * @returns the URI

package/build/es/index.js

@@ -1,11 +1,22 @@
 import { join } from 'path';
-import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
-import { signBundle, getCacheKeyFromJson, InflightTasks, TaskPool } from '@lwrjs/shared-utils';
-import { getTracer, BundleSpan } from '@lwrjs/instrumentation';
+import { LRUCache } from 'lru-cache';
+import { LwrUnresolvableError, createSingleDiagnosticError, descriptions, logger } from '@lwrjs/diagnostics';
+import { signBundle, getCacheKeyFromJson, InflightTasks, TaskPool, isLambdaEnv } from '@lwrjs/shared-utils';
+import { getTracer, BundleSpan, cacheCountStore } from '@lwrjs/instrumentation';
 const TASK_POOL = new TaskPool();
 export class LwrModuleBundler {
     constructor(config, globalConfig) {
-        this.cache = new Map();
+        this.cache = new LRUCache({
+            max: parseInt(process.env.BUNDLE_CACHE_SIZE ?? '500', 10),
+            dispose: (_value, key) => {
+                if (isLambdaEnv()) {
+                    logger.warn(`Bundle evicted from cache: "${key}"`);
+                }
+                else {
+                    logger.verbose(`Bundle evicted from cache: "${key}"`);
+                }
+            },
+        });
         this.providers = [];
         this.transformers = [];
         // Pending bundle definitions are tracked to prevent concurrent resolution of the same bundle.
@@ -33,32 +44,38 @@ export class LwrModuleBundler {
     }
     async getModuleBundle(moduleId, runtimeEnvironment, runtimeParams = {}, bundleConfigOverrides) {
         const { format, minify, debug } = runtimeEnvironment;
+        const ssr = runtimeParams.ssr;
         const cacheKey = `${moduleId.specifier}|${moduleId.version}|${getCacheKeyFromJson({
             locale: runtimeParams.locale,
             format,
             minify,
             debug,
             bundleConfigOverrides,
+            ssr,
         })}`;
         const cacheDisabled = process.env.NOCACHE === 'true';
         if (!cacheDisabled) {
             // Return the cached bundle definition
             if (this.cache.has(cacheKey)) {
-                // TODO add to profiling
-                // console.log('[INFO] Bundle Cache Hit: ', cacheKey);
                 const bundleDef = this.cache.get(cacheKey);
                 return bundleDef;
             }
         }
-        return getTracer().trace({
-            name: BundleSpan.GetBundle,
-            attributes: {
-                specifier: moduleId.specifier,
-            },
-        }, () => {
-            return this.inflightBundleDefinitions.execute(cacheKey, () => {
-                // Run theses tasks in a task pool to throttle parallel requests.
-                return TASK_POOL.execute(async () => {
+        return this.inflightBundleDefinitions.execute(cacheKey, () => {
+            // Run theses tasks in a task pool to throttle parallel requests.
+            return TASK_POOL.execute(async () => {
+                return getTracer().trace({
+                    name: BundleSpan.GetBundle,
+                    attributes: {
+                        specifier: moduleId.specifier,
+                        version: moduleId.version ?? '',
+                        locale: runtimeParams.locale ?? '',
+                        ssr: ssr ? 'TRUE' : 'FALSE',
+                        debug: debug ? 'TRUE' : 'FALSE',
+                    },
+                }, async () => {
+                    // Increment the async def miss counter setup by top level metrics interested in bundle definition misses
+                    cacheCountStore.incrementCacheKey('missedDefs');
                     for (const bundler of this.providers) {
                         // eslint-disable-next-line no-await-in-loop
                         const bundleDef = await bundler.bundle(moduleId, runtimeEnvironment, runtimeParams, bundleConfigOverrides);
@@ -72,14 +89,14 @@ export class LwrModuleBundler {
                     throw createSingleDiagnosticError({
                         description: descriptions.UNRESOLVABLE.BUNDLE(moduleId.specifier),
                     }, LwrUnresolvableError);
-                }, this);
-            });
+                });
+            }, this);
         });
     }
     /**
      * Resolve the URI to the bundle rooted at the `moduleId`
      * @param moduleId - The id of the root module for the bundle
-     * @param runtimeEnvironment  - The runtime operating environnment
+     * @param runtimeEnvironment  - The runtime operating environment
      * @param runtimeParams  - The available runtime parameters provided in context to the request
      * @param signature - The signature of the bundle instance being referenced
      * @returns the URI
@@ -119,7 +136,7 @@ export class LwrModuleBundler {
         for (const transformPlugin of this.transformers) {
             // eslint-disable-next-line no-await-in-loop
             const resolveUriResult = await transformPlugin.transformUri?.(bundleUri, bundleDefinition, runtimeEnvironment);
-            if (resolveUriResult && resolveUriResult.uri) {
+            if (resolveUriResult?.uri) {
                 uri = resolveUriResult.uri;
             }
         }

package/build/es/utils/amd-common.js

@@ -225,13 +225,14 @@ export async function amdBundler(rootModuleId, moduleRegistry, minify = false, r
         includedModules = cachedBundleGroupCode.includedModules;
     }
     const { id, name, namespace, version, specifier } = moduleGraphs.linkedDefinitions[rootModule.specifier];
+    const getCode = () => Promise.resolve(bundleCode);
     return {
         id,
         name,
         namespace,
         version,
         specifier,
-        code: bundleCode,
+        getCode,
         config: { external, exclude },
         bundleRecord: {
             imports: Array.from(requiredImports.values()),

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.9",
+    "version": "0.15.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -47,14 +47,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.15.0-alpha.9",
-        "@lwrjs/instrumentation": "0.15.0-alpha.9",
-        "@lwrjs/shared-utils": "0.15.0-alpha.9",
+        "@lwrjs/diagnostics": "0.15.0",
+        "@lwrjs/instrumentation": "0.15.0",
+        "@lwrjs/shared-utils": "0.15.0",
         "@rollup/plugin-replace": "^5.0.7",
-        "rollup": "^2.78.0"
+        "lru-cache": "^10.4.3",
+        "rollup": "^2.79.2"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.9",
+        "@lwrjs/types": "0.15.0",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -67,5 +68,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "9783b817b11c29ca385457683fcb87e8179f7902"
+    "gitHead": "ee374df435d5342f63e4da126a09461e761837f3"
 }