@carbonorm/carbonnode 5.0.1 → 6.0.0

package/dist/{api/types → types}/ormGenerics.d.ts

@@ -1,4 +1,4 @@
-import { iRestMethods } from './ormInterfaces';
+import type { iRestMethods } from './ormInterfaces';
 export type OrmGenerics<RequestMethod extends iRestMethods = iRestMethods, RestShortTableName extends string | string[] = any, RestTableInterface extends Record<string, any> = any, PrimaryKey extends keyof RestTableInterface & string = keyof RestTableInterface & string, CustomAndRequiredFields extends Record<string, any> = any, RequestTableOverrides extends {
     [key in keyof RestTableInterface]: any;
 } = {

package/dist/{api/types → types}/ormInterfaces.d.ts

@@ -1,11 +1,12 @@
-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 declare const POST = "POST";
 export declare const PUT = "PUT";
@@ -249,7 +250,7 @@ export interface iC6Object<RestTableInterfaces extends {
     };
     PREFIX: string;
     ORM: {
-        [K in Extract<keyof RestTableInterfaces, string>]: C6RestfulModel<K, RestTableInterfaces[K], keyof RestTableInterfaces[K] & string> & ReturnType<typeof restOrm<OrmGenerics<any>>>;
+        [K in Extract<keyof RestTableInterfaces, string>]: C6RestfulModel<K, RestTableInterfaces[K], keyof RestTableInterfaces[K] & string> & RestOrmReturn;
     };
     [key: string]: any;
 }

package/dist/{api/utils → utils}/apiHelpers.d.ts

@@ -1,5 +1,5 @@
-import { AxiosResponse } from "axios";
-import { C6RestfulModel } from "../types/ormInterfaces";
+import type { AxiosResponse } from "axios";
+import type { C6RestfulModel } from "../types/ormInterfaces";
 export declare function TestRestfulResponse(response: AxiosResponse | any, success: ((r: AxiosResponse) => (string | void)) | string | undefined, error: ((r: AxiosResponse) => (string | void)) | string | undefined): string | boolean | number;
 export declare function removePrefixIfExists(tableName: string, prefix: string): string;
 export declare function removeInvalidKeys<iRestObject>(request: any, c6Tables: {

package/dist/{api/utils → utils}/cacheManager.d.ts

@@ -1,5 +1,5 @@
-import { AxiosPromise } from "axios";
-import { iCacheAPI } from "../types/ormInterfaces";
+import type { AxiosPromise } from "axios";
+import type { iCacheAPI } from "../types/ormInterfaces";
 export declare const apiRequestCache: Map<string, iCacheAPI<any>>;
 export declare const userCustomClearCache: (() => void)[];
 export declare function clearCache(props?: {

package/dist/utils/sqlAllowList.d.ts

@@ -0,0 +1,5 @@
+export declare const normalizeSql: (sql: string) => string;
+export declare const loadSqlAllowList: (allowListPath: string) => Promise<Set<string>>;
+export declare const extractSqlEntries: (payload: unknown) => string[];
+export declare const collectSqlAllowListEntries: (payload: unknown, entries?: Set<string>) => Set<string>;
+export declare const compileSqlAllowList: (allowListPath: string, entries: Iterable<string>) => Promise<string[]>;

package/dist/utils/toastRuntime.d.ts

@@ -0,0 +1,5 @@
+import type { ToastOptions } from "variables/toastOptions";
+export type ToastLevel = "success" | "error" | "info" | "warning";
+export type ToastHandler = (level: ToastLevel, message: string, options?: ToastOptions) => void;
+export declare const setToastHandler: (handler: ToastHandler | null) => void;
+export declare const notifyToast: (level: ToastLevel, message: string, options?: ToastOptions) => void;

package/dist/variables/toastOptions.d.ts

@@ -1,3 +1,12 @@
-import { ToastOptions } from "react-toastify";
+export type ToastOptions = {
+    position?: string;
+    autoClose?: number | false;
+    hideProgressBar?: boolean;
+    closeOnClick?: boolean;
+    pauseOnHover?: boolean;
+    draggable?: boolean;
+    theme?: string;
+    [key: string]: unknown;
+};
 export declare const toastOptions: ToastOptions;
 export declare const toastOptionsDevs: ToastOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonnode",
-  "version": "5.0.1",
+  "version": "6.0.0",
   "browser": "dist/index.umd.js",
   "repository": {
     "type": "git",
@@ -30,8 +30,7 @@
   "peerDependencies": {
     "axios": "^1.10.0",
     "express": "^5.1.0",
-    "mysql2": "^3.14.1",
-    "react-toastify": "^11.0.5"
+    "mysql2": "^3.14.1"
   },
   "peerDependenciesMeta": {
     "axios": {
@@ -43,9 +42,6 @@
     "express": {
       "optional": true
     },
-    "react-toastify": {
-      "optional": true
-    },
     "mysql2": {
       "optional": true
     }
@@ -72,7 +68,6 @@
     "postcss": "^8.4.27",
     "postcss-nested": "^6.0.1",
     "postcss-simple-vars": "^7.0.1",
-    "react-toastify": "^11.0.5",
     "rimraf": "^5.0.1",
     "rollup": "^4.22.4",
     "rollup-plugin-includepaths": "^0.2.4",

package/scripts/assets/handlebars/C6.test.ts.handlebars

@@ -4,7 +4,8 @@ import { fileURLToPath } from 'node:url';
 import { mkdir, writeFile } from 'node:fs/promises';
 import {
     checkAllRequestsComplete,
-    normalizeSql,
+    collectSqlAllowListEntries,
+    compileSqlAllowList,
     type DetermineResponseDataType,
     type OrmGenerics,
 } from '@carbonorm/carbonnode';
@@ -63,10 +64,7 @@ async function recordSqlResponse<G extends OrmGenerics = OrmGenerics>(
     if (!response) return;
     const payload = unwrapResponse(response);
     if (!payload) return;
-    const sqlValue = payload?.sql?.sql ?? (typeof payload?.sql === 'string' ? payload.sql : undefined);
-    if (typeof sqlValue === 'string') {
-        sqlAllowListEntries.add(normalizeSql(sqlValue));
-    }
+    collectSqlAllowListEntries(payload, sqlAllowListEntries);
 
     await mkdir(sqlResponsesDir, { recursive: true });
     const filePath = path.join(sqlResponsesDir, `C6.${label}.json`);
@@ -74,9 +72,7 @@ async function recordSqlResponse<G extends OrmGenerics = OrmGenerics>(
 }
 
 async function finalizeSqlAllowList() {
-    await mkdir(sqlResponsesDir, { recursive: true });
-    const compiled = Array.from(sqlAllowListEntries).sort();
-    await writeFile(sqlAllowListPath, JSON.stringify(compiled, null, 2));
+    await compileSqlAllowList(sqlAllowListPath, sqlAllowListEntries);
 }
 
 async function executeAndRecord<G extends OrmGenerics = OrmGenerics>(

package/src/__tests__/binaryHex.e2e.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import mysql from 'mysql2/promise';
-import { C6C } from '../api/C6Constants';
+import { C6C } from '../constants/C6Constants';
 import { restOrm } from '../api/restOrm';
 import { buildBinaryTestConfig } from './fixtures/c6.fixture';
 

package/src/__tests__/cacheManager.test.ts

@@ -5,8 +5,8 @@ import {
   checkCache,
   clearCache,
   setCache,
-} from "../api/utils/cacheManager";
-import { checkAllRequestsComplete } from "../api/utils/testHelpers";
+} from "../utils/cacheManager";
+import { checkAllRequestsComplete } from "../utils/testHelpers";
 
 describe("cacheManager with map storage", () => {
   const requestData = { id: 1 } as const;
@@ -64,4 +64,3 @@ describe("cacheManager with map storage", () => {
     (global as any).document = originalDocument;
   });
 });
-

package/src/__tests__/expressServer.e2e.test.ts

@@ -3,7 +3,7 @@ import axios from "axios";
 import { AddressInfo } from "net";
 import {describe, it, expect, beforeAll, afterAll} from "vitest";
 import {Actor, C6, Film_Actor, GLOBAL_REST_PARAMETERS} from "./sakila-db/C6.js";
-import {C6C} from "../api/C6Constants";
+import {C6C} from "../constants/C6Constants";
 import createTestServer from "./fixtures/createTestServer";
 
 let pool: mysql.Pool;

package/src/__tests__/fixtures/c6.fixture.ts

@@ -1,4 +1,4 @@
-import type { iRest, C6RestfulModel } from "../../api/types/ormInterfaces";
+import type { iRest, C6RestfulModel } from "../../types/ormInterfaces";
 
 // Minimal C6 table descriptor for tests
 function tableModel<T extends Record<string, any>>(name: string, columns: Record<string, keyof T>): C6RestfulModel<string, T, keyof T & string> {

package/src/__tests__/fixtures/createTestServer.ts

@@ -1,7 +1,7 @@
 import express, {Express} from "express";
 import {Pool} from "mysql2/promise";
-import {iC6Object} from "src/api/types/ormInterfaces";
-import {ExpressHandler} from "../../api/handlers/ExpressHandler";
+import {iC6Object} from "../../types/ormInterfaces";
+import {ExpressHandler} from "../../handlers/ExpressHandler";
 
 export function createTestServer({
     C6,

package/src/__tests__/fixtures/pu.fixture.ts

@@ -1,4 +1,4 @@
-import type { iRest, C6RestfulModel } from "../../api/types/ormInterfaces";
+import type { iRest, C6RestfulModel } from "../../types/ormInterfaces";
 
 function tableModel<T extends Record<string, any>>(name: string, columns: Record<string, keyof T>): C6RestfulModel<string, T, keyof T & string> {
   const TYPE_VALIDATION: any = {};
@@ -69,4 +69,3 @@ export function buildPuSalesConfig() {
 
   return baseConfig;
 }
-

package/src/__tests__/httpExecutorSingular.e2e.test.ts

@@ -3,7 +3,7 @@ import axios from "axios";
 import { AddressInfo } from "net";
 import { describe, it, expect, beforeAll, afterAll, vi } from "vitest";
 import { Actor, C6, GLOBAL_REST_PARAMETERS } from "./sakila-db/C6.js";
-import { C6C } from "../api/C6Constants";
+import { C6C } from "../constants/C6Constants";
 import createTestServer from "./fixtures/createTestServer";
 
 let pool: mysql.Pool;

package/src/__tests__/normalizeSingularRequest.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
-import { normalizeSingularRequest } from '../api/utils/normalizeSingularRequest';
-import { C6C } from '../api/C6Constants';
-import type { C6RestfulModel } from '../api/types/ormInterfaces';
+import { normalizeSingularRequest } from '../utils/normalizeSingularRequest';
+import { C6C } from '../constants/C6Constants';
+import type { C6RestfulModel } from '../types/ormInterfaces';
 
 function makeModel(table: string, pkShorts: string[], extraCols: string[] = []): C6RestfulModel<any, any, any> {
   const COLUMNS: Record<string, string> = {};

package/src/__tests__/sakila-db/C6.js

@@ -1342,7 +1342,7 @@ export const TABLES = {
 };
 export const C6 = {
     ...C6Constants,
-    C6VERSION: '5.0.1',
+    C6VERSION: '6.0.0',
     IMPORT: async (tableName) => {
         tableName = tableName.toLowerCase();
         // if tableName is not a key in the TABLES object then throw an error