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

package/build/cjs/bundle.cjs

@@ -0,0 +1,37 @@
+var __defProp = Object.defineProperty;
+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});
+};
+
+// packages/@lwrjs/shared-utils/src/bundle.ts
+__markAsModule(exports);
+__export(exports, {
+  createAmdAlias: () => createAmdAlias,
+  getGroupName: () => getGroupName,
+  isGroupie: () => isGroupie
+});
+function getGroupName(rawSpecifier, groupsConfig) {
+  for (const [groupName, groupies] of Object.entries(groupsConfig)) {
+    if (groupies.indexOf(rawSpecifier) >= 0) {
+      return groupName;
+    }
+  }
+}
+function isGroupie(rawSpecifier, groupsConfig) {
+  for (const groupies of Object.values(groupsConfig)) {
+    if (groupies.indexOf(rawSpecifier) >= 0) {
+      return true;
+    }
+  }
+  return false;
+}
+function createAmdAlias(aliasSpecifier, originalSpecifier) {
+  const builder = [];
+  builder.push(`LWR.define('${aliasSpecifier}',['exports','${originalSpecifier}'],function(e,m){`);
+  builder.push(`e.default=m&&'object'==typeof m&&'default'in m?m.default:m;`);
+  builder.push(`Object.keys(m).forEach(function(n){'default'===n||e.hasOwnProperty(n)||Object.defineProperty(e,n,{enumerable:!0,get:function(){return m[n]}})});`);
+  builder.push("});");
+  return builder.join("");
+}

package/build/cjs/env.cjs

@@ -12,9 +12,10 @@ __export(exports, {
 });
 function getFeatureFlags() {
   return {
+    ASSETS_ON_LAMBDA: process.env.ASSETS_ON_LAMBDA !== void 0 && process.env.ASSETS_ON_LAMBDA.toLowerCase() === "true" ? true : false,
     LEGACY_LOADER: process.env.LEGACY_LOADER !== void 0 && process.env.LEGACY_LOADER.toLowerCase() === "true" ? true : false,
-    SSR_STATIC_BUNDLES: process.env.SSR_STATIC_BUNDLES !== void 0 && process.env.SSR_STATIC_BUNDLES.toLowerCase() === "true" ? true : false,
     SSR_SANDBOX_WORKER: process.env.SSR_SANDBOX_WORKER !== void 0 && process.env.SSR_SANDBOX_WORKER.toLowerCase() === "true" ? true : false,
-    ASSETS_ON_LAMBDA: process.env.ASSETS_ON_LAMBDA !== void 0 && process.env.ASSETS_ON_LAMBDA.toLowerCase() === "true" ? true : false
+    SSR_STATIC_BUNDLES: process.env.SSR_STATIC_BUNDLES !== void 0 && process.env.SSR_STATIC_BUNDLES.toLowerCase() === "true" ? true : false,
+    EXPERIMENTAL_UNVERSIONED_ALIASES: process.env.EXPERIMENTAL_UNVERSIONED_ALIASES !== void 0 && process.env.EXPERIMENTAL_UNVERSIONED_ALIASES.toLowerCase() === "true" ? true : false
   };
 }

package/build/cjs/html-meta.cjs

@@ -24,7 +24,13 @@ var __toModule = (module2) => {
 // packages/@lwrjs/shared-utils/src/html-meta.ts
 __markAsModule(exports);
 __export(exports, {
+  HYDRATE_CLIENT_VALUE: () => HYDRATE_CLIENT_VALUE,
+  HYDRATE_DIRECTIVE: () => HYDRATE_DIRECTIVE,
+  HYDRATE_LOAD_VALUE: () => HYDRATE_LOAD_VALUE,
   extractMetadataFromHtml: () => extractMetadataFromHtml,
+  getHydrateDirective: () => getHydrateDirective,
+  isCsrIsland: () => isCsrIsland,
+  isHydrateOnLoad: () => isHydrateOnLoad,
   isRelative: () => isRelative,
   isSelfUrl: () => isSelfUrl
 });
@@ -117,3 +123,19 @@ async function extractMetadataFromHtml(htmlSource) {
     inputStream.pipe(parser);
   });
 }
+var HYDRATE_DIRECTIVE = "lwr:hydrate";
+var HYDRATE_LOAD_VALUE = "load";
+var HYDRATE_CLIENT_VALUE = "client-only";
+var HYDRATION_VALUES = [HYDRATE_LOAD_VALUE, HYDRATE_CLIENT_VALUE];
+function getHydrateDirective(props = {}) {
+  const rawValue = props[HYDRATE_DIRECTIVE];
+  const value = rawValue === "true" ? HYDRATE_LOAD_VALUE : rawValue;
+  if (HYDRATION_VALUES.includes(value))
+    return value;
+}
+function isHydrateOnLoad(props = {}) {
+  return getHydrateDirective(props) === HYDRATE_LOAD_VALUE;
+}
+function isCsrIsland(props = {}) {
+  return getHydrateDirective(props) === HYDRATE_CLIENT_VALUE;
+}

package/build/cjs/identity.cjs

@@ -182,11 +182,11 @@ function slugify(name) {
 function getPropFromAttrName(propName) {
   return propName.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
 }
-function getModuleUriPrefix({apiVersion, bundle, format, compat, basePath}, {locale, environment} = {}) {
+function getModuleUriPrefix({apiVersion, bundle, format, compat, basePath}, {locale, environment} = {}, bundleId) {
   const localePart = locale ? `/${LOCALE_SIGIL}/${locale}` : "";
   const environmentPart = environment ? `/${ENVIRONMENT_SIGIL}/${environment}` : "";
   if (bundle) {
-    return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/${BUNDLE_SIGIL}/0/module/mi/`;
+    return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/${BUNDLE_SIGIL}/${bundleId || "0"}/module/mi/`;
   } else {
     return `${basePath}/${apiVersion}/module/${format}/${compat}${localePart}${environmentPart}/mi/`;
   }

package/build/cjs/import-metadata.cjs

@@ -28,6 +28,8 @@ __export(exports, {
   getImportMetadata: () => getImportMetadata
 });
 var import_es_module_lexer = __toModule(require("es-module-lexer"));
+var import_logger = __toModule(require("./logger.cjs"));
+var IMPORT_META_REGEX = /^import\.meta(\.\w+)+/;
 var ModuleNameType;
 (function(ModuleNameType2) {
   ModuleNameType2["string"] = "string";
@@ -36,11 +38,13 @@ var ModuleNameType;
 async function getImportMetadata(compiledSource) {
   const imports = [];
   const dynamicImports = [];
+  const importMeta = [];
   const [moduleImportLocations] = await (0, import_es_module_lexer.parse)(compiledSource);
   for (const moduleImportLocation of moduleImportLocations) {
     let moduleSpecifier = compiledSource.substring(moduleImportLocation.s, moduleImportLocation.e);
     const isStatic = moduleImportLocation.d === -1;
     const isDynamic = moduleImportLocation.d > -1;
+    const isMeta = moduleImportLocation.d === -2;
     const location = {
       startColumn: moduleImportLocation.s,
       endColumn: moduleImportLocation.e
@@ -49,21 +53,38 @@ async function getImportMetadata(compiledSource) {
       const isStringLiteral = moduleSpecifier.startsWith("'") || moduleSpecifier.startsWith('"');
       const moduleNameType = isStringLiteral ? ModuleNameType.string : ModuleNameType.unresolved;
       moduleSpecifier = isStringLiteral ? moduleSpecifier.slice(1, -1) : moduleSpecifier;
+      if (import_logger.logger.currentLevel === import_logger.DEBUG || import_logger.logger.currentLevel === import_logger.VERBOSE) {
+        import_logger.logger.debug(`[import-metadata] Import from dynamic import ${compiledSource.slice(moduleImportLocation.ss, moduleImportLocation.se)} -> ${compiledSource.slice(moduleImportLocation.ss, moduleImportLocation.s)}`);
+      }
       dynamicImports.push({
         moduleSpecifier,
         moduleNameType,
         location,
         importLocation: {
-          startColumn: moduleImportLocation.d,
+          startColumn: moduleImportLocation.ss,
           endColumn: moduleImportLocation.s
         }
       });
     } else if (isStatic) {
       imports.push({moduleSpecifier, location});
+    } else if (isMeta) {
+      const metaMatch = IMPORT_META_REGEX.exec(compiledSource.substring(moduleImportLocation.s));
+      if (metaMatch) {
+        const statement = metaMatch[0];
+        const extraLength = statement.length - 11;
+        importMeta.push({
+          statement,
+          location: {
+            startColumn: moduleImportLocation.s,
+            endColumn: moduleImportLocation.e + extraLength
+          }
+        });
+      }
     }
   }
   return {
     imports,
-    dynamicImports
+    dynamicImports,
+    importMeta
   };
 }

package/build/cjs/index.cjs

@@ -34,3 +34,4 @@ __exportStar(exports, __toModule(require("./urls.cjs")));
 __exportStar(exports, __toModule(require("./env.cjs")));
 __exportStar(exports, __toModule(require("./logger.cjs")));
 __exportStar(exports, __toModule(require("./lwr-app-observer.cjs")));
+__exportStar(exports, __toModule(require("./bundle.cjs")));

package/build/es/bundle.d.ts

@@ -0,0 +1,16 @@
+import type { BundleGroups } from '@lwrjs/types';
+export declare function getGroupName(rawSpecifier: string, groupsConfig: BundleGroups): string | undefined;
+export declare function isGroupie(rawSpecifier: string, groupsConfig: BundleGroups): boolean;
+/**
+ * Create an AMD Alias to another AMD module
+ *
+ * In the spirit of...
+ * LWR.define('alias', 'og', og=>og);
+ *
+ * But if OG has a default it is exposed as exports.default
+ *
+ * All enumerable properties of og are exposed as enumerable properties of exports.
+ *
+ */
+export declare function createAmdAlias(aliasSpecifier: string, originalSpecifier: string): string;
+//# sourceMappingURL=bundle.d.ts.map

package/build/es/bundle.js

@@ -0,0 +1,39 @@
+export function getGroupName(rawSpecifier, groupsConfig) {
+    for (const [groupName, groupies] of Object.entries(groupsConfig)) {
+        if (groupies.indexOf(rawSpecifier) >= 0) {
+            return groupName;
+        }
+    }
+}
+export function isGroupie(rawSpecifier, groupsConfig) {
+    for (const groupies of Object.values(groupsConfig)) {
+        if (groupies.indexOf(rawSpecifier) >= 0) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Create an AMD Alias to another AMD module
+ *
+ * In the spirit of...
+ * LWR.define('alias', 'og', og=>og);
+ *
+ * But if OG has a default it is exposed as exports.default
+ *
+ * All enumerable properties of og are exposed as enumerable properties of exports.
+ *
+ */
+export function createAmdAlias(aliasSpecifier, originalSpecifier) {
+    const builder = [];
+    // Define statement
+    builder.push(`LWR.define('${aliasSpecifier}',['exports','${originalSpecifier}'],function(e,m){`);
+    // un-wrap default
+    builder.push(`e.default=m&&'object'==typeof m&&'default'in m?m.default:m;`);
+    // Expose enumerable properties
+    builder.push(`Object.keys(m).forEach(function(n){'default'===n||e.hasOwnProperty(n)||Object.defineProperty(e,n,{enumerable:!0,get:function(){return m[n]}})});`);
+    // End the define
+    builder.push('});');
+    return builder.join('');
+}
+//# sourceMappingURL=bundle.js.map

package/build/es/env.js

@@ -1,13 +1,13 @@
 export function getFeatureFlags() {
     // Add any new feature flags here to parse from environment variables
     return {
-        // DEFAULT LEGACY_LOADER = false;
-        LEGACY_LOADER: process.env.LEGACY_LOADER !== undefined && process.env.LEGACY_LOADER.toLowerCase() === 'true'
+        // Should we load load the assets from the lambda on MRT
+        ASSETS_ON_LAMBDA: process.env.ASSETS_ON_LAMBDA !== undefined &&
+            process.env.ASSETS_ON_LAMBDA.toLowerCase() === 'true'
             ? true
             : false,
-        // SSR should concatenate bundles, default = false
-        SSR_STATIC_BUNDLES: process.env.SSR_STATIC_BUNDLES !== undefined &&
-            process.env.SSR_STATIC_BUNDLES.toLowerCase() === 'true'
+        // DEFAULT LEGACY_LOADER = false;
+        LEGACY_LOADER: process.env.LEGACY_LOADER !== undefined && process.env.LEGACY_LOADER.toLowerCase() === 'true'
             ? true
             : false,
         // Should we use a js worker for SSR, sand-boxing = false (use locker for ssr sand-boxing)
@@ -15,9 +15,14 @@ export function getFeatureFlags() {
             process.env.SSR_SANDBOX_WORKER.toLowerCase() === 'true'
             ? true
             : false,
-        // Should we load load the assets from the lambda on MRT
-        ASSETS_ON_LAMBDA: process.env.ASSETS_ON_LAMBDA !== undefined &&
-            process.env.ASSETS_ON_LAMBDA.toLowerCase() === 'true'
+        // SSR should concatenate bundles, default = false
+        SSR_STATIC_BUNDLES: process.env.SSR_STATIC_BUNDLES !== undefined &&
+            process.env.SSR_STATIC_BUNDLES.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'
             ? true
             : false,
     };

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

@@ -6,4 +6,10 @@ export declare function isSelfUrl(url: string): boolean;
  * @param htmlSource - An HTML string to parse
  */
 export declare function extractMetadataFromHtml(htmlSource: string): Promise<RenderedViewMetadata>;
+export declare const HYDRATE_DIRECTIVE = "lwr:hydrate";
+export declare const HYDRATE_LOAD_VALUE = "load";
+export declare const HYDRATE_CLIENT_VALUE = "client-only";
+export declare function getHydrateDirective(props?: Record<string, string>): string | undefined;
+export declare function isHydrateOnLoad(props?: {}): boolean;
+export declare function isCsrIsland(props?: {}): boolean;
 //# sourceMappingURL=html-meta.d.ts.map

package/build/es/html-meta.js

@@ -105,4 +105,20 @@ export async function extractMetadataFromHtml(htmlSource) {
         inputStream.pipe(parser);
     });
 }
+export const HYDRATE_DIRECTIVE = 'lwr:hydrate';
+export const HYDRATE_LOAD_VALUE = 'load';
+export const HYDRATE_CLIENT_VALUE = 'client-only';
+const HYDRATION_VALUES = [HYDRATE_LOAD_VALUE, HYDRATE_CLIENT_VALUE];
+export function getHydrateDirective(props = {}) {
+    const rawValue = props[HYDRATE_DIRECTIVE];
+    const value = rawValue === 'true' ? HYDRATE_LOAD_VALUE : rawValue; // valueless hyration directives => lwr:hydrate="load"
+    if (HYDRATION_VALUES.includes(value))
+        return value;
+}
+export function isHydrateOnLoad(props = {}) {
+    return getHydrateDirective(props) === HYDRATE_LOAD_VALUE;
+}
+export function isCsrIsland(props = {}) {
+    return getHydrateDirective(props) === HYDRATE_CLIENT_VALUE;
+}
 //# sourceMappingURL=html-meta.js.map

package/build/es/identity.d.ts

@@ -129,7 +129,7 @@ export declare function getPropFromAttrName(propName: string): string;
  * @param param0 - URI props from the Runtime Environment
  * @param param1 - URI props from the Runtime Params
  */
-export declare function getModuleUriPrefix({ apiVersion, bundle, format, compat, basePath }: RuntimeEnvironment, { locale, environment }?: RuntimeParams): string;
+export declare function getModuleUriPrefix({ apiVersion, bundle, format, compat, basePath }: RuntimeEnvironment, { locale, environment }?: RuntimeParams, bundleId?: string): string;
 /**
  * Create a URI Mapping API URI prefix, stopping where the specifiers would be (at "mp/")
  * @param param0 - URI props from the Runtime Environment

package/build/es/identity.js

@@ -221,11 +221,11 @@ export function getPropFromAttrName(propName) {
  * @param param0 - URI props from the Runtime Environment
  * @param param1 - URI props from the Runtime Params
  */
-export function getModuleUriPrefix({ apiVersion, bundle, format, compat, basePath }, { locale, environment } = {}) {
+export function getModuleUriPrefix({ apiVersion, bundle, format, compat, basePath }, { locale, environment } = {}, bundleId) {
     const localePart = locale ? `/${LOCALE_SIGIL}/${locale}` : '';
     const environmentPart = environment ? `/${ENVIRONMENT_SIGIL}/${environment}` : '';
     if (bundle) {
-        return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/${BUNDLE_SIGIL}/0/module/mi/`;
+        return `${basePath}/${apiVersion}/bundle/${format}${localePart}${environmentPart}/${BUNDLE_SIGIL}/${bundleId || '0'}/module/mi/`;
     }
     else {
         return `${basePath}/${apiVersion}/module/${format}/${compat}${localePart}${environmentPart}/mi/`;

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

@@ -1,4 +1,4 @@
-import { CompiledMetadata } from '@lwrjs/types';
+import type { CompiledMetadata } from '@lwrjs/types';
 export declare enum ModuleNameType {
     string = "string",
     unresolved = "unresolved"

package/build/es/import-metadata.js

@@ -1,4 +1,6 @@
 import { parse as parseImports } from 'es-module-lexer';
+import { DEBUG, logger, VERBOSE } from './logger.js';
+const IMPORT_META_REGEX = /^import\.meta(\.\w+)+/;
 export var ModuleNameType;
 (function (ModuleNameType) {
     ModuleNameType["string"] = "string";
@@ -7,6 +9,7 @@ export var ModuleNameType;
 export async function getImportMetadata(compiledSource) {
     const imports = [];
     const dynamicImports = [];
+    const importMeta = [];
     // Use very fast parser to get the location of the imports/exports
     const [moduleImportLocations] = await parseImports(compiledSource);
     for (const moduleImportLocation of moduleImportLocations) {
@@ -14,6 +17,7 @@ export async function getImportMetadata(compiledSource) {
         let moduleSpecifier = compiledSource.substring(moduleImportLocation.s, moduleImportLocation.e);
         const isStatic = moduleImportLocation.d === -1;
         const isDynamic = moduleImportLocation.d > -1;
+        const isMeta = moduleImportLocation.d === -2;
         const location = {
             startColumn: moduleImportLocation.s,
             endColumn: moduleImportLocation.e,
@@ -22,12 +26,16 @@ export async function getImportMetadata(compiledSource) {
             const isStringLiteral = moduleSpecifier.startsWith("'") || moduleSpecifier.startsWith('"');
             const moduleNameType = isStringLiteral ? ModuleNameType.string : ModuleNameType.unresolved;
             moduleSpecifier = isStringLiteral ? moduleSpecifier.slice(1, -1) : moduleSpecifier; // remove quotes
+            // Expecting: import(rootSpecifier) -> import(
+            if (logger.currentLevel === DEBUG || logger.currentLevel === VERBOSE) {
+                logger.debug(`[import-metadata] Import from dynamic import ${compiledSource.slice(moduleImportLocation.ss, moduleImportLocation.se)} -> ${compiledSource.slice(moduleImportLocation.ss, moduleImportLocation.s)}`);
+            }
             dynamicImports.push({
                 moduleSpecifier,
                 moduleNameType,
                 location,
                 importLocation: {
-                    startColumn: moduleImportLocation.d,
+                    startColumn: moduleImportLocation.ss,
                     endColumn: moduleImportLocation.s,
                 },
             });
@@ -35,10 +43,27 @@ export async function getImportMetadata(compiledSource) {
         else if (isStatic) {
             imports.push({ moduleSpecifier, location });
         }
+        else if (isMeta) {
+            // moduleImportLocation.s => moduleImportLocation.e only captures "import.meta"
+            // this regex will capture the entire statement, eg: `import.meta.env.SSR"
+            const metaMatch = IMPORT_META_REGEX.exec(compiledSource.substring(moduleImportLocation.s));
+            if (metaMatch) {
+                const statement = metaMatch[0];
+                const extraLength = statement.length - 11; // to include meta property, eg: ".env.SSR"
+                importMeta.push({
+                    statement,
+                    location: {
+                        startColumn: moduleImportLocation.s,
+                        endColumn: moduleImportLocation.e + extraLength,
+                    },
+                });
+            }
+        }
     }
     return {
         imports,
         dynamicImports,
+        importMeta,
     };
 }
 //# sourceMappingURL=import-metadata.js.map

package/build/es/index.d.ts

@@ -13,4 +13,5 @@ export * from './urls.js';
 export * from './env.js';
 export * from './logger.js';
 export * from './lwr-app-observer.js';
+export * from './bundle.js';
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -13,4 +13,5 @@ export * from './urls.js';
 export * from './env.js';
 export * from './logger.js';
 export * from './lwr-app-observer.js';
+export * from './bundle.js';
 //# sourceMappingURL=index.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.10.0-alpha.13",
+    "version": "0.10.0-alpha.15",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -45,7 +45,7 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "es-module-lexer": "^0.3.18",
+        "es-module-lexer": "^1.2.1",
         "fast-json-stable-stringify": "^2.1.0",
         "magic-string": "^0.30.0",
         "mime-types": "^2.1.33",
@@ -62,13 +62,13 @@
         "rollup": "^2.78.0"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.10.0-alpha.13",
-        "@lwrjs/types": "0.10.0-alpha.13",
+        "@lwrjs/diagnostics": "0.10.0-alpha.15",
+        "@lwrjs/types": "0.10.0-alpha.15",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=16.0.0 <20"
     },
-    "gitHead": "f6d142d5a027554cb1685389e0b173734149683d"
+    "gitHead": "70557f63a46167c40cf1415f12af69f78ae402d6"
 }