@modern-js/runtime 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/js/modern/core/loader/loaderManager.js

@@ -1,82 +1,92 @@
-import invariant from 'invariant';
-/**
- * Calc id from string or object
- */
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import invariant from "invariant";
 const createGetId = () => {
-  const idCache = new Map();
-  return objectId => {
+  const idCache = /* @__PURE__ */ new Map();
+  return (objectId) => {
     const cachedId = idCache.get(objectId);
     if (cachedId) {
       return cachedId;
     }
-
-    // WARNING: id should be unique after serialize.
     const id = JSON.stringify(objectId);
-    invariant(id, 'params should be not null value');
+    invariant(id, "params should be not null value");
     idCache.set(objectId, id);
     return id;
   };
 };
-export let LoaderStatus;
-(function (LoaderStatus) {
-  LoaderStatus[LoaderStatus["idle"] = 0] = "idle";
-  LoaderStatus[LoaderStatus["loading"] = 1] = "loading";
-  LoaderStatus[LoaderStatus["fulfilled"] = 2] = "fulfilled";
-  LoaderStatus[LoaderStatus["rejected"] = 3] = "rejected";
-})(LoaderStatus || (LoaderStatus = {}));
+var LoaderStatus = /* @__PURE__ */ ((LoaderStatus2) => {
+  LoaderStatus2[LoaderStatus2["idle"] = 0] = "idle";
+  LoaderStatus2[LoaderStatus2["loading"] = 1] = "loading";
+  LoaderStatus2[LoaderStatus2["fulfilled"] = 2] = "fulfilled";
+  LoaderStatus2[LoaderStatus2["rejected"] = 3] = "rejected";
+  return LoaderStatus2;
+})(LoaderStatus || {});
 const createLoader = (id, initialData = {
   loading: false,
   reloading: false,
-  data: undefined,
-  error: undefined
+  data: void 0,
+  error: void 0
 }, loaderFn, skip = false) => {
   let promise;
-  let status = LoaderStatus.idle;
-  let {
-    data,
-    error
-  } = initialData;
+  let status = 0 /* idle */;
+  let { data, error } = initialData;
   let hasLoaded = false;
-  const handlers = new Set();
-  const load = async () => {
+  const handlers = /* @__PURE__ */ new Set();
+  const load = () => __async(void 0, null, function* () {
     if (skip) {
       return promise;
     }
-    if (status === LoaderStatus.loading) {
+    if (status === 1 /* loading */) {
       return promise;
     }
-    status = LoaderStatus.loading;
+    status = 1 /* loading */;
     notify();
-    promise = loaderFn().then(value => {
+    promise = loaderFn().then((value) => {
       data = value;
       error = null;
-      status = LoaderStatus.fulfilled;
-    }).catch(e => {
+      status = 2 /* fulfilled */;
+    }).catch((e) => {
       error = e;
       data = null;
-      status = LoaderStatus.rejected;
+      status = 3 /* rejected */;
     }).finally(() => {
       promise = null;
       hasLoaded = true;
       notify();
     });
     return promise;
-  };
+  });
   const getResult = () => ({
-    loading: !hasLoaded && status === LoaderStatus.loading,
-    reloading: hasLoaded && status === LoaderStatus.loading,
+    loading: !hasLoaded && status === 1 /* loading */,
+    reloading: hasLoaded && status === 1 /* loading */,
     data,
     error: error instanceof Error ? `${error.message}` : error,
-    // redundant fields for ssr log
     _error: error
   });
   const notify = () => {
-    // don't iterate handlers directly, since it could be modified during iteration
-    [...handlers].forEach(handler => {
+    [...handlers].forEach((handler) => {
       handler(status, getResult());
     });
   };
-  const onChange = handler => {
+  const onChange = (handler) => {
     handlers.add(handler);
     return () => {
       handlers.delete(handler);
@@ -93,75 +103,63 @@ const createLoader = (id, initialData = {
     load
   };
 };
-/**
- * Create loaders manager. It's returned instance will add to context
- * @param initialDataMap used to initialing loader data
- */
-export const createLoaderManager = (initialDataMap, managerOptions = {}) => {
-  const {
-    skipStatic = false,
-    skipNonStatic = false
-  } = managerOptions;
-  const loadersMap = new Map();
+const createLoaderManager = (initialDataMap, managerOptions = {}) => {
+  const { skipStatic = false, skipNonStatic = false } = managerOptions;
+  const loadersMap = /* @__PURE__ */ new Map();
   const getId = createGetId();
   const add = (loaderFn, loaderOptions) => {
     const id = getId(loaderOptions.params);
     let loader = loadersMap.get(id);
-
-    // private property for opting out loader cache, maybe change in future
     const cache = loaderOptions._cache;
     if (!loader || cache === false) {
-      // ignore non-static loader on static phase
       const ignoreNonStatic = skipNonStatic && !loaderOptions.static;
-
-      // ignore static loader on non-static phase
       const ignoreStatic = skipStatic && loaderOptions.static;
       const skipExec = ignoreNonStatic || ignoreStatic;
-      loader = createLoader(id, typeof initialDataMap[id] !== 'undefined' ? initialDataMap[id] : {
-        data: loaderOptions.initialData
-      }, loaderFn,
-      // Todo whether static loader is exec when CSR
-      skipExec);
+      loader = createLoader(
+        id,
+        typeof initialDataMap[id] !== "undefined" ? initialDataMap[id] : { data: loaderOptions.initialData },
+        loaderFn,
+        skipExec
+      );
       loadersMap.set(id, loader);
     }
     return id;
   };
-  const get = id => loadersMap.get(id);
-
-  // check if there has pending loaders
+  const get = (id) => loadersMap.get(id);
   const hasPendingLoaders = () => {
     for (const loader of loadersMap.values()) {
-      const {
-        promise
-      } = loader;
+      const { promise } = loader;
       if (promise instanceof Promise) {
         return true;
       }
     }
     return false;
   };
-
-  // waiting for all pending loaders to be settled
-  const awaitPendingLoaders = async () => {
+  const awaitPendingLoaders = () => __async(void 0, null, function* () {
     const pendingLoaders = [];
     for (const [id, loader] of loadersMap) {
-      const {
-        promise
-      } = loader;
+      const { promise } = loader;
       if (promise instanceof Promise) {
         pendingLoaders.push([id, loader]);
       }
     }
-    await Promise.all(pendingLoaders.map(item => item[1].promise));
-    return pendingLoaders.reduce((res, [id, loader]) => {
-      res[id] = loader.result;
-      return res;
-    }, {});
-  };
+    yield Promise.all(pendingLoaders.map((item) => item[1].promise));
+    return pendingLoaders.reduce(
+      (res, [id, loader]) => {
+        res[id] = loader.result;
+        return res;
+      },
+      {}
+    );
+  });
   return {
     hasPendingLoaders,
     awaitPendingLoaders,
     add,
     get
   };
-};
+};
+export {
+  LoaderStatus,
+  createLoaderManager
+};

package/dist/js/modern/core/loader/useLoader.js

@@ -1,87 +1,114 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import { useContext, useRef, useMemo, useState, useCallback, useEffect } from 'react';
-import invariant from 'invariant';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import {
+  useContext,
+  useRef,
+  useMemo,
+  useState,
+  useCallback,
+  useEffect
+} from "react";
+import invariant from "invariant";
 import { RuntimeReactContext } from "../../runtime-context";
 import { LoaderStatus } from "./loaderManager";
-const useLoader = (loaderFn, options = {
-  params: undefined
-}) => {
+const useLoader = (loaderFn, options = { params: void 0 }) => {
   const context = useContext(RuntimeReactContext);
   const isSSRRender = Boolean(context.ssr);
-  const {
-    loaderManager
-  } = context;
+  const { loaderManager } = context;
   const loaderRef = useRef();
   const unlistenLoaderChangeRef = useRef(null);
-
-  // SSR render should ignore `_cache` prop
-  if (isSSRRender && Object.prototype.hasOwnProperty.call(options, '_cache')) {
+  if (isSSRRender && Object.prototype.hasOwnProperty.call(options, "_cache")) {
     delete options._cache;
   }
-  const load = useCallback(params => {
-    var _unlistenLoaderChange, _window, _window$_SSR_DATA, _window$_SSR_DATA$dat, _window$_SSR_DATA$dat2, _loaderRef$current2;
-    if (typeof params === 'undefined') {
-      var _loaderRef$current;
-      return (_loaderRef$current = loaderRef.current) === null || _loaderRef$current === void 0 ? void 0 : _loaderRef$current.load();
-    }
-    const id = loaderManager.add(() => {
-      try {
-        const res = loaderFn(context, params);
-        if (res instanceof Promise) {
-          return res;
-        }
-        return Promise.resolve(res);
-      } catch (e) {
-        return Promise.reject(e);
+  const load = useCallback(
+    (params) => {
+      var _a, _b, _c, _d, _e, _f;
+      if (typeof params === "undefined") {
+        return (_a = loaderRef.current) == null ? void 0 : _a.load();
       }
-    }, _objectSpread(_objectSpread({}, options), {}, {
-      params
-    }));
-    loaderRef.current = loaderManager.get(id);
-    // unsubscribe old loader onChange event
-    (_unlistenLoaderChange = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChange === void 0 ? void 0 : _unlistenLoaderChange.call(unlistenLoaderChangeRef);
-    if (isSSRRender) {
-      return undefined;
-    }
-
-    // skip this loader, then try to unlisten loader change
-    if (options.skip) {
-      return undefined;
-    }
-
-    // do not load data again in CSR hydrate stage if SSR data exists
-    if (context._hydration && ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : (_window$_SSR_DATA$dat2 = _window$_SSR_DATA$dat.loadersData[id]) === null || _window$_SSR_DATA$dat2 === void 0 ? void 0 : _window$_SSR_DATA$dat2.error) === null) {
-      return undefined;
-    }
-    const res = loaderRef.current.load();
-    unlistenLoaderChangeRef.current = (_loaderRef$current2 = loaderRef.current) === null || _loaderRef$current2 === void 0 ? void 0 : _loaderRef$current2.onChange((_status, _result) => {
-      setResult(_result);
-      if (_status === LoaderStatus.fulfilled) {
-        var _options$onSuccess;
-        options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, _result.data);
+      const id = loaderManager.add(
+        () => {
+          try {
+            const res2 = loaderFn(context, params);
+            if (res2 instanceof Promise) {
+              return res2;
+            }
+            return Promise.resolve(res2);
+          } catch (e) {
+            return Promise.reject(e);
+          }
+        },
+        __spreadProps(__spreadValues({}, options), {
+          params
+        })
+      );
+      loaderRef.current = loaderManager.get(id);
+      (_b = unlistenLoaderChangeRef.current) == null ? void 0 : _b.call(unlistenLoaderChangeRef);
+      if (isSSRRender) {
+        return void 0;
+      }
+      if (options.skip) {
+        return void 0;
       }
-      if (_status === LoaderStatus.rejected) {
-        var _options$onError;
-        options === null || options === void 0 ? void 0 : (_options$onError = options.onError) === null || _options$onError === void 0 ? void 0 : _options$onError.call(options, _result.error);
+      if (context._hydration && ((_e = (_d = (_c = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _c.data) == null ? void 0 : _d.loadersData[id]) == null ? void 0 : _e.error) === null) {
+        return void 0;
       }
-    });
-    return res;
-  }, [options.skip]);
-  useEffect(() => () => {
-    var _unlistenLoaderChange2;
-    (_unlistenLoaderChange2 = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChange2 === void 0 ? void 0 : _unlistenLoaderChange2.call(unlistenLoaderChangeRef);
-  }, []);
+      const res = loaderRef.current.load();
+      unlistenLoaderChangeRef.current = (_f = loaderRef.current) == null ? void 0 : _f.onChange(
+        (_status, _result) => {
+          var _a2, _b2;
+          setResult(_result);
+          if (_status === LoaderStatus.fulfilled) {
+            (_a2 = options == null ? void 0 : options.onSuccess) == null ? void 0 : _a2.call(options, _result.data);
+          }
+          if (_status === LoaderStatus.rejected) {
+            (_b2 = options == null ? void 0 : options.onError) == null ? void 0 : _b2.call(options, _result.error);
+          }
+        }
+      );
+      return res;
+    },
+    [options.skip]
+  );
+  useEffect(
+    () => () => {
+      var _a;
+      (_a = unlistenLoaderChangeRef.current) == null ? void 0 : _a.call(unlistenLoaderChangeRef);
+    },
+    []
+  );
   useMemo(() => {
-    var _options$params;
-    const p = (_options$params = options.params) !== null && _options$params !== void 0 ? _options$params : loaderFn.id;
-    invariant(typeof p !== 'undefined' && p !== null, 'Params is required in useLoader');
+    var _a;
+    const p = (_a = options.params) != null ? _a : loaderFn.id;
+    invariant(
+      typeof p !== "undefined" && p !== null,
+      "Params is required in useLoader"
+    );
     load(p);
   }, [options.params]);
   const [result, setResult] = useState(loaderRef.current.result);
-  return _objectSpread(_objectSpread({}, result), {}, {
+  return __spreadProps(__spreadValues({}, result), {
     reload: load
   });
 };
-export default useLoader;
+var useLoader_default = useLoader;
+export {
+  useLoader_default as default
+};

package/dist/js/modern/core/plugin.js

@@ -1,9 +1,30 @@
-import { createManager, createPipeline, createAsyncPipeline } from '@modern-js/plugin';
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import {
+  createManager,
+  createPipeline,
+  createAsyncPipeline
+} from "@modern-js/plugin";
 import { createLoaderManager } from "./loader/loaderManager";
 const hoc = createPipeline();
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-
 const provide = createPipeline();
 const client = createAsyncPipeline();
 const server = createAsyncPipeline();
@@ -17,25 +38,21 @@ const runtimeHooks = {
   init,
   pickContext
 };
-
-/** All hooks of runtime plugin. */
-
-export const createRuntime = () => createManager(runtimeHooks);
-
-/**
- * register init hook. It would be revoked both ssr and csr.
- */
+const createRuntime = () => createManager(runtimeHooks);
 const registerInit = (App, _init) => {
   const originalInit = App.init;
-  App.init = async context => {
+  App.init = (context) => __async(void 0, null, function* () {
     if (!context.loaderManager) {
       context.loaderManager = createLoaderManager({});
     }
-    await Promise.all([originalInit === null || originalInit === void 0 ? void 0 : originalInit(context), _init === null || _init === void 0 ? void 0 : _init(context)]);
-  };
+    yield Promise.all([originalInit == null ? void 0 : originalInit(context), _init == null ? void 0 : _init(context)]);
+  });
+};
+const runtime = createRuntime();
+const { createPlugin } = runtime;
+export {
+  createPlugin,
+  createRuntime,
+  registerInit,
+  runtime
 };
-export const runtime = createRuntime();
-export const {
-  createPlugin
-} = runtime;
-export { registerInit };

package/dist/js/modern/document/Body.js

@@ -1,17 +1,23 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import React, { useContext } from 'react';
-import { DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useContext } from "react";
+import {
+  DOCUMENT_CHUNKSMAP_PLACEHOLDER,
+  DOCUMENT_SSRDATASCRIPT_PLACEHOLDER
+} from "./constants";
 import { DocumentStructrueContext } from "./DocumentStructrueContext";
 import { DefaultRoot } from "./Root";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-export function Body(props) {
-  const {
-    hasSetRoot
-  } = useContext(DocumentStructrueContext);
-  const {
-    children
-  } = props;
-  return /*#__PURE__*/_jsxs("body", {
-    children: [hasSetRoot ? null : DefaultRoot, children, `${DOCUMENT_CHUNKSMAP_PLACEHOLDER}`, `${DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`]
+function Body(props) {
+  const { hasSetRoot } = useContext(DocumentStructrueContext);
+  const { children } = props;
+  return /* @__PURE__ */ jsxs("body", {
+    children: [
+      hasSetRoot ? null : /* @__PURE__ */ jsx(DefaultRoot, {}),
+      children,
+      `${DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
+      `${DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
+    ]
   });
-}
+}
+export {
+  Body
+};

package/dist/js/modern/document/DocumentContext.js

@@ -1,6 +1,9 @@
-import React from 'react';
-export const DocumentContext = /*#__PURE__*/React.createContext({
+import React from "react";
+const DocumentContext = React.createContext({
   config: {},
   templateParams: {},
   processEnv: {}
-});
+});
+export {
+  DocumentContext
+};

package/dist/js/modern/document/DocumentStructrueContext.js

@@ -1,7 +1,10 @@
-import React from 'react';
-export const DocumentStructrueContext = /*#__PURE__*/React.createContext({
+import React from "react";
+const DocumentStructrueContext = React.createContext({
   hasSetHead: false,
   hasSetScripts: false,
   hasSetBody: false,
   hasSetRoot: false
-});
+});
+export {
+  DocumentStructrueContext
+};

package/dist/js/modern/document/Head.js

@@ -1,24 +1,25 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import React, { useContext } from 'react';
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useContext } from "react";
 import { DocumentStructrueContext } from "./DocumentStructrueContext";
 import { Scripts } from "./Scripts";
 import { DOCUMENT_META_PLACEHOLDER } from "./constants";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-export function Head(props) {
-  const {
-    hasSetScripts
-  } = useContext(DocumentStructrueContext);
-  const {
-    children
-  } = props;
-  // todo: verify the children
-  return /*#__PURE__*/_jsxs("head", {
-    children: [`${DOCUMENT_META_PLACEHOLDER}`, !hasSetScripts && /*#__PURE__*/_jsx(Scripts, {}), children]
+function Head(props) {
+  const { hasSetScripts } = useContext(DocumentStructrueContext);
+  const { children } = props;
+  return /* @__PURE__ */ jsxs("head", {
+    children: [
+      `${DOCUMENT_META_PLACEHOLDER}`,
+      !hasSetScripts && /* @__PURE__ */ jsx(Scripts, {}),
+      children
+    ]
   });
 }
-export function DefaultHead() {
-  return /*#__PURE__*/_jsx("head", {
+function DefaultHead() {
+  return /* @__PURE__ */ jsx("head", {
     children: `${DOCUMENT_META_PLACEHOLDER}`
   });
-}
+}
+export {
+  DefaultHead,
+  Head
+};