@react-router/node 0.0.0-experimental-a26b992a1 → 0.0.0-experimental-312bddb22

package/dist/globals.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/globals.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export { installGlobals } from "./globals";
 export { createFileSessionStorage } from "./sessions/fileStorage";
-export { createFileUploadHandler as unstable_createFileUploadHandler, NodeOnDiskFile, } from "./upload/fileUploadHandler";
 export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable, } from "./stream";

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,15 +14,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var globals = require('./globals.js');
 var fileStorage = require('./sessions/fileStorage.js');
-var fileUploadHandler = require('./upload/fileUploadHandler.js');
 var stream = require('./stream.js');
 
 
 
 exports.installGlobals = globals.installGlobals;
 exports.createFileSessionStorage = fileStorage.createFileSessionStorage;
-exports.NodeOnDiskFile = fileUploadHandler.NodeOnDiskFile;
-exports.unstable_createFileUploadHandler = fileUploadHandler.createFileUploadHandler;
 exports.createReadableStreamFromReadable = stream.createReadableStreamFromReadable;
 exports.readableStreamToString = stream.readableStreamToString;
 exports.writeAsyncIterableToWritable = stream.writeAsyncIterableToWritable;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,5 +10,4 @@
  */
 export { installGlobals } from './globals.mjs';
 export { createFileSessionStorage } from './sessions/fileStorage.mjs';
-export { NodeOnDiskFile, createFileUploadHandler as unstable_createFileUploadHandler } from './upload/fileUploadHandler.mjs';
 export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable } from './stream.mjs';

package/dist/install.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/install.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/sessions/fileStorage.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/sessions/fileStorage.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/stream.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/stream.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-a26b992a1
+ * @react-router/node v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/node",
-  "version": "0.0.0-experimental-a26b992a1",
+  "version": "0.0.0-experimental-312bddb22",
   "description": "Node.js platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -39,11 +39,11 @@
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
     "typescript": "^5.1.6",
-    "react-router": "0.0.0-experimental-a26b992a1"
+    "react-router": "0.0.0-experimental-312bddb22"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
-    "react-router": "0.0.0-experimental-a26b992a1"
+    "react-router": "0.0.0-experimental-312bddb22"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/dist/upload/fileUploadHandler.d.ts

@@ -1,68 +0,0 @@
-/// <reference types="node" />
-import type { UploadHandler } from "react-router";
-export type FileUploadHandlerFilterArgs = {
-    filename: string;
-    contentType: string;
-    name: string;
-};
-export type FileUploadHandlerPathResolverArgs = {
-    filename: string;
-    contentType: string;
-    name: string;
-};
-/**
- * Chooses the path of the file to be uploaded. If a string is not
- * returned the file will not be written.
- */
-export type FileUploadHandlerPathResolver = (args: FileUploadHandlerPathResolverArgs) => string | undefined;
-export type FileUploadHandlerOptions = {
-    /**
-     * Avoid file conflicts by appending a count on the end of the filename
-     * if it already exists on disk. Defaults to `true`.
-     */
-    avoidFileConflicts?: boolean;
-    /**
-     * The directory to write the upload.
-     */
-    directory?: string | FileUploadHandlerPathResolver;
-    /**
-     * The name of the file in the directory. Can be a relative path, the directory
-     * structure will be created if it does not exist.
-     */
-    file?: FileUploadHandlerPathResolver;
-    /**
-     * The maximum upload size allowed. If the size is exceeded an error will be thrown.
-     * Defaults to 3000000B (3MB).
-     */
-    maxPartSize?: number;
-    /**
-     *
-     * @param filename
-     * @param contentType
-     * @param name
-     */
-    filter?(args: FileUploadHandlerFilterArgs): boolean | Promise<boolean>;
-};
-export declare function createFileUploadHandler({ directory, avoidFileConflicts, file, filter, maxPartSize, }?: FileUploadHandlerOptions): UploadHandler;
-export declare class NodeOnDiskFile implements Omit<File, "constructor"> {
-    private filepath;
-    type: string;
-    private slicer?;
-    name: string;
-    lastModified: number;
-    webkitRelativePath: string;
-    prototype: File;
-    constructor(filepath: string, type: string, slicer?: {
-        start: number;
-        end: number;
-    } | undefined);
-    get size(): number;
-    slice(start?: number, end?: number, type?: string): Blob;
-    arrayBuffer(): Promise<ArrayBuffer>;
-    stream(): ReadableStream<any>;
-    stream(): NodeJS.ReadableStream;
-    text(): Promise<string>;
-    get [Symbol.toStringTag](): string;
-    remove(): Promise<void>;
-    getFilePath(): string;
-}

package/dist/upload/fileUploadHandler.js

@@ -1,207 +0,0 @@
-/**
- * @react-router/node v0.0.0-experimental-a26b992a1
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var node_crypto = require('node:crypto');
-var node_fs = require('node:fs');
-var promises = require('node:fs/promises');
-var node_os = require('node:os');
-var path = require('node:path');
-var node_stream = require('node:stream');
-var node_util = require('node:util');
-var reactRouter = require('react-router');
-var streamSlice = require('stream-slice');
-var stream = require('../stream.js');
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-
-var streamSlice__namespace = /*#__PURE__*/_interopNamespace(streamSlice);
-
-/**
- * Chooses the path of the file to be uploaded. If a string is not
- * returned the file will not be written.
- */
-
-let defaultFilePathResolver = ({
-  filename
-}) => {
-  let ext = filename ? path.extname(filename) : "";
-  return "upload_" + node_crypto.randomBytes(4).readUInt32LE(0) + ext;
-};
-async function uniqueFile(filepath) {
-  let ext = path.extname(filepath);
-  let uniqueFilepath = filepath;
-  for (let i = 1; await promises.stat(uniqueFilepath).then(() => true).catch(() => false); i++) {
-    uniqueFilepath = (ext ? filepath.slice(0, -ext.length) : filepath) + `-${new Date().getTime()}${ext}`;
-  }
-  return uniqueFilepath;
-}
-function createFileUploadHandler({
-  directory = node_os.tmpdir(),
-  avoidFileConflicts = true,
-  file = defaultFilePathResolver,
-  filter,
-  maxPartSize = 3000000
-} = {}) {
-  return async ({
-    name,
-    filename,
-    contentType,
-    data
-  }) => {
-    if (!filename || filter && !(await filter({
-      name,
-      filename,
-      contentType
-    }))) {
-      return undefined;
-    }
-    let dir = typeof directory === "string" ? directory : directory({
-      name,
-      filename,
-      contentType
-    });
-    if (!dir) {
-      return undefined;
-    }
-    let filedir = path.resolve(dir);
-    let path$1 = typeof file === "string" ? file : file({
-      name,
-      filename,
-      contentType
-    });
-    if (!path$1) {
-      return undefined;
-    }
-    let filepath = path.resolve(filedir, path$1);
-    if (avoidFileConflicts) {
-      filepath = await uniqueFile(filepath);
-    }
-    await promises.mkdir(path.dirname(filepath), {
-      recursive: true
-    }).catch(() => {});
-    let writeFileStream = node_fs.createWriteStream(filepath);
-    let size = 0;
-    let deleteFile = false;
-    try {
-      for await (let chunk of data) {
-        size += chunk.byteLength;
-        if (size > maxPartSize) {
-          deleteFile = true;
-          throw new reactRouter.MaxPartSizeExceededError(name, maxPartSize);
-        }
-        writeFileStream.write(chunk);
-      }
-    } finally {
-      writeFileStream.end();
-      await node_util.promisify(node_stream.finished)(writeFileStream);
-      if (deleteFile) {
-        await promises.rm(filepath).catch(() => {});
-      }
-    }
-
-    // TODO: remove this typecast once TS fixed File class regression
-    //  https://github.com/microsoft/TypeScript/issues/52166
-    return new NodeOnDiskFile(filepath, contentType);
-  };
-}
-
-// TODO: remove this `Omit` usage once TS fixed File class regression
-//  https://github.com/microsoft/TypeScript/issues/52166
-class NodeOnDiskFile {
-  lastModified = 0;
-  webkitRelativePath = "";
-
-  // TODO: remove this property once TS fixed File class regression
-  //  https://github.com/microsoft/TypeScript/issues/52166
-  prototype = File.prototype;
-  constructor(filepath, type, slicer) {
-    this.filepath = filepath;
-    this.type = type;
-    this.slicer = slicer;
-    this.name = path.basename(filepath);
-  }
-  get size() {
-    let stats = node_fs.statSync(this.filepath);
-    if (this.slicer) {
-      let slice = this.slicer.end - this.slicer.start;
-      return slice < 0 ? 0 : slice > stats.size ? stats.size : slice;
-    }
-    return stats.size;
-  }
-  slice(start, end, type) {
-    var _this$slicer;
-    if (typeof start === "number" && start < 0) start = this.size + start;
-    if (typeof end === "number" && end < 0) end = this.size + end;
-    let startOffset = ((_this$slicer = this.slicer) === null || _this$slicer === void 0 ? void 0 : _this$slicer.start) || 0;
-    start = startOffset + (start || 0);
-    end = startOffset + (end || this.size);
-    return new NodeOnDiskFile(this.filepath, typeof type === "string" ? type : this.type, {
-      start,
-      end
-    }
-    // TODO: remove this typecast once TS fixed File class regression
-    //  https://github.com/microsoft/TypeScript/issues/52166
-    );
-  }
-  async arrayBuffer() {
-    let stream = node_fs.createReadStream(this.filepath);
-    if (this.slicer) {
-      stream = stream.pipe(streamSlice__namespace.slice(this.slicer.start, this.slicer.end));
-    }
-    return new Promise((resolve, reject) => {
-      let buf = [];
-      stream.on("data", chunk => buf.push(chunk));
-      stream.on("end", () => resolve(Buffer.concat(buf)));
-      stream.on("error", err => reject(err));
-    });
-  }
-  stream() {
-    let stream$1 = node_fs.createReadStream(this.filepath);
-    if (this.slicer) {
-      stream$1 = stream$1.pipe(streamSlice__namespace.slice(this.slicer.start, this.slicer.end));
-    }
-    return stream.createReadableStreamFromReadable(stream$1);
-  }
-  async text() {
-    return stream.readableStreamToString(this.stream());
-  }
-  get [Symbol.toStringTag]() {
-    return "File";
-  }
-  remove() {
-    return promises.unlink(this.filepath);
-  }
-  getFilePath() {
-    return this.filepath;
-  }
-}
-
-exports.NodeOnDiskFile = NodeOnDiskFile;
-exports.createFileUploadHandler = createFileUploadHandler;

package/dist/upload/fileUploadHandler.mjs

@@ -1,174 +0,0 @@
-/**
- * @react-router/node v0.0.0-experimental-a26b992a1
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-import { randomBytes } from 'node:crypto';
-import { createWriteStream, statSync, createReadStream } from 'node:fs';
-import { mkdir, rm, unlink, stat } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { resolve, dirname, basename, extname } from 'node:path';
-import { finished } from 'node:stream';
-import { promisify } from 'node:util';
-import { MaxPartSizeExceededError } from 'react-router';
-import * as streamSlice from 'stream-slice';
-import { createReadableStreamFromReadable, readableStreamToString } from '../stream.mjs';
-
-let defaultFilePathResolver = ({
-  filename
-}) => {
-  let ext = filename ? extname(filename) : "";
-  return "upload_" + randomBytes(4).readUInt32LE(0) + ext;
-};
-async function uniqueFile(filepath) {
-  let ext = extname(filepath);
-  let uniqueFilepath = filepath;
-  for (let i = 1; await stat(uniqueFilepath).then(() => true).catch(() => false); i++) {
-    uniqueFilepath = (ext ? filepath.slice(0, -ext.length) : filepath) + `-${new Date().getTime()}${ext}`;
-  }
-  return uniqueFilepath;
-}
-function createFileUploadHandler({
-  directory = tmpdir(),
-  avoidFileConflicts = true,
-  file = defaultFilePathResolver,
-  filter,
-  maxPartSize = 3000000
-} = {}) {
-  return async ({
-    name,
-    filename,
-    contentType,
-    data
-  }) => {
-    if (!filename || filter && !(await filter({
-      name,
-      filename,
-      contentType
-    }))) {
-      return undefined;
-    }
-    let dir = typeof directory === "string" ? directory : directory({
-      name,
-      filename,
-      contentType
-    });
-    if (!dir) {
-      return undefined;
-    }
-    let filedir = resolve(dir);
-    let path = typeof file === "string" ? file : file({
-      name,
-      filename,
-      contentType
-    });
-    if (!path) {
-      return undefined;
-    }
-    let filepath = resolve(filedir, path);
-    if (avoidFileConflicts) {
-      filepath = await uniqueFile(filepath);
-    }
-    await mkdir(dirname(filepath), {
-      recursive: true
-    }).catch(() => {});
-    let writeFileStream = createWriteStream(filepath);
-    let size = 0;
-    let deleteFile = false;
-    try {
-      for await (let chunk of data) {
-        size += chunk.byteLength;
-        if (size > maxPartSize) {
-          deleteFile = true;
-          throw new MaxPartSizeExceededError(name, maxPartSize);
-        }
-        writeFileStream.write(chunk);
-      }
-    } finally {
-      writeFileStream.end();
-      await promisify(finished)(writeFileStream);
-      if (deleteFile) {
-        await rm(filepath).catch(() => {});
-      }
-    }
-    // TODO: remove this typecast once TS fixed File class regression
-    //  https://github.com/microsoft/TypeScript/issues/52166
-    return new NodeOnDiskFile(filepath, contentType);
-  };
-}
-// TODO: remove this `Omit` usage once TS fixed File class regression
-//  https://github.com/microsoft/TypeScript/issues/52166
-class NodeOnDiskFile {
-  lastModified = 0;
-  webkitRelativePath = "";
-  // TODO: remove this property once TS fixed File class regression
-  //  https://github.com/microsoft/TypeScript/issues/52166
-  prototype = File.prototype;
-  constructor(filepath, type, slicer) {
-    this.filepath = filepath;
-    this.type = type;
-    this.slicer = slicer;
-    this.name = basename(filepath);
-  }
-  get size() {
-    let stats = statSync(this.filepath);
-    if (this.slicer) {
-      let slice = this.slicer.end - this.slicer.start;
-      return slice < 0 ? 0 : slice > stats.size ? stats.size : slice;
-    }
-    return stats.size;
-  }
-  slice(start, end, type) {
-    var _this$slicer;
-    if (typeof start === "number" && start < 0) start = this.size + start;
-    if (typeof end === "number" && end < 0) end = this.size + end;
-    let startOffset = ((_this$slicer = this.slicer) === null || _this$slicer === void 0 ? void 0 : _this$slicer.start) || 0;
-    start = startOffset + (start || 0);
-    end = startOffset + (end || this.size);
-    return new NodeOnDiskFile(this.filepath, typeof type === "string" ? type : this.type, {
-      start,
-      end
-    }
-    // TODO: remove this typecast once TS fixed File class regression
-    //  https://github.com/microsoft/TypeScript/issues/52166
-    );
-  }
-  async arrayBuffer() {
-    let stream = createReadStream(this.filepath);
-    if (this.slicer) {
-      stream = stream.pipe(streamSlice.slice(this.slicer.start, this.slicer.end));
-    }
-    return new Promise((resolve, reject) => {
-      let buf = [];
-      stream.on("data", chunk => buf.push(chunk));
-      stream.on("end", () => resolve(Buffer.concat(buf)));
-      stream.on("error", err => reject(err));
-    });
-  }
-  stream() {
-    let stream = createReadStream(this.filepath);
-    if (this.slicer) {
-      stream = stream.pipe(streamSlice.slice(this.slicer.start, this.slicer.end));
-    }
-    return createReadableStreamFromReadable(stream);
-  }
-  async text() {
-    return readableStreamToString(this.stream());
-  }
-  get [Symbol.toStringTag]() {
-    return "File";
-  }
-  remove() {
-    return unlink(this.filepath);
-  }
-  getFilePath() {
-    return this.filepath;
-  }
-}
-
-export { NodeOnDiskFile, createFileUploadHandler };