Updates

client/crud-fetch/index.ts

@@ -19,6 +19,7 @@ export default async function clientCrudFetch<
     targetId,
     method = "GET",
     apiOrigin,
+    headers,
 }: ClientCrudFetchParams<T, P>) {
     try {
         let pathname = basePath || ``;
@@ -43,6 +44,7 @@ export default async function clientCrudFetch<
         >(pathname, {
             method,
             body,
+            headers,
         });
 
         return res;

client/fetch/index.ts

@@ -1,4 +1,5 @@
 import _ from "lodash";
+import { DSQLClientFetchHeader } from "../../package-shared/types";
 
 type FetchApiOptions<T extends { [k: string]: any } = { [k: string]: any }> = {
     method:
@@ -13,11 +14,7 @@ type FetchApiOptions<T extends { [k: string]: any } = { [k: string]: any }> = {
         | "put"
         | "patch";
     body?: T | string;
-    headers?: FetchHeader;
-};
-
-type FetchHeader = HeadersInit & {
-    [key: string]: string | null;
+    headers?: DSQLClientFetchHeader;
 };
 
 export type FetchApiReturn = {
@@ -40,12 +37,7 @@ export default async function fetchApi<
     /**
      * Key to use to grab local Storage csrf value.
      */
-    localStorageCSRFKey?: string,
-    /**
-     * Key with which to set the request header csrf
-     * value
-     */
-    csrfHeaderKey?: string
+    localStorageCSRFKey?: string
 ): Promise<R> {
     let data;
 
@@ -54,7 +46,7 @@ export default async function fetchApi<
 
     let finalHeaders = {
         "Content-Type": "application/json",
-    } as FetchHeader;
+    } as DSQLClientFetchHeader;
 
     if (csrf && csrfValue) {
         finalHeaders[localStorageCSRFKey || csrfKey] = csrfValue;

dist/client/crud-fetch/index.d.ts

@@ -7,4 +7,4 @@ export default function clientCrudFetch<T extends {
     [k: string]: any;
 } = {
     [k: string]: any;
-}>({ table, basePath, body, query, targetId, method, apiOrigin, }: ClientCrudFetchParams<T, P>): Promise<APIResponseObject<PostInsertReturn | R[]>>;
+}>({ table, basePath, body, query, targetId, method, apiOrigin, headers, }: ClientCrudFetchParams<T, P>): Promise<APIResponseObject<PostInsertReturn | R[]>>;

dist/client/crud-fetch/index.js

@@ -17,7 +17,7 @@ const path_1 = __importDefault(require("path"));
 const serialize_query_1 = __importDefault(require("../../package-shared/utils/serialize-query"));
 const fetch_1 = __importDefault(require("../fetch"));
 function clientCrudFetch(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ table, basePath, body, query, targetId, method = "GET", apiOrigin, }) {
+    return __awaiter(this, arguments, void 0, function* ({ table, basePath, body, query, targetId, method = "GET", apiOrigin, headers, }) {
         try {
             let pathname = basePath || ``;
             pathname = path_1.default.join(pathname, String(table));
@@ -33,6 +33,7 @@ function clientCrudFetch(_a) {
             const res = yield (0, fetch_1.default)(pathname, {
                 method,
                 body,
+                headers,
             });
             return res;
         }

dist/client/fetch/index.d.ts

@@ -1,3 +1,4 @@
+import { DSQLClientFetchHeader } from "../../package-shared/types";
 type FetchApiOptions<T extends {
     [k: string]: any;
 } = {
@@ -5,10 +6,7 @@ type FetchApiOptions<T extends {
 }> = {
     method: "POST" | "GET" | "DELETE" | "PUT" | "PATCH" | "post" | "get" | "delete" | "put" | "patch";
     body?: T | string;
-    headers?: FetchHeader;
-};
-type FetchHeader = HeadersInit & {
-    [key: string]: string | null;
+    headers?: DSQLClientFetchHeader;
 };
 export type FetchApiReturn = {
     success: boolean;
@@ -27,10 +25,5 @@ export default function fetchApi<T extends {
 /**
  * Key to use to grab local Storage csrf value.
  */
-localStorageCSRFKey?: string, 
-/**
- * Key with which to set the request header csrf
- * value
- */
-csrfHeaderKey?: string): Promise<R>;
+localStorageCSRFKey?: string): Promise<R>;
 export {};

dist/client/fetch/index.js

@@ -21,12 +21,7 @@ function fetchApi(url, options, csrf,
 /**
  * Key to use to grab local Storage csrf value.
  */
-localStorageCSRFKey, 
-/**
- * Key with which to set the request header csrf
- * value
- */
-csrfHeaderKey) {
+localStorageCSRFKey) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         const csrfKey = "x-dsql-csrf-key";

dist/package-shared/types/index.d.ts

@@ -792,12 +792,12 @@ export type FetchApiFn = (url: string, options?: FetchApiOptions, csrf?: boolean
 export type FetchApiOptions = RequestInit & {
     method: (typeof DataCrudRequestMethods)[number] | (typeof DataCrudRequestMethodsLowerCase)[number];
     body?: object | string;
-    headers?: FetchHeader;
+    headers?: DSQLClientFetchHeader;
     query?: {
         [key: string]: any;
     };
 };
-type FetchHeader = HeadersInit & {
+export type DSQLClientFetchHeader = HeadersInit & {
     [key: string]: any;
 };
 export type FetchApiReturn = {
@@ -2298,5 +2298,5 @@ export type ClientCrudFetchParams<T extends {
     basePath?: string;
     targetId?: string | number | null;
     apiOrigin?: string;
+    headers?: DSQLClientFetchHeader;
 };
-export {};

package-shared/types/index.ts

@@ -953,11 +953,11 @@ export type FetchApiOptions = RequestInit & {
         | (typeof DataCrudRequestMethods)[number]
         | (typeof DataCrudRequestMethodsLowerCase)[number];
     body?: object | string;
-    headers?: FetchHeader;
+    headers?: DSQLClientFetchHeader;
     query?: { [key: string]: any };
 };
 
-type FetchHeader = HeadersInit & {
+export type DSQLClientFetchHeader = HeadersInit & {
     [key: string]: any;
 };
 
@@ -2959,4 +2959,5 @@ export type ClientCrudFetchParams<
     basePath?: string;
     targetId?: string | number | null;
     apiOrigin?: string;
+    headers?: DSQLClientFetchHeader;
 };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.6.1",
+    "version": "5.6.2",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {