@lwrjs/shared-utils 0.7.0-alpha.1 → 0.7.0-alpha.12

package/build/cjs/graph.cjs

@@ -28,6 +28,7 @@ __export(exports, {
   getModuleGraphs: () => getModuleGraphs
 });
 var import_identity = __toModule(require("./identity.cjs"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_import_metadata = __toModule(require("./import-metadata.cjs"));
 var GraphDepth;
 (function(GraphDepth2) {
@@ -110,7 +111,9 @@ async function getModuleGraphs(specifier, options, moduleRegistry, defRegistry,
   };
   const moduleDef = isBundler(defRegistry) ? await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams) : await defRegistry.getModule(versionedModuleId, runtimeParams);
   if (!moduleDef) {
-    throw new Error("Missing module Definition");
+    throw (0, import_diagnostics.createSingleDiagnosticError)({
+      description: import_diagnostics.descriptions.UNRESOLVABLE.MODULE_ENTRY(versionedModuleId.specifier)
+    }, import_diagnostics.LwrUnresolvableError);
   }
   const flattened = [];
   await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);

package/build/cjs/html-meta.cjs

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   extractMetadataFromHtml: () => extractMetadataFromHtml
 });
+var import_identity = __toModule(require("./identity.cjs"));
 var import_parse5_sax_parser = __toModule(require("parse5-sax-parser"));
 var import_stream = __toModule(require("stream"));
 function parseAssetLocation(htmlSource, tagName, attrLocation) {
@@ -52,11 +53,19 @@ async function extractMetadataFromHtml(htmlSource) {
     const ceRefStack = [];
     parser.on("startTag", ({
       tagName,
+      attrs,
       sourceCodeLocation
     }) => {
       if (tagName.includes("-") && !openElements.has(tagName)) {
         const {startOffset, endOffset} = sourceCodeLocation;
-        const ceRef = {tagName, location: {startOffset, endOffset}};
+        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
+        };
         openElements.add(tagName);
         if (ceRefStack.length) {
           const last = ceRefStack[ceRefStack.length - 1];

package/build/cjs/identity.cjs

@@ -43,13 +43,14 @@ __export(exports, {
   getMappingUriPrefix: () => getMappingUriPrefix,
   getModuleIdentity: () => getModuleIdentity,
   getModuleUriPrefix: () => getModuleUriPrefix,
+  getPropFromAttrName: () => getPropFromAttrName,
   getResourceIdentity: () => getResourceIdentity,
   getSpecifier: () => getSpecifier,
   getVersionedModuleId: () => getVersionedModuleId,
   getVersionedSpecifier: () => getVersionedSpecifier,
   isBundleDefinition: () => isBundleDefinition,
   isExternalUrl: () => isExternalUrl,
-  kebabcaseToCamelcase: () => kebabcaseToCamelcase,
+  kebabCaseToModuleSpecifer: () => kebabCaseToModuleSpecifer,
   moduleSpecifierToKebabCase: () => moduleSpecifierToKebabCase,
   normalizeVersionFromUri: () => normalizeVersionFromUri,
   normalizeVersionToUri: () => normalizeVersionToUri,
@@ -159,7 +160,7 @@ function parsePackageSpecifier(specifier) {
     subResource: matched[2] || ""
   };
 }
-function kebabcaseToCamelcase(name) {
+function kebabCaseToModuleSpecifer(name) {
   const newName = [];
   let nsFound = false;
   let upper = false;
@@ -186,6 +187,9 @@ function slugify(name) {
     lower: true
   });
 }
+function getPropFromAttrName(propName) {
+  return propName.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+}
 function getModuleUriPrefix({apiVersion, bundle, format, compat, basePath}, {locale, environment} = {}) {
   const localePart = locale ? `/${LOCALE_SIGIL}/${locale}` : "";
   const environmentPart = environment ? `/${ENVIRONMENT_SIGIL}/${environment}` : "";
@@ -218,7 +222,10 @@ function getModuleIdentity(req) {
 }
 function getMappingIdentity(req) {
   const {specifiers} = req.params;
-  const moduleIds = explodeSpecifiers(specifiers);
+  const moduleIds = explodeSpecifiers(specifiers).map((obj) => ({
+    ...obj,
+    importer: req.query.importer
+  }));
   return {
     moduleIds
   };

package/build/cjs/index.cjs

@@ -33,3 +33,4 @@ __exportStar(exports, __toModule(require("./graph.cjs")));
 __exportStar(exports, __toModule(require("./mappings.cjs")));
 __exportStar(exports, __toModule(require("./urls.cjs")));
 __exportStar(exports, __toModule(require("./env.cjs")));
+__exportStar(exports, __toModule(require("./logger.cjs")));

package/build/cjs/logger.cjs

@@ -0,0 +1,36 @@
+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/logger.ts
+__markAsModule(exports);
+__export(exports, {
+  logger: () => logger
+});
+var import_winston = __toModule(require("winston"));
+var LOG_LEVEL = process.env.LOG_LEVEL || "info";
+console.log(`LOG_LEVEL: ${LOG_LEVEL}`);
+var logger = import_winston.default.createLogger({
+  level: LOG_LEVEL,
+  format: import_winston.default.format.json(),
+  transports: [new import_winston.default.transports.Console()]
+});

package/build/cjs/mappings.cjs

@@ -36,7 +36,8 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
     index: {}
   };
   for (const moduleId of moduleIds) {
-    const specifier = (0, import_identity.getSpecifier)(moduleId);
+    const requestedSpecifier = (0, import_identity.getSpecifier)(moduleId);
+    const specifier = await getVersionedSpecifier(moduleId, moduleRegistry);
     if (!visitedCache.has(specifier)) {
       const depth = {
         static: runtimeEnvironment.format === "esm" ? import_graph.GraphDepth.NONE : import_graph.GraphDepth.ALL,
@@ -45,6 +46,14 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
       const moduleGraph = await (0, import_graph.getModuleGraphs)(specifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, runtimeEnvironment.bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
       importMetadata = await toImportMetadata(moduleGraph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
     }
+    if (requestedSpecifier !== specifier) {
+      const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
+      const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
+      if (!specifiersArray) {
+        throw new Error("Could not find: " + specifier + " in " + JSON.stringify(importMetadata.imports));
+      }
+      specifiersArray.push(requestedSpecifierPlusImporter);
+    }
   }
   return importMetadata;
 }
@@ -127,3 +136,12 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
   await Promise.all(promises);
   return index;
 }
+async function getVersionedSpecifier(moduleId, moduleRegistry) {
+  if (!moduleId.importer || moduleId.version) {
+    return (0, import_identity.getSpecifier)(moduleId);
+  }
+  const versionedModuleEntry = await moduleRegistry.getModuleEntry({
+    ...moduleId
+  });
+  return (0, import_identity.getSpecifier)(versionedModuleEntry);
+}

package/build/es/graph.js

@@ -1,4 +1,5 @@
 import { getSpecifier, getVersionedModuleId, isBundleDefinition } from './identity.js';
+import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
 import { ModuleNameType } from './import-metadata.js';
 export var GraphDepth;
 (function (GraphDepth) {
@@ -116,7 +117,9 @@ options, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visited
         ? await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams)
         : await defRegistry.getModule(versionedModuleId, runtimeParams);
     if (!moduleDef) {
-        throw new Error('Missing module Definition');
+        throw createSingleDiagnosticError({
+            description: descriptions.UNRESOLVABLE.MODULE_ENTRY(versionedModuleId.specifier),
+        }, LwrUnresolvableError);
     }
     const flattened = [];
     await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);

package/build/es/html-meta.js

@@ -1,3 +1,4 @@
+import { getPropFromAttrName } from './identity.js';
 import SAXParser from 'parse5-sax-parser';
 import { Readable } from 'stream';
 function parseAssetLocation(htmlSource, tagName, attrLocation) {
@@ -28,11 +29,24 @@ export async function extractMetadataFromHtml(htmlSource) {
         const assetReferences = [];
         const parser = new SAXParser({ sourceCodeLocationInfo: true }); // TODO: Would we need this in the future?
         const ceRefStack = [];
-        parser.on('startTag', ({ tagName, sourceCodeLocation, }) => {
+        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 } };
+                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,
+                };
                 openElements.add(tagName);
                 if (ceRefStack.length) {
                     // nested CE

package/build/es/identity.d.ts

@@ -127,13 +127,13 @@ interface PackageIdentity {
  */
 export declare function parsePackageSpecifier(specifier: string): PackageIdentity;
 /**
- * Turn a string from kebab case to camel case
+ * Turn a string from kebab case to "specifier case": namespace/camelCaseName
  * @param name A string in kebab case
  * @example - 'name-of-something' => 'name/ofSomething'
  */
-export declare function kebabcaseToCamelcase(name: string): string;
+export declare function kebabCaseToModuleSpecifer(name: string): string;
 /**
- * Clone of lwr/init, reverse of kebabcaseToCamelcase, strips off versions
+ * Clone of lwr/init, reverse of kebabCaseToModuleSpecifer, strips off versions
  * @param specifier
  * @example - 'name/ofSomething/v/1.0.0' => 'name-of-something'
  */
@@ -144,6 +144,12 @@ export declare function moduleSpecifierToKebabCase(specifier: string): string;
  * @example - 'This IS a sentence' => 'this-is-a-sentence'
  */
 export declare function slugify(name: string): string;
+/**
+ * Turn an html attribute into a LWC property, eg: 'best-property-ever' => 'bestPropertyEver'
+ * @param propName - a string in kebab case (lowercase)
+ * @returns - a string in camel case
+ */
+export declare function getPropFromAttrName(propName: string): string;
 /**
  * Create a module URI prefix, stopping where the specifier would be (at "mi/")
  * @param param0 - URI props from the Runtime Environment

package/build/es/identity.js

@@ -190,11 +190,11 @@ export function parsePackageSpecifier(specifier) {
     };
 }
 /**
- * Turn a string from kebab case to camel case
+ * Turn a string from kebab case to "specifier case": namespace/camelCaseName
  * @param name A string in kebab case
  * @example - 'name-of-something' => 'name/ofSomething'
  */
-export function kebabcaseToCamelcase(name) {
+export function kebabCaseToModuleSpecifer(name) {
     const newName = [];
     let nsFound = false;
     let upper = false;
@@ -216,7 +216,7 @@ export function kebabcaseToCamelcase(name) {
     return newName.join('');
 }
 /**
- * Clone of lwr/init, reverse of kebabcaseToCamelcase, strips off versions
+ * Clone of lwr/init, reverse of kebabCaseToModuleSpecifer, strips off versions
  * @param specifier
  * @example - 'name/ofSomething/v/1.0.0' => 'name-of-something'
  */
@@ -236,6 +236,14 @@ export function slugify(name) {
         lower: true,
     });
 }
+/**
+ * Turn an html attribute into a LWC property, eg: 'best-property-ever' => 'bestPropertyEver'
+ * @param propName - a string in kebab case (lowercase)
+ * @returns - a string in camel case
+ */
+export function getPropFromAttrName(propName) {
+    return propName.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+}
 /**
  * Create a module URI prefix, stopping where the specifier would be (at "mi/")
  * @param param0 - URI props from the Runtime Environment
@@ -281,7 +289,10 @@ export function getModuleIdentity(req) {
 }
 export function getMappingIdentity(req) {
     const { specifiers } = req.params;
-    const moduleIds = explodeSpecifiers(specifiers);
+    const moduleIds = explodeSpecifiers(specifiers).map((obj) => ({
+        ...obj,
+        importer: req.query.importer,
+    }));
     return {
         moduleIds,
     };

package/build/es/index.d.ts

@@ -12,4 +12,5 @@ export * from './graph.js';
 export * from './mappings.js';
 export * from './urls.js';
 export * from './env.js';
+export * from './logger.js';
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -12,4 +12,5 @@ export * from './graph.js';
 export * from './mappings.js';
 export * from './urls.js';
 export * from './env.js';
+export * from './logger.js';
 //# sourceMappingURL=index.js.map

package/build/es/logger.d.ts

@@ -0,0 +1,3 @@
+import winston from 'winston';
+export declare const logger: winston.Logger;
+//# sourceMappingURL=logger.d.ts.map

package/build/es/logger.js

@@ -0,0 +1,9 @@
+import winston from 'winston';
+const LOG_LEVEL = process.env.LOG_LEVEL || 'info';
+console.log(`LOG_LEVEL: ${LOG_LEVEL}`);
+export const logger = winston.createLogger({
+    level: LOG_LEVEL,
+    format: winston.format.json(),
+    transports: [new winston.transports.Console()],
+});
+//# sourceMappingURL=logger.js.map

package/build/es/mappings.js

@@ -10,7 +10,9 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
         index: {},
     };
     for (const moduleId of moduleIds) {
-        const specifier = getSpecifier(moduleId);
+        const requestedSpecifier = getSpecifier(moduleId);
+        // eslint-disable-next-line no-await-in-loop
+        const specifier = await getVersionedSpecifier(moduleId, moduleRegistry);
         // Check if we have already visited
         if (!visitedCache.has(specifier)) {
             // Traversal of the Module Graph is done to get all the URLs for discoverable dependencies.
@@ -27,6 +29,15 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
             // eslint-disable-next-line no-await-in-loop
             importMetadata = await toImportMetadata(moduleGraph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
         }
+        // If the requested specifier is not the same as the versioned specifier, include the requested specifier's importer.
+        if (requestedSpecifier !== specifier) {
+            const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
+            const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
+            if (!specifiersArray) {
+                throw new Error('Could not find: ' + specifier + ' in ' + JSON.stringify(importMetadata.imports));
+            }
+            specifiersArray.push(requestedSpecifierPlusImporter);
+        }
     }
     return importMetadata;
 }
@@ -141,4 +152,13 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
     await Promise.all(promises);
     return index;
 }
+async function getVersionedSpecifier(moduleId, moduleRegistry) {
+    if (!moduleId.importer || moduleId.version) {
+        return getSpecifier(moduleId);
+    }
+    const versionedModuleEntry = await moduleRegistry.getModuleEntry({
+        ...moduleId,
+    });
+    return getSpecifier(versionedModuleEntry);
+}
 //# sourceMappingURL=mappings.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.7.0-alpha.1",
+    "version": "0.7.0-alpha.12",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -40,16 +40,17 @@
         "magic-string": "^0.25.7",
         "mime-types": "^2.1.33",
         "parse5-sax-parser": "^6.0.1",
-        "slugify": "^1.4.5"
+        "slugify": "^1.4.5",
+        "winston": "^3.7.2"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.7.0-alpha.1",
-        "@lwrjs/types": "0.7.0-alpha.1",
+        "@lwrjs/diagnostics": "0.7.0-alpha.12",
+        "@lwrjs/types": "0.7.0-alpha.12",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "24245670d6908d37e465f2316f92385df63d22aa"
+    "gitHead": "785b8380a821b43b7320783dddaf20d1433216e2"
 }