eddev 0.1.39 → 0.1.42

package/blocks/ContentBlocks.d.ts

@@ -16,8 +16,7 @@ declare type BlocksContext = {
     current: ContentBlock;
 };
 export declare const BlocksContext: import("react").Context<BlocksContext | undefined>;
-declare type Props = {
-    blocks: ContentBlock[];
+export declare type ContentBlocksSettings = {
     wrapBlock?: (child: ReactElement, ctx: BlocksContext) => ReactElement;
     spacer?: (ctx: {
         ancestors: ContentBlock[];
@@ -26,6 +25,9 @@ declare type Props = {
         next: ContentBlock | null;
     }) => ReactElement | null;
 };
+declare type Props = {
+    blocks: ContentBlock[];
+} & ContentBlocksSettings;
 export declare type GenericBlockProps = {
     innerHTML?: string;
     innerContent?: string[];

package/blocks/inlineEditing.d.ts

@@ -1,4 +1,5 @@
 import { ElementType } from "react";
+import { ContentBlocksSettings } from ".";
 declare type PropTypes<T extends ElementType> = {
     /** The 'key' of this editable text value */
     id: string;
@@ -18,6 +19,6 @@ declare type InnerBlocksProps = {
     templateLock?: any;
     template?: any;
     renderAppender?: any;
-};
+} & ContentBlocksSettings;
 export declare function InnerBlocks(props: InnerBlocksProps): JSX.Element;
 export {};

package/blocks/inlineEditing.js

@@ -74,7 +74,7 @@ function InnerBlocks(props) {
     }
     else {
         var blocks = (0, blockAttributes_1.useInnerBlocks)();
-        return (0, jsx_runtime_1.jsx)(ContentBlocks_1.ContentBlocks, { blocks: blocks }, void 0);
+        return (0, jsx_runtime_1.jsx)(ContentBlocks_1.ContentBlocks, { blocks: blocks, spacer: props.spacer, wrapBlock: props.wrapBlock }, void 0);
     }
 }
 exports.InnerBlocks = InnerBlocks;

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/components/BrowserRouter.js

@@ -87,16 +87,6 @@ function BrowserRouter(props) {
                 if (!pending.popped) {
                     history.replaceState({ scrollPosition: (_b = document.scrollingElement) === null || _b === void 0 ? void 0 : _b.scrollTop }, "", document.location.href);
                     history.pushState({}, "", pending.url);
-                    // if (document.scrollingElement) {
-                    //   console.log("Scroll to top")
-                    //   document.scrollingElement.scrollTop = 0
-                    // }
-                }
-                else {
-                    // if (document.scrollingElement) {
-                    //   console.log("Scroll to", pending.scrollPosition)
-                    //   document.scrollingElement.scrollTop = pending.scrollPosition || 0
-                    // }
                 }
             };
             if (view && view.preload) {
@@ -112,11 +102,10 @@ function BrowserRouter(props) {
             cancelled = true;
         };
     }, [pending]);
-    console.log("Passing", url, data);
-    var _c = (0, react_1.useState)(null), scrollPosition = _c[0], setScrollPosition = _c[1];
+    var _c = (0, react_1.useState)({ value: null }), scrollPosition = _c[0], setScrollPosition = _c[1];
     (0, react_1.useEffect)(function () {
-        if (document.scrollingElement && typeof scrollPosition === "number") {
-            document.scrollingElement.scrollTop = scrollPosition;
+        if (document.scrollingElement && typeof scrollPosition.value === "number") {
+            document.scrollingElement.scrollTop = scrollPosition.value;
         }
     }, [scrollPosition]);
     return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: url, data: data, onNavigateRequest: function (url) {
@@ -127,10 +116,10 @@ function BrowserRouter(props) {
             }
         }, onNavigated: function () {
             if (pending && typeof pending.scrollPosition === "number") {
-                setScrollPosition(pending.scrollPosition);
+                setScrollPosition({ value: pending.scrollPosition });
             }
             else {
-                setScrollPosition(0);
+                setScrollPosition({ value: 0 });
             }
         } }, { children: props.children }), void 0));
 }

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);
@@ -143,6 +151,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.39",
+  "version": "0.1.42",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/routing/remoteProps.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasCachedProps = exports.fetchProps = exports.isSameOrigin = exports.setInitialProps = exports.parseURL = void 0;
 var url_parse_1 = __importDefault(require("url-parse"));
 var qs_1 = __importDefault(require("qs"));
+var pending = {};
 var cache = {};
 function parseURL(url) {
     return (0, url_parse_1.default)(url, qs_1.default.parse);
@@ -63,26 +64,26 @@ function isSameOrigin(url) {
 exports.isSameOrigin = isSameOrigin;
 function fetchProps(url) {
     return __awaiter(this, void 0, void 0, function () {
-        var parsed, cacheKey, requestUrl, response, data;
+        var parsed, cacheKey, requestUrl, promise;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    parsed = parseURL(url);
-                    cacheKey = getRouteCacheKey(url);
-                    // Cached value?
-                    if (cache[cacheKey])
-                        return [2 /*return*/, Promise.resolve(cache[cacheKey])];
-                    parsed.query["_props"] = "1";
-                    requestUrl = parsed.toString();
-                    return [4 /*yield*/, fetch(requestUrl)];
-                case 1:
-                    response = _a.sent();
-                    return [4 /*yield*/, response.json()];
-                case 2:
-                    data = _a.sent();
-                    cache[cacheKey] = data;
-                    return [2 /*return*/, data];
-            }
+            parsed = parseURL(url);
+            cacheKey = getRouteCacheKey(url);
+            // Cached value?
+            if (cacheKey in cache)
+                return [2 /*return*/, Promise.resolve(cache[cacheKey])];
+            if (cacheKey in pending)
+                return [2 /*return*/, pending[cacheKey]];
+            parsed.query["_props"] = "1";
+            requestUrl = parsed.toString();
+            promise = fetch(requestUrl)
+                .then(function (response) { return response.json(); })
+                .then(function (data) {
+                delete pending[cacheKey];
+                cache[cacheKey] = data;
+                return data;
+            });
+            pending[cacheKey] = promise;
+            return [2 /*return*/, promise];
         });
     });
 }

package/routing/routing.js

@@ -213,15 +213,7 @@ function useForkedRouter(conf, opts) {
     var ctx = (0, react_1.useMemo)(function () {
         return parent.fork(conf, opts);
     }, [parent]);
-    // useEffect(() => {
-    //   if (onChange) {
-    //     return ctx.subscribe(onChange);
-    //   }
-    // }, [ctx, onChange]);
     Object.assign(ctx.config, conf);
-    // ctx.config.match = conf.match;
-    // ctx.config.beforeLeave = conf.beforeLeave;
-    // ctx.config.beforeLeave = conf.beforeLeave;
     (0, react_1.useEffect)(function () {
         return function () { return ctx.dispose(); };
     }, [ctx]);