graphql-form 0.0.17 → 0.0.20

package/lib/FormToCode/gql/reducers.d.ts

@@ -1,5 +1,6 @@
-import { Reductor } from "../models";
+import { Reductor, ReductorValue } from "../models";
 import { FormObject } from "../../models";
 import { ParserField } from 'graphql-js-tree';
 export declare const fieldsToReductor: (toggledFields: Record<string, FormObject>) => Reductor;
+export declare const determineArgumentsQl: (v: ReductorValue, nodes: ParserField[], tabs?: string) => string;
 export declare const reduceQl: (o: Reductor, nodes: ParserField[], tabs?: string) => string;

package/lib/FormToCode/gql/reducers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduceQl = exports.fieldsToReductor = void 0;
+exports.reduceQl = exports.determineArgumentsQl = exports.fieldsToReductor = void 0;
 var resolvers_1 = require("./resolvers");
 var fieldsToReductor = function (toggledFields) {
     return Object.entries(toggledFields).reduce(function (a, _a) {
@@ -13,28 +13,37 @@ var fieldsToReductor = function (toggledFields) {
                 el = value.node.type.operations[0];
             }
             start[el] = start[el] || {};
-            start[el].node = start[el].node || {};
+            start[el].reductor = start[el].reductor || {};
             if (index === pathElements.length - 1) {
                 if (value.value && Object.keys(value.value).length > 0) {
                     start[el].value = value.value;
                 }
             }
-            start = start[el].node;
+            start = start[el].reductor;
         });
         return a;
     }, {});
 };
 exports.fieldsToReductor = fieldsToReductor;
+var determineArgumentsQl = function (v, nodes, tabs) {
+    if (tabs === void 0) { tabs = ''; }
+    if (v.value && Object.keys(v.value).length > 0) {
+        var resolvedValue = (0, resolvers_1.resolveQlValue)(v.value, nodes, tabs);
+        if (resolvedValue) {
+            return "(".concat(resolvedValue, "\n").concat(tabs, ")");
+        }
+    }
+    return '';
+};
+exports.determineArgumentsQl = determineArgumentsQl;
 var reduceQl = function (o, nodes, tabs) {
     if (tabs === void 0) { tabs = ''; }
     return Object.entries(o)
         .map(function (_a) {
         var k = _a[0], v = _a[1];
-        var kName = v.value && Object.keys(v.value).length > 0
-            ? "".concat(k, "(").concat((0, resolvers_1.resolveQlValue)(v.value, nodes, tabs), "\n").concat(tabs, ")")
-            : k;
-        var kObject = Object.keys(v.node).length > 0
-            ? "".concat(tabs).concat(kName, "{\n").concat((0, exports.reduceQl)(v.node, nodes, tabs + '\t')).concat(tabs, "}\n")
+        var kName = "".concat(k).concat((0, exports.determineArgumentsQl)(v, nodes, tabs));
+        var kObject = Object.keys(v.reductor).length > 0
+            ? "".concat(tabs).concat(kName, "{\n").concat((0, exports.reduceQl)(v.reductor, nodes, tabs + '\t')).concat(tabs, "}\n")
             : "".concat(tabs).concat(kName, "\n");
         return kObject;
     })

package/lib/FormToCode/gql/reducers.js.map

@@ -1 +1 @@
-{"version":3,"file":"reducers.js","sourceRoot":"","sources":["../../../src/FormToCode/gql/reducers.ts"],"names":[],"mappings":";;;AAAA,yCAA4D;AAKrD,IAAM,gBAAgB,GAAG,UAAC,aAAyC;IACtE,OAAA,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,EAAY;YAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAChD,IAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,YAAY,CAAC,OAAO,CAAC,UAAC,EAAE,EAAE,KAAK;;YAC3B,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA,MAAA,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,0CAAE,MAAM,CAAA,EAAE;gBACrD,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aACtC;YACD,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YAC5B,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACtC,IAAI,KAAK,KAAK,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnC,IAAI,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpD,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;iBACjC;aACJ;YACD,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACb,CAAC,EAAE,EAAc,CAAC;AAjBlB,CAiBkB,CAAC;AAlBV,QAAA,gBAAgB,oBAkBN;AAEhB,IAAM,QAAQ,GAAG,UAAC,CAAW,EAAE,KAAoB,EAAE,IAAS;IAAT,qBAAA,EAAA,SAAS;IACjE,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;SACnB,GAAG,CAAC,UAAC,EAAM;YAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QACP,IAAM,KAAK,GACP,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;YACtC,CAAC,CAAC,UAAG,CAAC,cAAI,IAAA,0BAAc,EAAC,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,eAAK,IAAI,MAAG;YAC1D,CAAC,CAAC,CAAC,CAAC;QACZ,IAAM,OAAO,GACT,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;YAC1B,CAAC,CAAC,UAAG,IAAI,SAAG,KAAK,gBAAM,IAAA,gBAAQ,EAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC,SAAG,IAAI,QAAK;YACvE,CAAC,CAAC,UAAG,IAAI,SAAG,KAAK,OAAI,CAAC;QAC9B,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC,CAAC;AAdW,QAAA,QAAQ,YAcnB"}
+{"version":3,"file":"reducers.js","sourceRoot":"","sources":["../../../src/FormToCode/gql/reducers.ts"],"names":[],"mappings":"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"}

package/lib/FormToCode/models.d.ts

@@ -1,6 +1,6 @@
 import { FormValue } from "../models";
 export declare type ReductorValue = {
-    node: Reductor;
+    reductor: Reductor;
     value?: FormValue;
 };
 export declare type Reductor = {

package/lib/FormToCode/zeus/resolvers.js

@@ -14,13 +14,13 @@ var zeusFieldsToReductor = function (toggledFields) {
                 return;
             }
             start[el] = start[el] || {};
-            start[el].node = start[el].node || {};
+            start[el].reductor = start[el].reductor || {};
             if (index === pathElements.length - 1) {
                 if (value.value && Object.keys(value.value).length > 0) {
                     start[el].value = value.value;
                 }
             }
-            start = start[el].node;
+            start = start[el].reductor;
         });
         return a;
     }, {});
@@ -36,15 +36,15 @@ var zeusReduceQl = function (o, nodes, tabs, level) {
         var _b, _c;
         var k = _a[0], v = _a[1];
         if (v.value && Object.keys(v.value).length > 0) {
-            return Object.keys(v.node).length > 0
-                ? "".concat(tabs).concat(k, ":[{").concat((0, resolvers_1.resolveQlValue)(v.value, nodes, tabs), "\n").concat(tabs, "}, {\n").concat((0, exports.zeusReduceQl)(v.node, nodes, tabs + '\t', lUP)).concat(tabs, "}]\n")
+            return Object.keys(v.reductor).length > 0
+                ? "".concat(tabs).concat(k, ":[{").concat((0, resolvers_1.resolveQlValue)(v.value, nodes, tabs), "\n").concat(tabs, "}, {\n").concat((0, exports.zeusReduceQl)(v.reductor, nodes, tabs + '\t', lUP)).concat(tabs, "}]\n")
                 : "".concat(tabs).concat(k, ":[{").concat((0, resolvers_1.resolveQlValue)(v.value, nodes, tabs), "\n").concat(tabs, "}, true]");
         }
         if (level === 0) {
-            return "const result = await api(\"".concat((_c = (_b = nodes.find(function (n) { return n.name === k; })) === null || _b === void 0 ? void 0 : _b.type.operations) === null || _c === void 0 ? void 0 : _c[0], "\")({\n").concat((0, exports.zeusReduceQl)(v.node, nodes, tabs + '\t', lUP), "})");
+            return "const result = await api(\"".concat((_c = (_b = nodes.find(function (n) { return n.name === k; })) === null || _b === void 0 ? void 0 : _b.type.operations) === null || _c === void 0 ? void 0 : _c[0], "\")({\n").concat((0, exports.zeusReduceQl)(v.reductor, nodes, tabs + '\t', lUP), "})");
         }
-        var kObject = Object.keys(v.node).length > 0
-            ? "".concat(tabs).concat(k, ":{\n").concat((0, exports.zeusReduceQl)(v.node, nodes, tabs + '\t', lUP)).concat(tabs, "}\n")
+        var kObject = Object.keys(v.reductor).length > 0
+            ? "".concat(tabs).concat(k, ":{\n").concat((0, exports.zeusReduceQl)(v.reductor, nodes, tabs + '\t', lUP)).concat(tabs, "}\n")
             : "".concat(tabs).concat(k, ": true\n");
         return kObject;
     })

package/lib/FormToCode/zeus/resolvers.js.map

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

package/lib/createWidget.d.ts

@@ -1,12 +1,14 @@
 import { PassedFormProps, CastToWidgetSettingsPassedForm } from "./models";
 import React from 'react';
-export declare function createWidget<Props>({ name, Component, Settings, Description, requirements, }: {
+export declare function createWidget<Props>({ name, Component, Settings, Description, requirements, displayName, }: {
     name: string;
+    displayName?: string;
     Component: React.FC<PassedFormProps<Props>>;
     Settings?: React.FC<CastToWidgetSettingsPassedForm<Props>>;
     Description?: React.FC;
     requirements: (props: PassedFormProps) => boolean;
 }): {
+    displayName: string | undefined;
     Component: React.FC<PassedFormProps<Props>>;
     Settings: React.FC<CastToWidgetSettingsPassedForm<Props>> | undefined;
     Description: React.FC<{}> | undefined;

package/lib/createWidget.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWidget = void 0;
 function createWidget(_a) {
-    var name = _a.name, Component = _a.Component, Settings = _a.Settings, Description = _a.Description, requirements = _a.requirements;
+    var name = _a.name, Component = _a.Component, Settings = _a.Settings, Description = _a.Description, requirements = _a.requirements, displayName = _a.displayName;
     return {
+        displayName: displayName,
         Component: Component,
         Settings: Settings,
         Description: Description,

package/lib/createWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"createWidget.js","sourceRoot":"","sources":["../src/createWidget.tsx"],"names":[],"mappings":";;;AAGA,SAAgB,YAAY,CAAQ,EAYnC;QAXG,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,QAAQ,cAAA,EACR,WAAW,iBAAA,EACX,YAAY,kBAAA;IAQZ,OAAO;QACH,SAAS,WAAA;QACT,QAAQ,UAAA;QACR,WAAW,aAAA;QACX,YAAY,cAAA;QACZ,KAAK,EAAE,EAAW;QAClB,IAAI,MAAA;KACP,CAAC;AACN,CAAC;AArBD,oCAqBC"}
+{"version":3,"file":"createWidget.js","sourceRoot":"","sources":["../src/createWidget.tsx"],"names":[],"mappings":";;;AAGA,SAAgB,YAAY,CAAQ,EAcnC;QAbG,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,QAAQ,cAAA,EACR,WAAW,iBAAA,EACX,YAAY,kBAAA,EACZ,WAAW,iBAAA;IASX,OAAO;QACH,WAAW,aAAA;QACX,SAAS,WAAA;QACT,QAAQ,UAAA;QACR,WAAW,aAAA;QACX,YAAY,cAAA;QACZ,KAAK,EAAE,EAAW;QAClB,IAAI,MAAA;KACP,CAAC;AACN,CAAC;AAxBD,oCAwBC"}

package/lib/models.d.ts

@@ -41,6 +41,7 @@ export declare type PassedFormProps<WidgetData = ReturnedDictType> = {
     currentPath: string;
     widgets?: SavedWidgets;
     widgetData?: WidgetData;
+    errors?: Errors;
     components: {
         ArrayField: FieldComponent;
         ObjectField: FieldComponent;
@@ -78,10 +79,11 @@ export declare type WidgetType = {
     name: string;
 };
 export declare type FormValue = {
+    value: FormValue;
+} | {
     [x: string]: FormValue;
 } | string | boolean | number | null | undefined | FormObject | Array<FormValue>;
 export declare type FormObject = {
     value?: FormValue;
-    errors?: string[];
     node: ParserField;
 };

package/lib/outsideUse.d.ts

@@ -1,10 +1,11 @@
-import { Errs, FormFile, FormObject, PassedFormProps } from "./models";
+import { Errs, FormFile, FormObject, FormValue, PassedFormProps } from "./models";
 import { ParserField } from 'graphql-js-tree';
 export declare const getWidgetFromProps: (props: PassedFormProps) => {
     data: any;
     widget: import("./models").WidgetType;
 } | undefined;
-export declare const validateValue: (f: FormObject, nodes: ParserField[], errors: Record<Errs, string>, pushErrors: (isValid: boolean) => void) => FormObject;
-export declare const validateForm: (v: FormFile, nodes: ParserField[], errors: Record<Errs, string>) => readonly [FormFile, true];
+export declare const getErrorFromProps: (props: PassedFormProps) => string | undefined;
+export declare const validateValue: (f: FormValue, nodes: ParserField[], path: string, pushErrors: (path: string, value: Errs) => void) => void;
+export declare const validateForm: (v: FormFile, nodes: ParserField[], errors: Record<Errs, string>) => Record<string, string>;
 export declare const eraseValue: (f: FormObject, nodes: ParserField[]) => FormObject;
 export declare const eraseForm: (v: FormFile, nodes: ParserField[]) => FormFile;

package/lib/outsideUse.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eraseForm = exports.eraseValue = exports.validateForm = exports.validateValue = exports.getWidgetFromProps = void 0;
+exports.eraseForm = exports.eraseValue = exports.validateForm = exports.validateValue = exports.getErrorFromProps = exports.getWidgetFromProps = void 0;
 var models_1 = require("./models");
 var graphql_js_tree_1 = require("graphql-js-tree");
 var getWidgetFromProps = function (props) {
@@ -38,66 +38,76 @@ var getWidgetFromProps = function (props) {
     };
 };
 exports.getWidgetFromProps = getWidgetFromProps;
-var validateValue = function (f, nodes, errors, pushErrors) {
-    var value = f.value, node = f.node;
-    var seekNode = nodes.find(function (n) { return n.name === (0, graphql_js_tree_1.getTypeName)(node.type.fieldType); });
-    var errs;
-    if ((!seekNode && node.data.type !== graphql_js_tree_1.TypeSystemDefinition.FieldDefinition) ||
-        (seekNode === null || seekNode === void 0 ? void 0 : seekNode.data.type) === graphql_js_tree_1.TypeDefinition.EnumTypeDefinition ||
-        (seekNode === null || seekNode === void 0 ? void 0 : seekNode.data.type) === graphql_js_tree_1.TypeDefinition.ScalarTypeDefinition) {
-        console.log(f);
-        if (node.type.fieldType.type === graphql_js_tree_1.Options.required) {
-            if (!value) {
-                errs = [errors[models_1.Errs.REQUIRED]];
-            }
-            if (node.type.fieldType.nest.type === graphql_js_tree_1.Options.array &&
-                node.type.fieldType.nest.nest.type === graphql_js_tree_1.Options.required) {
-                if (Array.isArray(value)) {
-                    for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                        var v = value_1[_i];
-                        if (!v) {
-                            errs = [errors[models_1.Errs.VALUE_IN_ARRAY_REQUIRED]];
+var getErrorFromProps = function (props) {
+    var _a;
+    return (_a = props.errors) === null || _a === void 0 ? void 0 : _a[props.currentPath];
+};
+exports.getErrorFromProps = getErrorFromProps;
+var validateValue = function (f, nodes, path, pushErrors) {
+    if (f === null ||
+        typeof f === 'string' ||
+        typeof f === 'boolean' ||
+        typeof f === 'number' ||
+        typeof f === 'undefined') {
+        return;
+    }
+    if ('node' in f &&
+        typeof f.node === 'object' &&
+        f.node !== null &&
+        'args' in f.node &&
+        'data' in f.node &&
+        typeof f.node.data === 'object' &&
+        !!f.node.data &&
+        'type' in f.node.data &&
+        'directives' in f.node) {
+        var _a = f, node = _a.node, value = _a.value;
+        if (node.data.type === graphql_js_tree_1.ValueDefinition.InputValueDefinition) {
+            if (node.type.fieldType.type === graphql_js_tree_1.Options.required) {
+                if (!value) {
+                    pushErrors(path, models_1.Errs.REQUIRED);
+                }
+                if (node.type.fieldType.nest.type === graphql_js_tree_1.Options.array &&
+                    node.type.fieldType.nest.nest.type === graphql_js_tree_1.Options.required) {
+                    if (Array.isArray(value)) {
+                        for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                            var v = value_1[_i];
+                            if (!v) {
+                                pushErrors(path, models_1.Errs.VALUE_IN_ARRAY_REQUIRED);
+                            }
                         }
                     }
                 }
             }
         }
     }
-    pushErrors(!(errs === null || errs === void 0 ? void 0 : errs.length));
-    if ((seekNode || node.data.type === graphql_js_tree_1.TypeSystemDefinition.FieldDefinition) && value) {
-        return __assign(__assign({}, f), { value: Object.fromEntries(Object.entries(value).map(function (_a) {
+    if ('value' in f && !!f.value) {
+        var value = f.value;
+        if (Array.isArray(value)) {
+            value.map(function (vv) { return (0, exports.validateValue)(vv, nodes, path, pushErrors); });
+            return;
+        }
+        if (typeof value === 'object' && !!value) {
+            Object.entries(value).forEach(function (_a) {
                 var k = _a[0], v = _a[1];
-                return [k, (0, exports.validateValue)(v, nodes, errors, pushErrors)];
-            })), errors: errs });
+                return (0, exports.validateValue)(v, nodes, "".concat(path, ".").concat(k), pushErrors);
+            });
+            return;
+        }
     }
-    return __assign(__assign({}, f), { errors: errs });
+    return;
 };
 exports.validateValue = validateValue;
 var validateForm = function (v, nodes, errors) {
-    var isValid = true;
+    var errorDict = {};
     if (!v.forms)
-        return [v, isValid];
-    var forms = Object.entries(v.forms)
-        .map(function (_a) {
+        return errorDict;
+    Object.entries(v.forms).forEach(function (_a) {
         var k = _a[0], val = _a[1];
-        return [
-            k,
-            (0, exports.validateValue)(val, nodes, errors, function (valid) {
-                if (!valid) {
-                    isValid = valid;
-                }
-            }),
-        ];
-    })
-        .reduce(function (a, _a) {
-        var _b;
-        var k = _a[0], val = _a[1];
-        return (__assign(__assign({}, a), (_b = {}, _b[k] = val, _b)));
-    }, {});
-    return [
-        __assign(__assign({}, v), { forms: forms }),
-        isValid,
-    ];
+        (0, exports.validateValue)(val, nodes, k, function (p, err) {
+            errorDict[p] = errors[err];
+        });
+    });
+    return errorDict;
 };
 exports.validateForm = validateForm;
 var eraseValue = function (f, nodes) {

package/lib/outsideUse.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphql-form",
-    "version": "0.0.17",
+    "version": "0.0.20",
     "description": "Easy form creation with GraphQL Editor and React",
     "main": "lib/index.js",
     "scripts": {

package/src/FormToCode/gql/reducers.ts

@@ -1,5 +1,5 @@
 import { resolveQlValue } from '@/FormToCode/gql/resolvers';
-import { Reductor } from '@/FormToCode/models';
+import { Reductor, ReductorValue } from '@/FormToCode/models';
 import { FormObject } from '@/models';
 import { ParserField } from 'graphql-js-tree';
 
@@ -12,27 +12,34 @@ export const fieldsToReductor = (toggledFields: Record<string, FormObject>): Red
                 el = value.node.type.operations[0];
             }
             start[el] = start[el] || {};
-            start[el].node = start[el].node || {};
+            start[el].reductor = start[el].reductor || {};
             if (index === pathElements.length - 1) {
                 if (value.value && Object.keys(value.value).length > 0) {
                     start[el].value = value.value;
                 }
             }
-            start = start[el].node;
+            start = start[el].reductor;
         });
         return a;
     }, {} as Reductor);
 
+export const determineArgumentsQl = (v: ReductorValue, nodes: ParserField[], tabs = '') => {
+    if (v.value && Object.keys(v.value).length > 0) {
+        const resolvedValue = resolveQlValue(v.value, nodes, tabs);
+        if (resolvedValue) {
+            return `(${resolvedValue}\n${tabs})`;
+        }
+    }
+    return '';
+};
+
 export const reduceQl = (o: Reductor, nodes: ParserField[], tabs = ''): string => {
     return Object.entries(o)
         .map(([k, v]) => {
-            const kName =
-                v.value && Object.keys(v.value).length > 0
-                    ? `${k}(${resolveQlValue(v.value, nodes, tabs)}\n${tabs})`
-                    : k;
+            const kName = `${k}${determineArgumentsQl(v, nodes, tabs)}`;
             const kObject =
-                Object.keys(v.node).length > 0
-                    ? `${tabs}${kName}{\n${reduceQl(v.node, nodes, tabs + '\t')}${tabs}}\n`
+                Object.keys(v.reductor).length > 0
+                    ? `${tabs}${kName}{\n${reduceQl(v.reductor, nodes, tabs + '\t')}${tabs}}\n`
                     : `${tabs}${kName}\n`;
             return kObject;
         })

package/src/FormToCode/models.ts

@@ -1,7 +1,7 @@
 import { FormValue } from '@/models';
 
 export type ReductorValue = {
-    node: Reductor;
+    reductor: Reductor;
     value?: FormValue;
 };
 export type Reductor = {

package/src/FormToCode/zeus/resolvers.tsx

@@ -13,13 +13,13 @@ export const zeusFieldsToReductor = (toggledFields: Record<string, FormObject>):
                 return;
             }
             start[el] = start[el] || {};
-            start[el].node = start[el].node || {};
+            start[el].reductor = start[el].reductor || {};
             if (index === pathElements.length - 1) {
                 if (value.value && Object.keys(value.value).length > 0) {
                     start[el].value = value.value;
                 }
             }
-            start = start[el].node;
+            start = start[el].reductor;
         });
         return a;
     }, {} as Reductor);
@@ -31,9 +31,9 @@ export const zeusReduceQl = (o: Reductor, nodes: ParserField[], tabs = '', level
     return Object.entries(o)
         .map(([k, v]) => {
             if (v.value && Object.keys(v.value).length > 0) {
-                return Object.keys(v.node).length > 0
+                return Object.keys(v.reductor).length > 0
                     ? `${tabs}${k}:[{${resolveQlValue(v.value, nodes, tabs)}\n${tabs}}, {\n${zeusReduceQl(
-                          v.node,
+                          v.reductor,
                           nodes,
                           tabs + '\t',
                           lUP,
@@ -43,11 +43,11 @@ export const zeusReduceQl = (o: Reductor, nodes: ParserField[], tabs = '', level
             if (level === 0) {
                 return `const result = await api("${
                     nodes.find((n) => n.name === k)?.type.operations?.[0]
-                }")({\n${zeusReduceQl(v.node, nodes, tabs + '\t', lUP)}})`;
+                }")({\n${zeusReduceQl(v.reductor, nodes, tabs + '\t', lUP)}})`;
             }
             const kObject =
-                Object.keys(v.node).length > 0
-                    ? `${tabs}${k}:{\n${zeusReduceQl(v.node, nodes, tabs + '\t', lUP)}${tabs}}\n`
+                Object.keys(v.reductor).length > 0
+                    ? `${tabs}${k}:{\n${zeusReduceQl(v.reductor, nodes, tabs + '\t', lUP)}${tabs}}\n`
                     : `${tabs}${k}: true\n`;
             return kObject;
         })

package/src/createWidget.tsx

@@ -7,14 +7,17 @@ export function createWidget<Props>({
     Settings,
     Description,
     requirements,
+    displayName,
 }: {
     name: string;
+    displayName?: string;
     Component: React.FC<PassedFormProps<Props>>;
     Settings?: React.FC<CastToWidgetSettingsPassedForm<Props>>;
     Description?: React.FC;
     requirements: (props: PassedFormProps) => boolean;
 }) {
     return {
+        displayName,
         Component,
         Settings,
         Description,

package/src/models.ts

@@ -48,6 +48,7 @@ export type PassedFormProps<WidgetData = ReturnedDictType> = {
     currentPath: string;
     widgets?: SavedWidgets;
     widgetData?: WidgetData;
+    errors?: Errors;
     components: {
         ArrayField: FieldComponent;
         ObjectField: FieldComponent;
@@ -99,6 +100,7 @@ export type WidgetType = {
 };
 
 export type FormValue =
+    | { value: FormValue }
     | {
           [x: string]: FormValue;
       }
@@ -112,6 +114,5 @@ export type FormValue =
 
 export type FormObject = {
     value?: FormValue;
-    errors?: string[];
     node: ParserField;
 };

package/src/outsideUse.tsx

@@ -1,5 +1,12 @@
-import { Errs, FormFile, FormObject, PassedFormProps } from '@/models';
-import { getTypeName, Options, ParserField, TypeDefinition, TypeSystemDefinition } from 'graphql-js-tree';
+import { Errs, FormFile, FormObject, FormValue, PassedFormProps } from '@/models';
+import {
+    getTypeName,
+    Options,
+    ParserField,
+    TypeDefinition,
+    TypeSystemDefinition,
+    ValueDefinition,
+} from 'graphql-js-tree';
 
 export const getWidgetFromProps = (props: PassedFormProps) => {
     const w = props.widgets?.[props.currentPath];
@@ -26,85 +33,82 @@ export const getWidgetFromProps = (props: PassedFormProps) => {
         widget: FoundBasicWidget,
     };
 };
+export const getErrorFromProps = (props: PassedFormProps) => {
+    return props.errors?.[props.currentPath];
+};
 
 export const validateValue = (
-    f: FormObject,
+    f: FormValue,
     nodes: ParserField[],
-    errors: Record<Errs, string>,
-    pushErrors: (isValid: boolean) => void,
-): FormObject => {
-    const { value, node } = f;
-
-    const seekNode = nodes.find((n) => n.name === getTypeName(node.type.fieldType));
-    let errs: string[] | undefined;
+    path: string,
+    pushErrors: (path: string, value: Errs) => void,
+) => {
     if (
-        (!seekNode && node.data.type !== TypeSystemDefinition.FieldDefinition) ||
-        seekNode?.data.type === TypeDefinition.EnumTypeDefinition ||
-        seekNode?.data.type === TypeDefinition.ScalarTypeDefinition
+        f === null ||
+        typeof f === 'string' ||
+        typeof f === 'boolean' ||
+        typeof f === 'number' ||
+        typeof f === 'undefined'
     ) {
-        console.log(f);
-        if (node.type.fieldType.type === Options.required) {
-            if (!value) {
-                errs = [errors[Errs.REQUIRED]];
-            }
-            if (
-                node.type.fieldType.nest.type === Options.array &&
-                node.type.fieldType.nest.nest.type === Options.required
-            ) {
-                if (Array.isArray(value)) {
-                    for (const v of value) {
-                        if (!v) {
-                            errs = [errors[Errs.VALUE_IN_ARRAY_REQUIRED]];
+        return;
+    }
+    if (
+        'node' in f &&
+        typeof f.node === 'object' &&
+        f.node !== null &&
+        'args' in f.node &&
+        'data' in f.node &&
+        typeof f.node.data === 'object' &&
+        !!f.node.data &&
+        'type' in f.node.data &&
+        'directives' in f.node
+    ) {
+        const { node, value } = f as FormObject;
+        if (node.data.type === ValueDefinition.InputValueDefinition) {
+            if (node.type.fieldType.type === Options.required) {
+                if (!value) {
+                    pushErrors(path, Errs.REQUIRED);
+                }
+                if (
+                    node.type.fieldType.nest.type === Options.array &&
+                    node.type.fieldType.nest.nest.type === Options.required
+                ) {
+                    if (Array.isArray(value)) {
+                        for (const v of value) {
+                            if (!v) {
+                                pushErrors(path, Errs.VALUE_IN_ARRAY_REQUIRED);
+                            }
                         }
                     }
                 }
             }
         }
     }
-    pushErrors(!errs?.length);
-    if ((seekNode || node.data.type === TypeSystemDefinition.FieldDefinition) && value) {
-        return {
-            ...f,
-            value: Object.fromEntries(
-                Object.entries(value).map(([k, v]) => [k, validateValue(v as FormObject, nodes, errors, pushErrors)]),
-            ),
-            errors: errs,
-        };
+    if ('value' in f && !!f.value) {
+        const { value } = f;
+        if (Array.isArray(value)) {
+            value.map((vv) => validateValue(vv, nodes, path, pushErrors));
+            return;
+        }
+        if (typeof value === 'object' && !!value) {
+            Object.entries(value).forEach(([k, v]) =>
+                validateValue(v as FormObject, nodes, `${path}.${k}`, pushErrors),
+            );
+            return;
+        }
     }
-    return {
-        ...f,
-        errors: errs,
-    };
+    return;
 };
 
 export const validateForm = (v: FormFile, nodes: ParserField[], errors: Record<Errs, string>) => {
-    let isValid = true;
-    if (!v.forms) return [v, isValid] as const;
-    const forms = Object.entries(v.forms)
-        .map(([k, val]) => {
-            return [
-                k,
-                validateValue(val, nodes, errors, (valid) => {
-                    if (!valid) {
-                        isValid = valid;
-                    }
-                }),
-            ] as const;
-        })
-        .reduce(
-            (a, [k, val]) => ({
-                ...a,
-                [k]: val,
-            }),
-            {} as FormFile['forms'],
-        );
-    return [
-        {
-            ...v,
-            forms,
-        } as FormFile,
-        isValid,
-    ] as const;
+    const errorDict: Record<string, string> = {};
+    if (!v.forms) return errorDict;
+    Object.entries(v.forms).forEach(([k, val]) => {
+        validateValue(val, nodes, k, (p, err) => {
+            errorDict[p] = errors[err];
+        });
+    });
+    return errorDict;
 };
 
 export const eraseValue = (f: FormObject, nodes: ParserField[]): FormObject => {