@lwrjs/label-module-provider 0.11.0-alpha.10 → 0.11.0-alpha.12

package/build/cjs/index.cjs

@@ -63,19 +63,23 @@ var LabelModuleProvider = class {
     });
   }
   async getLabelInfo(specifier, initialLocale) {
+    const labelInfo = (0, import_utils.parseSpecifier)(this.labelDirs, specifier);
+    if (!labelInfo) {
+      return void 0;
+    }
+    let rawValue;
     if (this.useI18nFallbacks) {
-      return (0, import_shared_utils.walkLocaleFallbacks)(initialLocale, this.i18n, async (locale) => {
-        return this.getLabelInfoForLocale(specifier, locale, false);
+      rawValue = await (0, import_shared_utils.walkLocaleFallbacks)(initialLocale, this.i18n, async (locale) => {
+        return this.getLabelInfoForLocale(labelInfo, locale, false);
       });
     } else {
-      return this.getLabelInfoForLocale(specifier, initialLocale, true);
+      rawValue = this.getLabelInfoForLocale(labelInfo, initialLocale, true);
     }
+    const {labelReference} = labelInfo;
+    const labelValue = !rawValue && this.provideDefault ? labelReference : rawValue;
+    return labelValue ? {...labelInfo, labelValue} : void 0;
   }
-  async getLabelInfoForLocale(specifier, locale, legacyFallbacks) {
-    const labelInfo = (0, import_utils.parseSpecifier)(this.labelDirs, specifier);
-    if (!labelInfo) {
-      return void 0;
-    }
+  getLabelInfoForLocale(labelInfo, locale, legacyFallbacks) {
     const {dir, labelReference} = labelInfo;
     const cacheKey = `${dir}|${locale}`;
     let labelJson = {};
@@ -91,9 +95,7 @@ var LabelModuleProvider = class {
     }
     const [namespace, labelName] = labelReference.split(".");
     const namespacedLabels = labelJson[namespace] || {};
-    const rawValue = namespacedLabels[labelName] || labelJson[labelReference];
-    const labelValue = !rawValue && this.provideDefault ? labelReference : rawValue;
-    return labelValue ? {...labelInfo, labelValue} : void 0;
+    return namespacedLabels[labelName] || labelJson[labelReference];
   }
   async getModuleEntry({specifier}, runtimeParams = {}) {
     const locale = runtimeParams.locale && runtimeParams.locale !== "*" ? runtimeParams.locale : this.defaultLocale;

package/build/es/index.js

@@ -37,24 +37,29 @@ export default class LabelModuleProvider {
         });
     }
     async getLabelInfo(specifier, initialLocale) {
+        // Check if this provider handles given specifier package/prefix
+        // Modules handled by this provider have specifiers in this form: "{package}/{labelReference}"
+        const labelInfo = parseSpecifier(this.labelDirs, specifier);
+        if (!labelInfo) {
+            return undefined;
+        }
         // If the app has defined any fallbacks in the config.  Assume this is the fallback precedence we should follow.
+        let rawValue;
         if (this.useI18nFallbacks) {
-            return walkLocaleFallbacks(initialLocale, this.i18n, async (locale) => {
-                return this.getLabelInfoForLocale(specifier, locale, false);
+            rawValue = await walkLocaleFallbacks(initialLocale, this.i18n, async (locale) => {
+                return this.getLabelInfoForLocale(labelInfo, locale, false);
             });
         }
         // Other wise use the default fallbacks for backward compatibility
         else {
-            return this.getLabelInfoForLocale(specifier, initialLocale, true);
+            rawValue = this.getLabelInfoForLocale(labelInfo, initialLocale, true);
         }
+        // If provideDefault is on, and the label is missing, return the label reference/key
+        const { labelReference } = labelInfo;
+        const labelValue = !rawValue && this.provideDefault ? labelReference : rawValue;
+        return labelValue ? { ...labelInfo, labelValue: labelValue } : undefined;
     }
-    async getLabelInfoForLocale(specifier, locale, legacyFallbacks) {
-        // Check if this provider handles given specifier package/prefix
-        // Modules handled by this provider have specifiers in this form: "{package}/{labelReference}"
-        const labelInfo = parseSpecifier(this.labelDirs, specifier);
-        if (!labelInfo) {
-            return undefined;
-        }
+    getLabelInfoForLocale(labelInfo, locale, legacyFallbacks) {
         const { dir, labelReference } = labelInfo;
         // Fetch the label JSON from the cache or file system
         const cacheKey = `${dir}|${locale}`;
@@ -79,9 +84,7 @@ export default class LabelModuleProvider {
         // If provideDefault is on, and the label is missing, return the label reference/key
         const [namespace, labelName] = labelReference.split('.');
         const namespacedLabels = (labelJson[namespace] || {});
-        const rawValue = namespacedLabels[labelName] || labelJson[labelReference]; // nested or flat structure
-        const labelValue = !rawValue && this.provideDefault ? labelReference : rawValue;
-        return labelValue ? { ...labelInfo, labelValue: labelValue } : undefined;
+        return namespacedLabels[labelName] || labelJson[labelReference]; // nested or flat structure
     }
     async getModuleEntry({ specifier }, runtimeParams = {}) {
         const locale = (runtimeParams.locale && runtimeParams.locale !== '*' ? runtimeParams.locale : this.defaultLocale);

package/build/es/utils.d.ts

@@ -6,14 +6,14 @@ export interface LabelProviderOptions {
     provideDefault: boolean;
     labelDirs: LabelDirConfig[];
 }
-interface LabelKeyInfo extends LabelDirConfig {
+export interface LabelKeyInfo extends LabelDirConfig {
     labelReference: string;
     fileType: string;
 }
 export interface LabelInfo extends LabelKeyInfo {
     labelValue: string;
 }
-type LabelEntry = {
+export type LabelEntry = {
     [key: string]: string;
 };
 export type LabelMap = {
@@ -55,5 +55,4 @@ export declare function getLabels(labelDir: string, locale: string, legacyFallba
  * @param fileType - The module file type: html, css or js
  */
 export declare function generateModule(label: string): string;
-export {};
 //# sourceMappingURL=utils.d.ts.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.10",
+    "version": "0.11.0-alpha.12",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,15 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.11.0-alpha.10",
-        "@lwrjs/shared-utils": "0.11.0-alpha.10",
+        "@lwrjs/diagnostics": "0.11.0-alpha.12",
+        "@lwrjs/shared-utils": "0.11.0-alpha.12",
         "ajv": "6.12.6"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.10"
+        "@lwrjs/types": "0.11.0-alpha.12"
     },
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "34b1e289e8de12531f5624b64512e870157195d4"
+    "gitHead": "e19ffe5a48dc2b2b6d74d8acfa9658bedb5dd1ff"
 }