eddev 0.1.41 → 0.1.44-beta-2

package/build/get-webpack-config.js

@@ -251,10 +251,11 @@ function getWebpackConfig(opts) {
                             var relative = path_1.default.relative(opts.baseDirectory, file);
                             var name = path_1.default.basename(file).replace(/\.(jsx|tsx|ts|js)$/i, "");
                             var module = JSON.stringify("./" + relative);
-                            var componentName = (0, change_case_1.pascalCase)(name);
+                            var componentName = "View" + (0, change_case_1.pascalCase)(name);
                             return { relative: relative, name: name, module: module, componentName: componentName };
                         });
-                        writeVirtualModule(ALIAS["@manifest/views"], "\n          ".concat(!isServerless && "import loadable from '".concat(require.resolve("@loadable/component"), "';"), "\n          import App from ").concat(JSON.stringify("./views/_app.tsx"), "\n\n          ").concat(isServerless
+                        var useLoadableViews = false;
+                        writeVirtualModule(ALIAS["@manifest/views"], "\n          ".concat(useLoadableViews && "import loadable from '".concat(require.resolve("@loadable/component"), "';"), "\n          import App from ").concat(JSON.stringify("./views/_app.tsx"), "\n\n          ").concat(!useLoadableViews
                             ? files.map(function (_a) {
                                 var componentName = _a.componentName, module = _a.module;
                                 return "import ".concat(componentName, " from ").concat(module);
@@ -262,7 +263,7 @@ function getWebpackConfig(opts) {
                             : "", "\n\n          export { App }\n\n          export default {\n            ").concat(files
                             .map(function (_a) {
                             var relative = _a.relative, componentName = _a.componentName, module = _a.module;
-                            if (!isServerless) {
+                            if (useLoadableViews) {
                                 // In serverless mode, export @loadable components. Script tags will be
                                 // auto-included in output HTML
                                 return "\"".concat(relative, "\": loadable(() => import(").concat(module, "))");

package/build/graphql-codegen/graphql-codegen-queries.js

@@ -219,10 +219,10 @@ module.exports = {
                         // Drill down to the path type
                         var finalResultTypeName_1 = resultTypeName;
                         pageInfo_1.nodesPath.forEach(function (key) {
-                            finalResultTypeName_1 = "Exclude<".concat(finalResultTypeName_1, "[").concat(JSON.stringify(key), "], null>");
+                            finalResultTypeName_1 = "Exclude<".concat(finalResultTypeName_1, "[").concat(JSON.stringify(key), "], undefined | null>");
                         });
                         importUtils["createUseInfiniteQuery"] = true;
-                        hooks[hookName] = "\n              createUseInfiniteQuery<Exclude<".concat(finalResultTypeName_1, "[0], null>, Omit<").concat(variablesTypeName || "undefined", ", 'limit' | 'cursor'>>({\n                name: ").concat(JSON.stringify(name), ",\n                defaultLimit: ").concat(defaultLimit_1, ",\n                paths: ").concat(JSON.stringify(pageInfo_1), "\n              })\n            ");
+                        hooks[hookName] = "\n              createUseInfiniteQuery<Exclude<".concat(finalResultTypeName_1, "[0], undefined | null>, Omit<").concat(variablesTypeName || "undefined", ", 'limit' | 'cursor'>>({\n                name: ").concat(JSON.stringify(name), ",\n                defaultLimit: ").concat(defaultLimit_1, ",\n                paths: ").concat(JSON.stringify(pageInfo_1), "\n              })\n            ");
                     }
                 });
             }

package/build/workers/codegen-worker-script.js

@@ -293,12 +293,18 @@ function beginWork(opts) {
                                     },
                                     config: {
                                         // maybeValue: "T",
-                                        avoidOptionals: true,
+                                        avoidOptionals: {
+                                            field: true,
+                                            inputValue: false,
+                                            object: true,
+                                            defaultValue: true,
+                                        },
                                         // exportFragmentSpreadSubTypes: true,
                                         inlineFragmentTypes: "combine",
                                         onlyOperationTypes: true,
                                         skipTypename: true,
                                         preResolveTypes: true,
+                                        maybeValue: "T | null",
                                     },
                                 },
                                 "types.views.ts": {

package/entry/entry.monolith.dev.js

@@ -9,7 +9,14 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  * It also assumes that it's being run from a theme directory in WordPress, and
  * that it's not being run in the Admin panel, but the user may be logged in.
  */
-var react_dom_1 = require("react-dom");
+var react_dom_1 = __importDefault(require("react-dom"));
 var BrowserRouter_1 = require("../components/BrowserRouter");
 var Root_1 = __importDefault(require("./Root"));
-(0, react_dom_1.render)((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0), document.getElementById("root"));
+// @ts-ignore
+if (react_dom_1.default.createRoot) {
+    // @ts-ignore
+    react_dom_1.default.createRoot(document.getElementById("root")).render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0));
+}
+else {
+    react_dom_1.default.render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0), document.getElementById("root"));
+}

package/entry/entry.monolith.prod.js

@@ -9,7 +9,15 @@ var jsx_runtime_1 = require("react/jsx-runtime");
  * It also assumes that it's being run from a theme directory in WordPress, and
  * that it's not being run in the Admin panel, but the user may be logged in.
  */
-var react_dom_1 = require("react-dom");
+// @ts-ignore
+var react_dom_1 = __importDefault(require("react-dom"));
 var BrowserRouter_1 = require("../components/BrowserRouter");
 var Root_1 = __importDefault(require("./Root"));
-(0, react_dom_1.render)((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0), document.getElementById("root"));
+// @ts-ignore
+if (react_dom_1.default.createRoot) {
+    // @ts-ignore
+    react_dom_1.default.createRoot(document.getElementById("root")).render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0));
+}
+else {
+    react_dom_1.default.render((0, jsx_runtime_1.jsx)(BrowserRouter_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(Root_1.default, {}, void 0) }, void 0), document.getElementById("root"));
+}

package/gravityforms/GravityForm.d.ts

@@ -0,0 +1,2 @@
+import type { GravityFormProps } from "./GravityFormDynamic";
+export declare function GravityForm(props: GravityFormProps): JSX.Element;

package/gravityforms/GravityForm.js

@@ -0,0 +1,33 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GravityForm = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = require("react");
+var react_2 = require("react");
+function GravityForm(props) {
+    var _a = (0, react_1.useState)(null), FormComponent = _a[0], setFormComponent = _a[1];
+    (0, react_2.useEffect)(function () {
+        Promise.resolve().then(function () { return __importStar(require("./GravityFormDynamic")); }).then(function (module) { return setFormComponent(module.GravityFormDynamic); });
+    });
+    return (0, jsx_runtime_1.jsx)("div", {}, void 0);
+}
+exports.GravityForm = GravityForm;

package/gravityforms/GravityFormDynamic.d.ts

@@ -0,0 +1,7 @@
+import type { GravityFormData } from "./gravity-forms";
+declare type Props = {
+    form: GravityFormData;
+};
+export declare type GravityFormProps = Props;
+export declare function GravityFormDynamic(): void;
+export {};

package/gravityforms/GravityFormDynamic.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GravityFormDynamic = void 0;
+function GravityFormDynamic() { }
+exports.GravityFormDynamic = GravityFormDynamic;

package/gravityforms/gravity-forms.d.ts

@@ -0,0 +1,16 @@
+export declare type GravityFormsField = {
+    type: string;
+    id: number;
+    label: string;
+    isRequired: boolean;
+} & {
+    [key: string]: any;
+};
+export declare type GravityFormData = {
+    id: number;
+    fields: GravityFormsField[];
+    title: string;
+    button: {
+        text: string;
+    };
+};

package/gravityforms/gravity-forms.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/gravityforms/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./useGravityForm";
+export * from "./gravity-forms";

package/gravityforms/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./useGravityForm"), exports);
+__exportStar(require("./gravity-forms"), exports);

package/gravityforms/useGravityForm.d.ts

@@ -0,0 +1,30 @@
+import { GravityFormsField } from ".";
+import { GravityFormData } from "./gravity-forms";
+declare type Options = {
+    form: GravityFormData;
+};
+export declare type GravityFormsFieldState<T = any> = GravityFormsField & {
+    value: T | undefined;
+    error: string | undefined;
+    set(value: T | undefined): void;
+};
+export declare function useGravityForm(opts: Options): {
+    fields: GravityFormsFieldState<any>[];
+    submit(): void;
+    updateField(id: number, value: any): void;
+    submitting: boolean;
+    complete: boolean;
+    successMessage: string | null;
+    mainError: string | null;
+    hasErrors: boolean;
+    values: {
+        [key: number]: any;
+    };
+    errors: {
+        [key: number]: string | undefined;
+    };
+    validity: {
+        [key: number]: boolean;
+    };
+};
+export {};

package/gravityforms/useGravityForm.js

@@ -0,0 +1,181 @@
+"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);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useGravityForm = void 0;
+var react_1 = require("react");
+var react_2 = require("react");
+var react_3 = require("react");
+var reducer = function (state, action) {
+    var _a, _b, _c;
+    switch (action.type) {
+        case "field":
+            return __assign(__assign({}, state), { errors: __assign(__assign({}, state.errors), (_a = {}, _a[action.id] = undefined, _a)), values: __assign(__assign({}, state.values), (_b = {}, _b[action.id] = action.value, _b)) });
+        case "submitting":
+            return __assign(__assign({}, state), { errors: {}, validity: {}, hasErrors: false, submitting: true });
+        case "success":
+            return __assign(__assign({}, state), { submitting: false, complete: true, errors: {}, validity: {}, hasErrors: false, successMessage: action.message });
+        case "mainError":
+            return __assign(__assign({}, state), { submitting: false, hasErrors: true, mainError: action.message });
+        case "errors":
+            return __assign(__assign({}, state), { submitting: false, hasErrors: true, errors: action.errors });
+        case "clearError":
+            return __assign(__assign({}, state), { submitting: false, errors: __assign(__assign({}, state.errors), (_c = {}, _c[action.id] = undefined, _c)) });
+        default:
+            throw new Error("Unknown GravityForms action ".concat(JSON.stringify(action)));
+    }
+    return state;
+};
+var initializer = function (form) {
+    return {
+        submitting: false,
+        mainError: null,
+        complete: false,
+        successMessage: null,
+        hasErrors: false,
+        values: {},
+        errors: {},
+        validity: {},
+    };
+};
+function useGravityForm(opts) {
+    var form = opts.form;
+    var _a = (0, react_3.useReducer)(reducer, form, initializer), state = _a[0], dispatch = _a[1];
+    var fields = form.fields.map(function (field) { return (__assign(__assign({}, field), { value: state.values[field.id], error: state.errors[field.id], set: function (value) {
+            dispatch({ type: "field", id: field.id, value: value });
+        } })); });
+    var _b = (0, react_2.useState)(null), submitter = _b[0], setSubmitter = _b[1];
+    (0, react_1.useEffect)(function () {
+        var cancelled = false;
+        setSubmitter({
+            submit: function (state) {
+                dispatch({ type: "submitting" });
+                submit(form, state).then(function (result) {
+                    console.log("RESULT", result);
+                    if (cancelled)
+                        return;
+                    if (result.success) {
+                        dispatch({ type: "success", message: result.successMessage || "" });
+                    }
+                    else if (result.errors) {
+                        dispatch({ type: "errors", errors: result.errors });
+                    }
+                    else if (result.mainError) {
+                        dispatch({ type: "mainError", message: result.mainError });
+                    }
+                });
+            },
+        });
+        return function () {
+            cancelled = true;
+        };
+    }, []);
+    return __assign(__assign({}, state), { fields: fields, submit: function () {
+            submitter === null || submitter === void 0 ? void 0 : submitter.submit(state);
+        }, updateField: function (id, value) {
+            dispatch({ type: "field", id: id, value: value });
+        } });
+}
+exports.useGravityForm = useGravityForm;
+function prepareValuesPayload(form, state, data) {
+    for (var _i = 0, _a = form.fields; _i < _a.length; _i++) {
+        var field = _a[_i];
+        var value = state.values[field.id];
+        data["input_" + field.id] = value;
+    }
+    return data;
+}
+function submit(form, state) {
+    return __awaiter(this, void 0, void 0, function () {
+        var url, params, result, payload, err_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 3, , 4]);
+                    console.log("Submitting", { form: form, state: state });
+                    url = "/wp-json/ed/v1/gf/submit";
+                    params = {
+                        formID: form.id,
+                        values: prepareValuesPayload(form, state, {}),
+                    };
+                    return [4 /*yield*/, fetch(url, {
+                            method: "POST",
+                            headers: {
+                                "Content-type": "application/json",
+                            },
+                            credentials: "include",
+                            body: JSON.stringify(params),
+                        })];
+                case 1:
+                    result = _a.sent();
+                    return [4 /*yield*/, result.json()];
+                case 2:
+                    payload = _a.sent();
+                    if (!payload.is_valid) {
+                        return [2 /*return*/, __assign(__assign({}, payload), { success: false, errors: payload.validation_messages })];
+                    }
+                    else if (payload.is_valid) {
+                        return [2 /*return*/, __assign(__assign({}, payload), { success: true, successMessage: payload.confirmation_message })];
+                    }
+                    else {
+                        console.error("Not sure what to do with GF response", payload);
+                        return [2 /*return*/, __assign({}, payload)];
+                    }
+                    return [3 /*break*/, 4];
+                case 3:
+                    err_1 = _a.sent();
+                    console.error(err_1);
+                    return [2 /*return*/, {
+                            success: false,
+                            mainError: "An error occurred while submitting this form. Please contact us directly if the issue persists.",
+                        }];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}

package/hooks/queryUtils.d.ts

@@ -34,9 +34,9 @@ declare type InfiniteQueryHookReturn<TItem, TVars> = {
     loadingMore: boolean;
     errors?: GraphQLError[];
     items?: TItem[];
-    hasMore?: boolean;
-    canLoadMore?: boolean;
-    refresh: (vars?: TVars) => void;
+    cursor?: string;
+    hasMore: boolean;
+    refresh: () => void;
     loadMore: () => void;
 };
 declare type InfiniteQueryHasAdditionalVars<TVars> = Exclude<keyof TVars, "limit" | "cursor"> extends never ? false : true;

package/hooks/queryUtils.js

@@ -112,17 +112,25 @@ function createUseInfiniteQuery(init) {
         var _d = (0, react_1.useState)(false), hasMore = _d[0], setHasMore = _d[1];
         var _e = (0, react_1.useState)(true), isLoadingMore = _e[0], setIsLoadingMore = _e[1];
         var _f = (0, react_1.useState)([]), items = _f[0], setItems = _f[1];
-        var _g = (0, swr_1.default)([
+        var _g = (0, react_1.useState)(vars), varPayload = _g[0], setVarPayload = _g[1];
+        var _h = (0, swr_1.default)([
             init.name,
-            JSON.stringify(__assign(__assign({}, (vars || {})), { cursor: activeCursor })),
+            JSON.stringify(__assign(__assign({}, (varPayload || {})), { cursor: activeCursor })),
         ], fetcherGET, {
             revalidateIfStale: false,
             revalidateOnFocus: false,
             revalidateOnReconnect: false,
-        }), payload = _g.data, isValidating = _g.isValidating, error = _g.error, mutate = _g.mutate;
+        }), payload = _h.data, isValidating = _h.isValidating, error = _h.error, mutate = _h.mutate;
+        (0, react_1.useEffect)(function () {
+            setItems([]);
+            setIsLoadingMore(true);
+            setErrors(undefined);
+            setHasMore(false);
+            setActiveCursor(undefined);
+            setVarPayload(vars);
+        }, [JSON.stringify(vars)]);
         (0, react_1.useEffect)(function () {
             if (payload) {
-                console.log("Got payload", payload);
                 setIsLoadingMore(false);
                 if (payload.errors) {
                     setErrors(payload.errors);
@@ -135,6 +143,7 @@ function createUseInfiniteQuery(init) {
                     setErrors(undefined);
                     setNextCursor(nextCursor_1);
                     setHasMore(hasMore_1);
+                    setIsLoadingMore(false);
                     setItems(function () { return __spreadArray(__spreadArray([], items, true), nodes_1, true); });
                 }
             }
@@ -143,6 +152,7 @@ function createUseInfiniteQuery(init) {
             loading: isValidating && !items.length,
             loadingMore: isLoadingMore,
             items: items,
+            cursor: activeCursor,
             errors: error ? [error] : errors,
             refresh: function () {
                 setErrors(undefined);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.1.41",
+  "version": "0.1.44-beta-2",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -42,12 +42,12 @@
     "@graphql-tools/load": "^7.4.1",
     "@graphql-tools/url-loader": "^7.1.0",
     "@loadable/babel-plugin": "^5.13.2",
-    "@loadable/component": "^5.15.0",
-    "@loadable/webpack-plugin": "^5.15.1",
+    "@loadable/component": "^5.15.2",
+    "@loadable/webpack-plugin": "^5.15.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
-    "@stitches/core": "^1.2.5",
-    "@stitches/react": "^1.2.5",
+    "@stitches/core": "^1.2.6",
+    "@stitches/react": "^1.2.6",
     "autoprefixer": "^10.3.4",
     "babel-loader": "^8.2.2",
     "chalk": "^4.1.2",
@@ -87,7 +87,7 @@
     "zustand": "^3.5.10"
   },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0-rc.0",
+    "react-dom": "^18.0.0-rc.0"
   }
 }