@lwrjs/diagnostics 0.12.0-alpha.9 → 0.12.1

package/build/cjs/descriptions/application.cjs

@@ -0,0 +1,35 @@
+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/diagnostics/src/descriptions/application.ts
+__markAsModule(exports);
+__export(exports, {
+  application: () => application
+});
+var import_core_diagnostics = __toModule(require("./core-diagnostics.cjs"));
+var application = (0, import_core_diagnostics.createDiagnosticsCategory)({
+  ROUTE_HANDLER_ERROR: (route, error) => ({
+    category: "lwrApplication/routeHandler",
+    message: `An error occurred executing route handler for "${route}": "${error}"`
+  })
+});

package/build/cjs/descriptions/index.cjs

@@ -29,9 +29,11 @@ __export(exports, {
 var import_configParser = __toModule(require("./configParser.cjs"));
 var import_unresolvable = __toModule(require("./unresolvable.cjs"));
 var import_server = __toModule(require("./server.cjs"));
+var import_application = __toModule(require("./application.cjs"));
 __exportStar(exports, __toModule(require("./core-diagnostics.cjs")));
 var descriptions = {
   CONFIG_PARSER: import_configParser.configParser,
   UNRESOLVABLE: import_unresolvable.unresolvable,
-  SERVER: import_server.server
+  SERVER: import_server.server,
+  APPLICATION: import_application.application
 };

package/build/cjs/descriptions/server.cjs

@@ -32,8 +32,12 @@ var server = (0, import_core_diagnostics.createDiagnosticsCategory)({
     category: "lwrServer/warmupError",
     message: `An error occurred during warmup: ${error}`
   }),
-  INVALID_MODE: (mode) => ({
-    category: "lwrServer/invalidMode",
-    message: `No configuration found for server mode - ${mode}`
+  UNEXPECTED_ERROR: (error) => ({
+    category: "lwrServer/fatal",
+    message: `An unexpected error occurred: "${error}"`
+  }),
+  SERVER_ERROR: (name) => ({
+    category: "lwrServer/fatal",
+    message: `500: Unexpected error fetching "${name}"`
   })
 });

package/build/cjs/descriptions/unresolvable.cjs

@@ -72,10 +72,6 @@ var unresolvable = (0, import_core_diagnostics.createDiagnosticsCategory)({
     category: "lwrUnresolvable/view",
     message: `404: LWR configuration for appId "${appId}" is not available`
   }),
-  SERVER_ERROR: (name) => ({
-    category: "lwrUnresolvable/fatal",
-    message: `500: Unexpected error fetching "${name}"`
-  }),
   INVALID_JSON: () => ({
     category: "lwrUnresolvable/invalid",
     message: "400: Accept header and json query parameter are incompatible"
@@ -105,5 +101,13 @@ ${error}`
   PRELOAD_MODULE: (specifier) => ({
     category: "lwrUnresolvable/invalid",
     message: `Invalid preload module: ${specifier}`
+  }),
+  INVALID_MODE: (mode) => ({
+    category: "lwrUnresolvable/invalid",
+    message: `No configuration found for server mode - ${mode}`
+  }),
+  SSR_TIMEOUT: (specifier, time) => ({
+    category: "lwrUnresolvable/ssr",
+    message: `Server side rendering '${specifier}' timed out after ${time}ms`
   })
 });

package/build/cjs/errors.cjs

@@ -9,8 +9,8 @@ var __export = (target, all) => {
 __markAsModule(exports);
 __export(exports, {
   DiagnosticsError: () => DiagnosticsError,
+  LwrApplicationError: () => LwrApplicationError,
   LwrConfigValidationError: () => LwrConfigValidationError,
-  LwrInvalidServerModeError: () => LwrInvalidServerModeError,
   LwrServerError: () => LwrServerError,
   LwrUnresolvableError: () => LwrUnresolvableError,
   createSingleDiagnosticError: () => createSingleDiagnosticError,
@@ -40,12 +40,23 @@ var DiagnosticsError = class extends Error {
     const message = this._message === void 0 ? "" : this._message + "\n";
     return message;
   }
-};
-var LwrInvalidServerModeError = class extends DiagnosticsError {
+  set message(message) {
+    this._message = message;
+  }
 };
 var LwrConfigValidationError = class extends DiagnosticsError {
 };
 var LwrUnresolvableError = class extends DiagnosticsError {
 };
 var LwrServerError = class extends DiagnosticsError {
+  constructor(message, diagnostics) {
+    super(message, diagnostics);
+    this.name = "ServerError";
+  }
+};
+var LwrApplicationError = class extends DiagnosticsError {
+  constructor(message, diagnostics) {
+    super(message, diagnostics);
+    this.name = "ApplicationError";
+  }
 };

package/build/cjs/logger.cjs

@@ -104,23 +104,29 @@ ${additionalMessage}`);
 var stringifyError = (error) => {
   if (error instanceof import_errors.DiagnosticsError) {
     return JSON.stringify({
-      message: error.message,
+      message: decodeMessage(error.message),
       diagnostics: error.diagnostics,
       stack: error.stack
     });
+  } else if (error.message) {
+    const message = error.message;
+    return decodeMessage(message);
   } else if (typeof error === "string" || error instanceof String) {
-    return error;
+    return decodeMessage(error);
   } else {
     const propertyNames = Object.getOwnPropertyNames(error);
     const retObj = {};
     for (let property, i = 0, len = propertyNames.length; i < len; ++i) {
       property = propertyNames[i];
       const descriptor = Object.getOwnPropertyDescriptor(error, property);
-      retObj[property] = descriptor?.value;
+      retObj[property] = decodeMessage(descriptor?.value);
     }
     return (0, import_util.inspect)(retObj);
   }
 };
+function decodeMessage(message) {
+  return typeof message === "string" || message instanceof String ? decodeURIComponent(message) : message;
+}
 function gap(message) {
   return String(message)?.indexOf("[") === 0 ? "" : " ";
 }

package/build/es/categories.d.ts

@@ -1,6 +1,7 @@
-export type DiagnosticCategory = DiagnosticLwrConfigCategory | DiagnosticCompiler | DiagnosticLwrUnresolvableCategory | DiagnosticLwrServer | '...more here';
+export type DiagnosticCategory = DiagnosticLwrConfigCategory | DiagnosticCompiler | DiagnosticLwrUnresolvableCategory | DiagnosticLwrServer | DiagnosticLwrApplication | '...more here';
 export type DiagnosticLwrConfigCategory = 'lwrConfig/invalidJson' | 'lwrConfig/invalidSchema';
-export type DiagnosticLwrUnresolvableCategory = 'lwrUnresolvable/asset' | 'lwrUnresolvable/module' | 'lwrUnresolvable/bundle' | 'lwrUnresolvable/label' | 'lwrUnresolvable/routes' | 'lwrUnresolvable/resource' | 'lwrUnresolvable/view' | 'lwrUnresolvable/invalid' | 'lwrUnresolvable/fatal';
+export type DiagnosticLwrUnresolvableCategory = 'lwrUnresolvable/asset' | 'lwrUnresolvable/module' | 'lwrUnresolvable/bundle' | 'lwrUnresolvable/label' | 'lwrUnresolvable/routes' | 'lwrUnresolvable/resource' | 'lwrUnresolvable/view' | 'lwrUnresolvable/ssr' | 'lwrUnresolvable/invalid';
 export type DiagnosticCompiler = 'compile/umd_transform';
-export type DiagnosticLwrServer = 'lwrServer/warmupError' | `lwrServer/invalidMode`;
+export type DiagnosticLwrServer = 'lwrServer/warmupError' | 'lwrServer/invalidMode' | 'lwrServer/fatal';
+export type DiagnosticLwrApplication = 'lwrApplication/routeHandler';
 //# sourceMappingURL=categories.d.ts.map

package/build/es/descriptions/application.d.ts

@@ -0,0 +1,10 @@
+export declare const application: {
+    ROUTE_HANDLER_ERROR: (route: string, error: string) => Omit<{
+        category: "lwrApplication/routeHandler";
+        message: string;
+    }, "message" | "advice"> & {
+        advice: import("../types.js").DiagnosticAdvice;
+        message: string;
+    };
+};
+//# sourceMappingURL=application.d.ts.map

package/build/es/descriptions/application.js

@@ -0,0 +1,8 @@
+import { createDiagnosticsCategory } from './core-diagnostics.js';
+export const application = createDiagnosticsCategory({
+    ROUTE_HANDLER_ERROR: (route, error) => ({
+        category: 'lwrApplication/routeHandler',
+        message: `An error occurred executing route handler for "${route}": "${error}"`,
+    }),
+});
+//# sourceMappingURL=application.js.map

package/build/es/descriptions/index.d.ts

@@ -277,13 +277,6 @@ export declare const descriptions: {
             advice: import("../types.js").DiagnosticAdvice;
             message: string;
         };
-        SERVER_ERROR: (name: string) => Omit<{
-            category: "lwrUnresolvable/fatal";
-            message: string;
-        }, "message" | "advice"> & {
-            advice: import("../types.js").DiagnosticAdvice;
-            message: string;
-        };
         INVALID_JSON: () => Omit<{
             category: "lwrUnresolvable/invalid";
             message: string;
@@ -333,6 +326,20 @@ export declare const descriptions: {
             advice: import("../types.js").DiagnosticAdvice;
             message: string;
         };
+        INVALID_MODE: (mode: string) => Omit<{
+            category: "lwrUnresolvable/invalid";
+            message: string;
+        }, "message" | "advice"> & {
+            advice: import("../types.js").DiagnosticAdvice;
+            message: string;
+        };
+        SSR_TIMEOUT: (specifier: string, time: number) => Omit<{
+            category: "lwrUnresolvable/ssr";
+            message: string;
+        }, "message" | "advice"> & {
+            advice: import("../types.js").DiagnosticAdvice;
+            message: string;
+        };
     };
     SERVER: {
         WARMUP_ERROR: (error: string) => Omit<{
@@ -342,8 +349,24 @@ export declare const descriptions: {
             advice: import("../types.js").DiagnosticAdvice;
             message: string;
         };
-        INVALID_MODE: (mode: string) => Omit<{
-            category: "lwrServer/invalidMode";
+        UNEXPECTED_ERROR: (error: string) => Omit<{
+            category: "lwrServer/fatal";
+            message: string;
+        }, "message" | "advice"> & {
+            advice: import("../types.js").DiagnosticAdvice;
+            message: string;
+        };
+        SERVER_ERROR: (name: string) => Omit<{
+            category: "lwrServer/fatal";
+            message: string;
+        }, "message" | "advice"> & {
+            advice: import("../types.js").DiagnosticAdvice;
+            message: string;
+        };
+    };
+    APPLICATION: {
+        ROUTE_HANDLER_ERROR: (route: string, error: string) => Omit<{
+            category: "lwrApplication/routeHandler";
             message: string;
         }, "message" | "advice"> & {
             advice: import("../types.js").DiagnosticAdvice;

package/build/es/descriptions/index.js

@@ -1,10 +1,12 @@
 import { configParser } from './configParser.js';
 import { unresolvable } from './unresolvable.js';
 import { server } from './server.js';
+import { application } from './application.js';
 export const descriptions = {
     CONFIG_PARSER: configParser,
     UNRESOLVABLE: unresolvable,
     SERVER: server,
+    APPLICATION: application,
 };
 export * from './core-diagnostics.js';
 //# sourceMappingURL=index.js.map

package/build/es/descriptions/server.d.ts

@@ -6,8 +6,15 @@ export declare const server: {
         advice: import("../types.js").DiagnosticAdvice;
         message: string;
     };
-    INVALID_MODE: (mode: string) => Omit<{
-        category: "lwrServer/invalidMode";
+    UNEXPECTED_ERROR: (error: string) => Omit<{
+        category: "lwrServer/fatal";
+        message: string;
+    }, "message" | "advice"> & {
+        advice: import("../types.js").DiagnosticAdvice;
+        message: string;
+    };
+    SERVER_ERROR: (name: string) => Omit<{
+        category: "lwrServer/fatal";
         message: string;
     }, "message" | "advice"> & {
         advice: import("../types.js").DiagnosticAdvice;

package/build/es/descriptions/server.js

@@ -4,9 +4,13 @@ export const server = createDiagnosticsCategory({
         category: 'lwrServer/warmupError',
         message: `An error occurred during warmup: ${error}`,
     }),
-    INVALID_MODE: (mode) => ({
-        category: 'lwrServer/invalidMode',
-        message: `No configuration found for server mode - ${mode}`,
+    UNEXPECTED_ERROR: (error) => ({
+        category: 'lwrServer/fatal',
+        message: `An unexpected error occurred: "${error}"`,
+    }),
+    SERVER_ERROR: (name) => ({
+        category: 'lwrServer/fatal',
+        message: `500: Unexpected error fetching "${name}"`,
     }),
 });
 //# sourceMappingURL=server.js.map

package/build/es/descriptions/unresolvable.d.ts

@@ -76,13 +76,6 @@ export declare const unresolvable: {
         advice: import("../types.js").DiagnosticAdvice;
         message: string;
     };
-    SERVER_ERROR: (name: string) => Omit<{
-        category: "lwrUnresolvable/fatal";
-        message: string;
-    }, "message" | "advice"> & {
-        advice: import("../types.js").DiagnosticAdvice;
-        message: string;
-    };
     INVALID_JSON: () => Omit<{
         category: "lwrUnresolvable/invalid";
         message: string;
@@ -132,5 +125,19 @@ export declare const unresolvable: {
         advice: import("../types.js").DiagnosticAdvice;
         message: string;
     };
+    INVALID_MODE: (mode: string) => Omit<{
+        category: "lwrUnresolvable/invalid";
+        message: string;
+    }, "message" | "advice"> & {
+        advice: import("../types.js").DiagnosticAdvice;
+        message: string;
+    };
+    SSR_TIMEOUT: (specifier: string, time: number) => Omit<{
+        category: "lwrUnresolvable/ssr";
+        message: string;
+    }, "message" | "advice"> & {
+        advice: import("../types.js").DiagnosticAdvice;
+        message: string;
+    };
 };
 //# sourceMappingURL=unresolvable.d.ts.map

package/build/es/descriptions/unresolvable.js

@@ -44,10 +44,6 @@ export const unresolvable = createDiagnosticsCategory({
         category: 'lwrUnresolvable/view',
         message: `404: LWR configuration for appId "${appId}" is not available`,
     }),
-    SERVER_ERROR: (name) => ({
-        category: 'lwrUnresolvable/fatal',
-        message: `500: Unexpected error fetching "${name}"`,
-    }),
     INVALID_JSON: () => ({
         category: 'lwrUnresolvable/invalid',
         message: '400: Accept header and json query parameter are incompatible',
@@ -76,5 +72,13 @@ export const unresolvable = createDiagnosticsCategory({
         category: 'lwrUnresolvable/invalid',
         message: `Invalid preload module: ${specifier}`,
     }),
+    INVALID_MODE: (mode) => ({
+        category: 'lwrUnresolvable/invalid',
+        message: `No configuration found for server mode - ${mode}`,
+    }),
+    SSR_TIMEOUT: (specifier, time) => ({
+        category: 'lwrUnresolvable/ssr',
+        message: `Server side rendering '${specifier}' timed out after ${time}ms`,
+    }),
 });
 //# sourceMappingURL=unresolvable.js.map

package/build/es/errors.d.ts

@@ -7,14 +7,17 @@ export declare class DiagnosticsError extends Error {
     private _memoMessage;
     private _message;
     get message(): string;
+    set message(message: string);
     diagnostics: Diagnostics;
 }
-export declare class LwrInvalidServerModeError extends DiagnosticsError {
-}
 export declare class LwrConfigValidationError extends DiagnosticsError {
 }
 export declare class LwrUnresolvableError extends DiagnosticsError {
 }
 export declare class LwrServerError extends DiagnosticsError {
+    constructor(message: undefined | string, diagnostics: Diagnostics);
+}
+export declare class LwrApplicationError extends DiagnosticsError {
+    constructor(message: undefined | string, diagnostics: Diagnostics);
 }
 //# sourceMappingURL=errors.d.ts.map

package/build/es/errors.js

@@ -25,13 +25,25 @@ export class DiagnosticsError extends Error {
         const message = this._message === undefined ? '' : this._message + '\n';
         return message;
     }
-}
-export class LwrInvalidServerModeError extends DiagnosticsError {
+    // Allow set message can be called from rollup ModuleLoader.addModuleSource
+    set message(message) {
+        this._message = message;
+    }
 }
 export class LwrConfigValidationError extends DiagnosticsError {
 }
 export class LwrUnresolvableError extends DiagnosticsError {
 }
 export class LwrServerError extends DiagnosticsError {
+    constructor(message, diagnostics) {
+        super(message, diagnostics);
+        this.name = 'ServerError';
+    }
+}
+export class LwrApplicationError extends DiagnosticsError {
+    constructor(message, diagnostics) {
+        super(message, diagnostics);
+        this.name = 'ApplicationError';
+    }
 }
 //# sourceMappingURL=errors.js.map

package/build/es/logger.js

@@ -74,13 +74,20 @@ function log(level, message, additionalInfo) {
 export const stringifyError = (error) => {
     if (error instanceof DiagnosticsError) {
         return JSON.stringify({
-            message: error.message,
+            // Message may have been encoded to prevent XSS
+            message: decodeMessage(error.message),
             diagnostics: error.diagnostics,
             stack: error.stack,
         });
     }
+    else if (error.message) {
+        const message = error.message;
+        // Message may have been encoded to prevent XSS
+        return decodeMessage(message);
+    }
     else if (typeof error === 'string' || error instanceof String) {
-        return error;
+        // Message may have been encoded to prevent XSS
+        return decodeMessage(error);
     }
     else {
         const propertyNames = Object.getOwnPropertyNames(error);
@@ -88,11 +95,17 @@ export const stringifyError = (error) => {
         for (let property, i = 0, len = propertyNames.length; i < len; ++i) {
             property = propertyNames[i];
             const descriptor = Object.getOwnPropertyDescriptor(error, property);
-            retObj[property] = descriptor?.value;
+            // Message may have been encoded to prevent XSS
+            retObj[property] = decodeMessage(descriptor?.value);
         }
         return inspect(retObj);
     }
 };
+function decodeMessage(message) {
+    return typeof message === 'string' || message instanceof String
+        ? decodeURIComponent(message)
+        : message;
+}
 // Return a space if there should be a space between the message and the level
 function gap(message) {
     return String(message)?.indexOf('[') === 0 ? '' : ' ';

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.9",
+    "version": "0.12.1",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -35,7 +35,7 @@
         "test": "jest"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.9",
+        "@lwrjs/types": "0.12.1",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6",
         "typescript": "^4.9.5"
@@ -46,5 +46,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "58b28fbc6300b704ac17f8878423120de0e376d7"
+    "gitHead": "4f8b2759b540af7443f07528980ddb0e7d4d5e3a"
 }