graphql-form 0.0.17 → 0.0.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. package/lib/models.d.ts +3 -1
  2. package/lib/outsideUse.d.ts +4 -3
  3. package/lib/outsideUse.js +58 -48
  4. package/lib/outsideUse.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/models.ts +2 -1
  7. package/src/outsideUse.tsx +70 -66
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,66 +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 && node.data.type !== graphql_js_tree_1.TypeSystemDefinition.FieldDefinition) ||
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
- console.log(f);
49
- if (node.type.fieldType.type === graphql_js_tree_1.Options.required) {
50
- if (!value) {
51
- errs = [errors[models_1.Errs.REQUIRED]];
52
- }
53
- if (node.type.fieldType.nest.type === graphql_js_tree_1.Options.array &&
54
- node.type.fieldType.nest.nest.type === graphql_js_tree_1.Options.required) {
55
- if (Array.isArray(value)) {
56
- for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
57
- var v = value_1[_i];
58
- if (!v) {
59
- 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
+ }
60
77
  }
61
78
  }
62
79
  }
63
80
  }
64
81
  }
65
82
  }
66
- pushErrors(!(errs === null || errs === void 0 ? void 0 : errs.length));
67
- if ((seekNode || node.data.type === graphql_js_tree_1.TypeSystemDefinition.FieldDefinition) && value) {
68
- 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) {
69
91
  var k = _a[0], v = _a[1];
70
- return [k, (0, exports.validateValue)(v, nodes, errors, pushErrors)];
71
- })), errors: errs });
92
+ return (0, exports.validateValue)(v, nodes, "".concat(path, ".").concat(k), pushErrors);
93
+ });
94
+ return;
95
+ }
72
96
  }
73
- return __assign(__assign({}, f), { errors: errs });
97
+ return;
74
98
  };
75
99
  exports.validateValue = validateValue;
76
100
  var validateForm = function (v, nodes, errors) {
77
- var isValid = true;
101
+ var errorDict = {};
78
102
  if (!v.forms)
79
- return [v, isValid];
80
- var forms = Object.entries(v.forms)
81
- .map(function (_a) {
103
+ return errorDict;
104
+ Object.entries(v.forms).forEach(function (_a) {
82
105
  var k = _a[0], val = _a[1];
83
- return [
84
- k,
85
- (0, exports.validateValue)(val, nodes, errors, function (valid) {
86
- if (!valid) {
87
- isValid = valid;
88
- }
89
- }),
90
- ];
91
- })
92
- .reduce(function (a, _a) {
93
- var _b;
94
- var k = _a[0], val = _a[1];
95
- return (__assign(__assign({}, a), (_b = {}, _b[k] = val, _b)));
96
- }, {});
97
- return [
98
- __assign(__assign({}, v), { forms: forms }),
99
- isValid,
100
- ];
106
+ (0, exports.validateValue)(val, nodes, k, function (p, err) {
107
+ errorDict[p] = errors[err];
108
+ });
109
+ });
110
+ return errorDict;
101
111
  };
102
112
  exports.validateForm = validateForm;
103
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.17",
3
+ "version": "0.0.18",
4
4
  "description": "Easy form creation with GraphQL Editor and React",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
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,85 +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 && node.data.type !== TypeSystemDefinition.FieldDefinition) ||
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
- console.log(f);
46
- if (node.type.fieldType.type === Options.required) {
47
- if (!value) {
48
- errs = [errors[Errs.REQUIRED]];
49
- }
50
- if (
51
- node.type.fieldType.nest.type === Options.array &&
52
- node.type.fieldType.nest.nest.type === Options.required
53
- ) {
54
- if (Array.isArray(value)) {
55
- for (const v of value) {
56
- if (!v) {
57
- 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
+ }
58
81
  }
59
82
  }
60
83
  }
61
84
  }
62
85
  }
63
86
  }
64
- pushErrors(!errs?.length);
65
- if ((seekNode || node.data.type === TypeSystemDefinition.FieldDefinition) && value) {
66
- return {
67
- ...f,
68
- value: Object.fromEntries(
69
- Object.entries(value).map(([k, v]) => [k, validateValue(v as FormObject, nodes, errors, pushErrors)]),
70
- ),
71
- errors: errs,
72
- };
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
+ }
73
99
  }
74
- return {
75
- ...f,
76
- errors: errs,
77
- };
100
+ return;
78
101
  };
79
102
 
80
103
  export const validateForm = (v: FormFile, nodes: ParserField[], errors: Record<Errs, string>) => {
81
- let isValid = true;
82
- if (!v.forms) return [v, isValid] as const;
83
- const forms = Object.entries(v.forms)
84
- .map(([k, val]) => {
85
- return [
86
- k,
87
- validateValue(val, nodes, errors, (valid) => {
88
- if (!valid) {
89
- isValid = valid;
90
- }
91
- }),
92
- ] as const;
93
- })
94
- .reduce(
95
- (a, [k, val]) => ({
96
- ...a,
97
- [k]: val,
98
- }),
99
- {} as FormFile['forms'],
100
- );
101
- return [
102
- {
103
- ...v,
104
- forms,
105
- } as FormFile,
106
- isValid,
107
- ] 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;
108
112
  };
109
113
 
110
114
  export const eraseValue = (f: FormObject, nodes: ParserField[]): FormObject => {