@sqrzro/server 2.0.0-bz.3 → 2.0.0-bz.4

package/dist/AuthService.d.ts

@@ -1,7 +1,7 @@
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
-import type { Errorable, UserObject } from './interfaces';
-export declare function handleLogin(formData: FormData, lookupFn: (email: string) => Promise<UserObject | null>): Promise<Errorable<UserObject>>;
+import type { Errorable, LoginFormFields, UserObject } from './interfaces';
+export declare function handleLogin(formData: LoginFormFields, lookupFn: (email: string) => Promise<UserObject | null>): Promise<Errorable<UserObject>>;
 interface MeObject {
     name: string;
     email: string;

package/dist/DataService.d.ts

@@ -1,7 +1,7 @@
 import type Joi from 'joi';
 import type { Errorable } from './interfaces';
 interface MutateArgs<F extends object> {
-    formData: FormData;
+    formData: F;
     onSuccess?: (model: F) => Promise<void> | void;
     onValidationError?: (errors: Record<string, string>) => void;
     request: Promise<Joi.ObjectSchema<F>>;

package/dist/DataService.js

@@ -26,7 +26,7 @@ async function mutate(args) {
     }
     const model = await args.fn(validated);
     if (!model) {
-        return [null, { $root: 'SERVER_ERROR' }];
+        return [null, { $root: 'No model has been returned from the fn' }];
     }
     try {
         await args.onSuccess?.(model);

package/dist/RequestService.d.ts

@@ -12,7 +12,7 @@ export declare function validate(): typeof Joi;
  * @param validation
  * @returns
  */
-export declare function validateSchema<T extends object>(formData: FormData, validation: Joi.ObjectSchema<T>): ErrorablePromise<T>;
+export declare function validateSchema<T extends object>(formData: T, validation: Joi.ObjectSchema<T>): ErrorablePromise<T>;
 export declare function createSchema<T>(schema: Joi.PartialSchemaMap<T>): Promise<Joi.ObjectSchema<T>>;
 interface ExtendSchemaOptions {
     required?: string[];

package/dist/RequestService.js

@@ -23,55 +23,6 @@ function checkExternalErrors(validated) {
 function transformErrors(error) {
     return error.details.reduce((acc, cur) => ({ ...acc, [cur.path[0]]: cur.message }), {});
 }
-function transformString(value) {
-    return value;
-}
-function transformNumber(value) {
-    return parseInt(value, 10);
-}
-function transformBoolean(value) {
-    return value === 'true' || value === '1';
-}
-function transformDate(value) {
-    if (!value) {
-        return null;
-    }
-    return new Date(value);
-}
-const transformMap = {
-    string: transformString,
-    number: transformNumber,
-    boolean: transformBoolean,
-    date: transformDate,
-};
-function transformValue(value, type) {
-    return transformMap[type](String(value));
-}
-/**
- * Take the formData and the validation schema and transform the formData into an object that
- * contains the correct types, as defined by the validation schema. This is because the FormData
- * object will only contain strings (or File/Blob objects) and we want to be able to use the object
- * correctly typed. For example, if the validation schema defines a property as a boolean, we want
- * the value to be either true or false, not the string "true" or "false".
- *
- * @param formData
- * @param validation
- */
-function transform(formData, validation) {
-    const keys = validation.describe().keys;
-    const entries = Object.entries(Object.fromEntries(formData.entries()));
-    const result = {};
-    entries.forEach(([key, value]) => {
-        const entry = keys[key];
-        if (entry) {
-            result[key] = transformValue(value, entry.type);
-        }
-        else {
-            result[key] = value;
-        }
-    });
-    return result;
-}
 /**
  * This function takes FormData and a schema. It then attempts to transform the FormData into an
  * object that matches `T`. This is because the FormData object is not typed and we want to be able
@@ -85,8 +36,7 @@ function transform(formData, validation) {
  */
 async function validateSchema(formData, validation) {
     try {
-        const transformed = transform(formData, validation);
-        const validated = await validation.validateAsync(transformed, {
+        const validated = await validation.validateAsync(formData, {
             abortEarly: false,
         });
         return checkExternalErrors(validated);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqrzro/server",
-  "version": "2.0.0-bz.3",
+  "version": "2.0.0-bz.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "ISC",