yedra 0.9.2 → 0.9.4

package/dist/routing/test.js

@@ -1,75 +1,63 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestService = void 0;
-const types_1 = require("node:util/types");
-const app_1 = require("./app");
-const http_1 = require("./http");
-const log_1 = require("./log");
-class TestService {
+import { isUint8Array } from 'node:util/types';
+import { App } from './app.js';
+import { Http, HttpRequestError, HttpResponse } from './http.js';
+import { Log } from './log.js';
+export class TestService {
     constructor(target, headers) {
         this.target = target;
         this.headers = headers;
-        const log = new log_1.Log();
-        this.http = new http_1.Http(log);
+        const log = new Log();
+        this.http = new Http(log);
     }
-    get(path, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.request('GET', path, undefined, headers);
-        });
+    async get(path, headers) {
+        return await this.request('GET', path, undefined, headers);
     }
-    post(path, body, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.request('POST', path, body, headers);
-        });
+    async post(path, body, headers) {
+        return await this.request('POST', path, body, headers);
     }
-    request(method, path, body, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.target instanceof app_1.App) {
-                // test local server
-                let buffer;
-                let contentHeader = {};
-                if (body) {
-                    if ((0, types_1.isUint8Array)(body)) {
-                        buffer = Buffer.from(body);
-                    }
-                    else {
-                        buffer = Buffer.from(JSON.stringify(body), 'utf-8');
-                        contentHeader = { 'content-type': 'application/json' };
-                    }
+    async request(method, path, body, headers) {
+        if (this.target instanceof App) {
+            // test local server
+            let buffer;
+            let contentHeader = {};
+            if (body) {
+                if (isUint8Array(body)) {
+                    buffer = Buffer.from(body);
                 }
-                // TODO: extract query parameters
-                const response = yield this.target.handle({
-                    method,
-                    url: path,
-                    query: {},
-                    body: buffer !== null && buffer !== void 0 ? buffer : Buffer.from(''),
-                    headers: Object.assign(Object.assign(Object.assign({}, headers), contentHeader), this.headers),
-                });
-                return new http_1.HttpResponse(response.status, response.headers, response.body);
-            }
-            // test remote server
-            try {
-                return yield this.http.request(method, this.target + path, body, Object.assign(Object.assign({}, this.headers), headers));
-            }
-            catch (error) {
-                if (error instanceof http_1.HttpRequestError && error.response) {
-                    // return response even on errors
-                    return error.response;
+                else {
+                    buffer = Buffer.from(JSON.stringify(body), 'utf-8');
+                    contentHeader = { 'content-type': 'application/json' };
                 }
-                // non-HTTP error, doesn't make sense to run other tests
-                console.error(`Could not connect to ${this.target}. Make sure the server is running and reachable.`);
-                process.exit(1);
             }
-        });
+            // TODO: extract query parameters
+            const response = await this.target.handle({
+                method,
+                url: path,
+                query: {},
+                body: buffer ?? Buffer.from(''),
+                headers: {
+                    ...headers,
+                    ...contentHeader,
+                    ...this.headers,
+                },
+            });
+            return new HttpResponse(response.status, response.headers, response.body);
+        }
+        // test remote server
+        try {
+            return await this.http.request(method, this.target + path, body, {
+                ...this.headers,
+                ...headers,
+            });
+        }
+        catch (error) {
+            if (error instanceof HttpRequestError && error.response) {
+                // return response even on errors
+                return error.response;
+            }
+            // non-HTTP error, doesn't make sense to run other tests
+            console.error(`Could not connect to ${this.target}. Make sure the server is running and reachable.`);
+            process.exit(1);
+        }
     }
 }
-exports.TestService = TestService;

package/dist/validation/array.d.ts

@@ -1,6 +1,6 @@
-import type { Typeof } from './body';
-import { ModifiableSchema } from './modifiable';
-import type { Schema } from './schema';
+import type { Typeof } from './body.js';
+import { ModifiableSchema } from './modifiable.js';
+import type { Schema } from './schema.js';
 declare class ArraySchema<ItemSchema extends Schema<unknown>> extends ModifiableSchema<Typeof<ItemSchema>[]> {
     private readonly itemSchema;
     private readonly minItems?;

package/dist/validation/array.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.array = void 0;
-const error_1 = require("./error");
-const modifiable_1 = require("./modifiable");
-class ArraySchema extends modifiable_1.ModifiableSchema {
+import { Issue, ValidationError } from './error.js';
+import { ModifiableSchema } from './modifiable.js';
+class ArraySchema extends ModifiableSchema {
     constructor(itemSchema, minItems, maxItems) {
         super();
         this.itemSchema = itemSchema;
@@ -34,18 +31,18 @@ class ArraySchema extends modifiable_1.ModifiableSchema {
     }
     parse(obj) {
         if (!Array.isArray(obj)) {
-            throw new error_1.ValidationError([
-                new error_1.Issue('invalidType', [], 'array', typeof obj),
+            throw new ValidationError([
+                new Issue('invalidType', [], 'array', typeof obj),
             ]);
         }
         if (this.minItems && obj.length < this.minItems) {
-            throw new error_1.ValidationError([
-                new error_1.Issue('tooShort', [], this.minItems.toString(), obj.length.toString()),
+            throw new ValidationError([
+                new Issue('tooShort', [], this.minItems.toString(), obj.length.toString()),
             ]);
         }
         if (this.maxItems && obj.length > this.maxItems) {
-            throw new error_1.ValidationError([
-                new error_1.Issue('tooLong', [], this.maxItems.toString(), obj.length.toString()),
+            throw new ValidationError([
+                new Issue('tooLong', [], this.maxItems.toString(), obj.length.toString()),
             ]);
         }
         const elems = [];
@@ -55,7 +52,7 @@ class ArraySchema extends modifiable_1.ModifiableSchema {
                 elems.push(this.itemSchema.parse(obj[i]));
             }
             catch (error) {
-                if (error instanceof error_1.ValidationError) {
+                if (error instanceof ValidationError) {
                     issues.push(...error.withPrefix(i.toString()));
                 }
                 else {
@@ -64,7 +61,7 @@ class ArraySchema extends modifiable_1.ModifiableSchema {
             }
         }
         if (issues.length > 0) {
-            throw new error_1.ValidationError(issues);
+            throw new ValidationError(issues);
         }
         return elems;
     }
@@ -81,5 +78,4 @@ class ArraySchema extends modifiable_1.ModifiableSchema {
  * A schema matching arrays of the provided item type.
  * @param itemSchema - The schema for array items.
  */
-const array = (itemSchema) => new ArraySchema(itemSchema);
-exports.array = array;
+export const array = (itemSchema) => new ArraySchema(itemSchema);

package/dist/validation/body.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BodyType = void 0;
 /**
  * The base class for all body types.
  */
-class BodyType {
+export class BodyType {
     constructor() {
         this._typeof = undefined;
     }
 }
-exports.BodyType = BodyType;

package/dist/validation/boolean.d.ts

@@ -1,4 +1,4 @@
-import { ModifiableSchema } from './modifiable';
+import { ModifiableSchema } from './modifiable.js';
 declare class BooleanSchema extends ModifiableSchema<boolean> {
     parse(obj: unknown): boolean;
     documentation(): object;

package/dist/validation/boolean.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.boolean = void 0;
-const error_1 = require("./error");
-const modifiable_1 = require("./modifiable");
-class BooleanSchema extends modifiable_1.ModifiableSchema {
+import { Issue, ValidationError } from './error.js';
+import { ModifiableSchema } from './modifiable.js';
+class BooleanSchema extends ModifiableSchema {
     parse(obj) {
         if (typeof obj !== 'boolean') {
-            throw new error_1.ValidationError([
-                new error_1.Issue('invalidType', [], 'boolean', typeof obj),
+            throw new ValidationError([
+                new Issue('invalidType', [], 'boolean', typeof obj),
             ]);
         }
         return obj;
@@ -21,5 +18,4 @@ class BooleanSchema extends modifiable_1.ModifiableSchema {
 /**
  * A schema matching any boolean.
  */
-const boolean = () => new BooleanSchema();
-exports.boolean = boolean;
+export const boolean = () => new BooleanSchema();

package/dist/validation/date.d.ts

@@ -1,4 +1,4 @@
-import { ModifiableSchema } from './modifiable';
+import { ModifiableSchema } from './modifiable.js';
 declare class DateSchema extends ModifiableSchema<Date> {
     parse(obj: unknown): Date;
     documentation(): object;

package/dist/validation/date.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.date = void 0;
-const types_1 = require("node:util/types");
-const error_1 = require("./error");
-const modifiable_1 = require("./modifiable");
-class DateSchema extends modifiable_1.ModifiableSchema {
+import { isDate } from 'node:util/types';
+import { Issue, ValidationError } from './error.js';
+import { ModifiableSchema } from './modifiable.js';
+class DateSchema extends ModifiableSchema {
     parse(obj) {
-        if ((0, types_1.isDate)(obj)) {
+        if (isDate(obj)) {
             return obj;
         }
         if (typeof obj === 'string' || typeof obj === 'number') {
@@ -15,8 +12,8 @@ class DateSchema extends modifiable_1.ModifiableSchema {
                 return date;
             }
         }
-        throw new error_1.ValidationError([
-            new error_1.Issue('invalidType', [], 'date', typeof obj),
+        throw new ValidationError([
+            new Issue('invalidType', [], 'date', typeof obj),
         ]);
     }
     documentation() {
@@ -30,5 +27,4 @@ class DateSchema extends modifiable_1.ModifiableSchema {
  * A schema matching date objects, or strings and numbers that can be
  * interpreted as dates.
  */
-const date = () => new DateSchema();
-exports.date = date;
+export const date = () => new DateSchema();

package/dist/validation/doc.d.ts

@@ -1,4 +1,4 @@
-import { Schema } from './schema';
+import { Schema } from './schema.js';
 export declare class DocSchema<T> extends Schema<T> {
     private readonly _schema;
     private readonly _description;

package/dist/validation/doc.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DocSchema = void 0;
-const schema_1 = require("./schema");
-class DocSchema extends schema_1.Schema {
+import { Schema } from './schema.js';
+export class DocSchema extends Schema {
     constructor(schema, description, example) {
         super();
         this._schema = schema;
@@ -13,10 +10,13 @@ class DocSchema extends schema_1.Schema {
         return this._schema.parse(obj);
     }
     documentation() {
-        return Object.assign({ description: this._description, example: this._example }, this._schema.documentation());
+        return {
+            description: this._description,
+            example: this._example,
+            ...this._schema.documentation(),
+        };
     }
     isOptional() {
         return this._schema.isOptional();
     }
 }
-exports.DocSchema = DocSchema;

package/dist/validation/either.d.ts

@@ -1,4 +1,4 @@
-import { BodyType, type Typeof } from './body';
+import { BodyType, type Typeof } from './body.js';
 declare class EitherBody<T extends [...BodyType<unknown>[]]> extends BodyType<Typeof<T[number]>> {
     private options;
     constructor(options: T);

package/dist/validation/either.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.either = void 0;
-const body_1 = require("./body");
-const error_1 = require("./error");
-class EitherBody extends body_1.BodyType {
+import { BodyType } from './body.js';
+import { ValidationError } from './error.js';
+class EitherBody extends BodyType {
     constructor(options) {
         super();
         this.options = options;
@@ -15,7 +12,7 @@ class EitherBody extends body_1.BodyType {
                 return option.deserialize(buffer, contentType);
             }
             catch (error) {
-                if (error instanceof error_1.ValidationError) {
+                if (error instanceof ValidationError) {
                     issues.push(...error.issues);
                 }
                 else {
@@ -23,12 +20,12 @@ class EitherBody extends body_1.BodyType {
                 }
             }
         }
-        throw new error_1.ValidationError(issues);
+        throw new ValidationError(issues);
     }
     bodyDocs() {
         let docs = {};
         for (const option of this.options) {
-            docs = Object.assign(Object.assign({}, docs), option.bodyDocs());
+            docs = { ...docs, ...option.bodyDocs() };
         }
         return docs;
     }
@@ -38,5 +35,4 @@ class EitherBody extends body_1.BodyType {
  * @param options
  * @returns
  */
-const either = (...options) => new EitherBody(options);
-exports.either = either;
+export const either = (...options) => new EitherBody(options);

package/dist/validation/enum.d.ts

@@ -1,4 +1,4 @@
-import { ModifiableSchema } from './modifiable';
+import { ModifiableSchema } from './modifiable.js';
 declare class EnumSchema<T extends [...(string | number)[]]> extends ModifiableSchema<T[number]> {
     private readonly options;
     constructor(options: T);

package/dist/validation/enum.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._enum = void 0;
-const error_1 = require("./error");
-const modifiable_1 = require("./modifiable");
-class EnumSchema extends modifiable_1.ModifiableSchema {
+import { Issue, ValidationError } from './error.js';
+import { ModifiableSchema } from './modifiable.js';
+class EnumSchema extends ModifiableSchema {
     constructor(options) {
         super();
         this.options = options;
@@ -12,9 +9,9 @@ class EnumSchema extends modifiable_1.ModifiableSchema {
         if (!obj ||
             (typeof obj !== 'string' && typeof obj !== 'number') ||
             !this.options.includes(obj)) {
-            throw new error_1.ValidationError([
+            throw new ValidationError([
                 // TODO: better validation message
-                new error_1.Issue('invalidType', [], this.options.join(', '), typeof obj === 'string' || typeof obj === 'number'
+                new Issue('invalidType', [], this.options.join(', '), typeof obj === 'string' || typeof obj === 'number'
                     ? obj.toString()
                     : typeof obj),
             ]);
@@ -38,5 +35,4 @@ class EnumSchema extends modifiable_1.ModifiableSchema {
  * type OptionsType = y.Typeof<typeof options>; // 3 | 4 | 'hello'
  * ```
  */
-const _enum = (...options) => new EnumSchema(options);
-exports._enum = _enum;
+export const _enum = (...options) => new EnumSchema(options);

package/dist/validation/error.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidationError = exports.Issue = void 0;
 const issueMessages = {
     invalidType: "Expected '${expected}' but got '${actual}'",
     tooSmall: "Must be at least '${expected}' but was '${actual}'",
@@ -11,7 +8,7 @@ const issueMessages = {
     missingProperty: 'Required',
     invalidContentType: "Expected content type '${expected}' but got '${actual}'",
 };
-class Issue {
+export class Issue {
     constructor(code, path, expected, actual) {
         this.code = code;
         this.path = path;
@@ -19,13 +16,12 @@ class Issue {
         this.actual = actual;
     }
     format(messages) {
-        return (messages !== null && messages !== void 0 ? messages : issueMessages)[this.code]
+        return (messages ?? issueMessages)[this.code]
             .replace('${expected}', this.expected)
             .replace('${actual}', this.actual);
     }
 }
-exports.Issue = Issue;
-class ValidationError extends Error {
+export class ValidationError extends Error {
     constructor(issues) {
         super(ValidationError.formatIssues(issues));
         this.issues = issues;
@@ -49,9 +45,8 @@ class ValidationError extends Error {
     static formatIssues(issues, messages) {
         const formattedIssues = [];
         for (const issue of issues) {
-            formattedIssues.push(`Error at '${issue.path.join('.')}': ${issue.format(messages !== null && messages !== void 0 ? messages : issueMessages)}.`);
+            formattedIssues.push(`Error at '${issue.path.join('.')}': ${issue.format(messages ?? issueMessages)}.`);
         }
         return formattedIssues.join(' ');
     }
 }
-exports.ValidationError = ValidationError;

package/dist/validation/intersection.d.ts

@@ -1,5 +1,5 @@
-import { ModifiableSchema } from './modifiable';
-import type { Schema } from './schema';
+import { ModifiableSchema } from './modifiable.js';
+import type { Schema } from './schema.js';
 export declare class IntersectionSchema<T, U> extends ModifiableSchema<T & U> {
     private left;
     private right;

package/dist/validation/intersection.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.intersection = exports.IntersectionSchema = void 0;
-const error_1 = require("./error");
-const modifiable_1 = require("./modifiable");
-class IntersectionSchema extends modifiable_1.ModifiableSchema {
+import { ValidationError } from './error.js';
+import { ModifiableSchema } from './modifiable.js';
+export class IntersectionSchema extends ModifiableSchema {
     constructor(left, right) {
         super();
         this.left = left;
@@ -17,7 +14,7 @@ class IntersectionSchema extends modifiable_1.ModifiableSchema {
             left = this.left.parse(obj);
         }
         catch (error) {
-            if (error instanceof error_1.ValidationError) {
+            if (error instanceof ValidationError) {
                 issues.push(...error.issues);
             }
             else {
@@ -28,7 +25,7 @@ class IntersectionSchema extends modifiable_1.ModifiableSchema {
             right = this.right.parse(obj);
         }
         catch (error) {
-            if (error instanceof error_1.ValidationError) {
+            if (error instanceof ValidationError) {
                 issues.push(...error.issues);
             }
             else {
@@ -36,9 +33,9 @@ class IntersectionSchema extends modifiable_1.ModifiableSchema {
             }
         }
         if (!(left && right)) {
-            throw new error_1.ValidationError(issues);
+            throw new ValidationError(issues);
         }
-        return Object.assign(Object.assign({}, left), right);
+        return { ...left, ...right };
     }
     documentation() {
         return {
@@ -46,11 +43,9 @@ class IntersectionSchema extends modifiable_1.ModifiableSchema {
         };
     }
 }
-exports.IntersectionSchema = IntersectionSchema;
 /**
  * A schema that only matches values that match both base schemas.
  * @param schema0 - The first schema.
  * @param schema1 - The second schema.
  */
-const intersection = (schema0, schema1) => new IntersectionSchema(schema0, schema1);
-exports.intersection = intersection;
+export const intersection = (schema0, schema1) => new IntersectionSchema(schema0, schema1);

package/dist/validation/modifiable.d.ts

@@ -1,5 +1,5 @@
-import { DocSchema } from './doc';
-import { Schema } from './schema';
+import { DocSchema } from './doc.js';
+import { Schema } from './schema.js';
 export declare abstract class ModifiableSchema<T> extends Schema<T> {
     /**
      * Mark this schema as optional.

package/dist/validation/modifiable.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModifiableSchema = void 0;
-const doc_1 = require("./doc");
-const schema_1 = require("./schema");
-class ModifiableSchema extends schema_1.Schema {
+import { DocSchema } from './doc.js';
+import { Schema } from './schema.js';
+export class ModifiableSchema extends Schema {
     /**
      * Mark this schema as optional.
      */
@@ -15,11 +12,10 @@ class ModifiableSchema extends schema_1.Schema {
      * @param doc - The documentation.
      */
     doc(doc) {
-        return new doc_1.DocSchema(this, doc.description, doc.example);
+        return new DocSchema(this, doc.description, doc.example);
     }
 }
-exports.ModifiableSchema = ModifiableSchema;
-class OptionalSchema extends schema_1.Schema {
+class OptionalSchema extends Schema {
     constructor(schema) {
         super();
         this.schema = schema;
@@ -29,7 +25,7 @@ class OptionalSchema extends schema_1.Schema {
      * @param doc - The documentation.
      */
     doc(doc) {
-        return new doc_1.DocSchema(this, doc.description, doc.example);
+        return new DocSchema(this, doc.description, doc.example);
     }
     parse(obj) {
         if (obj === undefined) {

package/dist/validation/none.d.ts

@@ -1,4 +1,4 @@
-import { BodyType } from './body';
+import { BodyType } from './body.js';
 export declare class NoneBody extends BodyType<void> {
     deserialize(buffer: Uint8Array, contentType: string): void;
     bodyDocs(): object;

package/dist/validation/none.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.none = exports.NoneBody = void 0;
-const body_1 = require("./body");
-class NoneBody extends body_1.BodyType {
+import { BodyType } from './body.js';
+export class NoneBody extends BodyType {
     deserialize(buffer, contentType) {
         return;
     }
@@ -11,9 +8,7 @@ class NoneBody extends body_1.BodyType {
         return {};
     }
 }
-exports.NoneBody = NoneBody;
 /**
  * Accepts no input body.
  */
-const none = () => new NoneBody();
-exports.none = none;
+export const none = () => new NoneBody();

package/dist/validation/number.d.ts

@@ -1,4 +1,4 @@
-import { ModifiableSchema } from './modifiable';
+import { ModifiableSchema } from './modifiable.js';
 declare class NumberSchema extends ModifiableSchema<number> {
     private readonly minValue?;
     private readonly maxValue?;