@lightsparkdev/core 1.0.13 → 1.0.14

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lightsparkdev/core
 
+## 1.0.14
+
+### Patch Changes
+
+- b9dd0c2: Return null if !error in errorToJSON
+
 ## 1.0.13
 
 ### Patch Changes

package/dist/{chunk-ADJSE2YZ.js → chunk-ZLX5HJ4C.js}

@@ -729,6 +729,9 @@ var isErrorMsg = (e, msg) => {
   return false;
 };
 function errorToJSON(err) {
+  if (!err) {
+    return null;
+  }
   if (typeof err === "object" && err !== null && "toJSON" in err && typeof err.toJSON === "function") {
     return err.toJSON();
   }

package/dist/index.cjs

@@ -112,10 +112,14 @@ var isTest = isNode && process.env.NODE_ENV === "test";
 var Logger = class {
   context;
   loggingEnabled = false;
+  loggingLevel = 1 /* Info */;
   constructor(loggerContext, getLoggingEnabled) {
     this.context = loggerContext;
     void this.updateLoggingEnabled(getLoggingEnabled);
   }
+  setLevel(level) {
+    this.loggingLevel = level;
+  }
   async updateLoggingEnabled(getLoggingEnabled) {
     if (getLoggingEnabled) {
       this.loggingEnabled = await getLoggingEnabled();
@@ -133,8 +137,13 @@ var Logger = class {
       console.log(`[${this.context}] Logging enabled`);
     }
   }
+  trace(message, ...rest) {
+    if (this.loggingEnabled && this.loggingLevel === 0 /* Trace */) {
+      console.log(`[${this.context}] ${message}`, ...rest);
+    }
+  }
   info(message, ...rest) {
-    if (this.loggingEnabled) {
+    if (this.loggingEnabled && this.loggingLevel <= 1 /* Info */) {
       console.log(`[${this.context}] ${message}`, ...rest);
     }
   }
@@ -1123,6 +1132,9 @@ var isErrorMsg = (e, msg) => {
   return false;
 };
 function errorToJSON(err) {
+  if (!err) {
+    return null;
+  }
   if (typeof err === "object" && err !== null && "toJSON" in err && typeof err.toJSON === "function") {
     return err.toJSON();
   }
@@ -1421,14 +1433,14 @@ var Requester = class {
     return query.constructObject(data);
   }
   subscribe(queryPayload, variables = {}) {
-    logger.info(`Requester.subscribe variables`, variables);
+    logger.trace(`Requester.subscribe variables`, variables);
     const operationNameRegex = /^\s*(query|mutation|subscription)\s+(\w+)/i;
     const operationMatch = queryPayload.match(operationNameRegex);
     if (!operationMatch || operationMatch.length < 3) {
       throw new LightsparkException_default("InvalidQuery", "Invalid query payload");
     }
     const operationType = operationMatch[1];
-    logger.info(`Requester.subscribe operationType`, operationType);
+    logger.trace(`Requester.subscribe operationType`, operationType);
     if (operationType == "mutation") {
       throw new LightsparkException_default(
         "InvalidQuery",
@@ -1447,7 +1459,7 @@ var Requester = class {
       operationName: operation
     };
     return new import_zen_observable_ts.Observable((observer) => {
-      logger.info(`Requester.subscribe observer`, observer);
+      logger.trace(`Requester.subscribe observer`, observer);
       return this.wsClient.subscribe(bodyData, {
         next: (data) => observer.next(data),
         error: (err) => observer.error(err),
@@ -1498,7 +1510,7 @@ var Requester = class {
       urlWithProtocol = `https://${urlWithProtocol}`;
     }
     const url = `${urlWithProtocol}/${this.schemaEndpoint}`;
-    logger.info(`Requester.makeRawRequest`, {
+    logger.trace(`Requester.makeRawRequest`, {
       url,
       operationName: operation,
       variables

package/dist/index.d.cts

@@ -9,11 +9,18 @@ declare class LightsparkException extends Error {
 }
 
 type GetLoggingEnabled = (() => Promise<boolean> | boolean) | undefined;
+declare enum LoggingLevel {
+    Trace = 0,
+    Info = 1
+}
 declare class Logger {
     context: string;
     loggingEnabled: boolean;
+    loggingLevel: LoggingLevel;
     constructor(loggerContext: string, getLoggingEnabled?: GetLoggingEnabled);
+    setLevel(level: LoggingLevel): void;
     updateLoggingEnabled(getLoggingEnabled: GetLoggingEnabled): Promise<void>;
+    trace(message: string, ...rest: unknown[]): void;
     info(message: string, ...rest: unknown[]): void;
 }
 

package/dist/index.d.ts

@@ -9,11 +9,18 @@ declare class LightsparkException extends Error {
 }
 
 type GetLoggingEnabled = (() => Promise<boolean> | boolean) | undefined;
+declare enum LoggingLevel {
+    Trace = 0,
+    Info = 1
+}
 declare class Logger {
     context: string;
     loggingEnabled: boolean;
+    loggingLevel: LoggingLevel;
     constructor(loggerContext: string, getLoggingEnabled?: GetLoggingEnabled);
+    setLevel(level: LoggingLevel): void;
     updateLoggingEnabled(getLoggingEnabled: GetLoggingEnabled): Promise<void>;
+    trace(message: string, ...rest: unknown[]): void;
     info(message: string, ...rest: unknown[]): void;
 }
 

package/dist/index.js

@@ -40,16 +40,20 @@ import {
   setLocalStorageBoolean,
   sleep,
   urlsafe_b64decode
-} from "./chunk-ADJSE2YZ.js";
+} from "./chunk-ZLX5HJ4C.js";
 
 // src/Logger.ts
 var Logger = class {
   context;
   loggingEnabled = false;
+  loggingLevel = 1 /* Info */;
   constructor(loggerContext, getLoggingEnabled) {
     this.context = loggerContext;
     void this.updateLoggingEnabled(getLoggingEnabled);
   }
+  setLevel(level) {
+    this.loggingLevel = level;
+  }
   async updateLoggingEnabled(getLoggingEnabled) {
     if (getLoggingEnabled) {
       this.loggingEnabled = await getLoggingEnabled();
@@ -67,8 +71,13 @@ var Logger = class {
       console.log(`[${this.context}] Logging enabled`);
     }
   }
+  trace(message, ...rest) {
+    if (this.loggingEnabled && this.loggingLevel === 0 /* Trace */) {
+      console.log(`[${this.context}] ${message}`, ...rest);
+    }
+  }
   info(message, ...rest) {
-    if (this.loggingEnabled) {
+    if (this.loggingEnabled && this.loggingLevel <= 1 /* Info */) {
       console.log(`[${this.context}] ${message}`, ...rest);
     }
   }
@@ -483,14 +492,14 @@ var Requester = class {
     return query.constructObject(data);
   }
   subscribe(queryPayload, variables = {}) {
-    logger.info(`Requester.subscribe variables`, variables);
+    logger.trace(`Requester.subscribe variables`, variables);
     const operationNameRegex = /^\s*(query|mutation|subscription)\s+(\w+)/i;
     const operationMatch = queryPayload.match(operationNameRegex);
     if (!operationMatch || operationMatch.length < 3) {
       throw new LightsparkException_default("InvalidQuery", "Invalid query payload");
     }
     const operationType = operationMatch[1];
-    logger.info(`Requester.subscribe operationType`, operationType);
+    logger.trace(`Requester.subscribe operationType`, operationType);
     if (operationType == "mutation") {
       throw new LightsparkException_default(
         "InvalidQuery",
@@ -509,7 +518,7 @@ var Requester = class {
       operationName: operation
     };
     return new Observable((observer) => {
-      logger.info(`Requester.subscribe observer`, observer);
+      logger.trace(`Requester.subscribe observer`, observer);
       return this.wsClient.subscribe(bodyData, {
         next: (data) => observer.next(data),
         error: (err) => observer.error(err),
@@ -560,7 +569,7 @@ var Requester = class {
       urlWithProtocol = `https://${urlWithProtocol}`;
     }
     const url = `${urlWithProtocol}/${this.schemaEndpoint}`;
-    logger.info(`Requester.makeRawRequest`, {
+    logger.trace(`Requester.makeRawRequest`, {
       url,
       operationName: operation,
       variables

package/dist/utils/index.cjs

@@ -804,6 +804,9 @@ var isErrorMsg = (e, msg) => {
   return false;
 };
 function errorToJSON(err) {
+  if (!err) {
+    return null;
+  }
   if (typeof err === "object" && err !== null && "toJSON" in err && typeof err.toJSON === "function") {
     return err.toJSON();
   }

package/dist/utils/index.js

@@ -39,7 +39,7 @@ import {
   setLocalStorageBoolean,
   sleep,
   urlsafe_b64decode
-} from "../chunk-ADJSE2YZ.js";
+} from "../chunk-ZLX5HJ4C.js";
 export {
   CurrencyUnit,
   abbrCurrencyUnit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightsparkdev/core",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Lightspark JS SDK",
   "author": "Lightspark Inc.",
   "keywords": [

package/src/Logger.ts

@@ -3,15 +3,25 @@ import { isBrowser, isTest } from "./utils/environment.js";
 
 type GetLoggingEnabled = (() => Promise<boolean> | boolean) | undefined;
 
+export enum LoggingLevel {
+  Trace,
+  Info,
+}
+
 export class Logger {
   context: string;
   loggingEnabled = false;
+  loggingLevel: LoggingLevel = LoggingLevel.Info;
 
   constructor(loggerContext: string, getLoggingEnabled?: GetLoggingEnabled) {
     this.context = loggerContext;
     void this.updateLoggingEnabled(getLoggingEnabled);
   }
 
+  public setLevel(level: LoggingLevel) {
+    this.loggingLevel = level;
+  }
+
   async updateLoggingEnabled(getLoggingEnabled: GetLoggingEnabled) {
     if (getLoggingEnabled) {
       this.loggingEnabled = await getLoggingEnabled();
@@ -32,8 +42,14 @@ export class Logger {
     }
   }
 
+  trace(message: string, ...rest: unknown[]) {
+    if (this.loggingEnabled && this.loggingLevel === LoggingLevel.Trace) {
+      console.log(`[${this.context}] ${message}`, ...rest);
+    }
+  }
+
   info(message: string, ...rest: unknown[]) {
-    if (this.loggingEnabled) {
+    if (this.loggingEnabled && this.loggingLevel <= LoggingLevel.Info) {
       console.log(`[${this.context}] ${message}`, ...rest);
     }
   }

package/src/requester/Requester.ts

@@ -77,14 +77,14 @@ class Requester {
     queryPayload: string,
     variables: { [key: string]: unknown } = {},
   ) {
-    logger.info(`Requester.subscribe variables`, variables);
+    logger.trace(`Requester.subscribe variables`, variables);
     const operationNameRegex = /^\s*(query|mutation|subscription)\s+(\w+)/i;
     const operationMatch = queryPayload.match(operationNameRegex);
     if (!operationMatch || operationMatch.length < 3) {
       throw new LightsparkException("InvalidQuery", "Invalid query payload");
     }
     const operationType = operationMatch[1];
-    logger.info(`Requester.subscribe operationType`, operationType);
+    logger.trace(`Requester.subscribe operationType`, operationType);
     if (operationType == "mutation") {
       throw new LightsparkException(
         "InvalidQuery",
@@ -105,7 +105,7 @@ class Requester {
     };
 
     return new Observable<{ data: T }>((observer) => {
-      logger.info(`Requester.subscribe observer`, observer);
+      logger.trace(`Requester.subscribe observer`, observer);
       return this.wsClient.subscribe(bodyData, {
         next: (data) => observer.next(data as { data: T }),
         error: (err) => observer.error(err),
@@ -173,7 +173,7 @@ class Requester {
 
     const url = `${urlWithProtocol}/${this.schemaEndpoint}`;
 
-    logger.info(`Requester.makeRawRequest`, {
+    logger.trace(`Requester.makeRawRequest`, {
       url,
       operationName: operation,
       variables,

package/src/utils/errors.ts

@@ -38,6 +38,9 @@ export const isErrorMsg = (e: unknown, msg: string) => {
 };
 
 export function errorToJSON(err: unknown) {
+  if (!err) {
+    return null;
+  }
   if (
     typeof err === "object" &&
     err !== null &&