rads-db 0.1.51 → 0.1.53

package/dist/index.d.ts

@@ -219,6 +219,9 @@ interface RestFileUploadDriverOptions {
         headers?: any;
         method?: string;
     }) => any;
+    /** If true, "multipart/form-data" body will be used (sometimes causes problems in serverless environments).
+     * Otherwise, "application/json" body (with base64-encoded binary content) will be used */
+    useFormData?: boolean;
 }
 type GenerateClientOptions = Partial<GenerateClientNormalizedOptions>;
 interface GenerateClientNormalizedOptions {
@@ -229,7 +232,7 @@ interface RadsRequestContext {
     getUser?: () => {
         id: string;
         role: string;
-    };
+    } | undefined;
 }
 
 declare function entity<T>(meta?: EntityDecoratorArgs): (classConstructor: new () => T, _ctx?: ClassDecoratorContext<any>) => void;

package/drivers/restApi.cjs

@@ -8,31 +8,48 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _pluralize = _interopRequireDefault(require("pluralize"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = options => (schema, entity) => {
-  options = {
+  const opts = {
     baseUrl: "/api",
     fetch: globalThis.fetch,
+    getHeaders: () => {
+      return void 0;
+    },
     ...options
   };
-  const fetch = options.fetch || global.fetch;
-  if (!options.fetch) throw new Error('Please provide "fetch" argument to rest driver definition');
+  const fetch = opts.fetch || global.fetch;
+  if (!opts.fetch) throw new Error('Please provide "fetch" argument to rest driver definition');
   const pluralEntityName = _lodash.default.lowerFirst((0, _pluralize.default)(entity));
   const instance = {
     driverName: "restApi",
     async getMany(args) {
       args = args || {};
-      const response = await fetch(`${options.baseUrl}/${pluralEntityName}`, {
+      const url = `${opts.baseUrl}/${pluralEntityName}`;
+      const fetchOptions = {
         method: "POST",
-        body: JSON.stringify(args)
-      });
+        body: JSON.stringify(args),
+        headers: {}
+      };
+      fetchOptions.headers = {
+        ...fetchOptions.headers,
+        ...opts.getHeaders(url, fetchOptions)
+      };
+      const response = await fetch(url, fetchOptions);
       return await response?.json();
     },
     async putMany(item) {
-      await fetch(`${options.baseUrl}/${pluralEntityName}`, {
+      const url = `${opts.baseUrl}/${pluralEntityName}`;
+      const fetchOptions = {
         method: "PUT",
         body: JSON.stringify({
           data: item
-        })
-      });
+        }),
+        headers: {}
+      };
+      fetchOptions.headers = {
+        ...fetchOptions.headers,
+        ...opts.getHeaders(url, fetchOptions)
+      };
+      await fetch(url, fetchOptions);
     }
   };
   return instance;

package/drivers/restApi.d.ts

@@ -6,6 +6,7 @@ interface RestDriverOptions {
         headers?: any;
         method?: string;
     }) => any;
+    getHeaders?: (url: string, fetchOptions: RequestInit) => Record<string, string> | undefined;
 }
 declare const _default: (options: RestDriverOptions) => (schema: Schema, entity: string) => MinimalDriver;
 export default _default;

package/drivers/restApi.mjs

@@ -1,26 +1,41 @@
 import _ from "lodash";
 import pluralize from "pluralize";
 export default (options) => (schema, entity) => {
-  options = { baseUrl: "/api", fetch: globalThis.fetch, ...options };
-  const fetch = options.fetch || global.fetch;
-  if (!options.fetch)
+  const opts = {
+    baseUrl: "/api",
+    fetch: globalThis.fetch,
+    getHeaders: () => {
+      return void 0;
+    },
+    ...options
+  };
+  const fetch = opts.fetch || global.fetch;
+  if (!opts.fetch)
     throw new Error('Please provide "fetch" argument to rest driver definition');
   const pluralEntityName = _.lowerFirst(pluralize(entity));
   const instance = {
     driverName: "restApi",
     async getMany(args) {
       args = args || {};
-      const response = await fetch(`${options.baseUrl}/${pluralEntityName}`, {
+      const url = `${opts.baseUrl}/${pluralEntityName}`;
+      const fetchOptions = {
         method: "POST",
-        body: JSON.stringify(args)
-      });
+        body: JSON.stringify(args),
+        headers: {}
+      };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      const response = await fetch(url, fetchOptions);
       return await response?.json();
     },
     async putMany(item) {
-      await fetch(`${options.baseUrl}/${pluralEntityName}`, {
+      const url = `${opts.baseUrl}/${pluralEntityName}`;
+      const fetchOptions = {
         method: "PUT",
-        body: JSON.stringify({ data: item })
-      });
+        body: JSON.stringify({ data: item }),
+        headers: {}
+      };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      await fetch(url, fetchOptions);
     }
   };
   return instance;

package/fileUploadDrivers/restApi.cjs

@@ -15,16 +15,32 @@ var _default = options => {
   const driver = {
     driverName: "restApi",
     async uploadFile(args) {
-      const form = new FormData();
-      form.append("containerName", args.containerName || "");
-      form.append("blob", args.blob, args.fileName);
+      const body = options.useFormData ? getFormDataBody(args) : await getJsonBody(args);
       const response = await fetch(`${options.baseUrl}/uploadFile`, {
         method: "POST",
-        body: form
+        body
       });
       return response.text();
     }
   };
   return driver;
 };
-module.exports = _default;
+module.exports = _default;
+function getFormDataBody(args) {
+  const form = new FormData();
+  form.append("containerName", args.containerName || "");
+  form.append("blob", args.blob, args.fileName);
+  return form;
+}
+async function getJsonBody(args) {
+  return JSON.stringify({
+    containerName: args.containerName,
+    fileName: args.fileName,
+    blobDataUrl: await blobToDataUrl(args.blob)
+  });
+}
+async function blobToDataUrl(blob) {
+  const buf = await blob.arrayBuffer();
+  const b64string = Buffer.from(buf).toString("base64");
+  return `data:${blob.type};base64,${b64string}`;
+}

package/fileUploadDrivers/restApi.mjs

@@ -6,15 +6,31 @@ export default (options) => {
   const driver = {
     driverName: "restApi",
     async uploadFile(args) {
-      const form = new FormData();
-      form.append("containerName", args.containerName || "");
-      form.append("blob", args.blob, args.fileName);
+      const body = options.useFormData ? getFormDataBody(args) : await getJsonBody(args);
       const response = await fetch(`${options.baseUrl}/uploadFile`, {
         method: "POST",
-        body: form
+        body
       });
       return response.text();
     }
   };
   return driver;
 };
+function getFormDataBody(args) {
+  const form = new FormData();
+  form.append("containerName", args.containerName || "");
+  form.append("blob", args.blob, args.fileName);
+  return form;
+}
+async function getJsonBody(args) {
+  return JSON.stringify({
+    containerName: args.containerName,
+    fileName: args.fileName,
+    blobDataUrl: await blobToDataUrl(args.blob)
+  });
+}
+async function blobToDataUrl(blob) {
+  const buf = await blob.arrayBuffer();
+  const b64string = Buffer.from(buf).toString("base64");
+  return `data:${blob.type};base64,${b64string}`;
+}

package/package.json

@@ -34,7 +34,7 @@
       "require": "./integrations/*.cjs"
     }
   },
-  "version": "0.1.51",
+  "version": "0.1.53",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "keywords": [],
   "author": "",