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

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

@@ -1,142 +0,0 @@
-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/esm-node/runtime/index.js

@@ -1,143 +0,0 @@
-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

@@ -1,79 +0,0 @@
-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/types/cli/data.d.ts

@@ -1,6 +0,0 @@
-/**
- * modified from https://github.com/remix-run/remix/blob/main/packages/remix-react/data.ts
- * license at https://github.com/remix-run/remix/blob/main/LICENSE.md
- */
-import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
-export declare function parseDeferredReadableStream(stream: ReadableStream<Uint8Array>): Promise<DeferredData>;

package/dist/types/runtime/index.d.ts

@@ -1,15 +0,0 @@
-import type { ModernServerContext, NestedRoute, ServerRoute } from '@modern-js/types';
-import { Response as NodeResponse } from '@remix-run/node';
-export type ServerContext = Pick<ModernServerContext, 'req' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
-export declare function isRedirectResponse(status: number): boolean;
-export declare function isResponse(value: any): value is NodeResponse;
-export declare const matchEntry: (pathname: string, entries: ServerRoute[]) => ServerRoute | undefined;
-export declare const handleRequest: ({
-  context,
-  serverRoutes,
-  routes
-}: {
-  context: ServerContext;
-  serverRoutes: ServerRoute[];
-  routes: NestedRoute[];
-}) => Promise<void>;

package/dist/types/runtime/response.d.ts

@@ -1,2 +0,0 @@
-import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
-export declare function createDeferredReadableStream(deferredData: DeferredData, signal: AbortSignal): any;