graphql-form 0.0.12 → 0.0.15

package/lib/index.d.ts

@@ -4,3 +4,4 @@ export * from "./FormDisplayer";
 export * from "./createWidget";
 export * from "./renderer";
 export * from "./FormToCode";
+export * from "./outsideUse";

package/lib/index.js

@@ -20,4 +20,5 @@ __exportStar(require("./FormDisplayer"), exports);
 __exportStar(require("./createWidget"), exports);
 __exportStar(require("./renderer"), exports);
 __exportStar(require("./FormToCode"), exports);
+__exportStar(require("./outsideUse"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,6CAA2B;AAC3B,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,6CAA2B;AAC3B,+CAA6B;AAC7B,+CAA6B"}

package/lib/models.d.ts

@@ -12,6 +12,9 @@ export declare type WidgetSavedData = {
 export declare type SavedWidgets = {
     [selector: string]: WidgetSavedData | undefined;
 };
+export declare type Errors = {
+    [selector: string]: string;
+};
 export declare type SavedForms = {
     [selector: string]: FormObject;
 };
@@ -33,6 +36,7 @@ export declare type PassedFormProps<WidgetData = ReturnedDictType> = {
     widgetVariants?: WidgetVariantType[];
     currentPath: string;
     widgets?: SavedWidgets;
+    errors?: Errors;
     widgetData?: WidgetData;
     components: {
         ArrayField: FieldComponent;

package/lib/outsideUse.d.ts

@@ -0,0 +1,6 @@
+import { PassedFormProps } from "./models";
+export declare const getWidgetFromProps: (props: PassedFormProps) => {
+    data: any;
+    widget: import("./models").WidgetType;
+} | undefined;
+export declare const getFieldErrorsFromProps: (props: PassedFormProps) => string | undefined;

package/lib/outsideUse.js

@@ -0,0 +1,45 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFieldErrorsFromProps = exports.getWidgetFromProps = void 0;
+var getWidgetFromProps = function (props) {
+    var _a, _b;
+    var w = (_a = props.widgets) === null || _a === void 0 ? void 0 : _a[props.currentPath];
+    var FoundBasicWidget = props.widgetComponents.find(function (wc) { return wc.name === (w === null || w === void 0 ? void 0 : w.widget); });
+    if (!FoundBasicWidget) {
+        var widgetVariant_1 = (_b = props.widgetVariants) === null || _b === void 0 ? void 0 : _b.find(function (wv) { return wv.name === (w === null || w === void 0 ? void 0 : w.widget); });
+        if (!widgetVariant_1) {
+            return;
+        }
+        var FoundVariantWidget = props.widgetComponents.find(function (wc) { return wc.name === widgetVariant_1.widget; });
+        if (!FoundVariantWidget) {
+            return;
+        }
+        return {
+            data: __assign({ widget: widgetVariant_1.widget }, widgetVariant_1.data),
+            widget: FoundVariantWidget,
+        };
+    }
+    return {
+        data: w,
+        widget: FoundBasicWidget,
+    };
+};
+exports.getWidgetFromProps = getWidgetFromProps;
+var getFieldErrorsFromProps = function (props) {
+    var _a;
+    var e = (_a = props.errors) === null || _a === void 0 ? void 0 : _a[props.currentPath];
+    return e;
+};
+exports.getFieldErrorsFromProps = getFieldErrorsFromProps;
+//# sourceMappingURL=outsideUse.js.map

package/lib/outsideUse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outsideUse.js","sourceRoot":"","sources":["../src/outsideUse.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;AAEO,IAAM,kBAAkB,GAAG,UAAC,KAAsB;;IACrD,IAAM,CAAC,GAAG,MAAA,KAAK,CAAC,OAAO,0CAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC7C,IAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,IAAI,MAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM,CAAA,EAArB,CAAqB,CAAC,CAAC;IACpF,IAAI,CAAC,gBAAgB,EAAE;QACnB,IAAM,eAAa,GAAG,MAAA,KAAK,CAAC,cAAc,0CAAE,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,IAAI,MAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM,CAAA,EAArB,CAAqB,CAAC,CAAC;QAChF,IAAI,CAAC,eAAa,EAAE;YAChB,OAAO;SACV;QACD,IAAM,kBAAkB,GAAG,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,IAAI,KAAK,eAAa,CAAC,MAAM,EAAhC,CAAgC,CAAC,CAAC;QACjG,IAAI,CAAC,kBAAkB,EAAE;YACrB,OAAO;SACV;QACD,OAAO;YACH,IAAI,aACA,MAAM,EAAE,eAAa,CAAC,MAAM,IACzB,eAAa,CAAC,IAAI,CACxB;YACD,MAAM,EAAE,kBAAkB;SAC7B,CAAC;KACL;IACD,OAAO;QACH,IAAI,EAAE,CAAC;QACP,MAAM,EAAE,gBAAgB;KAC3B,CAAC;AACN,CAAC,CAAC;AAxBW,QAAA,kBAAkB,sBAwB7B;AACK,IAAM,uBAAuB,GAAG,UAAC,KAAsB;;IAC1D,IAAM,CAAC,GAAG,MAAA,KAAK,CAAC,MAAM,0CAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AAHW,QAAA,uBAAuB,2BAGlC"}

package/lib/renderer/fields.js

@@ -15,11 +15,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fields = void 0;
+var outsideUse_1 = require("../outsideUse");
 var graphql_js_tree_1 = require("graphql-js-tree");
 var react_1 = __importDefault(require("react"));
 var Fields = function (props) {
-    var _a, _b;
-    var nodes = props.nodes, widgetComponents = props.widgetComponents, f = props.f, widgets = props.widgets, widgetVariants = props.widgetVariants, _c = props.components, ArrayField = _c.ArrayField, ObjectField = _c.ObjectField;
+    var nodes = props.nodes, f = props.f, _a = props.components, ArrayField = _a.ArrayField, ObjectField = _a.ObjectField;
     var seekNode = nodes.find(function (n) { return n.name === (0, graphql_js_tree_1.getTypeName)(f.type.fieldType); });
     var isInput = (seekNode === null || seekNode === void 0 ? void 0 : seekNode.data.type) === graphql_js_tree_1.TypeDefinition.InputObjectTypeDefinition;
     if (f.data.type === graphql_js_tree_1.TypeSystemDefinition.FieldDefinition) {
@@ -31,21 +31,10 @@ var Fields = function (props) {
     if (isInput) {
         return react_1.default.createElement(ObjectField, __assign({}, props, { f: seekNode }));
     }
-    var widget = widgets === null || widgets === void 0 ? void 0 : widgets[props.currentPath];
-    if (widget) {
-        var WidgetComponent = (_a = widgetComponents.find(function (wc) { return wc.name === widget.widget; })) === null || _a === void 0 ? void 0 : _a.Component;
-        if (!WidgetComponent) {
-            var widgetVariant_1 = widgetVariants === null || widgetVariants === void 0 ? void 0 : widgetVariants.find(function (wv) { return wv.name === widget.widget; });
-            if (!widgetVariant_1) {
-                return react_1.default.createElement(react_1.default.Fragment, null);
-            }
-            var WidgetComponent_1 = (_b = widgetComponents.find(function (wc) { return wc.name === widgetVariant_1.widget; })) === null || _b === void 0 ? void 0 : _b.Component;
-            if (!WidgetComponent_1) {
-                return react_1.default.createElement(react_1.default.Fragment, null);
-            }
-            return (react_1.default.createElement(WidgetComponent_1, __assign({}, props, { widgetData: __assign({ widget: widgetVariant_1.widget }, widgetVariant_1.data) })));
-        }
-        return react_1.default.createElement(WidgetComponent, __assign({}, props, { widgetData: widget }));
+    var w = (0, outsideUse_1.getWidgetFromProps)(props);
+    if (w) {
+        var data = w.data, Component = w.widget.Component;
+        return react_1.default.createElement(Component, __assign({}, props, { widgetData: data }));
     }
     return react_1.default.createElement(ScalarField, __assign({}, props));
 };

package/lib/renderer/fields.js.map

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

package/package.json

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

package/src/index.tsx

@@ -4,3 +4,4 @@ export * from '@/FormDisplayer';
 export * from '@/createWidget';
 export * from '@/renderer';
 export * from '@/FormToCode';
+export * from '@/outsideUse';

package/src/models.ts

@@ -13,6 +13,10 @@ export type WidgetSavedData = {
 export type SavedWidgets = {
     [selector: string]: WidgetSavedData | undefined;
 };
+export type Errors = {
+    [selector: string]: string;
+};
+
 export type SavedForms = {
     [selector: string]: FormObject;
 };
@@ -37,6 +41,7 @@ export type PassedFormProps<WidgetData = ReturnedDictType> = {
     widgetVariants?: WidgetVariantType[];
     currentPath: string;
     widgets?: SavedWidgets;
+    errors?: Errors;
     widgetData?: WidgetData;
     components: {
         ArrayField: FieldComponent;

package/src/outsideUse.tsx

@@ -0,0 +1,31 @@
+import { PassedFormProps } from '@/models';
+
+export const getWidgetFromProps = (props: PassedFormProps) => {
+    const w = props.widgets?.[props.currentPath];
+    const FoundBasicWidget = props.widgetComponents.find((wc) => wc.name === w?.widget);
+    if (!FoundBasicWidget) {
+        const widgetVariant = props.widgetVariants?.find((wv) => wv.name === w?.widget);
+        if (!widgetVariant) {
+            return;
+        }
+        const FoundVariantWidget = props.widgetComponents.find((wc) => wc.name === widgetVariant.widget);
+        if (!FoundVariantWidget) {
+            return;
+        }
+        return {
+            data: {
+                widget: widgetVariant.widget,
+                ...widgetVariant.data,
+            },
+            widget: FoundVariantWidget,
+        };
+    }
+    return {
+        data: w,
+        widget: FoundBasicWidget,
+    };
+};
+export const getFieldErrorsFromProps = (props: PassedFormProps) => {
+    const e = props.errors?.[props.currentPath];
+    return e;
+};

package/src/renderer/fields.tsx

@@ -1,14 +1,12 @@
 import { PassedFormProps } from '@/models';
+import { getWidgetFromProps } from '@/outsideUse';
 import { getTypeName, Options, ScalarTypes, TypeDefinition, TypeSystemDefinition } from 'graphql-js-tree';
 import React from 'react';
 
 export const Fields: React.FC<PassedFormProps> = (props) => {
     const {
         nodes,
-        widgetComponents,
         f,
-        widgets,
-        widgetVariants,
         components: { ArrayField, ObjectField },
     } = props;
     const seekNode = nodes.find((n) => n.name === getTypeName(f.type.fieldType));
@@ -22,29 +20,13 @@ export const Fields: React.FC<PassedFormProps> = (props) => {
     if (isInput) {
         return <ObjectField {...props} f={seekNode} />;
     }
-    const widget = widgets?.[props.currentPath];
-    if (widget) {
-        const WidgetComponent = widgetComponents.find((wc) => wc.name === widget.widget)?.Component;
-        if (!WidgetComponent) {
-            const widgetVariant = widgetVariants?.find((wv) => wv.name === widget.widget);
-            if (!widgetVariant) {
-                return <></>;
-            }
-            const WidgetComponent = widgetComponents.find((wc) => wc.name === widgetVariant.widget)?.Component;
-            if (!WidgetComponent) {
-                return <></>;
-            }
-            return (
-                <WidgetComponent
-                    {...props}
-                    widgetData={{
-                        widget: widgetVariant.widget,
-                        ...widgetVariant.data,
-                    }}
-                />
-            );
-        }
-        return <WidgetComponent {...props} widgetData={widget} />;
+    const w = getWidgetFromProps(props);
+    if (w) {
+        const {
+            data,
+            widget: { Component },
+        } = w;
+        return <Component {...props} widgetData={data} />;
     }
     return <ScalarField {...props} />;
 };