@carbonorm/carbonreact 3.3.1 → 3.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonreact",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "browser": "dist/index.umd.js",
   "module": "dist/index.esm.js",
   "main": "dist/index.cjs.js",

package/src/hoc/setupTests.tsx

@@ -4,15 +4,15 @@ import {checkAllRequestsComplete, isVerbose} from "@carbonorm/carbonnode";
 import {waitFor} from "@testing-library/react";
 import {validSQL} from "./validSQL";
 
-export default function () {
+export default function ({sqlDirectory = './logs/rest/', logsDirectory = './logs/tests/'}: { sqlDirectory?: string, logsDirectory?: string } = {}) {
 
-    const origionalWindowLocation = window.location
+    const originalWindowLocation = window.location
 
     const testName = () => expect.getState().currentTestName?.replaceAll(" ", "_").toLowerCase()
 
-    const validSqlFile = () => './logs/rest/' + testName() + '.json';
+    const validSqlFile = () => sqlDirectory + testName() + '.json';
 
-    const logsFile = () => './logs/tests/' + testName() + '.log';
+    const logsFile = () => logsDirectory + testName() + '.log';
 
     /* eslint-disable no-undef */
     expect(document).not.toBeNull();
@@ -20,29 +20,29 @@ export default function () {
 
     const orig = console;
 
-// @link https://stackoverflow.com/questions/13542667/create-directory-when-writing-to-file-in-node-js
-    const superLogger = async (...args) => fs.writeFileSync(
+    // @link https://stackoverflow.com/questions/13542667/create-directory-when-writing-to-file-in-node-js
+    const asyncFileLogging = async (...args) => fs.writeFileSync(
         logsFile(),
         '\n' + inspect(args.length === 1 ? args.pop() : args, false, 10, true),
         {flag: "a+"});
 
-// noinspection CommaExpressionJS
+    // noinspection CommaExpressionJS
     global.console = {
         ...console,
         // use jest.fn() to silence, comment out to leave as it is
-        log: (...args) => (isVerbose && orig.log(...args), superLogger('log', ...args)),
-        error: (...args) => (isVerbose && orig.error(...args), superLogger('error', ...args)),
-        warn: (...args) => (isVerbose && orig.warn(...args), superLogger('warn', ...args)),
-        info: (...args) => (isVerbose && orig.info(...args), superLogger('info', ...args)),
-        debug: (...args) => (isVerbose && orig.debug(...args), superLogger('debug', ...args)),
-        table: (...args) => (isVerbose && orig.table(...args), superLogger('table', ...args)),
-        trace: (...args) => (isVerbose && orig.trace(...args), superLogger((() => {
+        log: (...args) => (isVerbose && orig.log(...args), asyncFileLogging('log', ...args)),
+        error: (...args) => (isVerbose && orig.error(...args), asyncFileLogging('error', ...args)),
+        warn: (...args) => (isVerbose && orig.warn(...args), asyncFileLogging('warn', ...args)),
+        info: (...args) => (isVerbose && orig.info(...args), asyncFileLogging('info', ...args)),
+        debug: (...args) => (isVerbose && orig.debug(...args), asyncFileLogging('debug', ...args)),
+        table: (...args) => (isVerbose && orig.table(...args), asyncFileLogging('table', ...args)),
+        trace: (...args) => (isVerbose && orig.trace(...args), asyncFileLogging((() => {
             const err = new Error();
             return err.stack;
         })())),
-        group: (...args) => (isVerbose && orig.group(...args), superLogger('group', ...args)),
-        groupCollapsed: (...args) => (isVerbose && orig.groupCollapsed(args), superLogger('groupCollapsed', ...args)),
-        groupEnd: () => (isVerbose && orig.groupEnd(), superLogger('groupEnd')),
+        group: (...args) => (isVerbose && orig.group(...args), asyncFileLogging('group', ...args)),
+        groupCollapsed: (...args) => (isVerbose && orig.groupCollapsed(args), asyncFileLogging('groupCollapsed', ...args)),
+        groupEnd: () => (isVerbose && orig.groupEnd(), asyncFileLogging('groupEnd')),
     };
 
     afterEach(async () => {
@@ -60,7 +60,7 @@ export default function () {
 
         // restore `window.location` to the original `jsdom`
         // `Location` object
-        window.location = origionalWindowLocation
+        window.location = originalWindowLocation
 
         fs.writeFileSync(validSqlFile(), JSON.stringify(validSQL, undefined, 2) ?? '');
 

package/src/hoc/validSQL.tsx

@@ -7,4 +7,5 @@ export default function (sql: any) {
 
     validSQL.push({[expect.getState().currentTestName.replaceAll(" ", "_").toLowerCase()]: sql});
 
-}
+}
+