@carbonorm/carbonreact 5.0.4 → 6.0.1

package/src/{CarbonReact.tsx → core/CarbonReact.tsx}

@@ -1,15 +1,13 @@
-import changed from "hoc/changed";
-import {GlobalHistory} from "hoc/GlobalHistory";
-import hexToRgb from "hoc/hexToRgb";
+import changed from "utils/changed";
+import {GlobalHistory} from "routing/GlobalHistory";
 import {Component, Context, createContext, ReactElement, ReactNode} from 'react';
 import {ToastContainer} from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import BackendThrowable from 'components/Errors/BackendThrowable';
-import Nest from 'components/Nest/Nest';
-import {initialRestfulObjectsState, iRestfulObjectArrayTypes} from "variables/C6";
-import CarbonWebSocket, {iCarbonWebSocketProps} from "./components/WebSocket/CarbonWebSocket";
-import updateRestfulObjectArrays, {iUpdateRestfulObjectArrays} from "./hoc/updateRestfulObjectArrays";
-import deleteRestfulObjectArrays, {iDeleteRestfulObjectArrays} from "./hoc/deleteRestfulObjectArrays";
+import {initialRestfulObjectsState, iRestfulObjectArrayTypes} from "schema/C6";
+import CarbonWebSocket, {iCarbonWebSocketProps} from "components/WebSocket/CarbonWebSocket";
+import updateRestfulObjectArrays, {iUpdateRestfulObjectArrays} from "state/updateRestfulObjectArrays";
+import deleteRestfulObjectArrays, {iDeleteRestfulObjectArrays} from "state/deleteRestfulObjectArrays";
 import {BrowserRouter, HashRouter, MemoryRouter} from "react-router-dom";
 
 export type tStatefulApiData<T extends { [key: string]: any } = {}> = T[] | undefined | null;
@@ -51,6 +49,8 @@ export enum eRouterType {
     MemoryRouter,
 }
 
+const canUseDom = () => typeof window !== "undefined" && typeof document !== "undefined";
+
 abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactState> extends Component<{
     children?: ReactNode | ReactNode[],
     instanceId?: string,
@@ -105,7 +105,7 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         ...rest
     });
 
-    static lastLocation = window.location.pathname;
+    static lastLocation = typeof window === "undefined" ? "" : window.location.pathname;
 
     static whyDidYouRender = true;
 
@@ -157,10 +157,10 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
     }
 
     componentDidUpdate(_prevProps: Readonly<P>, _prevState: Readonly<S>, _snapshot?: any) {
-        if (CarbonReact.lastLocation !== location.pathname) {
+        if (typeof location !== "undefined" && CarbonReact.lastLocation !== location.pathname) {
             CarbonReact.lastLocation = location.pathname;
             const websocket = this.state.websocket;
-            if (websocket?.readyState === WebSocket.OPEN) {
+            if (typeof WebSocket !== "undefined" && websocket?.readyState === WebSocket.OPEN) {
                 websocket.send(location.pathname);
                 console.log(location.pathname);
             }
@@ -168,7 +168,8 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
     }
 
     reactRouterContext(children: ReactElement) {
-        switch (this.props.routerType ?? eRouterType.BrowserRouter) {
+        const routerType = this.props.routerType ?? (canUseDom() ? eRouterType.BrowserRouter : eRouterType.MemoryRouter);
+        switch (routerType) {
             case eRouterType.BrowserRouter:
                 return <BrowserRouter>{children}</BrowserRouter>
             case eRouterType.MemoryRouter:
@@ -183,31 +184,24 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
     render(): ReactElement {
         console.log('CarbonORM TSX RENDER');
 
-        const colorHex = '#' + Math.random().toString(16).slice(-6);
-
-        console.log('%c color (' + colorHex + ')', 'color: ' + colorHex);
-
-        const nest = <Nest position={'fixed'} backgroundColor={''} color={hexToRgb(colorHex)} count={100}/>;
+        const canUseDomNow = canUseDom();
 
         if (this.state.backendThrowable.length > 0) {
-            return <>
-                {nest}
-                <BackendThrowable instance={this}/>
-            </>;
+            return <BackendThrowable instance={this}/>;
         }
 
         this.context = createContext(this.state)
         const Context = this.context.Provider;
 
         return this.reactRouterContext(<>
-            <GlobalHistory/>
-            {this.props.websocket &&
+            {canUseDomNow && <GlobalHistory/>}
+            {canUseDomNow && this.props.websocket &&
                 <CarbonWebSocket<P, S> {...(false !== this.props.websocket ? this.props.websocket : {})}
                                        instance={this}/>}
             <Context value={this.state}>
                 {this.props.children}
             </Context>
-            <ToastContainer/>
+            {canUseDomNow && <ToastContainer/>}
         </>);
     }
 }

package/src/{hoc → dom}/isEdgeBrowser.tsx

@@ -3,5 +3,7 @@
 // Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) \
 // Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.26
 
-const isEdgeBrowser = window.navigator.userAgent.indexOf("Edg") > -1
-export default isEdgeBrowser
+const isEdgeBrowser = typeof window !== "undefined"
+    && typeof window.navigator !== "undefined"
+    && window.navigator.userAgent.indexOf("Edg") > -1
+export default isEdgeBrowser

package/src/{hoc → dom}/setCookies.tsx

@@ -11,7 +11,7 @@ export default function setCookies(cookies: string[], req: AxiosResponse | undef
             .replace("HttpOnly", "")
             .replace("secure", "");
 
-        if (document === undefined || document === null) {
+        if (typeof document === "undefined" || document === null) {
 
             const getStackTrace = function () {
                 let obj: any = {};

package/src/env/getEnv.ts

@@ -0,0 +1,29 @@
+function getProcessEnv(key: string): string | undefined {
+    // works in node + most polyfills
+    return typeof process !== "undefined" ? process.env?.[key] : undefined;
+}
+
+function getViteEnv(key: string): string | undefined {
+    // IMPORTANT:
+    // this file must be ESM-compatible in any environment where it's executed
+    // because import.meta may not even parse in CJS contexts
+    // @ts-ignore
+    return typeof import.meta !== "undefined" ? import.meta.env?.[key] : undefined;
+}
+
+export function getEnv<T = string>(key: string, fallback?: T): T {
+    // Prefer process.env in SSR/node (secrets, runtime config)
+    const proc = getProcessEnv(key);
+    if (proc !== undefined) return proc as T;
+
+    // Vite client / build-time vars
+    try {
+        const vite = getViteEnv(key);
+        if (vite !== undefined) return vite as T;
+    } catch {
+        // ignore
+    }
+
+    if (fallback !== undefined) return fallback;
+    throw new Error(`Missing required environment variable: ${key}`);
+}

package/src/env/isProduction.tsx

@@ -0,0 +1,6 @@
+import {getEnv} from "./getEnv";
+
+// @ts-ignore
+const isProduction = () => getEnv("NODE_ENV", "") === "production"
+
+export default isProduction

package/src/{hoc → hooks}/windowDimensions.tsx

@@ -1,6 +1,10 @@
 import { useState, useEffect } from 'react';
 
 function getWindowDimensions() {
+    if (typeof window === "undefined") {
+        return { width: 0, height: 0 };
+    }
+
     const { innerWidth: width, innerHeight: height } = window;
     return {
         width,
@@ -12,6 +16,10 @@ export default function useWindowDimensions() {
     const [windowDimensions, setWindowDimensions] = useState(getWindowDimensions());
 
     useEffect(() => {
+        if (typeof window === "undefined") {
+            return;
+        }
+
         function handleResize() {
             setWindowDimensions(getWindowDimensions());
         }
@@ -21,4 +29,4 @@ export default function useWindowDimensions() {
     }, []);
 
     return windowDimensions;
-}
+}

package/src/index.ts

@@ -2,13 +2,8 @@
  * @file Automatically generated by barrelsby.
  */
 
-export { default as CarbonReact } from "./CarbonReact";
-export * from "./CarbonReact";
-export { default as getStatefulObjectWithWhere } from "./api/hoc/getStatefulObjectWithWhere";
-export * from "./api/hoc/getStatefulObjectWithWhere";
-export * from "./api/hoc/useEffectOnce";
-export { default as watchInputElementChangeEvent } from "./api/hoc/watchInputElementChangeEvent";
-export * from "./api/hoc/watchInputElementChangeEvent";
+export { default as getStatefulObjectWithWhere } from "./api/getStatefulObjectWithWhere";
+export * from "./api/getStatefulObjectWithWhere";
 export { default as Alert } from "./components/Alert/Alert";
 export * from "./components/Alert/Alert";
 export { default as AccessDenied } from "./components/Errors/AccessDenied";
@@ -21,46 +16,48 @@ export { default as PageNotFound } from "./components/Errors/PageNotFound";
 export * from "./components/Errors/PageNotFound";
 export { default as Loading } from "./components/Loading/Loading";
 export * from "./components/Loading/Loading";
-export { default as Nest } from "./components/Nest/Nest";
-export * from "./components/Nest/Nest";
 export { default as OutsideClickHandler } from "./components/OutsideClickHandler/OutsideClickHandler";
 export * from "./components/OutsideClickHandler/OutsideClickHandler";
 export { default as Popup } from "./components/Popup/Popup";
 export * from "./components/Popup/Popup";
 export { default as CarbonWebSocket } from "./components/WebSocket/CarbonWebSocket";
 export * from "./components/WebSocket/CarbonWebSocket";
-export * from "./hoc/GlobalHistory";
-export * from "./hoc/KeysMatching";
-export * from "./hoc/SubsetMatching";
-export { default as addValidSQL } from "./hoc/addValidSQL";
-export * from "./hoc/addValidSQL";
-export { default as changed } from "./hoc/changed";
-export * from "./hoc/changed";
-export { default as deleteRestfulObjectArrays } from "./hoc/deleteRestfulObjectArrays";
-export * from "./hoc/deleteRestfulObjectArrays";
-export { default as getStyles } from "./hoc/getStyles";
-export * from "./hoc/getStyles";
-export { default as hexToRgb } from "./hoc/hexToRgb";
-export * from "./hoc/hexToRgb";
-export { default as isEdgeBrowser } from "./hoc/isEdgeBrowser";
-export * from "./hoc/isEdgeBrowser";
-export * from "./hoc/parseMultipleJson";
-export { default as scrollIntoView } from "./hoc/scrollIntoView";
-export * from "./hoc/scrollIntoView";
-export { default as setCookies } from "./hoc/setCookies";
-export * from "./hoc/setCookies";
-export { default as setUrl } from "./hoc/setUrl";
-export * from "./hoc/setUrl";
-export { default as setupTests } from "./hoc/setupTests";
-export * from "./hoc/setupTests";
-export { default as updateRestfulObjectArrays } from "./hoc/updateRestfulObjectArrays";
-export * from "./hoc/updateRestfulObjectArrays";
-export { default as uploadImage } from "./hoc/uploadImage";
-export * from "./hoc/uploadImage";
-export { default as validSQL } from "./hoc/validSQL";
-export * from "./hoc/validSQL";
-export { default as windowDimensions } from "./hoc/windowDimensions";
-export * from "./hoc/windowDimensions";
-export * from "./variables/C6";
-export { default as isProduction } from "./variables/isProduction";
-export * from "./variables/isProduction";
+export { default as CarbonReact } from "./core/CarbonReact";
+export * from "./core/CarbonReact";
+export { default as isEdgeBrowser } from "./dom/isEdgeBrowser";
+export * from "./dom/isEdgeBrowser";
+export { default as scrollIntoView } from "./dom/scrollIntoView";
+export * from "./dom/scrollIntoView";
+export { default as setCookies } from "./dom/setCookies";
+export * from "./dom/setCookies";
+export { default as uploadImage } from "./dom/uploadImage";
+export * from "./dom/uploadImage";
+export { default as watchInputElementChangeEvent } from "./dom/watchInputElementChangeEvent";
+export * from "./dom/watchInputElementChangeEvent";
+export * from "./env/getEnv";
+export { default as isProduction } from "./env/isProduction";
+export * from "./env/isProduction";
+export * from "./hooks/useEffectOnce";
+export { default as windowDimensions } from "./hooks/windowDimensions";
+export * from "./hooks/windowDimensions";
+export * from "./routing/GlobalHistory";
+export * from "./schema/C6";
+export { default as deleteRestfulObjectArrays } from "./state/deleteRestfulObjectArrays";
+export * from "./state/deleteRestfulObjectArrays";
+export { default as updateRestfulObjectArrays } from "./state/updateRestfulObjectArrays";
+export * from "./state/updateRestfulObjectArrays";
+export { default as getStyles } from "./styles/getStyles";
+export * from "./styles/getStyles";
+export { default as addValidSQL } from "./testing/addValidSQL";
+export * from "./testing/addValidSQL";
+export { default as setupTests } from "./testing/setupTests";
+export * from "./testing/setupTests";
+export { default as validSQL } from "./testing/validSQL";
+export * from "./testing/validSQL";
+export * from "./types/KeysMatching";
+export * from "./types/SubsetMatching";
+export { default as changed } from "./utils/changed";
+export * from "./utils/changed";
+export { default as hexToRgb } from "./utils/hexToRgb";
+export * from "./utils/hexToRgb";
+export * from "./utils/parseMultipleJson";

package/src/{variables → schema}/C6.tsx

@@ -1,4 +1,4 @@
-import { tStatefulApiData } from "CarbonReact";
+import { tStatefulApiData } from "core/CarbonReact";
 
 export interface stringMap {
     [key: string]: string;
@@ -3301,4 +3301,3 @@ export const initialRestfulObjectsState: iRestfulObjectArrayTypes = {
 
 export type tRestfulObjectArrayValues = iRestfulObjectArrayTypes[keyof iRestfulObjectArrayTypes];
 
-

package/src/{hoc → state}/deleteRestfulObjectArrays.tsx

@@ -1,5 +1,5 @@
-import CarbonReact, { iCarbonReactState, tStatefulApiData } from "CarbonReact";
-import { KeysMatching } from "./KeysMatching";
+import CarbonReact, { iCarbonReactState, tStatefulApiData } from "core/CarbonReact";
+import { KeysMatching } from "types/KeysMatching";
 
 export interface iDeleteRestfulObjectArrays<
     ObjectType extends {

package/src/{hoc → state}/updateRestfulObjectArrays.tsx

@@ -1,6 +1,6 @@
-import CarbonReact, { iCarbonReactState, tStatefulApiData } from "CarbonReact";
-import { KeysMatching } from "./KeysMatching";
-import { SubsetMatching } from "./SubsetMatching";
+import CarbonReact, { iCarbonReactState, tStatefulApiData } from "core/CarbonReact";
+import { KeysMatching } from "types/KeysMatching";
+import { SubsetMatching } from "types/SubsetMatching";
 
 export enum eUpdateInsertMethod {
     REPLACE,

package/src/{hoc → styles}/getStyles.tsx

@@ -1,9 +1,13 @@
 import classNames from "classnames";
-import BootstrapStyle from "variables/bootstrap.module.css"
+import BootstrapStyle from "styles/bootstrap.module.css"
 import Styles from "style.module.css"
 
 export const getRootStyleValue = (property = '--dig_primary_color') : string => {
 
+    if (typeof document === "undefined" || typeof getComputedStyle === "undefined") {
+        return "";
+    }
+
     return getComputedStyle(document.documentElement)
         .getPropertyValue(property).trim();
 
@@ -41,4 +45,4 @@ export default function getStyles<iCSS extends {}>(overrides: iCSS = {} as iCSS)
 
     return mergeStyles(dropStyles, overrides)
 
-}
+}

package/src/{hoc → testing}/setupTests.tsx

@@ -1,14 +1,34 @@
 import {axiosInstance, checkAllRequestsComplete, isVerbose} from "@carbonorm/carbonnode";
-import {waitFor} from "@testing-library/react";
 import ValidSQL, {validSQL} from "./validSQL";
 
+const nodeModulePromise = typeof process !== "undefined" && process.versions?.node
+    ? Promise.all([
+        import("node:fs"),
+        import("node:util"),
+        import("@testing-library/react"),
+    ])
+    : null;
+
+const getNodeModules = async () => {
+    if (!nodeModulePromise) {
+        throw new Error("setupTests requires a Node runtime.");
+    }
+
+    const [fsModule, utilModule, testingLib] = await nodeModulePromise;
+    return {
+        fs: fsModule,
+        inspect: utilModule.inspect,
+        waitFor: testingLib.waitFor,
+    };
+};
+
 export default function ({sqlDirectory = './logs/rest/', logsDirectory = './logs/tests/'}: {
     sqlDirectory?: string,
     logsDirectory?: string
 } = {}) {
-
-    const fs = require("fs");
-    const {inspect} = require("util");
+    if (!nodeModulePromise) {
+        throw new Error("setupTests requires a Node runtime.");
+    }
 
     const originalWindowLocation = window.location.href
 
@@ -36,10 +56,14 @@ export default function ({sqlDirectory = './logs/rest/', logsDirectory = './logs
         })
 
     // @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+"});
+    const asyncFileLogging = async (...args) => {
+        const {fs, inspect} = await getNodeModules();
+        fs.writeFileSync(
+            logsFile(),
+            '\n' + inspect(args.length === 1 ? args.pop() : args, false, 10, true),
+            {flag: "a+"}
+        );
+    };
 
     global.console = {
         ...console,
@@ -61,6 +85,8 @@ export default function ({sqlDirectory = './logs/rest/', logsDirectory = './logs
 
     afterEach(async () => {
 
+        const {waitFor, fs} = await getNodeModules();
+
         await waitFor(async () => {
 
             expect(checkAllRequestsComplete()).toEqual(true);

package/dist/components/Nest/Nest.d.ts

@@ -1,49 +0,0 @@
-import React from "react";
-export declare const range: (n: any) => number[];
-interface iTwoD {
-    max: number;
-    x: number | null;
-    y: number | null;
-}
-interface iTwoDAnimated extends iTwoD {
-    ya: number;
-    xa: number;
-}
-type NestProps = typeof Nest.defaultProps & {
-    children?: any;
-    position: "relative" | "-moz-initial" | "inherit" | "initial" | "revert" | "unset" | "-webkit-sticky" | "absolute" | "fixed" | "static" | "sticky";
-};
-export default class Nest extends React.Component<NestProps, {}> {
-    static defaultProps: {
-        backgroundColor: string;
-        display: string;
-        top: number;
-        left: number;
-        zIndex: number;
-        count: number;
-        opacity: number;
-        overflow: string;
-        color: string;
-        pointColor: string;
-        position: string;
-    };
-    canvas?: HTMLCanvasElement;
-    all: Array<iTwoDAnimated | iTwoD>;
-    points?: Array<iTwoDAnimated>;
-    current: iTwoD;
-    constructor(props: any);
-    canvasContext?: CanvasRenderingContext2D;
-    componentDidMount(): void;
-    randomPoints: () => {
-        x: number;
-        y: number;
-        xa: number;
-        ya: number;
-        max: number;
-    }[];
-    tid: number;
-    drawCanvas: () => void;
-    destroy(): void;
-    render(): import("react/jsx-runtime").JSX.Element;
-}
-export {};

package/dist/hoc/setUrl.d.ts

@@ -1 +0,0 @@
-export default function setUrl(host?: string, https?: boolean): void;

package/dist/variables/isProduction.d.ts

@@ -1,2 +0,0 @@
-declare const isProduction: boolean;
-export default isProduction;