@h3ravel/http 11.5.0 → 11.5.1

package/dist/index.cjs

@@ -18997,7 +18997,7 @@ var FormRequest = class {
 		};
 		for (const [rawKey, value] of data.entries()) {
 			const key = rawKey.endsWith("[]") ? rawKey.slice(0, -2) : rawKey;
-			if (value instanceof File) {
+			if (value instanceof UploadedFile || value instanceof File) {
 				const uploaded = value instanceof UploadedFile ? value : UploadedFile.createFromBase(value);
 				if (this.dataset.files[key]) {
 					const existing = this.dataset.files[key];
@@ -19088,6 +19088,10 @@ var Request = class Request {
 	*/
 	#json;
 	#uri;
+	/**
+	* Uploaded files (FILES).
+	*/
+	#files;
 	#method = void 0;
 	/**
 	* Gets route parameters.
@@ -19114,10 +19118,6 @@ var Request = class Request {
 	*/
 	query;
 	/**
-	* Uploaded files (FILES).
-	*/
-	files;
-	/**
 	* Server and execution environment parameters
 	*/
 	server;
@@ -19172,7 +19172,7 @@ var Request = class Request {
 		this.query = new InputBag((0, h3.getQuery)(this.event), this.event);
 		this.attributes = new ParamBag((0, h3.getRouterParams)(this.event), this.event);
 		this.cookies = new InputBag((0, h3.parseCookies)(this.event), this.event);
-		this.files = new FileBag(this.formData ? this.formData.files() : {}, this.event);
+		this.#files = new FileBag(this.formData ? this.formData.files() : {}, this.event);
 		this.server = new ServerBag(Object.fromEntries(this.event.req.headers.entries()), this.event);
 		this.headers = new HeaderBag(this.server.getHeaders());
 		this.acceptableContentTypes = [];
@@ -19238,18 +19238,41 @@ var Request = class Request {
 	*
 	* @param key
 	* @param defaultValue
+	* @param expectArray 
 	* @returns
 	*/
-	file(key, defaultValue) {
-		const source = this.allFiles();
-		return key ? (0, __h3ravel_support.data_get)(source, key, defaultValue) : source;
+	file(key, defaultValue, expectArray) {
+		const files = (0, __h3ravel_support.data_get)(this.allFiles(), key, defaultValue);
+		if (!files) return defaultValue;
+		if (Array.isArray(files)) return expectArray ? files : files[0];
+		return files;
 	}
 	/**
-	* Get an array of all of the files on the request.
+	* Determine if the uploaded data contains a file.
+	*
+	* @param  key
+	* @return boolean
+	*/
+	hasFile(key) {
+		let files = this.file(key, void 0, true);
+		if (!Array.isArray(files)) files = [files];
+		return files.some((e) => this.isValidFile(e));
+	}
+	/**
+	* Check that the given file is a valid file instance.
+	*
+	* @param file
+	* @return boolean
+	*/
+	isValidFile(file) {
+		return file.content instanceof File && file.size > 0;
+	}
+	/**
+	* Get an object with all the files on the request.
 	*/
 	allFiles() {
 		if (this.convertedFiles) return this.convertedFiles;
-		const entries = Object.entries(this.files.all()).filter((e) => e[1] != null);
+		const entries = Object.entries(this.#files.all()).filter((e) => e[1] != null);
 		const files = Object.fromEntries(entries);
 		this.convertedFiles = this.convertUploadedFiles(files);
 		return this.convertedFiles;
@@ -19328,7 +19351,7 @@ var Request = class Request {
 	* Get the keys for all of the input and files.
 	*/
 	keys() {
-		return [...Object.keys(this.input()), ...this.files.keys()];
+		return [...Object.keys(this.input()), ...this.#files.keys()];
 	}
 	/**
 	* Determine if the request is sending JSON.
@@ -19591,26 +19614,6 @@ var Request = class Request {
 		return content;
 	}
 	/**
-	* Determine if the uploaded data contains a file.
-	*
-	* @param  key
-	* @return boolean
-	*/
-	hasFile(key) {
-		let files = this.file(key);
-		if (!Array.isArray(files)) files = [files];
-		return files.some((e) => this.isValidFile(e));
-	}
-	/**
-	* Check that the given file is a valid file instance.
-	*
-	* @param file
-	* @return boolean
-	*/
-	isValidFile(file) {
-		return file.content instanceof File && file.size > 0;
-	}
-	/**
 	* Gets a "parameter" value from any bag.
 	*
 	* This method is mainly useful for libraries that want to provide some flexibility. If you don't need the

package/dist/index.d.cts

@@ -585,10 +585,6 @@ declare class Request implements IRequest {
    * Query string parameters (GET).
    */
   query: InputBag;
-  /**
-   * Uploaded files (FILES).
-   */
-  files: FileBag;
   /**
    * Server and execution environment parameters
    */
@@ -664,11 +660,26 @@ declare class Request implements IRequest {
    *
    * @param key
    * @param defaultValue
+   * @param expectArray
    * @returns
    */
-  file<K extends string | undefined = undefined>(key?: K, defaultValue?: any): K extends undefined ? Record<string, UploadedFile | UploadedFile[]> : UploadedFile | UploadedFile[];
+  file<K extends string | undefined = undefined, E extends boolean | undefined = undefined>(key?: K, defaultValue?: any, expectArray?: E): K extends undefined ? Record<string, E extends true ? UploadedFile[] : UploadedFile> : E extends true ? UploadedFile[] : UploadedFile;
+  /**
+   * Determine if the uploaded data contains a file.
+   *
+   * @param  key
+   * @return boolean
+   */
+  hasFile(key: string): boolean;
+  /**
+   * Check that the given file is a valid file instance.
+   *
+   * @param file
+   * @return boolean
+   */
+  protected isValidFile(file: UploadedFile): boolean;
   /**
-   * Get an array of all of the files on the request.
+   * Get an object with all the files on the request.
    */
   allFiles(): Record<string, UploadedFile | UploadedFile[]>;
   /**
@@ -848,20 +859,6 @@ declare class Request implements IRequest {
    * @return {string | ReadableStream | Promise<string | ReadableStream>}
    */
   getContent(asStream?: boolean): string | ReadableStream;
-  /**
-   * Determine if the uploaded data contains a file.
-   *
-   * @param  key
-   * @return boolean
-   */
-  hasFile(key: string): boolean;
-  /**
-   * Check that the given file is a valid file instance.
-   *
-   * @param file
-   * @return boolean
-   */
-  protected isValidFile(file: UploadedFile): boolean;
   /**
    * Gets a "parameter" value from any bag.
    *

package/dist/index.d.ts

@@ -585,10 +585,6 @@ declare class Request implements IRequest {
    * Query string parameters (GET).
    */
   query: InputBag;
-  /**
-   * Uploaded files (FILES).
-   */
-  files: FileBag;
   /**
    * Server and execution environment parameters
    */
@@ -664,11 +660,26 @@ declare class Request implements IRequest {
    *
    * @param key
    * @param defaultValue
+   * @param expectArray
    * @returns
    */
-  file<K extends string | undefined = undefined>(key?: K, defaultValue?: any): K extends undefined ? Record<string, UploadedFile | UploadedFile[]> : UploadedFile | UploadedFile[];
+  file<K extends string | undefined = undefined, E extends boolean | undefined = undefined>(key?: K, defaultValue?: any, expectArray?: E): K extends undefined ? Record<string, E extends true ? UploadedFile[] : UploadedFile> : E extends true ? UploadedFile[] : UploadedFile;
+  /**
+   * Determine if the uploaded data contains a file.
+   *
+   * @param  key
+   * @return boolean
+   */
+  hasFile(key: string): boolean;
+  /**
+   * Check that the given file is a valid file instance.
+   *
+   * @param file
+   * @return boolean
+   */
+  protected isValidFile(file: UploadedFile): boolean;
   /**
-   * Get an array of all of the files on the request.
+   * Get an object with all the files on the request.
    */
   allFiles(): Record<string, UploadedFile | UploadedFile[]>;
   /**
@@ -848,20 +859,6 @@ declare class Request implements IRequest {
    * @return {string | ReadableStream | Promise<string | ReadableStream>}
    */
   getContent(asStream?: boolean): string | ReadableStream;
-  /**
-   * Determine if the uploaded data contains a file.
-   *
-   * @param  key
-   * @return boolean
-   */
-  hasFile(key: string): boolean;
-  /**
-   * Check that the given file is a valid file instance.
-   *
-   * @param file
-   * @return boolean
-   */
-  protected isValidFile(file: UploadedFile): boolean;
   /**
    * Gets a "parameter" value from any bag.
    *

package/dist/index.js

@@ -18977,7 +18977,7 @@ var FormRequest = class {
 		};
 		for (const [rawKey, value] of data.entries()) {
 			const key = rawKey.endsWith("[]") ? rawKey.slice(0, -2) : rawKey;
-			if (value instanceof File) {
+			if (value instanceof UploadedFile || value instanceof File) {
 				const uploaded = value instanceof UploadedFile ? value : UploadedFile.createFromBase(value);
 				if (this.dataset.files[key]) {
 					const existing = this.dataset.files[key];
@@ -19068,6 +19068,10 @@ var Request = class Request {
 	*/
 	#json;
 	#uri;
+	/**
+	* Uploaded files (FILES).
+	*/
+	#files;
 	#method = void 0;
 	/**
 	* Gets route parameters.
@@ -19094,10 +19098,6 @@ var Request = class Request {
 	*/
 	query;
 	/**
-	* Uploaded files (FILES).
-	*/
-	files;
-	/**
 	* Server and execution environment parameters
 	*/
 	server;
@@ -19152,7 +19152,7 @@ var Request = class Request {
 		this.query = new InputBag(getQuery(this.event), this.event);
 		this.attributes = new ParamBag(getRouterParams(this.event), this.event);
 		this.cookies = new InputBag(parseCookies(this.event), this.event);
-		this.files = new FileBag(this.formData ? this.formData.files() : {}, this.event);
+		this.#files = new FileBag(this.formData ? this.formData.files() : {}, this.event);
 		this.server = new ServerBag(Object.fromEntries(this.event.req.headers.entries()), this.event);
 		this.headers = new HeaderBag(this.server.getHeaders());
 		this.acceptableContentTypes = [];
@@ -19218,18 +19218,41 @@ var Request = class Request {
 	*
 	* @param key
 	* @param defaultValue
+	* @param expectArray 
 	* @returns
 	*/
-	file(key, defaultValue) {
-		const source = this.allFiles();
-		return key ? data_get(source, key, defaultValue) : source;
+	file(key, defaultValue, expectArray) {
+		const files = data_get(this.allFiles(), key, defaultValue);
+		if (!files) return defaultValue;
+		if (Array.isArray(files)) return expectArray ? files : files[0];
+		return files;
 	}
 	/**
-	* Get an array of all of the files on the request.
+	* Determine if the uploaded data contains a file.
+	*
+	* @param  key
+	* @return boolean
+	*/
+	hasFile(key) {
+		let files = this.file(key, void 0, true);
+		if (!Array.isArray(files)) files = [files];
+		return files.some((e) => this.isValidFile(e));
+	}
+	/**
+	* Check that the given file is a valid file instance.
+	*
+	* @param file
+	* @return boolean
+	*/
+	isValidFile(file) {
+		return file.content instanceof File && file.size > 0;
+	}
+	/**
+	* Get an object with all the files on the request.
 	*/
 	allFiles() {
 		if (this.convertedFiles) return this.convertedFiles;
-		const entries = Object.entries(this.files.all()).filter((e) => e[1] != null);
+		const entries = Object.entries(this.#files.all()).filter((e) => e[1] != null);
 		const files = Object.fromEntries(entries);
 		this.convertedFiles = this.convertUploadedFiles(files);
 		return this.convertedFiles;
@@ -19308,7 +19331,7 @@ var Request = class Request {
 	* Get the keys for all of the input and files.
 	*/
 	keys() {
-		return [...Object.keys(this.input()), ...this.files.keys()];
+		return [...Object.keys(this.input()), ...this.#files.keys()];
 	}
 	/**
 	* Determine if the request is sending JSON.
@@ -19571,26 +19594,6 @@ var Request = class Request {
 		return content;
 	}
 	/**
-	* Determine if the uploaded data contains a file.
-	*
-	* @param  key
-	* @return boolean
-	*/
-	hasFile(key) {
-		let files = this.file(key);
-		if (!Array.isArray(files)) files = [files];
-		return files.some((e) => this.isValidFile(e));
-	}
-	/**
-	* Check that the given file is a valid file instance.
-	*
-	* @param file
-	* @return boolean
-	*/
-	isValidFile(file) {
-		return file.content instanceof File && file.size > 0;
-	}
-	/**
 	* Gets a "parameter" value from any bag.
 	*
 	* This method is mainly useful for libraries that want to provide some flexibility. If you don't need the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/http",
-  "version": "11.5.0",
+  "version": "11.5.1",
   "description": "HTTP kernel, middleware pipeline, request/response classes for H3ravel.",
   "h3ravel": {
     "providers": [