@lwrjs/core 0.4.5 → 0.5.1

package/LICENSE

@@ -0,0 +1,10 @@
+MIT LICENSE
+
+Copyright (c) 2020, Salesforce.com, Inc.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/build/cjs/middlewares/api-middleware.cjs

@@ -55,8 +55,9 @@ function apiMiddleware(app, context) {
       res.status(400).send({error: `Environment "${targetEnvironment}" is not supported`});
       return;
     }
-    const {moduleId, signature} = (0, import_shared_utils.getModuleIdentity)(req);
+    let moduleId, signature;
     try {
+      ({moduleId, signature} = (0, import_shared_utils.getModuleIdentity)(req));
       const sourceMapUrl = req.path.replace("/bundle/", "/sourcemaps/bundle/");
       const sourceMapRuntimeContext = {...runtimeEnvironment, sourceMapUrl};
       const importerSpecifier = req.query.importer;
@@ -101,7 +102,7 @@ function apiMiddleware(app, context) {
       res.type("application/javascript").send(bundleDef.code);
     } catch (e) {
       console.log(e);
-      const error = (0, import_utils.createReturnStatus)(`bundle for "${moduleId.specifier}"`, e);
+      const error = (0, import_utils.createReturnStatus)(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
       res.status(error.status).send(error.message);
     }
   });
@@ -117,9 +118,9 @@ function apiMiddleware(app, context) {
       res.status(400).send({error: `Environment "${targetEnvironment}" is not supported`});
       return;
     }
-    const id = (0, import_shared_utils.getModuleIdentity)(req);
-    let moduleId = id.moduleId;
+    let moduleId;
     try {
+      ({moduleId} = (0, import_shared_utils.getModuleIdentity)(req));
       const importerSpecifier = req.query.importer;
       if (importerSpecifier) {
         const importerModuleId = (0, import_shared_utils.explodeSpecifier)(importerSpecifier);
@@ -142,7 +143,7 @@ function apiMiddleware(app, context) {
       }
     } catch (e) {
       console.log(e);
-      const error = (0, import_utils.createReturnStatus)(`bundle for "${moduleId.specifier}"`, e);
+      const error = (0, import_utils.createReturnStatus)(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
       res.status(error.status).send(error.message);
     }
   });
@@ -163,8 +164,9 @@ function apiMiddleware(app, context) {
       res.status(400).send({error: `Environment "${targetEnvironment}" is not supported`});
       return;
     }
-    const {moduleId, signature} = (0, import_shared_utils.getModuleIdentity)(req);
+    let moduleId, signature;
     try {
+      ({moduleId, signature} = (0, import_shared_utils.getModuleIdentity)(req));
       const bundleDef = await moduleBundler.getModuleBundle(moduleId, runtimeEnvironment);
       if (signature !== import_shared_utils.LATEST_SIGNATURE) {
         res.setHeader("Cache-control", "public, max-age=31536000, immutable");
@@ -172,7 +174,7 @@ function apiMiddleware(app, context) {
       res.type("application/json").send(bundleDef.map);
     } catch (e) {
       console.log(e);
-      const error = (0, import_utils.createReturnStatus)(`bundle sourcemap for "${moduleId.specifier}"`, e);
+      const error = (0, import_utils.createReturnStatus)(`bundle sourcemap for "${moduleId?.specifier || req.params?.specifier}"`, e);
       res.status(error.status).send(error.message);
     }
   });
@@ -192,8 +194,9 @@ function apiMiddleware(app, context) {
       res.status(400).send({error: `Environment "${targetEnvironment}" is not supported`});
       return;
     }
-    const {moduleId, signature} = (0, import_shared_utils.getModuleIdentity)(req);
+    let moduleId, signature;
     try {
+      ({moduleId, signature} = (0, import_shared_utils.getModuleIdentity)(req));
       if (!req.validateJsonRequest()) {
         throw (0, import_diagnostics.createSingleDiagnosticError)({description: errors.INVALID_JSON()}, import_diagnostics.LwrUnresolvableError);
       }
@@ -213,7 +216,7 @@ function apiMiddleware(app, context) {
       }
     } catch (e) {
       console.log(e);
-      const error = (0, import_utils.createReturnStatus)(`module "${moduleId.specifier}"`, e);
+      const error = (0, import_utils.createReturnStatus)(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
       res.status(error.status).send(error.message);
     }
   });
@@ -229,9 +232,9 @@ function apiMiddleware(app, context) {
       res.status(400).send({error: `Environment "${targetEnvironment}" is not supported`});
       return;
     }
-    const id = (0, import_shared_utils.getModuleIdentity)(req);
-    let moduleId = id.moduleId;
+    let moduleId;
     try {
+      ({moduleId} = (0, import_shared_utils.getModuleIdentity)(req));
       const importerSpecifier = req.query.importer;
       if (importerSpecifier) {
         const importerModuleId = (0, import_shared_utils.explodeSpecifier)(importerSpecifier);
@@ -254,7 +257,7 @@ function apiMiddleware(app, context) {
       }
     } catch (e) {
       console.log(e);
-      const error = (0, import_utils.createReturnStatus)(`module "${moduleId.specifier}"`, e);
+      const error = (0, import_utils.createReturnStatus)(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
       res.status(error.status).send(error.message);
     }
   });
@@ -270,14 +273,15 @@ function apiMiddleware(app, context) {
       res.status(400).send({error: `Environment "${targetEnvironment}" is not supported`});
       return;
     }
-    const {moduleIds} = (0, import_shared_utils.getMappingIdentity)(req);
+    let moduleIds;
     try {
+      ({moduleIds} = (0, import_shared_utils.getMappingIdentity)(req));
       const {runtimeEnvironment, runtimeParams} = requestContext;
       const importMetadata = await (0, import_shared_utils.getImportMetadataMappings)(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
       res.type("application/json").send(importMetadata);
     } catch (e) {
       console.log(e);
-      const error = (0, import_utils.createReturnStatus)(`mappings for "${JSON.stringify(moduleIds)}"`, e);
+      const error = (0, import_utils.createReturnStatus)(`mappings for "${JSON.stringify(moduleIds || req.params?.specifiers)}"`, e);
       res.status(error.status).send(error.message);
     }
   });
@@ -293,8 +297,9 @@ function apiMiddleware(app, context) {
       res.status(400).send({error: `Environment "${targetEnvironment}" is not supported`});
       return;
     }
-    const {resourceId} = (0, import_shared_utils.getResourceIdentity)(req);
+    let resourceId;
     try {
+      ({resourceId} = (0, import_shared_utils.getResourceIdentity)(req));
       const resource = await resourceRegistry.getResource(resourceId, runtimeEnvironment, runtimeParams);
       if (resource && resource.content) {
         const type = resource.type === "text/css" ? resource.type : "application/javascript";
@@ -307,7 +312,7 @@ function apiMiddleware(app, context) {
       res.setMetadata({resource});
     } catch (e) {
       console.log(e);
-      const error = (0, import_utils.createReturnStatus)(`resource "${resourceId.specifier}"`, e);
+      const error = (0, import_utils.createReturnStatus)(`resource "${resourceId?.specifier || req.params?.specifier}"`, e);
       res.status(error.status).send(error.message);
     }
   });

package/build/es/context/hooks.js

@@ -10,6 +10,7 @@ function normalizeRoutesBootstrap({ routes, errorRoutes }) {
 }
 export async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig, runtimeConfig) {
     for (const hookPlugin of hookPlugins) {
+        // eslint-disable-next-line no-await-in-loop
         await hookPlugin.initConfigs(lwrConfig, dataConfig, runtimeConfig);
     }
     validateLwrAppConfig(JSON.stringify(lwrConfig), 'post');

package/build/es/middlewares/api-middleware.js

@@ -27,8 +27,9 @@ export default function apiMiddleware(app, context) {
             res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
             return;
         }
-        const { moduleId, signature } = getModuleIdentity(req);
+        let moduleId, signature;
         try {
+            ({ moduleId, signature } = getModuleIdentity(req));
             const sourceMapUrl = req.path.replace('/bundle/', '/sourcemaps/bundle/');
             const sourceMapRuntimeContext = { ...runtimeEnvironment, sourceMapUrl };
             // Redirect module requests to the concrete URL when requested with an importer
@@ -62,7 +63,9 @@ export default function apiMiddleware(app, context) {
                 if (bundleDef.bundleRecord.imports) {
                     for (let index = 0; index < bundleDef.bundleRecord.imports.length; index++) {
                         const theImport = bundleDef.bundleRecord.imports[index];
+                        // eslint-disable-next-line no-await-in-loop
                         const id = await getVersionedModuleId(theImport.specifier, moduleRegistry);
+                        // eslint-disable-next-line no-await-in-loop
                         const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
                         resolvedUris.push(uri);
                     }
@@ -70,7 +73,9 @@ export default function apiMiddleware(app, context) {
                 if (bundleDef.bundleRecord.dynamicImports) {
                     for (let index = 0; index < bundleDef.bundleRecord.dynamicImports.length; index++) {
                         const theImport = bundleDef.bundleRecord.dynamicImports[index];
+                        // eslint-disable-next-line no-await-in-loop
                         const id = await getVersionedModuleId(theImport.specifier, moduleRegistry);
+                        // eslint-disable-next-line no-await-in-loop
                         const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
                         resolvedUris.push(uri);
                     }
@@ -81,7 +86,7 @@ export default function apiMiddleware(app, context) {
         }
         catch (e) {
             console.log(e);
-            const error = createReturnStatus(`bundle for "${moduleId.specifier}"`, e);
+            const error = createReturnStatus(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
             res.status(error.status).send(error.message);
         }
     });
@@ -102,9 +107,9 @@ export default function apiMiddleware(app, context) {
             res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
             return;
         }
-        const id = getModuleIdentity(req);
-        let moduleId = id.moduleId;
+        let moduleId;
         try {
+            ({ moduleId } = getModuleIdentity(req));
             // Get the importer's specifier via the "importer" query param
             const importerSpecifier = req.query.importer;
             if (importerSpecifier) {
@@ -133,7 +138,7 @@ export default function apiMiddleware(app, context) {
         }
         catch (e) {
             console.log(e);
-            const error = createReturnStatus(`bundle for "${moduleId.specifier}"`, e);
+            const error = createReturnStatus(`bundle for "${moduleId?.specifier || req.params?.specifier}"`, e);
             res.status(error.status).send(error.message);
         }
     });
@@ -159,8 +164,9 @@ export default function apiMiddleware(app, context) {
             res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
             return;
         }
-        const { moduleId, signature } = getModuleIdentity(req);
+        let moduleId, signature;
         try {
+            ({ moduleId, signature } = getModuleIdentity(req));
             const bundleDef = await moduleBundler.getModuleBundle(moduleId, runtimeEnvironment);
             if (signature !== LATEST_SIGNATURE) {
                 res.setHeader('Cache-control', 'public, max-age=31536000, immutable');
@@ -169,7 +175,7 @@ export default function apiMiddleware(app, context) {
         }
         catch (e) {
             console.log(e);
-            const error = createReturnStatus(`bundle sourcemap for "${moduleId.specifier}"`, e);
+            const error = createReturnStatus(`bundle sourcemap for "${moduleId?.specifier || req.params?.specifier}"`, e);
             res.status(error.status).send(error.message);
         }
     });
@@ -195,8 +201,9 @@ export default function apiMiddleware(app, context) {
             res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
             return;
         }
-        const { moduleId, signature } = getModuleIdentity(req);
+        let moduleId, signature;
         try {
+            ({ moduleId, signature } = getModuleIdentity(req));
             if (!req.validateJsonRequest()) {
                 throw createDiagnostic({ description: errors.INVALID_JSON() }, LwrUnresolvableError);
             }
@@ -221,7 +228,7 @@ export default function apiMiddleware(app, context) {
         }
         catch (e) {
             console.log(e);
-            const error = createReturnStatus(`module "${moduleId.specifier}"`, e);
+            const error = createReturnStatus(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
             res.status(error.status).send(error.message);
         }
     });
@@ -242,9 +249,9 @@ export default function apiMiddleware(app, context) {
             res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
             return;
         }
-        const id = getModuleIdentity(req);
-        let moduleId = id.moduleId;
+        let moduleId;
         try {
+            ({ moduleId } = getModuleIdentity(req));
             // Get the importer's specifier via the "importer" query param
             const importerSpecifier = req.query.importer;
             if (importerSpecifier) {
@@ -273,7 +280,7 @@ export default function apiMiddleware(app, context) {
         }
         catch (e) {
             console.log(e);
-            const error = createReturnStatus(`module "${moduleId.specifier}"`, e);
+            const error = createReturnStatus(`module "${moduleId?.specifier || req.params?.specifier}"`, e);
             res.status(error.status).send(error.message);
         }
     });
@@ -295,15 +302,16 @@ export default function apiMiddleware(app, context) {
             res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
             return;
         }
-        const { moduleIds } = getMappingIdentity(req);
+        let moduleIds;
         try {
+            ({ moduleIds } = getMappingIdentity(req));
             const { runtimeEnvironment, runtimeParams } = requestContext;
             const importMetadata = await getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
             res.type('application/json').send(importMetadata);
         }
         catch (e) {
             console.log(e);
-            const error = createReturnStatus(`mappings for "${JSON.stringify(moduleIds)}"`, e);
+            const error = createReturnStatus(`mappings for "${JSON.stringify(moduleIds || req.params?.specifiers)}"`, e);
             res.status(error.status).send(error.message);
         }
     });
@@ -324,8 +332,9 @@ export default function apiMiddleware(app, context) {
             res.status(400).send({ error: `Environment "${targetEnvironment}" is not supported` });
             return;
         }
-        const { resourceId } = getResourceIdentity(req);
+        let resourceId;
         try {
+            ({ resourceId } = getResourceIdentity(req));
             const resource = await resourceRegistry.getResource(resourceId, runtimeEnvironment, runtimeParams);
             if (resource && resource.content) {
                 // Static resource
@@ -343,7 +352,7 @@ export default function apiMiddleware(app, context) {
         }
         catch (e) {
             console.log(e);
-            const error = createReturnStatus(`resource "${resourceId.specifier}"`, e);
+            const error = createReturnStatus(`resource "${resourceId?.specifier || req.params?.specifier}"`, e);
             res.status(error.status).send(error.message);
         }
     });

package/build/es/tools/static-generation.js

@@ -43,6 +43,7 @@ export default class SiteGenerator {
                         const assetUrl = asset.override?.uri || asset.url;
                         // skip empty asset urls / data urls (i.e. <img src="" /> <img src="data:image/png;base64, iVBORw0..." />)
                         if (assetUrl && !assetUrl.startsWith('data:')) {
+                            // eslint-disable-next-line no-await-in-loop
                             await this.dispatchResourceRecursive(assetUrl, dispatcher, { resourceType: 'asset', asset }, siteConfig);
                         }
                     }
@@ -51,6 +52,7 @@ export default class SiteGenerator {
                     for (const customElement of customElements) {
                         const jsUris = Object.values(customElement.flatGraph.uriMap);
                         for (const jsUri of jsUris) {
+                            // eslint-disable-next-line no-await-in-loop
                             await this.dispatchResourceRecursive(jsUri, dispatcher, { resourceType: 'js' }, siteConfig);
                         }
                     }
@@ -59,6 +61,7 @@ export default class SiteGenerator {
                         const boot = viewDefinition.viewRecord.bootstrapModule;
                         const jsUris = Object.values(boot.flatGraph.uriMap);
                         for (const jsUri of jsUris) {
+                            // eslint-disable-next-line no-await-in-loop
                             await this.dispatchResourceRecursive(jsUri, dispatcher, { resourceType: 'js' }, siteConfig);
                         }
                     }
@@ -69,6 +72,7 @@ export default class SiteGenerator {
                         if (!resource.inline) {
                             const resourceUri = resource.src || resource.specifier;
                             if (resourceUri) {
+                                // eslint-disable-next-line no-await-in-loop
                                 await this.dispatchResourceRecursive(resourceUri, dispatcher, { resourceType: 'resource' }, siteConfig);
                             }
                             else {
@@ -81,6 +85,7 @@ export default class SiteGenerator {
                     for (const resource of resources) {
                         const resourceUri = resource.src || resource.specifier || '';
                         if (resourceUri.startsWith('/')) {
+                            // eslint-disable-next-line no-await-in-loop
                             await this.dispatchResourceRecursive(resourceUri, dispatcher, { resourceType: 'resource' }, siteConfig);
                         }
                         else {
@@ -124,6 +129,7 @@ export default class SiteGenerator {
                     for (const importModule of imports) {
                         const jsUri = importModule.specifier;
                         if (jsUri.startsWith('/')) {
+                            // eslint-disable-next-line no-await-in-loop
                             await this.dispatchResourceRecursive(jsUri, dispatcher, { resourceType: 'js' }, siteConfig);
                         }
                         else {
@@ -138,6 +144,7 @@ export default class SiteGenerator {
                     for (const importModule of dynamicImports) {
                         const jsUri = importModule.specifier;
                         if (jsUri.startsWith('/')) {
+                            // eslint-disable-next-line no-await-in-loop
                             await this.dispatchResourceRecursive(jsUri, dispatcher, { resourceType: 'js' }, siteConfig);
                         }
                         else {
@@ -148,6 +155,7 @@ export default class SiteGenerator {
                 // Bundles with unresolved module uris
                 const uris = context.fs?.metadata.resolvedUris || [];
                 for (const jsUri of uris) {
+                    // eslint-disable-next-line no-await-in-loop
                     await this.dispatchResourceRecursive(jsUri, dispatcher, { resourceType: 'js' }, siteConfig);
                 }
             }
@@ -184,11 +192,13 @@ export default class SiteGenerator {
             const visitedUrls = new Set();
             // Generate all the routes
             for (const route of routes) {
+                // eslint-disable-next-line no-await-in-loop
                 await this.dispatchResourceRecursive(route.path, dispatcher, { resourceType: 'route' }, { outputDir, visitedUrls, locale, urlRewriteMap });
             }
             // Generate any additional urls
             if (staticSiteGenerator._additionalRoutePaths) {
                 for (const uri of staticSiteGenerator._additionalRoutePaths) {
+                    // eslint-disable-next-line no-await-in-loop
                     await this.dispatchResourceRecursive(uri, dispatcher, { resourceType: 'route' }, { outputDir, visitedUrls, locale, urlRewriteMap });
                 }
             }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.4.5",
+    "version": "0.5.1",
     "homepage": "https://lwr.dev/",
     "repository": {
         "type": "git",
@@ -33,27 +33,27 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.4.5",
-        "@lwrjs/asset-registry": "0.4.5",
-        "@lwrjs/base-template-engine": "0.4.5",
-        "@lwrjs/base-view-provider": "0.4.5",
-        "@lwrjs/client-modules": "0.4.5",
-        "@lwrjs/compiler": "0.4.5",
-        "@lwrjs/diagnostics": "0.4.5",
-        "@lwrjs/fs-asset-provider": "0.4.5",
-        "@lwrjs/html-view-provider": "0.4.5",
-        "@lwrjs/loader": "0.4.5",
-        "@lwrjs/lwc-module-provider": "0.4.5",
-        "@lwrjs/markdown-view-provider": "0.4.5",
-        "@lwrjs/module-bundler": "0.4.5",
-        "@lwrjs/module-registry": "0.4.5",
-        "@lwrjs/npm-module-provider": "0.4.5",
-        "@lwrjs/nunjucks-view-provider": "0.4.5",
-        "@lwrjs/resource-registry": "0.4.5",
-        "@lwrjs/router": "0.4.5",
-        "@lwrjs/server": "0.4.5",
-        "@lwrjs/shared-utils": "0.4.5",
-        "@lwrjs/view-registry": "0.4.5",
+        "@lwrjs/app-service": "0.5.1",
+        "@lwrjs/asset-registry": "0.5.1",
+        "@lwrjs/base-template-engine": "0.5.1",
+        "@lwrjs/base-view-provider": "0.5.1",
+        "@lwrjs/client-modules": "0.5.1",
+        "@lwrjs/compiler": "0.5.1",
+        "@lwrjs/diagnostics": "0.5.1",
+        "@lwrjs/fs-asset-provider": "0.5.1",
+        "@lwrjs/html-view-provider": "0.5.1",
+        "@lwrjs/loader": "0.5.1",
+        "@lwrjs/lwc-module-provider": "0.5.1",
+        "@lwrjs/markdown-view-provider": "0.5.1",
+        "@lwrjs/module-bundler": "0.5.1",
+        "@lwrjs/module-registry": "0.5.1",
+        "@lwrjs/npm-module-provider": "0.5.1",
+        "@lwrjs/nunjucks-view-provider": "0.5.1",
+        "@lwrjs/resource-registry": "0.5.1",
+        "@lwrjs/router": "0.5.1",
+        "@lwrjs/server": "0.5.1",
+        "@lwrjs/shared-utils": "0.5.1",
+        "@lwrjs/view-registry": "0.5.1",
         "dompurify": "^2.3.0",
         "fs-extra": "^10.0.0",
         "jsdom": "^16.7.0",
@@ -63,12 +63,13 @@
         "qs": "^6.9.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.4.5"
+        "@lwrjs/types": "0.5.1"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
     },
     "engines": {
         "node": ">=14.15.4 <15"
-    }
+    },
+    "gitHead": "007da758483711eb4f3422c3c94f7a816d20c71d"
 }