@modern-js/plugin-data-loader 2.4.1-beta.0 → 2.5.0-alpha.0

package/dist/esm/server/index.js

@@ -0,0 +1,176 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    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
+        };
+    }
+};
+import path from "path";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { matchEntry } from "../runtime";
+var server_default = function() {
+    return {
+        name: "@modern-js/plugin-data-loader",
+        setup: function() {
+            return {
+                preparebeforeRouteHandler: function preparebeforeRouteHandler(param) {
+                    var serverRoutes = param.serverRoutes, distDir = param.distDir;
+                    return function() {
+                        var _ref = _asyncToGenerator(function(context) {
+                            var entry, routesPath, _ref, routes, handleRequest;
+                            return __generator(this, function(_state) {
+                                switch(_state.label){
+                                    case 0:
+                                        entry = matchEntry(context.path, serverRoutes);
+                                        if (!entry) {
+                                            throw new Error("Route is not matched");
+                                        }
+                                        routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, "".concat(entry.entryName || MAIN_ENTRY_NAME, "-server-loaders"));
+                                        return [
+                                            4,
+                                            import(routesPath)
+                                        ];
+                                    case 1:
+                                        _ref = _state.sent(), routes = _ref.routes, handleRequest = _ref.handleRequest;
+                                        if (!routes) {
+                                            throw new Error("Missing route info");
+                                            ;
+                                        }
+                                        return [
+                                            2,
+                                            handleRequest({
+                                                serverRoutes: serverRoutes,
+                                                context: context,
+                                                routes: routes
+                                            })
+                                        ];
+                                }
+                            });
+                        });
+                        return function(context) {
+                            return _ref.apply(this, arguments);
+                        };
+                    }();
+                }
+            };
+        }
+    };
+};
+export { server_default as default };

package/dist/{js/modern → esm-node}/cli/create-request.js

@@ -1,26 +1,7 @@
-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 { compile } from "path-to-regexp";
 import { redirect } from "react-router-dom";
 import { LOADER_ID_PARAM, DIRECT_PARAM } from "../common/constants";
+import { parseDeferredReadableStream } from "./data";
 const getRequestUrl = ({
   params,
   request,
@@ -40,25 +21,35 @@ const handleRedirectResponse = (res) => {
   const { headers } = res;
   const location = headers.get("X-Modernjs-Redirect");
   if (location) {
-    return redirect(location);
+    throw redirect(location);
+  }
+  return res;
+};
+const handleDeferredResponse = async (res) => {
+  var _a;
+  if (((_a = res.headers.get("Content-Type")) == null ? void 0 : _a.match(/text\/modernjs-deferred/)) && res.body) {
+    return await parseDeferredReadableStream(res.body);
   }
   return res;
 };
 const createRequest = (routeId, method = "get") => {
-  return (_0) => __async(void 0, [_0], function* ({
+  return async ({
     params,
     request
-  }) {
+  }) => {
     const url = getRequestUrl({ params, request, routeId });
-    const res = yield fetch(url, {
+    let res;
+    res = await fetch(url, {
       method,
       signal: request.signal
     });
     if (!res.ok) {
       throw res;
     }
-    return handleRedirectResponse(res);
-  });
+    res = handleRedirectResponse(res);
+    res = await handleDeferredResponse(res);
+    return res;
+  };
 };
 export {
   createRequest,

package/dist/esm-node/cli/data.js

@@ -0,0 +1,142 @@
+import {
+  UNSAFE_DeferredData as DeferredData,
+  AbortedDeferredError
+} from "@modern-js/utils/remix-router";
+const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
+async function parseDeferredReadableStream(stream) {
+  if (!stream) {
+    throw new Error("parseDeferredReadableStream requires stream argument");
+  }
+  let deferredData;
+  const deferredResolvers = {};
+  try {
+    const sectionReader = readStreamSections(stream);
+    const initialSectionResult = await sectionReader.next();
+    const initialSection = initialSectionResult.value;
+    if (!initialSection) {
+      throw new Error("no critical data");
+    }
+    const criticalData = JSON.parse(initialSection);
+    if (typeof criticalData === "object" && criticalData !== null) {
+      for (const [eventKey, value] of Object.entries(criticalData)) {
+        if (typeof value !== "string" || !value.startsWith(DEFERRED_VALUE_PLACEHOLDER_PREFIX)) {
+          continue;
+        }
+        deferredData = deferredData || {};
+        deferredData[eventKey] = new Promise((resolve, reject) => {
+          deferredResolvers[eventKey] = {
+            resolve: (value2) => {
+              resolve(value2);
+              delete deferredResolvers[eventKey];
+            },
+            reject: (error) => {
+              reject(error);
+              delete deferredResolvers[eventKey];
+            }
+          };
+        });
+      }
+    }
+    (async () => {
+      try {
+        for await (const section of sectionReader) {
+          const [event, ...sectionDataStrings] = section.split(":");
+          const sectionDataString = sectionDataStrings.join(":");
+          const data = JSON.parse(sectionDataString);
+          if (event === "data") {
+            for (const [key, value] of Object.entries(data)) {
+              if (deferredResolvers[key]) {
+                deferredResolvers[key].resolve(value);
+              }
+            }
+          } else if (event === "error") {
+            for (const [key, value] of Object.entries(data)) {
+              const err = new Error(value.message);
+              err.stack = value.stack;
+              if (deferredResolvers[key]) {
+                deferredResolvers[key].reject(err);
+              }
+            }
+          }
+        }
+        for (const [key, resolver] of Object.entries(deferredResolvers)) {
+          resolver.reject(
+            new AbortedDeferredError(`Deferred ${key} will never resolved`)
+          );
+        }
+      } catch (error) {
+        for (const resolver of Object.values(deferredResolvers)) {
+          resolver.reject(error);
+        }
+      }
+    })();
+    return new DeferredData({ ...criticalData, ...deferredData });
+  } catch (error) {
+    for (const resolver of Object.values(deferredResolvers)) {
+      resolver.reject(error);
+    }
+    throw error;
+  }
+}
+async function* readStreamSections(stream) {
+  const reader = stream.getReader();
+  let buffer = [];
+  let sections = [];
+  let closed = false;
+  const encoder = new TextEncoder();
+  const decoder = new TextDecoder();
+  const readStreamSection = async () => {
+    if (sections.length > 0) {
+      return sections.shift();
+    }
+    while (!closed && sections.length === 0) {
+      const chunk = await reader.read();
+      if (chunk.done) {
+        closed = true;
+        break;
+      }
+      buffer.push(chunk.value);
+      try {
+        const bufferedString = decoder.decode(mergeArrays(...buffer));
+        const splitSections = bufferedString.split("\n\n");
+        if (splitSections.length >= 2) {
+          sections.push(...splitSections.slice(0, -1));
+          buffer = [encoder.encode(splitSections.slice(-1).join("\n\n"))];
+        }
+        if (sections.length > 0) {
+          break;
+        }
+      } catch {
+        continue;
+      }
+    }
+    if (sections.length > 0) {
+      return sections.shift();
+    }
+    if (buffer.length > 0) {
+      const bufferedString = decoder.decode(mergeArrays(...buffer));
+      sections = bufferedString.split("\n\n").filter((s) => s);
+      buffer = [];
+    }
+    return sections.shift();
+  };
+  let section = await readStreamSection();
+  while (section) {
+    yield section;
+    section = await readStreamSection();
+  }
+}
+function mergeArrays(...arrays) {
+  const out = new Uint8Array(
+    arrays.reduce((total, arr) => total + arr.length, 0)
+  );
+  let offset = 0;
+  for (const arr of arrays) {
+    out.set(arr, offset);
+    offset += arr.length;
+  }
+  return out;
+}
+export {
+  parseDeferredReadableStream
+};

package/dist/{js/modern → esm-node}/cli/generate-client.js

@@ -7,7 +7,7 @@ const generateClient = ({
   const loadersMap = require(mapFile);
   let requestCode = ``;
   let exportsCode = ``;
-  const requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
+  const requestCreatorPath = path.join(__dirname, "./create-request").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;

package/dist/esm-node/cli/loader.js

@@ -0,0 +1,18 @@
+import { generateClient } from "./generate-client";
+async function loader(source) {
+  var _a;
+  this.cacheable();
+  const target = (_a = this._compiler) == null ? void 0 : _a.options.target;
+  if (target === "node") {
+    return source;
+  }
+  const options = this.getOptions();
+  const code = generateClient({
+    mapFile: options.mapFile,
+    loaderId: options.loaderId
+  });
+  return code;
+}
+export {
+  loader as default
+};

package/dist/esm-node/runtime/index.js

@@ -0,0 +1,143 @@
+import {
+  installGlobals,
+  writeReadableStreamToWritable,
+  Response as NodeResponse
+} from "@remix-run/node";
+import {
+  transformNestedRoutes
+} from "@modern-js/utils";
+import {
+  createStaticHandler,
+  ErrorResponse,
+  UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL
+} from "@modern-js/utils/remix-router";
+import { LOADER_ID_PARAM } from "../common/constants";
+import { createDeferredReadableStream } from "./response";
+installGlobals();
+const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+function isRedirectResponse(status) {
+  return redirectStatusCodes.has(status);
+}
+function isResponse(value) {
+  return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
+}
+function convertModernRedirectResponse(headers) {
+  const newHeaders = new Headers(headers);
+  newHeaders.set("X-Modernjs-Redirect", headers.get("Location"));
+  newHeaders.delete("Location");
+  return new NodeResponse(null, {
+    status: 204,
+    headers: newHeaders
+  });
+}
+const createLoaderHeaders = (requestHeaders) => {
+  const headers = new Headers();
+  for (const [key, values] of Object.entries(requestHeaders)) {
+    if (values) {
+      if (Array.isArray(values)) {
+        for (const value of values) {
+          headers.append(key, value);
+        }
+      } else {
+        headers.set(key, values);
+      }
+    }
+  }
+  return headers;
+};
+const createLoaderRequest = (context) => {
+  const origin = `${context.protocol}://${context.host}`;
+  const url = new URL(context.url, origin);
+  const controller = new AbortController();
+  const init = {
+    method: context.method,
+    headers: createLoaderHeaders(context.headers),
+    signal: controller.signal
+  };
+  return new Request(url.href, init);
+};
+const sendLoaderResponse = async (res, nodeResponse) => {
+  res.statusMessage = nodeResponse.statusText;
+  res.statusCode = nodeResponse.status;
+  for (const [key, value] of nodeResponse.headers.entries()) {
+    res.setHeader(key, value);
+  }
+  if (nodeResponse.body) {
+    await writeReadableStreamToWritable(nodeResponse.body, res);
+  } else {
+    res.end();
+  }
+};
+const matchEntry = (pathname, entries) => {
+  return entries.find((entry) => pathname.startsWith(entry.urlPath));
+};
+const handleRequest = async ({
+  context,
+  serverRoutes,
+  routes
+}) => {
+  const { method, query } = context;
+  const routeId = query[LOADER_ID_PARAM];
+  if (!routeId) {
+    throw new Error(`Missing parameter: ${LOADER_ID_PARAM}`);
+  }
+  if (method.toLowerCase() !== "get") {
+    throw new Error("Only support httpp GET method");
+  }
+  const entry = matchEntry(context.path, serverRoutes);
+  if (!entry) {
+    throw new Error("Route is not matched");
+  }
+  const dataRoutes = transformNestedRoutes(routes);
+  const staticHandler = createStaticHandler(dataRoutes, {
+    basename: entry.urlPath
+  });
+  const { res } = context;
+  const request = createLoaderRequest(context);
+  let response;
+  try {
+    response = await staticHandler.queryRoute(request, {
+      routeId,
+      requestContext: context
+    });
+    if (isResponse(response) && isRedirectResponse(response.status)) {
+      response = convertModernRedirectResponse(response.headers);
+    } else if (DEFERRED_SYMBOL in response) {
+      const deferredData = response[DEFERRED_SYMBOL];
+      const body = createDeferredReadableStream(deferredData, request.signal);
+      const init = deferredData.init || {};
+      if (init.status && isRedirectResponse(init.status)) {
+        if (!init.headers) {
+          throw new Error("redirect response includes no headers");
+        }
+        response = convertModernRedirectResponse(new Headers(init.headers));
+      } else {
+        const headers = new Headers(init.headers);
+        headers.set("Content-Type", "text/modernjs-deferred");
+        init.headers = headers;
+        response = new NodeResponse(body, init);
+      }
+    } else {
+      response = isResponse(response) ? response : new NodeResponse(JSON.stringify(response), {
+        headers: {
+          "Content-Type": "application/json; charset=utf-8"
+        }
+      });
+    }
+  } catch (error) {
+    const message = error instanceof ErrorResponse ? error.data : String(error);
+    response = new NodeResponse(message, {
+      status: 500,
+      headers: {
+        "Content-Type": "text/plain"
+      }
+    });
+  }
+  sendLoaderResponse(res, response);
+};
+export {
+  handleRequest,
+  isRedirectResponse,
+  isResponse,
+  matchEntry
+};

package/dist/esm-node/runtime/response.js

@@ -0,0 +1,79 @@
+import { TextEncoder } from "util";
+import { serializeJson } from "@modern-js/utils";
+function isTrackedPromise(value) {
+  return value != null && typeof value.then === "function" && value._tracked === true;
+}
+const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
+function createDeferredReadableStream(deferredData, signal) {
+  const encoder = new TextEncoder();
+  const stream = new ReadableStream({
+    async start(controller) {
+      const criticalData = {};
+      const preresolvedKeys = [];
+      for (const [key, value] of Object.entries(deferredData.data)) {
+        if (isTrackedPromise(value)) {
+          criticalData[key] = `${DEFERRED_VALUE_PLACEHOLDER_PREFIX}${key}`;
+          if (typeof value._data !== "undefined" || typeof value._error !== "undefined") {
+            preresolvedKeys.push(key);
+          }
+        } else {
+          criticalData[key] = value;
+        }
+      }
+      controller.enqueue(encoder.encode(`${JSON.stringify(criticalData)}
+
+`));
+      for (const preresolvedKey of preresolvedKeys) {
+        enqueueTrackedPromise(
+          controller,
+          encoder,
+          preresolvedKey,
+          deferredData.data[preresolvedKey]
+        );
+      }
+      const unsubscribe = deferredData.subscribe((aborted, settledKey) => {
+        if (settledKey) {
+          enqueueTrackedPromise(
+            controller,
+            encoder,
+            settledKey,
+            deferredData.data[settledKey]
+          );
+        }
+      });
+      await deferredData.resolveData(signal);
+      unsubscribe();
+      controller.close();
+    }
+  });
+  return stream;
+}
+function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
+  var _a;
+  if ("_error" in promise) {
+    const { _error } = promise;
+    controller.enqueue(
+      encoder.encode(
+        `error:${serializeJson({
+          [settledKey]: {
+            message: _error.message,
+            stack: _error.stack
+          }
+        })}
+
+`
+      )
+    );
+  } else {
+    controller.enqueue(
+      encoder.encode(
+        `data:${JSON.stringify({ [settledKey]: (_a = promise._data) != null ? _a : null })}
+
+`
+      )
+    );
+  }
+}
+export {
+  createDeferredReadableStream
+};

package/dist/esm-node/server/index.js

@@ -0,0 +1,40 @@
+import path from "path";
+import {
+  MAIN_ENTRY_NAME,
+  SERVER_BUNDLE_DIRECTORY
+} from "@modern-js/utils";
+import { matchEntry } from "../runtime";
+var server_default = () => ({
+  name: "@modern-js/plugin-data-loader",
+  setup: () => ({
+    preparebeforeRouteHandler({
+      serverRoutes,
+      distDir
+    }) {
+      return async (context) => {
+        const entry = matchEntry(context.path, serverRoutes);
+        if (!entry) {
+          throw new Error("Route is not matched");
+        }
+        const routesPath = path.join(
+          distDir,
+          SERVER_BUNDLE_DIRECTORY,
+          `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders`
+        );
+        const { routes, handleRequest } = await import(routesPath);
+        if (!routes) {
+          throw new Error("Missing route info");
+          ;
+        }
+        return handleRequest({
+          serverRoutes,
+          context,
+          routes
+        });
+      };
+    }
+  })
+});
+export {
+  server_default as default
+};

package/dist/types/cli/create-request.d.ts

@@ -1,3 +1,4 @@
+import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
 export declare const getRequestUrl: ({
   params,
   request,
@@ -13,4 +14,4 @@ export declare const createRequest: (routeId: string, method?: string) => ({
 }: {
   params: Record<string, string>;
   request: Request;
-}) => Promise<Response>;
+}) => Promise<DeferredData | Response>;