rads-db 0.1.54 → 0.1.56

package/dist/index.cjs

@@ -1,7 +1,8 @@
 'use strict';
 
-const zod = require('zod');
 const _ = require('lodash');
+const h3 = require('h3');
+const zod = require('zod');
 const createMerge = require('@fastify/deepmerge');
 const uuid = require('uuid');
 const _radsDb = require('_rads-db');
@@ -893,24 +894,71 @@ function createRads(args) {
   const validators = generateValidators(s);
   return generateMethods(s, validators, args);
 }
-function getRestRoutes(db, prefix = "/") {
+function getRestRoutes(options) {
+  const { db, prefix = "/api/" } = options;
   const routes = {};
   const schema2 = db._schema;
+  routes[`${prefix}me`] = { GET: async (args, ctx) => ({ userId: ctx?.getUser?.()?.id }) };
+  routes[`${prefix}radsTunnel`] = { POST: getRadsTunnelHandler(db) };
+  routes[`${prefix}uploadFile`] = { POST: getUploadFileHandler(db) };
   for (const key in schema2) {
     const entity = schema2[key];
     if (!entity.decorators?.entity)
       continue;
     routes[`${prefix}${entity.handle}`] = {
-      POST: (args, ctx) => db[entity.handle].get(args, ctx),
-      PUT: (args, ctx) => db[entity.handle].put(args?.data, ctx)
+      POST: (args, ctx) => db[entity.handle].get(args.body, ctx),
+      PUT: (args, ctx) => db[entity.handle].put(args.body?.data, ctx)
     };
     routes[`${prefix}${entity.handlePlural}`] = {
-      POST: (args, ctx) => db[entity.handle].getMany(args, ctx),
-      PUT: (args, ctx) => db[entity.handle].putMany(args?.data, ctx)
+      POST: (args, ctx) => db[entity.handle].getMany(args.body, ctx),
+      PUT: (args, ctx) => db[entity.handle].putMany(args.body?.data, ctx)
     };
   }
   return routes;
 }
+function getUploadFileHandler(db) {
+  return async function uploadFileHandler(request, ctx) {
+    const { body } = request;
+    const blob = getBlobFromDataUrl(body?.blobDataUrl);
+    if (!blob)
+      throw h3.createError({ statusCode: 400, message: "Malformed request" });
+    return await db.uploadFile(
+      {
+        blob,
+        fileName: body.filename || body.fileName,
+        containerName: body.containerName
+      },
+      ctx
+    );
+  };
+}
+function getRadsTunnelHandler(db) {
+  return async function radsTunnelHandler(request, ctx) {
+    const { method, entity, args, uploadArgs } = request?.body || {};
+    if (method === "uploadFile") {
+      const blob = getBlobFromDataUrl(uploadArgs?.blobDataUrl);
+      if (!blob)
+        throw h3.createError({ statusCode: 400, message: "Malformed request" });
+      return db.uploadFile({ blob, ...uploadArgs }, ctx);
+    }
+    if (!method || !entity)
+      throw h3.createError({ statusCode: 400, message: "Malformed request" });
+    const handle = db[___default.lowerFirst(entity)];
+    if (!handle)
+      throw h3.createError({ statusCode: 400, message: "Malformed request" });
+    if (!handle[method])
+      throw h3.createError({ statusCode: 400, message: "Unknown method" });
+    return await handle[method](args, ctx);
+  };
+}
+function getBlobFromDataUrl(dataUrl) {
+  const [header, b64string] = dataUrl?.split(",");
+  const [protocol, format] = header?.split(":");
+  const [type, algorithm] = format?.split(";");
+  if (protocol !== "data" || algorithm !== "base64" || !b64string)
+    throw h3.createError({ statusCode: 400, message: "Malformed request" });
+  return new Blob([Buffer.from(b64string, "base64")], { type });
+}
 
 exports.computed = computed;
 exports.createRads = createRads;

package/dist/index.d.ts

@@ -158,8 +158,22 @@ interface TypeDefinition {
 }
 interface FileUploadDriver {
     driverName: string;
-    uploadFile(args: FileUploadArgs): Promise<string>;
+    uploadFile(args: FileUploadArgs, ctx?: RadsRequestContext): Promise<{
+        url: string;
+    }>;
+}
+interface GetRestRoutesOptions {
+    /** Instance of RadsDb */
+    db: RadsDb;
+    /** Prefix to use for generated routes. Defaults to "/api/" */
+    prefix?: string;
+}
+interface GetRestRoutesArgs {
+    body?: any;
+    context: any;
+    headers: Record<string, string>;
 }
+type GetRestRoutesResponse = Record<string, Partial<Record<'POST' | 'PUT' | 'GET' | 'PATCH', (args: GetRestRoutesArgs, ctx?: RadsRequestContext) => Promise<any>>>>;
 interface FileUploadArgs {
     blob: Blob;
     fileName: string;
@@ -243,6 +257,6 @@ declare function precomputed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassFi
 declare function computed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassFieldDecoratorContext | ClassDecoratorContext) => void;
 
 declare function createRads(args?: CreateRadsArgs): RadsDb;
-declare function getRestRoutes(db: RadsDb, prefix?: string): Record<string, Record<string, Function>>;
+declare function getRestRoutes(options: GetRestRoutesOptions): GetRestRoutesResponse;
 
-export { Change, ComputedContext, ComputedDecoratorArgs, CreateRadsArgs, DeepPartial, DeepPartialNullable, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, FieldDecoratorArgs, FieldDefinition, FileUploadArgs, FileUploadDriver, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, MinimalDriver, PutArgs, PutEffect, RadsRequestContext, Relation, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, computed, createRads, entity, field, getRestRoutes, precomputed, ui, validate };
+export { Change, ComputedContext, ComputedDecoratorArgs, CreateRadsArgs, DeepPartial, DeepPartialNullable, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, FieldDecoratorArgs, FieldDefinition, FileUploadArgs, FileUploadDriver, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsRequestContext, Relation, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, computed, createRads, entity, field, getRestRoutes, precomputed, ui, validate };

package/dist/index.mjs

@@ -1,5 +1,6 @@
-import { z } from 'zod';
 import _ from 'lodash';
+import { createError } from 'h3';
+import { z } from 'zod';
 import createMerge from '@fastify/deepmerge';
 import { v4 } from 'uuid';
 import { schema } from '_rads-db';
@@ -886,23 +887,70 @@ function createRads(args) {
   const validators = generateValidators(s);
   return generateMethods(s, validators, args);
 }
-function getRestRoutes(db, prefix = "/") {
+function getRestRoutes(options) {
+  const { db, prefix = "/api/" } = options;
   const routes = {};
   const schema2 = db._schema;
+  routes[`${prefix}me`] = { GET: async (args, ctx) => ({ userId: ctx?.getUser?.()?.id }) };
+  routes[`${prefix}radsTunnel`] = { POST: getRadsTunnelHandler(db) };
+  routes[`${prefix}uploadFile`] = { POST: getUploadFileHandler(db) };
   for (const key in schema2) {
     const entity = schema2[key];
     if (!entity.decorators?.entity)
       continue;
     routes[`${prefix}${entity.handle}`] = {
-      POST: (args, ctx) => db[entity.handle].get(args, ctx),
-      PUT: (args, ctx) => db[entity.handle].put(args?.data, ctx)
+      POST: (args, ctx) => db[entity.handle].get(args.body, ctx),
+      PUT: (args, ctx) => db[entity.handle].put(args.body?.data, ctx)
     };
     routes[`${prefix}${entity.handlePlural}`] = {
-      POST: (args, ctx) => db[entity.handle].getMany(args, ctx),
-      PUT: (args, ctx) => db[entity.handle].putMany(args?.data, ctx)
+      POST: (args, ctx) => db[entity.handle].getMany(args.body, ctx),
+      PUT: (args, ctx) => db[entity.handle].putMany(args.body?.data, ctx)
     };
   }
   return routes;
 }
+function getUploadFileHandler(db) {
+  return async function uploadFileHandler(request, ctx) {
+    const { body } = request;
+    const blob = getBlobFromDataUrl(body?.blobDataUrl);
+    if (!blob)
+      throw createError({ statusCode: 400, message: "Malformed request" });
+    return await db.uploadFile(
+      {
+        blob,
+        fileName: body.filename || body.fileName,
+        containerName: body.containerName
+      },
+      ctx
+    );
+  };
+}
+function getRadsTunnelHandler(db) {
+  return async function radsTunnelHandler(request, ctx) {
+    const { method, entity, args, uploadArgs } = request?.body || {};
+    if (method === "uploadFile") {
+      const blob = getBlobFromDataUrl(uploadArgs?.blobDataUrl);
+      if (!blob)
+        throw createError({ statusCode: 400, message: "Malformed request" });
+      return db.uploadFile({ blob, ...uploadArgs }, ctx);
+    }
+    if (!method || !entity)
+      throw createError({ statusCode: 400, message: "Malformed request" });
+    const handle = db[_.lowerFirst(entity)];
+    if (!handle)
+      throw createError({ statusCode: 400, message: "Malformed request" });
+    if (!handle[method])
+      throw createError({ statusCode: 400, message: "Unknown method" });
+    return await handle[method](args, ctx);
+  };
+}
+function getBlobFromDataUrl(dataUrl) {
+  const [header, b64string] = dataUrl?.split(",");
+  const [protocol, format] = header?.split(":");
+  const [type, algorithm] = format?.split(";");
+  if (protocol !== "data" || algorithm !== "base64" || !b64string)
+    throw createError({ statusCode: 400, message: "Malformed request" });
+  return new Blob([Buffer.from(b64string, "base64")], { type });
+}
 
 export { computed, createRads, entity, field, getRestRoutes, precomputed, ui, validate };

package/fileUploadDrivers/azureStorageBlob.cjs

@@ -30,7 +30,9 @@ var _default = options => {
         console.error("Error uploading file to azure storage:");
         throw e;
       }
-      return blobClient.url.split("?")[0];
+      return {
+        url: blobClient.url.split("?")[0]
+      };
     }
   };
   return driver;

package/fileUploadDrivers/azureStorageBlob.mjs

@@ -20,7 +20,7 @@ export default (options) => {
         console.error("Error uploading file to azure storage:");
         throw e;
       }
-      return blobClient.url.split("?")[0];
+      return { url: blobClient.url.split("?")[0] };
     }
   };
   return driver;

package/fileUploadDrivers/memory.cjs

@@ -12,7 +12,9 @@ var _default = options => {
         blob
       } = args;
       const dataUrl = await blobToDataURL(blob);
-      return dataUrl;
+      return {
+        url: dataUrl
+      };
     }
   };
   return driver;

package/fileUploadDrivers/memory.mjs

@@ -4,7 +4,7 @@ export default (options) => {
     async uploadFile(args) {
       const { blob } = args;
       const dataUrl = await blobToDataURL(blob);
-      return dataUrl;
+      return { url: dataUrl };
     }
   };
   return driver;

package/fileUploadDrivers/restApi.cjs

@@ -20,7 +20,7 @@ var _default = options => {
         method: "POST",
         body
       });
-      return response.text();
+      return await response.json();
     }
   };
   return driver;

package/fileUploadDrivers/restApi.mjs

@@ -11,7 +11,7 @@ export default (options) => {
         method: "POST",
         body
       });
-      return response.text();
+      return await response.json();
     }
   };
   return driver;

package/package.json

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