giraffeql 2.0.7 → 2.0.10

package/README.md

@@ -9,6 +9,8 @@ GiraffeQL is a JSON-friendly method of sending queries between the client and se
 For more information about GiraffeQL features, check out these wiki links:
 
 - [Hello World example](https://github.com/big213/giraffeql/wiki/Getting-Started)
+- [Giraffeql Boilerplate Template](https://github.com/big213/giraffeql-boilerplate)
+- [Giraffeql.com - Website for documenting your giraffes](https://github.com/big213/giraffeql.com)
 - [Roadmap](https://github.com/big213/giraffeql/wiki/Roadmap)
 
 ## License

package/lib/classes/error/argsError.d.ts

@@ -2,6 +2,6 @@ import { GiraffeqlBaseError } from "..";
 export declare class GiraffeqlArgsError extends GiraffeqlBaseError {
     constructor(params: {
         message: string;
-        fieldPath: string[];
+        fieldPath?: string[];
     });
 }

package/lib/classes/error/argsError.js.map

@@ -1 +1 @@
-{"version":3,"file":"argsError.js","sourceRoot":"","sources":["../../../src/classes/error/argsError.ts"],"names":[],"mappings":";;;AAAA,0BAAwC;AACxC,MAAa,kBAAmB,SAAQ,sBAAkB;IACxD,YAAY,MAAgD;QAC1D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QACtC,KAAK,CAAC;YACJ,SAAS,EAAE,oBAAoB;YAC/B,OAAO;YACP,SAAS;YACT,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAVD,gDAUC"}
+{"version":3,"file":"argsError.js","sourceRoot":"","sources":["../../../src/classes/error/argsError.ts"],"names":[],"mappings":";;;AAAA,0BAAwC;AACxC,MAAa,kBAAmB,SAAQ,sBAAkB;IACxD,YAAY,MAAiD;QAC3D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QACtC,KAAK,CAAC;YACJ,SAAS,EAAE,oBAAoB;YAC/B,OAAO;YACP,SAAS;YACT,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAVD,gDAUC"}

package/lib/classes/error/baseError.d.ts

@@ -1,10 +1,10 @@
 export declare class GiraffeqlBaseError extends Error {
     name: string;
-    fieldPath: string[];
+    fieldPath?: string[];
     statusCode: number;
     constructor(params: {
         errorName?: string;
-        message: string;
+        message?: string;
         fieldPath?: string[];
         statusCode?: number;
     });

package/lib/classes/error/baseError.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GiraffeqlBaseError = void 0;
 class GiraffeqlBaseError extends Error {
     constructor(params) {
-        const { errorName = "GiraffeqlBaseError", message, fieldPath = [], statusCode = 500, } = params;
+        const { errorName = "GiraffeqlBaseError", message = "An unspecified error has occurred", fieldPath, statusCode = 500, } = params;
         super(message);
         this.name = errorName;
         this.fieldPath = fieldPath;

package/lib/classes/error/baseError.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseError.js","sourceRoot":"","sources":["../../../src/classes/error/baseError.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAmB,SAAQ,KAAK;IAK3C,YAAY,MAKX;QACC,MAAM,EACJ,SAAS,GAAG,oBAAoB,EAChC,OAAO,EACP,SAAS,GAAG,EAAE,EACd,UAAU,GAAG,GAAG,GACjB,GAAG,MAAM,CAAC;QACX,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AAtBD,gDAsBC"}
+{"version":3,"file":"baseError.js","sourceRoot":"","sources":["../../../src/classes/error/baseError.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAmB,SAAQ,KAAK;IAK3C,YAAY,MAKX;QACC,MAAM,EACJ,SAAS,GAAG,oBAAoB,EAChC,OAAO,GAAG,mCAAmC,EAC7C,SAAS,EACT,UAAU,GAAG,GAAG,GACjB,GAAG,MAAM,CAAC;QACX,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AAtBD,gDAsBC"}

package/lib/classes/error/queryError.d.ts

@@ -2,6 +2,6 @@ import { GiraffeqlBaseError } from "..";
 export declare class GiraffeqlQueryError extends GiraffeqlBaseError {
     constructor(params: {
         message: string;
-        fieldPath: string[];
+        fieldPath?: string[];
     });
 }

package/lib/classes/error/queryError.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryError.js","sourceRoot":"","sources":["../../../src/classes/error/queryError.ts"],"names":[],"mappings":";;;AAAA,0BAAwC;AACxC,MAAa,mBAAoB,SAAQ,sBAAkB;IACzD,YAAY,MAAgD;QAC1D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QACtC,KAAK,CAAC;YACJ,SAAS,EAAE,qBAAqB;YAChC,OAAO;YACP,SAAS;YACT,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAVD,kDAUC"}
+{"version":3,"file":"queryError.js","sourceRoot":"","sources":["../../../src/classes/error/queryError.ts"],"names":[],"mappings":";;;AAAA,0BAAwC;AACxC,MAAa,mBAAoB,SAAQ,sBAAkB;IACzD,YAAY,MAAiD;QAC3D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QACtC,KAAK,CAAC;YACJ,SAAS,EAAE,qBAAqB;YAChC,OAAO;YACP,SAAS;YACT,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAVD,kDAUC"}

package/lib/classes/error/resultError.d.ts

@@ -2,6 +2,6 @@ import { GiraffeqlBaseError } from "..";
 export declare class GiraffeqlResultError extends GiraffeqlBaseError {
     constructor(params: {
         message: string;
-        fieldPath: string[];
+        fieldPath?: string[];
     });
 }

package/lib/classes/error/resultError.js.map

@@ -1 +1 @@
-{"version":3,"file":"resultError.js","sourceRoot":"","sources":["../../../src/classes/error/resultError.ts"],"names":[],"mappings":";;;AAAA,0BAAwC;AACxC,MAAa,oBAAqB,SAAQ,sBAAkB;IAC1D,YAAY,MAAgD;QAC1D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QACtC,KAAK,CAAC;YACJ,SAAS,EAAE,sBAAsB;YACjC,OAAO;YACP,SAAS;YACT,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAVD,oDAUC"}
+{"version":3,"file":"resultError.js","sourceRoot":"","sources":["../../../src/classes/error/resultError.ts"],"names":[],"mappings":";;;AAAA,0BAAwC;AACxC,MAAa,oBAAqB,SAAQ,sBAAkB;IAC1D,YAAY,MAAiD;QAC3D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QACtC,KAAK,CAAC;YACJ,SAAS,EAAE,sBAAsB;YACjC,OAAO;YACP,SAAS;YACT,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAVD,oDAUC"}

package/lib/helpers/base.d.ts

@@ -1,6 +1,7 @@
-import { GiraffeqlObjectType, GiraffeqlScalarType, GiraffeqlObjectTypeLookup, GiraffeqlInputFieldType } from "../classes";
+import { GiraffeqlObjectType, GiraffeqlScalarType, GiraffeqlObjectTypeLookup, GiraffeqlInputFieldType, GiraffeqlBaseError } from "../classes";
 import { GiraffeqlResolverNode, ResolverObject, RootResolverDefinition, GiraffeqlProcessorFunction, ObjectTypeDefinitionField, ArrayOptions, StringKeyObject } from "../types";
 export declare function isObject(ele: unknown): ele is StringKeyObject;
+export declare function processError(err: unknown, fieldPath?: string[]): GiraffeqlBaseError;
 export declare function validateExternalArgs(args: unknown, argDefinition: GiraffeqlInputFieldType | undefined, fieldPath: string[]): unknown;
 export declare function validateGiraffeqlResults(giraffeqlResultsNode: unknown, giraffeqlResolverNode: GiraffeqlResolverNode, fieldPath: string[]): Promise<unknown>;
 export declare function validateResultFields(value: unknown, resolverObject: ResolverObject, fieldPath: string[]): void;
@@ -9,7 +10,7 @@ export declare function generateAnonymousRootResolver(type: GiraffeqlObjectType
 export declare function generateGiraffeqlResolverTree({ fieldValue, resolverObject, fieldPath, fullTree, validateArgs, }: {
     fieldValue: unknown;
     resolverObject: ObjectTypeDefinitionField | RootResolverDefinition;
-    fieldPath?: string[];
+    fieldPath: string[];
     fullTree?: boolean;
     validateArgs?: boolean;
 }): GiraffeqlResolverNode;

package/lib/helpers/base.js

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processGiraffeqlResolverTree = exports.generateGiraffeqlResolverTree = exports.generateAnonymousRootResolver = exports.validateResultNullish = exports.validateResultFields = exports.validateGiraffeqlResults = exports.validateExternalArgs = exports.isObject = void 0;
+exports.processGiraffeqlResolverTree = exports.generateGiraffeqlResolverTree = exports.generateAnonymousRootResolver = exports.validateResultNullish = exports.validateResultFields = exports.validateGiraffeqlResults = exports.validateExternalArgs = exports.processError = exports.isObject = void 0;
 const __1 = require("..");
 const classes_1 = require("../classes");
 const types_1 = require("../types");
@@ -19,293 +19,321 @@ function isObject(ele) {
     return Object.prototype.toString.call(ele) === "[object Object]";
 }
 exports.isObject = isObject;
-// validates and replaces the args, returns the validated args
-function validateExternalArgs(args, argDefinition, fieldPath) {
-    let parsedArgs;
-    // if no argDefinition and args provided, throw error
-    if (!argDefinition) {
-        if (args)
-            throw new classes_1.GiraffeqlArgsError({
-                message: `Not expecting any args`,
-                fieldPath,
-            });
-        else
-            return;
+function processError(err, fieldPath) {
+    if (err instanceof classes_1.GiraffeqlBaseError) {
+        if (fieldPath)
+            err.fieldPath = fieldPath;
+        return err;
     }
-    // if no arg required and args is undefined, return
-    if (!argDefinition.definition.required && args === undefined)
-        return;
-    // if argDefinition.required and args is undefined, throw err
-    if (argDefinition.definition.required && args === undefined)
-        throw new classes_1.GiraffeqlArgsError({
-            message: `Args is required`,
+    else if (err instanceof Error) {
+        return new classes_1.GiraffeqlBaseError({
+            message: err.message,
             fieldPath,
         });
-    // if !argDefinition.allowNull and args is null, throw err
-    if (!argDefinition.definition.allowNull && args === null)
-        throw new classes_1.GiraffeqlArgsError({
-            message: `Null field is not allowed`,
+    }
+    else {
+        return new classes_1.GiraffeqlBaseError({
             fieldPath,
         });
-    // if array field
-    if (argDefinition.definition.arrayOptions) {
-        // if allowNull and not array, must be null
-        if (argDefinition.definition.allowNull &&
-            !Array.isArray(args) &&
-            args !== null) {
-            throw new classes_1.GiraffeqlArgsError({
-                message: `Field must be Array or null`,
-                fieldPath,
-            });
+    }
+}
+exports.processError = processError;
+// validates and replaces the args, returns the validated args
+function validateExternalArgs(args, argDefinition, fieldPath) {
+    try {
+        let parsedArgs;
+        // if no argDefinition and args provided, throw error
+        if (!argDefinition) {
+            if (args)
+                throw new classes_1.GiraffeqlArgsError({
+                    message: `Not expecting any args`,
+                });
+            else
+                return;
         }
-        // if !allowNull and not array, throw err
-        if (!argDefinition.definition.allowNull && !Array.isArray(args))
+        // if no arg required and args is undefined, return
+        if (!argDefinition.definition.required && args === undefined)
+            return;
+        // if argDefinition.required and args is undefined, throw err
+        if (argDefinition.definition.required && args === undefined)
             throw new classes_1.GiraffeqlArgsError({
-                message: `Array expected`,
-                fieldPath,
+                message: `Args is required`,
             });
-    }
-    let argDefType = argDefinition.definition.type;
-    // // if lookup field, convert from map
-    if (argDefType instanceof classes_1.GiraffeqlInputTypeLookup) {
-        const inputDef = __1.inputTypeDefs.get(argDefType.name);
-        if (!inputDef)
+        // if !argDefinition.allowNull and args is null, throw err
+        if (!argDefinition.definition.allowNull && args === null)
             throw new classes_1.GiraffeqlArgsError({
-                message: `Unknown inputDef '${argDefType.name}'`,
-                fieldPath,
+                message: `Null field is not allowed`,
             });
-        argDefType = inputDef;
-    }
-    // if argDefinition.type is inputTypeDefinition
-    if (argDefType instanceof classes_1.GiraffeqlInputType) {
-        let argsArray;
-        const fields = argDefType.definition.fields;
-        // if args is array and it is supposed to be array, process each array element
-        if (Array.isArray(args) && argDefinition.definition.arrayOptions) {
-            // if !allowNullElements and there is a null element, throw err
-            if (!argDefinition.definition.arrayOptions.allowNullElement &&
-                args.some((ele) => ele === null)) {
+        // if array field
+        if (argDefinition.definition.arrayOptions) {
+            // if allowNull and not array, must be null
+            if (argDefinition.definition.allowNull &&
+                !Array.isArray(args) &&
+                args !== null) {
                 throw new classes_1.GiraffeqlArgsError({
-                    message: `Null field is not allowed on array element`,
-                    fieldPath,
+                    message: `Field must be Array or null`,
                 });
             }
-            argsArray = args;
+            // if !allowNull and not array, throw err
+            if (!argDefinition.definition.allowNull && !Array.isArray(args))
+                throw new classes_1.GiraffeqlArgsError({
+                    message: `Array expected`,
+                });
         }
-        else {
-            argsArray = [args];
+        let argDefType = argDefinition.definition.type;
+        // // if lookup field, convert from map
+        if (argDefType instanceof classes_1.GiraffeqlInputTypeLookup) {
+            const inputDef = __1.inputTypeDefs.get(argDefType.name);
+            if (!inputDef)
+                throw new classes_1.GiraffeqlArgsError({
+                    message: `Unknown inputDef '${argDefType.name}'`,
+                });
+            argDefType = inputDef;
         }
-        // process all args
-        for (const arg of argsArray) {
-            if (!isObject(arg)) {
-                if (argDefinition.definition.allowNull && arg !== null) {
+        // if argDefinition.type is inputTypeDefinition
+        if (argDefType instanceof classes_1.GiraffeqlInputType) {
+            let argsArray;
+            const fields = argDefType.definition.fields;
+            // if args is array and it is supposed to be array, process each array element
+            if (Array.isArray(args) && argDefinition.definition.arrayOptions) {
+                // if !allowNullElements and there is a null element, throw err
+                if (!argDefinition.definition.arrayOptions.allowNullElement &&
+                    args.some((ele) => ele === null)) {
                     throw new classes_1.GiraffeqlArgsError({
-                        message: `Object or null expected`,
-                        fieldPath,
+                        message: `Null field is not allowed on array element`,
                     });
                 }
-                if (!argDefinition.definition.allowNull) {
-                    throw new classes_1.GiraffeqlArgsError({
-                        message: `Object expected`,
-                        fieldPath,
+                argsArray = args;
+            }
+            else {
+                argsArray = [args];
+            }
+            // process all args
+            for (const arg of argsArray) {
+                if (!isObject(arg)) {
+                    if (argDefinition.definition.allowNull && arg !== null) {
+                        throw new classes_1.GiraffeqlArgsError({
+                            message: `Object or null expected`,
+                        });
+                    }
+                    if (!argDefinition.definition.allowNull) {
+                        throw new classes_1.GiraffeqlArgsError({
+                            message: `Object expected`,
+                        });
+                    }
+                }
+                // if arg is null and allowed to be null, do nothing
+                if (isObject(arg)) {
+                    const keysToValidate = new Set(Object.keys(arg));
+                    Object.entries(fields).forEach(([key, argDef]) => {
+                        // validate each key of arg
+                        const validatedArg = validateExternalArgs(arg[key], argDef, fieldPath.concat(key));
+                        // if key is undefined, make sure it is deleted
+                        if (validatedArg === undefined)
+                            delete arg[key];
+                        else {
+                            arg[key] = validatedArg;
+                        }
+                        keysToValidate.delete(key);
                     });
+                    // check if any remaining keys to validate (aka unknown args)
+                    if (keysToValidate.size > 0) {
+                        throw new classes_1.GiraffeqlArgsError({
+                            message: `Unknown args '${[...keysToValidate].join(",")}'`,
+                        });
+                    }
+                    // perform validation on results
+                    if (argDefType.definition.inputsValidator) {
+                        argDefType.definition.inputsValidator(arg, fieldPath);
+                    }
                 }
             }
-            // if arg is null and allowed to be null, do nothing
-            if (isObject(arg)) {
-                const keysToValidate = new Set(Object.keys(arg));
-                Object.entries(fields).forEach(([key, argDef]) => {
-                    // validate each key of arg
-                    const validatedArg = validateExternalArgs(arg[key], argDef, fieldPath.concat(key));
-                    // if key is undefined, make sure it is deleted
-                    if (validatedArg === undefined)
-                        delete arg[key];
+        }
+        else {
+            // if argDefinition.type is scalarDefinition, attempt to parseValue args
+            // replace value if parseValue
+            const parseValue = argDefType.definition.parseValue;
+            // if arg is null, skip
+            if (parseValue && args !== null) {
+                try {
+                    // if arg is an array and supposed to be array, loop through
+                    if (Array.isArray(args) && argDefinition.definition.arrayOptions) {
+                        parsedArgs = args.map((ele) => parseValue(ele));
+                    }
                     else {
-                        arg[key] = validatedArg;
+                        parsedArgs = parseValue(args);
                     }
-                    keysToValidate.delete(key);
-                });
-                // check if any remaining keys to validate (aka unknown args)
-                if (keysToValidate.size > 0) {
+                }
+                catch (_a) {
+                    // transform any errors thrown into GiraffeqlParseError
                     throw new classes_1.GiraffeqlArgsError({
-                        message: `Unknown args '${[...keysToValidate].join(",")}'`,
-                        fieldPath,
+                        message: `Invalid scalar value for '${argDefType.definition.name}'`,
                     });
                 }
-                // perform validation on results
-                if (argDefType.definition.inputsValidator) {
-                    argDefType.definition.inputsValidator(arg, fieldPath);
-                }
             }
         }
-    }
-    else {
-        // if argDefinition.type is scalarDefinition, attempt to parseValue args
-        // replace value if parseValue
-        const parseValue = argDefType.definition.parseValue;
-        // if arg is null, skip
-        if (parseValue && args !== null) {
-            try {
-                // if arg is an array and supposed to be array, loop through
-                if (Array.isArray(args) && argDefinition.definition.arrayOptions) {
-                    parsedArgs = args.map((ele) => parseValue(ele));
-                }
-                else {
-                    parsedArgs = parseValue(args);
-                }
-            }
-            catch (_a) {
-                // transform any errors thrown into GiraffeqlParseError
-                throw new classes_1.GiraffeqlArgsError({
-                    message: `Invalid scalar value for '${argDefType.definition.name}'`,
-                    fieldPath: fieldPath,
-                });
-            }
+        /*
+        // if an argsValidator function is available, also run that
+        if (argDefinition.argsValidator) {
+          argDefinition.argsValidator(parsedArgs, fieldPath);
         }
+        */
+        return parsedArgs !== null && parsedArgs !== void 0 ? parsedArgs : args;
     }
-    /*
-    // if an argsValidator function is available, also run that
-    if (argDefinition.argsValidator) {
-      argDefinition.argsValidator(parsedArgs, fieldPath);
+    catch (err) {
+        throw processError(err, fieldPath);
     }
-    */
-    return parsedArgs !== null && parsedArgs !== void 0 ? parsedArgs : args;
 }
 exports.validateExternalArgs = validateExternalArgs;
 // traverses results according to GiraffeqlResolverTree and validates nulls, arrays, extracts results from objs
 async function validateGiraffeqlResults(giraffeqlResultsNode, giraffeqlResolverNode, fieldPath) {
-    const nested = giraffeqlResolverNode.nested;
-    if (nested) {
-        // if output is null, cut the tree short and return
-        if (giraffeqlResultsNode === null)
-            return null;
-        if (giraffeqlResolverNode.typeDef.arrayOptions) {
-            if (Array.isArray(giraffeqlResultsNode)) {
-                return Promise.all(giraffeqlResultsNode.map(async (ele) => {
-                    const arrReturnValue = {};
-                    for (const field in giraffeqlResolverNode.nested) {
-                        arrReturnValue[field] = await validateGiraffeqlResults(ele[field], giraffeqlResolverNode.nested[field], fieldPath.concat(field));
-                    }
-                    return arrReturnValue;
-                }));
+    try {
+        const nested = giraffeqlResolverNode.nested;
+        if (nested) {
+            // if output is null, cut the tree short and return
+            if (giraffeqlResultsNode === null) {
+                // but first, check if null is allowed. if not, throw err
+                if (!giraffeqlResolverNode.typeDef.allowNull) {
+                    throw new classes_1.GiraffeqlResultError({
+                        message: `Null output not allowed`,
+                    });
+                }
+                return null;
+            }
+            if (giraffeqlResolverNode.typeDef.arrayOptions) {
+                if (Array.isArray(giraffeqlResultsNode)) {
+                    return Promise.all(giraffeqlResultsNode.map(async (ele) => {
+                        const arrReturnValue = {};
+                        for (const field in giraffeqlResolverNode.nested) {
+                            arrReturnValue[field] = await validateGiraffeqlResults(ele[field], giraffeqlResolverNode.nested[field], fieldPath.concat(field));
+                        }
+                        return arrReturnValue;
+                    }));
+                }
+                else {
+                    // if field is not Array or null, throw err
+                    throw new classes_1.GiraffeqlResultError({
+                        message: `Expecting array or null`,
+                    });
+                }
             }
             else {
-                // if field is not Array or null, throw err
-                throw new classes_1.GiraffeqlResultError({
-                    message: `Expecting array or null`,
-                    fieldPath: fieldPath,
-                });
+                const tempReturnValue = {};
+                // if no nested fields requested, return empty object
+                if (giraffeqlResolverNode.nested &&
+                    Object.keys(giraffeqlResolverNode.nested).length < 1) {
+                    return isObject(giraffeqlResultsNode) ? tempReturnValue : null;
+                }
+                if (!isObject(giraffeqlResultsNode))
+                    throw new classes_1.GiraffeqlResultError({
+                        message: `Expecting object`,
+                    });
+                for (const field in giraffeqlResolverNode.nested) {
+                    tempReturnValue[field] = await validateGiraffeqlResults(giraffeqlResultsNode[field], giraffeqlResolverNode.nested[field], fieldPath.concat(field));
+                }
+                return tempReturnValue;
             }
         }
         else {
-            const tempReturnValue = {};
-            // if no nested fields requested, return empty object
-            if (giraffeqlResolverNode.nested &&
-                Object.keys(giraffeqlResolverNode.nested).length < 1) {
-                return isObject(giraffeqlResultsNode) ? tempReturnValue : null;
-            }
-            if (!isObject(giraffeqlResultsNode))
-                throw new classes_1.GiraffeqlResultError({
-                    message: `Expecting object`,
-                    fieldPath: fieldPath,
-                });
-            for (const field in giraffeqlResolverNode.nested) {
-                tempReturnValue[field] = await validateGiraffeqlResults(giraffeqlResultsNode[field], giraffeqlResolverNode.nested[field], fieldPath.concat(field));
+            // check for nulls and ensure array fields are arrays
+            validateResultFields(giraffeqlResultsNode, giraffeqlResolverNode.typeDef, fieldPath);
+            // if typeDef of field is ScalarDefinition, apply the serialize function to the end result
+            let fieldType = giraffeqlResolverNode.typeDef.type;
+            if (fieldType instanceof classes_1.GiraffeqlObjectTypeLookup) {
+                const typeDef = __1.objectTypeDefs.get(fieldType.name);
+                if (!typeDef) {
+                    throw new classes_1.GiraffeqlQueryError({
+                        message: `TypeDef '${fieldType.name}' not found`,
+                    });
+                }
+                fieldType = typeDef;
             }
-            return tempReturnValue;
-        }
-    }
-    else {
-        // check for nulls and ensure array fields are arrays
-        validateResultFields(giraffeqlResultsNode, giraffeqlResolverNode.typeDef, fieldPath);
-        // if typeDef of field is ScalarDefinition, apply the serialize function to the end result
-        let fieldType = giraffeqlResolverNode.typeDef.type;
-        if (fieldType instanceof classes_1.GiraffeqlObjectTypeLookup) {
-            const typeDef = __1.objectTypeDefs.get(fieldType.name);
-            if (!typeDef) {
-                throw new classes_1.GiraffeqlQueryError({
-                    message: `TypeDef '${fieldType.name}' not found`,
-                    fieldPath: fieldPath,
-                });
+            if (fieldType instanceof classes_1.GiraffeqlObjectType) {
+                return giraffeqlResultsNode;
             }
-            fieldType = typeDef;
-        }
-        if (fieldType instanceof classes_1.GiraffeqlObjectType) {
-            return giraffeqlResultsNode;
-        }
-        else {
-            const serializeFn = fieldType.definition.serialize;
-            // if field is null, skip
-            if (serializeFn &&
-                giraffeqlResultsNode !== null &&
-                giraffeqlResultsNode !== undefined) {
-                try {
-                    if (Array.isArray(giraffeqlResultsNode) &&
-                        giraffeqlResolverNode.typeDef.arrayOptions) {
-                        const allowNullElement = giraffeqlResolverNode.typeDef.arrayOptions
-                            .allowNullElement;
-                        return giraffeqlResultsNode.map((ele) => {
-                            if (allowNullElement && ele === null)
-                                return null;
-                            return serializeFn(ele);
-                        });
+            else {
+                const serializeFn = fieldType.definition.serialize;
+                // if field is null, skip
+                if (serializeFn &&
+                    giraffeqlResultsNode !== null &&
+                    giraffeqlResultsNode !== undefined) {
+                    try {
+                        if (Array.isArray(giraffeqlResultsNode) &&
+                            giraffeqlResolverNode.typeDef.arrayOptions) {
+                            const allowNullElement = giraffeqlResolverNode.typeDef
+                                .arrayOptions.allowNullElement;
+                            return giraffeqlResultsNode.map((ele) => {
+                                if (allowNullElement && ele === null)
+                                    return null;
+                                return serializeFn(ele);
+                            });
+                        }
+                        else {
+                            return serializeFn(giraffeqlResultsNode);
+                        }
                     }
-                    else {
-                        return serializeFn(giraffeqlResultsNode);
+                    catch (_a) {
+                        // transform any errors thrown into GiraffeqlParseError
+                        throw new classes_1.GiraffeqlResultError({
+                            message: `Invalid scalar value for '${fieldType.definition.name}'`,
+                        });
                     }
                 }
-                catch (_a) {
-                    // transform any errors thrown into GiraffeqlParseError
-                    throw new classes_1.GiraffeqlResultError({
-                        message: `Invalid scalar value for '${fieldType.definition.name}'`,
-                        fieldPath: fieldPath,
-                    });
+                else {
+                    return giraffeqlResultsNode;
                 }
             }
-            else {
-                return giraffeqlResultsNode;
-            }
         }
     }
+    catch (err) {
+        throw processError(err, fieldPath);
+    }
 }
 exports.validateGiraffeqlResults = validateGiraffeqlResults;
 // throws an error if a field is not an array when it should be
 function validateResultFields(value, resolverObject, fieldPath) {
-    if (resolverObject.arrayOptions) {
-        if (Array.isArray(value)) {
-            value.forEach((ele) => {
-                validateResultNullish(ele, resolverObject, fieldPath, resolverObject.arrayOptions);
-            });
-        }
-        else if (!resolverObject.allowNull) {
-            throw new classes_1.GiraffeqlResultError({
-                message: `Array expected`,
-                fieldPath,
-            });
+    try {
+        if (resolverObject.arrayOptions) {
+            if (Array.isArray(value)) {
+                value.forEach((ele) => {
+                    validateResultNullish(ele, resolverObject, fieldPath, resolverObject.arrayOptions);
+                });
+            }
+            else if (!resolverObject.allowNull) {
+                throw new classes_1.GiraffeqlResultError({
+                    message: `Array expected`,
+                });
+            }
+            else if (value !== null) {
+                // field must be null
+                throw new classes_1.GiraffeqlResultError({
+                    message: `Array or null expected`,
+                });
+            }
         }
-        else if (value !== null) {
-            // field must be null
-            throw new classes_1.GiraffeqlResultError({
-                message: `Array or null expected`,
-                fieldPath,
-            });
+        else {
+            validateResultNullish(value, resolverObject, fieldPath, resolverObject.arrayOptions);
         }
     }
-    else {
-        validateResultNullish(value, resolverObject, fieldPath, resolverObject.arrayOptions);
+    catch (err) {
+        throw processError(err, fieldPath);
     }
 }
 exports.validateResultFields = validateResultFields;
 // throws an error if a field is nullish when it should not be
 function validateResultNullish(value, resolverObject, fieldPath, arrayOptions) {
-    const isNullAllowed = arrayOptions
-        ? arrayOptions.allowNullElement
-        : resolverObject.allowNull;
-    if ((value === null || value === undefined) && !isNullAllowed) {
-        throw new classes_1.GiraffeqlResultError({
-            message: `Null value not allowed` + (arrayOptions ? " for array element" : ""),
-            fieldPath,
-        });
+    try {
+        const isNullAllowed = arrayOptions
+            ? arrayOptions.allowNullElement
+            : resolverObject.allowNull;
+        if ((value === null || value === undefined) && !isNullAllowed) {
+            throw new classes_1.GiraffeqlResultError({
+                message: `Null value not allowed` + (arrayOptions ? " for array element" : ""),
+            });
+        }
+    }
+    catch (err) {
+        throw processError(err, fieldPath);
     }
 }
 exports.validateResultNullish = validateResultNullish;
@@ -320,161 +348,167 @@ function generateAnonymousRootResolver(type) {
 exports.generateAnonymousRootResolver = generateAnonymousRootResolver;
 function generateGiraffeqlResolverTree({ fieldValue, resolverObject, fieldPath = [], fullTree = false, validateArgs = false, }) {
     var _a;
-    let fieldType = resolverObject.type;
-    // if string, attempt to convert to TypeDefinition
-    if (fieldType instanceof classes_1.GiraffeqlObjectTypeLookup) {
-        const typeDefLookup = __1.objectTypeDefs.get(fieldType.name);
-        if (!typeDefLookup) {
+    try {
+        let fieldType = resolverObject.type;
+        // if string, attempt to convert to TypeDefinition
+        if (fieldType instanceof classes_1.GiraffeqlObjectTypeLookup) {
+            const typeDefLookup = __1.objectTypeDefs.get(fieldType.name);
+            if (!typeDefLookup) {
+                throw new classes_1.GiraffeqlQueryError({
+                    message: `TypeDef '${fieldType.name}' not found`,
+                });
+            }
+            fieldType = typeDefLookup;
+        }
+        // define the lookupValue
+        const lookupValue = (0, __1.getParams)().lookupValue;
+        // field must either be lookupValue OR an object
+        // check if field is lookupValue
+        const isLookupField = fieldValue === lookupValue || fieldValue === __1.lookupSymbol;
+        const isLeafNode = !(fieldType instanceof classes_1.GiraffeqlObjectType);
+        // field must either be lookupValue OR an object
+        if (!isLookupField && !isObject(fieldValue))
             throw new classes_1.GiraffeqlQueryError({
-                message: `TypeDef '${fieldType.name}' not found`,
-                fieldPath: fieldPath,
+                message: `Invalid field RHS`,
             });
+        // if leafNode and nested, MUST be only with __args
+        if (isLeafNode && isObject(fieldValue)) {
+            if (!("__args" in fieldValue) || Object.keys(fieldValue).length !== 1) {
+                throw new classes_1.GiraffeqlQueryError({
+                    message: `Scalar node can only accept __args and no other field`,
+                });
+            }
         }
-        fieldType = typeDefLookup;
-    }
-    // define the lookupValue
-    const lookupValue = (0, __1.getParams)().lookupValue;
-    // field must either be lookupValue OR an object
-    // check if field is lookupValue
-    const isLookupField = fieldValue === lookupValue || fieldValue === __1.lookupSymbol;
-    const isLeafNode = !(fieldType instanceof classes_1.GiraffeqlObjectType);
-    // field must either be lookupValue OR an object
-    if (!isLookupField && !isObject(fieldValue))
-        throw new classes_1.GiraffeqlQueryError({
-            message: `Invalid field RHS`,
-            fieldPath: fieldPath,
-        });
-    // if leafNode and nested, MUST be only with __args
-    if (isLeafNode && isObject(fieldValue)) {
-        if (!("__args" in fieldValue) || Object.keys(fieldValue).length !== 1) {
+        // if not leafNode and isLookupField, deny
+        if (!isLeafNode && isLookupField)
             throw new classes_1.GiraffeqlQueryError({
-                message: `Scalar node can only accept __args and no other field`,
-                fieldPath,
+                message: `Resolved node must be an object with nested fields`,
+            });
+        // if field is scalar and args is required, and not object, throw err
+        if (isLeafNode &&
+            ((_a = resolverObject.args) === null || _a === void 0 ? void 0 : _a.definition.required) &&
+            !isObject(fieldValue)) {
+            throw new classes_1.GiraffeqlQueryError({
+                message: `Args required`,
             });
         }
-    }
-    // if not leafNode and isLookupField, deny
-    if (!isLeafNode && isLookupField)
-        throw new classes_1.GiraffeqlQueryError({
-            message: `Resolved node must be an object with nested fields`,
-            fieldPath,
-        });
-    // if field is scalar and args is required, and not object, throw err
-    if (isLeafNode &&
-        ((_a = resolverObject.args) === null || _a === void 0 ? void 0 : _a.definition.required) &&
-        !isObject(fieldValue)) {
-        throw new classes_1.GiraffeqlQueryError({
-            message: `Args required`,
-            fieldPath,
-        });
-    }
-    let nestedNodes = null;
-    // separate args from query
-    const _b = isObject(fieldValue)
-        ? fieldValue
-        : {}, { __args: args = null } = _b, query = __rest(_b, ["__args"]);
-    if (isObject(fieldValue)) {
-        // validate args in-place, if any
-        if (validateArgs) {
-            validateExternalArgs(fieldValue.__args, resolverObject.args, fieldPath.concat("__args"));
-        }
-        if (!isLeafNode && fieldType instanceof classes_1.GiraffeqlObjectType) {
-            nestedNodes = {};
-            // iterate over fields
-            for (const field in fieldValue) {
-                const parentsPlusCurrentField = fieldPath.concat(field);
-                if (field === "__args") {
-                    continue;
-                }
-                // if field not in TypeDef, reject
-                if (!(field in fieldType.definition.fields)) {
-                    throw new classes_1.GiraffeqlQueryError({
-                        message: `Unknown field`,
-                        fieldPath: parentsPlusCurrentField,
-                    });
-                }
-                // deny hidden fields
-                if (fieldType.definition.fields[field].hidden) {
-                    throw new classes_1.GiraffeqlQueryError({
-                        message: `Hidden field`,
-                        fieldPath: parentsPlusCurrentField,
-                    });
+        let nestedNodes = null;
+        // separate args from query
+        const _b = isObject(fieldValue)
+            ? fieldValue
+            : {}, { __args: args = null } = _b, query = __rest(_b, ["__args"]);
+        if (isObject(fieldValue)) {
+            // validate args in-place, if any
+            if (validateArgs) {
+                validateExternalArgs(fieldValue.__args, resolverObject.args, fieldPath.concat("__args"));
+            }
+            if (!isLeafNode && fieldType instanceof classes_1.GiraffeqlObjectType) {
+                nestedNodes = {};
+                // iterate over fields
+                for (const field in fieldValue) {
+                    const parentsPlusCurrentField = fieldPath.concat(field);
+                    if (field === "__args") {
+                        continue;
+                    }
+                    // if field not in TypeDef, reject
+                    if (!(field in fieldType.definition.fields)) {
+                        throw new classes_1.GiraffeqlQueryError({
+                            message: `Unknown field`,
+                            fieldPath: parentsPlusCurrentField,
+                        });
+                    }
+                    // deny hidden fields
+                    if (fieldType.definition.fields[field].hidden) {
+                        throw new classes_1.GiraffeqlQueryError({
+                            message: `Hidden field`,
+                            fieldPath: parentsPlusCurrentField,
+                        });
+                    }
+                    // only if no resolver do we recursively add to tree
+                    // if there is a resolver, the sub-tree should be generated in the resolver
+                    if (fullTree || !resolverObject.resolver)
+                        nestedNodes[field] = generateGiraffeqlResolverTree({
+                            fieldValue: fieldValue[field],
+                            resolverObject: fieldType.definition.fields[field],
+                            fieldPath: parentsPlusCurrentField,
+                            fullTree,
+                            validateArgs,
+                        });
                 }
-                // only if no resolver do we recursively add to tree
-                // if there is a resolver, the sub-tree should be generated in the resolver
-                if (fullTree || !resolverObject.resolver)
-                    nestedNodes[field] = generateGiraffeqlResolverTree({
-                        fieldValue: fieldValue[field],
-                        resolverObject: fieldType.definition.fields[field],
-                        fieldPath: parentsPlusCurrentField,
-                        fullTree,
-                        validateArgs,
-                    });
             }
         }
+        return {
+            typeDef: resolverObject,
+            query,
+            args,
+            nested: nestedNodes !== null && nestedNodes !== void 0 ? nestedNodes : undefined,
+        };
+    }
+    catch (err) {
+        throw processError(err, fieldPath);
     }
-    return {
-        typeDef: resolverObject,
-        query,
-        args,
-        nested: nestedNodes !== null && nestedNodes !== void 0 ? nestedNodes : undefined,
-    };
 }
 exports.generateGiraffeqlResolverTree = generateGiraffeqlResolverTree;
 // resolves the queries, and attaches them to the obj (if possible)
 const processGiraffeqlResolverTree = async ({ giraffeqlResultsNode, giraffeqlResolverNode, parentNode, req, data = {}, fieldPath = [], fullTree = false, }) => {
-    let results;
-    // if it is a root resolver, fetch the results first.
-    if ((0, types_1.isRootResolverDefinition)(giraffeqlResolverNode.typeDef)) {
-        results = await giraffeqlResolverNode.typeDef.resolver({
-            req,
-            fieldPath,
-            args: giraffeqlResolverNode.args,
-            query: giraffeqlResolverNode.query,
-        });
-        // if full tree not required, return here
-        if (!fullTree)
-            return results;
-    }
-    else {
-        results = giraffeqlResultsNode;
-    }
-    const resolverFn = giraffeqlResolverNode.typeDef.resolver;
-    const nested = giraffeqlResolverNode.nested;
-    // if typeDef is RootResolverDefinition, skip resolving (should already be done)
-    if (resolverFn && !(0, types_1.isRootResolverDefinition)(giraffeqlResolverNode.typeDef)) {
-        // if defer, skip resolving
-        if (giraffeqlResolverNode.typeDef.defer) {
-            return null;
+    try {
+        let results;
+        // if it is a root resolver, fetch the results first.
+        if ((0, types_1.isRootResolverDefinition)(giraffeqlResolverNode.typeDef)) {
+            results = await giraffeqlResolverNode.typeDef.resolver({
+                req,
+                fieldPath,
+                args: giraffeqlResolverNode.args,
+                query: giraffeqlResolverNode.query,
+            });
+            // if full tree not required, return here
+            if (!fullTree)
+                return results;
         }
-        return resolverFn({
-            req,
-            fieldPath,
-            args: giraffeqlResolverNode.args,
-            query: giraffeqlResolverNode.query,
-            fieldValue: results,
-            parentValue: parentNode,
-            data,
-        });
-    }
-    else if (nested && isObject(results)) {
-        // must be nested field.
-        const tempReturnValue = results;
-        for (const field in giraffeqlResolverNode.nested) {
-            const currentFieldPath = fieldPath.concat(field);
-            tempReturnValue[field] = await (0, exports.processGiraffeqlResolverTree)({
-                giraffeqlResultsNode: isObject(results) ? results[field] : null,
-                parentNode: results,
-                giraffeqlResolverNode: giraffeqlResolverNode.nested[field],
+        else {
+            results = giraffeqlResultsNode;
+        }
+        const resolverFn = giraffeqlResolverNode.typeDef.resolver;
+        const nested = giraffeqlResolverNode.nested;
+        // if typeDef is RootResolverDefinition, skip resolving (should already be done)
+        if (resolverFn &&
+            !(0, types_1.isRootResolverDefinition)(giraffeqlResolverNode.typeDef)) {
+            // if defer, skip resolving
+            if (giraffeqlResolverNode.typeDef.defer) {
+                return null;
+            }
+            return resolverFn({
                 req,
+                fieldPath,
+                args: giraffeqlResolverNode.args,
+                query: giraffeqlResolverNode.query,
+                fieldValue: results,
+                parentValue: parentNode,
                 data,
-                fieldPath: currentFieldPath,
             });
         }
-        return tempReturnValue;
+        else if (nested && isObject(results)) {
+            // must be nested field.
+            const tempReturnValue = results;
+            for (const field in giraffeqlResolverNode.nested) {
+                const currentFieldPath = fieldPath.concat(field);
+                tempReturnValue[field] = await (0, exports.processGiraffeqlResolverTree)({
+                    giraffeqlResultsNode: isObject(results) ? results[field] : null,
+                    parentNode: results,
+                    giraffeqlResolverNode: giraffeqlResolverNode.nested[field],
+                    req,
+                    data,
+                    fieldPath: currentFieldPath,
+                });
+            }
+            return tempReturnValue;
+        }
+        else {
+            return results;
+        }
     }
-    else {
-        return results;
+    catch (err) {
+        throw processError(err, fieldPath);
     }
 };
 exports.processGiraffeqlResolverTree = processGiraffeqlResolverTree;

package/lib/helpers/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/helpers/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/helpers/base.ts"],"names":[],"mappings":"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"}

package/lib/helpers/response.js

@@ -11,8 +11,9 @@ function generateNormalResponse(data) {
 }
 exports.generateNormalResponse = generateNormalResponse;
 function generateGiraffeqlResponse(data, error) {
+    var _a;
     return Object.assign({ data: data }, (error && {
-        error: Object.assign({ message: error.message, type: error.name, fieldPath: error.fieldPath }, ((0, __1.getParams)().debug && { stack: error.stack })),
+        error: Object.assign({ message: error.message, type: error.name, fieldPath: (_a = error.fieldPath) !== null && _a !== void 0 ? _a : null }, ((0, __1.getParams)().debug && { stack: error.stack })),
     }));
 }
 //# sourceMappingURL=response.js.map

package/lib/helpers/response.js.map

@@ -1 +1 @@
-{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/helpers/response.ts"],"names":[],"mappings":";;;AACA,0BAA+B;AAG/B,SAAgB,qBAAqB,CACnC,KAAyB;IAEzB,OAAO,yBAAyB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAChD,CAAC;AAJD,sDAIC;AAED,SAAgB,sBAAsB,CAAC,IAAS;IAC9C,OAAO,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAFD,wDAEC;AAED,SAAS,yBAAyB,CAChC,IAAS,EACT,KAA0B;IAE1B,uBACE,IAAI,EAAE,IAAI,IACP,CAAC,KAAK,IAAI;QACX,KAAK,kBACH,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,SAAS,EAAE,KAAK,CAAC,SAAS,IACvB,CAAC,IAAA,aAAS,GAAE,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CACjD;KACF,CAAC,EACF;AACJ,CAAC"}
+{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/helpers/response.ts"],"names":[],"mappings":";;;AACA,0BAA+B;AAG/B,SAAgB,qBAAqB,CACnC,KAAyB;IAEzB,OAAO,yBAAyB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAChD,CAAC;AAJD,sDAIC;AAED,SAAgB,sBAAsB,CAAC,IAAS;IAC9C,OAAO,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAFD,wDAEC;AAED,SAAS,yBAAyB,CAChC,IAAS,EACT,KAA0B;;IAE1B,uBACE,IAAI,EAAE,IAAI,IACP,CAAC,KAAK,IAAI;QACX,KAAK,kBACH,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,SAAS,EAAE,MAAA,KAAK,CAAC,SAAS,mCAAI,IAAI,IAC/B,CAAC,IAAA,aAAS,GAAE,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CACjD;KACF,CAAC,EACF;AACJ,CAAC"}

package/lib/helpers/router.d.ts

@@ -1,4 +1,7 @@
 import { Request, Response } from "express";
+import { GiraffeqlBaseError } from "../classes";
 import type { RootResolverDefinition } from "../types";
 export declare function createRestRequestHandler(rootResolverObject: RootResolverDefinition, operationName: string): (req: Request, res: Response) => Promise<void>;
 export declare function createGiraffeqlRequestHandler(): (req: Request, res: Response) => Promise<void>;
+export declare function sendErrorResponse(err: GiraffeqlBaseError, res: Response): Response<any, Record<string, any>>;
+export declare function sendSuccessResponse(results: any, res: Response): void;

package/lib/helpers/router.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createGiraffeqlRequestHandler = exports.createRestRequestHandler = void 0;
+exports.sendSuccessResponse = exports.sendErrorResponse = exports.createGiraffeqlRequestHandler = exports.createRestRequestHandler = void 0;
 const response_1 = require("./response");
 const classes_1 = require("../classes");
 const __1 = require("..");
@@ -54,9 +54,7 @@ function createRestRequestHandler(rootResolverObject, operationName) {
             sendSuccessResponse(validatedResults, res);
         }
         catch (err) {
-            sendErrorResponse(err instanceof Error
-                ? err
-                : new Error("An unspecified error has occurred"), res);
+            sendErrorResponse((0, base_1.processError)(err), res);
         }
     };
 }
@@ -68,7 +66,6 @@ function createGiraffeqlRequestHandler() {
             if (!(0, base_1.isObject)(req.body)) {
                 throw new classes_1.GiraffeqlQueryError({
                     message: `Request body must be object`,
-                    fieldPath: [],
                 });
             }
             // req must be an object at this point
@@ -76,7 +73,6 @@ function createGiraffeqlRequestHandler() {
             if (requestedOperations.length !== 1)
                 throw new classes_1.GiraffeqlQueryError({
                     message: `Exactly 1 root query required`,
-                    fieldPath: [],
                 });
             const operation = requestedOperations[0];
             const query = req.body[operation];
@@ -85,7 +81,6 @@ function createGiraffeqlRequestHandler() {
             if (!rootResolver) {
                 throw new classes_1.GiraffeqlQueryError({
                     message: `Unrecognized giraffeql root query '${operation}'`,
-                    fieldPath: [],
                 });
             }
             // validate query in-place
@@ -108,9 +103,7 @@ function createGiraffeqlRequestHandler() {
             sendSuccessResponse(validatedResults, res);
         }
         catch (err) {
-            sendErrorResponse(err instanceof Error
-                ? err
-                : new Error("An unspecified error has occurred"), res);
+            sendErrorResponse((0, base_1.processError)(err), res);
         }
     };
 }
@@ -119,20 +112,14 @@ function sendErrorResponse(err, res) {
     if ((0, __1.getParams)().debug) {
         console.log(err);
     }
-    // if not a GiraffeqlError, wrap it
-    const validatedError = err instanceof classes_1.GiraffeqlBaseError
-        ? err
-        : new classes_1.GiraffeqlBaseError({
-            errorName: "GiraffeqlGenericError",
-            message: err.message,
-            fieldPath: [],
-        });
-    const errorResponseObject = (0, response_1.generateErrorResponse)(validatedError);
-    return res.status(validatedError.statusCode).send(errorResponseObject);
+    const errorResponseObject = (0, response_1.generateErrorResponse)(err);
+    return res.status(err.statusCode).send(errorResponseObject);
 }
+exports.sendErrorResponse = sendErrorResponse;
 function sendSuccessResponse(results, res) {
     const responseObject = (0, response_1.generateNormalResponse)(results);
     res.header("Content-Type", "application/json");
     res.status(200).send(responseObject);
 }
+exports.sendSuccessResponse = sendSuccessResponse;
 //# sourceMappingURL=router.js.map

package/lib/helpers/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/helpers/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/helpers/router.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import type { Express } from "express";
 import { GiraffeqlObjectType, GiraffeqlRootResolverType, GiraffeqlInputType, GiraffeqlScalarType } from "./classes";
 import type { Params } from "./types";
 export { TsSchemaGenerator } from "./classes/schema";
+export { sendErrorResponse, sendSuccessResponse } from "./helpers/router";
 export { GiraffeqlArgsError, GiraffeqlBaseError, GiraffeqlQueryError, GiraffeqlResultError, GiraffeqlInitializationError, GiraffeqlObjectType, GiraffeqlInputType, GiraffeqlRootResolverType, GiraffeqlScalarType, GiraffeqlInputTypeLookup, GiraffeqlObjectTypeLookup, GiraffeqlInputFieldType, } from "./classes";
 export { RootResolverDefinition, ObjectTypeDefinition, InputFieldDefinition, InputTypeDefinition, ScalarDefinition, GiraffeqlResolverNode, ResolverFunction, RootResolverFunction, ObjectTypeDefinitionField, ArrayOptions, isRootResolverDefinition, StringKeyObject, } from "./types";
 export declare const lookupSymbol: unique symbol;

package/lib/index.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAnonymousRootResolver = exports.validateResultFields = exports.validateExternalArgs = exports.processGiraffeqlResolverTree = exports.generateGiraffeqlResolverTree = exports.BaseScalars = exports.getParams = exports.initializeGiraffeql = exports.rootResolvers = exports.scalarTypeDefs = exports.inputTypeDefs = exports.objectTypeDefs = exports.lookupSymbol = exports.isRootResolverDefinition = exports.GiraffeqlInputFieldType = exports.GiraffeqlObjectTypeLookup = exports.GiraffeqlInputTypeLookup = exports.GiraffeqlScalarType = exports.GiraffeqlRootResolverType = exports.GiraffeqlInputType = exports.GiraffeqlObjectType = exports.GiraffeqlInitializationError = exports.GiraffeqlResultError = exports.GiraffeqlQueryError = exports.GiraffeqlBaseError = exports.GiraffeqlArgsError = exports.TsSchemaGenerator = void 0;
+exports.generateAnonymousRootResolver = exports.validateResultFields = exports.validateExternalArgs = exports.processGiraffeqlResolverTree = exports.generateGiraffeqlResolverTree = exports.BaseScalars = exports.getParams = exports.initializeGiraffeql = exports.rootResolvers = exports.scalarTypeDefs = exports.inputTypeDefs = exports.objectTypeDefs = exports.lookupSymbol = exports.isRootResolverDefinition = exports.GiraffeqlInputFieldType = exports.GiraffeqlObjectTypeLookup = exports.GiraffeqlInputTypeLookup = exports.GiraffeqlScalarType = exports.GiraffeqlRootResolverType = exports.GiraffeqlInputType = exports.GiraffeqlObjectType = exports.GiraffeqlInitializationError = exports.GiraffeqlResultError = exports.GiraffeqlQueryError = exports.GiraffeqlBaseError = exports.GiraffeqlArgsError = exports.sendSuccessResponse = exports.sendErrorResponse = exports.TsSchemaGenerator = void 0;
 const router_1 = require("./helpers/router");
 const classes_1 = require("./classes");
 var schema_1 = require("./classes/schema");
 Object.defineProperty(exports, "TsSchemaGenerator", { enumerable: true, get: function () { return schema_1.TsSchemaGenerator; } });
+var router_2 = require("./helpers/router");
+Object.defineProperty(exports, "sendErrorResponse", { enumerable: true, get: function () { return router_2.sendErrorResponse; } });
+Object.defineProperty(exports, "sendSuccessResponse", { enumerable: true, get: function () { return router_2.sendSuccessResponse; } });
 var classes_2 = require("./classes");
 Object.defineProperty(exports, "GiraffeqlArgsError", { enumerable: true, get: function () { return classes_2.GiraffeqlArgsError; } });
 Object.defineProperty(exports, "GiraffeqlBaseError", { enumerable: true, get: function () { return classes_2.GiraffeqlBaseError; } });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,6CAG0B;AAE1B,uCAMmB;AAInB,2CAAqD;AAA5C,2GAAA,iBAAiB,OAAA;AAE1B,qCAamB;AAZjB,6GAAA,kBAAkB,OAAA;AAClB,6GAAA,kBAAkB,OAAA;AAClB,8GAAA,mBAAmB,OAAA;AACnB,+GAAA,oBAAoB,OAAA;AACpB,uHAAA,4BAA4B,OAAA;AAC5B,8GAAA,mBAAmB,OAAA;AACnB,6GAAA,kBAAkB,OAAA;AAClB,oHAAA,yBAAyB,OAAA;AACzB,8GAAA,mBAAmB,OAAA;AACnB,mHAAA,wBAAwB,OAAA;AACxB,oHAAA,yBAAyB,OAAA;AACzB,kHAAA,uBAAuB,OAAA;AAGzB,iCAaiB;AAFf,iHAAA,wBAAwB,OAAA;AAI1B,IAAI,cAAgC,CAAC;AAErC,2BAA2B;AACd,QAAA,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEhC,QAAA,cAAc,GAAqC,IAAI,GAAG,EAAE,CAAC;AAC7D,QAAA,aAAa,GAAoC,IAAI,GAAG,EAAE,CAAC;AAC3D,QAAA,cAAc,GAAqC,IAAI,GAAG,EAAE,CAAC;AAE7D,QAAA,aAAa,GAA2C,IAAI,GAAG,EAAE,CAAC;AAE/E,SAAgB,mBAAmB,CACjC,GAAY,EACZ,EACE,KAAK,GAAG,KAAK,EACb,WAAW,GAAG,IAAI,EAClB,KAAK,GAAG,YAAY,EACpB,iBAAiB,GAAG,IAAI,MACd,EAAE;IAEd,oCAAoC;IACpC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACvB,MAAM,IAAI,sCAA4B,CAAC;YACrC,OAAO,EAAE,yBAAyB;SACnC,CAAC,CAAC;KACJ;IAED,cAAc,GAAG;QACf,KAAK;QACL,WAAW;QACX,KAAK;QACL,iBAAiB;KAClB,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAA,sCAA6B,GAAE,CAAC,CAAC;IAEjD,wEAAwE;IACxE,qBAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QAChD,IAAI,CAAC,WAAW;YAAE,OAAO;QAEzB,IAAI,WAAW,CAAC,KAAK,KAAK,KAAK;YAC7B,MAAM,IAAI,sCAA4B,CAAC;gBACrC,OAAO,EAAE,yCAAyC,KAAK,GAAG;aAC3D,CAAC,CAAC;QAEL,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CACrB,WAAW,CAAC,KAAK,EACjB,IAAA,iCAAwB,EAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAC/C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,GAAW,EAAE,KAAc;QAC5D,qCAAqC;QACrC,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;YAChC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,kDAgDC;AAED,SAAgB,SAAS;IACvB,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,sCAA4B,CAAC;YACrC,OAAO,EAAE,wCAAwC;SAClD,CAAC,CAAC;KACJ;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAPD,8BAOC;AAED,2CAAyC;AAEzC,uCAMwB;AALtB,qHAAA,6BAA6B,OAAA;AAC7B,oHAAA,4BAA4B,OAAA;AAC5B,4GAAA,oBAAoB,OAAA;AACpB,4GAAA,oBAAoB,OAAA;AACpB,qHAAA,6BAA6B,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/types/index.d.ts

@@ -17,7 +17,7 @@ export interface GiraffeqlResponse {
 export interface GiraffeqlError {
     message: string;
     type: string;
-    fieldPath?: string[];
+    fieldPath?: string[] | null;
     stack?: string;
 }
 export interface Params {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "giraffeql",
-  "version": "2.0.7",
+  "version": "2.0.10",
   "description": "Methods and APIs for querying backends using JSON",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",