@lwrjs/static 0.13.0-alpha.7 → 0.13.0-alpha.9

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

@@ -103,7 +103,7 @@ var StaticBundleProvider = class {
     return includedModule;
   }
   async getCode(bundlePath, debug, specifier, version, localeId) {
-    const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== void 0;
+    const isLambda = (0, import_shared_utils.isLambdaEnv)();
     let bundleSourcePath = bundlePath;
     try {
       if (debug && isLambda) {

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

@@ -30,6 +30,7 @@ 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_site_metadata = __toModule(require("../site-metadata.cjs"));
 var StaticResourceProvider = class {
   constructor(_config, context) {
     this.name = "static-resource-provider";
@@ -37,15 +38,14 @@ var StaticResourceProvider = class {
       throw new Error(`[${this.name}] Site metadata was not found`);
     }
     this.resourceRegistry = context.resourceRegistry;
-    this.siteResources = context.siteMetadata.getSiteResources();
-    this.debugSiteResources = context.siteMetadata.getDebugSiteResources();
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
+    this.siteMetadata = context.siteMetadata;
   }
   async getResource(resourceIdentity, runtimeEnvironment) {
     const {debug} = runtimeEnvironment;
-    const metadata = this.siteResources.resources[resourceIdentity.specifier];
-    const debugMetadata = this.debugSiteResources ? this.debugSiteResources.resources[resourceIdentity.specifier] : void 0;
-    if (!metadata && !debugMetadata) {
+    const metadata = this.siteMetadata.getSiteResourcesDecisionTree().find((0, import_site_metadata.getSiteResourceId)(resourceIdentity));
+    const debugMetadata = this.siteMetadata.getSiteResourcesDecisionTree().find((0, import_site_metadata.getSiteResourceId)(resourceIdentity), true);
+    if (!metadata) {
       import_diagnostics.logger.warn({
         label: `${this.name}`,
         message: `Did not find requested specifier ${resourceIdentity.specifier}`
@@ -54,7 +54,7 @@ var StaticResourceProvider = class {
     }
     const resourcePath = import_path.default.join(this.siteRootDir, metadata.path);
     const debugResourcePath = debugMetadata ? import_path.default.join(this.siteRootDir, debugMetadata.path) : void 0;
-    const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== void 0;
+    const isLambda = (0, import_shared_utils.isLambdaEnv)();
     const useDebug = debug && !isLambda && debugResourcePath;
     const type = metadata.mimeType || (0, import_shared_utils.mimeLookup)(resourcePath) || "application/javascript";
     return {

package/build/cjs/site-metadata.cjs

@@ -28,6 +28,7 @@ __export(exports, {
   SITE_VERSION_PREFIX: () => SITE_VERSION_PREFIX,
   SiteMetadataImpl: () => SiteMetadataImpl,
   getSiteBundleId: () => getSiteBundleId,
+  getSiteResourceId: () => getSiteResourceId,
   parseSiteId: () => parseSiteId,
   resolveStaticBundleVersion: () => resolveStaticBundleVersion
 });
@@ -84,6 +85,18 @@ var SiteMetadataImpl = class {
     }
     return this.bundleDecisionTree;
   }
+  getSiteResourcesDecisionTree() {
+    if (!this.resourceDecisionTree) {
+      this.resourceDecisionTree = new import_decision_tree.default();
+      for (const [key, resource] of Object.entries(this.siteResources.resources)) {
+        this.resourceDecisionTree.insert(key, resource, false);
+      }
+      for (const [key, resource] of Object.entries(this.debugSiteResources.resources)) {
+        this.resourceDecisionTree.insert(key, resource, true);
+      }
+    }
+    return this.resourceDecisionTree;
+  }
   async persistSiteMetadata() {
     const siteMetadataPath = import_path.default.join(this.options.rootDir, SITE_METADATA_PATH);
     if (siteMetadataPath.indexOf("__skip_directory_creation__") !== -1)
@@ -191,3 +204,7 @@ function getSiteBundleId({specifier, namespace, name = "", version}, locale, i18
   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}`;
 }
+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;
+  return versionedSpecifier;
+}

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

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { VERSION_SIGIL, explodeSpecifier, getSpecifier } from '@lwrjs/shared-utils';
+import { VERSION_SIGIL, explodeSpecifier, getSpecifier, isLambdaEnv } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 import { getSiteBundleId, parseSiteId, resolveStaticBundleVersion } from '../site-metadata.js';
@@ -92,7 +92,7 @@ export default class StaticBundleProvider {
      */
     async getCode(bundlePath, debug, specifier, version, localeId) {
         // Flag is used to indicate that we are running on a lambda
-        const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined;
+        const isLambda = isLambdaEnv();
         // Default source code path determined from metadata based on debug mode
         let bundleSourcePath = bundlePath;
         try {

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

@@ -1,9 +1,8 @@
 import type { BootstrapRuntimeEnvironment, ProviderContext, ResourceDefinition, ResourceIdentifier, ResourceProvider } from '@lwrjs/types';
 export default class StaticResourceProvider implements ResourceProvider {
     name: string;
-    siteResources: import("@lwrjs/types").SiteResources;
-    debugSiteResources: import("@lwrjs/types").SiteResources;
     siteRootDir: string;
+    siteMetadata: import("@lwrjs/types").SiteMetadata;
     resourceRegistry: import("@lwrjs/types").PublicResourceRegistry;
     constructor(_config: {}, context: ProviderContext);
     getResource<Identifier extends ResourceIdentifier, RuntimeEnvironment extends BootstrapRuntimeEnvironment>(resourceIdentity: Identifier, runtimeEnvironment: RuntimeEnvironment): Promise<ResourceDefinition | undefined>;

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

@@ -1,7 +1,8 @@
 import { logger } from '@lwrjs/diagnostics';
-import { mimeLookup } from '@lwrjs/shared-utils';
+import { isLambdaEnv, mimeLookup } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
+import { getSiteResourceId } from '../site-metadata.js';
 export default class StaticResourceProvider {
     constructor(_config, context) {
         this.name = 'static-resource-provider';
@@ -9,17 +10,18 @@ export default class StaticResourceProvider {
             throw new Error(`[${this.name}] Site metadata was not found`);
         }
         this.resourceRegistry = context.resourceRegistry;
-        this.siteResources = context.siteMetadata.getSiteResources();
-        this.debugSiteResources = context.siteMetadata.getDebugSiteResources();
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
+        this.siteMetadata = context.siteMetadata;
     }
     async getResource(resourceIdentity, runtimeEnvironment) {
         const { debug } = runtimeEnvironment;
-        const metadata = this.siteResources.resources[resourceIdentity.specifier];
-        const debugMetadata = this.debugSiteResources
-            ? this.debugSiteResources.resources[resourceIdentity.specifier]
-            : undefined;
-        if (!metadata && !debugMetadata) {
+        const metadata = this.siteMetadata
+            .getSiteResourcesDecisionTree()
+            .find(getSiteResourceId(resourceIdentity));
+        const debugMetadata = this.siteMetadata
+            .getSiteResourcesDecisionTree()
+            .find(getSiteResourceId(resourceIdentity), true);
+        if (!metadata) {
             logger.warn({
                 label: `${this.name}`,
                 message: `Did not find requested specifier ${resourceIdentity.specifier}`,
@@ -28,7 +30,7 @@ export default class StaticResourceProvider {
         }
         const resourcePath = path.join(this.siteRootDir, metadata.path);
         const debugResourcePath = debugMetadata ? path.join(this.siteRootDir, debugMetadata.path) : undefined;
-        const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined;
+        const isLambda = isLambdaEnv();
         const useDebug = debug && !isLambda && debugResourcePath;
         // Figure out mime type
         const type = metadata.mimeType || mimeLookup(resourcePath) || 'application/javascript';

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

@@ -1,4 +1,4 @@
-import type { AbstractModuleId, I18NConfig, SiteAssets, SiteBundle, SiteBundles, SiteMetadata, SiteResources } from '@lwrjs/types';
+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';
 type Options = {
@@ -20,6 +20,7 @@ export declare class SiteMetadataImpl implements SiteMetadata {
     private debugSiteResources;
     private siteAssets;
     private bundleDecisionTree?;
+    private resourceDecisionTree?;
     constructor(options: Options);
     getSiteRootDir(): string;
     getSiteBundles(): SiteBundles;
@@ -32,6 +33,11 @@ export declare class SiteMetadataImpl implements SiteMetadata {
      * It is assumed this is static after creation subsequent calls will return the same instance.
      */
     getSiteBundlesDecisionTree(): DecisionTree<SiteBundle>;
+    /**
+     * Returns a decision tree for site resources.
+     * It is assumed this is static after creation subsequent calls will return the same instance.
+     */
+    getSiteResourcesDecisionTree(): DecisionTree<SiteResource>;
     persistSiteMetadata(): Promise<void>;
     private readStaticBundleMetadata;
     /**
@@ -61,5 +67,12 @@ export declare function parseSiteId(input: string): SiteArtifactId;
  * @returns Site Bundle Identifier
  */
 export declare function getSiteBundleId({ specifier, namespace, name, version }: Partial<AbstractModuleId>, locale?: string, i18n?: I18NConfig): string;
+/**
+ * Get a  Site Resource Identifier from a Resource Identifier
+ *
+ * @param resourceID -Resource Identifier
+ * @returns Site Bundle Identifier
+ */
+export declare function getSiteResourceId({ specifier, version }: Partial<ResourceIdentifier>): string;
 export {};
 //# sourceMappingURL=site-metadata.d.ts.map

package/build/es/site-metadata.js

@@ -47,17 +47,35 @@ export class SiteMetadataImpl {
             this.bundleDecisionTree = new DecisionTree();
             // Normalize i18NConfig fallback paths
             const localeFallbacks = createFallbackMap(this.options.i18n);
-            // Add All the Bundles path keys [prod | debug][specifier][version? & ''][localeId & fallbacks]
+            // Add All the Bundles path keys [specifier][prod][version? (version || '') : ('' || '*')][localeId || fallbacks]
             for (const [key, bundle] of Object.entries(this.siteBundles.bundles)) {
                 this.bundleDecisionTree.insert(key, bundle, false, localeFallbacks);
             }
-            // Add All the Bundles path keys [prod | debug][specifier][version? & ''][localeId & fallbacks]
+            // Add All the Bundles path keys [specifier][debug][[version? (version || '') : ('' || '*')][localeId || fallbacks]
             for (const [key, bundle] of Object.entries(this.debugSiteBundles.bundles)) {
                 this.bundleDecisionTree.insert(key, bundle, true, localeFallbacks);
             }
         }
         return this.bundleDecisionTree;
     }
+    /**
+     * Returns a decision tree for site resources.
+     * It is assumed this is static after creation subsequent calls will return the same instance.
+     */
+    getSiteResourcesDecisionTree() {
+        if (!this.resourceDecisionTree) {
+            this.resourceDecisionTree = new DecisionTree();
+            // Add All the prod resources path keys [specifier][prod][version? (version || '') : ('' || '*')][*]
+            for (const [key, resource] of Object.entries(this.siteResources.resources)) {
+                this.resourceDecisionTree.insert(key, resource, false);
+            }
+            // Add All the debug resources path keys [specifier][debug][version? (version || '') : ('' || '*')][*]
+            for (const [key, resource] of Object.entries(this.debugSiteResources.resources)) {
+                this.resourceDecisionTree.insert(key, resource, true);
+            }
+        }
+        return this.resourceDecisionTree;
+    }
     async persistSiteMetadata() {
         // Create the metadata directory if if does not exist
         const siteMetadataPath = path.join(this.options.rootDir, SITE_METADATA_PATH);
@@ -205,4 +223,17 @@ export function getSiteBundleId({ specifier, namespace, name = '', version }, lo
         ? versionedSpecifier
         : `${versionedSpecifier}${SITE_LOCALE_PREFIX}${locale}`;
 }
+/**
+ * Get a  Site Resource Identifier from a Resource Identifier
+ *
+ * @param resourceID -Resource Identifier
+ * @returns Site Bundle Identifier
+ */
+export function getSiteResourceId({ specifier, version }) {
+    // If a module has an explicit 'version-not-provided' version this will not be reflected in the specifier
+    const versionedSpecifier = version && version !== VERSION_NOT_PROVIDED
+        ? `${specifier}${SITE_VERSION_PREFIX}${normalizeVersionToUri(version)}`
+        : specifier;
+    return versionedSpecifier;
+}
 //# sourceMappingURL=site-metadata.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.13.0-alpha.7",
+    "version": "0.13.0-alpha.9",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -52,11 +52,11 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.13.0-alpha.7",
-        "@lwrjs/shared-utils": "0.13.0-alpha.7"
+        "@lwrjs/diagnostics": "0.13.0-alpha.9",
+        "@lwrjs/shared-utils": "0.13.0-alpha.9"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.13.0-alpha.7",
+        "@lwrjs/types": "0.13.0-alpha.9",
         "@types/express": "^4.17.21",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
@@ -69,5 +69,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "4b77dea6ac8d473a4113ad7b345b3a37b0b8a3f8"
+    "gitHead": "a2a9e1dbf39a7b04c7a43433e004895b6f4c51a3"
 }