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

package/build/cjs/fs.cjs

@@ -32,7 +32,9 @@ __export(exports, {
   normalizeDirectory: () => normalizeDirectory,
   normalizeResourcePath: () => normalizeResourcePath,
   readFile: () => readFile,
-  resolveFileExtension: () => resolveFileExtension
+  resolveFileExtension: () => resolveFileExtension,
+  streamToString: () => streamToString,
+  stringToStream: () => stringToStream
 });
 var import_fs = __toModule(require("fs"));
 var import_path = __toModule(require("path"));
@@ -40,6 +42,7 @@ var import_crypto = __toModule(require("crypto"));
 var import_identity = __toModule(require("./identity.cjs"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_mime_types = __toModule(require("mime-types"));
+var import_stream = __toModule(require("stream"));
 var import_logger = __toModule(require("./logger.cjs"));
 var fileCount = 0;
 var files = new Map();
@@ -150,3 +153,32 @@ function normalizeAssetSpecifier(assetId, assetPathMap, resourcePaths, basePath)
   }
   return specifier;
 }
+function streamToString(stream, encoding = "utf8") {
+  const chunks = [];
+  return new Promise((resolve, reject) => {
+    stream.on("data", (c) => chunks.push(c));
+    stream.on("error", reject);
+    stream.on("end", () => resolve(Buffer.concat(chunks).toString(encoding)));
+  });
+}
+function stringToStream(str) {
+  let index = 0;
+  const isBuffer = Buffer.isBuffer(str);
+  const readable = new import_stream.Readable({
+    read(size) {
+      if (index >= str.length) {
+        this.push(null);
+        return;
+      }
+      let chunk;
+      if (isBuffer) {
+        chunk = str.subarray(index, index + size);
+      } else {
+        chunk = str.slice(index, index + size);
+      }
+      index += size;
+      this.push(chunk);
+    }
+  });
+  return readable;
+}

package/build/cjs/import-metadata.cjs

@@ -39,7 +39,8 @@ async function getImportMetadata(compiledSource) {
   const [moduleImportLocations] = await (0, import_es_module_lexer.parse)(compiledSource);
   for (const moduleImportLocation of moduleImportLocations) {
     let moduleSpecifier = compiledSource.substring(moduleImportLocation.s, moduleImportLocation.e);
-    const isDynamic = moduleImportLocation.d !== -1;
+    const isStatic = moduleImportLocation.d === -1;
+    const isDynamic = moduleImportLocation.d > -1;
     const location = {
       startColumn: moduleImportLocation.s,
       endColumn: moduleImportLocation.e
@@ -57,7 +58,7 @@ async function getImportMetadata(compiledSource) {
           endColumn: moduleImportLocation.s
         }
       });
-    } else {
+    } else if (isStatic) {
       imports.push({moduleSpecifier, location});
     }
   }

package/build/cjs/index.cjs

@@ -34,4 +34,3 @@ __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("./site-metadata.cjs")));

package/build/es/fs.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import type { AssetIdentifier, ResourcePaths, ViewSource } from '@lwrjs/types';
 import { lookup } from 'mime-types';
+import { Readable } from 'stream';
 /**
  * Create a hash string for a source
  * @param source
@@ -36,4 +37,6 @@ 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;
+export declare function streamToString(stream: Readable, encoding?: BufferEncoding): Promise<string>;
+export declare function stringToStream(str: string | Buffer): Readable;
 //# sourceMappingURL=fs.d.ts.map

package/build/es/fs.js

@@ -4,6 +4,7 @@ import crypto from 'crypto';
 import { slugify } from './identity.js';
 import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
 import { lookup } from 'mime-types';
+import { Readable } from 'stream';
 import { DEBUG, logger, VERBOSE } from './logger.js';
 let fileCount = 0;
 const files = new Map();
@@ -163,4 +164,34 @@ export function normalizeAssetSpecifier(assetId, assetPathMap, resourcePaths, ba
     }
     return specifier;
 }
+export function streamToString(stream, encoding = 'utf8') {
+    const chunks = [];
+    return new Promise((resolve, reject) => {
+        stream.on('data', (c) => chunks.push(c));
+        stream.on('error', reject);
+        stream.on('end', () => resolve(Buffer.concat(chunks).toString(encoding)));
+    });
+}
+export function stringToStream(str) {
+    let index = 0;
+    const isBuffer = Buffer.isBuffer(str);
+    const readable = new Readable({
+        read(size) {
+            if (index >= str.length) {
+                this.push(null);
+                return;
+            }
+            let chunk;
+            if (isBuffer) {
+                chunk = str.subarray(index, index + size);
+            }
+            else {
+                chunk = str.slice(index, index + size);
+            }
+            index += size;
+            this.push(chunk);
+        },
+    });
+    return readable;
+}
 //# sourceMappingURL=fs.js.map

package/build/es/identity.d.ts

@@ -15,7 +15,7 @@ export declare const DEFAULT_LWR_LOCKER_CONFIG: {
     trustedComponents: string[];
 };
 export declare const DEFAULT_LWR_BOOTSTRAP_CONFIG: NormalizedLwrAppBootstrapConfig;
-type ModuleIdentifierPartial = Partial<AbstractModuleId>;
+declare type ModuleIdentifierPartial = Partial<AbstractModuleId>;
 /**
  * Turn the dots in a version into underscores
  * @param version

package/build/es/import-metadata.js

@@ -12,7 +12,8 @@ export async function getImportMetadata(compiledSource) {
     for (const moduleImportLocation of moduleImportLocations) {
         // This will give us the source specifier of the import (ex. import x from "bar" <= will get us bar)
         let moduleSpecifier = compiledSource.substring(moduleImportLocation.s, moduleImportLocation.e);
-        const isDynamic = moduleImportLocation.d !== -1;
+        const isStatic = moduleImportLocation.d === -1;
+        const isDynamic = moduleImportLocation.d > -1;
         const location = {
             startColumn: moduleImportLocation.s,
             endColumn: moduleImportLocation.e,
@@ -31,7 +32,7 @@ export async function getImportMetadata(compiledSource) {
                 },
             });
         }
-        else {
+        else if (isStatic) {
             imports.push({ moduleSpecifier, location });
         }
     }

package/build/es/index.d.ts

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

package/build/es/index.js

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

package/build/es/logger.d.ts

@@ -1,10 +1,10 @@
-type LEVEL = 'verbose' | 'debug' | 'info' | 'warn' | 'error';
+declare type LEVEL = 'verbose' | 'debug' | 'info' | 'warn' | 'error';
 export declare const VERBOSE: LEVEL;
 export declare const DEBUG: LEVEL;
 export declare const INFO: LEVEL;
 export declare const WARN: LEVEL;
 export declare const ERROR: LEVEL;
-type LoggerOptions = {
+declare type LoggerOptions = {
     dedupe?: Set<string>;
 };
 declare function log(level: string, message: string, additionalInfo?: any): void;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.10.0-alpha.12",
+    "version": "0.10.0-alpha.13",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -56,19 +56,19 @@
         "slugify": "^1.4.5"
     },
     "peerDependencies": {
-        "@locker/compiler": "0.19.0",
+        "@locker/compiler": "0.19.5",
         "chokidar": "^3.5.3",
         "esbuild": "^0.9.7",
         "rollup": "^2.78.0"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.10.0-alpha.12",
-        "@lwrjs/types": "0.10.0-alpha.12",
+        "@lwrjs/diagnostics": "0.10.0-alpha.13",
+        "@lwrjs/types": "0.10.0-alpha.13",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=16.0.0 <20"
     },
-    "gitHead": "c280f6e4914d67a58cb18a52d2320824c8ed4a7b"
+    "gitHead": "f6d142d5a027554cb1685389e0b173734149683d"
 }

package/build/cjs/site-metadata.cjs

@@ -1,121 +0,0 @@
-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/site-metadata.ts
-__markAsModule(exports);
-__export(exports, {
-  SiteMetadataImpl: () => SiteMetadataImpl
-});
-var import_path = __toModule(require("path"));
-var import_fs_extra = __toModule(require("fs-extra"));
-var import_logger = __toModule(require("./logger.cjs"));
-var SITE_METADATA_PATH = ".metadata";
-var STATIC_BUNDLE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/bundle-metadata.json");
-var STATIC_RESOURCE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/resource-metadata.json");
-var STATIC_ASSET_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/asset-metadata.json");
-var SiteMetadataImpl = class {
-  constructor(options) {
-    this.options = options;
-    this.siteBundles = this.readStaticBundleMetadata(options.rootDir);
-    this.siteResources = this.readStaticResourceMetadata(options.rootDir);
-    this.siteAssets = this.readStaticAssetsMetadata(options.rootDir);
-  }
-  getSiteRootDir() {
-    return this.options.rootDir;
-  }
-  getSiteBundles() {
-    return this.siteBundles;
-  }
-  getSiteResources() {
-    return this.siteResources;
-  }
-  getSiteAssets() {
-    return this.siteAssets;
-  }
-  async persistSiteMetadata() {
-    const siteMetadataPath = import_path.default.join(this.options.rootDir, SITE_METADATA_PATH);
-    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);
-    }
-  }
-  readStaticBundleMetadata(staticRoot) {
-    let bundleMetadataPath;
-    let siteBundles = {bundles: {}};
-    try {
-      bundleMetadataPath = import_path.default.join(staticRoot, STATIC_BUNDLE_METADATA_PATH);
-      const savedMetadata = import_fs_extra.default.readJSONSync(bundleMetadataPath);
-      siteBundles = savedMetadata;
-    } catch (error) {
-      if (error.code === "ENOENT") {
-        import_logger.logger.debug(`[SiteMetadata] Failed to load Static Bundle Metadata: ${bundleMetadataPath}`);
-      } else {
-        throw error;
-      }
-    }
-    return siteBundles;
-  }
-  readStaticResourceMetadata(staticRoot) {
-    let resourceMetadataPath;
-    let siteResources = {resources: {}};
-    try {
-      resourceMetadataPath = import_path.default.join(staticRoot, STATIC_RESOURCE_METADATA_PATH);
-      const savedMetadata = import_fs_extra.default.readJSONSync(resourceMetadataPath);
-      siteResources = savedMetadata;
-    } catch (error) {
-      if (error.code === "ENOENT") {
-        import_logger.logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${resourceMetadataPath}`);
-      } else {
-        throw error;
-      }
-    }
-    return siteResources;
-  }
-  readStaticAssetsMetadata(staticRoot) {
-    let assetMetadataPath;
-    let siteAssets = {
-      assets: {}
-    };
-    try {
-      assetMetadataPath = import_path.default.join(staticRoot, STATIC_ASSET_METADATA_PATH);
-      siteAssets = import_fs_extra.default.readJSONSync(assetMetadataPath);
-    } catch (error) {
-      if (error.code === "ENOENT") {
-        import_logger.logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${assetMetadataPath}`);
-      } else {
-        throw error;
-      }
-    }
-    return siteAssets;
-  }
-};

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

@@ -1,27 +0,0 @@
-import type { SiteAssets, SiteBundles, SiteMetadata, SiteResources } from '@lwrjs/types';
-type Options = {
-    rootDir: string;
-};
-export declare class SiteMetadataImpl implements SiteMetadata {
-    private options;
-    private siteBundles;
-    private siteResources;
-    private siteAssets;
-    constructor(options: Options);
-    getSiteRootDir(): string;
-    getSiteBundles(): SiteBundles;
-    getSiteResources(): SiteResources;
-    getSiteAssets(): SiteAssets;
-    persistSiteMetadata(): Promise<void>;
-    private readStaticBundleMetadata;
-    /**
-     * Read the metadata about the pre-built resources of the current site.
-     */
-    private readStaticResourceMetadata;
-    /**
-     * Read the metadata about the pre-built assets of the current site.
-     */
-    private readStaticAssetsMetadata;
-}
-export {};
-//# sourceMappingURL=site-metadata.d.ts.map

package/build/es/site-metadata.js

@@ -1,111 +0,0 @@
-import path from 'path';
-import fs from 'fs-extra';
-import { logger } from './logger.js';
-const SITE_METADATA_PATH = '.metadata';
-const STATIC_BUNDLE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/bundle-metadata.json');
-const STATIC_RESOURCE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/resource-metadata.json');
-const STATIC_ASSET_METADATA_PATH = path.join(SITE_METADATA_PATH, '/asset-metadata.json');
-export class SiteMetadataImpl {
-    constructor(options) {
-        this.options = options;
-        this.siteBundles = this.readStaticBundleMetadata(options.rootDir);
-        this.siteResources = this.readStaticResourceMetadata(options.rootDir);
-        this.siteAssets = this.readStaticAssetsMetadata(options.rootDir);
-    }
-    getSiteRootDir() {
-        return this.options.rootDir;
-    }
-    getSiteBundles() {
-        return this.siteBundles;
-    }
-    getSiteResources() {
-        return this.siteResources;
-    }
-    getSiteAssets() {
-        return this.siteAssets;
-    }
-    async persistSiteMetadata() {
-        // Create the metadata directory if if does not exist
-        const siteMetadataPath = path.join(this.options.rootDir, SITE_METADATA_PATH);
-        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);
-        }
-    }
-    readStaticBundleMetadata(staticRoot) {
-        let bundleMetadataPath;
-        let siteBundles = { bundles: {} };
-        try {
-            bundleMetadataPath = path.join(staticRoot, STATIC_BUNDLE_METADATA_PATH);
-            const savedMetadata = fs.readJSONSync(bundleMetadataPath);
-            siteBundles = savedMetadata;
-        }
-        catch (error) {
-            if (error.code === 'ENOENT') {
-                logger.debug(`[SiteMetadata] Failed to load Static Bundle Metadata: ${bundleMetadataPath}`);
-            }
-            else {
-                throw error;
-            }
-        }
-        return siteBundles;
-    }
-    /**
-     * Read the metadata about the pre-built resources of the current site.
-     */
-    readStaticResourceMetadata(staticRoot) {
-        let resourceMetadataPath;
-        let siteResources = { resources: {} };
-        try {
-            resourceMetadataPath = path.join(staticRoot, STATIC_RESOURCE_METADATA_PATH);
-            const savedMetadata = fs.readJSONSync(resourceMetadataPath);
-            siteResources = savedMetadata;
-        }
-        catch (error) {
-            if (error.code === 'ENOENT') {
-                logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${resourceMetadataPath}`);
-            }
-            else {
-                throw error;
-            }
-        }
-        return siteResources;
-    }
-    /**
-     * Read the metadata about the pre-built assets of the current site.
-     */
-    readStaticAssetsMetadata(staticRoot) {
-        let assetMetadataPath;
-        let siteAssets = {
-            assets: {},
-        };
-        try {
-            assetMetadataPath = path.join(staticRoot, STATIC_ASSET_METADATA_PATH);
-            siteAssets = fs.readJSONSync(assetMetadataPath);
-        }
-        catch (error) {
-            if (error.code === 'ENOENT') {
-                logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${assetMetadataPath}`);
-            }
-            else {
-                throw error;
-            }
-        }
-        return siteAssets;
-    }
-}
-//# sourceMappingURL=site-metadata.js.map