@carbonorm/carbonnode 5.0.0 → 6.0.0

package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.lookup.json

@@ -2,12 +2,12 @@
   "rest": [
     {
       "rental_id": 16050,
-      "rental_date": "2026-01-24T01:11:36.000Z",
+      "rental_date": "2026-01-24T05:49:17.000Z",
       "inventory_id": 1,
       "customer_id": 1,
-      "return_date": "2026-01-24T01:11:36.000Z",
+      "return_date": "2026-01-24T05:49:17.000Z",
       "staff_id": 1,
-      "last_update": "2026-01-24T01:11:36.000Z"
+      "last_update": "2026-01-24T05:49:17.000Z"
     }
   ],
   "sql": {

package/src/__tests__/sqlAllowList.test.ts

@@ -1,9 +1,8 @@
 import {describe, expect, it, vi} from "vitest";
 import path from "node:path";
 import {mkdir, readdir, readFile, writeFile} from "node:fs/promises";
-import restRequest from "../api/restRequest";
-import {Actor, C6} from "./sakila-db/C6.js";
-import {loadSqlAllowList, normalizeSql} from "../api/utils/sqlAllowList";
+import {Actor, C6, GLOBAL_REST_PARAMETERS} from "./sakila-db/C6.js";
+import {collectSqlAllowListEntries, compileSqlAllowList, extractSqlEntries, loadSqlAllowList, normalizeSql} from "../utils/sqlAllowList";
 
 const fixturesDir = path.join(process.cwd(), "src/__tests__/fixtures/sqlResponses");
 const fixturePath = path.join(fixturesDir, "actor.get.json");
@@ -20,31 +19,9 @@ const buildMockPool = (rows: Record<string, any>[]) => {
   return {pool, connection};
 };
 
-const extractSqlEntries = (payload: unknown): string[] => {
-  if (Array.isArray(payload)) {
-    return payload.flatMap(extractSqlEntries);
-  }
-  if (!payload || typeof payload !== "object") {
-    return [];
-  }
-
-  const sqlValue = (payload as {sql?: unknown}).sql;
-  if (typeof sqlValue === "string") {
-    return [sqlValue];
-  }
-  if (sqlValue && typeof sqlValue === "object") {
-    const nested = (sqlValue as {sql?: unknown}).sql;
-    if (typeof nested === "string") {
-      return [nested];
-    }
-  }
-
-  return [];
-};
-
-const compileSqlAllowList = async (): Promise<string[]> => {
+const compileSqlAllowListFromFixtures = async (): Promise<string[]> => {
   const entries = await readdir(fixturesDir);
-  const sqlEntries: string[] = [];
+  const sqlEntries = new Set<string>();
 
   for (const entry of entries) {
     if (!entry.endsWith(".json") || entry.startsWith("sqlAllowList")) {
@@ -56,12 +33,28 @@ const compileSqlAllowList = async (): Promise<string[]> => {
     if (extracted.length === 0) {
       throw new Error(`No SQL found in fixture ${entry}`);
     }
-    sqlEntries.push(...extracted);
+    collectSqlAllowListEntries(payload, sqlEntries);
   }
 
-  const compiled = Array.from(new Set(sqlEntries.map(normalizeSql))).sort();
-  await writeFile(compiledPath, JSON.stringify(compiled, null, 2));
-  return compiled;
+  return await compileSqlAllowList(compiledPath, sqlEntries);
+};
+
+const globalRestParameters = GLOBAL_REST_PARAMETERS as typeof GLOBAL_REST_PARAMETERS & {
+  mysqlPool?: unknown;
+  sqlAllowListPath?: string;
+  verbose?: boolean;
+};
+
+const snapshotGlobals = () => ({
+  mysqlPool: globalRestParameters.mysqlPool,
+  sqlAllowListPath: globalRestParameters.sqlAllowListPath,
+  verbose: globalRestParameters.verbose,
+});
+
+const restoreGlobals = (snapshot: ReturnType<typeof snapshotGlobals>) => {
+  globalRestParameters.mysqlPool = snapshot.mysqlPool;
+  globalRestParameters.sqlAllowListPath = snapshot.sqlAllowListPath;
+  globalRestParameters.verbose = snapshot.verbose;
 };
 
 describe("SQL allowlist", () => {
@@ -72,37 +65,35 @@ describe("SQL allowlist", () => {
       {actor_id: 1, first_name: "PENELOPE", last_name: "GUINESS"},
     ]);
 
-    const response = await restRequest({
-      C6,
-      mysqlPool: pool as any,
-      restModel: Actor,
-      requestMethod: "GET",
-      verbose: false,
-    })({
-      [C6.PAGINATION]: {[C6.LIMIT]: 1},
-    } as any);
-
-    await writeFile(fixturePath, JSON.stringify(response, null, 2));
-
-    const compiled = await compileSqlAllowList();
-    expect(compiled.length).toBeGreaterThan(0);
-
-    const allowList = await loadSqlAllowList(compiledPath);
-    const responseSql = normalizeSql((response as any).sql.sql as string);
-    expect(allowList.has(responseSql)).toBe(true);
-
-    const allowedResponse = await restRequest({
-      C6,
-      mysqlPool: pool as any,
-      restModel: Actor,
-      requestMethod: "GET",
-      sqlAllowListPath: compiledPath,
-      verbose: false,
-    })({
-      [C6.PAGINATION]: {[C6.LIMIT]: 1},
-    } as any);
-
-    expect(allowedResponse.rest).toEqual(response.rest);
+    const originalGlobals = snapshotGlobals();
+    try {
+      globalRestParameters.mysqlPool = pool as any;
+      globalRestParameters.sqlAllowListPath = undefined;
+      globalRestParameters.verbose = false;
+
+      const response = await Actor.Get({
+        [C6.PAGINATION]: {[C6.LIMIT]: 1},
+      } as any);
+
+      await writeFile(fixturePath, JSON.stringify(response, null, 2));
+
+      const compiled = await compileSqlAllowListFromFixtures();
+      expect(compiled.length).toBeGreaterThan(0);
+
+      const allowList = await loadSqlAllowList(compiledPath);
+      const responseSql = normalizeSql((response as any).sql.sql as string);
+      expect(allowList.has(responseSql)).toBe(true);
+
+      globalRestParameters.sqlAllowListPath = compiledPath;
+
+      const allowedResponse = await Actor.Get({
+        [C6.PAGINATION]: {[C6.LIMIT]: 1},
+      } as any);
+
+      expect(allowedResponse.rest).toEqual(response.rest);
+    } finally {
+      restoreGlobals(originalGlobals);
+    }
   });
 
   it("throws when allowlist file is missing", async () => {
@@ -119,17 +110,19 @@ describe("SQL allowlist", () => {
       {actor_id: 1, first_name: "PENELOPE", last_name: "GUINESS"},
     ]);
 
-    await expect(
-      restRequest({
-        C6,
-        mysqlPool: pool as any,
-        restModel: Actor,
-        requestMethod: "GET",
-        sqlAllowListPath: blockedPath,
-        verbose: false,
-      })({
-        [C6.PAGINATION]: {[C6.LIMIT]: 1},
-      } as any)
-    ).rejects.toThrow("SQL statement is not permitted");
+    const originalGlobals = snapshotGlobals();
+    try {
+      globalRestParameters.mysqlPool = pool as any;
+      globalRestParameters.sqlAllowListPath = blockedPath;
+      globalRestParameters.verbose = false;
+
+      await expect(
+        Actor.Get({
+          [C6.PAGINATION]: {[C6.LIMIT]: 1},
+        } as any)
+      ).rejects.toThrow("SQL statement is not permitted");
+    } finally {
+      restoreGlobals(originalGlobals);
+    }
   });
 });

package/src/__tests__/sqlBuilders.complex.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
-import { C6C } from '../api/C6Constants';
-import { SelectQueryBuilder } from '../api/orm/queries/SelectQueryBuilder';
-import { derivedTable, F } from '../api/orm/queryHelpers';
+import { C6C } from '../constants/C6Constants';
+import { SelectQueryBuilder } from '../orm/queries/SelectQueryBuilder';
+import { derivedTable, F } from '../orm/queryHelpers';
 import { buildParcelConfig, buildTestConfig } from './fixtures/c6.fixture';
 
 const Property_Units = {

package/src/__tests__/sqlBuilders.expressions.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
-import { C6C } from '../api/C6Constants';
-import { SelectQueryBuilder } from '../api/orm/queries/SelectQueryBuilder';
+import { C6C } from '../constants/C6Constants';
+import { SelectQueryBuilder } from '../orm/queries/SelectQueryBuilder';
 import { buildParcelConfig } from './fixtures/c6.fixture';
 
 const Property_Units = {

package/src/__tests__/sqlBuilders.test.ts

@@ -1,9 +1,9 @@
 import { describe, it, expect } from 'vitest';
-import { C6C } from '../api/C6Constants';
-import { SelectQueryBuilder } from '../api/orm/queries/SelectQueryBuilder';
-import { PostQueryBuilder } from '../api/orm/queries/PostQueryBuilder';
-import { UpdateQueryBuilder } from '../api/orm/queries/UpdateQueryBuilder';
-import { DeleteQueryBuilder } from '../api/orm/queries/DeleteQueryBuilder';
+import { C6C } from '../constants/C6Constants';
+import { SelectQueryBuilder } from '../orm/queries/SelectQueryBuilder';
+import { PostQueryBuilder } from '../orm/queries/PostQueryBuilder';
+import { UpdateQueryBuilder } from '../orm/queries/UpdateQueryBuilder';
+import { DeleteQueryBuilder } from '../orm/queries/DeleteQueryBuilder';
 import { buildTestConfig, buildBinaryTestConfig, buildBinaryTestConfigFqn } from './fixtures/c6.fixture';
 
 describe('SQL Builders', () => {

package/src/__tests__/toastRuntime.test.ts

@@ -0,0 +1,22 @@
+import {afterEach, describe, expect, it, vi} from "vitest";
+
+import {notifyToast, setToastHandler} from "../utils/toastRuntime";
+
+describe("toastRuntime", () => {
+    afterEach(() => {
+        setToastHandler(null);
+    });
+
+    it("no-ops when no handler is registered", () => {
+        expect(() => notifyToast("success", "hello")).not.toThrow();
+    });
+
+    it("dispatches to the registered handler", () => {
+        const handler = vi.fn();
+        setToastHandler(handler);
+
+        notifyToast("error", "boom", {autoClose: 10});
+
+        expect(handler).toHaveBeenCalledWith("error", "boom", {autoClose: 10});
+    });
+});

package/src/api/convertForRequestBody.ts

@@ -1,5 +1,5 @@
-import { C6Constants } from "./C6Constants";
-import {iC6Object, C6RestfulModel, iRestMethods, RequestQueryBody} from "./types/ormInterfaces";
+import { C6Constants } from "../constants/C6Constants";
+import {iC6Object, C6RestfulModel, iRestMethods, RequestQueryBody} from "../types/ormInterfaces";
 
 export default function <
     RequestMethod extends iRestMethods,

package/src/api/restOrm.ts

@@ -1,6 +1,6 @@
 import restRequest from "./restRequest";
-import {OrmGenerics} from "./types/ormGenerics";
-import {iRest, iRestMethods} from "./types/ormInterfaces";
+import {OrmGenerics} from "../types/ormGenerics";
+import {iRest, iRestMethods} from "../types/ormInterfaces";
 
 type WithMethod<G extends Omit<OrmGenerics, "RequestMethod">, M extends iRestMethods> =
     Omit<G, "RequestMethod"> & { RequestMethod: M };

package/src/api/restRequest.ts

@@ -1,9 +1,9 @@
 import isNode from '../variables/isNode';
-import {OrmGenerics} from "./types/ormGenerics";
+import {OrmGenerics} from "../types/ormGenerics";
 import {
     DetermineResponseDataType,
     iRest, RequestQueryBody
-} from "./types/ormInterfaces";
+} from "../types/ormInterfaces";
 
 /**
  * Facade: routes API calls to SQL or HTTP executors based on runtime context.
@@ -36,15 +36,14 @@ export default function restRequest<
 
         // SQL path if on Node with a provided pool
         if (isNode() && config.mysqlPool) {
-            const {SqlExecutor} = await import('./executors/SqlExecutor');
+            const {SqlExecutor} = await import('../executors/SqlExecutor');
             const executor = new SqlExecutor<G>(config, request);
             return executor.execute();
         }
 
         // HTTP path fallback
-        const {HttpExecutor} = await import('./executors/HttpExecutor');
+        const {HttpExecutor} = await import('../executors/HttpExecutor');
         const http = new HttpExecutor<G>(config, request);
         return http.execute();
     };
 }
-

package/src/{api/executors → executors}/HttpExecutor.ts

@@ -1,10 +1,9 @@
-import {AxiosPromise, AxiosResponse} from "axios";
-import {toast} from "react-toastify";
-import isLocal from "../../variables/isLocal";
-import isTest from "../../variables/isTest";
-import convertForRequestBody from "../convertForRequestBody";
+import type {AxiosPromise, AxiosResponse} from "axios";
+import isLocal from "../variables/isLocal";
+import isTest from "../variables/isTest";
+import convertForRequestBody from "../api/convertForRequestBody";
 import {eFetchDependencies} from "../types/dynamicFetching";
-import {OrmGenerics} from "../types/ormGenerics";
+import type {OrmGenerics} from "../types/ormGenerics";
 import {
     DELETE, DetermineResponseDataType,
     GET,
@@ -16,6 +15,7 @@ import {
 import {removeInvalidKeys, removePrefixIfExists, TestRestfulResponse} from "../utils/apiHelpers";
 import {checkCache, setCache, userCustomClearCache} from "../utils/cacheManager";
 import {sortAndSerializeQueryObject} from "../utils/sortAndSerializeQueryObject";
+import {notifyToast} from "../utils/toastRuntime";
 import {Executor} from "./Executor";
 import {toastOptions, toastOptionsDevs} from "variables/toastOptions";
 
@@ -260,11 +260,15 @@ export class HttpExecutor<
             if (cacheResults) {
                 cachingConfirmed = true;
             } else if (debug && isLocal()) {
-                toast.info("DEVS: Ignore cache was set to true.", toastOptionsDevs);
+                notifyToast("info", "DEVS: Ignore cache was set to true.", toastOptionsDevs);
             }
 
             if (cacheResults && debug && isLocal()) {
-                toast.success("DEVS: Request not in cache." + (requestMethod === C6.GET ? " Page (" + query[C6.PAGINATION][C6.PAGE] + ")" : ''), toastOptionsDevs);
+                notifyToast(
+                    "success",
+                    "DEVS: Request not in cache." + (requestMethod === C6.GET ? " Page (" + query[C6.PAGINATION][C6.PAGE] + ")" : ''),
+                    toastOptionsDevs,
+                );
             }
 
             let apiResponse: G['RestTableInterface'][G['PrimaryKey']] | string | boolean | number | undefined;
@@ -308,7 +312,7 @@ export class HttpExecutor<
 
                         if (true === debug && isLocal()) {
 
-                            toast.error('DEVS: The primary key (' + primaryKey + ') was not provided!!')
+                            notifyToast("error", `DEVS: The primary key (${primaryKey}) was not provided!!`);
 
                         }
 
@@ -319,7 +323,7 @@ export class HttpExecutor<
                     const providedPrimary = query?.[primaryKey!] ?? (primaryKeyFullyQualified ? query?.[primaryKeyFullyQualified] : undefined);
                     if (undefined === providedPrimary || null === providedPrimary) {
 
-                        toast.error('The primary key (' + primaryKey + ') provided is undefined or null explicitly!!')
+                        notifyToast("error", `The primary key (${primaryKey}) provided is undefined or null explicitly!!`);
 
                         throw Error('The primary key (' + primaryKey + ') provided in the request was exactly equal to undefined.');
 
@@ -390,7 +394,7 @@ export class HttpExecutor<
                                 data,
                                 fullTableList,
                                 C6,
-                                (message) => toast.error(message, toastOptions)
+                                (message) => notifyToast("error", message, toastOptions)
                             );
 
                         const baseConfig = {
@@ -485,7 +489,7 @@ export class HttpExecutor<
 
                         if (false === apiResponse) {
                             if (debug && isLocal()) {
-                                toast.warning("DEVS: TestRestfulResponse returned false.", toastOptionsDevs);
+                                notifyToast("warning", "DEVS: TestRestfulResponse returned false.", toastOptionsDevs);
                             }
                             // Force a null payload so the final .then(response => response.data) yields null
                             return Promise.resolve({ ...response, data: null as unknown as ResponseDataType });
@@ -813,7 +817,11 @@ export class HttpExecutor<
 
                         if (debug && isLocal()) {
 
-                            toast.success("DEVS: (" + requestMethod + ") request complete.", toastOptionsDevs);
+                            notifyToast(
+                                "success",
+                                `DEVS: (${requestMethod}) request complete.`,
+                                toastOptionsDevs,
+                            );
 
                         }
 

package/src/{api/executors → executors}/SqlExecutor.ts

@@ -3,13 +3,13 @@ import {PostQueryBuilder} from "../orm/queries/PostQueryBuilder";
 import {SelectQueryBuilder} from "../orm/queries/SelectQueryBuilder";
 import {UpdateQueryBuilder} from "../orm/queries/UpdateQueryBuilder";
 import {OrmGenerics} from "../types/ormGenerics";
-import {C6Constants as C6C} from "../C6Constants";
+import {C6Constants as C6C} from "../constants/C6Constants";
 import {
     DetermineResponseDataType,
     iRestWebsocketPayload,
 } from "../types/ormInterfaces";
 import namedPlaceholders from 'named-placeholders';
-import {PoolConnection} from 'mysql2/promise';
+import type {PoolConnection} from 'mysql2/promise';
 import {Buffer} from 'buffer';
 import {Executor} from "./Executor";
 import { normalizeSingularRequest } from "../utils/normalizeSingularRequest";

package/src/{api/handlers → handlers}/ExpressHandler.ts

@@ -1,8 +1,8 @@
-import {Request, Response, NextFunction} from "express";
-import {Pool} from "mysql2/promise";
-import {C6C} from "../C6Constants";
-import restRequest from "../restRequest"; // adjust path as needed
-import {iC6Object, iRestMethods} from "../types/ormInterfaces";
+import type {Request, Response, NextFunction} from "express";
+import type {Pool} from "mysql2/promise";
+import {C6C} from "../constants/C6Constants";
+import restRequest from "../api/restRequest";
+import type {iC6Object, iRestMethods} from "../types/ormInterfaces";
 
 
 // TODO - WE MUST make this a generic - optional, but helpful

package/src/index.ts

@@ -2,7 +2,6 @@
  * @file Automatically generated by barrelsby.
  */
 
-export * from "./api/C6Constants";
 export { default as axiosInstance } from "./api/axiosInstance";
 export * from "./api/axiosInstance";
 export { default as convertForRequestBody } from "./api/convertForRequestBody";
@@ -12,34 +11,36 @@ export { default as restRequest } from "./api/restRequest";
 export * from "./api/restRequest";
 export { default as timeout } from "./api/timeout";
 export * from "./api/timeout";
-export * from "./api/executors/Executor";
-export * from "./api/executors/HttpExecutor";
-export * from "./api/executors/SqlExecutor";
-export * from "./api/handlers/ExpressHandler";
-export * from "./api/orm/queryHelpers";
-export * from "./api/orm/builders/AggregateBuilder";
-export * from "./api/orm/builders/ConditionBuilder";
-export * from "./api/orm/builders/JoinBuilder";
-export * from "./api/orm/builders/PaginationBuilder";
-export * from "./api/orm/queries/DeleteQueryBuilder";
-export * from "./api/orm/queries/PostQueryBuilder";
-export * from "./api/orm/queries/SelectQueryBuilder";
-export * from "./api/orm/queries/UpdateQueryBuilder";
-export * from "./api/orm/utils/sqlUtils";
-export * from "./api/types/dynamicFetching";
-export * from "./api/types/modifyTypes";
-export * from "./api/types/mysqlTypes";
-export * from "./api/types/ormGenerics";
-export * from "./api/types/ormInterfaces";
-export * from "./api/utils/apiHelpers";
-export * from "./api/utils/cacheManager";
-export * from "./api/utils/determineRuntimeJsType";
-export * from "./api/utils/logger";
-export * from "./api/utils/normalizeSingularRequest";
-export * from "./api/utils/sortAndSerializeQueryObject";
-export * from "./api/utils/sqlAllowList";
-export * from "./api/utils/testHelpers";
-export * from "./api/utils/toastNotifier";
+export * from "./constants/C6Constants";
+export * from "./executors/Executor";
+export * from "./executors/HttpExecutor";
+export * from "./executors/SqlExecutor";
+export * from "./handlers/ExpressHandler";
+export * from "./orm/queryHelpers";
+export * from "./orm/builders/AggregateBuilder";
+export * from "./orm/builders/ConditionBuilder";
+export * from "./orm/builders/JoinBuilder";
+export * from "./orm/builders/PaginationBuilder";
+export * from "./orm/queries/DeleteQueryBuilder";
+export * from "./orm/queries/PostQueryBuilder";
+export * from "./orm/queries/SelectQueryBuilder";
+export * from "./orm/queries/UpdateQueryBuilder";
+export * from "./orm/utils/sqlUtils";
+export * from "./types/dynamicFetching";
+export * from "./types/modifyTypes";
+export * from "./types/mysqlTypes";
+export * from "./types/ormGenerics";
+export * from "./types/ormInterfaces";
+export * from "./utils/apiHelpers";
+export * from "./utils/cacheManager";
+export * from "./utils/determineRuntimeJsType";
+export * from "./utils/logger";
+export * from "./utils/normalizeSingularRequest";
+export * from "./utils/sortAndSerializeQueryObject";
+export * from "./utils/sqlAllowList";
+export * from "./utils/testHelpers";
+export * from "./utils/toastNotifier";
+export * from "./utils/toastRuntime";
 export * from "./variables/getEnvVar";
 export { default as isLocal } from "./variables/isLocal";
 export * from "./variables/isLocal";

package/src/{api/orm → orm}/builders/AggregateBuilder.ts

@@ -1,6 +1,6 @@
 import {Executor} from "../../executors/Executor";
 import {OrmGenerics} from "../../types/ormGenerics";
-import {C6C} from "../../C6Constants";
+import {C6C} from "../../constants/C6Constants";
 
 export abstract class AggregateBuilder<G extends OrmGenerics> extends Executor<G>{
     protected selectAliases: Set<string> = new Set<string>();

package/src/{api/orm → orm}/builders/ConditionBuilder.ts

@@ -1,4 +1,4 @@
-import {C6C} from "../../C6Constants";
+import {C6C} from "../../constants/C6Constants";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {DetermineResponseDataType} from "../../types/ormInterfaces";
 import {convertHexIfBinary, SqlBuilderResult} from "../utils/sqlUtils";

package/src/{api/orm → orm}/builders/JoinBuilder.ts

@@ -1,6 +1,6 @@
 import {OrmGenerics} from "../../types/ormGenerics";
 import {ConditionBuilder} from "./ConditionBuilder";
-import {C6C} from "../../C6Constants";
+import {C6C} from "../../constants/C6Constants";
 import {resolveDerivedTable, isDerivedTableKey} from "../queryHelpers";
 
 export abstract class JoinBuilder<G extends OrmGenerics> extends ConditionBuilder<G>{

package/src/{api/orm → orm}/builders/PaginationBuilder.ts

@@ -1,4 +1,4 @@
-import {C6Constants} from "../../C6Constants";
+import {C6Constants} from "../../constants/C6Constants";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {JoinBuilder} from "./JoinBuilder";
 

package/src/{api/orm → orm}/queries/PostQueryBuilder.ts

@@ -1,4 +1,4 @@
-import {C6C} from "../../C6Constants";
+import {C6C} from "../../constants/C6Constants";
 import {ConditionBuilder} from "../builders/ConditionBuilder";
 import {OrmGenerics} from "../../types/ormGenerics";
 

package/src/{api/orm → orm}/queries/UpdateQueryBuilder.ts

@@ -1,4 +1,4 @@
-import {C6C} from "../../C6Constants";
+import {C6C} from "../../constants/C6Constants";
 import {OrmGenerics} from "../../types/ormGenerics";
 import { PaginationBuilder } from '../builders/PaginationBuilder';
 import {SqlBuilderResult} from "../utils/sqlUtils";

package/src/{api/orm → orm}/queryHelpers.ts

@@ -1,5 +1,5 @@
 // Alias a table name with a given alias
-import {C6C} from "../C6Constants";
+import {C6C} from "../constants/C6Constants";
 
 type DerivedTableSpec = Record<string, any> & {
     [C6C.SUBSELECT]?: Record<string, any>;
@@ -90,4 +90,3 @@ export const bbox = (minLng: number, minLat: number, maxLng: number, maxLat: num
 // ST_Contains for map envelope/shape queries
 export const stContains = (envelope: string, shape: string): any[] =>
     [C6C.ST_CONTAINS, envelope, shape];
-

package/src/{api/types → types}/ormGenerics.ts

@@ -1,5 +1,5 @@
 // types/ormGenerics.ts
-import { iRestMethods } from './ormInterfaces';
+import type {iRestMethods} from './ormInterfaces';
 
 export type OrmGenerics<
     RequestMethod extends iRestMethods = iRestMethods,

package/src/{api/types → types}/ormInterfaces.ts

@@ -1,13 +1,15 @@
 // Refined TypeScript types for CarbonORM
 
-import {AxiosInstance, AxiosPromise, AxiosResponse} from "axios";
-import {Pool} from "mysql2/promise";
+import type {AxiosInstance, AxiosPromise, AxiosResponse} from "axios";
+import type {Pool} from "mysql2/promise";
 import {eFetchDependencies} from "./dynamicFetching";
 import {Modify} from "./modifyTypes";
 import {JoinType, OrderDirection, SQLComparisonOperator, SQLFunction} from "./mysqlTypes";
-import {CarbonReact} from "@carbonorm/carbonreact";
-import {OrmGenerics} from "./ormGenerics";
-import {restOrm} from "../restOrm";
+import type {CarbonReact} from "@carbonorm/carbonreact";
+import type {OrmGenerics} from "./ormGenerics";
+
+type RestOrmFactory = typeof import("../api/restOrm").restOrm;
+type RestOrmReturn = ReturnType<RestOrmFactory<OrmGenerics<any>>>;
 
 export type iRestMethods = 'GET' | 'POST' | 'PUT' | 'DELETE';
 export const POST = 'POST';
@@ -288,7 +290,7 @@ export interface iC6Object<
     ORM: {
         [K in Extract<keyof RestTableInterfaces, string>]:
         C6RestfulModel<K, RestTableInterfaces[K], keyof RestTableInterfaces[K] & string>
-        & ReturnType<typeof restOrm<OrmGenerics<any>>>
+        & RestOrmReturn
     }
 
     [key: string]: any;

package/src/{api/utils → utils}/apiHelpers.ts

@@ -1,9 +1,9 @@
 // When we capture DropExceptions and display them as a custom page, this will change.
-import {toast} from "react-toastify";
-import isTest from "../../variables/isTest";
-import { AxiosResponse } from "axios";
-import {toastOptions} from "../../variables/toastOptions";
-import {C6RestfulModel} from "../types/ormInterfaces";
+import isTest from "../variables/isTest";
+import type {AxiosResponse} from "axios";
+import {toastOptions} from "../variables/toastOptions";
+import type {C6RestfulModel} from "../types/ormInterfaces";
+import {notifyToast} from "./toastRuntime";
 
 
 
@@ -21,7 +21,7 @@ export function TestRestfulResponse(response: AxiosResponse | any, success: ((r:
 
         if (typeof successReturn === 'string') {
 
-            toast.success(successReturn, toastOptions);
+            notifyToast("success", successReturn, toastOptions);
 
         }
 
@@ -34,7 +34,7 @@ export function TestRestfulResponse(response: AxiosResponse | any, success: ((r:
 
     if (typeof errorReturn === 'string') {
 
-        toast.error(errorReturn, toastOptions);
+        notifyToast("error", errorReturn, toastOptions);
 
     }
 
@@ -83,4 +83,4 @@ export function removeInvalidKeys<iRestObject>(request: any, c6Tables: {
 
     return intersection
 
-}
+}