@modern-js/runtime-utils 2.54.6 → 2.55.0

package/dist/cjs/node/index.js

@@ -28,6 +28,7 @@ var import_storage = require("./storage");
 var import_serialize = require("./serialize");
 __reExport(node_exports, require("./nestedRoutes"), module.exports);
 __reExport(node_exports, require("./loaderContext"), module.exports);
+__reExport(node_exports, require("./stream"), module.exports);
 const { run, useContext: useHeaders } = (0, import_storage.createStorage)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -35,5 +36,6 @@ const { run, useContext: useHeaders } = (0, import_storage.createStorage)();
   serializeJson,
   useHeaders,
   ...require("./nestedRoutes"),
-  ...require("./loaderContext")
+  ...require("./loaderContext"),
+  ...require("./stream")
 });

package/dist/cjs/node/stream.js

@@ -0,0 +1,102 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stream_exports = {};
+__export(stream_exports, {
+  createReadableStreamFromReadable: () => createReadableStreamFromReadable
+});
+module.exports = __toCommonJS(stream_exports);
+var import_stream = require("stream");
+const createReadableStreamFromReadable = (source) => {
+  const pump = new StreamPump(source);
+  const stream = new ReadableStream(pump, pump);
+  return stream;
+};
+class StreamPump {
+  size(chunk) {
+    return (chunk === null || chunk === void 0 ? void 0 : chunk.byteLength) || 0;
+  }
+  start(controller) {
+    this.controller = controller;
+    this.stream.on("data", this.enqueue);
+    this.stream.once("error", this.error);
+    this.stream.once("end", this.close);
+    this.stream.once("close", this.close);
+  }
+  pull() {
+    this.resume();
+  }
+  cancel(reason) {
+    if (this.stream.destroy) {
+      this.stream.destroy(reason);
+    }
+    this.stream.off("data", this.enqueue);
+    this.stream.off("error", this.error);
+    this.stream.off("end", this.close);
+    this.stream.off("close", this.close);
+  }
+  enqueue(chunk) {
+    if (this.controller) {
+      try {
+        const bytes = chunk instanceof Uint8Array ? chunk : Buffer.from(chunk);
+        const available = (this.controller.desiredSize || 0) - bytes.byteLength;
+        this.controller.enqueue(bytes);
+        if (available <= 0) {
+          this.pause();
+        }
+      } catch (error) {
+        this.controller.error(new Error("Could not create Buffer, chunk must be of type string or an instance of Buffer, ArrayBuffer, or Array or an Array-like Object"));
+        this.cancel();
+      }
+    }
+  }
+  pause() {
+    if (this.stream.pause) {
+      this.stream.pause();
+    }
+  }
+  resume() {
+    if (this.stream.readable && this.stream.resume) {
+      this.stream.resume();
+    }
+  }
+  close() {
+    if (this.controller) {
+      this.controller.close();
+      delete this.controller;
+    }
+  }
+  error(error) {
+    if (this.controller) {
+      this.controller.error(error);
+      delete this.controller;
+    }
+  }
+  constructor(stream) {
+    this.highWaterMark = stream.readableHighWaterMark || new import_stream.Stream.Readable().readableHighWaterMark;
+    this.accumalatedSize = 0;
+    this.stream = stream;
+    this.enqueue = this.enqueue.bind(this);
+    this.error = this.error.bind(this);
+    this.close = this.close.bind(this);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createReadableStreamFromReadable
+});

package/dist/cjs/universal/request.js

@@ -0,0 +1,78 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var request_exports = {};
+__export(request_exports, {
+  getHost: () => getHost,
+  getPathname: () => getPathname,
+  parseCookie: () => parseCookie,
+  parseHeaders: () => parseHeaders,
+  parseQuery: () => parseQuery
+});
+module.exports = __toCommonJS(request_exports);
+function parseQuery(req) {
+  const query = {};
+  const { url } = req;
+  const q = url.split("?")[1];
+  if (q) {
+    const search = new URLSearchParams(q);
+    search.forEach((v, k) => {
+      query[k] = v;
+    });
+  }
+  return query;
+}
+function parseHeaders(request) {
+  const headersData = {};
+  request.headers.forEach((value, key) => {
+    headersData[key] = value;
+  });
+  return headersData;
+}
+function getPathname(request) {
+  const match = request.url.match(/^https?:\/\/[^/]+(\/[^?]*)/);
+  return match ? match[1] : "/";
+}
+function getHost(request) {
+  const { headers } = request;
+  let host = headers.get("X-Forwarded-Host");
+  if (!host) {
+    host = headers.get("Host");
+  }
+  host = (host === null || host === void 0 ? void 0 : host.split(/\s*,\s*/, 1)[0]) || "undefined";
+  return host;
+}
+function parseCookie(req) {
+  const _cookie = req.headers.get("Cookie");
+  const cookie = {};
+  _cookie === null || _cookie === void 0 ? void 0 : _cookie.trim().split(";").forEach((item) => {
+    const [k, v] = item.trim().split("=");
+    if (k) {
+      cookie[k] = v;
+    }
+  });
+  return cookie;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getHost,
+  getPathname,
+  parseCookie,
+  parseHeaders,
+  parseQuery
+});

package/dist/esm/node/index.js

@@ -3,6 +3,7 @@ var _createStorage = createStorage(), run = _createStorage.run, useHeaders = _cr
 import { serializeJson } from "./serialize";
 export * from "./nestedRoutes";
 export * from "./loaderContext";
+export * from "./stream";
 export {
   run,
   serializeJson,

package/dist/esm/node/stream.js

@@ -0,0 +1,84 @@
+import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { Stream } from "stream";
+var createReadableStreamFromReadable = function(source) {
+  var pump = new StreamPump(source);
+  var stream = new ReadableStream(pump, pump);
+  return stream;
+};
+var StreamPump = /* @__PURE__ */ function() {
+  "use strict";
+  function StreamPump2(stream) {
+    _class_call_check(this, StreamPump2);
+    this.highWaterMark = stream.readableHighWaterMark || new Stream.Readable().readableHighWaterMark;
+    this.accumalatedSize = 0;
+    this.stream = stream;
+    this.enqueue = this.enqueue.bind(this);
+    this.error = this.error.bind(this);
+    this.close = this.close.bind(this);
+  }
+  var _proto = StreamPump2.prototype;
+  _proto.size = function size(chunk) {
+    return (chunk === null || chunk === void 0 ? void 0 : chunk.byteLength) || 0;
+  };
+  _proto.start = function start(controller) {
+    this.controller = controller;
+    this.stream.on("data", this.enqueue);
+    this.stream.once("error", this.error);
+    this.stream.once("end", this.close);
+    this.stream.once("close", this.close);
+  };
+  _proto.pull = function pull() {
+    this.resume();
+  };
+  _proto.cancel = function cancel(reason) {
+    if (this.stream.destroy) {
+      this.stream.destroy(reason);
+    }
+    this.stream.off("data", this.enqueue);
+    this.stream.off("error", this.error);
+    this.stream.off("end", this.close);
+    this.stream.off("close", this.close);
+  };
+  _proto.enqueue = function enqueue(chunk) {
+    if (this.controller) {
+      try {
+        var bytes = _instanceof(chunk, Uint8Array) ? chunk : Buffer.from(chunk);
+        var available = (this.controller.desiredSize || 0) - bytes.byteLength;
+        this.controller.enqueue(bytes);
+        if (available <= 0) {
+          this.pause();
+        }
+      } catch (error) {
+        this.controller.error(new Error("Could not create Buffer, chunk must be of type string or an instance of Buffer, ArrayBuffer, or Array or an Array-like Object"));
+        this.cancel();
+      }
+    }
+  };
+  _proto.pause = function pause() {
+    if (this.stream.pause) {
+      this.stream.pause();
+    }
+  };
+  _proto.resume = function resume() {
+    if (this.stream.readable && this.stream.resume) {
+      this.stream.resume();
+    }
+  };
+  _proto.close = function close() {
+    if (this.controller) {
+      this.controller.close();
+      delete this.controller;
+    }
+  };
+  _proto.error = function error(error) {
+    if (this.controller) {
+      this.controller.error(error);
+      delete this.controller;
+    }
+  };
+  return StreamPump2;
+}();
+export {
+  createReadableStreamFromReadable
+};

package/dist/esm/universal/request.js

@@ -0,0 +1,51 @@
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+function parseQuery(req) {
+  var query = {};
+  var url = req.url;
+  var q = url.split("?")[1];
+  if (q) {
+    var search = new URLSearchParams(q);
+    search.forEach(function(v, k) {
+      query[k] = v;
+    });
+  }
+  return query;
+}
+function parseHeaders(request) {
+  var headersData = {};
+  request.headers.forEach(function(value, key) {
+    headersData[key] = value;
+  });
+  return headersData;
+}
+function getPathname(request) {
+  var match = request.url.match(/^https?:\/\/[^/]+(\/[^?]*)/);
+  return match ? match[1] : "/";
+}
+function getHost(request) {
+  var headers = request.headers;
+  var host = headers.get("X-Forwarded-Host");
+  if (!host) {
+    host = headers.get("Host");
+  }
+  host = (host === null || host === void 0 ? void 0 : host.split(/\s*,\s*/, 1)[0]) || "undefined";
+  return host;
+}
+function parseCookie(req) {
+  var _cookie = req.headers.get("Cookie");
+  var cookie = {};
+  _cookie === null || _cookie === void 0 ? void 0 : _cookie.trim().split(";").forEach(function(item) {
+    var _item_trim_split = _sliced_to_array(item.trim().split("="), 2), k = _item_trim_split[0], v = _item_trim_split[1];
+    if (k) {
+      cookie[k] = v;
+    }
+  });
+  return cookie;
+}
+export {
+  getHost,
+  getPathname,
+  parseCookie,
+  parseHeaders,
+  parseQuery
+};

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

@@ -3,6 +3,7 @@ const { run, useContext: useHeaders } = createStorage();
 import { serializeJson } from "./serialize";
 export * from "./nestedRoutes";
 export * from "./loaderContext";
+export * from "./stream";
 export {
   run,
   serializeJson,

package/dist/esm-node/node/stream.js

@@ -0,0 +1,78 @@
+import { Stream } from "stream";
+const createReadableStreamFromReadable = (source) => {
+  const pump = new StreamPump(source);
+  const stream = new ReadableStream(pump, pump);
+  return stream;
+};
+class StreamPump {
+  size(chunk) {
+    return (chunk === null || chunk === void 0 ? void 0 : chunk.byteLength) || 0;
+  }
+  start(controller) {
+    this.controller = controller;
+    this.stream.on("data", this.enqueue);
+    this.stream.once("error", this.error);
+    this.stream.once("end", this.close);
+    this.stream.once("close", this.close);
+  }
+  pull() {
+    this.resume();
+  }
+  cancel(reason) {
+    if (this.stream.destroy) {
+      this.stream.destroy(reason);
+    }
+    this.stream.off("data", this.enqueue);
+    this.stream.off("error", this.error);
+    this.stream.off("end", this.close);
+    this.stream.off("close", this.close);
+  }
+  enqueue(chunk) {
+    if (this.controller) {
+      try {
+        const bytes = chunk instanceof Uint8Array ? chunk : Buffer.from(chunk);
+        const available = (this.controller.desiredSize || 0) - bytes.byteLength;
+        this.controller.enqueue(bytes);
+        if (available <= 0) {
+          this.pause();
+        }
+      } catch (error) {
+        this.controller.error(new Error("Could not create Buffer, chunk must be of type string or an instance of Buffer, ArrayBuffer, or Array or an Array-like Object"));
+        this.cancel();
+      }
+    }
+  }
+  pause() {
+    if (this.stream.pause) {
+      this.stream.pause();
+    }
+  }
+  resume() {
+    if (this.stream.readable && this.stream.resume) {
+      this.stream.resume();
+    }
+  }
+  close() {
+    if (this.controller) {
+      this.controller.close();
+      delete this.controller;
+    }
+  }
+  error(error) {
+    if (this.controller) {
+      this.controller.error(error);
+      delete this.controller;
+    }
+  }
+  constructor(stream) {
+    this.highWaterMark = stream.readableHighWaterMark || new Stream.Readable().readableHighWaterMark;
+    this.accumalatedSize = 0;
+    this.stream = stream;
+    this.enqueue = this.enqueue.bind(this);
+    this.error = this.error.bind(this);
+    this.close = this.close.bind(this);
+  }
+}
+export {
+  createReadableStreamFromReadable
+};

package/dist/esm-node/universal/request.js

@@ -0,0 +1,50 @@
+function parseQuery(req) {
+  const query = {};
+  const { url } = req;
+  const q = url.split("?")[1];
+  if (q) {
+    const search = new URLSearchParams(q);
+    search.forEach((v, k) => {
+      query[k] = v;
+    });
+  }
+  return query;
+}
+function parseHeaders(request) {
+  const headersData = {};
+  request.headers.forEach((value, key) => {
+    headersData[key] = value;
+  });
+  return headersData;
+}
+function getPathname(request) {
+  const match = request.url.match(/^https?:\/\/[^/]+(\/[^?]*)/);
+  return match ? match[1] : "/";
+}
+function getHost(request) {
+  const { headers } = request;
+  let host = headers.get("X-Forwarded-Host");
+  if (!host) {
+    host = headers.get("Host");
+  }
+  host = (host === null || host === void 0 ? void 0 : host.split(/\s*,\s*/, 1)[0]) || "undefined";
+  return host;
+}
+function parseCookie(req) {
+  const _cookie = req.headers.get("Cookie");
+  const cookie = {};
+  _cookie === null || _cookie === void 0 ? void 0 : _cookie.trim().split(";").forEach((item) => {
+    const [k, v] = item.trim().split("=");
+    if (k) {
+      cookie[k] = v;
+    }
+  });
+  return cookie;
+}
+export {
+  getHost,
+  getPathname,
+  parseCookie,
+  parseHeaders,
+  parseQuery
+};

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

@@ -8,3 +8,4 @@ export { run, useHeaders };
 export { serializeJson } from './serialize';
 export * from './nestedRoutes';
 export * from './loaderContext';
+export * from './stream';

package/dist/types/node/stream.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+import { Readable } from 'stream';
+export declare const createReadableStreamFromReadable: (source: Readable & {
+    readableHighWaterMark?: number;
+}) => ReadableStream<Uint8Array>;

package/dist/types/universal/request.d.ts

@@ -0,0 +1,17 @@
+export type Query = Record<string, string>;
+export declare function parseQuery(req: Request): Query;
+export type HeadersData = Record<string, string | undefined>;
+export declare function parseHeaders(request: Request): HeadersData;
+/**
+ * The function is modified based on
+ * https://github.com/honojs/hono/blob/main/src/utils/url.ts
+ *
+ * MIT Licensed
+ * https://github.com/honojs/hono/blob/main/LICENSE
+ *
+ */
+export declare function getPathname(request: Request): string;
+export declare function getHost(request: Request): string;
+type Cookie = Record<string, string>;
+export declare function parseCookie(req: Request): Cookie;
+export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.6",
+  "version": "2.55.0",
   "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking",
   "exports": {
     "./router": {
@@ -43,6 +43,11 @@
       "require": "./dist/cjs/node/router.js",
       "default": "./dist/esm/node/router.js"
     },
+    "./universal/request": {
+      "types": "./dist/universal/request.d.ts",
+      "require": "./dist/cjs/universal/request.js",
+      "default": "./dist/esm/universal/request.js"
+    },
     "./time": {
       "types": "./dist/types/time.d.ts",
       "require": "./dist/cjs/time.js",
@@ -91,6 +96,9 @@
       "node/router": [
         "./dist/types/node/router.d.ts"
       ],
+      "universal/request": [
+        "./dist/types/universal/request.d.ts"
+      ],
       "time": [
         "./dist/types/time.d.ts"
       ],
@@ -114,7 +122,7 @@
     "react-router-dom": "6.22.0",
     "@remix-run/router": "1.15.0",
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.54.6"
+    "@modern-js/utils": "2.55.0"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
@@ -137,9 +145,9 @@
     "jest": "^29",
     "typescript": "^5",
     "@types/serialize-javascript": "^5.0.1",
-    "@scripts/build": "2.54.6",
-    "@scripts/jest-config": "2.54.6",
-    "@modern-js/types": "2.54.6"
+    "@scripts/build": "2.55.0",
+    "@scripts/jest-config": "2.55.0",
+    "@modern-js/types": "2.55.0"
   },
   "sideEffects": false,
   "scripts": {