@oino-ts/common 0.18.1 → 0.19.0

package/dist/cjs/OINORequest.js

@@ -48,10 +48,10 @@ class OINOHttpRequest extends OINORequest {
      */
     constructor(init) {
         super(init);
-        this.url = init.url;
-        this.method = init.method ?? "GET";
+        this.url = typeof init.url === "string" ? new URL(init.url) : init.url;
+        this.method = init.method?.toUpperCase() ?? "GET";
         this.headers = new _1.OINOHeaders(init.headers);
-        this.body = init.body;
+        this.body = init.body ?? null;
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -122,10 +122,13 @@ class OINOHttpRequest extends OINORequest {
      *
      */
     bodyAsText() {
-        if (this.body instanceof Uint8Array) {
+        if (this.body == null) {
+            return "";
+        }
+        else if (this.body instanceof Uint8Array) {
             return new TextDecoder().decode(this.body);
         }
-        else if (this.body instanceof Object) {
+        else if (typeof this.body === "object") {
             return JSON.stringify(this.body);
         }
         else {
@@ -160,7 +163,7 @@ class OINOHttpRequest extends OINORequest {
         else if (this.body instanceof Uint8Array) {
             return node_buffer_1.Buffer.from(this.body);
         }
-        else if (this.body instanceof Object) {
+        else if (typeof this.body === "object") {
             return node_buffer_1.Buffer.from(JSON.stringify(this.body), "utf-8");
         }
         else {

package/dist/esm/OINORequest.js

@@ -44,10 +44,10 @@ export class OINOHttpRequest extends OINORequest {
      */
     constructor(init) {
         super(init);
-        this.url = init.url;
-        this.method = init.method ?? "GET";
+        this.url = typeof init.url === "string" ? new URL(init.url) : init.url;
+        this.method = init.method?.toUpperCase() ?? "GET";
         this.headers = new OINOHeaders(init.headers);
-        this.body = init.body;
+        this.body = init.body ?? null;
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -118,10 +118,13 @@ export class OINOHttpRequest extends OINORequest {
      *
      */
     bodyAsText() {
-        if (this.body instanceof Uint8Array) {
+        if (this.body == null) {
+            return "";
+        }
+        else if (this.body instanceof Uint8Array) {
             return new TextDecoder().decode(this.body);
         }
-        else if (this.body instanceof Object) {
+        else if (typeof this.body === "object") {
             return JSON.stringify(this.body);
         }
         else {
@@ -156,7 +159,7 @@ export class OINOHttpRequest extends OINORequest {
         else if (this.body instanceof Uint8Array) {
             return Buffer.from(this.body);
         }
-        else if (this.body instanceof Object) {
+        else if (typeof this.body === "object") {
             return Buffer.from(JSON.stringify(this.body), "utf-8");
         }
         else {

package/dist/types/OINORequest.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { Buffer } from "node:buffer";
 import { OINOContentType, OINOHeaders, OINOHeadersInit } from ".";
 export interface OINORequestInit {
@@ -19,11 +21,12 @@ export declare class OINORequest {
      */
     constructor(init?: OINORequestInit);
 }
+export type OINOHttpData = string | Buffer | Uint8Array | null;
 export interface OINOHttpRequestInit extends OINORequestInit {
-    url?: URL;
+    url?: URL | string;
     method?: string;
     headers?: OINOHeadersInit;
-    body?: string | Buffer | Uint8Array | object | null | undefined;
+    body?: OINOHttpData;
     requestType?: OINOContentType;
     responseType?: OINOContentType;
     multipartBoundary?: string;
@@ -33,15 +36,15 @@ export interface OINOHttpRequestInit extends OINORequestInit {
  * Specialized result for HTTP responses.
  */
 export declare class OINOHttpRequest extends OINORequest {
-    readonly url?: URL;
-    readonly method: string;
-    readonly headers: OINOHeaders;
-    readonly body: string | Buffer | Uint8Array | object | null | undefined;
-    readonly requestType: OINOContentType;
-    readonly responseType: OINOContentType;
-    readonly multipartBoundary?: string;
-    readonly lastModified?: number;
-    readonly etags?: string[];
+    url?: URL;
+    method: string;
+    headers: OINOHeaders;
+    body: OINOHttpData;
+    requestType: OINOContentType;
+    responseType: OINOContentType;
+    multipartBoundary?: string;
+    lastModified?: number;
+    etags?: string[];
     /**
      * Constructor for a `OINOHttpRequest`
      *

package/dist/types/OINOResult.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { Buffer } from "node:buffer";
 import { OINOHeaders, OINOHeadersInit } from ".";
 export interface OINOResultInit {

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 export { OINOBenchmark, OINOMemoryBenchmark } from "./OINOBenchmark.js";
 export { OINOLog, OINOLogLevel, OINOConsoleLog } from "./OINOLog.js";
 export { OINOResult, OINOHttpResult, type OINOResultInit, type OINOHttpResultInit } from "./OINOResult.js";
-export { OINORequest, OINOHttpRequest, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js";
+export { OINORequest, OINOHttpRequest, type OINOHttpData, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js";
 export { OINOStr } from "./OINOStr.js";
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js";
 export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/common",
-  "version": "0.18.1",
+  "version": "0.19.0",
   "description": "OINO TS package for common classes.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,7 +19,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@oino-ts/types": "0.18.1",
+    "@oino-ts/types": "0.19.0",
     "@types/node": "^22.0.0",
     "typescript": "~5.9.0"
   },

package/src/OINORequest.ts

@@ -32,11 +32,13 @@ export class OINORequest {
     }
 }
 
+export type OINOHttpData = string|Buffer|Uint8Array|null
+
 export interface OINOHttpRequestInit extends OINORequestInit {
-    url?: URL
+    url?: URL|string
     method?: string
     headers?: OINOHeadersInit
-    body?: string|Buffer|Uint8Array|object|null|undefined
+    body?: OINOHttpData
     requestType?:OINOContentType
     responseType?:OINOContentType
     multipartBoundary?:string
@@ -47,15 +49,15 @@ export interface OINOHttpRequestInit extends OINORequestInit {
  * Specialized result for HTTP responses.
  */
 export class OINOHttpRequest extends OINORequest {
-    readonly url?: URL
-    readonly method: string
-    readonly headers: OINOHeaders
-    readonly body: string|Buffer|Uint8Array|object|null|undefined
-    readonly requestType:OINOContentType
-    readonly responseType:OINOContentType
-    readonly multipartBoundary?:string
-    readonly lastModified?:number
-    readonly etags?:string[]
+    url?: URL
+    method: string
+    headers: OINOHeaders
+    body: OINOHttpData
+    requestType:OINOContentType
+    responseType:OINOContentType
+    multipartBoundary?:string
+    lastModified?:number
+    etags?:string[]
 
     /**
      * Constructor for a `OINOHttpRequest` 
@@ -65,10 +67,10 @@ export class OINOHttpRequest extends OINORequest {
      */
     constructor(init: OINOHttpRequestInit) {
         super(init)
-        this.url = init.url 
-        this.method = init.method ?? "GET"
+        this.url = typeof init.url === "string" ? new URL(init.url) : init.url
+        this.method = init.method?.toUpperCase() ?? "GET"
         this.headers = new OINOHeaders(init.headers)
-        this.body = init.body 
+        this.body = init.body ?? null
         this.multipartBoundary = ""
         this.lastModified = init.lastModified
 
@@ -139,10 +141,13 @@ export class OINOHttpRequest extends OINORequest {
      * 
      */
     bodyAsText(): string {
-        if (this.body instanceof Uint8Array) {
+        if (this.body == null) {
+            return ""
+
+        } else if (this.body instanceof Uint8Array) {
             return new TextDecoder().decode(this.body)
 
-        } else if (this.body instanceof Object) {
+        } else if (typeof this.body === "object") {
             return JSON.stringify(this.body)
             
         } else {
@@ -180,7 +185,7 @@ export class OINOHttpRequest extends OINORequest {
         } else if (this.body instanceof Uint8Array) {
             return Buffer.from(this.body)
 
-        } else if (this.body instanceof Object) {
+        } else if (typeof this.body === "object") {
             return Buffer.from(JSON.stringify(this.body), "utf-8")
 
         } else {

package/src/index.ts

@@ -1,7 +1,7 @@
 export { OINOBenchmark, OINOMemoryBenchmark } from "./OINOBenchmark.js"
 export { OINOLog, OINOLogLevel, OINOConsoleLog } from "./OINOLog.js"
 export { OINOResult, OINOHttpResult, type OINOResultInit, type OINOHttpResultInit } from "./OINOResult.js"
-export { OINORequest, OINOHttpRequest, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js"
+export { OINORequest, OINOHttpRequest, type OINOHttpData, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js"
 export { OINOStr } from "./OINOStr.js"
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js"
 export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js"