@lwrjs/view-registry 0.17.2-alpha.21 → 0.17.2-alpha.22

package/build/cjs/index.cjs

@@ -336,19 +336,27 @@ var LwrViewRegistry = class {
       }
     }, (span) => {
       traceId = span.traceId;
-      let linkedMetadata2 = renderedViewMetadata;
-      if (!skipMetadataCollection) {
-        const contentHash = (0, import_crypto.createHash)("md5").update(renderedViewContent).digest("hex");
-        const cacheKey = `${view.id}:${contentHash}`;
-        if (this.metadataCache.has(cacheKey)) {
-          linkedMetadata2 = this.metadataCache.get(cacheKey);
-        } else {
-          linkedMetadata2 = (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
-          this.metadataCache.set(cacheKey, linkedMetadata2);
-        }
-      }
       const stringBuilder2 = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
-      return {linkedMetadata: linkedMetadata2, stringBuilder: stringBuilder2};
+      if (skipMetadataCollection) {
+        return {linkedMetadata: renderedViewMetadata, stringBuilder: stringBuilder2};
+      }
+      const contentHash = (0, import_crypto.createHash)("md5").update(renderedViewContent).digest("hex");
+      const cacheKey = `${view.id}:${contentHash}`;
+      let metadata;
+      if (this.metadataCache.has(cacheKey)) {
+        metadata = this.metadataCache.get(cacheKey);
+      } else {
+        metadata = (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
+        this.metadataCache.set(cacheKey, metadata);
+      }
+      return {
+        linkedMetadata: {
+          ...renderedViewMetadata,
+          customElements: metadata.customElements,
+          assetReferences: metadata.assetReferences
+        },
+        stringBuilder: stringBuilder2
+      };
     });
     if (!(0, import_shared_utils.getFeatureFlags)().DISABLE_B3_TRACING && traceId && runtimeParams.viewSpanID) {
       const content = `00-${traceId}-${runtimeParams.viewSpanID}-01`;
@@ -385,23 +393,24 @@ var LwrViewRegistry = class {
         unsafeEnableViewLinkCaching: this.globalConfig.unsafeEnableViewLinkCaching,
         viewLinkCacheKey: viewCacheKey
       });
+      const assetReferences = [...linkedMetadata.assetReferences];
       if (viewRecord.resources?.length) {
-        linkedMetadata.assetReferences.push(...viewRecord.resources.reduce((res, asset) => {
-          if (!asset.src)
-            return res;
-          res.push({
-            url: asset.src,
-            relative: (0, import_shared_utils.isRelative)(asset.src),
-            integrity: asset.integrity
+        for (const resource of viewRecord.resources) {
+          if (!resource.src) {
+            continue;
+          }
+          assetReferences.push({
+            url: resource.src,
+            relative: (0, import_shared_utils.isRelative)(resource.src),
+            integrity: resource.integrity
           });
-          return res;
-        }, []));
+        }
       }
       return {
         renderedView: linkedView,
         immutable,
         viewRecord: {
-          assetReferences: (0, import_utils.reduceSourceAssetReferences)(linkedMetadata.assetReferences),
+          assetReferences: (0, import_utils.reduceSourceAssetReferences)(assetReferences),
           ...viewRecord,
           serverBundles: linkedMetadata.serverBundles
         },

package/build/es/index.js

@@ -364,21 +364,29 @@ export class LwrViewRegistry {
             },
         }, (span) => {
             traceId = span.traceId;
-            let linkedMetadata = renderedViewMetadata;
-            if (!skipMetadataCollection) {
-                // Create a unique key based on view ID and content hash
-                const contentHash = createHash('md5').update(renderedViewContent).digest('hex');
-                const cacheKey = `${view.id}:${contentHash}`;
-                if (this.metadataCache.has(cacheKey)) {
-                    linkedMetadata = this.metadataCache.get(cacheKey);
-                }
-                else {
-                    linkedMetadata = extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
-                    this.metadataCache.set(cacheKey, linkedMetadata);
-                }
-            }
             const stringBuilder = createStringBuilder(renderedViewContent);
-            return { linkedMetadata, stringBuilder };
+            if (skipMetadataCollection) {
+                return { linkedMetadata: renderedViewMetadata, stringBuilder };
+            }
+            // Create a unique key based on view ID and content hash
+            const contentHash = createHash('md5').update(renderedViewContent).digest('hex');
+            const cacheKey = `${view.id}:${contentHash}`;
+            let metadata;
+            if (this.metadataCache.has(cacheKey)) {
+                metadata = this.metadataCache.get(cacheKey);
+            }
+            else {
+                metadata = extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
+                this.metadataCache.set(cacheKey, metadata);
+            }
+            return {
+                linkedMetadata: {
+                    ...renderedViewMetadata,
+                    customElements: metadata.customElements,
+                    assetReferences: metadata.assetReferences,
+                },
+                stringBuilder,
+            };
         });
         // Add distributed tracing meta tag to pass tracing info to the client
         // {version}-{traceId}-{spanId}-{sampleDecision} and version is always 00
@@ -424,24 +432,25 @@ export class LwrViewRegistry {
                 // Use the same cache key for the link stage
                 viewLinkCacheKey: viewCacheKey,
             });
+            const assetReferences = [...linkedMetadata.assetReferences];
             if (viewRecord.resources?.length) {
-                linkedMetadata.assetReferences.push(...viewRecord.resources.reduce((res, asset) => {
-                    if (!asset.src)
-                        return res;
-                    res.push({
-                        url: asset.src,
-                        relative: isRelative(asset.src),
-                        integrity: asset.integrity,
+                for (const resource of viewRecord.resources) {
+                    if (!resource.src) {
+                        continue;
+                    }
+                    assetReferences.push({
+                        url: resource.src,
+                        relative: isRelative(resource.src),
+                        integrity: resource.integrity,
                     });
-                    return res;
-                }, []));
+                }
             }
             return {
                 // ...viewDefinition,
                 renderedView: linkedView,
                 immutable,
                 viewRecord: {
-                    assetReferences: reduceSourceAssetReferences(linkedMetadata.assetReferences),
+                    assetReferences: reduceSourceAssetReferences(assetReferences),
                     ...viewRecord,
                     serverBundles: linkedMetadata.serverBundles,
                 },

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.21",
+    "version": "0.17.2-alpha.22",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,14 +33,14 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.17.2-alpha.21",
-        "@lwrjs/diagnostics": "0.17.2-alpha.21",
-        "@lwrjs/instrumentation": "0.17.2-alpha.21",
-        "@lwrjs/shared-utils": "0.17.2-alpha.21",
+        "@lwrjs/app-service": "0.17.2-alpha.22",
+        "@lwrjs/diagnostics": "0.17.2-alpha.22",
+        "@lwrjs/instrumentation": "0.17.2-alpha.22",
+        "@lwrjs/shared-utils": "0.17.2-alpha.22",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.2-alpha.21"
+        "@lwrjs/types": "0.17.2-alpha.22"
     },
     "engines": {
         "node": ">=20.0.0"
@@ -48,5 +48,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "448ae2b681a4718241a29890f34e0ac13e35e6fd"
+    "gitHead": "89460a05096fe25860f06a9bea2c5c9a25b9cf05"
 }