@lwrjs/shared-utils 0.11.0-alpha.4 → 0.11.0-alpha.6

package/build/cjs/env.cjs

@@ -16,6 +16,7 @@ function getFeatureFlags() {
     LEGACY_LOADER: process.env.LEGACY_LOADER !== void 0 && process.env.LEGACY_LOADER.toLowerCase() === "true" ? true : false,
     SSR_SANDBOX_WORKER: process.env.SSR_SANDBOX_WORKER !== void 0 && process.env.SSR_SANDBOX_WORKER.toLowerCase() === "true" ? true : false,
     SSR_STATIC_BUNDLES: process.env.SSR_STATIC_BUNDLES !== void 0 && process.env.SSR_STATIC_BUNDLES.toLowerCase() === "true" ? true : false,
+    SSR_WITH_CSR_FALLBACK: process.env.SSR_WITH_CSR_FALLBACK !== void 0 && process.env.SSR_WITH_CSR_FALLBACK.toLowerCase() === "true" ? true : false,
     EXPERIMENTAL_UNVERSIONED_ALIASES: process.env.EXPERIMENTAL_UNVERSIONED_ALIASES !== void 0 && process.env.EXPERIMENTAL_UNVERSIONED_ALIASES.toLowerCase() === "true" ? true : false,
     LWR_TRACING: process.env.LWR_TRACING !== void 0 && process.env.LWR_TRACING.toLowerCase() !== "off" ? true : false
   };

package/build/cjs/fs.cjs

@@ -75,6 +75,9 @@ function resolveFileExtension(filePath) {
   }
 }
 function canResolveView(source, type) {
+  if (typeof source !== "string") {
+    return false;
+  }
   if (!source.endsWith(`.${type}`)) {
     return false;
   }

package/build/cjs/html-meta.cjs

@@ -61,13 +61,16 @@ function isSelfUrl(url) {
   return !url || !!url.match(isSelfUrlRegex);
 }
 var isSelfUrlRegex = /^\s*(data:|#)/i;
-async function extractMetadataFromHtml(htmlSource) {
+function hasHydrationDirective(attrs = {}) {
+  return Object.keys(attrs).some((attr) => attr === HYDRATE_DIRECTIVE);
+}
+async function extractMetadataFromHtml(htmlSource, viewMetadata) {
+  const {customElements, assetReferences, serverData} = viewMetadata;
   return new Promise((resolve, reject) => {
-    const customElements = [];
     const openElements = new Set();
-    const assetReferences = [];
     const parser = new import_parse5_sax_parser.default({sourceCodeLocationInfo: true});
     const ceRefStack = [];
+    let nestedIslands = false;
     parser.on("startTag", ({
       tagName,
       attrs,
@@ -75,23 +78,23 @@ async function extractMetadataFromHtml(htmlSource) {
     }) => {
       if (tagName.includes("-") && !openElements.has(tagName)) {
         const {startOffset, endOffset} = sourceCodeLocation;
-        const ceRef = {
-          tagName,
-          location: {startOffset, endOffset},
-          props: attrs.length ? attrs.reduce((obj, {name, value}) => {
-            obj[(0, import_identity.getPropFromAttrName)(name)] = value === "" ? "true" : value;
-            return obj;
-          }, {}) : void 0
-        };
+        const props = attrs.length ? attrs.reduce((obj, {name, value}) => {
+          obj[(0, import_identity.getPropFromAttrName)(name)] = value === "" ? "true" : value;
+          return obj;
+        }, {}) : void 0;
+        const ceRef = {tagName, location: {startOffset, endOffset}, props};
         openElements.add(tagName);
         if (ceRefStack.length) {
           const last = ceRefStack[ceRefStack.length - 1];
           last.children = last.children ? [...last.children, ceRef] : [ceRef];
-          ceRefStack.push(ceRef);
+          if (hasHydrationDirective(props)) {
+            customElements.push(ceRef);
+            nestedIslands = true;
+          }
         } else {
           customElements.push(ceRef);
-          ceRefStack.push(ceRef);
         }
+        ceRefStack.push(ceRef);
       }
       if ((tagName === "img" || tagName === "script") && sourceCodeLocation.attrs) {
         if (sourceCodeLocation.attrs.src) {
@@ -118,7 +121,11 @@ async function extractMetadataFromHtml(htmlSource) {
       }
     });
     const inputStream = import_stream.Readable.from(htmlSource);
-    inputStream.on("end", () => resolve({customElements, assetReferences}));
+    inputStream.on("end", () => resolve({
+      customElements: customElements.filter((ce) => !nestedIslands || hasHydrationDirective(ce.props)),
+      assetReferences,
+      serverData
+    }));
     inputStream.on("error", (error) => reject(error));
     inputStream.pipe(parser);
   });

package/build/cjs/identity.cjs

@@ -47,6 +47,7 @@ __export(exports, {
   isAssetSourceExternal: () => isAssetSourceExternal,
   isBundleDefinition: () => isBundleDefinition,
   isExternalUrl: () => isExternalUrl,
+  isSpecifier: () => isSpecifier,
   kebabCaseToModuleSpecifier: () => kebabCaseToModuleSpecifier,
   moduleSpecifierToKebabCase: () => moduleSpecifierToKebabCase,
   normalizeVersionFromUri: () => normalizeVersionFromUri,
@@ -132,6 +133,9 @@ async function getVersionedModuleId(rawSpecifier, moduleRegistry, runtimeParams)
   const moduleEntry = await moduleRegistry.getModuleEntry(moduleId, runtimeParams);
   return {...moduleId, version: moduleEntry.version};
 }
+function isSpecifier(specifier) {
+  return !!specifier && /^@?[\w-]+(\/[\w-]+)*$/.test(specifier);
+}
 var RE_SCOPED = /^(@[^/]+\/[^/@]+)(?:\/([^@]+))?(?:@([\s\S]+))?/;
 var RE_NORMAL = /^([^/@]+)(?:\/([^@]+))?(?:@([\s\S]+))?/;
 function parsePackageSpecifier(specifier) {

package/build/cjs/localization.cjs

@@ -1,54 +1,16 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {get: all[name], enumerable: true});
 };
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
 
 // packages/@lwrjs/shared-utils/src/localization.ts
 __markAsModule(exports);
 __export(exports, {
-  hasCountryCode: () => hasCountryCode,
-  stripCountryCode: () => stripCountryCode
+  getFallbackLocale: () => getFallbackLocale
 });
-var import_logger = __toModule(require("./logger.cjs"));
-function hasCountryCode(locale) {
-  try {
-    const parsedLocale = new Intl.Locale(resolveLocaleId(locale));
-    return typeof parsedLocale.region === "string";
-  } catch (error) {
-    import_logger.logger.debug(`[static-util] Failed to parse country code from locale: ${locale}`, error);
-    return false;
-  }
-}
-function stripCountryCode(locale) {
-  try {
-    const parsedLocale = new Intl.Locale(resolveLocaleId(locale));
-    return parsedLocale.language;
-  } catch (error) {
-    import_logger.logger.debug(`[static-util] Failed to strip country code from locale: ${locale}`, error);
-  }
-}
-function resolveLocaleId(locale) {
-  const asLocalObj = locale;
-  if (asLocalObj.id !== void 0) {
-    return asLocalObj.id;
-  }
-  return locale;
+function getFallbackLocale(localeId, i18n) {
+  const locale = i18n.locales.find((l) => l.id === localeId);
+  return locale?.fallback;
 }

package/build/cjs/object.cjs

@@ -23,7 +23,10 @@ function _deepFreeze(obj, maxDepth, depth) {
   }
 }
 function deepFreeze(obj, maxDepth = 5) {
-  const objClone = JSON.parse(JSON.stringify(obj));
+  let objClone = obj;
+  if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION !== "true") {
+    objClone = JSON.parse(JSON.stringify(obj));
+  }
   return _deepFreeze(objClone, maxDepth, 0);
 }
 var debounce = (func, waitFor) => {

package/build/es/env.js

@@ -20,6 +20,11 @@ export function getFeatureFlags() {
             process.env.SSR_STATIC_BUNDLES.toLowerCase() === 'true'
             ? true
             : false,
+        // Islands fallback to CSR if SSR fails
+        SSR_WITH_CSR_FALLBACK: process.env.SSR_WITH_CSR_FALLBACK !== undefined &&
+            process.env.SSR_WITH_CSR_FALLBACK.toLowerCase() === 'true'
+            ? true
+            : false,
         // AMD Module Bundles include un-versioned aliases
         EXPERIMENTAL_UNVERSIONED_ALIASES: process.env.EXPERIMENTAL_UNVERSIONED_ALIASES !== undefined &&
             process.env.EXPERIMENTAL_UNVERSIONED_ALIASES.toLowerCase() === 'true'

package/build/es/fs.d.ts

@@ -21,10 +21,10 @@ export declare function resolveFileExtension(filePath: string): string;
 /**
  * Returns if view of specific type can be resolved
  *
- * @param source - path to view
+ * @param source - possible path to view
  * @param type - extension of file that should be expected, i.e. 'html'
  */
-export declare function canResolveView(source: string, type: string): boolean;
+export declare function canResolveView(source: unknown, type: string): boolean;
 /**
  * Construct a ViewSource from the associated file on the fs
  * @param source - Filepath with the source (source can be an absolute or relative path)

package/build/es/fs.js

@@ -57,10 +57,13 @@ export function resolveFileExtension(filePath) {
 /**
  * Returns if view of specific type can be resolved
  *
- * @param source - path to view
+ * @param source - possible path to view
  * @param type - extension of file that should be expected, i.e. 'html'
  */
 export function canResolveView(source, type) {
+    if (typeof source !== 'string') {
+        return false;
+    }
     if (!source.endsWith(`.${type}`)) {
         return false;
     }

package/build/es/html-meta.d.ts

@@ -5,7 +5,7 @@ export declare function isSelfUrl(url: string): boolean;
  * Pull the custom elements and img tags out of an HTML string, to use as metadata
  * @param htmlSource - An HTML string to parse
  */
-export declare function extractMetadataFromHtml(htmlSource: string): Promise<RenderedViewMetadata>;
+export declare function extractMetadataFromHtml(htmlSource: string, viewMetadata: RenderedViewMetadata): Promise<RenderedViewMetadata>;
 export declare const HYDRATE_DIRECTIVE = "lwr:hydrate";
 export declare const HYDRATE_LOAD_VALUE = "load";
 export declare const HYDRATE_CLIENT_VALUE = "client-only";

package/build/es/html-meta.js

@@ -29,46 +29,51 @@ export function isSelfUrl(url) {
     return !url || !!url.match(isSelfUrlRegex);
 }
 const isSelfUrlRegex = /^\s*(data:|#)/i;
+function hasHydrationDirective(attrs = {}) {
+    return Object.keys(attrs).some((attr) => attr === HYDRATE_DIRECTIVE);
+}
 /**
  * Pull the custom elements and img tags out of an HTML string, to use as metadata
  * @param htmlSource - An HTML string to parse
  */
-export async function extractMetadataFromHtml(htmlSource) {
+export async function extractMetadataFromHtml(htmlSource, viewMetadata) {
+    const { customElements, assetReferences, serverData } = viewMetadata;
     return new Promise((resolve, reject) => {
-        const customElements = [];
         const openElements = new Set();
-        const assetReferences = [];
         const parser = new SAXParser({ sourceCodeLocationInfo: true }); // TODO: Would we need this in the future?
         const ceRefStack = [];
+        let nestedIslands = false;
         parser.on('startTag', ({ tagName, attrs, // attributes are passed into SSR
         sourceCodeLocation, }) => {
             // custom elements
             if (tagName.includes('-') && !openElements.has(tagName)) {
                 const { startOffset, endOffset } = sourceCodeLocation;
-                const ceRef = {
-                    tagName,
-                    location: { startOffset, endOffset },
-                    // transform attributes [{ name: 'some-attr', value: 'the value' }] into properties { someAttr: 'the value' }
-                    // leave props as undefined if there are no attributes
-                    // set boolean attribute values to "true", or lwc will see them as falsy
-                    props: attrs.length
-                        ? attrs.reduce((obj, { name, value }) => {
-                            obj[getPropFromAttrName(name)] = value === '' ? 'true' : value;
-                            return obj;
-                        }, {})
-                        : undefined,
-                };
+                // transform attributes [{ name: 'some-attr', value: 'the value' }] into properties { someAttr: 'the value' }
+                // leave props as undefined if there are no attributes
+                // set boolean attribute values to "true", or lwc will see them as falsy
+                const props = attrs.length
+                    ? attrs.reduce((obj, { name, value }) => {
+                        obj[getPropFromAttrName(name)] = value === '' ? 'true' : value;
+                        return obj;
+                    }, {})
+                    : undefined;
+                const ceRef = { tagName, location: { startOffset, endOffset }, props };
                 openElements.add(tagName);
                 if (ceRefStack.length) {
                     // nested CE
                     const last = ceRefStack[ceRefStack.length - 1];
                     last.children = last.children ? [...last.children, ceRef] : [ceRef];
-                    ceRefStack.push(ceRef);
+                    // nested CEs are collected if they have a hydration directive
+                    if (hasHydrationDirective(props)) {
+                        customElements.push(ceRef);
+                        nestedIslands = true;
+                    }
                 }
                 else {
+                    // collect all top-level CEs
                     customElements.push(ceRef);
-                    ceRefStack.push(ceRef);
                 }
+                ceRefStack.push(ceRef);
             }
             // <img src="asset-url"/>
             // <script type="text/javascript" src="asset-url"></script>
@@ -99,8 +104,13 @@ export async function extractMetadataFromHtml(htmlSource) {
             }
         });
         const inputStream = Readable.from(htmlSource);
-        // dedupe custom element references
-        inputStream.on('end', () => resolve({ customElements, assetReferences }));
+        // 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({
+            customElements: customElements.filter((ce) => !nestedIslands || hasHydrationDirective(ce.props)),
+            assetReferences,
+            serverData,
+        }));
         inputStream.on('error', (error) => reject(error));
         inputStream.pipe(parser);
     });

package/build/es/identity.d.ts

@@ -82,6 +82,7 @@ interface VersionedAbstractModuleId extends AbstractModuleId {
  * @example - 'c/form/v/0_0_2' => {specifier: "c/form", version: "0.0.2"}
  */
 export declare function getVersionedModuleId(rawSpecifier: string, moduleRegistry: PublicModuleRegistry, runtimeParams: RuntimeParams): Promise<VersionedAbstractModuleId>;
+export declare function isSpecifier(specifier?: string): boolean;
 interface PackageIdentity {
     scope?: string;
     packageName: string;

package/build/es/identity.js

@@ -129,6 +129,9 @@ export async function getVersionedModuleId(rawSpecifier, moduleRegistry, runtime
     const moduleEntry = await moduleRegistry.getModuleEntry(moduleId, runtimeParams);
     return { ...moduleId, version: moduleEntry.version };
 }
+export function isSpecifier(specifier) {
+    return !!specifier && /^@?[\w-]+(\/[\w-]+)*$/.test(specifier);
+}
 const RE_SCOPED = /^(@[^/]+\/[^/@]+)(?:\/([^@]+))?(?:@([\s\S]+))?/;
 const RE_NORMAL = /^([^/@]+)(?:\/([^@]+))?(?:@([\s\S]+))?/;
 /**

package/build/es/localization.d.ts

@@ -1,4 +1,3 @@
-import type { Locale } from '@lwrjs/types';
-export declare function hasCountryCode(locale: Locale | string): boolean;
-export declare function stripCountryCode(locale: Locale | string): string | undefined;
+import type { I18NConfig } from '@lwrjs/types';
+export declare function getFallbackLocale(localeId: string, i18n: I18NConfig): string | undefined;
 //# sourceMappingURL=localization.d.ts.map

package/build/es/localization.js

@@ -1,29 +1,6 @@
-import { logger } from './logger.js';
 // Utilities for working with localized content
-export function hasCountryCode(locale) {
-    try {
-        const parsedLocale = new Intl.Locale(resolveLocaleId(locale));
-        return typeof parsedLocale.region === 'string';
-    }
-    catch (error) {
-        logger.debug(`[static-util] Failed to parse country code from locale: ${locale}`, error);
-        return false; // Invalid locale format
-    }
-}
-export function stripCountryCode(locale) {
-    try {
-        const parsedLocale = new Intl.Locale(resolveLocaleId(locale));
-        return parsedLocale.language;
-    }
-    catch (error) {
-        logger.debug(`[static-util] Failed to strip country code from locale: ${locale}`, error);
-    }
-}
-function resolveLocaleId(locale) {
-    const asLocalObj = locale;
-    if (asLocalObj.id !== undefined) {
-        return asLocalObj.id;
-    }
-    return locale;
+export function getFallbackLocale(localeId, i18n) {
+    const locale = i18n.locales.find((l) => l.id === localeId);
+    return locale?.fallback;
 }
 //# sourceMappingURL=localization.js.map

package/build/es/object.js

@@ -18,7 +18,12 @@ function _deepFreeze(obj, maxDepth, depth) {
  */
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
 export function deepFreeze(obj, maxDepth = 5) {
-    const objClone = JSON.parse(JSON.stringify(obj));
+    let objClone = obj;
+    // Temporary fix for W-13723739 to prevent out of memory exceptions
+    // Only clone the object if we don't have the env variable set
+    if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION !== 'true') {
+        objClone = JSON.parse(JSON.stringify(obj));
+    }
     return _deepFreeze(objClone, maxDepth, 0);
 }
 /**

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.4",
+    "version": "0.11.0-alpha.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -61,13 +61,13 @@
         "rollup": "^2.78.0"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.11.0-alpha.4",
-        "@lwrjs/types": "0.11.0-alpha.4",
+        "@lwrjs/diagnostics": "0.11.0-alpha.6",
+        "@lwrjs/types": "0.11.0-alpha.6",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "89a7e9815e0e381d9fd67212f0471d9a11f73985"
+    "gitHead": "571d4bac5650765aa818bcb9d5ed752a8cf041af"
 }