@lwrjs/shared-utils 0.11.0-alpha.13 → 0.11.0-alpha.15

package/build/cjs/html-meta.cjs

@@ -65,7 +65,7 @@ function hasHydrationDirective(attrs = {}) {
   return Object.keys(attrs).some((attr) => attr === HYDRATE_DIRECTIVE);
 }
 async function extractMetadataFromHtml(htmlSource, viewMetadata, appConfig) {
-  const {customElements, assetReferences, serverData} = viewMetadata;
+  const {customElements, assetReferences} = viewMetadata;
   const {
     bundleConfig: {external = {}}
   } = appConfig;
@@ -126,9 +126,9 @@ async function extractMetadataFromHtml(htmlSource, viewMetadata, appConfig) {
     });
     const inputStream = import_stream.Readable.from(htmlSource);
     inputStream.on("end", () => resolve({
+      ...viewMetadata,
       customElements: customElements.filter((ce) => !nestedIslands || hasHydrationDirective(ce.props)),
-      assetReferences,
-      serverData
+      assetReferences
     }));
     inputStream.on("error", (error) => reject(error));
     inputStream.pipe(parser);

package/build/cjs/localization.cjs

@@ -9,6 +9,7 @@ var __export = (target, all) => {
 __markAsModule(exports);
 __export(exports, {
   getFallbackLocale: () => getFallbackLocale,
+  sortLocalesByFallback: () => sortLocalesByFallback,
   walkLocaleFallbacks: () => walkLocaleFallbacks
 });
 function getFallbackLocale(localeId, i18n) {
@@ -32,3 +33,21 @@ async function walkLocaleFallbacks(initialLocale, i18n, test) {
   }
   return void 0;
 }
+function sortLocalesByFallback(i18n) {
+  const sortedLocales = [...i18n.locales];
+  return sortedLocales.sort((a, b) => {
+    if (a.id === i18n.defaultLocale)
+      return -1;
+    if (b.id === i18n.defaultLocale)
+      return 1;
+    if (a.fallback && !b.fallback)
+      return 1;
+    if (b.fallback && !a.fallback)
+      return -1;
+    if (a.fallback && b.id === a.fallback)
+      return 1;
+    if (b.fallback && a.id === b.fallback)
+      return -1;
+    return 0;
+  });
+}

package/build/es/html-meta.js

@@ -37,7 +37,7 @@ function hasHydrationDirective(attrs = {}) {
  * @param htmlSource - An HTML string to parse
  */
 export async function extractMetadataFromHtml(htmlSource, viewMetadata, appConfig) {
-    const { customElements, assetReferences, serverData } = viewMetadata;
+    const { customElements, assetReferences } = viewMetadata;
     const { bundleConfig: { external = {} }, } = appConfig;
     const externals = Object.keys(external);
     return new Promise((resolve, reject) => {
@@ -111,9 +111,9 @@ export async function extractMetadataFromHtml(htmlSource, viewMetadata, appConfi
         // If nested islands are found, ONLY collect custom elements with the hydration directive
         // Otherwise, just collect top-level custom elements (ie: root components) as usual
         inputStream.on('end', () => resolve({
+            ...viewMetadata,
             customElements: customElements.filter((ce) => !nestedIslands || hasHydrationDirective(ce.props)),
             assetReferences,
-            serverData,
         }));
         inputStream.on('error', (error) => reject(error));
         inputStream.pipe(parser);

package/build/es/localization.d.ts

@@ -1,4 +1,5 @@
-import type { I18NConfig } from '@lwrjs/types';
+import type { I18NConfig, Locale } from '@lwrjs/types';
 export declare function getFallbackLocale(localeId: string, i18n: I18NConfig): string | undefined;
 export declare function walkLocaleFallbacks<R>(initialLocale: string, i18n: I18NConfig, test: (locale: string) => Promise<R | undefined>): Promise<R | undefined>;
+export declare function sortLocalesByFallback(i18n: I18NConfig): Locale[];
 //# sourceMappingURL=localization.d.ts.map

package/build/es/localization.js

@@ -25,4 +25,23 @@ export async function walkLocaleFallbacks(initialLocale, i18n, test) {
     // Did not find what we were looking for
     return undefined;
 }
+// Sort locales with fallbacks based on fallback relationships
+export function sortLocalesByFallback(i18n) {
+    const sortedLocales = [...i18n.locales];
+    return sortedLocales.sort((a, b) => {
+        if (a.id === i18n.defaultLocale)
+            return -1; // Move the default locales to the front.
+        if (b.id === i18n.defaultLocale)
+            return 1;
+        if (a.fallback && !b.fallback)
+            return 1; // Move locales with no fallback before the ones that do
+        if (b.fallback && !a.fallback)
+            return -1;
+        if (a.fallback && b.id === a.fallback)
+            return 1; // Move 'a' before 'b' if 'a' is a fallback for 'b'.
+        if (b.fallback && a.id === b.fallback)
+            return -1; // Move 'b' before 'a' if 'b' is a fallback for 'a'.
+        return 0;
+    });
+}
 //# sourceMappingURL=localization.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.13",
+    "version": "0.11.0-alpha.15",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -37,7 +37,7 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.11.0-alpha.13",
+        "@lwrjs/diagnostics": "0.11.0-alpha.15",
         "es-module-lexer": "^1.3.0",
         "fast-json-stable-stringify": "^2.1.0",
         "magic-string": "^0.30.0",
@@ -50,12 +50,12 @@
         "slugify": "^1.4.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.13",
+        "@lwrjs/types": "0.11.0-alpha.15",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "101ac765e89de3b378b4c049cdeb0cfc635ae22a"
+    "gitHead": "3c6c6d17b2f57a5b67d32e40a1e574abb7d9afea"
 }