@lwrjs/shared-utils 0.9.0-alpha.26 → 0.9.0-alpha.27

package/build/cjs/env.cjs

@@ -14,6 +14,7 @@ function getFeatureFlags() {
   return {
     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
+    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
   };
 }

package/build/cjs/fs.cjs

@@ -28,6 +28,7 @@ __export(exports, {
   getViewSourceFromFile: () => getViewSourceFromFile,
   hashContent: () => hashContent,
   mimeLookup: () => import_mime_types.lookup,
+  normalizeAssetSpecifier: () => normalizeAssetSpecifier,
   normalizeDirectory: () => normalizeDirectory,
   normalizeResourcePath: () => normalizeResourcePath,
   readFile: () => readFile,
@@ -126,3 +127,26 @@ function logMetrics(filePath) {
     }
   }
 }
+function normalizeAssetSpecifier(assetId, assetPathMap, resourcePaths, basePath) {
+  const {specifier, importer, type} = assetId;
+  if (specifier.startsWith("./") || specifier.startsWith("../")) {
+    if (!importer) {
+      throw Error(`Unable to resolve relative import "${specifier}" without an importer.`);
+    }
+    return import_path.default.join(import_path.default.dirname(importer), specifier);
+  }
+  if (type === "content-asset") {
+    const originSpecifier = !basePath ? specifier : specifier.split(basePath)[1];
+    return import_path.default.join(resourcePaths.contentDir, originSpecifier);
+  }
+  if (specifier[0] === "$") {
+    return normalizeResourcePath(specifier, resourcePaths);
+  }
+  for (const [urlPath, fsPath] of assetPathMap.entries()) {
+    const slashPath = urlPath.endsWith("/") ? urlPath : `${urlPath}/`;
+    if (specifier.startsWith(slashPath) || specifier === urlPath) {
+      return specifier.replace(urlPath, fsPath);
+    }
+  }
+  return specifier;
+}

package/build/cjs/identity.cjs

@@ -43,9 +43,10 @@ __export(exports, {
   getPropFromAttrName: () => getPropFromAttrName,
   getSpecifier: () => getSpecifier,
   getVersionedModuleId: () => getVersionedModuleId,
+  isAssetSourceExternal: () => isAssetSourceExternal,
   isBundleDefinition: () => isBundleDefinition,
   isExternalUrl: () => isExternalUrl,
-  kebabCaseToModuleSpecifer: () => kebabCaseToModuleSpecifer,
+  kebabCaseToModuleSpecifier: () => kebabCaseToModuleSpecifier,
   moduleSpecifierToKebabCase: () => moduleSpecifierToKebabCase,
   normalizeVersionFromUri: () => normalizeVersionFromUri,
   normalizeVersionToUri: () => normalizeVersionToUri,
@@ -148,7 +149,7 @@ function parsePackageSpecifier(specifier) {
     subResource: matched[2] || ""
   };
 }
-function kebabCaseToModuleSpecifer(name) {
+function kebabCaseToModuleSpecifier(name) {
   const newName = [];
   let nsFound = false;
   let upper = false;
@@ -197,6 +198,9 @@ var REGEX_URL_SCHEMA_PREFIX = /^(https?|\/\/)/;
 function isExternalUrl(url) {
   return REGEX_URL_SCHEMA_PREFIX.test(url);
 }
+function isAssetSourceExternal(assetSource) {
+  return assetSource.type === "external" || !!assetSource.uri && isExternalUrl(assetSource.uri);
+}
 function isBundleDefinition(definition) {
   return definition.bundleRecord !== void 0;
 }

package/build/cjs/site-metadata.cjs

@@ -54,15 +54,20 @@ var SiteMetadataImpl = class {
   }
   async persistSiteMetadata() {
     const siteMetadataPath = import_path.default.join(this.options.rootDir, SITE_METADATA_PATH);
-    if (!await import_fs_extra.default.pathExists(siteMetadataPath)) {
-      await import_fs_extra.default.mkdir(siteMetadataPath, {recursive: true});
+    try {
+      if (!await import_fs_extra.default.pathExists(siteMetadataPath)) {
+        await import_fs_extra.default.mkdir(siteMetadataPath, {recursive: true});
+      }
+      const bundleMetadataPath = import_path.default.join(this.options.rootDir, STATIC_BUNDLE_METADATA_PATH);
+      await import_fs_extra.default.writeJSON(bundleMetadataPath, this.siteBundles, {spaces: 2});
+      const resourceMetadataPath = import_path.default.join(this.options.rootDir, STATIC_RESOURCE_METADATA_PATH);
+      await import_fs_extra.default.writeJSON(resourceMetadataPath, this.siteResources, {spaces: 2});
+      const assetMetadataPath = import_path.default.join(this.options.rootDir, STATIC_ASSET_METADATA_PATH);
+      return import_fs_extra.default.writeJSON(assetMetadataPath, this.siteAssets, {spaces: 2});
+    } catch (err) {
+      console.error(`[SiteMetadata] Failed to save site metadata ${siteMetadataPath}`);
+      console.error(err);
     }
-    const bundleMetadataPath = import_path.default.join(this.options.rootDir, STATIC_BUNDLE_METADATA_PATH);
-    await import_fs_extra.default.writeJSON(bundleMetadataPath, this.siteBundles, {spaces: 2});
-    const resourceMetadataPath = import_path.default.join(this.options.rootDir, STATIC_RESOURCE_METADATA_PATH);
-    await import_fs_extra.default.writeJSON(resourceMetadataPath, this.siteResources, {spaces: 2});
-    const assetMetadataPath = import_path.default.join(this.options.rootDir, STATIC_ASSET_METADATA_PATH);
-    return import_fs_extra.default.writeJSON(assetMetadataPath, this.siteAssets, {spaces: 2});
   }
   readStaticBundleMetadata(staticRoot) {
     let bundleMetadataPath;

package/build/es/env.js

@@ -10,11 +10,16 @@ export function getFeatureFlags() {
             process.env.SSR_STATIC_BUNDLES.toLowerCase() === 'true'
             ? true
             : false,
-        // Should we use a js worker for SSR, sandboxing = false (use locker for ssr sandboxing)
+        // Should we use a js worker for SSR, sand-boxing = false (use locker for ssr sand-boxing)
         SSR_SANDBOX_WORKER: process.env.SSR_SANDBOX_WORKER !== undefined &&
             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'
+            ? true
+            : false,
     };
 }
 //# sourceMappingURL=env.js.map

package/build/es/fs.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { ResourcePaths, ViewSource } from '@lwrjs/types';
+import type { AssetIdentifier, ResourcePaths, ViewSource } from '@lwrjs/types';
 import { lookup } from 'mime-types';
 /**
  * Create a hash string for a source
@@ -32,4 +32,8 @@ export declare function getViewSourceFromFile(source: string): ViewSource;
 export declare function normalizeDirectory(dir: string, rootDir: string): string;
 export declare function normalizeResourcePath(rawPath: string, { rootDir, assets, contentDir, layoutsDir }: ResourcePaths, allowUnresolvedAlias?: boolean): string;
 export { lookup as mimeLookup };
+/**
+ * Tries to convert any URL or $aliased path into a canonical fs path
+ */
+export declare function normalizeAssetSpecifier(assetId: AssetIdentifier, assetPathMap: Map<string, string>, resourcePaths: ResourcePaths, basePath: string): string;
 //# sourceMappingURL=fs.d.ts.map

package/build/es/fs.js

@@ -36,10 +36,10 @@ export function resolveFileExtension(filePath) {
     // No extension, if it exist, it can be a dir or a file
     if (fs.existsSync(filePath)) {
         if (fs.statSync(filePath).isFile()) {
-            return filePath; // extensionless file, which is odd but...
+            return filePath; // extension-less file, which is odd but...
         }
         else {
-            filePath = pathLib.join(filePath, 'index'); // if is a dir we will be tesing the extensions
+            filePath = pathLib.join(filePath, 'index'); // if is a dir we will be testing the extensions
         }
     }
     // At this point we have a file with no extension so we try for the default (js,ts) or fail
@@ -132,4 +132,35 @@ function logMetrics(filePath) {
         }
     }
 }
+/**
+ * Tries to convert any URL or $aliased path into a canonical fs path
+ */
+export function normalizeAssetSpecifier(assetId, assetPathMap, resourcePaths, basePath) {
+    const { specifier, importer, type } = assetId;
+    if (specifier.startsWith('./') || specifier.startsWith('../')) {
+        if (!importer) {
+            throw Error(`Unable to resolve relative import "${specifier}" without an importer.`);
+        }
+        return pathLib.join(pathLib.dirname(importer), specifier);
+    }
+    if (type === 'content-asset') {
+        const originSpecifier = !basePath ? specifier : specifier.split(basePath)[1];
+        return pathLib.join(resourcePaths.contentDir, originSpecifier);
+    }
+    if (specifier[0] === '$') {
+        // This is a fs path containing an asset alias
+        return normalizeResourcePath(specifier, resourcePaths);
+    }
+    // This is an absolute path to the server
+    // Match in 2 ways:
+    //      - Directories: the prefix of the asset specifier/path matches a configured assets[i].urlPath
+    //      - Individual files: the asset specifier is equal to a configured assets[i].urlPath
+    for (const [urlPath, fsPath] of assetPathMap.entries()) {
+        const slashPath = urlPath.endsWith('/') ? urlPath : `${urlPath}/`;
+        if (specifier.startsWith(slashPath) || specifier === urlPath) {
+            return specifier.replace(urlPath, fsPath);
+        }
+    }
+    return specifier;
+}
 //# sourceMappingURL=fs.js.map

package/build/es/identity.d.ts

@@ -1,5 +1,5 @@
 import getCacheKeyFromJson from 'fast-json-stable-stringify';
-import { AbstractModuleId, BundleDefinition, ModuleDefinition, NormalizedLwrAppBootstrapConfig, PublicModuleRegistry, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
+import { AbstractModuleId, AssetSource, BundleDefinition, ModuleDefinition, NormalizedLwrAppBootstrapConfig, PublicModuleRegistry, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
 export declare const VERSION_SIGIL = "/v/";
 export declare const LOCALE_SIGIL = "l";
 export declare const ENVIRONMENT_SIGIL = "e";
@@ -104,9 +104,9 @@ export declare function parsePackageSpecifier(specifier: string): PackageIdentit
  * @param name A string in kebab case
  * @example - 'name-of-something' => 'name/ofSomething'
  */
-export declare function kebabCaseToModuleSpecifer(name: string): string;
+export declare function kebabCaseToModuleSpecifier(name: string): string;
 /**
- * Clone of lwr/init, reverse of kebabCaseToModuleSpecifer, strips off versions
+ * Clone of lwr/init, reverse of kebabCaseToModuleSpecifier, strips off versions
  * @param specifier
  * @example - 'name/ofSomething/v/1.0.0' => 'name-of-something'
  */
@@ -137,5 +137,6 @@ export declare function getModuleUriPrefix({ apiVersion, bundle, format, compat,
 export declare function getMappingUriPrefix({ apiVersion, bundle, format, compat, basePath }: RuntimeEnvironment, { locale, environment }?: RuntimeParams): string;
 export { getCacheKeyFromJson };
 export declare function isExternalUrl(url: string): boolean;
+export declare function isAssetSourceExternal(assetSource: AssetSource): boolean;
 export declare function isBundleDefinition(definition: ModuleDefinition | BundleDefinition): definition is BundleDefinition;
 //# sourceMappingURL=identity.d.ts.map

package/build/es/identity.js

@@ -164,7 +164,7 @@ export function parsePackageSpecifier(specifier) {
  * @param name A string in kebab case
  * @example - 'name-of-something' => 'name/ofSomething'
  */
-export function kebabCaseToModuleSpecifer(name) {
+export function kebabCaseToModuleSpecifier(name) {
     const newName = [];
     let nsFound = false;
     let upper = false;
@@ -186,7 +186,7 @@ export function kebabCaseToModuleSpecifer(name) {
     return newName.join('');
 }
 /**
- * Clone of lwr/init, reverse of kebabCaseToModuleSpecifer, strips off versions
+ * Clone of lwr/init, reverse of kebabCaseToModuleSpecifier, strips off versions
  * @param specifier
  * @example - 'name/ofSomething/v/1.0.0' => 'name-of-something'
  */
@@ -245,6 +245,9 @@ const REGEX_URL_SCHEMA_PREFIX = /^(https?|\/\/)/;
 export function isExternalUrl(url) {
     return REGEX_URL_SCHEMA_PREFIX.test(url);
 }
+export function isAssetSourceExternal(assetSource) {
+    return assetSource.type === 'external' || (!!assetSource.uri && isExternalUrl(assetSource.uri));
+}
 // type guard for ViewDef responses
 export function isBundleDefinition(definition) {
     return definition.bundleRecord !== undefined;

package/build/es/site-metadata.js

@@ -27,18 +27,24 @@ export class SiteMetadataImpl {
     async persistSiteMetadata() {
         // Create the metadata directory if if does not exist
         const siteMetadataPath = path.join(this.options.rootDir, SITE_METADATA_PATH);
-        if (!(await fs.pathExists(siteMetadataPath))) {
-            await fs.mkdir(siteMetadataPath, { recursive: true });
+        try {
+            if (!(await fs.pathExists(siteMetadataPath))) {
+                await fs.mkdir(siteMetadataPath, { recursive: true });
+            }
+            // Save Bundle Metadata
+            const bundleMetadataPath = path.join(this.options.rootDir, STATIC_BUNDLE_METADATA_PATH);
+            await fs.writeJSON(bundleMetadataPath, this.siteBundles, { spaces: 2 });
+            // Save Resource Metadata
+            const resourceMetadataPath = path.join(this.options.rootDir, STATIC_RESOURCE_METADATA_PATH);
+            await fs.writeJSON(resourceMetadataPath, this.siteResources, { spaces: 2 });
+            // Save Resource Metadata
+            const assetMetadataPath = path.join(this.options.rootDir, STATIC_ASSET_METADATA_PATH);
+            return fs.writeJSON(assetMetadataPath, this.siteAssets, { spaces: 2 });
+        }
+        catch (err) {
+            console.error(`[SiteMetadata] Failed to save site metadata ${siteMetadataPath}`);
+            console.error(err);
         }
-        // Save Bundle Metadata
-        const bundleMetadataPath = path.join(this.options.rootDir, STATIC_BUNDLE_METADATA_PATH);
-        await fs.writeJSON(bundleMetadataPath, this.siteBundles, { spaces: 2 });
-        // Save Resource Metadata
-        const resourceMetadataPath = path.join(this.options.rootDir, STATIC_RESOURCE_METADATA_PATH);
-        await fs.writeJSON(resourceMetadataPath, this.siteResources, { spaces: 2 });
-        // Save Resource Metadata
-        const assetMetadataPath = path.join(this.options.rootDir, STATIC_ASSET_METADATA_PATH);
-        return fs.writeJSON(assetMetadataPath, this.siteAssets, { spaces: 2 });
     }
     readStaticBundleMetadata(staticRoot) {
         let bundleMetadataPath;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.26",
+    "version": "0.9.0-alpha.27",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -61,13 +61,13 @@
         "rollup": "~2.45.2"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.9.0-alpha.26",
-        "@lwrjs/types": "0.9.0-alpha.26",
+        "@lwrjs/diagnostics": "0.9.0-alpha.27",
+        "@lwrjs/types": "0.9.0-alpha.27",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=16.0.0 <20"
     },
-    "gitHead": "6da956eb29622d49423b0a6ee63300de1f3e121c"
+    "gitHead": "a7fcd8493b8a3286197e829b28b54670e7d4e97c"
 }