@lwrjs/static 0.11.0-alpha.0 → 0.11.0-alpha.2

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

@@ -41,9 +41,10 @@ var StaticBundleProvider = class {
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
     this.bundleConfig = context.config.bundleConfig;
   }
-  async bundle(moduleId, runtimeEnvironment) {
+  async bundle(moduleId, runtimeEnvironment, runtimeParams) {
     const {specifier, name, namespace, version} = moduleId;
-    const metadata = this.siteBundles.bundles[specifier];
+    const localeId = runtimeParams?.locale || runtimeEnvironment.defaultLocale;
+    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, runtimeEnvironment.defaultLocale);
     if (!metadata) {
       if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {
         import_shared_utils.logger.warn(`[${this.name}] did not find requested specifier ${specifier}`);

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

@@ -38,20 +38,23 @@ var StaticModuleProvider = class {
     this.externals = Object.keys(context.config.bundleConfig.external || {});
     this.siteBundles = context.siteMetadata.getSiteBundles();
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
+    this.runtimeEnvironment = context.runtimeEnvironment;
     this.fingerprintIndex = buildFingerprintsIndex(context);
   }
-  async getModule(moduleId) {
+  async getModule(moduleId, runtimeParams) {
     const {specifier} = moduleId;
-    const metadata = this.siteBundles.bundles[specifier];
+    const localeId = runtimeParams?.locale || this.runtimeEnvironment.defaultLocale;
+    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
     if (metadata) {
       import_shared_utils.logger.warn(`[${this.name}] We should not be asking for module source we have in our site metadata ${moduleId.specifier}`);
       return void 0;
     }
     return void 0;
   }
-  async getModuleEntry(moduleId) {
+  async getModuleEntry(moduleId, runtimeParams) {
     const {specifier, version} = moduleId;
-    const metadata = this.siteBundles.bundles[specifier];
+    const localeId = runtimeParams?.locale || this.runtimeEnvironment.defaultLocale;
+    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
     if (metadata) {
       import_shared_utils.logger.info(`[${this.name}] Module Entry request for static bundle ${specifier}`);
       const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);

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

@@ -39,7 +39,7 @@ var StaticResourceProvider = class {
     this.siteResources = context.siteMetadata.getSiteResources();
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
   }
-  async getResource(resourceIdentity, runtimeEnvironment) {
+  async getResource(resourceIdentity, _runtimeEnvironment) {
     const metadata = this.siteResources.resources[resourceIdentity.specifier];
     if (!metadata) {
       import_shared_utils.logger.warn(`[${this.name}] Did not find requested specifier ${resourceIdentity.specifier}`);

package/build/cjs/site-metadata.cjs

@@ -55,7 +55,7 @@ var SiteMetadataImpl = class {
   async persistSiteMetadata() {
     const siteMetadataPath = import_path.default.join(this.options.rootDir, SITE_METADATA_PATH);
     try {
-      if (!await import_fs_extra.default.pathExists(siteMetadataPath)) {
+      if (!import_fs_extra.default.existsSync(siteMetadataPath)) {
         await import_fs_extra.default.mkdir(siteMetadataPath, {recursive: true});
       }
       const bundleMetadataPath = import_path.default.join(this.options.rootDir, STATIC_BUNDLE_METADATA_PATH);

package/build/cjs/utils/static-utils.cjs

@@ -24,9 +24,29 @@ var __toModule = (module2) => {
 // packages/@lwrjs/static/src/utils/static-utils.ts
 __markAsModule(exports);
 __export(exports, {
+  getLocalizedBundle: () => getLocalizedBundle,
   resolveStaticBundleVersion: () => resolveStaticBundleVersion
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function resolveStaticBundleVersion(metadataVersion, requestedVersion) {
   return metadataVersion || requestedVersion || import_shared_utils.VERSION_NOT_PROVIDED;
 }
+function getLocalizedBundle(specifier, siteBundles, localeId, defaultLocaleId) {
+  if (localeId === defaultLocaleId) {
+    return siteBundles.bundles[specifier];
+  }
+  const localizedBundle = siteBundles.bundles[`${specifier}|l/${localeId}`];
+  if (localizedBundle) {
+    return localizedBundle;
+  }
+  if ((0, import_shared_utils.hasCountryCode)(localeId)) {
+    const stripedCode = (0, import_shared_utils.stripCountryCode)(localeId);
+    if (stripedCode) {
+      const localizedBundle2 = siteBundles.bundles[`${specifier}|l/${stripedCode}`];
+      if (localizedBundle2) {
+        return localizedBundle2;
+      }
+    }
+  }
+  return siteBundles.bundles[specifier];
+}

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

@@ -1,10 +1,10 @@
-import type { AbstractModuleId, BundleDefinition, BundleProvider, ProviderContext, RuntimeEnvironment } from '@lwrjs/types';
+import type { AbstractModuleId, BundleDefinition, BundleProvider, ProviderContext, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
 export default class StaticBundleProvider implements BundleProvider {
     name: string;
     siteBundles: import("@lwrjs/types").SiteBundles;
     siteRootDir: string;
     bundleConfig: import("@lwrjs/types").BundleConfig;
     constructor(_config: {}, context: ProviderContext);
-    bundle<BundleIdentifier extends AbstractModuleId, RE extends RuntimeEnvironment>(moduleId: BundleIdentifier, runtimeEnvironment: RE): Promise<BundleDefinition | undefined>;
+    bundle<BundleIdentifier extends AbstractModuleId, RE extends RuntimeEnvironment>(moduleId: BundleIdentifier, runtimeEnvironment: RE, runtimeParams: RuntimeParams): Promise<BundleDefinition | undefined>;
 }
 //# sourceMappingURL=static-bundle-provider.d.ts.map

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

@@ -1,7 +1,7 @@
 import { explodeSpecifier, getSpecifier, logger } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
-import { resolveStaticBundleVersion } from '../utils/static-utils.js';
+import { getLocalizedBundle, resolveStaticBundleVersion } from '../utils/static-utils.js';
 const LWR_SSR_BUNDLE_PREFIX = '@lwrjs/lwc-ssr/';
 export default class StaticBundleProvider {
     constructor(_config, context) {
@@ -13,9 +13,10 @@ export default class StaticBundleProvider {
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
         this.bundleConfig = context.config.bundleConfig;
     }
-    async bundle(moduleId, runtimeEnvironment) {
+    async bundle(moduleId, runtimeEnvironment, runtimeParams) {
         const { specifier, name, namespace, version } = moduleId;
-        const metadata = this.siteBundles.bundles[specifier];
+        const localeId = (runtimeParams?.locale || runtimeEnvironment.defaultLocale);
+        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, runtimeEnvironment.defaultLocale);
         if (!metadata) {
             // ignore ssr module requests
             if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {

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

@@ -1,12 +1,13 @@
-import type { AbstractModuleId, ModuleCompiled, ModuleEntry, ModuleProvider, ProviderContext } from '@lwrjs/types';
+import type { AbstractModuleId, ModuleCompiled, ModuleEntry, ModuleProvider, ProviderContext, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
 export default class StaticModuleProvider implements ModuleProvider {
     name: string;
     siteBundles: import("@lwrjs/types").SiteBundles;
     siteRootDir: string;
     externals: string[];
     fingerprintIndex: Record<string, ModuleEntry>;
+    runtimeEnvironment: RuntimeEnvironment;
     constructor(_config: {}, context: ProviderContext);
-    getModule<T extends AbstractModuleId>(moduleId: T): Promise<ModuleCompiled | undefined>;
-    getModuleEntry<T extends AbstractModuleId>(moduleId: T): Promise<ModuleEntry | undefined>;
+    getModule<T extends AbstractModuleId>(moduleId: T, runtimeParams: RuntimeParams): Promise<ModuleCompiled | undefined>;
+    getModuleEntry<T extends AbstractModuleId>(moduleId: T, runtimeParams: RuntimeParams): Promise<ModuleEntry | undefined>;
 }
 //# sourceMappingURL=static-module-provider.d.ts.map

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

@@ -1,6 +1,6 @@
 import { explodeSpecifier, getSpecifier, logger } from '@lwrjs/shared-utils';
 import path from 'path';
-import { resolveStaticBundleVersion } from '../utils/static-utils.js';
+import { getLocalizedBundle, resolveStaticBundleVersion } from '../utils/static-utils.js';
 export default class StaticModuleProvider {
     constructor(_config, context) {
         this.name = 'static-module-provider';
@@ -10,12 +10,14 @@ export default class StaticModuleProvider {
         this.externals = Object.keys(context.config.bundleConfig.external || {});
         this.siteBundles = context.siteMetadata.getSiteBundles();
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
+        this.runtimeEnvironment = context.runtimeEnvironment;
         // If we are using fingerprints collect all the specifiers in the bundles and add them to an index for creating the mapping identities
         this.fingerprintIndex = buildFingerprintsIndex(context);
     }
-    async getModule(moduleId) {
+    async getModule(moduleId, runtimeParams) {
         const { specifier } = moduleId;
-        const metadata = this.siteBundles.bundles[specifier];
+        const localeId = (runtimeParams?.locale || this.runtimeEnvironment.defaultLocale);
+        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
         if (metadata) {
             logger.warn(`[${this.name}] We should not be asking for module source we have in our site metadata ${moduleId.specifier}`);
             // proceed to next provider
@@ -24,10 +26,11 @@ export default class StaticModuleProvider {
         // proceed to next provider
         return undefined;
     }
-    async getModuleEntry(moduleId) {
+    async getModuleEntry(moduleId, runtimeParams) {
         // TODO shouldn't we be passing the runtime environment here to test?
         const { specifier, version } = moduleId;
-        const metadata = this.siteBundles.bundles[specifier];
+        const localeId = (runtimeParams?.locale || this.runtimeEnvironment.defaultLocale);
+        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
         if (metadata) {
             logger.info(`[${this.name}] Module Entry request for static bundle ${specifier}`);
             // Have to make the bundle code available for SSR

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

@@ -5,6 +5,6 @@ export default class StaticResourceProvider implements ResourceProvider {
     siteRootDir: string;
     resourceRegistry: import("@lwrjs/types").PublicResourceRegistry;
     constructor(_config: {}, context: ProviderContext);
-    getResource<Identifier extends ResourceIdentifier, RuntimeEnvironment extends BootstrapRuntimeEnvironment>(resourceIdentity: Identifier, runtimeEnvironment: RuntimeEnvironment): Promise<ResourceDefinition | undefined>;
+    getResource<Identifier extends ResourceIdentifier, RuntimeEnvironment extends BootstrapRuntimeEnvironment>(resourceIdentity: Identifier, _runtimeEnvironment: RuntimeEnvironment): Promise<ResourceDefinition | undefined>;
 }
 //# sourceMappingURL=static-resource-provider.d.ts.map

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

@@ -11,7 +11,7 @@ export default class StaticResourceProvider {
         this.siteResources = context.siteMetadata.getSiteResources();
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
     }
-    async getResource(resourceIdentity, runtimeEnvironment) {
+    async getResource(resourceIdentity, _runtimeEnvironment) {
         const metadata = this.siteResources.resources[resourceIdentity.specifier];
         if (!metadata) {
             logger.warn(`[${this.name}] Did not find requested specifier ${resourceIdentity.specifier}`);

package/build/es/site-metadata.js

@@ -28,7 +28,7 @@ export class SiteMetadataImpl {
         // Create the metadata directory if if does not exist
         const siteMetadataPath = path.join(this.options.rootDir, SITE_METADATA_PATH);
         try {
-            if (!(await fs.pathExists(siteMetadataPath))) {
+            if (!fs.existsSync(siteMetadataPath)) {
                 await fs.mkdir(siteMetadataPath, { recursive: true });
             }
             // Save Bundle Metadata

package/build/es/utils/static-utils.d.ts

@@ -1,7 +1,12 @@
+import type { SiteBundle, SiteBundles } from '@lwrjs/types';
 /**
  * Return the version for a static module bundle.
  *
  * Version defined in the metadata > Requested Version > 'version-not-provided'
  */
 export declare function resolveStaticBundleVersion(metadataVersion?: string, requestedVersion?: string): string;
+/**
+ * Get the most best match for a localized bundle
+ */
+export declare function getLocalizedBundle(specifier: string, siteBundles: SiteBundles, localeId: string, defaultLocaleId: string): SiteBundle | undefined;
 //# sourceMappingURL=static-utils.d.ts.map

package/build/es/utils/static-utils.js

@@ -2,7 +2,7 @@
  * Try to add any code that is mrt specific here so that we can isolate details that would have to be refactored to run lambdas
  * on a different platform
  */
-import { VERSION_NOT_PROVIDED } from '@lwrjs/shared-utils';
+import { hasCountryCode, stripCountryCode, VERSION_NOT_PROVIDED } from '@lwrjs/shared-utils';
 /**
  * Return the version for a static module bundle.
  *
@@ -11,4 +11,30 @@ import { VERSION_NOT_PROVIDED } from '@lwrjs/shared-utils';
 export function resolveStaticBundleVersion(metadataVersion, requestedVersion) {
     return metadataVersion || requestedVersion || VERSION_NOT_PROVIDED;
 }
+/**
+ * Get the most best match for a localized bundle
+ */
+export function getLocalizedBundle(specifier, siteBundles, localeId, defaultLocaleId) {
+    // check if the locale is the default or not an additional locale
+    if (localeId === defaultLocaleId) {
+        return siteBundles.bundles[specifier];
+    }
+    // Check if there was an exact match for the preferred locale
+    const localizedBundle = siteBundles.bundles[`${specifier}|l/${localeId}`];
+    if (localizedBundle) {
+        return localizedBundle;
+    }
+    // Else check if there is a match without the county code
+    if (hasCountryCode(localeId)) {
+        const stripedCode = stripCountryCode(localeId);
+        if (stripedCode) {
+            const localizedBundle = siteBundles.bundles[`${specifier}|l/${stripedCode}`];
+            if (localizedBundle) {
+                return localizedBundle;
+            }
+        }
+    }
+    // Else fall back to the non-localized bundle
+    return siteBundles.bundles[specifier];
+}
 //# sourceMappingURL=static-utils.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.0",
+    "version": "0.11.0-alpha.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -48,13 +48,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/shared-utils": "0.11.0-alpha.0"
+        "@lwrjs/shared-utils": "0.11.0-alpha.2"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.0",
+        "@lwrjs/types": "0.11.0-alpha.2",
         "@types/express": "^4.17.17",
+        "jest": "^26.6.3",
         "jest-express": "^1.12.0",
-        "mock-res": "^0.6.0"
+        "mock-res": "^0.6.0",
+        "ts-jest": "^26.5.6"
     },
     "engines": {
         "node": ">=16.0.0"
@@ -62,5 +64,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "6917abefe32752eeed0f9ba98505ca2b76f1df9d"
+    "gitHead": "ce7d80468d289a0d24682735513166f163f29f61"
 }