eddev 0.2.66 → 0.2.67-beta1

package/routing/remoteProps.js

@@ -1,102 +1,61 @@
 "use strict";
-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 };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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 = {};
+const url_parse_1 = __importDefault(require("url-parse"));
+const qs_1 = __importDefault(require("qs"));
+const pending = {};
+const cache = {};
 function parseURL(url) {
     return (0, url_parse_1.default)(url, qs_1.default.parse);
 }
 exports.parseURL = parseURL;
 function getRouteCacheKey(url) {
-    var parsed = parseURL(url);
+    const parsed = parseURL(url);
     return parsed.pathname.replace(/\/$/, "");
 }
 function setInitialProps(url, data) {
-    var cacheKey = getRouteCacheKey(url);
+    const cacheKey = getRouteCacheKey(url);
     cache[cacheKey] = data;
 }
 exports.setInitialProps = setInitialProps;
 function isSameOrigin(url) {
-    var parsed = parseURL(url);
+    const parsed = parseURL(url);
     return parsed.origin === document.location.origin && !parsed.pathname.match(/\.[a-z0-9]$/i);
 }
 exports.isSameOrigin = isSameOrigin;
-function fetchProps(url) {
-    return __awaiter(this, void 0, void 0, function () {
-        var parsed, cacheKey, requestUrl, promise;
-        return __generator(this, function (_a) {
-            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) {
-                if (data.redirect) {
-                    var redirect_1 = data.redirect;
-                    return fetchProps(redirect_1).then(function (data) {
-                        data.canonical = redirect_1;
-                        return data;
-                    });
-                }
-                delete pending[cacheKey];
-                cache[cacheKey] = data;
+async function fetchProps(url) {
+    const parsed = parseURL(url);
+    const cacheKey = getRouteCacheKey(url);
+    // Cached value?
+    if (cacheKey in cache)
+        return Promise.resolve(cache[cacheKey]);
+    if (cacheKey in pending)
+        return pending[cacheKey];
+    parsed.query["_props"] = "1";
+    const requestUrl = parsed.toString();
+    const promise = fetch(requestUrl)
+        .then((response) => response.json())
+        .then((data) => {
+        if (data.redirect) {
+            const redirect = data.redirect;
+            return fetchProps(redirect).then((data) => {
+                data.canonical = redirect;
                 return data;
             });
-            pending[cacheKey] = promise;
-            return [2 /*return*/, promise];
-        });
+        }
+        delete pending[cacheKey];
+        cache[cacheKey] = data;
+        return data;
     });
+    pending[cacheKey] = promise;
+    return promise;
 }
 exports.fetchProps = fetchProps;
 function hasCachedProps(url) {
-    var cacheKey = getRouteCacheKey(url);
+    const cacheKey = getRouteCacheKey(url);
     // Cached value?
     return !!cache[cacheKey];
 }

package/routing/routing.d.ts

@@ -2,23 +2,23 @@ import { ReactNode, PropsWithChildren } from "react";
 import { APropsWithoutRef } from "react-html-props";
 import URLParse from "url-parse";
 import { RouteData } from "./remoteProps";
-declare type RouteItem = URLParse<any> & {
+type RouteItem = URLParse<any> & {
     data?: RouteData;
 };
-declare type AnyPromise = Promise<any>;
-declare type MatchResult = boolean | string;
-declare type RouteStatus = "leaving" | "parent-leaving" | "active" | "inactive";
-declare type RouteContextConfig = {
+type AnyPromise = Promise<any>;
+type MatchResult = boolean | string;
+type RouteStatus = "leaving" | "parent-leaving" | "active" | "inactive";
+type RouteContextConfig = {
     debugName?: string;
     match?(next: RouteItem): MatchResult;
     beforeLeave?(current: RouteItem, next: RouteItem, parentIsLeaving: boolean): AnyPromise | undefined;
     onChange?(route: RouteItem, status: RouteStatus): void;
 };
-declare type ContextSubscriber = (item: RouteItem, status: RouteStatus) => void;
-declare type ForkOptions = {
+type ContextSubscriber = (item: RouteItem, status: RouteStatus) => void;
+type ForkOptions = {
     isSwitch?: boolean;
 };
-declare type RouteContextType = {
+type RouteContextType = {
     parent?: RouteContextType;
     status: RouteStatus;
     loading?: {
@@ -44,12 +44,12 @@ declare type RouteContextType = {
 };
 export declare function useRoute(): RouteItem;
 export declare function useRouter(): RouteContextType | undefined;
-export declare type RouteProps = RouteContextConfig & {
+export type RouteProps = RouteContextConfig & {
     children: ReactNode;
 };
-export declare function Route(props: RouteProps): JSX.Element | null;
+export declare function Route(props: RouteProps): import("react/jsx-runtime").JSX.Element | null;
 export declare function createRouteItem(url: string, data: RouteData): RouteItem;
-declare type RouterRootProps = {
+type RouterRootProps = {
     url: string;
     data: RouteData;
     children: ReactNode;
@@ -57,8 +57,8 @@ declare type RouterRootProps = {
     onPreload?: (url: string) => void;
     onNavigated?: (item: RouteItem) => void;
 };
-export declare function RouterRoot(props: RouterRootProps): JSX.Element;
-declare type SwitchProps = {
+export declare function RouterRoot(props: RouterRootProps): import("react/jsx-runtime").JSX.Element;
+type SwitchProps = {
     children: ReactNode | ReactNode[];
 };
 export declare const isInternalPageLink: (href: string) => boolean;
@@ -67,8 +67,8 @@ export declare const Link: import("react").ForwardRefExoticComponent<APropsWitho
 } & {
     className?: string | undefined;
 } & import("react").RefAttributes<HTMLAnchorElement>>;
-export declare function Switch({ children }: SwitchProps): JSX.Element;
+export declare function Switch({ children }: SwitchProps): import("react/jsx-runtime").JSX.Element;
 export declare function RouteItemContext(props: PropsWithChildren<{
     route: RouteItem;
-}>): JSX.Element;
+}>): import("react/jsx-runtime").JSX.Element;
 export {};