graphql-form 0.0.16 → 0.0.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. package/lib/FormToCode/gql/reducers.d.ts +2 -1
  2. package/lib/FormToCode/gql/reducers.js +17 -8
  3. package/lib/FormToCode/gql/reducers.js.map +1 -1
  4. package/lib/FormToCode/models.d.ts +1 -1
  5. package/lib/FormToCode/zeus/resolvers.js +7 -7
  6. package/lib/FormToCode/zeus/resolvers.js.map +1 -1
  7. package/lib/models.d.ts +3 -1
  8. package/lib/outsideUse.d.ts +4 -3
  9. package/lib/outsideUse.js +58 -47
  10. package/lib/outsideUse.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/FormToCode/gql/reducers.ts +16 -9
  13. package/src/FormToCode/models.ts +1 -1
  14. package/src/FormToCode/zeus/resolvers.tsx +7 -7
  15. package/src/models.ts +2 -1
  16. package/src/outsideUse.tsx +70 -65
package/lib/FormToCode/gql/reducers.d.ts CHANGED
@@ -1,5 +1,6 @@
1
- import { Reductor } from "../models";
1
+ import { Reductor, ReductorValue } from "../models";
2
2
  import { FormObject } from "../../models";
3
3
  import { ParserField } from 'graphql-js-tree';
4
4
  export declare const fieldsToReductor: (toggledFields: Record<string, FormObject>) => Reductor;
5
+ export declare const determineArgumentsQl: (v: ReductorValue, nodes: ParserField[], tabs?: string) => string;
5
6
  export declare const reduceQl: (o: Reductor, nodes: ParserField[], tabs?: string) => string;
package/lib/FormToCode/gql/reducers.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.reduceQl = exports.fieldsToReductor = void 0;
3
+ exports.reduceQl = exports.determineArgumentsQl = exports.fieldsToReductor = void 0;
4
4
  var resolvers_1 = require("./resolvers");
5
5
  var fieldsToReductor = function (toggledFields) {
6
6
  return Object.entries(toggledFields).reduce(function (a, _a) {
@@ -13,28 +13,37 @@ var fieldsToReductor = function (toggledFields) {
13
13
  el = value.node.type.operations[0];
14
14
  }
15
15
  start[el] = start[el] || {};
16
- start[el].node = start[el].node || {};
16
+ start[el].reductor = start[el].reductor || {};
17
17
  if (index === pathElements.length - 1) {
18
18
  if (value.value && Object.keys(value.value).length > 0) {
19
19
  start[el].value = value.value;
20
20
  }
21
21
  }
22
- start = start[el].node;
22
+ start = start[el].reductor;
23
23
  });
24
24
  return a;
25
25
  }, {});
26
26
  };
27
27
  exports.fieldsToReductor = fieldsToReductor;
28
+ var determineArgumentsQl = function (v, nodes, tabs) {
29
+ if (tabs === void 0) { tabs = ''; }
30
+ if (v.value && Object.keys(v.value).length > 0) {
31
+ var resolvedValue = (0, resolvers_1.resolveQlValue)(v.value, nodes, tabs);
32
+ if (resolvedValue) {
33
+ return "(".concat(resolvedValue, "\n").concat(tabs, ")");
34
+ }
35
+ }
36
+ return '';
37
+ };
38
+ exports.determineArgumentsQl = determineArgumentsQl;
28
39
  var reduceQl = function (o, nodes, tabs) {
29
40
  if (tabs === void 0) { tabs = ''; }
30
41
  return Object.entries(o)
31
42
  .map(function (_a) {
32
43
  var k = _a[0], v = _a[1];
33
- var kName = v.value && Object.keys(v.value).length > 0
34
- ? "".concat(k, "(").concat((0, resolvers_1.resolveQlValue)(v.value, nodes, tabs), "\n").concat(tabs, ")")
35
- : k;
36
- var kObject = Object.keys(v.node).length > 0
37
- ? "".concat(tabs).concat(kName, "{\n").concat((0, exports.reduceQl)(v.node, nodes, tabs + '\t')).concat(tabs, "}\n")
44
+ var kName = "".concat(k).concat((0, exports.determineArgumentsQl)(v, nodes, tabs));
45
+ var kObject = Object.keys(v.reductor).length > 0
46
+ ? "".concat(tabs).concat(kName, "{\n").concat((0, exports.reduceQl)(v.reductor, nodes, tabs + '\t')).concat(tabs, "}\n")
38
47
  : "".concat(tabs).concat(kName, "\n");
39
48
  return kObject;
40
49
  })
package/lib/FormToCode/gql/reducers.js.map CHANGED
@@ -1 +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"}
1
+ {"version":3,"file":"reducers.js","sourceRoot":"","sources":["../../../src/FormToCode/gql/reducers.ts"],"names":[],"mappings":"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"}
package/lib/FormToCode/models.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { FormValue } from "../models";
2
2
  export declare type ReductorValue = {
3
- node: Reductor;
3
+ reductor: Reductor;
4
4
  value?: FormValue;
5
5
  };
6
6
  export declare type Reductor = {
package/lib/FormToCode/zeus/resolvers.js CHANGED
@@ -14,13 +14,13 @@ var zeusFieldsToReductor = function (toggledFields) {
14
14
  return;
15
15
  }
16
16
  start[el] = start[el] || {};
17
- start[el].node = start[el].node || {};
17
+ start[el].reductor = start[el].reductor || {};
18
18
  if (index === pathElements.length - 1) {
19
19
  if (value.value && Object.keys(value.value).length > 0) {
20
20
  start[el].value = value.value;
21
21
  }
22
22
  }
23
- start = start[el].node;
23
+ start = start[el].reductor;
24
24
  });
25
25
  return a;
26
26
  }, {});
@@ -36,15 +36,15 @@ var zeusReduceQl = function (o, nodes, tabs, level) {
36
36
  var _b, _c;
37
37
  var k = _a[0], v = _a[1];
38
38
  if (v.value && Object.keys(v.value).length > 0) {
39
- return Object.keys(v.node).length > 0
40
- ? "".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")
39
+ return Object.keys(v.reductor).length > 0
40
+ ? "".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")
41
41
  : "".concat(tabs).concat(k, ":[{").concat((0, resolvers_1.resolveQlValue)(v.value, nodes, tabs), "\n").concat(tabs, "}, true]");
42
42
  }
43
43
  if (level === 0) {
44
- 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), "})");
44
+ 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), "})");
45
45
  }
46
- var kObject = Object.keys(v.node).length > 0
47
- ? "".concat(tabs).concat(k, ":{\n").concat((0, exports.zeusReduceQl)(v.node, nodes, tabs + '\t', lUP)).concat(tabs, "}\n")
46
+ var kObject = Object.keys(v.reductor).length > 0
47
+ ? "".concat(tabs).concat(k, ":{\n").concat((0, exports.zeusReduceQl)(v.reductor, nodes, tabs + '\t', lUP)).concat(tabs, "}\n")
48
48
  : "".concat(tabs).concat(k, ": true\n");
49
49
  return kObject;
50
50
  })
package/lib/FormToCode/zeus/resolvers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/FormToCode/zeus/resolvers.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/FormToCode/zeus/resolvers.tsx"],"names":[],"mappings":"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"}
package/lib/models.d.ts CHANGED
@@ -41,6 +41,7 @@ export declare type PassedFormProps<WidgetData = ReturnedDictType> = {
41
41
  currentPath: string;
42
42
  widgets?: SavedWidgets;
43
43
  widgetData?: WidgetData;
44
+ errors?: Errors;
44
45
  components: {
45
46
  ArrayField: FieldComponent;
46
47
  ObjectField: FieldComponent;
@@ -78,10 +79,11 @@ export declare type WidgetType = {
78
79
  name: string;
79
80
  };
80
81
  export declare type FormValue = {
82
+ value: FormValue;
83
+ } | {
81
84
  [x: string]: FormValue;
82
85
  } | string | boolean | number | null | undefined | FormObject | Array<FormValue>;
83
86
  export declare type FormObject = {
84
87
  value?: FormValue;
85
- errors?: string[];
86
88
  node: ParserField;
87
89
  };
package/lib/outsideUse.d.ts CHANGED
@@ -1,10 +1,11 @@
1
- import { Errs, FormFile, FormObject, PassedFormProps } from "./models";
1
+ import { Errs, FormFile, FormObject, FormValue, PassedFormProps } from "./models";
2
2
  import { ParserField } from 'graphql-js-tree';
3
3
  export declare const getWidgetFromProps: (props: PassedFormProps) => {
4
4
  data: any;
5
5
  widget: import("./models").WidgetType;
6
6
  } | undefined;
7
- export declare const validateValue: (f: FormObject, nodes: ParserField[], errors: Record<Errs, string>, pushErrors: (isValid: boolean) => void) => FormObject;
8
- export declare const validateForm: (v: FormFile, nodes: ParserField[], errors: Record<Errs, string>) => readonly [FormFile, true];
7
+ export declare const getErrorFromProps: (props: PassedFormProps) => string | undefined;
8
+ export declare const validateValue: (f: FormValue, nodes: ParserField[], path: string, pushErrors: (path: string, value: Errs) => void) => void;
9
+ export declare const validateForm: (v: FormFile, nodes: ParserField[], errors: Record<Errs, string>) => Record<string, string>;
9
10
  export declare const eraseValue: (f: FormObject, nodes: ParserField[]) => FormObject;
10
11
  export declare const eraseForm: (v: FormFile, nodes: ParserField[]) => FormFile;
package/lib/outsideUse.js CHANGED
@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
11
11
  return __assign.apply(this, arguments);
12
12
  };
13
13
  Object.defineProperty(exports, "__esModule", { value: true });
14
- exports.eraseForm = exports.eraseValue = exports.validateForm = exports.validateValue = exports.getWidgetFromProps = void 0;
14
+ exports.eraseForm = exports.eraseValue = exports.validateForm = exports.validateValue = exports.getErrorFromProps = exports.getWidgetFromProps = void 0;
15
15
  var models_1 = require("./models");
16
16
  var graphql_js_tree_1 = require("graphql-js-tree");
17
17
  var getWidgetFromProps = function (props) {
@@ -38,65 +38,76 @@ var getWidgetFromProps = function (props) {
38
38
  };
39
39
  };
40
40
  exports.getWidgetFromProps = getWidgetFromProps;
41
- var validateValue = function (f, nodes, errors, pushErrors) {
42
- var value = f.value, node = f.node;
43
- var seekNode = nodes.find(function (n) { return n.name === (0, graphql_js_tree_1.getTypeName)(node.type.fieldType); });
44
- var errs;
45
- if (!seekNode ||
46
- (seekNode === null || seekNode === void 0 ? void 0 : seekNode.data.type) === graphql_js_tree_1.TypeDefinition.EnumTypeDefinition ||
47
- (seekNode === null || seekNode === void 0 ? void 0 : seekNode.data.type) === graphql_js_tree_1.TypeDefinition.ScalarTypeDefinition) {
48
- if (node.type.fieldType.type === graphql_js_tree_1.Options.required) {
49
- if (!value) {
50
- errs = [errors[models_1.Errs.REQUIRED]];
51
- }
52
- if (node.type.fieldType.nest.type === graphql_js_tree_1.Options.array &&
53
- node.type.fieldType.nest.nest.type === graphql_js_tree_1.Options.required) {
54
- if (Array.isArray(value)) {
55
- for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
56
- var v = value_1[_i];
57
- if (!v) {
58
- errs = [errors[models_1.Errs.VALUE_IN_ARRAY_REQUIRED]];
41
+ var getErrorFromProps = function (props) {
42
+ var _a;
43
+ return (_a = props.errors) === null || _a === void 0 ? void 0 : _a[props.currentPath];
44
+ };
45
+ exports.getErrorFromProps = getErrorFromProps;
46
+ var validateValue = function (f, nodes, path, pushErrors) {
47
+ if (f === null ||
48
+ typeof f === 'string' ||
49
+ typeof f === 'boolean' ||
50
+ typeof f === 'number' ||
51
+ typeof f === 'undefined') {
52
+ return;
53
+ }
54
+ if ('node' in f &&
55
+ typeof f.node === 'object' &&
56
+ f.node !== null &&
57
+ 'args' in f.node &&
58
+ 'data' in f.node &&
59
+ typeof f.node.data === 'object' &&
60
+ !!f.node.data &&
61
+ 'type' in f.node.data &&
62
+ 'directives' in f.node) {
63
+ var _a = f, node = _a.node, value = _a.value;
64
+ if (node.data.type === graphql_js_tree_1.ValueDefinition.InputValueDefinition) {
65
+ if (node.type.fieldType.type === graphql_js_tree_1.Options.required) {
66
+ if (!value) {
67
+ pushErrors(path, models_1.Errs.REQUIRED);
68
+ }
69
+ if (node.type.fieldType.nest.type === graphql_js_tree_1.Options.array &&
70
+ node.type.fieldType.nest.nest.type === graphql_js_tree_1.Options.required) {
71
+ if (Array.isArray(value)) {
72
+ for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
73
+ var v = value_1[_i];
74
+ if (!v) {
75
+ pushErrors(path, models_1.Errs.VALUE_IN_ARRAY_REQUIRED);
76
+ }
59
77
  }
60
78
  }
61
79
  }
62
80
  }
63
81
  }
64
82
  }
65
- pushErrors(!(errs === null || errs === void 0 ? void 0 : errs.length));
66
- if ((seekNode || node.data.type === graphql_js_tree_1.TypeSystemDefinition.FieldDefinition) && value) {
67
- return __assign(__assign({}, f), { value: Object.fromEntries(Object.entries(value).map(function (_a) {
83
+ if ('value' in f && !!f.value) {
84
+ var value = f.value;
85
+ if (Array.isArray(value)) {
86
+ value.map(function (vv) { return (0, exports.validateValue)(vv, nodes, path, pushErrors); });
87
+ return;
88
+ }
89
+ if (typeof value === 'object' && !!value) {
90
+ Object.entries(value).forEach(function (_a) {
68
91
  var k = _a[0], v = _a[1];
69
- return [k, (0, exports.validateValue)(v, nodes, errors, pushErrors)];
70
- })), errors: errs });
92
+ return (0, exports.validateValue)(v, nodes, "".concat(path, ".").concat(k), pushErrors);
93
+ });
94
+ return;
95
+ }
71
96
  }
72
- return __assign(__assign({}, f), { errors: errs });
97
+ return;
73
98
  };
74
99
  exports.validateValue = validateValue;
75
100
  var validateForm = function (v, nodes, errors) {
76
- var isValid = true;
101
+ var errorDict = {};
77
102
  if (!v.forms)
78
- return [v, isValid];
79
- var forms = Object.entries(v.forms)
80
- .map(function (_a) {
81
- var k = _a[0], val = _a[1];
82
- return [
83
- k,
84
- (0, exports.validateValue)(val, nodes, errors, function (valid) {
85
- if (!valid) {
86
- isValid = valid;
87
- }
88
- }),
89
- ];
90
- })
91
- .reduce(function (a, _a) {
92
- var _b;
103
+ return errorDict;
104
+ Object.entries(v.forms).forEach(function (_a) {
93
105
  var k = _a[0], val = _a[1];
94
- return (__assign(__assign({}, a), (_b = {}, _b[k] = val, _b)));
95
- }, {});
96
- return [
97
- __assign(__assign({}, v), { forms: forms }),
98
- isValid,
99
- ];
106
+ (0, exports.validateValue)(val, nodes, k, function (p, err) {
107
+ errorDict[p] = errors[err];
108
+ });
109
+ });
110
+ return errorDict;
100
111
  };
101
112
  exports.validateForm = validateForm;
102
113
  var eraseValue = function (f, nodes) {
package/lib/outsideUse.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"outsideUse.js","sourceRoot":"","sources":["../src/outsideUse.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"outsideUse.js","sourceRoot":"","sources":["../src/outsideUse.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "graphql-form",
3
- "version": "0.0.16",
3
+ "version": "0.0.19",
4
4
  "description": "Easy form creation with GraphQL Editor and React",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/FormToCode/gql/reducers.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { resolveQlValue } from '@/FormToCode/gql/resolvers';
2
- import { Reductor } from '@/FormToCode/models';
2
+ import { Reductor, ReductorValue } from '@/FormToCode/models';
3
3
  import { FormObject } from '@/models';
4
4
  import { ParserField } from 'graphql-js-tree';
5
5
 
@@ -12,27 +12,34 @@ export const fieldsToReductor = (toggledFields: Record<string, FormObject>): Red
12
12
  el = value.node.type.operations[0];
13
13
  }
14
14
  start[el] = start[el] || {};
15
- start[el].node = start[el].node || {};
15
+ start[el].reductor = start[el].reductor || {};
16
16
  if (index === pathElements.length - 1) {
17
17
  if (value.value && Object.keys(value.value).length > 0) {
18
18
  start[el].value = value.value;
19
19
  }
20
20
  }
21
- start = start[el].node;
21
+ start = start[el].reductor;
22
22
  });
23
23
  return a;
24
24
  }, {} as Reductor);
25
25
 
26
+ export const determineArgumentsQl = (v: ReductorValue, nodes: ParserField[], tabs = '') => {
27
+ if (v.value && Object.keys(v.value).length > 0) {
28
+ const resolvedValue = resolveQlValue(v.value, nodes, tabs);
29
+ if (resolvedValue) {
30
+ return `(${resolvedValue}\n${tabs})`;
31
+ }
32
+ }
33
+ return '';
34
+ };
35
+
26
36
  export const reduceQl = (o: Reductor, nodes: ParserField[], tabs = ''): string => {
27
37
  return Object.entries(o)
28
38
  .map(([k, v]) => {
29
- const kName =
30
- v.value && Object.keys(v.value).length > 0
31
- ? `${k}(${resolveQlValue(v.value, nodes, tabs)}\n${tabs})`
32
- : k;
39
+ const kName = `${k}${determineArgumentsQl(v, nodes, tabs)}`;
33
40
  const kObject =
34
- Object.keys(v.node).length > 0
35
- ? `${tabs}${kName}{\n${reduceQl(v.node, nodes, tabs + '\t')}${tabs}}\n`
41
+ Object.keys(v.reductor).length > 0
42
+ ? `${tabs}${kName}{\n${reduceQl(v.reductor, nodes, tabs + '\t')}${tabs}}\n`
36
43
  : `${tabs}${kName}\n`;
37
44
  return kObject;
38
45
  })
package/src/FormToCode/models.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { FormValue } from '@/models';
2
2
 
3
3
  export type ReductorValue = {
4
- node: Reductor;
4
+ reductor: Reductor;
5
5
  value?: FormValue;
6
6
  };
7
7
  export type Reductor = {
package/src/FormToCode/zeus/resolvers.tsx CHANGED
@@ -13,13 +13,13 @@ export const zeusFieldsToReductor = (toggledFields: Record<string, FormObject>):
13
13
  return;
14
14
  }
15
15
  start[el] = start[el] || {};
16
- start[el].node = start[el].node || {};
16
+ start[el].reductor = start[el].reductor || {};
17
17
  if (index === pathElements.length - 1) {
18
18
  if (value.value && Object.keys(value.value).length > 0) {
19
19
  start[el].value = value.value;
20
20
  }
21
21
  }
22
- start = start[el].node;
22
+ start = start[el].reductor;
23
23
  });
24
24
  return a;
25
25
  }, {} as Reductor);
@@ -31,9 +31,9 @@ export const zeusReduceQl = (o: Reductor, nodes: ParserField[], tabs = '', level
31
31
  return Object.entries(o)
32
32
  .map(([k, v]) => {
33
33
  if (v.value && Object.keys(v.value).length > 0) {
34
- return Object.keys(v.node).length > 0
34
+ return Object.keys(v.reductor).length > 0
35
35
  ? `${tabs}${k}:[{${resolveQlValue(v.value, nodes, tabs)}\n${tabs}}, {\n${zeusReduceQl(
36
- v.node,
36
+ v.reductor,
37
37
  nodes,
38
38
  tabs + '\t',
39
39
  lUP,
@@ -43,11 +43,11 @@ export const zeusReduceQl = (o: Reductor, nodes: ParserField[], tabs = '', level
43
43
  if (level === 0) {
44
44
  return `const result = await api("${
45
45
  nodes.find((n) => n.name === k)?.type.operations?.[0]
46
- }")({\n${zeusReduceQl(v.node, nodes, tabs + '\t', lUP)}})`;
46
+ }")({\n${zeusReduceQl(v.reductor, nodes, tabs + '\t', lUP)}})`;
47
47
  }
48
48
  const kObject =
49
- Object.keys(v.node).length > 0
50
- ? `${tabs}${k}:{\n${zeusReduceQl(v.node, nodes, tabs + '\t', lUP)}${tabs}}\n`
49
+ Object.keys(v.reductor).length > 0
50
+ ? `${tabs}${k}:{\n${zeusReduceQl(v.reductor, nodes, tabs + '\t', lUP)}${tabs}}\n`
51
51
  : `${tabs}${k}: true\n`;
52
52
  return kObject;
53
53
  })
package/src/models.ts CHANGED
@@ -48,6 +48,7 @@ export type PassedFormProps<WidgetData = ReturnedDictType> = {
48
48
  currentPath: string;
49
49
  widgets?: SavedWidgets;
50
50
  widgetData?: WidgetData;
51
+ errors?: Errors;
51
52
  components: {
52
53
  ArrayField: FieldComponent;
53
54
  ObjectField: FieldComponent;
@@ -99,6 +100,7 @@ export type WidgetType = {
99
100
  };
100
101
 
101
102
  export type FormValue =
103
+ | { value: FormValue }
102
104
  | {
103
105
  [x: string]: FormValue;
104
106
  }
@@ -112,6 +114,5 @@ export type FormValue =
112
114
 
113
115
  export type FormObject = {
114
116
  value?: FormValue;
115
- errors?: string[];
116
117
  node: ParserField;
117
118
  };
package/src/outsideUse.tsx CHANGED
@@ -1,5 +1,12 @@
1
- import { Errs, FormFile, FormObject, PassedFormProps } from '@/models';
2
- import { getTypeName, Options, ParserField, TypeDefinition, TypeSystemDefinition } from 'graphql-js-tree';
1
+ import { Errs, FormFile, FormObject, FormValue, PassedFormProps } from '@/models';
2
+ import {
3
+ getTypeName,
4
+ Options,
5
+ ParserField,
6
+ TypeDefinition,
7
+ TypeSystemDefinition,
8
+ ValueDefinition,
9
+ } from 'graphql-js-tree';
3
10
 
4
11
  export const getWidgetFromProps = (props: PassedFormProps) => {
5
12
  const w = props.widgets?.[props.currentPath];
@@ -26,84 +33,82 @@ export const getWidgetFromProps = (props: PassedFormProps) => {
26
33
  widget: FoundBasicWidget,
27
34
  };
28
35
  };
36
+ export const getErrorFromProps = (props: PassedFormProps) => {
37
+ return props.errors?.[props.currentPath];
38
+ };
29
39
 
30
40
  export const validateValue = (
31
- f: FormObject,
41
+ f: FormValue,
32
42
  nodes: ParserField[],
33
- errors: Record<Errs, string>,
34
- pushErrors: (isValid: boolean) => void,
35
- ): FormObject => {
36
- const { value, node } = f;
37
-
38
- const seekNode = nodes.find((n) => n.name === getTypeName(node.type.fieldType));
39
- let errs: string[] | undefined;
43
+ path: string,
44
+ pushErrors: (path: string, value: Errs) => void,
45
+ ) => {
40
46
  if (
41
- !seekNode ||
42
- seekNode?.data.type === TypeDefinition.EnumTypeDefinition ||
43
- seekNode?.data.type === TypeDefinition.ScalarTypeDefinition
47
+ f === null ||
48
+ typeof f === 'string' ||
49
+ typeof f === 'boolean' ||
50
+ typeof f === 'number' ||
51
+ typeof f === 'undefined'
44
52
  ) {
45
- if (node.type.fieldType.type === Options.required) {
46
- if (!value) {
47
- errs = [errors[Errs.REQUIRED]];
48
- }
49
- if (
50
- node.type.fieldType.nest.type === Options.array &&
51
- node.type.fieldType.nest.nest.type === Options.required
52
- ) {
53
- if (Array.isArray(value)) {
54
- for (const v of value) {
55
- if (!v) {
56
- errs = [errors[Errs.VALUE_IN_ARRAY_REQUIRED]];
53
+ return;
54
+ }
55
+ if (
56
+ 'node' in f &&
57
+ typeof f.node === 'object' &&
58
+ f.node !== null &&
59
+ 'args' in f.node &&
60
+ 'data' in f.node &&
61
+ typeof f.node.data === 'object' &&
62
+ !!f.node.data &&
63
+ 'type' in f.node.data &&
64
+ 'directives' in f.node
65
+ ) {
66
+ const { node, value } = f as FormObject;
67
+ if (node.data.type === ValueDefinition.InputValueDefinition) {
68
+ if (node.type.fieldType.type === Options.required) {
69
+ if (!value) {
70
+ pushErrors(path, Errs.REQUIRED);
71
+ }
72
+ if (
73
+ node.type.fieldType.nest.type === Options.array &&
74
+ node.type.fieldType.nest.nest.type === Options.required
75
+ ) {
76
+ if (Array.isArray(value)) {
77
+ for (const v of value) {
78
+ if (!v) {
79
+ pushErrors(path, Errs.VALUE_IN_ARRAY_REQUIRED);
80
+ }
57
81
  }
58
82
  }
59
83
  }
60
84
  }
61
85
  }
62
86
  }
63
- pushErrors(!errs?.length);
64
- if ((seekNode || node.data.type === TypeSystemDefinition.FieldDefinition) && value) {
65
- return {
66
- ...f,
67
- value: Object.fromEntries(
68
- Object.entries(value).map(([k, v]) => [k, validateValue(v as FormObject, nodes, errors, pushErrors)]),
69
- ),
70
- errors: errs,
71
- };
87
+ if ('value' in f && !!f.value) {
88
+ const { value } = f;
89
+ if (Array.isArray(value)) {
90
+ value.map((vv) => validateValue(vv, nodes, path, pushErrors));
91
+ return;
92
+ }
93
+ if (typeof value === 'object' && !!value) {
94
+ Object.entries(value).forEach(([k, v]) =>
95
+ validateValue(v as FormObject, nodes, `${path}.${k}`, pushErrors),
96
+ );
97
+ return;
98
+ }
72
99
  }
73
- return {
74
- ...f,
75
- errors: errs,
76
- };
100
+ return;
77
101
  };
78
102
 
79
103
  export const validateForm = (v: FormFile, nodes: ParserField[], errors: Record<Errs, string>) => {
80
- let isValid = true;
81
- if (!v.forms) return [v, isValid] as const;
82
- const forms = Object.entries(v.forms)
83
- .map(([k, val]) => {
84
- return [
85
- k,
86
- validateValue(val, nodes, errors, (valid) => {
87
- if (!valid) {
88
- isValid = valid;
89
- }
90
- }),
91
- ] as const;
92
- })
93
- .reduce(
94
- (a, [k, val]) => ({
95
- ...a,
96
- [k]: val,
97
- }),
98
- {} as FormFile['forms'],
99
- );
100
- return [
101
- {
102
- ...v,
103
- forms,
104
- } as FormFile,
105
- isValid,
106
- ] as const;
104
+ const errorDict: Record<string, string> = {};
105
+ if (!v.forms) return errorDict;
106
+ Object.entries(v.forms).forEach(([k, val]) => {
107
+ validateValue(val, nodes, k, (p, err) => {
108
+ errorDict[p] = errors[err];
109
+ });
110
+ });
111
+ return errorDict;
107
112
  };
108
113
 
109
114
  export const eraseValue = (f: FormObject, nodes: ParserField[]): FormObject => {