From af749320bbdced7684b389a25256b22cf8d2867b Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 16 Feb 2024 15:59:31 -0500 Subject: [PATCH 001/238] Add a structure for a composables tutorial --- composables.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 composables.md diff --git a/composables.md b/composables.md new file mode 100644 index 00000000..d99d5a38 --- /dev/null +++ b/composables.md @@ -0,0 +1,45 @@ +# Composables + +## Composing type-safe functions +Let's say we ant to compose two functions: `add : (a: number, b:number) => number` and `toString : (a: number) => string`. We also want the composition to preserve the types, we can continue living in the happy world of type-safe coding, the result would be a function that adds and converts the result to string, something like `addAndReturnString : (a: number, b: number) => string`. + +Performing this operation manually is straightforward + +```typescript +function addAndReturnString(a: number, b: number) : string { + return toString(add(a, b)) +} +``` + +It would be neat if typescript could the typing for us and provided a more generic mechanism to compose these functions. Something like what you find in libraries such as [lodash](https://lodash.com/docs/4.17.15#flow) + +Using composables the code could be written as: + + ```typescript +const addAndReturnString = pipe(add, toString) +``` + +We can also extend the same reasoning to functions that return promises in a transparent way. Imagine we have `add : (a: number, b:number) => Promise` and `toString : (a: number) => Promise`, the composition above would work in the same fashion, returning a function `addAndReturnString(a: number, b: number) : Promise` that will wait for each promise in the chain before applying the next function. + +This library also defines several operations besides the `pipe` to compose functions in arbitrary ways, giving a powerful tool for the developer to reason about the data flow without worrying about mistakenly connecting the wrong parameters or forgetting to unwrap some promise or handle some error along the way. + +## Creating primitive composables + +> here we will have a quick intro for the `Composable` and `Result` types and how to call composables and check for results + +## Handling errors +> Quick motivation for having Composables return an error over dealing with exceptions + +### Catching errors +> We still dont have a catch combinator, but it would make a lot of sense and it seems more relevant than error mapping. + +### Mapping errors +> Motivation and example for mapping errors + +## Sequential composition +> Here we explain + +### Using non-composables (mapping) + +## Parallel composition + From ee7d2a0e975053e4dbc633de14265464e6048aab Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Mon, 26 Feb 2024 14:23:33 -0500 Subject: [PATCH 002/238] Adding section about building primitive composables --- composables.md | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/composables.md b/composables.md index d99d5a38..cf2a33a1 100644 --- a/composables.md +++ b/composables.md @@ -15,7 +15,7 @@ It would be neat if typescript could the typing for us and provided a more gener Using composables the code could be written as: - ```typescript +```typescript const addAndReturnString = pipe(add, toString) ``` @@ -25,7 +25,33 @@ This library also defines several operations besides the `pipe` to compose funct ## Creating primitive composables -> here we will have a quick intro for the `Composable` and `Result` types and how to call composables and check for results +A `Composable` is a function that returns a `Promise>` where `T` is any type you want to return. Values of the type `Result` will represent either a failure (which carries a list of errors) or a success, where the computation has returned a value within the type `T`. + +So we can define the `add` and the `toString` functions as a `Composable`: + +```typescript +const add = composable((a: number, b: number) => a + b) + ^? Composable<(a: number, b: number) => number> + +const toString = composable((a: unknown) => `${a}`) +``` + +Now we can compose them using pipe to create `addAndReturnString`: + +```typescript +const addAndReturnString = pipe(add, toString) + ^? Composable<(a: number, b: number) => string> +``` + +Note that trying to compose pipe flipping the arguments will not type-check: + +```typescript +const addAndReturnString = pipe(toString, add) + ^? ["Fail to compose", string, "does not fit in", number] +``` + +The error message comes in the form of an inferred type (the type checker error is a bit more cryptic). +Since pipe will compose from left to right, the only `string` output from `toString` will not fit into the first argument of `add` which is a `number`. ## Handling errors > Quick motivation for having Composables return an error over dealing with exceptions From 84cf99dcfea78654b8d12d5313973c198ec5d698 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Mon, 26 Feb 2024 17:11:49 -0500 Subject: [PATCH 003/238] Examples for composition and error handling --- composables.md | 60 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/composables.md b/composables.md index cf2a33a1..e4d0ad39 100644 --- a/composables.md +++ b/composables.md @@ -36,6 +36,7 @@ const add = composable((a: number, b: number) => a + b) const toString = composable((a: unknown) => `${a}`) ``` +## Sequential composition Now we can compose them using pipe to create `addAndReturnString`: ```typescript @@ -53,19 +54,58 @@ const addAndReturnString = pipe(toString, add) The error message comes in the form of an inferred type (the type checker error is a bit more cryptic). Since pipe will compose from left to right, the only `string` output from `toString` will not fit into the first argument of `add` which is a `number`. -## Handling errors -> Quick motivation for having Composables return an error over dealing with exceptions - -### Catching errors -> We still dont have a catch combinator, but it would make a lot of sense and it seems more relevant than error mapping. +### Using non-composables (mapping) -### Mapping errors -> Motivation and example for mapping errors +Sometimes we want to use a simple function in this sort of sequential composition. Imagine that `toString` is not a composable, and you just want to apply a plain old function to the result of `add` when it succeeds. +The function `map` can be used for this, since we are mapping over the result of a `Composable`: -## Sequential composition -> Here we explain +```typescript +const addAndReturnString = map(add, String) +``` -### Using non-composables (mapping) +Note that if your mapper function has to be `async` you should wrap it in `composable` and use `pipe` instead. ## Parallel composition +There are also functions compositions where all its parameters are excuted in parallel, like `Promise.all` will execute several promises and wait for all of them. +The `all` function is one way of composing in this fashion. Assuming we want to apply our `add` and multiply the two numbers returning a success only once both operations succeed: + +```typescript +const add = composable((a: number, b: number) => a + b) +const mul = composable((a: number, b: number) => a * b) +const addAndMul = all(add, mul) + ^? Composable<(args_0: number, args_1: number) => [number, number]> +``` + +The result of the composition comes in a tuple in the same order as the functions were passed to `all`. +Note that the input functions will also have to type-check and all the functions have to work from the same input. + +## Handling errors +Since a `Composable` always return a type `Result` that might be either a failure or a success, there are never exceptions to catch. Any exception inside a `Composable` will return as an object with the shape: `{ success: false, errors: Error[] }`. + +Two neat consequences is that we can handle errors using functions (no need for try/catch blocks) and handle multiple errors at once. + +### Catching errors +To catch an error you need a second `Composable` capable of receiving `{ errors: Error[] }`. This composable is called when the first function fails: + +```typescript +const fetchBody = composable((url: string) => fetch(url).then((r) => r.text())) +const emptyOnError = composable(({errors}: { errors: Error[] }) => { + console.error("Something went wrong, returning empty string", errors) + return "" +}) +const fetchThatNeverFails = catchError(fetchBody, emptyOnError) +``` + +### Mapping errors +Sometimes we just need to transform one error into something that would make more sense for the caller. Imagine you have our `fetchBody` defined above, but we want a custom error type for when the input URL is invalid. You can map over the failures using `mapError` and a function with the type `({ errors: Error[] }) => { errors: Error[] }`. + +```typescript +class InvalidUrlError extends Error {} +const fetchBodyWithCustomError = mapError(fetchBody, ({ errors }) => ({ + errors: errors.map((e) => + e.message.includes('Invalid URL') ? new InvalidUrlError() : e, + ), +})) +``` + From 4cb3ae1beef1aaad044e6b7b28127b631ccd6bf2 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 23 Feb 2024 15:11:08 -0500 Subject: [PATCH 004/238] Ensure our ErrorWithMessage type always has an attched exception --- src/all.test.ts | 6 +++++- src/branch.test.ts | 5 ++++- src/composable/index.test.ts | 1 + src/composable/types.ts | 2 +- src/constructor.test.ts | 5 +++-- src/errors.ts | 4 +++- src/map-error.test.ts | 17 ++++++++++++----- src/test-prelude.ts | 11 ++++++++--- src/trace.test.ts | 3 ++- 9 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index b406a6c9..4dc43f13 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -11,6 +11,7 @@ import { all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { ErrorWithMessage } from './index.ts' describe('all', () => { it('should combine two domain functions into one', async () => { @@ -106,7 +107,10 @@ describe('all', () => { assertObjectMatch( await c({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error A' }, { message: 'Error B' }], + errors: [ + { message: 'Error A' }, + { message: 'Error B' }, + ] as ErrorWithMessage[], }), ) }) diff --git a/src/branch.test.ts b/src/branch.test.ts index 0eede0c4..6314ce39 100644 --- a/src/branch.test.ts +++ b/src/branch.test.ts @@ -11,6 +11,7 @@ import { branch, pipe, all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { ErrorWithMessage } from './types.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { @@ -124,7 +125,9 @@ describe('branch', () => { assertObjectMatch( await c({ id: 1 }), makeErrorResult({ - errors: [{ message: 'condition function failed' }], + errors: [ + { message: 'condition function failed' }, + ] as ErrorWithMessage[], }), ) }) diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index 2782ecaf..5517eceb 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -349,6 +349,7 @@ describe('map', () => { }) const cleanError = (err: ErrorWithMessage) => ({ + ...err, message: err.message + '!!!', }) describe('mapError', () => { diff --git a/src/composable/types.ts b/src/composable/types.ts index cc028feb..ef1be9c7 100644 --- a/src/composable/types.ts +++ b/src/composable/types.ts @@ -21,7 +21,7 @@ type First = T extends [infer F, ...infer _I] : never type ErrorWithMessage = { message: string - exception?: unknown + exception: unknown } type Failure = { success: false diff --git a/src/constructor.test.ts b/src/constructor.test.ts index f022d56a..a48665de 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -17,6 +17,7 @@ import { import type { DomainFunction, SuccessResult } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { Composable } from './composable/index.ts' +import { ErrorWithMessage } from './types.ts' describe('toComposable', () => { it('returns a Composable with the same computation and all input errors in errors field', async () => { @@ -31,7 +32,7 @@ describe('toComposable', () => { assertEquals(await c(), { success: false, - errors: [{ message: 'Required' }], + errors: [{ message: 'Required', exception: new Error('Required') }], }) }) @@ -198,7 +199,7 @@ describe('makeDomainFunction', () => { assertObjectMatch( await handler({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error' }], + errors: [{ message: 'Error' }] as ErrorWithMessage[], }), ) }) diff --git a/src/errors.ts b/src/errors.ts index a94618fe..d162bd41 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -93,8 +93,10 @@ class ResultError extends Error { } function schemaErrorToErrorWithMessage(se: SchemaError): ErrorWithMessage { + const message = `${se.path.join('.')} ${se.message}`.trim() return { - message: `${se.path.join('.')} ${se.message}`.trim(), + message, + exception: new Error(message), } } function errorResultToFailure({ diff --git a/src/map-error.test.ts b/src/map-error.test.ts index 21e3b3ea..584cdd2b 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -1,4 +1,4 @@ -import { describe, it, assertEquals } from './test-prelude.ts' +import { assertEquals, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' @@ -6,6 +6,7 @@ import { mapError } from './domain-functions.ts' import type { DomainFunction, ErrorData } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { ErrorWithMessage } from './types.ts' describe('mapError', () => { it('returns the result when the domain function suceeds', async () => { @@ -23,10 +24,11 @@ describe('mapError', () => { }) it('returns a domain function function that will apply a function over the error of the first one', async () => { + const exception = new Error('Number of errors: 0') const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) const b = (result: ErrorData) => ({ - errors: [{ message: 'Number of errors: ' + result.errors.length }], + errors: [{ message: exception.message }] as ErrorWithMessage[], environmentErrors: [], inputErrors: [ { @@ -42,7 +44,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [{ message: 'Number of errors: 0' }], + errors: [{ message: 'Number of errors: 0' }] as ErrorWithMessage[], inputErrors: [{ message: 'Number of input errors: 1', path: [] }], }), ) @@ -52,7 +54,12 @@ describe('mapError', () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) const b = (result: ErrorData) => Promise.resolve({ - errors: [{ message: 'Number of errors: ' + result.errors.length }], + errors: [ + { + message: 'Number of errors: ' + result.errors.length, + exception: null, + }, + ], environmentErrors: [], inputErrors: [ { @@ -68,7 +75,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [{ message: 'Number of errors: 0' }], + errors: [{ message: 'Number of errors: 0', exception: null }], inputErrors: [{ message: 'Number of input errors: 1', path: [] }], }), ) diff --git a/src/test-prelude.ts b/src/test-prelude.ts index ce22a20b..00d42003 100644 --- a/src/test-prelude.ts +++ b/src/test-prelude.ts @@ -1,3 +1,8 @@ -export { describe, it } from "https://deno.land/std@0.206.0/testing/bdd.ts" -export { assertEquals, assertRejects, assertObjectMatch } from "https://deno.land/std@0.206.0/assert/mod.ts" -export { z } from "https://deno.land/x/zod@v3.22.4/mod.ts" +export { describe, it } from 'https://deno.land/std@0.206.0/testing/bdd.ts' +export { + assertEquals, + assertRejects, + assertObjectMatch, + assertAlmostEquals, +} from 'https://deno.land/std@0.206.0/assert/mod.ts' +export { z } from 'https://deno.land/x/zod@v3.22.4/mod.ts' diff --git a/src/trace.test.ts b/src/trace.test.ts index 0fb49c80..f4bfa553 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -11,6 +11,7 @@ import { fromSuccess, trace } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { ErrorWithMessage } from './types.ts' describe('trace', () => { it('converts trace exceptions to df failures', async () => { @@ -26,7 +27,7 @@ describe('trace', () => { assertObjectMatch( result, makeErrorResult({ - errors: [{ message: 'Problem in tracing' }], + errors: [{ message: 'Problem in tracing' }] as ErrorWithMessage[], }), ) }) From c3573a4dd878ccab7590a75d0efd7f8272b49242 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 23 Feb 2024 16:08:23 -0500 Subject: [PATCH 005/238] Simplify ErrorWithMessage so it's just an Error alias --- src/all.test.ts | 2 +- src/collect.test.ts | 14 +++++++------- src/composable/errors.ts | 9 +++------ src/composable/index.test.ts | 2 +- src/composable/types.ts | 8 +++----- src/constructor.test.ts | 13 +++++-------- src/errors.ts | 15 +++++---------- src/first.test.ts | 2 +- src/map-error.test.ts | 15 ++++++--------- src/map.test.ts | 2 +- src/merge.test.ts | 10 +++++----- 11 files changed, 38 insertions(+), 54 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index 4dc43f13..58bb9738 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -70,7 +70,7 @@ describe('all', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error', exception: 'Error' }], + errors: [new Error()], }), ) }) diff --git a/src/collect.test.ts b/src/collect.test.ts index bf6abbab..b3edc738 100644 --- a/src/collect.test.ts +++ b/src/collect.test.ts @@ -1,14 +1,14 @@ import { + assertEquals, + assertObjectMatch, describe, it, - assertObjectMatch, - assertEquals, } from './test-prelude.ts' import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { collect } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' +import type { DomainFunction, ErrorWithMessage } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' @@ -52,7 +52,7 @@ describe('collect', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error', exception: 'Error' }], + errors: [new Error('Error')], }), ) }) @@ -96,9 +96,9 @@ describe('collect', () => { await c({ id: 1 }), makeErrorResult({ errors: [ - { message: 'Error A', exception: { message: 'Error A' } }, - { message: 'Error B', exception: { message: 'Error B' } }, - ], + { message: 'Error A' }, + { message: 'Error B' }, + ] as ErrorWithMessage[], }), ) }) diff --git a/src/composable/errors.ts b/src/composable/errors.ts index 42ad9487..91bde781 100644 --- a/src/composable/errors.ts +++ b/src/composable/errors.ts @@ -23,12 +23,9 @@ function isErrorWithMessage(error: unknown): error is ErrorWithMessage { * } */ function toErrorWithMessage(maybeError: unknown): ErrorWithMessage { - return { - message: isErrorWithMessage(maybeError) - ? maybeError.message - : String(maybeError), - exception: maybeError, - } + return isErrorWithMessage(maybeError) + ? maybeError + : new Error(String(maybeError)) } export { toErrorWithMessage } diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index 5517eceb..1c95416c 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -124,7 +124,7 @@ describe('pipe', () => { assertEquals(res.errors![0].message, 'always throw') assertEquals( // deno-lint-ignore no-explicit-any - (res.errors[0] as any).exception?.cause, + (res.errors[0] as any).cause, 'it was made for this', ) }) diff --git a/src/composable/types.ts b/src/composable/types.ts index ef1be9c7..29cfb194 100644 --- a/src/composable/types.ts +++ b/src/composable/types.ts @@ -19,10 +19,9 @@ type IsNever = type First = T extends [infer F, ...infer _I] ? F : never -type ErrorWithMessage = { - message: string - exception: unknown -} + +type ErrorWithMessage = Error + type Failure = { success: false errors: Array @@ -234,4 +233,3 @@ export type { UnpackAll, UnpackResult, } - diff --git a/src/constructor.test.ts b/src/constructor.test.ts index a48665de..751c99d8 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -32,7 +32,7 @@ describe('toComposable', () => { assertEquals(await c(), { success: false, - errors: [{ message: 'Required', exception: new Error('Required') }], + errors: [new Error('Required')], }) }) @@ -216,12 +216,9 @@ describe('makeDomainFunction', () => { errors: [ { message: 'Some message', - exception: { - message: 'Some message', - cause: { someUnknownFields: true }, - }, + cause: { someUnknownFields: true }, }, - ], + ] as ErrorWithMessage[], }), ) }) @@ -235,7 +232,7 @@ describe('makeDomainFunction', () => { assertObjectMatch( await handler({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error', exception: 'Error' }], + errors: [{ message: 'Error' }] as ErrorWithMessage[], }), ) }) @@ -249,7 +246,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error', exception: { message: 'Error' } }], + errors: [{ message: 'Error' }] as ErrorWithMessage[], }), ) }) diff --git a/src/errors.ts b/src/errors.ts index d162bd41..c051c30a 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -94,10 +94,7 @@ class ResultError extends Error { function schemaErrorToErrorWithMessage(se: SchemaError): ErrorWithMessage { const message = `${se.path.join('.')} ${se.message}`.trim() - return { - message, - exception: new Error(message), - } + return new Error(message) } function errorResultToFailure({ errors, @@ -118,17 +115,15 @@ function failureToErrorResult({ errors }: Failure): ErrorResult { return makeErrorResult({ errors: errors .filter( - ({ exception }) => + (exception) => !( exception instanceof InputError || exception instanceof InputErrors || exception instanceof EnvironmentError ), ) - .flatMap((e) => - e.exception instanceof ResultError ? e.exception.result.errors : e, - ), - inputErrors: errors.flatMap(({ exception }) => + .flatMap((e) => (e instanceof ResultError ? e.result.errors : e)), + inputErrors: errors.flatMap((exception) => exception instanceof InputError ? [ { @@ -145,7 +140,7 @@ function failureToErrorResult({ errors }: Failure): ErrorResult { ? exception.result.inputErrors : [], ), - environmentErrors: errors.flatMap(({ exception }) => + environmentErrors: errors.flatMap((exception) => exception instanceof EnvironmentError ? [ { diff --git a/src/first.test.ts b/src/first.test.ts index 3ac21559..50c6ba90 100644 --- a/src/first.test.ts +++ b/src/first.test.ts @@ -48,7 +48,7 @@ describe('first', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error', exception: 'Error' }], + errors: [new Error('Error')], inputErrors: [ { message: 'Expected string, received number', path: ['id'] }, ], diff --git a/src/map-error.test.ts b/src/map-error.test.ts index 584cdd2b..c40bc10e 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -28,7 +28,7 @@ describe('mapError', () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) const b = (result: ErrorData) => ({ - errors: [{ message: exception.message }] as ErrorWithMessage[], + errors: [exception], environmentErrors: [], inputErrors: [ { @@ -44,7 +44,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [{ message: 'Number of errors: 0' }] as ErrorWithMessage[], + errors: [exception], inputErrors: [{ message: 'Number of input errors: 1', path: [] }], }), ) @@ -55,11 +55,8 @@ describe('mapError', () => { const b = (result: ErrorData) => Promise.resolve({ errors: [ - { - message: 'Number of errors: ' + result.errors.length, - exception: null, - }, - ], + { message: 'Number of errors: ' + result.errors.length }, + ] as ErrorWithMessage[], environmentErrors: [], inputErrors: [ { @@ -75,7 +72,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [{ message: 'Number of errors: 0', exception: null }], + errors: [{ message: 'Number of errors: 0' }] as ErrorWithMessage[], inputErrors: [{ message: 'Number of input errors: 1', path: [] }], }), ) @@ -93,7 +90,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [{ message: 'failed to map', exception: 'failed to map' }], + errors: [new Error('failed to map')], }), ) }) diff --git a/src/map.test.ts b/src/map.test.ts index ea252afd..8bb19007 100644 --- a/src/map.test.ts +++ b/src/map.test.ts @@ -56,7 +56,7 @@ describe('map', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - errors: [{ message: 'failed to map', exception: 'failed to map' }], + errors: [new Error('failed to map')], }), ) }) diff --git a/src/merge.test.ts b/src/merge.test.ts index 90bcd5d5..1937f66e 100644 --- a/src/merge.test.ts +++ b/src/merge.test.ts @@ -8,7 +8,7 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { merge } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' +import type { DomainFunction, ErrorWithMessage } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' @@ -105,7 +105,7 @@ describe('merge', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error', exception: 'Error' }], + errors: [new Error('Error')], }), ) }) @@ -149,9 +149,9 @@ describe('merge', () => { await c({ id: 1 }), makeErrorResult({ errors: [ - { message: 'Error A', exception: { message: 'Error A' } }, - { message: 'Error B', exception: { message: 'Error B' } }, - ], + { message: 'Error A' }, + { message: 'Error B' }, + ] as ErrorWithMessage[], }), ) }) From b7c5d0fe378b0a06f4deeeec8a4111fb902a4ff1 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 23 Feb 2024 17:42:48 -0500 Subject: [PATCH 006/238] Remove ErrorWithMessage since we already breaking backwards compatible might as well remove the alias and work with the native Error --- README.md | 2 +- src/all.test.ts | 8 +------- src/branch.test.ts | 5 +---- src/collect.test.ts | 7 ++----- src/composable/composable.ts | 7 +++---- src/composable/errors.ts | 22 +++++++++------------- src/composable/index.test.ts | 4 ++-- src/composable/index.ts | 4 ++-- src/composable/types.ts | 5 +---- src/constructor.test.ts | 14 +++++--------- src/domain-functions.ts | 4 ++-- src/errors.ts | 7 +++---- src/index.ts | 3 +-- src/map-error.test.ts | 7 ++----- src/merge.test.ts | 7 ++----- src/trace.test.ts | 3 +-- src/types.ts | 2 -- 17 files changed, 38 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index dc548a50..db294b70 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ The error result has the following structure: ```ts type ErrorResult = { success: false - errors: ErrorWithMessage[] + errors: Error[] inputErrors: SchemaError[] environmentErrors: SchemaError[] } diff --git a/src/all.test.ts b/src/all.test.ts index 58bb9738..60166a0f 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -11,7 +11,6 @@ import { all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' -import { ErrorWithMessage } from './index.ts' describe('all', () => { it('should combine two domain functions into one', async () => { @@ -106,12 +105,7 @@ describe('all', () => { assertObjectMatch( await c({ id: 1 }), - makeErrorResult({ - errors: [ - { message: 'Error A' }, - { message: 'Error B' }, - ] as ErrorWithMessage[], - }), + makeErrorResult({ errors: [new Error('Error A'), new Error('Error B')] }), ) }) }) diff --git a/src/branch.test.ts b/src/branch.test.ts index 6314ce39..e0ee489c 100644 --- a/src/branch.test.ts +++ b/src/branch.test.ts @@ -11,7 +11,6 @@ import { branch, pipe, all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' -import { ErrorWithMessage } from './types.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { @@ -125,9 +124,7 @@ describe('branch', () => { assertObjectMatch( await c({ id: 1 }), makeErrorResult({ - errors: [ - { message: 'condition function failed' }, - ] as ErrorWithMessage[], + errors: [new Error('condition function failed')], }), ) }) diff --git a/src/collect.test.ts b/src/collect.test.ts index b3edc738..1cb9537c 100644 --- a/src/collect.test.ts +++ b/src/collect.test.ts @@ -8,7 +8,7 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { collect } from './domain-functions.ts' -import type { DomainFunction, ErrorWithMessage } from './types.ts' +import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' @@ -95,10 +95,7 @@ describe('collect', () => { assertObjectMatch( await c({ id: 1 }), makeErrorResult({ - errors: [ - { message: 'Error A' }, - { message: 'Error B' }, - ] as ErrorWithMessage[], + errors: [new Error('Error A'), new Error('Error B')], }), ) }) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index aaf43f92..af8e63d7 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,9 +1,8 @@ -import { toErrorWithMessage } from './errors.ts' +import { toError } from './errors.ts' import { AllArguments, CollectArguments, Composable, - ErrorWithMessage, Failure, First, Fn, @@ -36,7 +35,7 @@ function success(data: T): Success { return { success: true, data, errors: [] } } -function error(errors: ErrorWithMessage[]): Failure { +function error(errors: Error[]): Failure { return { success: false, errors } } @@ -52,7 +51,7 @@ function composable(fn: T): Composable { const result = await fn(...(args as any[])) return success(result) } catch (e) { - return error([toErrorWithMessage(e)]) + return error([toError(e)]) } } } diff --git a/src/composable/errors.ts b/src/composable/errors.ts index 91bde781..fef8e0bb 100644 --- a/src/composable/errors.ts +++ b/src/composable/errors.ts @@ -1,5 +1,3 @@ -import { ErrorWithMessage } from './types.ts' - function objectHasKey( obj: unknown, key: T, @@ -7,25 +5,23 @@ function objectHasKey( return typeof obj === 'object' && obj !== null && key in obj } -function isErrorWithMessage(error: unknown): error is ErrorWithMessage { +function isError(error: unknown): error is Error { return objectHasKey(error, 'message') && typeof error.message === 'string' } /** - * Turns the given 'unknown' error into an ErrorWithMessage. - * @param maybeError the error to turn into an ErrorWithMessage - * @returns the ErrorWithMessage + * Turns the given 'unknown' error into an Error. + * @param maybeError the error to turn into an Error + * @returns the Error * @example * try {} * catch (error) { - * const errorWithMessage = toErrorWithMessage(error) - * console.log(errorWithMessage.message) + * const Error = toError(error) + * console.log(Error.message) * } */ -function toErrorWithMessage(maybeError: unknown): ErrorWithMessage { - return isErrorWithMessage(maybeError) - ? maybeError - : new Error(String(maybeError)) +function toError(maybeError: unknown): Error { + return isError(maybeError) ? maybeError : new Error(String(maybeError)) } -export { toErrorWithMessage } +export { toError } diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index 1c95416c..ecbdbbf8 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -1,6 +1,6 @@ import { assertEquals, describe, it } from '../test-prelude.ts' import { map, mapError, pipe, sequence } from './index.ts' -import type { Composable, ErrorWithMessage, Result } from './index.ts' +import type { Composable, Result } from './index.ts' import { Equal, Expect } from './types.test.ts' import { all, catchError, collect, composable } from './composable.ts' @@ -348,7 +348,7 @@ describe('map', () => { }) }) -const cleanError = (err: ErrorWithMessage) => ({ +const cleanError = (err: Error) => ({ ...err, message: err.message + '!!!', }) diff --git a/src/composable/index.ts b/src/composable/index.ts index 166d9479..f29f4dcb 100644 --- a/src/composable/index.ts +++ b/src/composable/index.ts @@ -1,5 +1,5 @@ -export type { Composable, Result, ErrorWithMessage } from './types.ts' -export { toErrorWithMessage } from './errors.ts' +export type { Composable, Result } from './types.ts' +export { toError } from './errors.ts' export { catchError, composable, diff --git a/src/composable/types.ts b/src/composable/types.ts index 29cfb194..d26a91f2 100644 --- a/src/composable/types.ts +++ b/src/composable/types.ts @@ -20,11 +20,9 @@ type First = T extends [infer F, ...infer _I] ? F : never -type ErrorWithMessage = Error - type Failure = { success: false - errors: Array + errors: Array } type Success = { success: true @@ -217,7 +215,6 @@ export type { AtLeastOne, CollectArguments, Composable, - ErrorWithMessage, Failure, First, Fn, diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 751c99d8..ad0a5bd7 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -17,7 +17,6 @@ import { import type { DomainFunction, SuccessResult } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { Composable } from './composable/index.ts' -import { ErrorWithMessage } from './types.ts' describe('toComposable', () => { it('returns a Composable with the same computation and all input errors in errors field', async () => { @@ -199,7 +198,7 @@ describe('makeDomainFunction', () => { assertObjectMatch( await handler({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error' }] as ErrorWithMessage[], + errors: [new Error('Error')], }), ) }) @@ -214,11 +213,8 @@ describe('makeDomainFunction', () => { await handler({ id: 1 }), makeErrorResult({ errors: [ - { - message: 'Some message', - cause: { someUnknownFields: true }, - }, - ] as ErrorWithMessage[], + new Error('Some message', { cause: { someUnknownFields: true } }), + ], }), ) }) @@ -232,7 +228,7 @@ describe('makeDomainFunction', () => { assertObjectMatch( await handler({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error' }] as ErrorWithMessage[], + errors: [new Error('Error')], }), ) }) @@ -246,7 +242,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), makeErrorResult({ - errors: [{ message: 'Error' }] as ErrorWithMessage[], + errors: [new Error('Error')], }), ) }) diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 4ce82905..f629b620 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -14,7 +14,7 @@ import type { UnpackResult, } from './types.ts' import { dfResultFromcomposable } from './constructor.ts' -import { toErrorWithMessage } from './composable/errors.ts' +import { toError } from './composable/errors.ts' import { Composable } from './index.ts' /** @@ -369,7 +369,7 @@ function trace>( >) return result } catch (e) { - return failureToErrorResult(A.error([toErrorWithMessage(e)])) + return failureToErrorResult(A.error([toError(e)])) } } } diff --git a/src/errors.ts b/src/errors.ts index c051c30a..66218478 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -3,7 +3,6 @@ import type { AtLeastOne, ErrorData, ErrorResult, - ErrorWithMessage, SchemaError, } from './types.ts' @@ -92,7 +91,7 @@ class ResultError extends Error { } } -function schemaErrorToErrorWithMessage(se: SchemaError): ErrorWithMessage { +function schemaErrorToError(se: SchemaError): Error { const message = `${se.path.join('.')} ${se.message}`.trim() return new Error(message) } @@ -105,8 +104,8 @@ function errorResultToFailure({ success: false, errors: [ ...errors, - ...inputErrors.map(schemaErrorToErrorWithMessage), - ...environmentErrors.map(schemaErrorToErrorWithMessage), + ...inputErrors.map(schemaErrorToError), + ...environmentErrors.map(schemaErrorToError), ], } } diff --git a/src/index.ts b/src/index.ts index 896fa15d..0007df2a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,14 +11,13 @@ export * from './errors.ts' export { mergeObjects } from './composable/composable.ts' export type { Composable } from './composable/index.ts' import * as composable from './composable/index.ts' -export { toErrorWithMessage } from './composable/errors.ts' +export { toError } from './composable/errors.ts' export { composable as cf } export type { AtLeastOne, DomainFunction, ErrorData, ErrorResult, - ErrorWithMessage, Last, MergeObjs, ParserIssue, diff --git a/src/map-error.test.ts b/src/map-error.test.ts index c40bc10e..6d8e2efb 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -6,7 +6,6 @@ import { mapError } from './domain-functions.ts' import type { DomainFunction, ErrorData } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' -import { ErrorWithMessage } from './types.ts' describe('mapError', () => { it('returns the result when the domain function suceeds', async () => { @@ -54,9 +53,7 @@ describe('mapError', () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) const b = (result: ErrorData) => Promise.resolve({ - errors: [ - { message: 'Number of errors: ' + result.errors.length }, - ] as ErrorWithMessage[], + errors: [new Error('Number of errors: ' + result.errors.length)], environmentErrors: [], inputErrors: [ { @@ -72,7 +69,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [{ message: 'Number of errors: 0' }] as ErrorWithMessage[], + errors: [new Error('Number of errors: 0')], inputErrors: [{ message: 'Number of input errors: 1', path: [] }], }), ) diff --git a/src/merge.test.ts b/src/merge.test.ts index 1937f66e..b164dac7 100644 --- a/src/merge.test.ts +++ b/src/merge.test.ts @@ -8,7 +8,7 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { merge } from './domain-functions.ts' -import type { DomainFunction, ErrorWithMessage } from './types.ts' +import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' @@ -148,10 +148,7 @@ describe('merge', () => { assertObjectMatch( await c({ id: 1 }), makeErrorResult({ - errors: [ - { message: 'Error A' }, - { message: 'Error B' }, - ] as ErrorWithMessage[], + errors: [new Error('Error A'), new Error('Error B')], }), ) }) diff --git a/src/trace.test.ts b/src/trace.test.ts index f4bfa553..ea18f293 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -11,7 +11,6 @@ import { fromSuccess, trace } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' -import { ErrorWithMessage } from './types.ts' describe('trace', () => { it('converts trace exceptions to df failures', async () => { @@ -27,7 +26,7 @@ describe('trace', () => { assertObjectMatch( result, makeErrorResult({ - errors: [{ message: 'Problem in tracing' }] as ErrorWithMessage[], + errors: [new Error('Problem in tracing')], }), ) }) diff --git a/src/types.ts b/src/types.ts index 6cd59769..ca05c750 100644 --- a/src/types.ts +++ b/src/types.ts @@ -121,7 +121,6 @@ type ParserSchema = { export type { AtLeastOne, - ErrorWithMessage, Last, MergeObjs, TupleToUnion, @@ -142,4 +141,3 @@ export type { UnpackResult, UnpackSuccess, } - From 5dc3184d3da1dec403f79a9ba4dd575ac6193f3b Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 8 Apr 2024 17:22:53 -0300 Subject: [PATCH 007/238] test: Fix tests --- src/all.test.ts | 17 +++++++---------- src/branch.test.ts | 17 +++++------------ src/collect.test.ts | 18 ++++++------------ src/constructor.test.ts | 40 +++++++++++++++++----------------------- src/merge.test.ts | 19 +++++++------------ src/test-prelude.ts | 1 + src/trace.test.ts | 16 +++------------- 7 files changed, 46 insertions(+), 82 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index 60166a0f..934c9df0 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -1,9 +1,4 @@ -import { - describe, - it, - assertEquals, - assertObjectMatch, -} from './test-prelude.ts' +import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' @@ -11,6 +6,7 @@ import { all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' describe('all', () => { it('should combine two domain functions into one', async () => { @@ -103,9 +99,10 @@ describe('all', () => { const c = all(a, b) type _R = Expect>> - assertObjectMatch( - await c({ id: 1 }), - makeErrorResult({ errors: [new Error('Error A'), new Error('Error B')] }), - ) + const { + errors: [errA, errB], + } = await c({ id: 1 }) + assertIsError(errA, Error, 'Error A') + assertIsError(errB, Error, 'Error B') }) }) diff --git a/src/branch.test.ts b/src/branch.test.ts index e0ee489c..f52d406f 100644 --- a/src/branch.test.ts +++ b/src/branch.test.ts @@ -1,9 +1,4 @@ -import { - describe, - it, - assertEquals, - assertObjectMatch, -} from './test-prelude.ts' +import { describe, it, assertEquals, assertIsError } from './test-prelude.ts' import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' @@ -121,12 +116,10 @@ describe('branch', () => { }) type _R = Expect>> - assertObjectMatch( - await c({ id: 1 }), - makeErrorResult({ - errors: [new Error('condition function failed')], - }), - ) + const { + errors: [err], + } = await c({ id: 1 }) + assertIsError(err, Error, 'condition function failed') }) it('should not break composition with other combinators', async () => { diff --git a/src/collect.test.ts b/src/collect.test.ts index 1cb9537c..ddb329b8 100644 --- a/src/collect.test.ts +++ b/src/collect.test.ts @@ -1,9 +1,4 @@ -import { - assertEquals, - assertObjectMatch, - describe, - it, -} from './test-prelude.ts' +import { assertEquals, assertIsError, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' @@ -92,11 +87,10 @@ describe('collect', () => { const c = collect({ a, b }) type _R = Expect>> - assertObjectMatch( - await c({ id: 1 }), - makeErrorResult({ - errors: [new Error('Error A'), new Error('Error B')], - }), - ) + const { + errors: [errA, errB], + } = await c({ id: 1 }) + assertIsError(errA, Error, 'Error A') + assertIsError(errB, Error, 'Error B') }) }) diff --git a/src/constructor.test.ts b/src/constructor.test.ts index ad0a5bd7..6b830905 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -1,3 +1,4 @@ +import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' import { assertEquals, assertObjectMatch, @@ -29,10 +30,10 @@ describe('toComposable', () => { > > - assertEquals(await c(), { - success: false, - errors: [new Error('Required')], - }) + const { + errors: [err], + } = await c(1) + assertIsError(err, Error, 'Expected string, received number') }) it('returns a Composable with the same computation and same success result (we just care about the structural typing match)', async () => { @@ -195,12 +196,10 @@ describe('makeDomainFunction', () => { }) type _R = Expect>> - assertObjectMatch( - await handler({ id: 1 }), - makeErrorResult({ - errors: [new Error('Error')], - }), - ) + const { + errors: [err], + } = await handler({ id: 1 }) + assertIsError(err, Error, 'Error') }) it('preserves entire original exception when the domain function throws an Error', async () => { @@ -209,14 +208,11 @@ describe('makeDomainFunction', () => { }) type _R = Expect>> - assertObjectMatch( - await handler({ id: 1 }), - makeErrorResult({ - errors: [ - new Error('Some message', { cause: { someUnknownFields: true } }), - ], - }), - ) + const { + errors: [err], + } = await handler({ id: 1 }) + assertIsError(err, Error, 'Some message') + assertEquals(err.cause, { someUnknownFields: true }) }) it('returns error when the domain function throws a string', async () => { @@ -225,7 +221,7 @@ describe('makeDomainFunction', () => { }) type _R = Expect>> - assertObjectMatch( + assertEquals( await handler({ id: 1 }), makeErrorResult({ errors: [new Error('Error')], @@ -239,11 +235,9 @@ describe('makeDomainFunction', () => { }) type _R = Expect>> - assertEquals( + assertObjectMatch( await handler({ id: 1 }), - makeErrorResult({ - errors: [new Error('Error')], - }), + makeErrorResult({ errors: [{ message: 'Error' } as Error] }), ) }) diff --git a/src/merge.test.ts b/src/merge.test.ts index b164dac7..b1f8e3fa 100644 --- a/src/merge.test.ts +++ b/src/merge.test.ts @@ -1,9 +1,5 @@ -import { - describe, - it, - assertEquals, - assertObjectMatch, -} from './test-prelude.ts' +import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' +import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' @@ -145,11 +141,10 @@ describe('merge', () => { const c = merge(a, b) type _R = Expect>> - assertObjectMatch( - await c({ id: 1 }), - makeErrorResult({ - errors: [new Error('Error A'), new Error('Error B')], - }), - ) + const { + errors: [errA, errB], + } = await c({ id: 1 }) + assertIsError(errA, Error, 'Error A') + assertIsError(errB, Error, 'Error B') }) }) diff --git a/src/test-prelude.ts b/src/test-prelude.ts index 00d42003..72abedab 100644 --- a/src/test-prelude.ts +++ b/src/test-prelude.ts @@ -4,5 +4,6 @@ export { assertRejects, assertObjectMatch, assertAlmostEquals, + assertIsError, } from 'https://deno.land/std@0.206.0/assert/mod.ts' export { z } from 'https://deno.land/x/zod@v3.22.4/mod.ts' diff --git a/src/trace.test.ts b/src/trace.test.ts index ea18f293..2966a3e8 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -1,16 +1,11 @@ -import { - assertEquals, - assertObjectMatch, - describe, - it, -} from './test-prelude.ts' +import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' +import { assertEquals, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' import { mdf } from './constructor.ts' import { fromSuccess, trace } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' describe('trace', () => { it('converts trace exceptions to df failures', async () => { @@ -23,12 +18,7 @@ describe('trace', () => { const result = await c({ id: 1 }) - assertObjectMatch( - result, - makeErrorResult({ - errors: [new Error('Problem in tracing')], - }), - ) + assertIsError(result.errors[0], Error, 'Problem in tracing') }) it('intercepts inputs and outputs of a given domain function', async () => { From ac0cee07dbb7e2e498a57993f454031cb0541a3c Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 8 Apr 2024 18:36:34 -0300 Subject: [PATCH 008/238] WIP --- src/all.test.ts | 11 ++- src/apply-environment.test.ts | 5 +- src/branch.test.ts | 9 +-- src/collect-sequence.test.ts | 13 ++-- src/collect.test.ts | 18 ++--- src/constructor.test.ts | 42 ++++------- src/constructor.ts | 52 ++++++-------- src/domain-functions.ts | 20 +++--- src/errors.ts | 129 ++++++++++++++-------------------- src/first.test.ts | 7 +- src/map-error.test.ts | 50 ++++++------- src/map.test.ts | 4 +- src/merge.test.ts | 12 ++-- src/pipe.test.ts | 13 ++-- src/sequence.test.ts | 13 ++-- src/trace.test.ts | 8 +-- src/types.ts | 32 ++------- 17 files changed, 171 insertions(+), 267 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index 934c9df0..aa16141f 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -7,6 +7,7 @@ import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' +import { InputError } from '../mod.ts' describe('all', () => { it('should combine two domain functions into one', async () => { @@ -46,9 +47,7 @@ describe('all', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected string, received number', path: ['id'] }, - ], + errors: [new InputError('Expected string, received number', 'id')], }), ) }) @@ -80,9 +79,9 @@ describe('all', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected string, received number', path: ['id'] }, - { message: 'Expected string, received number', path: ['id'] }, + errors: [ + new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', 'id'), ], }), ) diff --git a/src/apply-environment.test.ts b/src/apply-environment.test.ts index f4b57a43..5acce13c 100644 --- a/src/apply-environment.test.ts +++ b/src/apply-environment.test.ts @@ -4,6 +4,7 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { applyEnvironment } from './domain-functions.ts' import { makeErrorResult } from './errors.ts' +import { EnvironmentError } from '../mod.ts' describe('applyEnvironment', () => { it('fails when environment fails parser', async () => { @@ -17,9 +18,7 @@ describe('applyEnvironment', () => { assertEquals( await getEnvWithEnvironment('some input'), makeErrorResult({ - environmentErrors: [ - { message: 'Expected number, received string', path: [] }, - ], + errors: [new EnvironmentError('Expected number, received string', '')], }), ) }) diff --git a/src/branch.test.ts b/src/branch.test.ts index f52d406f..6f0fbf91 100644 --- a/src/branch.test.ts +++ b/src/branch.test.ts @@ -6,6 +6,7 @@ import { branch, pipe, all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { InputError } from '../mod.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { @@ -79,9 +80,7 @@ describe('branch', () => { assertEquals( await c({ id: '1' }), makeErrorResult({ - inputErrors: [ - { path: ['id'], message: 'Expected number, received string' }, - ], + errors: [new InputError('Expected number, received string', 'id')], }), ) }) @@ -97,9 +96,7 @@ describe('branch', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - inputErrors: [ - { path: ['id'], message: 'Expected number, received string' }, - ], + errors: [new InputError('Expected number, received string', 'id')], }), ) }) diff --git a/src/collect-sequence.test.ts b/src/collect-sequence.test.ts index 632b84bb..1cdbdb8a 100644 --- a/src/collect-sequence.test.ts +++ b/src/collect-sequence.test.ts @@ -5,7 +5,8 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { collectSequence } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { InputError, makeErrorResult } from './errors.ts' +import { EnvironmentError } from './errors.ts' describe('collectSequence', () => { it('should compose domain functions keeping the given order of keys', async () => { @@ -66,7 +67,7 @@ describe('collectSequence', () => { assertEquals( await c(undefined, {}), makeErrorResult({ - environmentErrors: [{ message: 'Required', path: ['env'] }], + errors: [new EnvironmentError('Required', 'env')], }), ) }) @@ -93,9 +94,7 @@ describe('collectSequence', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected undefined, received object', path: [] }, - ], + errors: [new InputError('Expected undefined, received object', '')], }), ) }) @@ -120,9 +119,7 @@ describe('collectSequence', () => { assertEquals( await c(undefined, { env: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected number, received string', path: ['inp'] }, - ], + errors: [new InputError('Expected number, received string', 'inp')], }), ) }) diff --git a/src/collect.test.ts b/src/collect.test.ts index ddb329b8..4cf2562f 100644 --- a/src/collect.test.ts +++ b/src/collect.test.ts @@ -5,7 +5,7 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { collect } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { InputError, makeErrorResult } from './errors.ts' describe('collect', () => { it('should combine an object of domain functions', async () => { @@ -28,9 +28,7 @@ describe('collect', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected string, received number', path: ['id'] }, - ], + errors: [new InputError('Expected string, received number', 'id')], }), ) }) @@ -62,15 +60,9 @@ describe('collect', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - inputErrors: [ - { - message: 'Expected string, received number', - path: ['id'], - }, - { - message: 'Expected string, received number', - path: ['id'], - }, + errors: [ + new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', 'id'), ], }), ) diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 6b830905..e672df23 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -70,7 +70,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler('some input'), makeErrorResult({ - inputErrors: [{ path: [], message: 'Expected undefined' }], + errors: [new InputError('Expected undefined', '')], }), ) }) @@ -93,7 +93,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler(undefined, ''), makeErrorResult({ - environmentErrors: [{ path: [], message: 'Expected an object' }], + errors: [new EnvironmentError('Expected an object', '')], }), ) }) @@ -106,9 +106,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ missingId: '1' }), makeErrorResult({ - inputErrors: [ - { message: 'Expected number, received nan', path: ['id'] }, - ], + errors: [new InputError('Expected number, received nan', 'id')], }), ) }) @@ -151,8 +149,10 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: '1' }, { uid: '2' }), makeErrorResult({ - inputErrors: [{ message: 'ID already taken', path: ['id'] }], - environmentErrors: [{ message: 'UID already taken', path: ['uid'] }], + errors: [ + new InputError('ID already taken', 'id'), + new EnvironmentError('UID already taken', 'uid'), + ], }), ) }) @@ -183,9 +183,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: '1' }, {}), makeErrorResult({ - environmentErrors: [ - { message: 'Expected number, received nan', path: ['uid'] }, - ], + errors: [new EnvironmentError('Expected number, received nan', 'uid')], }), ) }) @@ -250,9 +248,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Custom input error', path: ['contact', 'id'] }, - ], + errors: [new InputError('Custom input error', 'contact.id')], }), ) }) @@ -269,9 +265,9 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Custom input error', path: ['contact', 'id'] }, - { message: 'Another input error', path: ['contact', 'id'] }, + errors: [ + new InputError('Custom input error', 'contact.id'), + new InputError('Another input error', 'contact.id'), ], }), ) @@ -286,9 +282,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), makeErrorResult({ - environmentErrors: [ - { message: 'Custom env error', path: ['currentUser', 'role'] }, - ], + errors: [new EnvironmentError('Custom env error', 'currentUser.role')], }), ) }) @@ -296,11 +290,7 @@ describe('makeDomainFunction', () => { it('returns an error result when the domain function throws an ResultError', async () => { const handler = mdf(z.object({ id: z.number() }))(() => { throw new ResultError({ - errors: [], - inputErrors: [ - { message: 'Custom input error', path: ['contact', 'id'] }, - ], - environmentErrors: [], + errors: [new InputError('Custom input error', 'contact.id')], }) }) type _R = Expect>> @@ -308,9 +298,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Custom input error', path: ['contact', 'id'] }, - ], + errors: [new InputError('Custom input error', 'contact.id')], }), ) }) diff --git a/src/constructor.ts b/src/constructor.ts index f38d24df..05517ba3 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -1,40 +1,34 @@ -import { - errorResultToFailure, - failureToErrorResult, - makeErrorResult, -} from './errors.ts' +import { makeErrorResult, InputError, EnvironmentError } from './errors.ts' import type { DomainFunction, ParserIssue, ParserSchema, - SchemaError, SuccessResult, } from './types.ts' import { Composable } from './composable/index.ts' import { composable } from './composable/composable.ts' function makeSuccessResult(data: T): SuccessResult { - return { - success: true, - data, - inputErrors: [], - errors: [], - environmentErrors: [], - } + return { success: true, data, errors: [] } } function dfResultFromcomposable(fn: T) { return (async (...args) => { - const r = await fn(...args) - - return r.success ? makeSuccessResult(r.data) : failureToErrorResult(r) + return await fn(...args) }) as Composable<(...args: Parameters) => R> } -function formatSchemaErrors(errors: ParserIssue[]): SchemaError[] { +function getInputErrors(errors: ParserIssue[]): InputError[] { + return errors.map((error) => { + const { path, message } = error + return new InputError(message, path.join('.')) + }) +} + +function getEnvironmentErrors(errors: ParserIssue[]): EnvironmentError[] { return errors.map((error) => { const { path, message } = error - return { path: path.map(String), message } + return new EnvironmentError(message, path.join('.')) }) } /** @@ -69,9 +63,9 @@ function toComposable( df: DomainFunction, ) { return ((input = undefined, environment = {}) => - df(input, environment).then((r) => - r.success ? r : errorResultToFailure(r), - )) as unknown as Composable<(input?: I, environment?: E) => O> + df(input, environment)) as unknown as Composable< + (input?: I, environment?: E) => O + > } function fromComposable( @@ -86,14 +80,14 @@ function fromComposable( const result = await (inputSchema ?? undefinedSchema).safeParseAsync(input) if (!result.success || !envResult.success) { - return makeErrorResult({ - inputErrors: result.success - ? [] - : formatSchemaErrors(result.error.issues), - environmentErrors: envResult.success - ? [] - : formatSchemaErrors(envResult.error.issues), - }) + let errors: Error[] = [] + if (!result.success) { + errors = getInputErrors(result.error.issues) + } + if (!envResult.success) { + errors = errors.concat(getEnvironmentErrors(envResult.error.issues)) + } + return makeErrorResult({ errors }) } return dfResultFromcomposable(fn)( ...([result.data as I, envResult.data as E] as Parameters), diff --git a/src/domain-functions.ts b/src/domain-functions.ts index f629b620..00ee7cb3 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -1,8 +1,7 @@ -import { failureToErrorResult, ResultError } from './errors.ts' +import { ResultError } from './errors.ts' import * as A from './composable/composable.ts' import type { DomainFunction, - ErrorData, Last, MergeObjs, Result, @@ -16,6 +15,7 @@ import type { import { dfResultFromcomposable } from './constructor.ts' import { toError } from './composable/errors.ts' import { Composable } from './index.ts' +import { ErrorResult } from '../mod.ts' /** * A functions that turns the result of its callback into a Result object. @@ -118,14 +118,12 @@ function first( fns.map((fn) => (fn as DomainFunction)(input, environment)), ) - const result = results.find((r) => r.success) as SuccessResult | undefined + const result = results.find((r) => r.success) as + | SuccessResult + | undefined if (!result) { throw new ResultError({ errors: results.map(({ errors }) => errors).flat(), - inputErrors: results.map(({ inputErrors }) => inputErrors).flat(), - environmentErrors: results - .map(({ environmentErrors }) => environmentErrors) - .flat(), }) } @@ -168,7 +166,7 @@ function pipe( ...fns: T ): DomainFunction>> { const last = (ls: T[]): T => ls[ls.length - 1] - return map(sequence(...fns), last) as DomainFunction>> + return map(sequence(...fns), last) as DomainFunction>> } /** @@ -323,7 +321,9 @@ function fromSuccess( */ function mapError( dfn: DomainFunction, - mapper: (element: ErrorData) => ErrorData | Promise, + mapper: ( + element: Pick, + ) => Pick | Promise>, ): DomainFunction { return (async (input, environment) => { const result = await dfn(input, environment) @@ -369,7 +369,7 @@ function trace>( >) return result } catch (e) { - return failureToErrorResult(A.error([toError(e)])) + return A.error([toError(e)]) } } } diff --git a/src/errors.ts b/src/errors.ts index 66218478..18eef2f1 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -1,10 +1,4 @@ -import { Failure } from './composable/types.ts' -import type { - AtLeastOne, - ErrorData, - ErrorResult, - SchemaError, -} from './types.ts' +import type { ErrorData, ErrorResult, SchemaError } from './types.ts' /** * Creates a SchemaError (used in inputErrors and environmentErrors) from the given message and path. @@ -84,91 +78,72 @@ class EnvironmentError extends Error { class ResultError extends Error { result: ErrorResult - constructor(result: AtLeastOne) { + constructor(result: Pick) { super('ResultError') this.name = 'ResultError' this.result = makeErrorResult(result) } } -function schemaErrorToError(se: SchemaError): Error { - const message = `${se.path.join('.')} ${se.message}`.trim() - return new Error(message) -} -function errorResultToFailure({ - errors, - inputErrors, - environmentErrors, -}: ErrorResult): Failure { - return { - success: false, - errors: [ - ...errors, - ...inputErrors.map(schemaErrorToError), - ...environmentErrors.map(schemaErrorToError), - ], - } -} +// function schemaErrorToError(se: SchemaError): Error { +// const message = `${se.path.join('.')} ${se.message}`.trim() +// return new Error(message) +// } -function failureToErrorResult({ errors }: Failure): ErrorResult { - return makeErrorResult({ - errors: errors - .filter( - (exception) => - !( - exception instanceof InputError || - exception instanceof InputErrors || - exception instanceof EnvironmentError - ), - ) - .flatMap((e) => (e instanceof ResultError ? e.result.errors : e)), - inputErrors: errors.flatMap((exception) => - exception instanceof InputError - ? [ - { - path: exception.path.split('.'), - message: exception.message, - }, - ] - : exception instanceof InputErrors - ? exception.errors.map((e) => ({ - path: e.path.split('.'), - message: e.message, - })) - : exception instanceof ResultError - ? exception.result.inputErrors - : [], - ), - environmentErrors: errors.flatMap((exception) => - exception instanceof EnvironmentError - ? [ - { - path: exception.path.split('.'), - message: exception.message, - }, - ] - : exception instanceof ResultError - ? exception.result.environmentErrors - : [], - ), - }) -} +// function failureToErrorResult({ errors }: Failure): ErrorResult { +// return makeErrorResult({ +// errors: errors +// .filter( +// (exception) => +// !( +// exception instanceof InputError || +// exception instanceof InputErrors || +// exception instanceof EnvironmentError +// ), +// ) +// .flatMap((e) => (e instanceof ResultError ? e.result.errors : e)), +// inputErrors: errors.flatMap((exception) => +// exception instanceof InputError +// ? [ +// { +// path: exception.path.split('.'), +// message: exception.message, +// }, +// ] +// : exception instanceof InputErrors +// ? exception.errors.map((e) => ({ +// path: e.path.split('.'), +// message: e.message, +// })) +// : exception instanceof ResultError +// ? exception.result.inputErrors +// : [], +// ), +// environmentErrors: errors.flatMap((exception) => +// exception instanceof EnvironmentError +// ? [ +// { +// path: exception.path.split('.'), +// message: exception.message, +// }, +// ] +// : exception instanceof ResultError +// ? exception.result.environmentErrors +// : [], +// ), +// }) +// } -function makeErrorResult(errorData: AtLeastOne) { +function makeErrorResult({ errors }: Pick): ErrorResult { return { success: false, - errors: [], - inputErrors: [], - environmentErrors: [], - ...errorData, - } as ErrorResult + errors, + } } export { EnvironmentError, errorMessagesFor, - errorResultToFailure, - failureToErrorResult, InputError, InputErrors, ResultError, diff --git a/src/first.test.ts b/src/first.test.ts index 50c6ba90..b17158f4 100644 --- a/src/first.test.ts +++ b/src/first.test.ts @@ -6,6 +6,7 @@ import { first } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { InputError } from './errors.ts' describe('first', () => { it('should return the result of the first successful domain function', async () => { @@ -48,9 +49,9 @@ describe('first', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - errors: [new Error('Error')], - inputErrors: [ - { message: 'Expected string, received number', path: ['id'] }, + errors: [ + new Error('Error'), + new InputError('Expected string, received number', 'id'), ], }), ) diff --git a/src/map-error.test.ts b/src/map-error.test.ts index 6d8e2efb..dccd5339 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -6,15 +6,14 @@ import { mapError } from './domain-functions.ts' import type { DomainFunction, ErrorData } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' +import { ErrorResult, InputError } from '../mod.ts' describe('mapError', () => { it('returns the result when the domain function suceeds', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = () => - ({ - errors: [{ message: 'New Error Message' }], - inputErrors: [{ message: 'New Input Error Message' }], - } as ErrorData) + const b = () => ({ + errors: [new Error('New Error Message')], + }) const c = mapError(a, b) type _R = Expect>> @@ -25,17 +24,18 @@ describe('mapError', () => { it('returns a domain function function that will apply a function over the error of the first one', async () => { const exception = new Error('Number of errors: 0') const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = (result: ErrorData) => - ({ - errors: [exception], - environmentErrors: [], - inputErrors: [ - { - message: 'Number of input errors: ' + result.inputErrors.length, - path: [], - }, + const b = (result: Pick) => { + const nonInputErrors = result.errors.filter( + (e) => !(e instanceof InputError), + ) + const inputErrors = result.errors.filter((e) => e instanceof InputError) + return { + errors: [ + nonInputErrors, + new InputError('Number of input errors: ' + inputErrors.length, ''), ], - } as ErrorData) + } as Pick + } const c = mapError(a, b) type _R = Expect>> @@ -43,25 +43,17 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [exception], - inputErrors: [{ message: 'Number of input errors: 1', path: [] }], + errors: [exception, new InputError('Number of input errors: 1', '')], }), ) }) it('returns a domain function function that will apply an async function over the error of the first one', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = (result: ErrorData) => + const b = (result: Pick) => Promise.resolve({ errors: [new Error('Number of errors: ' + result.errors.length)], - environmentErrors: [], - inputErrors: [ - { - message: 'Number of input errors: ' + result.inputErrors.length, - path: [], - }, - ], - }) as Promise + }) const c = mapError(a, b) type _R = Expect>> @@ -69,8 +61,10 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [new Error('Number of errors: 0')], - inputErrors: [{ message: 'Number of input errors: 1', path: [] }], + errors: [ + new Error('Number of errors: 0'), + new InputError('Number of input errors: 1', ''), + ], }), ) }) diff --git a/src/map.test.ts b/src/map.test.ts index 8bb19007..0b35e422 100644 --- a/src/map.test.ts +++ b/src/map.test.ts @@ -5,7 +5,7 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { map } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { InputError, makeErrorResult } from './errors.ts' describe('map', () => { it('returns a domain function function that will apply a function over the results of the first one', async () => { @@ -39,7 +39,7 @@ describe('map', () => { assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - inputErrors: [{ message: 'Required', path: ['id'] }], + errors: [new InputError('Required', 'id')], }), ) }) diff --git a/src/merge.test.ts b/src/merge.test.ts index b1f8e3fa..efbf0d37 100644 --- a/src/merge.test.ts +++ b/src/merge.test.ts @@ -6,7 +6,7 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { merge } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { InputError, makeErrorResult } from './errors.ts' describe('merge', () => { it('should combine two domain functions results into one object', async () => { @@ -80,9 +80,7 @@ describe('merge', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected string, received number', path: ['id'] }, - ], + errors: [new InputError('Expected string, received number', 'id')], }), ) }) @@ -122,9 +120,9 @@ describe('merge', () => { assertEquals( await c({ id: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected string, received number', path: ['id'] }, - { message: 'Expected string, received number', path: ['id'] }, + errors: [ + new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', 'id'), ], }), ) diff --git a/src/pipe.test.ts b/src/pipe.test.ts index d9bfa5ab..fbdeb925 100644 --- a/src/pipe.test.ts +++ b/src/pipe.test.ts @@ -5,7 +5,8 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { pipe } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { InputError, makeErrorResult } from './errors.ts' +import { EnvironmentError } from './errors.ts' describe('pipe', () => { it('should compose domain functions from left-to-right', async () => { @@ -57,7 +58,7 @@ describe('pipe', () => { assertEquals( await c(undefined, {}), makeErrorResult({ - environmentErrors: [{ message: 'Required', path: ['env'] }], + errors: [new EnvironmentError('Required', 'env')], }), ) }) @@ -82,9 +83,7 @@ describe('pipe', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected undefined, received object', path: [] }, - ], + errors: [new InputError('Expected undefined, received object', '')], }), ) }) @@ -107,9 +106,7 @@ describe('pipe', () => { assertEquals( await c(undefined, { env: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected number, received string', path: ['inp'] }, - ], + errors: [new InputError('Expected number, received string', 'inp')], }), ) }) diff --git a/src/sequence.test.ts b/src/sequence.test.ts index 3806f259..34d59cfa 100644 --- a/src/sequence.test.ts +++ b/src/sequence.test.ts @@ -5,7 +5,8 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { sequence } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { InputError, makeErrorResult } from './errors.ts' +import { EnvironmentError } from './errors.ts' describe('sequence', () => { it('should compose domain functions from left-to-right saving the results sequentially', async () => { @@ -75,7 +76,7 @@ describe('sequence', () => { assertEquals( await c(undefined, {}), makeErrorResult({ - environmentErrors: [{ message: 'Required', path: ['env'] }], + errors: [new EnvironmentError('Required', 'env')], }), ) }) @@ -100,9 +101,7 @@ describe('sequence', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected undefined, received object', path: [] }, - ], + errors: [new InputError('Expected undefined, received object', '')], }), ) }) @@ -125,9 +124,7 @@ describe('sequence', () => { assertEquals( await c(undefined, { env: 1 }), makeErrorResult({ - inputErrors: [ - { message: 'Expected number, received string', path: ['inp'] }, - ], + errors: [new InputError('Expected number, received string', 'inp')], }), ) }) diff --git a/src/trace.test.ts b/src/trace.test.ts index 2966a3e8..fce522ca 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -39,13 +39,7 @@ describe('trace', () => { assertEquals(contextFromFunctionA, { input: { id: 1 }, environment: undefined, - result: { - success: true, - errors: [], - inputErrors: [], - environmentErrors: [], - data: 2, - }, + result: { success: true, errors: [], data: 2 }, }) }) }) diff --git a/src/types.ts b/src/types.ts index ca05c750..f1b8fb91 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,20 +1,4 @@ -import { Failure, Success } from './composable/types.ts' - -/** - * A successful domain function result. - */ -type SuccessResult = Success & { - inputErrors: [] - environmentErrors: [] -} - -/** - * A failed domain function result. - */ -type ErrorResult = Failure & { - inputErrors: SchemaError[] - environmentErrors: SchemaError[] -} +import { Failure, Success, Result } from './composable/types.ts' /** * Items in the inputErrors and environmentErrors array returned by failed domain functions. @@ -27,12 +11,10 @@ type SchemaError = { /** * The properties of the ErrorResult which carry information about what made the domain function fail. */ -type ErrorData = Omit - -/** - * The content of the Promise a domain function returns. - */ -type Result = SuccessResult | ErrorResult +type ErrorData = Failure & { + inputErrors: SchemaError[] + environmentErrors: SchemaError[] +} /** * A domain function. @@ -128,13 +110,13 @@ export type { export type { DomainFunction, ErrorData, - ErrorResult, + Failure as ErrorResult, ParserIssue, ParserResult, ParserSchema, Result, SchemaError, - SuccessResult, + Success as SuccessResult, UnpackAll, UnpackData, UnpackDFObject, From 6123555403f75e3bbcce6000983ca9cf8ce49921 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 14:40:01 -0400 Subject: [PATCH 009/238] multiple input errors wwill be handled by some generic Failure error class --- src/constructor.test.ts | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/constructor.test.ts b/src/constructor.test.ts index e672df23..e39bf035 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -253,26 +253,6 @@ describe('makeDomainFunction', () => { ) }) - it('returns multiple inputErrors when the domain function throws an InputErrors', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { - throw new InputErrors([ - { message: 'Custom input error', path: 'contact.id' }, - { message: 'Another input error', path: 'contact.id' }, - ]) - }) - type _R = Expect>> - - assertEquals( - await handler({ id: 1 }), - makeErrorResult({ - errors: [ - new InputError('Custom input error', 'contact.id'), - new InputError('Another input error', 'contact.id'), - ], - }), - ) - }) - it('returns environmentErrors when the domain function throws an EnvironmentError', async () => { const handler = mdf(z.object({ id: z.number() }))(() => { throw new EnvironmentError('Custom env error', 'currentUser.role') From 1c3108f861193a5fadb186f70c235a396f7469d2 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 14:50:18 -0400 Subject: [PATCH 010/238] Remove all references to InputErrors since we are going to unify everything under some sort o Failure (currently ResultError). Merge composable/errors into /errors to avoid weird TS bug --- README.md | 19 ------------------ src/composable/composable.ts | 2 +- src/composable/errors.ts | 27 -------------------------- src/composable/index.ts | 1 - src/constructor.test.ts | 1 - src/domain-functions.ts | 3 +-- src/errors.ts | 37 ++++++++++++++++++++++++++---------- src/index.ts | 1 - 8 files changed, 29 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index db294b70..45211682 100644 --- a/README.md +++ b/README.md @@ -210,25 +210,6 @@ failedResult = { */ ``` -To throw several input errors at once, you can use the pluralized version `InputErrors` like this: - -```ts -const alwaysFails = mdf(input, environment)(async () => { - throw new InputErrors([{message: 'Email already taken', path: 'email'}, {message: 'Password too short', path: 'password'}]) -}) - -const failedResult = await alwaysFails(someInput) -// ^? Result -/* -failedResult = { - success: false, - errors: [], - inputErrors: [{ message: 'Email already taken', path: ['email'] }, { message: 'Password too short', path: ['password'] }], - environmentErrors: [], -} -*/ -``` - You can also return a custom environment error by throwing an `EnvironmentError`. ### Using error messages in the UI diff --git a/src/composable/composable.ts b/src/composable/composable.ts index af8e63d7..9cf6171d 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,4 +1,4 @@ -import { toError } from './errors.ts' +import { toError } from '../errors.ts' import { AllArguments, CollectArguments, diff --git a/src/composable/errors.ts b/src/composable/errors.ts index fef8e0bb..e69de29b 100644 --- a/src/composable/errors.ts +++ b/src/composable/errors.ts @@ -1,27 +0,0 @@ -function objectHasKey( - obj: unknown, - key: T, -): obj is { [k in T]: unknown } { - return typeof obj === 'object' && obj !== null && key in obj -} - -function isError(error: unknown): error is Error { - return objectHasKey(error, 'message') && typeof error.message === 'string' -} - -/** - * Turns the given 'unknown' error into an Error. - * @param maybeError the error to turn into an Error - * @returns the Error - * @example - * try {} - * catch (error) { - * const Error = toError(error) - * console.log(Error.message) - * } - */ -function toError(maybeError: unknown): Error { - return isError(maybeError) ? maybeError : new Error(String(maybeError)) -} - -export { toError } diff --git a/src/composable/index.ts b/src/composable/index.ts index f29f4dcb..d0f89f6c 100644 --- a/src/composable/index.ts +++ b/src/composable/index.ts @@ -1,5 +1,4 @@ export type { Composable, Result } from './types.ts' -export { toError } from './errors.ts' export { catchError, composable, diff --git a/src/constructor.test.ts b/src/constructor.test.ts index e39bf035..f6f1df4e 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -11,7 +11,6 @@ import { makeSuccessResult, mdf, toComposable } from './constructor.ts' import { EnvironmentError, InputError, - InputErrors, ResultError, makeErrorResult, } from './errors.ts' diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 00ee7cb3..77c53078 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -1,4 +1,4 @@ -import { ResultError } from './errors.ts' +import { ResultError, toError } from './errors.ts' import * as A from './composable/composable.ts' import type { DomainFunction, @@ -13,7 +13,6 @@ import type { UnpackResult, } from './types.ts' import { dfResultFromcomposable } from './constructor.ts' -import { toError } from './composable/errors.ts' import { Composable } from './index.ts' import { ErrorResult } from '../mod.ts' diff --git a/src/errors.ts b/src/errors.ts index 18eef2f1..73021008 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -39,15 +39,6 @@ class InputError extends Error { } } -class InputErrors extends Error { - errors: { message: string; path: string }[] - - constructor(errors: { message: string; path: string }[]) { - super(`${errors.length} errors`) - this.errors = errors - } -} - /** * A custom error class for environment errors. * @example @@ -141,11 +132,37 @@ function makeErrorResult({ errors }: Pick): ErrorResult { } } +function objectHasKey( + obj: unknown, + key: T, +): obj is { [k in T]: unknown } { + return typeof obj === 'object' && obj !== null && key in obj +} + +function isError(error: unknown): error is Error { + return objectHasKey(error, 'message') && typeof error.message === 'string' +} + +/** + * Turns the given 'unknown' error into an Error. + * @param maybeError the error to turn into an Error + * @returns the Error + * @example + * try {} + * catch (error) { + * const Error = toError(error) + * console.log(Error.message) + * } + */ +function toError(maybeError: unknown): Error { + return isError(maybeError) ? maybeError : new Error(String(maybeError)) +} + export { + toError, EnvironmentError, errorMessagesFor, InputError, - InputErrors, ResultError, schemaError, makeErrorResult, diff --git a/src/index.ts b/src/index.ts index 0007df2a..55d19082 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,7 +11,6 @@ export * from './errors.ts' export { mergeObjects } from './composable/composable.ts' export type { Composable } from './composable/index.ts' import * as composable from './composable/index.ts' -export { toError } from './composable/errors.ts' export { composable as cf } export type { AtLeastOne, From 5fefce284ffa51a46090c73314cf129791cdfb4f Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 14:54:15 -0400 Subject: [PATCH 011/238] Adds a spacial handler for ResultError so we unpack list of errors for every composable --- src/composable/composable.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index 9cf6171d..8efd78ec 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,3 +1,4 @@ +import { ResultError } from '../../mod.ts' import { toError } from '../errors.ts' import { AllArguments, @@ -51,6 +52,9 @@ function composable(fn: T): Composable { const result = await fn(...(args as any[])) return success(result) } catch (e) { + if (e instanceof ResultError) { + return error(e.result.errors) + } return error([toError(e)]) } } From b6bd75e50193f63591b7beecda8cf211fd0c3089 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 14:56:11 -0400 Subject: [PATCH 012/238] Now input errors are always added before errors --- src/first.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/first.test.ts b/src/first.test.ts index b17158f4..bd396032 100644 --- a/src/first.test.ts +++ b/src/first.test.ts @@ -50,8 +50,8 @@ describe('first', () => { await c({ id: 1 }), makeErrorResult({ errors: [ - new Error('Error'), new InputError('Expected string, received number', 'id'), + new Error('Error'), ], }), ) From 2dbabfab3d92dbc228a4516cec52615eb6eba94f Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 15:06:28 -0400 Subject: [PATCH 013/238] All green --- src/map-error.test.ts | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/map-error.test.ts b/src/map-error.test.ts index dccd5339..48c6df6e 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -22,49 +22,38 @@ describe('mapError', () => { }) it('returns a domain function function that will apply a function over the error of the first one', async () => { - const exception = new Error('Number of errors: 0') const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = (result: Pick) => { - const nonInputErrors = result.errors.filter( - (e) => !(e instanceof InputError), - ) - const inputErrors = result.errors.filter((e) => e instanceof InputError) + const errorMapper = (result: Pick) => { return { - errors: [ - nonInputErrors, - new InputError('Number of input errors: ' + inputErrors.length, ''), - ], + errors: [new Error('Number of errors: ' + result.errors.length)], } as Pick } - const c = mapError(a, b) + const c = mapError(a, errorMapper) type _R = Expect>> assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [exception, new InputError('Number of input errors: 1', '')], + errors: [new Error('Number of errors: 1')], }), ) }) it('returns a domain function function that will apply an async function over the error of the first one', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = (result: Pick) => + const errorMapper = (result: Pick) => Promise.resolve({ errors: [new Error('Number of errors: ' + result.errors.length)], }) - const c = mapError(a, b) + const c = mapError(a, errorMapper) type _R = Expect>> assertEquals( await c({ invalidInput: '1' }), makeErrorResult({ - errors: [ - new Error('Number of errors: 0'), - new InputError('Number of input errors: 1', ''), - ], + errors: [new Error('Number of errors: 1')], }), ) }) From 3bb0e8cbc38fa98a86b37b54747178c461429df5 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 15:15:26 -0400 Subject: [PATCH 014/238] fix import --- src/composable/composable.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index 8efd78ec..094544c3 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,5 +1,4 @@ -import { ResultError } from '../../mod.ts' -import { toError } from '../errors.ts' +import { toError, ResultError } from '../errors.ts' import { AllArguments, CollectArguments, From e41c9e256cac07189e0e08616d5d7fadb96125db Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 15:16:49 -0400 Subject: [PATCH 015/238] Rename FailureConstructor to failure --- src/composable/composable.ts | 20 ++++++++++---------- src/domain-functions.ts | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index 094544c3..61ee8fa0 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -35,7 +35,7 @@ function success(data: T): Success { return { success: true, data, errors: [] } } -function error(errors: Error[]): Failure { +function failure(errors: Error[]): Failure { return { success: false, errors } } @@ -52,9 +52,9 @@ function composable(fn: T): Composable { return success(result) } catch (e) { if (e instanceof ResultError) { - return error(e.result.errors) + return failure(e.result.errors) } - return error([toError(e)]) + return failure([toError(e)]) } } } @@ -81,7 +81,7 @@ function pipe( // I don't understand what is the issue here but ignoring the errors // is safe and much nicer than a bunch of casts to any const res = await sequence(...fns)(...args) - return !res.success ? error(res.errors) : success(res.data.at(-1)) + return !res.success ? failure(res.errors) : success(res.data.at(-1)) }) as PipeReturn } @@ -103,7 +103,7 @@ function all( const results = await Promise.all(fns.map((fn) => fn(...args))) if (results.some(({ success }) => success === false)) { - return error(results.map(({ errors }) => errors).flat()) + return failure(results.map(({ errors }) => errors).flat()) } return success((results as Success[]).map(({ data }) => data)) @@ -154,12 +154,12 @@ function sequence( const [head, ...tail] = fns as T const res = await head(...args) - if (!res.success) return error(res.errors) + if (!res.success) return failure(res.errors) const result = [res.data] for await (const fn of tail) { const res = await fn(result.at(-1)) - if (!res.success) return error(res.errors) + if (!res.success) return failure(res.errors) result.push(res.data) } return success(result) @@ -234,9 +234,9 @@ function mapError( if (res.success) return success(res.data) const mapped = await composable(mapper)(res) if (mapped.success) { - return error(mapped.data.errors) + return failure(mapped.data.errors) } else { - return error(mapped.errors) + return failure(mapped.errors) } }) as T } @@ -246,7 +246,7 @@ export { catchError, collect, composable, - error, + failure, map, mapError, mergeObjects, diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 77c53078..994ff01a 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -368,7 +368,7 @@ function trace>( >) return result } catch (e) { - return A.error([toError(e)]) + return A.failure([toError(e)]) } } } From ff88e2f293adda27bf75c50bca1f4a2ceb9fdaec Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 15:29:39 -0400 Subject: [PATCH 016/238] Remove all imports from mod since that is just the external interface --- src/all.test.ts | 3 +-- src/apply-environment.test.ts | 3 +-- src/branch.test.ts | 3 +-- src/domain-functions.ts | 2 +- src/map-error.test.ts | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index aa16141f..4d81e5ee 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -5,9 +5,8 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { makeErrorResult, InputError } from './errors.ts' import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' -import { InputError } from '../mod.ts' describe('all', () => { it('should combine two domain functions into one', async () => { diff --git a/src/apply-environment.test.ts b/src/apply-environment.test.ts index 5acce13c..98bf4668 100644 --- a/src/apply-environment.test.ts +++ b/src/apply-environment.test.ts @@ -3,8 +3,7 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { applyEnvironment } from './domain-functions.ts' -import { makeErrorResult } from './errors.ts' -import { EnvironmentError } from '../mod.ts' +import { makeErrorResult, EnvironmentError } from './errors.ts' describe('applyEnvironment', () => { it('fails when environment fails parser', async () => { diff --git a/src/branch.test.ts b/src/branch.test.ts index 6f0fbf91..4b2b6bd0 100644 --- a/src/branch.test.ts +++ b/src/branch.test.ts @@ -5,8 +5,7 @@ import { makeSuccessResult, mdf } from './constructor.ts' import { branch, pipe, all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' -import { InputError } from '../mod.ts' +import { makeErrorResult, InputError } from './errors.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 994ff01a..42ecadc8 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -11,10 +11,10 @@ import type { UnpackData, UnpackDFObject, UnpackResult, + ErrorResult, } from './types.ts' import { dfResultFromcomposable } from './constructor.ts' import { Composable } from './index.ts' -import { ErrorResult } from '../mod.ts' /** * A functions that turns the result of its callback into a Result object. diff --git a/src/map-error.test.ts b/src/map-error.test.ts index 48c6df6e..f5bab8b6 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -3,10 +3,9 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { mapError } from './domain-functions.ts' -import type { DomainFunction, ErrorData } from './types.ts' +import type { DomainFunction, ErrorData, ErrorResult } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' -import { ErrorResult, InputError } from '../mod.ts' describe('mapError', () => { it('returns the result when the domain function suceeds', async () => { From 33ae91d728978b73e36a7c456780b60442a058cd Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 9 Apr 2024 15:32:08 -0400 Subject: [PATCH 017/238] drop ErrorResult name in favour of Failure to keep consistent with composable --- src/domain-functions.ts | 6 +++--- src/errors.ts | 8 ++++---- src/index.ts | 2 +- src/map-error.test.ts | 6 +++--- src/types.ts | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 42ecadc8..db0cb58f 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -11,7 +11,7 @@ import type { UnpackData, UnpackDFObject, UnpackResult, - ErrorResult, + Failure, } from './types.ts' import { dfResultFromcomposable } from './constructor.ts' import { Composable } from './index.ts' @@ -321,8 +321,8 @@ function fromSuccess( function mapError( dfn: DomainFunction, mapper: ( - element: Pick, - ) => Pick | Promise>, + element: Pick, + ) => Pick | Promise>, ): DomainFunction { return (async (input, environment) => { const result = await dfn(input, environment) diff --git a/src/errors.ts b/src/errors.ts index 73021008..666dd3f4 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -1,4 +1,4 @@ -import type { ErrorData, ErrorResult, SchemaError } from './types.ts' +import type { ErrorData, Failure, SchemaError } from './types.ts' /** * Creates a SchemaError (used in inputErrors and environmentErrors) from the given message and path. @@ -67,9 +67,9 @@ class EnvironmentError extends Error { * }) */ class ResultError extends Error { - result: ErrorResult + result: Failure - constructor(result: Pick) { + constructor(result: Pick) { super('ResultError') this.name = 'ResultError' this.result = makeErrorResult(result) @@ -125,7 +125,7 @@ class ResultError extends Error { // }) // } -function makeErrorResult({ errors }: Pick): ErrorResult { +function makeErrorResult({ errors }: Pick): Failure { return { success: false, errors, diff --git a/src/index.ts b/src/index.ts index 55d19082..76aec652 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,7 +16,7 @@ export type { AtLeastOne, DomainFunction, ErrorData, - ErrorResult, + Failure, Last, MergeObjs, ParserIssue, diff --git a/src/map-error.test.ts b/src/map-error.test.ts index f5bab8b6..bc9ea7df 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -3,7 +3,7 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { mapError } from './domain-functions.ts' -import type { DomainFunction, ErrorData, ErrorResult } from './types.ts' +import type { DomainFunction, ErrorData, Failure } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' @@ -22,7 +22,7 @@ describe('mapError', () => { it('returns a domain function function that will apply a function over the error of the first one', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const errorMapper = (result: Pick) => { + const errorMapper = (result: Pick) => { return { errors: [new Error('Number of errors: ' + result.errors.length)], } as Pick @@ -41,7 +41,7 @@ describe('mapError', () => { it('returns a domain function function that will apply an async function over the error of the first one', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const errorMapper = (result: Pick) => + const errorMapper = (result: Pick) => Promise.resolve({ errors: [new Error('Number of errors: ' + result.errors.length)], }) diff --git a/src/types.ts b/src/types.ts index f1b8fb91..d7f65abb 100644 --- a/src/types.ts +++ b/src/types.ts @@ -110,7 +110,7 @@ export type { export type { DomainFunction, ErrorData, - Failure as ErrorResult, + Failure as Failure, ParserIssue, ParserResult, ParserSchema, From c9f734cfb3a21e3d178c4fd53477689f6e227d4e Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 17:22:03 -0300 Subject: [PATCH 018/238] Remove dfResultFromComposable since result is consistent --- src/constructor.ts | 11 +---------- src/domain-functions.ts | 17 +++++------------ 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/constructor.ts b/src/constructor.ts index 05517ba3..7d79304f 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -12,12 +12,6 @@ function makeSuccessResult(data: T): SuccessResult { return { success: true, data, errors: [] } } -function dfResultFromcomposable(fn: T) { - return (async (...args) => { - return await fn(...args) - }) as Composable<(...args: Parameters) => R> -} - function getInputErrors(errors: ParserIssue[]): InputError[] { return errors.map((error) => { const { path, message } = error @@ -89,9 +83,7 @@ function fromComposable( } return makeErrorResult({ errors }) } - return dfResultFromcomposable(fn)( - ...([result.data as I, envResult.data as E] as Parameters), - ) + return fn(...([result.data as I, envResult.data as E] as Parameters)) } as DomainFunction>> } @@ -121,7 +113,6 @@ const undefinedSchema: ParserSchema = { } export { - dfResultFromcomposable, fromComposable, makeDomainFunction, makeDomainFunction as mdf, diff --git a/src/domain-functions.ts b/src/domain-functions.ts index db0cb58f..3b90a58c 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -13,7 +13,6 @@ import type { UnpackResult, Failure, } from './types.ts' -import { dfResultFromcomposable } from './constructor.ts' import { Composable } from './index.ts' /** @@ -36,7 +35,7 @@ import { Composable } from './index.ts' * } */ function safeResult(fn: () => T): Promise> { - return dfResultFromcomposable(A.composable(fn))() as Promise> + return A.composable(fn)() as Promise> } /** @@ -73,7 +72,7 @@ function all( const composables = fns.map((df) => A.composable(() => fromSuccess(df)(input, environment)), ) - return dfResultFromcomposable(A.all(...(composables as [Composable])))() + return A.all(...(composables as [Composable]))() }) as DomainFunction> } @@ -210,12 +209,8 @@ function sequence( ...fns: Fns ): DomainFunction> { return function (input: unknown, environment?: unknown) { - const dfsAsComposable = fns.map((df) => - A.composable(fromSuccess(applyEnvironment(df, environment))), - ) - return dfResultFromcomposable( - A.sequence(...(dfsAsComposable as [Composable])), - )(input) + const dfsAsComposable = fns.map((df) => applyEnvironment(df, environment)) + return A.sequence(...(dfsAsComposable as [Composable]))(input) } as DomainFunction> } @@ -232,9 +227,7 @@ function map( dfn: DomainFunction, mapper: (element: O) => R | Promise, ): DomainFunction { - return dfResultFromcomposable( - A.map(A.composable(fromSuccess(dfn)), mapper), - ) as DomainFunction + return A.map(A.composable(fromSuccess(dfn)), mapper) as DomainFunction } /** From f84539b3918c87bc854fe16dcf864362159c00b5 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 17:22:58 -0300 Subject: [PATCH 019/238] Remove legacy ErrorData and SchemaError --- src/composable/errors.ts | 0 src/composable/types.ts | 4 ++-- src/errors.test.ts | 33 -------------------------------- src/errors.ts | 41 +++------------------------------------- src/index.ts | 36 +++++++++++++++++++++++++++++------ src/map-error.test.ts | 10 ++++------ src/types.ts | 22 ++------------------- 7 files changed, 41 insertions(+), 105 deletions(-) delete mode 100644 src/composable/errors.ts delete mode 100644 src/errors.test.ts diff --git a/src/composable/errors.ts b/src/composable/errors.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/composable/types.ts b/src/composable/types.ts index d26a91f2..a93b2ff5 100644 --- a/src/composable/types.ts +++ b/src/composable/types.ts @@ -24,12 +24,12 @@ type Failure = { success: false errors: Array } -type Success = { +type Success = { success: true data: T errors: [] } -type Result = Success | Failure +type Result = Success | Failure type Fn = (...args: any[]) => any type Composable = ( diff --git a/src/errors.test.ts b/src/errors.test.ts deleted file mode 100644 index f23d8b24..00000000 --- a/src/errors.test.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { describe, it, assertEquals } from './test-prelude.ts' - -import { errorMessagesFor, schemaError } from './errors.ts' - -const errors = [ - { path: ['a'], message: 'a' }, - { path: ['b'], message: 'b' }, - { path: ['b'], message: 'c' }, -] - -describe('schemaError', () => { - it('returns a SchemaError from a message and a path using dot notation', () => { - assertEquals(schemaError('this is an error message', 'b.c'), { - message: 'this is an error message', - path: ['b', 'c'], - }) - }) -}) - -describe('errorMessagesFor', () => { - it('returns a list of error messages for a given name', () => { - assertEquals(errorMessagesFor(errors, 'b'), ['b', 'c']) - }) - - it('returns an empty list if no error messages can be found', () => { - assertEquals(errorMessagesFor(errors, 'c'), []) - }) - - it('returns a list of error messages for a deep property of the formData', () => { - const err = [{ path: ['person', '0', 'email'], message: 'Invalid email' }] - assertEquals(errorMessagesFor(err, 'person.0.email'), ['Invalid email']) - }) -}) diff --git a/src/errors.ts b/src/errors.ts index 666dd3f4..09b620b2 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -1,26 +1,4 @@ -import type { ErrorData, Failure, SchemaError } from './types.ts' - -/** - * Creates a SchemaError (used in inputErrors and environmentErrors) from the given message and path. - * @param message the error message - * @param path the path to the property that caused the error - * @returns the SchemaError - */ -function schemaError(message: string, path: string): SchemaError { - return { message, path: path.split('.') } -} - -/** - * Extracts the error messages for a property from the given ErrorResult. - * @param errors the ErrorResult['inputErrors'] or ErrorResult['environmentErrors'] - * @param name the name of the property - * @returns string[] the error messages for the given property - */ -function errorMessagesFor(errors: SchemaError[], name: string) { - return errors - .filter(({ path }) => path.join('.') === name) - .map(({ message }) => message) -} +import type { Failure } from './types.ts' /** * A custom error class for input errors. @@ -76,11 +54,6 @@ class ResultError extends Error { } } -// function schemaErrorToError(se: SchemaError): Error { -// const message = `${se.path.join('.')} ${se.message}`.trim() -// return new Error(message) -// } - // function failureToErrorResult({ errors }: Failure): ErrorResult { // return makeErrorResult({ // errors: errors @@ -125,7 +98,7 @@ class ResultError extends Error { // }) // } -function makeErrorResult({ errors }: Pick): Failure { +function makeErrorResult({ errors }: Pick): Failure { return { success: false, errors, @@ -158,12 +131,4 @@ function toError(maybeError: unknown): Error { return isError(maybeError) ? maybeError : new Error(String(maybeError)) } -export { - toError, - EnvironmentError, - errorMessagesFor, - InputError, - ResultError, - schemaError, - makeErrorResult, -} +export { toError, EnvironmentError, InputError, ResultError, makeErrorResult } diff --git a/src/index.ts b/src/index.ts index 76aec652..ba0625ea 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,13 +1,39 @@ export { fromComposable, makeDomainFunction, + makeSuccessResult, mdf, toComposable, - makeSuccessResult, } from './constructor.ts' -export * from './domain-functions.ts' -export * from './input-resolvers.ts' -export * from './errors.ts' +export { + all, + applyEnvironment, + branch, + collect, + collectSequence, + first, + fromSuccess, + map, + mapError, + merge, + pipe, + safeResult, + sequence, + trace, +} from './domain-functions.ts' +export { + inputFromForm, + inputFromFormData, + inputFromSearch, + inputFromUrl, +} from './input-resolvers.ts' +export { + EnvironmentError, + InputError, + makeErrorResult, + ResultError, + toError, +} from './errors.ts' export { mergeObjects } from './composable/composable.ts' export type { Composable } from './composable/index.ts' import * as composable from './composable/index.ts' @@ -15,7 +41,6 @@ export { composable as cf } export type { AtLeastOne, DomainFunction, - ErrorData, Failure, Last, MergeObjs, @@ -23,7 +48,6 @@ export type { ParserResult, ParserSchema, Result, - SchemaError, SuccessResult, TupleToUnion, UnpackAll, diff --git a/src/map-error.test.ts b/src/map-error.test.ts index bc9ea7df..36612582 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -3,7 +3,7 @@ import { z } from './test-prelude.ts' import { makeSuccessResult, mdf } from './constructor.ts' import { mapError } from './domain-functions.ts' -import type { DomainFunction, ErrorData, Failure } from './types.ts' +import type { DomainFunction, Failure } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { makeErrorResult } from './errors.ts' @@ -22,11 +22,9 @@ describe('mapError', () => { it('returns a domain function function that will apply a function over the error of the first one', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const errorMapper = (result: Pick) => { - return { - errors: [new Error('Number of errors: ' + result.errors.length)], - } as Pick - } + const errorMapper = (result: Pick) => ({ + errors: [new Error('Number of errors: ' + result.errors.length)], + }) const c = mapError(a, errorMapper) type _R = Expect>> diff --git a/src/types.ts b/src/types.ts index d7f65abb..861bf9e1 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,21 +1,5 @@ import { Failure, Success, Result } from './composable/types.ts' -/** - * Items in the inputErrors and environmentErrors array returned by failed domain functions. - */ -type SchemaError = { - path: string[] - message: string -} - -/** - * The properties of the ErrorResult which carry information about what made the domain function fail. - */ -type ErrorData = Failure & { - inputErrors: SchemaError[] - environmentErrors: SchemaError[] -} - /** * A domain function. * It carries the output type which can be further unpacked with UnpackData and other type helpers. @@ -77,7 +61,7 @@ type UnpackDFObject> = /** * A parsing error when validating the input or environment schemas. - * This will be transformed into a `SchemaError` before being returned from the domain function. + * This will be transformed into an `InputError` before being returned from the domain function. * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. */ type ParserIssue = { path: PropertyKey[]; message: string } @@ -109,13 +93,11 @@ export type { } from './composable/types.ts' export type { DomainFunction, - ErrorData, - Failure as Failure, + Failure, ParserIssue, ParserResult, ParserSchema, Result, - SchemaError, Success as SuccessResult, UnpackAll, UnpackData, From 63540104a78ef99856b507acf10c399d028f4e3c Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 17:51:29 -0300 Subject: [PATCH 020/238] Unify success with makeSuccessResult and failure with makeErrorResult --- src/all.test.ts | 35 +++++------------ src/apply-environment.test.ts | 10 ++--- src/branch.test.ts | 25 +++++------- src/collect-sequence.test.ts | 24 +++++------- src/collect.test.ts | 27 +++++-------- src/composable/composable.ts | 13 +------ src/composable/index.test.ts | 55 +++++++++++---------------- src/composable/index.ts | 6 +-- src/constructor.test.ts | 71 ++++++++++------------------------- src/constructor.ts | 21 +++++------ src/domain-functions.ts | 4 +- src/errors.ts | 21 ++++++----- src/first.test.ts | 22 ++++------- src/index.ts | 2 + src/map-error.test.ts | 18 +++------ src/map.test.ts | 19 +++------- src/merge.test.ts | 35 +++++------------ src/pipe.test.ts | 24 +++++------- src/sequence.test.ts | 26 ++++--------- src/trace.test.ts | 3 +- 20 files changed, 160 insertions(+), 301 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index 4d81e5ee..ff45d9a9 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -1,11 +1,11 @@ import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult, InputError } from './errors.ts' +import { failure, InputError } from './errors.ts' import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' describe('all', () => { @@ -16,10 +16,7 @@ describe('all', () => { const c = all(a, b) type _R = Expect>> - assertEquals( - await c({ id: 1 }), - makeSuccessResult<[number, number]>([2, 0]), - ) + assertEquals(await c({ id: 1 }), success<[number, number]>([2, 0])) }) it('should combine many domain functions into one', async () => { @@ -30,10 +27,7 @@ describe('all', () => { type _R = Expect>> const results = await d({ id: 1 }) - assertEquals( - results, - makeSuccessResult<[string, number, boolean]>(['1', 2, true]), - ) + assertEquals(results, success<[string, number, boolean]>(['1', 2, true])) }) it('should return error when one of the domain functions has input errors', async () => { @@ -45,9 +39,7 @@ describe('all', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [new InputError('Expected string, received number', 'id')], - }), + failure([new InputError('Expected string, received number', 'id')]), ) }) @@ -60,12 +52,7 @@ describe('all', () => { const c = all(a, b) type _R = Expect>> - assertEquals( - await c({ id: 1 }), - makeErrorResult({ - errors: [new Error()], - }), - ) + assertEquals(await c({ id: 1 }), failure([new Error()])) }) it('should combine the inputError messages of both functions', async () => { @@ -77,12 +64,10 @@ describe('all', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [ - new InputError('Expected string, received number', 'id'), - new InputError('Expected string, received number', 'id'), - ], - }), + failure([ + new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', 'id'), + ]), ) }) diff --git a/src/apply-environment.test.ts b/src/apply-environment.test.ts index 98bf4668..a4598c48 100644 --- a/src/apply-environment.test.ts +++ b/src/apply-environment.test.ts @@ -1,9 +1,9 @@ import { assertEquals, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { applyEnvironment } from './domain-functions.ts' -import { makeErrorResult, EnvironmentError } from './errors.ts' +import { failure, EnvironmentError } from './errors.ts' describe('applyEnvironment', () => { it('fails when environment fails parser', async () => { @@ -16,9 +16,7 @@ describe('applyEnvironment', () => { assertEquals( await getEnvWithEnvironment('some input'), - makeErrorResult({ - errors: [new EnvironmentError('Expected number, received string', '')], - }), + failure([new EnvironmentError('Expected number, received string', '')]), ) }) @@ -32,7 +30,7 @@ describe('applyEnvironment', () => { assertEquals( await getEnvWithEnvironment('some input'), - makeSuccessResult('constant environment'), + success('constant environment'), ) }) }) diff --git a/src/branch.test.ts b/src/branch.test.ts index 4b2b6bd0..690452cd 100644 --- a/src/branch.test.ts +++ b/src/branch.test.ts @@ -1,11 +1,11 @@ import { describe, it, assertEquals, assertIsError } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { branch, pipe, all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult, InputError } from './errors.ts' +import { failure, InputError } from './errors.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { @@ -17,7 +17,7 @@ describe('branch', () => { const c = branch(a, () => Promise.resolve(b)) type _R = Expect>> - assertEquals(await c({ id: 1 }), makeSuccessResult(2)) + assertEquals(await c({ id: 1 }), success(2)) }) it('should enable conditionally choosing the next DF with the output of first one', async () => { @@ -30,7 +30,7 @@ describe('branch', () => { const d = branch(a, (output) => (output.next === 'multiply' ? c : b)) type _R = Expect>> - assertEquals(await d({ id: 1 }), makeSuccessResult(6)) + assertEquals(await d({ id: 1 }), success(6)) }) it('should not pipe if the predicate returns null', async () => { @@ -44,10 +44,7 @@ describe('branch', () => { Equal> > - assertEquals( - await d({ id: 1 }), - makeSuccessResult({ id: 3, next: 'multiply' }), - ) + assertEquals(await d({ id: 1 }), success({ id: 3, next: 'multiply' })) }) it('should use the same environment in all composed functions', async () => { @@ -65,7 +62,7 @@ describe('branch', () => { const c = branch(a, () => b) type _R = Expect>> - assertEquals(await c(undefined, { env: 1 }), makeSuccessResult(4)) + assertEquals(await c(undefined, { env: 1 }), success(4)) }) it('should gracefully fail if the first function fails', async () => { @@ -78,9 +75,7 @@ describe('branch', () => { assertEquals( await c({ id: '1' }), - makeErrorResult({ - errors: [new InputError('Expected number, received string', 'id')], - }), + failure([new InputError('Expected number, received string', 'id')]), ) }) @@ -94,9 +89,7 @@ describe('branch', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [new InputError('Expected number, received string', 'id')], - }), + failure([new InputError('Expected number, received string', 'id')]), ) }) @@ -135,7 +128,7 @@ describe('branch', () => { assertEquals( await d({ id: 1 }), - makeSuccessResult<[number, { id: number }]>([4, { id: 3 }]), + success<[number, { id: number }]>([4, { id: 3 }]), ) }) }) diff --git a/src/collect-sequence.test.ts b/src/collect-sequence.test.ts index 1cdbdb8a..9c8d7580 100644 --- a/src/collect-sequence.test.ts +++ b/src/collect-sequence.test.ts @@ -1,12 +1,12 @@ import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { collectSequence } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { InputError, makeErrorResult } from './errors.ts' -import { EnvironmentError } from './errors.ts' +import { InputError } from './errors.ts' +import { failure, EnvironmentError } from './errors.ts' describe('collectSequence', () => { it('should compose domain functions keeping the given order of keys', async () => { @@ -20,7 +20,7 @@ describe('collectSequence', () => { Equal> > - assertEquals(await c({ id: 1 }), makeSuccessResult({ a: { id: 3 }, b: 2 })) + assertEquals(await c({ id: 1 }), success({ a: { id: 3 }, b: 2 })) }) it('should use the same environment in all composed functions', async () => { @@ -42,7 +42,7 @@ describe('collectSequence', () => { assertEquals( await c(undefined, { env: 1 }), - makeSuccessResult({ a: { inp: 3 }, b: 4 }), + success({ a: { inp: 3 }, b: 4 }), ) }) @@ -66,9 +66,7 @@ describe('collectSequence', () => { assertEquals( await c(undefined, {}), - makeErrorResult({ - errors: [new EnvironmentError('Required', 'env')], - }), + failure([new EnvironmentError('Required', 'env')]), ) }) @@ -93,9 +91,7 @@ describe('collectSequence', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), - makeErrorResult({ - errors: [new InputError('Expected undefined, received object', '')], - }), + failure([new InputError('Expected undefined, received object', '')]), ) }) @@ -118,9 +114,7 @@ describe('collectSequence', () => { assertEquals( await c(undefined, { env: 1 }), - makeErrorResult({ - errors: [new InputError('Expected number, received string', 'inp')], - }), + failure([new InputError('Expected number, received string', 'inp')]), ) }) @@ -149,7 +143,7 @@ describe('collectSequence', () => { assertEquals( await d({ aNumber: 1 }), - makeSuccessResult({ + success({ a: { aString: '1' }, b: { aBoolean: true }, c: false, diff --git a/src/collect.test.ts b/src/collect.test.ts index 4cf2562f..a8487646 100644 --- a/src/collect.test.ts +++ b/src/collect.test.ts @@ -1,11 +1,11 @@ import { assertEquals, assertIsError, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { collect } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { InputError, makeErrorResult } from './errors.ts' +import { failure, InputError } from './errors.ts' describe('collect', () => { it('should combine an object of domain functions', async () => { @@ -15,7 +15,7 @@ describe('collect', () => { const c = collect({ a, b }) type _R = Expect>> - assertEquals(await c({ id: 1 }), makeSuccessResult({ a: 2, b: 0 })) + assertEquals(await c({ id: 1 }), success({ a: 2, b: 0 })) }) it('should return error when one of the domain functions has input errors', async () => { @@ -27,9 +27,7 @@ describe('collect', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [new InputError('Expected string, received number', 'id')], - }), + failure([new InputError('Expected string, received number', 'id')]), ) }) @@ -42,12 +40,7 @@ describe('collect', () => { const c = collect({ a, b }) type _R = Expect>> - assertEquals( - await c({ id: 1 }), - makeErrorResult({ - errors: [new Error('Error')], - }), - ) + assertEquals(await c({ id: 1 }), failure([new Error('Error')])) }) it('should combine the inputError messages of both functions', async () => { @@ -59,12 +52,10 @@ describe('collect', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [ - new InputError('Expected string, received number', 'id'), - new InputError('Expected string, received number', 'id'), - ], - }), + failure([ + new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', 'id'), + ]), ) }) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index 61ee8fa0..9bedd342 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,4 +1,5 @@ -import { toError, ResultError } from '../errors.ts' +import { success } from '../constructor.ts' +import { toError, ResultError, failure } from '../errors.ts' import { AllArguments, CollectArguments, @@ -31,14 +32,6 @@ function mergeObjects(objs: T) { return Object.assign({}, ...objs) as MergeObjs } -function success(data: T): Success { - return { success: true, data, errors: [] } -} - -function failure(errors: Error[]): Failure { - return { success: false, errors } -} - /** * Creates a composable function. * That function is gonna catch any errors and always return a Result. @@ -246,11 +239,9 @@ export { catchError, collect, composable, - failure, map, mapError, mergeObjects, pipe, sequence, - success, } diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index ecbdbbf8..78f7227b 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -3,6 +3,7 @@ import { map, mapError, pipe, sequence } from './index.ts' import type { Composable, Result } from './index.ts' import { Equal, Expect } from './types.test.ts' import { all, catchError, collect, composable } from './composable.ts' +import { success } from '../constructor.ts' const voidFn = composable(() => {}) const toString = composable((a: unknown) => `${a}`) @@ -25,7 +26,7 @@ describe('composable', () => { type _FN = Expect void>>> type _R = Expect>> - assertEquals(res, { success: true, data: undefined, errors: [] }) + assertEquals(res, success(undefined)) }) it('infers the types if has arguments and a return', async () => { @@ -37,7 +38,7 @@ describe('composable', () => { > type _R = Expect>> - assertEquals(res, { success: true, data: 3, errors: [] }) + assertEquals(res, success(3)) }) it('infers the types of async functions', async () => { @@ -49,7 +50,7 @@ describe('composable', () => { > type _R = Expect>> - assertEquals(res, { success: true, data: 3, errors: [] }) + assertEquals(res, success(3)) }) it('catch errors', async () => { @@ -76,7 +77,7 @@ describe('pipe', () => { > type _R = Expect>> - assertEquals(res, { success: true, data: '3', errors: [] }) + assertEquals(res, success('3')) }) it('type checks and composes async functions', async () => { @@ -92,7 +93,7 @@ describe('pipe', () => { type _FN = Expect number>>> type _R = Expect>> - assertEquals(res, { success: true, data: 2, errors: [] }) + assertEquals(res, success(2)) }) it('catches the errors from function A', async () => { @@ -140,7 +141,7 @@ describe('sequence', () => { > type _R = Expect>> - assertEquals(res, { success: true, data: [3, '3'], errors: [] }) + assertEquals(res, success<[number, string]>([3, '3'])) }) it('type checks and composes async functions', async () => { @@ -168,11 +169,13 @@ describe('sequence', () => { > > - assertEquals(res, { - success: true, - data: [{ toIncrement: 1, someOtherProperty: 'test' }, 2], - errors: [], - }) + assertEquals( + res, + success<[{ toIncrement: number; someOtherProperty: string }, number]>([ + { toIncrement: 1, someOtherProperty: 'test' }, + 2, + ]), + ) }) it('catches the errors from function A', async () => { @@ -195,7 +198,7 @@ describe('all', () => { const res = await fn(1, 2) - assertEquals(res, { success: true, data: [3, '1', undefined], errors: [] }) + assertEquals(res, success<[number, string, undefined]>([3, '1', undefined])) }) }) @@ -227,11 +230,7 @@ describe('collect', () => { Equal> > - assertEquals(res, { - success: true, - data: { add: 3, string: '1', void: undefined }, - errors: [], - }) + assertEquals(res, success({ add: 3, string: '1', void: undefined })) }) it('uses the same arguments for every function', async () => { @@ -256,11 +255,7 @@ describe('collect', () => { > > type _R = Expect>> - assertEquals(res, { - success: true, - data: { add: 3, string: '12' }, - errors: [], - }) + assertEquals(res, success({ add: 3, string: '12' })) }) it('collects the errors in the error array', async () => { @@ -304,7 +299,7 @@ describe('map', () => { > type _R = Expect>> - assertEquals(res, { success: true, data: true, errors: [] }) + assertEquals(res, success(true)) }) it('maps over a composition', async () => { @@ -316,7 +311,7 @@ describe('map', () => { > type _R = Expect>> - assertEquals(res, { success: true, data: true, errors: [] }) + assertEquals(res, success(true)) }) it('does not do anything when the function fails', async () => { @@ -394,11 +389,7 @@ describe('catchError', () => { > type _R = Expect>> - assertEquals(res, { - success: true, - data: null, - errors: [], - }) + assertEquals(res, success(null)) }) it('receives the list of errors as input to another function and returns a new composable', async () => { @@ -412,11 +403,7 @@ describe('catchError', () => { > type _R = Expect>> - assertEquals(res, { - success: true, - data: 3, - errors: [], - }) + assertEquals(res, success(3)) }) it('fails when catcher fail', async () => { diff --git a/src/composable/index.ts b/src/composable/index.ts index d0f89f6c..e18ba1e2 100644 --- a/src/composable/index.ts +++ b/src/composable/index.ts @@ -1,11 +1,11 @@ export type { Composable, Result } from './types.ts' export { + all, catchError, + collect, composable, - pipe, map, mapError, + pipe, sequence, - all, - collect, } from './composable.ts' diff --git a/src/constructor.test.ts b/src/constructor.test.ts index f6f1df4e..3e29c586 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -7,13 +7,8 @@ import { } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf, toComposable } from './constructor.ts' -import { - EnvironmentError, - InputError, - ResultError, - makeErrorResult, -} from './errors.ts' +import { success, mdf, toComposable } from './constructor.ts' +import { failure, EnvironmentError, InputError, ResultError } from './errors.ts' import type { DomainFunction, SuccessResult } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { Composable } from './composable/index.ts' @@ -45,11 +40,7 @@ describe('toComposable', () => { > > - assertObjectMatch(await c(), { - success: true, - data: 'no input!', - errors: [], - }) + assertObjectMatch(await c(), success('no input!')) }) }) @@ -59,7 +50,7 @@ describe('makeDomainFunction', () => { const handler = mdf()(() => 'no input!') type _R = Expect>> - assertEquals(await handler(), makeSuccessResult('no input!')) + assertEquals(await handler(), success('no input!')) }) it('fails gracefully if gets something other than undefined', async () => { @@ -68,9 +59,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler('some input'), - makeErrorResult({ - errors: [new InputError('Expected undefined', '')], - }), + failure([new InputError('Expected undefined', '')]), ) }) }) @@ -82,7 +71,7 @@ describe('makeDomainFunction', () => { const handler = mdf(parser)(({ id }) => id) type _R = Expect>> - assertEquals(await handler({ id: '1' }), makeSuccessResult(1)) + assertEquals(await handler({ id: '1' }), success(1)) }) it('fails gracefully if gets something other than empty record', async () => { @@ -91,9 +80,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler(undefined, ''), - makeErrorResult({ - errors: [new EnvironmentError('Expected an object', '')], - }), + failure([new EnvironmentError('Expected an object', '')]), ) }) @@ -104,9 +91,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ missingId: '1' }), - makeErrorResult({ - errors: [new InputError('Expected number, received nan', 'id')], - }), + failure([new InputError('Expected number, received nan', 'id')]), ) }) }) @@ -123,10 +108,7 @@ describe('makeDomainFunction', () => { Equal> > - assertEquals( - await handler({ id: '1' }, { uid: '2' }), - makeSuccessResult([1, 2]), - ) + assertEquals(await handler({ id: '1' }, { uid: '2' }), success([1, 2])) }) it('applies async validations', async () => { @@ -147,12 +129,10 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: '1' }, { uid: '2' }), - makeErrorResult({ - errors: [ - new InputError('ID already taken', 'id'), - new EnvironmentError('UID already taken', 'uid'), - ], - }), + failure([ + new InputError('ID already taken', 'id'), + new EnvironmentError('UID already taken', 'uid'), + ]), ) }) @@ -181,9 +161,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: '1' }, {}), - makeErrorResult({ - errors: [new EnvironmentError('Expected number, received nan', 'uid')], - }), + failure([new EnvironmentError('Expected number, received nan', 'uid')]), ) }) @@ -218,12 +196,7 @@ describe('makeDomainFunction', () => { }) type _R = Expect>> - assertEquals( - await handler({ id: 1 }), - makeErrorResult({ - errors: [new Error('Error')], - }), - ) + assertEquals(await handler({ id: 1 }), failure([new Error('Error')])) }) it('returns error when the domain function throws an object with message', async () => { @@ -234,7 +207,7 @@ describe('makeDomainFunction', () => { assertObjectMatch( await handler({ id: 1 }), - makeErrorResult({ errors: [{ message: 'Error' } as Error] }), + failure([{ message: 'Error' } as Error]), ) }) @@ -246,9 +219,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), - makeErrorResult({ - errors: [new InputError('Custom input error', 'contact.id')], - }), + failure([new InputError('Custom input error', 'contact.id')]), ) }) @@ -260,9 +231,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), - makeErrorResult({ - errors: [new EnvironmentError('Custom env error', 'currentUser.role')], - }), + failure([new EnvironmentError('Custom env error', 'currentUser.role')]), ) }) @@ -276,9 +245,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: 1 }), - makeErrorResult({ - errors: [new InputError('Custom input error', 'contact.id')], - }), + failure([new InputError('Custom input error', 'contact.id')]), ) }) }) diff --git a/src/constructor.ts b/src/constructor.ts index 7d79304f..18dbccf1 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -1,14 +1,10 @@ -import { makeErrorResult, InputError, EnvironmentError } from './errors.ts' -import type { - DomainFunction, - ParserIssue, - ParserSchema, - SuccessResult, -} from './types.ts' +import { InputError, EnvironmentError, failure } from './errors.ts' +import type { DomainFunction, ParserIssue, ParserSchema } from './types.ts' import { Composable } from './composable/index.ts' -import { composable } from './composable/composable.ts' +import { composable } from './composable/index.ts' +import { Success } from './composable/types.ts' -function makeSuccessResult(data: T): SuccessResult { +function success(data: T): Success { return { success: true, data, errors: [] } } @@ -81,7 +77,7 @@ function fromComposable( if (!envResult.success) { errors = errors.concat(getEnvironmentErrors(envResult.error.issues)) } - return makeErrorResult({ errors }) + return failure(errors) } return fn(...([result.data as I, envResult.data as E] as Parameters)) } as DomainFunction>> @@ -114,8 +110,9 @@ const undefinedSchema: ParserSchema = { export { fromComposable, - makeDomainFunction, makeDomainFunction as mdf, + makeDomainFunction, + success as makeSuccessResult, + success, toComposable, - makeSuccessResult, } diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 3b90a58c..55a7aa02 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -1,4 +1,4 @@ -import { ResultError, toError } from './errors.ts' +import { ResultError, failure, toError } from './errors.ts' import * as A from './composable/composable.ts' import type { DomainFunction, @@ -361,7 +361,7 @@ function trace>( >) return result } catch (e) { - return A.failure([toError(e)]) + return failure([toError(e)]) } } } diff --git a/src/errors.ts b/src/errors.ts index 09b620b2..b4c0f17b 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -1,5 +1,8 @@ import type { Failure } from './types.ts' +function failure(errors: Error[]): Failure { + return { success: false, errors } +} /** * A custom error class for input errors. * @example @@ -50,7 +53,7 @@ class ResultError extends Error { constructor(result: Pick) { super('ResultError') this.name = 'ResultError' - this.result = makeErrorResult(result) + this.result = failure(result.errors) } } @@ -98,13 +101,6 @@ class ResultError extends Error { // }) // } -function makeErrorResult({ errors }: Pick): Failure { - return { - success: false, - errors, - } -} - function objectHasKey( obj: unknown, key: T, @@ -131,4 +127,11 @@ function toError(maybeError: unknown): Error { return isError(maybeError) ? maybeError : new Error(String(maybeError)) } -export { toError, EnvironmentError, InputError, ResultError, makeErrorResult } +export { + EnvironmentError, + failure as makeErrorResult, + failure, + InputError, + ResultError, + toError, +} diff --git a/src/first.test.ts b/src/first.test.ts index bd396032..cc116c42 100644 --- a/src/first.test.ts +++ b/src/first.test.ts @@ -1,12 +1,11 @@ import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { first } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' -import { InputError } from './errors.ts' +import { failure, InputError } from './errors.ts' describe('first', () => { it('should return the result of the first successful domain function', async () => { @@ -17,7 +16,7 @@ describe('first', () => { type _R = Expect>> const results = await d({ id: 1 }) - assertEquals(results, makeSuccessResult('1')) + assertEquals(results, success('1')) }) it('should return a successful result even if one of the domain functions fails', async () => { @@ -31,10 +30,7 @@ describe('first', () => { const c = first(a, b) type _R = Expect>> - assertEquals( - await c({ n: 1, operation: 'increment' }), - makeSuccessResult(2), - ) + assertEquals(await c({ n: 1, operation: 'increment' }), success(2)) }) it('should return error when all of the domain functions fails', async () => { @@ -48,12 +44,10 @@ describe('first', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [ - new InputError('Expected string, received number', 'id'), - new Error('Error'), - ], - }), + failure([ + new InputError('Expected string, received number', 'id'), + new Error('Error'), + ]), ) }) }) diff --git a/src/index.ts b/src/index.ts index ba0625ea..1e9bc4d6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,6 +3,7 @@ export { makeDomainFunction, makeSuccessResult, mdf, + success, toComposable, } from './constructor.ts' export { @@ -28,6 +29,7 @@ export { inputFromUrl, } from './input-resolvers.ts' export { + failure, EnvironmentError, InputError, makeErrorResult, diff --git a/src/map-error.test.ts b/src/map-error.test.ts index 36612582..435f0d69 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -1,11 +1,11 @@ import { assertEquals, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { mapError } from './domain-functions.ts' import type { DomainFunction, Failure } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { makeErrorResult } from './errors.ts' +import { failure } from './errors.ts' describe('mapError', () => { it('returns the result when the domain function suceeds', async () => { @@ -17,7 +17,7 @@ describe('mapError', () => { const c = mapError(a, b) type _R = Expect>> - assertEquals(await c({ id: 1 }), makeSuccessResult(2)) + assertEquals(await c({ id: 1 }), success(2)) }) it('returns a domain function function that will apply a function over the error of the first one', async () => { @@ -31,9 +31,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), - makeErrorResult({ - errors: [new Error('Number of errors: 1')], - }), + failure([new Error('Number of errors: 1')]), ) }) @@ -49,9 +47,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), - makeErrorResult({ - errors: [new Error('Number of errors: 1')], - }), + failure([new Error('Number of errors: 1')]), ) }) @@ -66,9 +62,7 @@ describe('mapError', () => { assertEquals( await c({ invalidInput: '1' }), - makeErrorResult({ - errors: [new Error('failed to map')], - }), + failure([new Error('failed to map')]), ) }) }) diff --git a/src/map.test.ts b/src/map.test.ts index 0b35e422..0e170a42 100644 --- a/src/map.test.ts +++ b/src/map.test.ts @@ -1,11 +1,11 @@ import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { map } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { InputError, makeErrorResult } from './errors.ts' +import { failure, InputError } from './errors.ts' describe('map', () => { it('returns a domain function function that will apply a function over the results of the first one', async () => { @@ -15,7 +15,7 @@ describe('map', () => { const c = map(a, b) type _R = Expect>> - assertEquals(await c({ id: 1 }), makeSuccessResult(3)) + assertEquals(await c({ id: 1 }), success(3)) }) it('returns a domain function function that will apply an async function over the results of the first one', async () => { @@ -25,7 +25,7 @@ describe('map', () => { const c = map(a, b) type _R = Expect>> - assertEquals(await c({ id: 1 }), makeSuccessResult(3)) + assertEquals(await c({ id: 1 }), success(3)) }) it('returns the error when the domain function fails', async () => { @@ -38,9 +38,7 @@ describe('map', () => { assertEquals( await c({ invalidInput: '1' }), - makeErrorResult({ - errors: [new InputError('Required', 'id')], - }), + failure([new InputError('Required', 'id')]), ) }) @@ -53,11 +51,6 @@ describe('map', () => { const c = map(a, b) type _R = Expect>> - assertEquals( - await c({ id: 1 }), - makeErrorResult({ - errors: [new Error('failed to map')], - }), - ) + assertEquals(await c({ id: 1 }), failure([new Error('failed to map')])) }) }) diff --git a/src/merge.test.ts b/src/merge.test.ts index efbf0d37..97ab66cb 100644 --- a/src/merge.test.ts +++ b/src/merge.test.ts @@ -2,11 +2,11 @@ import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_er import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { merge } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { InputError, makeErrorResult } from './errors.ts' +import { failure, InputError } from './errors.ts' describe('merge', () => { it('should combine two domain functions results into one object', async () => { @@ -22,10 +22,7 @@ describe('merge', () => { Equal> > - assertEquals( - await c({ id: 1 }), - makeSuccessResult({ resultA: 2, resultB: 0 }), - ) + assertEquals(await c({ id: 1 }), success({ resultA: 2, resultB: 0 })) }) it('should combine many domain functions into one', async () => { @@ -53,10 +50,7 @@ describe('merge', () => { > const results = await d({ id: 1 }) - assertEquals( - results, - makeSuccessResult({ resultA: '1', resultB: 2, resultC: true }), - ) + assertEquals(results, success({ resultA: '1', resultB: 2, resultC: true })) }) it('should return error when one of the domain functions has input errors', async () => { @@ -79,9 +73,7 @@ describe('merge', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [new InputError('Expected string, received number', 'id')], - }), + failure([new InputError('Expected string, received number', 'id')]), ) }) @@ -96,12 +88,7 @@ describe('merge', () => { const c: DomainFunction = merge(a, b) type _R = Expect>> - assertEquals( - await c({ id: 1 }), - makeErrorResult({ - errors: [new Error('Error')], - }), - ) + assertEquals(await c({ id: 1 }), failure([new Error('Error')])) }) it('should combine the inputError messages of both functions', async () => { @@ -119,12 +106,10 @@ describe('merge', () => { assertEquals( await c({ id: 1 }), - makeErrorResult({ - errors: [ - new InputError('Expected string, received number', 'id'), - new InputError('Expected string, received number', 'id'), - ], - }), + failure([ + new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', 'id'), + ]), ) }) diff --git a/src/pipe.test.ts b/src/pipe.test.ts index fbdeb925..053f62a4 100644 --- a/src/pipe.test.ts +++ b/src/pipe.test.ts @@ -1,12 +1,12 @@ import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { pipe } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { InputError, makeErrorResult } from './errors.ts' -import { EnvironmentError } from './errors.ts' +import { InputError } from './errors.ts' +import { failure, EnvironmentError } from './errors.ts' describe('pipe', () => { it('should compose domain functions from left-to-right', async () => { @@ -18,7 +18,7 @@ describe('pipe', () => { const c = pipe(a, b) type _R = Expect>> - assertEquals(await c({ id: 1 }), makeSuccessResult(2)) + assertEquals(await c({ id: 1 }), success(2)) }) it('should use the same environment in all composed functions', async () => { @@ -36,7 +36,7 @@ describe('pipe', () => { const c = pipe(a, b) type _R = Expect>> - assertEquals(await c(undefined, { env: 1 }), makeSuccessResult(4)) + assertEquals(await c(undefined, { env: 1 }), success(4)) }) it('should fail on the first environment parser failure', async () => { @@ -57,9 +57,7 @@ describe('pipe', () => { assertEquals( await c(undefined, {}), - makeErrorResult({ - errors: [new EnvironmentError('Required', 'env')], - }), + failure([new EnvironmentError('Required', 'env')]), ) }) @@ -82,9 +80,7 @@ describe('pipe', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), - makeErrorResult({ - errors: [new InputError('Expected undefined, received object', '')], - }), + failure([new InputError('Expected undefined, received object', '')]), ) }) @@ -105,9 +101,7 @@ describe('pipe', () => { assertEquals( await c(undefined, { env: 1 }), - makeErrorResult({ - errors: [new InputError('Expected number, received string', 'inp')], - }), + failure([new InputError('Expected number, received string', 'inp')]), ) }) @@ -125,6 +119,6 @@ describe('pipe', () => { const d = pipe(a, b, c) type _R = Expect>> - assertEquals(await d({ aNumber: 1 }), makeSuccessResult(false)) + assertEquals(await d({ aNumber: 1 }), success(false)) }) }) diff --git a/src/sequence.test.ts b/src/sequence.test.ts index 34d59cfa..8e847219 100644 --- a/src/sequence.test.ts +++ b/src/sequence.test.ts @@ -1,12 +1,11 @@ import { describe, it, assertEquals } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { makeSuccessResult, mdf } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { sequence } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { InputError, makeErrorResult } from './errors.ts' -import { EnvironmentError } from './errors.ts' +import { failure, EnvironmentError, InputError } from './errors.ts' describe('sequence', () => { it('should compose domain functions from left-to-right saving the results sequentially', async () => { @@ -24,10 +23,7 @@ describe('sequence', () => { assertEquals( await c({ id: 1 }), - makeSuccessResult<[{ id: number }, { result: number }]>([ - { id: 3 }, - { result: 2 }, - ]), + success<[{ id: number }, { result: number }]>([{ id: 3 }, { result: 2 }]), ) }) @@ -50,7 +46,7 @@ describe('sequence', () => { assertEquals( await c(undefined, { env: 1 }), - makeSuccessResult<[{ inp: number }, { result: number }]>([ + success<[{ inp: number }, { result: number }]>([ { inp: 3 }, { result: 4 }, ]), @@ -75,9 +71,7 @@ describe('sequence', () => { assertEquals( await c(undefined, {}), - makeErrorResult({ - errors: [new EnvironmentError('Required', 'env')], - }), + failure([new EnvironmentError('Required', 'env')]), ) }) @@ -100,9 +94,7 @@ describe('sequence', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), - makeErrorResult({ - errors: [new InputError('Expected undefined, received object', '')], - }), + failure([new InputError('Expected undefined, received object', '')]), ) }) @@ -123,9 +115,7 @@ describe('sequence', () => { assertEquals( await c(undefined, { env: 1 }), - makeErrorResult({ - errors: [new InputError('Expected number, received string', 'inp')], - }), + failure([new InputError('Expected number, received string', 'inp')]), ) }) @@ -156,7 +146,7 @@ describe('sequence', () => { assertEquals( await d({ aNumber: 1 }), - makeSuccessResult< + success< [ { aString: string }, { aBoolean: boolean }, diff --git a/src/trace.test.ts b/src/trace.test.ts index fce522ca..9e22c604 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -6,6 +6,7 @@ import { mdf } from './constructor.ts' import { fromSuccess, trace } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' +import { success } from './constructor.ts' describe('trace', () => { it('converts trace exceptions to df failures', async () => { @@ -39,7 +40,7 @@ describe('trace', () => { assertEquals(contextFromFunctionA, { input: { id: 1 }, environment: undefined, - result: { success: true, errors: [], data: 2 }, + result: success(2), }) }) }) From 9dd3167cd5b63214c15dffbdcc4ca8ec8b3e5e4c Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 18:05:38 -0300 Subject: [PATCH 021/238] Simplify some DF combinator implementations and deprecate safeResult in favor of composable --- src/domain-functions.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 55a7aa02..2abb7531 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -16,6 +16,7 @@ import type { import { Composable } from './index.ts' /** + * @deprecated Use `composable` instead. * A functions that turns the result of its callback into a Result object. * @example * const result = await safeResult(() => ({ @@ -69,10 +70,8 @@ function all( ...fns: Fns ): DomainFunction> { return ((input, environment) => { - const composables = fns.map((df) => - A.composable(() => fromSuccess(df)(input, environment)), - ) - return A.all(...(composables as [Composable]))() + const composables = fns.map((df) => applyEnvironment(df, environment)) + return A.all(...(composables as [Composable]))(input) }) as DomainFunction> } @@ -111,7 +110,7 @@ function first( ...fns: Fns ): DomainFunction>> { return ((input, environment) => { - return safeResult(async () => { + return A.composable(async () => { const results = await Promise.all( fns.map((fn) => (fn as DomainFunction)(input, environment)), ) @@ -126,7 +125,7 @@ function first( } return result.data - }) + })() }) as DomainFunction>> } @@ -209,8 +208,9 @@ function sequence( ...fns: Fns ): DomainFunction> { return function (input: unknown, environment?: unknown) { - const dfsAsComposable = fns.map((df) => applyEnvironment(df, environment)) - return A.sequence(...(dfsAsComposable as [Composable]))(input) + return A.sequence( + ...(fns.map((df) => applyEnvironment(df, environment)) as [Composable]), + )(input) } as DomainFunction> } @@ -227,7 +227,7 @@ function map( dfn: DomainFunction, mapper: (element: O) => R | Promise, ): DomainFunction { - return A.map(A.composable(fromSuccess(dfn)), mapper) as DomainFunction + return A.map(dfn, mapper) as DomainFunction } /** @@ -262,11 +262,11 @@ function branch( const result = await dfn(input, environment) if (!result.success) return result - return safeResult(async () => { + return A.composable(async () => { const nextDf = await resolver(result.data) if (typeof nextDf !== 'function') return result.data return fromSuccess(nextDf)(result.data, environment) - }) + })() }) as DomainFunction< R extends DomainFunction ? U : UnpackData> | T > @@ -321,9 +321,9 @@ function mapError( const result = await dfn(input, environment) if (result.success) return result - return safeResult(async () => { + return A.composable(async () => { throw new ResultError({ ...(await mapper(result)) }) - }) + })() }) as DomainFunction } From 0f64996eb6051f5217b98312904bb6aededbf880 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 18:19:22 -0300 Subject: [PATCH 022/238] Unify some types --- src/composable/composable.ts | 4 +- src/composable/types.test.ts | 52 ------------------------- src/composable/types.ts | 72 +--------------------------------- src/constructor.ts | 8 +++- src/types.test.ts | 60 ++++++++++++++++++++++++++--- src/types.ts | 75 +++++++++++++++++++++++++++++++++--- 6 files changed, 132 insertions(+), 139 deletions(-) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index 9bedd342..d3f7a835 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,17 +1,15 @@ import { success } from '../constructor.ts' import { toError, ResultError, failure } from '../errors.ts' +import { MergeObjs, Success, Failure } from '../types.ts' import { AllArguments, CollectArguments, Composable, - Failure, First, Fn, - MergeObjs, PipeArguments, PipeReturn, RecordToTuple, - Success, UnpackAll, UnpackResult, } from './types.ts' diff --git a/src/composable/types.test.ts b/src/composable/types.test.ts index aef74f9b..f9b2ead3 100644 --- a/src/composable/types.test.ts +++ b/src/composable/types.test.ts @@ -9,57 +9,6 @@ export type Equal = (() => T extends A ? 1 : 2) extends (() => T extends B ? 1 : 2) ? true : [A, "should equal", B] -namespace MergeObjs { - const obj1 = { a: 1, b: 2 } as const - const obj2 = {} - const obj3 = { c: 3, d: 4 } as const - - type Result = Subject.MergeObjs<[typeof obj1, typeof obj2, typeof obj3]> - - type test1 = Expect> - type test2 = Expect> -} - -namespace TupleToUnion { - type Result = Subject.TupleToUnion<[1, 2, 3]> - - type test = Expect> -} - -namespace Last { - type test1 = Expect, 3>> - type test2 = Expect, 1>> - type test3 = Expect, never>> -} - -namespace Prettify { - type test1 = Expect< - Equal< - Subject.Prettify<{ a: number } & { b: string }>, - { a: number; b: string } - > - > - type error1 = Expect< - // @ts-expect-error - Equal< - Subject.Prettify<{ a: number } & { b: string }>, - { a: number } & { b: string } - > - > -} - -namespace AtLeastOne { - type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> - - const test1: Result = { a: 1 } - const test2: Result = { b: 2 } - const test3: Result = { a: 1, b: 2 } - // @ts-expect-error - const error1: Result = {} - // @ts-expect-error - const error2: Result = { a: 1, c: 3 } -} - namespace PipeArguments { type testNoEmptyArgumentList = Expect, never>> type testOneComposable = Expect< @@ -232,4 +181,3 @@ namespace UnpackAll { describe('type tests', () => it('should have no ts errors', () => assertEquals(true, true))) - diff --git a/src/composable/types.ts b/src/composable/types.ts index a93b2ff5..6159d5c6 100644 --- a/src/composable/types.ts +++ b/src/composable/types.ts @@ -1,13 +1,4 @@ -/** - * Returns the last item of a tuple type. - * @example - * type MyTuple = [string, number] - * type Result = Last - * // ^? number - */ -type Last = T extends [...infer _I, infer L] - ? L - : never +import { Prettify, Result } from '../types.ts' type IsNever = // prettier is removing the parens thus worsening readability @@ -20,17 +11,6 @@ type First = T extends [infer F, ...infer _I] ? F : never -type Failure = { - success: false - errors: Array -} -type Success = { - success: true - data: T - errors: [] -} -type Result = Success | Failure - type Fn = (...args: any[]) => any type Composable = ( ...args: Parameters @@ -42,49 +22,6 @@ type UnpackAll = { [K in keyof List]: UnpackResult> } -/** - * Merges the data types of a list of objects. - * @example - * type MyObjs = [ - * { a: string }, - * { b: number }, - * ] - * type MyData = MergeObjs - * // ^? { a: string, b: number } - */ -type MergeObjs = Objs extends [ - infer first, - ...infer rest, -] - ? MergeObjs & first>> - : output - -type Prettify = { - [K in keyof T]: T[K] - // deno-lint-ignore ban-types -} & {} - -/** - * Converts a tuple type to a union type. - * @example - * type MyTuple = [string, number] - * type MyUnion = TupleToUnion - * // ^? string | number - */ -type TupleToUnion = T[number] - -/** - * It is similar to Partial but it requires at least one property to be defined. - * @example - * type MyType = AtLeastOne<{ a: string, b: number }> - * const a: MyType = { a: 'hello' } - * const b: MyType = { b: 123 } - * const c: MyType = { a: 'hello', b: 123 } - * // The following won't compile: - * const d: MyType = {} - */ -type AtLeastOne }> = Partial & U[keyof U] - type PipeReturn = Fns extends [ Composable<(...a: infer PA) => infer OA>, Composable<(b: infer PB) => infer OB>, @@ -212,21 +149,14 @@ type RecordToTuple> = export type { AllArguments, - AtLeastOne, CollectArguments, Composable, - Failure, First, Fn, - Last, - MergeObjs, PipeArguments, PipeReturn, - Prettify, RecordToTuple, Result, - Success, - TupleToUnion, UnpackAll, UnpackResult, } diff --git a/src/constructor.ts b/src/constructor.ts index 18dbccf1..02d4477b 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -1,8 +1,12 @@ import { InputError, EnvironmentError, failure } from './errors.ts' -import type { DomainFunction, ParserIssue, ParserSchema } from './types.ts' +import type { + DomainFunction, + ParserIssue, + ParserSchema, + Success, +} from './types.ts' import { Composable } from './composable/index.ts' import { composable } from './composable/index.ts' -import { Success } from './composable/types.ts' function success(data: T): Success { return { success: true, data, errors: [] } diff --git a/src/types.test.ts b/src/types.test.ts index 10d0640d..f0008e9c 100644 --- a/src/types.test.ts +++ b/src/types.test.ts @@ -8,10 +8,10 @@ export type Equal = // prettier is removing the parens thus worsening readability // prettier-ignore (() => T extends A ? 1 : 2) extends (() => T extends B ? 1 : 2) ? true - : false + : [A, "should equal", B] namespace UnpackData { - const result = mdf()(() => ({ name: 'foo' }) as const) + const result = mdf()(() => ({ name: 'foo' } as const)) type test = Expect< Equal, { readonly name: 'foo' }> @@ -77,14 +77,64 @@ namespace AtLeastOne { } namespace UnpackAll { - const dfA = mdf()(() => ({ a: 1 }) as const) - const dfB = mdf()(() => ({ b: 2 }) as const) + const dfA = mdf()(() => ({ a: 1 } as const)) + const dfB = mdf()(() => ({ b: 2 } as const)) type Result = Subject.UnpackAll<[typeof dfA, typeof dfB]> type test = Expect> } +namespace MergeObjs { + const obj1 = { a: 1, b: 2 } as const + const obj2 = {} + const obj3 = { c: 3, d: 4 } as const + + type Result = Subject.MergeObjs<[typeof obj1, typeof obj2, typeof obj3]> + + type test1 = Expect> + type test2 = Expect> +} + +namespace TupleToUnion { + type Result = Subject.TupleToUnion<[1, 2, 3]> + + type test = Expect> +} + +namespace Last { + type test1 = Expect, 3>> + type test2 = Expect, 1>> + type test3 = Expect, never>> +} + +namespace Prettify { + type test1 = Expect< + Equal< + Subject.Prettify<{ a: number } & { b: string }>, + { a: number; b: string } + > + > + type error1 = Expect< + // @ts-expect-error + Equal< + Subject.Prettify<{ a: number } & { b: string }>, + { a: number } & { b: string } + > + > +} + +namespace AtLeastOne { + type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> + + const test1: Result = { a: 1 } + const test2: Result = { b: 2 } + const test3: Result = { a: 1, b: 2 } + // @ts-expect-error + const error1: Result = {} + // @ts-expect-error + const error2: Result = { a: 1, c: 3 } +} + describe('type tests', () => it('should have no ts errors', () => assertEquals(true, true))) - diff --git a/src/types.ts b/src/types.ts index 861bf9e1..05ef7883 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,13 @@ -import { Failure, Success, Result } from './composable/types.ts' +type Failure = { + success: false + errors: Array +} +type Success = { + success: true + data: T + errors: [] +} +type Result = Success | Failure /** * A domain function. @@ -85,20 +94,74 @@ type ParserSchema = { safeParseAsync: (a: unknown) => Promise> } +/** + * Merges the data types of a list of objects. + * @example + * type MyObjs = [ + * { a: string }, + * { b: number }, + * ] + * type MyData = MergeObjs + * // ^? { a: string, b: number } + */ +type MergeObjs = Objs extends [ + infer first, + ...infer rest, +] + ? MergeObjs & first>> + : output + +type Prettify = { + [K in keyof T]: T[K] + // deno-lint-ignore ban-types +} & {} + +/** + * It is similar to Partial but it requires at least one property to be defined. + * @example + * type MyType = AtLeastOne<{ a: string, b: number }> + * const a: MyType = { a: 'hello' } + * const b: MyType = { b: 123 } + * const c: MyType = { a: 'hello', b: 123 } + * // The following won't compile: + * const d: MyType = {} + */ +type AtLeastOne }> = Partial & U[keyof U] + +/** + * Returns the last item of a tuple type. + * @example + * type MyTuple = [string, number] + * type Result = Last + * // ^? number + */ +type Last = T extends [...infer _I, infer L] + ? L + : never + +/** + * Converts a tuple type to a union type. + * @example + * type MyTuple = [string, number] + * type MyUnion = TupleToUnion + * // ^? string | number + */ +type TupleToUnion = T[number] + export type { AtLeastOne, - Last, - MergeObjs, - TupleToUnion, -} from './composable/types.ts' -export type { DomainFunction, Failure, + Last, + MergeObjs, ParserIssue, ParserResult, ParserSchema, + Prettify, Result, + Success, Success as SuccessResult, + TupleToUnion, UnpackAll, UnpackData, UnpackDFObject, From d5ebb8b45be8a718fb6c0b896c58b0a75ead0307 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 18:24:39 -0300 Subject: [PATCH 023/238] Lil change --- src/constructor.ts | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/src/constructor.ts b/src/constructor.ts index 02d4477b..d07a4296 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -1,10 +1,5 @@ import { InputError, EnvironmentError, failure } from './errors.ts' -import type { - DomainFunction, - ParserIssue, - ParserSchema, - Success, -} from './types.ts' +import type { DomainFunction, ParserSchema, Success } from './types.ts' import { Composable } from './composable/index.ts' import { composable } from './composable/index.ts' @@ -12,19 +7,6 @@ function success(data: T): Success { return { success: true, data, errors: [] } } -function getInputErrors(errors: ParserIssue[]): InputError[] { - return errors.map((error) => { - const { path, message } = error - return new InputError(message, path.join('.')) - }) -} - -function getEnvironmentErrors(errors: ParserIssue[]): EnvironmentError[] { - return errors.map((error) => { - const { path, message } = error - return new EnvironmentError(message, path.join('.')) - }) -} /** * Creates a domain function. * After giving the input and environment schemas, you can pass a handler function that takes type safe input and environment. That function is gonna catch any errors and always return a Result. @@ -76,10 +58,17 @@ function fromComposable( if (!result.success || !envResult.success) { let errors: Error[] = [] if (!result.success) { - errors = getInputErrors(result.error.issues) + errors = result.error.issues.map( + (error) => new InputError(error.message, error.path.join('.')), + ) } if (!envResult.success) { - errors = errors.concat(getEnvironmentErrors(envResult.error.issues)) + errors = errors.concat( + envResult.error.issues.map( + (error) => + new EnvironmentError(error.message, error.path.join('.')), + ), + ) } return failure(errors) } From f983103efdbbd7fa165eb4985b0c13a231889560 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 22:26:16 -0300 Subject: [PATCH 024/238] Remove toComposable --- src/composable/index.test.ts | 3 ++- src/constructor.test.ts | 34 +--------------------------------- src/constructor.ts | 10 ---------- src/index.ts | 1 - 4 files changed, 3 insertions(+), 45 deletions(-) diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index 78f7227b..cb5e9832 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -1,7 +1,8 @@ import { assertEquals, describe, it } from '../test-prelude.ts' import { map, mapError, pipe, sequence } from './index.ts' -import type { Composable, Result } from './index.ts' import { Equal, Expect } from './types.test.ts' +import type { Result } from '../types.ts' +import type { Composable } from './types.ts' import { all, catchError, collect, composable } from './composable.ts' import { success } from '../constructor.ts' diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 3e29c586..47fad285 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -7,42 +7,10 @@ import { } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { success, mdf, toComposable } from './constructor.ts' +import { success, mdf } from './constructor.ts' import { failure, EnvironmentError, InputError, ResultError } from './errors.ts' import type { DomainFunction, SuccessResult } from './types.ts' import type { Equal, Expect } from './types.test.ts' -import { Composable } from './composable/index.ts' - -describe('toComposable', () => { - it('returns a Composable with the same computation and all input errors in errors field', async () => { - const handler = mdf(z.string())(() => 'no input!') - const c = toComposable(handler) - type _R = Expect< - Equal< - typeof c, - Composable<(input?: unknown, environment?: unknown) => string> - > - > - - const { - errors: [err], - } = await c(1) - assertIsError(err, Error, 'Expected string, received number') - }) - - it('returns a Composable with the same computation and same success result (we just care about the structural typing match)', async () => { - const handler = mdf()(() => 'no input!') - const c = toComposable(handler) - type _R = Expect< - Equal< - typeof c, - Composable<(input?: unknown, environment?: unknown) => string> - > - > - - assertObjectMatch(await c(), success('no input!')) - }) -}) describe('makeDomainFunction', () => { describe('when it has no input', () => { diff --git a/src/constructor.ts b/src/constructor.ts index d07a4296..9ba781a9 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -35,15 +35,6 @@ function makeDomainFunction( } } -function toComposable( - df: DomainFunction, -) { - return ((input = undefined, environment = {}) => - df(input, environment)) as unknown as Composable< - (input?: I, environment?: E) => O - > -} - function fromComposable( fn: A, inputSchema?: ParserSchema, @@ -107,5 +98,4 @@ export { makeDomainFunction, success as makeSuccessResult, success, - toComposable, } diff --git a/src/index.ts b/src/index.ts index 1e9bc4d6..0e08b1d0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,6 @@ export { makeSuccessResult, mdf, success, - toComposable, } from './constructor.ts' export { all, From 4e9dd179267261572e7bbbeb2ed8c37198990474 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 22:26:28 -0300 Subject: [PATCH 025/238] Refactoring --- src/constructor.ts | 25 +++++++++++-------------- src/domain-functions.ts | 29 +++++++++++++++++------------ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/constructor.ts b/src/constructor.ts index 9ba781a9..dd5dcf1d 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -47,23 +47,20 @@ function fromComposable( const result = await (inputSchema ?? undefinedSchema).safeParseAsync(input) if (!result.success || !envResult.success) { - let errors: Error[] = [] - if (!result.success) { - errors = result.error.issues.map( - (error) => new InputError(error.message, error.path.join('.')), - ) - } - if (!envResult.success) { - errors = errors.concat( - envResult.error.issues.map( + const inputErrors = result.success + ? [] + : result.error.issues.map( + (error) => new InputError(error.message, error.path.join('.')), + ) + const envErrors = envResult.success + ? [] + : envResult.error.issues.map( (error) => new EnvironmentError(error.message, error.path.join('.')), - ), - ) - } - return failure(errors) + ) + return failure([...inputErrors, ...envErrors]) } - return fn(...([result.data as I, envResult.data as E] as Parameters)) + return fn(result.data, envResult.data) } as DomainFunction>> } diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 2abb7531..02344b3e 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -55,6 +55,12 @@ function applyEnvironment< return (input: unknown) => df(input, environment) as ReturnType } +function applyEnvironmentToList< + Fns extends Array<(input: unknown, environment: unknown) => unknown>, +>(fns: Fns, environment: unknown) { + return fns.map((fn) => applyEnvironment(fn, environment)) as [Composable] +} + /** * Creates a single domain function out of multiple domain functions. It will pass the same input and environment to each provided function. The functions will run in parallel. If all constituent functions are successful, The data field will be a tuple containing each function's output. * @example @@ -69,10 +75,10 @@ function applyEnvironment< function all( ...fns: Fns ): DomainFunction> { - return ((input, environment) => { - const composables = fns.map((df) => applyEnvironment(df, environment)) - return A.all(...(composables as [Composable]))(input) - }) as DomainFunction> + return ((input, environment) => + A.all(...applyEnvironmentToList(fns, environment))( + input, + )) as DomainFunction> } /** @@ -162,8 +168,8 @@ function merge>[]>( function pipe( ...fns: T ): DomainFunction>> { - const last = (ls: T[]): T => ls[ls.length - 1] - return map(sequence(...fns), last) as DomainFunction>> + return (input, environment) => + A.pipe(...applyEnvironmentToList(fns, environment))(input) } /** @@ -207,11 +213,10 @@ function collectSequence>( function sequence( ...fns: Fns ): DomainFunction> { - return function (input: unknown, environment?: unknown) { - return A.sequence( - ...(fns.map((df) => applyEnvironment(df, environment)) as [Composable]), - )(input) - } as DomainFunction> + return ((input, environment) => + A.sequence(...applyEnvironmentToList(fns, environment))( + input, + )) as DomainFunction> } /** @@ -227,7 +232,7 @@ function map( dfn: DomainFunction, mapper: (element: O) => R | Promise, ): DomainFunction { - return A.map(dfn, mapper) as DomainFunction + return A.map(dfn, mapper) } /** From 87b0d383b50cf541f46f89abf1bd632ff6f3a941 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 22:37:57 -0300 Subject: [PATCH 026/238] Rename ResultError to ErrorList and only keep the list of errors --- src/composable/composable.ts | 6 ++-- src/composable/index.test.ts | 2 +- src/constructor.test.ts | 8 ++--- src/domain-functions.ts | 12 +++---- src/errors.ts | 68 ++++-------------------------------- src/from-success.test.ts | 4 +-- src/index.ts | 2 +- 7 files changed, 22 insertions(+), 80 deletions(-) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index d3f7a835..ac1182c2 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,5 +1,5 @@ import { success } from '../constructor.ts' -import { toError, ResultError, failure } from '../errors.ts' +import { toError, ErrorList, failure } from '../errors.ts' import { MergeObjs, Success, Failure } from '../types.ts' import { AllArguments, @@ -42,8 +42,8 @@ function composable(fn: T): Composable { const result = await fn(...(args as any[])) return success(result) } catch (e) { - if (e instanceof ResultError) { - return failure(e.result.errors) + if (e instanceof ErrorList) { + return failure(e.list) } return failure([toError(e)]) } diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index cb5e9832..a5ac47ad 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -1,10 +1,10 @@ import { assertEquals, describe, it } from '../test-prelude.ts' -import { map, mapError, pipe, sequence } from './index.ts' import { Equal, Expect } from './types.test.ts' import type { Result } from '../types.ts' import type { Composable } from './types.ts' import { all, catchError, collect, composable } from './composable.ts' import { success } from '../constructor.ts' +import { map, mapError, pipe, sequence } from './index.ts' const voidFn = composable(() => {}) const toString = composable((a: unknown) => `${a}`) diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 47fad285..c73d6008 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -8,7 +8,7 @@ import { import { z } from './test-prelude.ts' import { success, mdf } from './constructor.ts' -import { failure, EnvironmentError, InputError, ResultError } from './errors.ts' +import { failure, EnvironmentError, InputError, ErrorList } from './errors.ts' import type { DomainFunction, SuccessResult } from './types.ts' import type { Equal, Expect } from './types.test.ts' @@ -203,11 +203,9 @@ describe('makeDomainFunction', () => { ) }) - it('returns an error result when the domain function throws an ResultError', async () => { + it('returns an error result when the domain function throws an ErrorList', async () => { const handler = mdf(z.object({ id: z.number() }))(() => { - throw new ResultError({ - errors: [new InputError('Custom input error', 'contact.id')], - }) + throw new ErrorList([new InputError('Custom input error', 'contact.id')]) }) type _R = Expect>> diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 02344b3e..ef24607f 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -1,4 +1,4 @@ -import { ResultError, failure, toError } from './errors.ts' +import { ErrorList, failure, toError } from './errors.ts' import * as A from './composable/composable.ts' import type { DomainFunction, @@ -125,9 +125,7 @@ function first( | SuccessResult | undefined if (!result) { - throw new ResultError({ - errors: results.map(({ errors }) => errors).flat(), - }) + throw new ErrorList(results.map(({ errors }) => errors).flat()) } return result.data @@ -278,7 +276,7 @@ function branch( } /** - * It can be used to call a domain function from another domain function. It will return the output of the given domain function if it was successfull, otherwise it will throw a `ResultError` that will bubble up to the parent function. + * It can be used to call a domain function from another domain function. It will return the output of the given domain function if it was successfull, otherwise it will throw a `ErrorList` that will bubble up to the parent function. * Also good to use it in successfull test cases. * @example * import { mdf, fromSuccess } from 'domain-functions' @@ -295,7 +293,7 @@ function fromSuccess( ): (...args: Parameters) => Promise> { return async function (...args) { const result = await df(...args) - if (!result.success) throw new ResultError(result) + if (!result.success) throw new ErrorList(result.errors) return result.data } @@ -327,7 +325,7 @@ function mapError( if (result.success) return result return A.composable(async () => { - throw new ResultError({ ...(await mapper(result)) }) + throw new ErrorList((await mapper(result)).errors) })() }) as DomainFunction } diff --git a/src/errors.ts b/src/errors.ts index b4c0f17b..35ad26d9 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -37,70 +37,16 @@ class EnvironmentError extends Error { } } -/** - * A custom error class for creating ErrorResult. - * @example - * const df = mdf()(() => { - * throw new ResultError({ - * errors: [{ message: 'Some error' }], - * inputErrors: [{ message: 'Some input error', path: 'user.name' }], - * }) - * }) - */ -class ResultError extends Error { - result: Failure +class ErrorList extends Error { + list: Error[] - constructor(result: Pick) { - super('ResultError') - this.name = 'ResultError' - this.result = failure(result.errors) + constructor(errors: Error[]) { + super('ErrorList') + this.name = 'ErrorList' + this.list = failure(errors).errors } } -// function failureToErrorResult({ errors }: Failure): ErrorResult { -// return makeErrorResult({ -// errors: errors -// .filter( -// (exception) => -// !( -// exception instanceof InputError || -// exception instanceof InputErrors || -// exception instanceof EnvironmentError -// ), -// ) -// .flatMap((e) => (e instanceof ResultError ? e.result.errors : e)), -// inputErrors: errors.flatMap((exception) => -// exception instanceof InputError -// ? [ -// { -// path: exception.path.split('.'), -// message: exception.message, -// }, -// ] -// : exception instanceof InputErrors -// ? exception.errors.map((e) => ({ -// path: e.path.split('.'), -// message: e.message, -// })) -// : exception instanceof ResultError -// ? exception.result.inputErrors -// : [], -// ), -// environmentErrors: errors.flatMap((exception) => -// exception instanceof EnvironmentError -// ? [ -// { -// path: exception.path.split('.'), -// message: exception.message, -// }, -// ] -// : exception instanceof ResultError -// ? exception.result.environmentErrors -// : [], -// ), -// }) -// } - function objectHasKey( obj: unknown, key: T, @@ -132,6 +78,6 @@ export { failure as makeErrorResult, failure, InputError, - ResultError, + ErrorList, toError, } diff --git a/src/from-success.test.ts b/src/from-success.test.ts index 95e4e776..c8c8f871 100644 --- a/src/from-success.test.ts +++ b/src/from-success.test.ts @@ -3,7 +3,7 @@ import { z } from './test-prelude.ts' import { mdf } from './constructor.ts' import { fromSuccess } from './domain-functions.ts' -import { ResultError } from './errors.ts' +import { ErrorList } from './errors.ts' import type { Equal, Expect } from './types.test.ts' describe('fromSuccess', () => { @@ -34,6 +34,6 @@ describe('fromSuccess', () => { assertRejects(async () => { await c({ invalidInput: 'should error' }) - }, ResultError) + }, ErrorList) }) }) diff --git a/src/index.ts b/src/index.ts index 0e08b1d0..5415c0c2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -32,7 +32,7 @@ export { EnvironmentError, InputError, makeErrorResult, - ResultError, + ErrorList, toError, } from './errors.ts' export { mergeObjects } from './composable/composable.ts' From fe0a94a1192868d8bad2a6aabc896834ddca7204 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 22:43:46 -0300 Subject: [PATCH 027/238] Serialize function for backwards compatibility --- src/serialize.ts | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/serialize.ts diff --git a/src/serialize.ts b/src/serialize.ts new file mode 100644 index 00000000..9ebfc3a6 --- /dev/null +++ b/src/serialize.ts @@ -0,0 +1,26 @@ +import { EnvironmentError } from './errors.ts' +import { InputError } from './errors.ts' +import type { Result } from './types.ts' + +function serializeResult(result: Result) { + if (result.success) { + return { + ...result, + inputErrors: [], + environmentErrors: [], + } + } + + return { + success: false, + errors: result.errors.filter( + (e) => !(e instanceof InputError) && !(e instanceof EnvironmentError), + ), + inputErrors: result.errors.filter((e) => e instanceof InputError), + environmentErrors: result.errors.filter( + (e) => e instanceof EnvironmentError, + ), + } +} + +export { serializeResult } From db312591825e416851d8bdfc09e65f9aa25a7e77 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 22:54:18 -0300 Subject: [PATCH 028/238] Do not join the error path on input and environment errors --- src/all.test.ts | 6 +++--- src/apply-environment.test.ts | 2 +- src/branch.test.ts | 4 ++-- src/collect-sequence.test.ts | 6 +++--- src/collect.test.ts | 6 +++--- src/composable/index.test.ts | 2 +- src/constructor.test.ts | 28 ++++++++++++++++------------ src/constructor.ts | 4 ++-- src/errors.ts | 8 ++++---- src/first.test.ts | 2 +- src/map.test.ts | 2 +- src/merge.test.ts | 6 +++--- src/pipe.test.ts | 6 +++--- src/sequence.test.ts | 6 +++--- 14 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index ff45d9a9..2b78998e 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -39,7 +39,7 @@ describe('all', () => { assertEquals( await c({ id: 1 }), - failure([new InputError('Expected string, received number', 'id')]), + failure([new InputError('Expected string, received number', ['id'])]), ) }) @@ -65,8 +65,8 @@ describe('all', () => { assertEquals( await c({ id: 1 }), failure([ - new InputError('Expected string, received number', 'id'), - new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', ['id']), + new InputError('Expected string, received number', ['id']), ]), ) }) diff --git a/src/apply-environment.test.ts b/src/apply-environment.test.ts index a4598c48..25cbb253 100644 --- a/src/apply-environment.test.ts +++ b/src/apply-environment.test.ts @@ -16,7 +16,7 @@ describe('applyEnvironment', () => { assertEquals( await getEnvWithEnvironment('some input'), - failure([new EnvironmentError('Expected number, received string', '')]), + failure([new EnvironmentError('Expected number, received string')]), ) }) diff --git a/src/branch.test.ts b/src/branch.test.ts index 690452cd..9842d2f8 100644 --- a/src/branch.test.ts +++ b/src/branch.test.ts @@ -75,7 +75,7 @@ describe('branch', () => { assertEquals( await c({ id: '1' }), - failure([new InputError('Expected number, received string', 'id')]), + failure([new InputError('Expected number, received string', ['id'])]), ) }) @@ -89,7 +89,7 @@ describe('branch', () => { assertEquals( await c({ id: 1 }), - failure([new InputError('Expected number, received string', 'id')]), + failure([new InputError('Expected number, received string', ['id'])]), ) }) diff --git a/src/collect-sequence.test.ts b/src/collect-sequence.test.ts index 9c8d7580..67ae81c7 100644 --- a/src/collect-sequence.test.ts +++ b/src/collect-sequence.test.ts @@ -66,7 +66,7 @@ describe('collectSequence', () => { assertEquals( await c(undefined, {}), - failure([new EnvironmentError('Required', 'env')]), + failure([new EnvironmentError('Required', ['env'])]), ) }) @@ -91,7 +91,7 @@ describe('collectSequence', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), - failure([new InputError('Expected undefined, received object', '')]), + failure([new InputError('Expected undefined, received object')]), ) }) @@ -114,7 +114,7 @@ describe('collectSequence', () => { assertEquals( await c(undefined, { env: 1 }), - failure([new InputError('Expected number, received string', 'inp')]), + failure([new InputError('Expected number, received string', ['inp'])]), ) }) diff --git a/src/collect.test.ts b/src/collect.test.ts index a8487646..ea37f9f1 100644 --- a/src/collect.test.ts +++ b/src/collect.test.ts @@ -27,7 +27,7 @@ describe('collect', () => { assertEquals( await c({ id: 1 }), - failure([new InputError('Expected string, received number', 'id')]), + failure([new InputError('Expected string, received number', ['id'])]), ) }) @@ -53,8 +53,8 @@ describe('collect', () => { assertEquals( await c({ id: 1 }), failure([ - new InputError('Expected string, received number', 'id'), - new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', ['id']), + new InputError('Expected string, received number', ['id']), ]), ) }) diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index a5ac47ad..1dff6cbf 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -3,8 +3,8 @@ import { Equal, Expect } from './types.test.ts' import type { Result } from '../types.ts' import type { Composable } from './types.ts' import { all, catchError, collect, composable } from './composable.ts' -import { success } from '../constructor.ts' import { map, mapError, pipe, sequence } from './index.ts' +import { success } from '../constructor.ts' const voidFn = composable(() => {}) const toString = composable((a: unknown) => `${a}`) diff --git a/src/constructor.test.ts b/src/constructor.test.ts index c73d6008..2fe9db97 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -27,7 +27,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler('some input'), - failure([new InputError('Expected undefined', '')]), + failure([new InputError('Expected undefined')]), ) }) }) @@ -48,7 +48,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler(undefined, ''), - failure([new EnvironmentError('Expected an object', '')]), + failure([new EnvironmentError('Expected an object')]), ) }) @@ -59,7 +59,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ missingId: '1' }), - failure([new InputError('Expected number, received nan', 'id')]), + failure([new InputError('Expected number, received nan', ['id'])]), ) }) }) @@ -98,8 +98,8 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: '1' }, { uid: '2' }), failure([ - new InputError('ID already taken', 'id'), - new EnvironmentError('UID already taken', 'uid'), + new InputError('ID already taken', ['id']), + new EnvironmentError('UID already taken', ['uid']), ]), ) }) @@ -129,7 +129,7 @@ describe('makeDomainFunction', () => { assertEquals( await handler({ id: '1' }, {}), - failure([new EnvironmentError('Expected number, received nan', 'uid')]), + failure([new EnvironmentError('Expected number, received nan', ['uid'])]), ) }) @@ -181,37 +181,41 @@ describe('makeDomainFunction', () => { it('returns inputErrors when the domain function throws an InputError', async () => { const handler = mdf(z.object({ id: z.number() }))(() => { - throw new InputError('Custom input error', 'contact.id') + throw new InputError('Custom input error', ['contact', 'id']) }) type _R = Expect>> assertEquals( await handler({ id: 1 }), - failure([new InputError('Custom input error', 'contact.id')]), + failure([new InputError('Custom input error', ['contact', 'id'])]), ) }) it('returns environmentErrors when the domain function throws an EnvironmentError', async () => { const handler = mdf(z.object({ id: z.number() }))(() => { - throw new EnvironmentError('Custom env error', 'currentUser.role') + throw new EnvironmentError('Custom env error', ['currentUser', 'role']) }) type _R = Expect>> assertEquals( await handler({ id: 1 }), - failure([new EnvironmentError('Custom env error', 'currentUser.role')]), + failure([ + new EnvironmentError('Custom env error', ['currentUser', 'role']), + ]), ) }) it('returns an error result when the domain function throws an ErrorList', async () => { const handler = mdf(z.object({ id: z.number() }))(() => { - throw new ErrorList([new InputError('Custom input error', 'contact.id')]) + throw new ErrorList([ + new InputError('Custom input error', ['contact', 'id']), + ]) }) type _R = Expect>> assertEquals( await handler({ id: 1 }), - failure([new InputError('Custom input error', 'contact.id')]), + failure([new InputError('Custom input error', ['contact', 'id'])]), ) }) }) diff --git a/src/constructor.ts b/src/constructor.ts index dd5dcf1d..7e294ac5 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -50,13 +50,13 @@ function fromComposable( const inputErrors = result.success ? [] : result.error.issues.map( - (error) => new InputError(error.message, error.path.join('.')), + (error) => new InputError(error.message, error.path as string[]), ) const envErrors = envResult.success ? [] : envResult.error.issues.map( (error) => - new EnvironmentError(error.message, error.path.join('.')), + new EnvironmentError(error.message, error.path as string[]), ) return failure([...inputErrors, ...envErrors]) } diff --git a/src/errors.ts b/src/errors.ts index 35ad26d9..09303b03 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -11,9 +11,9 @@ function failure(errors: Error[]): Failure { * }) */ class InputError extends Error { - path: string + path: string[] - constructor(message: string, path: string) { + constructor(message: string, path: string[] = []) { super(message) this.name = 'InputError' this.path = path @@ -28,9 +28,9 @@ class InputError extends Error { * }) */ class EnvironmentError extends Error { - path: string + path: string[] - constructor(message: string, path: string) { + constructor(message: string, path: string[] = []) { super(message) this.name = 'EnvironmentError' this.path = path diff --git a/src/first.test.ts b/src/first.test.ts index cc116c42..df9aedda 100644 --- a/src/first.test.ts +++ b/src/first.test.ts @@ -45,7 +45,7 @@ describe('first', () => { assertEquals( await c({ id: 1 }), failure([ - new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', ['id']), new Error('Error'), ]), ) diff --git a/src/map.test.ts b/src/map.test.ts index 0e170a42..63eb38cd 100644 --- a/src/map.test.ts +++ b/src/map.test.ts @@ -38,7 +38,7 @@ describe('map', () => { assertEquals( await c({ invalidInput: '1' }), - failure([new InputError('Required', 'id')]), + failure([new InputError('Required', ['id'])]), ) }) diff --git a/src/merge.test.ts b/src/merge.test.ts index 97ab66cb..602b7831 100644 --- a/src/merge.test.ts +++ b/src/merge.test.ts @@ -73,7 +73,7 @@ describe('merge', () => { assertEquals( await c({ id: 1 }), - failure([new InputError('Expected string, received number', 'id')]), + failure([new InputError('Expected string, received number', ['id'])]), ) }) @@ -107,8 +107,8 @@ describe('merge', () => { assertEquals( await c({ id: 1 }), failure([ - new InputError('Expected string, received number', 'id'), - new InputError('Expected string, received number', 'id'), + new InputError('Expected string, received number', ['id']), + new InputError('Expected string, received number', ['id']), ]), ) }) diff --git a/src/pipe.test.ts b/src/pipe.test.ts index 053f62a4..7935375b 100644 --- a/src/pipe.test.ts +++ b/src/pipe.test.ts @@ -57,7 +57,7 @@ describe('pipe', () => { assertEquals( await c(undefined, {}), - failure([new EnvironmentError('Required', 'env')]), + failure([new EnvironmentError('Required', ['env'])]), ) }) @@ -80,7 +80,7 @@ describe('pipe', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), - failure([new InputError('Expected undefined, received object', '')]), + failure([new InputError('Expected undefined, received object')]), ) }) @@ -101,7 +101,7 @@ describe('pipe', () => { assertEquals( await c(undefined, { env: 1 }), - failure([new InputError('Expected number, received string', 'inp')]), + failure([new InputError('Expected number, received string', ['inp'])]), ) }) diff --git a/src/sequence.test.ts b/src/sequence.test.ts index 8e847219..2e90fb69 100644 --- a/src/sequence.test.ts +++ b/src/sequence.test.ts @@ -71,7 +71,7 @@ describe('sequence', () => { assertEquals( await c(undefined, {}), - failure([new EnvironmentError('Required', 'env')]), + failure([new EnvironmentError('Required', ['env'])]), ) }) @@ -94,7 +94,7 @@ describe('sequence', () => { assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), - failure([new InputError('Expected undefined, received object', '')]), + failure([new InputError('Expected undefined, received object')]), ) }) @@ -115,7 +115,7 @@ describe('sequence', () => { assertEquals( await c(undefined, { env: 1 }), - failure([new InputError('Expected number, received string', 'inp')]), + failure([new InputError('Expected number, received string', ['inp'])]), ) }) From 759a0ce57a6434ea3ba2d4886115c983e9ec5176 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 22:57:57 -0300 Subject: [PATCH 029/238] Fix test imports --- src/all.test.ts | 3 +-- src/collect.test.ts | 2 +- src/constructor.test.ts | 4 ++-- src/first.test.ts | 2 +- src/merge.test.ts | 5 ++--- src/trace.test.ts | 3 +-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/all.test.ts b/src/all.test.ts index 2b78998e..667ea7c1 100644 --- a/src/all.test.ts +++ b/src/all.test.ts @@ -1,4 +1,4 @@ -import { describe, it, assertEquals } from './test-prelude.ts' +import { describe, it, assertEquals, assertIsError } from './test-prelude.ts' import { z } from './test-prelude.ts' import { success, mdf } from './constructor.ts' @@ -6,7 +6,6 @@ import { all } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { failure, InputError } from './errors.ts' -import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' describe('all', () => { it('should combine two domain functions into one', async () => { diff --git a/src/collect.test.ts b/src/collect.test.ts index ea37f9f1..2cb72c20 100644 --- a/src/collect.test.ts +++ b/src/collect.test.ts @@ -40,7 +40,7 @@ describe('collect', () => { const c = collect({ a, b }) type _R = Expect>> - assertEquals(await c({ id: 1 }), failure([new Error('Error')])) + assertEquals(await c({ id: 1 }), failure([new Error()])) }) it('should combine the inputError messages of both functions', async () => { diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 2fe9db97..78e20ff8 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -1,7 +1,7 @@ -import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' import { assertEquals, assertObjectMatch, + assertIsError, describe, it, } from './test-prelude.ts' @@ -164,7 +164,7 @@ describe('makeDomainFunction', () => { }) type _R = Expect>> - assertEquals(await handler({ id: 1 }), failure([new Error('Error')])) + assertEquals(await handler({ id: 1 }), failure([new Error()])) }) it('returns error when the domain function throws an object with message', async () => { diff --git a/src/first.test.ts b/src/first.test.ts index df9aedda..33c698fc 100644 --- a/src/first.test.ts +++ b/src/first.test.ts @@ -46,7 +46,7 @@ describe('first', () => { await c({ id: 1 }), failure([ new InputError('Expected string, received number', ['id']), - new Error('Error'), + new Error(), ]), ) }) diff --git a/src/merge.test.ts b/src/merge.test.ts index 602b7831..854eac95 100644 --- a/src/merge.test.ts +++ b/src/merge.test.ts @@ -1,5 +1,4 @@ -import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' -import { describe, it, assertEquals } from './test-prelude.ts' +import { describe, it, assertEquals, assertIsError } from './test-prelude.ts' import { z } from './test-prelude.ts' import { success, mdf } from './constructor.ts' @@ -88,7 +87,7 @@ describe('merge', () => { const c: DomainFunction = merge(a, b) type _R = Expect>> - assertEquals(await c({ id: 1 }), failure([new Error('Error')])) + assertEquals(await c({ id: 1 }), failure([new Error()])) }) it('should combine the inputError messages of both functions', async () => { diff --git a/src/trace.test.ts b/src/trace.test.ts index 9e22c604..5f01fe21 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -1,5 +1,4 @@ -import { assertIsError } from 'https://deno.land/std@0.206.0/assert/assert_is_error.ts' -import { assertEquals, describe, it } from './test-prelude.ts' +import { assertIsError, assertEquals, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' import { mdf } from './constructor.ts' From 2265985331cbdbeff460d87f7830bf8824ddedfd Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 23:07:59 -0300 Subject: [PATCH 030/238] Default Result type is void --- src/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/types.ts b/src/types.ts index 05ef7883..22ed05f1 100644 --- a/src/types.ts +++ b/src/types.ts @@ -2,12 +2,12 @@ type Failure = { success: false errors: Array } -type Success = { +type Success = { success: true data: T errors: [] } -type Result = Success | Failure +type Result = Success | Failure /** * A domain function. From d4820e222a5408bab959a51578de73b3b9922411 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 23:13:10 -0300 Subject: [PATCH 031/238] Adjust serialize type --- src/serialize.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/serialize.ts b/src/serialize.ts index 9ebfc3a6..02498e16 100644 --- a/src/serialize.ts +++ b/src/serialize.ts @@ -1,8 +1,15 @@ import { EnvironmentError } from './errors.ts' import { InputError } from './errors.ts' import type { Result } from './types.ts' +import { Failure } from './types.ts' +import { Success } from './types.ts' -function serializeResult(result: Result) { +function serializeResult(result: Result): + | (Success & { inputErrors: []; environmentErrors: [] }) + | (Failure & { + inputErrors: Error[] + environmentErrors: Error[] + }) { if (result.success) { return { ...result, From 057728da8cb566ef765a9b832a752124788ee4ca Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 9 Apr 2024 23:18:43 -0300 Subject: [PATCH 032/238] Simpler mapError --- src/domain-functions.ts | 10 +++------- src/map-error.test.ts | 16 ++++++---------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/domain-functions.ts b/src/domain-functions.ts index ef24607f..caa977bc 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -121,9 +121,7 @@ function first( fns.map((fn) => (fn as DomainFunction)(input, environment)), ) - const result = results.find((r) => r.success) as - | SuccessResult - | undefined + const result = results.find((r) => r.success) as SuccessResult | undefined if (!result) { throw new ErrorList(results.map(({ errors }) => errors).flat()) } @@ -316,16 +314,14 @@ function fromSuccess( */ function mapError( dfn: DomainFunction, - mapper: ( - element: Pick, - ) => Pick | Promise>, + mapper: (errors: Error[]) => Error[] | Promise, ): DomainFunction { return (async (input, environment) => { const result = await dfn(input, environment) if (result.success) return result return A.composable(async () => { - throw new ErrorList((await mapper(result)).errors) + throw new ErrorList(await mapper(result.errors)) })() }) as DomainFunction } diff --git a/src/map-error.test.ts b/src/map-error.test.ts index 435f0d69..b61e0b78 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -10,9 +10,7 @@ import { failure } from './errors.ts' describe('mapError', () => { it('returns the result when the domain function suceeds', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = () => ({ - errors: [new Error('New Error Message')], - }) + const b = () => [new Error('New Error Message')] const c = mapError(a, b) type _R = Expect>> @@ -22,9 +20,9 @@ describe('mapError', () => { it('returns a domain function function that will apply a function over the error of the first one', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const errorMapper = (result: Pick) => ({ - errors: [new Error('Number of errors: ' + result.errors.length)], - }) + const errorMapper = (errors: Error[]) => [ + new Error('Number of errors: ' + errors.length), + ] const c = mapError(a, errorMapper) type _R = Expect>> @@ -37,10 +35,8 @@ describe('mapError', () => { it('returns a domain function function that will apply an async function over the error of the first one', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const errorMapper = (result: Pick) => - Promise.resolve({ - errors: [new Error('Number of errors: ' + result.errors.length)], - }) + const errorMapper = (errors: Error[]) => + Promise.resolve([new Error('Number of errors: ' + errors.length)]) const c = mapError(a, errorMapper) type _R = Expect>> From 49d717c289fdeaf375966a9dc23dc5d285f23d1e Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 10 Apr 2024 10:22:00 -0400 Subject: [PATCH 033/238] remove unnecessary export --- src/constructor.ts | 1 - src/index.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/constructor.ts b/src/constructor.ts index 7e294ac5..21aaac80 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -93,6 +93,5 @@ export { fromComposable, makeDomainFunction as mdf, makeDomainFunction, - success as makeSuccessResult, success, } diff --git a/src/index.ts b/src/index.ts index 5415c0c2..2a9d0e07 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,6 @@ export { fromComposable, makeDomainFunction, - makeSuccessResult, mdf, success, } from './constructor.ts' From 576d5e15c1c2a115f17101b8c093926c7a2c8b07 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 12:26:46 -0300 Subject: [PATCH 034/238] Remove another unnecessary export --- src/errors.ts | 9 +-------- src/index.ts | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/errors.ts b/src/errors.ts index 09303b03..3a04be84 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -73,11 +73,4 @@ function toError(maybeError: unknown): Error { return isError(maybeError) ? maybeError : new Error(String(maybeError)) } -export { - EnvironmentError, - failure as makeErrorResult, - failure, - InputError, - ErrorList, - toError, -} +export { EnvironmentError, failure, InputError, ErrorList, toError } diff --git a/src/index.ts b/src/index.ts index 2a9d0e07..84020a7c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,7 +30,6 @@ export { failure, EnvironmentError, InputError, - makeErrorResult, ErrorList, toError, } from './errors.ts' From 8112b8e1be045a319939af951dcda9b6dd53c2a9 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 12:31:23 -0300 Subject: [PATCH 035/238] Remove undocumented safeResult --- src/domain-functions.ts | 27 --------------------------- src/index.ts | 1 - 2 files changed, 28 deletions(-) diff --git a/src/domain-functions.ts b/src/domain-functions.ts index caa977bc..81b79bdc 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -4,41 +4,15 @@ import type { DomainFunction, Last, MergeObjs, - Result, SuccessResult, TupleToUnion, UnpackAll, UnpackData, UnpackDFObject, UnpackResult, - Failure, } from './types.ts' import { Composable } from './index.ts' -/** - * @deprecated Use `composable` instead. - * A functions that turns the result of its callback into a Result object. - * @example - * const result = await safeResult(() => ({ - * message: 'hello', - * })) - * // the type of result is Result<{ message: string }> - * if (result.success) { - * console.log(result.data.message) - * } - * - * const result = await safeResult(() => { - * throw new Error('something went wrong') - * }) - * // the type of result is Result - * if (!result.success) { - * console.log(result.errors[0].message) - * } - */ -function safeResult(fn: () => T): Promise> { - return A.composable(fn)() as Promise> -} - /** * Takes a function with 2 parameters and partially applies the second one. * This is useful when one wants to use a domain function having a fixed environment. @@ -377,7 +351,6 @@ export { mapError, merge, pipe, - safeResult, sequence, trace, } diff --git a/src/index.ts b/src/index.ts index 84020a7c..c0b1302b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,7 +16,6 @@ export { mapError, merge, pipe, - safeResult, sequence, trace, } from './domain-functions.ts' From 1774cb83bb98edcffc02c16ea57de9d7b334378c Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 12:32:05 -0300 Subject: [PATCH 036/238] Remove serialize as it can be introduced in another PR --- src/serialize.ts | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 src/serialize.ts diff --git a/src/serialize.ts b/src/serialize.ts deleted file mode 100644 index 02498e16..00000000 --- a/src/serialize.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { EnvironmentError } from './errors.ts' -import { InputError } from './errors.ts' -import type { Result } from './types.ts' -import { Failure } from './types.ts' -import { Success } from './types.ts' - -function serializeResult(result: Result): - | (Success & { inputErrors: []; environmentErrors: [] }) - | (Failure & { - inputErrors: Error[] - environmentErrors: Error[] - }) { - if (result.success) { - return { - ...result, - inputErrors: [], - environmentErrors: [], - } - } - - return { - success: false, - errors: result.errors.filter( - (e) => !(e instanceof InputError) && !(e instanceof EnvironmentError), - ), - inputErrors: result.errors.filter((e) => e instanceof InputError), - environmentErrors: result.errors.filter( - (e) => e instanceof EnvironmentError, - ), - } -} - -export { serializeResult } From 0d777e35dc8102e460ca888b708ffb0053631c16 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 12:44:22 -0300 Subject: [PATCH 037/238] Modify one test to compensate an celebrate the end of InputErrors class --- src/constructor.test.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 78e20ff8..7637b039 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -209,13 +209,17 @@ describe('makeDomainFunction', () => { const handler = mdf(z.object({ id: z.number() }))(() => { throw new ErrorList([ new InputError('Custom input error', ['contact', 'id']), + new EnvironmentError('Custom env error', ['currentUser', 'role']), ]) }) type _R = Expect>> assertEquals( await handler({ id: 1 }), - failure([new InputError('Custom input error', ['contact', 'id'])]), + failure([ + new InputError('Custom input error', ['contact', 'id']), + new EnvironmentError('Custom env error', ['currentUser', 'role']), + ]), ) }) }) From f0ca6458d91ef8f8374fdd96b0222ccea64c3838 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 13:13:50 -0300 Subject: [PATCH 038/238] Remove toError export and refactor trace to avoid using it --- src/composable/composable.ts | 11 ++++++++++- src/constructor.test.ts | 17 ++++++----------- src/domain-functions.ts | 21 +++++++++++---------- src/errors.ts | 28 +--------------------------- src/index.ts | 8 +------- 5 files changed, 29 insertions(+), 56 deletions(-) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index ac1182c2..d51e53d1 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -1,5 +1,5 @@ import { success } from '../constructor.ts' -import { toError, ErrorList, failure } from '../errors.ts' +import { ErrorList, failure } from '../errors.ts' import { MergeObjs, Success, Failure } from '../types.ts' import { AllArguments, @@ -14,6 +14,15 @@ import { UnpackResult, } from './types.ts' +function toError(maybeError: unknown): Error { + if (maybeError instanceof Error) return maybeError + try { + return new Error(JSON.stringify(maybeError)) + } catch (_e) { + return new Error(String(maybeError)) + } +} + /** * Merges a list of objects into a single object. * It is a type-safe version of Object.assign. diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 7637b039..24a6cffb 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -1,10 +1,4 @@ -import { - assertEquals, - assertObjectMatch, - assertIsError, - describe, - it, -} from './test-prelude.ts' +import { assertEquals, assertIsError, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' import { success, mdf } from './constructor.ts' @@ -173,10 +167,11 @@ describe('makeDomainFunction', () => { }) type _R = Expect>> - assertObjectMatch( - await handler({ id: 1 }), - failure([{ message: 'Error' } as Error]), - ) + const { + errors: [err], + } = await handler({ id: 1 }) + + assertIsError(err, Error, JSON.stringify({ message: 'Error' })) }) it('returns inputErrors when the domain function throws an InputError', async () => { diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 81b79bdc..17742f98 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -1,4 +1,4 @@ -import { ErrorList, failure, toError } from './errors.ts' +import { ErrorList, failure } from './errors.ts' import * as A from './composable/composable.ts' import type { DomainFunction, @@ -327,15 +327,16 @@ function trace>( }: TraceData>) => Promise | void, ): (fn: DomainFunction) => DomainFunction { return (fn) => async (input, environment) => { - const result = await fn(input, environment) - try { - await traceFn({ input, environment, result } as TraceData< - UnpackResult - >) - return result - } catch (e) { - return failure([toError(e)]) - } + const originalResult = await fn(input, environment) + const traceResult = await A.composable(traceFn)({ + input, + environment, + // TODO: Remove this casting when we unify the Unpack types + result: originalResult as Awaited>, + }) + if (traceResult.success) return originalResult + + return failure(traceResult.errors) } } diff --git a/src/errors.ts b/src/errors.ts index 3a04be84..342750d1 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -47,30 +47,4 @@ class ErrorList extends Error { } } -function objectHasKey( - obj: unknown, - key: T, -): obj is { [k in T]: unknown } { - return typeof obj === 'object' && obj !== null && key in obj -} - -function isError(error: unknown): error is Error { - return objectHasKey(error, 'message') && typeof error.message === 'string' -} - -/** - * Turns the given 'unknown' error into an Error. - * @param maybeError the error to turn into an Error - * @returns the Error - * @example - * try {} - * catch (error) { - * const Error = toError(error) - * console.log(Error.message) - * } - */ -function toError(maybeError: unknown): Error { - return isError(maybeError) ? maybeError : new Error(String(maybeError)) -} - -export { EnvironmentError, failure, InputError, ErrorList, toError } +export { EnvironmentError, failure, InputError, ErrorList } diff --git a/src/index.ts b/src/index.ts index c0b1302b..288f65af 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,13 +25,7 @@ export { inputFromSearch, inputFromUrl, } from './input-resolvers.ts' -export { - failure, - EnvironmentError, - InputError, - ErrorList, - toError, -} from './errors.ts' +export { failure, EnvironmentError, InputError, ErrorList } from './errors.ts' export { mergeObjects } from './composable/composable.ts' export type { Composable } from './composable/index.ts' import * as composable from './composable/index.ts' From 19af6c5eef7dc7f95938a1bbe88bfd3bfbaae5b9 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Tue, 28 Nov 2023 22:37:04 -0500 Subject: [PATCH 039/238] Added missing default generic parameters when parsers are not given. Also remove the validation from our default undefined parser and simply ignore the input, since that seems more useful on compositions than erroring in case something is passed. --- src/composable/index.test.ts | 2 +- src/constructor.test.ts | 19 ++++++++++--------- src/constructor.ts | 10 ++-------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index 1dff6cbf..a5ac47ad 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -3,8 +3,8 @@ import { Equal, Expect } from './types.test.ts' import type { Result } from '../types.ts' import type { Composable } from './types.ts' import { all, catchError, collect, composable } from './composable.ts' -import { map, mapError, pipe, sequence } from './index.ts' import { success } from '../constructor.ts' +import { map, mapError, pipe, sequence } from './index.ts' const voidFn = composable(() => {}) const toString = composable((a: unknown) => `${a}`) diff --git a/src/constructor.test.ts b/src/constructor.test.ts index 24a6cffb..30a40a22 100644 --- a/src/constructor.test.ts +++ b/src/constructor.test.ts @@ -1,8 +1,8 @@ import { assertEquals, assertIsError, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' -import { success, mdf } from './constructor.ts' -import { failure, EnvironmentError, InputError, ErrorList } from './errors.ts' +import { mdf, success } from './constructor.ts' +import { EnvironmentError, ErrorList, failure, InputError } from './errors.ts' import type { DomainFunction, SuccessResult } from './types.ts' import type { Equal, Expect } from './types.test.ts' @@ -15,14 +15,15 @@ describe('makeDomainFunction', () => { assertEquals(await handler(), success('no input!')) }) - it('fails gracefully if gets something other than undefined', async () => { - const handler = mdf()(() => 'no input!') - type _R = Expect>> + it('ignores the input and pass undefined', async () => { + const handler = mdf()((args) => args) + type _R = Expect>> - assertEquals( - await handler('some input'), - failure([new InputError('Expected undefined')]), - ) + assertEquals(await handler('some input'), { + success: true, + data: undefined, + errors: [], + }) }) }) diff --git a/src/constructor.ts b/src/constructor.ts index 21aaac80..167272b8 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -78,14 +78,8 @@ const objectSchema: ParserSchema> = { } const undefinedSchema: ParserSchema = { - safeParseAsync: (data: unknown) => { - if (data !== undefined) { - return Promise.resolve({ - success: false, - error: { issues: [{ path: [], message: 'Expected undefined' }] }, - }) - } - return Promise.resolve({ success: true, data }) + safeParseAsync: (_data: unknown) => { + return Promise.resolve({ success: true, data: undefined }) }, } From c18f531ac9548c0593908a3ebe4b6149673e48d7 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 13:26:21 -0300 Subject: [PATCH 040/238] Rename custom schema --- src/constructor.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/constructor.ts b/src/constructor.ts index 167272b8..1155193b 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -44,7 +44,9 @@ function fromComposable( const envResult = await (environmentSchema ?? objectSchema).safeParseAsync( environment, ) - const result = await (inputSchema ?? undefinedSchema).safeParseAsync(input) + const result = await (inputSchema ?? alwaysUndefinedSchema).safeParseAsync( + input, + ) if (!result.success || !envResult.success) { const inputErrors = result.success @@ -77,7 +79,7 @@ const objectSchema: ParserSchema> = { }, } -const undefinedSchema: ParserSchema = { +const alwaysUndefinedSchema: ParserSchema = { safeParseAsync: (_data: unknown) => { return Promise.resolve({ success: true, data: undefined }) }, From 64dad0d796e753041700610e2e96cbb5cff4737f Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 13:55:59 -0300 Subject: [PATCH 041/238] Create the onErrorThrow function to replace fromSuccess with an universal function --- src/constructor.ts | 3 ++ src/domain-functions.ts | 29 +++++++++------- src/index.ts | 2 +- ...success.test.ts => on-error-throw.test.ts} | 33 ++++++++++++++++--- src/trace.test.ts | 4 +-- 5 files changed, 52 insertions(+), 19 deletions(-) rename src/{from-success.test.ts => on-error-throw.test.ts} (55%) diff --git a/src/constructor.ts b/src/constructor.ts index 1155193b..450089de 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -85,6 +85,9 @@ const alwaysUndefinedSchema: ParserSchema = { }, } +// Ainda chamamos de Environment? +// Ainda chamamos de DF? Dado a nova definicao + export { fromComposable, makeDomainFunction as mdf, diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 17742f98..011af41b 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -240,7 +240,7 @@ function branch( return A.composable(async () => { const nextDf = await resolver(result.data) if (typeof nextDf !== 'function') return result.data - return fromSuccess(nextDf)(result.data, environment) + return onErrorThrow(nextDf)(result.data, environment) })() }) as DomainFunction< R extends DomainFunction ? U : UnpackData> | T @@ -251,24 +251,29 @@ function branch( * It can be used to call a domain function from another domain function. It will return the output of the given domain function if it was successfull, otherwise it will throw a `ErrorList` that will bubble up to the parent function. * Also good to use it in successfull test cases. * @example - * import { mdf, fromSuccess } from 'domain-functions' + * import { mdf, onErrorThrow } from 'domain-functions' * * const add1 = mdf(z.number())((n) => n + 1) * const result = await add1(1) * // ^? Result - * const data = await fromSuccess(add1)(n) + * const data = await onErrorThrow(add1)(n) * // ^? number * expect(data).toBe(n + 1) */ -function fromSuccess( - df: T, -): (...args: Parameters) => Promise> { - return async function (...args) { - const result = await df(...args) - if (!result.success) throw new ErrorList(result.errors) +function onErrorThrow( + fn: T, + onError: (errors: Error[]) => Error[] | Promise = (e) => e, +): T extends Composable<(...a: infer A) => infer O> + ? (...a: A) => Promise> + : never { + return (async (...args) => { + const result = await fn(...args) + if (result.success) return result.data - return result.data - } + throw new ErrorList(await onError(result.errors)) + }) as T extends Composable<(...a: infer A) => infer O> + ? (...a: A) => Promise> + : never } /** @@ -347,7 +352,7 @@ export { collect, collectSequence, first, - fromSuccess, + onErrorThrow, map, mapError, merge, diff --git a/src/index.ts b/src/index.ts index 288f65af..e5200c03 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,10 +11,10 @@ export { collect, collectSequence, first, - fromSuccess, map, mapError, merge, + onErrorThrow, pipe, sequence, trace, diff --git a/src/from-success.test.ts b/src/on-error-throw.test.ts similarity index 55% rename from src/from-success.test.ts rename to src/on-error-throw.test.ts index c8c8f871..10637360 100644 --- a/src/from-success.test.ts +++ b/src/on-error-throw.test.ts @@ -2,15 +2,16 @@ import { describe, it, assertEquals, assertRejects } from './test-prelude.ts' import { z } from './test-prelude.ts' import { mdf } from './constructor.ts' -import { fromSuccess } from './domain-functions.ts' +import { onErrorThrow } from './domain-functions.ts' import { ErrorList } from './errors.ts' import type { Equal, Expect } from './types.test.ts' +import { composable } from './composable/index.ts' -describe('fromSuccess', () => { +describe('onErrorThrow', () => { it('returns the result.data when the domain function suceeds', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = fromSuccess(a) + const c = onErrorThrow(a) type _R = Expect< Equal< typeof c, @@ -24,7 +25,7 @@ describe('fromSuccess', () => { it('throws an exception when the domain function fails', () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = fromSuccess(a) + const c = onErrorThrow(a) type _R = Expect< Equal< typeof c, @@ -36,4 +37,28 @@ describe('fromSuccess', () => { await c({ invalidInput: 'should error' }) }, ErrorList) }) + + it('works with composable functions', async () => { + const a = composable(() => 1) + + const c = onErrorThrow(a) + type _R = Expect Promise>> + + assertEquals(await c(), 1) + }) + + it('allows to change the errors list', () => { + const a = composable(() => { + throw new Error('Some error') + }) + + const c = onErrorThrow(a, (errors) => [ + new Error(`Number of errors: ${errors.length}`), + ]) + type _R = Expect Promise>> + + assertRejects(async () => { + await c() + }, ErrorList) + }) }) diff --git a/src/trace.test.ts b/src/trace.test.ts index 5f01fe21..481ce9a0 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -2,7 +2,7 @@ import { assertIsError, assertEquals, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' import { mdf } from './constructor.ts' -import { fromSuccess, trace } from './domain-functions.ts' +import { onErrorThrow, trace } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { success } from './constructor.ts' @@ -35,7 +35,7 @@ describe('trace', () => { })(a) type _R = Expect>> - assertEquals(await fromSuccess(c)({ id: 1 }), 2) + assertEquals(await onErrorThrow(c)({ id: 1 }), 2) assertEquals(contextFromFunctionA, { input: { id: 1 }, environment: undefined, From 6df264a5a0734a768f357425a238917393143d3a Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 14:02:51 -0300 Subject: [PATCH 042/238] Implement onErrorThrow with mapError and unify mapError implementations --- src/composable/composable.ts | 6 +++--- src/composable/index.test.ts | 4 +--- src/domain-functions.ts | 13 +++---------- src/map-error.test.ts | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/composable/composable.ts b/src/composable/composable.ts index d51e53d1..244aa187 100644 --- a/src/composable/composable.ts +++ b/src/composable/composable.ts @@ -227,14 +227,14 @@ function catchError( */ function mapError( fn: T, - mapper: (err: Omit) => Omit, + mapper: (err: Error[]) => Error[] | Promise, ) { return (async (...args) => { const res = await fn(...args) if (res.success) return success(res.data) - const mapped = await composable(mapper)(res) + const mapped = await composable(mapper)(res.errors) if (mapped.success) { - return failure(mapped.data.errors) + return failure(mapped.data) } else { return failure(mapped.errors) } diff --git a/src/composable/index.test.ts b/src/composable/index.test.ts index a5ac47ad..588fce7d 100644 --- a/src/composable/index.test.ts +++ b/src/composable/index.test.ts @@ -350,9 +350,7 @@ const cleanError = (err: Error) => ({ }) describe('mapError', () => { it('maps over the error results of an Composable function', async () => { - const fn = mapError(faultyAdd, ({ errors }) => ({ - errors: errors.map(cleanError), - })) + const fn = mapError(faultyAdd, (errors) => errors.map(cleanError)) const res = await fn(1, 2) type _FN = Expect< diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 011af41b..2a1991e6 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -267,10 +267,10 @@ function onErrorThrow( ? (...a: A) => Promise> : never { return (async (...args) => { - const result = await fn(...args) + const result = await A.mapError(fn, onError)(...args) if (result.success) return result.data - throw new ErrorList(await onError(result.errors)) + throw new ErrorList(result.errors) }) as T extends Composable<(...a: infer A) => infer O> ? (...a: A) => Promise> : never @@ -295,14 +295,7 @@ function mapError( dfn: DomainFunction, mapper: (errors: Error[]) => Error[] | Promise, ): DomainFunction { - return (async (input, environment) => { - const result = await dfn(input, environment) - if (result.success) return result - - return A.composable(async () => { - throw new ErrorList(await mapper(result.errors)) - })() - }) as DomainFunction + return A.mapError(dfn, mapper) } type TraceData = { diff --git a/src/map-error.test.ts b/src/map-error.test.ts index b61e0b78..d8a23048 100644 --- a/src/map-error.test.ts +++ b/src/map-error.test.ts @@ -3,7 +3,7 @@ import { z } from './test-prelude.ts' import { success, mdf } from './constructor.ts' import { mapError } from './domain-functions.ts' -import type { DomainFunction, Failure } from './types.ts' +import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { failure } from './errors.ts' From 278861d6a40d1053ba09a4fc9a7e39f092b59582 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 14:03:46 -0300 Subject: [PATCH 043/238] Remove comment --- src/constructor.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/constructor.ts b/src/constructor.ts index 450089de..1155193b 100644 --- a/src/constructor.ts +++ b/src/constructor.ts @@ -85,9 +85,6 @@ const alwaysUndefinedSchema: ParserSchema = { }, } -// Ainda chamamos de Environment? -// Ainda chamamos de DF? Dado a nova definicao - export { fromComposable, makeDomainFunction as mdf, From 3e145cfb2f26aaa2e0940a3b25b5389e602382ed Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 15:28:47 -0300 Subject: [PATCH 044/238] Rename onErrorThrow to fromSuccess for now --- src/domain-functions.ts | 10 +++++----- src/index.ts | 2 +- src/on-error-throw.test.ts | 12 ++++++------ src/trace.test.ts | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/domain-functions.ts b/src/domain-functions.ts index 2a1991e6..df781d2b 100644 --- a/src/domain-functions.ts +++ b/src/domain-functions.ts @@ -240,7 +240,7 @@ function branch( return A.composable(async () => { const nextDf = await resolver(result.data) if (typeof nextDf !== 'function') return result.data - return onErrorThrow(nextDf)(result.data, environment) + return fromSuccess(nextDf)(result.data, environment) })() }) as DomainFunction< R extends DomainFunction ? U : UnpackData> | T @@ -251,16 +251,16 @@ function branch( * It can be used to call a domain function from another domain function. It will return the output of the given domain function if it was successfull, otherwise it will throw a `ErrorList` that will bubble up to the parent function. * Also good to use it in successfull test cases. * @example - * import { mdf, onErrorThrow } from 'domain-functions' + * import { mdf, fromSuccess } from 'domain-functions' * * const add1 = mdf(z.number())((n) => n + 1) * const result = await add1(1) * // ^? Result - * const data = await onErrorThrow(add1)(n) + * const data = await fromSuccess(add1)(n) * // ^? number * expect(data).toBe(n + 1) */ -function onErrorThrow( +function fromSuccess( fn: T, onError: (errors: Error[]) => Error[] | Promise = (e) => e, ): T extends Composable<(...a: infer A) => infer O> @@ -345,7 +345,7 @@ export { collect, collectSequence, first, - onErrorThrow, + fromSuccess, map, mapError, merge, diff --git a/src/index.ts b/src/index.ts index e5200c03..7a7ede94 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,7 +14,7 @@ export { map, mapError, merge, - onErrorThrow, + fromSuccess, pipe, sequence, trace, diff --git a/src/on-error-throw.test.ts b/src/on-error-throw.test.ts index 10637360..528a0f9a 100644 --- a/src/on-error-throw.test.ts +++ b/src/on-error-throw.test.ts @@ -2,16 +2,16 @@ import { describe, it, assertEquals, assertRejects } from './test-prelude.ts' import { z } from './test-prelude.ts' import { mdf } from './constructor.ts' -import { onErrorThrow } from './domain-functions.ts' +import { fromSuccess } from './domain-functions.ts' import { ErrorList } from './errors.ts' import type { Equal, Expect } from './types.test.ts' import { composable } from './composable/index.ts' -describe('onErrorThrow', () => { +describe('fromSuccess', () => { it('returns the result.data when the domain function suceeds', async () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = onErrorThrow(a) + const c = fromSuccess(a) type _R = Expect< Equal< typeof c, @@ -25,7 +25,7 @@ describe('onErrorThrow', () => { it('throws an exception when the domain function fails', () => { const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = onErrorThrow(a) + const c = fromSuccess(a) type _R = Expect< Equal< typeof c, @@ -41,7 +41,7 @@ describe('onErrorThrow', () => { it('works with composable functions', async () => { const a = composable(() => 1) - const c = onErrorThrow(a) + const c = fromSuccess(a) type _R = Expect Promise>> assertEquals(await c(), 1) @@ -52,7 +52,7 @@ describe('onErrorThrow', () => { throw new Error('Some error') }) - const c = onErrorThrow(a, (errors) => [ + const c = fromSuccess(a, (errors) => [ new Error(`Number of errors: ${errors.length}`), ]) type _R = Expect Promise>> diff --git a/src/trace.test.ts b/src/trace.test.ts index 481ce9a0..5f01fe21 100644 --- a/src/trace.test.ts +++ b/src/trace.test.ts @@ -2,7 +2,7 @@ import { assertIsError, assertEquals, describe, it } from './test-prelude.ts' import { z } from './test-prelude.ts' import { mdf } from './constructor.ts' -import { onErrorThrow, trace } from './domain-functions.ts' +import { fromSuccess, trace } from './domain-functions.ts' import type { DomainFunction } from './types.ts' import type { Equal, Expect } from './types.test.ts' import { success } from './constructor.ts' @@ -35,7 +35,7 @@ describe('trace', () => { })(a) type _R = Expect>> - assertEquals(await onErrorThrow(c)({ id: 1 }), 2) + assertEquals(await fromSuccess(c)({ id: 1 }), 2) assertEquals(contextFromFunctionA, { input: { id: 1 }, environment: undefined, From 4eaf51793de2560c94f52640e4624fb6f4567b30 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 15:30:49 -0300 Subject: [PATCH 045/238] Rename test file --- src/{on-error-throw.test.ts => from-success.test.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{on-error-throw.test.ts => from-success.test.ts} (100%) diff --git a/src/on-error-throw.test.ts b/src/from-success.test.ts similarity index 100% rename from src/on-error-throw.test.ts rename to src/from-success.test.ts From a6766f297d0c6db038af16de581166bd4fd6c7b8 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 17:01:24 -0300 Subject: [PATCH 046/238] Re-export all modules according to new discussed API --- composables.md | 36 ++- deno.json | 3 + src/apply-environment.test.ts | 36 --- .../composable.ts => combinators.ts} | 65 +---- src/composable/index.ts | 11 - src/composable/types.ts | 162 ------------ src/constructors.ts | 87 ++++++ .../combinators.ts} | 82 ++---- src/{constructor.ts => df/constructors.ts} | 37 +-- src/df/index.ts | 14 + src/{ => df/tests}/all.test.ts | 55 ++-- src/{ => df/tests}/branch.test.ts | 73 ++--- src/{ => df/tests}/collect-sequence.test.ts | 62 +++-- src/{ => df/tests}/collect.test.ts | 47 ++-- .../tests/constructors.test.ts} | 95 +++++-- src/{ => df/tests}/first.test.ts | 31 +-- src/{ => df/tests}/map-error.test.ts | 27 +- src/{ => df/tests}/map.test.ts | 27 +- src/{ => df/tests}/merge.test.ts | 55 ++-- src/{ => df/tests}/pipe.test.ts | 56 ++-- src/{ => df/tests}/sequence.test.ts | 55 ++-- src/{ => df/tests}/trace.test.ts | 25 +- src/df/tests/types.test.ts | 44 +++ src/df/types.ts | 98 +++++++ src/errors.ts | 9 +- src/from-success.test.ts | 64 ----- src/index.ts | 48 ++-- src/test.d.ts | 5 + .../combinators.test.ts} | 68 +---- src/tests/constructors.test.ts | 121 +++++++++ src/{ => tests}/input-resolvers.test.ts | 11 +- src/{composable => tests}/types.test.ts | 96 ++++++- src/types.test.ts | 140 ---------- src/types.ts | 250 +++++++++++------- 34 files changed, 1053 insertions(+), 1042 deletions(-) delete mode 100644 src/apply-environment.test.ts rename src/{composable/composable.ts => combinators.ts} (81%) delete mode 100644 src/composable/index.ts delete mode 100644 src/composable/types.ts create mode 100644 src/constructors.ts rename src/{domain-functions.ts => df/combinators.ts} (83%) rename src/{constructor.ts => df/constructors.ts} (71%) create mode 100644 src/df/index.ts rename src/{ => df/tests}/all.test.ts (57%) rename src/{ => df/tests}/branch.test.ts (58%) rename src/{ => df/tests}/collect-sequence.test.ts (73%) rename src/{ => df/tests}/collect.test.ts (58%) rename src/{constructor.test.ts => df/tests/constructors.test.ts} (73%) rename src/{ => df/tests}/first.test.ts (56%) rename src/{ => df/tests}/map-error.test.ts (65%) rename src/{ => df/tests}/map.test.ts (63%) rename src/{ => df/tests}/merge.test.ts (63%) rename src/{ => df/tests}/pipe.test.ts (71%) rename src/{ => df/tests}/sequence.test.ts (76%) rename src/{ => df/tests}/trace.test.ts (59%) create mode 100644 src/df/tests/types.test.ts create mode 100644 src/df/types.ts delete mode 100644 src/from-success.test.ts create mode 100644 src/test.d.ts rename src/{composable/index.test.ts => tests/combinators.test.ts} (86%) create mode 100644 src/tests/constructors.test.ts rename src/{ => tests}/input-resolvers.test.ts (97%) rename src/{composable => tests}/types.test.ts (68%) delete mode 100644 src/types.test.ts diff --git a/composables.md b/composables.md index e4d0ad39..91d6f4f8 100644 --- a/composables.md +++ b/composables.md @@ -9,7 +9,7 @@ Performing this operation manually is straightforward function addAndReturnString(a: number, b: number) : string { return toString(add(a, b)) } -``` +``` It would be neat if typescript could the typing for us and provided a more generic mechanism to compose these functions. Something like what you find in libraries such as [lodash](https://lodash.com/docs/4.17.15#flow) @@ -17,7 +17,7 @@ Using composables the code could be written as: ```typescript const addAndReturnString = pipe(add, toString) -``` +``` We can also extend the same reasoning to functions that return promises in a transparent way. Imagine we have `add : (a: number, b:number) => Promise` and `toString : (a: number) => Promise`, the composition above would work in the same fashion, returning a function `addAndReturnString(a: number, b: number) : Promise` that will wait for each promise in the chain before applying the next function. @@ -30,6 +30,8 @@ A `Composable` is a function that returns a `Promise>` where `T` is an So we can define the `add` and the `toString` functions as a `Composable`: ```typescript +import { composable } from 'composable-functions' + const add = composable((a: number, b: number) => a + b) ^? Composable<(a: number, b: number) => number> @@ -40,14 +42,18 @@ const toString = composable((a: unknown) => `${a}`) Now we can compose them using pipe to create `addAndReturnString`: ```typescript -const addAndReturnString = pipe(add, toString) +import { cf } from 'composable-functions' + +const addAndReturnString = cf.pipe(add, toString) ^? Composable<(a: number, b: number) => string> ``` Note that trying to compose pipe flipping the arguments will not type-check: ```typescript -const addAndReturnString = pipe(toString, add) +import { cf } from 'composable-functions' + +const addAndReturnString = cf.pipe(toString, add) ^? ["Fail to compose", string, "does not fit in", number] ``` @@ -60,7 +66,9 @@ Sometimes we want to use a simple function in this sort of sequential compositio The function `map` can be used for this, since we are mapping over the result of a `Composable`: ```typescript -const addAndReturnString = map(add, String) +import { cf } from 'composable-functions' + +const addAndReturnString = cf.map(add, String) ``` Note that if your mapper function has to be `async` you should wrap it in `composable` and use `pipe` instead. @@ -71,9 +79,11 @@ There are also functions compositions where all its parameters are excuted in pa The `all` function is one way of composing in this fashion. Assuming we want to apply our `add` and multiply the two numbers returning a success only once both operations succeed: ```typescript +import { composable, cf } from 'composable-functions' + const add = composable((a: number, b: number) => a + b) const mul = composable((a: number, b: number) => a * b) -const addAndMul = all(add, mul) +const addAndMul = cf.all(add, mul) ^? Composable<(args_0: number, args_1: number) => [number, number]> ``` @@ -89,23 +99,25 @@ Two neat consequences is that we can handle errors using functions (no need for To catch an error you need a second `Composable` capable of receiving `{ errors: Error[] }`. This composable is called when the first function fails: ```typescript +import { composable, cf } from 'composable-functions' + const fetchBody = composable((url: string) => fetch(url).then((r) => r.text())) const emptyOnError = composable(({errors}: { errors: Error[] }) => { console.error("Something went wrong, returning empty string", errors) return "" }) -const fetchThatNeverFails = catchError(fetchBody, emptyOnError) +const fetchThatNeverFails = cf.catchError(fetchBody, emptyOnError) ``` ### Mapping errors Sometimes we just need to transform one error into something that would make more sense for the caller. Imagine you have our `fetchBody` defined above, but we want a custom error type for when the input URL is invalid. You can map over the failures using `mapError` and a function with the type `({ errors: Error[] }) => { errors: Error[] }`. ```typescript +import { cf } from 'composable-functions' + class InvalidUrlError extends Error {} -const fetchBodyWithCustomError = mapError(fetchBody, ({ errors }) => ({ - errors: errors.map((e) => - e.message.includes('Invalid URL') ? new InvalidUrlError() : e, - ), -})) +const fetchBodyWithCustomError = cf.mapError(fetchBody, (errors) => + errors.map((e) => e.message.includes('Invalid URL') ? new InvalidUrlError() : e) +) ``` diff --git a/deno.json b/deno.json index d6210777..a43e5acd 100644 --- a/deno.json +++ b/deno.json @@ -16,5 +16,8 @@ "ban-types" ] } + }, + "compilerOptions": { + "types": ["./src/test.d.ts"] } } diff --git a/src/apply-environment.test.ts b/src/apply-environment.test.ts deleted file mode 100644 index 25cbb253..00000000 --- a/src/apply-environment.test.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { assertEquals, describe, it } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { applyEnvironment } from './domain-functions.ts' -import { failure, EnvironmentError } from './errors.ts' - -describe('applyEnvironment', () => { - it('fails when environment fails parser', async () => { - const getEnv = mdf(z.unknown(), z.number())((_, e) => e) - - const getEnvWithEnvironment = applyEnvironment( - getEnv, - 'invalid environment', - ) - - assertEquals( - await getEnvWithEnvironment('some input'), - failure([new EnvironmentError('Expected number, received string')]), - ) - }) - - it('should apply environment', async () => { - const getEnv = mdf(z.unknown(), z.string())((_, e) => e) - - const getEnvWithEnvironment = applyEnvironment( - getEnv, - 'constant environment', - ) - - assertEquals( - await getEnvWithEnvironment('some input'), - success('constant environment'), - ) - }) -}) diff --git a/src/composable/composable.ts b/src/combinators.ts similarity index 81% rename from src/composable/composable.ts rename to src/combinators.ts index 244aa187..f8bd7820 100644 --- a/src/composable/composable.ts +++ b/src/combinators.ts @@ -1,63 +1,18 @@ -import { success } from '../constructor.ts' -import { ErrorList, failure } from '../errors.ts' -import { MergeObjs, Success, Failure } from '../types.ts' -import { +import type { AllArguments, CollectArguments, Composable, + Failure, First, Fn, PipeArguments, PipeReturn, RecordToTuple, + Success, UnpackAll, UnpackResult, } from './types.ts' - -function toError(maybeError: unknown): Error { - if (maybeError instanceof Error) return maybeError - try { - return new Error(JSON.stringify(maybeError)) - } catch (_e) { - return new Error(String(maybeError)) - } -} - -/** - * Merges a list of objects into a single object. - * It is a type-safe version of Object.assign. - * @param objs the list of objects to merge - * @returns the merged object - * @example - * const obj1 = { a: 1, b: 2 } - * const obj2 = { c: 3 } - * const obj3 = { d: 4 } - * const merged = mergeObjects([obj1, obj2, obj3]) - * // ^? { a: number, b: number, c: number, d: number } - */ -function mergeObjects(objs: T) { - return Object.assign({}, ...objs) as MergeObjs -} - -/** - * Creates a composable function. - * That function is gonna catch any errors and always return a Result. - * @param fn a function to be used as a Composable - */ -function composable(fn: T): Composable { - return async (...args) => { - try { - // deno-lint-ignore no-explicit-any - const result = await fn(...(args as any[])) - return success(result) - } catch (e) { - if (e instanceof ErrorList) { - return failure(e.list) - } - return failure([toError(e)]) - } - } -} +import { composable, failure, mergeObjects, success } from './constructors.ts' /** * Creates a single function out of a chain of multiple Composables. It will pass the output of a function as the next function's input in left-to-right order. The resulting data will be the output of the rightmost function. @@ -241,14 +196,4 @@ function mapError( }) as T } -export { - all, - catchError, - collect, - composable, - map, - mapError, - mergeObjects, - pipe, - sequence, -} +export { pipe, all, collect, sequence, map, catchError, mapError } diff --git a/src/composable/index.ts b/src/composable/index.ts deleted file mode 100644 index e18ba1e2..00000000 --- a/src/composable/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -export type { Composable, Result } from './types.ts' -export { - all, - catchError, - collect, - composable, - map, - mapError, - pipe, - sequence, -} from './composable.ts' diff --git a/src/composable/types.ts b/src/composable/types.ts deleted file mode 100644 index 6159d5c6..00000000 --- a/src/composable/types.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { Prettify, Result } from '../types.ts' - -type IsNever = - // prettier is removing the parens thus worsening readability - // prettier-ignore - (() => T extends A ? 1 : 2) extends (() => T extends never ? 1 : 2) - ? true - : false - -type First = T extends [infer F, ...infer _I] - ? F - : never - -type Fn = (...args: any[]) => any -type Composable = ( - ...args: Parameters -) => Promise>>> - -type UnpackResult = Awaited extends Result ? R : never - -type UnpackAll = { - [K in keyof List]: UnpackResult> -} - -type PipeReturn = Fns extends [ - Composable<(...a: infer PA) => infer OA>, - Composable<(b: infer PB) => infer OB>, - ...infer rest, -] - ? IsNever extends true - ? ['Fail to compose, "never" does not fit in', PB] - : Awaited extends PB - ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> - : ['Fail to compose', Awaited, 'does not fit in', PB] - : Fns extends [Composable<(...args: infer P) => infer O>] - ? Composable<(...args: P) => O> - : never - -type PipeArguments< - Fns extends any[], - Arguments extends any[] = [], -> = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] - ? restA extends [ - Composable< - (firstParameter: infer FirstBParameter, ...b: infer PB) => any - >, - ] - ? IsNever> extends true - ? ['Fail to compose, "never" does not fit in', FirstBParameter] - : Awaited extends FirstBParameter - ? EveryElementTakesUndefined extends true - ? PipeArguments OA>]> - : EveryElementTakesUndefined - : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] - : [...Arguments, Composable<(...a: PA) => OA>] - : never - -type EveryElementTakesUndefined = T extends [ - infer HEAD, - ...infer TAIL, -] - ? undefined extends HEAD - ? true & EveryElementTakesUndefined - : ['Fail to compose', undefined, 'does not fit in', HEAD] - : true - -type SubtypesTuple< - TA extends unknown[], - TB extends unknown[], - O extends unknown[], -> = TA extends [infer headA, ...infer restA] - ? TB extends [infer headB, ...infer restB] - ? headA extends headB - ? SubtypesTuple - : headB extends headA - ? SubtypesTuple - : { 'Incompatible arguments ': true; argument1: headA; argument2: headB } - : SubtypesTuple - : TB extends [infer headBNoA, ...infer restBNoA] - ? SubtypesTuple<[], restBNoA, [...O, headBNoA]> - : O - -type AllArguments< - Fns extends any[], - Arguments extends any[] = [], -> = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] - ? restA extends [Composable<(...b: infer PB) => infer OB>, ...infer restB] - ? SubtypesTuple extends [...infer MergedP] - ? AllArguments< - [Composable<(...args: MergedP) => OB>, ...restB], - [...Arguments, Composable<(...a: MergedP) => OA>] - > - : ['Fail to compose', PA, 'does not fit in', PB] - : [...Arguments, Composable<(...a: PA) => OA>] - : never - -// Thanks to https://github.com/tjjfvi -// UnionToTuple code lifted from this thread: https://github.com/microsoft/TypeScript/issues/13298#issuecomment-707364842 -// This will not preserve union order but we don't care since this is for Composable paralel application -type UnionToTuple = ( - (T extends any ? (t: T) => T : never) extends infer U - ? (U extends any ? (u: U) => any : never) extends (v: infer V) => any - ? V - : never - : never -) extends (_: any) => infer W - ? [...UnionToTuple>, W] - : [] - -type Keys> = UnionToTuple - -type RecordValuesFromKeysTuple< - R extends Record, - K extends unknown[], - ValuesTuple extends Composable[] = [], -> = K extends [infer Head, ...infer rest] - ? Head extends string - ? rest extends string[] - ? RecordValuesFromKeysTuple - : never - : ValuesTuple - : ValuesTuple - -type Zip< - K extends unknown[], - V extends Composable[], - O extends Record = {}, -> = K extends [infer HeadK, ...infer restK] - ? V extends [infer HeadV, ...infer restV] - ? HeadK extends string - ? restK extends string[] - ? restV extends Composable[] - ? Zip - : V // in this case V has the AllArguments failure type - : never - : never - : O - : O - -type CollectArguments> = {} extends Zip< - Keys, - AllArguments>> -> - ? never - : Prettify, AllArguments>>>> - -type RecordToTuple> = - RecordValuesFromKeysTuple> - -export type { - AllArguments, - CollectArguments, - Composable, - First, - Fn, - PipeArguments, - PipeReturn, - RecordToTuple, - Result, - UnpackAll, - UnpackResult, -} diff --git a/src/constructors.ts b/src/constructors.ts new file mode 100644 index 00000000..4e30a68b --- /dev/null +++ b/src/constructors.ts @@ -0,0 +1,87 @@ +import { mapError } from './combinators.ts' +import { ErrorList } from './errors.ts' +import type { Composable, Failure, Fn, MergeObjs, Success } from './types.ts' + +function success(data: T): Success { + return { success: true, data, errors: [] } +} + +function failure(errors: Error[]): Failure { + return { success: false, errors } +} + +function toError(maybeError: unknown): Error { + if (maybeError instanceof Error) return maybeError + try { + return new Error(JSON.stringify(maybeError)) + } catch (_e) { + return new Error(String(maybeError)) + } +} + +/** + * Merges a list of objects into a single object. + * It is a type-safe version of Object.assign. + * @param objs the list of objects to merge + * @returns the merged object + * @example + * const obj1 = { a: 1, b: 2 } + * const obj2 = { c: 3 } + * const obj3 = { d: 4 } + * const merged = mergeObjects([obj1, obj2, obj3]) + * // ^? { a: number, b: number, c: number, d: number } + */ +function mergeObjects(objs: T) { + return Object.assign({}, ...objs) as MergeObjs +} + +/** + * Creates a composable function. + * That function is gonna catch any errors and always return a Result. + * @param fn a function to be used as a Composable + */ +function composable(fn: T): Composable { + return async (...args) => { + try { + // deno-lint-ignore no-explicit-any + const result = await fn(...(args as any[])) + return success(result) + } catch (e) { + if (e instanceof ErrorList) { + return failure(e.list) + } + return failure([toError(e)]) + } + } +} + +/** + * It can be used to call a domain function from another domain function. It will return the output of the given domain function if it was successfull, otherwise it will throw a `ErrorList` that will bubble up to the parent function. + * Also good to use it in successfull test cases. + * @example + * import { mdf, fromSuccess } from 'domain-functions' + * + * const add1 = mdf(z.number())((n) => n + 1) + * const result = await add1(1) + * // ^? Result + * const data = await fromSuccess(add1)(n) + * // ^? number + * expect(data).toBe(n + 1) + */ +function fromSuccess( + fn: T, + onError: (errors: Error[]) => Error[] | Promise = (e) => e, +): T extends Composable<(...a: infer A) => infer O> + ? (...a: A) => Promise> + : never { + return (async (...args) => { + const result = await mapError(fn, onError)(...args) + if (result.success) return result.data + + throw new ErrorList(result.errors) + }) as T extends Composable<(...a: infer A) => infer O> + ? (...a: A) => Promise> + : never +} + +export { composable, failure, fromSuccess, mergeObjects, success } diff --git a/src/domain-functions.ts b/src/df/combinators.ts similarity index 83% rename from src/domain-functions.ts rename to src/df/combinators.ts index df781d2b..0bc51536 100644 --- a/src/domain-functions.ts +++ b/src/df/combinators.ts @@ -1,33 +1,26 @@ -import { ErrorList, failure } from './errors.ts' -import * as A from './composable/composable.ts' import type { - DomainFunction, + Composable, Last, MergeObjs, - SuccessResult, + Success, TupleToUnion, UnpackAll, - UnpackData, +} from '../types.ts' +import * as A from '../combinators.ts' +import type { + DomainFunction, UnpackDFObject, + UnpackData, UnpackResult, } from './types.ts' -import { Composable } from './index.ts' - -/** - * Takes a function with 2 parameters and partially applies the second one. - * This is useful when one wants to use a domain function having a fixed environment. - * @example - * import { mdf, applyEnvironment } from 'domain-functions' - * - * const endOfDay = mdf(z.date(), z.object({ timezone: z.string() }))((date, { timezone }) => ...) - * const endOfDayUTC = applyEnvironment(endOfDay, { timezone: 'UTC' }) - * // ^? (input: unknown) => Promise> - */ -function applyEnvironment< - Fn extends (input: unknown, environment: unknown) => unknown, ->(df: Fn, environment: unknown) { - return (input: unknown) => df(input, environment) as ReturnType -} +import { + composable, + failure, + fromSuccess, + mergeObjects, +} from '../constructors.ts' +import { ErrorList } from '../errors.ts' +import { applyEnvironment } from './constructors.ts' function applyEnvironmentToList< Fns extends Array<(input: unknown, environment: unknown) => unknown>, @@ -71,7 +64,7 @@ function collect>( const dfsWithKey = Object.entries(fns).map(([key, df]) => map(df, (result) => ({ [key]: result })), ) - return map(all(...dfsWithKey), A.mergeObjects) as DomainFunction< + return map(all(...dfsWithKey), mergeObjects) as DomainFunction< UnpackDFObject > } @@ -90,12 +83,12 @@ function first( ...fns: Fns ): DomainFunction>> { return ((input, environment) => { - return A.composable(async () => { + return composable(async () => { const results = await Promise.all( fns.map((fn) => (fn as DomainFunction)(input, environment)), ) - const result = results.find((r) => r.success) as SuccessResult | undefined + const result = results.find((r) => r.success) as Success | undefined if (!result) { throw new ErrorList(results.map(({ errors }) => errors).flat()) } @@ -118,7 +111,7 @@ function first( function merge>[]>( ...fns: Fns ): DomainFunction>> { - return map(all(...fns), A.mergeObjects) + return map(all(...fns), mergeObjects) } /** @@ -166,7 +159,7 @@ function collectSequence>( [keys[i]]: o, })), ), - A.mergeObjects, + mergeObjects, ) as DomainFunction> } @@ -237,7 +230,7 @@ function branch( const result = await dfn(input, environment) if (!result.success) return result - return A.composable(async () => { + return composable(async () => { const nextDf = await resolver(result.data) if (typeof nextDf !== 'function') return result.data return fromSuccess(nextDf)(result.data, environment) @@ -247,35 +240,6 @@ function branch( > } -/** - * It can be used to call a domain function from another domain function. It will return the output of the given domain function if it was successfull, otherwise it will throw a `ErrorList` that will bubble up to the parent function. - * Also good to use it in successfull test cases. - * @example - * import { mdf, fromSuccess } from 'domain-functions' - * - * const add1 = mdf(z.number())((n) => n + 1) - * const result = await add1(1) - * // ^? Result - * const data = await fromSuccess(add1)(n) - * // ^? number - * expect(data).toBe(n + 1) - */ -function fromSuccess( - fn: T, - onError: (errors: Error[]) => Error[] | Promise = (e) => e, -): T extends Composable<(...a: infer A) => infer O> - ? (...a: A) => Promise> - : never { - return (async (...args) => { - const result = await A.mapError(fn, onError)(...args) - if (result.success) return result.data - - throw new ErrorList(result.errors) - }) as T extends Composable<(...a: infer A) => infer O> - ? (...a: A) => Promise> - : never -} - /** * Creates a single domain function that will apply a transformation over the ErrorResult of a failed DomainFunction. When the given domain function succeeds, its result is returned without changes. * @example @@ -326,7 +290,7 @@ function trace>( ): (fn: DomainFunction) => DomainFunction { return (fn) => async (input, environment) => { const originalResult = await fn(input, environment) - const traceResult = await A.composable(traceFn)({ + const traceResult = await composable(traceFn)({ input, environment, // TODO: Remove this casting when we unify the Unpack types @@ -340,12 +304,10 @@ function trace>( export { all, - applyEnvironment, branch, collect, collectSequence, first, - fromSuccess, map, mapError, merge, diff --git a/src/constructor.ts b/src/df/constructors.ts similarity index 71% rename from src/constructor.ts rename to src/df/constructors.ts index 1155193b..f745063c 100644 --- a/src/constructor.ts +++ b/src/df/constructors.ts @@ -1,11 +1,7 @@ -import { InputError, EnvironmentError, failure } from './errors.ts' -import type { DomainFunction, ParserSchema, Success } from './types.ts' -import { Composable } from './composable/index.ts' -import { composable } from './composable/index.ts' - -function success(data: T): Success { - return { success: true, data, errors: [] } -} +import { composable, failure } from '../constructors.ts' +import { EnvironmentError, InputError } from '../errors.ts' +import type { Composable } from '../types.ts' +import type { DomainFunction, ParserSchema } from './types.ts' /** * Creates a domain function. @@ -14,7 +10,7 @@ function success(data: T): Success { * @param environmentSchema the schema for the environment * @returns a handler function that takes type safe input and environment * @example - * const safeFunction = makeDomainFunction( + * const safeFunction = df.make( * z.object({ greeting: z.string() }), * z.object({ user: z.object({ name: z.string() }) }), * ) @@ -22,7 +18,7 @@ function success(data: T): Success { * return { message: `${greeting} ${user.name}` } * }) */ -function makeDomainFunction( +function make( inputSchema?: ParserSchema, environmentSchema?: ParserSchema, ) { @@ -85,9 +81,20 @@ const alwaysUndefinedSchema: ParserSchema = { }, } -export { - fromComposable, - makeDomainFunction as mdf, - makeDomainFunction, - success, +/** + * Takes a function with 2 parameters and partially applies the second one. + * This is useful when one wants to use a domain function having a fixed environment. + * @example + * import { mdf, applyEnvironment } from 'domain-functions' + * + * const endOfDay = mdf(z.date(), z.object({ timezone: z.string() }))((date, { timezone }) => ...) + * const endOfDayUTC = applyEnvironment(endOfDay, { timezone: 'UTC' }) + * // ^? (input: unknown) => Promise> + */ +function applyEnvironment< + Fn extends (input: unknown, environment: unknown) => unknown, +>(df: Fn, environment: unknown) { + return (input: unknown) => df(input, environment) as ReturnType } + +export { applyEnvironment, make, fromComposable } diff --git a/src/df/index.ts b/src/df/index.ts new file mode 100644 index 00000000..f73a5a40 --- /dev/null +++ b/src/df/index.ts @@ -0,0 +1,14 @@ +export { applyEnvironment, make, fromComposable } from './constructors.ts' +export { + all, + branch, + collect, + collectSequence, + first, + map, + mapError, + merge, + pipe, + sequence, + trace, +} from './combinators.ts' diff --git a/src/all.test.ts b/src/df/tests/all.test.ts similarity index 57% rename from src/all.test.ts rename to src/df/tests/all.test.ts index 667ea7c1..effe3f6a 100644 --- a/src/all.test.ts +++ b/src/df/tests/all.test.ts @@ -1,28 +1,29 @@ -import { describe, it, assertEquals, assertIsError } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { all } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure, InputError } from './errors.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../../test-prelude.ts' +import { df, failure, InputError, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('all', () => { it('should combine two domain functions into one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = all(a, b) + const c = df.all(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), success<[number, number]>([2, 0])) }) it('should combine many domain functions into one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = mdf(z.object({ id: z.number() }))(({ id }) => Boolean(id)) - const d = all(a, b, c) + const a = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) + const d = df.all(a, b, c) type _R = Expect>> const results = await d({ id: 1 }) @@ -30,10 +31,10 @@ describe('all', () => { }) it('should return error when one of the domain functions has input errors', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id) - const b = mdf(z.object({ id: z.string() }))(({ id }) => id) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - const c = all(a, b) + const c = df.all(a, b) type _R = Expect>> assertEquals( @@ -43,22 +44,22 @@ describe('all', () => { }) it('should return error when one of the domain functions fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id) - const b = mdf(z.object({ id: z.number() }))(() => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.number() }))(() => { throw 'Error' }) - const c = all(a, b) + const c = df.all(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), failure([new Error()])) }) it('should combine the inputError messages of both functions', async () => { - const a = mdf(z.object({ id: z.string() }))(({ id }) => id) - const b = mdf(z.object({ id: z.string() }))(({ id }) => id) + const a = df.make(z.object({ id: z.string() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - const c = all(a, b) + const c = df.all(a, b) type _R = Expect>> assertEquals( @@ -71,14 +72,14 @@ describe('all', () => { }) it('should combine the error messages when both functions fail', async () => { - const a = mdf(z.object({ id: z.number() }))(() => { + const a = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) - const b = mdf(z.object({ id: z.number() }))(() => { + const b = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) - const c = all(a, b) + const c = df.all(a, b) type _R = Expect>> const { diff --git a/src/branch.test.ts b/src/df/tests/branch.test.ts similarity index 58% rename from src/branch.test.ts rename to src/df/tests/branch.test.ts index 9842d2f8..7d219665 100644 --- a/src/branch.test.ts +++ b/src/df/tests/branch.test.ts @@ -1,45 +1,46 @@ -import { describe, it, assertEquals, assertIsError } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { branch, pipe, all } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure, InputError } from './errors.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../../test-prelude.ts' +import { df, failure, InputError, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, () => Promise.resolve(b)) + const c = df.branch(a, () => Promise.resolve(b)) type _R = Expect>> assertEquals(await c({ id: 1 }), success(2)) }) it('should enable conditionally choosing the next DF with the output of first one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, next: 'multiply', })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) - const c = mdf(z.object({ id: z.number() }))(({ id }) => id * 2) - const d = branch(a, (output) => (output.next === 'multiply' ? c : b)) + const b = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) + const c = df.make(z.object({ id: z.number() }))(({ id }) => id * 2) + const d = df.branch(a, (output) => (output.next === 'multiply' ? c : b)) type _R = Expect>> assertEquals(await d({ id: 1 }), success(6)) }) it('should not pipe if the predicate returns null', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, next: 'multiply', })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) - const d = branch(a, (output) => (output.next === 'multiply' ? null : b)) + const b = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) + const d = df.branch(a, (output) => (output.next === 'multiply' ? null : b)) type _R = Expect< Equal> > @@ -48,29 +49,29 @@ describe('branch', () => { }) it('should use the same environment in all composed functions', async () => { - const a = mdf( + const a = df.make( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = branch(a, () => b) + const c = df.branch(a, () => b) type _R = Expect>> assertEquals(await c(undefined, { env: 1 }), success(4)) }) it('should gracefully fail if the first function fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, () => b) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const c = df.branch(a, () => b) type _R = Expect>> assertEquals( @@ -80,11 +81,11 @@ describe('branch', () => { }) it('should gracefully fail if the second function fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: String(id), })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, () => b) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const c = df.branch(a, () => b) type _R = Expect>> assertEquals( @@ -94,11 +95,11 @@ describe('branch', () => { }) it('should gracefully fail if the condition function fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, (_) => { + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const c = df.branch(a, (_) => { throw new Error('condition function failed') // deno-lint-ignore no-unreachable return b @@ -112,14 +113,14 @@ describe('branch', () => { }) it('should not break composition with other combinators', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = mdf(z.number())((n) => n * 2) - const d = all( - pipe( - branch(a, () => b), + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const c = df.make(z.number())((n) => n * 2) + const d = df.all( + df.pipe( + df.branch(a, () => b), c, ), a, diff --git a/src/collect-sequence.test.ts b/src/df/tests/collect-sequence.test.ts similarity index 73% rename from src/collect-sequence.test.ts rename to src/df/tests/collect-sequence.test.ts index 67ae81c7..debac462 100644 --- a/src/collect-sequence.test.ts +++ b/src/df/tests/collect-sequence.test.ts @@ -1,21 +1,27 @@ -import { describe, it, assertEquals } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { collectSequence } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { InputError } from './errors.ts' -import { failure, EnvironmentError } from './errors.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../../test-prelude.ts' +import { + df, + EnvironmentError, + failure, + InputError, + success, +} from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('collectSequence', () => { it('should compose domain functions keeping the given order of keys', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = collectSequence({ a, b }) + const c = df.collectSequence({ a, b }) type _R = Expect< Equal> > @@ -24,18 +30,18 @@ describe('collectSequence', () => { }) it('should use the same environment in all composed functions', async () => { - const a = mdf( + const a = df.make( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = collectSequence({ a, b }) + const c = df.collectSequence({ a, b }) type _R = Expect< Equal> > @@ -48,18 +54,18 @@ describe('collectSequence', () => { it('should fail on the first environment parser failure', async () => { const envParser = z.object({ env: z.number() }) - const a = mdf( + const a = df.make( z.undefined(), envParser, )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), envParser, )(({ inp }, { env }) => inp + env) - const c = collectSequence({ a, b }) + const c = df.collectSequence({ a, b }) type _R = Expect< Equal> > @@ -73,18 +79,18 @@ describe('collectSequence', () => { it('should fail on the first input parser failure', async () => { const firstInputParser = z.undefined() - const a = mdf( + const a = df.make( firstInputParser, z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = collectSequence({ a, b }) + const c = df.collectSequence({ a, b }) type _R = Expect< Equal> > @@ -96,18 +102,18 @@ describe('collectSequence', () => { }) it('should fail on the second input parser failure', async () => { - const a = mdf( + const a = df.make( z.undefined(), z.object({ env: z.number() }), )(() => ({ inp: 'some invalid input', })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = collectSequence({ a, b }) + const c = df.collectSequence({ a, b }) type _R = Expect< Equal> > @@ -119,17 +125,17 @@ describe('collectSequence', () => { }) it('should compose more than 2 functions', async () => { - const a = mdf(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ + const a = df.make(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ aString: String(aNumber), })) - const b = mdf(z.object({ aString: z.string() }))(({ aString }) => ({ + const b = df.make(z.object({ aString: z.string() }))(({ aString }) => ({ aBoolean: aString == '1', })) - const c = mdf(z.object({ aBoolean: z.boolean() }))( + const c = df.make(z.object({ aBoolean: z.boolean() }))( ({ aBoolean }) => !aBoolean, ) - const d = collectSequence({ a, b, c }) + const d = df.collectSequence({ a, b, c }) type _R = Expect< Equal< typeof d, diff --git a/src/collect.test.ts b/src/df/tests/collect.test.ts similarity index 58% rename from src/collect.test.ts rename to src/df/tests/collect.test.ts index 2cb72c20..fe471468 100644 --- a/src/collect.test.ts +++ b/src/df/tests/collect.test.ts @@ -1,28 +1,29 @@ -import { assertEquals, assertIsError, describe, it } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { collect } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure, InputError } from './errors.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../../test-prelude.ts' +import { df, failure, InputError, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('collect', () => { it('should combine an object of domain functions', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = collect({ a, b }) + const c = df.collect({ a, b }) type _R = Expect>> assertEquals(await c({ id: 1 }), success({ a: 2, b: 0 })) }) it('should return error when one of the domain functions has input errors', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id) - const b = mdf(z.object({ id: z.string() }))(({ id }) => id) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - const c = collect({ a, b }) + const c = df.collect({ a, b }) type _R = Expect>> assertEquals( @@ -32,22 +33,22 @@ describe('collect', () => { }) it('should return error when one of the domain functions fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id) - const b = mdf(z.object({ id: z.number() }))(() => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.number() }))(() => { throw 'Error' }) - const c = collect({ a, b }) + const c = df.collect({ a, b }) type _R = Expect>> assertEquals(await c({ id: 1 }), failure([new Error()])) }) it('should combine the inputError messages of both functions', async () => { - const a = mdf(z.object({ id: z.string() }))(({ id }) => id) - const b = mdf(z.object({ id: z.string() }))(({ id }) => id) + const a = df.make(z.object({ id: z.string() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - const c = collect({ a, b }) + const c = df.collect({ a, b }) type _R = Expect>> assertEquals( @@ -60,14 +61,14 @@ describe('collect', () => { }) it('should combine the error messages when both functions fail', async () => { - const a = mdf(z.object({ id: z.number() }))(() => { + const a = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) - const b = mdf(z.object({ id: z.number() }))(() => { + const b = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) - const c = collect({ a, b }) + const c = df.collect({ a, b }) type _R = Expect>> const { diff --git a/src/constructor.test.ts b/src/df/tests/constructors.test.ts similarity index 73% rename from src/constructor.test.ts rename to src/df/tests/constructors.test.ts index 30a40a22..a3615b90 100644 --- a/src/constructor.test.ts +++ b/src/df/tests/constructors.test.ts @@ -1,22 +1,31 @@ -import { assertEquals, assertIsError, describe, it } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { mdf, success } from './constructor.ts' -import { EnvironmentError, ErrorList, failure, InputError } from './errors.ts' -import type { DomainFunction, SuccessResult } from './types.ts' -import type { Equal, Expect } from './types.test.ts' - -describe('makeDomainFunction', () => { +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../../test-prelude.ts' +import { + df, + EnvironmentError, + ErrorList, + failure, + InputError, + success, +} from '../../index.ts' +import type { DomainFunction, Success } from '../../index.ts' + +describe('make', () => { describe('when it has no input', () => { it('uses zod parser to create parse the input and call the domain function', async () => { - const handler = mdf()(() => 'no input!') + const handler = df.make()(() => 'no input!') type _R = Expect>> assertEquals(await handler(), success('no input!')) }) it('ignores the input and pass undefined', async () => { - const handler = mdf()((args) => args) + const handler = df.make()((args) => args) type _R = Expect>> assertEquals(await handler('some input'), { @@ -31,14 +40,14 @@ describe('makeDomainFunction', () => { it('uses zod parser to create parse the input and call the domain function', async () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) - const handler = mdf(parser)(({ id }) => id) + const handler = df.make(parser)(({ id }) => id) type _R = Expect>> assertEquals(await handler({ id: '1' }), success(1)) }) it('fails gracefully if gets something other than empty record', async () => { - const handler = mdf()(() => 'no input!') + const handler = df.make()(() => 'no input!') type _R = Expect>> assertEquals( @@ -49,7 +58,7 @@ describe('makeDomainFunction', () => { it('returns error when parsing fails', async () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) - const handler = mdf(parser)(({ id }) => id) + const handler = df.make(parser)(({ id }) => id) type _R = Expect>> assertEquals( @@ -63,7 +72,7 @@ describe('makeDomainFunction', () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) - const handler = mdf( + const handler = df.make( parser, envParser, )(({ id }, { uid }) => [id, uid] as const) @@ -87,7 +96,7 @@ describe('makeDomainFunction', () => { .refine((value) => value !== 2, { message: 'UID already taken' }), }) - const handler = mdf(parser, envParser)(({ id }, { uid }) => [id, uid]) + const handler = df.make(parser, envParser)(({ id }, { uid }) => [id, uid]) type _R = Expect>> assertEquals( @@ -100,26 +109,26 @@ describe('makeDomainFunction', () => { }) it('accepts literals as input of domain functions', async () => { - const handler = mdf(z.number(), z.string())((n) => n + 1) + const handler = df.make(z.number(), z.string())((n) => n + 1) type _R = Expect>> const result = await handler(1, 'not going to be used') - assertEquals((result as SuccessResult).data, 2) + assertEquals((result as Success).data, 2) }) it('accepts sync functions', async () => { - const handler = mdf(z.number())((n) => n + 1) + const handler = df.make(z.number())((n) => n + 1) type _R = Expect>> const result = await handler(1) - assertEquals((result as SuccessResult).data, 2) + assertEquals((result as Success).data, 2) }) it('returns error when environment parsing fails', async () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) - const handler = mdf(parser, envParser)(({ id }, { uid }) => [id, uid]) + const handler = df.make(parser, envParser)(({ id }, { uid }) => [id, uid]) type _R = Expect>> assertEquals( @@ -129,7 +138,7 @@ describe('makeDomainFunction', () => { }) it('returns error when the domain function throws an Error', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { + const handler = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error') }) type _R = Expect>> @@ -141,7 +150,7 @@ describe('makeDomainFunction', () => { }) it('preserves entire original exception when the domain function throws an Error', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { + const handler = df.make(z.object({ id: z.number() }))(() => { throw new Error('Some message', { cause: { someUnknownFields: true } }) }) type _R = Expect>> @@ -154,7 +163,7 @@ describe('makeDomainFunction', () => { }) it('returns error when the domain function throws a string', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { + const handler = df.make(z.object({ id: z.number() }))(() => { throw 'Error' }) type _R = Expect>> @@ -163,7 +172,7 @@ describe('makeDomainFunction', () => { }) it('returns error when the domain function throws an object with message', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { + const handler = df.make(z.object({ id: z.number() }))(() => { throw { message: 'Error' } }) type _R = Expect>> @@ -176,7 +185,7 @@ describe('makeDomainFunction', () => { }) it('returns inputErrors when the domain function throws an InputError', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { + const handler = df.make(z.object({ id: z.number() }))(() => { throw new InputError('Custom input error', ['contact', 'id']) }) type _R = Expect>> @@ -188,7 +197,7 @@ describe('makeDomainFunction', () => { }) it('returns environmentErrors when the domain function throws an EnvironmentError', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { + const handler = df.make(z.object({ id: z.number() }))(() => { throw new EnvironmentError('Custom env error', ['currentUser', 'role']) }) type _R = Expect>> @@ -202,7 +211,7 @@ describe('makeDomainFunction', () => { }) it('returns an error result when the domain function throws an ErrorList', async () => { - const handler = mdf(z.object({ id: z.number() }))(() => { + const handler = df.make(z.object({ id: z.number() }))(() => { throw new ErrorList([ new InputError('Custom input error', ['contact', 'id']), new EnvironmentError('Custom env error', ['currentUser', 'role']), @@ -219,3 +228,33 @@ describe('makeDomainFunction', () => { ) }) }) + +describe('applyEnvironment', () => { + it('fails when environment fails parser', async () => { + const getEnv = df.make(z.unknown(), z.number())((_, e) => e) + + const getEnvWithEnvironment = df.applyEnvironment( + getEnv, + 'invalid environment', + ) + + assertEquals( + await getEnvWithEnvironment('some input'), + failure([new EnvironmentError('Expected number, received string')]), + ) + }) + + it('should apply environment', async () => { + const getEnv = df.make(z.unknown(), z.string())((_, e) => e) + + const getEnvWithEnvironment = df.applyEnvironment( + getEnv, + 'constant environment', + ) + + assertEquals( + await getEnvWithEnvironment('some input'), + success('constant environment'), + ) + }) +}) diff --git a/src/first.test.ts b/src/df/tests/first.test.ts similarity index 56% rename from src/first.test.ts rename to src/df/tests/first.test.ts index 33c698fc..dd96c13e 100644 --- a/src/first.test.ts +++ b/src/df/tests/first.test.ts @@ -1,18 +1,13 @@ -import { describe, it, assertEquals } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { first } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure, InputError } from './errors.ts' +import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { df, failure, InputError, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('first', () => { it('should return the result of the first successful domain function', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = mdf(z.object({ id: z.number() }))(({ id }) => Boolean(id)) - const d = first(a, b, c) + const a = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) + const d = df.first(a, b, c) type _R = Expect>> const results = await d({ id: 1 }) @@ -20,26 +15,26 @@ describe('first', () => { }) it('should return a successful result even if one of the domain functions fails', async () => { - const a = mdf( + const a = df.make( z.object({ n: z.number(), operation: z.literal('increment') }), )(({ n }) => n + 1) - const b = mdf( + const b = df.make( z.object({ n: z.number(), operation: z.literal('decrement') }), )(({ n }) => n - 1) - const c = first(a, b) + const c = df.first(a, b) type _R = Expect>> assertEquals(await c({ n: 1, operation: 'increment' }), success(2)) }) it('should return error when all of the domain functions fails', async () => { - const a = mdf(z.object({ id: z.string() }))(({ id }) => id) - const b = mdf(z.object({ id: z.number() }))(() => { + const a = df.make(z.object({ id: z.string() }))(({ id }) => id) + const b = df.make(z.object({ id: z.number() }))(() => { throw 'Error' }) - const c = first(a, b) + const c = df.first(a, b) type _R = Expect>> assertEquals( diff --git a/src/map-error.test.ts b/src/df/tests/map-error.test.ts similarity index 65% rename from src/map-error.test.ts rename to src/df/tests/map-error.test.ts index d8a23048..1e5cd28e 100644 --- a/src/map-error.test.ts +++ b/src/df/tests/map-error.test.ts @@ -1,30 +1,25 @@ -import { assertEquals, describe, it } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { mapError } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure } from './errors.ts' +import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { df, failure, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('mapError', () => { it('returns the result when the domain function suceeds', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const b = () => [new Error('New Error Message')] - const c = mapError(a, b) + const c = df.mapError(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), success(2)) }) it('returns a domain function function that will apply a function over the error of the first one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const errorMapper = (errors: Error[]) => [ new Error('Number of errors: ' + errors.length), ] - const c = mapError(a, errorMapper) + const c = df.mapError(a, errorMapper) type _R = Expect>> assertEquals( @@ -34,11 +29,11 @@ describe('mapError', () => { }) it('returns a domain function function that will apply an async function over the error of the first one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const errorMapper = (errors: Error[]) => Promise.resolve([new Error('Number of errors: ' + errors.length)]) - const c = mapError(a, errorMapper) + const c = df.mapError(a, errorMapper) type _R = Expect>> assertEquals( @@ -48,12 +43,12 @@ describe('mapError', () => { }) it('returns the error when the mapping function fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const b = () => { throw 'failed to map' } - const c = mapError(a, b) + const c = df.mapError(a, b) type _R = Expect>> assertEquals( diff --git a/src/map.test.ts b/src/df/tests/map.test.ts similarity index 63% rename from src/map.test.ts rename to src/df/tests/map.test.ts index 63eb38cd..b6f8a150 100644 --- a/src/map.test.ts +++ b/src/df/tests/map.test.ts @@ -1,28 +1,23 @@ -import { describe, it, assertEquals } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { map } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure, InputError } from './errors.ts' +import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { df, failure, InputError, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('map', () => { it('returns a domain function function that will apply a function over the results of the first one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const b = (id: number) => id + 1 - const c = map(a, b) + const c = df.map(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), success(3)) }) it('returns a domain function function that will apply an async function over the results of the first one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const b = (id: number) => Promise.resolve(id + 1) - const c = map(a, b) + const c = df.map(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), success(3)) @@ -30,10 +25,10 @@ describe('map', () => { it('returns the error when the domain function fails', async () => { const firstInputParser = z.object({ id: z.number() }) - const a = mdf(firstInputParser)(({ id }) => id + 1) + const a = df.make(firstInputParser)(({ id }) => id + 1) const b = (id: number) => id + 1 - const c = map(a, b) + const c = df.map(a, b) type _R = Expect>> assertEquals( @@ -43,12 +38,12 @@ describe('map', () => { }) it('returns the error when the mapping function fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const b = () => { throw 'failed to map' } - const c = map(a, b) + const c = df.map(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), failure([new Error('failed to map')])) diff --git a/src/merge.test.ts b/src/df/tests/merge.test.ts similarity index 63% rename from src/merge.test.ts rename to src/df/tests/merge.test.ts index 854eac95..9d310f5b 100644 --- a/src/merge.test.ts +++ b/src/df/tests/merge.test.ts @@ -1,22 +1,23 @@ -import { describe, it, assertEquals, assertIsError } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { merge } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure, InputError } from './errors.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../../test-prelude.ts' +import { df, failure, InputError, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('merge', () => { it('should combine two domain functions results into one object', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ resultA: id + 1, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const b = df.make(z.object({ id: z.number() }))(({ id }) => ({ resultB: id - 1, })) - const c = merge(a, b) + const c = df.merge(a, b) type _R = Expect< Equal> > @@ -25,18 +26,18 @@ describe('merge', () => { }) it('should combine many domain functions into one', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ resultA: String(id), resultB: String(id), resultC: String(id), })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const b = df.make(z.object({ id: z.number() }))(({ id }) => ({ resultB: id + 1, })) - const c = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const c = df.make(z.object({ id: z.number() }))(({ id }) => ({ resultC: Boolean(id), })) - const d = merge(a, b, c) + const d = df.merge(a, b, c) type _R = Expect< Equal< typeof d, @@ -53,14 +54,14 @@ describe('merge', () => { }) it('should return error when one of the domain functions has input errors', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id, })) - const b = mdf(z.object({ id: z.string() }))(({ id }) => ({ + const b = df.make(z.object({ id: z.string() }))(({ id }) => ({ id, })) - const c: DomainFunction<{ id: string }> = merge(a, b) + const c: DomainFunction<{ id: string }> = df.merge(a, b) type _R = Expect< Equal< typeof c, @@ -77,28 +78,28 @@ describe('merge', () => { }) it('should return error when one of the domain functions fails', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id, })) - const b = mdf(z.object({ id: z.number() }))(() => { + const b = df.make(z.object({ id: z.number() }))(() => { throw 'Error' }) - const c: DomainFunction = merge(a, b) + const c: DomainFunction = df.merge(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), failure([new Error()])) }) it('should combine the inputError messages of both functions', async () => { - const a = mdf(z.object({ id: z.string() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.string() }))(({ id }) => ({ resultA: id, })) - const b = mdf(z.object({ id: z.string() }))(({ id }) => ({ + const b = df.make(z.object({ id: z.string() }))(({ id }) => ({ resultB: id, })) - const c = merge(a, b) + const c = df.merge(a, b) type _R = Expect< Equal> > @@ -113,14 +114,14 @@ describe('merge', () => { }) it('should combine the error messages when both functions fail', async () => { - const a = mdf(z.object({ id: z.number() }))(() => { + const a = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) - const b = mdf(z.object({ id: z.number() }))(() => { + const b = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) - const c = merge(a, b) + const c = df.merge(a, b) type _R = Expect>> const { diff --git a/src/pipe.test.ts b/src/df/tests/pipe.test.ts similarity index 71% rename from src/pipe.test.ts rename to src/df/tests/pipe.test.ts index 7935375b..72f23998 100644 --- a/src/pipe.test.ts +++ b/src/df/tests/pipe.test.ts @@ -1,39 +1,39 @@ -import { describe, it, assertEquals } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { pipe } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { InputError } from './errors.ts' -import { failure, EnvironmentError } from './errors.ts' +import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { + df, + EnvironmentError, + failure, + InputError, + success, +} from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('pipe', () => { it('should compose domain functions from left-to-right', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = pipe(a, b) + const c = df.pipe(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), success(2)) }) it('should use the same environment in all composed functions', async () => { - const a = mdf( + const a = df.make( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = pipe(a, b) + const c = df.pipe(a, b) type _R = Expect>> assertEquals(await c(undefined, { env: 1 }), success(4)) @@ -41,18 +41,18 @@ describe('pipe', () => { it('should fail on the first environment parser failure', async () => { const envParser = z.object({ env: z.number() }) - const a = mdf( + const a = df.make( z.undefined(), envParser, )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), envParser, )(({ inp }, { env }) => inp + env) - const c = pipe(a, b) + const c = df.pipe(a, b) type _R = Expect>> assertEquals( @@ -64,18 +64,18 @@ describe('pipe', () => { it('should fail on the first input parser failure', async () => { const firstInputParser = z.undefined() - const a = mdf( + const a = df.make( firstInputParser, z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = pipe(a, b) + const c = df.pipe(a, b) type _R = Expect>> assertEquals( @@ -85,18 +85,18 @@ describe('pipe', () => { }) it('should fail on the second input parser failure', async () => { - const a = mdf( + const a = df.make( z.undefined(), z.object({ env: z.number() }), )(() => ({ inp: 'some invalid input', })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = pipe(a, b) + const c = df.pipe(a, b) type _R = Expect>> assertEquals( @@ -106,17 +106,17 @@ describe('pipe', () => { }) it('should compose more than 2 functions', async () => { - const a = mdf(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ + const a = df.make(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ aString: String(aNumber), })) - const b = mdf(z.object({ aString: z.string() }))(({ aString }) => ({ + const b = df.make(z.object({ aString: z.string() }))(({ aString }) => ({ aBoolean: aString == '1', })) - const c = mdf(z.object({ aBoolean: z.boolean() }))( + const c = df.make(z.object({ aBoolean: z.boolean() }))( ({ aBoolean }) => !aBoolean, ) - const d = pipe(a, b, c) + const d = df.pipe(a, b, c) type _R = Expect>> assertEquals(await d({ aNumber: 1 }), success(false)) diff --git a/src/sequence.test.ts b/src/df/tests/sequence.test.ts similarity index 76% rename from src/sequence.test.ts rename to src/df/tests/sequence.test.ts index 2e90fb69..93c44d05 100644 --- a/src/sequence.test.ts +++ b/src/df/tests/sequence.test.ts @@ -1,22 +1,23 @@ -import { describe, it, assertEquals } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { success, mdf } from './constructor.ts' -import { sequence } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { failure, EnvironmentError, InputError } from './errors.ts' +import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { + df, + EnvironmentError, + failure, + InputError, + success, +} from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('sequence', () => { it('should compose domain functions from left-to-right saving the results sequentially', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = mdf(z.object({ id: z.number() }))(({ id }) => ({ + const b = df.make(z.object({ id: z.number() }))(({ id }) => ({ result: id - 1, })) - const c = sequence(a, b) + const c = df.sequence(a, b) type _R = Expect< Equal> > @@ -28,18 +29,18 @@ describe('sequence', () => { }) it('should use the same environment in all composed functions', async () => { - const a = mdf( + const a = df.make( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => ({ result: inp + env })) - const c = sequence(a, b) + const c = df.sequence(a, b) type _R = Expect< Equal> > @@ -55,18 +56,18 @@ describe('sequence', () => { it('should fail on the first environment parser failure', async () => { const envParser = z.object({ env: z.number() }) - const a = mdf( + const a = df.make( z.undefined(), envParser, )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), envParser, )(({ inp }, { env }) => inp + env) - const c = sequence(a, b) + const c = df.sequence(a, b) type _R = Expect>> assertEquals( @@ -78,18 +79,18 @@ describe('sequence', () => { it('should fail on the first input parser failure', async () => { const firstInputParser = z.undefined() - const a = mdf( + const a = df.make( firstInputParser, z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = sequence(a, b) + const c = df.sequence(a, b) type _R = Expect>> assertEquals( @@ -99,18 +100,18 @@ describe('sequence', () => { }) it('should fail on the second input parser failure', async () => { - const a = mdf( + const a = df.make( z.undefined(), z.object({ env: z.number() }), )(() => ({ inp: 'some invalid input', })) - const b = mdf( + const b = df.make( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = sequence(a, b) + const c = df.sequence(a, b) type _R = Expect>> assertEquals( @@ -120,17 +121,17 @@ describe('sequence', () => { }) it('should compose more than 2 functions', async () => { - const a = mdf(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ + const a = df.make(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ aString: String(aNumber), })) - const b = mdf(z.object({ aString: z.string() }))(({ aString }) => ({ + const b = df.make(z.object({ aString: z.string() }))(({ aString }) => ({ aBoolean: aString == '1', })) - const c = mdf(z.object({ aBoolean: z.boolean() }))(({ aBoolean }) => ({ + const c = df.make(z.object({ aBoolean: z.boolean() }))(({ aBoolean }) => ({ anotherBoolean: !aBoolean, })) - const d = sequence(a, b, c) + const d = df.sequence(a, b, c) type _R = Expect< Equal< typeof d, diff --git a/src/trace.test.ts b/src/df/tests/trace.test.ts similarity index 59% rename from src/trace.test.ts rename to src/df/tests/trace.test.ts index 5f01fe21..6e4d07ee 100644 --- a/src/trace.test.ts +++ b/src/df/tests/trace.test.ts @@ -1,17 +1,18 @@ -import { assertIsError, assertEquals, describe, it } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { mdf } from './constructor.ts' -import { fromSuccess, trace } from './domain-functions.ts' -import type { DomainFunction } from './types.ts' -import type { Equal, Expect } from './types.test.ts' -import { success } from './constructor.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../../test-prelude.ts' +import { df, fromSuccess, success } from '../../index.ts' +import type { DomainFunction } from '../../index.ts' describe('trace', () => { it('converts trace exceptions to df failures', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = trace(() => { + const c = df.trace(() => { throw new Error('Problem in tracing') })(a) type _R = Expect>> @@ -22,7 +23,7 @@ describe('trace', () => { }) it('intercepts inputs and outputs of a given domain function', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) let contextFromFunctionA: { input: unknown @@ -30,7 +31,7 @@ describe('trace', () => { result: unknown } | null = null - const c = trace((context) => { + const c = df.trace((context) => { contextFromFunctionA = context })(a) type _R = Expect>> diff --git a/src/df/tests/types.test.ts b/src/df/tests/types.test.ts new file mode 100644 index 00000000..1b1f1a13 --- /dev/null +++ b/src/df/tests/types.test.ts @@ -0,0 +1,44 @@ +import { assertEquals, describe, it } from '../../test-prelude.ts' +import { Result, Success } from '../../types.ts' +import { make } from '../index.ts' +import * as Subject from '../types.ts' + +namespace UnpackData { + const result = make()(() => ({ name: 'foo' } as const)) + + type test = Expect< + Equal, { readonly name: 'foo' }> + > + type error = Expect< + // @ts-expect-error + Equal, { name: string }> + > +} + +namespace UnpackResult { + const result = make()(() => ({ name: 'foo' })) + + type test = Expect< + Equal, Result<{ name: string }>> + > +} + +namespace UnpackSuccess { + const result = make()(() => ({ name: 'foo' })) + + type test = Expect< + Equal, Success<{ name: string }>> + > +} + +namespace UnpackAll { + const dfA = make()(() => ({ a: 1 } as const)) + const dfB = make()(() => ({ b: 2 } as const)) + + type Result = Subject.UnpackAll<[typeof dfA, typeof dfB]> + + type test = Expect> +} + +describe('type tests', () => + it('should have no ts errors', () => assertEquals(true, true))) diff --git a/src/df/types.ts b/src/df/types.ts new file mode 100644 index 00000000..a82b26de --- /dev/null +++ b/src/df/types.ts @@ -0,0 +1,98 @@ +import { Result } from '../types.ts' + +/** + * A domain function. + * It carries the output type which can be further unpacked with UnpackData and other type helpers. + */ +type DomainFunction = { + (input?: unknown, environment?: unknown): Promise> +} + +/** + * Unpacks the result of a domain function. + * @example + * type MyDF = DomainFunction<{ a: string }> + * type MyResult = UnpackResult + * // ^? SuccessResult<{ a: string }> | ErrorResult + */ +type UnpackResult = Awaited> + +/** + * Unpacks the data type of a successful domain function. + * @example + * type MyDF = DomainFunction<{ a: string }> + * type MyData = UnpackSuccess + * // ^? SuccessResult<{ a: string }> + */ +type UnpackSuccess = Extract< + UnpackResult, + { success: true } +> + +/** + * Unpacks the data type of a successful domain function. + * @example + * type MyDF = DomainFunction<{ a: string }> + * type MyData = UnpackData + * // ^? { a: string } + */ +type UnpackData = UnpackSuccess['data'] + +/** + * Unpacks a list of DomainFunctions into a tuple of their data types. + * @example + * type MyDFs = [ + * DomainFunction<{ a: string }>, + * DomainFunction<{ b: number }>, + * ] + * type MyData = UnpackAll + * // ^? [{ a: string }, { b: number }] + */ +type UnpackAll = List extends [ + DomainFunction, + ...infer rest, +] + ? UnpackAll + : output + +type UnpackDFObject> = + | { [K in keyof Obj]: UnpackData } + | never + +/** + * A parsing error when validating the input or environment schemas. + * This will be transformed into an `InputError` before being returned from the domain function. + * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. + */ +type ParserIssue = { path: PropertyKey[]; message: string } + +/** + * The result of input or environment validation. + * See the type `Result` for the return values of domain functions. + * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. + */ +type ParserResult = + | { + success: true + data: T + } + | { success: false; error: { issues: ParserIssue[] } } + +/** + * The object used to validate either input or environment when creating domain functions. + */ +type ParserSchema = { + safeParseAsync: (a: unknown) => Promise> +} + +export type { + DomainFunction, + ParserIssue, + ParserResult, + ParserSchema, + UnpackAll, + UnpackData, + UnpackDFObject, + UnpackResult, + UnpackSuccess, +} diff --git a/src/errors.ts b/src/errors.ts index 342750d1..fda01e9a 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -1,8 +1,3 @@ -import type { Failure } from './types.ts' - -function failure(errors: Error[]): Failure { - return { success: false, errors } -} /** * A custom error class for input errors. * @example @@ -43,8 +38,8 @@ class ErrorList extends Error { constructor(errors: Error[]) { super('ErrorList') this.name = 'ErrorList' - this.list = failure(errors).errors + this.list = errors } } -export { EnvironmentError, failure, InputError, ErrorList } +export { EnvironmentError, InputError, ErrorList } diff --git a/src/from-success.test.ts b/src/from-success.test.ts deleted file mode 100644 index 528a0f9a..00000000 --- a/src/from-success.test.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { describe, it, assertEquals, assertRejects } from './test-prelude.ts' -import { z } from './test-prelude.ts' - -import { mdf } from './constructor.ts' -import { fromSuccess } from './domain-functions.ts' -import { ErrorList } from './errors.ts' -import type { Equal, Expect } from './types.test.ts' -import { composable } from './composable/index.ts' - -describe('fromSuccess', () => { - it('returns the result.data when the domain function suceeds', async () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - - const c = fromSuccess(a) - type _R = Expect< - Equal< - typeof c, - (input?: unknown, environment?: unknown) => Promise - > - > - - assertEquals(await c({ id: 1 }), 2) - }) - - it('throws an exception when the domain function fails', () => { - const a = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - - const c = fromSuccess(a) - type _R = Expect< - Equal< - typeof c, - (input?: unknown, environment?: unknown) => Promise - > - > - - assertRejects(async () => { - await c({ invalidInput: 'should error' }) - }, ErrorList) - }) - - it('works with composable functions', async () => { - const a = composable(() => 1) - - const c = fromSuccess(a) - type _R = Expect Promise>> - - assertEquals(await c(), 1) - }) - - it('allows to change the errors list', () => { - const a = composable(() => { - throw new Error('Some error') - }) - - const c = fromSuccess(a, (errors) => [ - new Error(`Number of errors: ${errors.length}`), - ]) - type _R = Expect Promise>> - - assertRejects(async () => { - await c() - }, ErrorList) - }) -}) diff --git a/src/index.ts b/src/index.ts index 7a7ede94..11836262 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,49 +1,49 @@ export { - fromComposable, - makeDomainFunction, - mdf, + composable, + failure, + fromSuccess, + mergeObjects, success, -} from './constructor.ts' +} from './constructors.ts' export { all, - applyEnvironment, - branch, + catchError, collect, - collectSequence, - first, map, mapError, - merge, - fromSuccess, pipe, sequence, - trace, -} from './domain-functions.ts' +} from './combinators.ts' export { inputFromForm, inputFromFormData, inputFromSearch, inputFromUrl, } from './input-resolvers.ts' -export { failure, EnvironmentError, InputError, ErrorList } from './errors.ts' -export { mergeObjects } from './composable/composable.ts' -export type { Composable } from './composable/index.ts' -import * as composable from './composable/index.ts' -export { composable as cf } +export { EnvironmentError, ErrorList, InputError } from './errors.ts' export type { AtLeastOne, - DomainFunction, + Composable, Failure, Last, MergeObjs, - ParserIssue, - ParserResult, - ParserSchema, Result, - SuccessResult, + Success, TupleToUnion, UnpackAll, - UnpackData, UnpackResult, - UnpackSuccess, } from './types.ts' + +// DOMAIN FUNCTIONS +export type { + DomainFunction, + ParserIssue, + ParserResult, + ParserSchema, + // UnpackAll, // DUPLICATE + UnpackData, + UnpackDFObject, + // UnpackResult, // DUPLICATE + UnpackSuccess, +} from './df/types.ts' +export * as df from './df/index.ts' diff --git a/src/test.d.ts b/src/test.d.ts new file mode 100644 index 00000000..f1b17b51 --- /dev/null +++ b/src/test.d.ts @@ -0,0 +1,5 @@ +type Expect = T +type Equal = + // prettier-ignore + (() => T extends A ? 1 : 2) extends (() => T extends B ? 1 : 2) ? true + : [A, "should equal", B] diff --git a/src/composable/index.test.ts b/src/tests/combinators.test.ts similarity index 86% rename from src/composable/index.test.ts rename to src/tests/combinators.test.ts index 588fce7d..39ab1495 100644 --- a/src/composable/index.test.ts +++ b/src/tests/combinators.test.ts @@ -1,16 +1,21 @@ import { assertEquals, describe, it } from '../test-prelude.ts' -import { Equal, Expect } from './types.test.ts' -import type { Result } from '../types.ts' -import type { Composable } from './types.ts' -import { all, catchError, collect, composable } from './composable.ts' -import { success } from '../constructor.ts' -import { map, mapError, pipe, sequence } from './index.ts' +import type { Result, Composable } from '../index.ts' +import { + all, + catchError, + collect, + composable, + map, + mapError, + pipe, + sequence, + success, +} from '../index.ts' const voidFn = composable(() => {}) const toString = composable((a: unknown) => `${a}`) const append = composable((a: string, b: string) => `${a}${b}`) const add = composable((a: number, b: number) => a + b) -const asyncAdd = (a: number, b: number) => Promise.resolve(a + b) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') return a + b @@ -19,55 +24,6 @@ const alwaysThrow = composable(() => { throw new Error('always throw', { cause: 'it was made for this' }) }) -describe('composable', () => { - it('infers the types if has no arguments or return', async () => { - const fn = composable(() => {}) - const res = await fn() - - type _FN = Expect void>>> - type _R = Expect>> - - assertEquals(res, success(undefined)) - }) - - it('infers the types if has arguments and a return', async () => { - const fn = add - const res = await fn(1, 2) - - type _FN = Expect< - Equal number>> - > - type _R = Expect>> - - assertEquals(res, success(3)) - }) - - it('infers the types of async functions', async () => { - const fn = composable(asyncAdd) - const res = await fn(1, 2) - - type _FN = Expect< - Equal number>> - > - type _R = Expect>> - - assertEquals(res, success(3)) - }) - - it('catch errors', async () => { - const fn = faultyAdd - const res = await fn(1, 2) - - type _FN = Expect< - Equal number>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') - }) -}) - describe('pipe', () => { it('sends the results of the first function to the second and infers types', async () => { const fn = pipe(add, toString) diff --git a/src/tests/constructors.test.ts b/src/tests/constructors.test.ts new file mode 100644 index 00000000..4d97b460 --- /dev/null +++ b/src/tests/constructors.test.ts @@ -0,0 +1,121 @@ +import { + assertEquals, + assertRejects, + describe, + it, + z, +} from '../test-prelude.ts' +import type { Result, Composable } from '../index.ts' +import { composable, success, fromSuccess, df, ErrorList } from '../index.ts' + +const add = composable((a: number, b: number) => a + b) +const asyncAdd = (a: number, b: number) => Promise.resolve(a + b) +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) + +describe('composable', () => { + it('infers the types if has no arguments or return', async () => { + const fn = composable(() => {}) + const res = await fn() + + type _FN = Expect void>>> + type _R = Expect>> + + assertEquals(res, success(undefined)) + }) + + it('infers the types if has arguments and a return', async () => { + const fn = add + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res, success(3)) + }) + + it('infers the types of async functions', async () => { + const fn = composable(asyncAdd) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res, success(3)) + }) + + it('catch errors', async () => { + const fn = faultyAdd + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'a is 1') + }) +}) + +describe('fromSuccess', () => { + it('returns the result.data when the domain function suceeds', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + + const c = fromSuccess(a) + type _R = Expect< + Equal< + typeof c, + (input?: unknown, environment?: unknown) => Promise + > + > + + assertEquals(await c({ id: 1 }), 2) + }) + + it('throws an exception when the domain function fails', () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + + const c = fromSuccess(a) + type _R = Expect< + Equal< + typeof c, + (input?: unknown, environment?: unknown) => Promise + > + > + + assertRejects(async () => { + await c({ invalidInput: 'should error' }) + }, ErrorList) + }) + + it('works with composable functions', async () => { + const a = composable(() => 1) + + const c = fromSuccess(a) + type _R = Expect Promise>> + + assertEquals(await c(), 1) + }) + + it('allows to change the errors list', () => { + const a = composable(() => { + throw new Error('Some error') + }) + + const c = fromSuccess(a, (errors) => [ + new Error(`Number of errors: ${errors.length}`), + ]) + type _R = Expect Promise>> + + assertRejects(async () => { + await c() + }, ErrorList) + }) +}) diff --git a/src/input-resolvers.test.ts b/src/tests/input-resolvers.test.ts similarity index 97% rename from src/input-resolvers.test.ts rename to src/tests/input-resolvers.test.ts index e475b29e..a68cc817 100644 --- a/src/input-resolvers.test.ts +++ b/src/tests/input-resolvers.test.ts @@ -1,6 +1,5 @@ -import { describe, it, assertEquals } from './test-prelude.ts' - -import * as subject from './input-resolvers.ts' +import { describe, it, assertEquals } from '../test-prelude.ts' +import * as subject from '../input-resolvers.ts' const makePost: (entries: Array<[string, string]>, url?: string) => Request = ( entries, @@ -24,11 +23,9 @@ const makeGet: (entries: Array<[string, string]>, url?: string) => Request = ( describe('inputFromForm', () => { it('should parse all symbols correctly', async () => { - const request = makePost([ - ['formula', '3 % 2'] - ]) + const request = makePost([['formula', '3 % 2']]) assertEquals(await subject.inputFromForm(request), { - formula: '3 % 2' + formula: '3 % 2', }) }) diff --git a/src/composable/types.test.ts b/src/tests/types.test.ts similarity index 68% rename from src/composable/types.test.ts rename to src/tests/types.test.ts index f9b2ead3..518fe5c4 100644 --- a/src/composable/types.test.ts +++ b/src/tests/types.test.ts @@ -1,13 +1,91 @@ -// deno-lint-ignore-file ban-ts-comment no-namespace no-unused-vars import { assertEquals, describe, it } from '../test-prelude.ts' -import * as Subject from './types.ts' - -export type Expect = T -export type Equal = - // prettier is removing the parens thus worsening readability - // prettier-ignore - (() => T extends A ? 1 : 2) extends (() => T extends B ? 1 : 2) ? true - : [A, "should equal", B] +import * as Subject from '../types.ts' + +namespace MergeObjs { + const obj1 = { a: 1, b: 2 } as const + const obj2 = {} + const obj3 = { c: 3, d: 4 } as const + + type Result = Subject.MergeObjs<[typeof obj1, typeof obj2, typeof obj3]> + + type test1 = Expect> + type test2 = Expect> +} + +namespace TupleToUnion { + type Result = Subject.TupleToUnion<[1, 2, 3]> + + type test = Expect> +} + +namespace Last { + type test1 = Expect, 3>> + type test2 = Expect, 1>> + type test3 = Expect, never>> +} + +namespace AtLeastOne { + type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> + + const test1: Result = { a: 1 } + const test2: Result = { b: 2 } + const test3: Result = { a: 1, b: 2 } + // @ts-expect-error + const error1: Result = {} + // @ts-expect-error + const error2: Result = { a: 1, c: 3 } +} + +namespace MergeObjs { + const obj1 = { a: 1, b: 2 } as const + const obj2 = {} + const obj3 = { c: 3, d: 4 } as const + + type Result = Subject.MergeObjs<[typeof obj1, typeof obj2, typeof obj3]> + + type test1 = Expect> + type test2 = Expect> +} + +namespace TupleToUnion { + type Result = Subject.TupleToUnion<[1, 2, 3]> + + type test = Expect> +} + +namespace Last { + type test1 = Expect, 3>> + type test2 = Expect, 1>> + type test3 = Expect, never>> +} + +namespace Prettify { + type test1 = Expect< + Equal< + Subject.Prettify<{ a: number } & { b: string }>, + { a: number; b: string } + > + > + type error1 = Expect< + // @ts-expect-error + Equal< + Subject.Prettify<{ a: number } & { b: string }>, + { a: number } & { b: string } + > + > +} + +namespace AtLeastOne { + type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> + + const test1: Result = { a: 1 } + const test2: Result = { b: 2 } + const test3: Result = { a: 1, b: 2 } + // @ts-expect-error + const error1: Result = {} + // @ts-expect-error + const error2: Result = { a: 1, c: 3 } +} namespace PipeArguments { type testNoEmptyArgumentList = Expect, never>> diff --git a/src/types.test.ts b/src/types.test.ts deleted file mode 100644 index f0008e9c..00000000 --- a/src/types.test.ts +++ /dev/null @@ -1,140 +0,0 @@ -// deno-lint-ignore-file ban-ts-comment no-namespace no-unused-vars -import { mdf } from './constructor.ts' -import { assertEquals, describe, it } from './test-prelude.ts' -import * as Subject from './types.ts' - -export type Expect = T -export type Equal = - // prettier is removing the parens thus worsening readability - // prettier-ignore - (() => T extends A ? 1 : 2) extends (() => T extends B ? 1 : 2) ? true - : [A, "should equal", B] - -namespace UnpackData { - const result = mdf()(() => ({ name: 'foo' } as const)) - - type test = Expect< - Equal, { readonly name: 'foo' }> - > - type error = Expect< - // @ts-expect-error - Equal, { name: string }> - > -} - -namespace UnpackResult { - const result = mdf()(() => ({ name: 'foo' })) - - type test = Expect< - Equal, Subject.Result<{ name: string }>> - > -} - -namespace UnpackSuccess { - const result = mdf()(() => ({ name: 'foo' })) - - type test = Expect< - Equal< - Subject.UnpackSuccess, - Subject.SuccessResult<{ name: string }> - > - > -} - -namespace MergeObjs { - const obj1 = { a: 1, b: 2 } as const - const obj2 = {} - const obj3 = { c: 3, d: 4 } as const - - type Result = Subject.MergeObjs<[typeof obj1, typeof obj2, typeof obj3]> - - type test1 = Expect> - type test2 = Expect> -} - -namespace TupleToUnion { - type Result = Subject.TupleToUnion<[1, 2, 3]> - - type test = Expect> -} - -namespace Last { - type test1 = Expect, 3>> - type test2 = Expect, 1>> - type test3 = Expect, never>> -} - -namespace AtLeastOne { - type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> - - const test1: Result = { a: 1 } - const test2: Result = { b: 2 } - const test3: Result = { a: 1, b: 2 } - // @ts-expect-error - const error1: Result = {} - // @ts-expect-error - const error2: Result = { a: 1, c: 3 } -} - -namespace UnpackAll { - const dfA = mdf()(() => ({ a: 1 } as const)) - const dfB = mdf()(() => ({ b: 2 } as const)) - - type Result = Subject.UnpackAll<[typeof dfA, typeof dfB]> - - type test = Expect> -} - -namespace MergeObjs { - const obj1 = { a: 1, b: 2 } as const - const obj2 = {} - const obj3 = { c: 3, d: 4 } as const - - type Result = Subject.MergeObjs<[typeof obj1, typeof obj2, typeof obj3]> - - type test1 = Expect> - type test2 = Expect> -} - -namespace TupleToUnion { - type Result = Subject.TupleToUnion<[1, 2, 3]> - - type test = Expect> -} - -namespace Last { - type test1 = Expect, 3>> - type test2 = Expect, 1>> - type test3 = Expect, never>> -} - -namespace Prettify { - type test1 = Expect< - Equal< - Subject.Prettify<{ a: number } & { b: string }>, - { a: number; b: string } - > - > - type error1 = Expect< - // @ts-expect-error - Equal< - Subject.Prettify<{ a: number } & { b: string }>, - { a: number } & { b: string } - > - > -} - -namespace AtLeastOne { - type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> - - const test1: Result = { a: 1 } - const test2: Result = { b: 2 } - const test3: Result = { a: 1, b: 2 } - // @ts-expect-error - const error1: Result = {} - // @ts-expect-error - const error2: Result = { a: 1, c: 3 } -} - -describe('type tests', () => - it('should have no ts errors', () => assertEquals(true, true))) diff --git a/src/types.ts b/src/types.ts index 22ed05f1..ee77ffed 100644 --- a/src/types.ts +++ b/src/types.ts @@ -2,97 +2,14 @@ type Failure = { success: false errors: Array } + type Success = { success: true data: T errors: [] } -type Result = Success | Failure - -/** - * A domain function. - * It carries the output type which can be further unpacked with UnpackData and other type helpers. - */ -type DomainFunction = { - (input?: unknown, environment?: unknown): Promise> -} - -/** - * Unpacks the result of a domain function. - * @example - * type MyDF = DomainFunction<{ a: string }> - * type MyResult = UnpackResult - * // ^? SuccessResult<{ a: string }> | ErrorResult - */ -type UnpackResult = Awaited> - -/** - * Unpacks the data type of a successful domain function. - * @example - * type MyDF = DomainFunction<{ a: string }> - * type MyData = UnpackSuccess - * // ^? SuccessResult<{ a: string }> - */ -type UnpackSuccess = Extract< - UnpackResult, - { success: true } -> - -/** - * Unpacks the data type of a successful domain function. - * @example - * type MyDF = DomainFunction<{ a: string }> - * type MyData = UnpackData - * // ^? { a: string } - */ -type UnpackData = UnpackSuccess['data'] - -/** - * Unpacks a list of DomainFunctions into a tuple of their data types. - * @example - * type MyDFs = [ - * DomainFunction<{ a: string }>, - * DomainFunction<{ b: number }>, - * ] - * type MyData = UnpackAll - * // ^? [{ a: string }, { b: number }] - */ -type UnpackAll = List extends [ - DomainFunction, - ...infer rest, -] - ? UnpackAll - : output - -type UnpackDFObject> = - | { [K in keyof Obj]: UnpackData } - | never -/** - * A parsing error when validating the input or environment schemas. - * This will be transformed into an `InputError` before being returned from the domain function. - * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. - */ -type ParserIssue = { path: PropertyKey[]; message: string } - -/** - * The result of input or environment validation. - * See the type `Result` for the return values of domain functions. - * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. - */ -type ParserResult = - | { - success: true - data: T - } - | { success: false; error: { issues: ParserIssue[] } } - -/** - * The object used to validate either input or environment when creating domain functions. - */ -type ParserSchema = { - safeParseAsync: (a: unknown) => Promise> -} +type Result = Success | Failure /** * Merges the data types of a list of objects. @@ -148,23 +65,170 @@ type Last = T extends [...infer _I, infer L] */ type TupleToUnion = T[number] +type IsNever = + // prettier is removing the parens thus worsening readability + // prettier-ignore + (() => T extends A ? 1 : 2) extends (() => T extends never ? 1 : 2) + ? true + : false + +type First = T extends [infer F, ...infer _I] + ? F + : never + +type Fn = (...args: any[]) => any +type Composable = ( + ...args: Parameters +) => Promise>>> + +type UnpackResult = Awaited extends Result ? R : never + +type UnpackAll = { + [K in keyof List]: UnpackResult> +} + +type PipeReturn = Fns extends [ + Composable<(...a: infer PA) => infer OA>, + Composable<(b: infer PB) => infer OB>, + ...infer rest, +] + ? IsNever extends true + ? ['Fail to compose, "never" does not fit in', PB] + : Awaited extends PB + ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> + : ['Fail to compose', Awaited, 'does not fit in', PB] + : Fns extends [Composable<(...args: infer P) => infer O>] + ? Composable<(...args: P) => O> + : never + +type PipeArguments< + Fns extends any[], + Arguments extends any[] = [], +> = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] + ? restA extends [ + Composable< + (firstParameter: infer FirstBParameter, ...b: infer PB) => any + >, + ] + ? IsNever> extends true + ? ['Fail to compose, "never" does not fit in', FirstBParameter] + : Awaited extends FirstBParameter + ? EveryElementTakesUndefined extends true + ? PipeArguments OA>]> + : EveryElementTakesUndefined + : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] + : [...Arguments, Composable<(...a: PA) => OA>] + : never + +type EveryElementTakesUndefined = T extends [ + infer HEAD, + ...infer TAIL, +] + ? undefined extends HEAD + ? true & EveryElementTakesUndefined + : ['Fail to compose', undefined, 'does not fit in', HEAD] + : true + +type SubtypesTuple< + TA extends unknown[], + TB extends unknown[], + O extends unknown[], +> = TA extends [infer headA, ...infer restA] + ? TB extends [infer headB, ...infer restB] + ? headA extends headB + ? SubtypesTuple + : headB extends headA + ? SubtypesTuple + : { 'Incompatible arguments ': true; argument1: headA; argument2: headB } + : SubtypesTuple + : TB extends [infer headBNoA, ...infer restBNoA] + ? SubtypesTuple<[], restBNoA, [...O, headBNoA]> + : O + +type AllArguments< + Fns extends any[], + Arguments extends any[] = [], +> = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] + ? restA extends [Composable<(...b: infer PB) => infer OB>, ...infer restB] + ? SubtypesTuple extends [...infer MergedP] + ? AllArguments< + [Composable<(...args: MergedP) => OB>, ...restB], + [...Arguments, Composable<(...a: MergedP) => OA>] + > + : ['Fail to compose', PA, 'does not fit in', PB] + : [...Arguments, Composable<(...a: PA) => OA>] + : never + +// Thanks to https://github.com/tjjfvi +// UnionToTuple code lifted from this thread: https://github.com/microsoft/TypeScript/issues/13298#issuecomment-707364842 +// This will not preserve union order but we don't care since this is for Composable paralel application +type UnionToTuple = ( + (T extends any ? (t: T) => T : never) extends infer U + ? (U extends any ? (u: U) => any : never) extends (v: infer V) => any + ? V + : never + : never +) extends (_: any) => infer W + ? [...UnionToTuple>, W] + : [] + +type Keys> = UnionToTuple + +type RecordValuesFromKeysTuple< + R extends Record, + K extends unknown[], + ValuesTuple extends Composable[] = [], +> = K extends [infer Head, ...infer rest] + ? Head extends string + ? rest extends string[] + ? RecordValuesFromKeysTuple + : never + : ValuesTuple + : ValuesTuple + +type Zip< + K extends unknown[], + V extends Composable[], + O extends Record = {}, +> = K extends [infer HeadK, ...infer restK] + ? V extends [infer HeadV, ...infer restV] + ? HeadK extends string + ? restK extends string[] + ? restV extends Composable[] + ? Zip + : V // in this case V has the AllArguments failure type + : never + : never + : O + : O + +type CollectArguments> = {} extends Zip< + Keys, + AllArguments>> +> + ? never + : Prettify, AllArguments>>>> + +type RecordToTuple> = + RecordValuesFromKeysTuple> + export type { + AllArguments, AtLeastOne, - DomainFunction, + CollectArguments, + Composable, Failure, + First, + Fn, Last, MergeObjs, - ParserIssue, - ParserResult, - ParserSchema, + PipeArguments, + PipeReturn, Prettify, + RecordToTuple, Result, Success, - Success as SuccessResult, TupleToUnion, UnpackAll, - UnpackData, - UnpackDFObject, UnpackResult, - UnpackSuccess, } From ad9656233b9c874a24c8a23438c7ef7047bd6769 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 10 Apr 2024 16:24:07 -0400 Subject: [PATCH 047/238] Split combinators tests into one file per combinator to make test navigation easier --- src/tests/all.test.ts | 16 ++ src/tests/catch-error.test.ts | 51 +++++ src/tests/collect.test.ts | 99 +++++++++ src/tests/combinators.test.ts | 378 ---------------------------------- src/tests/map-error.test.ts | 42 ++++ src/tests/map.test.ts | 64 ++++++ src/tests/pipe.test.ts | 77 +++++++ src/tests/sequence.test.ts | 71 +++++++ 8 files changed, 420 insertions(+), 378 deletions(-) create mode 100644 src/tests/all.test.ts create mode 100644 src/tests/catch-error.test.ts create mode 100644 src/tests/collect.test.ts delete mode 100644 src/tests/combinators.test.ts create mode 100644 src/tests/map-error.test.ts create mode 100644 src/tests/map.test.ts create mode 100644 src/tests/pipe.test.ts create mode 100644 src/tests/sequence.test.ts diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts new file mode 100644 index 00000000..669a8f07 --- /dev/null +++ b/src/tests/all.test.ts @@ -0,0 +1,16 @@ +import { assertEquals, describe, it } from '../test-prelude.ts' +import { all, composable, success } from '../index.ts' + +const voidFn = composable(() => {}) +const toString = composable((a: unknown) => `${a}`) +const add = composable((a: number, b: number) => a + b) + +describe('all', () => { + it('executes all functions using the same input returning a tuple with every result when all are successful', async () => { + const fn = all(add, toString, voidFn) + + const res = await fn(1, 2) + + assertEquals(res, success<[number, string, undefined]>([3, '1', undefined])) + }) +}) diff --git a/src/tests/catch-error.test.ts b/src/tests/catch-error.test.ts new file mode 100644 index 00000000..4c6100b5 --- /dev/null +++ b/src/tests/catch-error.test.ts @@ -0,0 +1,51 @@ +import { assertEquals, describe, it } from '../test-prelude.ts' +import type { Result, Composable } from '../index.ts' +import { catchError, composable, success } from '../index.ts' + +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) + +describe('catchError', () => { + it('changes the type to accomodate catcher return type', async () => { + const fn = catchError(faultyAdd, () => null) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number | null>> + > + type _R = Expect>> + + assertEquals(res, success(null)) + }) + + it('receives the list of errors as input to another function and returns a new composable', async () => { + const fn = catchError(faultyAdd, (errors, a, b) => + errors.length > 1 ? NaN : a + b, + ) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res, success(3)) + }) + + it('fails when catcher fail', async () => { + const fn = catchError(faultyAdd, () => { + throw new Error('Catcher also has problems') + }) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'Catcher also has problems') + }) +}) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts new file mode 100644 index 00000000..cfcdf120 --- /dev/null +++ b/src/tests/collect.test.ts @@ -0,0 +1,99 @@ +import { assertEquals, describe, it } from '../test-prelude.ts' +import type { Result, Composable } from '../index.ts' +import { collect, composable, success } from '../index.ts' + +const voidFn = composable(() => {}) +const toString = composable((a: unknown) => `${a}`) +const append = composable((a: string, b: string) => `${a}${b}`) +const add = composable((a: number, b: number) => a + b) +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) + +describe('collect', () => { + it('collects the results of an object of Composables into a result with same format', async () => { + const fn = collect({ + add: add, + string: toString, + void: voidFn, + }) + const res = await fn(1, 2) + + type _FN = Expect< + Equal< + typeof fn, + Composable< + ( + a: number, + b: number, + ) => { + add: number + string: string + void: void + } + > + > + > + type _R = Expect< + Equal> + > + + assertEquals(res, success({ add: 3, string: '1', void: undefined })) + }) + + it('uses the same arguments for every function', async () => { + //@ts-expect-error add and append parameters are incompatible + // The runtime will work since passing 1, 2 will be coerced to '1', '2' + const fn = collect({ + add: add, + string: append, + }) + //@ts-expect-error add and append parameters are incompatible + const res = await fn(1, 2) + + type _FN = Expect< + Equal< + typeof fn, + Composable< + (...args: never) => { + add: number + string: string + } + > + > + > + type _R = Expect>> + assertEquals(res, success({ add: 3, string: '12' })) + }) + + it('collects the errors in the error array', async () => { + const fn = collect({ + error1: faultyAdd, + error2: faultyAdd, + }) + const res = await fn(1, 2) + + type _FN = Expect< + Equal< + typeof fn, + Composable< + ( + a: number, + b: number, + ) => { + error1: number + error2: number + } + > + > + > + type _R = Expect< + Equal> + > + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'a is 1') + assertEquals(res.errors![1].message, 'a is 1') + }) +}) diff --git a/src/tests/combinators.test.ts b/src/tests/combinators.test.ts deleted file mode 100644 index 39ab1495..00000000 --- a/src/tests/combinators.test.ts +++ /dev/null @@ -1,378 +0,0 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' -import type { Result, Composable } from '../index.ts' -import { - all, - catchError, - collect, - composable, - map, - mapError, - pipe, - sequence, - success, -} from '../index.ts' - -const voidFn = composable(() => {}) -const toString = composable((a: unknown) => `${a}`) -const append = composable((a: string, b: string) => `${a}${b}`) -const add = composable((a: number, b: number) => a + b) -const faultyAdd = composable((a: number, b: number) => { - if (a === 1) throw new Error('a is 1') - return a + b -}) -const alwaysThrow = composable(() => { - throw new Error('always throw', { cause: 'it was made for this' }) -}) - -describe('pipe', () => { - it('sends the results of the first function to the second and infers types', async () => { - const fn = pipe(add, toString) - const res = await fn(1, 2) - - type _FN = Expect< - Equal string>> - > - type _R = Expect>> - - assertEquals(res, success('3')) - }) - - it('type checks and composes async functions', async () => { - const asyncProduceToIncrement = composable(() => - Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }), - ) - const asyncIncrementProperty = composable((a: { toIncrement: number }) => - Promise.resolve(a.toIncrement + 1), - ) - const fn = pipe(asyncProduceToIncrement, asyncIncrementProperty) - const res = await fn() - - type _FN = Expect number>>> - type _R = Expect>> - - assertEquals(res, success(2)) - }) - - it('catches the errors from function A', async () => { - const fn = pipe(faultyAdd, toString) - const res = await fn(1, 2) - - type _FN = Expect< - Equal string>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') - }) - - it('catches the errors from function B', async () => { - //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter - const fn = pipe(add, alwaysThrow, toString) - //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter - const res = await fn(1, 2) - - type _FN = Expect< - //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter - Equal string>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'always throw') - assertEquals( - // deno-lint-ignore no-explicit-any - (res.errors[0] as any).cause, - 'it was made for this', - ) - }) -}) - -describe('sequence', () => { - it('sends the results of the first function to the second and saves every step of the result', async () => { - const fn = sequence(add, toString) - const res = await fn(1, 2) - - type _FN = Expect< - Equal [number, string]>> - > - type _R = Expect>> - - assertEquals(res, success<[number, string]>([3, '3'])) - }) - - it('type checks and composes async functions', async () => { - const asyncProduceToIncrement = composable(() => - Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }), - ) - const asyncIncrementProperty = composable((a: { toIncrement: number }) => - Promise.resolve(a.toIncrement + 1), - ) - const fn = sequence(asyncProduceToIncrement, asyncIncrementProperty) - const res = await fn() - - type _FN = Expect< - Equal< - typeof fn, - Composable< - () => [{ toIncrement: number; someOtherProperty: string }, number] - > - > - > - type _R = Expect< - Equal< - typeof res, - Result<[{ toIncrement: number; someOtherProperty: string }, number]> - > - > - - assertEquals( - res, - success<[{ toIncrement: number; someOtherProperty: string }, number]>([ - { toIncrement: 1, someOtherProperty: 'test' }, - 2, - ]), - ) - }) - - it('catches the errors from function A', async () => { - const fn = sequence(faultyAdd, toString) - const res = await fn(1, 2) - - type _FN = Expect< - Equal [number, string]>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') - }) -}) - -describe('all', () => { - it('executes all functions using the same input returning a tuple with every result when all are successful', async () => { - const fn = all(add, toString, voidFn) - - const res = await fn(1, 2) - - assertEquals(res, success<[number, string, undefined]>([3, '1', undefined])) - }) -}) - -describe('collect', () => { - it('collects the results of an object of Composables into a result with same format', async () => { - const fn = collect({ - add: add, - string: toString, - void: voidFn, - }) - const res = await fn(1, 2) - - type _FN = Expect< - Equal< - typeof fn, - Composable< - ( - a: number, - b: number, - ) => { - add: number - string: string - void: void - } - > - > - > - type _R = Expect< - Equal> - > - - assertEquals(res, success({ add: 3, string: '1', void: undefined })) - }) - - it('uses the same arguments for every function', async () => { - //@ts-expect-error add and append parameters are incompatible - // The runtime will work since passing 1, 2 will be coerced to '1', '2' - const fn = collect({ - add: add, - string: append, - }) - //@ts-expect-error add and append parameters are incompatible - const res = await fn(1, 2) - - type _FN = Expect< - Equal< - typeof fn, - Composable< - (...args: never) => { - add: number - string: string - } - > - > - > - type _R = Expect>> - assertEquals(res, success({ add: 3, string: '12' })) - }) - - it('collects the errors in the error array', async () => { - const fn = collect({ - error1: faultyAdd, - error2: faultyAdd, - }) - const res = await fn(1, 2) - - type _FN = Expect< - Equal< - typeof fn, - Composable< - ( - a: number, - b: number, - ) => { - error1: number - error2: number - } - > - > - > - type _R = Expect< - Equal> - > - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') - assertEquals(res.errors![1].message, 'a is 1') - }) -}) - -describe('map', () => { - it('maps over an Composable function successful result', async () => { - const fn = map(add, (a) => a + 1 === 4) - const res = await fn(1, 2) - - type _FN = Expect< - Equal boolean>> - > - type _R = Expect>> - - assertEquals(res, success(true)) - }) - - it('maps over a composition', async () => { - const fn = map(pipe(add, toString), (a) => typeof a === 'string') - const res = await fn(1, 2) - - type _FN = Expect< - Equal boolean>> - > - type _R = Expect>> - - assertEquals(res, success(true)) - }) - - it('does not do anything when the function fails', async () => { - const fn = map(faultyAdd, (a) => a + 1 === 4) - const res = await fn(1, 2) - - type _FN = Expect< - Equal boolean>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') - }) - - it('fails when mapper fail', async () => { - const fn = map(add, () => { - throw new Error('Mapper also has problems') - }) - const res = await fn(1, 2) - - type _FN = Expect< - Equal never>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'Mapper also has problems') - }) -}) - -const cleanError = (err: Error) => ({ - ...err, - message: err.message + '!!!', -}) -describe('mapError', () => { - it('maps over the error results of an Composable function', async () => { - const fn = mapError(faultyAdd, (errors) => errors.map(cleanError)) - const res = await fn(1, 2) - - type _FN = Expect< - Equal number>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1!!!') - }) - - it('fails when mapper fail', async () => { - const fn = mapError(faultyAdd, () => { - throw new Error('Mapper also has problems') - }) - const res = await fn(1, 2) - - type _FN = Expect< - Equal number>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'Mapper also has problems') - }) -}) - -describe('catchError', () => { - it('changes the type to accomodate catcher return type', async () => { - const fn = catchError(faultyAdd, () => null) - const res = await fn(1, 2) - - type _FN = Expect< - Equal number | null>> - > - type _R = Expect>> - - assertEquals(res, success(null)) - }) - - it('receives the list of errors as input to another function and returns a new composable', async () => { - const fn = catchError(faultyAdd, (errors, a, b) => - errors.length > 1 ? NaN : a + b, - ) - const res = await fn(1, 2) - - type _FN = Expect< - Equal number>> - > - type _R = Expect>> - - assertEquals(res, success(3)) - }) - - it('fails when catcher fail', async () => { - const fn = catchError(faultyAdd, () => { - throw new Error('Catcher also has problems') - }) - const res = await fn(1, 2) - - type _FN = Expect< - Equal number>> - > - type _R = Expect>> - - assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'Catcher also has problems') - }) -}) diff --git a/src/tests/map-error.test.ts b/src/tests/map-error.test.ts new file mode 100644 index 00000000..c6b8a6cb --- /dev/null +++ b/src/tests/map-error.test.ts @@ -0,0 +1,42 @@ +import { assertEquals, describe, it } from '../test-prelude.ts' +import type { Result, Composable } from '../index.ts' +import { composable, mapError } from '../index.ts' + +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) + +const cleanError = (err: Error) => ({ + ...err, + message: err.message + '!!!', +}) +describe('mapError', () => { + it('maps over the error results of an Composable function', async () => { + const fn = mapError(faultyAdd, (errors) => errors.map(cleanError)) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'a is 1!!!') + }) + + it('fails when mapper fail', async () => { + const fn = mapError(faultyAdd, () => { + throw new Error('Mapper also has problems') + }) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'Mapper also has problems') + }) +}) diff --git a/src/tests/map.test.ts b/src/tests/map.test.ts new file mode 100644 index 00000000..5cefa492 --- /dev/null +++ b/src/tests/map.test.ts @@ -0,0 +1,64 @@ +import { assertEquals, describe, it } from '../test-prelude.ts' +import type { Result, Composable } from '../index.ts' +import { composable, map, pipe, success } from '../index.ts' + +const toString = composable((a: unknown) => `${a}`) +const add = composable((a: number, b: number) => a + b) +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) + +describe('map', () => { + it('maps over an Composable function successful result', async () => { + const fn = map(add, (a) => a + 1 === 4) + const res = await fn(1, 2) + + type _FN = Expect< + Equal boolean>> + > + type _R = Expect>> + + assertEquals(res, success(true)) + }) + + it('maps over a composition', async () => { + const fn = map(pipe(add, toString), (a) => typeof a === 'string') + const res = await fn(1, 2) + + type _FN = Expect< + Equal boolean>> + > + type _R = Expect>> + + assertEquals(res, success(true)) + }) + + it('does not do anything when the function fails', async () => { + const fn = map(faultyAdd, (a) => a + 1 === 4) + const res = await fn(1, 2) + + type _FN = Expect< + Equal boolean>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'a is 1') + }) + + it('fails when mapper fail', async () => { + const fn = map(add, () => { + throw new Error('Mapper also has problems') + }) + const res = await fn(1, 2) + + type _FN = Expect< + Equal never>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'Mapper also has problems') + }) +}) diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts new file mode 100644 index 00000000..9a744a0f --- /dev/null +++ b/src/tests/pipe.test.ts @@ -0,0 +1,77 @@ +import { assertEquals, describe, it } from '../test-prelude.ts' +import type { Result, Composable } from '../index.ts' +import { composable, pipe, success } from '../index.ts' + +const toString = composable((a: unknown) => `${a}`) +const add = composable((a: number, b: number) => a + b) +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) +const alwaysThrow = composable(() => { + throw new Error('always throw', { cause: 'it was made for this' }) +}) + +describe('pipe', () => { + it('sends the results of the first function to the second and infers types', async () => { + const fn = pipe(add, toString) + const res = await fn(1, 2) + + type _FN = Expect< + Equal string>> + > + type _R = Expect>> + + assertEquals(res, success('3')) + }) + + it('type checks and composes async functions', async () => { + const asyncProduceToIncrement = composable(() => + Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }), + ) + const asyncIncrementProperty = composable((a: { toIncrement: number }) => + Promise.resolve(a.toIncrement + 1), + ) + const fn = pipe(asyncProduceToIncrement, asyncIncrementProperty) + const res = await fn() + + type _FN = Expect number>>> + type _R = Expect>> + + assertEquals(res, success(2)) + }) + + it('catches the errors from function A', async () => { + const fn = pipe(faultyAdd, toString) + const res = await fn(1, 2) + + type _FN = Expect< + Equal string>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'a is 1') + }) + + it('catches the errors from function B', async () => { + //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter + const fn = pipe(add, alwaysThrow, toString) + //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter + const res = await fn(1, 2) + + type _FN = Expect< + //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter + Equal string>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'always throw') + assertEquals( + // deno-lint-ignore no-explicit-any + (res.errors[0] as any).cause, + 'it was made for this', + ) + }) +}) diff --git a/src/tests/sequence.test.ts b/src/tests/sequence.test.ts new file mode 100644 index 00000000..43bfd025 --- /dev/null +++ b/src/tests/sequence.test.ts @@ -0,0 +1,71 @@ +import { assertEquals, describe, it } from '../test-prelude.ts' +import type { Result, Composable } from '../index.ts' +import { composable, sequence, success } from '../index.ts' + +const toString = composable((a: unknown) => `${a}`) +const add = composable((a: number, b: number) => a + b) +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) + +describe('sequence', () => { + it('sends the results of the first function to the second and saves every step of the result', async () => { + const fn = sequence(add, toString) + const res = await fn(1, 2) + + type _FN = Expect< + Equal [number, string]>> + > + type _R = Expect>> + + assertEquals(res, success<[number, string]>([3, '3'])) + }) + + it('type checks and composes async functions', async () => { + const asyncProduceToIncrement = composable(() => + Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }), + ) + const asyncIncrementProperty = composable((a: { toIncrement: number }) => + Promise.resolve(a.toIncrement + 1), + ) + const fn = sequence(asyncProduceToIncrement, asyncIncrementProperty) + const res = await fn() + + type _FN = Expect< + Equal< + typeof fn, + Composable< + () => [{ toIncrement: number; someOtherProperty: string }, number] + > + > + > + type _R = Expect< + Equal< + typeof res, + Result<[{ toIncrement: number; someOtherProperty: string }, number]> + > + > + + assertEquals( + res, + success<[{ toIncrement: number; someOtherProperty: string }, number]>([ + { toIncrement: 1, someOtherProperty: 'test' }, + 2, + ]), + ) + }) + + it('catches the errors from function A', async () => { + const fn = sequence(faultyAdd, toString) + const res = await fn(1, 2) + + type _FN = Expect< + Equal [number, string]>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'a is 1') + }) +}) From 9bee28ca9a9c55948a193b2e9bf4a1006c6347f7 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 10 Apr 2024 16:39:19 -0400 Subject: [PATCH 048/238] Move DF types (except for DomainFunction) to df namespace so we avoid conflicting definitions of UnpackData and UnpackResult. --- src/df/index.ts | 10 ++++++++++ src/index.ts | 12 +----------- src/tests/collect.test.ts | 12 +++++++++++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/df/index.ts b/src/df/index.ts index f73a5a40..e0bdb4b9 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -1,4 +1,14 @@ export { applyEnvironment, make, fromComposable } from './constructors.ts' +export type { + DomainFunction, + ParserIssue, + ParserResult, + ParserSchema, + UnpackData, + UnpackResult, + UnpackDFObject, + UnpackSuccess, +} from './types.ts' export { all, branch, diff --git a/src/index.ts b/src/index.ts index 11836262..e6a5cf98 100644 --- a/src/index.ts +++ b/src/index.ts @@ -35,15 +35,5 @@ export type { } from './types.ts' // DOMAIN FUNCTIONS -export type { - DomainFunction, - ParserIssue, - ParserResult, - ParserSchema, - // UnpackAll, // DUPLICATE - UnpackData, - UnpackDFObject, - // UnpackResult, // DUPLICATE - UnpackSuccess, -} from './df/types.ts' export * as df from './df/index.ts' +export type { DomainFunction } from './df/index.ts' diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index cfcdf120..7dbe7823 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -13,11 +13,21 @@ const faultyAdd = composable((a: number, b: number) => { describe('collect', () => { it('collects the results of an object of Composables into a result with same format', async () => { - const fn = collect({ + const fn: Composable< + ( + args_0: number, + args_1: number, + ) => { + add: number + string: string + void: void + } + > = collect({ add: add, string: toString, void: voidFn, }) + const res = await fn(1, 2) type _FN = Expect< From b89b127e3c3fc503ccc23f2900bb985ff9ff53b7 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 18:09:26 -0300 Subject: [PATCH 049/238] Export mergeObjects from combinators to avoid some imports --- src/combinators.ts | 21 +++++++++++++++++++-- src/constructors.ts | 20 ++------------------ src/df/combinators.ts | 13 ++++--------- src/index.ts | 9 ++------- 4 files changed, 27 insertions(+), 36 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index f8bd7820..3607644e 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -5,6 +5,7 @@ import type { Failure, First, Fn, + MergeObjs, PipeArguments, PipeReturn, RecordToTuple, @@ -12,7 +13,23 @@ import type { UnpackAll, UnpackResult, } from './types.ts' -import { composable, failure, mergeObjects, success } from './constructors.ts' +import { composable, failure, success } from './constructors.ts' + +/** + * Merges a list of objects into a single object. + * It is a type-safe version of Object.assign. + * @param objs the list of objects to merge + * @returns the merged object + * @example + * const obj1 = { a: 1, b: 2 } + * const obj2 = { c: 3 } + * const obj3 = { d: 4 } + * const merged = mergeObjects([obj1, obj2, obj3]) + * // ^? { a: number, b: number, c: number, d: number } + */ +function mergeObjects(objs: T) { + return Object.assign({}, ...objs) as MergeObjs +} /** * Creates a single function out of a chain of multiple Composables. It will pass the output of a function as the next function's input in left-to-right order. The resulting data will be the output of the rightmost function. @@ -196,4 +213,4 @@ function mapError( }) as T } -export { pipe, all, collect, sequence, map, catchError, mapError } +export { pipe, all, collect, sequence, map, catchError, mapError, mergeObjects } diff --git a/src/constructors.ts b/src/constructors.ts index 4e30a68b..3999f049 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -1,6 +1,6 @@ import { mapError } from './combinators.ts' import { ErrorList } from './errors.ts' -import type { Composable, Failure, Fn, MergeObjs, Success } from './types.ts' +import type { Composable, Failure, Fn, Success } from './types.ts' function success(data: T): Success { return { success: true, data, errors: [] } @@ -19,22 +19,6 @@ function toError(maybeError: unknown): Error { } } -/** - * Merges a list of objects into a single object. - * It is a type-safe version of Object.assign. - * @param objs the list of objects to merge - * @returns the merged object - * @example - * const obj1 = { a: 1, b: 2 } - * const obj2 = { c: 3 } - * const obj3 = { d: 4 } - * const merged = mergeObjects([obj1, obj2, obj3]) - * // ^? { a: number, b: number, c: number, d: number } - */ -function mergeObjects(objs: T) { - return Object.assign({}, ...objs) as MergeObjs -} - /** * Creates a composable function. * That function is gonna catch any errors and always return a Result. @@ -84,4 +68,4 @@ function fromSuccess( : never } -export { composable, failure, fromSuccess, mergeObjects, success } +export { composable, failure, fromSuccess, success } diff --git a/src/df/combinators.ts b/src/df/combinators.ts index 0bc51536..50d1d4a2 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -13,12 +13,7 @@ import type { UnpackData, UnpackResult, } from './types.ts' -import { - composable, - failure, - fromSuccess, - mergeObjects, -} from '../constructors.ts' +import { composable, failure, fromSuccess } from '../constructors.ts' import { ErrorList } from '../errors.ts' import { applyEnvironment } from './constructors.ts' @@ -64,7 +59,7 @@ function collect>( const dfsWithKey = Object.entries(fns).map(([key, df]) => map(df, (result) => ({ [key]: result })), ) - return map(all(...dfsWithKey), mergeObjects) as DomainFunction< + return map(all(...dfsWithKey), A.mergeObjects) as DomainFunction< UnpackDFObject > } @@ -111,7 +106,7 @@ function first( function merge>[]>( ...fns: Fns ): DomainFunction>> { - return map(all(...fns), mergeObjects) + return map(all(...fns), A.mergeObjects) } /** @@ -159,7 +154,7 @@ function collectSequence>( [keys[i]]: o, })), ), - mergeObjects, + A.mergeObjects, ) as DomainFunction> } diff --git a/src/index.ts b/src/index.ts index e6a5cf98..eb3ef581 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,16 +1,11 @@ -export { - composable, - failure, - fromSuccess, - mergeObjects, - success, -} from './constructors.ts' +export { composable, failure, fromSuccess, success } from './constructors.ts' export { all, catchError, collect, map, mapError, + mergeObjects, pipe, sequence, } from './combinators.ts' From eb467079deb123b86dd2dfc2e066faf4d12bb25b Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 10 Apr 2024 17:12:19 -0400 Subject: [PATCH 050/238] Rename UnpackResult from root to UnpackData to match df.UnpackData semantics --- src/combinators.ts | 8 +++---- src/index.ts | 2 +- src/tests/types.test.ts | 2 +- src/types.ts | 46 ++++++++++++++++++++++------------------- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 3607644e..2a65e880 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -11,7 +11,7 @@ import type { RecordToTuple, Success, UnpackAll, - UnpackResult, + UnpackData, } from './types.ts' import { composable, failure, success } from './constructors.ts' @@ -81,7 +81,7 @@ function all( return success((results as Success[]).map(({ data }) => data)) }) as Composable< (...args: Parameters[0]>) => { - [key in keyof T]: UnpackResult>> + [key in keyof T]: UnpackData>> } > } @@ -104,7 +104,7 @@ function collect>( ) return map(all(...(fnsWithKey as any)), mergeObjects) as Composable< (...args: Parameters>[0]>) => { - [key in keyof T]: UnpackResult>> + [key in keyof T]: UnpackData>> } > } @@ -151,7 +151,7 @@ function sequence( */ function map( fn: T, - mapper: (res: UnpackResult>) => R, + mapper: (res: UnpackData>) => R, ) { return pipe(fn as Composable, composable(mapper) as Composable) as Composable< (...args: Parameters) => R diff --git a/src/index.ts b/src/index.ts index eb3ef581..27c5d58d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -26,7 +26,7 @@ export type { Success, TupleToUnion, UnpackAll, - UnpackResult, + UnpackData, } from './types.ts' // DOMAIN FUNCTIONS diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 518fe5c4..de047874 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -247,7 +247,7 @@ namespace CollectArguments { namespace UnpackResult { type testExtractsDataFromPromisedResult = Expect< - Equal>>, string> + Equal>>, string> > } diff --git a/src/types.ts b/src/types.ts index ee77ffed..d6079e07 100644 --- a/src/types.ts +++ b/src/types.ts @@ -81,10 +81,10 @@ type Composable = ( ...args: Parameters ) => Promise>>> -type UnpackResult = Awaited extends Result ? R : never +type UnpackData = Awaited extends Result ? R : never type UnpackAll = { - [K in keyof List]: UnpackResult> + [K in keyof List]: UnpackData> } type PipeReturn = Fns extends [ @@ -95,11 +95,11 @@ type PipeReturn = Fns extends [ ? IsNever extends true ? ['Fail to compose, "never" does not fit in', PB] : Awaited extends PB - ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> - : ['Fail to compose', Awaited, 'does not fit in', PB] + ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> + : ['Fail to compose', Awaited, 'does not fit in', PB] : Fns extends [Composable<(...args: infer P) => infer O>] - ? Composable<(...args: P) => O> - : never + ? Composable<(...args: P) => O> + : never type PipeArguments< Fns extends any[], @@ -113,10 +113,10 @@ type PipeArguments< ? IsNever> extends true ? ['Fail to compose, "never" does not fit in', FirstBParameter] : Awaited extends FirstBParameter - ? EveryElementTakesUndefined extends true - ? PipeArguments OA>]> - : EveryElementTakesUndefined - : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] + ? EveryElementTakesUndefined extends true + ? PipeArguments OA>]> + : EveryElementTakesUndefined + : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] : [...Arguments, Composable<(...a: PA) => OA>] : never @@ -138,12 +138,16 @@ type SubtypesTuple< ? headA extends headB ? SubtypesTuple : headB extends headA - ? SubtypesTuple - : { 'Incompatible arguments ': true; argument1: headA; argument2: headB } + ? SubtypesTuple + : { + 'Incompatible arguments ': true + argument1: headA + argument2: headB + } : SubtypesTuple : TB extends [infer headBNoA, ...infer restBNoA] - ? SubtypesTuple<[], restBNoA, [...O, headBNoA]> - : O + ? SubtypesTuple<[], restBNoA, [...O, headBNoA]> + : O type AllArguments< Fns extends any[], @@ -202,12 +206,12 @@ type Zip< : O : O -type CollectArguments> = {} extends Zip< - Keys, - AllArguments>> -> - ? never - : Prettify, AllArguments>>>> +type CollectArguments> = + {} extends Zip, AllArguments>>> + ? never + : Prettify< + Zip, AllArguments>>> + > type RecordToTuple> = RecordValuesFromKeysTuple> @@ -230,5 +234,5 @@ export type { Success, TupleToUnion, UnpackAll, - UnpackResult, + UnpackData, } From 72cd78e1e8b4d8df9824613078c721d94b2af94a Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 10 Apr 2024 19:03:06 -0400 Subject: [PATCH 051/238] update build npm script --- scripts/build-npm.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/build-npm.ts b/scripts/build-npm.ts index 0f51e717..93323f66 100644 --- a/scripts/build-npm.ts +++ b/scripts/build-npm.ts @@ -1,5 +1,5 @@ // ex. scripts/build_npm.ts -import { build, emptyDir } from 'https://deno.land/x/dnt@0.38.0/mod.ts' +import { build, emptyDir } from 'https://deno.land/x/dnt@0.40.0/mod.ts' import pkg from '../deno.json' assert { type: 'json' } await emptyDir('./npm') @@ -15,19 +15,19 @@ await build({ undici: true, }, package: { - name: 'domain-functions', + name: 'composable-functions', version: pkg.version, description: 'Decouple your business logic from your controllers. With first-class type inference from end to end.', license: 'MIT', author: 'Seasoned', bugs: { - url: 'https://github.com/seasonedcc/domain-functions/issues', + url: 'https://github.com/seasonedcc/composable-functions/issues', }, - homepage: 'https://github.com/seasonedcc/domain-functions', + homepage: 'https://github.com/seasonedcc/composable-functions', repository: { - type: "git", - url: "https://github.com/seasonedcc/domain-functions.git" + type: 'git', + url: 'https://github.com/seasonedcc/composable-functions.git', }, }, }) From 0f92c201b2d424530b0cc301309c19de25ee13f4 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 10 Apr 2024 19:41:29 -0400 Subject: [PATCH 052/238] Use a brand new vite application and use a local package of composable functions in example --- deno.lock | 40 + examples/remix/.eslintrc | 3 - examples/remix/.eslintrc.cjs | 84 + examples/remix/.gitignore | 3 - examples/remix/.prettierrc | 14 - examples/remix/README.md | 36 + .../remix/app/{domain => business}/colors.ts | 18 +- .../remix/app/{domain => business}/gpd.ts | 8 +- .../remix/app/{domain => business}/users.ts | 8 +- examples/remix/app/entry.client.tsx | 18 + examples/remix/app/entry.server.tsx | 140 + examples/remix/app/lib/index.ts | 2 +- examples/remix/app/root.tsx | 152 +- examples/remix/app/routes/_index.tsx | 10 +- examples/remix/app/routes/color.$id.tsx | 12 +- examples/remix/app/routes/user.$id.tsx | 8 +- examples/remix/package-lock.json | 14389 +++------------- examples/remix/package.json | 57 +- examples/remix/postcss.config.mjs | 5 + examples/remix/remix.config.js | 15 - examples/remix/remix.env.d.ts | 2 - examples/remix/tsconfig.json | 26 +- examples/remix/vite.config.ts | 10 + 23 files changed, 3006 insertions(+), 12054 deletions(-) delete mode 100644 examples/remix/.eslintrc create mode 100644 examples/remix/.eslintrc.cjs delete mode 100644 examples/remix/.prettierrc create mode 100644 examples/remix/README.md rename examples/remix/app/{domain => business}/colors.ts (65%) rename examples/remix/app/{domain => business}/gpd.ts (80%) rename examples/remix/app/{domain => business}/users.ts (78%) create mode 100644 examples/remix/app/entry.client.tsx create mode 100644 examples/remix/app/entry.server.tsx create mode 100644 examples/remix/postcss.config.mjs delete mode 100644 examples/remix/remix.config.js delete mode 100644 examples/remix/remix.env.d.ts create mode 100644 examples/remix/vite.config.ts diff --git a/deno.lock b/deno.lock index 9b50b72a..920e507d 100644 --- a/deno.lock +++ b/deno.lock @@ -1,5 +1,8 @@ { "version": "3", + "redirects": { + "https://deno.land/x/dnt/mod.ts": "https://deno.land/x/dnt@0.40.0/mod.ts" + }, "remote": { "https://deno.land/std@0.140.0/_util/assert.ts": "e94f2eb37cebd7f199952e242c77654e43333c1ac4c5c700e929ea3aa5489f74", "https://deno.land/std@0.140.0/_util/os.ts": "3b4c6e27febd119d36a416d7a97bd3b0251b77c88942c8f16ee5953ea13e2e49", @@ -23,7 +26,9 @@ "https://deno.land/std@0.140.0/streams/conversion.ts": "712585bfa0172a97fb68dd46e784ae8ad59d11b88079d6a4ab098ff42e697d21", "https://deno.land/std@0.181.0/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462", "https://deno.land/std@0.181.0/_util/os.ts": "d932f56d41e4f6a6093d56044e29ce637f8dcc43c5a90af43504a889cf1775e3", + "https://deno.land/std@0.181.0/fmt/colors.ts": "d67e3cd9f472535241a8e410d33423980bec45047e343577554d3356e1f0ef4e", "https://deno.land/std@0.181.0/fs/_util.ts": "65381f341af1ff7f40198cee15c20f59951ac26e51ddc651c5293e24f9ce6f32", + "https://deno.land/std@0.181.0/fs/empty_dir.ts": "c3d2da4c7352fab1cf144a1ecfef58090769e8af633678e0f3fabaef98594688", "https://deno.land/std@0.181.0/fs/ensure_dir.ts": "dc64c4c75c64721d4e3fb681f1382f803ff3d2868f08563ff923fdd20d071c40", "https://deno.land/std@0.181.0/fs/expand_glob.ts": "e4f56259a0a70fe23f05215b00de3ac5e6ba46646ab2a06ebbe9b010f81c972a", "https://deno.land/std@0.181.0/fs/walk.ts": "ea95ffa6500c1eda6b365be488c056edc7c883a1db41ef46ec3bf057b1c0fe32", @@ -98,6 +103,18 @@ "https://deno.land/x/deno_cache@0.4.1/http_cache.ts": "f632e0d6ec4a5d61ae3987737a72caf5fcdb93670d21032ddb78df41131360cd", "https://deno.land/x/deno_cache@0.4.1/mod.ts": "ef1cda9235a93b89cb175fe648372fc0f785add2a43aa29126567a05e3e36195", "https://deno.land/x/deno_cache@0.4.1/util.ts": "8cb686526f4be5205b92c819ca2ce82220aa0a8dd3613ef0913f6dc269dbbcfe", + "https://deno.land/x/deno_cache@0.6.2/auth_tokens.ts": "5d1d56474c54a9d152e44d43ea17c2e6a398dd1e9682c69811a313567c01ee1e", + "https://deno.land/x/deno_cache@0.6.2/cache.ts": "58b53c128b742757efcad10af9a3871f23b4e200674cb5b0ddf61164fb9b2fe7", + "https://deno.land/x/deno_cache@0.6.2/deno_dir.ts": "1ea355b8ba11c630d076b222b197cfc937dd81e5a4a260938997da99e8ff93a0", + "https://deno.land/x/deno_cache@0.6.2/deps.ts": "12cca94516cf2d3ed42fccd4b721ecd8060679253f077d83057511045b0081aa", + "https://deno.land/x/deno_cache@0.6.2/dirs.ts": "009c6f54e0b610914d6ce9f72f6f6ccfffd2d47a79a19061e0a9eb4253836069", + "https://deno.land/x/deno_cache@0.6.2/disk_cache.ts": "66a1e604a8d564b6dd0500326cac33d08b561d331036bf7272def80f2f7952aa", + "https://deno.land/x/deno_cache@0.6.2/file_fetcher.ts": "4f3e4a2c78a5ca1e4812099e5083f815a8525ab20d389b560b3517f6b1161dd6", + "https://deno.land/x/deno_cache@0.6.2/http_cache.ts": "407135eaf2802809ed373c230d57da7ef8dff923c4abf205410b9b99886491fd", + "https://deno.land/x/deno_cache@0.6.2/lib/deno_cache_dir.generated.js": "59f8defac32e8ebf2a30f7bc77e9d88f0e60098463fb1b75e00b9791a4bbd733", + "https://deno.land/x/deno_cache@0.6.2/lib/snippets/deno_cache_dir-a2aecaa9536c9402/fs.js": "cbe3a976ed63c72c7cb34ef845c27013033a3b11f9d8d3e2c4aa5dda2c0c7af6", + "https://deno.land/x/deno_cache@0.6.2/mod.ts": "b4004287e1c6123d7f07fe9b5b3e94ce6d990c4102949a89c527c68b19627867", + "https://deno.land/x/deno_cache@0.6.2/util.ts": "f3f5a0cfc60051f09162942fb0ee87a0e27b11a12aec4c22076e3006be4cc1e2", "https://deno.land/x/dir@1.5.1/data_local_dir/mod.ts": "91eb1c4bfadfbeda30171007bac6d85aadacd43224a5ed721bbe56bc64e9eb66", "https://deno.land/x/dnt@0.38.0/lib/compiler.ts": "209ad2e1b294f93f87ec02ade9a0821f942d2e524104552d0aa8ff87021050a5", "https://deno.land/x/dnt@0.38.0/lib/compiler_transforms.ts": "f21aba052f5dcf0b0595c734450842855c7f572e96165d3d34f8fed2fc1f7ba1", @@ -114,14 +131,37 @@ "https://deno.land/x/dnt@0.38.0/lib/utils.ts": "878b7ac7003a10c16e6061aa49dbef9b42bd43174853ebffc9b67ea47eeb11d8", "https://deno.land/x/dnt@0.38.0/mod.ts": "b13349fe77847cf58e26b40bcd58797a8cec5d71b31a1ca567071329c8489de1", "https://deno.land/x/dnt@0.38.0/transform.ts": "f68743a14cf9bf53bfc9c81073871d69d447a7f9e3453e0447ca2fb78926bb1d", + "https://deno.land/x/dnt@0.40.0/lib/compiler.ts": "7f4447531581896348b8a379ab94730856b42ae50d99043f2468328360293cb1", + "https://deno.land/x/dnt@0.40.0/lib/compiler_transforms.ts": "f21aba052f5dcf0b0595c734450842855c7f572e96165d3d34f8fed2fc1f7ba1", + "https://deno.land/x/dnt@0.40.0/lib/mod.deps.ts": "8d6123c8e1162037e58aa8126686a03d1e2cffb250a8757bf715f80242097597", + "https://deno.land/x/dnt@0.40.0/lib/npm_ignore.ts": "57fbb7e7b935417d225eec586c6aa240288905eb095847d3f6a88e290209df4e", + "https://deno.land/x/dnt@0.40.0/lib/package_json.ts": "607b0a4f44acad071a4c8533b312a27d6671eac8e6a23625c8350ce29eadb2ba", + "https://deno.land/x/dnt@0.40.0/lib/pkg/dnt_wasm.generated.js": "2694546844a50861d6d1610859afbf5130baca4dc6cf304541b7ec2d6d998142", + "https://deno.land/x/dnt@0.40.0/lib/pkg/snippets/dnt-wasm-a15ef721fa5290c5/helpers.js": "aba69a019a6da6f084898a6c7b903b8b583bc0dbd82bfb338449cf0b5bce58fd", + "https://deno.land/x/dnt@0.40.0/lib/shims.ts": "39e5c141f0315c0faf30b479b53f92b9078d92e1fd67ee34cc60b701d8e68dab", + "https://deno.land/x/dnt@0.40.0/lib/test_runner/get_test_runner_code.ts": "4dc7a73a13b027341c0688df2b29a4ef102f287c126f134c33f69f0339b46968", + "https://deno.land/x/dnt@0.40.0/lib/test_runner/test_runner.ts": "4d0da0500ec427d5f390d9a8d42fb882fbeccc92c92d66b6f2e758606dbd40e6", + "https://deno.land/x/dnt@0.40.0/lib/transform.deps.ts": "2e159661e1c5c650de9a573babe0e319349fe493105157307ec2ad2f6a52c94e", + "https://deno.land/x/dnt@0.40.0/lib/types.ts": "b8e228b2fac44c2ae902fbb73b1689f6ab889915bd66486c8a85c0c24255f5fb", + "https://deno.land/x/dnt@0.40.0/lib/utils.ts": "224f15f33e7226a2fd991e438d0291d7ed8c7889807efa2e1ecb67d2d1db6720", + "https://deno.land/x/dnt@0.40.0/mod.ts": "ae1890fbe592e4797e7dd88c1e270f22b8334878e9bf187c4e11ae75746fe778", + "https://deno.land/x/dnt@0.40.0/transform.ts": "f68743a14cf9bf53bfc9c81073871d69d447a7f9e3453e0447ca2fb78926bb1d", "https://deno.land/x/ts_morph@18.0.0/bootstrap/mod.ts": "b53aad517f106c4079971fcd4a81ab79fadc40b50061a3ab2b741a09119d51e9", "https://deno.land/x/ts_morph@18.0.0/bootstrap/ts_morph_bootstrap.js": "6645ac03c5e6687dfa8c78109dc5df0250b811ecb3aea2d97c504c35e8401c06", "https://deno.land/x/ts_morph@18.0.0/common/DenoRuntime.ts": "6a7180f0c6e90dcf23ccffc86aa8271c20b1c4f34c570588d08a45880b7e172d", "https://deno.land/x/ts_morph@18.0.0/common/mod.ts": "01985d2ee7da8d1caee318a9d07664774fbee4e31602bc2bb6bb62c3489555ed", "https://deno.land/x/ts_morph@18.0.0/common/ts_morph_common.js": "845671ca951073400ce142f8acefa2d39ea9a51e29ca80928642f3f8cf2b7700", "https://deno.land/x/ts_morph@18.0.0/common/typescript.js": "d5c598b6a2db2202d0428fca5fd79fc9a301a71880831a805d778797d2413c59", + "https://deno.land/x/ts_morph@20.0.0/bootstrap/mod.ts": "b53aad517f106c4079971fcd4a81ab79fadc40b50061a3ab2b741a09119d51e9", + "https://deno.land/x/ts_morph@20.0.0/bootstrap/ts_morph_bootstrap.js": "6645ac03c5e6687dfa8c78109dc5df0250b811ecb3aea2d97c504c35e8401c06", + "https://deno.land/x/ts_morph@20.0.0/common/DenoRuntime.ts": "6a7180f0c6e90dcf23ccffc86aa8271c20b1c4f34c570588d08a45880b7e172d", + "https://deno.land/x/ts_morph@20.0.0/common/mod.ts": "01985d2ee7da8d1caee318a9d07664774fbee4e31602bc2bb6bb62c3489555ed", + "https://deno.land/x/ts_morph@20.0.0/common/ts_morph_common.js": "2325f94f61dc5f3f98a1dab366dc93048d11b1433d718b10cfc6ee5a1cfebe8f", + "https://deno.land/x/ts_morph@20.0.0/common/typescript.js": "b9edf0a451685d13e0467a7ed4351d112b74bd1e256b915a2b941054e31c1736", "https://deno.land/x/wasmbuild@0.14.1/cache.ts": "89eea5f3ce6035a1164b3e655c95f21300498920575ade23161421f5b01967f4", "https://deno.land/x/wasmbuild@0.14.1/loader.ts": "d98d195a715f823151cbc8baa3f32127337628379a02d9eb2a3c5902dbccfc02", + "https://deno.land/x/wasmbuild@0.15.1/cache.ts": "9d01b5cb24e7f2a942bbd8d14b093751fa690a6cde8e21709ddc97667e6669ed", + "https://deno.land/x/wasmbuild@0.15.1/loader.ts": "8c2fc10e21678e42f84c5135d8ab6ab7dc92424c3f05d2354896a29ccfd02a63", "https://deno.land/x/zod@v3.22.4/ZodError.ts": "4de18ff525e75a0315f2c12066b77b5c2ae18c7c15ef7df7e165d63536fdf2ea", "https://deno.land/x/zod@v3.22.4/errors.ts": "5285922d2be9700cc0c70c95e4858952b07ae193aa0224be3cbd5cd5567eabef", "https://deno.land/x/zod@v3.22.4/external.ts": "a6cfbd61e9e097d5f42f8a7ed6f92f93f51ff927d29c9fbaec04f03cbce130fe", diff --git a/examples/remix/.eslintrc b/examples/remix/.eslintrc deleted file mode 100644 index 71569754..00000000 --- a/examples/remix/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["@remix-run/eslint-config", "@remix-run/eslint-config/node"] -} diff --git a/examples/remix/.eslintrc.cjs b/examples/remix/.eslintrc.cjs new file mode 100644 index 00000000..4f6f59ee --- /dev/null +++ b/examples/remix/.eslintrc.cjs @@ -0,0 +1,84 @@ +/** + * This is intended to be a basic starting point for linting in your app. + * It relies on recommended configs out of the box for simplicity, but you can + * and should modify this configuration to best suit your team's needs. + */ + +/** @type {import('eslint').Linter.Config} */ +module.exports = { + root: true, + parserOptions: { + ecmaVersion: "latest", + sourceType: "module", + ecmaFeatures: { + jsx: true, + }, + }, + env: { + browser: true, + commonjs: true, + es6: true, + }, + ignorePatterns: ["!**/.server", "!**/.client"], + + // Base config + extends: ["eslint:recommended"], + + overrides: [ + // React + { + files: ["**/*.{js,jsx,ts,tsx}"], + plugins: ["react", "jsx-a11y"], + extends: [ + "plugin:react/recommended", + "plugin:react/jsx-runtime", + "plugin:react-hooks/recommended", + "plugin:jsx-a11y/recommended", + ], + settings: { + react: { + version: "detect", + }, + formComponents: ["Form"], + linkComponents: [ + { name: "Link", linkAttribute: "to" }, + { name: "NavLink", linkAttribute: "to" }, + ], + "import/resolver": { + typescript: {}, + }, + }, + }, + + // Typescript + { + files: ["**/*.{ts,tsx}"], + plugins: ["@typescript-eslint", "import"], + parser: "@typescript-eslint/parser", + settings: { + "import/internal-regex": "^~/", + "import/resolver": { + node: { + extensions: [".ts", ".tsx"], + }, + typescript: { + alwaysTryTypes: true, + }, + }, + }, + extends: [ + "plugin:@typescript-eslint/recommended", + "plugin:import/recommended", + "plugin:import/typescript", + ], + }, + + // Node + { + files: [".eslintrc.cjs"], + env: { + node: true, + }, + }, + ], +}; diff --git a/examples/remix/.gitignore b/examples/remix/.gitignore index 8ec1e75c..80ec311f 100644 --- a/examples/remix/.gitignore +++ b/examples/remix/.gitignore @@ -2,7 +2,4 @@ node_modules /.cache /build -/public/build .env -app/styles/tailwind.css -yarn.lock diff --git a/examples/remix/.prettierrc b/examples/remix/.prettierrc deleted file mode 100644 index d22544ca..00000000 --- a/examples/remix/.prettierrc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "arrowParens": "always", - "bracketSameLine": false, - "bracketSpacing": true, - "jsxBracketSameLine": false, - "jsxSingleQuote": false, - "parser": "typescript", - "printWidth": 80, - "quoteProps": "as-needed", - "semi": false, - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "all" -} diff --git a/examples/remix/README.md b/examples/remix/README.md new file mode 100644 index 00000000..c05e097d --- /dev/null +++ b/examples/remix/README.md @@ -0,0 +1,36 @@ +# Welcome to Remix + Vite! + +πŸ“– See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features. + +## Development + +Run the Vite dev server: + +```shellscript +npm run dev +``` + +## Deployment + +First, build your app for production: + +```sh +npm run build +``` + +Then run the app in production mode: + +```sh +npm start +``` + +Now you'll need to pick a host to deploy it to. + +### DIY + +If you're familiar with deploying Node applications, the built-in Remix app server is production-ready. + +Make sure to deploy the output of `npm run build` + +- `build/server` +- `build/client` diff --git a/examples/remix/app/domain/colors.ts b/examples/remix/app/business/colors.ts similarity index 65% rename from examples/remix/app/domain/colors.ts rename to examples/remix/app/business/colors.ts index 16f6b87d..bf541f33 100644 --- a/examples/remix/app/domain/colors.ts +++ b/examples/remix/app/business/colors.ts @@ -1,5 +1,5 @@ import * as z from 'zod' -import { makeDomainFunction as mdf } from 'domain-functions' +import { df } from 'composable-functions' import { makeService } from 'make-service' const reqRes = makeService('https://reqres.in/api') @@ -12,19 +12,19 @@ const colorSchema = z.object({ pantone_value: z.string(), }) -const listColors = mdf(z.object({ page: z.string().optional() }))(async ({ - page = '1', -}) => { - const response = await reqRes.get('/colors', { query: { page } }) - return response.json(z.object({ data: z.array(colorSchema) })) -}) +const listColors = df.make(z.object({ page: z.string().optional() }))( + async ({ page = '1' }) => { + const response = await reqRes.get('/colors', { query: { page } }) + return response.json(z.object({ data: z.array(colorSchema) })) + }, +) -const getColor = mdf(z.object({ id: z.string() }))(async ({ id }) => { +const getColor = df.make(z.object({ id: z.string() }))(async ({ id }) => { const response = await reqRes.get('/colors/:id', { params: { id } }) return response.json(z.object({ data: colorSchema })) }) -const mutateColor = mdf( +const mutateColor = df.make( z.object({ id: z.string(), color: z.string().min(1, 'Color is required'), diff --git a/examples/remix/app/domain/gpd.ts b/examples/remix/app/business/gpd.ts similarity index 80% rename from examples/remix/app/domain/gpd.ts rename to examples/remix/app/business/gpd.ts index 12ab4434..b7c8fd67 100644 --- a/examples/remix/app/domain/gpd.ts +++ b/examples/remix/app/business/gpd.ts @@ -1,12 +1,12 @@ -import * as z from 'zod' -import { makeDomainFunction as mdf } from 'domain-functions' +import { z } from 'zod' +import { df } from 'composable-functions' import { createCookie } from '@remix-run/node' const cookie = createCookie('gpd', { maxAge: 60, // One minute, but should probably be longer }) -const getGPDInfo = mdf( +const getGPDInfo = df.make( z.any(), // The "environment" knows there can be cookie information in the Request z.object({ agreed: z.boolean().optional() }), @@ -14,7 +14,7 @@ const getGPDInfo = mdf( return { agreed } }) -const agreeToGPD = mdf( +const agreeToGPD = df.make( // Agreeing to the GPD is user input z.object({ agree: z.preprocess((v) => v === 'true', z.boolean()) }), )(async ({ agree }) => ({ agreed: agree })) diff --git a/examples/remix/app/domain/users.ts b/examples/remix/app/business/users.ts similarity index 78% rename from examples/remix/app/domain/users.ts rename to examples/remix/app/business/users.ts index a69a1e79..73a0f7d8 100644 --- a/examples/remix/app/domain/users.ts +++ b/examples/remix/app/business/users.ts @@ -1,5 +1,5 @@ import * as z from 'zod' -import { makeDomainFunction as mdf } from 'domain-functions' +import { df } from 'composable-functions' import { makeService } from 'make-service' const jsonPlaceholder = makeService('https://jsonplaceholder.typicode.com') @@ -15,17 +15,17 @@ const userSchema = z.object({ website: z.string(), }) -const listUsers = mdf(z.any())(async () => { +const listUsers = df.make(z.any())(async () => { const response = await jsonPlaceholder.get('/users') return response.json(z.array(userSchema)) }) -const getUser = mdf(z.object({ id: z.string() }))(async ({ id }) => { +const getUser = df.make(z.object({ id: z.string() }))(async ({ id }) => { const response = await jsonPlaceholder.get('/users/:id', { params: { id } }) return response.json(userSchema) }) -const formatUser = mdf(userSchema)((user) => { +const formatUser = df.make(userSchema)((user) => { return { user: { ...user, diff --git a/examples/remix/app/entry.client.tsx b/examples/remix/app/entry.client.tsx new file mode 100644 index 00000000..94d5dc0d --- /dev/null +++ b/examples/remix/app/entry.client.tsx @@ -0,0 +1,18 @@ +/** + * By default, Remix will handle hydrating your app on the client for you. + * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨ + * For more information, see https://remix.run/file-conventions/entry.client + */ + +import { RemixBrowser } from "@remix-run/react"; +import { startTransition, StrictMode } from "react"; +import { hydrateRoot } from "react-dom/client"; + +startTransition(() => { + hydrateRoot( + document, + + + + ); +}); diff --git a/examples/remix/app/entry.server.tsx b/examples/remix/app/entry.server.tsx new file mode 100644 index 00000000..45db3229 --- /dev/null +++ b/examples/remix/app/entry.server.tsx @@ -0,0 +1,140 @@ +/** + * By default, Remix will handle generating the HTTP Response for you. + * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨ + * For more information, see https://remix.run/file-conventions/entry.server + */ + +import { PassThrough } from "node:stream"; + +import type { AppLoadContext, EntryContext } from "@remix-run/node"; +import { createReadableStreamFromReadable } from "@remix-run/node"; +import { RemixServer } from "@remix-run/react"; +import { isbot } from "isbot"; +import { renderToPipeableStream } from "react-dom/server"; + +const ABORT_DELAY = 5_000; + +export default function handleRequest( + request: Request, + responseStatusCode: number, + responseHeaders: Headers, + remixContext: EntryContext, + // This is ignored so we can keep it in the template for visibility. Feel + // free to delete this parameter in your app if you're not using it! + // eslint-disable-next-line @typescript-eslint/no-unused-vars + loadContext: AppLoadContext +) { + return isbot(request.headers.get("user-agent") || "") + ? handleBotRequest( + request, + responseStatusCode, + responseHeaders, + remixContext + ) + : handleBrowserRequest( + request, + responseStatusCode, + responseHeaders, + remixContext + ); +} + +function handleBotRequest( + request: Request, + responseStatusCode: number, + responseHeaders: Headers, + remixContext: EntryContext +) { + return new Promise((resolve, reject) => { + let shellRendered = false; + const { pipe, abort } = renderToPipeableStream( + , + { + onAllReady() { + shellRendered = true; + const body = new PassThrough(); + const stream = createReadableStreamFromReadable(body); + + responseHeaders.set("Content-Type", "text/html"); + + resolve( + new Response(stream, { + headers: responseHeaders, + status: responseStatusCode, + }) + ); + + pipe(body); + }, + onShellError(error: unknown) { + reject(error); + }, + onError(error: unknown) { + responseStatusCode = 500; + // Log streaming rendering errors from inside the shell. Don't log + // errors encountered during initial shell rendering since they'll + // reject and get logged in handleDocumentRequest. + if (shellRendered) { + console.error(error); + } + }, + } + ); + + setTimeout(abort, ABORT_DELAY); + }); +} + +function handleBrowserRequest( + request: Request, + responseStatusCode: number, + responseHeaders: Headers, + remixContext: EntryContext +) { + return new Promise((resolve, reject) => { + let shellRendered = false; + const { pipe, abort } = renderToPipeableStream( + , + { + onShellReady() { + shellRendered = true; + const body = new PassThrough(); + const stream = createReadableStreamFromReadable(body); + + responseHeaders.set("Content-Type", "text/html"); + + resolve( + new Response(stream, { + headers: responseHeaders, + status: responseStatusCode, + }) + ); + + pipe(body); + }, + onShellError(error: unknown) { + reject(error); + }, + onError(error: unknown) { + responseStatusCode = 500; + // Log streaming rendering errors from inside the shell. Don't log + // errors encountered during initial shell rendering since they'll + // reject and get logged in handleDocumentRequest. + if (shellRendered) { + console.error(error); + } + }, + } + ); + + setTimeout(abort, ABORT_DELAY); + }); +} diff --git a/examples/remix/app/lib/index.ts b/examples/remix/app/lib/index.ts index 51748b06..235a87af 100644 --- a/examples/remix/app/lib/index.ts +++ b/examples/remix/app/lib/index.ts @@ -1,5 +1,5 @@ import { Cookie, json, TypedResponse } from '@remix-run/node' -import { Result } from 'domain-functions' +import { Result } from 'composable-functions' /** * Given a Cookie and a Request it returns the stored cookie's value as an object diff --git a/examples/remix/app/root.tsx b/examples/remix/app/root.tsx index 21d9acd3..f699d115 100644 --- a/examples/remix/app/root.tsx +++ b/examples/remix/app/root.tsx @@ -1,46 +1,53 @@ -import type { - DataFunctionArgs, - LinksFunction, - MetaFunction, -} from '@remix-run/node' -import { json } from '@remix-run/node' import { Form, Links, - LiveReload, Meta, Outlet, Scripts, + ScrollRestoration, useActionData, useLoaderData, useRouteError, } from '@remix-run/react' -import { ScrollRestoration } from '@remix-run/react' -import * as React from 'react' - -import { envFromCookie, loaderResponseOrThrow } from '~/lib' -import { agreeToGPD, cookie, getGPDInfo } from '~/domain/gpd' -import { inputFromForm } from 'domain-functions' +import { + ActionFunctionArgs, + LinksFunction, + LoaderFunctionArgs, + json, +} from '@remix-run/node' -import styles from './tailwind.css' +import styles from './tailwind.css?url' -export const meta: MetaFunction = () => [ - { - charset: 'utf-8', - title: 'Remix Domains', - viewport: 'width=device-width,initial-scale=1', - language: 'en-US', - }, -] +import { envFromCookie, loaderResponseOrThrow } from '~/lib' +import { agreeToGPD, cookie, getGPDInfo } from '~/business/gpd' +import { inputFromForm } from 'composable-functions' export const links: LinksFunction = () => [{ rel: 'stylesheet', href: styles }] -export const loader = async ({ request }: DataFunctionArgs) => { +export function Layout({ children }: { children: React.ReactNode }) { + return ( + + + + + + + + + {children} + + + + + ) +} + +export const loader = async ({ request }: LoaderFunctionArgs) => { const result = await getGPDInfo(null, await envFromCookie(cookie)(request)) return loaderResponseOrThrow(result) } -export const action = async ({ request }: DataFunctionArgs) => { +export const action = async ({ request }: ActionFunctionArgs) => { const result = await agreeToGPD(await inputFromForm(request)) if (!result.success || result.data.agreed === false) { return json(result) @@ -55,63 +62,38 @@ export default function App() { const actionData = useActionData() const disagreed = actionData?.success && actionData.data.agreed === false return ( - -
- - {disagreed && ( -

- You are not good for our marketing stuff 😩 -

- )} - {disagreed || agreed || ( -
+ + {disagreed && ( +

+ You are not good for our marketing stuff 😩 +

+ )} + {disagreed || agreed || ( + + Want some πŸͺ ? + - - - )} -
- - - ) -} - -type DocumentProps = { - children: React.ReactNode - title?: string -} -function Document({ children, title }: DocumentProps) { - return ( - - - {title && {title}} - - - - - {children} - - - - - + Agree... I guess + + + + )} + ) } @@ -119,11 +101,9 @@ export function ErrorBoundary() { const error = useRouteError() console.error(error) return ( - -
-

500

-

Server error

-
- +
+

500

+

Server error

+
) } diff --git a/examples/remix/app/routes/_index.tsx b/examples/remix/app/routes/_index.tsx index 54e74710..8ba0776d 100644 --- a/examples/remix/app/routes/_index.tsx +++ b/examples/remix/app/routes/_index.tsx @@ -1,15 +1,15 @@ import { LoaderFunctionArgs } from '@remix-run/node' import { Link, useLoaderData, useLocation } from '@remix-run/react' -import { inputFromUrl, map, collect } from 'domain-functions' -import { listColors } from '~/domain/colors' -import { listUsers } from '~/domain/users' +import { inputFromUrl, df } from 'composable-functions' +import { listColors } from '~/business/colors' +import { listUsers } from '~/business/users' import { loaderResponseOrThrow } from '~/lib' // We'll run these 2 domain functions in parallel with Promise.all -const getData = collect({ +const getData = df.collect({ // The second argument will transform the successful result of listColors, // we only care about what is in the "data" field - colors: map(listColors, ({ data }) => data), + colors: df.map(listColors, ({ data }) => data), users: listUsers, }) export const loader = async ({ request }: LoaderFunctionArgs) => { diff --git a/examples/remix/app/routes/color.$id.tsx b/examples/remix/app/routes/color.$id.tsx index 0da7fbee..fa334540 100644 --- a/examples/remix/app/routes/color.$id.tsx +++ b/examples/remix/app/routes/color.$id.tsx @@ -1,8 +1,8 @@ import { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node' import { Form, Link, useActionData, useLoaderData } from '@remix-run/react' -import { inputFromForm } from 'domain-functions' +import { inputFromForm } from 'composable-functions' import tinycolor from 'tinycolor2' -import { getColor, mutateColor } from '~/domain/colors' +import { getColor, mutateColor } from '~/business/colors' import { actionResponse, loaderResponseOrThrow } from '~/lib' export const loader = async ({ params }: LoaderFunctionArgs) => { @@ -11,7 +11,9 @@ export const loader = async ({ params }: LoaderFunctionArgs) => { } export const action = async ({ request }: ActionFunctionArgs) => { - const result = await mutateColor(await inputFromForm(request)) + const input = await inputFromForm(request) + const result = await mutateColor(input) + console.warn({ input, result }) return actionResponse(result) } @@ -57,9 +59,9 @@ export default function Index() { > Error - {actionData && actionData.inputErrors.length > 0 && ( + {actionData && actionData.errors.length > 0 && ( - {actionData.inputErrors[0].message} + {actionData.errors[0].message} )} diff --git a/examples/remix/app/routes/user.$id.tsx b/examples/remix/app/routes/user.$id.tsx index 4a67d29b..0d393161 100644 --- a/examples/remix/app/routes/user.$id.tsx +++ b/examples/remix/app/routes/user.$id.tsx @@ -1,11 +1,11 @@ import { LoaderFunctionArgs } from '@remix-run/node' import { Link, useLoaderData } from '@remix-run/react' -import { pipe } from 'domain-functions' -import { formatUser, getUser } from '~/domain/users' +import { df } from 'composable-functions' +import { formatUser, getUser } from '~/business/users' import { loaderResponseOrThrow } from '~/lib' // The output of getUser will be the input of formatUser -const getData = pipe(getUser, formatUser) +const getData = df.pipe(getUser, formatUser) export const loader = async ({ params }: LoaderFunctionArgs) => { const result = await getData(params) @@ -20,7 +20,7 @@ export default function Index() { href={user.link} className="hover:text-cyan-500" target="_blank" - rel="noreferer noopener" + rel="noreferer" >

{user.initials}

{user.name}

diff --git a/examples/remix/package-lock.json b/examples/remix/package-lock.json index e6918919..8f7ce66d 100644 --- a/examples/remix/package-lock.json +++ b/examples/remix/package-lock.json @@ -1,40 +1,54 @@ { - "name": "remix-template-remix", - "lockfileVersion": 2, + "name": "remix", + "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "remix-template-remix", - "dependencies": { - "@remix-run/css-bundle": "2.3.0", - "@remix-run/node": "2.3.0", - "@remix-run/react": "2.3.0", - "domain-functions": "1.8.0", - "isbot": "^3.6.13", - "make-service": "^2.0.0-next.0", + "name": "remix", + "dependencies": { + "@remix-run/node": "^2.8.1", + "@remix-run/react": "^2.8.1", + "@remix-run/serve": "^2.8.1", + "@types/tinycolor2": "^1.4.6", + "composable-functions": "file:../../npm", + "isbot": "^4.1.0", + "make-service": "^3.0.0", + "postcss": "^8.4.38", "react": "^18.2.0", "react-dom": "^18.2.0", - "remix": "2.3.0", "tinycolor2": "^1.6.0", - "zod": "^3.21.4" + "zod": "^3.22.4" }, "devDependencies": { - "@remix-run/dev": "2.3.0", - "@remix-run/eslint-config": "2.3.0", - "@remix-run/serve": "2.3.0", - "@types/react": "^18.2.18", + "@remix-run/dev": "^2.8.1", + "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "@types/tinycolor2": "^1.4.3", - "@typescript-eslint/eslint-plugin": "^6.2.1", - "@typescript-eslint/parser": "^6.2.1", - "eslint": "^8.46.0", - "prettier": "^3.0.1", - "prettier-plugin-tailwindcss": "^0.4.1", - "tailwindcss": "^3.3.3", - "typescript": "^5.1.6" + "@typescript-eslint/eslint-plugin": "^6.7.4", + "@typescript-eslint/parser": "^6.7.4", + "eslint": "^8.38.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.28.1", + "eslint-plugin-jsx-a11y": "^6.7.1", + "eslint-plugin-react": "^7.33.2", + "eslint-plugin-react-hooks": "^4.6.0", + "tailwindcss": "^3.4.3", + "typescript": "^5.1.6", + "vite": "^5.1.0", + "vite-tsconfig-paths": "^4.2.1" }, "engines": { - "node": ">=14" + "node": ">=18.0.0" + } + }, + "../../npm": { + "name": "composable-functions", + "version": "2.6.0", + "license": "MIT", + "devDependencies": { + "@deno/shim-deno": "~0.18.0", + "@types/node": "^20.9.0", + "picocolors": "^1.0.0", + "undici": "^6.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -59,131 +73,60 @@ } }, "node_modules/@ampproject/remapping": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" } }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", + "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", "dev": true, "dependencies": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.2", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/code-frame/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/code-frame/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/code-frame/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz", + "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", - "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz", + "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.24.2", + "@babel/generator": "^7.24.4", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.24.4", + "@babel/parser": "^7.24.4", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -203,42 +146,15 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/eslint-parser": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.9.tgz", - "integrity": "sha512-xdMkt39/nviO/4vpVdrEYPwXCsYIXSSAr6mC7WQsNIlGnuxKyKE7GZjalcnbSWiC4OXGNNN3UQPeHfjSC6sTDA==", - "dev": true, - "dependencies": { - "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", - "eslint-visitor-keys": "^2.1.0", - "semver": "^6.3.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || >=14.0.0" - }, - "peerDependencies": { - "@babel/core": ">=7.11.0", - "eslint": "^7.5.0 || ^8.0.0" - } - }, - "node_modules/@babel/eslint-parser/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/generator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", - "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz", + "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==", "dev": true, "dependencies": { - "@babel/types": "^7.23.3", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", + "@babel/types": "^7.24.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" }, "engines": { @@ -270,31 +186,19 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", - "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.9", + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { @@ -306,24 +210,18 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz", - "integrity": "sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz", + "integrity": "sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-replace-supers": "^7.24.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", "semver": "^6.3.1" @@ -379,40 +277,40 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz", - "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.24.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", + "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -434,22 +332,22 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz", - "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz", + "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -496,9 +394,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", + "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", "dev": true, "engines": { "node": ">=6.9.0" @@ -514,37 +412,38 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz", + "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", + "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -622,9 +521,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", - "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz", + "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -634,12 +533,12 @@ } }, "node_modules/@babel/plugin-syntax-decorators": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz", - "integrity": "sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.1.tgz", + "integrity": "sha512-05RJdO/cCrtVWuAaSn1tS3bH8jbsJa/Y1uD186u6J4C/1mnHFxseeuWpsqr9anvo7TUulev7tm7GDwRV+VuhDw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -649,12 +548,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz", + "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -664,12 +563,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", - "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz", + "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -679,13 +578,13 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz", - "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz", + "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-simple-access": "^7.22.5" }, "engines": { @@ -695,101 +594,16 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-react-display-name": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz", - "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-react-jsx": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz", - "integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "@babel/plugin-syntax-jsx": "^7.18.6", - "@babel/types": "^7.19.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-react-jsx-development": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz", - "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==", - "dev": true, - "dependencies": { - "@babel/plugin-transform-react-jsx": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-react-pure-annotations": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz", - "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-transform-typescript": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.9.tgz", - "integrity": "sha512-BnVR1CpKiuD0iobHPaM1iLvcwPYN2uVFAqoLVSpEDKWuOikoCv5HbKLxclhKYUXlWkX86DoZGtqI4XhbOsyrMg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz", + "integrity": "sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.9", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-typescript": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/preset-react": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz", - "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-transform-react-display-name": "^7.18.6", - "@babel/plugin-transform-react-jsx": "^7.18.6", - "@babel/plugin-transform-react-jsx-development": "^7.18.6", - "@babel/plugin-transform-react-pure-annotations": "^7.18.6" + "@babel/helper-create-class-features-plugin": "^7.24.4", + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/plugin-syntax-typescript": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -799,16 +613,16 @@ } }, "node_modules/@babel/preset-typescript": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz", - "integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz", + "integrity": "sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", - "@babel/plugin-syntax-jsx": "^7.22.5", - "@babel/plugin-transform-modules-commonjs": "^7.22.5", - "@babel/plugin-transform-typescript": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-validator-option": "^7.23.5", + "@babel/plugin-syntax-jsx": "^7.24.1", + "@babel/plugin-transform-modules-commonjs": "^7.24.1", + "@babel/plugin-transform-typescript": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -818,46 +632,46 @@ } }, "node_modules/@babel/runtime": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz", - "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz", + "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==", "dev": true, "dependencies": { - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", - "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", + "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.3", + "@babel/code-frame": "^7.24.1", + "@babel/generator": "^7.24.1", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.3", - "@babel/types": "^7.23.3", - "debug": "^4.1.0", + "@babel/parser": "^7.24.1", + "@babel/types": "^7.24.0", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -865,12 +679,12 @@ } }, "node_modules/@babel/types": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", - "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, @@ -884,6 +698,22 @@ "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==", "dev": true }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/android-arm": { "version": "0.17.6", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.6.tgz", @@ -1251,31 +1081,19 @@ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, - "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@eslint-community/regexpp": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", - "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz", - "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -1295,10 +1113,20 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -1310,67 +1138,80 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "brace-expansion": "^1.1.7" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": "*" } }, "node_modules/@eslint/js": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz", - "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@fastify/busboy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", - "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==", - "dev": true, - "engines": { - "node": ">=14" - } - }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", "minimatch": "^3.0.5" }, "engines": { "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", "url": "https://github.com/sponsors/nzakas" } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", "dev": true }, "node_modules/@isaacs/cliui": { @@ -1418,32 +1259,32 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, "engines": { "node": ">=6.0.0" @@ -1456,21 +1297,15 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, "node_modules/@jspm/core": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz", @@ -1506,25 +1341,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/@mdx-js/mdx/node_modules/estree-util-is-identifier-name": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", - "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { - "version": "5.1.1-v1", - "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", - "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", - "dev": true, - "dependencies": { - "eslint-scope": "5.1.1" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1600,21 +1416,6 @@ "node": ">=12" } }, - "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@npmcli/package-json": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-4.0.1.tgz", @@ -1633,52 +1434,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/package-json/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@npmcli/package-json/node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@npmcli/package-json/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@npmcli/promise-spawn": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", @@ -1691,21 +1446,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -1716,60 +1456,10 @@ "node": ">=14" } }, - "node_modules/@pkgr/utils": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", - "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "fast-glob": "^3.3.0", - "is-glob": "^4.0.3", - "open": "^9.1.0", - "picocolors": "^1.0.0", - "tslib": "^2.6.0" - }, - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" - } - }, - "node_modules/@pkgr/utils/node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/@pkgr/utils/node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - }, - "node_modules/@remix-run/css-bundle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-2.3.0.tgz", - "integrity": "sha512-+qjS0bk716XYEtcwrCMgFkZkreOHQN70L5+ItQyNyIxeTbuwBuBzu7239p6Scg9I9A3nV+NtxpKYHzL/qB1XKA==", - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/@remix-run/dev": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.3.0.tgz", - "integrity": "sha512-Eno0XHyIKo5GyzN4OAwNkgkyl4H1mLWbqeVUA8T5HmVDj+8qJLIcYeayS2BmA1KYAHJBiy5ufAGi2MpaXMjKww==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.8.1.tgz", + "integrity": "sha512-qFt4jAsAJeIOyg6ngeSnTG/9Z5N9QJfeThP/8wRHc1crqYgTiEtcI3DZ8WlAXjVSF5emgn/ZZKqzLAI02OgMfQ==", "dev": true, "dependencies": { "@babel/core": "^7.21.8", @@ -1782,9 +1472,9 @@ "@babel/types": "^7.22.5", "@mdx-js/mdx": "^2.3.0", "@npmcli/package-json": "^4.0.1", - "@remix-run/node": "2.3.0", - "@remix-run/router": "1.12.0-pre.0", - "@remix-run/server-runtime": "2.3.0", + "@remix-run/node": "2.8.1", + "@remix-run/router": "1.15.3-pre.0", + "@remix-run/server-runtime": "2.8.1", "@types/mdx": "^2.0.5", "@vanilla-extract/integration": "^6.2.0", "arg": "^5.0.1", @@ -1807,9 +1497,7 @@ "lodash": "^4.17.21", "lodash.debounce": "^4.0.8", "minimatch": "^9.0.0", - "node-fetch": "^2.6.9", "ora": "^5.4.1", - "parse-multipart-data": "^1.5.0", "picocolors": "^1.0.0", "picomatch": "^2.3.1", "pidtree": "^0.6.0", @@ -1826,7 +1514,6 @@ "set-cookie-parser": "^2.6.0", "tar-fs": "^2.1.1", "tsconfig-paths": "^4.0.0", - "undici": "^5.22.1", "ws": "^7.4.5" }, "bin": { @@ -1836,9 +1523,10 @@ "node": ">=18.0.0" }, "peerDependencies": { - "@remix-run/serve": "^2.3.0", + "@remix-run/serve": "^2.8.1", "typescript": "^5.1.0", - "vite": "^4.4.9 || ^5.0.0" + "vite": "^5.1.0", + "wrangler": "^3.28.2" }, "peerDependenciesMeta": { "@remix-run/serve": { @@ -1849,89 +1537,24 @@ }, "vite": { "optional": true + }, + "wrangler": { + "optional": true } } }, - "node_modules/@remix-run/dev/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@remix-run/dev/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@remix-run/dev/node_modules/pidtree": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", - "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", - "dev": true, - "bin": { - "pidtree": "bin/pidtree.js" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/@remix-run/dev/node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/@remix-run/eslint-config": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-2.3.0.tgz", - "integrity": "sha512-iyuNO7tRjevLjwGH4nLv/6g5NROhUXIQHTNjTUhQjEkHac4/kp3EOnnQEtGmMUfLruTyz6OoOJQzTkT3l14VvQ==", - "dev": true, + "node_modules/@remix-run/express": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-2.8.1.tgz", + "integrity": "sha512-p1eo8uwZk8uLihSDpUnPOPsTDfghWikVPQfa+e0ZMk6tnJCjcpHAyENKDFtn9vDh9h7YNUg6A7+19CStHgxd7Q==", "dependencies": { - "@babel/core": "^7.21.8", - "@babel/eslint-parser": "^7.21.8", - "@babel/preset-react": "^7.18.6", - "@rushstack/eslint-patch": "^1.2.0", - "@typescript-eslint/eslint-plugin": "^5.59.0", - "@typescript-eslint/parser": "^5.59.0", - "eslint-import-resolver-node": "0.3.7", - "eslint-import-resolver-typescript": "^3.5.4", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-jest": "^26.9.0", - "eslint-plugin-jest-dom": "^4.0.3", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-react": "^7.32.2", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-testing-library": "^5.10.2" + "@remix-run/node": "2.8.1" }, "engines": { "node": ">=18.0.0" }, "peerDependencies": { - "eslint": "^8.0.0", - "react": "^18.0.0", + "express": "^4.17.1", "typescript": "^5.1.0" }, "peerDependenciesMeta": { @@ -1940,33 +1563,25 @@ } } }, - "node_modules/@remix-run/eslint-config/node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", - "dev": true, + "node_modules/@remix-run/node": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.8.1.tgz", + "integrity": "sha512-ddCwBVlfLvRxTQJHPcaM1lhfMjsFYG3EGmYpWJIWnnzDX5EbX9pUNHBWisMuH1eA0c7pbw0PbW0UtCttKYx2qg==", "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "@remix-run/server-runtime": "2.8.1", + "@remix-run/web-fetch": "^4.4.2", + "@remix-run/web-file": "^3.1.0", + "@remix-run/web-stream": "^1.1.0", + "@web3-storage/multipart-parser": "^1.0.0", + "cookie-signature": "^1.1.0", + "source-map-support": "^0.5.21", + "stream-slice": "^0.1.2" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=18.0.0" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "typescript": "^5.1.0" }, "peerDependenciesMeta": { "typescript": { @@ -1974,26 +1589,23 @@ } } }, - "node_modules/@remix-run/eslint-config/node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", - "dev": true, + "node_modules/@remix-run/react": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.8.1.tgz", + "integrity": "sha512-HTPm1U8+xz2jPaVjZnssrckfmFMA8sUZUdaWnoF5lmLWdReqcQv+XlBhIrQQ3jO9L8iYYdnzaSZZcRFYSdpTYg==", "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "debug": "^4.3.4" + "@remix-run/router": "1.15.3", + "@remix-run/server-runtime": "2.8.1", + "react-router": "6.22.3", + "react-router-dom": "6.22.3" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=18.0.0" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "react": "^18.0.0", + "react-dom": "^18.0.0", + "typescript": "^5.1.0" }, "peerDependenciesMeta": { "typescript": { @@ -2001,152 +1613,30 @@ } } }, - "node_modules/@remix-run/eslint-config/node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, + "node_modules/@remix-run/react/node_modules/@remix-run/router": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.3.tgz", + "integrity": "sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "node": ">=14.0.0" } }, - "node_modules/@remix-run/eslint-config/node_modules/eslint-plugin-jest": { - "version": "26.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.9.0.tgz", - "integrity": "sha512-TWJxWGp1J628gxh2KhaH1H1paEdgE2J61BBF1I59c6xWeL5+D1BzMxGDN/nXAfX+aSkR5u80K+XhskK6Gwq9ng==", - "dev": true, - "dependencies": { - "@typescript-eslint/utils": "^5.10.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "@typescript-eslint/eslint-plugin": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "@typescript-eslint/eslint-plugin": { - "optional": true - }, - "jest": { - "optional": true - } - } - }, - "node_modules/@remix-run/express": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-2.3.0.tgz", - "integrity": "sha512-XSIR5H3YQ/anitOrp0m8PI7wqJ1Rri7LS2sHkwl8N9i+TKmZLkMAqg8SoSIaaxl/rMlA9gRCSC1msOHKw5xvzw==", - "dev": true, - "dependencies": { - "@remix-run/node": "2.3.0" - }, - "engines": { - "node": ">=18.0.0" - }, - "peerDependencies": { - "express": "^4.17.1", - "typescript": "^5.1.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@remix-run/node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.3.0.tgz", - "integrity": "sha512-WQybWc1EWPLMD/btDtchVrhoLvz/ek6MB0gr2cV2N3Sxgn1VaJmpsN3+sUA5lK8vR2S/kOmGun2Ut3tKi8TKHg==", - "dependencies": { - "@remix-run/server-runtime": "2.3.0", - "@remix-run/web-fetch": "^4.4.1", - "@remix-run/web-file": "^3.1.0", - "@remix-run/web-stream": "^1.1.0", - "@web3-storage/multipart-parser": "^1.0.0", - "cookie-signature": "^1.1.0", - "source-map-support": "^0.5.21", - "stream-slice": "^0.1.2" - }, - "engines": { - "node": ">=18.0.0" - }, - "peerDependencies": { - "typescript": "^5.1.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@remix-run/react": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.3.0.tgz", - "integrity": "sha512-8sLgNw0wbNx0Gir0CKCqJVlQ8ipKMvTfUAY/sra/jiAkUSztz1HuGXNTV+4yrP9786puiMp9mB+bJqD32SAEPg==", - "dependencies": { - "@remix-run/router": "1.12.0", - "@remix-run/server-runtime": "2.3.0", - "react-router-dom": "6.19.0" - }, - "engines": { - "node": ">=18.0.0" - }, - "peerDependencies": { - "react": "^18.0.0", - "react-dom": "^18.0.0", - "typescript": "^5.1.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@remix-run/react/node_modules/@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@remix-run/router": { - "version": "1.12.0-pre.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0-pre.0.tgz", - "integrity": "sha512-+bBn9KqD2AC0pttSGydVFOZSsT0NqQ1+rGFwMTx9dRANk6oGxrPbKTDxLLikocscGzSL5przvcK4Uxfq8yU7BQ==", + "node_modules/@remix-run/router": { + "version": "1.15.3-pre.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.3-pre.0.tgz", + "integrity": "sha512-JUQb6sztqJpRbsdKpx3D4+6eaGmHU4Yb/QeKrES/ZbLuijlZMOmZ+gV0ohX5vrRDnJHJmcQPq3Tpk0GGPNM9gg==", "dev": true, "engines": { "node": ">=14.0.0" } }, "node_modules/@remix-run/serve": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.3.0.tgz", - "integrity": "sha512-/Y1xpBlaA47e5Xmz3VxXfnIbK8yn0NzKVeuflVoyvEFK0lOzSpceHc079fADQr3vItWNBzzMaNRZSUSuLY/tQw==", - "dev": true, + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.8.1.tgz", + "integrity": "sha512-PyCV7IMnRshwfFw7JJ2hZJppX88VAhZyYjeTAmYb6PK7IDtdmqUf5eOrYDi8gCu914C+aZRu6blxpLRlpyCY8Q==", "dependencies": { - "@remix-run/express": "2.3.0", - "@remix-run/node": "2.3.0", + "@remix-run/express": "2.8.1", + "@remix-run/node": "2.8.1", "chokidar": "^3.5.3", "compression": "^1.7.4", "express": "^4.17.1", @@ -2162,14 +1652,14 @@ } }, "node_modules/@remix-run/server-runtime": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.3.0.tgz", - "integrity": "sha512-9BiRK7VPm5nt/aOlRmeROXWA8HKgqjvQy+f9NNpqvf3jj62EUl0h4eUdyqRj6nNh44I+0XUBG7ZQ2xXTrGJATw==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.8.1.tgz", + "integrity": "sha512-fh4SOEoONrN73Kvzc0gMDCmYpVRVbvoj9j3BUXHAcn0An8iX+HD/22gU7nTkIBzExM/F9xgEcwTewOnWqLw0Bg==", "dependencies": { - "@remix-run/router": "1.12.0", - "@types/cookie": "^0.5.3", + "@remix-run/router": "1.15.3", + "@types/cookie": "^0.6.0", "@web3-storage/multipart-parser": "^1.0.0", - "cookie": "^0.5.0", + "cookie": "^0.6.0", "set-cookie-parser": "^2.4.8", "source-map": "^0.7.3" }, @@ -2186,9 +1676,9 @@ } }, "node_modules/@remix-run/server-runtime/node_modules/@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.3.tgz", + "integrity": "sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==", "engines": { "node": ">=14.0.0" } @@ -2203,9 +1693,9 @@ } }, "node_modules/@remix-run/web-fetch": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.4.1.tgz", - "integrity": "sha512-xMceEGn2kvfeWS91nHSOhEQHPGgjFnmDVpWFZrbWPVdiTByMZIn421/tdSF6Kd1RsNsY+5Iwt3JFEKZHAcMQHw==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.4.2.tgz", + "integrity": "sha512-jgKfzA713/4kAW/oZ4bC3MoLWyjModOVDjFPNseVqcJKSafgIscrYL9G50SurEYLswPuoU3HzSbO0jQCMYWHhA==", "dependencies": { "@remix-run/web-blob": "^3.1.0", "@remix-run/web-file": "^3.1.0", @@ -2244,30 +1734,200 @@ "web-streams-polyfill": "^3.1.1" } }, - "node_modules/@rushstack/eslint-patch": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz", - "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==", - "dev": true + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.1.tgz", + "integrity": "sha512-fH8/o8nSUek8ceQnT7K4EQbSiV7jgkHq81m9lWZFIXjJ7lJzpWXbQFpT/Zh6OZYnpFykvzC3fbEvEAFZu03dPA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] }, - "node_modules/@testing-library/dom": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz", - "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==", + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.1.tgz", + "integrity": "sha512-Y/9OHLjzkunF+KGEoJr3heiD5X9OLa8sbT1lm0NYeKyaM3oMhhQFvPB0bNZYJwlq93j8Z6wSxh9+cyKQaxS7PQ==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/runtime": "^7.12.5", - "@types/aria-query": "^4.2.0", - "aria-query": "^5.0.0", - "chalk": "^4.1.0", - "dom-accessibility-api": "^0.5.9", - "lz-string": "^1.4.4", - "pretty-format": "^27.0.2" - }, - "engines": { - "node": ">=12" - } + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.1.tgz", + "integrity": "sha512-+kecg3FY84WadgcuSVm6llrABOdQAEbNdnpi5X3UwWiFVhZIZvKgGrF7kmLguvxHNQy+UuRV66cLVl3S+Rkt+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.1.tgz", + "integrity": "sha512-2pYRzEjVqq2TB/UNv47BV/8vQiXkFGVmPFwJb+1E0IFFZbIX8/jo1olxqqMbo6xCXf8kabANhp5bzCij2tFLUA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.1.tgz", + "integrity": "sha512-mS6wQ6Do6/wmrF9aTFVpIJ3/IDXhg1EZcQFYHZLHqw6AzMBjTHWnCG35HxSqUNphh0EHqSM6wRTT8HsL1C0x5g==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.1.tgz", + "integrity": "sha512-p9rGKYkHdFMzhckOTFubfxgyIO1vw//7IIjBBRVzyZebWlzRLeNhqxuSaZ7kCEKVkm/kuC9fVRW9HkC/zNRG2w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.1.tgz", + "integrity": "sha512-nDY6Yz5xS/Y4M2i9JLQd3Rofh5OR8Bn8qe3Mv/qCVpHFlwtZSBYSPaU4mrGazWkXrdQ98GB//H0BirGR/SKFSw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.1.tgz", + "integrity": "sha512-im7HE4VBL+aDswvcmfx88Mp1soqL9OBsdDBU8NqDEYtkri0qV0THhQsvZtZeNNlLeCUQ16PZyv7cqutjDF35qw==", + "cpu": [ + "ppc64le" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.1.tgz", + "integrity": "sha512-RWdiHuAxWmzPJgaHJdpvUUlDz8sdQz4P2uv367T2JocdDa98iRw2UjIJ4QxSyt077mXZT2X6pKfT2iYtVEvOFw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.1.tgz", + "integrity": "sha512-VMgaGQ5zRX6ZqV/fas65/sUGc9cPmsntq2FiGmayW9KMNfWVG/j0BAqImvU4KTeOOgYSf1F+k6at1UfNONuNjA==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.1.tgz", + "integrity": "sha512-9Q7DGjZN+hTdJomaQ3Iub4m6VPu1r94bmK2z3UeWP3dGUecRC54tmVu9vKHTm1bOt3ASoYtEz6JSRLFzrysKlA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.1.tgz", + "integrity": "sha512-JNEG/Ti55413SsreTguSx0LOVKX902OfXIKVg+TCXO6Gjans/k9O6ww9q3oLGjNDaTLxM+IHFMeXy/0RXL5R/g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.1.tgz", + "integrity": "sha512-ryS22I9y0mumlLNwDFYZRDFLwWh3aKaC72CWjFcFvxK0U6v/mOkM5Up1bTbCRAhv3kEIwW2ajROegCIQViUCeA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.1.tgz", + "integrity": "sha512-TdloItiGk+T0mTxKx7Hp279xy30LspMso+GzQvV2maYePMAWdmrzqSNZhUpPj3CGw12aGj57I026PgLCTu8CGg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.1.tgz", + "integrity": "sha512-wQGI+LY/Py20zdUPq+XCem7JcPOyzIJBm3dli+56DJsQOHbnXZFEwgmnC6el1TPAfC8lBT3m+z69RmLykNUbew==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] }, "node_modules/@types/acorn": { "version": "4.0.6", @@ -2278,16 +1938,10 @@ "@types/estree": "*" } }, - "node_modules/@types/aria-query": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz", - "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==", - "dev": true - }, "node_modules/@types/cookie": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.5.4.tgz", - "integrity": "sha512-7z/eR6O859gyWIAjuvBWFzNURmf2oPBmJlfVWkwehU5nzIyjwBsTh7WMmEEV4JFnHuQ3ex4oyTvfKzcyJVDBNA==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" }, "node_modules/@types/debug": { "version": "4.1.12", @@ -2305,27 +1959,27 @@ "dev": true }, "node_modules/@types/estree-jsx": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.3.tgz", - "integrity": "sha512-pvQ+TKeRHeiUGRhvYwRrQ/ISnohKkSJR14fT2yqyZ4e9K5vqc7hrtY2Y1Dw0ZwAzQ6DQsxsaCUuSIIi8v0Cq6w==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.5.tgz", + "integrity": "sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==", "dev": true, "dependencies": { "@types/estree": "*" } }, "node_modules/@types/hast": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.8.tgz", - "integrity": "sha512-aMIqAlFd2wTIDZuvLbhUT+TGvMxrNC8ECUIVtH6xxy0sQLs3iu6NO8Kp/VT5je7i5ufnebXzdV1dNDMnvaH6IQ==", + "version": "2.3.10", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz", + "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==", "dev": true, "dependencies": { "@types/unist": "^2" } }, "node_modules/@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, "node_modules/@types/json5": { @@ -2335,18 +1989,18 @@ "dev": true }, "node_modules/@types/mdast": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", - "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz", + "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==", "dev": true, "dependencies": { - "@types/unist": "*" + "@types/unist": "^2" } }, "node_modules/@types/mdx": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.10.tgz", - "integrity": "sha512-Rllzc5KHk0Al5/WANwgSPl1/CwjqCy+AZrGd78zuK+jO9aDM6ffblZ+zIjgPNAaEBmlO0RYDvLNh7wD0zKVgEg==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.12.tgz", + "integrity": "sha512-H9VZ9YqE+H28FQVchC83RCs5xQ2J7mAAv6qdDEaWmXEVl3OpdH+xfrSUzQ1lp7U7oSTRZ0RvW08ASPJsYBi7Cw==", "dev": true }, "node_modules/@types/ms": { @@ -2356,79 +2010,71 @@ "dev": true }, "node_modules/@types/node": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", - "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==", + "version": "20.12.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", + "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", "dev": true, - "optional": true, - "peer": true + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", + "version": "15.7.12", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", + "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==", "dev": true }, "node_modules/@types/react": { - "version": "18.2.18", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz", - "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==", + "version": "18.2.75", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.75.tgz", + "integrity": "sha512-+DNnF7yc5y0bHkBTiLKqXFe+L4B3nvOphiMY3tuA5X10esmjqk7smyBZzbGTy2vsiy/Bnzj8yFIBL8xhRacoOg==", "dev": true, "dependencies": { "@types/prop-types": "*", - "@types/scheduler": "*", "csstype": "^3.0.2" } }, "node_modules/@types/react-dom": { - "version": "18.2.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", - "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", + "version": "18.2.24", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.24.tgz", + "integrity": "sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==", "dev": true, "dependencies": { "@types/react": "*" } }, - "node_modules/@types/scheduler": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", - "dev": true - }, "node_modules/@types/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, "node_modules/@types/tinycolor2": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.3.tgz", - "integrity": "sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==", - "dev": true + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz", + "integrity": "sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==" }, "node_modules/@types/unist": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", + "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==", "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz", - "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", + "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/type-utils": "6.2.1", - "@typescript-eslint/utils": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/type-utils": "6.21.0", + "@typescript-eslint/utils": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", "natural-compare": "^1.4.0", - "natural-compare-lite": "^1.4.0", "semver": "^7.5.4", "ts-api-utils": "^1.0.1" }, @@ -2449,14 +2095,17 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", + "node_modules/@typescript-eslint/parser": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", + "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2464,13 +2113,25 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", + "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0" + }, "engines": { "node": "^16.0.0 || >=18.0.0" }, @@ -2479,18 +2140,15 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", + "node_modules/@typescript-eslint/type-utils": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz", + "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/utils": "6.21.0", "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", "ts-api-utils": "^1.0.1" }, "engines": { @@ -2500,45 +2158,42 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, "peerDependenciesMeta": { "typescript": { "optional": true } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz", - "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==", + "node_modules/@typescript-eslint/types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", + "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "semver": "^7.5.4" - }, "engines": { "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", + "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "9.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2546,31 +2201,41 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=16 || 14 >=14.17" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@typescript-eslint/parser": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz", - "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==", + "node_modules/@typescript-eslint/utils": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz", + "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "semver": "^7.5.4" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2581,21 +2246,16 @@ }, "peerDependencies": { "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", + "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" + "@typescript-eslint/types": "6.21.0", + "eslint-visitor-keys": "^3.4.1" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2605,493 +2265,173 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/@vanilla-extract/babel-plugin-debug-ids": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@vanilla-extract/babel-plugin-debug-ids/-/babel-plugin-debug-ids-1.0.5.tgz", + "integrity": "sha512-Rc9A6ylsw7EBErmpgqCMvc/Z/eEZxI5k1xfLQHw7f5HHh3oc5YfzsAsYU/PdmSNjF1dp3sGEViBdDltvwnfVaA==", "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "dependencies": { + "@babel/core": "^7.23.9" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", + "node_modules/@vanilla-extract/css": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/@vanilla-extract/css/-/css-1.14.2.tgz", + "integrity": "sha512-OasEW4ojGqqRiUpsyEDUMrSkLnmwbChtafkogpCZ1eDAgAZ9eY9CHLYodj2nB8aV5T25kQ5shm92k25ngjYhhg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "@emotion/hash": "^0.9.0", + "@vanilla-extract/private": "^1.0.4", + "chalk": "^4.1.1", + "css-what": "^6.1.0", + "cssesc": "^3.0.0", + "csstype": "^3.0.7", + "deep-object-diff": "^1.1.9", + "deepmerge": "^4.2.2", + "media-query-parser": "^2.0.2", + "modern-ahocorasick": "^1.0.0", + "outdent": "^0.8.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", + "node_modules/@vanilla-extract/integration": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.5.0.tgz", + "integrity": "sha512-E2YcfO8vA+vs+ua+gpvy1HRqvgWbI+MTlUpxA8FvatOvybuNcWAY0CKwQ/Gpj7rswYKtC6C7+xw33emM6/ImdQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "@babel/core": "^7.20.7", + "@babel/plugin-syntax-typescript": "^7.20.0", + "@vanilla-extract/babel-plugin-debug-ids": "^1.0.4", + "@vanilla-extract/css": "^1.14.0", + "esbuild": "npm:esbuild@~0.17.6 || ~0.18.0 || ~0.19.0", + "eval": "0.1.8", + "find-up": "^5.0.0", + "javascript-stringify": "^2.0.1", + "lodash": "^4.17.21", + "mlly": "^1.4.2", + "outdent": "^0.8.0", + "vite": "^5.0.11", + "vite-node": "^1.2.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node_modules/@vanilla-extract/private": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.4.tgz", + "integrity": "sha512-8FGD6AejeC/nXcblgNCM5rnZb9KXa4WNkR03HCWtdJBpANjTgjHEglNLFnhuvdQ78tC6afaxBPI+g7F2NX3tgg==", + "dev": true + }, + "node_modules/@web3-storage/multipart-parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz", + "integrity": "sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==" + }, + "node_modules/@zxing/text-encoding": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", + "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==", + "optional": true + }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dependencies": { + "event-target-shim": "^5.0.0" }, - "funding": { - "url": "https://opencollective.com/eslint" + "engines": { + "node": ">=6.5" } }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "dev": true, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "mime-types": "~2.1.34", + "negotiator": "0.6.3" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">= 0.6" } }, - "node_modules/@typescript-eslint/type-utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", - "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", + "node_modules/acorn": { + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/utils": "6.2.1", - "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" + "bin": { + "acorn": "bin/acorn" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=8" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "node": ">=8" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz", - "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==", + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "semver": "^7.5.4" + "color-convert": "^2.0.1" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">=8" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@vanilla-extract/babel-plugin-debug-ids": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@vanilla-extract/babel-plugin-debug-ids/-/babel-plugin-debug-ids-1.0.3.tgz", - "integrity": "sha512-vm4jYu1xhSa6ofQ9AhIpR3DkAp4c+eoR1Rpm8/TQI4DmWbmGbOjYRcqV0aWsfaIlNhN4kFuxFMKBNN9oG6iRzA==", - "dev": true, - "dependencies": { - "@babel/core": "^7.20.7" - } - }, - "node_modules/@vanilla-extract/css": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@vanilla-extract/css/-/css-1.12.0.tgz", - "integrity": "sha512-TEttZfnqTRtwgVYiBWQSGGUiVaYWReHp59DsavITEvh4TpJNifZFGhBznHx4wQFEsyio6xA513jps4tmqR6zmw==", - "dev": true, - "dependencies": { - "@emotion/hash": "^0.9.0", - "@vanilla-extract/private": "^1.0.3", - "ahocorasick": "1.0.2", - "chalk": "^4.1.1", - "css-what": "^6.1.0", - "cssesc": "^3.0.0", - "csstype": "^3.0.7", - "deep-object-diff": "^1.1.9", - "deepmerge": "^4.2.2", - "media-query-parser": "^2.0.2", - "outdent": "^0.8.0" - } - }, - "node_modules/@vanilla-extract/integration": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.2.1.tgz", - "integrity": "sha512-+xYJz07G7TFAMZGrOqArOsURG+xcYvqctujEkANjw2McCBvGEK505RxQqOuNiA9Mi9hgGdNp2JedSa94f3eoLg==", - "dev": true, - "dependencies": { - "@babel/core": "^7.20.7", - "@babel/plugin-syntax-typescript": "^7.20.0", - "@vanilla-extract/babel-plugin-debug-ids": "^1.0.2", - "@vanilla-extract/css": "^1.10.0", - "esbuild": "0.17.6", - "eval": "0.1.6", - "find-up": "^5.0.0", - "javascript-stringify": "^2.0.1", - "lodash": "^4.17.21", - "mlly": "^1.1.0", - "outdent": "^0.8.0", - "vite": "^4.1.4", - "vite-node": "^0.28.5" - } - }, - "node_modules/@vanilla-extract/private": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.3.tgz", - "integrity": "sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==", - "dev": true - }, - "node_modules/@web3-storage/multipart-parser": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz", - "integrity": "sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==" - }, - "node_modules/@zxing/text-encoding": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", - "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==", - "optional": true - }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ahocorasick": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ahocorasick/-/ahocorasick-1.0.2.tgz", - "integrity": "sha512-hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA==", - "dev": true - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/any-promise": { @@ -3101,10 +2441,9 @@ "dev": true }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -3135,13 +2474,16 @@ } }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3150,19 +2492,19 @@ "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", "is-string": "^1.0.7" }, "engines": { @@ -3181,17 +2523,18 @@ "node": ">=8" } }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz", - "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==", + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -3200,16 +2543,18 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "node_modules/array.prototype.findlastindex": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", + "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -3218,15 +2563,15 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "node_modules/array.prototype.flat": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -3236,30 +2581,62 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", + "node_modules/array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", - "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", + "node_modules/array.prototype.toreversed": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -3270,9 +2647,9 @@ } }, "node_modules/ast-types-flow": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz", + "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==", "dev": true }, "node_modules/astring": { @@ -3285,9 +2662,12 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -3296,9 +2676,9 @@ } }, "node_modules/axe-core": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz", - "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz", + "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==", "dev": true, "engines": { "node": ">=4" @@ -3353,7 +2733,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "dev": true, "dependencies": { "safe-buffer": "5.1.2" }, @@ -3361,22 +2740,15 @@ "node": ">= 0.8" } }, - "node_modules/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/bl": { @@ -3391,13 +2763,12 @@ } }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "dev": true, + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -3405,7 +2776,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -3418,7 +2789,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -3427,7 +2797,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -3435,36 +2804,21 @@ "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/bplist-parser": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "dev": true, - "dependencies": { - "big-integer": "^1.6.44" - }, - "engines": { - "node": ">= 5.10.0" - } + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^1.0.0" } }, "node_modules/braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -3475,16 +2829,16 @@ "node_modules/browserify-zlib": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0= sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==", + "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==", "dev": true, "dependencies": { "pako": "~0.2.0" } }, "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "dev": true, "funding": [ { @@ -3501,10 +2855,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -3543,34 +2897,18 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "node_modules/builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", "dev": true, "dependencies": { "semver": "^7.0.0" } }, - "node_modules/bundle-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", - "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", - "dev": true, - "dependencies": { - "run-applescript": "^5.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -3607,37 +2945,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/cacache/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/cacache/node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/cacache/node_modules/lru-cache": { "version": "7.18.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", @@ -3647,28 +2954,19 @@ "node": ">=12" } }, - "node_modules/cacache/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "brace-expansion": "^2.0.1" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" }, "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3693,9 +2991,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001519", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", - "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", + "version": "1.0.30001608", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz", + "integrity": "sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==", "dev": true, "funding": [ { @@ -3779,16 +3077,9 @@ } }, "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -3801,6 +3092,9 @@ "engines": { "node": ">= 8.10.0" }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, "optionalDependencies": { "fsevents": "~2.3.2" } @@ -3836,9 +3130,9 @@ } }, "node_modules/cli-spinners": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz", - "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", "dev": true, "engines": { "node": ">=6" @@ -3893,11 +3187,14 @@ "node": ">= 6" } }, + "node_modules/composable-functions": { + "resolved": "../../npm", + "link": true + }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, "dependencies": { "mime-db": ">= 1.43.0 < 2" }, @@ -3909,7 +3206,6 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", - "dev": true, "dependencies": { "accepts": "~1.3.5", "bytes": "3.0.0", @@ -3927,7 +3223,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -3935,20 +3230,18 @@ "node_modules/compression/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, "dependencies": { "safe-buffer": "5.2.1" }, @@ -3960,7 +3253,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -3980,24 +3272,20 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "engines": { "node": ">= 0.6" } @@ -4030,6 +3318,21 @@ "node": ">= 8" } }, + "node_modules/cross-spawn/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/css-what": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", @@ -4055,9 +3358,9 @@ } }, "node_modules/csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true }, "node_modules/damerau-levenshtein": { @@ -4074,6 +3377,57 @@ "node": ">= 6" } }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4125,228 +3479,75 @@ "node": ">=0.10.0" } }, - "node_modules/default-browser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", - "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, "dependencies": { - "bundle-name": "^3.0.0", - "default-browser-id": "^3.0.0", - "execa": "^7.1.1", - "titleize": "^3.0.0" - }, - "engines": { - "node": ">=14.16" + "clone": "^1.0.2" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/default-browser-id": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", - "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", - "dev": true, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dependencies": { - "bplist-parser": "^0.2.0", - "untildify": "^4.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/default-browser/node_modules/execa": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" }, "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/default-browser/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 0.8" } }, - "node_modules/default-browser/node_modules/human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, "engines": { - "node": ">=14.18.0" + "node": ">=6" } }, - "node_modules/default-browser/node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/default-browser/node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/default-browser/node_modules/npm-run-path": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", - "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", - "dev": true, - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/default-browser/node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/default-browser/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/default-browser/node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "dependencies": { - "clone": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", - "dev": true, - "dependencies": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" } }, "node_modules/didyoumean": { @@ -4356,9 +3557,9 @@ "dev": true }, "node_modules/diff": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", - "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, "engines": { "node": ">=0.3.1" @@ -4394,30 +3595,16 @@ "node": ">=6.0.0" } }, - "node_modules/dom-accessibility-api": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.13.tgz", - "integrity": "sha512-R305kwb5CcMDIpSHUnLyIAp7SrSPBx6F0VfQFB3M75xVMHhXJJIdePYgbPPh1o57vCHNu5QztokWUPsLjWzFqw==", - "dev": true - }, - "node_modules/domain-functions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/domain-functions/-/domain-functions-1.8.0.tgz", - "integrity": "sha512-HhplgbGE8zeQM4Z5/zEhq1F+8lsqKlh7tH+OEAmaI46/e0v5SlfdeEZtS9ye6mGqA79Jj7b/bZu20JeDStoQUw==", - "dependencies": { - "qs": "^6.10.3" - }, - "peerDependencies": { - "zod": "^3.21.4" - } - }, "node_modules/dotenv": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.0.tgz", - "integrity": "sha512-qD9WU0MPM4SWLPJy/r2Be+2WgQj8plChsyrCNQzW/0WjvcJQiKQJ9mH3ZgB3fxbUUxgc/11ZJ0Fi5KiimWGz2Q==", + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", "dev": true, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" } }, "node_modules/duplexify": { @@ -4432,10 +3619,16 @@ "stream-shift": "^1.0.0" } }, + "node_modules/duplexify/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "node_modules/duplexify/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "dependencies": { "core-util-is": "~1.0.0", @@ -4465,13 +3658,12 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.485", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.485.tgz", - "integrity": "sha512-1ndQ5IBNEnFirPwvyud69GHL+31FkE09gH/CJ6m3KCbkx3i0EVOrjwz4UNxRmN9H8OVHbC6vMRZGN1yCvjSs9w==", + "version": "1.4.733", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.733.tgz", + "integrity": "sha512-gUI9nhI2iBGF0OaYYLKOaOtliFMl+Bt1rY7VmEjwxOxqoYLub/D9xmduPEhbw2imE6gYkJKhIE5it+KE2ulVxQ==", "dev": true }, "node_modules/emoji-regex": { @@ -4484,7 +3676,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -4499,9 +3690,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", + "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -4518,50 +3709,57 @@ "dev": true }, "node_modules/es-abstract": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", - "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.1", + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.1", - "get-symbol-description": "^1.0.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-buffer": "^1.0.0", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" + "which-typed-array": "^1.1.15" }, "engines": { "node": ">= 0.4" @@ -4570,33 +3768,89 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz", + "integrity": "sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", - "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz", + "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==", "dev": true }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { @@ -4654,26 +3908,26 @@ } }, "node_modules/esbuild-plugins-node-modules-polyfill": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.6.1.tgz", - "integrity": "sha512-6sAwI24PV8W0zxeO+i4BS5zoQypS3SzEGwIdxpzpy65riRuK8apMw8PN0aKVLCTnLr0FgNIxUMRd9BsreBrtog==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.6.3.tgz", + "integrity": "sha512-nydQGT3RijD8mBd3Hek+2gSAxndgceZU9GIjYYiqU+7CE7veN8utTmupf0frcKpwIXCXWpRofL9CY9k0yU70CA==", "dev": true, "dependencies": { "@jspm/core": "^2.0.1", - "local-pkg": "^0.4.3", + "local-pkg": "^0.5.0", "resolve.exports": "^2.0.2" }, "engines": { "node": ">=14.0.0" }, "peerDependencies": { - "esbuild": "^0.14.0 || ^0.15.0 || ^0.16.0 || ^0.17.0 || ^0.18.0 || ^0.19.0" + "esbuild": "^0.14.0 || ^0.15.0 || ^0.16.0 || ^0.17.0 || ^0.18.0 || ^0.19.0 || ^0.20.0" } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, "engines": { "node": ">=6" @@ -4682,8 +3936,7 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "node_modules/escape-string-regexp": { "version": "4.0.0", @@ -4698,18 +3951,19 @@ } }, "node_modules/eslint": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz", - "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.1", - "@eslint/js": "^8.46.0", - "@humanwhocodes/config-array": "^0.11.10", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -4717,7 +3971,7 @@ "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.2", + "eslint-visitor-keys": "^3.4.3", "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", @@ -4752,14 +4006,14 @@ } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "dependencies": { "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { @@ -4772,19 +4026,18 @@ } }, "node_modules/eslint-import-resolver-typescript": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.5.tgz", - "integrity": "sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz", + "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==", "dev": true, "dependencies": { "debug": "^4.3.4", "enhanced-resolve": "^5.12.0", "eslint-module-utils": "^2.7.4", + "fast-glob": "^3.3.1", "get-tsconfig": "^4.5.0", - "globby": "^13.1.3", "is-core-module": "^2.11.0", - "is-glob": "^4.0.3", - "synckit": "^0.8.5" + "is-glob": "^4.0.3" }, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -4797,57 +4050,10 @@ "eslint-plugin-import": "*" } }, - "node_modules/eslint-import-resolver-typescript/node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/eslint-import-resolver-typescript/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "dev": true, - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint-import-resolver-typescript/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint-module-utils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", - "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", + "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", "dev": true, "dependencies": { "debug": "^3.2.7" @@ -4870,73 +4076,29 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-plugin-es": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", - "dev": true, - "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/eslint-plugin-import": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz", - "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.findlastindex": "^1.2.2", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", + "eslint-import-resolver-node": "^0.3.9", "eslint-module-utils": "^2.8.0", - "has": "^1.0.3", - "is-core-module": "^2.12.1", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.fromentries": "^2.0.6", - "object.groupby": "^1.0.0", - "object.values": "^1.1.6", - "resolve": "^1.22.3", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" + "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" @@ -4945,6 +4107,16 @@ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" } }, + "node_modules/eslint-plugin-import/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint-plugin-import/node_modules/debug": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", @@ -4978,19 +4150,31 @@ "json5": "lib/cli.js" } }, - "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "node_modules/eslint-plugin-import/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" } }, "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, "dependencies": { "@types/json5": "^0.0.29", @@ -4999,47 +4183,28 @@ "strip-bom": "^3.0.0" } }, - "node_modules/eslint-plugin-jest-dom": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.3.tgz", - "integrity": "sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.16.3", - "@testing-library/dom": "^8.11.1", - "requireindex": "^1.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0", - "npm": ">=6", - "yarn": ">=1" - }, - "peerDependencies": { - "eslint": "^6.8.0 || ^7.0.0 || ^8.0.0" - } - }, "node_modules/eslint-plugin-jsx-a11y": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz", - "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.20.7", - "aria-query": "^5.1.3", - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "ast-types-flow": "^0.0.7", - "axe-core": "^4.6.2", - "axobject-query": "^3.1.1", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz", + "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.23.2", + "aria-query": "^5.3.0", + "array-includes": "^3.1.7", + "array.prototype.flatmap": "^1.3.2", + "ast-types-flow": "^0.0.8", + "axe-core": "=4.7.0", + "axobject-query": "^3.2.1", "damerau-levenshtein": "^1.0.8", "emoji-regex": "^9.2.2", - "has": "^1.0.3", - "jsx-ast-utils": "^3.3.3", - "language-tags": "=1.0.5", + "es-iterator-helpers": "^1.0.15", + "hasown": "^2.0.0", + "jsx-ast-utils": "^3.3.5", + "language-tags": "^1.0.9", "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "semver": "^6.3.0" + "object.entries": "^1.1.7", + "object.fromentries": "^2.0.7" }, "engines": { "node": ">=4.0" @@ -5048,89 +4213,52 @@ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" } }, - "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "dependencies": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "peerDependencies": { - "eslint": ">=5.16.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "node_modules/eslint-plugin-node/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "node_modules/eslint-plugin-jsx-a11y/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" + "brace-expansion": "^1.1.7" }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-node/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-plugin-node/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": "*" } }, "node_modules/eslint-plugin-react": { - "version": "7.33.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz", - "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==", + "version": "7.34.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz", + "integrity": "sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", + "array-includes": "^3.1.7", + "array.prototype.findlast": "^1.2.4", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.toreversed": "^1.1.2", + "array.prototype.tosorted": "^1.1.3", "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.17", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", + "object.entries": "^1.1.7", + "object.fromentries": "^2.0.7", + "object.hasown": "^1.1.3", + "object.values": "^1.1.7", "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", + "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" + "string.prototype.matchall": "^4.0.10" }, "engines": { "node": ">=4" @@ -5151,6 +4279,16 @@ "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" } }, + "node_modules/eslint-plugin-react/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint-plugin-react/node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -5163,13 +4301,25 @@ "node": ">=0.10.0" } }, + "node_modules/eslint-plugin-react/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -5189,54 +4339,7 @@ "semver": "bin/semver.js" } }, - "node_modules/eslint-plugin-testing-library": { - "version": "5.11.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz", - "integrity": "sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==", - "dev": true, - "dependencies": { - "@typescript-eslint/utils": "^5.58.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0", - "npm": ">=6" - }, - "peerDependencies": { - "eslint": "^7.5.0 || ^8.0.0" - } - }, "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-scope/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/eslint-scope": { "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", @@ -5252,10 +4355,10 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -5264,6 +4367,16 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -5277,9 +4390,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -5291,16 +4404,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "brace-expansion": "^1.1.7" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": "*" } }, "node_modules/espree": { @@ -5320,18 +4433,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/esquery": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", @@ -5393,7 +4494,7 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/estree-util-build-jsx/node_modules/estree-util-is-identifier-name": { + "node_modules/estree-util-is-identifier-name": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", @@ -5403,16 +4504,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/estree-util-is-identifier-name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz", - "integrity": "sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/estree-util-to-js": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/estree-util-to-js/-/estree-util-to-js-1.2.0.tgz", @@ -5476,17 +4567,17 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/eval": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz", - "integrity": "sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.8.tgz", + "integrity": "sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==", "dev": true, "dependencies": { + "@types/node": "*", "require-like": ">= 0.1.1" }, "engines": { @@ -5524,18 +4615,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/execa/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/exit-hook": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz", @@ -5549,17 +4628,16 @@ } }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "dev": true, + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -5593,14 +4671,12 @@ "node_modules/express/node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -5608,14 +4684,12 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -5644,9 +4718,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -5672,9 +4746,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -5709,7 +4783,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -5721,7 +4794,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "dev": true, "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -5739,7 +4811,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -5747,8 +4818,7 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/find-up": { "version": "5.0.0", @@ -5767,12 +4837,13 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { @@ -5780,9 +4851,9 @@ } }, "node_modules/flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "node_modules/for-each": { @@ -5824,7 +4895,7 @@ "node_modules/format": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs= sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", + "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", "dev": true, "engines": { "node": ">=0.4.x" @@ -5834,7 +4905,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -5843,7 +4913,6 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -5855,9 +4924,9 @@ "dev": true }, "node_modules/fs-extra": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz", - "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -5883,14 +4952,13 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "hasInstallScript": true, "optional": true, "os": [ @@ -5901,20 +4969,23 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -5941,15 +5012,6 @@ "loader-utils": "^3.2.0" } }, - "node_modules/generic-names/node_modules/loader-utils": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", - "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", - "dev": true, - "engines": { - "node": ">= 12.13.0" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -5960,14 +5022,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5977,7 +5043,6 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", - "dev": true, "engines": { "node": ">=8" }, @@ -5985,14 +5050,27 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -6002,9 +5080,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.6.2.tgz", - "integrity": "sha512-E5XrT4CbbXcXWy+1jChlZmrmCwd5KGx502kDCXJJ7y898TtWW9FwoG5HfOLVRKmlmDGkWN2HM9Ho+/Y8F0sJDg==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.3.tgz", + "integrity": "sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==", "dev": true, "dependencies": { "resolve-pkg-maps": "^1.0.0" @@ -6014,20 +5092,22 @@ } }, "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.6", + "minimatch": "^9.0.1", + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -6037,7 +5117,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -6089,6 +5168,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true + }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", @@ -6101,9 +5186,9 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "node_modules/graphemer": { @@ -6129,17 +5214,6 @@ "gunzip-maybe": "bin.js" } }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -6159,21 +5233,20 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "engines": { "node": ">= 0.4" }, @@ -6193,11 +5266,11 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -6206,6 +5279,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/hast-util-to-estree": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-2.3.3.tgz", @@ -6233,16 +5317,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/hast-util-to-estree/node_modules/estree-util-is-identifier-name": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", - "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/hast-util-whitespace": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz", @@ -6278,7 +5352,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -6303,7 +5376,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -6344,9 +5416,9 @@ ] }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "dev": true, "engines": { "node": ">= 4" @@ -6371,7 +5443,7 @@ "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, "engines": { "node": ">=0.8.19" @@ -6389,7 +5461,7 @@ "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, "dependencies": { "once": "^1.3.0", @@ -6408,13 +5480,13 @@ "dev": true }, "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "hasown": "^2.0.0", "side-channel": "^1.0.4" }, "engines": { @@ -6425,7 +5497,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, "engines": { "node": ">= 0.10" } @@ -6470,14 +5541,31 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6499,7 +5587,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -6558,12 +5645,27 @@ } }, "node_modules/is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", "dev": true, "dependencies": { - "has": "^1.0.3" + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6597,33 +5699,29 @@ "node_modules/is-deflate": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz", - "integrity": "sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ= sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==", + "integrity": "sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==", "dev": true }, - "node_modules/is-docker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", - "dev": true, - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "engines": { "node": ">=0.10.0" } }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -6651,7 +5749,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -6662,7 +5759,7 @@ "node_modules/is-gzip": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz", - "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==", + "integrity": "sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==", "dev": true, "engines": { "node": ">=0.10.0" @@ -6678,24 +5775,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/is-inside-container": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", - "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", - "dev": true, - "dependencies": { - "is-docker": "^3.0.0" - }, - "bin": { - "is-inside-container": "cli.js" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", @@ -6705,10 +5784,22 @@ "node": ">=8" } }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, "engines": { "node": ">= 0.4" @@ -6721,7 +5812,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "engines": { "node": ">=0.12.0" } @@ -6787,13 +5877,28 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6842,11 +5947,11 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -6867,6 +5972,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -6879,53 +5996,55 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "node_modules/is-weakset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", "dev": true, "dependencies": { - "is-docker": "^2.0.0" + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/is-wsl/node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true }, "node_modules/isbot": { - "version": "3.6.13", - "resolved": "https://registry.npmjs.org/isbot/-/isbot-3.6.13.tgz", - "integrity": "sha512-uoP4uK5Dc2CrabmK+Gue1jTL+scHiCc1c9rblRpJwG8CPxjLIv8jmGyyGRGkbPOweayhkskdZsEQXG6p+QCQrg==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/isbot/-/isbot-4.4.0.tgz", + "integrity": "sha512-8ZvOWUA68kyJO4hHJdWjyreq7TYNWTS9y15IzeqVdKxR9pPr3P/3r9AHcoIv9M0Rllkao5qWz2v1lmcyKIVCzQ==", "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } + }, "node_modules/jackspeak": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", @@ -6951,9 +6070,9 @@ "dev": true }, "node_modules/jiti": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz", - "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", "dev": true, "bin": { "jiti": "bin/jiti.js" @@ -6988,10 +6107,16 @@ "node": ">=6" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz", + "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -7006,7 +6131,7 @@ "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, "node_modules/json5": { @@ -7022,9 +6147,9 @@ } }, "node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", "dev": true }, "node_modules/jsonfile": { @@ -7054,6 +6179,15 @@ "node": ">=4.0" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kleur": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", @@ -7070,12 +6204,15 @@ "dev": true }, "node_modules/language-tags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz", - "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz", + "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==", "dev": true, "dependencies": { - "language-subtag-registry": "~0.3.2" + "language-subtag-registry": "^0.3.20" + }, + "engines": { + "node": ">=0.10" } }, "node_modules/levn": { @@ -7092,12 +6229,15 @@ } }, "node_modules/lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz", + "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==", "dev": true, "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antonk52" } }, "node_modules/lines-and-columns": { @@ -7106,11 +6246,24 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true }, + "node_modules/loader-utils": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", + "dev": true, + "engines": { + "node": ">= 12.13.0" + } + }, "node_modules/local-pkg": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz", - "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", + "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", "dev": true, + "dependencies": { + "mlly": "^1.4.2", + "pkg-types": "^1.0.3" + }, "engines": { "node": ">=14" }, @@ -7195,30 +6348,18 @@ } }, "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/lz-string": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz", - "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==", - "dev": true, - "bin": { - "lz-string": "bin/bin.js" + "yallist": "^3.0.2" } }, "node_modules/make-service": { - "version": "2.0.0-next.0", - "resolved": "https://registry.npmjs.org/make-service/-/make-service-2.0.0-next.0.tgz", - "integrity": "sha512-+IxIiMlpWAxPOHMNiEuFQkM5uaogDMfRdWeCG5ot3h8WBamzYWb9zKtolD1C1wlB0bE0iKX57jItpkhdHwj/eQ==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/make-service/-/make-service-3.0.0.tgz", + "integrity": "sha512-yJsC+6yTZWaTT/xLs70MFe9vl4k73tINfdsMCo+HXmvDneO3fqD4LNyVe160sWO+MD2qP5AB9/4NChSU7sFdHw==" }, "node_modules/markdown-extensions": { "version": "1.1.1", @@ -7269,11 +6410,13 @@ } }, "node_modules/mdast-util-frontmatter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.0.tgz", - "integrity": "sha512-7itKvp0arEVNpCktOET/eLFAYaZ+0cNjVtFtIPxgQ5tV+3i+D4SDDTjTzPWl44LT59PC+xdx+glNTawBdF98Mw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.1.tgz", + "integrity": "sha512-JjA2OjxRqAa8wEG8hloD0uTU0kdn8kbtOWpPP94NBkfAlbxn4S8gCGf/9DwFtEeGPXrDcNXdiDjVaRdUFqYokw==", "dev": true, "dependencies": { + "@types/mdast": "^3.0.0", + "mdast-util-to-markdown": "^1.3.0", "micromark-extension-frontmatter": "^1.0.0" }, "funding": { @@ -7436,7 +6579,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -7444,8 +6586,7 @@ "node_modules/merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, "node_modules/merge-stream": { "version": "2.0.0", @@ -7466,7 +6607,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -7541,14 +6681,15 @@ } }, "node_modules/micromark-extension-frontmatter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-1.0.0.tgz", - "integrity": "sha512-EXjmRnupoX6yYuUJSQhrQ9ggK0iQtQlpi6xeJzVD5xscyAI+giqco5fdymayZhJMbIFecjnE2yz85S9NzIgQpg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-1.1.1.tgz", + "integrity": "sha512-m2UH9a7n3W8VAH9JO9y01APpPKmNNNs71P0RbknEmYSaZU5Ghogv38BYO94AI5Xw6OYfxZRdHZZ2nYjs/Z+SZQ==", "dev": true, "dependencies": { "fault": "^2.0.0", "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0" + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0" }, "funding": { "type": "opencollective", @@ -7603,16 +6744,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/micromark-extension-mdx-jsx/node_modules/estree-util-is-identifier-name": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", - "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/micromark-extension-mdx-md": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-1.0.1.tgz", @@ -7801,9 +6932,9 @@ } }, "node_modules/micromark-util-character": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz", - "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz", + "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==", "dev": true, "funding": [ { @@ -8061,9 +7192,9 @@ } }, "node_modules/micromark-util-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz", - "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz", + "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==", "dev": true, "funding": [ { @@ -8077,9 +7208,9 @@ ] }, "node_modules/micromark-util-types": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz", - "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz", + "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==", "dev": true, "funding": [ { @@ -8109,7 +7240,6 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true, "bin": { "mime": "cli.js" }, @@ -8121,7 +7251,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -8130,7 +7259,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -8148,22 +7276,28 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/minipass": { "version": "7.0.4", @@ -8198,9 +7332,15 @@ "node": ">=8" } }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "node_modules/minipass-collect/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, "dependencies": { @@ -8222,6 +7362,12 @@ "node": ">=8" } }, + "node_modules/minipass-flush/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", @@ -8246,6 +7392,12 @@ "node": ">=8" } }, + "node_modules/minipass-pipeline/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minizlib": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", @@ -8271,6 +7423,12 @@ "node": ">=8" } }, + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -8290,22 +7448,27 @@ "dev": true }, "node_modules/mlly": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.0.tgz", - "integrity": "sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz", + "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==", "dev": true, "dependencies": { - "acorn": "^8.9.0", - "pathe": "^1.1.1", + "acorn": "^8.11.3", + "pathe": "^1.1.2", "pkg-types": "^1.0.3", - "ufo": "^1.1.2" + "ufo": "^1.3.2" } }, + "node_modules/modern-ahocorasick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/modern-ahocorasick/-/modern-ahocorasick-1.0.1.tgz", + "integrity": "sha512-yoe+JbhTClckZ67b2itRtistFKf8yPYelHLc7e5xAwtNAXxM6wJTUx2C7QeVSJFDzKT7bCIFyBVybPMKvmB9AA==", + "dev": true + }, "node_modules/morgan": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "dev": true, "dependencies": { "basic-auth": "~2.0.1", "debug": "2.6.9", @@ -8321,7 +7484,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -8329,14 +7491,12 @@ "node_modules/morgan/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/morgan/node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "dev": true, "dependencies": { "ee-first": "1.1.1" }, @@ -8379,10 +7539,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", - "dev": true, + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "funding": [ { "type": "github", @@ -8399,48 +7558,21 @@ "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true, "engines": { "node": ">= 0.6" } }, - "node_modules/node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, "node_modules/normalize-package-data": { @@ -8462,7 +7594,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8549,9 +7680,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8566,13 +7697,13 @@ } }, "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, @@ -8584,28 +7715,29 @@ } }, "node_modules/object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -8615,39 +7747,45 @@ } }, "node_modules/object.groupby": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz", - "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", + "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", "dev": true, "dependencies": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -8660,7 +7798,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, "dependencies": { "ee-first": "1.1.1" }, @@ -8672,7 +7809,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -8680,7 +7816,7 @@ "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "dependencies": { "wrappy": "1" @@ -8701,24 +7837,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/open": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", - "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", - "dev": true, - "dependencies": { - "default-browser": "^4.0.0", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", - "is-wsl": "^2.2.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -8813,7 +7931,7 @@ "node_modules/pako": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU= sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==", + "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==", "dev": true }, "node_modules/parent-module": { @@ -8857,17 +7975,10 @@ "node": ">=6" } }, - "node_modules/parse-multipart-data": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/parse-multipart-data/-/parse-multipart-data-1.5.0.tgz", - "integrity": "sha512-ck5zaMF0ydjGfejNMnlo5YU2oJ+pT+80Jb1y4ybanT27j+zbVP/jkYmCrUGsEln0Ox/hZmuvgy8Ra7AxbXP2Mw==", - "dev": true - }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -8884,7 +7995,7 @@ "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -8906,12 +8017,12 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", "dev": true, "dependencies": { - "lru-cache": "^9.1.1 || ^10.0.0", + "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { @@ -8922,13 +8033,10 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.2.tgz", - "integrity": "sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", + "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", "dev": true, - "dependencies": { - "semver": "^7.3.5" - }, "engines": { "node": "14 || >=16.14" } @@ -8936,8 +8044,7 @@ "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, "node_modules/path-type": { "version": "4.0.0", @@ -8949,9 +8056,9 @@ } }, "node_modules/pathe": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", - "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", "dev": true }, "node_modules/peek-stream": { @@ -8979,14 +8086,12 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, "engines": { "node": ">=8.6" }, @@ -8994,6 +8099,18 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pidtree": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", + "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", + "dev": true, + "bin": { + "pidtree": "bin/pidtree.js" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -9023,11 +8140,18 @@ "pathe": "^1.1.0" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", - "dev": true, + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "funding": [ { "type": "opencollective", @@ -9043,9 +8167,9 @@ } ], "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -9100,21 +8224,27 @@ } }, "node_modules/postcss-load-config": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz", - "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", + "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "dependencies": { - "lilconfig": "^2.0.5", - "yaml": "^2.1.1" + "lilconfig": "^3.0.0", + "yaml": "^2.3.4" }, "engines": { "node": ">= 14" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, "peerDependencies": { "postcss": ">=8.0.9", "ts-node": ">=9.0.0" @@ -9148,9 +8278,9 @@ } }, "node_modules/postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", + "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", "dev": true, "engines": { "node": "^10 || ^12 || >= 14" @@ -9160,9 +8290,9 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz", - "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", + "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", "dev": true, "dependencies": { "icss-utils": "^5.0.0", @@ -9177,9 +8307,9 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", + "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.4" @@ -9226,9 +8356,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.13", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", - "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", + "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -9254,120 +8384,20 @@ } }, "node_modules/prettier": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", - "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "dev": true, "bin": { - "prettier": "bin/prettier.cjs" + "prettier": "bin-prettier.js" }, "engines": { - "node": ">=14" + "node": ">=10.13.0" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/prettier-plugin-tailwindcss": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz", - "integrity": "sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==", - "dev": true, - "engines": { - "node": ">=12.17.0" - }, - "peerDependencies": { - "@ianvs/prettier-plugin-sort-imports": "*", - "@prettier/plugin-pug": "*", - "@shopify/prettier-plugin-liquid": "*", - "@shufo/prettier-plugin-blade": "*", - "@trivago/prettier-plugin-sort-imports": "*", - "prettier": "^2.2 || ^3.0", - "prettier-plugin-astro": "*", - "prettier-plugin-css-order": "*", - "prettier-plugin-import-sort": "*", - "prettier-plugin-jsdoc": "*", - "prettier-plugin-marko": "*", - "prettier-plugin-organize-attributes": "*", - "prettier-plugin-organize-imports": "*", - "prettier-plugin-style-order": "*", - "prettier-plugin-svelte": "*", - "prettier-plugin-twig-melody": "*" - }, - "peerDependenciesMeta": { - "@ianvs/prettier-plugin-sort-imports": { - "optional": true - }, - "@prettier/plugin-pug": { - "optional": true - }, - "@shopify/prettier-plugin-liquid": { - "optional": true - }, - "@shufo/prettier-plugin-blade": { - "optional": true - }, - "@trivago/prettier-plugin-sort-imports": { - "optional": true - }, - "prettier-plugin-astro": { - "optional": true - }, - "prettier-plugin-css-order": { - "optional": true - }, - "prettier-plugin-import-sort": { - "optional": true - }, - "prettier-plugin-jsdoc": { - "optional": true - }, - "prettier-plugin-marko": { - "optional": true - }, - "prettier-plugin-organize-attributes": { - "optional": true - }, - "prettier-plugin-organize-imports": { - "optional": true - }, - "prettier-plugin-style-order": { - "optional": true - }, - "prettier-plugin-svelte": { - "optional": true - }, - "prettier-plugin-twig-melody": { - "optional": true - } - } - }, - "node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/pretty-ms": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", @@ -9428,16 +8458,10 @@ "react-is": "^16.13.1" } }, - "node_modules/prop-types/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - }, "node_modules/property-information": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.4.0.tgz", - "integrity": "sha512-9t5qARVofg2xQqKtytzt+lZ4d1Qvj8t5B8fEwXK6qOfgRLgH/b13QlgEyDh033NOS31nXeFbYv7CLUDG1CeifQ==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz", + "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==", "dev": true, "funding": { "type": "github", @@ -9448,7 +8472,6 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -9479,9 +8502,9 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" @@ -9525,16 +8548,14 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dev": true, + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -9549,7 +8570,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -9578,9 +8598,9 @@ } }, "node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, "node_modules/react-refresh": { @@ -9593,11 +8613,11 @@ } }, "node_modules/react-router": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.19.0.tgz", - "integrity": "sha512-0W63PKCZ7+OuQd7Tm+RbkI8kCLmn4GPjDbX61tWljPxWgqTKlEpeQUwPkT1DRjYhF8KSihK0hQpmhU4uxVMcdw==", + "version": "6.22.3", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.3.tgz", + "integrity": "sha512-dr2eb3Mj5zK2YISHK++foM9w4eBnO23eKnZEDs7c880P6oKbrjz/Svg9+nxqtHQK+oMW4OtjZca0RqPglXxguQ==", "dependencies": { - "@remix-run/router": "1.12.0" + "@remix-run/router": "1.15.3" }, "engines": { "node": ">=14.0.0" @@ -9607,12 +8627,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.19.0.tgz", - "integrity": "sha512-N6dWlcgL2w0U5HZUUqU2wlmOrSb3ighJmtQ438SWbhB1yuLTXQ8yyTBMK3BSvVjp7gBtKurT554nCtMOgxCZmQ==", + "version": "6.22.3", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.3.tgz", + "integrity": "sha512-7ZILI7HjcE+p31oQvwbokjk6OA/bnFxrhJ19n82Ex9Ph8fNAq+Hm/7KchpMGlTgWhUxRHMMCut+vEtNpWpowKw==", "dependencies": { - "@remix-run/router": "1.12.0", - "react-router": "6.19.0" + "@remix-run/router": "1.15.3", + "react-router": "6.22.3" }, "engines": { "node": ">=14.0.0" @@ -9623,17 +8643,17 @@ } }, "node_modules/react-router-dom/node_modules/@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.3.tgz", + "integrity": "sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==", "engines": { "node": ">=14.0.0" } }, "node_modules/react-router/node_modules/@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.3.tgz", + "integrity": "sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==", "engines": { "node": ">=14.0.0" } @@ -9648,9 +8668,9 @@ } }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { "inherits": "^2.0.3", @@ -9665,7 +8685,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, "dependencies": { "picomatch": "^2.2.1" }, @@ -9673,21 +8692,19 @@ "node": ">=8.10.0" } }, - "node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true - }, - "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "node_modules/reflect.getprototypeof": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", + "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" }, "engines": { "node": ">= 0.4" @@ -9696,16 +8713,28 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", + "dev": true + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" + }, "engines": { - "node": ">=8" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/mysticatea" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/remark-frontmatter": { @@ -9753,6 +8782,16 @@ "node": ">=12.2.0" } }, + "node_modules/remark-mdx-frontmatter/node_modules/estree-util-is-identifier-name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz", + "integrity": "sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/remark-parse": { "version": "10.0.2", "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz", @@ -9784,14 +8823,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/remix": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/remix/-/remix-2.3.0.tgz", - "integrity": "sha512-jI7nWAcp5WyfWiT3yoEx59T+JuGf61vlka0K4dsJybr0LAgWgsuY3RsuZ5MhK66zh4wkeC5G3dsb295tu58MhQ==", - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/require-like": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", @@ -9801,19 +8832,10 @@ "node": "*" } }, - "node_modules/requireindex": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz", - "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==", - "dev": true, - "engines": { - "node": ">=0.10.5" - } - }, "node_modules/resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, "dependencies": { "is-core-module": "^2.13.0", @@ -9901,35 +8923,80 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rollup": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.27.2.tgz", - "integrity": "sha512-YGwmHf7h2oUHkVBT248x0yt6vZkYQ3/rvE5iQuVBh3WO8GcJ6BNeOkpoX1yMHIiBm18EMLjBPIoUDkhgnyxGOQ==", + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "bin": { - "rollup": "dist/bin/rollup" + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": ">=14.18.0", - "npm": ">=8.0.0" + "node": "*" }, - "optionalDependencies": { - "fsevents": "~2.3.2" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/run-applescript": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", - "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", + "node_modules/rimraf/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { - "execa": "^5.0.0" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=12" + "node": "*" + } + }, + "node_modules/rollup": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.1.tgz", + "integrity": "sha512-4LnHSdd3QK2pa1J6dFbfm1HN0D7vSK/ZuZTsdyUAlA6Rr1yTouUTL13HaDOGJVgby461AhrNGBS7sCGXXtT+SA==", + "dev": true, + "dependencies": { + "@types/estree": "1.0.5" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.14.1", + "@rollup/rollup-android-arm64": "4.14.1", + "@rollup/rollup-darwin-arm64": "4.14.1", + "@rollup/rollup-darwin-x64": "4.14.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.14.1", + "@rollup/rollup-linux-arm64-gnu": "4.14.1", + "@rollup/rollup-linux-arm64-musl": "4.14.1", + "@rollup/rollup-linux-powerpc64le-gnu": "4.14.1", + "@rollup/rollup-linux-riscv64-gnu": "4.14.1", + "@rollup/rollup-linux-s390x-gnu": "4.14.1", + "@rollup/rollup-linux-x64-gnu": "4.14.1", + "@rollup/rollup-linux-x64-musl": "4.14.1", + "@rollup/rollup-win32-arm64-msvc": "4.14.1", + "@rollup/rollup-win32-ia32-msvc": "4.14.1", + "@rollup/rollup-win32-x64-msvc": "4.14.1", + "fsevents": "~2.3.2" } }, "node_modules/run-parallel": { @@ -9968,13 +9035,13 @@ } }, "node_modules/safe-array-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", - "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -9985,28 +9052,24 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/safe-array-concat/node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10014,8 +9077,7 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/scheduler": { "version": "0.23.0", @@ -10026,9 +9088,9 @@ } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -10040,11 +9102,28 @@ "node": ">=10" } }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/send": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dev": true, "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -10068,7 +9147,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -10076,20 +9154,17 @@ "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "dev": true, "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -10105,11 +9180,41 @@ "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==" }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "node_modules/shebang-command": { "version": "2.0.0", @@ -10133,13 +9238,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10161,18 +9270,17 @@ } }, "node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", "engines": { "node": ">= 8" } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "engines": { "node": ">=0.10.0" } @@ -10215,9 +9323,9 @@ } }, "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", "dev": true }, "node_modules/spdx-expression-parse": { @@ -10231,9 +9339,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", - "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", + "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", "dev": true }, "node_modules/ssri": { @@ -10252,15 +9360,14 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true, "engines": { "node": ">= 0.8" } }, "node_modules/stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz", + "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==", "dev": true }, "node_modules/stream-slice": { @@ -10369,33 +9476,41 @@ } }, "node_modules/string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", - "side-channel": "^1.0.4" + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -10405,37 +9520,40 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/stringify-entities": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz", - "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz", + "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==", "dev": true, "dependencies": { "character-entities-html4": "^2.0.0", @@ -10474,7 +9592,7 @@ "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, "engines": { "node": ">=4" @@ -10511,14 +9629,14 @@ } }, "node_modules/sucrase": { - "version": "3.34.0", - "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", - "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", + "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", - "glob": "7.1.6", + "glob": "^10.3.10", "lines-and-columns": "^1.1.6", "mz": "^2.7.0", "pirates": "^4.0.1", @@ -10529,27 +9647,7 @@ "sucrase-node": "bin/sucrase-node" }, "engines": { - "node": ">=8" - } - }, - "node_modules/sucrase/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=16 || 14 >=14.17" } }, "node_modules/supports-color": { @@ -10576,32 +9674,10 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/synckit": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", - "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", - "dev": true, - "dependencies": { - "@pkgr/utils": "^2.3.1", - "tslib": "^2.5.0" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" - } - }, - "node_modules/synckit/node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - }, "node_modules/tailwindcss": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", - "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz", + "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==", "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -10609,10 +9685,10 @@ "chokidar": "^3.5.3", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.12", + "fast-glob": "^3.3.0", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "jiti": "^1.18.2", + "jiti": "^1.21.0", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", @@ -10635,34 +9711,6 @@ "node": ">=14.0.0" } }, - "node_modules/tailwindcss/node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/tailwindcss/node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/tailwindcss/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -10675,6 +9723,15 @@ "node": ">=10.13.0" } }, + "node_modules/tailwindcss/node_modules/lilconfig": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -10685,9 +9742,9 @@ } }, "node_modules/tar": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", - "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, "dependencies": { "chownr": "^2.0.0", @@ -10778,10 +9835,16 @@ "node": ">=8" } }, + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, "node_modules/thenify": { @@ -10815,10 +9878,16 @@ "xtend": "~4.0.1" } }, + "node_modules/through2/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "node_modules/through2/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "dependencies": { "core-util-is": "~1.0.0", @@ -10844,22 +9913,10 @@ "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" }, - "node_modules/titleize": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", - "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, "engines": { "node": ">=4" @@ -10869,7 +9926,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -10881,7 +9937,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true, "engines": { "node": ">=0.6" } @@ -10892,12 +9947,6 @@ "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==", "dev": true }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, "node_modules/trim-lines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", @@ -10909,9 +9958,9 @@ } }, "node_modules/trough": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz", - "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz", + "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==", "dev": true, "funding": { "type": "github", @@ -10919,12 +9968,12 @@ } }, "node_modules/ts-api-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", - "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", "dev": true, "engines": { - "node": ">=16.13.0" + "node": ">=16" }, "peerDependencies": { "typescript": ">=4.2.0" @@ -10936,39 +9985,38 @@ "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", "dev": true }, - "node_modules/tsconfig-paths": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz", - "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==", + "node_modules/tsconfck": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.0.3.tgz", + "integrity": "sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA==", "dev": true, - "dependencies": { - "json5": "^2.2.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" + "bin": { + "tsconfck": "bin/tsconfck.js" }, "engines": { - "node": ">=6" + "node": "^18 || >=20" + }, + "peerDependencies": { + "typescript": "^5.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", "dev": true, "dependencies": { - "tslib": "^1.8.1" + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" }, "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + "node": ">=6" } }, "node_modules/type-check": { @@ -10983,43 +10031,55 @@ "node": ">= 0.8.0" } }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" }, "engines": { "node": ">= 0.6" } }, "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -11029,16 +10089,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -11048,23 +10109,29 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "devOptional": true, "bin": { "tsc": "bin/tsc", @@ -11075,9 +10142,9 @@ } }, "node_modules/ufo": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.2.0.tgz", - "integrity": "sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz", + "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==", "dev": true }, "node_modules/unbox-primitive": { @@ -11095,17 +10162,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/undici": { - "version": "5.27.2", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.27.2.tgz", - "integrity": "sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==", - "dev": true, - "dependencies": { - "@fastify/busboy": "^2.0.0" - }, - "engines": { - "node": ">=14.0" - } + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true }, "node_modules/unified": { "version": "10.1.2", @@ -11127,9 +10188,9 @@ } }, "node_modules/unified/node_modules/is-plain-obj": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.0.0.tgz", - "integrity": "sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", + "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==", "dev": true, "engines": { "node": ">=12" @@ -11226,9 +10287,9 @@ } }, "node_modules/unist-util-stringify-position": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz", - "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz", + "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==", "dev": true, "dependencies": { "@types/unist": "^2.0.0" @@ -11268,9 +10329,9 @@ } }, "node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, "engines": { "node": ">= 10.0.0" @@ -11280,24 +10341,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, "engines": { "node": ">= 0.8" } }, - "node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -11348,14 +10399,13 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true, "engines": { "node": ">= 0.4.0" } @@ -11404,15 +10454,14 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, "engines": { "node": ">= 0.8" } }, "node_modules/vfile": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.2.tgz", - "integrity": "sha512-w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz", + "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==", "dev": true, "dependencies": { "@types/unist": "^2.0.0", @@ -11426,9 +10475,9 @@ } }, "node_modules/vfile-message": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz", - "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz", + "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==", "dev": true, "dependencies": { "@types/unist": "^2.0.0", @@ -11440,29 +10489,29 @@ } }, "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", + "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", "dev": true, "dependencies": { - "esbuild": "^0.18.10", - "postcss": "^8.4.27", - "rollup": "^3.27.1" + "esbuild": "^0.20.1", + "postcss": "^8.4.38", + "rollup": "^4.13.0" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "^18.0.0 || >=20.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" }, "optionalDependencies": { - "fsevents": "~2.3.2" + "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": ">= 14", + "@types/node": "^18.0.0 || >=20.0.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", @@ -11495,43 +10544,50 @@ } }, "node_modules/vite-node": { - "version": "0.28.5", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.28.5.tgz", - "integrity": "sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.4.0.tgz", + "integrity": "sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==", "dev": true, "dependencies": { "cac": "^6.7.14", "debug": "^4.3.4", - "mlly": "^1.1.0", - "pathe": "^1.1.0", + "pathe": "^1.1.1", "picocolors": "^1.0.0", - "source-map": "^0.6.1", - "source-map-support": "^0.5.21", - "vite": "^3.0.0 || ^4.0.0" + "vite": "^5.0.0" }, "bin": { "vite-node": "vite-node.mjs" }, "engines": { - "node": ">=v14.16.0" + "node": "^18.0.0 || >=20.0.0" }, "funding": { - "url": "https://github.com/sponsors/antfu" + "url": "https://opencollective.com/vitest" } }, - "node_modules/vite-node/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "node_modules/vite-tsconfig-paths": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz", + "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==", "dev": true, - "engines": { - "node": ">=0.10.0" + "dependencies": { + "debug": "^4.1.1", + "globrex": "^0.1.2", + "tsconfck": "^3.0.3" + }, + "peerDependencies": { + "vite": "*" + }, + "peerDependenciesMeta": { + "vite": { + "optional": true + } } }, "node_modules/vite/node_modules/@esbuild/android-arm": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.19.tgz", - "integrity": "sha512-1uOoDurJYh5MNqPqpj3l/TQCI1V25BXgChEldCB7D6iryBYqYKrbZIhYO5AI9fulf66sM8UJpc3UcCly2Tv28w==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ "arm" ], @@ -11545,9 +10601,9 @@ } }, "node_modules/vite/node_modules/@esbuild/android-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.19.tgz", - "integrity": "sha512-4+jkUFQxZkQfQOOxfGVZB38YUWHMJX2ihZwF+2nh8m7bHdWXpixiurgGRN3c/KMSwlltbYI0/i929jwBRMFzbA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "cpu": [ "arm64" ], @@ -11561,9 +10617,9 @@ } }, "node_modules/vite/node_modules/@esbuild/android-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.19.tgz", - "integrity": "sha512-ae5sHYiP/Ogj2YNrLZbWkBmyHIDOhPgpkGvFnke7XFGQldBDWvc/AyYwSLpNuKw9UNkgnLlB/jPpnBmlF3G9Bg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "cpu": [ "x64" ], @@ -11577,9 +10633,9 @@ } }, "node_modules/vite/node_modules/@esbuild/darwin-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.19.tgz", - "integrity": "sha512-HIpQvNQWFYROmWDANMRL+jZvvTQGOiTuwWBIuAsMaQrnStedM+nEKJBzKQ6bfT9RFKH2wZ+ej+DY7+9xHBTFPg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" ], @@ -11593,9 +10649,9 @@ } }, "node_modules/vite/node_modules/@esbuild/darwin-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.19.tgz", - "integrity": "sha512-m6JdvXJQt0thNLIcWOeG079h2ivhYH4B5sVCgqb/B29zTcFd7EE8/J1nIUHhdtwGeItdUeqKaqqb4towwxvglQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "cpu": [ "x64" ], @@ -11609,9 +10665,9 @@ } }, "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.19.tgz", - "integrity": "sha512-G0p4EFMPZhGn/xVNspUyMQbORH3nlKTV0bFNHPIwLraBuAkTeMyxNviTe0ZXUbIXQrR1lrwniFjNFU4s+x7veQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "cpu": [ "arm64" ], @@ -11625,9 +10681,9 @@ } }, "node_modules/vite/node_modules/@esbuild/freebsd-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.19.tgz", - "integrity": "sha512-hBxgRlG42+W+j/1/cvlnSa+3+OBKeDCyO7OG2ICya1YJaSCYfSpuG30KfOnQHI7Ytgu4bRqCgrYXxQEzy0zM5Q==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "cpu": [ "x64" ], @@ -11641,9 +10697,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-arm": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.19.tgz", - "integrity": "sha512-qtWyoQskfJlb9MD45mvzCEKeO4uCnDZ7lPFeNqbfaaJHqBiH9qA5Vu2EuckqYZuFMJWy1l4dxTf9NOulCVfUjg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "cpu": [ "arm" ], @@ -11657,9 +10713,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.19.tgz", - "integrity": "sha512-X8g33tczY0GsJq3lhyBrjnFtaKjWVpp1gMq5IlF9BQJ3TUfSK74nQnz9mRIEejmcV+OIYn6bkOJeUaU1Knrljg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "cpu": [ "arm64" ], @@ -11673,9 +10729,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-ia32": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.19.tgz", - "integrity": "sha512-SAkRWJgb+KN+gOhmbiE6/wu23D6HRcGQi15cB13IVtBZZgXxygTV5GJlUAKLQ5Gcx0gtlmt+XIxEmSqA6sZTOw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "cpu": [ "ia32" ], @@ -11689,9 +10745,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-loong64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.19.tgz", - "integrity": "sha512-YLAslaO8NsB9UOxBchos82AOMRDbIAWChwDKfjlGrHSzS3v1kxce7dGlSTsrb0PJwo1KYccypN3VNjQVLtz7LA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "cpu": [ "loong64" ], @@ -11705,9 +10761,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-mips64el": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.19.tgz", - "integrity": "sha512-vSYFtlYds/oTI8aflEP65xo3MXChMwBOG1eWPGGKs/ev9zkTeXVvciU+nifq8J1JYMz+eQ4J9JDN0O2RKF8+1Q==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "cpu": [ "mips64el" ], @@ -11721,9 +10777,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-ppc64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.19.tgz", - "integrity": "sha512-tgG41lRVwlzqO9tv9l7aXYVw35BxKXLtPam1qALScwSqPivI8hjkZLNH0deaaSCYCFT9cBIdB+hUjWFlFFLL9A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "cpu": [ "ppc64" ], @@ -11737,9 +10793,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-riscv64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.19.tgz", - "integrity": "sha512-EgBZFLoN1S5RuB4cCJI31pBPsjE1nZ+3+fHRjguq9Ibrzo29bOLSBcH1KZJvRNh5qtd+fcYIGiIUia8Jw5r1lQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "cpu": [ "riscv64" ], @@ -11753,9 +10809,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-s390x": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.19.tgz", - "integrity": "sha512-q1V1rtHRojAzjSigZEqrcLkpfh5K09ShCoIsdTakozVBnM5rgV58PLFticqDp5UJ9uE0HScov9QNbbl8HBo6QQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "cpu": [ "s390x" ], @@ -11769,9 +10825,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.19.tgz", - "integrity": "sha512-D0IiYjpZRXxGZLQfsydeAD7ZWqdGyFLBj5f2UshJpy09WPs3qizDCsEr8zyzcym6Woj/UI9ZzMIXwvoXVtyt0A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "cpu": [ "x64" ], @@ -11785,9 +10841,9 @@ } }, "node_modules/vite/node_modules/@esbuild/netbsd-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.19.tgz", - "integrity": "sha512-3tt3SOS8L3D54R8oER41UdDshlBIAjYhdWRPiZCTZ1E41+shIZBpTjaW5UaN/jD1ENE/Ok5lkeqhoNMbxstyxw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "cpu": [ "x64" ], @@ -11801,9 +10857,9 @@ } }, "node_modules/vite/node_modules/@esbuild/openbsd-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.19.tgz", - "integrity": "sha512-MxbhcuAYQPlfln1EMc4T26OUoeg/YQc6wNoEV8xvktDKZhLtBxjkoeESSo9BbPaGKhAPzusXYj5n8n5A8iZSrA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "cpu": [ "x64" ], @@ -11817,9 +10873,9 @@ } }, "node_modules/vite/node_modules/@esbuild/sunos-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.19.tgz", - "integrity": "sha512-m0/UOq1wj25JpWqOJxoWBRM9VWc3c32xiNzd+ERlYstUZ6uwx5SZsQUtkiFHaYmcaoj+f6+Tfcl7atuAz3idwQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "cpu": [ "x64" ], @@ -11833,9 +10889,9 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.19.tgz", - "integrity": "sha512-L4vb6pcoB1cEcXUHU6EPnUhUc4+/tcz4OqlXTWPcSQWxegfmcOprhmIleKKwmMNQVc4wrx/+jB7tGkjjDmiupg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "cpu": [ "arm64" ], @@ -11849,9 +10905,9 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-ia32": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.19.tgz", - "integrity": "sha512-rQng7LXSKdrDlNDb7/v0fujob6X0GAazoK/IPd9C3oShr642ri8uIBkgM37/l8B3Rd5sBQcqUXoDdEy75XC/jg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "cpu": [ "ia32" ], @@ -11865,9 +10921,9 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.19.tgz", - "integrity": "sha512-z69jhyG20Gq4QL5JKPLqUT+eREuqnDAFItLbza4JCmpvUnIlY73YNjd5djlO7kBiiZnvTnJuAbOjIoZIOa1GjA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "cpu": [ "x64" ], @@ -11881,9 +10937,9 @@ } }, "node_modules/vite/node_modules/esbuild": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.19.tgz", - "integrity": "sha512-ra3CaIKCzJp5bU5BDfrCc0FRqKj71fQi+gbld0aj6lN0ifuX2fWJYPgLVLGwPfA+ruKna+OWwOvf/yHj6n+i0g==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, "bin": { @@ -11893,28 +10949,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.19", - "@esbuild/android-arm64": "0.18.19", - "@esbuild/android-x64": "0.18.19", - "@esbuild/darwin-arm64": "0.18.19", - "@esbuild/darwin-x64": "0.18.19", - "@esbuild/freebsd-arm64": "0.18.19", - "@esbuild/freebsd-x64": "0.18.19", - "@esbuild/linux-arm": "0.18.19", - "@esbuild/linux-arm64": "0.18.19", - "@esbuild/linux-ia32": "0.18.19", - "@esbuild/linux-loong64": "0.18.19", - "@esbuild/linux-mips64el": "0.18.19", - "@esbuild/linux-ppc64": "0.18.19", - "@esbuild/linux-riscv64": "0.18.19", - "@esbuild/linux-s390x": "0.18.19", - "@esbuild/linux-x64": "0.18.19", - "@esbuild/netbsd-x64": "0.18.19", - "@esbuild/openbsd-x64": "0.18.19", - "@esbuild/sunos-x64": "0.18.19", - "@esbuild/win32-arm64": "0.18.19", - "@esbuild/win32-ia32": "0.18.19", - "@esbuild/win32-x64": "0.18.19" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "node_modules/wcwidth": { @@ -11938,42 +10995,26 @@ } }, "node_modules/web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", + "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", "engines": { "node": ">= 8" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" }, "bin": { - "node-which": "bin/node-which" + "node-which": "bin/which.js" }, "engines": { - "node": ">= 8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/which-boxed-primitive": { @@ -11992,16 +11033,60 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dev": true, + "dependencies": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -12107,13 +11192,13 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "node_modules/ws": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", - "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", "dev": true, "engines": { "node": ">=8.3.0" @@ -12141,16 +11226,19 @@ } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, "node_modules/yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz", + "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==", "dev": true, + "bin": { + "yaml": "bin.mjs" + }, "engines": { "node": ">= 14" } @@ -12168,9 +11256,9 @@ } }, "node_modules/zod": { - "version": "3.21.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz", - "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==", + "version": "3.22.4", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz", + "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -12185,8436 +11273,5 @@ "url": "https://github.com/sponsors/wooorm" } } - }, - "dependencies": { - "@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true - }, - "@alloc/quick-lru": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", - "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", - "dev": true - }, - "@ampproject/remapping": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", - "dev": true, - "requires": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", - "dev": true - }, - "@babel/core": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", - "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.1" - }, - "dependencies": { - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - } - } - }, - "@babel/eslint-parser": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.9.tgz", - "integrity": "sha512-xdMkt39/nviO/4vpVdrEYPwXCsYIXSSAr6mC7WQsNIlGnuxKyKE7GZjalcnbSWiC4OXGNNN3UQPeHfjSC6sTDA==", - "dev": true, - "requires": { - "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", - "eslint-visitor-keys": "^2.1.0", - "semver": "^6.3.1" - }, - "dependencies": { - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - } - } - }, - "@babel/generator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", - "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", - "dev": true, - "requires": { - "@babel/types": "^7.23.3", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - }, - "dependencies": { - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - } - } - }, - "@babel/helper-annotate-as-pure": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", - "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", - "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.9", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - } - } - }, - "@babel/helper-create-class-features-plugin": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz", - "integrity": "sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", - "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.9", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "semver": "^6.3.1" - }, - "dependencies": { - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - } - } - }, - "@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", - "dev": true - }, - "@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", - "dev": true, - "requires": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz", - "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", - "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", - "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", - "dev": true - }, - "@babel/helper-replace-supers": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz", - "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", - "@babel/helper-optimise-call-expression": "^7.22.5" - } - }, - "@babel/helper-simple-access": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", - "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", - "dev": true - }, - "@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", - "dev": true, - "requires": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" - } - }, - "@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.22.20", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", - "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", - "dev": true - }, - "@babel/plugin-syntax-decorators": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz", - "integrity": "sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.22.5" - } - }, - "@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.22.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", - "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.22.5" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz", - "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.22.5", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-simple-access": "^7.22.5" - } - }, - "@babel/plugin-transform-react-display-name": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz", - "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-react-jsx": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz", - "integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "@babel/plugin-syntax-jsx": "^7.18.6", - "@babel/types": "^7.19.0" - } - }, - "@babel/plugin-transform-react-jsx-development": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz", - "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==", - "dev": true, - "requires": { - "@babel/plugin-transform-react-jsx": "^7.18.6" - } - }, - "@babel/plugin-transform-react-pure-annotations": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz", - "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-typescript": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.9.tgz", - "integrity": "sha512-BnVR1CpKiuD0iobHPaM1iLvcwPYN2uVFAqoLVSpEDKWuOikoCv5HbKLxclhKYUXlWkX86DoZGtqI4XhbOsyrMg==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.9", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-typescript": "^7.22.5" - } - }, - "@babel/preset-react": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz", - "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-transform-react-display-name": "^7.18.6", - "@babel/plugin-transform-react-jsx": "^7.18.6", - "@babel/plugin-transform-react-jsx-development": "^7.18.6", - "@babel/plugin-transform-react-pure-annotations": "^7.18.6" - } - }, - "@babel/preset-typescript": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz", - "integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", - "@babel/plugin-syntax-jsx": "^7.22.5", - "@babel/plugin-transform-modules-commonjs": "^7.22.5", - "@babel/plugin-transform-typescript": "^7.22.5" - } - }, - "@babel/runtime": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz", - "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.11" - } - }, - "@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" - } - }, - "@babel/traverse": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", - "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.3", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.3", - "@babel/types": "^7.23.3", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", - "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", - "to-fast-properties": "^2.0.0" - } - }, - "@emotion/hash": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", - "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==", - "dev": true - }, - "@esbuild/android-arm": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.6.tgz", - "integrity": "sha512-bSC9YVUjADDy1gae8RrioINU6e1lCkg3VGVwm0QQ2E1CWcC4gnMce9+B6RpxuSsrsXsk1yojn7sp1fnG8erE2g==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.6.tgz", - "integrity": "sha512-YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.6.tgz", - "integrity": "sha512-MVcYcgSO7pfu/x34uX9u2QIZHmXAB7dEiLQC5bBl5Ryqtpj9lT2sg3gNDEsrPEmimSJW2FXIaxqSQ501YLDsZQ==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.6.tgz", - "integrity": "sha512-bsDRvlbKMQMt6Wl08nHtFz++yoZHsyTOxnjfB2Q95gato+Yi4WnRl13oC2/PJJA9yLCoRv9gqT/EYX0/zDsyMA==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.6.tgz", - "integrity": "sha512-xh2A5oPrYRfMFz74QXIQTQo8uA+hYzGWJFoeTE8EvoZGHb+idyV4ATaukaUvnnxJiauhs/fPx3vYhU4wiGfosg==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.6.tgz", - "integrity": "sha512-EnUwjRc1inT4ccZh4pB3v1cIhohE2S4YXlt1OvI7sw/+pD+dIE4smwekZlEPIwY6PhU6oDWwITrQQm5S2/iZgg==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.6.tgz", - "integrity": "sha512-Uh3HLWGzH6FwpviUcLMKPCbZUAFzv67Wj5MTwK6jn89b576SR2IbEp+tqUHTr8DIl0iDmBAf51MVaP7pw6PY5Q==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.6.tgz", - "integrity": "sha512-7YdGiurNt7lqO0Bf/U9/arrPWPqdPqcV6JCZda4LZgEn+PTQ5SMEI4MGR52Bfn3+d6bNEGcWFzlIxiQdS48YUw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.6.tgz", - "integrity": "sha512-bUR58IFOMJX523aDVozswnlp5yry7+0cRLCXDsxnUeQYJik1DukMY+apBsLOZJblpH+K7ox7YrKrHmJoWqVR9w==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.6.tgz", - "integrity": "sha512-ujp8uoQCM9FRcbDfkqECoARsLnLfCUhKARTP56TFPog8ie9JG83D5GVKjQ6yVrEVdMie1djH86fm98eY3quQkQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.6.tgz", - "integrity": "sha512-y2NX1+X/Nt+izj9bLoiaYB9YXT/LoaQFYvCkVD77G/4F+/yuVXYCWz4SE9yr5CBMbOxOfBcy/xFL4LlOeNlzYQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.6.tgz", - "integrity": "sha512-09AXKB1HDOzXD+j3FdXCiL/MWmZP0Ex9eR8DLMBVcHorrWJxWmY8Nms2Nm41iRM64WVx7bA/JVHMv081iP2kUA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.6.tgz", - "integrity": "sha512-AmLhMzkM8JuqTIOhxnX4ubh0XWJIznEynRnZAVdA2mMKE6FAfwT2TWKTwdqMG+qEaeyDPtfNoZRpJbD4ZBv0Tg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.6.tgz", - "integrity": "sha512-Y4Ri62PfavhLQhFbqucysHOmRamlTVK10zPWlqjNbj2XMea+BOs4w6ASKwQwAiqf9ZqcY9Ab7NOU4wIgpxwoSQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.6.tgz", - "integrity": "sha512-SPUiz4fDbnNEm3JSdUW8pBJ/vkop3M1YwZAVwvdwlFLoJwKEZ9L98l3tzeyMzq27CyepDQ3Qgoba44StgbiN5Q==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.6.tgz", - "integrity": "sha512-a3yHLmOodHrzuNgdpB7peFGPx1iJ2x6m+uDvhP2CKdr2CwOaqEFMeSqYAHU7hG+RjCq8r2NFujcd/YsEsFgTGw==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.6.tgz", - "integrity": "sha512-EanJqcU/4uZIBreTrnbnre2DXgXSa+Gjap7ifRfllpmyAU7YMvaXmljdArptTHmjrkkKm9BK6GH5D5Yo+p6y5A==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.6.tgz", - "integrity": "sha512-xaxeSunhQRsTNGFanoOkkLtnmMn5QbA0qBhNet/XLVsc+OVkpIWPHcr3zTW2gxVU5YOHFbIHR9ODuaUdNza2Vw==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.6.tgz", - "integrity": "sha512-gnMnMPg5pfMkZvhHee21KbKdc6W3GR8/JuE0Da1kjwpK6oiFU3nqfHuVPgUX2rsOx9N2SadSQTIYV1CIjYG+xw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.6.tgz", - "integrity": "sha512-G95n7vP1UnGJPsVdKXllAJPtqjMvFYbN20e8RK8LVLhlTiSOH1sd7+Gt7rm70xiG+I5tM58nYgwWrLs6I1jHqg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.6.tgz", - "integrity": "sha512-96yEFzLhq5bv9jJo5JhTs1gI+1cKQ83cUpyxHuGqXVwQtY5Eq54ZEsKs8veKtiKwlrNimtckHEkj4mRh4pPjsg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.6.tgz", - "integrity": "sha512-n6d8MOyUrNp6G4VSpRcgjs5xj4A91svJSaiwLIDWVWEsZtpN5FA9NlBbZHDmAJc2e8e6SF4tkBD3HAvPF+7igA==", - "dev": true, - "optional": true - }, - "@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^3.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - } - } - }, - "@eslint-community/regexpp": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", - "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", - "dev": true - }, - "@eslint/eslintrc": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz", - "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - } - } - }, - "@eslint/js": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz", - "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==", - "dev": true - }, - "@fastify/busboy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", - "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==", - "dev": true - }, - "@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" - } - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true - }, - "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "requires": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - } - } - }, - "@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "dev": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - }, - "dependencies": { - "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - } - } - }, - "@jspm/core": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz", - "integrity": "sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==", - "dev": true - }, - "@mdx-js/mdx": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-2.3.0.tgz", - "integrity": "sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==", - "dev": true, - "requires": { - "@types/estree-jsx": "^1.0.0", - "@types/mdx": "^2.0.0", - "estree-util-build-jsx": "^2.0.0", - "estree-util-is-identifier-name": "^2.0.0", - "estree-util-to-js": "^1.1.0", - "estree-walker": "^3.0.0", - "hast-util-to-estree": "^2.0.0", - "markdown-extensions": "^1.0.0", - "periscopic": "^3.0.0", - "remark-mdx": "^2.0.0", - "remark-parse": "^10.0.0", - "remark-rehype": "^10.0.0", - "unified": "^10.0.0", - "unist-util-position-from-estree": "^1.0.0", - "unist-util-stringify-position": "^3.0.0", - "unist-util-visit": "^4.0.0", - "vfile": "^5.0.0" - }, - "dependencies": { - "estree-util-is-identifier-name": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", - "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", - "dev": true - } - } - }, - "@nicolo-ribaudo/eslint-scope-5-internals": { - "version": "5.1.1-v1", - "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", - "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", - "dev": true, - "requires": { - "eslint-scope": "5.1.1" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", - "dev": true, - "requires": { - "semver": "^7.3.5" - } - }, - "@npmcli/git": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", - "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", - "dev": true, - "requires": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@npmcli/package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha512-lRCEGdHZomFsURroh522YvA/2cVb9oPIJrjHanCJZkiasz1BzcnLr3tBJhlV7S86MBJBuAQ33is2D60YitZL2Q==", - "dev": true, - "requires": { - "@npmcli/git": "^4.1.0", - "glob": "^10.2.2", - "hosted-git-info": "^6.1.1", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "proc-log": "^3.0.0", - "semver": "^7.5.3" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", - "dev": true, - "requires": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - } - }, - "minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, - "@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "requires": { - "which": "^3.0.0" - }, - "dependencies": { - "which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "optional": true - }, - "@pkgr/utils": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", - "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "fast-glob": "^3.3.0", - "is-glob": "^4.0.3", - "open": "^9.1.0", - "picocolors": "^1.0.0", - "tslib": "^2.6.0" - }, - "dependencies": { - "fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - } - } - }, - "@remix-run/css-bundle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-2.3.0.tgz", - "integrity": "sha512-+qjS0bk716XYEtcwrCMgFkZkreOHQN70L5+ItQyNyIxeTbuwBuBzu7239p6Scg9I9A3nV+NtxpKYHzL/qB1XKA==" - }, - "@remix-run/dev": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.3.0.tgz", - "integrity": "sha512-Eno0XHyIKo5GyzN4OAwNkgkyl4H1mLWbqeVUA8T5HmVDj+8qJLIcYeayS2BmA1KYAHJBiy5ufAGi2MpaXMjKww==", - "dev": true, - "requires": { - "@babel/core": "^7.21.8", - "@babel/generator": "^7.21.5", - "@babel/parser": "^7.21.8", - "@babel/plugin-syntax-decorators": "^7.22.10", - "@babel/plugin-syntax-jsx": "^7.21.4", - "@babel/preset-typescript": "^7.21.5", - "@babel/traverse": "^7.23.2", - "@babel/types": "^7.22.5", - "@mdx-js/mdx": "^2.3.0", - "@npmcli/package-json": "^4.0.1", - "@remix-run/node": "2.3.0", - "@remix-run/router": "1.12.0-pre.0", - "@remix-run/server-runtime": "2.3.0", - "@types/mdx": "^2.0.5", - "@vanilla-extract/integration": "^6.2.0", - "arg": "^5.0.1", - "cacache": "^17.1.3", - "chalk": "^4.1.2", - "chokidar": "^3.5.1", - "cross-spawn": "^7.0.3", - "dotenv": "^16.0.0", - "es-module-lexer": "^1.3.1", - "esbuild": "0.17.6", - "esbuild-plugins-node-modules-polyfill": "^1.6.0", - "execa": "5.1.1", - "exit-hook": "2.2.1", - "express": "^4.17.1", - "fs-extra": "^10.0.0", - "get-port": "^5.1.1", - "gunzip-maybe": "^1.4.2", - "jsesc": "3.0.2", - "json5": "^2.2.2", - "lodash": "^4.17.21", - "lodash.debounce": "^4.0.8", - "minimatch": "^9.0.0", - "node-fetch": "^2.6.9", - "ora": "^5.4.1", - "parse-multipart-data": "^1.5.0", - "picocolors": "^1.0.0", - "picomatch": "^2.3.1", - "pidtree": "^0.6.0", - "postcss": "^8.4.19", - "postcss-discard-duplicates": "^5.1.0", - "postcss-load-config": "^4.0.1", - "postcss-modules": "^6.0.0", - "prettier": "^2.7.1", - "pretty-ms": "^7.0.1", - "react-refresh": "^0.14.0", - "remark-frontmatter": "4.0.1", - "remark-mdx-frontmatter": "^1.0.1", - "semver": "^7.3.7", - "set-cookie-parser": "^2.6.0", - "tar-fs": "^2.1.1", - "tsconfig-paths": "^4.0.0", - "undici": "^5.22.1", - "ws": "^7.4.5" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "pidtree": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", - "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", - "dev": true - }, - "prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true - } - } - }, - "@remix-run/eslint-config": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-2.3.0.tgz", - "integrity": "sha512-iyuNO7tRjevLjwGH4nLv/6g5NROhUXIQHTNjTUhQjEkHac4/kp3EOnnQEtGmMUfLruTyz6OoOJQzTkT3l14VvQ==", - "dev": true, - "requires": { - "@babel/core": "^7.21.8", - "@babel/eslint-parser": "^7.21.8", - "@babel/preset-react": "^7.18.6", - "@rushstack/eslint-patch": "^1.2.0", - "@typescript-eslint/eslint-plugin": "^5.59.0", - "@typescript-eslint/parser": "^5.59.0", - "eslint-import-resolver-node": "0.3.7", - "eslint-import-resolver-typescript": "^3.5.4", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-jest": "^26.9.0", - "eslint-plugin-jest-dom": "^4.0.3", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-react": "^7.32.2", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-testing-library": "^5.10.2" - }, - "dependencies": { - "@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", - "dev": true, - "requires": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "debug": "^4.3.4" - } - }, - "@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", - "dev": true, - "requires": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - } - }, - "eslint-plugin-jest": { - "version": "26.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.9.0.tgz", - "integrity": "sha512-TWJxWGp1J628gxh2KhaH1H1paEdgE2J61BBF1I59c6xWeL5+D1BzMxGDN/nXAfX+aSkR5u80K+XhskK6Gwq9ng==", - "dev": true, - "requires": { - "@typescript-eslint/utils": "^5.10.0" - } - } - } - }, - "@remix-run/express": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-2.3.0.tgz", - "integrity": "sha512-XSIR5H3YQ/anitOrp0m8PI7wqJ1Rri7LS2sHkwl8N9i+TKmZLkMAqg8SoSIaaxl/rMlA9gRCSC1msOHKw5xvzw==", - "dev": true, - "requires": { - "@remix-run/node": "2.3.0" - } - }, - "@remix-run/node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.3.0.tgz", - "integrity": "sha512-WQybWc1EWPLMD/btDtchVrhoLvz/ek6MB0gr2cV2N3Sxgn1VaJmpsN3+sUA5lK8vR2S/kOmGun2Ut3tKi8TKHg==", - "requires": { - "@remix-run/server-runtime": "2.3.0", - "@remix-run/web-fetch": "^4.4.1", - "@remix-run/web-file": "^3.1.0", - "@remix-run/web-stream": "^1.1.0", - "@web3-storage/multipart-parser": "^1.0.0", - "cookie-signature": "^1.1.0", - "source-map-support": "^0.5.21", - "stream-slice": "^0.1.2" - } - }, - "@remix-run/react": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.3.0.tgz", - "integrity": "sha512-8sLgNw0wbNx0Gir0CKCqJVlQ8ipKMvTfUAY/sra/jiAkUSztz1HuGXNTV+4yrP9786puiMp9mB+bJqD32SAEPg==", - "requires": { - "@remix-run/router": "1.12.0", - "@remix-run/server-runtime": "2.3.0", - "react-router-dom": "6.19.0" - }, - "dependencies": { - "@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==" - } - } - }, - "@remix-run/router": { - "version": "1.12.0-pre.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0-pre.0.tgz", - "integrity": "sha512-+bBn9KqD2AC0pttSGydVFOZSsT0NqQ1+rGFwMTx9dRANk6oGxrPbKTDxLLikocscGzSL5przvcK4Uxfq8yU7BQ==", - "dev": true - }, - "@remix-run/serve": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.3.0.tgz", - "integrity": "sha512-/Y1xpBlaA47e5Xmz3VxXfnIbK8yn0NzKVeuflVoyvEFK0lOzSpceHc079fADQr3vItWNBzzMaNRZSUSuLY/tQw==", - "dev": true, - "requires": { - "@remix-run/express": "2.3.0", - "@remix-run/node": "2.3.0", - "chokidar": "^3.5.3", - "compression": "^1.7.4", - "express": "^4.17.1", - "get-port": "5.1.1", - "morgan": "^1.10.0", - "source-map-support": "^0.5.21" - } - }, - "@remix-run/server-runtime": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.3.0.tgz", - "integrity": "sha512-9BiRK7VPm5nt/aOlRmeROXWA8HKgqjvQy+f9NNpqvf3jj62EUl0h4eUdyqRj6nNh44I+0XUBG7ZQ2xXTrGJATw==", - "requires": { - "@remix-run/router": "1.12.0", - "@types/cookie": "^0.5.3", - "@web3-storage/multipart-parser": "^1.0.0", - "cookie": "^0.5.0", - "set-cookie-parser": "^2.4.8", - "source-map": "^0.7.3" - }, - "dependencies": { - "@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==" - } - } - }, - "@remix-run/web-blob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@remix-run/web-blob/-/web-blob-3.1.0.tgz", - "integrity": "sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g==", - "requires": { - "@remix-run/web-stream": "^1.1.0", - "web-encoding": "1.1.5" - } - }, - "@remix-run/web-fetch": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.4.1.tgz", - "integrity": "sha512-xMceEGn2kvfeWS91nHSOhEQHPGgjFnmDVpWFZrbWPVdiTByMZIn421/tdSF6Kd1RsNsY+5Iwt3JFEKZHAcMQHw==", - "requires": { - "@remix-run/web-blob": "^3.1.0", - "@remix-run/web-file": "^3.1.0", - "@remix-run/web-form-data": "^3.1.0", - "@remix-run/web-stream": "^1.1.0", - "@web3-storage/multipart-parser": "^1.0.0", - "abort-controller": "^3.0.0", - "data-uri-to-buffer": "^3.0.1", - "mrmime": "^1.0.0" - } - }, - "@remix-run/web-file": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@remix-run/web-file/-/web-file-3.1.0.tgz", - "integrity": "sha512-dW2MNGwoiEYhlspOAXFBasmLeYshyAyhIdrlXBi06Duex5tDr3ut2LFKVj7tyHLmn8nnNwFf1BjNbkQpygC2aQ==", - "requires": { - "@remix-run/web-blob": "^3.1.0" - } - }, - "@remix-run/web-form-data": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@remix-run/web-form-data/-/web-form-data-3.1.0.tgz", - "integrity": "sha512-NdeohLMdrb+pHxMQ/Geuzdp0eqPbea+Ieo8M8Jx2lGC6TBHsgHzYcBvr0LyPdPVycNRDEpWpiDdCOdCryo3f9A==", - "requires": { - "web-encoding": "1.1.5" - } - }, - "@remix-run/web-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@remix-run/web-stream/-/web-stream-1.1.0.tgz", - "integrity": "sha512-KRJtwrjRV5Bb+pM7zxcTJkhIqWWSy+MYsIxHK+0m5atcznsf15YwUBWHWulZerV2+vvHH1Lp1DD7pw6qKW8SgA==", - "requires": { - "web-streams-polyfill": "^3.1.1" - } - }, - "@rushstack/eslint-patch": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz", - "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==", - "dev": true - }, - "@testing-library/dom": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz", - "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/runtime": "^7.12.5", - "@types/aria-query": "^4.2.0", - "aria-query": "^5.0.0", - "chalk": "^4.1.0", - "dom-accessibility-api": "^0.5.9", - "lz-string": "^1.4.4", - "pretty-format": "^27.0.2" - } - }, - "@types/acorn": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.6.tgz", - "integrity": "sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==", - "dev": true, - "requires": { - "@types/estree": "*" - } - }, - "@types/aria-query": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz", - "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==", - "dev": true - }, - "@types/cookie": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.5.4.tgz", - "integrity": "sha512-7z/eR6O859gyWIAjuvBWFzNURmf2oPBmJlfVWkwehU5nzIyjwBsTh7WMmEEV4JFnHuQ3ex4oyTvfKzcyJVDBNA==" - }, - "@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", - "dev": true, - "requires": { - "@types/ms": "*" - } - }, - "@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true - }, - "@types/estree-jsx": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.3.tgz", - "integrity": "sha512-pvQ+TKeRHeiUGRhvYwRrQ/ISnohKkSJR14fT2yqyZ4e9K5vqc7hrtY2Y1Dw0ZwAzQ6DQsxsaCUuSIIi8v0Cq6w==", - "dev": true, - "requires": { - "@types/estree": "*" - } - }, - "@types/hast": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.8.tgz", - "integrity": "sha512-aMIqAlFd2wTIDZuvLbhUT+TGvMxrNC8ECUIVtH6xxy0sQLs3iu6NO8Kp/VT5je7i5ufnebXzdV1dNDMnvaH6IQ==", - "dev": true, - "requires": { - "@types/unist": "^2" - } - }, - "@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", - "dev": true - }, - "@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true - }, - "@types/mdast": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", - "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==", - "dev": true, - "requires": { - "@types/unist": "*" - } - }, - "@types/mdx": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.10.tgz", - "integrity": "sha512-Rllzc5KHk0Al5/WANwgSPl1/CwjqCy+AZrGd78zuK+jO9aDM6ffblZ+zIjgPNAaEBmlO0RYDvLNh7wD0zKVgEg==", - "dev": true - }, - "@types/ms": { - "version": "0.7.34", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz", - "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==", - "dev": true - }, - "@types/node": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", - "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==", - "dev": true, - "optional": true, - "peer": true - }, - "@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", - "dev": true - }, - "@types/react": { - "version": "18.2.18", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz", - "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==", - "dev": true, - "requires": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" - } - }, - "@types/react-dom": { - "version": "18.2.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", - "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", - "dev": true, - "requires": { - "@types/react": "*" - } - }, - "@types/scheduler": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", - "dev": true - }, - "@types/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", - "dev": true - }, - "@types/tinycolor2": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.3.tgz", - "integrity": "sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==", - "dev": true - }, - "@types/unist": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", - "dev": true - }, - "@typescript-eslint/eslint-plugin": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz", - "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==", - "dev": true, - "requires": { - "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/type-utils": "6.2.1", - "@typescript-eslint/utils": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.4", - "natural-compare": "^1.4.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" - } - }, - "@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - } - }, - "@typescript-eslint/utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz", - "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "semver": "^7.5.4" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - } - }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - } - } - }, - "@typescript-eslint/parser": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz", - "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4" - }, - "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" - } - }, - "@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - } - }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - } - } - }, - "@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" - } - }, - "@typescript-eslint/type-utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", - "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", - "dev": true, - "requires": { - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/utils": "6.2.1", - "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" - }, - "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" - } - }, - "@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - } - }, - "@typescript-eslint/utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz", - "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "semver": "^7.5.4" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - } - }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - } - } - }, - "@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - } - } - }, - "@vanilla-extract/babel-plugin-debug-ids": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@vanilla-extract/babel-plugin-debug-ids/-/babel-plugin-debug-ids-1.0.3.tgz", - "integrity": "sha512-vm4jYu1xhSa6ofQ9AhIpR3DkAp4c+eoR1Rpm8/TQI4DmWbmGbOjYRcqV0aWsfaIlNhN4kFuxFMKBNN9oG6iRzA==", - "dev": true, - "requires": { - "@babel/core": "^7.20.7" - } - }, - "@vanilla-extract/css": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@vanilla-extract/css/-/css-1.12.0.tgz", - "integrity": "sha512-TEttZfnqTRtwgVYiBWQSGGUiVaYWReHp59DsavITEvh4TpJNifZFGhBznHx4wQFEsyio6xA513jps4tmqR6zmw==", - "dev": true, - "requires": { - "@emotion/hash": "^0.9.0", - "@vanilla-extract/private": "^1.0.3", - "ahocorasick": "1.0.2", - "chalk": "^4.1.1", - "css-what": "^6.1.0", - "cssesc": "^3.0.0", - "csstype": "^3.0.7", - "deep-object-diff": "^1.1.9", - "deepmerge": "^4.2.2", - "media-query-parser": "^2.0.2", - "outdent": "^0.8.0" - } - }, - "@vanilla-extract/integration": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.2.1.tgz", - "integrity": "sha512-+xYJz07G7TFAMZGrOqArOsURG+xcYvqctujEkANjw2McCBvGEK505RxQqOuNiA9Mi9hgGdNp2JedSa94f3eoLg==", - "dev": true, - "requires": { - "@babel/core": "^7.20.7", - "@babel/plugin-syntax-typescript": "^7.20.0", - "@vanilla-extract/babel-plugin-debug-ids": "^1.0.2", - "@vanilla-extract/css": "^1.10.0", - "esbuild": "0.17.6", - "eval": "0.1.6", - "find-up": "^5.0.0", - "javascript-stringify": "^2.0.1", - "lodash": "^4.17.21", - "mlly": "^1.1.0", - "outdent": "^0.8.0", - "vite": "^4.1.4", - "vite-node": "^0.28.5" - } - }, - "@vanilla-extract/private": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.3.tgz", - "integrity": "sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==", - "dev": true - }, - "@web3-storage/multipart-parser": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz", - "integrity": "sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==" - }, - "@zxing/text-encoding": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", - "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==", - "optional": true - }, - "abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "requires": { - "event-target-shim": "^5.0.0" - } - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "dev": true - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} - }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, - "ahocorasick": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ahocorasick/-/ahocorasick-1.0.2.tgz", - "integrity": "sha512-hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA==", - "dev": true - }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", - "dev": true - }, - "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "arg": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", - "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", - "dev": true - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "aria-query": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", - "dev": true, - "requires": { - "dequal": "^2.0.3" - } - }, - "array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" - } - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true - }, - "array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", - "is-string": "^1.0.7" - } - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "array.prototype.findlastindex": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz", - "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" - } - }, - "array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - } - }, - "array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - } - }, - "array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" - } - }, - "arraybuffer.prototype.slice": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", - "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", - "dev": true, - "requires": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", - "is-shared-array-buffer": "^1.0.2" - } - }, - "ast-types-flow": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", - "dev": true - }, - "astring": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz", - "integrity": "sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==", - "dev": true - }, - "available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" - }, - "axe-core": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz", - "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==", - "dev": true - }, - "axobject-query": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", - "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", - "dev": true, - "requires": { - "dequal": "^2.0.3" - } - }, - "bail": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz", - "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==", - "dev": true - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true - }, - "basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "dev": true, - "requires": { - "safe-buffer": "5.1.2" - } - }, - "big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true - }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true - }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "bplist-parser": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "dev": true, - "requires": { - "big-integer": "^1.6.44" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "browserify-zlib": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0= sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==", - "dev": true, - "requires": { - "pako": "~0.2.0" - } - }, - "browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" - } - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", - "dev": true, - "requires": { - "semver": "^7.0.0" - } - }, - "bundle-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", - "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", - "dev": true, - "requires": { - "run-applescript": "^5.0.0" - } - }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true - }, - "cac": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", - "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", - "dev": true - }, - "cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "requires": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", - "dev": true, - "requires": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - } - }, - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase-css": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", - "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001519", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", - "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", - "dev": true - }, - "ccount": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz", - "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "character-entities": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz", - "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==", - "dev": true - }, - "character-entities-html4": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz", - "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==", - "dev": true - }, - "character-entities-legacy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz", - "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==", - "dev": true - }, - "character-reference-invalid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz", - "integrity": "sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==", - "dev": true - }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-spinners": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz", - "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==", - "dev": true - }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "comma-separated-tokens": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", - "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==", - "dev": true - }, - "commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "dev": true - }, - "compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "requires": { - "mime-db": ">= 1.43.0 < 2" - } - }, - "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, - "requires": { - "safe-buffer": "5.2.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true - }, - "convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" - }, - "cookie-signature": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.1.tgz", - "integrity": "sha512-78KWk9T26NhzXtuL26cIJ8/qNHANyJ/ZYrmEXFzUmhZdjpBv+DlWlOANRTGBt48YcyslsLrj0bMLFTmXvLRCOw==" - }, - "core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true - }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - }, - "csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==", - "dev": true - }, - "damerau-levenshtein": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", - "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", - "dev": true - }, - "data-uri-to-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz", - "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==" - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "decode-named-character-reference": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz", - "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==", - "dev": true, - "requires": { - "character-entities": "^2.0.0" - } - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "deep-object-diff": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.9.tgz", - "integrity": "sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==", - "dev": true - }, - "deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true - }, - "default-browser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", - "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", - "dev": true, - "requires": { - "bundle-name": "^3.0.0", - "default-browser-id": "^3.0.0", - "execa": "^7.1.1", - "titleize": "^3.0.0" - }, - "dependencies": { - "execa": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", - "dev": true - }, - "is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true - }, - "mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true - }, - "npm-run-path": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", - "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", - "dev": true, - "requires": { - "path-key": "^4.0.0" - } - }, - "onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "requires": { - "mimic-fn": "^4.0.0" - } - }, - "path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true - }, - "strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true - } - } - }, - "default-browser-id": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", - "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", - "dev": true, - "requires": { - "bplist-parser": "^0.2.0", - "untildify": "^4.0.0" - } - }, - "defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, - "define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", - "dev": true - }, - "define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", - "dev": true, - "requires": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - } - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true - }, - "didyoumean": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", - "dev": true - }, - "diff": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", - "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", - "dev": true - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "dlv": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", - "dev": true - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-accessibility-api": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.13.tgz", - "integrity": "sha512-R305kwb5CcMDIpSHUnLyIAp7SrSPBx6F0VfQFB3M75xVMHhXJJIdePYgbPPh1o57vCHNu5QztokWUPsLjWzFqw==", - "dev": true - }, - "domain-functions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/domain-functions/-/domain-functions-1.8.0.tgz", - "integrity": "sha512-HhplgbGE8zeQM4Z5/zEhq1F+8lsqKlh7tH+OEAmaI46/e0v5SlfdeEZtS9ye6mGqA79Jj7b/bZu20JeDStoQUw==", - "requires": { - "qs": "^6.10.3" - } - }, - "dotenv": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.0.tgz", - "integrity": "sha512-qD9WU0MPM4SWLPJy/r2Be+2WgQj8plChsyrCNQzW/0WjvcJQiKQJ9mH3ZgB3fxbUUxgc/11ZJ0Fi5KiimWGz2Q==", - "dev": true - }, - "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "dev": true, - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.4.485", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.485.tgz", - "integrity": "sha512-1ndQ5IBNEnFirPwvyud69GHL+31FkE09gH/CJ6m3KCbkx3i0EVOrjwz4UNxRmN9H8OVHbC6vMRZGN1yCvjSs9w==", - "dev": true - }, - "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - } - }, - "err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, - "es-abstract": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", - "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", - "dev": true, - "requires": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.1", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.1", - "get-symbol-description": "^1.0.0", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", - "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-buffer": "^1.0.0", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" - } - }, - "es-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", - "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", - "dev": true - }, - "es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" - } - }, - "es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "esbuild": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.6.tgz", - "integrity": "sha512-TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q==", - "dev": true, - "requires": { - "@esbuild/android-arm": "0.17.6", - "@esbuild/android-arm64": "0.17.6", - "@esbuild/android-x64": "0.17.6", - "@esbuild/darwin-arm64": "0.17.6", - "@esbuild/darwin-x64": "0.17.6", - "@esbuild/freebsd-arm64": "0.17.6", - "@esbuild/freebsd-x64": "0.17.6", - "@esbuild/linux-arm": "0.17.6", - "@esbuild/linux-arm64": "0.17.6", - "@esbuild/linux-ia32": "0.17.6", - "@esbuild/linux-loong64": "0.17.6", - "@esbuild/linux-mips64el": "0.17.6", - "@esbuild/linux-ppc64": "0.17.6", - "@esbuild/linux-riscv64": "0.17.6", - "@esbuild/linux-s390x": "0.17.6", - "@esbuild/linux-x64": "0.17.6", - "@esbuild/netbsd-x64": "0.17.6", - "@esbuild/openbsd-x64": "0.17.6", - "@esbuild/sunos-x64": "0.17.6", - "@esbuild/win32-arm64": "0.17.6", - "@esbuild/win32-ia32": "0.17.6", - "@esbuild/win32-x64": "0.17.6" - } - }, - "esbuild-plugins-node-modules-polyfill": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.6.1.tgz", - "integrity": "sha512-6sAwI24PV8W0zxeO+i4BS5zoQypS3SzEGwIdxpzpy65riRuK8apMw8PN0aKVLCTnLr0FgNIxUMRd9BsreBrtog==", - "dev": true, - "requires": { - "@jspm/core": "^2.0.1", - "local-pkg": "^0.4.3", - "resolve.exports": "^2.0.2" - } - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz", - "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.1", - "@eslint/js": "^8.46.0", - "@humanwhocodes/config-array": "^0.11.10", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.2", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "dependencies": { - "eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - } - } - }, - "eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", - "dev": true, - "requires": { - "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "eslint-import-resolver-typescript": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.5.tgz", - "integrity": "sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==", - "dev": true, - "requires": { - "debug": "^4.3.4", - "enhanced-resolve": "^5.12.0", - "eslint-module-utils": "^2.7.4", - "get-tsconfig": "^4.5.0", - "globby": "^13.1.3", - "is-core-module": "^2.11.0", - "is-glob": "^4.0.3", - "synckit": "^0.8.5" - }, - "dependencies": { - "fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "dev": true, - "requires": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - } - }, - "slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true - } - } - }, - "eslint-module-utils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", - "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", - "dev": true, - "requires": { - "debug": "^3.2.7" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "eslint-plugin-es": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", - "dev": true, - "requires": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "dependencies": { - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } - } - }, - "eslint-plugin-import": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz", - "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==", - "dev": true, - "requires": { - "array-includes": "^3.1.6", - "array.prototype.findlastindex": "^1.2.2", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.8.0", - "has": "^1.0.3", - "is-core-module": "^2.12.1", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.fromentries": "^2.0.6", - "object.groupby": "^1.0.0", - "object.values": "^1.1.6", - "resolve": "^1.22.3", - "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - }, - "tsconfig-paths": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", - "dev": true, - "requires": { - "@types/json5": "^0.0.29", - "json5": "^1.0.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - } - } - }, - "eslint-plugin-jest-dom": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.3.tgz", - "integrity": "sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==", - "dev": true, - "requires": { - "@babel/runtime": "^7.16.3", - "@testing-library/dom": "^8.11.1", - "requireindex": "^1.2.0" - } - }, - "eslint-plugin-jsx-a11y": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz", - "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==", - "dev": true, - "requires": { - "@babel/runtime": "^7.20.7", - "aria-query": "^5.1.3", - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "ast-types-flow": "^0.0.7", - "axe-core": "^4.6.2", - "axobject-query": "^3.1.1", - "damerau-levenshtein": "^1.0.8", - "emoji-regex": "^9.2.2", - "has": "^1.0.3", - "jsx-ast-utils": "^3.3.3", - "language-tags": "=1.0.5", - "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - } - } - }, - "eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", - "dev": true, - "requires": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" - }, - "dependencies": { - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "eslint-plugin-react": { - "version": "7.33.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz", - "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==", - "dev": true, - "requires": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", - "doctrine": "^2.1.0", - "estraverse": "^5.3.0", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", - "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", - "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" - }, - "dependencies": { - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", - "dev": true, - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - } - } - }, - "eslint-plugin-react-hooks": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "dev": true, - "requires": {} - }, - "eslint-plugin-testing-library": { - "version": "5.11.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz", - "integrity": "sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==", - "dev": true, - "requires": { - "@typescript-eslint/utils": "^5.58.0" - } - }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "dependencies": { - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - } - } - }, - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - }, - "espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "requires": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - } - } - }, - "esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "estree-util-attach-comments": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/estree-util-attach-comments/-/estree-util-attach-comments-2.1.1.tgz", - "integrity": "sha512-+5Ba/xGGS6mnwFbXIuQiDPTbuTxuMCooq3arVv7gPZtYpjp+VXH/NkHAP35OOefPhNG/UGqU3vt/LTABwcHX0w==", - "dev": true, - "requires": { - "@types/estree": "^1.0.0" - } - }, - "estree-util-build-jsx": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/estree-util-build-jsx/-/estree-util-build-jsx-2.2.2.tgz", - "integrity": "sha512-m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg==", - "dev": true, - "requires": { - "@types/estree-jsx": "^1.0.0", - "estree-util-is-identifier-name": "^2.0.0", - "estree-walker": "^3.0.0" - }, - "dependencies": { - "estree-util-is-identifier-name": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", - "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", - "dev": true - } - } - }, - "estree-util-is-identifier-name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz", - "integrity": "sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ==", - "dev": true - }, - "estree-util-to-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/estree-util-to-js/-/estree-util-to-js-1.2.0.tgz", - "integrity": "sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==", - "dev": true, - "requires": { - "@types/estree-jsx": "^1.0.0", - "astring": "^1.8.0", - "source-map": "^0.7.0" - } - }, - "estree-util-value-to-estree": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/estree-util-value-to-estree/-/estree-util-value-to-estree-1.3.0.tgz", - "integrity": "sha512-Y+ughcF9jSUJvncXwqRageavjrNPAI+1M/L3BI3PyLp1nmgYTGUXU6t5z1Y7OWuThoDdhPME07bQU+d5LxdJqw==", - "dev": true, - "requires": { - "is-plain-obj": "^3.0.0" - } - }, - "estree-util-visit": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.1.tgz", - "integrity": "sha512-xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw==", - "dev": true, - "requires": { - "@types/estree-jsx": "^1.0.0", - "@types/unist": "^2.0.0" - } - }, - "estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "dev": true, - "requires": { - "@types/estree": "^1.0.0" - } - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true - }, - "eval": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz", - "integrity": "sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==", - "dev": true, - "requires": { - "require-like": ">= 0.1.1" - } - }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "dependencies": { - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - } - } - }, - "exit-hook": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz", - "integrity": "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==", - "dev": true - }, - "express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "dev": true, - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.1", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.5.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "fault": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fault/-/fault-2.0.1.tgz", - "integrity": "sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==", - "dev": true, - "requires": { - "format": "^0.2.0" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", - "dev": true - }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "requires": { - "is-callable": "^1.1.3" - } - }, - "foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "dependencies": { - "signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true - } - } - }, - "format": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs= sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", - "dev": true - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true - }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "fs-extra": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz", - "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "requires": { - "minipass": "^7.0.3" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - } - }, - "functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true - }, - "generic-names": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-4.0.0.tgz", - "integrity": "sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==", - "dev": true, - "requires": { - "loader-utils": "^3.2.0" - }, - "dependencies": { - "loader-utils": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", - "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", - "dev": true - } - } - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" - } - }, - "get-port": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", - "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", - "dev": true - }, - "get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - } - }, - "get-tsconfig": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.6.2.tgz", - "integrity": "sha512-E5XrT4CbbXcXWy+1jChlZmrmCwd5KGx502kDCXJJ7y898TtWW9FwoG5HfOLVRKmlmDGkWN2HM9Ho+/Y8F0sJDg==", - "dev": true, - "requires": { - "resolve-pkg-maps": "^1.0.0" - } - }, - "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "requires": { - "get-intrinsic": "^1.1.3" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "gunzip-maybe": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz", - "integrity": "sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==", - "dev": true, - "requires": { - "browserify-zlib": "^0.1.4", - "is-deflate": "^1.0.0", - "is-gzip": "^1.0.0", - "peek-stream": "^1.1.0", - "pumpify": "^1.3.3", - "through2": "^2.0.3" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.1" - } - }, - "has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==" - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" - }, - "has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "requires": { - "has-symbols": "^1.0.2" - } - }, - "hast-util-to-estree": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-2.3.3.tgz", - "integrity": "sha512-ihhPIUPxN0v0w6M5+IiAZZrn0LH2uZomeWwhn7uP7avZC6TE7lIiEh2yBMPr5+zi1aUCXq6VoYRgs2Bw9xmycQ==", - "dev": true, - "requires": { - "@types/estree": "^1.0.0", - "@types/estree-jsx": "^1.0.0", - "@types/hast": "^2.0.0", - "@types/unist": "^2.0.0", - "comma-separated-tokens": "^2.0.0", - "estree-util-attach-comments": "^2.0.0", - "estree-util-is-identifier-name": "^2.0.0", - "hast-util-whitespace": "^2.0.0", - "mdast-util-mdx-expression": "^1.0.0", - "mdast-util-mdxjs-esm": "^1.0.0", - "property-information": "^6.0.0", - "space-separated-tokens": "^2.0.0", - "style-to-object": "^0.4.1", - "unist-util-position": "^4.0.0", - "zwitch": "^2.0.0" - }, - "dependencies": { - "estree-util-is-identifier-name": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", - "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", - "dev": true - } - } - }, - "hast-util-whitespace": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz", - "integrity": "sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==", - "dev": true - }, - "hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "requires": { - "lru-cache": "^7.5.1" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - } - } - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "icss-utils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "requires": {} - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true - }, - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "inline-style-parser": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz", - "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==", - "dev": true - }, - "internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - } - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true - }, - "is-alphabetical": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz", - "integrity": "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==", - "dev": true - }, - "is-alphanumerical": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz", - "integrity": "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==", - "dev": true, - "requires": { - "is-alphabetical": "^2.0.0", - "is-decimal": "^2.0.0" - } - }, - "is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" - } - }, - "is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "requires": { - "has-bigints": "^1.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true - }, - "is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==" - }, - "is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-decimal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz", - "integrity": "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==", - "dev": true - }, - "is-deflate": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz", - "integrity": "sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ= sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==", - "dev": true - }, - "is-docker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-gzip": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz", - "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==", - "dev": true - }, - "is-hexadecimal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz", - "integrity": "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==", - "dev": true - }, - "is-inside-container": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", - "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", - "dev": true, - "requires": { - "is-docker": "^3.0.0" - } - }, - "is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true - }, - "is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, - "is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", - "dev": true - }, - "is-reference": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz", - "integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==", - "dev": true, - "requires": { - "@types/estree": "*" - } - }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", - "requires": { - "which-typed-array": "^1.1.11" - } - }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true - }, - "is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, - "is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "requires": { - "is-docker": "^2.0.0" - }, - "dependencies": { - "is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true - } - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "isbot": { - "version": "3.6.13", - "resolved": "https://registry.npmjs.org/isbot/-/isbot-3.6.13.tgz", - "integrity": "sha512-uoP4uK5Dc2CrabmK+Gue1jTL+scHiCc1c9rblRpJwG8CPxjLIv8jmGyyGRGkbPOweayhkskdZsEQXG6p+QCQrg==" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "dev": true, - "requires": { - "@isaacs/cliui": "^8.0.2", - "@pkgjs/parseargs": "^0.11.0" - } - }, - "javascript-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz", - "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==", - "dev": true - }, - "jiti": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz", - "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - }, - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "jsx-ast-utils": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", - "dev": true, - "requires": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "object.assign": "^4.1.4", - "object.values": "^1.1.6" - } - }, - "kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true - }, - "language-subtag-registry": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", - "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==", - "dev": true - }, - "language-tags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz", - "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==", - "dev": true, - "requires": { - "language-subtag-registry": "~0.3.2" - } - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", - "dev": true - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "local-pkg": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz", - "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==", - "dev": true - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - } - }, - "longest-streak": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz", - "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==", - "dev": true - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "lz-string": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz", - "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==", - "dev": true - }, - "make-service": { - "version": "2.0.0-next.0", - "resolved": "https://registry.npmjs.org/make-service/-/make-service-2.0.0-next.0.tgz", - "integrity": "sha512-+IxIiMlpWAxPOHMNiEuFQkM5uaogDMfRdWeCG5ot3h8WBamzYWb9zKtolD1C1wlB0bE0iKX57jItpkhdHwj/eQ==" - }, - "markdown-extensions": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.1.tgz", - "integrity": "sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==", - "dev": true - }, - "mdast-util-definitions": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz", - "integrity": "sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "@types/unist": "^2.0.0", - "unist-util-visit": "^4.0.0" - } - }, - "mdast-util-from-markdown": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz", - "integrity": "sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "@types/unist": "^2.0.0", - "decode-named-character-reference": "^1.0.0", - "mdast-util-to-string": "^3.1.0", - "micromark": "^3.0.0", - "micromark-util-decode-numeric-character-reference": "^1.0.0", - "micromark-util-decode-string": "^1.0.0", - "micromark-util-normalize-identifier": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "unist-util-stringify-position": "^3.0.0", - "uvu": "^0.5.0" - } - }, - "mdast-util-frontmatter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.0.tgz", - "integrity": "sha512-7itKvp0arEVNpCktOET/eLFAYaZ+0cNjVtFtIPxgQ5tV+3i+D4SDDTjTzPWl44LT59PC+xdx+glNTawBdF98Mw==", - "dev": true, - "requires": { - "micromark-extension-frontmatter": "^1.0.0" - } - }, - "mdast-util-mdx": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-2.0.1.tgz", - "integrity": "sha512-38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw==", - "dev": true, - "requires": { - "mdast-util-from-markdown": "^1.0.0", - "mdast-util-mdx-expression": "^1.0.0", - "mdast-util-mdx-jsx": "^2.0.0", - "mdast-util-mdxjs-esm": "^1.0.0", - "mdast-util-to-markdown": "^1.0.0" - } - }, - "mdast-util-mdx-expression": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.2.tgz", - "integrity": "sha512-xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA==", - "dev": true, - "requires": { - "@types/estree-jsx": "^1.0.0", - "@types/hast": "^2.0.0", - "@types/mdast": "^3.0.0", - "mdast-util-from-markdown": "^1.0.0", - "mdast-util-to-markdown": "^1.0.0" - } - }, - "mdast-util-mdx-jsx": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.4.tgz", - "integrity": "sha512-DtMn9CmVhVzZx3f+optVDF8yFgQVt7FghCRNdlIaS3X5Bnym3hZwPbg/XW86vdpKjlc1PVj26SpnLGeJBXD3JA==", - "dev": true, - "requires": { - "@types/estree-jsx": "^1.0.0", - "@types/hast": "^2.0.0", - "@types/mdast": "^3.0.0", - "@types/unist": "^2.0.0", - "ccount": "^2.0.0", - "mdast-util-from-markdown": "^1.1.0", - "mdast-util-to-markdown": "^1.3.0", - "parse-entities": "^4.0.0", - "stringify-entities": "^4.0.0", - "unist-util-remove-position": "^4.0.0", - "unist-util-stringify-position": "^3.0.0", - "vfile-message": "^3.0.0" - } - }, - "mdast-util-mdxjs-esm": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.1.tgz", - "integrity": "sha512-SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w==", - "dev": true, - "requires": { - "@types/estree-jsx": "^1.0.0", - "@types/hast": "^2.0.0", - "@types/mdast": "^3.0.0", - "mdast-util-from-markdown": "^1.0.0", - "mdast-util-to-markdown": "^1.0.0" - } - }, - "mdast-util-phrasing": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz", - "integrity": "sha512-WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "unist-util-is": "^5.0.0" - } - }, - "mdast-util-to-hast": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz", - "integrity": "sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==", - "dev": true, - "requires": { - "@types/hast": "^2.0.0", - "@types/mdast": "^3.0.0", - "mdast-util-definitions": "^5.0.0", - "micromark-util-sanitize-uri": "^1.1.0", - "trim-lines": "^3.0.0", - "unist-util-generated": "^2.0.0", - "unist-util-position": "^4.0.0", - "unist-util-visit": "^4.0.0" - } - }, - "mdast-util-to-markdown": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz", - "integrity": "sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "@types/unist": "^2.0.0", - "longest-streak": "^3.0.0", - "mdast-util-phrasing": "^3.0.0", - "mdast-util-to-string": "^3.0.0", - "micromark-util-decode-string": "^1.0.0", - "unist-util-visit": "^4.0.0", - "zwitch": "^2.0.0" - } - }, - "mdast-util-to-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz", - "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0" - } - }, - "media-query-parser": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/media-query-parser/-/media-query-parser-2.0.2.tgz", - "integrity": "sha512-1N4qp+jE0pL5Xv4uEcwVUhIkwdUO3S/9gML90nqKA7v7FcOS5vUtatfzok9S9U1EJU8dHWlcv95WLnKmmxZI9w==", - "dev": true, - "requires": { - "@babel/runtime": "^7.12.5" - } - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true - }, - "micromark": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.2.0.tgz", - "integrity": "sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==", - "dev": true, - "requires": { - "@types/debug": "^4.0.0", - "debug": "^4.0.0", - "decode-named-character-reference": "^1.0.0", - "micromark-core-commonmark": "^1.0.1", - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-chunked": "^1.0.0", - "micromark-util-combine-extensions": "^1.0.0", - "micromark-util-decode-numeric-character-reference": "^1.0.0", - "micromark-util-encode": "^1.0.0", - "micromark-util-normalize-identifier": "^1.0.0", - "micromark-util-resolve-all": "^1.0.0", - "micromark-util-sanitize-uri": "^1.0.0", - "micromark-util-subtokenize": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.1", - "uvu": "^0.5.0" - } - }, - "micromark-core-commonmark": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz", - "integrity": "sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==", - "dev": true, - "requires": { - "decode-named-character-reference": "^1.0.0", - "micromark-factory-destination": "^1.0.0", - "micromark-factory-label": "^1.0.0", - "micromark-factory-space": "^1.0.0", - "micromark-factory-title": "^1.0.0", - "micromark-factory-whitespace": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-chunked": "^1.0.0", - "micromark-util-classify-character": "^1.0.0", - "micromark-util-html-tag-name": "^1.0.0", - "micromark-util-normalize-identifier": "^1.0.0", - "micromark-util-resolve-all": "^1.0.0", - "micromark-util-subtokenize": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.1", - "uvu": "^0.5.0" - } - }, - "micromark-extension-frontmatter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-1.0.0.tgz", - "integrity": "sha512-EXjmRnupoX6yYuUJSQhrQ9ggK0iQtQlpi6xeJzVD5xscyAI+giqco5fdymayZhJMbIFecjnE2yz85S9NzIgQpg==", - "dev": true, - "requires": { - "fault": "^2.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0" - } - }, - "micromark-extension-mdx-expression": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.8.tgz", - "integrity": "sha512-zZpeQtc5wfWKdzDsHRBY003H2Smg+PUi2REhqgIhdzAa5xonhP03FcXxqFSerFiNUr5AWmHpaNPQTBVOS4lrXw==", - "dev": true, - "requires": { - "@types/estree": "^1.0.0", - "micromark-factory-mdx-expression": "^1.0.0", - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-events-to-acorn": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "uvu": "^0.5.0" - } - }, - "micromark-extension-mdx-jsx": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.5.tgz", - "integrity": "sha512-gPH+9ZdmDflbu19Xkb8+gheqEDqkSpdCEubQyxuz/Hn8DOXiXvrXeikOoBA71+e8Pfi0/UYmU3wW3H58kr7akA==", - "dev": true, - "requires": { - "@types/acorn": "^4.0.0", - "@types/estree": "^1.0.0", - "estree-util-is-identifier-name": "^2.0.0", - "micromark-factory-mdx-expression": "^1.0.0", - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "uvu": "^0.5.0", - "vfile-message": "^3.0.0" - }, - "dependencies": { - "estree-util-is-identifier-name": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz", - "integrity": "sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==", - "dev": true - } - } - }, - "micromark-extension-mdx-md": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-1.0.1.tgz", - "integrity": "sha512-7MSuj2S7xjOQXAjjkbjBsHkMtb+mDGVW6uI2dBL9snOBCbZmoNgDAeZ0nSn9j3T42UE/g2xVNMn18PJxZvkBEA==", - "dev": true, - "requires": { - "micromark-util-types": "^1.0.0" - } - }, - "micromark-extension-mdxjs": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs/-/micromark-extension-mdxjs-1.0.1.tgz", - "integrity": "sha512-7YA7hF6i5eKOfFUzZ+0z6avRG52GpWR8DL+kN47y3f2KhxbBZMhmxe7auOeaTBrW2DenbbZTf1ea9tA2hDpC2Q==", - "dev": true, - "requires": { - "acorn": "^8.0.0", - "acorn-jsx": "^5.0.0", - "micromark-extension-mdx-expression": "^1.0.0", - "micromark-extension-mdx-jsx": "^1.0.0", - "micromark-extension-mdx-md": "^1.0.0", - "micromark-extension-mdxjs-esm": "^1.0.0", - "micromark-util-combine-extensions": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-extension-mdxjs-esm": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-1.0.5.tgz", - "integrity": "sha512-xNRBw4aoURcyz/S69B19WnZAkWJMxHMT5hE36GtDAyhoyn/8TuAeqjFJQlwk+MKQsUD7b3l7kFX+vlfVWgcX1w==", - "dev": true, - "requires": { - "@types/estree": "^1.0.0", - "micromark-core-commonmark": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-events-to-acorn": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "unist-util-position-from-estree": "^1.1.0", - "uvu": "^0.5.0", - "vfile-message": "^3.0.0" - } - }, - "micromark-factory-destination": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz", - "integrity": "sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==", - "dev": true, - "requires": { - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-factory-label": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz", - "integrity": "sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==", - "dev": true, - "requires": { - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "uvu": "^0.5.0" - } - }, - "micromark-factory-mdx-expression": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.9.tgz", - "integrity": "sha512-jGIWzSmNfdnkJq05c7b0+Wv0Kfz3NJ3N4cBjnbO4zjXIlxJr+f8lk+5ZmwFvqdAbUy2q6B5rCY//g0QAAaXDWA==", - "dev": true, - "requires": { - "@types/estree": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-events-to-acorn": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "unist-util-position-from-estree": "^1.0.0", - "uvu": "^0.5.0", - "vfile-message": "^3.0.0" - } - }, - "micromark-factory-space": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz", - "integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==", - "dev": true, - "requires": { - "micromark-util-character": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-factory-title": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz", - "integrity": "sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==", - "dev": true, - "requires": { - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-factory-whitespace": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz", - "integrity": "sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==", - "dev": true, - "requires": { - "micromark-factory-space": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-util-character": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz", - "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==", - "dev": true, - "requires": { - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-util-chunked": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz", - "integrity": "sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==", - "dev": true, - "requires": { - "micromark-util-symbol": "^1.0.0" - } - }, - "micromark-util-classify-character": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz", - "integrity": "sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==", - "dev": true, - "requires": { - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-util-combine-extensions": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz", - "integrity": "sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==", - "dev": true, - "requires": { - "micromark-util-chunked": "^1.0.0", - "micromark-util-types": "^1.0.0" - } - }, - "micromark-util-decode-numeric-character-reference": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz", - "integrity": "sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==", - "dev": true, - "requires": { - "micromark-util-symbol": "^1.0.0" - } - }, - "micromark-util-decode-string": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz", - "integrity": "sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==", - "dev": true, - "requires": { - "decode-named-character-reference": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-decode-numeric-character-reference": "^1.0.0", - "micromark-util-symbol": "^1.0.0" - } - }, - "micromark-util-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz", - "integrity": "sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==", - "dev": true - }, - "micromark-util-events-to-acorn": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.3.tgz", - "integrity": "sha512-ij4X7Wuc4fED6UoLWkmo0xJQhsktfNh1J0m8g4PbIMPlx+ek/4YdW5mvbye8z/aZvAPUoxgXHrwVlXAPKMRp1w==", - "dev": true, - "requires": { - "@types/acorn": "^4.0.0", - "@types/estree": "^1.0.0", - "@types/unist": "^2.0.0", - "estree-util-visit": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "uvu": "^0.5.0", - "vfile-message": "^3.0.0" - } - }, - "micromark-util-html-tag-name": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz", - "integrity": "sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==", - "dev": true - }, - "micromark-util-normalize-identifier": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz", - "integrity": "sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==", - "dev": true, - "requires": { - "micromark-util-symbol": "^1.0.0" - } - }, - "micromark-util-resolve-all": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz", - "integrity": "sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==", - "dev": true, - "requires": { - "micromark-util-types": "^1.0.0" - } - }, - "micromark-util-sanitize-uri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz", - "integrity": "sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==", - "dev": true, - "requires": { - "micromark-util-character": "^1.0.0", - "micromark-util-encode": "^1.0.0", - "micromark-util-symbol": "^1.0.0" - } - }, - "micromark-util-subtokenize": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz", - "integrity": "sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==", - "dev": true, - "requires": { - "micromark-util-chunked": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", - "uvu": "^0.5.0" - } - }, - "micromark-util-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz", - "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==", - "dev": true - }, - "micromark-util-types": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz", - "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "dev": true - }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, - "mlly": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.0.tgz", - "integrity": "sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==", - "dev": true, - "requires": { - "acorn": "^8.9.0", - "pathe": "^1.1.1", - "pkg-types": "^1.0.3", - "ufo": "^1.1.2" - } - }, - "morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "dev": true, - "requires": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", - "on-finished": "~2.3.0", - "on-headers": "~1.0.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - } - } - }, - "mri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", - "dev": true - }, - "mrmime": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", - "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "dev": true, - "requires": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, - "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", - "dev": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true - }, - "node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true - }, - "normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "npm-install-checks": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", - "dev": true, - "requires": { - "semver": "^7.1.1" - } - }, - "npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", - "dev": true - }, - "npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - } - }, - "npm-pick-manifest": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", - "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", - "dev": true, - "requires": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true - }, - "object-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", - "dev": true - }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - } - }, - "object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "object.groupby": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz", - "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", - "get-intrinsic": "^1.2.1" - } - }, - "object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", - "dev": true, - "requires": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "open": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", - "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", - "dev": true, - "requires": { - "default-browser": "^4.0.0", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", - "is-wsl": "^2.2.0" - } - }, - "optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, - "requires": { - "@aashutoshrathi/word-wrap": "^1.2.3", - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" - } - }, - "ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "requires": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - } - }, - "outdent": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.8.0.tgz", - "integrity": "sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==", - "dev": true - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "pako": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU= sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==", - "dev": true - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-entities": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.1.tgz", - "integrity": "sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "character-entities": "^2.0.0", - "character-entities-legacy": "^3.0.0", - "character-reference-invalid": "^2.0.0", - "decode-named-character-reference": "^1.0.0", - "is-alphanumerical": "^2.0.0", - "is-decimal": "^2.0.0", - "is-hexadecimal": "^2.0.0" - } - }, - "parse-ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", - "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", - "dev": true - }, - "parse-multipart-data": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/parse-multipart-data/-/parse-multipart-data-1.5.0.tgz", - "integrity": "sha512-ck5zaMF0ydjGfejNMnlo5YU2oJ+pT+80Jb1y4ybanT27j+zbVP/jkYmCrUGsEln0Ox/hZmuvgy8Ra7AxbXP2Mw==", - "dev": true - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", - "dev": true, - "requires": { - "lru-cache": "^9.1.1 || ^10.0.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.2.tgz", - "integrity": "sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==", - "dev": true, - "requires": { - "semver": "^7.3.5" - } - } - } - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "pathe": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", - "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==", - "dev": true - }, - "peek-stream": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz", - "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "duplexify": "^3.5.0", - "through2": "^2.0.3" - } - }, - "periscopic": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz", - "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==", - "dev": true, - "requires": { - "@types/estree": "^1.0.0", - "estree-walker": "^3.0.0", - "is-reference": "^3.0.0" - } - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true - }, - "pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", - "dev": true - }, - "pkg-types": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz", - "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==", - "dev": true, - "requires": { - "jsonc-parser": "^3.2.0", - "mlly": "^1.2.0", - "pathe": "^1.1.0" - } - }, - "postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", - "dev": true, - "requires": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - } - }, - "postcss-discard-duplicates": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "dev": true, - "requires": {} - }, - "postcss-import": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", - "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.0.0", - "read-cache": "^1.0.0", - "resolve": "^1.1.7" - } - }, - "postcss-js": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", - "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", - "dev": true, - "requires": { - "camelcase-css": "^2.0.1" - } - }, - "postcss-load-config": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz", - "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==", - "dev": true, - "requires": { - "lilconfig": "^2.0.5", - "yaml": "^2.1.1" - } - }, - "postcss-modules": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-6.0.0.tgz", - "integrity": "sha512-7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ==", - "dev": true, - "requires": { - "generic-names": "^4.0.0", - "icss-utils": "^5.1.0", - "lodash.camelcase": "^4.3.0", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", - "postcss-modules-scope": "^3.0.0", - "postcss-modules-values": "^4.0.0", - "string-hash": "^1.1.1" - } - }, - "postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "requires": {} - }, - "postcss-modules-local-by-default": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz", - "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==", - "dev": true, - "requires": { - "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.4" - } - }, - "postcss-modules-values": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", - "dev": true, - "requires": { - "icss-utils": "^5.0.0" - } - }, - "postcss-nested": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", - "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.11" - } - }, - "postcss-selector-parser": { - "version": "6.0.13", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", - "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - } - }, - "postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "prettier": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", - "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", - "dev": true - }, - "prettier-plugin-tailwindcss": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz", - "integrity": "sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==", - "dev": true, - "requires": {} - }, - "pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "pretty-ms": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", - "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", - "dev": true, - "requires": { - "parse-ms": "^2.1.0" - } - }, - "proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, - "promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "requires": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - } - }, - "prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - }, - "dependencies": { - "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - } - } - }, - "property-information": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.4.0.tgz", - "integrity": "sha512-9t5qARVofg2xQqKtytzt+lZ4d1Qvj8t5B8fEwXK6qOfgRLgH/b13QlgEyDh033NOS31nXeFbYv7CLUDG1CeifQ==", - "dev": true - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "dev": true, - "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - } - }, - "punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "requires": { - "side-channel": "^1.0.4" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true - }, - "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - } - } - }, - "react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "requires": { - "loose-envify": "^1.1.0" - } - }, - "react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "requires": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" - } - }, - "react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true - }, - "react-refresh": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", - "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", - "dev": true - }, - "react-router": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.19.0.tgz", - "integrity": "sha512-0W63PKCZ7+OuQd7Tm+RbkI8kCLmn4GPjDbX61tWljPxWgqTKlEpeQUwPkT1DRjYhF8KSihK0hQpmhU4uxVMcdw==", - "requires": { - "@remix-run/router": "1.12.0" - }, - "dependencies": { - "@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==" - } - } - }, - "react-router-dom": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.19.0.tgz", - "integrity": "sha512-N6dWlcgL2w0U5HZUUqU2wlmOrSb3ighJmtQ438SWbhB1yuLTXQ8yyTBMK3BSvVjp7gBtKurT554nCtMOgxCZmQ==", - "requires": { - "@remix-run/router": "1.12.0", - "react-router": "6.19.0" - }, - "dependencies": { - "@remix-run/router": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz", - "integrity": "sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg==" - } - } - }, - "read-cache": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", - "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", - "dev": true, - "requires": { - "pify": "^2.3.0" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true - }, - "regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" - } - }, - "regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true - }, - "remark-frontmatter": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-4.0.1.tgz", - "integrity": "sha512-38fJrB0KnmD3E33a5jZC/5+gGAC2WKNiPw1/fdXJvijBlhA7RCsvJklrYJakS0HedninvaCYW8lQGf9C918GfA==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "mdast-util-frontmatter": "^1.0.0", - "micromark-extension-frontmatter": "^1.0.0", - "unified": "^10.0.0" - } - }, - "remark-mdx": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.3.0.tgz", - "integrity": "sha512-g53hMkpM0I98MU266IzDFMrTD980gNF3BJnkyFcmN+dD873mQeD5rdMO3Y2X+x8umQfbSE0PcoEDl7ledSA+2g==", - "dev": true, - "requires": { - "mdast-util-mdx": "^2.0.0", - "micromark-extension-mdxjs": "^1.0.0" - } - }, - "remark-mdx-frontmatter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/remark-mdx-frontmatter/-/remark-mdx-frontmatter-1.1.1.tgz", - "integrity": "sha512-7teX9DW4tI2WZkXS4DBxneYSY7NHiXl4AKdWDO9LXVweULlCT8OPWsOjLEnMIXViN1j+QcY8mfbq3k0EK6x3uA==", - "dev": true, - "requires": { - "estree-util-is-identifier-name": "^1.0.0", - "estree-util-value-to-estree": "^1.0.0", - "js-yaml": "^4.0.0", - "toml": "^3.0.0" - } - }, - "remark-parse": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz", - "integrity": "sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==", - "dev": true, - "requires": { - "@types/mdast": "^3.0.0", - "mdast-util-from-markdown": "^1.0.0", - "unified": "^10.0.0" - } - }, - "remark-rehype": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-10.1.0.tgz", - "integrity": "sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==", - "dev": true, - "requires": { - "@types/hast": "^2.0.0", - "@types/mdast": "^3.0.0", - "mdast-util-to-hast": "^12.1.0", - "unified": "^10.0.0" - } - }, - "remix": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/remix/-/remix-2.3.0.tgz", - "integrity": "sha512-jI7nWAcp5WyfWiT3yoEx59T+JuGf61vlka0K4dsJybr0LAgWgsuY3RsuZ5MhK66zh4wkeC5G3dsb295tu58MhQ==" - }, - "require-like": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", - "integrity": "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==", - "dev": true - }, - "requireindex": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz", - "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==", - "dev": true - }, - "resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", - "dev": true, - "requires": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, - "resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "dev": true - }, - "resolve.exports": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", - "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", - "dev": true - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "rollup": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.27.2.tgz", - "integrity": "sha512-YGwmHf7h2oUHkVBT248x0yt6vZkYQ3/rvE5iQuVBh3WO8GcJ6BNeOkpoX1yMHIiBm18EMLjBPIoUDkhgnyxGOQ==", - "dev": true, - "requires": { - "fsevents": "~2.3.2" - } - }, - "run-applescript": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", - "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", - "dev": true, - "requires": { - "execa": "^5.0.0" - } - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "sade": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", - "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", - "dev": true, - "requires": { - "mri": "^1.1.0" - } - }, - "safe-array-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", - "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - } - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-regex": "^1.1.4" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "requires": { - "loose-envify": "^1.1.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - } - } - }, - "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "dev": true, - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" - } - }, - "set-cookie-parser": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", - "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==" - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" - }, - "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "space-separated-tokens": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", - "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", - "dev": true - }, - "spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", - "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", - "dev": true - }, - "ssri": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", - "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", - "dev": true, - "requires": { - "minipass": "^7.0.3" - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true - }, - "stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", - "dev": true - }, - "stream-slice": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz", - "integrity": "sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA==" - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "string-hash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz", - "integrity": "sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==", - "dev": true - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - } - } - }, - "string-width-cjs": { - "version": "npm:string-width@4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - } - } - }, - "string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", - "side-channel": "^1.0.4" - } - }, - "string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "stringify-entities": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz", - "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==", - "dev": true, - "requires": { - "character-entities-html4": "^2.0.0", - "character-entities-legacy": "^3.0.0" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-ansi-cjs": { - "version": "npm:strip-ansi@6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "style-to-object": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.4.tgz", - "integrity": "sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==", - "dev": true, - "requires": { - "inline-style-parser": "0.1.1" - } - }, - "sucrase": { - "version": "3.34.0", - "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", - "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.2", - "commander": "^4.0.0", - "glob": "7.1.6", - "lines-and-columns": "^1.1.6", - "mz": "^2.7.0", - "pirates": "^4.0.1", - "ts-interface-checker": "^0.1.9" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "synckit": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", - "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", - "dev": true, - "requires": { - "@pkgr/utils": "^2.3.1", - "tslib": "^2.5.0" - }, - "dependencies": { - "tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", - "dev": true - } - } - }, - "tailwindcss": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", - "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", - "dev": true, - "requires": { - "@alloc/quick-lru": "^5.2.0", - "arg": "^5.0.2", - "chokidar": "^3.5.3", - "didyoumean": "^1.2.2", - "dlv": "^1.1.3", - "fast-glob": "^3.2.12", - "glob-parent": "^6.0.2", - "is-glob": "^4.0.3", - "jiti": "^1.18.2", - "lilconfig": "^2.1.0", - "micromatch": "^4.0.5", - "normalize-path": "^3.0.0", - "object-hash": "^3.0.0", - "picocolors": "^1.0.0", - "postcss": "^8.4.23", - "postcss-import": "^15.1.0", - "postcss-js": "^4.0.1", - "postcss-load-config": "^4.0.1", - "postcss-nested": "^6.0.1", - "postcss-selector-parser": "^6.0.11", - "resolve": "^1.22.2", - "sucrase": "^3.32.0" - }, - "dependencies": { - "fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "dependencies": { - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - } - } - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - } - } - }, - "tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true - }, - "tar": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", - "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", - "dev": true, - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "dependencies": { - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true - } - } - }, - "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "requires": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - }, - "dependencies": { - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, - "tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "thenify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "dev": true, - "requires": { - "any-promise": "^1.0.0" - } - }, - "thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", - "dev": true, - "requires": { - "thenify": ">= 3.1.0 < 4" - } - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "tinycolor2": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", - "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" - }, - "titleize": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", - "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true - }, - "toml": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz", - "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==", - "dev": true - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, - "trim-lines": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", - "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==", - "dev": true - }, - "trough": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz", - "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==", - "dev": true - }, - "ts-api-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", - "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", - "dev": true, - "requires": {} - }, - "ts-interface-checker": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", - "dev": true - }, - "tsconfig-paths": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz", - "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==", - "dev": true, - "requires": { - "json5": "^2.2.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" - } - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" - } - }, - "typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" - } - }, - "typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" - } - }, - "typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" - } - }, - "typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "devOptional": true - }, - "ufo": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.2.0.tgz", - "integrity": "sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==", - "dev": true - }, - "unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - } - }, - "undici": { - "version": "5.27.2", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.27.2.tgz", - "integrity": "sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==", - "dev": true, - "requires": { - "@fastify/busboy": "^2.0.0" - } - }, - "unified": { - "version": "10.1.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz", - "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "bail": "^2.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^4.0.0", - "trough": "^2.0.0", - "vfile": "^5.0.0" - }, - "dependencies": { - "is-plain-obj": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.0.0.tgz", - "integrity": "sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw==", - "dev": true - } - } - }, - "unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "requires": { - "unique-slug": "^4.0.0" - } - }, - "unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "unist-util-generated": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.1.tgz", - "integrity": "sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==", - "dev": true - }, - "unist-util-is": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.1.tgz", - "integrity": "sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0" - } - }, - "unist-util-position": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.4.tgz", - "integrity": "sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0" - } - }, - "unist-util-position-from-estree": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.2.tgz", - "integrity": "sha512-poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0" - } - }, - "unist-util-remove-position": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-4.0.2.tgz", - "integrity": "sha512-TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-visit": "^4.0.0" - } - }, - "unist-util-stringify-position": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz", - "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0" - } - }, - "unist-util-visit": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz", - "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-is": "^5.0.0", - "unist-util-visit-parents": "^5.1.1" - } - }, - "unist-util-visit-parents": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz", - "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-is": "^5.0.0" - } - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true - }, - "untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true - }, - "update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", - "dev": true, - "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - } - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "util": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", - "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", - "requires": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "which-typed-array": "^1.1.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true - }, - "uvu": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz", - "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==", - "dev": true, - "requires": { - "dequal": "^2.0.0", - "diff": "^5.0.0", - "kleur": "^4.0.3", - "sade": "^1.7.3" - } - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", - "dev": true, - "requires": { - "builtins": "^5.0.0" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true - }, - "vfile": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.2.tgz", - "integrity": "sha512-w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^3.0.0", - "vfile-message": "^3.0.0" - } - }, - "vfile-message": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz", - "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^3.0.0" - } - }, - "vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", - "dev": true, - "requires": { - "esbuild": "^0.18.10", - "fsevents": "~2.3.2", - "postcss": "^8.4.27", - "rollup": "^3.27.1" - }, - "dependencies": { - "@esbuild/android-arm": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.19.tgz", - "integrity": "sha512-1uOoDurJYh5MNqPqpj3l/TQCI1V25BXgChEldCB7D6iryBYqYKrbZIhYO5AI9fulf66sM8UJpc3UcCly2Tv28w==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.19.tgz", - "integrity": "sha512-4+jkUFQxZkQfQOOxfGVZB38YUWHMJX2ihZwF+2nh8m7bHdWXpixiurgGRN3c/KMSwlltbYI0/i929jwBRMFzbA==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.19.tgz", - "integrity": "sha512-ae5sHYiP/Ogj2YNrLZbWkBmyHIDOhPgpkGvFnke7XFGQldBDWvc/AyYwSLpNuKw9UNkgnLlB/jPpnBmlF3G9Bg==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.19.tgz", - "integrity": "sha512-HIpQvNQWFYROmWDANMRL+jZvvTQGOiTuwWBIuAsMaQrnStedM+nEKJBzKQ6bfT9RFKH2wZ+ej+DY7+9xHBTFPg==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.19.tgz", - "integrity": "sha512-m6JdvXJQt0thNLIcWOeG079h2ivhYH4B5sVCgqb/B29zTcFd7EE8/J1nIUHhdtwGeItdUeqKaqqb4towwxvglQ==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.19.tgz", - "integrity": "sha512-G0p4EFMPZhGn/xVNspUyMQbORH3nlKTV0bFNHPIwLraBuAkTeMyxNviTe0ZXUbIXQrR1lrwniFjNFU4s+x7veQ==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.19.tgz", - "integrity": "sha512-hBxgRlG42+W+j/1/cvlnSa+3+OBKeDCyO7OG2ICya1YJaSCYfSpuG30KfOnQHI7Ytgu4bRqCgrYXxQEzy0zM5Q==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.19.tgz", - "integrity": "sha512-qtWyoQskfJlb9MD45mvzCEKeO4uCnDZ7lPFeNqbfaaJHqBiH9qA5Vu2EuckqYZuFMJWy1l4dxTf9NOulCVfUjg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.19.tgz", - "integrity": "sha512-X8g33tczY0GsJq3lhyBrjnFtaKjWVpp1gMq5IlF9BQJ3TUfSK74nQnz9mRIEejmcV+OIYn6bkOJeUaU1Knrljg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.19.tgz", - "integrity": "sha512-SAkRWJgb+KN+gOhmbiE6/wu23D6HRcGQi15cB13IVtBZZgXxygTV5GJlUAKLQ5Gcx0gtlmt+XIxEmSqA6sZTOw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.19.tgz", - "integrity": "sha512-YLAslaO8NsB9UOxBchos82AOMRDbIAWChwDKfjlGrHSzS3v1kxce7dGlSTsrb0PJwo1KYccypN3VNjQVLtz7LA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.19.tgz", - "integrity": "sha512-vSYFtlYds/oTI8aflEP65xo3MXChMwBOG1eWPGGKs/ev9zkTeXVvciU+nifq8J1JYMz+eQ4J9JDN0O2RKF8+1Q==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.19.tgz", - "integrity": "sha512-tgG41lRVwlzqO9tv9l7aXYVw35BxKXLtPam1qALScwSqPivI8hjkZLNH0deaaSCYCFT9cBIdB+hUjWFlFFLL9A==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.19.tgz", - "integrity": "sha512-EgBZFLoN1S5RuB4cCJI31pBPsjE1nZ+3+fHRjguq9Ibrzo29bOLSBcH1KZJvRNh5qtd+fcYIGiIUia8Jw5r1lQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.19.tgz", - "integrity": "sha512-q1V1rtHRojAzjSigZEqrcLkpfh5K09ShCoIsdTakozVBnM5rgV58PLFticqDp5UJ9uE0HScov9QNbbl8HBo6QQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.19.tgz", - "integrity": "sha512-D0IiYjpZRXxGZLQfsydeAD7ZWqdGyFLBj5f2UshJpy09WPs3qizDCsEr8zyzcym6Woj/UI9ZzMIXwvoXVtyt0A==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.19.tgz", - "integrity": "sha512-3tt3SOS8L3D54R8oER41UdDshlBIAjYhdWRPiZCTZ1E41+shIZBpTjaW5UaN/jD1ENE/Ok5lkeqhoNMbxstyxw==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.19.tgz", - "integrity": "sha512-MxbhcuAYQPlfln1EMc4T26OUoeg/YQc6wNoEV8xvktDKZhLtBxjkoeESSo9BbPaGKhAPzusXYj5n8n5A8iZSrA==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.19.tgz", - "integrity": "sha512-m0/UOq1wj25JpWqOJxoWBRM9VWc3c32xiNzd+ERlYstUZ6uwx5SZsQUtkiFHaYmcaoj+f6+Tfcl7atuAz3idwQ==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.19.tgz", - "integrity": "sha512-L4vb6pcoB1cEcXUHU6EPnUhUc4+/tcz4OqlXTWPcSQWxegfmcOprhmIleKKwmMNQVc4wrx/+jB7tGkjjDmiupg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.19.tgz", - "integrity": "sha512-rQng7LXSKdrDlNDb7/v0fujob6X0GAazoK/IPd9C3oShr642ri8uIBkgM37/l8B3Rd5sBQcqUXoDdEy75XC/jg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.19.tgz", - "integrity": "sha512-z69jhyG20Gq4QL5JKPLqUT+eREuqnDAFItLbza4JCmpvUnIlY73YNjd5djlO7kBiiZnvTnJuAbOjIoZIOa1GjA==", - "dev": true, - "optional": true - }, - "esbuild": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.19.tgz", - "integrity": "sha512-ra3CaIKCzJp5bU5BDfrCc0FRqKj71fQi+gbld0aj6lN0ifuX2fWJYPgLVLGwPfA+ruKna+OWwOvf/yHj6n+i0g==", - "dev": true, - "requires": { - "@esbuild/android-arm": "0.18.19", - "@esbuild/android-arm64": "0.18.19", - "@esbuild/android-x64": "0.18.19", - "@esbuild/darwin-arm64": "0.18.19", - "@esbuild/darwin-x64": "0.18.19", - "@esbuild/freebsd-arm64": "0.18.19", - "@esbuild/freebsd-x64": "0.18.19", - "@esbuild/linux-arm": "0.18.19", - "@esbuild/linux-arm64": "0.18.19", - "@esbuild/linux-ia32": "0.18.19", - "@esbuild/linux-loong64": "0.18.19", - "@esbuild/linux-mips64el": "0.18.19", - "@esbuild/linux-ppc64": "0.18.19", - "@esbuild/linux-riscv64": "0.18.19", - "@esbuild/linux-s390x": "0.18.19", - "@esbuild/linux-x64": "0.18.19", - "@esbuild/netbsd-x64": "0.18.19", - "@esbuild/openbsd-x64": "0.18.19", - "@esbuild/sunos-x64": "0.18.19", - "@esbuild/win32-arm64": "0.18.19", - "@esbuild/win32-ia32": "0.18.19", - "@esbuild/win32-x64": "0.18.19" - } - } - } - }, - "vite-node": { - "version": "0.28.5", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.28.5.tgz", - "integrity": "sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==", - "dev": true, - "requires": { - "cac": "^6.7.14", - "debug": "^4.3.4", - "mlly": "^1.1.0", - "pathe": "^1.1.0", - "picocolors": "^1.0.0", - "source-map": "^0.6.1", - "source-map-support": "^0.5.21", - "vite": "^3.0.0 || ^4.0.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "requires": { - "defaults": "^1.0.3" - } - }, - "web-encoding": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/web-encoding/-/web-encoding-1.1.5.tgz", - "integrity": "sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==", - "requires": { - "@zxing/text-encoding": "0.9.0", - "util": "^0.12.3" - } - }, - "web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, - "which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" - } - }, - "wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "requires": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true - }, - "strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - } - } - }, - "wrap-ansi-cjs": { - "version": "npm:wrap-ansi@7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "ws": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", - "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", - "dev": true, - "requires": {} - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", - "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - }, - "zod": { - "version": "3.21.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz", - "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==" - }, - "zwitch": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz", - "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==", - "dev": true - } } } diff --git a/examples/remix/package.json b/examples/remix/package.json index 89c8ac14..6f266849 100644 --- a/examples/remix/package.json +++ b/examples/remix/package.json @@ -1,42 +1,47 @@ { - "name": "remix-template-remix", + "name": "remix", "private": true, - "description": "", - "license": "", "sideEffects": false, + "type": "module", "scripts": { - "build": "remix build", - "dev": "remix dev" + "build": "remix vite:build", + "dev": "remix vite:dev", + "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .", + "start": "remix-serve ./build/server/index.js", + "typecheck": "tsc" }, "dependencies": { - "@remix-run/css-bundle": "2.3.0", - "@remix-run/node": "2.3.0", - "@remix-run/react": "2.3.0", - "domain-functions": "1.8.0", - "isbot": "^3.6.13", - "make-service": "^2.0.0-next.0", + "@remix-run/node": "^2.8.1", + "@remix-run/react": "^2.8.1", + "@remix-run/serve": "^2.8.1", + "@types/tinycolor2": "^1.4.6", + "composable-functions": "file:../../npm", + "isbot": "^4.1.0", + "make-service": "^3.0.0", + "postcss": "^8.4.38", "react": "^18.2.0", "react-dom": "^18.2.0", - "remix": "2.3.0", "tinycolor2": "^1.6.0", - "zod": "^3.21.4" + "zod": "^3.22.4" }, "devDependencies": { - "@remix-run/dev": "2.3.0", - "@remix-run/eslint-config": "2.3.0", - "@remix-run/serve": "2.3.0", - "@types/react": "^18.2.18", + "@remix-run/dev": "^2.8.1", + "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "@types/tinycolor2": "^1.4.3", - "@typescript-eslint/eslint-plugin": "^6.2.1", - "@typescript-eslint/parser": "^6.2.1", - "eslint": "^8.46.0", - "prettier": "^3.0.1", - "prettier-plugin-tailwindcss": "^0.4.1", - "tailwindcss": "^3.3.3", - "typescript": "^5.1.6" + "@typescript-eslint/eslint-plugin": "^6.7.4", + "@typescript-eslint/parser": "^6.7.4", + "eslint": "^8.38.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.28.1", + "eslint-plugin-jsx-a11y": "^6.7.1", + "eslint-plugin-react": "^7.33.2", + "eslint-plugin-react-hooks": "^4.6.0", + "tailwindcss": "^3.4.3", + "typescript": "^5.1.6", + "vite": "^5.1.0", + "vite-tsconfig-paths": "^4.2.1" }, "engines": { - "node": ">=14" + "node": ">=18.0.0" } } diff --git a/examples/remix/postcss.config.mjs b/examples/remix/postcss.config.mjs new file mode 100644 index 00000000..28418020 --- /dev/null +++ b/examples/remix/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + tailwindcss: {}, + }, +} diff --git a/examples/remix/remix.config.js b/examples/remix/remix.config.js deleted file mode 100644 index b0b05a5b..00000000 --- a/examples/remix/remix.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/** @type {import('@remix-run/dev').AppConfig} */ - -module.exports = { - ignoredRouteFiles: ["**/.*"], - // When running locally in development mode, we use the built-in remix - // server. This does not understand the vercel lambda module format, - // so we default back to the standard build output. - // server: process.env.NODE_ENV === "development" ? undefined : "./server.ts", - // serverBuildPath: "api/index.js", - // appDirectory: "app", - // assetsBuildDirectory: "public/build", - // publicPath: "/build/", - serverModuleFormat: "cjs", - tailwind: true, -}; diff --git a/examples/remix/remix.env.d.ts b/examples/remix/remix.env.d.ts deleted file mode 100644 index dcf8c45e..00000000 --- a/examples/remix/remix.env.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -/// -/// diff --git a/examples/remix/tsconfig.json b/examples/remix/tsconfig.json index 98e05fa3..9d87dd37 100644 --- a/examples/remix/tsconfig.json +++ b/examples/remix/tsconfig.json @@ -1,20 +1,32 @@ { - "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"], + "include": [ + "**/*.ts", + "**/*.tsx", + "**/.server/**/*.ts", + "**/.server/**/*.tsx", + "**/.client/**/*.ts", + "**/.client/**/*.tsx" + ], "compilerOptions": { - "lib": ["DOM", "DOM.Iterable", "ES2019"], + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "types": ["@remix-run/node", "vite/client"], "isolatedModules": true, "esModuleInterop": true, "jsx": "react-jsx", - "moduleResolution": "node", + "module": "ESNext", + "moduleResolution": "Bundler", "resolveJsonModule": true, - "target": "ES2019", + "target": "ES2022", "strict": true, + "allowJs": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true, "baseUrl": ".", "paths": { "~/*": ["./app/*"] }, - "noEmit": true, - "allowJs": true, - "forceConsistentCasingInFileNames": true + + // Vite takes care of building everything, not tsc. + "noEmit": true } } diff --git a/examples/remix/vite.config.ts b/examples/remix/vite.config.ts new file mode 100644 index 00000000..2b6aff98 --- /dev/null +++ b/examples/remix/vite.config.ts @@ -0,0 +1,10 @@ +import { vitePlugin as remix } from "@remix-run/dev"; +import { installGlobals } from "@remix-run/node"; +import { defineConfig } from "vite"; +import tsconfigPaths from "vite-tsconfig-paths"; + +installGlobals(); + +export default defineConfig({ + plugins: [remix(), tsconfigPaths()], +}); From ed899eabedebbd9faa1042c68b983f54674ebbca Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 10 Apr 2024 23:45:27 -0300 Subject: [PATCH 053/238] Adjust some UI and remove entry files from example --- examples/remix/app/business/colors.ts | 2 +- examples/remix/app/entry.client.tsx | 18 ---- examples/remix/app/entry.server.tsx | 140 -------------------------- examples/remix/app/root.tsx | 4 +- 4 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 examples/remix/app/entry.client.tsx delete mode 100644 examples/remix/app/entry.server.tsx diff --git a/examples/remix/app/business/colors.ts b/examples/remix/app/business/colors.ts index bf541f33..65d57bbd 100644 --- a/examples/remix/app/business/colors.ts +++ b/examples/remix/app/business/colors.ts @@ -34,7 +34,7 @@ const mutateColor = df.make( params: { id }, body: { color }, }) - return response.json(colorSchema.pick({ color: true, id: true })) + return response.json(colorSchema.pick({ id: true, color: true })) }) export { listColors, getColor, mutateColor } diff --git a/examples/remix/app/entry.client.tsx b/examples/remix/app/entry.client.tsx deleted file mode 100644 index 94d5dc0d..00000000 --- a/examples/remix/app/entry.client.tsx +++ /dev/null @@ -1,18 +0,0 @@ -/** - * By default, Remix will handle hydrating your app on the client for you. - * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨ - * For more information, see https://remix.run/file-conventions/entry.client - */ - -import { RemixBrowser } from "@remix-run/react"; -import { startTransition, StrictMode } from "react"; -import { hydrateRoot } from "react-dom/client"; - -startTransition(() => { - hydrateRoot( - document, - - - - ); -}); diff --git a/examples/remix/app/entry.server.tsx b/examples/remix/app/entry.server.tsx deleted file mode 100644 index 45db3229..00000000 --- a/examples/remix/app/entry.server.tsx +++ /dev/null @@ -1,140 +0,0 @@ -/** - * By default, Remix will handle generating the HTTP Response for you. - * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨ - * For more information, see https://remix.run/file-conventions/entry.server - */ - -import { PassThrough } from "node:stream"; - -import type { AppLoadContext, EntryContext } from "@remix-run/node"; -import { createReadableStreamFromReadable } from "@remix-run/node"; -import { RemixServer } from "@remix-run/react"; -import { isbot } from "isbot"; -import { renderToPipeableStream } from "react-dom/server"; - -const ABORT_DELAY = 5_000; - -export default function handleRequest( - request: Request, - responseStatusCode: number, - responseHeaders: Headers, - remixContext: EntryContext, - // This is ignored so we can keep it in the template for visibility. Feel - // free to delete this parameter in your app if you're not using it! - // eslint-disable-next-line @typescript-eslint/no-unused-vars - loadContext: AppLoadContext -) { - return isbot(request.headers.get("user-agent") || "") - ? handleBotRequest( - request, - responseStatusCode, - responseHeaders, - remixContext - ) - : handleBrowserRequest( - request, - responseStatusCode, - responseHeaders, - remixContext - ); -} - -function handleBotRequest( - request: Request, - responseStatusCode: number, - responseHeaders: Headers, - remixContext: EntryContext -) { - return new Promise((resolve, reject) => { - let shellRendered = false; - const { pipe, abort } = renderToPipeableStream( - , - { - onAllReady() { - shellRendered = true; - const body = new PassThrough(); - const stream = createReadableStreamFromReadable(body); - - responseHeaders.set("Content-Type", "text/html"); - - resolve( - new Response(stream, { - headers: responseHeaders, - status: responseStatusCode, - }) - ); - - pipe(body); - }, - onShellError(error: unknown) { - reject(error); - }, - onError(error: unknown) { - responseStatusCode = 500; - // Log streaming rendering errors from inside the shell. Don't log - // errors encountered during initial shell rendering since they'll - // reject and get logged in handleDocumentRequest. - if (shellRendered) { - console.error(error); - } - }, - } - ); - - setTimeout(abort, ABORT_DELAY); - }); -} - -function handleBrowserRequest( - request: Request, - responseStatusCode: number, - responseHeaders: Headers, - remixContext: EntryContext -) { - return new Promise((resolve, reject) => { - let shellRendered = false; - const { pipe, abort } = renderToPipeableStream( - , - { - onShellReady() { - shellRendered = true; - const body = new PassThrough(); - const stream = createReadableStreamFromReadable(body); - - responseHeaders.set("Content-Type", "text/html"); - - resolve( - new Response(stream, { - headers: responseHeaders, - status: responseStatusCode, - }) - ); - - pipe(body); - }, - onShellError(error: unknown) { - reject(error); - }, - onError(error: unknown) { - responseStatusCode = 500; - // Log streaming rendering errors from inside the shell. Don't log - // errors encountered during initial shell rendering since they'll - // reject and get logged in handleDocumentRequest. - if (shellRendered) { - console.error(error); - } - }, - } - ); - - setTimeout(abort, ABORT_DELAY); - }); -} diff --git a/examples/remix/app/root.tsx b/examples/remix/app/root.tsx index f699d115..e5a8e747 100644 --- a/examples/remix/app/root.tsx +++ b/examples/remix/app/root.tsx @@ -26,14 +26,14 @@ export const links: LinksFunction = () => [{ rel: 'stylesheet', href: styles }] export function Layout({ children }: { children: React.ReactNode }) { return ( - + - + {children} From 55106a091a0fc3d38dbfd9fe7f18c9c1508465ab Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 11 Apr 2024 09:56:29 -0300 Subject: [PATCH 054/238] Create serializer and compat serializer --- examples/remix/app/routes/color.$id.tsx | 5 +-- src/compat/index.ts | 1 + src/compat/serializer.ts | 47 ++++++++++++++++++++++ src/index.ts | 5 +++ src/serializer.ts | 33 ++++++++++++++++ src/types.ts | 52 ++++++++++++++----------- 6 files changed, 118 insertions(+), 25 deletions(-) create mode 100644 src/compat/index.ts create mode 100644 src/compat/serializer.ts create mode 100644 src/serializer.ts diff --git a/examples/remix/app/routes/color.$id.tsx b/examples/remix/app/routes/color.$id.tsx index fa334540..685b4195 100644 --- a/examples/remix/app/routes/color.$id.tsx +++ b/examples/remix/app/routes/color.$id.tsx @@ -1,6 +1,6 @@ import { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node' import { Form, Link, useActionData, useLoaderData } from '@remix-run/react' -import { inputFromForm } from 'composable-functions' +import { inputFromForm, serialize } from 'composable-functions' import tinycolor from 'tinycolor2' import { getColor, mutateColor } from '~/business/colors' import { actionResponse, loaderResponseOrThrow } from '~/lib' @@ -13,8 +13,7 @@ export const loader = async ({ params }: LoaderFunctionArgs) => { export const action = async ({ request }: ActionFunctionArgs) => { const input = await inputFromForm(request) const result = await mutateColor(input) - console.warn({ input, result }) - return actionResponse(result) + return actionResponse(serialize(result)) } export default function Index() { diff --git a/src/compat/index.ts b/src/compat/index.ts new file mode 100644 index 00000000..d1df9c5a --- /dev/null +++ b/src/compat/index.ts @@ -0,0 +1 @@ +export { serialize } from './serializer.ts' diff --git a/src/compat/serializer.ts b/src/compat/serializer.ts new file mode 100644 index 00000000..814c717d --- /dev/null +++ b/src/compat/serializer.ts @@ -0,0 +1,47 @@ +import { EnvironmentError, InputError } from '../errors.ts' +import { toErrorPayload } from '../serializer.ts' +import { Result, SerializableError } from '../types.ts' + +const isInputError = (error: Error): error is InputError => + error instanceof InputError + +const isEnvironmentError = (error: Error): error is EnvironmentError => + error instanceof EnvironmentError + +function serialize(result: Result): + | { + success: true + data: T + errors: [] + inputErrors: [] + environmentErrors: [] + } + | { + success: false + errors: SerializableError[] + inputErrors: SerializableError[] + environmentErrors: SerializableError[] + } { + if (result.success) { + return { + ...result, + inputErrors: [], + environmentErrors: [], + } + } + + return { + success: false, + errors: result.errors + .filter( + (e) => !(e instanceof InputError) && !(e instanceof EnvironmentError), + ) + .map(toErrorPayload), + inputErrors: result.errors.filter(isInputError).map(toErrorPayload), + environmentErrors: result.errors + .filter(isEnvironmentError) + .map(toErrorPayload), + } +} + +export { serialize } diff --git a/src/index.ts b/src/index.ts index 27c5d58d..a24f390c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -15,6 +15,7 @@ export { inputFromSearch, inputFromUrl, } from './input-resolvers.ts' +export { toErrorPayload, serialize } from './serializer.ts' export { EnvironmentError, ErrorList, InputError } from './errors.ts' export type { AtLeastOne, @@ -23,6 +24,7 @@ export type { Last, MergeObjs, Result, + SerializableError, Success, TupleToUnion, UnpackAll, @@ -32,3 +34,6 @@ export type { // DOMAIN FUNCTIONS export * as df from './df/index.ts' export type { DomainFunction } from './df/index.ts' + +// COMPAT MODULE +export * as compat from './compat/index.ts' diff --git a/src/serializer.ts b/src/serializer.ts new file mode 100644 index 00000000..05ba9ed4 --- /dev/null +++ b/src/serializer.ts @@ -0,0 +1,33 @@ +import { EnvironmentError } from './errors.ts' +import { InputError } from './errors.ts' +import type { Result, SerializableError, Success } from './types.ts' + +function toErrorPayload(error: T): SerializableError { + if (error instanceof InputError || error instanceof EnvironmentError) { + return { + exception: error, + message: error.message, + name: error.name, + path: error.path, + } + } + return { + exception: error, + message: error.message, + name: error.name, + path: [], + } +} + +function serialize(result: Result): + | Success + | { + success: false + errors: SerializableError[] + } { + if (result.success) return result + + return { success: false, errors: result.errors.map(toErrorPayload) } +} + +export { serialize, toErrorPayload } diff --git a/src/types.ts b/src/types.ts index d6079e07..120dc665 100644 --- a/src/types.ts +++ b/src/types.ts @@ -95,11 +95,11 @@ type PipeReturn = Fns extends [ ? IsNever extends true ? ['Fail to compose, "never" does not fit in', PB] : Awaited extends PB - ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> - : ['Fail to compose', Awaited, 'does not fit in', PB] + ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> + : ['Fail to compose', Awaited, 'does not fit in', PB] : Fns extends [Composable<(...args: infer P) => infer O>] - ? Composable<(...args: P) => O> - : never + ? Composable<(...args: P) => O> + : never type PipeArguments< Fns extends any[], @@ -113,10 +113,10 @@ type PipeArguments< ? IsNever> extends true ? ['Fail to compose, "never" does not fit in', FirstBParameter] : Awaited extends FirstBParameter - ? EveryElementTakesUndefined extends true - ? PipeArguments OA>]> - : EveryElementTakesUndefined - : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] + ? EveryElementTakesUndefined extends true + ? PipeArguments OA>]> + : EveryElementTakesUndefined + : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] : [...Arguments, Composable<(...a: PA) => OA>] : never @@ -138,16 +138,16 @@ type SubtypesTuple< ? headA extends headB ? SubtypesTuple : headB extends headA - ? SubtypesTuple - : { - 'Incompatible arguments ': true - argument1: headA - argument2: headB - } + ? SubtypesTuple + : { + 'Incompatible arguments ': true + argument1: headA + argument2: headB + } : SubtypesTuple : TB extends [infer headBNoA, ...infer restBNoA] - ? SubtypesTuple<[], restBNoA, [...O, headBNoA]> - : O + ? SubtypesTuple<[], restBNoA, [...O, headBNoA]> + : O type AllArguments< Fns extends any[], @@ -206,16 +206,23 @@ type Zip< : O : O -type CollectArguments> = - {} extends Zip, AllArguments>>> - ? never - : Prettify< - Zip, AllArguments>>> - > +type CollectArguments> = {} extends Zip< + Keys, + AllArguments>> +> + ? never + : Prettify, AllArguments>>>> type RecordToTuple> = RecordValuesFromKeysTuple> +type SerializableError = { + exception: T + message: string + name: string + path: string[] +} + export type { AllArguments, AtLeastOne, @@ -231,6 +238,7 @@ export type { Prettify, RecordToTuple, Result, + SerializableError, Success, TupleToUnion, UnpackAll, From c1885811d5c26df47b491b5b4f25e63fc2042cdf Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 11 Apr 2024 11:02:05 -0300 Subject: [PATCH 055/238] Adjust mutation in example --- examples/remix/app/business/colors.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/remix/app/business/colors.ts b/examples/remix/app/business/colors.ts index 65d57bbd..ea3e7d9c 100644 --- a/examples/remix/app/business/colors.ts +++ b/examples/remix/app/business/colors.ts @@ -34,7 +34,8 @@ const mutateColor = df.make( params: { id }, body: { color }, }) - return response.json(colorSchema.pick({ id: true, color: true })) + await response.json(colorSchema.pick({ id: true })) + return { color } }) export { listColors, getColor, mutateColor } From 3cf5d5f6258500db815ce266f2d97aa0023ae9a9 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 11 Apr 2024 11:19:19 -0300 Subject: [PATCH 056/238] Adjust serializer types and fix example --- examples/remix/app/lib/index.ts | 13 ++++++++----- examples/remix/app/root.tsx | 7 +++---- examples/remix/app/routes/color.$id.tsx | 4 ++-- examples/remix/app/routes/user.$id.tsx | 2 +- src/compat/index.ts | 1 + src/compat/serializer.ts | 18 +++--------------- src/compat/types.ts | 19 +++++++++++++++++++ src/index.ts | 1 + src/serializer.ts | 9 ++------- src/types.ts | 5 +++++ 10 files changed, 45 insertions(+), 34 deletions(-) create mode 100644 src/compat/types.ts diff --git a/examples/remix/app/lib/index.ts b/examples/remix/app/lib/index.ts index 235a87af..4cb8f178 100644 --- a/examples/remix/app/lib/index.ts +++ b/examples/remix/app/lib/index.ts @@ -1,5 +1,7 @@ -import { Cookie, json, TypedResponse } from '@remix-run/node' -import { Result } from 'composable-functions' +import type { Cookie, TypedResponse } from '@remix-run/node' +import { json } from '@remix-run/node' +import type { Result, SerializedResult } from 'composable-functions' +import { serialize } from 'composable-functions' /** * Given a Cookie and a Request it returns the stored cookie's value as an object @@ -14,10 +16,11 @@ function envFromCookie( } } -const actionResponse = , X>( - result: T, +const actionResponse = ( + result: Result, opts?: RequestInit, -) => json(result, { status: result.success ? 200 : 422, ...opts }) +): TypedResponse> => + json(serialize(result), { status: result.success ? 200 : 422, ...opts }) const loaderResponseOrThrow = >( result: T, diff --git a/examples/remix/app/root.tsx b/examples/remix/app/root.tsx index e5a8e747..e9a95501 100644 --- a/examples/remix/app/root.tsx +++ b/examples/remix/app/root.tsx @@ -13,12 +13,11 @@ import { ActionFunctionArgs, LinksFunction, LoaderFunctionArgs, - json, } from '@remix-run/node' import styles from './tailwind.css?url' -import { envFromCookie, loaderResponseOrThrow } from '~/lib' +import { actionResponse, envFromCookie, loaderResponseOrThrow } from '~/lib' import { agreeToGPD, cookie, getGPDInfo } from '~/business/gpd' import { inputFromForm } from 'composable-functions' @@ -50,9 +49,9 @@ export const loader = async ({ request }: LoaderFunctionArgs) => { export const action = async ({ request }: ActionFunctionArgs) => { const result = await agreeToGPD(await inputFromForm(request)) if (!result.success || result.data.agreed === false) { - return json(result) + return actionResponse(result) } - return json(result, { + return actionResponse(result, { headers: { 'Set-Cookie': await cookie.serialize(result.data) }, }) } diff --git a/examples/remix/app/routes/color.$id.tsx b/examples/remix/app/routes/color.$id.tsx index 685b4195..17ce2f5d 100644 --- a/examples/remix/app/routes/color.$id.tsx +++ b/examples/remix/app/routes/color.$id.tsx @@ -1,6 +1,6 @@ import { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node' import { Form, Link, useActionData, useLoaderData } from '@remix-run/react' -import { inputFromForm, serialize } from 'composable-functions' +import { inputFromForm } from 'composable-functions' import tinycolor from 'tinycolor2' import { getColor, mutateColor } from '~/business/colors' import { actionResponse, loaderResponseOrThrow } from '~/lib' @@ -13,7 +13,7 @@ export const loader = async ({ params }: LoaderFunctionArgs) => { export const action = async ({ request }: ActionFunctionArgs) => { const input = await inputFromForm(request) const result = await mutateColor(input) - return actionResponse(serialize(result)) + return actionResponse(result) } export default function Index() { diff --git a/examples/remix/app/routes/user.$id.tsx b/examples/remix/app/routes/user.$id.tsx index 0d393161..72c36351 100644 --- a/examples/remix/app/routes/user.$id.tsx +++ b/examples/remix/app/routes/user.$id.tsx @@ -20,7 +20,7 @@ export default function Index() { href={user.link} className="hover:text-cyan-500" target="_blank" - rel="noreferer" + rel="noreferer noreferrer" >

{user.initials}

{user.name}

diff --git a/src/compat/index.ts b/src/compat/index.ts index d1df9c5a..3a174c65 100644 --- a/src/compat/index.ts +++ b/src/compat/index.ts @@ -1 +1,2 @@ export { serialize } from './serializer.ts' +export type { SerializedResult } from './types.ts' diff --git a/src/compat/serializer.ts b/src/compat/serializer.ts index 814c717d..c2496e98 100644 --- a/src/compat/serializer.ts +++ b/src/compat/serializer.ts @@ -1,6 +1,7 @@ import { EnvironmentError, InputError } from '../errors.ts' import { toErrorPayload } from '../serializer.ts' -import { Result, SerializableError } from '../types.ts' +import { Result } from '../types.ts' +import { SerializedResult } from './types.ts' const isInputError = (error: Error): error is InputError => error instanceof InputError @@ -8,20 +9,7 @@ const isInputError = (error: Error): error is InputError => const isEnvironmentError = (error: Error): error is EnvironmentError => error instanceof EnvironmentError -function serialize(result: Result): - | { - success: true - data: T - errors: [] - inputErrors: [] - environmentErrors: [] - } - | { - success: false - errors: SerializableError[] - inputErrors: SerializableError[] - environmentErrors: SerializableError[] - } { +function serialize(result: Result): SerializedResult { if (result.success) { return { ...result, diff --git a/src/compat/types.ts b/src/compat/types.ts new file mode 100644 index 00000000..59b13c8e --- /dev/null +++ b/src/compat/types.ts @@ -0,0 +1,19 @@ +import { EnvironmentError, InputError } from '../errors.ts' +import { SerializableError } from '../types.ts' + +type SerializedResult = + | { + success: true + data: T + errors: [] + inputErrors: [] + environmentErrors: [] + } + | { + success: false + errors: SerializableError[] + inputErrors: SerializableError[] + environmentErrors: SerializableError[] + } + +export type { SerializedResult } diff --git a/src/index.ts b/src/index.ts index a24f390c..ea1743bb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,6 +25,7 @@ export type { MergeObjs, Result, SerializableError, + SerializedResult, Success, TupleToUnion, UnpackAll, diff --git a/src/serializer.ts b/src/serializer.ts index 05ba9ed4..fdb60d8f 100644 --- a/src/serializer.ts +++ b/src/serializer.ts @@ -1,6 +1,6 @@ import { EnvironmentError } from './errors.ts' import { InputError } from './errors.ts' -import type { Result, SerializableError, Success } from './types.ts' +import type { Result, SerializableError, SerializedResult } from './types.ts' function toErrorPayload(error: T): SerializableError { if (error instanceof InputError || error instanceof EnvironmentError) { @@ -19,12 +19,7 @@ function toErrorPayload(error: T): SerializableError { } } -function serialize(result: Result): - | Success - | { - success: false - errors: SerializableError[] - } { +function serialize(result: Result): SerializedResult { if (result.success) return result return { success: false, errors: result.errors.map(toErrorPayload) } diff --git a/src/types.ts b/src/types.ts index 120dc665..af4b6bcb 100644 --- a/src/types.ts +++ b/src/types.ts @@ -223,6 +223,10 @@ type SerializableError = { path: string[] } +type SerializedResult = + | Success + | { success: false; errors: SerializableError[] } + export type { AllArguments, AtLeastOne, @@ -239,6 +243,7 @@ export type { RecordToTuple, Result, SerializableError, + SerializedResult, Success, TupleToUnion, UnpackAll, From cc240e587b5be559e59aeb0b784306a92f8dcd16 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 12 Apr 2024 16:17:12 -0300 Subject: [PATCH 057/238] Express DomainFunction type in terms of Composable type --- src/df/types.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/df/types.ts b/src/df/types.ts index a82b26de..0c5a3472 100644 --- a/src/df/types.ts +++ b/src/df/types.ts @@ -1,12 +1,12 @@ -import { Result } from '../types.ts' +import { Composable } from '../types.ts' /** * A domain function. * It carries the output type which can be further unpacked with UnpackData and other type helpers. */ -type DomainFunction = { - (input?: unknown, environment?: unknown): Promise> -} +type DomainFunction = Composable< + (input?: unknown, environment?: unknown) => Output +> /** * Unpacks the result of a domain function. From 173d8fca033924d84b550f4df8645bdf8359e9d7 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 12 Apr 2024 16:30:13 -0300 Subject: [PATCH 058/238] Simplify fromSuccess type with function overload --- src/constructors.ts | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/constructors.ts b/src/constructors.ts index 3999f049..c533c554 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -1,5 +1,6 @@ import { mapError } from './combinators.ts' import { ErrorList } from './errors.ts' +import { DomainFunction } from './index.ts' import type { Composable, Failure, Fn, Success } from './types.ts' function success(data: T): Success { @@ -52,20 +53,24 @@ function composable(fn: T): Composable { * // ^? number * expect(data).toBe(n + 1) */ -function fromSuccess( +type OnError = (errors: Error[]) => Error[] | Promise +function fromSuccess O>>( fn: T, - onError: (errors: Error[]) => Error[] | Promise = (e) => e, -): T extends Composable<(...a: infer A) => infer O> - ? (...a: A) => Promise> - : never { - return (async (...args) => { + onError?: OnError, +): T extends Composable<(...a: infer P) => infer O> + ? (...args: P) => Promise + : never +function fromSuccess>( + fn: T, + onError?: OnError, +): (...args: Parameters) => Promise +function fromSuccess(fn: T, onError: OnError = (e) => e) { + return async (...args: any[]) => { const result = await mapError(fn, onError)(...args) if (result.success) return result.data throw new ErrorList(result.errors) - }) as T extends Composable<(...a: infer A) => infer O> - ? (...a: A) => Promise> - : never + } } export { composable, failure, fromSuccess, success } From 393efc276223540462b3ecc711b8da17e0daca8e Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 12 Apr 2024 16:54:07 -0300 Subject: [PATCH 059/238] Make map and mapError be universal combinators --- src/df/combinators.ts | 50 +++------------------------- src/df/index.ts | 2 -- src/df/tests/map-error.test.ts | 59 ---------------------------------- src/df/tests/map.test.ts | 51 ----------------------------- src/tests/map-error.test.ts | 30 ++++++++++++++++- src/tests/map.test.ts | 14 +++++++- 6 files changed, 47 insertions(+), 159 deletions(-) delete mode 100644 src/df/tests/map-error.test.ts delete mode 100644 src/df/tests/map.test.ts diff --git a/src/df/combinators.ts b/src/df/combinators.ts index 50d1d4a2..8b4e0e25 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -57,9 +57,9 @@ function collect>( fns: Fns, ): DomainFunction> { const dfsWithKey = Object.entries(fns).map(([key, df]) => - map(df, (result) => ({ [key]: result })), + A.map(df, (result) => ({ [key]: result })), ) - return map(all(...dfsWithKey), A.mergeObjects) as DomainFunction< + return A.map(all(...dfsWithKey), A.mergeObjects) as DomainFunction< UnpackDFObject > } @@ -106,7 +106,7 @@ function first( function merge>[]>( ...fns: Fns ): DomainFunction>> { - return map(all(...fns), A.mergeObjects) + return A.map(all(...fns), A.mergeObjects) } /** @@ -148,8 +148,8 @@ function collectSequence>( ): DomainFunction> { const keys = Object.keys(fns) - return map( - map(sequence(...Object.values(fns)), (outputs) => + return A.map( + A.map(sequence(...Object.values(fns)), (outputs) => outputs.map((o, i) => ({ [keys[i]]: o, })), @@ -177,22 +177,6 @@ function sequence( )) as DomainFunction> } -/** - * It takes a domain function and a predicate to apply a transformation over the result.data of that function. It only runs if the function was successfull. When the given domain function fails, its error is returned wihout changes. - * @example - * import { mdf, map } from 'domain-functions' - * - * const a = mdf(z.object({ n: z.number() }))(({ n }) => n + 1) - * const df = map(a, (n) => String(n)) - * // ^? DomainFunction - */ -function map( - dfn: DomainFunction, - mapper: (element: O) => R | Promise, -): DomainFunction { - return A.map(dfn, mapper) -} - /** * Use it to add conditional logic to your domain functions' compositions. * It receives a domain function and a predicate function that should return the next domain function to be executed based on the previous domain function's output, like `pipe`. If the predicate returns `null` the result of the previous domain function will be returned and it won't be piped. @@ -235,28 +219,6 @@ function branch( > } -/** - * Creates a single domain function that will apply a transformation over the ErrorResult of a failed DomainFunction. When the given domain function succeeds, its result is returned without changes. - * @example - * import { mdf, mapError } from 'domain-functions' - * - * const increment = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - * const summarizeErrors = (result: ErrorData) => - * ({ - * errors: [{ message: 'Errors count: ' + result.errors.length }], - * inputErrors: [{ message: 'Input errors count: ' + result.inputErrors.length }], - * environmentErrors: [{ message: 'Environment errors count: ' + result.environmentErrors.length }], - * } as ErrorData) - * - * const incrementWithErrorSummary = mapError(increment, summarizeErrors) - */ -function mapError( - dfn: DomainFunction, - mapper: (errors: Error[]) => Error[] | Promise, -): DomainFunction { - return A.mapError(dfn, mapper) -} - type TraceData = { input: unknown environment: unknown @@ -303,8 +265,6 @@ export { collect, collectSequence, first, - map, - mapError, merge, pipe, sequence, diff --git a/src/df/index.ts b/src/df/index.ts index e0bdb4b9..f34bf8f9 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -15,8 +15,6 @@ export { collect, collectSequence, first, - map, - mapError, merge, pipe, sequence, diff --git a/src/df/tests/map-error.test.ts b/src/df/tests/map-error.test.ts deleted file mode 100644 index 1e5cd28e..00000000 --- a/src/df/tests/map-error.test.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { assertEquals, describe, it, z } from '../../test-prelude.ts' -import { df, failure, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' - -describe('mapError', () => { - it('returns the result when the domain function suceeds', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = () => [new Error('New Error Message')] - - const c = df.mapError(a, b) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), success(2)) - }) - - it('returns a domain function function that will apply a function over the error of the first one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const errorMapper = (errors: Error[]) => [ - new Error('Number of errors: ' + errors.length), - ] - - const c = df.mapError(a, errorMapper) - type _R = Expect>> - - assertEquals( - await c({ invalidInput: '1' }), - failure([new Error('Number of errors: 1')]), - ) - }) - - it('returns a domain function function that will apply an async function over the error of the first one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const errorMapper = (errors: Error[]) => - Promise.resolve([new Error('Number of errors: ' + errors.length)]) - - const c = df.mapError(a, errorMapper) - type _R = Expect>> - - assertEquals( - await c({ invalidInput: '1' }), - failure([new Error('Number of errors: 1')]), - ) - }) - - it('returns the error when the mapping function fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = () => { - throw 'failed to map' - } - - const c = df.mapError(a, b) - type _R = Expect>> - - assertEquals( - await c({ invalidInput: '1' }), - failure([new Error('failed to map')]), - ) - }) -}) diff --git a/src/df/tests/map.test.ts b/src/df/tests/map.test.ts deleted file mode 100644 index b6f8a150..00000000 --- a/src/df/tests/map.test.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { assertEquals, describe, it, z } from '../../test-prelude.ts' -import { df, failure, InputError, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' - -describe('map', () => { - it('returns a domain function function that will apply a function over the results of the first one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = (id: number) => id + 1 - - const c = df.map(a, b) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), success(3)) - }) - - it('returns a domain function function that will apply an async function over the results of the first one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = (id: number) => Promise.resolve(id + 1) - - const c = df.map(a, b) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), success(3)) - }) - - it('returns the error when the domain function fails', async () => { - const firstInputParser = z.object({ id: z.number() }) - const a = df.make(firstInputParser)(({ id }) => id + 1) - const b = (id: number) => id + 1 - - const c = df.map(a, b) - type _R = Expect>> - - assertEquals( - await c({ invalidInput: '1' }), - failure([new InputError('Required', ['id'])]), - ) - }) - - it('returns the error when the mapping function fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = () => { - throw 'failed to map' - } - - const c = df.map(a, b) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), failure([new Error('failed to map')])) - }) -}) diff --git a/src/tests/map-error.test.ts b/src/tests/map-error.test.ts index c6b8a6cb..3d93fd24 100644 --- a/src/tests/map-error.test.ts +++ b/src/tests/map-error.test.ts @@ -1,6 +1,7 @@ import { assertEquals, describe, it } from '../test-prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, mapError } from '../index.ts' +import { success } from '../constructors.ts' const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') @@ -12,8 +13,35 @@ const cleanError = (err: Error) => ({ message: err.message + '!!!', }) describe('mapError', () => { - it('maps over the error results of an Composable function', async () => { + it('maps over the error results of a Composable function', async () => { const fn = mapError(faultyAdd, (errors) => errors.map(cleanError)) + const res = await fn(2, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res, success(4)) + }) + + it('maps over the error results of a Composable function', async () => { + const fn = mapError(faultyAdd, (errors) => errors.map(cleanError)) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + type _R = Expect>> + + assertEquals(res.success, false) + assertEquals(res.errors![0].message, 'a is 1!!!') + }) + + it('accepts an async mapper', async () => { + const fn = mapError(faultyAdd, (errors) => + Promise.resolve(errors.map(cleanError)), + ) const res = await fn(1, 2) type _FN = Expect< diff --git a/src/tests/map.test.ts b/src/tests/map.test.ts index 5cefa492..232bb24d 100644 --- a/src/tests/map.test.ts +++ b/src/tests/map.test.ts @@ -22,6 +22,18 @@ describe('map', () => { assertEquals(res, success(true)) }) + it('maps with an async function', async () => { + const fn = map(add, (a) => Promise.resolve(a + 1 === 4)) + const res = await fn(1, 2) + + type _FN = Expect< + Equal boolean>> + > + type _R = Expect>> + + assertEquals(res, success(true)) + }) + it('maps over a composition', async () => { const fn = map(pipe(add, toString), (a) => typeof a === 'string') const res = await fn(1, 2) @@ -34,7 +46,7 @@ describe('map', () => { assertEquals(res, success(true)) }) - it('does not do anything when the function fails', async () => { + it('returns a Failure when the function fails', async () => { const fn = map(faultyAdd, (a) => a + 1 === 4) const res = await fn(1, 2) From ec092707554d4f8c723620374f3f68bb696da5ec Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 12 Apr 2024 17:00:45 -0400 Subject: [PATCH 060/238] Generalized catchError --- src/combinators.ts | 28 +++++++++++++--------------- src/tests/catch-error.test.ts | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 2a65e880..daeba52f 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -2,9 +2,7 @@ import type { AllArguments, CollectArguments, Composable, - Failure, First, - Fn, MergeObjs, PipeArguments, PipeReturn, @@ -168,22 +166,22 @@ function map( * originalInput.id * -1 * )) */ -function catchError( - fn: Composable, - catcher: (err: Failure['errors'], ...originalInput: Parameters) => R, -) { - return (async (...args: Parameters) => { +function catchError< + F extends Composable, + C extends (err: Error[], ...originalInput: Parameters) => any, +>(fn: F, catcher: C) { + return (async (...args: Parameters) => { const res = await fn(...args) if (res.success) return success(res.data) - return composable(catcher)(res.errors, ...(args as any)) + return composable(catcher)(res.errors as never, ...(args as any as never)) }) as Composable< ( - ...args: Parameters - ) => ReturnType extends any[] - ? R extends never[] - ? ReturnType - : ReturnType | R - : ReturnType | R + ...args: Parameters + ) => Awaited> extends never[] + ? UnpackData> extends any[] + ? UnpackData> + : Awaited> | UnpackData> + : Awaited> | UnpackData> > } @@ -213,4 +211,4 @@ function mapError( }) as T } -export { pipe, all, collect, sequence, map, catchError, mapError, mergeObjects } +export { all, catchError, collect, map, mapError, mergeObjects, pipe, sequence } diff --git a/src/tests/catch-error.test.ts b/src/tests/catch-error.test.ts index 4c6100b5..cf0612f5 100644 --- a/src/tests/catch-error.test.ts +++ b/src/tests/catch-error.test.ts @@ -1,6 +1,14 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' +import { assertEquals, describe, it, z } from '../test-prelude.ts' import type { Result, Composable } from '../index.ts' -import { catchError, composable, success } from '../index.ts' +import { catchError, composable, success, df } from '../index.ts' + +const dfFaultyAdd = df.make( + z.number(), + z.number(), +)((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') @@ -8,6 +16,28 @@ const faultyAdd = composable((a: number, b: number) => { }) describe('catchError', () => { + it('changes the type of DF to accomodate catcher return type', async () => { + const fn = catchError(dfFaultyAdd, () => null) + const res = await fn(1, 2) + + type _FN = Expect< + Equal number | null>> + > + type _R = Expect>> + + assertEquals(res, success(null)) + }) + + it('returns original type when catcher returns empty list', async () => { + const getList = composable(() => [1, 2, 3]) + const fn = catchError(getList, () => []) + const res = await fn() + + type _FN = Expect number[]>>> + + assertEquals(res, success([1, 2, 3])) + }) + it('changes the type to accomodate catcher return type', async () => { const fn = catchError(faultyAdd, () => null) const res = await fn(1, 2) From f120fc833321ff147d8aaeab09dc9a11b20ecb34 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 12 Apr 2024 17:23:58 -0400 Subject: [PATCH 061/238] Generalize trace --- src/combinators.ts | 43 +++++++++++++++++++++++++++- src/df/combinators.ts | 44 +---------------------------- src/df/index.ts | 1 - src/df/tests/trace.test.ts | 46 ------------------------------ src/index.ts | 1 + src/tests/trace.test.ts | 58 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 91 deletions(-) delete mode 100644 src/df/tests/trace.test.ts create mode 100644 src/tests/trace.test.ts diff --git a/src/combinators.ts b/src/combinators.ts index daeba52f..26783d6f 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -7,6 +7,7 @@ import type { PipeArguments, PipeReturn, RecordToTuple, + Result, Success, UnpackAll, UnpackData, @@ -211,4 +212,44 @@ function mapError( }) as T } -export { all, catchError, collect, map, mapError, mergeObjects, pipe, sequence } +/** + * Whenever you need to intercept inputs and a domain function result without changing them you can use this function. + * The most common use case is to log failures to the console or to an external service. + * @param traceFn A function that receives the input, environment and result of a domain function. + * @example + * import { mdf, trace } from 'domain-functions' + * + * const trackErrors = trace(({ input, output, result }) => { + * if(!result.success) sendToExternalService({ input, output, result }) + * }) + * const increment = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) + * const incrementAndTrackErrors = trackErrors(increment) + * // ^? DomainFunction + */ +function trace( + traceFn: ( + result: Result, + ...originalInput: unknown[] + ) => Promise | void, +) { + return (fn: C) => + (async (...args) => { + const originalResult = await fn(...args) + const traceResult = await composable(traceFn)(originalResult, ...args) + if (traceResult.success) return originalResult + + return failure(traceResult.errors) + }) as C +} + +export { + all, + catchError, + collect, + map, + mapError, + mergeObjects, + pipe, + sequence, + trace, +} diff --git a/src/df/combinators.ts b/src/df/combinators.ts index 8b4e0e25..f787ac58 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -11,9 +11,8 @@ import type { DomainFunction, UnpackDFObject, UnpackData, - UnpackResult, } from './types.ts' -import { composable, failure, fromSuccess } from '../constructors.ts' +import { composable, fromSuccess } from '../constructors.ts' import { ErrorList } from '../errors.ts' import { applyEnvironment } from './constructors.ts' @@ -219,46 +218,6 @@ function branch( > } -type TraceData = { - input: unknown - environment: unknown - result: T -} -/** - * Whenever you need to intercept inputs and a domain function result without changing them you can use this function. - * The most common use case is to log failures to the console or to an external service. - * @param traceFn A function that receives the input, environment and result of a domain function. - * @example - * import { mdf, trace } from 'domain-functions' - * - * const trackErrors = trace(({ input, output, result }) => { - * if(!result.success) sendToExternalService({ input, output, result }) - * }) - * const increment = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - * const incrementAndTrackErrors = trackErrors(increment) - * // ^? DomainFunction - */ -function trace>( - traceFn: ({ - input, - environment, - result, - }: TraceData>) => Promise | void, -): (fn: DomainFunction) => DomainFunction { - return (fn) => async (input, environment) => { - const originalResult = await fn(input, environment) - const traceResult = await composable(traceFn)({ - input, - environment, - // TODO: Remove this casting when we unify the Unpack types - result: originalResult as Awaited>, - }) - if (traceResult.success) return originalResult - - return failure(traceResult.errors) - } -} - export { all, branch, @@ -268,5 +227,4 @@ export { merge, pipe, sequence, - trace, } diff --git a/src/df/index.ts b/src/df/index.ts index f34bf8f9..9ba00ac0 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -18,5 +18,4 @@ export { merge, pipe, sequence, - trace, } from './combinators.ts' diff --git a/src/df/tests/trace.test.ts b/src/df/tests/trace.test.ts deleted file mode 100644 index 6e4d07ee..00000000 --- a/src/df/tests/trace.test.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../../test-prelude.ts' -import { df, fromSuccess, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' - -describe('trace', () => { - it('converts trace exceptions to df failures', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - - const c = df.trace(() => { - throw new Error('Problem in tracing') - })(a) - type _R = Expect>> - - const result = await c({ id: 1 }) - - assertIsError(result.errors[0], Error, 'Problem in tracing') - }) - - it('intercepts inputs and outputs of a given domain function', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - - let contextFromFunctionA: { - input: unknown - environment: unknown - result: unknown - } | null = null - - const c = df.trace((context) => { - contextFromFunctionA = context - })(a) - type _R = Expect>> - - assertEquals(await fromSuccess(c)({ id: 1 }), 2) - assertEquals(contextFromFunctionA, { - input: { id: 1 }, - environment: undefined, - result: success(2), - }) - }) -}) diff --git a/src/index.ts b/src/index.ts index ea1743bb..df54a058 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,6 +8,7 @@ export { mergeObjects, pipe, sequence, + trace } from './combinators.ts' export { inputFromForm, diff --git a/src/tests/trace.test.ts b/src/tests/trace.test.ts new file mode 100644 index 00000000..a85e9bd5 --- /dev/null +++ b/src/tests/trace.test.ts @@ -0,0 +1,58 @@ +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../test-prelude.ts' +import { composable, df, trace, fromSuccess, success } from '../index.ts' +import type { Composable, DomainFunction } from '../index.ts' + +describe('trace', () => { + it('converts trace exceptions to df failures', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + + const c = trace(() => { + throw new Error('Problem in tracing') + })(a) + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + const result = await c({ id: 1 }) + + assertIsError(result.errors[0], Error, 'Problem in tracing') + }) + + it('converts trace exceptions to df failures', async () => { + const a = composable(({ id }: { id: number }) => id + 1) + + const c = trace(() => { + throw new Error('Problem in tracing') + })(a) + type _R = Expect< + Equal number>> + > + + const result = await c({ id: 1 }) + + assertIsError(result.errors[0], Error, 'Problem in tracing') + }) + + it('intercepts inputs and outputs of a given domain function', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + + let contextFromFunctionA: unknown[] = [] + + const c = trace((...context) => { + contextFromFunctionA = context + })(a) + type _R = Expect>> + + assertEquals(await fromSuccess(c)({ id: 1 }), 2) + assertEquals(contextFromFunctionA, [success(2), { id: 1 }]) + }) +}) From 798a8eb2169d7a015a22d9316359be73018245ca Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 12 Apr 2024 17:57:15 -0400 Subject: [PATCH 062/238] Using experimental version --- deno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deno.json b/deno.json index a43e5acd..10f54e36 100644 --- a/deno.json +++ b/deno.json @@ -1,5 +1,5 @@ { - "version": "2.6.0", + "version": "0.0.0-experimental-20240412-1", "tasks": { "test": "deno test --allow-env --allow-net src", "publish": "deno task build-npm && cd npm/ && npm publish", From b1b13d5cc52824b66066c11e37faa1fb798deae3 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Sat, 13 Apr 2024 11:21:35 -0400 Subject: [PATCH 063/238] Update example with latest changes in CF modules --- examples/remix/app/routes/_index.tsx | 4 ++-- examples/remix/package-lock.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/remix/app/routes/_index.tsx b/examples/remix/app/routes/_index.tsx index 8ba0776d..3f4bd83a 100644 --- a/examples/remix/app/routes/_index.tsx +++ b/examples/remix/app/routes/_index.tsx @@ -1,6 +1,6 @@ import { LoaderFunctionArgs } from '@remix-run/node' import { Link, useLoaderData, useLocation } from '@remix-run/react' -import { inputFromUrl, df } from 'composable-functions' +import { inputFromUrl, df, map } from 'composable-functions' import { listColors } from '~/business/colors' import { listUsers } from '~/business/users' import { loaderResponseOrThrow } from '~/lib' @@ -9,7 +9,7 @@ import { loaderResponseOrThrow } from '~/lib' const getData = df.collect({ // The second argument will transform the successful result of listColors, // we only care about what is in the "data" field - colors: df.map(listColors, ({ data }) => data), + colors: map(listColors, ({ data }) => data), users: listUsers, }) export const loader = async ({ request }: LoaderFunctionArgs) => { diff --git a/examples/remix/package-lock.json b/examples/remix/package-lock.json index 8f7ce66d..fb5f3392 100644 --- a/examples/remix/package-lock.json +++ b/examples/remix/package-lock.json @@ -42,7 +42,7 @@ }, "../../npm": { "name": "composable-functions", - "version": "2.6.0", + "version": "0.0.0-experimental-20240412-1", "license": "MIT", "devDependencies": { "@deno/shim-deno": "~0.18.0", From 504b49aa20b62291e0391abb236a10e9d7bc799d Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Sat, 13 Apr 2024 11:49:44 -0400 Subject: [PATCH 064/238] New README --- DFs.md | 920 ++++++++++++++++++++++++++++++++++++++++ README.md | 930 ++++------------------------------------- composables.md | 123 ------ src/tests/pipe.test.ts | 2 +- 4 files changed, 1013 insertions(+), 962 deletions(-) create mode 100644 DFs.md delete mode 100644 composables.md diff --git a/DFs.md b/DFs.md new file mode 100644 index 00000000..45211682 --- /dev/null +++ b/DFs.md @@ -0,0 +1,920 @@ +# Keep your business logic clean with Domain Functions + +Domain Functions helps you decouple your business logic from your controllers, with first-class type inference from end to end. +It does this by enforcing the parameters' types at runtime (through [Zod](https://github.com/colinhacks/zod#what-is-zod) schemas) and always wrapping results (even exceptions) into a `Promise>` type. + +![](example.gif) + +## Table of contents + +- [Benefits](#benefits) +- [Quickstart](#quickstart) +- [Using Deno](#using-deno) +- [Taking parameters that are not user input](#taking-parameters-that-are-not-user-input) +- [Dealing with errors](#dealing-with-errors) + - [Changing the ErrorResult with Custom Errors](#changing-the-errorresult-with-custom-errors) + - [ResultError constructor](#resulterror-constructor) + - [Other error constructors](#other-error-constructors) + - [Using error messages in the UI](#using-error-messages-in-the-ui) + - [errorMessagesFor](#errormessagesfor) + - [Tracing](#tracing) +- [Combining domain functions](#combining-domain-functions) + - [all](#all) + - [collect](#collect) + - [merge](#merge) + - [first](#first) + - [pipe](#pipe) + - [branch](#branch) + - [sequence](#sequence) + - [collectSequence](#collectsequence) + - [map](#map) + - [mapError](#maperror) +- [Runtime utilities](#runtime-utilities) + - [fromSuccess](#fromsuccess) + - [mergeObjects](#mergeobjects) +- [Improve type inference with Utility Types](#improve-type-inference-with-utility-types) + - [UnpackData](#unpackdata) + - [UnpackSuccess](#unpacksuccess) + - [UnpackResult](#unpackresult) +- [Extracting input values for domain functions](#extracting-input-values-for-domain-functions) + - [inputFromForm](#inputfromform) + - [inputFromFormData](#inputfromformdata) + - [inputFromUrl](#inputfromurl) + - [inputFromSearch](#inputfromsearch) +- [Resources](#resources) +- [FAQ](#faq) +- [Acknowlegements](#acknowlegements) + +## Benefits + +- Provides end-to-end type safety, all the way from the Backend to the UI +- Removes the "plumbing": Extracting and parsing structured data from your Requests +- Keeps your domain functions decoupled from the framework, with the assurance that your values conform to your types +- Facilitates easier testing and maintainence of business logic +- Allows business logic to be expressed in the type system + +## Quickstart + +``` +npm i domain-functions zod +``` + +```tsx +import { makeDomainFunction, inputFromForm } from 'domain-functions' +import * as z from 'zod' + +const schema = z.object({ number: z.coerce.number() }) +const increment = makeDomainFunction(schema)(({ number }) => number + 1) + +const result = await increment({ number: 1 }) +/* +result = { + success: true, + data: 2, + errors: [] + inputErrors: [] + environmentErrors: [] +} +*/ +const failedResult = await increment({ number: 'foo' }) +/* +failedResult = { + success: false, + inputErrors: [{ path: ['number'], message: 'Expected number, received nan' }], + environmentErrors: [] + errors: [], +} +*/ +``` + +To understand how to build the schemas, refer to [Zod documentation](https://github.com/colinhacks/zod#defining-schemas). + +## Using Deno + +If you are using [Deno](https://deno.land/), just directly import the functions you need from [deno.land/x](https://deno.land/x): + +```ts +import { makeDomainFunction } from "https://deno.land/x/domain_functions/mod.ts"; +``` + +This documentation will use Node.JS imports by convention, just replace `domain-functions` with `https://deno.land/x/domain_functions/mod.ts` when using [Deno](https://deno.land/). + +## Taking parameters that are not user input + +Sometimes you want to ensure the safety of certain values that weren't explicitly sent by the user. We call them _environment_: + +```tsx +// In some app/domain/*.server.ts file +const sendEmail = mdf( + z.object({ email: z.string().email() }), // user input schema + z.object({ origin: z.string() }) // environment schema +)( + async ({ email }, { origin }) => { + mailer.send({ + email, + message: `Link to reset password: ${origin}/reset-password` + }) + } +) + +// In your controller: +async ({ request }) => { + const environment = (request: Request) => ({ + origin: new URL(request.url).origin, + }) + + await sendEmail( + await inputFromForm(request), + environment(request), + ) +} +``` + +We usually use the environment for ensuring authenticated requests. +In this case, assume you have a `currentUser` function that returns the authenticated user: + +```tsx +const dangerousFunction = mdf( + someInputSchema, + z.object({ user: z.object({ id: z.string(), admin: z.literal(true) }) }) +)(async (input, { user }) => { + // do something that only the admin can do +}) +``` + +## Dealing with errors + +The error result has the following structure: + +```ts +type ErrorResult = { + success: false + errors: Error[] + inputErrors: SchemaError[] + environmentErrors: SchemaError[] +} +``` + +The `inputErrors` and `environmentErrors` fields will be the errors from parsing the corresponding Zod schemas, and the `errors` field will be for any exceptions thrown inside the domain function (in which case we keep a reference to the original exception): + +```ts +const alwaysFails = mdf(input, environment)(async () => { + throw new Error('Some error') +}) + +const failedResult = await alwaysFails(someInput) +/* +failedResult = { + success: false, + errors: [{ message: 'Some error', exception: instanceOfError }], + inputErrors: [], + environmentErrors: [], +} +*/ +``` + +### Changing the ErrorResult with Custom Errors + +### ResultError constructor + +Whenever you want more control over the domain function's `ErrorResult`, you can throw a `ResultError` from the domain function's handler. You will then be able to add multiple error messages to the structure: + +```ts +const alwaysFails = mdf(inputSchema)(async () => { + throw new ResultError({ + errors: [{ message: 'Some error' }], + inputErrors: [{ path: ['number'], message: 'Expected number, received nan' }], + environmentErrors: [], // you can optionally omit this as it is empty. + }) +}) +``` + +### Other error constructors + +You can also throw an `InputError` whenever you want a custom input error that cannot be generated by your schema. + +```ts +const alwaysFails = mdf(input, environment)(async () => { + throw new InputError('Email already taken', 'email') +}) + +const failedResult = await alwaysFails(someInput) +// ^? Result +/* +failedResult = { + success: false, + errors: [], + inputErrors: [{ message: 'Email already taken', path: ['email'] }], + environmentErrors: [], +} +*/ +``` + +You can also return a custom environment error by throwing an `EnvironmentError`. + +### Using error messages in the UI + +To improve DX when dealing with errors, we export a couple of utilities. + +#### errorMessagesFor + +Given an array of `SchemaError` -- be it from `inputErrors` or `environmentErrors` -- and a name, `errorMessagesFor` returns an array of error messages with that name in their path. + +```tsx +const result = { + success: false, + errors: [], + inputErrors: [], + environmentErrors: [{ message: 'Must not be empty', path: ['host'] }, { message: 'Must be a fully qualified domain', path: ['host'] }] +} + +errorMessagesFor(result.inputErrors, 'email') // will be an empty array: [] +errorMessagesFor(result.environmentErrors, 'host')[0] === 'Must not be empty' +``` + +### Tracing + +Whenever you need to intercept inputs and a domain function result without changing them, there is a function called `trace` that can help you. + +The most common use case is to log failures to the console or to an external service. Let's say you want to log failed domain functions, you could create a function such as this: + +```ts +const traceToConsole = trace((context) => { + if(!context.result.success) { + console.trace("Domain Function Failure ", context) + } +}) +``` + +Then, assuming you want to trace all failures in a `someOtherDomainFunction`, you just need to pass that domain function to our `tracetoConsole` function: + +```ts +traceToConsole(someOtherDomainFunction)() +``` + +It would also be simple to create a function that will send the errors to some error tracking service under certain conditions: + +```ts +const trackErrors = trace(async ({ input, output, result }) => { + if(!result.success && someOtherConditions(result)) { + await sendToExternalService({ input, output, result }) + } +}) +``` + +## Combining domain functions + +These combinators are useful for composing domain functions. They all return another `DomainFunction`, thus allowing further application in more compositions. + +### all + +`all` creates a single domain function out of multiple domain functions. +It will pass the same input and environment to each provided function. +If __all constituent functions__ are successful, The `data` field (on the composite domain function's result) will be a tuple containing each function's output. + +```ts +const a = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) +const b = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) +const c = mdf(z.object({ id: z.number() }))(({ id }) => Boolean(id)) + +const results = await all(a, b, c)({ id: 1 }) +// ^? Result<[string, number, boolean]> +``` + +For the example above, the result will be: + +```ts +{ + success: true, + data: ['1', 2, true], + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +If any of the constituent functions fail, the `errors` field (on the composite domain function's result) will be an array of the concatenated errors from each failing function: + +```ts +const a = mdf(z.object({ id: z.number() }))(() => { + throw new Error('Error A') +}) +const b = mdf(z.object({ id: z.number() }))(() => { + throw new Error('Error B') +}) + +const results = await all(a, b)({ id: 1 }) +// ^? Result<[never, never]> + +/*{ + success: false, + errors: [ + { message: 'Error A', exception: instanceOfErrorA }, + { message: 'Error B', exception: instanceOfErrorB } + ], + inputErrors: [], + environmentErrors: [], +}*/ +``` + +### collect + +`collect` works like the `all` function but receives its constituent functions inside a record with string keys that identify each one. The shape of this record will be preserved for the `data` property in successful results. + +The motivation for this is that an object with named fields is often preferable to long tuples, when composing many domain functions. + +```ts +const a = mdf(z.object({}))(() => '1') +const b = mdf(z.object({}))(() => 2) +const c = mdf(z.object({}))(() => true) + +const results = await collect({ a, b, c })({}) +// ^? Result<{ a: string, b: number, c: boolean }> +``` + +For the example above, the result will be: + +```ts +{ + success: true, + data: { a: '1', b: 2, c: true }, + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +As with the `all` function, in case any function fails their errors will be concatenated. + +### merge + +`merge` works exactly like the `all` function, except __the shape of the result__ is different. +Instead of returning a tuple, it will return a merged object which is equivalent to: +```ts +map(all(a, b, c), mergeObjects) +``` + +**NOTE :** Try to use [collect](collect) instead wherever possible since it is much safer. `merge` can create domain functions that will always fail in run-time or even overwrite data from successful constituent functions application. The `collect` function does not have these issues and serves a similar purpose. + +The resulting data of every domain function will be merged into one object. __This could potentially lead to values of the leftmost functions being overwritten by the rightmost ones__. + +```ts +const a = mdf(z.object({}))(() => ({ + resultA: 'string', + resultB: 'string', + resultC: 'string', +})) +const b = mdf(z.object({}))(() => ({ resultB: 2 })) +const c = mdf(z.object({}))(async () => ({ resultC: true })) + +const results = await merge(a, b, c)({}) +// ^? Result<{ resultA: string, resultB: number, resultC: boolean }> +``` + +For the example above, the result will be: +```ts +{ + success: true, + data: { resultA: 'string', resultB: 2, resultC: true }, + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +### first + +`first` will create a composite domain function that will return the result of the first successful constituent domain function. It handles inputs and environments like the `all` function. +__It is important to notice__ that all constituent domain functions will be executed in parallel, so be mindful of the side effects. + +```ts +const a = mdf( + z.object({ n: z.number(), operation: z.literal('increment') }), +)(({ n }) => n + 1) +const b = mdf( + z.object({ n: z.number(), operation: z.literal('decrement') }), +)(({ n }) => n - 1) + +const result = await first(a, b)({ n: 1, operation: 'increment' }) +// ^? Result +``` + +For the example above, the result will be: + +```ts +{ + success: true, + data: 2, + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +The composite domain function's result type will be a union of each constituent domain function's result type. + +```ts +const a = mdf(z.object({ operation: z.literal('A') }))(() => ({ + resultA: 'A', +})) +const b = mdf(z.object({ operation: z.literal('B') }))(() => ({ + resultB: 'B', +})) + +const result = await first(a, b)({ operation: 'A' }) +// ^? Result<{ resultA: string } | { resultB: string }> + +if (!result.success) return console.log('No function was successful') +if ('resultA' in result.data) return console.log('function A succeeded') +return console.log('function B succeeded') +``` + +If every constituent domain function fails, the `errors` field will contain the concatenated errors from each failing function's result: + +```ts +const a = mdf(z.object({ id: z.number() }))(() => { + throw new Error('Error A') +}) +const b = mdf(z.object({ id: z.number() }))(() => { + throw new Error('Error B') +}) + +const result = await first(a, b)({ id: 1 }) +// ^? Result + +/*{ + success: false, + errors: [ + { message: 'Error A', exception: instanceOfErrorA }, + { message: 'Error B', exception: instanceOfErrorB } + ], + inputErrors: [], + environmentErrors: [], +}*/ +``` + +### pipe + +`pipe` creates a single domain function out of a chain of multiple domain functions. +It will pass the same environment to all given functions, and it will pass the output of a function as the next function's input in left-to-right order. +The resulting data will be the output of the rightmost function. + +Note that there is no type-level assurance that a function's output will align with and be succesfully parsed by the next function in the pipeline. + +```ts +const a = mdf(z.object({ aNumber: z.number() }))( + ({ aNumber }) => ({ + aString: String(aNumber), + }), +) +const b = mdf(z.object({ aString: z.string() }))( + ({ aString }) => ({ + aBoolean: aString == '1', + }), +) +const c = mdf(z.object({ aBoolean: z.boolean() }))( + async ({ aBoolean }) => !aBoolean, +) + +const d = pipe(a, b, c) + +const result = await d({ aNumber: 1 }) +// ^? Result +``` + +For the example above, the result will be: + +```ts +{ + success: true, + data: false, + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +If one functions fails, execution halts and the error is returned. + +### sequence + +`sequence` works exactly like the `pipe` function, except __the shape of the result__ is different. +Instead of the `data` field being the output of the last domain function, it will be a tuple containing each intermediate output (similar to the `all` function). + +```ts +const a = mdf(z.number())((aNumber) => String(aNumber)) +const b = mdf(z.string())((aString) => aString === '1') + +const c = sequence(a, b) + +const result = await c(1) +// ^? Result<[string, boolean]> +``` + +For the example above, the result will be: + +```ts +{ + success: true, + data: ['1', true], + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +If you'd rather have an object instead of a tuple (similar to the `merge` function), you can use the `map` and `mergeObjects` functions like so: + +```ts +import { mergeObjects } from 'domain-functions' + +const a = mdf(z.number())((aNumber) => ({ + aString: String(aNumber) +})) +const b = mdf(z.object({ aString: z.string() }))( + ({ aString }) => ({ aBoolean: aString === '1' }) +) + +const c = map(sequence(a, b), mergeObjects) + +const result = await c(1) +// ^? Result<{ aString: string, aBoolean: boolean }> +``` + +### collectSequence + +`collectSequence` is very similar to the `collect` function, except __it runs in the sequence of the keys' order like a `pipe`__. + +It receives its constituent functions inside a record with string keys that identify each one. +The shape of this record will be preserved for the `data` property in successful results. + +This feature relies on JS's order of objects' keys (guaranteed since ECMAScript2015). + +**NOTE :** For number-like object keys (eg: { 2: dfA, 1: dfB }) JS will follow ascendent order. + +```ts +const a = mdf(z.number())((aNumber) => String(aNumber)) +const b = mdf(z.string())((aString) => aString === '1') + +const c = collectSequence({ a, b }) + +const result = await c(1) +// ^? Result<{ a: string, b: boolean }> +``` + +For the example above, the result will be: + +```ts +{ + success: true, + data: { a: '1', b: true }, + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +### branch + +Use `branch` to add conditional logic to your domain functions' compositions. + +It receives a domain function and a predicate function that should return the next domain function to be executed based on the previous domain function's output, like `pipe`. + +```ts +const getIdOrEmail = mdf(z.object({ id: z.number().optional, email: z.string().optional() }))((data) => { + return data.id ?? data.email +}) +const findUserById = mdf(z.number())((id) => { + return db.users.find({ id }) +}) +const findUserByEmail = mdf(z.string().email())((email) => { + return db.users.find({ email }) +}) +const findUserByIdOrEmail = branch( + getIdOrEmail, + (output) => (typeof output === "number" ? findUserById : findUserByEmail), +) +const result = await findUserByIdOrEmail({ id: 1 }) +// ^? Result +``` +For the example above, the result will be: +```ts +{ + success: true, + data: { id: 1, email: 'john@doe.com' }, + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` +If you don't want to pipe when a certain condition is matched, you can return `null` like so: +```ts +const a = mdf()(() => 'a') +const b = mdf()(() => 'b') +const df = branch(a, (output) => output === 'a' ? null : b) +// ^? DomainFunction<'a' | 'b'> +``` + +If any function fails, execution halts and the error is returned. +The predicate function will return an `ErrorResult` type in case it throws: +```ts +const findUserByIdOrEmail = branch( + getIdOrEmail, + (output) => { + throw new Error("Invalid input") + }, +) +// ^? DomainFunction +``` +For the example above, the result type will be `ErrorResult`: +```ts +{ + success: false, + errors: [{ message: 'Invalid input' }], + inputErrors: [], + environmentErrors: [], +} +``` + +### map + +`map` creates a single domain function that will apply a transformation over the `result.data` of a successful `DomainFunction`. +When the given domain function fails, its error is returned wihout changes. +If successful, the `data` field will contain the output of the first function argument, mapped using the second function argument. + +This can be useful when composing domain functions. For example, you might need to align input/output types in a pipeline: + +```ts +const fetchAsText = mdf(z.object({ userId: z.number() }))( + ({ userId }) => + fetch(`https://reqres.in/api/users/${String(userId)}`).then((r) => + r.json(), + ), +) + +const fullName = mdf( + z.object({ first_name: z.string(), last_name: z.string() }), +)(({ first_name, last_name }) => `${first_name} ${last_name}`) + +const fetchFullName = pipe( + map(fetchAsText, ({ data }) => data), + fullName, +) + +const result = fetchFullName({ userId: 2 }) +// ^? Result +``` + +For the example above, the result will be something like this: + +```ts +{ + success: true, + data: 'Janet Weaver', + errors: [], + inputErrors: [], + environmentErrors: [], +} +``` + +### mapError + +`mapError` creates a single domain function that will apply a transformation over the `ErrorResult` of a failed `DomainFunction`. +When the given domain function succeeds, its result is returned without changes. + +This could be useful when adding any layer of error handling. +In the example below, we are counting the errors but disregarding the contents: + +```ts +const increment = mdf(z.object({ id: z.number() }))( + ({ id }) => id + 1, +) + +const summarizeErrors = (result: ErrorData) => + ({ + errors: [{ message: 'Number of errors: ' + result.errors.length }], + inputErrors: [ + { message: 'Number of input errors: ' + result.inputErrors.length }, + ], + environmentErrors: [ + { message: 'Number of environment errors: ' + result.environmentErrors.length }, + ], + } as ErrorData) + +const incrementWithErrorSummary = mapError(increment, summarizeErrors) + +const result = await incrementWithErrorSummary({ invalidInput: '1' }) +``` + +For the example above, the `result` will be: + +```ts +{ + success: false, + errors: [{ message: 'Number of errors: 0' }], + inputErrors: [{ message: 'Number of input errors: 1' }], + environmentErrors: [{ message: 'Number of environment errors: 0' }], +} +``` + +## Runtime utilities + +### fromSuccess + +Whenever the composition utilities fall short, and you want to call other domain functions from inside your current one, you can use the `fromSuccess` function to create a domain function that is expected to always succeed. + +```ts +const domainFunctionA = mdf( + z.object({ id: z.string() }), +)(async ({ id }) => { + const valueB = await fromSuccess(domainFunctionB)({ userId: id }) + // do something else + return { valueA, valueB } +}) +``` + +Otherwise, if the domain function passed to `fromSuccess` happens to fail, the error will be bubbled up exactly as it was thrown. + +### mergeObjects + +`mergeObjects` merges an array of objects into one object, preserving type inference completely. +Object properties from the rightmost object will take precedence over the leftmost ones. + +```ts +const a = { a: 1, b: 2 } +const b = { b: '3', c: '4' } +const result = mergeObjects([a, b]) +// ^? { a: number, b: string, c: string } +``` +The resulting object will be: +```ts +{ a: 1, b: '3', c: '4' } +``` + + + +## Improve type inference with Utility Types + +### UnpackData + +`UnpackData` infers the returned data of a successful domain function: + +```ts +const fn = mdf()(async () => '') + +type Data = UnpackData +// ^? string +``` + +### UnpackSuccess + +`UnpackSuccess` infers the success result of a domain function: + +```ts +const fn = mdf()(async () => '') + +type Success = UnpackSuccess +// ^? SuccessResult +// Which is the same as: { success: true, data: string, errors: [], inputErrors: [], environmentErrors: [] } +``` +### UnpackResult + +`UnpackResult` infers the result of a domain function: + +```ts +const fn = mdf()(async () => '') + +type Result = UnpackResult +// ^? Result +// Which is the same as: { success: true, data: string, errors: [], inputErrors: [], environmentErrors: [], } | { success: false, errors: { message: string }[], inputErrors: SchemaError[], environmentErrors: SchemaError[] } +// Or the same as: SuccessResult | ErrorResult +``` + +## Extracting input values for domain functions + +We export some functions to help you extract values out of your requests before sending them as user input. + +### inputFromForm + +`inputFromForm` will read a request's `FormData` and extract its values into a structured object: + +```tsx +// Given the following form: +function Form() { + return ( +
+ + + +
+ ) +} + +async (request: Request) => { + const values = await inputFromForm(request) + // values = { email: 'john@doe.com', password: '1234' } +} +``` + +### inputFromFormData + +`inputFromFormData` extracts values from a `FormData` object into a structured object: + +```tsx +const formData = new FormData() +formData.append('email', 'john@doe.com') +formData.append('tasks[]', 'one') +formData.append('tasks[]', 'two') +const values = inputFromFormData(formData) +// values = { email: 'john@doe.com', tasks: ['one', 'two'] } +``` + +### inputFromUrl + +`inputFromUrl` will read a request's query params and extract its values into a structured object: + +```tsx +// Given the following form: +function Form() { + return ( +
+ +
+ ) +} + +async (request: Request) => { + const values = inputFromUrl(request) + // values = { page: '2' } +} +``` +### inputFromSearch + +`inputFromSearch` extracts values from a `URLSearchParams` object into a structured object: + +```tsx +const qs = new URLSearchParams() +qs.append('colors[]', 'red') +qs.append('colors[]', 'green') +qs.append('colors[]', 'blue') +const values = inputFromSearch(qs) +// values = { colors: ['red', 'green', 'blue'] } +``` + +All of the functions above will allow structured data as follows: + +```tsx +// Given the following form: +function Form() { + return ( +
+ + + + + +
+ ) +} + +async (request: Request) => { + const values = await inputFromForm(request) + /* + values = { + numbers: ['1', '2'], + person: [{ email: 'john@doe.com', password: '1234' }] + } + */ +} +``` + +To better understand how to structure your data, refer to [this test file](./src/input-resolvers.test.ts) + +## Resources + +- [The case for domain-functions](https://dev.to/diogob/the-case-for-domain-functions-f4e) +- [How domain-functions improves the already awesome DX of Remix projects](https://dev.to/gugaguichard/how-remix-domains-improves-the-already-awesome-dx-of-remix-projects-56lm) + +## FAQ + +- I want to use domain-functions in a project that does not have Zod, how can I use other schema validation libraries? + - Although we code against Zod during the library development, any schema validation can be used as long as you are able to create an adapter of the type [`ParserSchema`](./src/types.ts#L183). +- Why are the inputs and the environment not type-safe? + - Short answer: Similar to how Zod's `.parse` operates, we won't presume you're providing the right data to the domain function. We will validate it only at runtime. The domain function's inner code won't execute if the input/environment is invalid, ensuring that the data you receive is valid. Once validated, we can also infer the output type. Read more about it in [@danielweinmann 's comment](https://github.com/seasonedcc/domain-functions/issues/80#issuecomment-1642453221). +- How do I carry out conditional branching in a composition of domain functions? + - Before 1.8.0: You would have to use either the [`first`](#first) operator or `if` statements within the function. The `first` operator was not ideal because it could execute all the functions in the composition (assuming the input and environment validate) until one of them returns a success. For the `if` approach, we'd recommend using [`fromSuccess`](#fromsuccess) to invoke the other domain functions, as it would propagate any errors that could occur within them. Read more about it [here](https://twitter.com/gugaguichard/status/1684280544387899393). + - After 1.8.0: We introduced the [`branch`](#branch) operator, which enables you to conduct more complex conditional branching without breaking compositions. + +## Acknowlegements + +We are grateful for [Zod](https://github.com/colinhacks/zod), as it is a great library and it informed our design. +It's worth mentioning two other projects that inspired domain-functions: + +- [Servant](https://github.com/haskell-servant/servant/) +- [tRPC](https://trpc.io) diff --git a/README.md b/README.md index 45211682..f6d3790b 100644 --- a/README.md +++ b/README.md @@ -1,920 +1,174 @@ -# Keep your business logic clean with Domain Functions - -Domain Functions helps you decouple your business logic from your controllers, with first-class type inference from end to end. -It does this by enforcing the parameters' types at runtime (through [Zod](https://github.com/colinhacks/zod#what-is-zod) schemas) and always wrapping results (even exceptions) into a `Promise>` type. - -![](example.gif) - -## Table of contents - -- [Benefits](#benefits) -- [Quickstart](#quickstart) -- [Using Deno](#using-deno) -- [Taking parameters that are not user input](#taking-parameters-that-are-not-user-input) -- [Dealing with errors](#dealing-with-errors) - - [Changing the ErrorResult with Custom Errors](#changing-the-errorresult-with-custom-errors) - - [ResultError constructor](#resulterror-constructor) - - [Other error constructors](#other-error-constructors) - - [Using error messages in the UI](#using-error-messages-in-the-ui) - - [errorMessagesFor](#errormessagesfor) - - [Tracing](#tracing) -- [Combining domain functions](#combining-domain-functions) - - [all](#all) - - [collect](#collect) - - [merge](#merge) - - [first](#first) - - [pipe](#pipe) - - [branch](#branch) - - [sequence](#sequence) - - [collectSequence](#collectsequence) - - [map](#map) - - [mapError](#maperror) -- [Runtime utilities](#runtime-utilities) - - [fromSuccess](#fromsuccess) - - [mergeObjects](#mergeobjects) -- [Improve type inference with Utility Types](#improve-type-inference-with-utility-types) - - [UnpackData](#unpackdata) - - [UnpackSuccess](#unpacksuccess) - - [UnpackResult](#unpackresult) -- [Extracting input values for domain functions](#extracting-input-values-for-domain-functions) - - [inputFromForm](#inputfromform) - - [inputFromFormData](#inputfromformdata) - - [inputFromUrl](#inputfromurl) - - [inputFromSearch](#inputfromsearch) -- [Resources](#resources) -- [FAQ](#faq) -- [Acknowlegements](#acknowlegements) - -## Benefits - -- Provides end-to-end type safety, all the way from the Backend to the UI -- Removes the "plumbing": Extracting and parsing structured data from your Requests -- Keeps your domain functions decoupled from the framework, with the assurance that your values conform to your types -- Facilitates easier testing and maintainence of business logic -- Allows business logic to be expressed in the type system +# Composable Functions ## Quickstart ``` -npm i domain-functions zod +npm i composable-functions ``` ```tsx -import { makeDomainFunction, inputFromForm } from 'domain-functions' -import * as z from 'zod' +import { composable, pipe } from 'domain-functions' -const schema = z.object({ number: z.coerce.number() }) -const increment = makeDomainFunction(schema)(({ number }) => number + 1) +const faultyAdd = composable((a: number, b: number) => { + if (a === 1) throw new Error('a is 1') + return a + b +}) +const show = composable(String) +const addAndShow = pipe(faultyAdd, show) -const result = await increment({ number: 1 }) +const result = await addAndShow(2, 2) /* result = { success: true, - data: 2, + data: "4", errors: [] - inputErrors: [] - environmentErrors: [] -} -*/ -const failedResult = await increment({ number: 'foo' }) -/* -failedResult = { - success: false, - inputErrors: [{ path: ['number'], message: 'Expected number, received nan' }], - environmentErrors: [] - errors: [], -} -*/ -``` - -To understand how to build the schemas, refer to [Zod documentation](https://github.com/colinhacks/zod#defining-schemas). - -## Using Deno - -If you are using [Deno](https://deno.land/), just directly import the functions you need from [deno.land/x](https://deno.land/x): - -```ts -import { makeDomainFunction } from "https://deno.land/x/domain_functions/mod.ts"; -``` - -This documentation will use Node.JS imports by convention, just replace `domain-functions` with `https://deno.land/x/domain_functions/mod.ts` when using [Deno](https://deno.land/). - -## Taking parameters that are not user input - -Sometimes you want to ensure the safety of certain values that weren't explicitly sent by the user. We call them _environment_: - -```tsx -// In some app/domain/*.server.ts file -const sendEmail = mdf( - z.object({ email: z.string().email() }), // user input schema - z.object({ origin: z.string() }) // environment schema -)( - async ({ email }, { origin }) => { - mailer.send({ - email, - message: `Link to reset password: ${origin}/reset-password` - }) - } -) - -// In your controller: -async ({ request }) => { - const environment = (request: Request) => ({ - origin: new URL(request.url).origin, - }) - - await sendEmail( - await inputFromForm(request), - environment(request), - ) -} -``` - -We usually use the environment for ensuring authenticated requests. -In this case, assume you have a `currentUser` function that returns the authenticated user: - -```tsx -const dangerousFunction = mdf( - someInputSchema, - z.object({ user: z.object({ id: z.string(), admin: z.literal(true) }) }) -)(async (input, { user }) => { - // do something that only the admin can do -}) -``` - -## Dealing with errors - -The error result has the following structure: - -```ts -type ErrorResult = { - success: false - errors: Error[] - inputErrors: SchemaError[] - environmentErrors: SchemaError[] -} -``` - -The `inputErrors` and `environmentErrors` fields will be the errors from parsing the corresponding Zod schemas, and the `errors` field will be for any exceptions thrown inside the domain function (in which case we keep a reference to the original exception): - -```ts -const alwaysFails = mdf(input, environment)(async () => { - throw new Error('Some error') -}) - -const failedResult = await alwaysFails(someInput) -/* -failedResult = { - success: false, - errors: [{ message: 'Some error', exception: instanceOfError }], - inputErrors: [], - environmentErrors: [], } */ -``` - -### Changing the ErrorResult with Custom Errors - -### ResultError constructor - -Whenever you want more control over the domain function's `ErrorResult`, you can throw a `ResultError` from the domain function's handler. You will then be able to add multiple error messages to the structure: - -```ts -const alwaysFails = mdf(inputSchema)(async () => { - throw new ResultError({ - errors: [{ message: 'Some error' }], - inputErrors: [{ path: ['number'], message: 'Expected number, received nan' }], - environmentErrors: [], // you can optionally omit this as it is empty. - }) -}) -``` - -### Other error constructors - -You can also throw an `InputError` whenever you want a custom input error that cannot be generated by your schema. - -```ts -const alwaysFails = mdf(input, environment)(async () => { - throw new InputError('Email already taken', 'email') -}) - -const failedResult = await alwaysFails(someInput) -// ^? Result +const failedResult = await addAndShow(1, 2) /* failedResult = { success: false, - errors: [], - inputErrors: [{ message: 'Email already taken', path: ['email'] }], - environmentErrors: [], + errors: [] } */ ``` -You can also return a custom environment error by throwing an `EnvironmentError`. - -### Using error messages in the UI - -To improve DX when dealing with errors, we export a couple of utilities. - -#### errorMessagesFor - -Given an array of `SchemaError` -- be it from `inputErrors` or `environmentErrors` -- and a name, `errorMessagesFor` returns an array of error messages with that name in their path. - -```tsx -const result = { - success: false, - errors: [], - inputErrors: [], - environmentErrors: [{ message: 'Must not be empty', path: ['host'] }, { message: 'Must be a fully qualified domain', path: ['host'] }] -} - -errorMessagesFor(result.inputErrors, 'email') // will be an empty array: [] -errorMessagesFor(result.environmentErrors, 'host')[0] === 'Must not be empty' -``` - -### Tracing - -Whenever you need to intercept inputs and a domain function result without changing them, there is a function called `trace` that can help you. - -The most common use case is to log failures to the console or to an external service. Let's say you want to log failed domain functions, you could create a function such as this: - -```ts -const traceToConsole = trace((context) => { - if(!context.result.success) { - console.trace("Domain Function Failure ", context) - } -}) -``` - -Then, assuming you want to trace all failures in a `someOtherDomainFunction`, you just need to pass that domain function to our `tracetoConsole` function: - -```ts -traceToConsole(someOtherDomainFunction)() -``` - -It would also be simple to create a function that will send the errors to some error tracking service under certain conditions: - -```ts -const trackErrors = trace(async ({ input, output, result }) => { - if(!result.success && someOtherConditions(result)) { - await sendToExternalService({ input, output, result }) - } -}) -``` - -## Combining domain functions - -These combinators are useful for composing domain functions. They all return another `DomainFunction`, thus allowing further application in more compositions. - -### all - -`all` creates a single domain function out of multiple domain functions. -It will pass the same input and environment to each provided function. -If __all constituent functions__ are successful, The `data` field (on the composite domain function's result) will be a tuple containing each function's output. - -```ts -const a = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) -const b = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) -const c = mdf(z.object({ id: z.number() }))(({ id }) => Boolean(id)) - -const results = await all(a, b, c)({ id: 1 }) -// ^? Result<[string, number, boolean]> -``` - -For the example above, the result will be: - -```ts -{ - success: true, - data: ['1', 2, true], - errors: [], - inputErrors: [], - environmentErrors: [], -} -``` - -If any of the constituent functions fail, the `errors` field (on the composite domain function's result) will be an array of the concatenated errors from each failing function: - -```ts -const a = mdf(z.object({ id: z.number() }))(() => { - throw new Error('Error A') -}) -const b = mdf(z.object({ id: z.number() }))(() => { - throw new Error('Error B') -}) - -const results = await all(a, b)({ id: 1 }) -// ^? Result<[never, never]> - -/*{ - success: false, - errors: [ - { message: 'Error A', exception: instanceOfErrorA }, - { message: 'Error B', exception: instanceOfErrorB } - ], - inputErrors: [], - environmentErrors: [], -}*/ -``` - -### collect - -`collect` works like the `all` function but receives its constituent functions inside a record with string keys that identify each one. The shape of this record will be preserved for the `data` property in successful results. - -The motivation for this is that an object with named fields is often preferable to long tuples, when composing many domain functions. - -```ts -const a = mdf(z.object({}))(() => '1') -const b = mdf(z.object({}))(() => 2) -const c = mdf(z.object({}))(() => true) - -const results = await collect({ a, b, c })({}) -// ^? Result<{ a: string, b: number, c: boolean }> -``` +## Composing type-safe functions +Let's say we ant to compose two functions: `add : (a: number, b:number) => number` and `toString : (a: number) => string`. We also want the composition to preserve the types, we can continue living in the happy world of type-safe coding, the result would be a function that adds and converts the result to string, something like `addAndReturnString : (a: number, b: number) => string`. -For the example above, the result will be: +Performing this operation manually is straightforward -```ts -{ - success: true, - data: { a: '1', b: 2, c: true }, - errors: [], - inputErrors: [], - environmentErrors: [], +```typescript +function addAndReturnString(a: number, b: number) : string { + return toString(add(a, b)) } ``` -As with the `all` function, in case any function fails their errors will be concatenated. +It would be neat if typescript could the typing for us and provided a more generic mechanism to compose these functions. Something like what you find in libraries such as [lodash](https://lodash.com/docs/4.17.15#flow) -### merge +Using composables the code could be written as: -`merge` works exactly like the `all` function, except __the shape of the result__ is different. -Instead of returning a tuple, it will return a merged object which is equivalent to: -```ts -map(all(a, b, c), mergeObjects) +```typescript +const addAndReturnString = pipe(add, toString) ``` -**NOTE :** Try to use [collect](collect) instead wherever possible since it is much safer. `merge` can create domain functions that will always fail in run-time or even overwrite data from successful constituent functions application. The `collect` function does not have these issues and serves a similar purpose. +We can also extend the same reasoning to functions that return promises in a transparent way. Imagine we have `add : (a: number, b:number) => Promise` and `toString : (a: number) => Promise`, the composition above would work in the same fashion, returning a function `addAndReturnString(a: number, b: number) : Promise` that will wait for each promise in the chain before applying the next function. -The resulting data of every domain function will be merged into one object. __This could potentially lead to values of the leftmost functions being overwritten by the rightmost ones__. +This library also defines several operations besides the `pipe` to compose functions in arbitrary ways, giving a powerful tool for the developer to reason about the data flow without worrying about mistakenly connecting the wrong parameters or forgetting to unwrap some promise or handle some error along the way. -```ts -const a = mdf(z.object({}))(() => ({ - resultA: 'string', - resultB: 'string', - resultC: 'string', -})) -const b = mdf(z.object({}))(() => ({ resultB: 2 })) -const c = mdf(z.object({}))(async () => ({ resultC: true })) - -const results = await merge(a, b, c)({}) -// ^? Result<{ resultA: string, resultB: number, resultC: boolean }> -``` +## Creating primitive composables -For the example above, the result will be: -```ts -{ - success: true, - data: { resultA: 'string', resultB: 2, resultC: true }, - errors: [], - inputErrors: [], - environmentErrors: [], -} -``` - -### first +A `Composable` is a function that returns a `Promise>` where `T` is any type you want to return. Values of the type `Result` will represent either a failure (which carries a list of errors) or a success, where the computation has returned a value within the type `T`. -`first` will create a composite domain function that will return the result of the first successful constituent domain function. It handles inputs and environments like the `all` function. -__It is important to notice__ that all constituent domain functions will be executed in parallel, so be mindful of the side effects. +So we can define the `add` and the `toString` functions as a `Composable`: -```ts -const a = mdf( - z.object({ n: z.number(), operation: z.literal('increment') }), -)(({ n }) => n + 1) -const b = mdf( - z.object({ n: z.number(), operation: z.literal('decrement') }), -)(({ n }) => n - 1) - -const result = await first(a, b)({ n: 1, operation: 'increment' }) -// ^? Result -``` +```typescript +import { composable } from 'composable-functions' -For the example above, the result will be: +const add = composable((a: number, b: number) => a + b) + ^? Composable<(a: number, b: number) => number> -```ts -{ - success: true, - data: 2, - errors: [], - inputErrors: [], - environmentErrors: [], -} +const toString = composable((a: unknown) => `${a}`) ``` -The composite domain function's result type will be a union of each constituent domain function's result type. - -```ts -const a = mdf(z.object({ operation: z.literal('A') }))(() => ({ - resultA: 'A', -})) -const b = mdf(z.object({ operation: z.literal('B') }))(() => ({ - resultB: 'B', -})) - -const result = await first(a, b)({ operation: 'A' }) -// ^? Result<{ resultA: string } | { resultB: string }> - -if (!result.success) return console.log('No function was successful') -if ('resultA' in result.data) return console.log('function A succeeded') -return console.log('function B succeeded') -``` - -If every constituent domain function fails, the `errors` field will contain the concatenated errors from each failing function's result: - -```ts -const a = mdf(z.object({ id: z.number() }))(() => { - throw new Error('Error A') -}) -const b = mdf(z.object({ id: z.number() }))(() => { - throw new Error('Error B') -}) +## Sequential composition +Now we can compose them using pipe to create `addAndReturnString`: -const result = await first(a, b)({ id: 1 }) -// ^? Result +```typescript +import { pipe } from 'composable-functions' -/*{ - success: false, - errors: [ - { message: 'Error A', exception: instanceOfErrorA }, - { message: 'Error B', exception: instanceOfErrorB } - ], - inputErrors: [], - environmentErrors: [], -}*/ +const addAndReturnString = pipe(add, toString) + ^? Composable<(a: number, b: number) => string> ``` -### pipe - -`pipe` creates a single domain function out of a chain of multiple domain functions. -It will pass the same environment to all given functions, and it will pass the output of a function as the next function's input in left-to-right order. -The resulting data will be the output of the rightmost function. - -Note that there is no type-level assurance that a function's output will align with and be succesfully parsed by the next function in the pipeline. - -```ts -const a = mdf(z.object({ aNumber: z.number() }))( - ({ aNumber }) => ({ - aString: String(aNumber), - }), -) -const b = mdf(z.object({ aString: z.string() }))( - ({ aString }) => ({ - aBoolean: aString == '1', - }), -) -const c = mdf(z.object({ aBoolean: z.boolean() }))( - async ({ aBoolean }) => !aBoolean, -) - -const d = pipe(a, b, c) +Note that trying to compose pipe flipping the arguments will not type-check: -const result = await d({ aNumber: 1 }) -// ^? Result -``` +```typescript +import { pipe } from 'composable-functions' -For the example above, the result will be: - -```ts -{ - success: true, - data: false, - errors: [], - inputErrors: [], - environmentErrors: [], -} +const addAndReturnString = pipe(toString, add) + ^? ["Fail to compose", string, "does not fit in", number] ``` -If one functions fails, execution halts and the error is returned. +The error message comes in the form of an inferred type (the type checker error is a bit more cryptic). +Since pipe will compose from left to right, the only `string` output from `toString` will not fit into the first argument of `add` which is a `number`. -### sequence +### Using non-composables (mapping) -`sequence` works exactly like the `pipe` function, except __the shape of the result__ is different. -Instead of the `data` field being the output of the last domain function, it will be a tuple containing each intermediate output (similar to the `all` function). +Sometimes we want to use a simple function in this sort of sequential composition. Imagine that `toString` is not a composable, and you just want to apply a plain old function to the result of `add` when it succeeds. +The function `map` can be used for this, since we are mapping over the result of a `Composable`: -```ts -const a = mdf(z.number())((aNumber) => String(aNumber)) -const b = mdf(z.string())((aString) => aString === '1') +```typescript +import { map } from 'composable-functions' -const c = sequence(a, b) - -const result = await c(1) -// ^? Result<[string, boolean]> +const addAndReturnString = map(add, String) ``` -For the example above, the result will be: +Note that if your mapper function has to be `async` you should wrap it in `composable` and use `pipe` instead. -```ts -{ - success: true, - data: ['1', true], - errors: [], - inputErrors: [], - environmentErrors: [], -} -``` +## Parallel composition -If you'd rather have an object instead of a tuple (similar to the `merge` function), you can use the `map` and `mergeObjects` functions like so: +There are also functions compositions where all its parameters are excuted in parallel, like `Promise.all` will execute several promises and wait for all of them. +The `all` function is one way of composing in this fashion. Assuming we want to apply our `add` and multiply the two numbers returning a success only once both operations succeed: -```ts -import { mergeObjects } from 'domain-functions' +```typescript +import { composable, all } from 'composable-functions' -const a = mdf(z.number())((aNumber) => ({ - aString: String(aNumber) -})) -const b = mdf(z.object({ aString: z.string() }))( - ({ aString }) => ({ aBoolean: aString === '1' }) -) - -const c = map(sequence(a, b), mergeObjects) - -const result = await c(1) -// ^? Result<{ aString: string, aBoolean: boolean }> +const add = composable((a: number, b: number) => a + b) +const mul = composable((a: number, b: number) => a * b) +const addAndMul = all(add, mul) + ^? Composable<(args_0: number, args_1: number) => [number, number]> ``` -### collectSequence +The result of the composition comes in a tuple in the same order as the functions were passed to `all`. +Note that the input functions will also have to type-check and all the functions have to work from the same input. -`collectSequence` is very similar to the `collect` function, except __it runs in the sequence of the keys' order like a `pipe`__. +## Handling errors +Since a `Composable` always return a type `Result` that might be either a failure or a success, there are never exceptions to catch. Any exception inside a `Composable` will return as an object with the shape: `{ success: false, errors: Error[] }`. -It receives its constituent functions inside a record with string keys that identify each one. -The shape of this record will be preserved for the `data` property in successful results. +Two neat consequences is that we can handle errors using functions (no need for try/catch blocks) and handle multiple errors at once. -This feature relies on JS's order of objects' keys (guaranteed since ECMAScript2015). +### Throwing -**NOTE :** For number-like object keys (eg: { 2: dfA, 1: dfB }) JS will follow ascendent order. - -```ts -const a = mdf(z.number())((aNumber) => String(aNumber)) -const b = mdf(z.string())((aString) => aString === '1') +### Catching +To catch an error you need a second `Composable` capable of receiving `{ errors: Error[] }`. This composable is called when the first function fails: -const c = collectSequence({ a, b }) +```typescript +import { composable, catchError } from 'composable-functions' -const result = await c(1) -// ^? Result<{ a: string, b: boolean }> -``` - -For the example above, the result will be: - -```ts -{ - success: true, - data: { a: '1', b: true }, - errors: [], - inputErrors: [], - environmentErrors: [], -} -``` - -### branch - -Use `branch` to add conditional logic to your domain functions' compositions. - -It receives a domain function and a predicate function that should return the next domain function to be executed based on the previous domain function's output, like `pipe`. - -```ts -const getIdOrEmail = mdf(z.object({ id: z.number().optional, email: z.string().optional() }))((data) => { - return data.id ?? data.email -}) -const findUserById = mdf(z.number())((id) => { - return db.users.find({ id }) -}) -const findUserByEmail = mdf(z.string().email())((email) => { - return db.users.find({ email }) +const fetchBody = composable((url: string) => fetch(url).then((r) => r.text())) +const emptyOnError = composable(({errors}: { errors: Error[] }) => { + console.error("Something went wrong, returning empty string", errors) + return "" }) -const findUserByIdOrEmail = branch( - getIdOrEmail, - (output) => (typeof output === "number" ? findUserById : findUserByEmail), -) -const result = await findUserByIdOrEmail({ id: 1 }) -// ^? Result -``` -For the example above, the result will be: -```ts -{ - success: true, - data: { id: 1, email: 'john@doe.com' }, - errors: [], - inputErrors: [], - environmentErrors: [], -} -``` -If you don't want to pipe when a certain condition is matched, you can return `null` like so: -```ts -const a = mdf()(() => 'a') -const b = mdf()(() => 'b') -const df = branch(a, (output) => output === 'a' ? null : b) -// ^? DomainFunction<'a' | 'b'> +const fetchThatNeverFails = catchError(fetchBody, emptyOnError) ``` -If any function fails, execution halts and the error is returned. -The predicate function will return an `ErrorResult` type in case it throws: -```ts -const findUserByIdOrEmail = branch( - getIdOrEmail, - (output) => { - throw new Error("Invalid input") - }, -) -// ^? DomainFunction -``` -For the example above, the result type will be `ErrorResult`: -```ts -{ - success: false, - errors: [{ message: 'Invalid input' }], - inputErrors: [], - environmentErrors: [], -} -``` +### Mapping +Sometimes we just need to transform one error into something that would make more sense for the caller. Imagine you have our `fetchBody` defined above, but we want a custom error type for when the input URL is invalid. You can map over the failures using `mapError` and a function with the type `({ errors: Error[] }) => { errors: Error[] }`. -### map +```typescript +import { mapError } from 'composable-functions' -`map` creates a single domain function that will apply a transformation over the `result.data` of a successful `DomainFunction`. -When the given domain function fails, its error is returned wihout changes. -If successful, the `data` field will contain the output of the first function argument, mapped using the second function argument. - -This can be useful when composing domain functions. For example, you might need to align input/output types in a pipeline: - -```ts -const fetchAsText = mdf(z.object({ userId: z.number() }))( - ({ userId }) => - fetch(`https://reqres.in/api/users/${String(userId)}`).then((r) => - r.json(), - ), +class InvalidUrlError extends Error {} +const fetchBodyWithCustomError = mapError(fetchBody, (errors) => + errors.map((e) => e.message.includes('Invalid URL') ? new InvalidUrlError() : e) ) - -const fullName = mdf( - z.object({ first_name: z.string(), last_name: z.string() }), -)(({ first_name, last_name }) => `${first_name} ${last_name}`) - -const fetchFullName = pipe( - map(fetchAsText, ({ data }) => data), - fullName, -) - -const result = fetchFullName({ userId: 2 }) -// ^? Result -``` - -For the example above, the result will be something like this: - -```ts -{ - success: true, - data: 'Janet Weaver', - errors: [], - inputErrors: [], - environmentErrors: [], -} -``` - -### mapError - -`mapError` creates a single domain function that will apply a transformation over the `ErrorResult` of a failed `DomainFunction`. -When the given domain function succeeds, its result is returned without changes. - -This could be useful when adding any layer of error handling. -In the example below, we are counting the errors but disregarding the contents: - -```ts -const increment = mdf(z.object({ id: z.number() }))( - ({ id }) => id + 1, -) - -const summarizeErrors = (result: ErrorData) => - ({ - errors: [{ message: 'Number of errors: ' + result.errors.length }], - inputErrors: [ - { message: 'Number of input errors: ' + result.inputErrors.length }, - ], - environmentErrors: [ - { message: 'Number of environment errors: ' + result.environmentErrors.length }, - ], - } as ErrorData) - -const incrementWithErrorSummary = mapError(increment, summarizeErrors) - -const result = await incrementWithErrorSummary({ invalidInput: '1' }) -``` - -For the example above, the `result` will be: - -```ts -{ - success: false, - errors: [{ message: 'Number of errors: 0' }], - inputErrors: [{ message: 'Number of input errors: 1' }], - environmentErrors: [{ message: 'Number of environment errors: 0' }], -} -``` - -## Runtime utilities - -### fromSuccess - -Whenever the composition utilities fall short, and you want to call other domain functions from inside your current one, you can use the `fromSuccess` function to create a domain function that is expected to always succeed. - -```ts -const domainFunctionA = mdf( - z.object({ id: z.string() }), -)(async ({ id }) => { - const valueB = await fromSuccess(domainFunctionB)({ userId: id }) - // do something else - return { valueA, valueB } -}) ``` -Otherwise, if the domain function passed to `fromSuccess` happens to fail, the error will be bubbled up exactly as it was thrown. - -### mergeObjects - -`mergeObjects` merges an array of objects into one object, preserving type inference completely. -Object properties from the rightmost object will take precedence over the leftmost ones. - -```ts -const a = { a: 1, b: 2 } -const b = { b: '3', c: '4' } -const result = mergeObjects([a, b]) -// ^? { a: number, b: string, c: string } -``` -The resulting object will be: -```ts -{ a: 1, b: '3', c: '4' } -``` - - - -## Improve type inference with Utility Types +## Recipes -### UnpackData + - Migrating from domain-functions + - [Handling external input](./DFs.md) + - [Defining constants for multiple functions (environments)](./DFs.md) -`UnpackData` infers the returned data of a successful domain function: - -```ts -const fn = mdf()(async () => '') - -type Data = UnpackData -// ^? string -``` - -### UnpackSuccess - -`UnpackSuccess` infers the success result of a domain function: - -```ts -const fn = mdf()(async () => '') - -type Success = UnpackSuccess -// ^? SuccessResult -// Which is the same as: { success: true, data: string, errors: [], inputErrors: [], environmentErrors: [] } -``` -### UnpackResult +## Using Deno -`UnpackResult` infers the result of a domain function: +If you are using [Deno](https://deno.land/), just directly import the functions you need from [deno.land/x](https://deno.land/x): ```ts -const fn = mdf()(async () => '') - -type Result = UnpackResult -// ^? Result -// Which is the same as: { success: true, data: string, errors: [], inputErrors: [], environmentErrors: [], } | { success: false, errors: { message: string }[], inputErrors: SchemaError[], environmentErrors: SchemaError[] } -// Or the same as: SuccessResult | ErrorResult -``` - -## Extracting input values for domain functions - -We export some functions to help you extract values out of your requests before sending them as user input. - -### inputFromForm - -`inputFromForm` will read a request's `FormData` and extract its values into a structured object: - -```tsx -// Given the following form: -function Form() { - return ( -
- - - -
- ) -} - -async (request: Request) => { - const values = await inputFromForm(request) - // values = { email: 'john@doe.com', password: '1234' } -} -``` - -### inputFromFormData - -`inputFromFormData` extracts values from a `FormData` object into a structured object: - -```tsx -const formData = new FormData() -formData.append('email', 'john@doe.com') -formData.append('tasks[]', 'one') -formData.append('tasks[]', 'two') -const values = inputFromFormData(formData) -// values = { email: 'john@doe.com', tasks: ['one', 'two'] } -``` - -### inputFromUrl - -`inputFromUrl` will read a request's query params and extract its values into a structured object: - -```tsx -// Given the following form: -function Form() { - return ( -
- -
- ) -} - -async (request: Request) => { - const values = inputFromUrl(request) - // values = { page: '2' } -} -``` -### inputFromSearch - -`inputFromSearch` extracts values from a `URLSearchParams` object into a structured object: - -```tsx -const qs = new URLSearchParams() -qs.append('colors[]', 'red') -qs.append('colors[]', 'green') -qs.append('colors[]', 'blue') -const values = inputFromSearch(qs) -// values = { colors: ['red', 'green', 'blue'] } -``` - -All of the functions above will allow structured data as follows: - -```tsx -// Given the following form: -function Form() { - return ( -
- - - - - -
- ) -} - -async (request: Request) => { - const values = await inputFromForm(request) - /* - values = { - numbers: ['1', '2'], - person: [{ email: 'john@doe.com', password: '1234' }] - } - */ -} +import { makeDomainFunction } from "https://deno.land/x/domain_functions/mod.ts"; ``` -To better understand how to structure your data, refer to [this test file](./src/input-resolvers.test.ts) - -## Resources - -- [The case for domain-functions](https://dev.to/diogob/the-case-for-domain-functions-f4e) -- [How domain-functions improves the already awesome DX of Remix projects](https://dev.to/gugaguichard/how-remix-domains-improves-the-already-awesome-dx-of-remix-projects-56lm) - -## FAQ - -- I want to use domain-functions in a project that does not have Zod, how can I use other schema validation libraries? - - Although we code against Zod during the library development, any schema validation can be used as long as you are able to create an adapter of the type [`ParserSchema`](./src/types.ts#L183). -- Why are the inputs and the environment not type-safe? - - Short answer: Similar to how Zod's `.parse` operates, we won't presume you're providing the right data to the domain function. We will validate it only at runtime. The domain function's inner code won't execute if the input/environment is invalid, ensuring that the data you receive is valid. Once validated, we can also infer the output type. Read more about it in [@danielweinmann 's comment](https://github.com/seasonedcc/domain-functions/issues/80#issuecomment-1642453221). -- How do I carry out conditional branching in a composition of domain functions? - - Before 1.8.0: You would have to use either the [`first`](#first) operator or `if` statements within the function. The `first` operator was not ideal because it could execute all the functions in the composition (assuming the input and environment validate) until one of them returns a success. For the `if` approach, we'd recommend using [`fromSuccess`](#fromsuccess) to invoke the other domain functions, as it would propagate any errors that could occur within them. Read more about it [here](https://twitter.com/gugaguichard/status/1684280544387899393). - - After 1.8.0: We introduced the [`branch`](#branch) operator, which enables you to conduct more complex conditional branching without breaking compositions. - -## Acknowlegements - -We are grateful for [Zod](https://github.com/colinhacks/zod), as it is a great library and it informed our design. -It's worth mentioning two other projects that inspired domain-functions: +This documentation will use Node.JS imports by convention, just replace `domain-functions` with `https://deno.land/x/domain_functions/mod.ts` when using [Deno](https://deno.land/). -- [Servant](https://github.com/haskell-servant/servant/) -- [tRPC](https://trpc.io) diff --git a/composables.md b/composables.md deleted file mode 100644 index 91d6f4f8..00000000 --- a/composables.md +++ /dev/null @@ -1,123 +0,0 @@ -# Composables - -## Composing type-safe functions -Let's say we ant to compose two functions: `add : (a: number, b:number) => number` and `toString : (a: number) => string`. We also want the composition to preserve the types, we can continue living in the happy world of type-safe coding, the result would be a function that adds and converts the result to string, something like `addAndReturnString : (a: number, b: number) => string`. - -Performing this operation manually is straightforward - -```typescript -function addAndReturnString(a: number, b: number) : string { - return toString(add(a, b)) -} -``` - -It would be neat if typescript could the typing for us and provided a more generic mechanism to compose these functions. Something like what you find in libraries such as [lodash](https://lodash.com/docs/4.17.15#flow) - -Using composables the code could be written as: - -```typescript -const addAndReturnString = pipe(add, toString) -``` - -We can also extend the same reasoning to functions that return promises in a transparent way. Imagine we have `add : (a: number, b:number) => Promise` and `toString : (a: number) => Promise`, the composition above would work in the same fashion, returning a function `addAndReturnString(a: number, b: number) : Promise` that will wait for each promise in the chain before applying the next function. - -This library also defines several operations besides the `pipe` to compose functions in arbitrary ways, giving a powerful tool for the developer to reason about the data flow without worrying about mistakenly connecting the wrong parameters or forgetting to unwrap some promise or handle some error along the way. - -## Creating primitive composables - -A `Composable` is a function that returns a `Promise>` where `T` is any type you want to return. Values of the type `Result` will represent either a failure (which carries a list of errors) or a success, where the computation has returned a value within the type `T`. - -So we can define the `add` and the `toString` functions as a `Composable`: - -```typescript -import { composable } from 'composable-functions' - -const add = composable((a: number, b: number) => a + b) - ^? Composable<(a: number, b: number) => number> - -const toString = composable((a: unknown) => `${a}`) -``` - -## Sequential composition -Now we can compose them using pipe to create `addAndReturnString`: - -```typescript -import { cf } from 'composable-functions' - -const addAndReturnString = cf.pipe(add, toString) - ^? Composable<(a: number, b: number) => string> -``` - -Note that trying to compose pipe flipping the arguments will not type-check: - -```typescript -import { cf } from 'composable-functions' - -const addAndReturnString = cf.pipe(toString, add) - ^? ["Fail to compose", string, "does not fit in", number] -``` - -The error message comes in the form of an inferred type (the type checker error is a bit more cryptic). -Since pipe will compose from left to right, the only `string` output from `toString` will not fit into the first argument of `add` which is a `number`. - -### Using non-composables (mapping) - -Sometimes we want to use a simple function in this sort of sequential composition. Imagine that `toString` is not a composable, and you just want to apply a plain old function to the result of `add` when it succeeds. -The function `map` can be used for this, since we are mapping over the result of a `Composable`: - -```typescript -import { cf } from 'composable-functions' - -const addAndReturnString = cf.map(add, String) -``` - -Note that if your mapper function has to be `async` you should wrap it in `composable` and use `pipe` instead. - -## Parallel composition - -There are also functions compositions where all its parameters are excuted in parallel, like `Promise.all` will execute several promises and wait for all of them. -The `all` function is one way of composing in this fashion. Assuming we want to apply our `add` and multiply the two numbers returning a success only once both operations succeed: - -```typescript -import { composable, cf } from 'composable-functions' - -const add = composable((a: number, b: number) => a + b) -const mul = composable((a: number, b: number) => a * b) -const addAndMul = cf.all(add, mul) - ^? Composable<(args_0: number, args_1: number) => [number, number]> -``` - -The result of the composition comes in a tuple in the same order as the functions were passed to `all`. -Note that the input functions will also have to type-check and all the functions have to work from the same input. - -## Handling errors -Since a `Composable` always return a type `Result` that might be either a failure or a success, there are never exceptions to catch. Any exception inside a `Composable` will return as an object with the shape: `{ success: false, errors: Error[] }`. - -Two neat consequences is that we can handle errors using functions (no need for try/catch blocks) and handle multiple errors at once. - -### Catching errors -To catch an error you need a second `Composable` capable of receiving `{ errors: Error[] }`. This composable is called when the first function fails: - -```typescript -import { composable, cf } from 'composable-functions' - -const fetchBody = composable((url: string) => fetch(url).then((r) => r.text())) -const emptyOnError = composable(({errors}: { errors: Error[] }) => { - console.error("Something went wrong, returning empty string", errors) - return "" -}) -const fetchThatNeverFails = cf.catchError(fetchBody, emptyOnError) -``` - -### Mapping errors -Sometimes we just need to transform one error into something that would make more sense for the caller. Imagine you have our `fetchBody` defined above, but we want a custom error type for when the input URL is invalid. You can map over the failures using `mapError` and a function with the type `({ errors: Error[] }) => { errors: Error[] }`. - -```typescript -import { cf } from 'composable-functions' - -class InvalidUrlError extends Error {} -const fetchBodyWithCustomError = cf.mapError(fetchBody, (errors) => - errors.map((e) => e.message.includes('Invalid URL') ? new InvalidUrlError() : e) -) -``` - diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index 9a744a0f..bb733cd8 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -2,7 +2,7 @@ import { assertEquals, describe, it } from '../test-prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, pipe, success } from '../index.ts' -const toString = composable((a: unknown) => `${a}`) +const toString = composable(String) const add = composable((a: number, b: number) => a + b) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') From 23dbd58e4e06f6ee0526769de1d01aa15e33919c Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Sat, 13 Apr 2024 16:28:14 -0400 Subject: [PATCH 065/238] WIP - investigating why 2 optional arguments are removed from parameter list We need to recurse on the optional parameters --- src/tests/all.test.ts | 11 +++++++- src/tests/types.test.ts | 56 +++++++++++++++++++++++++++++++++++++++ src/types.ts | 58 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 121 insertions(+), 4 deletions(-) diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts index 669a8f07..c2282196 100644 --- a/src/tests/all.test.ts +++ b/src/tests/all.test.ts @@ -2,8 +2,9 @@ import { assertEquals, describe, it } from '../test-prelude.ts' import { all, composable, success } from '../index.ts' const voidFn = composable(() => {}) -const toString = composable((a: unknown) => `${a}`) +const toString = composable(String) const add = composable((a: number, b: number) => a + b) +const optionalAdd = composable((a: number, b?: number) => a + (b ?? 1)) describe('all', () => { it('executes all functions using the same input returning a tuple with every result when all are successful', async () => { @@ -13,4 +14,12 @@ describe('all', () => { assertEquals(res, success<[number, string, undefined]>([3, '1', undefined])) }) + + it('handles optional arguments', async () => { + const fn = all(optionalAdd, toString, voidFn) + + const res = await fn(1, 2) + + assertEquals(res, success<[number, string, undefined]>([3, '1', undefined])) + }) }) diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index de047874..8d64b131 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -163,6 +163,48 @@ namespace AllArguments { ] > > + type testSubtypesForStricterOptional = Expect< + Equal< + Subject.AllArguments< + [ + Subject.Composable<(x: string, y?: 1) => void>, + Subject.Composable<(x: 'foo', y: number) => void>, + ] + >, + [ + Subject.Composable<(x: 'foo', y: 1) => void>, + Subject.Composable<(x: 'foo', y: 1) => void>, + ] + > + > + type testSubtypesForOptionalsOnBoth = Expect< + Equal< + Subject.AllArguments< + [ + Subject.Composable<(x: string, y?: number) => void>, + Subject.Composable<(x: 'foo', y?: number) => void>, + ] + >, + [ + Subject.Composable<(x: 'foo', y?: number) => void>, + Subject.Composable<(x: 'foo', y?: number) => void>, + ] + > + > + type testSubtypesForConflictingOptionals = Expect< + Equal< + Subject.AllArguments< + [ + Subject.Composable<(x: string, y?: number) => void>, + Subject.Composable<(x: 'foo', y?: string) => void>, + ] + >, + [ + Subject.Composable<(x: 'foo') => void>, + Subject.Composable<(x: 'foo') => void>, + ] + > + > type testMaxArityForTwoComposables = Expect< Equal< Subject.AllArguments< @@ -177,6 +219,20 @@ namespace AllArguments { ] > > + type testMaxArityForTwoComposablesInverse = Expect< + Equal< + Subject.AllArguments< + [ + Subject.Composable<(x: string) => void>, + Subject.Composable<(x: 'foo', y: number) => void>, + ] + >, + [ + Subject.Composable<(x: 'foo', y: number) => void>, + Subject.Composable<(x: 'foo', y: number) => void>, + ] + > + > type testCompositionFailure = Expect< Equal< Subject.AllArguments< diff --git a/src/types.ts b/src/types.ts index af4b6bcb..de3382cd 100644 --- a/src/types.ts +++ b/src/types.ts @@ -144,10 +144,62 @@ type SubtypesTuple< argument1: headA argument2: headB } + // TB is empty (or partial) + // We should go down a SubtypesPartialTuple : SubtypesTuple - : TB extends [infer headBNoA, ...infer restBNoA] - ? SubtypesTuple<[], restBNoA, [...O, headBNoA]> - : O + : TB extends [infer headBNoA, []] + // TA is empty (or partial) + // We should go down a SubtypesPartialTuple + ? SubtypesTuple<[], [], [...O, headBNoA]> + /* + * We should continue the recursion checking optional parameters + * We can pattern match optionals using Partial + * We should start handling partials as soon one side of mandatory ends + * Remove ...TA, ...TB bellow + */ + : [...O, ...TA, ...TB] + +type AllMandatory = SubtypesTuple< + Parameters<(a: string, b: number) => void>, + Parameters<(a: string, b: number) => void>, + [] +> +type WithOptional = SubtypesTuple< + Parameters<(a: string, b?: number) => void>, + Parameters<(a: string, b: number) => void>, + [] +> +type WithBothOptional = SubtypesTuple< + Parameters<(a: string, b?: number) => void>, + Parameters<(a: string, b?: number) => void>, + [] +> +type WithOptionalOnSecond = SubtypesTuple< + Parameters<(a: unknown) => void>, + Parameters<(a: number, b?: number) => void>, + [] +> + +type WithOptionalOnFirst = SubtypesTuple< + Parameters<(a: unknown, b?: number) => void>, + Parameters<(a: number) => void>, + [] +> + +type WithMultipleOptionals = SubtypesTuple< + Parameters<(a: unknown, b?: number, c?: boolean) => void>, + Parameters<(a: number, b?: 1) => void>, + [] +> +type X = WithMultipleOptionals[0] extends Partial<[infer A, ...infer B]> + ? [A, B] + : false + +type WithConflictingOptionals = SubtypesTuple< + Parameters<(a: unknown, b?: number) => void>, + Parameters<(a: number, b: string) => void>, + [] +> type AllArguments< Fns extends any[], From 30116d4d032a38b69e5129ac8751967a8fcd5f0b Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Mon, 15 Apr 2024 10:22:51 -0400 Subject: [PATCH 066/238] fix test defioinition, we should not remove a parameter from the signature when we have two optionals, since the undefined still fits --- src/tests/types.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 8d64b131..f45e23d6 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -200,8 +200,8 @@ namespace AllArguments { ] >, [ - Subject.Composable<(x: 'foo') => void>, - Subject.Composable<(x: 'foo') => void>, + Subject.Composable<(x: 'foo', y?: undefined) => void>, + Subject.Composable<(x: 'foo', y?: undefined) => void>, ] > > From 6f92c466e13f3ec4af4eb6a7c1e29cdd404334ba Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Mon, 15 Apr 2024 11:33:56 -0400 Subject: [PATCH 067/238] WIP - creating subtype tuple for partial tuples --- src/types.ts | 164 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 114 insertions(+), 50 deletions(-) diff --git a/src/types.ts b/src/types.ts index de3382cd..8a76992d 100644 --- a/src/types.ts +++ b/src/types.ts @@ -95,11 +95,11 @@ type PipeReturn = Fns extends [ ? IsNever extends true ? ['Fail to compose, "never" does not fit in', PB] : Awaited extends PB - ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> - : ['Fail to compose', Awaited, 'does not fit in', PB] + ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> + : ['Fail to compose', Awaited, 'does not fit in', PB] : Fns extends [Composable<(...args: infer P) => infer O>] - ? Composable<(...args: P) => O> - : never + ? Composable<(...args: P) => O> + : never type PipeArguments< Fns extends any[], @@ -113,10 +113,10 @@ type PipeArguments< ? IsNever> extends true ? ['Fail to compose, "never" does not fit in', FirstBParameter] : Awaited extends FirstBParameter - ? EveryElementTakesUndefined extends true - ? PipeArguments OA>]> - : EveryElementTakesUndefined - : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] + ? EveryElementTakesUndefined extends true + ? PipeArguments OA>]> + : EveryElementTakesUndefined + : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] : [...Arguments, Composable<(...a: PA) => OA>] : never @@ -138,37 +138,27 @@ type SubtypesTuple< ? headA extends headB ? SubtypesTuple : headB extends headA - ? SubtypesTuple - : { - 'Incompatible arguments ': true - argument1: headA - argument2: headB - } - // TB is empty (or partial) - // We should go down a SubtypesPartialTuple - : SubtypesTuple - : TB extends [infer headBNoA, []] - // TA is empty (or partial) - // We should go down a SubtypesPartialTuple - ? SubtypesTuple<[], [], [...O, headBNoA]> - /* - * We should continue the recursion checking optional parameters - * We can pattern match optionals using Partial - * We should start handling partials as soon one side of mandatory ends - * Remove ...TA, ...TB bellow - */ - : [...O, ...TA, ...TB] + ? SubtypesTuple + : { + 'Incompatible arguments ': true + argument1: headA + argument2: headB + } + : // TB is empty (or partial) + // We should go down a SubtypesPartialTuple + SubtypesTuple + : TB extends [infer headBNoA, ...infer restB] + ? // TA is empty (or partial) + // We should go down a SubtypesPartialTuple + SubtypesTuple<[], restB, [...O, headBNoA]> + : /* + * We should continue the recursion checking optional parameters + * We can pattern match optionals using Partial + * We should start handling partials as soon one side of mandatory ends + * Remove ...TA, ...TB bellow + */ + O -type AllMandatory = SubtypesTuple< - Parameters<(a: string, b: number) => void>, - Parameters<(a: string, b: number) => void>, - [] -> -type WithOptional = SubtypesTuple< - Parameters<(a: string, b?: number) => void>, - Parameters<(a: string, b: number) => void>, - [] -> type WithBothOptional = SubtypesTuple< Parameters<(a: string, b?: number) => void>, Parameters<(a: string, b?: number) => void>, @@ -179,28 +169,102 @@ type WithOptionalOnSecond = SubtypesTuple< Parameters<(a: number, b?: number) => void>, [] > - type WithOptionalOnFirst = SubtypesTuple< Parameters<(a: unknown, b?: number) => void>, Parameters<(a: number) => void>, [] > - type WithMultipleOptionals = SubtypesTuple< Parameters<(a: unknown, b?: number, c?: boolean) => void>, Parameters<(a: number, b?: 1) => void>, [] > -type X = WithMultipleOptionals[0] extends Partial<[infer A, ...infer B]> - ? [A, B] - : false - type WithConflictingOptionals = SubtypesTuple< Parameters<(a: unknown, b?: number) => void>, Parameters<(a: number, b: string) => void>, [] > +// Current pass +type AllMandatory = SubtypesTuple< + Parameters<(a: string, b: number) => void>, + Parameters<(a: string, b: number) => void>, + [] +> +type WithOptional = SubtypesTuple< + Parameters<(a: string, b?: number) => void>, + Parameters<(a: string, b: number) => void>, + [] +> +type WithOptional2 = SubtypesTuple< + Parameters<(a: string, b: number) => void>, + Parameters<(a: string, b?: number) => void>, + [] +> +type SubtypesWithAPartialTuple< + MandatoryTuple extends unknown[], + PartialTuble extends unknown[], + O extends unknown[], +> = MandatoryTuple extends [infer head, ...infer rest] + ? PartialTuble extends Partial<[infer headPartial, ...infer restPartial]> + ? head extends headPartial + ? SubtypesWithAPartialTuple, [...O, head]> + : headPartial extends head + ? SubtypesWithAPartialTuple< + rest, + Partial, + [...O, headPartial] + > + : { + 'Incompatible arguments ': true + argument1: head + argument2: headPartial + } + : // Partial is empty + // so I need the mandatory parameters list + [...O, ...MandatoryTuple] + : PartialTuble extends Partial<[...infer restPartial]> + ? // Mandatory is empty (or partial) + // We should go down a SubtypesPartialPartialTuple + MandatoryTuple extends Partial<[...infer restMandatory]> + ? SubtypesTuple extends [] + ? O + : [...O, Partial>] + : never + : /* + * We should continue the recursion checking optional parameters + * We can pattern match optionals using Partial + * We should start handling partials as soon one side of mandatory ends + * Remove ...TA, ...TB bellow + */ + never + +type PartialTestSubtype = SubtypesWithAPartialTuple< + Parameters<(b: number) => void>, + Parameters<(b?: 1) => void>, + [] +> +type PartialTestConflict = SubtypesWithAPartialTuple< + Parameters<(b: string) => void>, + Parameters<(b?: 1) => void>, + [] +> +type PartialTestLongerPartial = SubtypesWithAPartialTuple< + Parameters<(b: number) => void>, + Parameters<(b?: 1, c?: string) => void>, + [] +> +type PartialTestLongerMandatory = SubtypesWithAPartialTuple< + Parameters<(b: number, c: string) => void>, + Parameters<(b?: 1) => void>, + [] +> +type PartialTestLongerMandatoryPlusPartial = SubtypesWithAPartialTuple< + Parameters<(b: number, c: string, d?: string) => void>, + Parameters<(b?: 1) => void>, + [] +> + type AllArguments< Fns extends any[], Arguments extends any[] = [], @@ -258,12 +322,12 @@ type Zip< : O : O -type CollectArguments> = {} extends Zip< - Keys, - AllArguments>> -> - ? never - : Prettify, AllArguments>>>> +type CollectArguments> = + {} extends Zip, AllArguments>>> + ? never + : Prettify< + Zip, AllArguments>>> + > type RecordToTuple> = RecordValuesFromKeysTuple> From 500f7c96027a3f1757399f5b56c219c4020c65eb Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 17 Apr 2024 12:55:11 -0400 Subject: [PATCH 068/238] perhaps we should handle partial in the same recursion? --- src/types.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/types.ts b/src/types.ts index 8a76992d..a7c5e3b4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -157,7 +157,11 @@ type SubtypesTuple< * We should start handling partials as soon one side of mandatory ends * Remove ...TA, ...TB bellow */ - O + TA extends [] + ? [...O, ...TB] + : TB extends [] + ? [...O, ...TA] + : ['both partial'] type WithBothOptional = SubtypesTuple< Parameters<(a: string, b?: number) => void>, From 76020a9708727fdfa83acf073db5002b489e8a83 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 17 Apr 2024 14:52:24 -0400 Subject: [PATCH 069/238] extract CommonSubtype and cover incompatibility between optional arguments --- src/types.ts | 167 +++++++++++++++++++++------------------------------ 1 file changed, 67 insertions(+), 100 deletions(-) diff --git a/src/types.ts b/src/types.ts index a7c5e3b4..4cb42e7a 100644 --- a/src/types.ts +++ b/src/types.ts @@ -133,62 +133,92 @@ type SubtypesTuple< TA extends unknown[], TB extends unknown[], O extends unknown[], -> = TA extends [infer headA, ...infer restA] - ? TB extends [infer headB, ...infer restB] - ? headA extends headB - ? SubtypesTuple - : headB extends headA - ? SubtypesTuple - : { +> = TA extends [] + ? [...O, ...TB] + : TB extends [] + ? [...O, ...TA] + : TA extends [infer headA, ...infer restA] + ? TB extends [infer headB, ...infer restB] + ? CommonSubType extends { 'Incompatible arguments ': true - argument1: headA - argument2: headB } - : // TB is empty (or partial) - // We should go down a SubtypesPartialTuple - SubtypesTuple - : TB extends [infer headBNoA, ...infer restB] - ? // TA is empty (or partial) - // We should go down a SubtypesPartialTuple - SubtypesTuple<[], restB, [...O, headBNoA]> - : /* - * We should continue the recursion checking optional parameters - * We can pattern match optionals using Partial - * We should start handling partials as soon one side of mandatory ends - * Remove ...TA, ...TB bellow - */ - TA extends [] - ? [...O, ...TB] - : TB extends [] - ? [...O, ...TA] - : ['both partial'] + ? CommonSubType + : SubtypesTuple]> + : // TB is partial + // We should handle partial case before recursion + TB extends Partial<[infer headPartial, ...infer restPartial]> + ? CommonSubType extends { + 'Incompatible arguments ': true + } + ? CommonSubType + : SubtypesTuple< + restA, + restPartial, + [...O, CommonSubType] + > + : never + : TB extends [infer headBNoA, ...infer restB] + ? // TA is partial + // We should handle partial case before recursion + TA extends Partial<[infer headPartial, ...infer restPartial]> + ? CommonSubType extends { + 'Incompatible arguments ': true + } + ? CommonSubType + : SubtypesTuple< + restB, + restPartial, + [...O, CommonSubType] + > + : never + : /* + * We should continue the recursion checking optional parameters + * We can pattern match optionals using Partial + * We should start handling partials as soon one side of mandatory ends + * Remove ...TA, ...TB bellow + */ + ['both partial'] + +type CommonSubType = A extends B + ? A + : B extends A + ? B + : { + 'Incompatible arguments ': true + argument1: A + argument2: B + } type WithBothOptional = SubtypesTuple< Parameters<(a: string, b?: number) => void>, Parameters<(a: string, b?: number) => void>, [] > -type WithOptionalOnSecond = SubtypesTuple< - Parameters<(a: unknown) => void>, - Parameters<(a: number, b?: number) => void>, - [] -> -type WithOptionalOnFirst = SubtypesTuple< - Parameters<(a: unknown, b?: number) => void>, - Parameters<(a: number) => void>, - [] -> type WithMultipleOptionals = SubtypesTuple< Parameters<(a: unknown, b?: number, c?: boolean) => void>, Parameters<(a: number, b?: 1) => void>, [] > + +// Pass with new partial handling and CommonSubtype type WithConflictingOptionals = SubtypesTuple< Parameters<(a: unknown, b?: number) => void>, Parameters<(a: number, b: string) => void>, [] > +// Pass with new base cases for [] +type WithOptionalOnSecond = SubtypesTuple< + Parameters<(a: unknown) => void>, + Parameters<(a: number, b?: number) => void>, + [] +> +type WithOptionalOnFirst = SubtypesTuple< + Parameters<(a: unknown, b?: number) => void>, + Parameters<(a: number) => void>, + [] +> + // Current pass type AllMandatory = SubtypesTuple< Parameters<(a: string, b: number) => void>, @@ -205,69 +235,6 @@ type WithOptional2 = SubtypesTuple< Parameters<(a: string, b?: number) => void>, [] > -type SubtypesWithAPartialTuple< - MandatoryTuple extends unknown[], - PartialTuble extends unknown[], - O extends unknown[], -> = MandatoryTuple extends [infer head, ...infer rest] - ? PartialTuble extends Partial<[infer headPartial, ...infer restPartial]> - ? head extends headPartial - ? SubtypesWithAPartialTuple, [...O, head]> - : headPartial extends head - ? SubtypesWithAPartialTuple< - rest, - Partial, - [...O, headPartial] - > - : { - 'Incompatible arguments ': true - argument1: head - argument2: headPartial - } - : // Partial is empty - // so I need the mandatory parameters list - [...O, ...MandatoryTuple] - : PartialTuble extends Partial<[...infer restPartial]> - ? // Mandatory is empty (or partial) - // We should go down a SubtypesPartialPartialTuple - MandatoryTuple extends Partial<[...infer restMandatory]> - ? SubtypesTuple extends [] - ? O - : [...O, Partial>] - : never - : /* - * We should continue the recursion checking optional parameters - * We can pattern match optionals using Partial - * We should start handling partials as soon one side of mandatory ends - * Remove ...TA, ...TB bellow - */ - never - -type PartialTestSubtype = SubtypesWithAPartialTuple< - Parameters<(b: number) => void>, - Parameters<(b?: 1) => void>, - [] -> -type PartialTestConflict = SubtypesWithAPartialTuple< - Parameters<(b: string) => void>, - Parameters<(b?: 1) => void>, - [] -> -type PartialTestLongerPartial = SubtypesWithAPartialTuple< - Parameters<(b: number) => void>, - Parameters<(b?: 1, c?: string) => void>, - [] -> -type PartialTestLongerMandatory = SubtypesWithAPartialTuple< - Parameters<(b: number, c: string) => void>, - Parameters<(b?: 1) => void>, - [] -> -type PartialTestLongerMandatoryPlusPartial = SubtypesWithAPartialTuple< - Parameters<(b: number, c: string, d?: string) => void>, - Parameters<(b?: 1) => void>, - [] -> type AllArguments< Fns extends any[], From 0aa41a72a808a64e5dfdccbca6b6f8d357e84ed9 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 17 Apr 2024 15:07:21 -0400 Subject: [PATCH 070/238] Handle remaining case where only common subtype is undefined --- src/types.ts | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/types.ts b/src/types.ts index 4cb42e7a..1939677e 100644 --- a/src/types.ts +++ b/src/types.ts @@ -177,7 +177,24 @@ type SubtypesTuple< * We should start handling partials as soon one side of mandatory ends * Remove ...TA, ...TB bellow */ - ['both partial'] + TA extends Partial<[infer headAPartial, ...infer restAPartial]> + ? TB extends Partial<[infer headBPartial, ...infer restBPartial]> + ? CommonSubType extends { + 'Incompatible arguments ': true + } + ? SubtypesTuple< + Partial, + Partial, + [...O, ...Partial<[undefined]>] + > + + : SubtypesTuple< + Partial, + Partial, + [...O, ...Partial<[CommonSubType]>] + > + : never + : never type CommonSubType = A extends B ? A @@ -189,11 +206,19 @@ type CommonSubType = A extends B argument2: B } +type WithOnlyUdnefinedAsCommonSubtype = SubtypesTuple< + Parameters<(a: string, b?: number) => void>, + Parameters<(a: string, b?: string) => void>, + [] +> + +// Pass with implementation for both partials type WithBothOptional = SubtypesTuple< Parameters<(a: string, b?: number) => void>, Parameters<(a: string, b?: number) => void>, [] > + type WithMultipleOptionals = SubtypesTuple< Parameters<(a: unknown, b?: number, c?: boolean) => void>, Parameters<(a: number, b?: 1) => void>, From 62f5b24f39f1e366442e64916525745ad010a3db Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 17 Apr 2024 15:31:44 -0400 Subject: [PATCH 071/238] this might be the end of it --- src/types.ts | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/types.ts b/src/types.ts index 1939677e..c203a639 100644 --- a/src/types.ts +++ b/src/types.ts @@ -130,23 +130,23 @@ type EveryElementTakesUndefined = T extends [ : true type SubtypesTuple< - TA extends unknown[], - TB extends unknown[], - O extends unknown[], -> = TA extends [] - ? [...O, ...TB] - : TB extends [] - ? [...O, ...TA] - : TA extends [infer headA, ...infer restA] - ? TB extends [infer headB, ...infer restB] + TupleA extends unknown[], + TupleB extends unknown[], + Output extends unknown[], +> = TupleA extends [] + ? [...Output, ...TupleB] + : TupleB extends [] + ? [...Output, ...TupleA] + : TupleA extends [infer headA, ...infer restA] + ? TupleB extends [infer headB, ...infer restB] ? CommonSubType extends { 'Incompatible arguments ': true } ? CommonSubType - : SubtypesTuple]> + : SubtypesTuple]> : // TB is partial // We should handle partial case before recursion - TB extends Partial<[infer headPartial, ...infer restPartial]> + TupleB extends Partial<[infer headPartial, ...infer restPartial]> ? CommonSubType extends { 'Incompatible arguments ': true } @@ -154,13 +154,13 @@ type SubtypesTuple< : SubtypesTuple< restA, restPartial, - [...O, CommonSubType] + [...Output, CommonSubType] > : never - : TB extends [infer headBNoA, ...infer restB] + : TupleB extends [infer headBNoA, ...infer restB] ? // TA is partial // We should handle partial case before recursion - TA extends Partial<[infer headPartial, ...infer restPartial]> + TupleA extends Partial<[infer headPartial, ...infer restPartial]> ? CommonSubType extends { 'Incompatible arguments ': true } @@ -168,7 +168,7 @@ type SubtypesTuple< : SubtypesTuple< restB, restPartial, - [...O, CommonSubType] + [...Output, CommonSubType] > : never : /* @@ -177,21 +177,21 @@ type SubtypesTuple< * We should start handling partials as soon one side of mandatory ends * Remove ...TA, ...TB bellow */ - TA extends Partial<[infer headAPartial, ...infer restAPartial]> - ? TB extends Partial<[infer headBPartial, ...infer restBPartial]> + TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> + ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> ? CommonSubType extends { 'Incompatible arguments ': true } ? SubtypesTuple< Partial, Partial, - [...O, ...Partial<[undefined]>] + [...Output, ...Partial<[undefined]>] > : SubtypesTuple< Partial, Partial, - [...O, ...Partial<[CommonSubType]>] + [...Output, ...Partial<[CommonSubType]>] > : never : never @@ -246,8 +246,8 @@ type WithOptionalOnFirst = SubtypesTuple< // Current pass type AllMandatory = SubtypesTuple< - Parameters<(a: string, b: number) => void>, - Parameters<(a: string, b: number) => void>, + Parameters<(a: string, b: 1) => void>, + Parameters<(a: 'foo', b: number) => void>, [] > type WithOptional = SubtypesTuple< From 6dfb517ae3a8903ab5cd7a48253420a7c713005a Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 17 Apr 2024 17:24:39 -0300 Subject: [PATCH 072/238] Remove linting errors from types test files --- src/df/tests/types.test.ts | 1 + src/tests/types.test.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/df/tests/types.test.ts b/src/df/tests/types.test.ts index 1b1f1a13..2b65872a 100644 --- a/src/df/tests/types.test.ts +++ b/src/df/tests/types.test.ts @@ -1,3 +1,4 @@ +// deno-lint-ignore-file no-namespace ban-ts-comment import { assertEquals, describe, it } from '../../test-prelude.ts' import { Result, Success } from '../../types.ts' import { make } from '../index.ts' diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index f45e23d6..440bdc8c 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -1,3 +1,4 @@ +// deno-lint-ignore-file no-namespace ban-ts-comment no-unused-vars import { assertEquals, describe, it } from '../test-prelude.ts' import * as Subject from '../types.ts' From 325c479de27a756673207df43c240c0411369b89 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 17 Apr 2024 17:24:58 -0300 Subject: [PATCH 073/238] Add an internal types module --- src/internal/types.test.ts | 175 ++++++++++++++++++++++++++++++ src/internal/types.ts | 135 +++++++++++++++++++++++ src/types.ts | 216 ++++--------------------------------- 3 files changed, 330 insertions(+), 196 deletions(-) create mode 100644 src/internal/types.test.ts create mode 100644 src/internal/types.ts diff --git a/src/internal/types.test.ts b/src/internal/types.test.ts new file mode 100644 index 00000000..0c974770 --- /dev/null +++ b/src/internal/types.test.ts @@ -0,0 +1,175 @@ +// deno-lint-ignore-file no-namespace +import { assertEquals, describe, it } from '../test-prelude.ts' +import { Internal } from './types.ts' + +namespace UnionToTuple { + type WithStringUnion = Expect< + Equal, ['a', 'b']> + > + + type WithStringAndNumber = Expect< + Equal, ['a', 1]> + > + + type WithRecords = Expect< + Equal< + Internal.UnionToTuple<{ a: boolean } | { b?: { name: string } }>, + [{ a: boolean }, { b?: { name: string } }] + > + > + + type WithFunctions = Expect< + Equal< + Internal.UnionToTuple<((a: boolean) => void) | (() => Promise)>, + [(a: boolean) => void, () => Promise] + > + > +} + +namespace CommonSubType { + type WithNoCompatibility = Expect< + Equal< + Internal.CommonSubType, + { 'Incompatible arguments ': true; argument1: number; argument2: string } + > + > + + type WithSameType = Expect< + Equal, number> + > + + type WithNarrowerFirst = Expect, 1>> + type WithNarrowerLast = Expect, 1>> + + type WithArrays = Expect< + Equal, string[]> + > + type WithTuplesAndArrays = Expect< + Equal, ['foo']> + > + type WithUnions = Expect, 1>> + type WithPartial = Expect< + Equal, string> + > +} + +namespace SubtypesTuple { + type WithOnlyUdnefinedAsCommonSubtype = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: string, b?: number) => void>, + Parameters<(a: string, b?: string) => void>, + [] + >, + [string, undefined?] + > + > + + type WithBothOptional = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: string, b?: number) => void>, + Parameters<(a: string, b?: number) => void>, + [] + >, + [string, (number | undefined)?] + > + > + + type WithMultipleOptionals = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: unknown, b?: number, c?: boolean) => void>, + Parameters<(a: number, b?: 1) => void>, + [] + >, + [number, (1 | undefined)?, (boolean | undefined)?] + > + > + + type WithConflictingOptionals = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: unknown, b?: number) => void>, + Parameters<(a: number, b: string) => void>, + [] + >, + { + 'Incompatible arguments ': true + argument1: string + argument2: number + } + > + > + + type WithOptionalOnSecond = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: unknown) => void>, + Parameters<(a: number, b?: number) => void>, + [] + >, + [number, (number | undefined)?] + > + > + + type WithOptionalOnFirst = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: unknown, b?: number) => void>, + Parameters<(a: number) => void>, + [] + >, + [number, (number | undefined)?] + > + > + + type AllMandatory = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: string, b: 1) => void>, + Parameters<(a: 'foo', b: number) => void>, + [] + >, + ['foo', 1] + > + > + + type WithOptional = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: string, b?: number) => void>, + Parameters<(a: string, b: number) => void>, + [] + >, + [string, number] + > + > + + type WithOptional2 = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a: string, b: number) => void>, + Parameters<(a: string, b?: number) => void>, + [] + >, + [string, number] + > + > +} + +namespace EveryElementTakesUndefined { + type WithAllUndefined = Expect< + Equal, true> + > + + type WithSomeDefined = Expect< + Equal< + Internal.EveryElementTakesUndefined<[undefined, 'foo', undefined]>, + ['Fail to compose', undefined, 'does not fit in', 'foo'] + > + > +} + +describe('type tests', () => + it('should have no ts errors', () => assertEquals(true, true))) diff --git a/src/internal/types.ts b/src/internal/types.ts new file mode 100644 index 00000000..b20db521 --- /dev/null +++ b/src/internal/types.ts @@ -0,0 +1,135 @@ +// deno-lint-ignore-file no-namespace + +import { Composable } from '../types.ts' + +namespace Internal { + // Thanks to https://github.com/tjjfvi + // UnionToTuple code lifted from this thread: https://github.com/microsoft/TypeScript/issues/13298#issuecomment-707364842 + // This will not preserve union order but we don't care since this is for Composable paralel application + export type UnionToTuple = ( + (T extends any ? (t: T) => T : never) extends infer U + ? (U extends any ? (u: U) => any : never) extends (v: infer V) => any + ? V + : never + : never + ) extends (_: any) => infer W + ? [...UnionToTuple>, W] + : [] + + export type Keys> = UnionToTuple + + export type RecordValuesFromKeysTuple< + R extends Record, + K extends unknown[], + ValuesTuple extends Composable[] = [], + > = K extends [infer Head, ...infer rest] + ? Head extends string + ? rest extends string[] + ? RecordValuesFromKeysTuple + : never + : ValuesTuple + : ValuesTuple + + export type Zip< + K extends unknown[], + V extends Composable[], + O extends Record = {}, + > = K extends [infer HeadK, ...infer restK] + ? V extends [infer HeadV, ...infer restV] + ? HeadK extends string + ? restK extends string[] + ? restV extends Composable[] + ? Zip + : V // in this case V has the AllArguments failure type + : never + : never + : O + : O + + export type EveryElementTakesUndefined = T extends [ + infer HEAD, + ...infer TAIL, + ] + ? undefined extends HEAD + ? true & EveryElementTakesUndefined + : ['Fail to compose', undefined, 'does not fit in', HEAD] + : true + + export type SubtypesTuple< + TupleA extends unknown[], + TupleB extends unknown[], + Output extends unknown[], + > = TupleA extends [] + ? [...Output, ...TupleB] + : TupleB extends [] + ? [...Output, ...TupleA] + : TupleA extends [infer headA, ...infer restA] + ? TupleB extends [infer headB, ...infer restB] + ? CommonSubType extends { + 'Incompatible arguments ': true + } + ? CommonSubType + : SubtypesTuple]> + : // TB is partial + // We should handle partial case before recursion + TupleB extends Partial<[infer headPartial, ...infer restPartial]> + ? CommonSubType extends { + 'Incompatible arguments ': true + } + ? CommonSubType + : SubtypesTuple< + restA, + restPartial, + [...Output, CommonSubType] + > + : never + : TupleB extends [infer headBNoA, ...infer restB] + ? // TA is partial + // We should handle partial case before recursion + TupleA extends Partial<[infer headPartial, ...infer restPartial]> + ? CommonSubType extends { + 'Incompatible arguments ': true + } + ? CommonSubType + : SubtypesTuple< + restB, + restPartial, + [...Output, CommonSubType] + > + : never + : /* + * We should continue the recursion checking optional parameters + * We can pattern match optionals using Partial + * We should start handling partials as soon one side of mandatory ends + * Remove ...TA, ...TB bellow + */ + TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> + ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> + ? CommonSubType extends { + 'Incompatible arguments ': true + } + ? SubtypesTuple< + Partial, + Partial, + [...Output, ...Partial<[undefined]>] + > + : SubtypesTuple< + Partial, + Partial, + [...Output, ...Partial<[CommonSubType]>] + > + : never + : never + + export type CommonSubType = [A] extends [B] + ? A + : B extends A + ? B + : { + 'Incompatible arguments ': true + argument1: A + argument2: B + } +} + +export type { Internal } diff --git a/src/types.ts b/src/types.ts index c203a639..13195872 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,3 +1,5 @@ +import { Internal } from './internal/types.ts' + type Failure = { success: false errors: Array @@ -95,11 +97,11 @@ type PipeReturn = Fns extends [ ? IsNever extends true ? ['Fail to compose, "never" does not fit in', PB] : Awaited extends PB - ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> - : ['Fail to compose', Awaited, 'does not fit in', PB] + ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> + : ['Fail to compose', Awaited, 'does not fit in', PB] : Fns extends [Composable<(...args: infer P) => infer O>] - ? Composable<(...args: P) => O> - : never + ? Composable<(...args: P) => O> + : never type PipeArguments< Fns extends any[], @@ -113,160 +115,19 @@ type PipeArguments< ? IsNever> extends true ? ['Fail to compose, "never" does not fit in', FirstBParameter] : Awaited extends FirstBParameter - ? EveryElementTakesUndefined extends true - ? PipeArguments OA>]> - : EveryElementTakesUndefined - : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] + ? Internal.EveryElementTakesUndefined extends true + ? PipeArguments OA>]> + : Internal.EveryElementTakesUndefined + : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] : [...Arguments, Composable<(...a: PA) => OA>] : never -type EveryElementTakesUndefined = T extends [ - infer HEAD, - ...infer TAIL, -] - ? undefined extends HEAD - ? true & EveryElementTakesUndefined - : ['Fail to compose', undefined, 'does not fit in', HEAD] - : true - -type SubtypesTuple< - TupleA extends unknown[], - TupleB extends unknown[], - Output extends unknown[], -> = TupleA extends [] - ? [...Output, ...TupleB] - : TupleB extends [] - ? [...Output, ...TupleA] - : TupleA extends [infer headA, ...infer restA] - ? TupleB extends [infer headB, ...infer restB] - ? CommonSubType extends { - 'Incompatible arguments ': true - } - ? CommonSubType - : SubtypesTuple]> - : // TB is partial - // We should handle partial case before recursion - TupleB extends Partial<[infer headPartial, ...infer restPartial]> - ? CommonSubType extends { - 'Incompatible arguments ': true - } - ? CommonSubType - : SubtypesTuple< - restA, - restPartial, - [...Output, CommonSubType] - > - : never - : TupleB extends [infer headBNoA, ...infer restB] - ? // TA is partial - // We should handle partial case before recursion - TupleA extends Partial<[infer headPartial, ...infer restPartial]> - ? CommonSubType extends { - 'Incompatible arguments ': true - } - ? CommonSubType - : SubtypesTuple< - restB, - restPartial, - [...Output, CommonSubType] - > - : never - : /* - * We should continue the recursion checking optional parameters - * We can pattern match optionals using Partial - * We should start handling partials as soon one side of mandatory ends - * Remove ...TA, ...TB bellow - */ - TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> - ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> - ? CommonSubType extends { - 'Incompatible arguments ': true - } - ? SubtypesTuple< - Partial, - Partial, - [...Output, ...Partial<[undefined]>] - > - - : SubtypesTuple< - Partial, - Partial, - [...Output, ...Partial<[CommonSubType]>] - > - : never - : never - -type CommonSubType = A extends B - ? A - : B extends A - ? B - : { - 'Incompatible arguments ': true - argument1: A - argument2: B - } - -type WithOnlyUdnefinedAsCommonSubtype = SubtypesTuple< - Parameters<(a: string, b?: number) => void>, - Parameters<(a: string, b?: string) => void>, - [] -> - -// Pass with implementation for both partials -type WithBothOptional = SubtypesTuple< - Parameters<(a: string, b?: number) => void>, - Parameters<(a: string, b?: number) => void>, - [] -> - -type WithMultipleOptionals = SubtypesTuple< - Parameters<(a: unknown, b?: number, c?: boolean) => void>, - Parameters<(a: number, b?: 1) => void>, - [] -> - -// Pass with new partial handling and CommonSubtype -type WithConflictingOptionals = SubtypesTuple< - Parameters<(a: unknown, b?: number) => void>, - Parameters<(a: number, b: string) => void>, - [] -> - -// Pass with new base cases for [] -type WithOptionalOnSecond = SubtypesTuple< - Parameters<(a: unknown) => void>, - Parameters<(a: number, b?: number) => void>, - [] -> -type WithOptionalOnFirst = SubtypesTuple< - Parameters<(a: unknown, b?: number) => void>, - Parameters<(a: number) => void>, - [] -> - -// Current pass -type AllMandatory = SubtypesTuple< - Parameters<(a: string, b: 1) => void>, - Parameters<(a: 'foo', b: number) => void>, - [] -> -type WithOptional = SubtypesTuple< - Parameters<(a: string, b?: number) => void>, - Parameters<(a: string, b: number) => void>, - [] -> -type WithOptional2 = SubtypesTuple< - Parameters<(a: string, b: number) => void>, - Parameters<(a: string, b?: number) => void>, - [] -> - type AllArguments< Fns extends any[], Arguments extends any[] = [], > = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] ? restA extends [Composable<(...b: infer PB) => infer OB>, ...infer restB] - ? SubtypesTuple extends [...infer MergedP] + ? Internal.SubtypesTuple extends [...infer MergedP] ? AllArguments< [Composable<(...args: MergedP) => OB>, ...restB], [...Arguments, Composable<(...a: MergedP) => OA>] @@ -275,58 +136,21 @@ type AllArguments< : [...Arguments, Composable<(...a: PA) => OA>] : never -// Thanks to https://github.com/tjjfvi -// UnionToTuple code lifted from this thread: https://github.com/microsoft/TypeScript/issues/13298#issuecomment-707364842 -// This will not preserve union order but we don't care since this is for Composable paralel application -type UnionToTuple = ( - (T extends any ? (t: T) => T : never) extends infer U - ? (U extends any ? (u: U) => any : never) extends (v: infer V) => any - ? V - : never - : never -) extends (_: any) => infer W - ? [...UnionToTuple>, W] - : [] - -type Keys> = UnionToTuple - -type RecordValuesFromKeysTuple< - R extends Record, - K extends unknown[], - ValuesTuple extends Composable[] = [], -> = K extends [infer Head, ...infer rest] - ? Head extends string - ? rest extends string[] - ? RecordValuesFromKeysTuple - : never - : ValuesTuple - : ValuesTuple - -type Zip< - K extends unknown[], - V extends Composable[], - O extends Record = {}, -> = K extends [infer HeadK, ...infer restK] - ? V extends [infer HeadV, ...infer restV] - ? HeadK extends string - ? restK extends string[] - ? restV extends Composable[] - ? Zip - : V // in this case V has the AllArguments failure type - : never - : never - : O - : O - type CollectArguments> = - {} extends Zip, AllArguments>>> + {} extends Internal.Zip< + Internal.Keys, + AllArguments>> + > ? never : Prettify< - Zip, AllArguments>>> + Internal.Zip< + Internal.Keys, + AllArguments>> + > > type RecordToTuple> = - RecordValuesFromKeysTuple> + Internal.RecordValuesFromKeysTuple> type SerializableError = { exception: T From 87f51edb632d6cfa20f67981b5db04c0c31ea7ac Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 17 Apr 2024 17:25:11 -0300 Subject: [PATCH 074/238] Fix couple type bugs --- src/internal/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal/types.ts b/src/internal/types.ts index b20db521..872aa703 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -51,7 +51,7 @@ namespace Internal { ...infer TAIL, ] ? undefined extends HEAD - ? true & EveryElementTakesUndefined + ? EveryElementTakesUndefined : ['Fail to compose', undefined, 'does not fit in', HEAD] : true @@ -123,7 +123,7 @@ namespace Internal { export type CommonSubType = [A] extends [B] ? A - : B extends A + : [B] extends [A] ? B : { 'Incompatible arguments ': true From cbcdfadae90f46f13c7976ddde8d70b9347ad9b3 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 17 Apr 2024 17:35:50 -0300 Subject: [PATCH 075/238] Adjust some types and add more types tests --- src/internal/types.test.ts | 37 ++++++++++++++++++++++++++++++++++--- src/internal/types.ts | 25 ++++++++++++++----------- src/types.ts | 20 ++++++-------------- 3 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/internal/types.test.ts b/src/internal/types.test.ts index 0c974770..86f50ea2 100644 --- a/src/internal/types.test.ts +++ b/src/internal/types.test.ts @@ -158,18 +158,49 @@ namespace SubtypesTuple { > } -namespace EveryElementTakesUndefined { +namespace EveryElementTakes { type WithAllUndefined = Expect< - Equal, true> + Equal, true> > type WithSomeDefined = Expect< Equal< - Internal.EveryElementTakesUndefined<[undefined, 'foo', undefined]>, + Internal.EveryElementTakes<[undefined, 'foo', undefined], undefined>, ['Fail to compose', undefined, 'does not fit in', 'foo'] > > } +namespace Keys { + type WithEmptyRecord = Expect, []>> + type WithRecord = Expect, ['a', 'b']>> +} + +namespace Zip { + type WithEmpty = Expect, {}>> + type WithSingle = Expect< + Equal 1]>, { a: () => 1 }> + > + type WithMultiple = Expect< + Equal, { a: 1; b: 2 }> + > + type WithExtraKeys = Expect< + Equal, { a: 1; b: 2 }> + > +} + +namespace RecordValuesFromKeysTuple { + type WithEmpty = Expect, []>> + type WithSingle = Expect< + Equal, [1]> + > + type WithMultiple = Expect< + Equal< + Internal.RecordValuesFromKeysTuple<{ a: 1; b: 2 }, ['a', 'b']>, + [1, 2] + > + > +} + describe('type tests', () => it('should have no ts errors', () => assertEquals(true, true))) diff --git a/src/internal/types.ts b/src/internal/types.ts index 872aa703..e5bc2711 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -1,8 +1,11 @@ // deno-lint-ignore-file no-namespace -import { Composable } from '../types.ts' - namespace Internal { + export type Prettify = { + [K in keyof T]: T[K] + // deno-lint-ignore ban-types + } & {} + // Thanks to https://github.com/tjjfvi // UnionToTuple code lifted from this thread: https://github.com/microsoft/TypeScript/issues/13298#issuecomment-707364842 // This will not preserve union order but we don't care since this is for Composable paralel application @@ -19,9 +22,9 @@ namespace Internal { export type Keys> = UnionToTuple export type RecordValuesFromKeysTuple< - R extends Record, + R extends Record, K extends unknown[], - ValuesTuple extends Composable[] = [], + ValuesTuple extends unknown[] = [], > = K extends [infer Head, ...infer rest] ? Head extends string ? rest extends string[] @@ -32,26 +35,26 @@ namespace Internal { export type Zip< K extends unknown[], - V extends Composable[], - O extends Record = {}, + V extends unknown[], + O extends Record = {}, > = K extends [infer HeadK, ...infer restK] ? V extends [infer HeadV, ...infer restV] ? HeadK extends string ? restK extends string[] - ? restV extends Composable[] - ? Zip + ? restV extends unknown[] + ? Prettify> : V // in this case V has the AllArguments failure type : never : never : O : O - export type EveryElementTakesUndefined = T extends [ + export type EveryElementTakes = T extends [ infer HEAD, ...infer TAIL, ] - ? undefined extends HEAD - ? EveryElementTakesUndefined + ? U extends HEAD + ? EveryElementTakes : ['Fail to compose', undefined, 'does not fit in', HEAD] : true diff --git a/src/types.ts b/src/types.ts index 13195872..67312d15 100644 --- a/src/types.ts +++ b/src/types.ts @@ -27,14 +27,9 @@ type MergeObjs = Objs extends [ infer first, ...infer rest, ] - ? MergeObjs & first>> + ? MergeObjs & first>> : output -type Prettify = { - [K in keyof T]: T[K] - // deno-lint-ignore ban-types -} & {} - /** * It is similar to Partial but it requires at least one property to be defined. * @example @@ -115,9 +110,9 @@ type PipeArguments< ? IsNever> extends true ? ['Fail to compose, "never" does not fit in', FirstBParameter] : Awaited extends FirstBParameter - ? Internal.EveryElementTakesUndefined extends true + ? Internal.EveryElementTakes extends true ? PipeArguments OA>]> - : Internal.EveryElementTakesUndefined + : Internal.EveryElementTakes : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] : [...Arguments, Composable<(...a: PA) => OA>] : never @@ -142,11 +137,9 @@ type CollectArguments> = AllArguments>> > ? never - : Prettify< - Internal.Zip< - Internal.Keys, - AllArguments>> - > + : Internal.Zip< + Internal.Keys, + AllArguments>> > type RecordToTuple> = @@ -175,7 +168,6 @@ export type { MergeObjs, PipeArguments, PipeReturn, - Prettify, RecordToTuple, Result, SerializableError, From 71f0f9c9a5bb2357c65de32031de0e9bceb262c6 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 17 Apr 2024 18:21:23 -0300 Subject: [PATCH 076/238] fix some type tests --- src/internal/types.test.ts | 18 ++++++++++++++- src/internal/types.ts | 2 +- src/tests/types.test.ts | 46 +++++++++++++------------------------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/internal/types.test.ts b/src/internal/types.test.ts index 86f50ea2..787891fb 100644 --- a/src/internal/types.test.ts +++ b/src/internal/types.test.ts @@ -1,4 +1,4 @@ -// deno-lint-ignore-file no-namespace +// deno-lint-ignore-file no-namespace ban-ts-comment import { assertEquals, describe, it } from '../test-prelude.ts' import { Internal } from './types.ts' @@ -202,5 +202,21 @@ namespace RecordValuesFromKeysTuple { > } +namespace Prettify { + type test1 = Expect< + Equal< + Internal.Prettify<{ a: number } & { b: string }>, + { a: number; b: string } + > + > + type error1 = Expect< + // @ts-expect-error + Equal< + Internal.Prettify<{ a: number } & { b: string }>, + { a: number } & { b: string } + > + > +} + describe('type tests', () => it('should have no ts errors', () => assertEquals(true, true))) diff --git a/src/internal/types.ts b/src/internal/types.ts index e5bc2711..2ad8d855 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -61,7 +61,7 @@ namespace Internal { export type SubtypesTuple< TupleA extends unknown[], TupleB extends unknown[], - Output extends unknown[], + Output extends unknown[] = [], > = TupleA extends [] ? [...Output, ...TupleB] : TupleB extends [] diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 440bdc8c..9b924ceb 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -60,22 +60,6 @@ namespace Last { type test3 = Expect, never>> } -namespace Prettify { - type test1 = Expect< - Equal< - Subject.Prettify<{ a: number } & { b: string }>, - { a: number; b: string } - > - > - type error1 = Expect< - // @ts-expect-error - Equal< - Subject.Prettify<{ a: number } & { b: string }>, - { a: number } & { b: string } - > - > -} - namespace AtLeastOne { type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> @@ -286,20 +270,22 @@ namespace CollectArguments { } > > - type testCompositionFailure = Expect< - Equal< - Subject.CollectArguments<{ - a: Subject.Composable<(x: string, y: string) => void> - b: Subject.Composable<(x: 'foo', y: number) => void> - }>, - [ - 'Fail to compose', - [x: string, y: string], - 'does not fit in', - [x: 'foo', y: number], - ] - > - > + + // TODO: Fix this error + // type testCompositionFailure = Expect< + // Equal< + // Subject.CollectArguments<{ + // a: Subject.Composable<(x: string, y: string) => void> + // b: Subject.Composable<(x: 'foo', y: number) => void> + // }>, + // [ + // 'Fail to compose', + // [x: string, y: string], + // 'does not fit in', + // [x: 'foo', y: number], + // ] + // > + // > } namespace UnpackResult { From 645042c882307d1e3451d1eb44aad7beb018ca3f Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 17 Apr 2024 22:59:33 -0400 Subject: [PATCH 077/238] found the infinite loop. The default definition of Composable and those anys mess up our recursion. Also, the contraint in the generic also does not seem to be very useful. --- src/combinators.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/combinators.ts b/src/combinators.ts index 26783d6f..d45a0406 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -67,7 +67,7 @@ function pipe( * const cf = C.all(a, b, c) // ^? Composable<(id: number) => [string, number, boolean]> */ -function all( +function all( ...fns: T & AllArguments ) { return (async (...args: any) => { From fa7f6a986c03e85d6f9ff67a23a041f88b96c376 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Thu, 18 Apr 2024 09:23:24 -0400 Subject: [PATCH 078/238] Type checking on collect now generates errors only on the parameters --- src/tests/collect.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 7dbe7823..395fe09b 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -53,10 +53,11 @@ describe('collect', () => { }) it('uses the same arguments for every function', async () => { - //@ts-expect-error add and append parameters are incompatible // The runtime will work since passing 1, 2 will be coerced to '1', '2' const fn = collect({ + //@ts-expect-error add and append parameters are incompatible add: add, + //@ts-expect-error add and append parameters are incompatible string: append, }) //@ts-expect-error add and append parameters are incompatible From 60dfb29c303fc239b2af168d57c491d46dde3c66 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 11:42:57 -0300 Subject: [PATCH 079/238] Make all only accept array of composables --- src/combinators.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index d45a0406..d8dc7777 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -67,17 +67,15 @@ function pipe( * const cf = C.all(a, b, c) // ^? Composable<(id: number) => [string, number, boolean]> */ -function all( - ...fns: T & AllArguments -) { - return (async (...args: any) => { +function all(...fns: T & AllArguments) { + return (async (...args) => { const results = await Promise.all(fns.map((fn) => fn(...args))) if (results.some(({ success }) => success === false)) { return failure(results.map(({ errors }) => errors).flat()) } - return success((results as Success[]).map(({ data }) => data)) + return success((results as Success[]).map(({ data }) => data)) }) as Composable< (...args: Parameters[0]>) => { [key in keyof T]: UnpackData>> From 40a5fe54d47284f691f52660f53f78ea94d61f2d Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 11:43:23 -0300 Subject: [PATCH 080/238] Make the CommonSubtype intersect records --- src/internal/types.test.ts | 25 +++++++++++++++++++++++++ src/internal/types.ts | 8 ++++++++ 2 files changed, 33 insertions(+) diff --git a/src/internal/types.test.ts b/src/internal/types.test.ts index 787891fb..2464c59a 100644 --- a/src/internal/types.test.ts +++ b/src/internal/types.test.ts @@ -51,6 +51,12 @@ namespace CommonSubType { type WithPartial = Expect< Equal, string> > + type WithRecords = Expect< + Equal< + Internal.CommonSubType<{ a: number }, { b: boolean; a: number | string }>, + { a: number; b: boolean } + > + > } namespace SubtypesTuple { @@ -156,6 +162,25 @@ namespace SubtypesTuple { [string, number] > > + + type WithObjects = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(obj: { a: string }) => void>, + Parameters<(obj: { b: number }) => void> + >, + [{ a: string; b: number }] + > + > + type WithArrays = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(obj: (string | number)[]) => void>, + Parameters<(obj: (1 | 2)[]) => void> + >, + [(1 | 2)[]] + > + > } namespace EveryElementTakes { diff --git a/src/internal/types.ts b/src/internal/types.ts index 2ad8d855..1fa17b7f 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -128,6 +128,14 @@ namespace Internal { ? A : [B] extends [A] ? B + : A extends Record + ? B extends Record + ? Prettify + : { + 'Incompatible arguments ': true + argument1: A + argument2: B + } : { 'Incompatible arguments ': true argument1: A From 297f8ef57c9b2cd0da1c6da81c7ea9e77604b86e Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 11:49:48 -0300 Subject: [PATCH 081/238] Make all and collect out of cfs --- src/df/combinators.ts | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/src/df/combinators.ts b/src/df/combinators.ts index f787ac58..8c9a4e93 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -7,11 +7,7 @@ import type { UnpackAll, } from '../types.ts' import * as A from '../combinators.ts' -import type { - DomainFunction, - UnpackDFObject, - UnpackData, -} from './types.ts' +import type { DomainFunction, UnpackDFObject, UnpackData } from './types.ts' import { composable, fromSuccess } from '../constructors.ts' import { ErrorList } from '../errors.ts' import { applyEnvironment } from './constructors.ts' @@ -36,10 +32,7 @@ function applyEnvironmentToList< function all( ...fns: Fns ): DomainFunction> { - return ((input, environment) => - A.all(...applyEnvironmentToList(fns, environment))( - input, - )) as DomainFunction> + return A.all(...(fns as never)) as DomainFunction> } /** @@ -55,12 +48,7 @@ function all( function collect>( fns: Fns, ): DomainFunction> { - const dfsWithKey = Object.entries(fns).map(([key, df]) => - A.map(df, (result) => ({ [key]: result })), - ) - return A.map(all(...dfsWithKey), A.mergeObjects) as DomainFunction< - UnpackDFObject - > + return A.collect(fns as never) as DomainFunction> } /** @@ -218,13 +206,4 @@ function branch( > } -export { - all, - branch, - collect, - collectSequence, - first, - merge, - pipe, - sequence, -} +export { all, branch, collect, collectSequence, first, merge, pipe, sequence } From a49d4901ae282864318cd19ddd2e837d2e0581fe Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 12:33:01 -0300 Subject: [PATCH 082/238] Export all and merge from CF as they are now universal --- src/combinators.ts | 21 +++++++ src/df/combinators.ts | 36 +----------- src/df/index.ts | 2 - src/df/tests/all.test.ts | 91 ----------------------------- src/df/tests/branch.test.ts | 43 +++++++------- src/index.ts | 3 +- src/tests/all.test.ts | 98 +++++++++++++++++++++++++++++++- src/{df => }/tests/merge.test.ts | 18 +++--- 8 files changed, 151 insertions(+), 161 deletions(-) delete mode 100644 src/df/tests/all.test.ts rename src/{df => }/tests/merge.test.ts (89%) diff --git a/src/combinators.ts b/src/combinators.ts index d8dc7777..3999d351 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -155,6 +155,26 @@ function map( > } +/** + * **NOTE :** Try to use [collect](collect) instead wherever possible since it is much safer. `merge` can create domain functions that will always fail in run-time or even overwrite data from successful constituent functions application. The `collect` function does not have these issues and serves a similar purpose. + * @example + * import { mdf, merge } from 'domain-functions' + * + * const a = mdf(z.object({}))(() => ({ a: 'a' })) + * const b = mdf(z.object({}))(() => ({ b: 2 })) + * const df = merge(a, b) + * // ^? DomainFunction<{ a: string, b: number }> + */ +function merge( + ...fns: T & AllArguments +): Composable< + (...args: Parameters[0]>) => MergeObjs<{ + [key in keyof T]: UnpackData>> + }> +> { + return map(all(...(fns as never)), mergeObjects as never) +} + /** * Creates a new function that will try to recover from a resulting Failure. When the given function succeeds, its result is returned without changes. * @example @@ -246,6 +266,7 @@ export { collect, map, mapError, + merge, mergeObjects, pipe, sequence, diff --git a/src/df/combinators.ts b/src/df/combinators.ts index 8c9a4e93..d698f2cf 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -1,7 +1,6 @@ import type { Composable, Last, - MergeObjs, Success, TupleToUnion, UnpackAll, @@ -18,23 +17,6 @@ function applyEnvironmentToList< return fns.map((fn) => applyEnvironment(fn, environment)) as [Composable] } -/** - * Creates a single domain function out of multiple domain functions. It will pass the same input and environment to each provided function. The functions will run in parallel. If all constituent functions are successful, The data field will be a tuple containing each function's output. - * @example - * import { mdf, all } from 'domain-functions' - * - * const a = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) - * const b = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) - * const c = mdf(z.object({ id: z.number() }))(({ id }) => Boolean(id)) - * const df = all(a, b, c) -// ^? DomainFunction<[string, number, boolean]> - */ -function all( - ...fns: Fns -): DomainFunction> { - return A.all(...(fns as never)) as DomainFunction> -} - /** * Receives a Record of domain functions, runs them all in parallel and preserves the shape of this record for the data property in successful results. * @example @@ -80,22 +62,6 @@ function first( }) as DomainFunction>> } -/** - * **NOTE :** Try to use [collect](collect) instead wherever possible since it is much safer. `merge` can create domain functions that will always fail in run-time or even overwrite data from successful constituent functions application. The `collect` function does not have these issues and serves a similar purpose. - * @example - * import { mdf, merge } from 'domain-functions' - * - * const a = mdf(z.object({}))(() => ({ a: 'a' })) - * const b = mdf(z.object({}))(() => ({ b: 2 })) - * const df = merge(a, b) - * // ^? DomainFunction<{ a: string, b: number }> - */ -function merge>[]>( - ...fns: Fns -): DomainFunction>> { - return A.map(all(...fns), A.mergeObjects) -} - /** * Creates a single domain function out of a chain of multiple domain functions. It will pass the same environment to all given functions, and it will pass the output of a function as the next function's input in left-to-right order. The resulting data will be the output of the rightmost function. * @example @@ -206,4 +172,4 @@ function branch( > } -export { all, branch, collect, collectSequence, first, merge, pipe, sequence } +export { branch, collect, collectSequence, first, pipe, sequence } diff --git a/src/df/index.ts b/src/df/index.ts index 9ba00ac0..c894c8bd 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -10,12 +10,10 @@ export type { UnpackSuccess, } from './types.ts' export { - all, branch, collect, collectSequence, first, - merge, pipe, sequence, } from './combinators.ts' diff --git a/src/df/tests/all.test.ts b/src/df/tests/all.test.ts deleted file mode 100644 index effe3f6a..00000000 --- a/src/df/tests/all.test.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../../test-prelude.ts' -import { df, failure, InputError, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' - -describe('all', () => { - it('should combine two domain functions into one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - - const c = df.all(a, b) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), success<[number, number]>([2, 0])) - }) - - it('should combine many domain functions into one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) - const d = df.all(a, b, c) - type _R = Expect>> - - const results = await d({ id: 1 }) - assertEquals(results, success<[string, number, boolean]>(['1', 2, true])) - }) - - it('should return error when one of the domain functions has input errors', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - - const c = df.all(a, b) - type _R = Expect>> - - assertEquals( - await c({ id: 1 }), - failure([new InputError('Expected string, received number', ['id'])]), - ) - }) - - it('should return error when one of the domain functions fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.number() }))(() => { - throw 'Error' - }) - - const c = df.all(a, b) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), failure([new Error()])) - }) - - it('should combine the inputError messages of both functions', async () => { - const a = df.make(z.object({ id: z.string() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - - const c = df.all(a, b) - type _R = Expect>> - - assertEquals( - await c({ id: 1 }), - failure([ - new InputError('Expected string, received number', ['id']), - new InputError('Expected string, received number', ['id']), - ]), - ) - }) - - it('should combine the error messages when both functions fail', async () => { - const a = df.make(z.object({ id: z.number() }))(() => { - throw new Error('Error A') - }) - const b = df.make(z.object({ id: z.number() }))(() => { - throw new Error('Error B') - }) - - const c = df.all(a, b) - type _R = Expect>> - - const { - errors: [errA, errB], - } = await c({ id: 1 }) - assertIsError(errA, Error, 'Error A') - assertIsError(errB, Error, 'Error B') - }) -}) diff --git a/src/df/tests/branch.test.ts b/src/df/tests/branch.test.ts index 7d219665..bf4ba693 100644 --- a/src/df/tests/branch.test.ts +++ b/src/df/tests/branch.test.ts @@ -5,7 +5,7 @@ import { it, z, } from '../../test-prelude.ts' -import { df, failure, InputError, success } from '../../index.ts' +import { all, df, failure, InputError, success } from '../../index.ts' import type { DomainFunction } from '../../index.ts' describe('branch', () => { @@ -112,24 +112,25 @@ describe('branch', () => { assertIsError(err, Error, 'condition function failed') }) - it('should not break composition with other combinators', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ - id: id + 2, - })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = df.make(z.number())((n) => n * 2) - const d = df.all( - df.pipe( - df.branch(a, () => b), - c, - ), - a, - ) - type _R = Expect>> - - assertEquals( - await d({ id: 1 }), - success<[number, { id: number }]>([4, { id: 3 }]), - ) - }) + // TODO: FIX THIS + // it('should not break composition with other combinators', async () => { + // const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + // id: id + 2, + // })) + // const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + // const c = df.make(z.number())((n) => n * 2) + // const d = all( + // df.pipe( + // df.branch(a, () => b), + // c, + // ), + // a, + // ) + // type _R = Expect>> + + // assertEquals( + // await d({ id: 1 }), + // success<[number, { id: number }]>([4, { id: 3 }]), + // ) + // }) }) diff --git a/src/index.ts b/src/index.ts index df54a058..74038bb3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,10 +5,11 @@ export { collect, map, mapError, + merge, mergeObjects, pipe, sequence, - trace + trace, } from './combinators.ts' export { inputFromForm, diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts index c2282196..ff6622dd 100644 --- a/src/tests/all.test.ts +++ b/src/tests/all.test.ts @@ -1,5 +1,19 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' -import { all, composable, success } from '../index.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../test-prelude.ts' +import { + all, + composable, + success, + df, + DomainFunction, + InputError, + failure, +} from '../index.ts' const voidFn = composable(() => {}) const toString = composable(String) @@ -22,4 +36,84 @@ describe('all', () => { assertEquals(res, success<[number, string, undefined]>([3, '1', undefined])) }) + + it('should combine two domain functions into one', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + + const c = all(a, b) + type _R = Expect>> + + assertEquals(await c({ id: 1 }), success<[number, number]>([2, 0])) + }) + + it('should combine many domain functions into one', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) + const d = all(a, b, c) + type _R = Expect>> + + const results = await d({ id: 1 }) + assertEquals(results, success<[string, number, boolean]>(['1', 2, true])) + }) + + it('should return error when one of the domain functions has input errors', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + + const c = all(a, b) + type _R = Expect>> + + assertEquals( + await c({ id: 1 }), + failure([new InputError('Expected string, received number', ['id'])]), + ) + }) + + it('should return error when one of the domain functions fails', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.number() }))(() => { + throw 'Error' + }) + + const c = all(a, b) + type _R = Expect>> + + assertEquals(await c({ id: 1 }), failure([new Error()])) + }) + + it('should combine the inputError messages of both functions', async () => { + const a = df.make(z.object({ id: z.string() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + + const c = all(a, b) + type _R = Expect>> + + assertEquals( + await c({ id: 1 }), + failure([ + new InputError('Expected string, received number', ['id']), + new InputError('Expected string, received number', ['id']), + ]), + ) + }) + + it('should combine the error messages when both functions fail', async () => { + const a = df.make(z.object({ id: z.number() }))(() => { + throw new Error('Error A') + }) + const b = df.make(z.object({ id: z.number() }))(() => { + throw new Error('Error B') + }) + + const c = all(a, b) + type _R = Expect>> + + const { + errors: [errA, errB], + } = await c({ id: 1 }) + assertIsError(errA, Error, 'Error A') + assertIsError(errB, Error, 'Error B') + }) }) diff --git a/src/df/tests/merge.test.ts b/src/tests/merge.test.ts similarity index 89% rename from src/df/tests/merge.test.ts rename to src/tests/merge.test.ts index 9d310f5b..bb1c54cb 100644 --- a/src/df/tests/merge.test.ts +++ b/src/tests/merge.test.ts @@ -4,9 +4,9 @@ import { describe, it, z, -} from '../../test-prelude.ts' -import { df, failure, InputError, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' +} from '../test-prelude.ts' +import { merge, df, failure, InputError, success } from '../index.ts' +import type { DomainFunction } from '../index.ts' describe('merge', () => { it('should combine two domain functions results into one object', async () => { @@ -17,7 +17,7 @@ describe('merge', () => { resultB: id - 1, })) - const c = df.merge(a, b) + const c = merge(a, b) type _R = Expect< Equal> > @@ -37,7 +37,7 @@ describe('merge', () => { const c = df.make(z.object({ id: z.number() }))(({ id }) => ({ resultC: Boolean(id), })) - const d = df.merge(a, b, c) + const d = merge(a, b, c) type _R = Expect< Equal< typeof d, @@ -61,7 +61,7 @@ describe('merge', () => { id, })) - const c: DomainFunction<{ id: string }> = df.merge(a, b) + const c: DomainFunction<{ id: string }> = merge(a, b) type _R = Expect< Equal< typeof c, @@ -85,7 +85,7 @@ describe('merge', () => { throw 'Error' }) - const c: DomainFunction = df.merge(a, b) + const c: DomainFunction = merge(a, b) type _R = Expect>> assertEquals(await c({ id: 1 }), failure([new Error()])) @@ -99,7 +99,7 @@ describe('merge', () => { resultB: id, })) - const c = df.merge(a, b) + const c = merge(a, b) type _R = Expect< Equal> > @@ -121,7 +121,7 @@ describe('merge', () => { throw new Error('Error B') }) - const c = df.merge(a, b) + const c = merge(a, b) type _R = Expect>> const { From 0ad1956311a3540830482337a7607075cbfb5068 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 12:36:12 -0300 Subject: [PATCH 083/238] Export collect from CF as they are now universal --- src/df/combinators.ts | 18 +------- src/df/index.ts | 1 - src/df/tests/branch.test.ts | 2 +- src/df/tests/collect.test.ts | 80 -------------------------------- src/tests/collect.test.ts | 88 ++++++++++++++++++++++++++++++++++-- 5 files changed, 87 insertions(+), 102 deletions(-) delete mode 100644 src/df/tests/collect.test.ts diff --git a/src/df/combinators.ts b/src/df/combinators.ts index d698f2cf..9c51fae7 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -17,22 +17,6 @@ function applyEnvironmentToList< return fns.map((fn) => applyEnvironment(fn, environment)) as [Composable] } -/** - * Receives a Record of domain functions, runs them all in parallel and preserves the shape of this record for the data property in successful results. - * @example - * import { mdf, collect } from 'domain-functions' - * - * const a = mdf(z.object({}))(() => '1') - * const b = mdf(z.object({}))(() => 2) - * const df = collect({ a, b }) -// ^? DomainFunction<{ a: string, b: number }> - */ -function collect>( - fns: Fns, -): DomainFunction> { - return A.collect(fns as never) as DomainFunction> -} - /** * Creates a composite domain function that will return the result of the first successful constituent domain function. **It is important to notice** that all constituent domain functions will be executed in parallel, so be mindful of the side effects. * @example @@ -172,4 +156,4 @@ function branch( > } -export { branch, collect, collectSequence, first, pipe, sequence } +export { branch, collectSequence, first, pipe, sequence } diff --git a/src/df/index.ts b/src/df/index.ts index c894c8bd..7118a9d1 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -11,7 +11,6 @@ export type { } from './types.ts' export { branch, - collect, collectSequence, first, pipe, diff --git a/src/df/tests/branch.test.ts b/src/df/tests/branch.test.ts index bf4ba693..0ea1318b 100644 --- a/src/df/tests/branch.test.ts +++ b/src/df/tests/branch.test.ts @@ -5,7 +5,7 @@ import { it, z, } from '../../test-prelude.ts' -import { all, df, failure, InputError, success } from '../../index.ts' +import { df, failure, InputError, success } from '../../index.ts' import type { DomainFunction } from '../../index.ts' describe('branch', () => { diff --git a/src/df/tests/collect.test.ts b/src/df/tests/collect.test.ts deleted file mode 100644 index fe471468..00000000 --- a/src/df/tests/collect.test.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../../test-prelude.ts' -import { df, failure, InputError, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' - -describe('collect', () => { - it('should combine an object of domain functions', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - - const c = df.collect({ a, b }) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), success({ a: 2, b: 0 })) - }) - - it('should return error when one of the domain functions has input errors', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - - const c = df.collect({ a, b }) - type _R = Expect>> - - assertEquals( - await c({ id: 1 }), - failure([new InputError('Expected string, received number', ['id'])]), - ) - }) - - it('should return error when one of the domain functions fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.number() }))(() => { - throw 'Error' - }) - - const c = df.collect({ a, b }) - type _R = Expect>> - - assertEquals(await c({ id: 1 }), failure([new Error()])) - }) - - it('should combine the inputError messages of both functions', async () => { - const a = df.make(z.object({ id: z.string() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) - - const c = df.collect({ a, b }) - type _R = Expect>> - - assertEquals( - await c({ id: 1 }), - failure([ - new InputError('Expected string, received number', ['id']), - new InputError('Expected string, received number', ['id']), - ]), - ) - }) - - it('should combine the error messages when both functions fail', async () => { - const a = df.make(z.object({ id: z.number() }))(() => { - throw new Error('Error A') - }) - const b = df.make(z.object({ id: z.number() }))(() => { - throw new Error('Error B') - }) - - const c = df.collect({ a, b }) - type _R = Expect>> - - const { - errors: [errA, errB], - } = await c({ id: 1 }) - assertIsError(errA, Error, 'Error A') - assertIsError(errB, Error, 'Error B') - }) -}) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 395fe09b..79ffb446 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -1,6 +1,19 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' -import type { Result, Composable } from '../index.ts' -import { collect, composable, success } from '../index.ts' +import { + assertEquals, + assertIsError, + describe, + it, + z, +} from '../test-prelude.ts' +import type { Result, Composable, DomainFunction } from '../index.ts' +import { + collect, + df, + failure, + InputError, + composable, + success, +} from '../index.ts' const voidFn = composable(() => {}) const toString = composable((a: unknown) => `${a}`) @@ -107,4 +120,73 @@ describe('collect', () => { assertEquals(res.errors![0].message, 'a is 1') assertEquals(res.errors![1].message, 'a is 1') }) + + it('should combine an object of domain functions', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + + const c = collect({ a, b }) + type _R = Expect>> + + assertEquals(await c({ id: 1 }), success({ a: 2, b: 0 })) + }) + + it('should return error when one of the domain functions has input errors', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + + const c = collect({ a, b }) + type _R = Expect>> + + assertEquals( + await c({ id: 1 }), + failure([new InputError('Expected string, received number', ['id'])]), + ) + }) + + it('should return error when one of the domain functions fails', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => id) + const b = df.make(z.object({ id: z.number() }))(() => { + throw 'Error' + }) + + const c = collect({ a, b }) + type _R = Expect>> + + assertEquals(await c({ id: 1 }), failure([new Error()])) + }) + + it('should combine the inputError messages of both functions', async () => { + const a = df.make(z.object({ id: z.string() }))(({ id }) => id) + const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + + const c = collect({ a, b }) + type _R = Expect>> + + assertEquals( + await c({ id: 1 }), + failure([ + new InputError('Expected string, received number', ['id']), + new InputError('Expected string, received number', ['id']), + ]), + ) + }) + + it('should combine the error messages when both functions fail', async () => { + const a = df.make(z.object({ id: z.number() }))(() => { + throw new Error('Error A') + }) + const b = df.make(z.object({ id: z.number() }))(() => { + throw new Error('Error B') + }) + + const c = collect({ a, b }) + type _R = Expect>> + + const { + errors: [errA, errB], + } = await c({ id: 1 }) + assertIsError(errA, Error, 'Error A') + assertIsError(errB, Error, 'Error B') + }) }) From ac64d4156aed3a43903b23014f6720fd1b0d73d7 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 14:35:50 -0300 Subject: [PATCH 084/238] Bring first from df to cf as it is also a parallel combinator --- src/combinators.ts | 31 +++++++++++++++++++++++++ src/df/combinators.ts | 40 ++------------------------------ src/df/index.ts | 8 +------ src/index.ts | 1 + src/{df => }/tests/first.test.ts | 12 +++++----- 5 files changed, 41 insertions(+), 51 deletions(-) rename src/{df => }/tests/first.test.ts (83%) diff --git a/src/combinators.ts b/src/combinators.ts index 3999d351..1f15ca58 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -13,6 +13,7 @@ import type { UnpackData, } from './types.ts' import { composable, failure, success } from './constructors.ts' +import { ErrorList } from './errors.ts' /** * Merges a list of objects into a single object. @@ -175,6 +176,35 @@ function merge( return map(all(...(fns as never)), mergeObjects as never) } +/** + * Creates a composite domain function that will return the result of the first successful constituent domain function. **It is important to notice** that all constituent domain functions will be executed in parallel, so be mindful of the side effects. + * @example + * import { mdf, first } from 'domain-functions' + * + * const a = mdf(z.object({ n: z.number() }))(({ n }) => n + 1) +const b = mdf(z.object({ n: z.number() }))(({ n }) => String(n)) +const df = first(a, b) +// ^? DomainFunction + */ +function first(...fns: T & AllArguments) { + return ((...args) => { + return composable(async () => { + const results = await Promise.all(fns.map((fn) => fn(...args))) + + const result = results.find((r) => r.success) as Success | undefined + if (!result) { + throw new ErrorList(results.map(({ errors }) => errors).flat()) + } + + return result.data + })() + }) as Composable< + ( + ...args: Parameters[0]> + ) => UnpackData>> + > +} + /** * Creates a new function that will try to recover from a resulting Failure. When the given function succeeds, its result is returned without changes. * @example @@ -264,6 +294,7 @@ export { all, catchError, collect, + first, map, mapError, merge, diff --git a/src/df/combinators.ts b/src/df/combinators.ts index 9c51fae7..91c69a11 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -1,14 +1,7 @@ -import type { - Composable, - Last, - Success, - TupleToUnion, - UnpackAll, -} from '../types.ts' +import type { Composable, Last, UnpackAll } from '../types.ts' import * as A from '../combinators.ts' import type { DomainFunction, UnpackDFObject, UnpackData } from './types.ts' import { composable, fromSuccess } from '../constructors.ts' -import { ErrorList } from '../errors.ts' import { applyEnvironment } from './constructors.ts' function applyEnvironmentToList< @@ -17,35 +10,6 @@ function applyEnvironmentToList< return fns.map((fn) => applyEnvironment(fn, environment)) as [Composable] } -/** - * Creates a composite domain function that will return the result of the first successful constituent domain function. **It is important to notice** that all constituent domain functions will be executed in parallel, so be mindful of the side effects. - * @example - * import { mdf, first } from 'domain-functions' - * - * const a = mdf(z.object({ n: z.number() }))(({ n }) => n + 1) -const b = mdf(z.object({ n: z.number() }))(({ n }) => String(n)) -const df = first(a, b) -// ^? DomainFunction - */ -function first( - ...fns: Fns -): DomainFunction>> { - return ((input, environment) => { - return composable(async () => { - const results = await Promise.all( - fns.map((fn) => (fn as DomainFunction)(input, environment)), - ) - - const result = results.find((r) => r.success) as Success | undefined - if (!result) { - throw new ErrorList(results.map(({ errors }) => errors).flat()) - } - - return result.data - })() - }) as DomainFunction>> -} - /** * Creates a single domain function out of a chain of multiple domain functions. It will pass the same environment to all given functions, and it will pass the output of a function as the next function's input in left-to-right order. The resulting data will be the output of the rightmost function. * @example @@ -156,4 +120,4 @@ function branch( > } -export { branch, collectSequence, first, pipe, sequence } +export { branch, collectSequence, pipe, sequence } diff --git a/src/df/index.ts b/src/df/index.ts index 7118a9d1..12bc0edd 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -9,10 +9,4 @@ export type { UnpackDFObject, UnpackSuccess, } from './types.ts' -export { - branch, - collectSequence, - first, - pipe, - sequence, -} from './combinators.ts' +export { branch, collectSequence, pipe, sequence } from './combinators.ts' diff --git a/src/index.ts b/src/index.ts index 74038bb3..64362cda 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,6 +3,7 @@ export { all, catchError, collect, + first, map, mapError, merge, diff --git a/src/df/tests/first.test.ts b/src/tests/first.test.ts similarity index 83% rename from src/df/tests/first.test.ts rename to src/tests/first.test.ts index dd96c13e..81606138 100644 --- a/src/df/tests/first.test.ts +++ b/src/tests/first.test.ts @@ -1,13 +1,13 @@ -import { assertEquals, describe, it, z } from '../../test-prelude.ts' -import { df, failure, InputError, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' +import { assertEquals, describe, it, z } from '../test-prelude.ts' +import { df, first, failure, InputError, success } from '../index.ts' +import type { DomainFunction } from '../index.ts' describe('first', () => { it('should return the result of the first successful domain function', async () => { const a = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) - const d = df.first(a, b, c) + const d = first(a, b, c) type _R = Expect>> const results = await d({ id: 1 }) @@ -22,7 +22,7 @@ describe('first', () => { z.object({ n: z.number(), operation: z.literal('decrement') }), )(({ n }) => n - 1) - const c = df.first(a, b) + const c = first(a, b) type _R = Expect>> assertEquals(await c({ n: 1, operation: 'increment' }), success(2)) @@ -34,7 +34,7 @@ describe('first', () => { throw 'Error' }) - const c = df.first(a, b) + const c = first(a, b) type _R = Expect>> assertEquals( From f2b6ece34238da8c775125f139e2cc8b44ce5a80 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 14:38:02 -0300 Subject: [PATCH 085/238] Remove stale type utility --- src/index.ts | 1 - src/tests/types.test.ts | 12 ------------ src/types.ts | 10 ---------- 3 files changed, 23 deletions(-) diff --git a/src/index.ts b/src/index.ts index 64362cda..ed50fd28 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,7 +30,6 @@ export type { SerializableError, SerializedResult, Success, - TupleToUnion, UnpackAll, UnpackData, } from './types.ts' diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 9b924ceb..e90fffeb 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -13,12 +13,6 @@ namespace MergeObjs { type test2 = Expect> } -namespace TupleToUnion { - type Result = Subject.TupleToUnion<[1, 2, 3]> - - type test = Expect> -} - namespace Last { type test1 = Expect, 3>> type test2 = Expect, 1>> @@ -48,12 +42,6 @@ namespace MergeObjs { type test2 = Expect> } -namespace TupleToUnion { - type Result = Subject.TupleToUnion<[1, 2, 3]> - - type test = Expect> -} - namespace Last { type test1 = Expect, 3>> type test2 = Expect, 1>> diff --git a/src/types.ts b/src/types.ts index 67312d15..6f5405b3 100644 --- a/src/types.ts +++ b/src/types.ts @@ -53,15 +53,6 @@ type Last = T extends [...infer _I, infer L] ? L : never -/** - * Converts a tuple type to a union type. - * @example - * type MyTuple = [string, number] - * type MyUnion = TupleToUnion - * // ^? string | number - */ -type TupleToUnion = T[number] - type IsNever = // prettier is removing the parens thus worsening readability // prettier-ignore @@ -173,7 +164,6 @@ export type { SerializableError, SerializedResult, Success, - TupleToUnion, UnpackAll, UnpackData, } From 8331fd3645b76bfd63086f300fb40c7a556a8020 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 14:42:11 -0300 Subject: [PATCH 086/238] Remove another stale type utility --- src/index.ts | 1 - src/tests/types.test.ts | 26 +------------------------- src/types.ts | 13 ------------- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/src/index.ts b/src/index.ts index ed50fd28..926c5269 100644 --- a/src/index.ts +++ b/src/index.ts @@ -21,7 +21,6 @@ export { export { toErrorPayload, serialize } from './serializer.ts' export { EnvironmentError, ErrorList, InputError } from './errors.ts' export type { - AtLeastOne, Composable, Failure, Last, diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index e90fffeb..d55216c0 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -1,4 +1,4 @@ -// deno-lint-ignore-file no-namespace ban-ts-comment no-unused-vars +// deno-lint-ignore-file no-namespace import { assertEquals, describe, it } from '../test-prelude.ts' import * as Subject from '../types.ts' @@ -19,18 +19,6 @@ namespace Last { type test3 = Expect, never>> } -namespace AtLeastOne { - type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> - - const test1: Result = { a: 1 } - const test2: Result = { b: 2 } - const test3: Result = { a: 1, b: 2 } - // @ts-expect-error - const error1: Result = {} - // @ts-expect-error - const error2: Result = { a: 1, c: 3 } -} - namespace MergeObjs { const obj1 = { a: 1, b: 2 } as const const obj2 = {} @@ -48,18 +36,6 @@ namespace Last { type test3 = Expect, never>> } -namespace AtLeastOne { - type Result = Subject.AtLeastOne<{ a: 1; b: 2 }> - - const test1: Result = { a: 1 } - const test2: Result = { b: 2 } - const test3: Result = { a: 1, b: 2 } - // @ts-expect-error - const error1: Result = {} - // @ts-expect-error - const error2: Result = { a: 1, c: 3 } -} - namespace PipeArguments { type testNoEmptyArgumentList = Expect, never>> type testOneComposable = Expect< diff --git a/src/types.ts b/src/types.ts index 6f5405b3..f48fd854 100644 --- a/src/types.ts +++ b/src/types.ts @@ -30,18 +30,6 @@ type MergeObjs = Objs extends [ ? MergeObjs & first>> : output -/** - * It is similar to Partial but it requires at least one property to be defined. - * @example - * type MyType = AtLeastOne<{ a: string, b: number }> - * const a: MyType = { a: 'hello' } - * const b: MyType = { b: 123 } - * const c: MyType = { a: 'hello', b: 123 } - * // The following won't compile: - * const d: MyType = {} - */ -type AtLeastOne }> = Partial & U[keyof U] - /** * Returns the last item of a tuple type. * @example @@ -149,7 +137,6 @@ type SerializedResult = export type { AllArguments, - AtLeastOne, CollectArguments, Composable, Failure, From b0010816ff38f216e6b172624488b511b1f8c860 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 14:49:23 -0300 Subject: [PATCH 087/238] Fix error reporting on collect type --- src/tests/collect.test.ts | 3 +-- src/tests/types.test.ts | 29 ++++++++++++++--------------- src/types.ts | 4 ++++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 79ffb446..4bf3ae85 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -67,10 +67,9 @@ describe('collect', () => { it('uses the same arguments for every function', async () => { // The runtime will work since passing 1, 2 will be coerced to '1', '2' + //@ts-expect-error add and append parameters are incompatible const fn = collect({ - //@ts-expect-error add and append parameters are incompatible add: add, - //@ts-expect-error add and append parameters are incompatible string: append, }) //@ts-expect-error add and append parameters are incompatible diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index d55216c0..aae92951 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -235,21 +235,20 @@ namespace CollectArguments { > > - // TODO: Fix this error - // type testCompositionFailure = Expect< - // Equal< - // Subject.CollectArguments<{ - // a: Subject.Composable<(x: string, y: string) => void> - // b: Subject.Composable<(x: 'foo', y: number) => void> - // }>, - // [ - // 'Fail to compose', - // [x: string, y: string], - // 'does not fit in', - // [x: 'foo', y: number], - // ] - // > - // > + type testCompositionFailure = Expect< + Equal< + Subject.CollectArguments<{ + a: Subject.Composable<(x: string, y: string) => void> + b: Subject.Composable<(x: 'foo', y: number) => void> + }>, + [ + 'Fail to compose', + [x: string, y: string], + 'does not fit in', + [x: 'foo', y: number], + ] + > + > } namespace UnpackResult { diff --git a/src/types.ts b/src/types.ts index f48fd854..51f587fc 100644 --- a/src/types.ts +++ b/src/types.ts @@ -116,6 +116,10 @@ type CollectArguments> = AllArguments>> > ? never + : AllArguments< + Internal.RecordValuesFromKeysTuple> + > extends ['Fail to compose', ...any[]] + ? AllArguments>> : Internal.Zip< Internal.Keys, AllArguments>> From 82684e1b72f3bca0beebc1c6a13c3c37cfb8da56 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 15:53:48 -0300 Subject: [PATCH 088/238] Remove DF type in favor of only Composable --- src/constructors.ts | 9 +- src/df/combinators.ts | 43 +++++---- src/df/constructors.ts | 8 +- src/df/index.ts | 1 - src/df/tests/branch.test.ts | 56 ++++++++++-- src/df/tests/collect-sequence.test.ts | 75 ++++++++++++---- src/df/tests/constructors.test.ts | 121 ++++++++++++++++++++++---- src/df/tests/pipe.test.ts | 44 ++++++++-- src/df/tests/sequence.test.ts | 56 ++++++++++-- src/df/types.ts | 31 +++---- src/index.ts | 1 - src/tests/all.test.ts | 46 ++++++++-- src/tests/collect.test.ts | 47 ++++++++-- src/tests/first.test.ts | 25 +++++- src/tests/merge.test.ts | 69 +++++++++++---- src/tests/trace.test.ts | 9 +- 16 files changed, 498 insertions(+), 143 deletions(-) diff --git a/src/constructors.ts b/src/constructors.ts index c533c554..d0aade58 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -1,6 +1,5 @@ import { mapError } from './combinators.ts' import { ErrorList } from './errors.ts' -import { DomainFunction } from './index.ts' import type { Composable, Failure, Fn, Success } from './types.ts' function success(data: T): Success { @@ -60,10 +59,10 @@ function fromSuccess O>>( ): T extends Composable<(...a: infer P) => infer O> ? (...args: P) => Promise : never -function fromSuccess>( - fn: T, - onError?: OnError, -): (...args: Parameters) => Promise +function fromSuccess< + O, + T extends Composable<(input?: unknown, environment?: unknown) => O>, +>(fn: T, onError?: OnError): (...args: Parameters) => Promise function fromSuccess(fn: T, onError: OnError = (e) => e) { return async (...args: any[]) => { const result = await mapError(fn, onError)(...args) diff --git a/src/df/combinators.ts b/src/df/combinators.ts index 91c69a11..893edbe9 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -1,6 +1,6 @@ import type { Composable, Last, UnpackAll } from '../types.ts' import * as A from '../combinators.ts' -import type { DomainFunction, UnpackDFObject, UnpackData } from './types.ts' +import type { UnpackDFObject, UnpackData } from './types.ts' import { composable, fromSuccess } from '../constructors.ts' import { applyEnvironment } from './constructors.ts' @@ -22,11 +22,11 @@ function applyEnvironmentToList< * ({ aString }) => ({ aBoolean: aString == '1' }), * ) * const d = pipe(a, b) - * // ^? DomainFunction<{ aBoolean: boolean }> + * // ^? Composable<(input?: unknown, environment?: unknown) => { aBoolean: boolean }> */ -function pipe( +function pipe( ...fns: T -): DomainFunction>> { +): Composable<(input?: unknown, environment?: unknown) => Last>> { return (input, environment) => A.pipe(...applyEnvironmentToList(fns, environment))(input) } @@ -42,11 +42,11 @@ function pipe( * const a = mdf(z.object({}))(() => '1') const b = mdf(z.number())((n) => n + 2) const df = collectSequence({ a, b }) -// ^? DomainFunction<{ a: string, b: number }> +// ^? Composable<(input?: unknown, environment?: unknown) => { a: string, b: number }> */ -function collectSequence>( +function collectSequence>( fns: Fns, -): DomainFunction> { +): Composable<(input?: unknown, environment?: unknown) => UnpackDFObject> { const keys = Object.keys(fns) return A.map( @@ -56,7 +56,7 @@ function collectSequence>( })), ), A.mergeObjects, - ) as DomainFunction> + ) } /** @@ -67,15 +67,13 @@ function collectSequence>( * const a = mdf(z.number())((aNumber) => String(aNumber)) * const b = mdf(z.string())((aString) => aString === '1') * const df = sequence(a, b) - * // ^? DomainFunction<[string, boolean]> + * // ^? Composable<(input?: unknown, environment?: unknown) => [string, boolean]> */ -function sequence( - ...fns: Fns -): DomainFunction> { +function sequence(...fns: Fns) { return ((input, environment) => A.sequence(...applyEnvironmentToList(fns, environment))( input, - )) as DomainFunction> + )) as Composable<(input?: unknown, environment?: unknown) => UnpackAll> } /** @@ -91,7 +89,7 @@ function sequence( * getIdOrEmail, * (output) => (typeof output === "number" ? findUserById : findUserByEmail) * ) - * // ^? DomainFunction + * // ^? Composable<(input?: unknown, environment?: unknown) => User> * * const getStock = mdf(z.any(), z.object({ id: z.number() }))(_, ({ id }) => db.stocks.find({ id })) * const getExtraStock = mdf(z.any(), z.object({ id: z.number() }))(_, ({ id }) => db.stockes.find({ id, extra: true })) @@ -100,10 +98,10 @@ function sequence( * getStock, * ({ items }) => (items.length >= 0 ? null : getExtraStock) * ) - * // ^? DomainFunction<{ items: Item[] }> + * // ^? Composable<(input?: unknown, environment?: unknown) => { items: Item[] }> */ -function branch( - dfn: DomainFunction, +function branch( + dfn: Composable<(input?: unknown, environment?: unknown) => T>, resolver: (o: T) => Promise | R, ) { return (async (input, environment) => { @@ -115,8 +113,15 @@ function branch( if (typeof nextDf !== 'function') return result.data return fromSuccess(nextDf)(result.data, environment) })() - }) as DomainFunction< - R extends DomainFunction ? U : UnpackData> | T + }) as Composable< + ( + input?: unknown, + environment?: unknown, + ) => R extends Composable< + (input?: unknown, environment?: unknown) => infer U + > + ? U + : UnpackData> | T > } diff --git a/src/df/constructors.ts b/src/df/constructors.ts index f745063c..afe428b5 100644 --- a/src/df/constructors.ts +++ b/src/df/constructors.ts @@ -1,7 +1,7 @@ import { composable, failure } from '../constructors.ts' import { EnvironmentError, InputError } from '../errors.ts' import type { Composable } from '../types.ts' -import type { DomainFunction, ParserSchema } from './types.ts' +import type { ParserSchema } from './types.ts' /** * Creates a domain function. @@ -27,7 +27,7 @@ function make( composable(handler), inputSchema, environmentSchema, - ) as DomainFunction> + ) as Composable<(input?: unknown, environment?: unknown) => Awaited> } } @@ -59,7 +59,9 @@ function fromComposable( return failure([...inputErrors, ...envErrors]) } return fn(result.data, envResult.data) - } as DomainFunction>> + } as Composable< + (input?: unknown, environment?: unknown) => Awaited> + > } const objectSchema: ParserSchema> = { diff --git a/src/df/index.ts b/src/df/index.ts index 12bc0edd..2fc4b1fe 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -1,6 +1,5 @@ export { applyEnvironment, make, fromComposable } from './constructors.ts' export type { - DomainFunction, ParserIssue, ParserResult, ParserSchema, diff --git a/src/df/tests/branch.test.ts b/src/df/tests/branch.test.ts index 0ea1318b..83c8036a 100644 --- a/src/df/tests/branch.test.ts +++ b/src/df/tests/branch.test.ts @@ -6,7 +6,7 @@ import { z, } from '../../test-prelude.ts' import { df, failure, InputError, success } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' +import { Composable } from '../../types.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { @@ -16,7 +16,12 @@ describe('branch', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.branch(a, () => Promise.resolve(b)) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals(await c({ id: 1 }), success(2)) }) @@ -29,7 +34,12 @@ describe('branch', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) const c = df.make(z.object({ id: z.number() }))(({ id }) => id * 2) const d = df.branch(a, (output) => (output.next === 'multiply' ? c : b)) - type _R = Expect>> + type _R = Expect< + Equal< + typeof d, + Composable<(input?: unknown, environment?: unknown) => number | string> + > + > assertEquals(await d({ id: 1 }), success(6)) }) @@ -42,7 +52,15 @@ describe('branch', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) const d = df.branch(a, (output) => (output.next === 'multiply' ? null : b)) type _R = Expect< - Equal> + Equal< + typeof d, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => string | { id: number; next: string } + > + > > assertEquals(await d({ id: 1 }), success({ id: 3, next: 'multiply' })) @@ -61,7 +79,12 @@ describe('branch', () => { )(({ inp }, { env }) => inp + env) const c = df.branch(a, () => b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals(await c(undefined, { env: 1 }), success(4)) }) @@ -72,7 +95,12 @@ describe('branch', () => { })) const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.branch(a, () => b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals( await c({ id: '1' }), @@ -86,7 +114,12 @@ describe('branch', () => { })) const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.branch(a, () => b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals( await c({ id: 1 }), @@ -104,7 +137,12 @@ describe('branch', () => { // deno-lint-ignore no-unreachable return b }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > const { errors: [err], @@ -126,7 +164,7 @@ describe('branch', () => { // ), // a, // ) - // type _R = Expect>> + // type _R = Expect [number, { id: number }]>>> // assertEquals( // await d({ id: 1 }), diff --git a/src/df/tests/collect-sequence.test.ts b/src/df/tests/collect-sequence.test.ts index debac462..028665a8 100644 --- a/src/df/tests/collect-sequence.test.ts +++ b/src/df/tests/collect-sequence.test.ts @@ -1,10 +1,4 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../../test-prelude.ts' +import { assertEquals, describe, it, z } from '../../test-prelude.ts' import { df, EnvironmentError, @@ -12,7 +6,7 @@ import { InputError, success, } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' +import type { Composable } from '../../index.ts' describe('collectSequence', () => { it('should compose domain functions keeping the given order of keys', async () => { @@ -23,7 +17,15 @@ describe('collectSequence', () => { const c = df.collectSequence({ a, b }) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { a: { id: number }; b: number } + > + > > assertEquals(await c({ id: 1 }), success({ a: { id: 3 }, b: 2 })) @@ -43,7 +45,15 @@ describe('collectSequence', () => { const c = df.collectSequence({ a, b }) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { a: { inp: number }; b: number } + > + > > assertEquals( @@ -67,7 +77,15 @@ describe('collectSequence', () => { const c = df.collectSequence({ a, b }) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { a: { inp: number }; b: number } + > + > > assertEquals( @@ -92,7 +110,15 @@ describe('collectSequence', () => { const c = df.collectSequence({ a, b }) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { a: { inp: number }; b: number } + > + > > assertEquals( @@ -115,7 +141,15 @@ describe('collectSequence', () => { const c = df.collectSequence({ a, b }) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { a: { inp: string }; b: number } + > + > > assertEquals( @@ -139,11 +173,16 @@ describe('collectSequence', () => { type _R = Expect< Equal< typeof d, - DomainFunction<{ - a: { aString: string } - b: { aBoolean: boolean } - c: boolean - }> + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { + a: { aString: string } + b: { aBoolean: boolean } + c: boolean + } + > > > diff --git a/src/df/tests/constructors.test.ts b/src/df/tests/constructors.test.ts index a3615b90..69e08de9 100644 --- a/src/df/tests/constructors.test.ts +++ b/src/df/tests/constructors.test.ts @@ -13,20 +13,30 @@ import { InputError, success, } from '../../index.ts' -import type { DomainFunction, Success } from '../../index.ts' +import type { Composable, Success } from '../../index.ts' describe('make', () => { describe('when it has no input', () => { it('uses zod parser to create parse the input and call the domain function', async () => { const handler = df.make()(() => 'no input!') - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => string> + > + > assertEquals(await handler(), success('no input!')) }) it('ignores the input and pass undefined', async () => { const handler = df.make()((args) => args) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => unknown> + > + > assertEquals(await handler('some input'), { success: true, @@ -41,14 +51,24 @@ describe('make', () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) const handler = df.make(parser)(({ id }) => id) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals(await handler({ id: '1' }), success(1)) }) it('fails gracefully if gets something other than empty record', async () => { const handler = df.make()(() => 'no input!') - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => string> + > + > assertEquals( await handler(undefined, ''), @@ -59,7 +79,12 @@ describe('make', () => { it('returns error when parsing fails', async () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) const handler = df.make(parser)(({ id }) => id) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals( await handler({ missingId: '1' }), @@ -77,7 +102,12 @@ describe('make', () => { envParser, )(({ id }, { uid }) => [id, uid] as const) type _R = Expect< - Equal> + Equal< + typeof handler, + Composable< + (input?: unknown, environment?: unknown) => readonly [number, number] + > + > > assertEquals(await handler({ id: '1' }, { uid: '2' }), success([1, 2])) @@ -97,7 +127,12 @@ describe('make', () => { }) const handler = df.make(parser, envParser)(({ id }, { uid }) => [id, uid]) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number[]> + > + > assertEquals( await handler({ id: '1' }, { uid: '2' }), @@ -110,7 +145,12 @@ describe('make', () => { it('accepts literals as input of domain functions', async () => { const handler = df.make(z.number(), z.string())((n) => n + 1) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > const result = await handler(1, 'not going to be used') assertEquals((result as Success).data, 2) @@ -118,7 +158,12 @@ describe('make', () => { it('accepts sync functions', async () => { const handler = df.make(z.number())((n) => n + 1) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > const result = await handler(1) assertEquals((result as Success).data, 2) @@ -129,7 +174,12 @@ describe('make', () => { const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) const handler = df.make(parser, envParser)(({ id }, { uid }) => [id, uid]) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number[]> + > + > assertEquals( await handler({ id: '1' }, {}), @@ -141,7 +191,12 @@ describe('make', () => { const handler = df.make(z.object({ id: z.number() }))(() => { throw new Error('Error') }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > const { errors: [err], @@ -153,7 +208,12 @@ describe('make', () => { const handler = df.make(z.object({ id: z.number() }))(() => { throw new Error('Some message', { cause: { someUnknownFields: true } }) }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > const { errors: [err], @@ -166,7 +226,12 @@ describe('make', () => { const handler = df.make(z.object({ id: z.number() }))(() => { throw 'Error' }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > assertEquals(await handler({ id: 1 }), failure([new Error()])) }) @@ -175,7 +240,12 @@ describe('make', () => { const handler = df.make(z.object({ id: z.number() }))(() => { throw { message: 'Error' } }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > const { errors: [err], @@ -188,7 +258,12 @@ describe('make', () => { const handler = df.make(z.object({ id: z.number() }))(() => { throw new InputError('Custom input error', ['contact', 'id']) }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > assertEquals( await handler({ id: 1 }), @@ -200,7 +275,12 @@ describe('make', () => { const handler = df.make(z.object({ id: z.number() }))(() => { throw new EnvironmentError('Custom env error', ['currentUser', 'role']) }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > assertEquals( await handler({ id: 1 }), @@ -217,7 +297,12 @@ describe('make', () => { new EnvironmentError('Custom env error', ['currentUser', 'role']), ]) }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > assertEquals( await handler({ id: 1 }), diff --git a/src/df/tests/pipe.test.ts b/src/df/tests/pipe.test.ts index 72f23998..9c59503c 100644 --- a/src/df/tests/pipe.test.ts +++ b/src/df/tests/pipe.test.ts @@ -6,7 +6,7 @@ import { InputError, success, } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' +import type { Composable } from '../../index.ts' describe('pipe', () => { it('should compose domain functions from left-to-right', async () => { @@ -16,7 +16,12 @@ describe('pipe', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.pipe(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals(await c({ id: 1 }), success(2)) }) @@ -34,7 +39,12 @@ describe('pipe', () => { )(({ inp }, { env }) => inp + env) const c = df.pipe(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals(await c(undefined, { env: 1 }), success(4)) }) @@ -53,7 +63,12 @@ describe('pipe', () => { )(({ inp }, { env }) => inp + env) const c = df.pipe(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals( await c(undefined, {}), @@ -76,7 +91,12 @@ describe('pipe', () => { )(({ inp }, { env }) => inp + env) const c = df.pipe(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), @@ -97,7 +117,12 @@ describe('pipe', () => { )(({ inp }, { env }) => inp + env) const c = df.pipe(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals( await c(undefined, { env: 1 }), @@ -117,7 +142,12 @@ describe('pipe', () => { ) const d = df.pipe(a, b, c) - type _R = Expect>> + type _R = Expect< + Equal< + typeof d, + Composable<(input?: unknown, environment?: unknown) => boolean> + > + > assertEquals(await d({ aNumber: 1 }), success(false)) }) diff --git a/src/df/tests/sequence.test.ts b/src/df/tests/sequence.test.ts index 93c44d05..ef8c1c31 100644 --- a/src/df/tests/sequence.test.ts +++ b/src/df/tests/sequence.test.ts @@ -6,7 +6,7 @@ import { InputError, success, } from '../../index.ts' -import type { DomainFunction } from '../../index.ts' +import type { Composable } from '../../index.ts' describe('sequence', () => { it('should compose domain functions from left-to-right saving the results sequentially', async () => { @@ -19,7 +19,15 @@ describe('sequence', () => { const c = df.sequence(a, b) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => [{ id: number }, { result: number }] + > + > > assertEquals( @@ -42,7 +50,15 @@ describe('sequence', () => { const c = df.sequence(a, b) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => [{ inp: number }, { result: number }] + > + > > assertEquals( @@ -68,7 +84,14 @@ describe('sequence', () => { )(({ inp }, { env }) => inp + env) const c = df.sequence(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => [{ inp: number }, number] + > + > + > assertEquals( await c(undefined, {}), @@ -91,7 +114,14 @@ describe('sequence', () => { )(({ inp }, { env }) => inp + env) const c = df.sequence(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => [{ inp: number }, number] + > + > + > assertEquals( await c({ inp: 'some invalid input' }, { env: 1 }), @@ -112,7 +142,14 @@ describe('sequence', () => { )(({ inp }, { env }) => inp + env) const c = df.sequence(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => [{ inp: string }, number] + > + > + > assertEquals( await c(undefined, { env: 1 }), @@ -135,8 +172,11 @@ describe('sequence', () => { type _R = Expect< Equal< typeof d, - DomainFunction< - [ + Composable< + ( + input?: unknown, + environment?: unknown, + ) => [ { aString: string }, { aBoolean: boolean }, { anotherBoolean: boolean }, diff --git a/src/df/types.ts b/src/df/types.ts index 0c5a3472..6d568e84 100644 --- a/src/df/types.ts +++ b/src/df/types.ts @@ -1,30 +1,22 @@ import { Composable } from '../types.ts' -/** - * A domain function. - * It carries the output type which can be further unpacked with UnpackData and other type helpers. - */ -type DomainFunction = Composable< - (input?: unknown, environment?: unknown) => Output -> - /** * Unpacks the result of a domain function. * @example - * type MyDF = DomainFunction<{ a: string }> + * type MyDF = Composable<(input?: unknown, environment?: unknown) => { a: string }> * type MyResult = UnpackResult * // ^? SuccessResult<{ a: string }> | ErrorResult */ -type UnpackResult = Awaited> +type UnpackResult = Awaited> /** * Unpacks the data type of a successful domain function. * @example - * type MyDF = DomainFunction<{ a: string }> + * type MyDF = Composable<(input?: unknown, environment?: unknown) => { a: string }> * type MyData = UnpackSuccess * // ^? SuccessResult<{ a: string }> */ -type UnpackSuccess = Extract< +type UnpackSuccess = Extract< UnpackResult, { success: true } > @@ -32,30 +24,30 @@ type UnpackSuccess = Extract< /** * Unpacks the data type of a successful domain function. * @example - * type MyDF = DomainFunction<{ a: string }> + * type MyDF = Composable<(input?: unknown, environment?: unknown) => { a: string }> * type MyData = UnpackData * // ^? { a: string } */ -type UnpackData = UnpackSuccess['data'] +type UnpackData = UnpackSuccess['data'] /** - * Unpacks a list of DomainFunctions into a tuple of their data types. + * Unpacks a list of Composable into a tuple of their data types. * @example * type MyDFs = [ - * DomainFunction<{ a: string }>, - * DomainFunction<{ b: number }>, + * Composable<(input?: unknown, environment?: unknown) => { a: string }>, + * Composable<(input?: unknown, environment?: unknown) => { b: number }>, * ] * type MyData = UnpackAll * // ^? [{ a: string }, { b: number }] */ type UnpackAll = List extends [ - DomainFunction, + Composable<(input?: unknown, environment?: unknown) => infer first>, ...infer rest, ] ? UnpackAll : output -type UnpackDFObject> = +type UnpackDFObject> = | { [K in keyof Obj]: UnpackData } | never @@ -86,7 +78,6 @@ type ParserSchema = { } export type { - DomainFunction, ParserIssue, ParserResult, ParserSchema, diff --git a/src/index.ts b/src/index.ts index 926c5269..358bb7b0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -35,7 +35,6 @@ export type { // DOMAIN FUNCTIONS export * as df from './df/index.ts' -export type { DomainFunction } from './df/index.ts' // COMPAT MODULE export * as compat from './compat/index.ts' diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts index ff6622dd..296d709e 100644 --- a/src/tests/all.test.ts +++ b/src/tests/all.test.ts @@ -10,7 +10,7 @@ import { composable, success, df, - DomainFunction, + Composable, InputError, failure, } from '../index.ts' @@ -42,7 +42,12 @@ describe('all', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) const c = all(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => [number, number]> + > + > assertEquals(await c({ id: 1 }), success<[number, number]>([2, 0])) }) @@ -52,7 +57,14 @@ describe('all', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) const d = all(a, b, c) - type _R = Expect>> + type _R = Expect< + Equal< + typeof d, + Composable< + (input?: unknown, environment?: unknown) => [string, number, boolean] + > + > + > const results = await d({ id: 1 }) assertEquals(results, success<[string, number, boolean]>(['1', 2, true])) @@ -63,7 +75,12 @@ describe('all', () => { const b = df.make(z.object({ id: z.string() }))(({ id }) => id) const c = all(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => [number, string]> + > + > assertEquals( await c({ id: 1 }), @@ -78,7 +95,12 @@ describe('all', () => { }) const c = all(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => [number, never]> + > + > assertEquals(await c({ id: 1 }), failure([new Error()])) }) @@ -88,7 +110,12 @@ describe('all', () => { const b = df.make(z.object({ id: z.string() }))(({ id }) => id) const c = all(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => [string, string]> + > + > assertEquals( await c({ id: 1 }), @@ -108,7 +135,12 @@ describe('all', () => { }) const c = all(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => [never, never]> + > + > const { errors: [errA, errB], diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 79ffb446..725fbdc1 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -5,7 +5,7 @@ import { it, z, } from '../test-prelude.ts' -import type { Result, Composable, DomainFunction } from '../index.ts' +import type { Result, Composable } from '../index.ts' import { collect, df, @@ -126,7 +126,14 @@ describe('collect', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) const c = collect({ a, b }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => { a: number; b: number } + > + > + > assertEquals(await c({ id: 1 }), success({ a: 2, b: 0 })) }) @@ -136,7 +143,14 @@ describe('collect', () => { const b = df.make(z.object({ id: z.string() }))(({ id }) => id) const c = collect({ a, b }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => { a: number; b: string } + > + > + > assertEquals( await c({ id: 1 }), @@ -151,7 +165,14 @@ describe('collect', () => { }) const c = collect({ a, b }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => { a: number; b: never } + > + > + > assertEquals(await c({ id: 1 }), failure([new Error()])) }) @@ -161,7 +182,14 @@ describe('collect', () => { const b = df.make(z.object({ id: z.string() }))(({ id }) => id) const c = collect({ a, b }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => { a: string; b: string } + > + > + > assertEquals( await c({ id: 1 }), @@ -181,7 +209,14 @@ describe('collect', () => { }) const c = collect({ a, b }) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable< + (input?: unknown, environment?: unknown) => { a: never; b: never } + > + > + > const { errors: [errA, errB], diff --git a/src/tests/first.test.ts b/src/tests/first.test.ts index 81606138..dffb2099 100644 --- a/src/tests/first.test.ts +++ b/src/tests/first.test.ts @@ -1,6 +1,6 @@ import { assertEquals, describe, it, z } from '../test-prelude.ts' import { df, first, failure, InputError, success } from '../index.ts' -import type { DomainFunction } from '../index.ts' +import type { Composable } from '../index.ts' describe('first', () => { it('should return the result of the first successful domain function', async () => { @@ -8,7 +8,14 @@ describe('first', () => { const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) const d = first(a, b, c) - type _R = Expect>> + type _R = Expect< + Equal< + typeof d, + Composable< + (input?: unknown, environment?: unknown) => string | number | boolean + > + > + > const results = await d({ id: 1 }) assertEquals(results, success('1')) @@ -23,7 +30,12 @@ describe('first', () => { )(({ n }) => n - 1) const c = first(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals(await c({ n: 1, operation: 'increment' }), success(2)) }) @@ -35,7 +47,12 @@ describe('first', () => { }) const c = first(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => string> + > + > assertEquals( await c({ id: 1 }), diff --git a/src/tests/merge.test.ts b/src/tests/merge.test.ts index bb1c54cb..bf25cfdc 100644 --- a/src/tests/merge.test.ts +++ b/src/tests/merge.test.ts @@ -6,7 +6,7 @@ import { z, } from '../test-prelude.ts' import { merge, df, failure, InputError, success } from '../index.ts' -import type { DomainFunction } from '../index.ts' +import type { Composable } from '../index.ts' describe('merge', () => { it('should combine two domain functions results into one object', async () => { @@ -19,7 +19,15 @@ describe('merge', () => { const c = merge(a, b) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { resultA: number; resultB: number } + > + > > assertEquals(await c({ id: 1 }), success({ resultA: 2, resultB: 0 })) @@ -41,11 +49,16 @@ describe('merge', () => { type _R = Expect< Equal< typeof d, - DomainFunction<{ - resultA: string - resultB: number - resultC: boolean - }> + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { + resultA: string + resultB: number + resultC: boolean + } + > > > @@ -61,13 +74,20 @@ describe('merge', () => { id, })) - const c: DomainFunction<{ id: string }> = merge(a, b) + const c: Composable< + (input?: unknown, environment?: unknown) => { id: string } + > = merge(a, b) type _R = Expect< Equal< typeof c, - DomainFunction<{ - id: string - }> + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { + id: string + } + > > > @@ -85,8 +105,14 @@ describe('merge', () => { throw 'Error' }) - const c: DomainFunction = merge(a, b) - type _R = Expect>> + const c: Composable<(input?: unknown, environment?: unknown) => never> = + merge(a, b) + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => never> + > + > assertEquals(await c({ id: 1 }), failure([new Error()])) }) @@ -101,7 +127,15 @@ describe('merge', () => { const c = merge(a, b) type _R = Expect< - Equal> + Equal< + typeof c, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => { resultA: string; resultB: string } + > + > > assertEquals( @@ -122,7 +156,12 @@ describe('merge', () => { }) const c = merge(a, b) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => never> + > + > const { errors: [errA, errB], diff --git a/src/tests/trace.test.ts b/src/tests/trace.test.ts index a85e9bd5..325822be 100644 --- a/src/tests/trace.test.ts +++ b/src/tests/trace.test.ts @@ -6,7 +6,7 @@ import { z, } from '../test-prelude.ts' import { composable, df, trace, fromSuccess, success } from '../index.ts' -import type { Composable, DomainFunction } from '../index.ts' +import type { Composable } from '../index.ts' describe('trace', () => { it('converts trace exceptions to df failures', async () => { @@ -50,7 +50,12 @@ describe('trace', () => { const c = trace((...context) => { contextFromFunctionA = context })(a) - type _R = Expect>> + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > assertEquals(await fromSuccess(c)({ id: 1 }), 2) assertEquals(contextFromFunctionA, [success(2), { id: 1 }]) From 85850126f2a1b63e0727c281438533688d67a7a5 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 15:58:00 -0300 Subject: [PATCH 089/238] Remove DF overload from fromSuccess --- src/constructors.ts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/constructors.ts b/src/constructors.ts index d0aade58..03e074a3 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -52,24 +52,18 @@ function composable(fn: T): Composable { * // ^? number * expect(data).toBe(n + 1) */ -type OnError = (errors: Error[]) => Error[] | Promise function fromSuccess O>>( fn: T, - onError?: OnError, -): T extends Composable<(...a: infer P) => infer O> - ? (...args: P) => Promise - : never -function fromSuccess< - O, - T extends Composable<(input?: unknown, environment?: unknown) => O>, ->(fn: T, onError?: OnError): (...args: Parameters) => Promise -function fromSuccess(fn: T, onError: OnError = (e) => e) { - return async (...args: any[]) => { + onError: (errors: Error[]) => Error[] | Promise = (e) => e, +) { + return (async (...args: any[]) => { const result = await mapError(fn, onError)(...args) if (result.success) return result.data throw new ErrorList(result.errors) - } + }) as T extends Composable<(...a: infer P) => infer O> + ? (...args: P) => Promise + : never } export { composable, failure, fromSuccess, success } From f1647cd1a25c05cfaadc1f97b83a0d0c63997f12 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 16:16:50 -0300 Subject: [PATCH 090/238] Interoperability achieved - not that type safe tho --- src/df/tests/branch.test.ts | 55 ++++++++++++++++++++++--------------- src/tests/collect.test.ts | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/df/tests/branch.test.ts b/src/df/tests/branch.test.ts index 83c8036a..47e13df0 100644 --- a/src/df/tests/branch.test.ts +++ b/src/df/tests/branch.test.ts @@ -5,7 +5,14 @@ import { it, z, } from '../../test-prelude.ts' -import { df, failure, InputError, success } from '../../index.ts' +import { + all, + composable, + df, + failure, + InputError, + success, +} from '../../index.ts' import { Composable } from '../../types.ts' describe('branch', () => { @@ -150,25 +157,29 @@ describe('branch', () => { assertIsError(err, Error, 'condition function failed') }) - // TODO: FIX THIS - // it('should not break composition with other combinators', async () => { - // const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ - // id: id + 2, - // })) - // const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) - // const c = df.make(z.number())((n) => n * 2) - // const d = all( - // df.pipe( - // df.branch(a, () => b), - // c, - // ), - // a, - // ) - // type _R = Expect [number, { id: number }]>>> - - // assertEquals( - // await d({ id: 1 }), - // success<[number, { id: number }]>([4, { id: 3 }]), - // ) - // }) + it('should not break composition with other combinators', async () => { + const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + id: id + 2, + })) + const b = composable(({ id }: { id: number }) => id - 1) + const c = composable((n: number) => n * 2) + const dfPipe = df.pipe( + df.branch(a, () => b), + c, + ) + const d = all(dfPipe, a) + type _R = Expect< + Equal< + typeof d, + Composable< + (input?: unknown, environment?: unknown) => [number, { id: number }] + > + > + > + + assertEquals( + await d({ id: 1 }), + success<[number, { id: number }]>([4, { id: 3 }]), + ) + }) }) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 725fbdc1..ad589d92 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -16,7 +16,7 @@ import { } from '../index.ts' const voidFn = composable(() => {}) -const toString = composable((a: unknown) => `${a}`) +const toString = df.make(z.unknown(), z.any())(String) const append = composable((a: string, b: string) => `${a}${b}`) const add = composable((a: number, b: number) => a + b) const faultyAdd = composable((a: number, b: number) => { From dbd2cdf14f76a4c814cf755513637f5545735a6f Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 16:38:15 -0300 Subject: [PATCH 091/238] Rename df.make -> withSchema - and - df.fromComposable -> applySchema --- examples/remix/app/business/colors.ts | 6 +- examples/remix/app/business/gpd.ts | 4 +- examples/remix/app/business/users.ts | 6 +- src/constructors.ts | 86 ++++++- src/df/combinators.ts | 19 +- src/df/constructors.ts | 102 -------- src/df/index.ts | 12 +- src/df/tests/branch.test.ts | 33 +-- src/df/tests/collect-sequence.test.ts | 27 +-- src/df/tests/constructors.test.ts | 315 +------------------------ src/df/tests/pipe.test.ts | 27 +-- src/df/tests/sequence.test.ts | 33 +-- src/df/tests/types.test.ts | 12 +- src/df/types.ts | 29 --- src/index.ts | 9 +- src/tests/all.test.ts | 28 +-- src/tests/catch-error.test.ts | 4 +- src/tests/collect.test.ts | 24 +- src/tests/constructors.test.ts | 323 +++++++++++++++++++++++++- src/tests/first.test.ts | 16 +- src/tests/merge.test.ts | 28 +-- src/tests/trace.test.ts | 12 +- src/types.ts | 29 +++ 23 files changed, 603 insertions(+), 581 deletions(-) delete mode 100644 src/df/constructors.ts diff --git a/examples/remix/app/business/colors.ts b/examples/remix/app/business/colors.ts index ea3e7d9c..21d5fb2c 100644 --- a/examples/remix/app/business/colors.ts +++ b/examples/remix/app/business/colors.ts @@ -12,19 +12,19 @@ const colorSchema = z.object({ pantone_value: z.string(), }) -const listColors = df.make(z.object({ page: z.string().optional() }))( +const listColors = withSchema(z.object({ page: z.string().optional() }))( async ({ page = '1' }) => { const response = await reqRes.get('/colors', { query: { page } }) return response.json(z.object({ data: z.array(colorSchema) })) }, ) -const getColor = df.make(z.object({ id: z.string() }))(async ({ id }) => { +const getColor = withSchema(z.object({ id: z.string() }))(async ({ id }) => { const response = await reqRes.get('/colors/:id', { params: { id } }) return response.json(z.object({ data: colorSchema })) }) -const mutateColor = df.make( +const mutateColor = withSchema( z.object({ id: z.string(), color: z.string().min(1, 'Color is required'), diff --git a/examples/remix/app/business/gpd.ts b/examples/remix/app/business/gpd.ts index b7c8fd67..7e19a7c2 100644 --- a/examples/remix/app/business/gpd.ts +++ b/examples/remix/app/business/gpd.ts @@ -6,7 +6,7 @@ const cookie = createCookie('gpd', { maxAge: 60, // One minute, but should probably be longer }) -const getGPDInfo = df.make( +const getGPDInfo = withSchema( z.any(), // The "environment" knows there can be cookie information in the Request z.object({ agreed: z.boolean().optional() }), @@ -14,7 +14,7 @@ const getGPDInfo = df.make( return { agreed } }) -const agreeToGPD = df.make( +const agreeToGPD = withSchema( // Agreeing to the GPD is user input z.object({ agree: z.preprocess((v) => v === 'true', z.boolean()) }), )(async ({ agree }) => ({ agreed: agree })) diff --git a/examples/remix/app/business/users.ts b/examples/remix/app/business/users.ts index 73a0f7d8..30f72409 100644 --- a/examples/remix/app/business/users.ts +++ b/examples/remix/app/business/users.ts @@ -15,17 +15,17 @@ const userSchema = z.object({ website: z.string(), }) -const listUsers = df.make(z.any())(async () => { +const listUsers = withSchema(z.any())(async () => { const response = await jsonPlaceholder.get('/users') return response.json(z.array(userSchema)) }) -const getUser = df.make(z.object({ id: z.string() }))(async ({ id }) => { +const getUser = withSchema(z.object({ id: z.string() }))(async ({ id }) => { const response = await jsonPlaceholder.get('/users/:id', { params: { id } }) return response.json(userSchema) }) -const formatUser = df.make(userSchema)((user) => { +const formatUser = withSchema(userSchema)((user) => { return { user: { ...user, diff --git a/src/constructors.ts b/src/constructors.ts index 03e074a3..67830ade 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -1,6 +1,6 @@ import { mapError } from './combinators.ts' -import { ErrorList } from './errors.ts' -import type { Composable, Failure, Fn, Success } from './types.ts' +import { EnvironmentError, ErrorList, InputError } from './errors.ts' +import type { Composable, Failure, Fn, ParserSchema, Success } from './types.ts' function success(data: T): Success { return { success: true, data, errors: [] } @@ -66,4 +66,84 @@ function fromSuccess O>>( : never } -export { composable, failure, fromSuccess, success } +/** + * Creates a domain function. + * After giving the input and environment schemas, you can pass a handler function that takes type safe input and environment. That function is gonna catch any errors and always return a Result. + * @param inputSchema the schema for the input + * @param environmentSchema the schema for the environment + * @returns a handler function that takes type safe input and environment + * @example + * const safeFunction = withSchema( + * z.object({ greeting: z.string() }), + * z.object({ user: z.object({ name: z.string() }) }), + * ) + * const myDf = safeFunction(({ greeting }, { user }) => { + * return { message: `${greeting} ${user.name}` } + * }) + */ +function withSchema( + inputSchema?: ParserSchema, + environmentSchema?: ParserSchema, +) { + return function (handler: (input: I, environment: E) => Output) { + return applySchema( + composable(handler), + inputSchema, + environmentSchema, + ) as Composable<(input?: unknown, environment?: unknown) => Awaited> + } +} + +function applySchema( + fn: A, + inputSchema?: ParserSchema, + environmentSchema?: ParserSchema, +) { + return async function (input, environment = {}) { + const envResult = await (environmentSchema ?? objectSchema).safeParseAsync( + environment, + ) + const result = await (inputSchema ?? alwaysUndefinedSchema).safeParseAsync( + input, + ) + + if (!result.success || !envResult.success) { + const inputErrors = result.success + ? [] + : result.error.issues.map( + (error) => new InputError(error.message, error.path as string[]), + ) + const envErrors = envResult.success + ? [] + : envResult.error.issues.map( + (error) => + new EnvironmentError(error.message, error.path as string[]), + ) + return failure([...inputErrors, ...envErrors]) + } + return fn(result.data, envResult.data) + } as Composable< + (input?: unknown, environment?: unknown) => Awaited> + > +} + +const objectSchema: ParserSchema> = { + safeParseAsync: (data: unknown) => { + if (Object.prototype.toString.call(data) !== '[object Object]') { + return Promise.resolve({ + success: false, + error: { issues: [{ path: [], message: 'Expected an object' }] }, + }) + } + const someRecord = data as Record + return Promise.resolve({ success: true, data: someRecord }) + }, +} + +const alwaysUndefinedSchema: ParserSchema = { + safeParseAsync: (_data: unknown) => { + return Promise.resolve({ success: true, data: undefined }) + }, +} + +export { composable, failure, fromSuccess, success, withSchema, applySchema } diff --git a/src/df/combinators.ts b/src/df/combinators.ts index 893edbe9..f04b9308 100644 --- a/src/df/combinators.ts +++ b/src/df/combinators.ts @@ -2,7 +2,22 @@ import type { Composable, Last, UnpackAll } from '../types.ts' import * as A from '../combinators.ts' import type { UnpackDFObject, UnpackData } from './types.ts' import { composable, fromSuccess } from '../constructors.ts' -import { applyEnvironment } from './constructors.ts' + +/** + * Takes a function with 2 parameters and partially applies the second one. + * This is useful when one wants to use a domain function having a fixed environment. + * @example + * import { mdf, applyEnvironment } from 'domain-functions' + * + * const endOfDay = mdf(z.date(), z.object({ timezone: z.string() }))((date, { timezone }) => ...) + * const endOfDayUTC = applyEnvironment(endOfDay, { timezone: 'UTC' }) + * // ^? (input: unknown) => Promise> + */ +function applyEnvironment< + Fn extends (input: unknown, environment: unknown) => unknown, +>(df: Fn, environment: unknown) { + return (input: unknown) => df(input, environment) as ReturnType +} function applyEnvironmentToList< Fns extends Array<(input: unknown, environment: unknown) => unknown>, @@ -125,4 +140,4 @@ function branch( > } -export { branch, collectSequence, pipe, sequence } +export { applyEnvironment, branch, collectSequence, pipe, sequence } diff --git a/src/df/constructors.ts b/src/df/constructors.ts deleted file mode 100644 index afe428b5..00000000 --- a/src/df/constructors.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { composable, failure } from '../constructors.ts' -import { EnvironmentError, InputError } from '../errors.ts' -import type { Composable } from '../types.ts' -import type { ParserSchema } from './types.ts' - -/** - * Creates a domain function. - * After giving the input and environment schemas, you can pass a handler function that takes type safe input and environment. That function is gonna catch any errors and always return a Result. - * @param inputSchema the schema for the input - * @param environmentSchema the schema for the environment - * @returns a handler function that takes type safe input and environment - * @example - * const safeFunction = df.make( - * z.object({ greeting: z.string() }), - * z.object({ user: z.object({ name: z.string() }) }), - * ) - * const myDf = safeFunction(({ greeting }, { user }) => { - * return { message: `${greeting} ${user.name}` } - * }) - */ -function make( - inputSchema?: ParserSchema, - environmentSchema?: ParserSchema, -) { - return function (handler: (input: I, environment: E) => Output) { - return fromComposable( - composable(handler), - inputSchema, - environmentSchema, - ) as Composable<(input?: unknown, environment?: unknown) => Awaited> - } -} - -function fromComposable( - fn: A, - inputSchema?: ParserSchema, - environmentSchema?: ParserSchema, -) { - return async function (input, environment = {}) { - const envResult = await (environmentSchema ?? objectSchema).safeParseAsync( - environment, - ) - const result = await (inputSchema ?? alwaysUndefinedSchema).safeParseAsync( - input, - ) - - if (!result.success || !envResult.success) { - const inputErrors = result.success - ? [] - : result.error.issues.map( - (error) => new InputError(error.message, error.path as string[]), - ) - const envErrors = envResult.success - ? [] - : envResult.error.issues.map( - (error) => - new EnvironmentError(error.message, error.path as string[]), - ) - return failure([...inputErrors, ...envErrors]) - } - return fn(result.data, envResult.data) - } as Composable< - (input?: unknown, environment?: unknown) => Awaited> - > -} - -const objectSchema: ParserSchema> = { - safeParseAsync: (data: unknown) => { - if (Object.prototype.toString.call(data) !== '[object Object]') { - return Promise.resolve({ - success: false, - error: { issues: [{ path: [], message: 'Expected an object' }] }, - }) - } - const someRecord = data as Record - return Promise.resolve({ success: true, data: someRecord }) - }, -} - -const alwaysUndefinedSchema: ParserSchema = { - safeParseAsync: (_data: unknown) => { - return Promise.resolve({ success: true, data: undefined }) - }, -} - -/** - * Takes a function with 2 parameters and partially applies the second one. - * This is useful when one wants to use a domain function having a fixed environment. - * @example - * import { mdf, applyEnvironment } from 'domain-functions' - * - * const endOfDay = mdf(z.date(), z.object({ timezone: z.string() }))((date, { timezone }) => ...) - * const endOfDayUTC = applyEnvironment(endOfDay, { timezone: 'UTC' }) - * // ^? (input: unknown) => Promise> - */ -function applyEnvironment< - Fn extends (input: unknown, environment: unknown) => unknown, ->(df: Fn, environment: unknown) { - return (input: unknown) => df(input, environment) as ReturnType -} - -export { applyEnvironment, make, fromComposable } diff --git a/src/df/index.ts b/src/df/index.ts index 2fc4b1fe..ebce5719 100644 --- a/src/df/index.ts +++ b/src/df/index.ts @@ -1,11 +1,13 @@ -export { applyEnvironment, make, fromComposable } from './constructors.ts' export type { - ParserIssue, - ParserResult, - ParserSchema, UnpackData, UnpackResult, UnpackDFObject, UnpackSuccess, } from './types.ts' -export { branch, collectSequence, pipe, sequence } from './combinators.ts' +export { + applyEnvironment, + branch, + collectSequence, + pipe, + sequence, +} from './combinators.ts' diff --git a/src/df/tests/branch.test.ts b/src/df/tests/branch.test.ts index 47e13df0..e840c47e 100644 --- a/src/df/tests/branch.test.ts +++ b/src/df/tests/branch.test.ts @@ -9,6 +9,7 @@ import { all, composable, df, + withSchema, failure, InputError, success, @@ -17,10 +18,10 @@ import { Composable } from '../../types.ts' describe('branch', () => { it('should pipe a domain function with a function that returns a DF', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.branch(a, () => Promise.resolve(b)) type _R = Expect< @@ -34,12 +35,12 @@ describe('branch', () => { }) it('should enable conditionally choosing the next DF with the output of first one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, next: 'multiply', })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) - const c = df.make(z.object({ id: z.number() }))(({ id }) => id * 2) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) + const c = withSchema(z.object({ id: z.number() }))(({ id }) => id * 2) const d = df.branch(a, (output) => (output.next === 'multiply' ? c : b)) type _R = Expect< Equal< @@ -52,11 +53,11 @@ describe('branch', () => { }) it('should not pipe if the predicate returns null', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, next: 'multiply', })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) const d = df.branch(a, (output) => (output.next === 'multiply' ? null : b)) type _R = Expect< Equal< @@ -74,13 +75,13 @@ describe('branch', () => { }) it('should use the same environment in all composed functions', async () => { - const a = df.make( + const a = withSchema( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -97,10 +98,10 @@ describe('branch', () => { }) it('should gracefully fail if the first function fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.branch(a, () => b) type _R = Expect< Equal< @@ -116,10 +117,10 @@ describe('branch', () => { }) it('should gracefully fail if the second function fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: String(id), })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.branch(a, () => b) type _R = Expect< Equal< @@ -135,10 +136,10 @@ describe('branch', () => { }) it('should gracefully fail if the condition function fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.branch(a, (_) => { throw new Error('condition function failed') // deno-lint-ignore no-unreachable @@ -158,7 +159,7 @@ describe('branch', () => { }) it('should not break composition with other combinators', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) const b = composable(({ id }: { id: number }) => id - 1) diff --git a/src/df/tests/collect-sequence.test.ts b/src/df/tests/collect-sequence.test.ts index 028665a8..b750f375 100644 --- a/src/df/tests/collect-sequence.test.ts +++ b/src/df/tests/collect-sequence.test.ts @@ -1,6 +1,7 @@ import { assertEquals, describe, it, z } from '../../test-prelude.ts' import { df, + withSchema, EnvironmentError, failure, InputError, @@ -10,10 +11,10 @@ import type { Composable } from '../../index.ts' describe('collectSequence', () => { it('should compose domain functions keeping the given order of keys', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.collectSequence({ a, b }) type _R = Expect< @@ -32,13 +33,13 @@ describe('collectSequence', () => { }) it('should use the same environment in all composed functions', async () => { - const a = df.make( + const a = withSchema( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -64,13 +65,13 @@ describe('collectSequence', () => { it('should fail on the first environment parser failure', async () => { const envParser = z.object({ env: z.number() }) - const a = df.make( + const a = withSchema( z.undefined(), envParser, )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), envParser, )(({ inp }, { env }) => inp + env) @@ -97,13 +98,13 @@ describe('collectSequence', () => { it('should fail on the first input parser failure', async () => { const firstInputParser = z.undefined() - const a = df.make( + const a = withSchema( firstInputParser, z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -128,13 +129,13 @@ describe('collectSequence', () => { }) it('should fail on the second input parser failure', async () => { - const a = df.make( + const a = withSchema( z.undefined(), z.object({ env: z.number() }), )(() => ({ inp: 'some invalid input', })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -159,13 +160,13 @@ describe('collectSequence', () => { }) it('should compose more than 2 functions', async () => { - const a = df.make(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ + const a = withSchema(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ aString: String(aNumber), })) - const b = df.make(z.object({ aString: z.string() }))(({ aString }) => ({ + const b = withSchema(z.object({ aString: z.string() }))(({ aString }) => ({ aBoolean: aString == '1', })) - const c = df.make(z.object({ aBoolean: z.boolean() }))( + const c = withSchema(z.object({ aBoolean: z.boolean() }))( ({ aBoolean }) => !aBoolean, ) diff --git a/src/df/tests/constructors.test.ts b/src/df/tests/constructors.test.ts index 69e08de9..cd832cf3 100644 --- a/src/df/tests/constructors.test.ts +++ b/src/df/tests/constructors.test.ts @@ -1,322 +1,15 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../../test-prelude.ts' +import { assertEquals, describe, it, z } from '../../test-prelude.ts' import { df, + withSchema, EnvironmentError, - ErrorList, failure, - InputError, success, } from '../../index.ts' -import type { Composable, Success } from '../../index.ts' - -describe('make', () => { - describe('when it has no input', () => { - it('uses zod parser to create parse the input and call the domain function', async () => { - const handler = df.make()(() => 'no input!') - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => string> - > - > - - assertEquals(await handler(), success('no input!')) - }) - - it('ignores the input and pass undefined', async () => { - const handler = df.make()((args) => args) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => unknown> - > - > - - assertEquals(await handler('some input'), { - success: true, - data: undefined, - errors: [], - }) - }) - }) - - describe('when it has no environment', () => { - it('uses zod parser to create parse the input and call the domain function', async () => { - const parser = z.object({ id: z.preprocess(Number, z.number()) }) - - const handler = df.make(parser)(({ id }) => id) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => number> - > - > - - assertEquals(await handler({ id: '1' }), success(1)) - }) - - it('fails gracefully if gets something other than empty record', async () => { - const handler = df.make()(() => 'no input!') - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => string> - > - > - - assertEquals( - await handler(undefined, ''), - failure([new EnvironmentError('Expected an object')]), - ) - }) - - it('returns error when parsing fails', async () => { - const parser = z.object({ id: z.preprocess(Number, z.number()) }) - const handler = df.make(parser)(({ id }) => id) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => number> - > - > - - assertEquals( - await handler({ missingId: '1' }), - failure([new InputError('Expected number, received nan', ['id'])]), - ) - }) - }) - - it('uses zod parsers to parse the input and environment and call the domain function', async () => { - const parser = z.object({ id: z.preprocess(Number, z.number()) }) - const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) - - const handler = df.make( - parser, - envParser, - )(({ id }, { uid }) => [id, uid] as const) - type _R = Expect< - Equal< - typeof handler, - Composable< - (input?: unknown, environment?: unknown) => readonly [number, number] - > - > - > - - assertEquals(await handler({ id: '1' }, { uid: '2' }), success([1, 2])) - }) - - it('applies async validations', async () => { - const parser = z.object({ - id: z - .preprocess(Number, z.number()) - .refine((value) => value !== 1, { message: 'ID already taken' }), - }) - - const envParser = z.object({ - uid: z - .preprocess(Number, z.number()) - .refine((value) => value !== 2, { message: 'UID already taken' }), - }) - - const handler = df.make(parser, envParser)(({ id }, { uid }) => [id, uid]) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => number[]> - > - > - - assertEquals( - await handler({ id: '1' }, { uid: '2' }), - failure([ - new InputError('ID already taken', ['id']), - new EnvironmentError('UID already taken', ['uid']), - ]), - ) - }) - - it('accepts literals as input of domain functions', async () => { - const handler = df.make(z.number(), z.string())((n) => n + 1) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => number> - > - > - - const result = await handler(1, 'not going to be used') - assertEquals((result as Success).data, 2) - }) - - it('accepts sync functions', async () => { - const handler = df.make(z.number())((n) => n + 1) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => number> - > - > - - const result = await handler(1) - assertEquals((result as Success).data, 2) - }) - - it('returns error when environment parsing fails', async () => { - const parser = z.object({ id: z.preprocess(Number, z.number()) }) - const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) - - const handler = df.make(parser, envParser)(({ id }, { uid }) => [id, uid]) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => number[]> - > - > - - assertEquals( - await handler({ id: '1' }, {}), - failure([new EnvironmentError('Expected number, received nan', ['uid'])]), - ) - }) - - it('returns error when the domain function throws an Error', async () => { - const handler = df.make(z.object({ id: z.number() }))(() => { - throw new Error('Error') - }) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => never> - > - > - - const { - errors: [err], - } = await handler({ id: 1 }) - assertIsError(err, Error, 'Error') - }) - - it('preserves entire original exception when the domain function throws an Error', async () => { - const handler = df.make(z.object({ id: z.number() }))(() => { - throw new Error('Some message', { cause: { someUnknownFields: true } }) - }) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => never> - > - > - - const { - errors: [err], - } = await handler({ id: 1 }) - assertIsError(err, Error, 'Some message') - assertEquals(err.cause, { someUnknownFields: true }) - }) - - it('returns error when the domain function throws a string', async () => { - const handler = df.make(z.object({ id: z.number() }))(() => { - throw 'Error' - }) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => never> - > - > - - assertEquals(await handler({ id: 1 }), failure([new Error()])) - }) - - it('returns error when the domain function throws an object with message', async () => { - const handler = df.make(z.object({ id: z.number() }))(() => { - throw { message: 'Error' } - }) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => never> - > - > - - const { - errors: [err], - } = await handler({ id: 1 }) - - assertIsError(err, Error, JSON.stringify({ message: 'Error' })) - }) - - it('returns inputErrors when the domain function throws an InputError', async () => { - const handler = df.make(z.object({ id: z.number() }))(() => { - throw new InputError('Custom input error', ['contact', 'id']) - }) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => never> - > - > - - assertEquals( - await handler({ id: 1 }), - failure([new InputError('Custom input error', ['contact', 'id'])]), - ) - }) - - it('returns environmentErrors when the domain function throws an EnvironmentError', async () => { - const handler = df.make(z.object({ id: z.number() }))(() => { - throw new EnvironmentError('Custom env error', ['currentUser', 'role']) - }) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => never> - > - > - - assertEquals( - await handler({ id: 1 }), - failure([ - new EnvironmentError('Custom env error', ['currentUser', 'role']), - ]), - ) - }) - - it('returns an error result when the domain function throws an ErrorList', async () => { - const handler = df.make(z.object({ id: z.number() }))(() => { - throw new ErrorList([ - new InputError('Custom input error', ['contact', 'id']), - new EnvironmentError('Custom env error', ['currentUser', 'role']), - ]) - }) - type _R = Expect< - Equal< - typeof handler, - Composable<(input?: unknown, environment?: unknown) => never> - > - > - - assertEquals( - await handler({ id: 1 }), - failure([ - new InputError('Custom input error', ['contact', 'id']), - new EnvironmentError('Custom env error', ['currentUser', 'role']), - ]), - ) - }) -}) describe('applyEnvironment', () => { it('fails when environment fails parser', async () => { - const getEnv = df.make(z.unknown(), z.number())((_, e) => e) + const getEnv = withSchema(z.unknown(), z.number())((_, e) => e) const getEnvWithEnvironment = df.applyEnvironment( getEnv, @@ -330,7 +23,7 @@ describe('applyEnvironment', () => { }) it('should apply environment', async () => { - const getEnv = df.make(z.unknown(), z.string())((_, e) => e) + const getEnv = withSchema(z.unknown(), z.string())((_, e) => e) const getEnvWithEnvironment = df.applyEnvironment( getEnv, diff --git a/src/df/tests/pipe.test.ts b/src/df/tests/pipe.test.ts index 9c59503c..26f940f3 100644 --- a/src/df/tests/pipe.test.ts +++ b/src/df/tests/pipe.test.ts @@ -5,15 +5,16 @@ import { failure, InputError, success, + withSchema, } from '../../index.ts' import type { Composable } from '../../index.ts' describe('pipe', () => { it('should compose domain functions from left-to-right', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = df.pipe(a, b) type _R = Expect< @@ -27,13 +28,13 @@ describe('pipe', () => { }) it('should use the same environment in all composed functions', async () => { - const a = df.make( + const a = withSchema( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -51,13 +52,13 @@ describe('pipe', () => { it('should fail on the first environment parser failure', async () => { const envParser = z.object({ env: z.number() }) - const a = df.make( + const a = withSchema( z.undefined(), envParser, )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), envParser, )(({ inp }, { env }) => inp + env) @@ -79,13 +80,13 @@ describe('pipe', () => { it('should fail on the first input parser failure', async () => { const firstInputParser = z.undefined() - const a = df.make( + const a = withSchema( firstInputParser, z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -105,13 +106,13 @@ describe('pipe', () => { }) it('should fail on the second input parser failure', async () => { - const a = df.make( + const a = withSchema( z.undefined(), z.object({ env: z.number() }), )(() => ({ inp: 'some invalid input', })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -131,13 +132,13 @@ describe('pipe', () => { }) it('should compose more than 2 functions', async () => { - const a = df.make(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ + const a = withSchema(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ aString: String(aNumber), })) - const b = df.make(z.object({ aString: z.string() }))(({ aString }) => ({ + const b = withSchema(z.object({ aString: z.string() }))(({ aString }) => ({ aBoolean: aString == '1', })) - const c = df.make(z.object({ aBoolean: z.boolean() }))( + const c = withSchema(z.object({ aBoolean: z.boolean() }))( ({ aBoolean }) => !aBoolean, ) diff --git a/src/df/tests/sequence.test.ts b/src/df/tests/sequence.test.ts index ef8c1c31..1e493d95 100644 --- a/src/df/tests/sequence.test.ts +++ b/src/df/tests/sequence.test.ts @@ -5,15 +5,16 @@ import { failure, InputError, success, + withSchema, } from '../../index.ts' import type { Composable } from '../../index.ts' describe('sequence', () => { it('should compose domain functions from left-to-right saving the results sequentially', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const b = withSchema(z.object({ id: z.number() }))(({ id }) => ({ result: id - 1, })) @@ -37,13 +38,13 @@ describe('sequence', () => { }) it('should use the same environment in all composed functions', async () => { - const a = df.make( + const a = withSchema( z.undefined(), z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => ({ result: inp + env })) @@ -72,13 +73,13 @@ describe('sequence', () => { it('should fail on the first environment parser failure', async () => { const envParser = z.object({ env: z.number() }) - const a = df.make( + const a = withSchema( z.undefined(), envParser, )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), envParser, )(({ inp }, { env }) => inp + env) @@ -102,13 +103,13 @@ describe('sequence', () => { it('should fail on the first input parser failure', async () => { const firstInputParser = z.undefined() - const a = df.make( + const a = withSchema( firstInputParser, z.object({ env: z.number() }), )((_input, { env }) => ({ inp: env + 2, })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -130,13 +131,13 @@ describe('sequence', () => { }) it('should fail on the second input parser failure', async () => { - const a = df.make( + const a = withSchema( z.undefined(), z.object({ env: z.number() }), )(() => ({ inp: 'some invalid input', })) - const b = df.make( + const b = withSchema( z.object({ inp: z.number() }), z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) @@ -158,15 +159,17 @@ describe('sequence', () => { }) it('should compose more than 2 functions', async () => { - const a = df.make(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ + const a = withSchema(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ aString: String(aNumber), })) - const b = df.make(z.object({ aString: z.string() }))(({ aString }) => ({ + const b = withSchema(z.object({ aString: z.string() }))(({ aString }) => ({ aBoolean: aString == '1', })) - const c = df.make(z.object({ aBoolean: z.boolean() }))(({ aBoolean }) => ({ - anotherBoolean: !aBoolean, - })) + const c = withSchema(z.object({ aBoolean: z.boolean() }))( + ({ aBoolean }) => ({ + anotherBoolean: !aBoolean, + }), + ) const d = df.sequence(a, b, c) type _R = Expect< diff --git a/src/df/tests/types.test.ts b/src/df/tests/types.test.ts index 2b65872a..4306ce6c 100644 --- a/src/df/tests/types.test.ts +++ b/src/df/tests/types.test.ts @@ -1,11 +1,11 @@ // deno-lint-ignore-file no-namespace ban-ts-comment import { assertEquals, describe, it } from '../../test-prelude.ts' import { Result, Success } from '../../types.ts' -import { make } from '../index.ts' +import { withSchema } from '../../index.ts' import * as Subject from '../types.ts' namespace UnpackData { - const result = make()(() => ({ name: 'foo' } as const)) + const result = withSchema()(() => ({ name: 'foo' } as const)) type test = Expect< Equal, { readonly name: 'foo' }> @@ -17,7 +17,7 @@ namespace UnpackData { } namespace UnpackResult { - const result = make()(() => ({ name: 'foo' })) + const result = withSchema()(() => ({ name: 'foo' })) type test = Expect< Equal, Result<{ name: string }>> @@ -25,7 +25,7 @@ namespace UnpackResult { } namespace UnpackSuccess { - const result = make()(() => ({ name: 'foo' })) + const result = withSchema()(() => ({ name: 'foo' })) type test = Expect< Equal, Success<{ name: string }>> @@ -33,8 +33,8 @@ namespace UnpackSuccess { } namespace UnpackAll { - const dfA = make()(() => ({ a: 1 } as const)) - const dfB = make()(() => ({ b: 2 } as const)) + const dfA = withSchema()(() => ({ a: 1 } as const)) + const dfB = withSchema()(() => ({ b: 2 } as const)) type Result = Subject.UnpackAll<[typeof dfA, typeof dfB]> diff --git a/src/df/types.ts b/src/df/types.ts index 6d568e84..c898ff66 100644 --- a/src/df/types.ts +++ b/src/df/types.ts @@ -51,36 +51,7 @@ type UnpackDFObject> = | { [K in keyof Obj]: UnpackData } | never -/** - * A parsing error when validating the input or environment schemas. - * This will be transformed into an `InputError` before being returned from the domain function. - * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. - */ -type ParserIssue = { path: PropertyKey[]; message: string } - -/** - * The result of input or environment validation. - * See the type `Result` for the return values of domain functions. - * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. - */ -type ParserResult = - | { - success: true - data: T - } - | { success: false; error: { issues: ParserIssue[] } } - -/** - * The object used to validate either input or environment when creating domain functions. - */ -type ParserSchema = { - safeParseAsync: (a: unknown) => Promise> -} - export type { - ParserIssue, - ParserResult, - ParserSchema, UnpackAll, UnpackData, UnpackDFObject, diff --git a/src/index.ts b/src/index.ts index 358bb7b0..3b6ea3ec 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,11 @@ -export { composable, failure, fromSuccess, success } from './constructors.ts' +export { + applySchema, + composable, + failure, + fromSuccess, + success, + withSchema, +} from './constructors.ts' export { all, catchError, diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts index 296d709e..b2f70a34 100644 --- a/src/tests/all.test.ts +++ b/src/tests/all.test.ts @@ -9,7 +9,7 @@ import { all, composable, success, - df, + withSchema, Composable, InputError, failure, @@ -38,8 +38,8 @@ describe('all', () => { }) it('should combine two domain functions into one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = all(a, b) type _R = Expect< @@ -53,9 +53,9 @@ describe('all', () => { }) it('should combine many domain functions into one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) + const c = withSchema(z.object({ id: z.number() }))(({ id }) => Boolean(id)) const d = all(a, b, c) type _R = Expect< Equal< @@ -71,8 +71,8 @@ describe('all', () => { }) it('should return error when one of the domain functions has input errors', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) + const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) const c = all(a, b) type _R = Expect< @@ -89,8 +89,8 @@ describe('all', () => { }) it('should return error when one of the domain functions fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.number() }))(() => { + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) + const b = withSchema(z.object({ id: z.number() }))(() => { throw 'Error' }) @@ -106,8 +106,8 @@ describe('all', () => { }) it('should combine the inputError messages of both functions', async () => { - const a = df.make(z.object({ id: z.string() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + const a = withSchema(z.object({ id: z.string() }))(({ id }) => id) + const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) const c = all(a, b) type _R = Expect< @@ -127,10 +127,10 @@ describe('all', () => { }) it('should combine the error messages when both functions fail', async () => { - const a = df.make(z.object({ id: z.number() }))(() => { + const a = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) - const b = df.make(z.object({ id: z.number() }))(() => { + const b = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) diff --git a/src/tests/catch-error.test.ts b/src/tests/catch-error.test.ts index cf0612f5..4871d8b0 100644 --- a/src/tests/catch-error.test.ts +++ b/src/tests/catch-error.test.ts @@ -1,8 +1,8 @@ import { assertEquals, describe, it, z } from '../test-prelude.ts' import type { Result, Composable } from '../index.ts' -import { catchError, composable, success, df } from '../index.ts' +import { catchError, composable, success, withSchema } from '../index.ts' -const dfFaultyAdd = df.make( +const dfFaultyAdd = withSchema( z.number(), z.number(), )((a: number, b: number) => { diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index ad589d92..d7e10455 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -8,7 +8,7 @@ import { import type { Result, Composable } from '../index.ts' import { collect, - df, + withSchema, failure, InputError, composable, @@ -16,7 +16,7 @@ import { } from '../index.ts' const voidFn = composable(() => {}) -const toString = df.make(z.unknown(), z.any())(String) +const toString = withSchema(z.unknown(), z.any())(String) const append = composable((a: string, b: string) => `${a}${b}`) const add = composable((a: number, b: number) => a + b) const faultyAdd = composable((a: number, b: number) => { @@ -122,8 +122,8 @@ describe('collect', () => { }) it('should combine an object of domain functions', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id - 1) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = collect({ a, b }) type _R = Expect< @@ -139,8 +139,8 @@ describe('collect', () => { }) it('should return error when one of the domain functions has input errors', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) + const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) const c = collect({ a, b }) type _R = Expect< @@ -159,8 +159,8 @@ describe('collect', () => { }) it('should return error when one of the domain functions fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id) - const b = df.make(z.object({ id: z.number() }))(() => { + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) + const b = withSchema(z.object({ id: z.number() }))(() => { throw 'Error' }) @@ -178,8 +178,8 @@ describe('collect', () => { }) it('should combine the inputError messages of both functions', async () => { - const a = df.make(z.object({ id: z.string() }))(({ id }) => id) - const b = df.make(z.object({ id: z.string() }))(({ id }) => id) + const a = withSchema(z.object({ id: z.string() }))(({ id }) => id) + const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) const c = collect({ a, b }) type _R = Expect< @@ -201,10 +201,10 @@ describe('collect', () => { }) it('should combine the error messages when both functions fail', async () => { - const a = df.make(z.object({ id: z.number() }))(() => { + const a = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) - const b = df.make(z.object({ id: z.number() }))(() => { + const b = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) diff --git a/src/tests/constructors.test.ts b/src/tests/constructors.test.ts index 4d97b460..84cf25d6 100644 --- a/src/tests/constructors.test.ts +++ b/src/tests/constructors.test.ts @@ -1,12 +1,22 @@ import { assertEquals, + assertIsError, assertRejects, describe, it, z, } from '../test-prelude.ts' -import type { Result, Composable } from '../index.ts' -import { composable, success, fromSuccess, df, ErrorList } from '../index.ts' +import type { Result, Composable, Success } from '../index.ts' +import { + composable, + success, + fromSuccess, + ErrorList, + EnvironmentError, + failure, + InputError, + withSchema, +} from '../index.ts' const add = composable((a: number, b: number) => a + b) const asyncAdd = (a: number, b: number) => Promise.resolve(a + b) @@ -66,7 +76,7 @@ describe('composable', () => { describe('fromSuccess', () => { it('returns the result.data when the domain function suceeds', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) const c = fromSuccess(a) type _R = Expect< @@ -80,7 +90,7 @@ describe('fromSuccess', () => { }) it('throws an exception when the domain function fails', () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) const c = fromSuccess(a) type _R = Expect< @@ -119,3 +129,308 @@ describe('fromSuccess', () => { }, ErrorList) }) }) + +describe('make', () => { + describe('when it has no input', () => { + it('uses zod parser to create parse the input and call the domain function', async () => { + const handler = withSchema()(() => 'no input!') + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => string> + > + > + + assertEquals(await handler(), success('no input!')) + }) + + it('ignores the input and pass undefined', async () => { + const handler = withSchema()((args) => args) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => unknown> + > + > + + assertEquals(await handler('some input'), { + success: true, + data: undefined, + errors: [], + }) + }) + }) + + describe('when it has no environment', () => { + it('uses zod parser to create parse the input and call the domain function', async () => { + const parser = z.object({ id: z.preprocess(Number, z.number()) }) + + const handler = withSchema(parser)(({ id }) => id) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + assertEquals(await handler({ id: '1' }), success(1)) + }) + + it('fails gracefully if gets something other than empty record', async () => { + const handler = withSchema()(() => 'no input!') + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => string> + > + > + + assertEquals( + await handler(undefined, ''), + failure([new EnvironmentError('Expected an object')]), + ) + }) + + it('returns error when parsing fails', async () => { + const parser = z.object({ id: z.preprocess(Number, z.number()) }) + const handler = withSchema(parser)(({ id }) => id) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + assertEquals( + await handler({ missingId: '1' }), + failure([new InputError('Expected number, received nan', ['id'])]), + ) + }) + }) + + it('uses zod parsers to parse the input and environment and call the domain function', async () => { + const parser = z.object({ id: z.preprocess(Number, z.number()) }) + const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) + + const handler = withSchema( + parser, + envParser, + )(({ id }, { uid }) => [id, uid] as const) + type _R = Expect< + Equal< + typeof handler, + Composable< + (input?: unknown, environment?: unknown) => readonly [number, number] + > + > + > + + assertEquals(await handler({ id: '1' }, { uid: '2' }), success([1, 2])) + }) + + it('applies async validations', async () => { + const parser = z.object({ + id: z + .preprocess(Number, z.number()) + .refine((value) => value !== 1, { message: 'ID already taken' }), + }) + + const envParser = z.object({ + uid: z + .preprocess(Number, z.number()) + .refine((value) => value !== 2, { message: 'UID already taken' }), + }) + + const handler = withSchema( + parser, + envParser, + )(({ id }, { uid }) => [id, uid]) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number[]> + > + > + + assertEquals( + await handler({ id: '1' }, { uid: '2' }), + failure([ + new InputError('ID already taken', ['id']), + new EnvironmentError('UID already taken', ['uid']), + ]), + ) + }) + + it('accepts literals as input of domain functions', async () => { + const handler = withSchema(z.number(), z.string())((n) => n + 1) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + const result = await handler(1, 'not going to be used') + assertEquals((result as Success).data, 2) + }) + + it('accepts sync functions', async () => { + const handler = withSchema(z.number())((n) => n + 1) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + const result = await handler(1) + assertEquals((result as Success).data, 2) + }) + + it('returns error when environment parsing fails', async () => { + const parser = z.object({ id: z.preprocess(Number, z.number()) }) + const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) + + const handler = withSchema( + parser, + envParser, + )(({ id }, { uid }) => [id, uid]) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => number[]> + > + > + + assertEquals( + await handler({ id: '1' }, {}), + failure([new EnvironmentError('Expected number, received nan', ['uid'])]), + ) + }) + + it('returns error when the domain function throws an Error', async () => { + const handler = withSchema(z.object({ id: z.number() }))(() => { + throw new Error('Error') + }) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > + + const { + errors: [err], + } = await handler({ id: 1 }) + assertIsError(err, Error, 'Error') + }) + + it('preserves entire original exception when the domain function throws an Error', async () => { + const handler = withSchema(z.object({ id: z.number() }))(() => { + throw new Error('Some message', { cause: { someUnknownFields: true } }) + }) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > + + const { + errors: [err], + } = await handler({ id: 1 }) + assertIsError(err, Error, 'Some message') + assertEquals(err.cause, { someUnknownFields: true }) + }) + + it('returns error when the domain function throws a string', async () => { + const handler = withSchema(z.object({ id: z.number() }))(() => { + throw 'Error' + }) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > + + assertEquals(await handler({ id: 1 }), failure([new Error()])) + }) + + it('returns error when the domain function throws an object with message', async () => { + const handler = withSchema(z.object({ id: z.number() }))(() => { + throw { message: 'Error' } + }) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > + + const { + errors: [err], + } = await handler({ id: 1 }) + + assertIsError(err, Error, JSON.stringify({ message: 'Error' })) + }) + + it('returns inputErrors when the domain function throws an InputError', async () => { + const handler = withSchema(z.object({ id: z.number() }))(() => { + throw new InputError('Custom input error', ['contact', 'id']) + }) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > + + assertEquals( + await handler({ id: 1 }), + failure([new InputError('Custom input error', ['contact', 'id'])]), + ) + }) + + it('returns environmentErrors when the domain function throws an EnvironmentError', async () => { + const handler = withSchema(z.object({ id: z.number() }))(() => { + throw new EnvironmentError('Custom env error', ['currentUser', 'role']) + }) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > + + assertEquals( + await handler({ id: 1 }), + failure([ + new EnvironmentError('Custom env error', ['currentUser', 'role']), + ]), + ) + }) + + it('returns an error result when the domain function throws an ErrorList', async () => { + const handler = withSchema(z.object({ id: z.number() }))(() => { + throw new ErrorList([ + new InputError('Custom input error', ['contact', 'id']), + new EnvironmentError('Custom env error', ['currentUser', 'role']), + ]) + }) + type _R = Expect< + Equal< + typeof handler, + Composable<(input?: unknown, environment?: unknown) => never> + > + > + + assertEquals( + await handler({ id: 1 }), + failure([ + new InputError('Custom input error', ['contact', 'id']), + new EnvironmentError('Custom env error', ['currentUser', 'role']), + ]), + ) + }) +}) diff --git a/src/tests/first.test.ts b/src/tests/first.test.ts index dffb2099..f16f1374 100644 --- a/src/tests/first.test.ts +++ b/src/tests/first.test.ts @@ -1,12 +1,12 @@ import { assertEquals, describe, it, z } from '../test-prelude.ts' -import { df, first, failure, InputError, success } from '../index.ts' +import { withSchema, first, failure, InputError, success } from '../index.ts' import type { Composable } from '../index.ts' describe('first', () => { it('should return the result of the first successful domain function', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => String(id)) - const b = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = df.make(z.object({ id: z.number() }))(({ id }) => Boolean(id)) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) + const c = withSchema(z.object({ id: z.number() }))(({ id }) => Boolean(id)) const d = first(a, b, c) type _R = Expect< Equal< @@ -22,10 +22,10 @@ describe('first', () => { }) it('should return a successful result even if one of the domain functions fails', async () => { - const a = df.make( + const a = withSchema( z.object({ n: z.number(), operation: z.literal('increment') }), )(({ n }) => n + 1) - const b = df.make( + const b = withSchema( z.object({ n: z.number(), operation: z.literal('decrement') }), )(({ n }) => n - 1) @@ -41,8 +41,8 @@ describe('first', () => { }) it('should return error when all of the domain functions fails', async () => { - const a = df.make(z.object({ id: z.string() }))(({ id }) => id) - const b = df.make(z.object({ id: z.number() }))(() => { + const a = withSchema(z.object({ id: z.string() }))(({ id }) => id) + const b = withSchema(z.object({ id: z.number() }))(() => { throw 'Error' }) diff --git a/src/tests/merge.test.ts b/src/tests/merge.test.ts index bf25cfdc..1d8f97ef 100644 --- a/src/tests/merge.test.ts +++ b/src/tests/merge.test.ts @@ -5,15 +5,15 @@ import { it, z, } from '../test-prelude.ts' -import { merge, df, failure, InputError, success } from '../index.ts' +import { merge, withSchema, failure, InputError, success } from '../index.ts' import type { Composable } from '../index.ts' describe('merge', () => { it('should combine two domain functions results into one object', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ resultA: id + 1, })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const b = withSchema(z.object({ id: z.number() }))(({ id }) => ({ resultB: id - 1, })) @@ -34,15 +34,15 @@ describe('merge', () => { }) it('should combine many domain functions into one', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ resultA: String(id), resultB: String(id), resultC: String(id), })) - const b = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const b = withSchema(z.object({ id: z.number() }))(({ id }) => ({ resultB: id + 1, })) - const c = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const c = withSchema(z.object({ id: z.number() }))(({ id }) => ({ resultC: Boolean(id), })) const d = merge(a, b, c) @@ -67,10 +67,10 @@ describe('merge', () => { }) it('should return error when one of the domain functions has input errors', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id, })) - const b = df.make(z.object({ id: z.string() }))(({ id }) => ({ + const b = withSchema(z.object({ id: z.string() }))(({ id }) => ({ id, })) @@ -98,10 +98,10 @@ describe('merge', () => { }) it('should return error when one of the domain functions fails', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id, })) - const b = df.make(z.object({ id: z.number() }))(() => { + const b = withSchema(z.object({ id: z.number() }))(() => { throw 'Error' }) @@ -118,10 +118,10 @@ describe('merge', () => { }) it('should combine the inputError messages of both functions', async () => { - const a = df.make(z.object({ id: z.string() }))(({ id }) => ({ + const a = withSchema(z.object({ id: z.string() }))(({ id }) => ({ resultA: id, })) - const b = df.make(z.object({ id: z.string() }))(({ id }) => ({ + const b = withSchema(z.object({ id: z.string() }))(({ id }) => ({ resultB: id, })) @@ -148,10 +148,10 @@ describe('merge', () => { }) it('should combine the error messages when both functions fail', async () => { - const a = df.make(z.object({ id: z.number() }))(() => { + const a = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) - const b = df.make(z.object({ id: z.number() }))(() => { + const b = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) diff --git a/src/tests/trace.test.ts b/src/tests/trace.test.ts index 325822be..ba176026 100644 --- a/src/tests/trace.test.ts +++ b/src/tests/trace.test.ts @@ -5,12 +5,18 @@ import { it, z, } from '../test-prelude.ts' -import { composable, df, trace, fromSuccess, success } from '../index.ts' +import { + composable, + withSchema, + trace, + fromSuccess, + success, +} from '../index.ts' import type { Composable } from '../index.ts' describe('trace', () => { it('converts trace exceptions to df failures', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) const c = trace(() => { throw new Error('Problem in tracing') @@ -43,7 +49,7 @@ describe('trace', () => { }) it('intercepts inputs and outputs of a given domain function', async () => { - const a = df.make(z.object({ id: z.number() }))(({ id }) => id + 1) + const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) let contextFromFunctionA: unknown[] = [] diff --git a/src/types.ts b/src/types.ts index f48fd854..45ed19e1 100644 --- a/src/types.ts +++ b/src/types.ts @@ -135,6 +135,32 @@ type SerializedResult = | Success | { success: false; errors: SerializableError[] } +/** + * A parsing error when validating the input or environment schemas. + * This will be transformed into an `InputError` before being returned from the domain function. + * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. + */ +type ParserIssue = { path: PropertyKey[]; message: string } + +/** + * The result of input or environment validation. + * See the type `Result` for the return values of domain functions. + * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. + */ +type ParserResult = + | { + success: true + data: T + } + | { success: false; error: { issues: ParserIssue[] } } + +/** + * The object used to validate either input or environment when creating domain functions. + */ +type ParserSchema = { + safeParseAsync: (a: unknown) => Promise> +} + export type { AllArguments, CollectArguments, @@ -144,6 +170,9 @@ export type { Fn, Last, MergeObjs, + ParserIssue, + ParserResult, + ParserSchema, PipeArguments, PipeReturn, RecordToTuple, From 4d44f8245a3aebd4e0b575031f06b1dcfc365de5 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 16:41:45 -0300 Subject: [PATCH 092/238] Rename df module to environment --- src/{df => environment}/combinators.ts | 0 src/{df => environment}/index.ts | 0 .../tests/apply-environment.test.ts} | 8 +++---- src/{df => environment}/tests/branch.test.ts | 24 +++++++++++-------- .../tests/collect-sequence.test.ts | 14 +++++------ src/{df => environment}/tests/pipe.test.ts | 14 +++++------ .../tests/sequence.test.ts | 14 +++++------ src/{df => environment}/tests/types.test.ts | 0 src/{df => environment}/types.ts | 0 src/index.ts | 4 ++-- 10 files changed, 41 insertions(+), 37 deletions(-) rename src/{df => environment}/combinators.ts (100%) rename src/{df => environment}/index.ts (100%) rename src/{df/tests/constructors.test.ts => environment/tests/apply-environment.test.ts} (85%) rename src/{df => environment}/tests/branch.test.ts (89%) rename src/{df => environment}/tests/collect-sequence.test.ts (93%) rename src/{df => environment}/tests/pipe.test.ts (94%) rename src/{df => environment}/tests/sequence.test.ts (94%) rename src/{df => environment}/tests/types.test.ts (100%) rename src/{df => environment}/types.ts (100%) diff --git a/src/df/combinators.ts b/src/environment/combinators.ts similarity index 100% rename from src/df/combinators.ts rename to src/environment/combinators.ts diff --git a/src/df/index.ts b/src/environment/index.ts similarity index 100% rename from src/df/index.ts rename to src/environment/index.ts diff --git a/src/df/tests/constructors.test.ts b/src/environment/tests/apply-environment.test.ts similarity index 85% rename from src/df/tests/constructors.test.ts rename to src/environment/tests/apply-environment.test.ts index cd832cf3..592dfa46 100644 --- a/src/df/tests/constructors.test.ts +++ b/src/environment/tests/apply-environment.test.ts @@ -1,17 +1,17 @@ import { assertEquals, describe, it, z } from '../../test-prelude.ts' import { - df, - withSchema, + environment, EnvironmentError, failure, success, + withSchema, } from '../../index.ts' describe('applyEnvironment', () => { it('fails when environment fails parser', async () => { const getEnv = withSchema(z.unknown(), z.number())((_, e) => e) - const getEnvWithEnvironment = df.applyEnvironment( + const getEnvWithEnvironment = environment.applyEnvironment( getEnv, 'invalid environment', ) @@ -25,7 +25,7 @@ describe('applyEnvironment', () => { it('should apply environment', async () => { const getEnv = withSchema(z.unknown(), z.string())((_, e) => e) - const getEnvWithEnvironment = df.applyEnvironment( + const getEnvWithEnvironment = environment.applyEnvironment( getEnv, 'constant environment', ) diff --git a/src/df/tests/branch.test.ts b/src/environment/tests/branch.test.ts similarity index 89% rename from src/df/tests/branch.test.ts rename to src/environment/tests/branch.test.ts index e840c47e..60fc1bfb 100644 --- a/src/df/tests/branch.test.ts +++ b/src/environment/tests/branch.test.ts @@ -8,7 +8,7 @@ import { import { all, composable, - df, + environment, withSchema, failure, InputError, @@ -23,7 +23,7 @@ describe('branch', () => { })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = df.branch(a, () => Promise.resolve(b)) + const c = environment.branch(a, () => Promise.resolve(b)) type _R = Expect< Equal< typeof c, @@ -41,7 +41,9 @@ describe('branch', () => { })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) const c = withSchema(z.object({ id: z.number() }))(({ id }) => id * 2) - const d = df.branch(a, (output) => (output.next === 'multiply' ? c : b)) + const d = environment.branch(a, (output) => + output.next === 'multiply' ? c : b, + ) type _R = Expect< Equal< typeof d, @@ -58,7 +60,9 @@ describe('branch', () => { next: 'multiply', })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) - const d = df.branch(a, (output) => (output.next === 'multiply' ? null : b)) + const d = environment.branch(a, (output) => + output.next === 'multiply' ? null : b, + ) type _R = Expect< Equal< typeof d, @@ -86,7 +90,7 @@ describe('branch', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.branch(a, () => b) + const c = environment.branch(a, () => b) type _R = Expect< Equal< typeof c, @@ -102,7 +106,7 @@ describe('branch', () => { id: id + 2, })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = df.branch(a, () => b) + const c = environment.branch(a, () => b) type _R = Expect< Equal< typeof c, @@ -121,7 +125,7 @@ describe('branch', () => { id: String(id), })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = df.branch(a, () => b) + const c = environment.branch(a, () => b) type _R = Expect< Equal< typeof c, @@ -140,7 +144,7 @@ describe('branch', () => { id: id + 2, })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = df.branch(a, (_) => { + const c = environment.branch(a, (_) => { throw new Error('condition function failed') // deno-lint-ignore no-unreachable return b @@ -164,8 +168,8 @@ describe('branch', () => { })) const b = composable(({ id }: { id: number }) => id - 1) const c = composable((n: number) => n * 2) - const dfPipe = df.pipe( - df.branch(a, () => b), + const dfPipe = environment.pipe( + environment.branch(a, () => b), c, ) const d = all(dfPipe, a) diff --git a/src/df/tests/collect-sequence.test.ts b/src/environment/tests/collect-sequence.test.ts similarity index 93% rename from src/df/tests/collect-sequence.test.ts rename to src/environment/tests/collect-sequence.test.ts index b750f375..cc5c7673 100644 --- a/src/df/tests/collect-sequence.test.ts +++ b/src/environment/tests/collect-sequence.test.ts @@ -1,6 +1,6 @@ import { assertEquals, describe, it, z } from '../../test-prelude.ts' import { - df, + environment, withSchema, EnvironmentError, failure, @@ -16,7 +16,7 @@ describe('collectSequence', () => { })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = df.collectSequence({ a, b }) + const c = environment.collectSequence({ a, b }) type _R = Expect< Equal< typeof c, @@ -44,7 +44,7 @@ describe('collectSequence', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.collectSequence({ a, b }) + const c = environment.collectSequence({ a, b }) type _R = Expect< Equal< typeof c, @@ -76,7 +76,7 @@ describe('collectSequence', () => { envParser, )(({ inp }, { env }) => inp + env) - const c = df.collectSequence({ a, b }) + const c = environment.collectSequence({ a, b }) type _R = Expect< Equal< typeof c, @@ -109,7 +109,7 @@ describe('collectSequence', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.collectSequence({ a, b }) + const c = environment.collectSequence({ a, b }) type _R = Expect< Equal< typeof c, @@ -140,7 +140,7 @@ describe('collectSequence', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.collectSequence({ a, b }) + const c = environment.collectSequence({ a, b }) type _R = Expect< Equal< typeof c, @@ -170,7 +170,7 @@ describe('collectSequence', () => { ({ aBoolean }) => !aBoolean, ) - const d = df.collectSequence({ a, b, c }) + const d = environment.collectSequence({ a, b, c }) type _R = Expect< Equal< typeof d, diff --git a/src/df/tests/pipe.test.ts b/src/environment/tests/pipe.test.ts similarity index 94% rename from src/df/tests/pipe.test.ts rename to src/environment/tests/pipe.test.ts index 26f940f3..1fdf8f15 100644 --- a/src/df/tests/pipe.test.ts +++ b/src/environment/tests/pipe.test.ts @@ -1,6 +1,6 @@ import { assertEquals, describe, it, z } from '../../test-prelude.ts' import { - df, + environment, EnvironmentError, failure, InputError, @@ -16,7 +16,7 @@ describe('pipe', () => { })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = df.pipe(a, b) + const c = environment.pipe(a, b) type _R = Expect< Equal< typeof c, @@ -39,7 +39,7 @@ describe('pipe', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.pipe(a, b) + const c = environment.pipe(a, b) type _R = Expect< Equal< typeof c, @@ -63,7 +63,7 @@ describe('pipe', () => { envParser, )(({ inp }, { env }) => inp + env) - const c = df.pipe(a, b) + const c = environment.pipe(a, b) type _R = Expect< Equal< typeof c, @@ -91,7 +91,7 @@ describe('pipe', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.pipe(a, b) + const c = environment.pipe(a, b) type _R = Expect< Equal< typeof c, @@ -117,7 +117,7 @@ describe('pipe', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.pipe(a, b) + const c = environment.pipe(a, b) type _R = Expect< Equal< typeof c, @@ -142,7 +142,7 @@ describe('pipe', () => { ({ aBoolean }) => !aBoolean, ) - const d = df.pipe(a, b, c) + const d = environment.pipe(a, b, c) type _R = Expect< Equal< typeof d, diff --git a/src/df/tests/sequence.test.ts b/src/environment/tests/sequence.test.ts similarity index 94% rename from src/df/tests/sequence.test.ts rename to src/environment/tests/sequence.test.ts index 1e493d95..b877229b 100644 --- a/src/df/tests/sequence.test.ts +++ b/src/environment/tests/sequence.test.ts @@ -1,6 +1,6 @@ import { assertEquals, describe, it, z } from '../../test-prelude.ts' import { - df, + environment, EnvironmentError, failure, InputError, @@ -18,7 +18,7 @@ describe('sequence', () => { result: id - 1, })) - const c = df.sequence(a, b) + const c = environment.sequence(a, b) type _R = Expect< Equal< typeof c, @@ -49,7 +49,7 @@ describe('sequence', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => ({ result: inp + env })) - const c = df.sequence(a, b) + const c = environment.sequence(a, b) type _R = Expect< Equal< typeof c, @@ -84,7 +84,7 @@ describe('sequence', () => { envParser, )(({ inp }, { env }) => inp + env) - const c = df.sequence(a, b) + const c = environment.sequence(a, b) type _R = Expect< Equal< typeof c, @@ -114,7 +114,7 @@ describe('sequence', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.sequence(a, b) + const c = environment.sequence(a, b) type _R = Expect< Equal< typeof c, @@ -142,7 +142,7 @@ describe('sequence', () => { z.object({ env: z.number() }), )(({ inp }, { env }) => inp + env) - const c = df.sequence(a, b) + const c = environment.sequence(a, b) type _R = Expect< Equal< typeof c, @@ -171,7 +171,7 @@ describe('sequence', () => { }), ) - const d = df.sequence(a, b, c) + const d = environment.sequence(a, b, c) type _R = Expect< Equal< typeof d, diff --git a/src/df/tests/types.test.ts b/src/environment/tests/types.test.ts similarity index 100% rename from src/df/tests/types.test.ts rename to src/environment/tests/types.test.ts diff --git a/src/df/types.ts b/src/environment/types.ts similarity index 100% rename from src/df/types.ts rename to src/environment/types.ts diff --git a/src/index.ts b/src/index.ts index 3b6ea3ec..01ca69f0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -40,8 +40,8 @@ export type { UnpackData, } from './types.ts' -// DOMAIN FUNCTIONS -export * as df from './df/index.ts' +// FUNCTIONS WITH ENVIRONMENT +export * as environment from './environment/index.ts' // COMPAT MODULE export * as compat from './compat/index.ts' From e61d03706d43408975079bc370fc7abc95d88c1d Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 16:51:15 -0300 Subject: [PATCH 093/238] Unify UnpackData --- src/combinators.ts | 18 ++++++------- src/environment/combinators.ts | 4 +-- src/environment/index.ts | 7 +---- src/environment/tests/types.test.ts | 31 +--------------------- src/environment/types.ts | 40 ++--------------------------- src/tests/types.test.ts | 17 +++++++++--- src/types.ts | 7 +++-- 7 files changed, 34 insertions(+), 90 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 1f15ca58..7f1a480f 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -79,7 +79,7 @@ function all(...fns: T & AllArguments) { return success((results as Success[]).map(({ data }) => data)) }) as Composable< (...args: Parameters[0]>) => { - [key in keyof T]: UnpackData>> + [key in keyof T]: UnpackData> } > } @@ -102,7 +102,7 @@ function collect>( ) return map(all(...(fnsWithKey as any)), mergeObjects) as Composable< (...args: Parameters>[0]>) => { - [key in keyof T]: UnpackData>> + [key in keyof T]: UnpackData> } > } @@ -149,7 +149,7 @@ function sequence( */ function map( fn: T, - mapper: (res: UnpackData>) => R, + mapper: (res: UnpackData) => R, ) { return pipe(fn as Composable, composable(mapper) as Composable) as Composable< (...args: Parameters) => R @@ -170,7 +170,7 @@ function merge( ...fns: T & AllArguments ): Composable< (...args: Parameters[0]>) => MergeObjs<{ - [key in keyof T]: UnpackData>> + [key in keyof T]: UnpackData> }> > { return map(all(...(fns as never)), mergeObjects as never) @@ -201,7 +201,7 @@ function first(...fns: T & AllArguments) { }) as Composable< ( ...args: Parameters[0]> - ) => UnpackData>> + ) => UnpackData> > } @@ -227,10 +227,10 @@ function catchError< ( ...args: Parameters ) => Awaited> extends never[] - ? UnpackData> extends any[] - ? UnpackData> - : Awaited> | UnpackData> - : Awaited> | UnpackData> + ? UnpackData extends any[] + ? UnpackData + : Awaited> | UnpackData + : Awaited> | UnpackData > } diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index f04b9308..55d591d4 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,6 +1,6 @@ -import type { Composable, Last, UnpackAll } from '../types.ts' +import type { Composable, Last, UnpackAll, UnpackData } from '../types.ts' import * as A from '../combinators.ts' -import type { UnpackDFObject, UnpackData } from './types.ts' +import type { UnpackDFObject } from './types.ts' import { composable, fromSuccess } from '../constructors.ts' /** diff --git a/src/environment/index.ts b/src/environment/index.ts index ebce5719..2ff510eb 100644 --- a/src/environment/index.ts +++ b/src/environment/index.ts @@ -1,9 +1,4 @@ -export type { - UnpackData, - UnpackResult, - UnpackDFObject, - UnpackSuccess, -} from './types.ts' +export type { UnpackDFObject } from './types.ts' export { applyEnvironment, branch, diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts index 4306ce6c..1d87e166 100644 --- a/src/environment/tests/types.test.ts +++ b/src/environment/tests/types.test.ts @@ -1,37 +1,8 @@ -// deno-lint-ignore-file no-namespace ban-ts-comment +// deno-lint-ignore-file no-namespace import { assertEquals, describe, it } from '../../test-prelude.ts' -import { Result, Success } from '../../types.ts' import { withSchema } from '../../index.ts' import * as Subject from '../types.ts' -namespace UnpackData { - const result = withSchema()(() => ({ name: 'foo' } as const)) - - type test = Expect< - Equal, { readonly name: 'foo' }> - > - type error = Expect< - // @ts-expect-error - Equal, { name: string }> - > -} - -namespace UnpackResult { - const result = withSchema()(() => ({ name: 'foo' })) - - type test = Expect< - Equal, Result<{ name: string }>> - > -} - -namespace UnpackSuccess { - const result = withSchema()(() => ({ name: 'foo' })) - - type test = Expect< - Equal, Success<{ name: string }>> - > -} - namespace UnpackAll { const dfA = withSchema()(() => ({ a: 1 } as const)) const dfB = withSchema()(() => ({ b: 2 } as const)) diff --git a/src/environment/types.ts b/src/environment/types.ts index c898ff66..31eeb90b 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -1,34 +1,4 @@ -import { Composable } from '../types.ts' - -/** - * Unpacks the result of a domain function. - * @example - * type MyDF = Composable<(input?: unknown, environment?: unknown) => { a: string }> - * type MyResult = UnpackResult - * // ^? SuccessResult<{ a: string }> | ErrorResult - */ -type UnpackResult = Awaited> - -/** - * Unpacks the data type of a successful domain function. - * @example - * type MyDF = Composable<(input?: unknown, environment?: unknown) => { a: string }> - * type MyData = UnpackSuccess - * // ^? SuccessResult<{ a: string }> - */ -type UnpackSuccess = Extract< - UnpackResult, - { success: true } -> - -/** - * Unpacks the data type of a successful domain function. - * @example - * type MyDF = Composable<(input?: unknown, environment?: unknown) => { a: string }> - * type MyData = UnpackData - * // ^? { a: string } - */ -type UnpackData = UnpackSuccess['data'] +import { Composable, UnpackData } from '../types.ts' /** * Unpacks a list of Composable into a tuple of their data types. @@ -51,10 +21,4 @@ type UnpackDFObject> = | { [K in keyof Obj]: UnpackData } | never -export type { - UnpackAll, - UnpackData, - UnpackDFObject, - UnpackResult, - UnpackSuccess, -} +export type { UnpackAll, UnpackDFObject } diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index d55216c0..a4f58572 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -1,4 +1,5 @@ -// deno-lint-ignore-file no-namespace +// deno-lint-ignore-file no-namespace ban-ts-comment +import { withSchema } from '../index.ts' import { assertEquals, describe, it } from '../test-prelude.ts' import * as Subject from '../types.ts' @@ -252,9 +253,19 @@ namespace CollectArguments { // > } -namespace UnpackResult { +namespace UnpackData { type testExtractsDataFromPromisedResult = Expect< - Equal>>, string> + Equal Promise>>, string> + > + + const result = withSchema()(() => ({ name: 'foo' } as const)) + + type test = Expect< + Equal, { readonly name: 'foo' }> + > + type error = Expect< + // @ts-expect-error + Equal, { name: string }> > } diff --git a/src/types.ts b/src/types.ts index 45ed19e1..286443b8 100644 --- a/src/types.ts +++ b/src/types.ts @@ -57,10 +57,13 @@ type Composable = ( ...args: Parameters ) => Promise>>> -type UnpackData = Awaited extends Result ? R : never +type UnpackData = Extract< + Awaited>, + { success: true } +>['data'] type UnpackAll = { - [K in keyof List]: UnpackData> + [K in keyof List]: UnpackData } type PipeReturn = Fns extends [ From 8a51ea3186c0d5d016f88690d1f9917c0553380a Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 17:17:13 -0300 Subject: [PATCH 094/238] Fix a bug with the applySchema type --- src/constructors.ts | 5 ++-- src/tests/constructors.test.ts | 55 +++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/constructors.ts b/src/constructors.ts index 67830ade..2c5c6171 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -1,6 +1,7 @@ import { mapError } from './combinators.ts' import { EnvironmentError, ErrorList, InputError } from './errors.ts' import type { Composable, Failure, Fn, ParserSchema, Success } from './types.ts' +import { UnpackData } from './types.ts' function success(data: T): Success { return { success: true, data, errors: [] } @@ -122,9 +123,7 @@ function applySchema( return failure([...inputErrors, ...envErrors]) } return fn(result.data, envResult.data) - } as Composable< - (input?: unknown, environment?: unknown) => Awaited> - > + } as Composable<(input?: unknown, environment?: unknown) => UnpackData> } const objectSchema: ParserSchema> = { diff --git a/src/tests/constructors.test.ts b/src/tests/constructors.test.ts index 84cf25d6..aac8848c 100644 --- a/src/tests/constructors.test.ts +++ b/src/tests/constructors.test.ts @@ -17,6 +17,7 @@ import { InputError, withSchema, } from '../index.ts' +import { applySchema } from '../index.ts' const add = composable((a: number, b: number) => a + b) const asyncAdd = (a: number, b: number) => Promise.resolve(a + b) @@ -75,7 +76,7 @@ describe('composable', () => { }) describe('fromSuccess', () => { - it('returns the result.data when the domain function suceeds', async () => { + it('returns the result.data when the schema function suceeds', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) const c = fromSuccess(a) @@ -89,7 +90,7 @@ describe('fromSuccess', () => { assertEquals(await c({ id: 1 }), 2) }) - it('throws an exception when the domain function fails', () => { + it('throws an exception when the schema function fails', () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) const c = fromSuccess(a) @@ -130,9 +131,9 @@ describe('fromSuccess', () => { }) }) -describe('make', () => { +describe('withSchema', () => { describe('when it has no input', () => { - it('uses zod parser to create parse the input and call the domain function', async () => { + it('uses zod parser to create parse the input and call the schema function', async () => { const handler = withSchema()(() => 'no input!') type _R = Expect< Equal< @@ -162,7 +163,7 @@ describe('make', () => { }) describe('when it has no environment', () => { - it('uses zod parser to create parse the input and call the domain function', async () => { + it('uses zod parser to create parse the input and call the schema function', async () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) const handler = withSchema(parser)(({ id }) => id) @@ -208,7 +209,7 @@ describe('make', () => { }) }) - it('uses zod parsers to parse the input and environment and call the domain function', async () => { + it('uses zod parsers to parse the input and environment and call the schema function', async () => { const parser = z.object({ id: z.preprocess(Number, z.number()) }) const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) @@ -261,7 +262,7 @@ describe('make', () => { ) }) - it('accepts literals as input of domain functions', async () => { + it('accepts literals as input of schema functions', async () => { const handler = withSchema(z.number(), z.string())((n) => n + 1) type _R = Expect< Equal< @@ -308,7 +309,7 @@ describe('make', () => { ) }) - it('returns error when the domain function throws an Error', async () => { + it('returns error when the schema function throws an Error', async () => { const handler = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error') }) @@ -325,7 +326,7 @@ describe('make', () => { assertIsError(err, Error, 'Error') }) - it('preserves entire original exception when the domain function throws an Error', async () => { + it('preserves entire original exception when the schema function throws an Error', async () => { const handler = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Some message', { cause: { someUnknownFields: true } }) }) @@ -343,7 +344,7 @@ describe('make', () => { assertEquals(err.cause, { someUnknownFields: true }) }) - it('returns error when the domain function throws a string', async () => { + it('returns error when the schema function throws a string', async () => { const handler = withSchema(z.object({ id: z.number() }))(() => { throw 'Error' }) @@ -357,7 +358,7 @@ describe('make', () => { assertEquals(await handler({ id: 1 }), failure([new Error()])) }) - it('returns error when the domain function throws an object with message', async () => { + it('returns error when the schema function throws an object with message', async () => { const handler = withSchema(z.object({ id: z.number() }))(() => { throw { message: 'Error' } }) @@ -375,7 +376,7 @@ describe('make', () => { assertIsError(err, Error, JSON.stringify({ message: 'Error' })) }) - it('returns inputErrors when the domain function throws an InputError', async () => { + it('returns inputErrors when the schema function throws an InputError', async () => { const handler = withSchema(z.object({ id: z.number() }))(() => { throw new InputError('Custom input error', ['contact', 'id']) }) @@ -392,7 +393,7 @@ describe('make', () => { ) }) - it('returns environmentErrors when the domain function throws an EnvironmentError', async () => { + it('returns environmentErrors when the schema function throws an EnvironmentError', async () => { const handler = withSchema(z.object({ id: z.number() }))(() => { throw new EnvironmentError('Custom env error', ['currentUser', 'role']) }) @@ -411,7 +412,7 @@ describe('make', () => { ) }) - it('returns an error result when the domain function throws an ErrorList', async () => { + it('returns an error result when the schema function throws an ErrorList', async () => { const handler = withSchema(z.object({ id: z.number() }))(() => { throw new ErrorList([ new InputError('Custom input error', ['contact', 'id']), @@ -434,3 +435,29 @@ describe('make', () => { ) }) }) + +describe('applySchema', () => { + it('uses zod parsers to parse the input and environment turning it into a schema function', async () => { + const parser = z.object({ id: z.preprocess(Number, z.number()) }) + const envParser = z.object({ uid: z.preprocess(Number, z.number()) }) + + const handler = applySchema( + composable( + ({ id }: { id: number }, { uid }: { uid: number }) => + [id, uid] as const, + ), + parser, + envParser, + ) + type _R = Expect< + Equal< + typeof handler, + Composable< + (input?: unknown, environment?: unknown) => readonly [number, number] + > + > + > + + assertEquals(await handler({ id: 1 }, { uid: 2 }), success([1, 2])) + }) +}) From 93f0b2ee6a8ff256a5383057dccabbaba4b1e1cc Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 17:17:53 -0300 Subject: [PATCH 095/238] Tackle some tests to eliminate repetition and have more represented interoperability --- src/tests/all.test.ts | 63 ++++++------------------------ src/tests/catch-error.test.ts | 6 +-- src/tests/collect.test.ts | 73 ++--------------------------------- src/tests/first.test.ts | 17 +++++--- src/tests/merge.test.ts | 17 ++++---- src/tests/sequence.test.ts | 11 ++++-- src/tests/trace.test.ts | 4 +- 7 files changed, 47 insertions(+), 144 deletions(-) diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts index b2f70a34..f9fcb887 100644 --- a/src/tests/all.test.ts +++ b/src/tests/all.test.ts @@ -16,7 +16,7 @@ import { } from '../index.ts' const voidFn = composable(() => {}) -const toString = composable(String) +const toString = withSchema(z.unknown(), z.any())(String) const add = composable((a: number, b: number) => a + b) const optionalAdd = composable((a: number, b?: number) => a + (b ?? 1)) @@ -37,40 +37,7 @@ describe('all', () => { assertEquals(res, success<[number, string, undefined]>([3, '1', undefined])) }) - it('should combine two domain functions into one', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - - const c = all(a, b) - type _R = Expect< - Equal< - typeof c, - Composable<(input?: unknown, environment?: unknown) => [number, number]> - > - > - - assertEquals(await c({ id: 1 }), success<[number, number]>([2, 0])) - }) - - it('should combine many domain functions into one', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) - const c = withSchema(z.object({ id: z.number() }))(({ id }) => Boolean(id)) - const d = all(a, b, c) - type _R = Expect< - Equal< - typeof d, - Composable< - (input?: unknown, environment?: unknown) => [string, number, boolean] - > - > - > - - const results = await d({ id: 1 }) - assertEquals(results, success<[string, number, boolean]>(['1', 2, true])) - }) - - it('should return error when one of the domain functions has input errors', async () => { + it('should return error when one of the schema functions has input errors', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) @@ -88,24 +55,21 @@ describe('all', () => { ) }) - it('should return error when one of the domain functions fails', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) - const b = withSchema(z.object({ id: z.number() }))(() => { + it('should return error when one of the functions fails', async () => { + const a = composable(({ id }: { id: number }) => id) + const b = composable(() => { throw 'Error' }) const c = all(a, b) type _R = Expect< - Equal< - typeof c, - Composable<(input?: unknown, environment?: unknown) => [number, never]> - > + Equal [number, never]>> > assertEquals(await c({ id: 1 }), failure([new Error()])) }) - it('should combine the inputError messages of both functions', async () => { + it('should combine the InputError messages of both schema functions', async () => { const a = withSchema(z.object({ id: z.string() }))(({ id }) => id) const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) @@ -127,24 +91,19 @@ describe('all', () => { }) it('should combine the error messages when both functions fail', async () => { - const a = withSchema(z.object({ id: z.number() }))(() => { + const a = composable(() => { throw new Error('Error A') }) - const b = withSchema(z.object({ id: z.number() }))(() => { + const b = composable(() => { throw new Error('Error B') }) const c = all(a, b) - type _R = Expect< - Equal< - typeof c, - Composable<(input?: unknown, environment?: unknown) => [never, never]> - > - > + type _R = Expect [never, never]>>> const { errors: [errA, errB], - } = await c({ id: 1 }) + } = await c() assertIsError(errA, Error, 'Error A') assertIsError(errB, Error, 'Error B') }) diff --git a/src/tests/catch-error.test.ts b/src/tests/catch-error.test.ts index 4871d8b0..04bd1c9e 100644 --- a/src/tests/catch-error.test.ts +++ b/src/tests/catch-error.test.ts @@ -2,7 +2,7 @@ import { assertEquals, describe, it, z } from '../test-prelude.ts' import type { Result, Composable } from '../index.ts' import { catchError, composable, success, withSchema } from '../index.ts' -const dfFaultyAdd = withSchema( +const schemaFaultyAdd = withSchema( z.number(), z.number(), )((a: number, b: number) => { @@ -16,8 +16,8 @@ const faultyAdd = composable((a: number, b: number) => { }) describe('catchError', () => { - it('changes the type of DF to accomodate catcher return type', async () => { - const fn = catchError(dfFaultyAdd, () => null) + it('changes the type to accomodate catcher return type', async () => { + const fn = catchError(schemaFaultyAdd, () => null) const res = await fn(1, 2) type _FN = Expect< diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index b34c8333..002180d1 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -1,10 +1,4 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../test-prelude.ts' +import { assertEquals, describe, it, z } from '../test-prelude.ts' import type { Result, Composable } from '../index.ts' import { collect, @@ -120,24 +114,7 @@ describe('collect', () => { assertEquals(res.errors![1].message, 'a is 1') }) - it('should combine an object of domain functions', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - - const c = collect({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - (input?: unknown, environment?: unknown) => { a: number; b: number } - > - > - > - - assertEquals(await c({ id: 1 }), success({ a: 2, b: 0 })) - }) - - it('should return error when one of the domain functions has input errors', async () => { + it('should return error when one of the schema functions has input errors', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) @@ -157,26 +134,7 @@ describe('collect', () => { ) }) - it('should return error when one of the domain functions fails', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => id) - const b = withSchema(z.object({ id: z.number() }))(() => { - throw 'Error' - }) - - const c = collect({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - (input?: unknown, environment?: unknown) => { a: number; b: never } - > - > - > - - assertEquals(await c({ id: 1 }), failure([new Error()])) - }) - - it('should combine the inputError messages of both functions', async () => { + it('should combine the inputError messages of both schema functions', async () => { const a = withSchema(z.object({ id: z.string() }))(({ id }) => id) const b = withSchema(z.object({ id: z.string() }))(({ id }) => id) @@ -198,29 +156,4 @@ describe('collect', () => { ]), ) }) - - it('should combine the error messages when both functions fail', async () => { - const a = withSchema(z.object({ id: z.number() }))(() => { - throw new Error('Error A') - }) - const b = withSchema(z.object({ id: z.number() }))(() => { - throw new Error('Error B') - }) - - const c = collect({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - (input?: unknown, environment?: unknown) => { a: never; b: never } - > - > - > - - const { - errors: [errA, errB], - } = await c({ id: 1 }) - assertIsError(errA, Error, 'Error A') - assertIsError(errB, Error, 'Error B') - }) }) diff --git a/src/tests/first.test.ts b/src/tests/first.test.ts index f16f1374..64358c33 100644 --- a/src/tests/first.test.ts +++ b/src/tests/first.test.ts @@ -1,27 +1,32 @@ import { assertEquals, describe, it, z } from '../test-prelude.ts' import { withSchema, first, failure, InputError, success } from '../index.ts' import type { Composable } from '../index.ts' +import { composable } from '../index.ts' describe('first', () => { - it('should return the result of the first successful domain function', async () => { + it('should return the result of the first successful schema function', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) + const b = composable(({ id }: { id: number }) => id + 1) const c = withSchema(z.object({ id: z.number() }))(({ id }) => Boolean(id)) const d = first(a, b, c) type _R = Expect< Equal< typeof d, Composable< - (input?: unknown, environment?: unknown) => string | number | boolean + ( + input: { id: number }, + environment: unknown, + ) => string | number | boolean > > > - const results = await d({ id: 1 }) + // TODO: we should keep the environment optional when composing with interoperability + const results = await d({ id: 1 }, {}) assertEquals(results, success('1')) }) - it('should return a successful result even if one of the domain functions fails', async () => { + it('should return a successful result even if one of the schema functions fails', async () => { const a = withSchema( z.object({ n: z.number(), operation: z.literal('increment') }), )(({ n }) => n + 1) @@ -40,7 +45,7 @@ describe('first', () => { assertEquals(await c({ n: 1, operation: 'increment' }), success(2)) }) - it('should return error when all of the domain functions fails', async () => { + it('should return error when all of the schema functions fails', async () => { const a = withSchema(z.object({ id: z.string() }))(({ id }) => id) const b = withSchema(z.object({ id: z.number() }))(() => { throw 'Error' diff --git a/src/tests/merge.test.ts b/src/tests/merge.test.ts index 1d8f97ef..8ceb2b8e 100644 --- a/src/tests/merge.test.ts +++ b/src/tests/merge.test.ts @@ -7,13 +7,14 @@ import { } from '../test-prelude.ts' import { merge, withSchema, failure, InputError, success } from '../index.ts' import type { Composable } from '../index.ts' +import { composable } from '../index.ts' describe('merge', () => { - it('should combine two domain functions results into one object', async () => { + it('should combine two schema functions results into one object', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ resultA: id + 1, })) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + const b = composable(({ id }: { id: number }) => ({ resultB: id - 1, })) @@ -23,17 +24,17 @@ describe('merge', () => { typeof c, Composable< ( - input?: unknown, - environment?: unknown, + input: { id: number }, + environment: unknown, ) => { resultA: number; resultB: number } > > > - assertEquals(await c({ id: 1 }), success({ resultA: 2, resultB: 0 })) + assertEquals(await c({ id: 1 }, {}), success({ resultA: 2, resultB: 0 })) }) - it('should combine many domain functions into one', async () => { + it('should combine many schema functions into one', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ resultA: String(id), resultB: String(id), @@ -66,7 +67,7 @@ describe('merge', () => { assertEquals(results, success({ resultA: '1', resultB: 2, resultC: true })) }) - it('should return error when one of the domain functions has input errors', async () => { + it('should return error when one of the schema functions has input errors', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id, })) @@ -97,7 +98,7 @@ describe('merge', () => { ) }) - it('should return error when one of the domain functions fails', async () => { + it('should return error when one of the schema functions fails', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id, })) diff --git a/src/tests/sequence.test.ts b/src/tests/sequence.test.ts index 43bfd025..ec41aec4 100644 --- a/src/tests/sequence.test.ts +++ b/src/tests/sequence.test.ts @@ -1,9 +1,10 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' +import { assertEquals, describe, it, z } from '../test-prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, sequence, success } from '../index.ts' +import { withSchema } from '../index.ts' const toString = composable((a: unknown) => `${a}`) -const add = composable((a: number, b: number) => a + b) +const add = withSchema(z.number(), z.number())((a, b) => a + b) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') return a + b @@ -15,7 +16,11 @@ describe('sequence', () => { const res = await fn(1, 2) type _FN = Expect< - Equal [number, string]>> + Equal< + typeof fn, + // TODO: this is wrong, it should infer the params + Composable<(a?: unknown, b?: unknown) => [number, string]> + > > type _R = Expect>> diff --git a/src/tests/trace.test.ts b/src/tests/trace.test.ts index ba176026..58a351ed 100644 --- a/src/tests/trace.test.ts +++ b/src/tests/trace.test.ts @@ -15,7 +15,7 @@ import { import type { Composable } from '../index.ts' describe('trace', () => { - it('converts trace exceptions to df failures', async () => { + it('converts trace exceptions to failures', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) const c = trace(() => { @@ -33,7 +33,7 @@ describe('trace', () => { assertIsError(result.errors[0], Error, 'Problem in tracing') }) - it('converts trace exceptions to df failures', async () => { + it('converts trace exceptions to failures', async () => { const a = composable(({ id }: { id: number }) => id + 1) const c = trace(() => { From cdb95cddf67f086fbc1e08791a49f49543f2f73c Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 17:21:28 -0300 Subject: [PATCH 096/238] =?UTF-8?q?=F0=9F=92=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constructors.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/constructors.ts b/src/constructors.ts index 2c5c6171..11efc6ee 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -86,12 +86,10 @@ function withSchema( inputSchema?: ParserSchema, environmentSchema?: ParserSchema, ) { - return function (handler: (input: I, environment: E) => Output) { - return applySchema( - composable(handler), - inputSchema, - environmentSchema, - ) as Composable<(input?: unknown, environment?: unknown) => Awaited> + return function ( + handler: (input: I, environment: E) => Output, + ): Composable<(input?: unknown, environment?: unknown) => Awaited> { + return applySchema(composable(handler), inputSchema, environmentSchema) } } @@ -99,7 +97,7 @@ function applySchema( fn: A, inputSchema?: ParserSchema, environmentSchema?: ParserSchema, -) { +): Composable<(input?: unknown, environment?: unknown) => UnpackData> { return async function (input, environment = {}) { const envResult = await (environmentSchema ?? objectSchema).safeParseAsync( environment, @@ -123,7 +121,7 @@ function applySchema( return failure([...inputErrors, ...envErrors]) } return fn(result.data, envResult.data) - } as Composable<(input?: unknown, environment?: unknown) => UnpackData> + } } const objectSchema: ParserSchema> = { From c1e94bf62c907d0c592f30777ca33f1dc8b73c44 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 17:30:53 -0300 Subject: [PATCH 097/238] Update example folder --- deno.json | 2 +- examples/remix/app/business/colors.ts | 2 +- examples/remix/app/business/gpd.ts | 2 +- examples/remix/app/business/users.ts | 6 +++--- examples/remix/app/routes/_index.tsx | 7 ++++--- examples/remix/app/routes/user.$id.tsx | 4 ++-- examples/remix/package-lock.json | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/deno.json b/deno.json index 10f54e36..cb4cb9bf 100644 --- a/deno.json +++ b/deno.json @@ -1,5 +1,5 @@ { - "version": "0.0.0-experimental-20240412-1", + "version": "0.0.0-experimental-20240418-1", "tasks": { "test": "deno test --allow-env --allow-net src", "publish": "deno task build-npm && cd npm/ && npm publish", diff --git a/examples/remix/app/business/colors.ts b/examples/remix/app/business/colors.ts index 21d5fb2c..3e5869f7 100644 --- a/examples/remix/app/business/colors.ts +++ b/examples/remix/app/business/colors.ts @@ -1,5 +1,5 @@ import * as z from 'zod' -import { df } from 'composable-functions' +import { withSchema } from 'composable-functions' import { makeService } from 'make-service' const reqRes = makeService('https://reqres.in/api') diff --git a/examples/remix/app/business/gpd.ts b/examples/remix/app/business/gpd.ts index 7e19a7c2..d4ec5d47 100644 --- a/examples/remix/app/business/gpd.ts +++ b/examples/remix/app/business/gpd.ts @@ -1,5 +1,5 @@ import { z } from 'zod' -import { df } from 'composable-functions' +import { withSchema } from 'composable-functions' import { createCookie } from '@remix-run/node' const cookie = createCookie('gpd', { diff --git a/examples/remix/app/business/users.ts b/examples/remix/app/business/users.ts index 30f72409..f5597174 100644 --- a/examples/remix/app/business/users.ts +++ b/examples/remix/app/business/users.ts @@ -1,5 +1,5 @@ import * as z from 'zod' -import { df } from 'composable-functions' +import { composable, withSchema } from 'composable-functions' import { makeService } from 'make-service' const jsonPlaceholder = makeService('https://jsonplaceholder.typicode.com') @@ -15,7 +15,7 @@ const userSchema = z.object({ website: z.string(), }) -const listUsers = withSchema(z.any())(async () => { +const listUsers = withSchema()(async () => { const response = await jsonPlaceholder.get('/users') return response.json(z.array(userSchema)) }) @@ -25,7 +25,7 @@ const getUser = withSchema(z.object({ id: z.string() }))(async ({ id }) => { return response.json(userSchema) }) -const formatUser = withSchema(userSchema)((user) => { +const formatUser = composable((user: z.output) => { return { user: { ...user, diff --git a/examples/remix/app/routes/_index.tsx b/examples/remix/app/routes/_index.tsx index 3f4bd83a..b2774b43 100644 --- a/examples/remix/app/routes/_index.tsx +++ b/examples/remix/app/routes/_index.tsx @@ -1,15 +1,16 @@ import { LoaderFunctionArgs } from '@remix-run/node' import { Link, useLoaderData, useLocation } from '@remix-run/react' -import { inputFromUrl, df, map } from 'composable-functions' +import { inputFromUrl, collect, map } from 'composable-functions' import { listColors } from '~/business/colors' import { listUsers } from '~/business/users' import { loaderResponseOrThrow } from '~/lib' // We'll run these 2 domain functions in parallel with Promise.all -const getData = df.collect({ +const mappedColors = map(listColors, ({ data }) => data) +const getData = collect({ // The second argument will transform the successful result of listColors, // we only care about what is in the "data" field - colors: map(listColors, ({ data }) => data), + colors: mappedColors, users: listUsers, }) export const loader = async ({ request }: LoaderFunctionArgs) => { diff --git a/examples/remix/app/routes/user.$id.tsx b/examples/remix/app/routes/user.$id.tsx index 72c36351..b298059b 100644 --- a/examples/remix/app/routes/user.$id.tsx +++ b/examples/remix/app/routes/user.$id.tsx @@ -1,11 +1,11 @@ import { LoaderFunctionArgs } from '@remix-run/node' import { Link, useLoaderData } from '@remix-run/react' -import { df } from 'composable-functions' +import { pipe } from 'composable-functions' import { formatUser, getUser } from '~/business/users' import { loaderResponseOrThrow } from '~/lib' // The output of getUser will be the input of formatUser -const getData = df.pipe(getUser, formatUser) +const getData = pipe(getUser, formatUser) export const loader = async ({ params }: LoaderFunctionArgs) => { const result = await getData(params) diff --git a/examples/remix/package-lock.json b/examples/remix/package-lock.json index fb5f3392..5b12e477 100644 --- a/examples/remix/package-lock.json +++ b/examples/remix/package-lock.json @@ -42,7 +42,7 @@ }, "../../npm": { "name": "composable-functions", - "version": "0.0.0-experimental-20240412-1", + "version": "0.0.0-experimental-20240418-1", "license": "MIT", "devDependencies": { "@deno/shim-deno": "~0.18.0", From 59caab0a6d5bf56e44f53119984a32d8cf111d1b Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Thu, 18 Apr 2024 20:42:23 -0400 Subject: [PATCH 098/238] Pipe would always fail to compose more than 2 arguments --- src/tests/types.test.ts | 12 ++++++++++++ src/types.ts | 1 + 2 files changed, 13 insertions(+) diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 1710e493..b6245645 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -92,6 +92,18 @@ namespace PipeArguments { ['Fail to compose', void, 'does not fit in', number] > > + type testFailureToComposeOnThirdElement = Expect< + Equal< + Subject.PipeArguments< + [ + Subject.Composable<(x: string) => number>, + Subject.Composable<(y: number) => string>, + Subject.Composable<(z: boolean) => void>, + ] + >, + ['Fail to compose', string, 'does not fit in', boolean] + > + > } namespace AllArguments { diff --git a/src/types.ts b/src/types.ts index 12a5eae5..0bf64a30 100644 --- a/src/types.ts +++ b/src/types.ts @@ -88,6 +88,7 @@ type PipeArguments< Composable< (firstParameter: infer FirstBParameter, ...b: infer PB) => any >, + ...unknown[], ] ? IsNever> extends true ? ['Fail to compose, "never" does not fit in', FirstBParameter] From 1f155781fb4d473523224e9c25d20d4d14bff864 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 22:12:35 -0300 Subject: [PATCH 099/238] Removes or hides some types we don't want to commit to publicly --- src/combinators.ts | 3 +-- src/constructors.ts | 4 ++-- src/environment/combinators.ts | 8 +++++-- src/environment/index.ts | 1 - src/environment/tests/types.test.ts | 16 ------------- src/environment/types.ts | 24 -------------------- src/index.ts | 1 - src/internal/types.ts | 7 ++++++ src/types.ts | 35 ++++++----------------------- 9 files changed, 23 insertions(+), 76 deletions(-) delete mode 100644 src/environment/tests/types.test.ts delete mode 100644 src/environment/types.ts diff --git a/src/combinators.ts b/src/combinators.ts index 7f1a480f..dfa1b88d 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -2,7 +2,6 @@ import type { AllArguments, CollectArguments, Composable, - First, MergeObjs, PipeArguments, PipeReturn, @@ -134,7 +133,7 @@ function sequence( } return success(result) }) as Composable< - (...args: Parameters, Composable>>) => UnpackAll + (...args: Parameters>) => UnpackAll > } diff --git a/src/constructors.ts b/src/constructors.ts index 11efc6ee..798bf570 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -1,6 +1,6 @@ import { mapError } from './combinators.ts' import { EnvironmentError, ErrorList, InputError } from './errors.ts' -import type { Composable, Failure, Fn, ParserSchema, Success } from './types.ts' +import type { Composable, Failure, ParserSchema, Success } from './types.ts' import { UnpackData } from './types.ts' function success(data: T): Success { @@ -25,7 +25,7 @@ function toError(maybeError: unknown): Error { * That function is gonna catch any errors and always return a Result. * @param fn a function to be used as a Composable */ -function composable(fn: T): Composable { +function composable any>(fn: T): Composable { return async (...args) => { try { // deno-lint-ignore no-explicit-any diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 55d591d4..4097321b 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,6 +1,5 @@ import type { Composable, Last, UnpackAll, UnpackData } from '../types.ts' import * as A from '../combinators.ts' -import type { UnpackDFObject } from './types.ts' import { composable, fromSuccess } from '../constructors.ts' /** @@ -61,7 +60,12 @@ const df = collectSequence({ a, b }) */ function collectSequence>( fns: Fns, -): Composable<(input?: unknown, environment?: unknown) => UnpackDFObject> { +): Composable< + ( + input?: unknown, + environment?: unknown, + ) => { [K in keyof Fns]: UnpackData } +> { const keys = Object.keys(fns) return A.map( diff --git a/src/environment/index.ts b/src/environment/index.ts index 2ff510eb..dfb4706f 100644 --- a/src/environment/index.ts +++ b/src/environment/index.ts @@ -1,4 +1,3 @@ -export type { UnpackDFObject } from './types.ts' export { applyEnvironment, branch, diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts deleted file mode 100644 index 1d87e166..00000000 --- a/src/environment/tests/types.test.ts +++ /dev/null @@ -1,16 +0,0 @@ -// deno-lint-ignore-file no-namespace -import { assertEquals, describe, it } from '../../test-prelude.ts' -import { withSchema } from '../../index.ts' -import * as Subject from '../types.ts' - -namespace UnpackAll { - const dfA = withSchema()(() => ({ a: 1 } as const)) - const dfB = withSchema()(() => ({ b: 2 } as const)) - - type Result = Subject.UnpackAll<[typeof dfA, typeof dfB]> - - type test = Expect> -} - -describe('type tests', () => - it('should have no ts errors', () => assertEquals(true, true))) diff --git a/src/environment/types.ts b/src/environment/types.ts deleted file mode 100644 index 31eeb90b..00000000 --- a/src/environment/types.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Composable, UnpackData } from '../types.ts' - -/** - * Unpacks a list of Composable into a tuple of their data types. - * @example - * type MyDFs = [ - * Composable<(input?: unknown, environment?: unknown) => { a: string }>, - * Composable<(input?: unknown, environment?: unknown) => { b: number }>, - * ] - * type MyData = UnpackAll - * // ^? [{ a: string }, { b: number }] - */ -type UnpackAll = List extends [ - Composable<(input?: unknown, environment?: unknown) => infer first>, - ...infer rest, -] - ? UnpackAll - : output - -type UnpackDFObject> = - | { [K in keyof Obj]: UnpackData } - | never - -export type { UnpackAll, UnpackDFObject } diff --git a/src/index.ts b/src/index.ts index 01ca69f0..5e1ffa51 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,7 +30,6 @@ export { EnvironmentError, ErrorList, InputError } from './errors.ts' export type { Composable, Failure, - Last, MergeObjs, Result, SerializableError, diff --git a/src/internal/types.ts b/src/internal/types.ts index 1fa17b7f..702dd4b3 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -6,6 +6,13 @@ namespace Internal { // deno-lint-ignore ban-types } & {} + export type IsNever = + // prettier is removing the parens thus worsening readability + // prettier-ignore + (() => T extends A ? 1 : 2) extends (() => T extends never ? 1 : 2) + ? true + : false + // Thanks to https://github.com/tjjfvi // UnionToTuple code lifted from this thread: https://github.com/microsoft/TypeScript/issues/13298#issuecomment-707364842 // This will not preserve union order but we don't care since this is for Composable paralel application diff --git a/src/types.ts b/src/types.ts index 0bf64a30..f7df32a3 100644 --- a/src/types.ts +++ b/src/types.ts @@ -30,30 +30,7 @@ type MergeObjs = Objs extends [ ? MergeObjs & first>> : output -/** - * Returns the last item of a tuple type. - * @example - * type MyTuple = [string, number] - * type Result = Last - * // ^? number - */ -type Last = T extends [...infer _I, infer L] - ? L - : never - -type IsNever = - // prettier is removing the parens thus worsening readability - // prettier-ignore - (() => T extends A ? 1 : 2) extends (() => T extends never ? 1 : 2) - ? true - : false - -type First = T extends [infer F, ...infer _I] - ? F - : never - -type Fn = (...args: any[]) => any -type Composable = ( +type Composable any = (...args: any[]) => any> = ( ...args: Parameters ) => Promise>>> @@ -71,7 +48,7 @@ type PipeReturn = Fns extends [ Composable<(b: infer PB) => infer OB>, ...infer rest, ] - ? IsNever extends true + ? Internal.IsNever extends true ? ['Fail to compose, "never" does not fit in', PB] : Awaited extends PB ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> @@ -90,7 +67,7 @@ type PipeArguments< >, ...unknown[], ] - ? IsNever> extends true + ? Internal.IsNever> extends true ? ['Fail to compose, "never" does not fit in', FirstBParameter] : Awaited extends FirstBParameter ? Internal.EveryElementTakes extends true @@ -169,13 +146,15 @@ type ParserSchema = { safeParseAsync: (a: unknown) => Promise> } +type Last = T extends [...infer _I, infer L] + ? L + : never + export type { AllArguments, CollectArguments, Composable, Failure, - First, - Fn, Last, MergeObjs, ParserIssue, From 5dd2ef3d0944273dea3b77c229b22ce7a3dc2685 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 22:39:59 -0300 Subject: [PATCH 100/238] Fix the collect weird bug where it won't accept inline functions --- examples/remix/app/routes/_index.tsx | 3 +-- src/combinators.ts | 5 +---- src/internal/types.ts | 1 - src/tests/collect.test.ts | 11 +++++------ src/types.ts | 22 ++++++++-------------- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/examples/remix/app/routes/_index.tsx b/examples/remix/app/routes/_index.tsx index b2774b43..59426fc6 100644 --- a/examples/remix/app/routes/_index.tsx +++ b/examples/remix/app/routes/_index.tsx @@ -6,11 +6,10 @@ import { listUsers } from '~/business/users' import { loaderResponseOrThrow } from '~/lib' // We'll run these 2 domain functions in parallel with Promise.all -const mappedColors = map(listColors, ({ data }) => data) const getData = collect({ // The second argument will transform the successful result of listColors, // we only care about what is in the "data" field - colors: mappedColors, + colors: map(listColors, ({ data }) => data), users: listUsers, }) export const loader = async ({ request }: LoaderFunctionArgs) => { diff --git a/src/combinators.ts b/src/combinators.ts index dfa1b88d..7e152de4 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -48,10 +48,7 @@ function pipe( ...fns: T & PipeArguments ) { return (async (...args) => { - //@ts-ignore pipe uses exactly he same generic input type as sequence - // I don't understand what is the issue here but ignoring the errors - // is safe and much nicer than a bunch of casts to any - const res = await sequence(...fns)(...args) + const res = await sequence(...(fns as never))(...(args as never)) return !res.success ? failure(res.errors) : success(res.data.at(-1)) }) as PipeReturn } diff --git a/src/internal/types.ts b/src/internal/types.ts index 702dd4b3..32a341f2 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -7,7 +7,6 @@ namespace Internal { } & {} export type IsNever = - // prettier is removing the parens thus worsening readability // prettier-ignore (() => T extends A ? 1 : 2) extends (() => T extends never ? 1 : 2) ? true diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 002180d1..30c8b431 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -10,7 +10,6 @@ import { } from '../index.ts' const voidFn = composable(() => {}) -const toString = withSchema(z.unknown(), z.any())(String) const append = composable((a: string, b: string) => `${a}${b}`) const add = composable((a: number, b: number) => a + b) const faultyAdd = composable((a: number, b: number) => { @@ -26,12 +25,12 @@ describe('collect', () => { args_1: number, ) => { add: number - string: string + stringfied: string void: void } > = collect({ add: add, - string: toString, + stringfied: withSchema(z.unknown(), z.any())((a) => String(a)), void: voidFn, }) @@ -46,17 +45,17 @@ describe('collect', () => { b: number, ) => { add: number - string: string + stringfied: string void: void } > > > type _R = Expect< - Equal> + Equal> > - assertEquals(res, success({ add: 3, string: '1', void: undefined })) + assertEquals(res, success({ add: 3, stringfied: '1', void: undefined })) }) it('uses the same arguments for every function', async () => { diff --git a/src/types.ts b/src/types.ts index f7df32a3..f44f0aaf 100644 --- a/src/types.ts +++ b/src/types.ts @@ -91,20 +91,14 @@ type AllArguments< : [...Arguments, Composable<(...a: PA) => OA>] : never -type CollectArguments> = - {} extends Internal.Zip< - Internal.Keys, - AllArguments>> - > - ? never - : AllArguments< - Internal.RecordValuesFromKeysTuple> - > extends ['Fail to compose', ...any[]] - ? AllArguments>> - : Internal.Zip< - Internal.Keys, - AllArguments>> - > +type CollectArguments> = AllArguments< + Internal.UnionToTuple +> extends ['Fail to compose', ...any[]] + ? AllArguments> + : Internal.Zip< + Internal.Keys, + AllArguments> + > type RecordToTuple> = Internal.RecordValuesFromKeysTuple> From d862031c742799dcf8dafe769a096c65663d0495 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 18 Apr 2024 23:19:32 -0300 Subject: [PATCH 101/238] Normalize some types params --- src/combinators.ts | 107 ++++++++++++++++----------------- src/environment/combinators.ts | 22 ++++--- src/tests/collect.test.ts | 12 ++-- 3 files changed, 71 insertions(+), 70 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 7e152de4..b2025935 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -26,8 +26,8 @@ import { ErrorList } from './errors.ts' * const merged = mergeObjects([obj1, obj2, obj3]) * // ^? { a: number, b: number, c: number, d: number } */ -function mergeObjects(objs: T) { - return Object.assign({}, ...objs) as MergeObjs +function mergeObjects(objs: T): MergeObjs { + return Object.assign({}, ...objs) } /** @@ -44,13 +44,15 @@ function mergeObjects(objs: T) { * const d = C.pipe(a, b) * // ^? Composable<({ aNumber }: { aNumber: number }) => { aBoolean: boolean }> */ -function pipe( - ...fns: T & PipeArguments +function pipe( + ...fns: Fns & PipeArguments ) { return (async (...args) => { const res = await sequence(...(fns as never))(...(args as never)) - return !res.success ? failure(res.errors) : success(res.data.at(-1)) - }) as PipeReturn + return !res.success + ? failure(res.errors) + : success(res.data[res.data.length - 1]) + }) as PipeReturn } /** @@ -64,7 +66,7 @@ function pipe( * const cf = C.all(a, b, c) // ^? Composable<(id: number) => [string, number, boolean]> */ -function all(...fns: T & AllArguments) { +function all(...fns: Fns & AllArguments) { return (async (...args) => { const results = await Promise.all(fns.map((fn) => fn(...args))) @@ -74,8 +76,8 @@ function all(...fns: T & AllArguments) { return success((results as Success[]).map(({ data }) => data)) }) as Composable< - (...args: Parameters[0]>) => { - [key in keyof T]: UnpackData> + (...args: Parameters[0]>) => { + [k in keyof Fns]: UnpackData } > } @@ -90,15 +92,15 @@ function all(...fns: T & AllArguments) { * const df = collect({ a, b }) // ^? Composable<() => { a: string, b: number }> */ -function collect>( - fns: T & CollectArguments, +function collect>( + fns: Fns & CollectArguments, ) { const fnsWithKey = Object.entries(fns).map(([key, cf]) => map(cf, (result) => ({ [key]: result })), ) return map(all(...(fnsWithKey as any)), mergeObjects) as Composable< - (...args: Parameters>[0]>) => { - [key in keyof T]: UnpackData> + (...args: Parameters>[0]>) => { + [key in keyof Fns]: UnpackData } > } @@ -113,11 +115,11 @@ function collect>( * const cf = C.sequence(a, b) * // ^? Composable<(aNumber: number) => [string, boolean]> */ -function sequence( - ...fns: T & PipeArguments +function sequence( + ...fns: Fn & PipeArguments ) { return (async (...args) => { - const [head, ...tail] = fns as T + const [head, ...tail] = fns const res = await head(...args) if (!res.success) return failure(res.errors) @@ -129,9 +131,7 @@ function sequence( result.push(res.data) } return success(result) - }) as Composable< - (...args: Parameters>) => UnpackAll - > + }) as Composable<(...args: Parameters) => UnpackAll> } /** @@ -143,13 +143,11 @@ function sequence( * const incrementToString = C.map(increment, String) * // ^? Composable */ -function map( - fn: T, - mapper: (res: UnpackData) => R, -) { - return pipe(fn as Composable, composable(mapper) as Composable) as Composable< - (...args: Parameters) => R - > +function map( + fn: Fn, + mapper: (res: UnpackData) => O, +): Composable<(...args: Parameters) => O> { + return pipe(fn as Composable, composable(mapper) as Composable) } /** @@ -162,14 +160,14 @@ function map( * const df = merge(a, b) * // ^? DomainFunction<{ a: string, b: number }> */ -function merge( - ...fns: T & AllArguments +function merge( + ...fns: Fn & AllArguments ): Composable< - (...args: Parameters[0]>) => MergeObjs<{ - [key in keyof T]: UnpackData> + (...args: Parameters[0]>) => MergeObjs<{ + [key in keyof Fn]: UnpackData }> > { - return map(all(...(fns as never)), mergeObjects as never) + return map(all(...(fns as never)), mergeObjects) } /** @@ -182,7 +180,7 @@ const b = mdf(z.object({ n: z.number() }))(({ n }) => String(n)) const df = first(a, b) // ^? DomainFunction */ -function first(...fns: T & AllArguments) { +function first(...fns: Fn & AllArguments) { return ((...args) => { return composable(async () => { const results = await Promise.all(fns.map((fn) => fn(...args))) @@ -195,9 +193,7 @@ function first(...fns: T & AllArguments) { return result.data })() }) as Composable< - ( - ...args: Parameters[0]> - ) => UnpackData> + (...args: Parameters[0]>) => UnpackData > } @@ -212,22 +208,25 @@ function first(...fns: T & AllArguments) { * )) */ function catchError< - F extends Composable, - C extends (err: Error[], ...originalInput: Parameters) => any, ->(fn: F, catcher: C) { - return (async (...args: Parameters) => { + Fn extends Composable, + C extends (err: Error[], ...originalInput: Parameters) => any, +>( + fn: Fn, + catcher: C, +): Composable< + ( + ...args: Parameters + ) => Awaited> extends never[] + ? UnpackData extends any[] + ? UnpackData + : Awaited> | UnpackData + : Awaited> | UnpackData +> { + return async (...args: Parameters) => { const res = await fn(...args) if (res.success) return success(res.data) - return composable(catcher)(res.errors as never, ...(args as any as never)) - }) as Composable< - ( - ...args: Parameters - ) => Awaited> extends never[] - ? UnpackData extends any[] - ? UnpackData - : Awaited> | UnpackData - : Awaited> | UnpackData - > + return composable(catcher)(res.errors, ...(args as never)) + } } /** @@ -240,8 +239,8 @@ function catchError< * errors: [{ message: 'Errors count: ' + result.errors.length }], * })) */ -function mapError( - fn: T, +function mapError( + fn: Fn, mapper: (err: Error[]) => Error[] | Promise, ) { return (async (...args) => { @@ -253,7 +252,7 @@ function mapError( } else { return failure(mapped.errors) } - }) as T + }) as Fn } /** @@ -276,14 +275,14 @@ function trace( ...originalInput: unknown[] ) => Promise | void, ) { - return (fn: C) => + return (fn: Fn) => (async (...args) => { const originalResult = await fn(...args) const traceResult = await composable(traceFn)(originalResult, ...args) if (traceResult.success) return originalResult return failure(traceResult.errors) - }) as C + }) as Fn } export { diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 4097321b..29966297 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -38,9 +38,11 @@ function applyEnvironmentToList< * const d = pipe(a, b) * // ^? Composable<(input?: unknown, environment?: unknown) => { aBoolean: boolean }> */ -function pipe( - ...fns: T -): Composable<(input?: unknown, environment?: unknown) => Last>> { +function pipe( + ...fns: Fns +): Composable< + (input?: unknown, environment?: unknown) => Last> +> { return (input, environment) => A.pipe(...applyEnvironmentToList(fns, environment))(input) } @@ -119,9 +121,9 @@ function sequence(...fns: Fns) { * ) * // ^? Composable<(input?: unknown, environment?: unknown) => { items: Item[] }> */ -function branch( - dfn: Composable<(input?: unknown, environment?: unknown) => T>, - resolver: (o: T) => Promise | R, +function branch( + dfn: Composable<(input?: unknown, environment?: unknown) => O>, + resolver: (o: O) => Promise | MaybeFn, ) { return (async (input, environment) => { const result = await dfn(input, environment) @@ -136,11 +138,11 @@ function branch( ( input?: unknown, environment?: unknown, - ) => R extends Composable< - (input?: unknown, environment?: unknown) => infer U + ) => MaybeFn extends Composable< + (input?: unknown, environment?: unknown) => infer BranchOutput > - ? U - : UnpackData> | T + ? BranchOutput + : UnpackData> | O > } diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 30c8b431..ae0c8b94 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -25,12 +25,12 @@ describe('collect', () => { args_1: number, ) => { add: number - stringfied: string + str: string void: void } > = collect({ - add: add, - stringfied: withSchema(z.unknown(), z.any())((a) => String(a)), + add, + str: withSchema(z.unknown(), z.any())((a) => String(a)), void: voidFn, }) @@ -45,17 +45,17 @@ describe('collect', () => { b: number, ) => { add: number - stringfied: string + str: string void: void } > > > type _R = Expect< - Equal> + Equal> > - assertEquals(res, success({ add: 3, stringfied: '1', void: undefined })) + assertEquals(res, success({ add: 3, str: '1', void: undefined })) }) it('uses the same arguments for every function', async () => { From af2915b84bcdc2ac4bbe1f6022eb967654e2e354 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 09:46:06 -0300 Subject: [PATCH 102/238] Reduce Parser types to the essential and public --- src/index.ts | 1 + src/types.ts | 32 ++++++++++---------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/index.ts b/src/index.ts index 5e1ffa51..34620101 100644 --- a/src/index.ts +++ b/src/index.ts @@ -31,6 +31,7 @@ export type { Composable, Failure, MergeObjs, + ParserSchema, Result, SerializableError, SerializedResult, diff --git a/src/types.ts b/src/types.ts index f44f0aaf..d3841a44 100644 --- a/src/types.ts +++ b/src/types.ts @@ -114,30 +114,20 @@ type SerializedResult = | Success | { success: false; errors: SerializableError[] } -/** - * A parsing error when validating the input or environment schemas. - * This will be transformed into an `InputError` before being returned from the domain function. - * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. - */ -type ParserIssue = { path: PropertyKey[]; message: string } - -/** - * The result of input or environment validation. - * See the type `Result` for the return values of domain functions. - * It is usually not visible to the end user unless one wants to write an adapter for a schema validator. - */ -type ParserResult = - | { - success: true - data: T - } - | { success: false; error: { issues: ParserIssue[] } } - /** * The object used to validate either input or environment when creating domain functions. */ type ParserSchema = { - safeParseAsync: (a: unknown) => Promise> + safeParseAsync: (a: unknown) => Promise< + | { + success: true + data: T + } + | { + success: false + error: { issues: { path: PropertyKey[]; message: string }[] } + } + > } type Last = T extends [...infer _I, infer L] @@ -151,8 +141,6 @@ export type { Failure, Last, MergeObjs, - ParserIssue, - ParserResult, ParserSchema, PipeArguments, PipeReturn, From 802a5e25bb2adb4a85d7468ebf652045806ad685 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 13:54:48 -0300 Subject: [PATCH 103/238] Fix flaky tsc by doing some non-sense change --- src/tests/collect.test.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index ae0c8b94..f75e97d3 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -11,6 +11,7 @@ import { const voidFn = composable(() => {}) const append = composable((a: string, b: string) => `${a}${b}`) +const toString = withSchema(z.unknown(), z.any())((a) => String(a)) const add = composable((a: number, b: number) => a + b) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') @@ -25,14 +26,10 @@ describe('collect', () => { args_1: number, ) => { add: number - str: string + string: string void: void } - > = collect({ - add, - str: withSchema(z.unknown(), z.any())((a) => String(a)), - void: voidFn, - }) + > = collect({ add, string: toString, void: voidFn }) const res = await fn(1, 2) @@ -45,17 +42,17 @@ describe('collect', () => { b: number, ) => { add: number - str: string + string: string void: void } > > > type _R = Expect< - Equal> + Equal> > - assertEquals(res, success({ add: 3, str: '1', void: undefined })) + assertEquals(res, success({ add: 3, string: '1', void: undefined })) }) it('uses the same arguments for every function', async () => { From 8e38818e330115822a53717cff077719e65f6587 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 13:57:00 -0300 Subject: [PATCH 104/238] Bump experimental version --- deno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deno.json b/deno.json index cb4cb9bf..296f0770 100644 --- a/deno.json +++ b/deno.json @@ -1,5 +1,5 @@ { - "version": "0.0.0-experimental-20240418-1", + "version": "0.0.0-experimental-20240419-1", "tasks": { "test": "deno test --allow-env --allow-net src", "publish": "deno task build-npm && cd npm/ && npm publish", From d82638ebb5578ef1d43e1b628c6acfca9ffa82dd Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 19 Apr 2024 13:19:10 -0400 Subject: [PATCH 105/238] Add failing test. We should first combina all parameters, and replace it in all functions on a second step --- src/tests/types.test.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index b6245645..6f3cd18a 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -125,6 +125,22 @@ namespace AllArguments { ] > > + type testSubtypesForThreeComposables = Expect< + Equal< + Subject.AllArguments< + [ + Subject.Composable<(x: unknown) => void>, + Subject.Composable<(x: string) => void>, + Subject.Composable<(x: 'foo') => void>, + ] + >, + [ + Subject.Composable<(x: 'foo') => void>, + Subject.Composable<(x: 'foo') => void>, + Subject.Composable<(x: 'foo') => void>, + ] + > + > type testSubtypesForStricterOptional = Expect< Equal< Subject.AllArguments< From 5322fa2b4b1d64e67cbaf127562b20fdc26e3737 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 15:04:41 -0300 Subject: [PATCH 106/238] Fix all with flexible arity and collect types --- src/combinators.ts | 28 +++++++++++++++++----------- src/tests/collect.test.ts | 2 +- src/tests/types.test.ts | 7 +++++++ src/types.ts | 18 +++++++++++++----- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index b2025935..2abf6034 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -76,7 +76,7 @@ function all(...fns: Fns & AllArguments) { return success((results as Success[]).map(({ data }) => data)) }) as Composable< - (...args: Parameters[0]>) => { + (...args: Parameters[0]>>) => { [k in keyof Fns]: UnpackData } > @@ -99,7 +99,11 @@ function collect>( map(cf, (result) => ({ [key]: result })), ) return map(all(...(fnsWithKey as any)), mergeObjects) as Composable< - (...args: Parameters>[0]>) => { + ( + ...args: Parameters< + Exclude>[0], undefined> + > + ) => { [key in keyof Fns]: UnpackData } > @@ -115,8 +119,8 @@ function collect>( * const cf = C.sequence(a, b) * // ^? Composable<(aNumber: number) => [string, boolean]> */ -function sequence( - ...fns: Fn & PipeArguments +function sequence( + ...fns: Fns & PipeArguments ) { return (async (...args) => { const [head, ...tail] = fns @@ -131,7 +135,7 @@ function sequence( result.push(res.data) } return success(result) - }) as Composable<(...args: Parameters) => UnpackAll> + }) as Composable<(...args: Parameters) => UnpackAll> } /** @@ -160,11 +164,11 @@ function map( * const df = merge(a, b) * // ^? DomainFunction<{ a: string, b: number }> */ -function merge( - ...fns: Fn & AllArguments +function merge( + ...fns: Fns & AllArguments ): Composable< - (...args: Parameters[0]>) => MergeObjs<{ - [key in keyof Fn]: UnpackData + (...args: Parameters[0]>>) => MergeObjs<{ + [key in keyof Fns]: UnpackData }> > { return map(all(...(fns as never)), mergeObjects) @@ -180,7 +184,7 @@ const b = mdf(z.object({ n: z.number() }))(({ n }) => String(n)) const df = first(a, b) // ^? DomainFunction */ -function first(...fns: Fn & AllArguments) { +function first(...fns: Fns & AllArguments) { return ((...args) => { return composable(async () => { const results = await Promise.all(fns.map((fn) => fn(...args))) @@ -193,7 +197,9 @@ function first(...fns: Fn & AllArguments) { return result.data })() }) as Composable< - (...args: Parameters[0]>) => UnpackData + ( + ...args: Parameters[0]>> + ) => UnpackData > } diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index f75e97d3..ca208ea0 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -29,7 +29,7 @@ describe('collect', () => { string: string void: void } - > = collect({ add, string: toString, void: voidFn }) + > = collect({ add: add, string: toString, void: voidFn }) const res = await fn(1, 2) diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 6f3cd18a..cbaf5bfd 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -111,6 +111,13 @@ namespace AllArguments { type testOneComposable = Expect< Equal, [Subject.Composable]> > + type Foo = Subject.AllArguments< + [ + Subject.Composable<(x: unknown) => void>, + Subject.Composable<(x: string) => void>, + Subject.Composable<(x: 'foo') => void>, + ] + > type testSubtypesForTwoComposables = Expect< Equal< Subject.AllArguments< diff --git a/src/types.ts b/src/types.ts index d3841a44..fa6a2292 100644 --- a/src/types.ts +++ b/src/types.ts @@ -79,18 +79,26 @@ type PipeArguments< type AllArguments< Fns extends any[], - Arguments extends any[] = [], -> = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] + OriginalFns extends any[] = Fns, +> = Fns extends [Composable<(...a: infer PA) => any>, ...infer restA] ? restA extends [Composable<(...b: infer PB) => infer OB>, ...infer restB] - ? Internal.SubtypesTuple extends [...infer MergedP] + ? Internal.SubtypesTuple extends [...infer MergedP] ? AllArguments< [Composable<(...args: MergedP) => OB>, ...restB], - [...Arguments, Composable<(...a: MergedP) => OA>] + OriginalFns > : ['Fail to compose', PA, 'does not fit in', PB] - : [...Arguments, Composable<(...a: PA) => OA>] + : ApplyArgumentsToFns : never +type ApplyArgumentsToFns< + Fns extends any[], + Args extends any[], + Output extends any[] = [], +> = Fns extends [(...a: any[]) => infer OA, ...infer restA] + ? ApplyArgumentsToFns OA]> + : Output + type CollectArguments> = AllArguments< Internal.UnionToTuple > extends ['Fail to compose', ...any[]] From d8271582c22ad6dfa84fd85850b41019b1266478 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 15:06:05 -0300 Subject: [PATCH 107/238] Remove log leftover --- src/tests/types.test.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index cbaf5bfd..6f3cd18a 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -111,13 +111,6 @@ namespace AllArguments { type testOneComposable = Expect< Equal, [Subject.Composable]> > - type Foo = Subject.AllArguments< - [ - Subject.Composable<(x: unknown) => void>, - Subject.Composable<(x: string) => void>, - Subject.Composable<(x: 'foo') => void>, - ] - > type testSubtypesForTwoComposables = Expect< Equal< Subject.AllArguments< From a9ef0663d2b42ace9b294376041a5a698c1e0eac Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 16:29:56 -0300 Subject: [PATCH 108/238] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6d3790b..a663be41 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Composable Functions +![Composable Functions](https://github.com/seasonedcc/composable-functions/assets/566971/bc025ec6-420a-40bd-9d66-78bdd85569b7) ## Quickstart From 83b08568bafff8aec73baf7d7938a2db15431ec3 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 16:31:11 -0300 Subject: [PATCH 109/238] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a663be41..958b78d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Composable Functions](https://github.com/seasonedcc/composable-functions/assets/566971/bc025ec6-420a-40bd-9d66-78bdd85569b7) +![Composable Functions](https://github.com/seasonedcc/composable-functions/assets/566971/17048e80-271a-4c8b-9914-7bd10fba5e42) ## Quickstart From c4188a4a1b220454c34e7724122869df2e2c3d95 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 16:36:07 -0300 Subject: [PATCH 110/238] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 958b78d1..60509cd9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ -![Composable Functions](https://github.com/seasonedcc/composable-functions/assets/566971/17048e80-271a-4c8b-9914-7bd10fba5e42) + + + + Composable Functions + ## Quickstart From b93641013a2903aa3fd8c9c5d1662fba403f96b6 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 19 Apr 2024 17:02:42 -0300 Subject: [PATCH 111/238] Add ArkType example --- examples/arktype/.gitignore | 23 +++ examples/arktype/package.json | 18 ++ examples/arktype/pnpm-lock.yaml | 318 +++++++++++++++++++++++++++++++ examples/arktype/src/adapters.ts | 52 +++++ examples/arktype/src/index.ts | 18 ++ examples/arktype/tsconfig.json | 23 +++ 6 files changed, 452 insertions(+) create mode 100644 examples/arktype/.gitignore create mode 100644 examples/arktype/package.json create mode 100644 examples/arktype/pnpm-lock.yaml create mode 100644 examples/arktype/src/adapters.ts create mode 100644 examples/arktype/src/index.ts create mode 100644 examples/arktype/tsconfig.json diff --git a/examples/arktype/.gitignore b/examples/arktype/.gitignore new file mode 100644 index 00000000..f1e61f37 --- /dev/null +++ b/examples/arktype/.gitignore @@ -0,0 +1,23 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/examples/arktype/package.json b/examples/arktype/package.json new file mode 100644 index 00000000..cc6a05bf --- /dev/null +++ b/examples/arktype/package.json @@ -0,0 +1,18 @@ +{ + "name": "composable-functions-arktype-example", + "private": true, + "version": "0.0.0", + "type": "module", + "main": "src/index.ts", + "scripts": { + "dev": "tsx src/index.ts" + }, + "devDependencies": { + "tsx": "^4.7.2" + }, + "dependencies": { + "arktype": "2.0.0-dev.7", + "composable-functions": "file:../../npm", + "typescript": "^5.4.5" + } +} diff --git a/examples/arktype/pnpm-lock.yaml b/examples/arktype/pnpm-lock.yaml new file mode 100644 index 00000000..159f97b7 --- /dev/null +++ b/examples/arktype/pnpm-lock.yaml @@ -0,0 +1,318 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +dependencies: + arktype: + specifier: 2.0.0-dev.7 + version: 2.0.0-dev.7 + composable-functions: + specifier: file:../../npm + version: file:../../npm + typescript: + specifier: ^5.4.5 + version: 5.4.5 + +devDependencies: + tsx: + specifier: ^4.7.2 + version: 4.7.2 + +packages: + + /@arktype/schema@0.0.7: + resolution: {integrity: sha512-awo14Oi98bn6pEgN7soiXvD+mQzidLgzABVO7Tpbw6xtU7+XRWp6JucSEmWLASC+fcoK0QSJxdoC+rm3iIKarQ==} + dependencies: + '@arktype/util': 0.0.33 + dev: false + + /@arktype/util@0.0.33: + resolution: {integrity: sha512-MYbrLHf0tVYjxI84m0mMRISmKKVoPzv25B1/X05nePUcyPqROoDBn+hYhHpB0GqnJZQOr8UG1CyMuxjFeVbTNg==} + dev: false + + /@esbuild/aix-ppc64@0.19.12: + resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64@0.19.12: + resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm@0.19.12: + resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64@0.19.12: + resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64@0.19.12: + resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64@0.19.12: + resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64@0.19.12: + resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64@0.19.12: + resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64@0.19.12: + resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm@0.19.12: + resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32@0.19.12: + resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64@0.19.12: + resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-mips64el@0.19.12: + resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64@0.19.12: + resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64@0.19.12: + resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x@0.19.12: + resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64@0.19.12: + resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64@0.19.12: + resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64@0.19.12: + resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64@0.19.12: + resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64@0.19.12: + resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32@0.19.12: + resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64@0.19.12: + resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /arktype@2.0.0-dev.7: + resolution: {integrity: sha512-TeehK+ExNsvqNoEccNOMs73LcNwR9+gX9pQsoCIvZfuxrQ24nB5MUQGweAAuNSwVX7GUUU9Ad0BWGnsvD8ST+g==} + dependencies: + '@arktype/schema': 0.0.7 + '@arktype/util': 0.0.33 + dev: false + + /esbuild@0.19.12: + resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/aix-ppc64': 0.19.12 + '@esbuild/android-arm': 0.19.12 + '@esbuild/android-arm64': 0.19.12 + '@esbuild/android-x64': 0.19.12 + '@esbuild/darwin-arm64': 0.19.12 + '@esbuild/darwin-x64': 0.19.12 + '@esbuild/freebsd-arm64': 0.19.12 + '@esbuild/freebsd-x64': 0.19.12 + '@esbuild/linux-arm': 0.19.12 + '@esbuild/linux-arm64': 0.19.12 + '@esbuild/linux-ia32': 0.19.12 + '@esbuild/linux-loong64': 0.19.12 + '@esbuild/linux-mips64el': 0.19.12 + '@esbuild/linux-ppc64': 0.19.12 + '@esbuild/linux-riscv64': 0.19.12 + '@esbuild/linux-s390x': 0.19.12 + '@esbuild/linux-x64': 0.19.12 + '@esbuild/netbsd-x64': 0.19.12 + '@esbuild/openbsd-x64': 0.19.12 + '@esbuild/sunos-x64': 0.19.12 + '@esbuild/win32-arm64': 0.19.12 + '@esbuild/win32-ia32': 0.19.12 + '@esbuild/win32-x64': 0.19.12 + dev: true + + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /get-tsconfig@4.7.3: + resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: true + + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: true + + /tsx@4.7.2: + resolution: {integrity: sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==} + engines: {node: '>=18.0.0'} + hasBin: true + dependencies: + esbuild: 0.19.12 + get-tsconfig: 4.7.3 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /typescript@5.4.5: + resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} + engines: {node: '>=14.17'} + hasBin: true + dev: false + + file:../../npm: + resolution: {directory: ../../npm, type: directory} + name: composable-functions + dev: false diff --git a/examples/arktype/src/adapters.ts b/examples/arktype/src/adapters.ts new file mode 100644 index 00000000..ee2f3d01 --- /dev/null +++ b/examples/arktype/src/adapters.ts @@ -0,0 +1,52 @@ +import { + composable, + Composable, + EnvironmentError, + failure, + InputError, + UnpackData, +} from 'composable-functions' +import { type, Type } from 'arktype' + +const objectSchema = type('unknown') +const alwaysUndefinedSchema = type('any', '=>', () => undefined) + +function withArkSchema( + inputSchema?: Type, + environmentSchema?: Type, +) { + return function ( + handler: (input: I, environment: E) => Output, + ): Composable<(input?: unknown, environment?: unknown) => Awaited> { + return applyArkSchema(composable(handler), inputSchema, environmentSchema) + } +} + +function applyArkSchema( + fn: A, + inputSchema?: Type, + environmentSchema?: Type, +): Composable<(input?: unknown, environment?: unknown) => UnpackData> { + return async function (input, environment = {}) { + const envResult = (environmentSchema ?? objectSchema)(environment) + const result = (inputSchema ?? alwaysUndefinedSchema)(input) + + if (!result.data || !envResult.data) { + const inputErrors = Array.isArray(result.errors) + ? result.errors.map( + (error) => new InputError(error.message, error.path as string[]), + ) + : [] + const envErrors = Array.isArray(envResult.errors) + ? envResult.errors.map( + (error) => + new EnvironmentError(error.message, error.path as string[]), + ) + : [] + return failure([...inputErrors, ...envErrors]) + } + return fn(result.data, envResult.data) + } +} + +export { withArkSchema, applyArkSchema } diff --git a/examples/arktype/src/index.ts b/examples/arktype/src/index.ts new file mode 100644 index 00000000..b1899c96 --- /dev/null +++ b/examples/arktype/src/index.ts @@ -0,0 +1,18 @@ +import { composable } from 'composable-functions' +import { applyArkSchema, withArkSchema } from './adapters' +import { type } from 'arktype' + +const fn = composable((a: number, b: number) => a + b) +const schemaFn = applyArkSchema(fn, type('number'), type('number')) +const df = withArkSchema(type('number'), type('number'))((a, b) => a + b) + +const result = await schemaFn(1, 2) +console.log(result) +// { success: true, data: 3, errors: [] } + +const result2 = await df('1', 2) +console.log(result2) +// { +// success: false, +// errors: [InputError("must be a number (was string)", [])] +// } diff --git a/examples/arktype/tsconfig.json b/examples/arktype/tsconfig.json new file mode 100644 index 00000000..75abdef2 --- /dev/null +++ b/examples/arktype/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "target": "ES2020", + "useDefineForClassFields": true, + "module": "ESNext", + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["src"] +} From 7b6353bd2f5fe5a90eb08ea88b369760200ca2be Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 09:01:24 -0300 Subject: [PATCH 112/238] Keep easy access to tests prelude in tests --- src/environment/tests/apply-environment.test.ts | 2 +- src/environment/tests/branch.test.ts | 8 +------- src/environment/tests/collect-sequence.test.ts | 2 +- src/environment/tests/pipe.test.ts | 2 +- src/environment/tests/prelude.ts | 1 + src/environment/tests/sequence.test.ts | 2 +- src/internal/types.test.ts | 2 +- src/tests/all.test.ts | 8 +------- src/tests/catch-error.test.ts | 2 +- src/tests/collect.test.ts | 2 +- src/tests/constructors.test.ts | 2 +- src/tests/first.test.ts | 2 +- src/tests/input-resolvers.test.ts | 2 +- src/tests/map-error.test.ts | 2 +- src/tests/map.test.ts | 2 +- src/tests/merge.test.ts | 8 +------- src/tests/pipe.test.ts | 2 +- src/{test-prelude.ts => tests/prelude.ts} | 0 src/tests/sequence.test.ts | 2 +- src/tests/trace.test.ts | 8 +------- src/tests/types.test.ts | 2 +- 21 files changed, 20 insertions(+), 43 deletions(-) create mode 100644 src/environment/tests/prelude.ts rename src/{test-prelude.ts => tests/prelude.ts} (100%) diff --git a/src/environment/tests/apply-environment.test.ts b/src/environment/tests/apply-environment.test.ts index 592dfa46..61c55206 100644 --- a/src/environment/tests/apply-environment.test.ts +++ b/src/environment/tests/apply-environment.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import { environment, EnvironmentError, diff --git a/src/environment/tests/branch.test.ts b/src/environment/tests/branch.test.ts index 60fc1bfb..a95adf82 100644 --- a/src/environment/tests/branch.test.ts +++ b/src/environment/tests/branch.test.ts @@ -1,10 +1,4 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../../test-prelude.ts' +import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' import { all, composable, diff --git a/src/environment/tests/collect-sequence.test.ts b/src/environment/tests/collect-sequence.test.ts index cc5c7673..6e7dd628 100644 --- a/src/environment/tests/collect-sequence.test.ts +++ b/src/environment/tests/collect-sequence.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import { environment, withSchema, diff --git a/src/environment/tests/pipe.test.ts b/src/environment/tests/pipe.test.ts index 1fdf8f15..44fc85cb 100644 --- a/src/environment/tests/pipe.test.ts +++ b/src/environment/tests/pipe.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import { environment, EnvironmentError, diff --git a/src/environment/tests/prelude.ts b/src/environment/tests/prelude.ts new file mode 100644 index 00000000..53df1e5c --- /dev/null +++ b/src/environment/tests/prelude.ts @@ -0,0 +1 @@ +export * from '../../tests/prelude.ts' diff --git a/src/environment/tests/sequence.test.ts b/src/environment/tests/sequence.test.ts index b877229b..a4b1e61a 100644 --- a/src/environment/tests/sequence.test.ts +++ b/src/environment/tests/sequence.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import { environment, EnvironmentError, diff --git a/src/internal/types.test.ts b/src/internal/types.test.ts index 2464c59a..277991fe 100644 --- a/src/internal/types.test.ts +++ b/src/internal/types.test.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file no-namespace ban-ts-comment -import { assertEquals, describe, it } from '../test-prelude.ts' +import { assertEquals, describe, it } from '../tests/prelude.ts' import { Internal } from './types.ts' namespace UnionToTuple { diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts index f9fcb887..92a32988 100644 --- a/src/tests/all.test.ts +++ b/src/tests/all.test.ts @@ -1,10 +1,4 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../test-prelude.ts' +import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' import { all, composable, diff --git a/src/tests/catch-error.test.ts b/src/tests/catch-error.test.ts index 04bd1c9e..f9df942a 100644 --- a/src/tests/catch-error.test.ts +++ b/src/tests/catch-error.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import type { Result, Composable } from '../index.ts' import { catchError, composable, success, withSchema } from '../index.ts' diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index ca208ea0..75fcb7ef 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import type { Result, Composable } from '../index.ts' import { collect, diff --git a/src/tests/constructors.test.ts b/src/tests/constructors.test.ts index aac8848c..7a08b4bc 100644 --- a/src/tests/constructors.test.ts +++ b/src/tests/constructors.test.ts @@ -5,7 +5,7 @@ import { describe, it, z, -} from '../test-prelude.ts' +} from './prelude.ts' import type { Result, Composable, Success } from '../index.ts' import { composable, diff --git a/src/tests/first.test.ts b/src/tests/first.test.ts index 64358c33..f2f1cc1f 100644 --- a/src/tests/first.test.ts +++ b/src/tests/first.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import { withSchema, first, failure, InputError, success } from '../index.ts' import type { Composable } from '../index.ts' import { composable } from '../index.ts' diff --git a/src/tests/input-resolvers.test.ts b/src/tests/input-resolvers.test.ts index a68cc817..b5a44e4a 100644 --- a/src/tests/input-resolvers.test.ts +++ b/src/tests/input-resolvers.test.ts @@ -1,4 +1,4 @@ -import { describe, it, assertEquals } from '../test-prelude.ts' +import { describe, it, assertEquals } from './prelude.ts' import * as subject from '../input-resolvers.ts' const makePost: (entries: Array<[string, string]>, url?: string) => Request = ( diff --git a/src/tests/map-error.test.ts b/src/tests/map-error.test.ts index 3d93fd24..face8c8b 100644 --- a/src/tests/map-error.test.ts +++ b/src/tests/map-error.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' +import { assertEquals, describe, it } from './prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, mapError } from '../index.ts' import { success } from '../constructors.ts' diff --git a/src/tests/map.test.ts b/src/tests/map.test.ts index 232bb24d..1708f5f5 100644 --- a/src/tests/map.test.ts +++ b/src/tests/map.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' +import { assertEquals, describe, it } from './prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, map, pipe, success } from '../index.ts' diff --git a/src/tests/merge.test.ts b/src/tests/merge.test.ts index 8ceb2b8e..936d28a7 100644 --- a/src/tests/merge.test.ts +++ b/src/tests/merge.test.ts @@ -1,10 +1,4 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../test-prelude.ts' +import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' import { merge, withSchema, failure, InputError, success } from '../index.ts' import type { Composable } from '../index.ts' import { composable } from '../index.ts' diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index bb733cd8..b7f68952 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it } from '../test-prelude.ts' +import { assertEquals, describe, it } from './prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, pipe, success } from '../index.ts' diff --git a/src/test-prelude.ts b/src/tests/prelude.ts similarity index 100% rename from src/test-prelude.ts rename to src/tests/prelude.ts diff --git a/src/tests/sequence.test.ts b/src/tests/sequence.test.ts index ec41aec4..b63703dd 100644 --- a/src/tests/sequence.test.ts +++ b/src/tests/sequence.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, describe, it, z } from '../test-prelude.ts' +import { assertEquals, describe, it, z } from './prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, sequence, success } from '../index.ts' import { withSchema } from '../index.ts' diff --git a/src/tests/trace.test.ts b/src/tests/trace.test.ts index 58a351ed..b044710c 100644 --- a/src/tests/trace.test.ts +++ b/src/tests/trace.test.ts @@ -1,10 +1,4 @@ -import { - assertEquals, - assertIsError, - describe, - it, - z, -} from '../test-prelude.ts' +import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' import { composable, withSchema, diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 6f3cd18a..7e63bff8 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -1,6 +1,6 @@ // deno-lint-ignore-file no-namespace ban-ts-comment import { withSchema } from '../index.ts' -import { assertEquals, describe, it } from '../test-prelude.ts' +import { assertEquals, describe, it } from './prelude.ts' import * as Subject from '../types.ts' namespace MergeObjs { From cb7fe4da90dd6b1f00e8713141bb82dab1a5e16d Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 08:32:54 -0300 Subject: [PATCH 113/238] Remove arcane syntax from combinators arguments --- src/combinators.ts | 15 ++++-------- src/tests/collect.test.ts | 3 +-- src/tests/pipe.test.ts | 3 +-- src/tests/types.test.ts | 51 --------------------------------------- src/types.ts | 10 -------- 5 files changed, 7 insertions(+), 75 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 2abf6034..8c0e508f 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -1,6 +1,5 @@ import type { AllArguments, - CollectArguments, Composable, MergeObjs, PipeArguments, @@ -66,7 +65,7 @@ function pipe( * const cf = C.all(a, b, c) // ^? Composable<(id: number) => [string, number, boolean]> */ -function all(...fns: Fns & AllArguments) { +function all(...fns: Fns) { return (async (...args) => { const results = await Promise.all(fns.map((fn) => fn(...args))) @@ -92,9 +91,7 @@ function all(...fns: Fns & AllArguments) { * const df = collect({ a, b }) // ^? Composable<() => { a: string, b: number }> */ -function collect>( - fns: Fns & CollectArguments, -) { +function collect>(fns: Fns) { const fnsWithKey = Object.entries(fns).map(([key, cf]) => map(cf, (result) => ({ [key]: result })), ) @@ -119,9 +116,7 @@ function collect>( * const cf = C.sequence(a, b) * // ^? Composable<(aNumber: number) => [string, boolean]> */ -function sequence( - ...fns: Fns & PipeArguments -) { +function sequence(...fns: Fns) { return (async (...args) => { const [head, ...tail] = fns @@ -165,7 +160,7 @@ function map( * // ^? DomainFunction<{ a: string, b: number }> */ function merge( - ...fns: Fns & AllArguments + ...fns: Fns ): Composable< (...args: Parameters[0]>>) => MergeObjs<{ [key in keyof Fns]: UnpackData @@ -184,7 +179,7 @@ const b = mdf(z.object({ n: z.number() }))(({ n }) => String(n)) const df = first(a, b) // ^? DomainFunction */ -function first(...fns: Fns & AllArguments) { +function first(...fns: Fns) { return ((...args) => { return composable(async () => { const results = await Promise.all(fns.map((fn) => fn(...args))) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 75fcb7ef..f23e65ba 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -10,8 +10,8 @@ import { } from '../index.ts' const voidFn = composable(() => {}) -const append = composable((a: string, b: string) => `${a}${b}`) const toString = withSchema(z.unknown(), z.any())((a) => String(a)) +const append = composable((a: string, b: string) => `${a}${b}`) const add = composable((a: number, b: number) => a + b) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') @@ -57,7 +57,6 @@ describe('collect', () => { it('uses the same arguments for every function', async () => { // The runtime will work since passing 1, 2 will be coerced to '1', '2' - //@ts-expect-error add and append parameters are incompatible const fn = collect({ add: add, string: append, diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index b7f68952..939476df 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -61,8 +61,7 @@ describe('pipe', () => { const res = await fn(1, 2) type _FN = Expect< - //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter - Equal string>> + Equal > type _R = Expect>> diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 7e63bff8..4682390a 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -229,57 +229,6 @@ namespace AllArguments { > } -namespace CollectArguments { - type testNoEmptyArgumentList = Expect< - Equal, never> - > - type testOneComposable = Expect< - Equal< - Subject.CollectArguments<{ a: Subject.Composable }>, - { a: Subject.Composable } - > - > - type testSubtypesForTwoComposables = Expect< - Equal< - Subject.CollectArguments<{ - a: Subject.Composable<(x: string, y: 1) => void> - b: Subject.Composable<(x: 'foo', y: number) => void> - }>, - { - a: Subject.Composable<(x: 'foo', y: 1) => void> - b: Subject.Composable<(x: 'foo', y: 1) => void> - } - > - > - type testMaxArityForTwoComposables = Expect< - Equal< - Subject.CollectArguments<{ - a: Subject.Composable<(x: string, y: number) => void> - b: Subject.Composable<(x: 'foo') => void> - }>, - { - a: Subject.Composable<(x: 'foo', y: number) => void> - b: Subject.Composable<(x: 'foo', y: number) => void> - } - > - > - - type testCompositionFailure = Expect< - Equal< - Subject.CollectArguments<{ - a: Subject.Composable<(x: string, y: string) => void> - b: Subject.Composable<(x: 'foo', y: number) => void> - }>, - [ - 'Fail to compose', - [x: string, y: string], - 'does not fit in', - [x: 'foo', y: number], - ] - > - > -} - namespace UnpackData { type testExtractsDataFromPromisedResult = Expect< Equal Promise>>, string> diff --git a/src/types.ts b/src/types.ts index fa6a2292..84331395 100644 --- a/src/types.ts +++ b/src/types.ts @@ -99,15 +99,6 @@ type ApplyArgumentsToFns< ? ApplyArgumentsToFns OA]> : Output -type CollectArguments> = AllArguments< - Internal.UnionToTuple -> extends ['Fail to compose', ...any[]] - ? AllArguments> - : Internal.Zip< - Internal.Keys, - AllArguments> - > - type RecordToTuple> = Internal.RecordValuesFromKeysTuple> @@ -144,7 +135,6 @@ type Last = T extends [...infer _I, infer L] export type { AllArguments, - CollectArguments, Composable, Failure, Last, From c0d213811004e26660d93a54612764203f88e7e5 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 08:57:03 -0300 Subject: [PATCH 114/238] Remove some legacy type casts --- src/tests/collect.test.ts | 4 ++-- src/tests/constructors.test.ts | 2 +- src/tests/map-error.test.ts | 6 +++--- src/tests/map.test.ts | 4 ++-- src/tests/pipe.test.ts | 14 +++++--------- src/tests/sequence.test.ts | 2 +- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index f23e65ba..0bdc499c 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -105,8 +105,8 @@ describe('collect', () => { > assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') - assertEquals(res.errors![1].message, 'a is 1') + assertEquals(res.errors[0].message, 'a is 1') + assertEquals(res.errors[1].message, 'a is 1') }) it('should return error when one of the schema functions has input errors', async () => { diff --git a/src/tests/constructors.test.ts b/src/tests/constructors.test.ts index 7a08b4bc..57c7c108 100644 --- a/src/tests/constructors.test.ts +++ b/src/tests/constructors.test.ts @@ -71,7 +71,7 @@ describe('composable', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') + assertEquals(res.errors[0].message, 'a is 1') }) }) diff --git a/src/tests/map-error.test.ts b/src/tests/map-error.test.ts index face8c8b..1ccd79d5 100644 --- a/src/tests/map-error.test.ts +++ b/src/tests/map-error.test.ts @@ -35,7 +35,7 @@ describe('mapError', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1!!!') + assertEquals(res.errors[0].message, 'a is 1!!!') }) it('accepts an async mapper', async () => { @@ -50,7 +50,7 @@ describe('mapError', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1!!!') + assertEquals(res.errors[0].message, 'a is 1!!!') }) it('fails when mapper fail', async () => { @@ -65,6 +65,6 @@ describe('mapError', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'Mapper also has problems') + assertEquals(res.errors[0].message, 'Mapper also has problems') }) }) diff --git a/src/tests/map.test.ts b/src/tests/map.test.ts index 1708f5f5..c304edd4 100644 --- a/src/tests/map.test.ts +++ b/src/tests/map.test.ts @@ -56,7 +56,7 @@ describe('map', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') + assertEquals(res.errors[0].message, 'a is 1') }) it('fails when mapper fail', async () => { @@ -71,6 +71,6 @@ describe('map', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'Mapper also has problems') + assertEquals(res.errors[0].message, 'Mapper also has problems') }) }) diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index 939476df..6b40adfc 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -2,7 +2,7 @@ import { assertEquals, describe, it } from './prelude.ts' import type { Result, Composable } from '../index.ts' import { composable, pipe, success } from '../index.ts' -const toString = composable(String) +const toString = composable((a: unknown) => `${a}`) const add = composable((a: number, b: number) => a + b) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') @@ -51,7 +51,7 @@ describe('pipe', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') + assertEquals(res.errors[0].message, 'a is 1') }) it('catches the errors from function B', async () => { @@ -61,16 +61,12 @@ describe('pipe', () => { const res = await fn(1, 2) type _FN = Expect< - Equal + Equal > type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'always throw') - assertEquals( - // deno-lint-ignore no-explicit-any - (res.errors[0] as any).cause, - 'it was made for this', - ) + assertEquals(res.errors[0].message, 'always throw') + assertEquals(res.errors[0].cause, 'it was made for this') }) }) diff --git a/src/tests/sequence.test.ts b/src/tests/sequence.test.ts index b63703dd..dc55483e 100644 --- a/src/tests/sequence.test.ts +++ b/src/tests/sequence.test.ts @@ -71,6 +71,6 @@ describe('sequence', () => { type _R = Expect>> assertEquals(res.success, false) - assertEquals(res.errors![0].message, 'a is 1') + assertEquals(res.errors[0].message, 'a is 1') }) }) From 94c6a6905d76f5ada0d761b14b7206e5a3bd830a Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 09:29:33 -0300 Subject: [PATCH 115/238] Extract a lil helper --- src/internal/types.ts | 46 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/internal/types.ts b/src/internal/types.ts index 32a341f2..bdbf3fad 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -74,18 +74,14 @@ namespace Internal { ? [...Output, ...TupleA] : TupleA extends [infer headA, ...infer restA] ? TupleB extends [infer headB, ...infer restB] - ? CommonSubType extends { - 'Incompatible arguments ': true - } - ? CommonSubType + ? IsIncompatible extends true + ? Incompatible : SubtypesTuple]> : // TB is partial // We should handle partial case before recursion TupleB extends Partial<[infer headPartial, ...infer restPartial]> - ? CommonSubType extends { - 'Incompatible arguments ': true - } - ? CommonSubType + ? IsIncompatible extends true + ? Incompatible : SubtypesTuple< restA, restPartial, @@ -96,10 +92,8 @@ namespace Internal { ? // TA is partial // We should handle partial case before recursion TupleA extends Partial<[infer headPartial, ...infer restPartial]> - ? CommonSubType extends { - 'Incompatible arguments ': true - } - ? CommonSubType + ? IsIncompatible extends true + ? Incompatible : SubtypesTuple< restB, restPartial, @@ -114,9 +108,7 @@ namespace Internal { */ TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> - ? CommonSubType extends { - 'Incompatible arguments ': true - } + ? IsIncompatible extends true ? SubtypesTuple< Partial, Partial, @@ -137,16 +129,20 @@ namespace Internal { : A extends Record ? B extends Record ? Prettify - : { - 'Incompatible arguments ': true - argument1: A - argument2: B - } - : { - 'Incompatible arguments ': true - argument1: A - argument2: B - } + : Incompatible + : Incompatible + + type Incompatible = { + 'Incompatible arguments ': true + argument1: A + argument2: B + } + + type IsIncompatible = CommonSubType extends { + 'Incompatible arguments ': true + } + ? true + : false } export type { Internal } From 905af43934612c2dc2d8999556375f36da4a2af2 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 10:15:03 -0300 Subject: [PATCH 116/238] =?UTF-8?q?=F0=9F=92=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/internal/types.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/internal/types.ts b/src/internal/types.ts index bdbf3fad..56905c74 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -1,5 +1,17 @@ // deno-lint-ignore-file no-namespace +type Incompatible = { + 'Incompatible arguments ': true + argument1: A + argument2: B +} + +type IsIncompatible = Internal.CommonSubType extends { + 'Incompatible arguments ': true +} + ? true + : false + namespace Internal { export type Prettify = { [K in keyof T]: T[K] @@ -77,7 +89,7 @@ namespace Internal { ? IsIncompatible extends true ? Incompatible : SubtypesTuple]> - : // TB is partial + : // TupleB is partial // We should handle partial case before recursion TupleB extends Partial<[infer headPartial, ...infer restPartial]> ? IsIncompatible extends true @@ -89,7 +101,7 @@ namespace Internal { > : never : TupleB extends [infer headBNoA, ...infer restB] - ? // TA is partial + ? // TupleA is partial // We should handle partial case before recursion TupleA extends Partial<[infer headPartial, ...infer restPartial]> ? IsIncompatible extends true @@ -104,7 +116,7 @@ namespace Internal { * We should continue the recursion checking optional parameters * We can pattern match optionals using Partial * We should start handling partials as soon one side of mandatory ends - * Remove ...TA, ...TB bellow + * Remove ...TupleA, ...TupleB bellow */ TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> @@ -131,18 +143,6 @@ namespace Internal { ? Prettify : Incompatible : Incompatible - - type Incompatible = { - 'Incompatible arguments ': true - argument1: A - argument2: B - } - - type IsIncompatible = CommonSubType extends { - 'Incompatible arguments ': true - } - ? true - : false } export type { Internal } From c75b7862f2669a901257d9f80f53ddff895108db Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 11:13:16 -0300 Subject: [PATCH 117/238] Remove arcane params from pipe --- src/combinators.ts | 6 ++---- src/tests/pipe.test.ts | 3 +-- src/tests/sequence.test.ts | 5 ++--- src/types.ts | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 8c0e508f..188f9169 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -43,15 +43,13 @@ function mergeObjects(objs: T): MergeObjs { * const d = C.pipe(a, b) * // ^? Composable<({ aNumber }: { aNumber: number }) => { aBoolean: boolean }> */ -function pipe( - ...fns: Fns & PipeArguments -) { +function pipe(...fns: Fns) { return (async (...args) => { const res = await sequence(...(fns as never))(...(args as never)) return !res.success ? failure(res.errors) : success(res.data[res.data.length - 1]) - }) as PipeReturn + }) as PipeReturn> } /** diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index 6b40adfc..598cd5de 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -55,9 +55,8 @@ describe('pipe', () => { }) it('catches the errors from function B', async () => { - //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter const fn = pipe(add, alwaysThrow, toString) - //@ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter + // @ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter const res = await fn(1, 2) type _FN = Expect< diff --git a/src/tests/sequence.test.ts b/src/tests/sequence.test.ts index dc55483e..902dfb98 100644 --- a/src/tests/sequence.test.ts +++ b/src/tests/sequence.test.ts @@ -4,7 +4,7 @@ import { composable, sequence, success } from '../index.ts' import { withSchema } from '../index.ts' const toString = composable((a: unknown) => `${a}`) -const add = withSchema(z.number(), z.number())((a, b) => a + b) +const schemaAdd = withSchema(z.number(), z.number())((a, b) => a + b) const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') return a + b @@ -12,13 +12,12 @@ const faultyAdd = composable((a: number, b: number) => { describe('sequence', () => { it('sends the results of the first function to the second and saves every step of the result', async () => { - const fn = sequence(add, toString) + const fn = sequence(schemaAdd, toString) const res = await fn(1, 2) type _FN = Expect< Equal< typeof fn, - // TODO: this is wrong, it should infer the params Composable<(a?: unknown, b?: unknown) => [number, string]> > > diff --git a/src/types.ts b/src/types.ts index 84331395..73ebe3d5 100644 --- a/src/types.ts +++ b/src/types.ts @@ -55,7 +55,7 @@ type PipeReturn = Fns extends [ : ['Fail to compose', Awaited, 'does not fit in', PB] : Fns extends [Composable<(...args: infer P) => infer O>] ? Composable<(...args: P) => O> - : never + : Fns type PipeArguments< Fns extends any[], From 69d3f795c1a81bdbb55cf9032897195d622b9cbc Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 11:26:13 -0300 Subject: [PATCH 118/238] Fix case with composing a full partial with non-partial args --- src/internal/types.test.ts | 11 +++++++++++ src/internal/types.ts | 8 ++++---- src/tests/first.test.ts | 5 ++--- src/tests/merge.test.ts | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/internal/types.test.ts b/src/internal/types.test.ts index 277991fe..e095e62a 100644 --- a/src/internal/types.test.ts +++ b/src/internal/types.test.ts @@ -163,6 +163,17 @@ namespace SubtypesTuple { > > + type WithOptional3 = Expect< + Equal< + Internal.SubtypesTuple< + Parameters<(a?: string, b?: number) => void>, + Parameters<(a: string) => void>, + [] + >, + [string, number?] + > + > + type WithObjects = Expect< Equal< Internal.SubtypesTuple< diff --git a/src/internal/types.ts b/src/internal/types.ts index 56905c74..9a5252a4 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -96,8 +96,8 @@ namespace Internal { ? Incompatible : SubtypesTuple< restA, - restPartial, - [...Output, CommonSubType] + Partial, + [...Output, CommonSubType>] > : never : TupleB extends [infer headBNoA, ...infer restB] @@ -108,8 +108,8 @@ namespace Internal { ? Incompatible : SubtypesTuple< restB, - restPartial, - [...Output, CommonSubType] + Partial, + [...Output, CommonSubType>] > : never : /* diff --git a/src/tests/first.test.ts b/src/tests/first.test.ts index f2f1cc1f..90fb7adc 100644 --- a/src/tests/first.test.ts +++ b/src/tests/first.test.ts @@ -15,14 +15,13 @@ describe('first', () => { Composable< ( input: { id: number }, - environment: unknown, + environment?: unknown, ) => string | number | boolean > > > - // TODO: we should keep the environment optional when composing with interoperability - const results = await d({ id: 1 }, {}) + const results = await d({ id: 1 }) assertEquals(results, success('1')) }) diff --git a/src/tests/merge.test.ts b/src/tests/merge.test.ts index 936d28a7..99c06ff8 100644 --- a/src/tests/merge.test.ts +++ b/src/tests/merge.test.ts @@ -19,13 +19,13 @@ describe('merge', () => { Composable< ( input: { id: number }, - environment: unknown, + environment?: unknown, ) => { resultA: number; resultB: number } > > > - assertEquals(await c({ id: 1 }, {}), success({ resultA: 2, resultB: 0 })) + assertEquals(await c({ id: 1 }), success({ resultA: 2, resultB: 0 })) }) it('should combine many schema functions into one', async () => { From 6b9dbf70f733975725ad9754ccaedf10bc2dba7f Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 11:35:27 -0300 Subject: [PATCH 119/238] Normalize helpers for composition failure and argument incompatibility failure --- src/internal/types.ts | 36 +++++++++++++++++++----------------- src/tests/pipe.test.ts | 2 +- src/types.ts | 10 +++++----- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/internal/types.ts b/src/internal/types.ts index 9a5252a4..2d4fc1c3 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -1,18 +1,20 @@ // deno-lint-ignore-file no-namespace -type Incompatible = { - 'Incompatible arguments ': true - argument1: A - argument2: B -} +namespace Internal { + export type IncompatibleArguments = { + 'Incompatible arguments ': true + argument1: A + argument2: B + } -type IsIncompatible = Internal.CommonSubType extends { - 'Incompatible arguments ': true -} - ? true - : false + export type IsIncompatible = Internal.CommonSubType extends { + 'Incompatible arguments ': true + } + ? true + : false + + export type FailToCompose = ['Fail to compose', A, 'does not fit in', B] -namespace Internal { export type Prettify = { [K in keyof T]: T[K] // deno-lint-ignore ban-types @@ -73,7 +75,7 @@ namespace Internal { ] ? U extends HEAD ? EveryElementTakes - : ['Fail to compose', undefined, 'does not fit in', HEAD] + : FailToCompose : true export type SubtypesTuple< @@ -87,13 +89,13 @@ namespace Internal { : TupleA extends [infer headA, ...infer restA] ? TupleB extends [infer headB, ...infer restB] ? IsIncompatible extends true - ? Incompatible + ? IncompatibleArguments : SubtypesTuple]> : // TupleB is partial // We should handle partial case before recursion TupleB extends Partial<[infer headPartial, ...infer restPartial]> ? IsIncompatible extends true - ? Incompatible + ? IncompatibleArguments : SubtypesTuple< restA, Partial, @@ -105,7 +107,7 @@ namespace Internal { // We should handle partial case before recursion TupleA extends Partial<[infer headPartial, ...infer restPartial]> ? IsIncompatible extends true - ? Incompatible + ? IncompatibleArguments : SubtypesTuple< restB, Partial, @@ -141,8 +143,8 @@ namespace Internal { : A extends Record ? B extends Record ? Prettify - : Incompatible - : Incompatible + : IncompatibleArguments + : IncompatibleArguments } export type { Internal } diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index 598cd5de..e0c0c952 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -60,7 +60,7 @@ describe('pipe', () => { const res = await fn(1, 2) type _FN = Expect< - Equal + Equal > type _R = Expect>> diff --git a/src/types.ts b/src/types.ts index 73ebe3d5..d212ef1c 100644 --- a/src/types.ts +++ b/src/types.ts @@ -49,10 +49,10 @@ type PipeReturn = Fns extends [ ...infer rest, ] ? Internal.IsNever extends true - ? ['Fail to compose, "never" does not fit in', PB] + ? Internal.FailToCompose : Awaited extends PB ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> - : ['Fail to compose', Awaited, 'does not fit in', PB] + : Internal.FailToCompose, PB> : Fns extends [Composable<(...args: infer P) => infer O>] ? Composable<(...args: P) => O> : Fns @@ -68,12 +68,12 @@ type PipeArguments< ...unknown[], ] ? Internal.IsNever> extends true - ? ['Fail to compose, "never" does not fit in', FirstBParameter] + ? Internal.FailToCompose : Awaited extends FirstBParameter ? Internal.EveryElementTakes extends true ? PipeArguments OA>]> : Internal.EveryElementTakes - : ['Fail to compose', Awaited, 'does not fit in', FirstBParameter] + : Internal.FailToCompose, FirstBParameter> : [...Arguments, Composable<(...a: PA) => OA>] : never @@ -87,7 +87,7 @@ type AllArguments< [Composable<(...args: MergedP) => OB>, ...restB], OriginalFns > - : ['Fail to compose', PA, 'does not fit in', PB] + : Internal.FailToCompose : ApplyArgumentsToFns : never From 6d6236d0f91c75aaeac7dc740f57319cf92fdc7f Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Mon, 22 Apr 2024 11:36:27 -0300 Subject: [PATCH 120/238] Experimental release --- deno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deno.json b/deno.json index 296f0770..b2749227 100644 --- a/deno.json +++ b/deno.json @@ -1,5 +1,5 @@ { - "version": "0.0.0-experimental-20240419-1", + "version": "0.0.0-experimental-20240422-1", "tasks": { "test": "deno test --allow-env --allow-net src", "publish": "deno task build-npm && cd npm/ && npm publish", From b5176e480fbe015c8fa29986b98fa726a32f2198 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 19 Apr 2024 22:02:18 -0400 Subject: [PATCH 121/238] Environments can have arbitrary types (except in collectSequence). --- src/environment/combinators.ts | 46 ++++++++++++----- src/environment/tests/branch.test.ts | 8 ++- src/environment/tests/types.test.ts | 75 ++++++++++++++++++++++++++++ src/environment/types.ts | 57 +++++++++++++++++++++ 4 files changed, 168 insertions(+), 18 deletions(-) create mode 100644 src/environment/tests/types.test.ts create mode 100644 src/environment/types.ts diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 29966297..676da3ab 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,6 +1,13 @@ -import type { Composable, Last, UnpackAll, UnpackData } from '../types.ts' +import type { + Composable, + Last, + PipeArguments, + UnpackAll, + UnpackData, +} from '../types.ts' import * as A from '../combinators.ts' import { composable, fromSuccess } from '../constructors.ts' +import { CommonEnvironment } from './types.ts' /** * Takes a function with 2 parameters and partially applies the second one. @@ -13,9 +20,11 @@ import { composable, fromSuccess } from '../constructors.ts' * // ^? (input: unknown) => Promise> */ function applyEnvironment< - Fn extends (input: unknown, environment: unknown) => unknown, ->(df: Fn, environment: unknown) { - return (input: unknown) => df(input, environment) as ReturnType + I extends any, + E extends any, + Fn extends (input: I, environment: E) => any, +>(df: Fn, environment: E) { + return (input: I) => df(input, environment) as ReturnType } function applyEnvironmentToList< @@ -39,9 +48,12 @@ function applyEnvironmentToList< * // ^? Composable<(input?: unknown, environment?: unknown) => { aBoolean: boolean }> */ function pipe( - ...fns: Fns + ...fns: Fns & PipeArguments> ): Composable< - (input?: unknown, environment?: unknown) => Last> + ( + input?: Parameters[0], + environment?: Parameters>[0]>[1], + ) => Last> > { return (input, environment) => A.pipe(...applyEnvironmentToList(fns, environment))(input) @@ -69,9 +81,9 @@ function collectSequence>( ) => { [K in keyof Fns]: UnpackData } > { const keys = Object.keys(fns) - + const values = Object.values(fns) as [Composable] return A.map( - A.map(sequence(...Object.values(fns)), (outputs) => + A.map(sequence(...values), (outputs) => outputs.map((o, i) => ({ [keys[i]]: o, })), @@ -90,11 +102,19 @@ function collectSequence>( * const df = sequence(a, b) * // ^? Composable<(input?: unknown, environment?: unknown) => [string, boolean]> */ -function sequence(...fns: Fns) { + +function sequence( + ...fns: Fns & PipeArguments> +) { return ((input, environment) => A.sequence(...applyEnvironmentToList(fns, environment))( input, - )) as Composable<(input?: unknown, environment?: unknown) => UnpackAll> + )) as Composable< + ( + input?: Parameters[0], + environment?: Parameters>[0]>[1], + ) => UnpackAll + > } /** @@ -121,11 +141,11 @@ function sequence(...fns: Fns) { * ) * // ^? Composable<(input?: unknown, environment?: unknown) => { items: Item[] }> */ -function branch( - dfn: Composable<(input?: unknown, environment?: unknown) => O>, +function branch( + dfn: Composable<(input?: unknown, environment?: E) => O>, resolver: (o: O) => Promise | MaybeFn, ) { - return (async (input, environment) => { + return (async (input, environment: E) => { const result = await dfn(input, environment) if (!result.success) return result diff --git a/src/environment/tests/branch.test.ts b/src/environment/tests/branch.test.ts index a95adf82..c18f7584 100644 --- a/src/environment/tests/branch.test.ts +++ b/src/environment/tests/branch.test.ts @@ -3,10 +3,10 @@ import { all, composable, environment, - withSchema, failure, InputError, success, + withSchema, } from '../../index.ts' import { Composable } from '../../types.ts' @@ -162,10 +162,8 @@ describe('branch', () => { })) const b = composable(({ id }: { id: number }) => id - 1) const c = composable((n: number) => n * 2) - const dfPipe = environment.pipe( - environment.branch(a, () => b), - c, - ) + const br = environment.branch(a, () => b) + const dfPipe = environment.pipe(br, c) const d = all(dfPipe, a) type _R = Expect< Equal< diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts new file mode 100644 index 00000000..3fdcc5e3 --- /dev/null +++ b/src/environment/tests/types.test.ts @@ -0,0 +1,75 @@ +// deno-lint-ignore-file no-namespace ban-ts-comment + +import { Composable } from '../../types.ts' +import * as Subject from '../types.ts' + +namespace CommonEnvironment { + type testNoEmptyArgumentList = Expect< + Equal, never> + > + type testOneComposable = Expect< + Equal< + Subject.CommonEnvironment<[Composable]>, + [Composable<(a: any, env: any, ...rest: any[]) => any>] + > + > + type testForTwoComposables = Expect< + Equal< + Subject.CommonEnvironment< + [ + Composable<(x: string, env: number) => number>, + Composable<(y: number, env: 1) => boolean>, + ] + >, + [ + Composable<(x: string, env: 1) => number>, + Composable<(y: number, env: 1) => boolean>, + ] + > + > + type testForComponentsWithArityGreaterThan1WithOptionalParameters = Expect< + Equal< + Subject.CommonEnvironment< + [ + Composable<(x: string) => number>, + Composable<(y: number, optionalArgument?: string) => boolean>, + ] + >, + [ + Composable<(x: string, optionalArgument: string | undefined) => number>, + Composable< + (y: number, optionalArgument: string | undefined) => boolean + >, + ] + > + > + type testForComponentsWithArityGreaterThan1 = Expect< + Equal< + Subject.CommonEnvironment< + [ + Composable<(x: string) => number>, + Composable<(y: number, willBeUndefined: string) => boolean>, + ] + >, + [ + Composable<(x: string, willBeUndefined: string) => number>, + Composable<(y: number, willBeUndefined: string) => boolean>, + ] + > + > + type testFailureToCompose = Expect< + Equal< + Subject.CommonEnvironment< + [ + Composable<(x: string, env: number) => void>, + Composable<(y: number, env: string) => boolean>, + ] + >, + { + 'Incompatible arguments ': true + argument1: number + argument2: string + } + > + > +} diff --git a/src/environment/types.ts b/src/environment/types.ts new file mode 100644 index 00000000..7eb5baeb --- /dev/null +++ b/src/environment/types.ts @@ -0,0 +1,57 @@ +import { Internal } from '../internal/types.ts' +import { Composable } from '../types.ts' + +type CommonEnvironment< + Fns extends any[], + OriginalFns extends any[] = Fns, +> = Fns extends [ + Composable<(a: any, envA: infer EnvA, ...rest: any[]) => any>, + ...infer restA, +] + ? restA extends [ + Composable<(b: any, envB: infer EnvB, ...rest: any[]) => any>, + ...infer restB, + ] + ? Internal.CommonSubType extends { + 'Incompatible arguments ': true + } + ? Internal.CommonSubType + : CommonEnvironment< + [ + Composable< + ( + a: any, + envA: Internal.CommonSubType, + ...rest: any[] + ) => any + >, + ...restB, + ], + OriginalFns + > + : ApplyEnvironmentsToFns + : never + +type ApplyEnvironmentsToFns< + Fns extends any[], + Environment extends any, + Output extends any[] = [], +> = Fns extends [ + ( + a: infer FirstParameter, + env: any, + ...rest: infer RestParameters + ) => infer OA, + ...infer restA, +] + ? ApplyEnvironmentsToFns< + restA, + Environment, + [ + ...Output, + (a: FirstParameter, env: Environment, ...rest: RestParameters) => OA, + ] + > + : Output + +export type { CommonEnvironment } From 988c173c9b9c2c36b6c95e19883b1bd2c7071f66 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 23 Apr 2024 16:50:51 -0300 Subject: [PATCH 122/238] Apply some of the new patterns --- src/environment/combinators.ts | 6 ++---- src/environment/tests/types.test.ts | 2 +- src/environment/types.ts | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 676da3ab..a062197b 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -48,7 +48,7 @@ function applyEnvironmentToList< * // ^? Composable<(input?: unknown, environment?: unknown) => { aBoolean: boolean }> */ function pipe( - ...fns: Fns & PipeArguments> + ...fns: Fns ): Composable< ( input?: Parameters[0], @@ -103,9 +103,7 @@ function collectSequence>( * // ^? Composable<(input?: unknown, environment?: unknown) => [string, boolean]> */ -function sequence( - ...fns: Fns & PipeArguments> -) { +function sequence(...fns: Fns) { return ((input, environment) => A.sequence(...applyEnvironmentToList(fns, environment))( input, diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts index 3fdcc5e3..d29431f3 100644 --- a/src/environment/tests/types.test.ts +++ b/src/environment/tests/types.test.ts @@ -1,4 +1,4 @@ -// deno-lint-ignore-file no-namespace ban-ts-comment +// deno-lint-ignore-file no-namespace import { Composable } from '../../types.ts' import * as Subject from '../types.ts' diff --git a/src/environment/types.ts b/src/environment/types.ts index 7eb5baeb..80c245ba 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -12,10 +12,8 @@ type CommonEnvironment< Composable<(b: any, envB: infer EnvB, ...rest: any[]) => any>, ...infer restB, ] - ? Internal.CommonSubType extends { - 'Incompatible arguments ': true - } - ? Internal.CommonSubType + ? Internal.IsIncompatible extends true + ? Internal.IncompatibleArguments : CommonEnvironment< [ Composable< From 8a280e0e603ad4f5b668e1dfedd6a915e09541ac Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 23 Apr 2024 16:55:29 -0300 Subject: [PATCH 123/238] Now we don't need to avoid inline declarations of composables --- src/environment/tests/branch.test.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/environment/tests/branch.test.ts b/src/environment/tests/branch.test.ts index c18f7584..9a211f8b 100644 --- a/src/environment/tests/branch.test.ts +++ b/src/environment/tests/branch.test.ts @@ -162,9 +162,13 @@ describe('branch', () => { })) const b = composable(({ id }: { id: number }) => id - 1) const c = composable((n: number) => n * 2) - const br = environment.branch(a, () => b) - const dfPipe = environment.pipe(br, c) - const d = all(dfPipe, a) + const d = all( + environment.pipe( + environment.branch(a, () => b), + c, + ), + a, + ) type _R = Expect< Equal< typeof d, From 2742459349a3639193cabc9a2a5da8c753d4ff1c Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Tue, 23 Apr 2024 18:24:31 -0300 Subject: [PATCH 124/238] TODO: We found an infinite loop and almost got there --- src/environment/combinators.ts | 65 ++++---------------------- src/environment/tests/sequence.test.ts | 8 ++++ src/environment/types.ts | 55 +++++++++++----------- 3 files changed, 42 insertions(+), 86 deletions(-) diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index a062197b..65e9ccfc 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,10 +1,4 @@ -import type { - Composable, - Last, - PipeArguments, - UnpackAll, - UnpackData, -} from '../types.ts' +import type { Composable, UnpackData } from '../types.ts' import * as A from '../combinators.ts' import { composable, fromSuccess } from '../constructors.ts' import { CommonEnvironment } from './types.ts' @@ -47,49 +41,11 @@ function applyEnvironmentToList< * const d = pipe(a, b) * // ^? Composable<(input?: unknown, environment?: unknown) => { aBoolean: boolean }> */ -function pipe( - ...fns: Fns -): Composable< - ( - input?: Parameters[0], - environment?: Parameters>[0]>[1], - ) => Last> -> { - return (input, environment) => - A.pipe(...applyEnvironmentToList(fns, environment))(input) -} - -/** - * Receives a Record of domain functions, runs them all in sequence like `pipe` but preserves the shape of that record for the data property in successful results. - * It will pass the same environment to all given functions, and it will pass the output of a function as the next function's input in the given order. - * - * **NOTE :** After ECMAScript2015 JS is able to keep the order of keys in an object, we are relying on that. However, number-like keys such as { 1: 'foo' } will be ordered and may break the given order. - * @example - * import { mdf, collectSequence } from 'domain-functions' - * - * const a = mdf(z.object({}))(() => '1') -const b = mdf(z.number())((n) => n + 2) -const df = collectSequence({ a, b }) -// ^? Composable<(input?: unknown, environment?: unknown) => { a: string, b: number }> - */ -function collectSequence>( - fns: Fns, -): Composable< - ( - input?: unknown, - environment?: unknown, - ) => { [K in keyof Fns]: UnpackData } -> { - const keys = Object.keys(fns) - const values = Object.values(fns) as [Composable] - return A.map( - A.map(sequence(...values), (outputs) => - outputs.map((o, i) => ({ - [keys[i]]: o, - })), - ), - A.mergeObjects, - ) +function pipe(...fns: Fns) { + return ((input, environment) => + A.pipe(...applyEnvironmentToList(fns, environment))( + input, + )) as CommonEnvironment } /** @@ -107,12 +63,7 @@ function sequence(...fns: Fns) { return ((input, environment) => A.sequence(...applyEnvironmentToList(fns, environment))( input, - )) as Composable< - ( - input?: Parameters[0], - environment?: Parameters>[0]>[1], - ) => UnpackAll - > + )) as CommonEnvironment } /** @@ -164,4 +115,4 @@ function branch( > } -export { applyEnvironment, branch, collectSequence, pipe, sequence } +export { applyEnvironment, branch, pipe, sequence } diff --git a/src/environment/tests/sequence.test.ts b/src/environment/tests/sequence.test.ts index a4b1e61a..64be4758 100644 --- a/src/environment/tests/sequence.test.ts +++ b/src/environment/tests/sequence.test.ts @@ -1,5 +1,6 @@ import { assertEquals, describe, it, z } from './prelude.ts' import { + composable, environment, EnvironmentError, failure, @@ -199,4 +200,11 @@ describe('sequence', () => { >([{ aString: '1' }, { aBoolean: true }, { anotherBoolean: false }]), ) }) + + it('should properly type the environment', async () => { + const a = composable((a: number, b: number) => a + b) + const b = composable((a: number, b: number) => `${a} + ${b}`) + const c = environment.sequence(a, b) + const result = await c(1, 2) + }) }) diff --git a/src/environment/types.ts b/src/environment/types.ts index 80c245ba..fde30302 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -1,15 +1,16 @@ +import { UnpackData } from '../index.ts' import { Internal } from '../internal/types.ts' -import { Composable } from '../types.ts' +import { Composable, Last } from '../types.ts' type CommonEnvironment< Fns extends any[], OriginalFns extends any[] = Fns, > = Fns extends [ - Composable<(a: any, envA: infer EnvA, ...rest: any[]) => any>, + Composable<(a: any, envA: infer EnvA) => infer O>, ...infer restA, ] ? restA extends [ - Composable<(b: any, envB: infer EnvB, ...rest: any[]) => any>, + Composable<(b: any, envB: infer EnvB) => any>, ...infer restB, ] ? Internal.IsIncompatible extends true @@ -17,39 +18,35 @@ type CommonEnvironment< : CommonEnvironment< [ Composable< - ( - a: any, - envA: Internal.CommonSubType, - ...rest: any[] - ) => any + (a: any, envA: Internal.CommonSubType) => any >, ...restB, ], OriginalFns > - : ApplyEnvironmentsToFns + : Composable< + // TODO: Find where is the infinite loop when we use: + // (...args: ReplaceEnv, EnvA>) => UnpackData> + ( + ...args: ReplaceEnv<[string, unknown], EnvA> + ) => UnpackData> + > : never -type ApplyEnvironmentsToFns< - Fns extends any[], - Environment extends any, - Output extends any[] = [], -> = Fns extends [ - ( - a: infer FirstParameter, - env: any, - ...rest: infer RestParameters - ) => infer OA, - ...infer restA, -] - ? ApplyEnvironmentsToFns< - restA, - Environment, - [ - ...Output, - (a: FirstParameter, env: Environment, ...rest: RestParameters) => OA, - ] +type ReplaceEnv< + Params extends unknown[], + Env, + Output extends unknown[] = [], +> = Params extends [] + ? Output + : Params extends [infer headA, ...infer restA] + ? ReplaceEnv + : Params extends Partial<[infer headAPartial, ...infer restAPartial]> + ? ReplaceEnv< + Partial, + Env, + [...Output, (headAPartial | undefined)?] > - : Output + : never export type { CommonEnvironment } From 6b6c06d9c5d0523f8bc21b9b8790f3cad0f4f311 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 24 Apr 2024 09:18:25 -0400 Subject: [PATCH 125/238] Fix sequential environment compositions --- src/combinators.ts | 8 +- src/environment/combinators.ts | 11 +- src/environment/index.ts | 8 +- .../tests/collect-sequence.test.ts | 199 ------------------ src/environment/tests/pipe.test.ts | 1 + src/environment/tests/types.test.ts | 39 ++-- src/environment/types.ts | 143 +++++++++---- src/internal/types.ts | 136 ++++++------ src/types.ts | 18 +- 9 files changed, 222 insertions(+), 341 deletions(-) delete mode 100644 src/environment/tests/collect-sequence.test.ts diff --git a/src/combinators.ts b/src/combinators.ts index 188f9169..915ac070 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -6,8 +6,8 @@ import type { PipeReturn, RecordToTuple, Result, + SequenceReturn, Success, - UnpackAll, UnpackData, } from './types.ts' import { composable, failure, success } from './constructors.ts' @@ -44,8 +44,8 @@ function mergeObjects(objs: T): MergeObjs { * // ^? Composable<({ aNumber }: { aNumber: number }) => { aBoolean: boolean }> */ function pipe(...fns: Fns) { - return (async (...args) => { - const res = await sequence(...(fns as never))(...(args as never)) + return (async (...args: any[]) => { + const res = await sequence(...fns)(...args) return !res.success ? failure(res.errors) : success(res.data[res.data.length - 1]) @@ -128,7 +128,7 @@ function sequence(...fns: Fns) { result.push(res.data) } return success(result) - }) as Composable<(...args: Parameters) => UnpackAll> + }) as SequenceReturn> } /** diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 65e9ccfc..aecd151e 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,7 +1,8 @@ import type { Composable, UnpackData } from '../types.ts' import * as A from '../combinators.ts' import { composable, fromSuccess } from '../constructors.ts' -import { CommonEnvironment } from './types.ts' +import { PipeReturnWithEnvironment } from './types.ts' +import { SequenceReturnWithEnvironment } from './types.ts' /** * Takes a function with 2 parameters and partially applies the second one. @@ -42,10 +43,10 @@ function applyEnvironmentToList< * // ^? Composable<(input?: unknown, environment?: unknown) => { aBoolean: boolean }> */ function pipe(...fns: Fns) { - return ((input, environment) => + return ((input: any, environment: any) => A.pipe(...applyEnvironmentToList(fns, environment))( input, - )) as CommonEnvironment + )) as unknown as PipeReturnWithEnvironment } /** @@ -60,10 +61,10 @@ function pipe(...fns: Fns) { */ function sequence(...fns: Fns) { - return ((input, environment) => + return ((input: any, environment: any) => A.sequence(...applyEnvironmentToList(fns, environment))( input, - )) as CommonEnvironment + )) as unknown as SequenceReturnWithEnvironment } /** diff --git a/src/environment/index.ts b/src/environment/index.ts index dfb4706f..0b635322 100644 --- a/src/environment/index.ts +++ b/src/environment/index.ts @@ -1,7 +1 @@ -export { - applyEnvironment, - branch, - collectSequence, - pipe, - sequence, -} from './combinators.ts' +export { applyEnvironment, branch, pipe, sequence } from './combinators.ts' diff --git a/src/environment/tests/collect-sequence.test.ts b/src/environment/tests/collect-sequence.test.ts deleted file mode 100644 index 6e7dd628..00000000 --- a/src/environment/tests/collect-sequence.test.ts +++ /dev/null @@ -1,199 +0,0 @@ -import { assertEquals, describe, it, z } from './prelude.ts' -import { - environment, - withSchema, - EnvironmentError, - failure, - InputError, - success, -} from '../../index.ts' -import type { Composable } from '../../index.ts' - -describe('collectSequence', () => { - it('should compose domain functions keeping the given order of keys', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ - id: id + 2, - })) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - - const c = environment.collectSequence({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - ( - input?: unknown, - environment?: unknown, - ) => { a: { id: number }; b: number } - > - > - > - - assertEquals(await c({ id: 1 }), success({ a: { id: 3 }, b: 2 })) - }) - - it('should use the same environment in all composed functions', async () => { - const a = withSchema( - z.undefined(), - z.object({ env: z.number() }), - )((_input, { env }) => ({ - inp: env + 2, - })) - const b = withSchema( - z.object({ inp: z.number() }), - z.object({ env: z.number() }), - )(({ inp }, { env }) => inp + env) - - const c = environment.collectSequence({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - ( - input?: unknown, - environment?: unknown, - ) => { a: { inp: number }; b: number } - > - > - > - - assertEquals( - await c(undefined, { env: 1 }), - success({ a: { inp: 3 }, b: 4 }), - ) - }) - - it('should fail on the first environment parser failure', async () => { - const envParser = z.object({ env: z.number() }) - const a = withSchema( - z.undefined(), - envParser, - )((_input, { env }) => ({ - inp: env + 2, - })) - const b = withSchema( - z.object({ inp: z.number() }), - envParser, - )(({ inp }, { env }) => inp + env) - - const c = environment.collectSequence({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - ( - input?: unknown, - environment?: unknown, - ) => { a: { inp: number }; b: number } - > - > - > - - assertEquals( - await c(undefined, {}), - failure([new EnvironmentError('Required', ['env'])]), - ) - }) - - it('should fail on the first input parser failure', async () => { - const firstInputParser = z.undefined() - - const a = withSchema( - firstInputParser, - z.object({ env: z.number() }), - )((_input, { env }) => ({ - inp: env + 2, - })) - const b = withSchema( - z.object({ inp: z.number() }), - z.object({ env: z.number() }), - )(({ inp }, { env }) => inp + env) - - const c = environment.collectSequence({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - ( - input?: unknown, - environment?: unknown, - ) => { a: { inp: number }; b: number } - > - > - > - - assertEquals( - await c({ inp: 'some invalid input' }, { env: 1 }), - failure([new InputError('Expected undefined, received object')]), - ) - }) - - it('should fail on the second input parser failure', async () => { - const a = withSchema( - z.undefined(), - z.object({ env: z.number() }), - )(() => ({ - inp: 'some invalid input', - })) - const b = withSchema( - z.object({ inp: z.number() }), - z.object({ env: z.number() }), - )(({ inp }, { env }) => inp + env) - - const c = environment.collectSequence({ a, b }) - type _R = Expect< - Equal< - typeof c, - Composable< - ( - input?: unknown, - environment?: unknown, - ) => { a: { inp: string }; b: number } - > - > - > - - assertEquals( - await c(undefined, { env: 1 }), - failure([new InputError('Expected number, received string', ['inp'])]), - ) - }) - - it('should compose more than 2 functions', async () => { - const a = withSchema(z.object({ aNumber: z.number() }))(({ aNumber }) => ({ - aString: String(aNumber), - })) - const b = withSchema(z.object({ aString: z.string() }))(({ aString }) => ({ - aBoolean: aString == '1', - })) - const c = withSchema(z.object({ aBoolean: z.boolean() }))( - ({ aBoolean }) => !aBoolean, - ) - - const d = environment.collectSequence({ a, b, c }) - type _R = Expect< - Equal< - typeof d, - Composable< - ( - input?: unknown, - environment?: unknown, - ) => { - a: { aString: string } - b: { aBoolean: boolean } - c: boolean - } - > - > - > - - assertEquals( - await d({ aNumber: 1 }), - success({ - a: { aString: '1' }, - b: { aBoolean: true }, - c: false, - }), - ) - }) -}) diff --git a/src/environment/tests/pipe.test.ts b/src/environment/tests/pipe.test.ts index 44fc85cb..6b3dd9a8 100644 --- a/src/environment/tests/pipe.test.ts +++ b/src/environment/tests/pipe.test.ts @@ -8,6 +8,7 @@ import { withSchema, } from '../../index.ts' import type { Composable } from '../../index.ts' +import { PipeReturnWithEnvironment } from '../types.ts' describe('pipe', () => { it('should compose domain functions from left-to-right', async () => { diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts index d29431f3..e1c33d1c 100644 --- a/src/environment/tests/types.test.ts +++ b/src/environment/tests/types.test.ts @@ -5,12 +5,20 @@ import * as Subject from '../types.ts' namespace CommonEnvironment { type testNoEmptyArgumentList = Expect< - Equal, never> + Equal, [unknown?]> > type testOneComposable = Expect< + Equal, [any]> + > + type testForTwoOptionalUnknowns = Expect< Equal< - Subject.CommonEnvironment<[Composable]>, - [Composable<(a: any, env: any, ...rest: any[]) => any>] + Subject.CommonEnvironment< + [ + Composable<(x: string, env?: unknown) => number>, + Composable<(y: number, env?: unknown) => boolean>, + ] + >, + [unknown?] > > type testForTwoComposables = Expect< @@ -21,28 +29,21 @@ namespace CommonEnvironment { Composable<(y: number, env: 1) => boolean>, ] >, - [ - Composable<(x: string, env: 1) => number>, - Composable<(y: number, env: 1) => boolean>, - ] + [1] > > type testForComponentsWithArityGreaterThan1WithOptionalParameters = Expect< Equal< Subject.CommonEnvironment< [ - Composable<(x: string) => number>, + Composable<(x: number) => number>, Composable<(y: number, optionalArgument?: string) => boolean>, ] >, - [ - Composable<(x: string, optionalArgument: string | undefined) => number>, - Composable< - (y: number, optionalArgument: string | undefined) => boolean - >, - ] + [(string | undefined)?] > > + type testForComponentsWithArityGreaterThan1 = Expect< Equal< Subject.CommonEnvironment< @@ -51,12 +52,10 @@ namespace CommonEnvironment { Composable<(y: number, willBeUndefined: string) => boolean>, ] >, - [ - Composable<(x: string, willBeUndefined: string) => number>, - Composable<(y: number, willBeUndefined: string) => boolean>, - ] + [string] > > + type testFailureToCompose = Expect< Equal< Subject.CommonEnvironment< @@ -67,8 +66,8 @@ namespace CommonEnvironment { >, { 'Incompatible arguments ': true - argument1: number - argument2: string + argument1: [number] + argument2: [string] } > > diff --git a/src/environment/types.ts b/src/environment/types.ts index fde30302..16a6f576 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -1,52 +1,113 @@ -import { UnpackData } from '../index.ts' import { Internal } from '../internal/types.ts' -import { Composable, Last } from '../types.ts' +import { Composable, PipeReturn, SequenceReturn } from '../types.ts' type CommonEnvironment< - Fns extends any[], - OriginalFns extends any[] = Fns, -> = Fns extends [ - Composable<(a: any, envA: infer EnvA) => infer O>, - ...infer restA, -] - ? restA extends [ - Composable<(b: any, envB: infer EnvB) => any>, - ...infer restB, + Fns extends Composable[], + Env extends [unknown?] = [unknown?], +> = Fns extends [] + ? Env + : Fns extends [ + Composable<(...args: infer CParameters) => any>, + ...infer RestFns, ] - ? Internal.IsIncompatible extends true - ? Internal.IncompatibleArguments + ? GetEnv extends [unknown?] + ? Internal.IsIncompatible> extends true + ? Internal.IncompatibleArguments> : CommonEnvironment< - [ - Composable< - (a: any, envA: Internal.CommonSubType) => any - >, - ...restB, - ], - OriginalFns + Extract, + Extract>, [unknown?]> > - : Composable< - // TODO: Find where is the infinite loop when we use: - // (...args: ReplaceEnv, EnvA>) => UnpackData> - ( - ...args: ReplaceEnv<[string, unknown], EnvA> - ) => UnpackData> - > + : never : never -type ReplaceEnv< +type SequenceReturnWithEnvironment = + SequenceReturn extends Composable<(...args: any[]) => infer CReturn> + ? CommonEnvironment extends { 'Incompatible arguments ': true } + ? CommonEnvironment + : Composable< + ( + ...args: SetEnv, CommonEnvironment> + ) => CReturn + > + : SequenceReturn + +type PipeReturnWithEnvironment = + PipeReturn extends Composable<(...args: any[]) => infer CReturn> + ? CommonEnvironment extends { 'Incompatible arguments ': true } + ? CommonEnvironment + : Composable< + ( + ...args: SetEnv, CommonEnvironment> + ) => CReturn + > + : PipeReturn + +type X = PipeReturnWithEnvironment< + [ + Composable<(a: number, e?: unknown) => number>, + Composable<(a: number, e: number) => number>, + Composable<(a: number) => void>, + ] +> + +type GetEnv = Params extends [ + unknown, + infer envMandatory, +] + ? [envMandatory] + : Params extends Partial<[unknown, infer envOptional]> + ? [envOptional?] + : Params extends [...Partial<[unknown]>] + ? [unknown?] + : Params extends [...infer AnyArg] + ? [AnyArg[1]] + : never + +type GE1 = GetEnv void>>> +type GE2 = GetEnv void>>> +type GE3 = GetEnv void>>> +type GE4 = GetEnv void>>> +type GE5 = GetEnv> +type GE6 = GetEnv void>>> + +type SetEnv< Params extends unknown[], - Env, - Output extends unknown[] = [], -> = Params extends [] - ? Output - : Params extends [infer headA, ...infer restA] - ? ReplaceEnv - : Params extends Partial<[infer headAPartial, ...infer restAPartial]> - ? ReplaceEnv< - Partial, - Env, - [...Output, (headAPartial | undefined)?] - > + Env extends [unknown?] = [unknown?], +> = Params extends [infer firstMandatory, ...any] + ? [firstMandatory, ...Env] + : Params extends [...Partial<[infer firstOptional, ...any]>] + ? [firstOptional?, ...Env] : never -export type { CommonEnvironment } +type Y1 = SetEnv void>>> +type Y2 = SetEnv void>>, [number]> +type Y3 = SetEnv void>>, [number]> +type Y4 = SetEnv void>>> +type Y5 = SetEnv< + Parameters void>>, + [unknown?] +> +type CE = CommonEnvironment< + [ + Composable<(a?: unknown, e?: unknown) => void>, + Composable<(a?: unknown, e?: unknown) => void>, + ] +> +type PRWE = PipeReturnWithEnvironment< + [ + Composable<(a?: unknown, e?: unknown) => { id: number }>, + Composable<(a?: unknown, e?: unknown) => number>, + ] +> +type PR = PipeReturn< + [ + Composable<(a?: unknown, e?: unknown) => { id: number }>, + Composable<(a?: unknown, e?: unknown) => number>, + ] +> + +export type { + CommonEnvironment, + PipeReturnWithEnvironment, + SequenceReturnWithEnvironment, +} diff --git a/src/internal/types.ts b/src/internal/types.ts index 2d4fc1c3..b3e0f4f1 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -7,11 +7,12 @@ namespace Internal { argument2: B } - export type IsIncompatible = Internal.CommonSubType extends { - 'Incompatible arguments ': true - } - ? true - : false + export type IsIncompatible = + Internal.CommonSubType extends { + 'Incompatible arguments ': true + } + ? true + : false export type FailToCompose = ['Fail to compose', A, 'does not fit in', B] @@ -85,66 +86,79 @@ namespace Internal { > = TupleA extends [] ? [...Output, ...TupleB] : TupleB extends [] - ? [...Output, ...TupleA] - : TupleA extends [infer headA, ...infer restA] - ? TupleB extends [infer headB, ...infer restB] - ? IsIncompatible extends true - ? IncompatibleArguments - : SubtypesTuple]> - : // TupleB is partial - // We should handle partial case before recursion - TupleB extends Partial<[infer headPartial, ...infer restPartial]> - ? IsIncompatible extends true - ? IncompatibleArguments - : SubtypesTuple< - restA, - Partial, - [...Output, CommonSubType>] - > - : never - : TupleB extends [infer headBNoA, ...infer restB] - ? // TupleA is partial - // We should handle partial case before recursion - TupleA extends Partial<[infer headPartial, ...infer restPartial]> - ? IsIncompatible extends true - ? IncompatibleArguments - : SubtypesTuple< - restB, - Partial, - [...Output, CommonSubType>] - > - : never - : /* - * We should continue the recursion checking optional parameters - * We can pattern match optionals using Partial - * We should start handling partials as soon one side of mandatory ends - * Remove ...TupleA, ...TupleB bellow - */ - TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> - ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> - ? IsIncompatible extends true - ? SubtypesTuple< - Partial, - Partial, - [...Output, ...Partial<[undefined]>] - > - : SubtypesTuple< - Partial, - Partial, - [...Output, ...Partial<[CommonSubType]>] - > - : never - : never + ? [...Output, ...TupleA] + : TupleA extends [infer headA, ...infer restA] + ? TupleB extends [infer headB, ...infer restB] + ? IsIncompatible extends true + ? IncompatibleArguments + : SubtypesTuple< + restA, + restB, + [...Output, CommonSubType] + > + : // TupleB is partial + // We should handle partial case before recursion + TupleB extends Partial<[infer headPartial, ...infer restPartial]> + ? IsIncompatible extends true + ? IncompatibleArguments + : SubtypesTuple< + restA, + Partial, + [...Output, CommonSubType>] + > + : never + : TupleB extends [infer headBNoA, ...infer restB] + ? // TupleA is partial + // We should handle partial case before recursion + TupleA extends Partial<[infer headPartial, ...infer restPartial]> + ? IsIncompatible extends true + ? IncompatibleArguments + : SubtypesTuple< + restB, + Partial, + [...Output, CommonSubType>] + > + : never + : /* + * We should continue the recursion checking optional parameters + * We can pattern match optionals using Partial + * We should start handling partials as soon one side of mandatory ends + * Remove ...TupleA, ...TupleB bellow + */ + TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> + ? TupleB extends Partial< + [infer headBPartial, ...infer restBPartial] + > + ? IsIncompatible extends true + ? SubtypesTuple< + Partial, + Partial, + [...Output, ...Partial<[undefined]>] + > + : SubtypesTuple< + Partial, + Partial, + [ + ...Output, + ...Partial<[CommonSubType]>, + ] + > + : never + : never export type CommonSubType = [A] extends [B] ? A : [B] extends [A] - ? B - : A extends Record - ? B extends Record - ? Prettify - : IncompatibleArguments - : IncompatibleArguments + ? B + : A extends { 'Incompatible arguments ': true } + ? A + : B extends { 'Incompatible arguments ': true } + ? B + : A extends Record + ? B extends Record + ? Prettify + : IncompatibleArguments + : IncompatibleArguments } export type { Internal } diff --git a/src/types.ts b/src/types.ts index d212ef1c..2d669acc 100644 --- a/src/types.ts +++ b/src/types.ts @@ -43,7 +43,10 @@ type UnpackAll = { [K in keyof List]: UnpackData } -type PipeReturn = Fns extends [ +type SequenceReturn< + Fns extends any[], + OriginalFns extends Composable[] = Fns, +> = Fns extends [ Composable<(...a: infer PA) => infer OA>, Composable<(b: infer PB) => infer OB>, ...infer rest, @@ -51,12 +54,18 @@ type PipeReturn = Fns extends [ ? Internal.IsNever extends true ? Internal.FailToCompose : Awaited extends PB - ? PipeReturn<[Composable<(...args: PA) => OB>, ...rest]> + ? SequenceReturn<[Composable<(...args: PA) => OB>, ...rest], OriginalFns> : Internal.FailToCompose, PB> - : Fns extends [Composable<(...args: infer P) => infer O>] - ? Composable<(...args: P) => O> + : Fns extends [Composable<(...args: infer P) => any>] + ? Composable<(...args: P) => UnpackAll> : Fns +type PipeReturn = SequenceReturn extends Composable< + (...args: infer P) => any +> + ? Composable<(...args: P) => UnpackData>> + : SequenceReturn + type PipeArguments< Fns extends any[], Arguments extends any[] = [], @@ -144,6 +153,7 @@ export type { PipeReturn, RecordToTuple, Result, + SequenceReturn, SerializableError, SerializedResult, Success, From e57c892e717d6e64ccdc57300c585cf9c0e1d642 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 24 Apr 2024 17:36:12 -0300 Subject: [PATCH 126/238] Write some tests and cleanup meta tests --- src/environment/tests/pipe.test.ts | 25 ++--- src/environment/tests/sequence.test.ts | 6 +- src/environment/tests/types.test.ts | 135 ++++++++++++++++++++++ src/environment/types.ts | 44 +------- src/internal/types.test.ts | 13 +++ src/internal/types.ts | 148 ++++++++++++------------- src/tests/types.test.ts | 14 +++ src/types.ts | 10 +- 8 files changed, 251 insertions(+), 144 deletions(-) diff --git a/src/environment/tests/pipe.test.ts b/src/environment/tests/pipe.test.ts index 6b3dd9a8..5438ac1d 100644 --- a/src/environment/tests/pipe.test.ts +++ b/src/environment/tests/pipe.test.ts @@ -1,5 +1,6 @@ import { assertEquals, describe, it, z } from './prelude.ts' import { + composable, environment, EnvironmentError, failure, @@ -8,7 +9,6 @@ import { withSchema, } from '../../index.ts' import type { Composable } from '../../index.ts' -import { PipeReturnWithEnvironment } from '../types.ts' describe('pipe', () => { it('should compose domain functions from left-to-right', async () => { @@ -106,30 +106,21 @@ describe('pipe', () => { ) }) - it('should fail on the second input parser failure', async () => { - const a = withSchema( - z.undefined(), - z.object({ env: z.number() }), - )(() => ({ - inp: 'some invalid input', - })) - const b = withSchema( - z.object({ inp: z.number() }), - z.object({ env: z.number() }), - )(({ inp }, { env }) => inp + env) + it('should compose mandatory environments', async () => { + const a = composable(() => ({ inp: 1 })) + const b = composable( + ({ inp }: { inp: number }, { env }: { env: number }) => inp + env, + ) const c = environment.pipe(a, b) type _R = Expect< Equal< typeof c, - Composable<(input?: unknown, environment?: unknown) => number> + Composable<(inp: unknown, env: { env: number }) => number> > > - assertEquals( - await c(undefined, { env: 1 }), - failure([new InputError('Expected number, received string', ['inp'])]), - ) + assertEquals(await c(undefined, { env: 1 }), success(2)) }) it('should compose more than 2 functions', async () => { diff --git a/src/environment/tests/sequence.test.ts b/src/environment/tests/sequence.test.ts index 64be4758..a7b582b5 100644 --- a/src/environment/tests/sequence.test.ts +++ b/src/environment/tests/sequence.test.ts @@ -205,6 +205,10 @@ describe('sequence', () => { const a = composable((a: number, b: number) => a + b) const b = composable((a: number, b: number) => `${a} + ${b}`) const c = environment.sequence(a, b) - const result = await c(1, 2) + type _R = Expect< + Equal [number, string]>> + > + + assertEquals(await c(1, 2), success<[number, string]>([3, '3 + 2'])) }) }) diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts index e1c33d1c..9a0fa1bf 100644 --- a/src/environment/tests/types.test.ts +++ b/src/environment/tests/types.test.ts @@ -71,4 +71,139 @@ namespace CommonEnvironment { } > > + + type testMultipleOptionalUnknown = Expect< + Equal< + Subject.CommonEnvironment< + [ + Composable<(a?: unknown, e?: unknown) => void>, + Composable<(a?: unknown, e?: unknown) => void>, + ] + >, + [unknown?] + > + > +} + +namespace SequenceReturnWithEnvironment { + type test = Expect< + Equal< + Subject.SequenceReturnWithEnvironment< + [ + Composable<(a: number, e?: unknown) => number>, + Composable<(a: number, e: number) => number>, + Composable<(a: number) => void>, + ] + >, + Composable<(a: number, b: number) => [number, number, void]> + > + > + + type test2 = Expect< + Equal< + Subject.SequenceReturnWithEnvironment< + [ + Composable<(a?: unknown, e?: unknown) => { id: number }>, + Composable<(a?: unknown, e?: unknown) => number>, + ] + >, + Composable<(a?: unknown, b?: unknown) => [{ id: number }, number]> + > + > +} + +namespace PipeReturnWithEnvironment { + type test = Expect< + Equal< + Subject.PipeReturnWithEnvironment< + [ + Composable<(a: number, e?: unknown) => number>, + Composable<(a: number, e: number) => number>, + Composable<(a: number) => void>, + ] + >, + Composable<(a: number, b: number) => void> + > + > + + type test2 = Expect< + Equal< + Subject.PipeReturnWithEnvironment< + [ + Composable<(a?: unknown, e?: unknown) => { id: number }>, + Composable<(a?: unknown, e?: unknown) => number>, + ] + >, + Composable<(a?: unknown, b?: unknown) => number> + > + > +} + +namespace GetEnv { + type test1 = Expect< + Equal< + Subject.GetEnv void>>>, + [number] + > + > + type test2 = Expect< + Equal void>>>, [unknown?]> + > + type test3 = Expect< + Equal< + Subject.GetEnv void>>>, + [number?] + > + > + type test4 = Expect< + Equal< + Subject.GetEnv void>>>, + [number?] + > + > + type test5 = Expect>, [any]>> + type test6 = Expect< + Equal< + Subject.GetEnv< + Parameters void>> + >, + [unknown?] + > + > +} + +namespace SetEnv { + type test1 = Expect< + Equal< + Subject.SetEnv void>>>, + [number, unknown?] + > + > + type test2 = Expect< + Equal< + Subject.SetEnv void>>, [number]>, + [number, number] + > + > + type test3 = Expect< + Equal< + Subject.SetEnv void>>, [number]>, + [number | undefined, number] + > + > + type test4 = Expect< + Equal< + Subject.SetEnv void>>>, + [unknown?, unknown?] + > + > + type test5 = Expect< + Equal< + Subject.SetEnv< + Parameters void>>, + [unknown?] + >, + [unknown?, unknown?] + > + > } diff --git a/src/environment/types.ts b/src/environment/types.ts index 16a6f576..d4a50c9c 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -42,14 +42,6 @@ type PipeReturnWithEnvironment = > : PipeReturn -type X = PipeReturnWithEnvironment< - [ - Composable<(a: number, e?: unknown) => number>, - Composable<(a: number, e: number) => number>, - Composable<(a: number) => void>, - ] -> - type GetEnv = Params extends [ unknown, infer envMandatory, @@ -63,13 +55,6 @@ type GetEnv = Params extends [ ? [AnyArg[1]] : never -type GE1 = GetEnv void>>> -type GE2 = GetEnv void>>> -type GE3 = GetEnv void>>> -type GE4 = GetEnv void>>> -type GE5 = GetEnv> -type GE6 = GetEnv void>>> - type SetEnv< Params extends unknown[], Env extends [unknown?] = [unknown?], @@ -79,34 +64,9 @@ type SetEnv< ? [firstOptional?, ...Env] : never -type Y1 = SetEnv void>>> -type Y2 = SetEnv void>>, [number]> -type Y3 = SetEnv void>>, [number]> -type Y4 = SetEnv void>>> -type Y5 = SetEnv< - Parameters void>>, - [unknown?] -> -type CE = CommonEnvironment< - [ - Composable<(a?: unknown, e?: unknown) => void>, - Composable<(a?: unknown, e?: unknown) => void>, - ] -> -type PRWE = PipeReturnWithEnvironment< - [ - Composable<(a?: unknown, e?: unknown) => { id: number }>, - Composable<(a?: unknown, e?: unknown) => number>, - ] -> -type PR = PipeReturn< - [ - Composable<(a?: unknown, e?: unknown) => { id: number }>, - Composable<(a?: unknown, e?: unknown) => number>, - ] -> - export type { + GetEnv, + SetEnv, CommonEnvironment, PipeReturnWithEnvironment, SequenceReturnWithEnvironment, diff --git a/src/internal/types.test.ts b/src/internal/types.test.ts index e095e62a..f13b682c 100644 --- a/src/internal/types.test.ts +++ b/src/internal/types.test.ts @@ -254,5 +254,18 @@ namespace Prettify { > } +namespace ApplyArgumentsToFns { + type WithEmpty = Expect, []>> + type WithSingle = Expect< + Equal 1], [string]>, [(a: string) => 1]> + > + type WithMultiple = Expect< + Equal< + Internal.ApplyArgumentsToFns<[() => 1, (a: 1) => 'a'], [string]>, + [(a: string) => 1, (a: string) => 'a'] + > + > +} + describe('type tests', () => it('should have no ts errors', () => assertEquals(true, true))) diff --git a/src/internal/types.ts b/src/internal/types.ts index b3e0f4f1..114a3b45 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -7,12 +7,11 @@ namespace Internal { argument2: B } - export type IsIncompatible = - Internal.CommonSubType extends { - 'Incompatible arguments ': true - } - ? true - : false + export type IsIncompatible = Internal.CommonSubType extends { + 'Incompatible arguments ': true + } + ? true + : false export type FailToCompose = ['Fail to compose', A, 'does not fit in', B] @@ -27,6 +26,14 @@ namespace Internal { ? true : false + export type ApplyArgumentsToFns< + Fns extends any[], + Args extends any[], + Output extends any[] = [], + > = Fns extends [(...a: any[]) => infer OA, ...infer restA] + ? ApplyArgumentsToFns OA]> + : Output + // Thanks to https://github.com/tjjfvi // UnionToTuple code lifted from this thread: https://github.com/microsoft/TypeScript/issues/13298#issuecomment-707364842 // This will not preserve union order but we don't care since this is for Composable paralel application @@ -86,79 +93,70 @@ namespace Internal { > = TupleA extends [] ? [...Output, ...TupleB] : TupleB extends [] - ? [...Output, ...TupleA] - : TupleA extends [infer headA, ...infer restA] - ? TupleB extends [infer headB, ...infer restB] - ? IsIncompatible extends true - ? IncompatibleArguments - : SubtypesTuple< - restA, - restB, - [...Output, CommonSubType] - > - : // TupleB is partial - // We should handle partial case before recursion - TupleB extends Partial<[infer headPartial, ...infer restPartial]> - ? IsIncompatible extends true - ? IncompatibleArguments - : SubtypesTuple< - restA, - Partial, - [...Output, CommonSubType>] - > - : never - : TupleB extends [infer headBNoA, ...infer restB] - ? // TupleA is partial - // We should handle partial case before recursion - TupleA extends Partial<[infer headPartial, ...infer restPartial]> - ? IsIncompatible extends true - ? IncompatibleArguments - : SubtypesTuple< - restB, - Partial, - [...Output, CommonSubType>] - > - : never - : /* - * We should continue the recursion checking optional parameters - * We can pattern match optionals using Partial - * We should start handling partials as soon one side of mandatory ends - * Remove ...TupleA, ...TupleB bellow - */ - TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> - ? TupleB extends Partial< - [infer headBPartial, ...infer restBPartial] - > - ? IsIncompatible extends true - ? SubtypesTuple< - Partial, - Partial, - [...Output, ...Partial<[undefined]>] - > - : SubtypesTuple< - Partial, - Partial, - [ - ...Output, - ...Partial<[CommonSubType]>, - ] - > - : never - : never + ? [...Output, ...TupleA] + : TupleA extends [infer headA, ...infer restA] + ? TupleB extends [infer headB, ...infer restB] + ? IsIncompatible extends true + ? IncompatibleArguments + : SubtypesTuple]> + : // TupleB is partial + // We should handle partial case before recursion + TupleB extends Partial<[infer headPartial, ...infer restPartial]> + ? IsIncompatible extends true + ? IncompatibleArguments + : SubtypesTuple< + restA, + Partial, + [...Output, CommonSubType>] + > + : never + : TupleB extends [infer headBNoA, ...infer restB] + ? // TupleA is partial + // We should handle partial case before recursion + TupleA extends Partial<[infer headPartial, ...infer restPartial]> + ? IsIncompatible extends true + ? IncompatibleArguments + : SubtypesTuple< + restB, + Partial, + [...Output, CommonSubType>] + > + : never + : /* + * We should continue the recursion checking optional parameters + * We can pattern match optionals using Partial + * We should start handling partials as soon one side of mandatory ends + * Remove ...TupleA, ...TupleB bellow + */ + TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> + ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> + ? IsIncompatible extends true + ? SubtypesTuple< + Partial, + Partial, + [...Output, ...Partial<[undefined]>] + > + : SubtypesTuple< + Partial, + Partial, + [...Output, ...Partial<[CommonSubType]>] + > + : never + : never export type CommonSubType = [A] extends [B] ? A : [B] extends [A] - ? B - : A extends { 'Incompatible arguments ': true } - ? A - : B extends { 'Incompatible arguments ': true } - ? B - : A extends Record - ? B extends Record - ? Prettify - : IncompatibleArguments - : IncompatibleArguments + ? B + : A extends { 'Incompatible arguments ': true } + ? A + : B extends { 'Incompatible arguments ': true } + ? B + : A extends Record + ? B extends Record + ? Prettify + : IncompatibleArguments + : IncompatibleArguments } export type { Internal } diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 4682390a..f249af7b 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -37,6 +37,20 @@ namespace Last { type test3 = Expect, never>> } +namespace PipeReturn { + type test = Expect< + Equal< + Subject.PipeReturn< + [ + Subject.Composable<(a?: unknown, e?: unknown) => { id: number }>, + Subject.Composable<(a?: unknown, e?: unknown) => number>, + ] + >, + Subject.Composable<(a?: unknown, b?: unknown) => number> + > + > +} + namespace PipeArguments { type testNoEmptyArgumentList = Expect, never>> type testOneComposable = Expect< diff --git a/src/types.ts b/src/types.ts index 2d669acc..08072fee 100644 --- a/src/types.ts +++ b/src/types.ts @@ -97,17 +97,9 @@ type AllArguments< OriginalFns > : Internal.FailToCompose - : ApplyArgumentsToFns + : Internal.ApplyArgumentsToFns : never -type ApplyArgumentsToFns< - Fns extends any[], - Args extends any[], - Output extends any[] = [], -> = Fns extends [(...a: any[]) => infer OA, ...infer restA] - ? ApplyArgumentsToFns OA]> - : Output - type RecordToTuple> = Internal.RecordValuesFromKeysTuple> From 78ed7ba69fa2cc8b3215c0768313d51434648f1b Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Wed, 24 Apr 2024 17:54:06 -0300 Subject: [PATCH 127/238] Remove applyEnvironment from public API --- src/environment/combinators.ts | 28 +++----------- src/environment/index.ts | 2 +- .../tests/apply-environment.test.ts | 38 ------------------- 3 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 src/environment/tests/apply-environment.test.ts diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index aecd151e..a3f2d368 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,31 +1,15 @@ import type { Composable, UnpackData } from '../types.ts' import * as A from '../combinators.ts' import { composable, fromSuccess } from '../constructors.ts' -import { PipeReturnWithEnvironment } from './types.ts' -import { SequenceReturnWithEnvironment } from './types.ts' - -/** - * Takes a function with 2 parameters and partially applies the second one. - * This is useful when one wants to use a domain function having a fixed environment. - * @example - * import { mdf, applyEnvironment } from 'domain-functions' - * - * const endOfDay = mdf(z.date(), z.object({ timezone: z.string() }))((date, { timezone }) => ...) - * const endOfDayUTC = applyEnvironment(endOfDay, { timezone: 'UTC' }) - * // ^? (input: unknown) => Promise> - */ -function applyEnvironment< - I extends any, - E extends any, - Fn extends (input: I, environment: E) => any, ->(df: Fn, environment: E) { - return (input: I) => df(input, environment) as ReturnType -} +import { + PipeReturnWithEnvironment, + SequenceReturnWithEnvironment, +} from './types.ts' function applyEnvironmentToList< Fns extends Array<(input: unknown, environment: unknown) => unknown>, >(fns: Fns, environment: unknown) { - return fns.map((fn) => applyEnvironment(fn, environment)) as [Composable] + return fns.map((fn) => (input) => fn(input, environment)) as [Composable] } /** @@ -116,4 +100,4 @@ function branch( > } -export { applyEnvironment, branch, pipe, sequence } +export { branch, pipe, sequence } diff --git a/src/environment/index.ts b/src/environment/index.ts index 0b635322..e26e2490 100644 --- a/src/environment/index.ts +++ b/src/environment/index.ts @@ -1 +1 @@ -export { applyEnvironment, branch, pipe, sequence } from './combinators.ts' +export { branch, pipe, sequence } from './combinators.ts' diff --git a/src/environment/tests/apply-environment.test.ts b/src/environment/tests/apply-environment.test.ts deleted file mode 100644 index 61c55206..00000000 --- a/src/environment/tests/apply-environment.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { assertEquals, describe, it, z } from './prelude.ts' -import { - environment, - EnvironmentError, - failure, - success, - withSchema, -} from '../../index.ts' - -describe('applyEnvironment', () => { - it('fails when environment fails parser', async () => { - const getEnv = withSchema(z.unknown(), z.number())((_, e) => e) - - const getEnvWithEnvironment = environment.applyEnvironment( - getEnv, - 'invalid environment', - ) - - assertEquals( - await getEnvWithEnvironment('some input'), - failure([new EnvironmentError('Expected number, received string')]), - ) - }) - - it('should apply environment', async () => { - const getEnv = withSchema(z.unknown(), z.string())((_, e) => e) - - const getEnvWithEnvironment = environment.applyEnvironment( - getEnv, - 'constant environment', - ) - - assertEquals( - await getEnvWithEnvironment('some input'), - success('constant environment'), - ) - }) -}) From 719ca21ea672ccda0d01d3cec5f72d39e49d5d14 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 24 Apr 2024 19:46:09 -0400 Subject: [PATCH 128/238] Just create 2 additional test cases making the use of mandatory second parameters a bit more explicit on both pipe and environment.pipe --- src/environment/tests/pipe.test.ts | 12 ++++++++++++ src/tests/pipe.test.ts | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/environment/tests/pipe.test.ts b/src/environment/tests/pipe.test.ts index 5438ac1d..0456eac3 100644 --- a/src/environment/tests/pipe.test.ts +++ b/src/environment/tests/pipe.test.ts @@ -144,4 +144,16 @@ describe('pipe', () => { assertEquals(await d({ aNumber: 1 }), success(false)) }) + + it('compose using environment when piped functions requires a second parameter', async () => { + const add = composable((a: number, env: number) => a + env) + const fn = environment.pipe(add, add) + + const res = await fn(1, 2) + + type _FN = Expect< + Equal number>> + > + assertEquals(res, success(5)) + }) }) diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index e0c0c952..f66b5373 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -54,6 +54,16 @@ describe('pipe', () => { assertEquals(res.errors[0].message, 'a is 1') }) + it('fails to compose when piped functions requires a second parameter', async () => { + const fn = pipe(add, add) + // @ts-expect-error composition will fail + const res = await fn(1, 2) + + type _FN = Expect< + Equal + > + }) + it('catches the errors from function B', async () => { const fn = pipe(add, alwaysThrow, toString) // @ts-expect-error alwaysThrow won't type-check the composition since its return type is never and toString expects an unknown parameter From 847feaecbe88c1f97578a0d1f6b5f91be04c69e1 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 24 Apr 2024 20:19:25 -0400 Subject: [PATCH 129/238] Simplify PipeReturn centralizing all Parameters validation in PipeArguments and PipeArgumentsWithEnvironment. Ensure the WithEnvironment version also guards against mandatory third parameters in piped functions. --- src/environment/combinators.ts | 4 +- src/environment/tests/pipe.test.ts | 33 +++++++++++++++ src/environment/types.ts | 65 +++++++++++++++++++++--------- src/types.ts | 29 +++++-------- 4 files changed, 90 insertions(+), 41 deletions(-) diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index a3f2d368..4a85f2a8 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -30,7 +30,7 @@ function pipe(...fns: Fns) { return ((input: any, environment: any) => A.pipe(...applyEnvironmentToList(fns, environment))( input, - )) as unknown as PipeReturnWithEnvironment + )) as PipeReturnWithEnvironment } /** @@ -48,7 +48,7 @@ function sequence(...fns: Fns) { return ((input: any, environment: any) => A.sequence(...applyEnvironmentToList(fns, environment))( input, - )) as unknown as SequenceReturnWithEnvironment + )) as SequenceReturnWithEnvironment } /** diff --git a/src/environment/tests/pipe.test.ts b/src/environment/tests/pipe.test.ts index 0456eac3..c29ed53b 100644 --- a/src/environment/tests/pipe.test.ts +++ b/src/environment/tests/pipe.test.ts @@ -145,6 +145,39 @@ describe('pipe', () => { assertEquals(await d({ aNumber: 1 }), success(false)) }) + it('fails to compose functions with third mandatory parameter', async () => { + const add = composable((a: number, env: number) => a + env) + const fn = environment.pipe( + add, + composable((x: number, env: number, makeItFail: boolean) => x), + ) + + // @ts-expect-error composition will fail + const res = await fn(1, 2) + + type _FN = Expect< + Equal< + typeof fn, + ['Fail to compose', undefined, 'does not fit in', boolean] + > + > + }) + + it('fails to compose incompatible functions', async () => { + const add = composable((a: number, env: number) => a + env) + const fn = environment.pipe( + add, + composable((x: string) => x), + ) + + // @ts-expect-error composition will fail + const res = await fn(1, 2) + + type _FN = Expect< + Equal + > + }) + it('compose using environment when piped functions requires a second parameter', async () => { const add = composable((a: number, env: number) => a + env) const fn = environment.pipe(add, add) diff --git a/src/environment/types.ts b/src/environment/types.ts index d4a50c9c..ebb28a0c 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -20,27 +20,52 @@ type CommonEnvironment< : never : never -type SequenceReturnWithEnvironment = - SequenceReturn extends Composable<(...args: any[]) => infer CReturn> - ? CommonEnvironment extends { 'Incompatible arguments ': true } - ? CommonEnvironment - : Composable< - ( - ...args: SetEnv, CommonEnvironment> - ) => CReturn - > - : SequenceReturn +type SequenceReturnWithEnvironment = SequenceReturn< + PipeArgumentsWithEnvironment +> extends Composable<(...args: any[]) => infer CReturn> + ? CommonEnvironment extends { 'Incompatible arguments ': true } + ? CommonEnvironment + : Composable< + (...args: SetEnv, CommonEnvironment>) => CReturn + > + : PipeArgumentsWithEnvironment -type PipeReturnWithEnvironment = - PipeReturn extends Composable<(...args: any[]) => infer CReturn> - ? CommonEnvironment extends { 'Incompatible arguments ': true } - ? CommonEnvironment - : Composable< - ( - ...args: SetEnv, CommonEnvironment> - ) => CReturn - > - : PipeReturn +type PipeReturnWithEnvironment = PipeReturn< + PipeArgumentsWithEnvironment +> extends Composable<(...args: any[]) => infer CReturn> + ? CommonEnvironment extends { 'Incompatible arguments ': true } + ? CommonEnvironment + : Composable< + (...args: SetEnv, CommonEnvironment>) => CReturn + > + : PipeArgumentsWithEnvironment + +type PipeArgumentsWithEnvironment< + Fns extends any[], + Arguments extends any[] = [], +> = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] + ? restA extends [ + Composable< + ( + firstParameter: infer FirstBParameter, + secondParameter: any, + ...b: infer PB + ) => any + >, + ...unknown[], + ] + ? Internal.IsNever> extends true + ? Internal.FailToCompose + : Awaited extends FirstBParameter + ? Internal.EveryElementTakes extends true + ? PipeArgumentsWithEnvironment< + restA, + [...Arguments, Composable<(...a: PA) => OA>] + > + : Internal.EveryElementTakes + : Internal.FailToCompose, FirstBParameter> + : [...Arguments, Composable<(...a: PA) => OA>] + : never type GetEnv = Params extends [ unknown, diff --git a/src/types.ts b/src/types.ts index 08072fee..bbfabdf2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -43,28 +43,19 @@ type UnpackAll = { [K in keyof List]: UnpackData } -type SequenceReturn< - Fns extends any[], - OriginalFns extends Composable[] = Fns, -> = Fns extends [ - Composable<(...a: infer PA) => infer OA>, - Composable<(b: infer PB) => infer OB>, - ...infer rest, +type SequenceReturn = Fns extends [ + Composable<(...args: infer P) => any>, + ...any, ] - ? Internal.IsNever extends true - ? Internal.FailToCompose - : Awaited extends PB - ? SequenceReturn<[Composable<(...args: PA) => OB>, ...rest], OriginalFns> - : Internal.FailToCompose, PB> - : Fns extends [Composable<(...args: infer P) => any>] - ? Composable<(...args: P) => UnpackAll> + ? Composable<(...args: P) => UnpackAll> : Fns -type PipeReturn = SequenceReturn extends Composable< - (...args: infer P) => any -> - ? Composable<(...args: P) => UnpackData>> - : SequenceReturn +type PipeReturn = Fns extends [ + Composable<(...args: infer P) => any>, + ...any, +] + ? Composable<(...args: P) => UnpackData, Composable>>> + : Fns type PipeArguments< Fns extends any[], From ff03bba020797134aff9811b41251883ef6f40db Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 24 Apr 2024 20:51:12 -0400 Subject: [PATCH 130/238] First draft for generic branch --- src/combinators.ts | 25 ++++++- src/environment/combinators.ts | 17 +++-- src/index.ts | 1 + src/tests/branch.test.ts | 127 +++++++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+), 7 deletions(-) create mode 100644 src/tests/branch.test.ts diff --git a/src/combinators.ts b/src/combinators.ts index 915ac070..09844de5 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -10,7 +10,7 @@ import type { Success, UnpackData, } from './types.ts' -import { composable, failure, success } from './constructors.ts' +import { composable, failure, fromSuccess, success } from './constructors.ts' import { ErrorList } from './errors.ts' /** @@ -284,8 +284,31 @@ function trace( }) as Fn } +function branch( + cf: Composable<(...args: P) => O>, + resolver: (o: O) => Promise | MaybeFn, +) { + return (async (...args: P) => { + const result = await cf(...args) + if (!result.success) return result + + return composable(async () => { + const nextComposable = await resolver(result.data) + if (typeof nextComposable !== 'function') return result.data + return fromSuccess(nextComposable)(result.data) + })() + }) as Composable< + ( + ...args: P + ) => MaybeFn extends Composable<(...args: P) => infer BranchOutput> + ? BranchOutput + : UnpackData> | O + > +} + export { all, + branch, catchError, collect, first, diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 4a85f2a8..1c523342 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -75,11 +75,16 @@ function sequence(...fns: Fns) { * ) * // ^? Composable<(input?: unknown, environment?: unknown) => { items: Item[] }> */ -function branch( - dfn: Composable<(input?: unknown, environment?: E) => O>, +function branch< + O, + I extends any, + E extends any, + MaybeFn extends Composable | null, +>( + dfn: Composable<(input?: I, environment?: E) => O>, resolver: (o: O) => Promise | MaybeFn, ) { - return (async (input, environment: E) => { + return (async (input: I, environment: E) => { const result = await dfn(input, environment) if (!result.success) return result @@ -90,10 +95,10 @@ function branch( })() }) as Composable< ( - input?: unknown, - environment?: unknown, + input?: I, + environment?: E, ) => MaybeFn extends Composable< - (input?: unknown, environment?: unknown) => infer BranchOutput + (input?: I, environment?: E) => infer BranchOutput > ? BranchOutput : UnpackData> | O diff --git a/src/index.ts b/src/index.ts index 34620101..5b2ea75b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,6 +8,7 @@ export { } from './constructors.ts' export { all, + branch, catchError, collect, first, diff --git a/src/tests/branch.test.ts b/src/tests/branch.test.ts new file mode 100644 index 00000000..bcf57385 --- /dev/null +++ b/src/tests/branch.test.ts @@ -0,0 +1,127 @@ +import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' +import { + composable, + failure, + InputError, + success, + withSchema, +} from '../index.ts' +import { Composable } from '../types.ts' +import { branch } from '../combinators.ts' + +describe('branch', () => { + it('should pipe a composable with arbitrary pipes', async () => { + const a = composable(({ id }: { id: number }) => ({ + id: id + 2, + })) + const b = composable(({ id }: { id: number }) => id - 1) + + const c = branch(a, () => Promise.resolve(b)) + type _R = Expect< + Equal number>> + > + + assertEquals(await c({ id: 1 }), success(2)) + }) + + it('should enable conditionally choosing the next Composable with the output of first one', async () => { + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + id: id + 2, + next: 'multiply', + })) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) + const c = withSchema(z.object({ id: z.number() }))(({ id }) => id * 2) + const d = branch(a, (output) => (output.next === 'multiply' ? c : b)) + type _R = Expect< + Equal< + typeof d, + Composable<(input?: unknown, environment?: unknown) => number | string> + > + > + + assertEquals(await d({ id: 1 }), success(6)) + }) + + it('should not pipe if the predicate returns null', async () => { + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + id: id + 2, + next: 'multiply', + })) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) + const d = branch(a, (output) => (output.next === 'multiply' ? null : b)) + type _R = Expect< + Equal< + typeof d, + Composable< + ( + input?: unknown, + environment?: unknown, + ) => string | { id: number; next: string } + > + > + > + + assertEquals(await d({ id: 1 }), success({ id: 3, next: 'multiply' })) + }) + + it('should gracefully fail if the first function fails', async () => { + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + id: id + 2, + })) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) + const c = branch(a, () => b) + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + assertEquals( + await c({ id: '1' }), + failure([new InputError('Expected number, received string', ['id'])]), + ) + }) + + it('should gracefully fail if the second function fails', async () => { + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + id: String(id), + })) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) + const c = branch(a, () => b) + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + assertEquals( + await c({ id: 1 }), + failure([new InputError('Expected number, received string', ['id'])]), + ) + }) + + it('should gracefully fail if the condition function fails', async () => { + const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + id: id + 2, + })) + const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) + const c = branch(a, (_) => { + throw new Error('condition function failed') + // deno-lint-ignore no-unreachable + return b + }) + type _R = Expect< + Equal< + typeof c, + Composable<(input?: unknown, environment?: unknown) => number> + > + > + + const { + errors: [err], + } = await c({ id: 1 }) + assertIsError(err, Error, 'condition function failed') + }) +}) From 3e98c78c1ea49d7e354d54237fbe4eebdd019c88 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 25 Apr 2024 10:07:45 -0300 Subject: [PATCH 131/238] Add some TODO comments to test things that branch didn't implement yet --- src/environment/tests/branch.test.ts | 61 ++++++++++++++++------------ src/tests/branch.test.ts | 2 +- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/environment/tests/branch.test.ts b/src/environment/tests/branch.test.ts index 9a211f8b..511910a7 100644 --- a/src/environment/tests/branch.test.ts +++ b/src/environment/tests/branch.test.ts @@ -73,22 +73,21 @@ describe('branch', () => { }) it('should use the same environment in all composed functions', async () => { - const a = withSchema( - z.undefined(), - z.object({ env: z.number() }), - )((_input, { env }) => ({ + const a = composable((_input: unknown, { env }: { env: number }) => ({ inp: env + 2, })) - const b = withSchema( - z.object({ inp: z.number() }), - z.object({ env: z.number() }), - )(({ inp }, { env }) => inp + env) + const b = composable( + ({ inp }: { inp: number }, { env }: { env: number }) => inp + env, + ) const c = environment.branch(a, () => b) + // TODO: This input should maybe be a required { inp: number } type _R = Expect< Equal< typeof c, - Composable<(input?: unknown, environment?: unknown) => number> + Composable< + (input?: unknown, environment?: { env: number } | undefined) => number + > > > @@ -96,10 +95,10 @@ describe('branch', () => { }) it('should gracefully fail if the first function fails', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema(z.number())((id) => ({ id: id + 2, })) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = composable((id: number) => id - 1) const c = environment.branch(a, () => b) type _R = Expect< Equal< @@ -109,8 +108,8 @@ describe('branch', () => { > assertEquals( - await c({ id: '1' }), - failure([new InputError('Expected number, received string', ['id'])]), + await c('1'), + failure([new InputError('Expected number, received string')]), ) }) @@ -134,34 +133,39 @@ describe('branch', () => { }) it('should gracefully fail if the condition function fails', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + const a = composable((id: number) => ({ id: id + 2, })) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = composable((id: number) => id - 1) const c = environment.branch(a, (_) => { throw new Error('condition function failed') // deno-lint-ignore no-unreachable return b }) - type _R = Expect< - Equal< - typeof c, - Composable<(input?: unknown, environment?: unknown) => number> - > - > + // TODO: the input should be required + // type _R = Expect< + // Equal< + // typeof c, + // Composable<(input: number, environment?: unknown) => number> + // > + // > const { errors: [err], - } = await c({ id: 1 }) + } = await c(1) assertIsError(err, Error, 'condition function failed') }) it('should not break composition with other combinators', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + const a = withSchema( + z.object({ id: z.number() }), + // TODO: Why don't we have z.any or z.unknown as default for env? + z.unknown(), + )(({ id }) => ({ id: id + 2, })) const b = composable(({ id }: { id: number }) => id - 1) - const c = composable((n: number) => n * 2) + const c = composable((n: number, env: number) => env + n * 2) const d = all( environment.pipe( environment.branch(a, () => b), @@ -173,14 +177,17 @@ describe('branch', () => { Equal< typeof d, Composable< - (input?: unknown, environment?: unknown) => [number, { id: number }] + ( + input: Partial, + environment: number, + ) => [number, { id: number }] > > > assertEquals( - await d({ id: 1 }), - success<[number, { id: number }]>([4, { id: 3 }]), + await d({ id: 1 }, 3), + success<[number, { id: number }]>([7, { id: 3 }]), ) }) }) diff --git a/src/tests/branch.test.ts b/src/tests/branch.test.ts index bcf57385..df27d645 100644 --- a/src/tests/branch.test.ts +++ b/src/tests/branch.test.ts @@ -47,7 +47,7 @@ describe('branch', () => { id: id + 2, next: 'multiply', })) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) + const b = composable(({ id }: { id: number }) => String(id)) const d = branch(a, (output) => (output.next === 'multiply' ? null : b)) type _R = Expect< Equal< From a2629467c1b6d5d80b59b78f29edfc8884848147 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 26 Apr 2024 10:33:10 -0300 Subject: [PATCH 132/238] Publish a new experimental version --- deno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deno.json b/deno.json index b2749227..4a2d6d6e 100644 --- a/deno.json +++ b/deno.json @@ -1,5 +1,5 @@ { - "version": "0.0.0-experimental-20240422-1", + "version": "0.0.0-experimental-20240426-1", "tasks": { "test": "deno test --allow-env --allow-net src", "publish": "deno task build-npm && cd npm/ && npm publish", From d2a78d0c16a650a85acde145cc137027b4611842 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Thu, 2 May 2024 08:53:48 -0400 Subject: [PATCH 133/238] remove outdated note --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 60509cd9..a9fe3187 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,6 @@ import { map } from 'composable-functions' const addAndReturnString = map(add, String) ``` -Note that if your mapper function has to be `async` you should wrap it in `composable` and use `pipe` instead. - ## Parallel composition There are also functions compositions where all its parameters are excuted in parallel, like `Promise.all` will execute several promises and wait for all of them. From 0da09de9624781771bf73e51b5d50b295f7048c3 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 3 May 2024 18:28:10 -0400 Subject: [PATCH 134/238] This is how the code looks with deno formatter --- deno.json | 9 ++ src/combinators.ts | 15 ++-- src/compat/types.ts | 22 ++--- src/constructors.ts | 19 ++--- src/environment/combinators.ts | 3 +- src/environment/tests/branch.test.ts | 10 ++- src/environment/types.ts | 86 +++++++++---------- src/errors.ts | 2 +- src/index.ts | 2 +- src/internal/types.ts | 122 ++++++++++++--------------- src/test.d.ts | 2 +- src/tests/all.test.ts | 6 +- src/tests/catch-error.test.ts | 7 +- src/tests/collect.test.ts | 6 +- src/tests/constructors.test.ts | 8 +- src/tests/first.test.ts | 2 +- src/tests/input-resolvers.test.ts | 2 +- src/tests/map-error.test.ts | 7 +- src/tests/map.test.ts | 2 +- src/tests/merge.test.ts | 2 +- src/tests/pipe.test.ts | 11 ++- src/tests/prelude.ts | 6 +- src/tests/sequence.test.ts | 6 +- src/tests/trace.test.ts | 4 +- src/types.ts | 55 ++++++------ 25 files changed, 203 insertions(+), 213 deletions(-) diff --git a/deno.json b/deno.json index 4a2d6d6e..3ea68c6c 100644 --- a/deno.json +++ b/deno.json @@ -19,5 +19,14 @@ }, "compilerOptions": { "types": ["./src/test.d.ts"] + }, + "fmt": { + "useTabs": false, + "lineWidth": 80, + "indentWidth": 2, + "semiColons": false, + "singleQuote": true, + "proseWrap": "preserve", + "include": ["src/"], } } diff --git a/src/combinators.ts b/src/combinators.ts index 09844de5..63b4b4d5 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -91,7 +91,7 @@ function all(...fns: Fns) { */ function collect>(fns: Fns) { const fnsWithKey = Object.entries(fns).map(([key, cf]) => - map(cf, (result) => ({ [key]: result })), + map(cf, (result) => ({ [key]: result })) ) return map(all(...(fnsWithKey as any)), mergeObjects) as Composable< ( @@ -160,9 +160,11 @@ function map( function merge( ...fns: Fns ): Composable< - (...args: Parameters[0]>>) => MergeObjs<{ - [key in keyof Fns]: UnpackData - }> + (...args: Parameters[0]>>) => MergeObjs< + { + [key in keyof Fns]: UnpackData + } + > > { return map(all(...(fns as never)), mergeObjects) } @@ -216,9 +218,8 @@ function catchError< ( ...args: Parameters ) => Awaited> extends never[] - ? UnpackData extends any[] - ? UnpackData - : Awaited> | UnpackData + ? UnpackData extends any[] ? UnpackData + : Awaited> | UnpackData : Awaited> | UnpackData > { return async (...args: Parameters) => { diff --git a/src/compat/types.ts b/src/compat/types.ts index 59b13c8e..f0dfdaf3 100644 --- a/src/compat/types.ts +++ b/src/compat/types.ts @@ -3,17 +3,17 @@ import { SerializableError } from '../types.ts' type SerializedResult = | { - success: true - data: T - errors: [] - inputErrors: [] - environmentErrors: [] - } + success: true + data: T + errors: [] + inputErrors: [] + environmentErrors: [] + } | { - success: false - errors: SerializableError[] - inputErrors: SerializableError[] - environmentErrors: SerializableError[] - } + success: false + errors: SerializableError[] + inputErrors: SerializableError[] + environmentErrors: SerializableError[] + } export type { SerializedResult } diff --git a/src/constructors.ts b/src/constructors.ts index 798bf570..cd83d17e 100644 --- a/src/constructors.ts +++ b/src/constructors.ts @@ -107,17 +107,12 @@ function applySchema( ) if (!result.success || !envResult.success) { - const inputErrors = result.success - ? [] - : result.error.issues.map( - (error) => new InputError(error.message, error.path as string[]), - ) - const envErrors = envResult.success - ? [] - : envResult.error.issues.map( - (error) => - new EnvironmentError(error.message, error.path as string[]), - ) + const inputErrors = result.success ? [] : result.error.issues.map( + (error) => new InputError(error.message, error.path as string[]), + ) + const envErrors = envResult.success ? [] : envResult.error.issues.map( + (error) => new EnvironmentError(error.message, error.path as string[]), + ) return failure([...inputErrors, ...envErrors]) } return fn(result.data, envResult.data) @@ -143,4 +138,4 @@ const alwaysUndefinedSchema: ParserSchema = { }, } -export { composable, failure, fromSuccess, success, withSchema, applySchema } +export { applySchema, composable, failure, fromSuccess, success, withSchema } diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 1c523342..8e528e32 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -99,8 +99,7 @@ function branch< environment?: E, ) => MaybeFn extends Composable< (input?: I, environment?: E) => infer BranchOutput - > - ? BranchOutput + > ? BranchOutput : UnpackData> | O > } diff --git a/src/environment/tests/branch.test.ts b/src/environment/tests/branch.test.ts index 511910a7..60ccde49 100644 --- a/src/environment/tests/branch.test.ts +++ b/src/environment/tests/branch.test.ts @@ -35,8 +35,9 @@ describe('branch', () => { })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) const c = withSchema(z.object({ id: z.number() }))(({ id }) => id * 2) - const d = environment.branch(a, (output) => - output.next === 'multiply' ? c : b, + const d = environment.branch( + a, + (output) => output.next === 'multiply' ? c : b, ) type _R = Expect< Equal< @@ -54,8 +55,9 @@ describe('branch', () => { next: 'multiply', })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) - const d = environment.branch(a, (output) => - output.next === 'multiply' ? null : b, + const d = environment.branch( + a, + (output) => output.next === 'multiply' ? null : b, ) type _R = Expect< Equal< diff --git a/src/environment/types.ts b/src/environment/types.ts index ebb28a0c..e7d8dd79 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -4,19 +4,18 @@ import { Composable, PipeReturn, SequenceReturn } from '../types.ts' type CommonEnvironment< Fns extends Composable[], Env extends [unknown?] = [unknown?], -> = Fns extends [] - ? Env +> = Fns extends [] ? Env : Fns extends [ - Composable<(...args: infer CParameters) => any>, - ...infer RestFns, - ] - ? GetEnv extends [unknown?] - ? Internal.IsIncompatible> extends true - ? Internal.IncompatibleArguments> + Composable<(...args: infer CParameters) => any>, + ...infer RestFns, + ] + ? GetEnv extends [unknown?] + ? Internal.IsIncompatible> extends true + ? Internal.IncompatibleArguments> : CommonEnvironment< - Extract, - Extract>, [unknown?]> - > + Extract, + Extract>, [unknown?]> + > : never : never @@ -25,9 +24,9 @@ type SequenceReturnWithEnvironment = SequenceReturn< > extends Composable<(...args: any[]) => infer CReturn> ? CommonEnvironment extends { 'Incompatible arguments ': true } ? CommonEnvironment - : Composable< - (...args: SetEnv, CommonEnvironment>) => CReturn - > + : Composable< + (...args: SetEnv, CommonEnvironment>) => CReturn + > : PipeArgumentsWithEnvironment type PipeReturnWithEnvironment = PipeReturn< @@ -35,9 +34,9 @@ type PipeReturnWithEnvironment = PipeReturn< > extends Composable<(...args: any[]) => infer CReturn> ? CommonEnvironment extends { 'Incompatible arguments ': true } ? CommonEnvironment - : Composable< - (...args: SetEnv, CommonEnvironment>) => CReturn - > + : Composable< + (...args: SetEnv, CommonEnvironment>) => CReturn + > : PipeArgumentsWithEnvironment type PipeArgumentsWithEnvironment< @@ -45,54 +44,49 @@ type PipeArgumentsWithEnvironment< Arguments extends any[] = [], > = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] ? restA extends [ - Composable< - ( - firstParameter: infer FirstBParameter, - secondParameter: any, - ...b: infer PB - ) => any - >, - ...unknown[], - ] + Composable< + ( + firstParameter: infer FirstBParameter, + secondParameter: any, + ...b: infer PB + ) => any + >, + ...unknown[], + ] ? Internal.IsNever> extends true ? Internal.FailToCompose - : Awaited extends FirstBParameter + : Awaited extends FirstBParameter ? Internal.EveryElementTakes extends true ? PipeArgumentsWithEnvironment< - restA, - [...Arguments, Composable<(...a: PA) => OA>] - > - : Internal.EveryElementTakes - : Internal.FailToCompose, FirstBParameter> - : [...Arguments, Composable<(...a: PA) => OA>] + restA, + [...Arguments, Composable<(...a: PA) => OA>] + > + : Internal.EveryElementTakes + : Internal.FailToCompose, FirstBParameter> + : [...Arguments, Composable<(...a: PA) => OA>] : never type GetEnv = Params extends [ unknown, infer envMandatory, -] - ? [envMandatory] - : Params extends Partial<[unknown, infer envOptional]> - ? [envOptional?] - : Params extends [...Partial<[unknown]>] - ? [unknown?] - : Params extends [...infer AnyArg] - ? [AnyArg[1]] +] ? [envMandatory] + : Params extends Partial<[unknown, infer envOptional]> ? [envOptional?] + : Params extends [...Partial<[unknown]>] ? [unknown?] + : Params extends [...infer AnyArg] ? [AnyArg[1]] : never type SetEnv< Params extends unknown[], Env extends [unknown?] = [unknown?], -> = Params extends [infer firstMandatory, ...any] - ? [firstMandatory, ...Env] +> = Params extends [infer firstMandatory, ...any] ? [firstMandatory, ...Env] : Params extends [...Partial<[infer firstOptional, ...any]>] - ? [firstOptional?, ...Env] + ? [firstOptional?, ...Env] : never export type { - GetEnv, - SetEnv, CommonEnvironment, + GetEnv, PipeReturnWithEnvironment, SequenceReturnWithEnvironment, + SetEnv, } diff --git a/src/errors.ts b/src/errors.ts index fda01e9a..d7baa93e 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -42,4 +42,4 @@ class ErrorList extends Error { } } -export { EnvironmentError, InputError, ErrorList } +export { EnvironmentError, ErrorList, InputError } diff --git a/src/index.ts b/src/index.ts index 5b2ea75b..73d9175a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -26,7 +26,7 @@ export { inputFromSearch, inputFromUrl, } from './input-resolvers.ts' -export { toErrorPayload, serialize } from './serializer.ts' +export { serialize, toErrorPayload } from './serializer.ts' export { EnvironmentError, ErrorList, InputError } from './errors.ts' export type { Composable, diff --git a/src/internal/types.ts b/src/internal/types.ts index 114a3b45..74f7c07d 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -9,22 +9,23 @@ namespace Internal { export type IsIncompatible = Internal.CommonSubType extends { 'Incompatible arguments ': true - } - ? true + } ? true : false export type FailToCompose = ['Fail to compose', A, 'does not fit in', B] - export type Prettify = { - [K in keyof T]: T[K] - // deno-lint-ignore ban-types - } & {} + export type Prettify = + & { + [K in keyof T]: T[K] + // deno-lint-ignore ban-types + } + & {} export type IsNever = // prettier-ignore (() => T extends A ? 1 : 2) extends (() => T extends never ? 1 : 2) - ? true - : false + ? true + : false export type ApplyArgumentsToFns< Fns extends any[], @@ -39,12 +40,10 @@ namespace Internal { // This will not preserve union order but we don't care since this is for Composable paralel application export type UnionToTuple = ( (T extends any ? (t: T) => T : never) extends infer U - ? (U extends any ? (u: U) => any : never) extends (v: infer V) => any - ? V - : never + ? (U extends any ? (u: U) => any : never) extends (v: infer V) => any ? V + : never : never - ) extends (_: any) => infer W - ? [...UnionToTuple>, W] + ) extends (_: any) => infer W ? [...UnionToTuple>, W] : [] export type Keys> = UnionToTuple @@ -57,8 +56,8 @@ namespace Internal { ? Head extends string ? rest extends string[] ? RecordValuesFromKeysTuple - : never - : ValuesTuple + : never + : ValuesTuple : ValuesTuple export type Zip< @@ -71,90 +70,81 @@ namespace Internal { ? restK extends string[] ? restV extends unknown[] ? Prettify> - : V // in this case V has the AllArguments failure type - : never + : V // in this case V has the AllArguments failure type : never - : O + : never + : O : O export type EveryElementTakes = T extends [ infer HEAD, ...infer TAIL, - ] - ? U extends HEAD - ? EveryElementTakes - : FailToCompose + ] ? U extends HEAD ? EveryElementTakes + : FailToCompose : true export type SubtypesTuple< TupleA extends unknown[], TupleB extends unknown[], Output extends unknown[] = [], - > = TupleA extends [] - ? [...Output, ...TupleB] - : TupleB extends [] - ? [...Output, ...TupleA] + > = TupleA extends [] ? [...Output, ...TupleB] + : TupleB extends [] ? [...Output, ...TupleA] : TupleA extends [infer headA, ...infer restA] - ? TupleB extends [infer headB, ...infer restB] - ? IsIncompatible extends true - ? IncompatibleArguments + ? TupleB extends [infer headB, ...infer restB] + ? IsIncompatible extends true + ? IncompatibleArguments : SubtypesTuple]> - : // TupleB is partial - // We should handle partial case before recursion - TupleB extends Partial<[infer headPartial, ...infer restPartial]> - ? IsIncompatible extends true - ? IncompatibleArguments + // TupleB is partial + // We should handle partial case before recursion + : TupleB extends Partial<[infer headPartial, ...infer restPartial]> + ? IsIncompatible extends true + ? IncompatibleArguments : SubtypesTuple< - restA, - Partial, - [...Output, CommonSubType>] - > + restA, + Partial, + [...Output, CommonSubType>] + > : never : TupleB extends [infer headBNoA, ...infer restB] - ? // TupleA is partial - // We should handle partial case before recursion - TupleA extends Partial<[infer headPartial, ...infer restPartial]> - ? IsIncompatible extends true - ? IncompatibleArguments + // TupleA is partial + // We should handle partial case before recursion + ? TupleA extends Partial<[infer headPartial, ...infer restPartial]> + ? IsIncompatible extends true + ? IncompatibleArguments : SubtypesTuple< - restB, - Partial, - [...Output, CommonSubType>] - > + restB, + Partial, + [...Output, CommonSubType>] + > : never - : /* + /* * We should continue the recursion checking optional parameters * We can pattern match optionals using Partial * We should start handling partials as soon one side of mandatory ends * Remove ...TupleA, ...TupleB bellow */ - TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> - ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> - ? IsIncompatible extends true - ? SubtypesTuple< + : TupleA extends Partial<[infer headAPartial, ...infer restAPartial]> + ? TupleB extends Partial<[infer headBPartial, ...infer restBPartial]> + ? IsIncompatible extends true + ? SubtypesTuple< Partial, Partial, [...Output, ...Partial<[undefined]>] > : SubtypesTuple< - Partial, - Partial, - [...Output, ...Partial<[CommonSubType]>] - > + Partial, + Partial, + [...Output, ...Partial<[CommonSubType]>] + > : never : never - export type CommonSubType = [A] extends [B] - ? A - : [B] extends [A] - ? B - : A extends { 'Incompatible arguments ': true } - ? A - : B extends { 'Incompatible arguments ': true } - ? B + export type CommonSubType = [A] extends [B] ? A + : [B] extends [A] ? B + : A extends { 'Incompatible arguments ': true } ? A + : B extends { 'Incompatible arguments ': true } ? B : A extends Record - ? B extends Record - ? Prettify + ? B extends Record ? Prettify : IncompatibleArguments : IncompatibleArguments } diff --git a/src/test.d.ts b/src/test.d.ts index f1b17b51..2a0b9f43 100644 --- a/src/test.d.ts +++ b/src/test.d.ts @@ -2,4 +2,4 @@ type Expect = T type Equal = // prettier-ignore (() => T extends A ? 1 : 2) extends (() => T extends B ? 1 : 2) ? true - : [A, "should equal", B] + : [A, 'should equal', B] diff --git a/src/tests/all.test.ts b/src/tests/all.test.ts index 92a32988..f9687117 100644 --- a/src/tests/all.test.ts +++ b/src/tests/all.test.ts @@ -1,12 +1,12 @@ import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' import { all, + Composable, composable, + failure, + InputError, success, withSchema, - Composable, - InputError, - failure, } from '../index.ts' const voidFn = composable(() => {}) diff --git a/src/tests/catch-error.test.ts b/src/tests/catch-error.test.ts index f9df942a..e606f551 100644 --- a/src/tests/catch-error.test.ts +++ b/src/tests/catch-error.test.ts @@ -1,5 +1,5 @@ import { assertEquals, describe, it, z } from './prelude.ts' -import type { Result, Composable } from '../index.ts' +import type { Composable, Result } from '../index.ts' import { catchError, composable, success, withSchema } from '../index.ts' const schemaFaultyAdd = withSchema( @@ -51,8 +51,9 @@ describe('catchError', () => { }) it('receives the list of errors as input to another function and returns a new composable', async () => { - const fn = catchError(faultyAdd, (errors, a, b) => - errors.length > 1 ? NaN : a + b, + const fn = catchError( + faultyAdd, + (errors, a, b) => errors.length > 1 ? NaN : a + b, ) const res = await fn(1, 2) diff --git a/src/tests/collect.test.ts b/src/tests/collect.test.ts index 0bdc499c..69293b13 100644 --- a/src/tests/collect.test.ts +++ b/src/tests/collect.test.ts @@ -1,12 +1,12 @@ import { assertEquals, describe, it, z } from './prelude.ts' -import type { Result, Composable } from '../index.ts' +import type { Composable, Result } from '../index.ts' import { collect, - withSchema, + composable, failure, InputError, - composable, success, + withSchema, } from '../index.ts' const voidFn = composable(() => {}) diff --git a/src/tests/constructors.test.ts b/src/tests/constructors.test.ts index 57c7c108..b577d3e7 100644 --- a/src/tests/constructors.test.ts +++ b/src/tests/constructors.test.ts @@ -6,15 +6,15 @@ import { it, z, } from './prelude.ts' -import type { Result, Composable, Success } from '../index.ts' +import type { Composable, Result, Success } from '../index.ts' import { composable, - success, - fromSuccess, - ErrorList, EnvironmentError, + ErrorList, failure, + fromSuccess, InputError, + success, withSchema, } from '../index.ts' import { applySchema } from '../index.ts' diff --git a/src/tests/first.test.ts b/src/tests/first.test.ts index 90fb7adc..e0e0e053 100644 --- a/src/tests/first.test.ts +++ b/src/tests/first.test.ts @@ -1,5 +1,5 @@ import { assertEquals, describe, it, z } from './prelude.ts' -import { withSchema, first, failure, InputError, success } from '../index.ts' +import { failure, first, InputError, success, withSchema } from '../index.ts' import type { Composable } from '../index.ts' import { composable } from '../index.ts' diff --git a/src/tests/input-resolvers.test.ts b/src/tests/input-resolvers.test.ts index b5a44e4a..46c8783e 100644 --- a/src/tests/input-resolvers.test.ts +++ b/src/tests/input-resolvers.test.ts @@ -1,4 +1,4 @@ -import { describe, it, assertEquals } from './prelude.ts' +import { assertEquals, describe, it } from './prelude.ts' import * as subject from '../input-resolvers.ts' const makePost: (entries: Array<[string, string]>, url?: string) => Request = ( diff --git a/src/tests/map-error.test.ts b/src/tests/map-error.test.ts index 1ccd79d5..a6f66ddc 100644 --- a/src/tests/map-error.test.ts +++ b/src/tests/map-error.test.ts @@ -1,5 +1,5 @@ import { assertEquals, describe, it } from './prelude.ts' -import type { Result, Composable } from '../index.ts' +import type { Composable, Result } from '../index.ts' import { composable, mapError } from '../index.ts' import { success } from '../constructors.ts' @@ -39,8 +39,9 @@ describe('mapError', () => { }) it('accepts an async mapper', async () => { - const fn = mapError(faultyAdd, (errors) => - Promise.resolve(errors.map(cleanError)), + const fn = mapError( + faultyAdd, + (errors) => Promise.resolve(errors.map(cleanError)), ) const res = await fn(1, 2) diff --git a/src/tests/map.test.ts b/src/tests/map.test.ts index c304edd4..72f386b2 100644 --- a/src/tests/map.test.ts +++ b/src/tests/map.test.ts @@ -1,5 +1,5 @@ import { assertEquals, describe, it } from './prelude.ts' -import type { Result, Composable } from '../index.ts' +import type { Composable, Result } from '../index.ts' import { composable, map, pipe, success } from '../index.ts' const toString = composable((a: unknown) => `${a}`) diff --git a/src/tests/merge.test.ts b/src/tests/merge.test.ts index 99c06ff8..79e03583 100644 --- a/src/tests/merge.test.ts +++ b/src/tests/merge.test.ts @@ -1,5 +1,5 @@ import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' -import { merge, withSchema, failure, InputError, success } from '../index.ts' +import { failure, InputError, merge, success, withSchema } from '../index.ts' import type { Composable } from '../index.ts' import { composable } from '../index.ts' diff --git a/src/tests/pipe.test.ts b/src/tests/pipe.test.ts index f66b5373..49329969 100644 --- a/src/tests/pipe.test.ts +++ b/src/tests/pipe.test.ts @@ -1,5 +1,5 @@ import { assertEquals, describe, it } from './prelude.ts' -import type { Result, Composable } from '../index.ts' +import type { Composable, Result } from '../index.ts' import { composable, pipe, success } from '../index.ts' const toString = composable((a: unknown) => `${a}`) @@ -27,10 +27,10 @@ describe('pipe', () => { it('type checks and composes async functions', async () => { const asyncProduceToIncrement = composable(() => - Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }), + Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }) ) const asyncIncrementProperty = composable((a: { toIncrement: number }) => - Promise.resolve(a.toIncrement + 1), + Promise.resolve(a.toIncrement + 1) ) const fn = pipe(asyncProduceToIncrement, asyncIncrementProperty) const res = await fn() @@ -60,7 +60,10 @@ describe('pipe', () => { const res = await fn(1, 2) type _FN = Expect< - Equal + Equal< + typeof fn, + ['Fail to compose', undefined, 'does not fit in', number] + > > }) diff --git a/src/tests/prelude.ts b/src/tests/prelude.ts index 72abedab..f2c4259f 100644 --- a/src/tests/prelude.ts +++ b/src/tests/prelude.ts @@ -1,9 +1,9 @@ export { describe, it } from 'https://deno.land/std@0.206.0/testing/bdd.ts' export { - assertEquals, - assertRejects, - assertObjectMatch, assertAlmostEquals, + assertEquals, assertIsError, + assertObjectMatch, + assertRejects, } from 'https://deno.land/std@0.206.0/assert/mod.ts' export { z } from 'https://deno.land/x/zod@v3.22.4/mod.ts' diff --git a/src/tests/sequence.test.ts b/src/tests/sequence.test.ts index 902dfb98..71f0d3ed 100644 --- a/src/tests/sequence.test.ts +++ b/src/tests/sequence.test.ts @@ -1,5 +1,5 @@ import { assertEquals, describe, it, z } from './prelude.ts' -import type { Result, Composable } from '../index.ts' +import type { Composable, Result } from '../index.ts' import { composable, sequence, success } from '../index.ts' import { withSchema } from '../index.ts' @@ -28,10 +28,10 @@ describe('sequence', () => { it('type checks and composes async functions', async () => { const asyncProduceToIncrement = composable(() => - Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }), + Promise.resolve({ toIncrement: 1, someOtherProperty: 'test' }) ) const asyncIncrementProperty = composable((a: { toIncrement: number }) => - Promise.resolve(a.toIncrement + 1), + Promise.resolve(a.toIncrement + 1) ) const fn = sequence(asyncProduceToIncrement, asyncIncrementProperty) const res = await fn() diff --git a/src/tests/trace.test.ts b/src/tests/trace.test.ts index b044710c..d175dc0b 100644 --- a/src/tests/trace.test.ts +++ b/src/tests/trace.test.ts @@ -1,10 +1,10 @@ import { assertEquals, assertIsError, describe, it, z } from './prelude.ts' import { composable, - withSchema, - trace, fromSuccess, success, + trace, + withSchema, } from '../index.ts' import type { Composable } from '../index.ts' diff --git a/src/types.ts b/src/types.ts index bbfabdf2..c5abf21e 100644 --- a/src/types.ts +++ b/src/types.ts @@ -26,8 +26,7 @@ type Result = Success | Failure type MergeObjs = Objs extends [ infer first, ...infer rest, -] - ? MergeObjs & first>> +] ? MergeObjs & first>> : output type Composable any = (...args: any[]) => any> = ( @@ -46,15 +45,13 @@ type UnpackAll = { type SequenceReturn = Fns extends [ Composable<(...args: infer P) => any>, ...any, -] - ? Composable<(...args: P) => UnpackAll> +] ? Composable<(...args: P) => UnpackAll> : Fns type PipeReturn = Fns extends [ Composable<(...args: infer P) => any>, ...any, -] - ? Composable<(...args: P) => UnpackData, Composable>>> +] ? Composable<(...args: P) => UnpackData, Composable>>> : Fns type PipeArguments< @@ -62,19 +59,19 @@ type PipeArguments< Arguments extends any[] = [], > = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] ? restA extends [ - Composable< - (firstParameter: infer FirstBParameter, ...b: infer PB) => any - >, - ...unknown[], - ] + Composable< + (firstParameter: infer FirstBParameter, ...b: infer PB) => any + >, + ...unknown[], + ] ? Internal.IsNever> extends true ? Internal.FailToCompose - : Awaited extends FirstBParameter + : Awaited extends FirstBParameter ? Internal.EveryElementTakes extends true ? PipeArguments OA>]> - : Internal.EveryElementTakes - : Internal.FailToCompose, FirstBParameter> - : [...Arguments, Composable<(...a: PA) => OA>] + : Internal.EveryElementTakes + : Internal.FailToCompose, FirstBParameter> + : [...Arguments, Composable<(...a: PA) => OA>] : never type AllArguments< @@ -82,13 +79,12 @@ type AllArguments< OriginalFns extends any[] = Fns, > = Fns extends [Composable<(...a: infer PA) => any>, ...infer restA] ? restA extends [Composable<(...b: infer PB) => infer OB>, ...infer restB] - ? Internal.SubtypesTuple extends [...infer MergedP] - ? AllArguments< - [Composable<(...args: MergedP) => OB>, ...restB], - OriginalFns - > - : Internal.FailToCompose - : Internal.ApplyArgumentsToFns + ? Internal.SubtypesTuple extends [...infer MergedP] ? AllArguments< + [Composable<(...args: MergedP) => OB>, ...restB], + OriginalFns + > + : Internal.FailToCompose + : Internal.ApplyArgumentsToFns : never type RecordToTuple> = @@ -111,18 +107,17 @@ type SerializedResult = type ParserSchema = { safeParseAsync: (a: unknown) => Promise< | { - success: true - data: T - } + success: true + data: T + } | { - success: false - error: { issues: { path: PropertyKey[]; message: string }[] } - } + success: false + error: { issues: { path: PropertyKey[]; message: string }[] } + } > } -type Last = T extends [...infer _I, infer L] - ? L +type Last = T extends [...infer _I, infer L] ? L : never export type { From 127f1f1bffe42c32c366a3e50ebd854c5951b617 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 11:39:51 -0400 Subject: [PATCH 135/238] First draft of BranchReturn type. Still some basic cases failing. --- src/combinators.ts | 21 +++++------ src/tests/branch.test.ts | 15 +++++--- src/types.ts | 79 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 17 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 63b4b4d5..9a72f444 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -1,5 +1,6 @@ import type { AllArguments, + BranchReturn, Composable, MergeObjs, PipeArguments, @@ -285,11 +286,13 @@ function trace( }) as Fn } -function branch( - cf: Composable<(...args: P) => O>, - resolver: (o: O) => Promise | MaybeFn, -) { - return (async (...args: P) => { +function branch< + SourceComposable extends Composable, + Resolver extends ( + ...args: any[] + ) => Composable | null | Promise, +>(cf: SourceComposable, resolver: Resolver) { + return (async (...args: Parameters) => { const result = await cf(...args) if (!result.success) return result @@ -298,13 +301,7 @@ function branch( if (typeof nextComposable !== 'function') return result.data return fromSuccess(nextComposable)(result.data) })() - }) as Composable< - ( - ...args: P - ) => MaybeFn extends Composable<(...args: P) => infer BranchOutput> - ? BranchOutput - : UnpackData> | O - > + }) as BranchReturn } export { diff --git a/src/tests/branch.test.ts b/src/tests/branch.test.ts index df27d645..827d182c 100644 --- a/src/tests/branch.test.ts +++ b/src/tests/branch.test.ts @@ -10,15 +10,20 @@ import { Composable } from '../types.ts' import { branch } from '../combinators.ts' describe('branch', () => { - it('should pipe a composable with arbitrary pipes', async () => { + it('should pipe a composable with arbitrary types', async () => { const a = composable(({ id }: { id: number }) => ({ id: id + 2, })) const b = composable(({ id }: { id: number }) => id - 1) - const c = branch(a, () => Promise.resolve(b)) + const c = branch(a, (i: { id: number }) => + i.id % 2 === 0 ? Promise.resolve(b) : Promise.resolve(a), + ) type _R = Expect< - Equal number>> + Equal< + typeof c, + Composable<(input: { id: number }) => number | { id: number }> + > > assertEquals(await c({ id: 1 }), success(2)) @@ -69,7 +74,7 @@ describe('branch', () => { id: id + 2, })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, () => b) + const c = branch(a, (i: { id: number }) => b) type _R = Expect< Equal< typeof c, @@ -88,7 +93,7 @@ describe('branch', () => { id: String(id), })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, () => b) + const c = branch(a, (i: { id: string }) => b) type _R = Expect< Equal< typeof c, diff --git a/src/types.ts b/src/types.ts index c5abf21e..3c4aa2de 100644 --- a/src/types.ts +++ b/src/types.ts @@ -120,8 +120,87 @@ type ParserSchema = { type Last = T extends [...infer _I, infer L] ? L : never +type BranchReturn< + SourceComposable extends Composable, + Resolver extends ( + ...args: any[] + ) => Composable | null | Promise, +> = UnpackData extends Parameters[0] + ? ReturnType extends null + ? SourceComposable + : ReturnType extends Composable< + (i: infer FirstParameter) => infer COutput + > + ? UnpackData extends FirstParameter + ? Composable<(...args: Parameters) => COutput> + : { + 'Incompatible types ': true + sourceOutput: UnpackData + composableFirstParameter: FirstParameter + } + : ReturnType extends Promise< + Composable<(i: infer FirstParameter) => infer COutput> + > + ? UnpackData extends FirstParameter + ? Composable<(...args: Parameters) => COutput> + : { + 'Incompatible types ': true + sourceOutput: UnpackData + composableFirstParameter: FirstParameter + } + : never + : { + 'Incompatible types ': true + sourceOutput: UnpackData + resolverFirstParameter: Parameters[0] + } + +// Testing resolver compatibility +type X1 = BranchReturn number>, () => null> +type X2 = BranchReturn number>, (i: string) => null> +type X3 = BranchReturn number>, (i: number) => null> + +// Testing second composable compatibility +type X4 = BranchReturn< + Composable<() => number>, + (i: number) => Composable<(i: string) => number> +> +// +// Testing second composable compatibility when we have more than one possible type +type X5 = BranchReturn< + Composable<() => number>, + ( + i: number, + ) => Composable<(i: string) => number> | Composable<(i: number) => boolean> +> +type X6 = BranchReturn< + Composable<() => { s: string; n: number }>, + (i: { + n: number + }) => + | Composable<(i: { s: string }) => number> + | Composable<(i: { n: number }) => boolean> +> +type X7 = BranchReturn< + Composable<() => number>, + ( + i: number, + ) => Composable<(i: number) => number> | Composable<(i: number) => boolean> +> + +// Resolver is async +type X8 = BranchReturn< + Composable<() => number>, + ( + i: number, + ) => Promise< + Composable<(i: number) => number> | Composable<(i: number) => boolean> + > +> + export type { AllArguments, + BranchReturn, Composable, Failure, Last, From 158d166a87942a0fb3dd28ba8fb02831c04bffd6 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 12:16:06 -0400 Subject: [PATCH 136/238] Cover cases where there might be a null or composable in resolver --- src/types.ts | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/types.ts b/src/types.ts index 3c4aa2de..52fdab83 100644 --- a/src/types.ts +++ b/src/types.ts @@ -126,7 +126,7 @@ type BranchReturn< ...args: any[] ) => Composable | null | Promise, > = UnpackData extends Parameters[0] - ? ReturnType extends null + ? ReturnType extends null | Promise ? SourceComposable : ReturnType extends Composable< (i: infer FirstParameter) => infer COutput @@ -148,6 +148,24 @@ type BranchReturn< sourceOutput: UnpackData composableFirstParameter: FirstParameter } + : ReturnType extends Composable< + (i: infer FirstParameter) => infer COutput + > | null + ? + | BranchReturn< + SourceComposable, + (...args: any[]) => Composable<(i: FirstParameter) => COutput> + > + | BranchReturn null> + : ReturnType extends Promise infer COutput + > | null> + ? + | BranchReturn< + SourceComposable, + (...args: any[]) => Composable<(i: FirstParameter) => COutput> + > + | BranchReturn null> : never : { 'Incompatible types ': true @@ -159,6 +177,7 @@ type BranchReturn< type X1 = BranchReturn number>, () => null> type X2 = BranchReturn number>, (i: string) => null> type X3 = BranchReturn number>, (i: number) => null> +type X31 = BranchReturn number>, (i: number) => Promise> // Testing second composable compatibility type X4 = BranchReturn< @@ -197,6 +216,17 @@ type X8 = BranchReturn< Composable<(i: number) => number> | Composable<(i: number) => boolean> > > +// +// Resolver might return null +type X9 = BranchReturn< + Composable<() => number>, + (i: number) => Composable<(i: number) => boolean> | null +> +// Resolver might return null in promise +type X10 = BranchReturn< + Composable<() => number>, + (i: number) => Promise boolean> | null> +> export type { AllArguments, From ac6e0a1b32237d9d699463f5399bff09d08e5600 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 13:13:43 -0400 Subject: [PATCH 137/238] PipeReturn and PipeArguments to the rescue --- src/tests/branch.test.ts | 22 +++++-------- src/types.ts | 71 +++++++++++++++------------------------- 2 files changed, 35 insertions(+), 58 deletions(-) diff --git a/src/tests/branch.test.ts b/src/tests/branch.test.ts index 827d182c..db335236 100644 --- a/src/tests/branch.test.ts +++ b/src/tests/branch.test.ts @@ -16,14 +16,9 @@ describe('branch', () => { })) const b = composable(({ id }: { id: number }) => id - 1) - const c = branch(a, (i: { id: number }) => - i.id % 2 === 0 ? Promise.resolve(b) : Promise.resolve(a), - ) + const c = branch(a, () => Promise.resolve(b)) type _R = Expect< - Equal< - typeof c, - Composable<(input: { id: number }) => number | { id: number }> - > + Equal number>> > assertEquals(await c({ id: 1 }), success(2)) @@ -57,12 +52,13 @@ describe('branch', () => { type _R = Expect< Equal< typeof d, - Composable< - ( - input?: unknown, - environment?: unknown, - ) => string | { id: number; next: string } - > + | Composable< + ( + input?: unknown, + environment?: unknown, + ) => { id: number; next: string } + > + | Composable<(input?: unknown, environment?: unknown) => string> > > diff --git a/src/types.ts b/src/types.ts index 52fdab83..ef0a0b7c 100644 --- a/src/types.ts +++ b/src/types.ts @@ -125,54 +125,34 @@ type BranchReturn< Resolver extends ( ...args: any[] ) => Composable | null | Promise, -> = UnpackData extends Parameters[0] +> = PipeArguments<[SourceComposable, Composable]> extends Composable[] ? ReturnType extends null | Promise ? SourceComposable - : ReturnType extends Composable< - (i: infer FirstParameter) => infer COutput - > - ? UnpackData extends FirstParameter - ? Composable<(...args: Parameters) => COutput> - : { - 'Incompatible types ': true - sourceOutput: UnpackData - composableFirstParameter: FirstParameter - } - : ReturnType extends Promise< - Composable<(i: infer FirstParameter) => infer COutput> - > - ? UnpackData extends FirstParameter - ? Composable<(...args: Parameters) => COutput> - : { - 'Incompatible types ': true - sourceOutput: UnpackData - composableFirstParameter: FirstParameter - } - : ReturnType extends Composable< - (i: infer FirstParameter) => infer COutput - > | null - ? - | BranchReturn< - SourceComposable, - (...args: any[]) => Composable<(i: FirstParameter) => COutput> - > - | BranchReturn null> - : ReturnType extends Promise infer COutput - > | null> + : ReturnType extends Promise + ? null extends CorNULL + ? + | PipeReturn< + PipeArguments<[SourceComposable, Extract]> + > + | SourceComposable + : PipeReturn< + PipeArguments<[SourceComposable, Extract]> + > + : null extends ReturnType ? - | BranchReturn< - SourceComposable, - (...args: any[]) => Composable<(i: FirstParameter) => COutput> + | PipeReturn< + PipeArguments< + [SourceComposable, Extract, Composable>] + > > - | BranchReturn null> - : never - : { - 'Incompatible types ': true - sourceOutput: UnpackData - resolverFirstParameter: Parameters[0] - } - + | SourceComposable + : PipeReturn< + PipeArguments< + [SourceComposable, Extract, Composable>] + > + > + : PipeArguments<[SourceComposable, Composable]> +// // Testing resolver compatibility type X1 = BranchReturn number>, () => null> type X2 = BranchReturn number>, (i: string) => null> @@ -185,13 +165,14 @@ type X4 = BranchReturn< (i: number) => Composable<(i: string) => number> > // -// Testing second composable compatibility when we have more than one possible type +// Testing second composable compatibility when we have more than one possible type with one incompatible type X5 = BranchReturn< Composable<() => number>, ( i: number, ) => Composable<(i: string) => number> | Composable<(i: number) => boolean> > +// Testing second composable compatibility when we have more than one possible compatible type type X6 = BranchReturn< Composable<() => { s: string; n: number }>, (i: { From b39c71ad165dcbd9fea8b9159bc2d00d96b8e1b1 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 13:31:53 -0400 Subject: [PATCH 138/238] DRY the code a bit --- src/types.ts | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/types.ts b/src/types.ts index ef0a0b7c..671c24de 100644 --- a/src/types.ts +++ b/src/types.ts @@ -129,30 +129,20 @@ type BranchReturn< ? ReturnType extends null | Promise ? SourceComposable : ReturnType extends Promise - ? null extends CorNULL - ? - | PipeReturn< - PipeArguments<[SourceComposable, Extract]> - > - | SourceComposable - : PipeReturn< - PipeArguments<[SourceComposable, Extract]> - > - : null extends ReturnType ? + | PipeReturn< + PipeArguments<[SourceComposable, Extract]> + > + | (null extends CorNULL ? SourceComposable : never) + : | PipeReturn< PipeArguments< [SourceComposable, Extract, Composable>] > > - | SourceComposable - : PipeReturn< - PipeArguments< - [SourceComposable, Extract, Composable>] - > - > + | (null extends ReturnType ? SourceComposable : never) : PipeArguments<[SourceComposable, Composable]> -// + // Testing resolver compatibility type X1 = BranchReturn number>, () => null> type X2 = BranchReturn number>, (i: string) => null> From d056d3eb67aa819c6e3a6389d01492234db115ff Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 13:36:00 -0400 Subject: [PATCH 139/238] DRY a bit more --- src/types.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/types.ts b/src/types.ts index 671c24de..9caaccc7 100644 --- a/src/types.ts +++ b/src/types.ts @@ -128,19 +128,18 @@ type BranchReturn< > = PipeArguments<[SourceComposable, Composable]> extends Composable[] ? ReturnType extends null | Promise ? SourceComposable - : ReturnType extends Promise - ? - | PipeReturn< - PipeArguments<[SourceComposable, Extract]> - > - | (null extends CorNULL ? SourceComposable : never) : | PipeReturn< PipeArguments< - [SourceComposable, Extract, Composable>] + [ + SourceComposable, + Extract>, Composable>, + ] > > - | (null extends ReturnType ? SourceComposable : never) + | (null extends Awaited> + ? SourceComposable + : never) : PipeArguments<[SourceComposable, Composable]> // Testing resolver compatibility From e3202f04603cb2100ccdc89c5ff46a90d9dcfca1 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 14:55:17 -0400 Subject: [PATCH 140/238] We can safely ignore parameters that are not used (perhaps the composition depends only on some effectful computation) --- src/tests/branch.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/branch.test.ts b/src/tests/branch.test.ts index db335236..cf4b8054 100644 --- a/src/tests/branch.test.ts +++ b/src/tests/branch.test.ts @@ -70,7 +70,7 @@ describe('branch', () => { id: id + 2, })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, (i: { id: number }) => b) + const c = branch(a, () => b) type _R = Expect< Equal< typeof c, @@ -89,7 +89,7 @@ describe('branch', () => { id: String(id), })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) - const c = branch(a, (i: { id: string }) => b) + const c = branch(a, () => b) type _R = Expect< Equal< typeof c, From 0f43fc2ca9c4c606583f13d01a3b88e3b195f4e4 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 18:42:57 -0400 Subject: [PATCH 141/238] Prettify composable union --- src/tests/branch.test.ts | 13 ++++++------- src/types.ts | 7 ++++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/tests/branch.test.ts b/src/tests/branch.test.ts index cf4b8054..0bf5a221 100644 --- a/src/tests/branch.test.ts +++ b/src/tests/branch.test.ts @@ -52,13 +52,12 @@ describe('branch', () => { type _R = Expect< Equal< typeof d, - | Composable< - ( - input?: unknown, - environment?: unknown, - ) => { id: number; next: string } - > - | Composable<(input?: unknown, environment?: unknown) => string> + Composable< + ( + input?: unknown, + environment?: unknown, + ) => string | { id: number; next: string } + > > > diff --git a/src/types.ts b/src/types.ts index 9caaccc7..7c9055f7 100644 --- a/src/types.ts +++ b/src/types.ts @@ -120,6 +120,10 @@ type ParserSchema = { type Last = T extends [...infer _I, infer L] ? L : never +type PrettifyComposableUnion = Composable< + (...args: Parameters) => UnpackData +> + type BranchReturn< SourceComposable extends Composable, Resolver extends ( @@ -128,7 +132,7 @@ type BranchReturn< > = PipeArguments<[SourceComposable, Composable]> extends Composable[] ? ReturnType extends null | Promise ? SourceComposable - : + : PrettifyComposableUnion< | PipeReturn< PipeArguments< [ @@ -140,6 +144,7 @@ type BranchReturn< | (null extends Awaited> ? SourceComposable : never) + > : PipeArguments<[SourceComposable, Composable]> // Testing resolver compatibility From 0003c0b25f31935bfa6de5f4e89eff47385a37b4 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Wed, 1 May 2024 19:17:39 -0400 Subject: [PATCH 142/238] Fix failure to compose with prettify --- src/types.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/types.ts b/src/types.ts index 7c9055f7..03ad519a 100644 --- a/src/types.ts +++ b/src/types.ts @@ -124,6 +124,10 @@ type PrettifyComposableUnion = Composable< (...args: Parameters) => UnpackData > +type G = PrettifyComposableUnion< + Composable<() => boolean> | Composable<() => number> +> + type BranchReturn< SourceComposable extends Composable, Resolver extends ( @@ -132,7 +136,10 @@ type BranchReturn< > = PipeArguments<[SourceComposable, Composable]> extends Composable[] ? ReturnType extends null | Promise ? SourceComposable - : PrettifyComposableUnion< + : PipeArguments< + [SourceComposable, Extract>, Composable>] + > extends [Composable<(...args: infer P) => any>, ...any] + ? PrettifyComposableUnion< | PipeReturn< PipeArguments< [ @@ -145,6 +152,9 @@ type BranchReturn< ? SourceComposable : never) > + : PipeArguments< + [SourceComposable, Extract>, Composable>] + > : PipeArguments<[SourceComposable, Composable]> // Testing resolver compatibility From bdb9cff38e9f6f8fbaa5a10edbb63aaa21596ced Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Thu, 2 May 2024 15:16:02 -0300 Subject: [PATCH 143/238] Lil refactoring to avoid PrettifyComposable in public API and move tests to test files --- src/tests/branch.test.ts | 29 ++++----- src/tests/types.test.ts | 124 +++++++++++++++++++++++++++++++++++++++ src/types.ts | 97 +++++------------------------- 3 files changed, 151 insertions(+), 99 deletions(-) diff --git a/src/tests/branch.test.ts b/src/tests/branch.test.ts index 0bf5a221..c24ce7fb 100644 --- a/src/tests/branch.test.ts +++ b/src/tests/branch.test.ts @@ -4,6 +4,7 @@ import { failure, InputError, success, + UnpackData, withSchema, } from '../index.ts' import { Composable } from '../types.ts' @@ -25,21 +26,18 @@ describe('branch', () => { }) it('should enable conditionally choosing the next Composable with the output of first one', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + const a = composable((id: number) => ({ id: id + 2, next: 'multiply', })) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) - const c = withSchema(z.object({ id: z.number() }))(({ id }) => id * 2) + const b = composable(({ id }: { id: number }) => String(id)) + const c = composable(({ id }: { id: number }) => id * 2) const d = branch(a, (output) => (output.next === 'multiply' ? c : b)) type _R = Expect< - Equal< - typeof d, - Composable<(input?: unknown, environment?: unknown) => number | string> - > + Equal number | string>> > - assertEquals(await d({ id: 1 }), success(6)) + assertEquals(await d(1), success(6)) }) it('should not pipe if the predicate returns null', async () => { @@ -48,7 +46,9 @@ describe('branch', () => { next: 'multiply', })) const b = composable(({ id }: { id: number }) => String(id)) - const d = branch(a, (output) => (output.next === 'multiply' ? null : b)) + const resolver = (output: UnpackData) => + output.next === 'multiply' ? null : b + const d = branch(a, resolver) type _R = Expect< Equal< typeof d, @@ -68,7 +68,7 @@ describe('branch', () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, })) - const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) + const b = composable(({ id }: { id: number }) => id - 1) const c = branch(a, () => b) type _R = Expect< Equal< @@ -84,17 +84,12 @@ describe('branch', () => { }) it('should gracefully fail if the second function fails', async () => { - const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ + const a = composable(({ id }: { id: number }) => ({ id: String(id), })) const b = withSchema(z.object({ id: z.number() }))(({ id }) => id - 1) const c = branch(a, () => b) - type _R = Expect< - Equal< - typeof c, - Composable<(input?: unknown, environment?: unknown) => number> - > - > + type _R = Expect number>>> assertEquals( await c({ id: 1 }), diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index f249af7b..9168c8fb 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -243,6 +243,130 @@ namespace AllArguments { > } +namespace BranchReturn { + type resolverNotReturningComposable = Expect< + Equal< + Subject.BranchReturn number>, () => null>, + Subject.Composable<() => number> + > + > + type resolverWithParamsThatDontCompose = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + (i: string) => null + >, + ['Fail to compose', number, 'does not fit in', string] + > + > + type resolverWithParamsThatCompose = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + (i: number) => null + >, + Subject.Composable<() => number> + > + > + type resolverWithPromise = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + (i: number) => Promise + >, + Subject.Composable<() => number> + > + > + + type returningComposableDoesntMatch = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + (i: number) => Subject.Composable<(i: string) => number> + >, + ['Fail to compose', number, 'does not fit in', string] + > + > + + type returningComposableUnionDoesntMatch = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + ( + i: number, + ) => + | Subject.Composable<(i: string) => number> + | Subject.Composable<(i: number) => boolean> + >, + ['Fail to compose', number, 'does not fit in', never] + > + > + + type resolverUnionMatches = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => { s: string; n: number }>, + (i: { + n: number + }) => + | Subject.Composable<(i: { s: string }) => number> + | Subject.Composable<(i: { n: number }) => boolean> + >, + Subject.Composable<() => number | boolean> + > + > + type resolverMatches = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + ( + i: number, + ) => + | Subject.Composable<(i: number) => number> + | Subject.Composable<(i: number) => boolean> + >, + Subject.Composable<() => number | boolean> + > + > + + // Resolver is async + type asyncResolver = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<(i: string) => number>, + ( + i: number, + ) => Promise< + | Subject.Composable<(i: number) => number> + | Subject.Composable<(i: number) => boolean> + > + >, + Subject.Composable<(i: string) => number | boolean> + > + > + + type resolverMayBeNull = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + (i: number) => Subject.Composable<(i: number) => boolean> | null + >, + Subject.Composable<() => number | boolean> + > + > + type asyncResolverMayBeNull = Expect< + Equal< + Subject.BranchReturn< + Subject.Composable<() => number>, + ( + i: number, + ) => Promise boolean> | null> + >, + Subject.Composable<() => number | boolean> + > + > +} + namespace UnpackData { type testExtractsDataFromPromisedResult = Expect< Equal Promise>>, string> diff --git a/src/types.ts b/src/types.ts index 03ad519a..8e53a413 100644 --- a/src/types.ts +++ b/src/types.ts @@ -120,99 +120,32 @@ type ParserSchema = { type Last = T extends [...infer _I, infer L] ? L : never -type PrettifyComposableUnion = Composable< - (...args: Parameters) => UnpackData -> - -type G = PrettifyComposableUnion< - Composable<() => boolean> | Composable<() => number> -> - type BranchReturn< SourceComposable extends Composable, Resolver extends ( ...args: any[] ) => Composable | null | Promise, > = PipeArguments<[SourceComposable, Composable]> extends Composable[] - ? ReturnType extends null | Promise + ? Awaited> extends null ? SourceComposable - : PipeArguments< - [SourceComposable, Extract>, Composable>] - > extends [Composable<(...args: infer P) => any>, ...any] - ? PrettifyComposableUnion< - | PipeReturn< - PipeArguments< - [ - SourceComposable, - Extract>, Composable>, - ] - > + : PipeArguments<[SourceComposable, Awaited>]> extends [ + Composable, + ...any, + ] + ? Composable< + ( + ...args: Parameters< + PipeArguments<[SourceComposable, Awaited>]>[0] > - | (null extends Awaited> - ? SourceComposable - : never) - > - : PipeArguments< - [SourceComposable, Extract>, Composable>] + ) => null extends Awaited> + ? + | UnpackData + | UnpackData>, Composable>> + : UnpackData>, Composable>> > + : PipeArguments<[SourceComposable, Awaited>]> : PipeArguments<[SourceComposable, Composable]> -// Testing resolver compatibility -type X1 = BranchReturn number>, () => null> -type X2 = BranchReturn number>, (i: string) => null> -type X3 = BranchReturn number>, (i: number) => null> -type X31 = BranchReturn number>, (i: number) => Promise> - -// Testing second composable compatibility -type X4 = BranchReturn< - Composable<() => number>, - (i: number) => Composable<(i: string) => number> -> -// -// Testing second composable compatibility when we have more than one possible type with one incompatible -type X5 = BranchReturn< - Composable<() => number>, - ( - i: number, - ) => Composable<(i: string) => number> | Composable<(i: number) => boolean> -> -// Testing second composable compatibility when we have more than one possible compatible type -type X6 = BranchReturn< - Composable<() => { s: string; n: number }>, - (i: { - n: number - }) => - | Composable<(i: { s: string }) => number> - | Composable<(i: { n: number }) => boolean> -> -type X7 = BranchReturn< - Composable<() => number>, - ( - i: number, - ) => Composable<(i: number) => number> | Composable<(i: number) => boolean> -> - -// Resolver is async -type X8 = BranchReturn< - Composable<() => number>, - ( - i: number, - ) => Promise< - Composable<(i: number) => number> | Composable<(i: number) => boolean> - > -> -// -// Resolver might return null -type X9 = BranchReturn< - Composable<() => number>, - (i: number) => Composable<(i: number) => boolean> | null -> -// Resolver might return null in promise -type X10 = BranchReturn< - Composable<() => number>, - (i: number) => Promise boolean> | null> -> - export type { AllArguments, BranchReturn, From 59c6a6954c56da505bebdefce36040f7b77ca0fc Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Fri, 3 May 2024 14:55:19 -0400 Subject: [PATCH 144/238] environment.branch seems to be fine --- src/environment/combinators.ts | 31 +++++++++--------------- src/environment/tests/branch.test.ts | 36 +++++++++++++++++----------- src/environment/types.ts | 34 +++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 35 deletions(-) diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 8e528e32..108578c1 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,10 +1,11 @@ -import type { Composable, UnpackData } from '../types.ts' +import type { Composable } from '../types.ts' import * as A from '../combinators.ts' import { composable, fromSuccess } from '../constructors.ts' import { PipeReturnWithEnvironment, SequenceReturnWithEnvironment, } from './types.ts' +import { BranchReturnWithEnvironment } from './types.ts' function applyEnvironmentToList< Fns extends Array<(input: unknown, environment: unknown) => unknown>, @@ -76,16 +77,14 @@ function sequence(...fns: Fns) { * // ^? Composable<(input?: unknown, environment?: unknown) => { items: Item[] }> */ function branch< - O, - I extends any, - E extends any, - MaybeFn extends Composable | null, ->( - dfn: Composable<(input?: I, environment?: E) => O>, - resolver: (o: O) => Promise | MaybeFn, -) { - return (async (input: I, environment: E) => { - const result = await dfn(input, environment) + SourceComposable extends Composable, + Resolver extends ( + ...args: any[] + ) => Composable | null | Promise, +>(cf: SourceComposable, resolver: Resolver) { + return (async (...args: Parameters) => { + const [input, environment] = args + const result = await cf(input, environment) if (!result.success) return result return composable(async () => { @@ -93,15 +92,7 @@ function branch< if (typeof nextDf !== 'function') return result.data return fromSuccess(nextDf)(result.data, environment) })() - }) as Composable< - ( - input?: I, - environment?: E, - ) => MaybeFn extends Composable< - (input?: I, environment?: E) => infer BranchOutput - > ? BranchOutput - : UnpackData> | O - > + }) as BranchReturnWithEnvironment } export { branch, pipe, sequence } diff --git a/src/environment/tests/branch.test.ts b/src/environment/tests/branch.test.ts index 60ccde49..ce3b5b40 100644 --- a/src/environment/tests/branch.test.ts +++ b/src/environment/tests/branch.test.ts @@ -11,6 +11,25 @@ import { import { Composable } from '../../types.ts' describe('branch', () => { + it('should pipe a composable with arbitrary types', async () => { + const a = composable(({ id }: { id: number }, environment: number) => ({ + id: id + 2 + environment, + })) + const b = composable( + ({ id }: { id: number }, environment: number) => id - 1 + environment, + ) + + const c = environment.branch(a, () => Promise.resolve(b)) + type _R = Expect< + Equal< + typeof c, + Composable<(input: { id: number }, environment: number) => number> + > + > + + assertEquals(await c({ id: 1 }, 0), success(2)) + }) + it('should pipe a domain function with a function that returns a DF', async () => { const a = withSchema(z.object({ id: z.number() }))(({ id }) => ({ id: id + 2, @@ -83,13 +102,10 @@ describe('branch', () => { ) const c = environment.branch(a, () => b) - // TODO: This input should maybe be a required { inp: number } type _R = Expect< Equal< typeof c, - Composable< - (input?: unknown, environment?: { env: number } | undefined) => number - > + Composable<(input: unknown, environment: { env: number }) => number> > > @@ -100,7 +116,7 @@ describe('branch', () => { const a = withSchema(z.number())((id) => ({ id: id + 2, })) - const b = composable((id: number) => id - 1) + const b = composable(({ id }: { id: number }) => id - 1) const c = environment.branch(a, () => b) type _R = Expect< Equal< @@ -138,20 +154,12 @@ describe('branch', () => { const a = composable((id: number) => ({ id: id + 2, })) - const b = composable((id: number) => id - 1) + const b = composable(({ id }: { id: number }) => id - 1) const c = environment.branch(a, (_) => { throw new Error('condition function failed') // deno-lint-ignore no-unreachable return b }) - // TODO: the input should be required - // type _R = Expect< - // Equal< - // typeof c, - // Composable<(input: number, environment?: unknown) => number> - // > - // > - const { errors: [err], } = await c(1) diff --git a/src/environment/types.ts b/src/environment/types.ts index e7d8dd79..e01a044f 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -1,5 +1,5 @@ import { Internal } from '../internal/types.ts' -import { Composable, PipeReturn, SequenceReturn } from '../types.ts' +import { Composable, PipeReturn, SequenceReturn, UnpackData } from '../types.ts' type CommonEnvironment< Fns extends Composable[], @@ -83,7 +83,39 @@ type SetEnv< ? [firstOptional?, ...Env] : never +type BranchReturnWithEnvironment< + SourceComposable extends Composable, + Resolver extends ( + ...args: any[] + ) => Composable | null | Promise, +> = PipeArgumentsWithEnvironment< + [SourceComposable, Composable] +> extends Composable[] + ? Awaited> extends null + ? SourceComposable + : PipeArgumentsWithEnvironment< + [SourceComposable, Awaited>] + > extends [Composable, ...any] + ? Composable< + ( + ...args: Parameters< + PipeArgumentsWithEnvironment< + [SourceComposable, Awaited>] + >[0] + > + ) => null extends Awaited> + ? + | UnpackData + | UnpackData>, Composable>> + : UnpackData>, Composable>> + > + : PipeArgumentsWithEnvironment< + [SourceComposable, Awaited>] + > + : PipeArgumentsWithEnvironment<[SourceComposable, Composable]> + export type { + BranchReturnWithEnvironment, CommonEnvironment, GetEnv, PipeReturnWithEnvironment, From 1539374521cc31c58d931c4fc1944347971dfd33 Mon Sep 17 00:00:00 2001 From: Guga Guichard Date: Fri, 3 May 2024 16:44:44 -0300 Subject: [PATCH 145/238] Rename types to keep right mind model and carry the context of module to avoid lengthy types --- src/combinators.ts | 18 ++++---- src/environment/combinators.ts | 12 ++--- src/environment/tests/types.test.ts | 24 +++++++--- src/environment/types.ts | 72 ++++++++++++++--------------- src/internal/types.ts | 4 +- src/tests/types.test.ts | 48 +++++++++++-------- src/types.ts | 56 +++++++++++----------- 7 files changed, 129 insertions(+), 105 deletions(-) diff --git a/src/combinators.ts b/src/combinators.ts index 9a72f444..057836ce 100644 --- a/src/combinators.ts +++ b/src/combinators.ts @@ -1,9 +1,9 @@ import type { - AllArguments, BranchReturn, + CanComposeInParallel, + CanComposeInSequence, Composable, MergeObjs, - PipeArguments, PipeReturn, RecordToTuple, Result, @@ -50,7 +50,7 @@ function pipe(...fns: Fns) { return !res.success ? failure(res.errors) : success(res.data[res.data.length - 1]) - }) as PipeReturn> + }) as PipeReturn> } /** @@ -74,7 +74,7 @@ function all(...fns: Fns) { return success((results as Success[]).map(({ data }) => data)) }) as Composable< - (...args: Parameters[0]>>) => { + (...args: Parameters[0]>>) => { [k in keyof Fns]: UnpackData } > @@ -97,7 +97,7 @@ function collect>(fns: Fns) { return map(all(...(fnsWithKey as any)), mergeObjects) as Composable< ( ...args: Parameters< - Exclude>[0], undefined> + Exclude>[0], undefined> > ) => { [key in keyof Fns]: UnpackData @@ -129,7 +129,7 @@ function sequence(...fns: Fns) { result.push(res.data) } return success(result) - }) as SequenceReturn> + }) as SequenceReturn> } /** @@ -161,7 +161,9 @@ function map( function merge( ...fns: Fns ): Composable< - (...args: Parameters[0]>>) => MergeObjs< + ( + ...args: Parameters[0]>> + ) => MergeObjs< { [key in keyof Fns]: UnpackData } @@ -194,7 +196,7 @@ function first(...fns: Fns) { })() }) as Composable< ( - ...args: Parameters[0]>> + ...args: Parameters[0]>> ) => UnpackData > } diff --git a/src/environment/combinators.ts b/src/environment/combinators.ts index 108578c1..4ea33ff6 100644 --- a/src/environment/combinators.ts +++ b/src/environment/combinators.ts @@ -1,11 +1,7 @@ import type { Composable } from '../types.ts' import * as A from '../combinators.ts' import { composable, fromSuccess } from '../constructors.ts' -import { - PipeReturnWithEnvironment, - SequenceReturnWithEnvironment, -} from './types.ts' -import { BranchReturnWithEnvironment } from './types.ts' +import { BranchReturn, PipeReturn, SequenceReturn } from './types.ts' function applyEnvironmentToList< Fns extends Array<(input: unknown, environment: unknown) => unknown>, @@ -31,7 +27,7 @@ function pipe(...fns: Fns) { return ((input: any, environment: any) => A.pipe(...applyEnvironmentToList(fns, environment))( input, - )) as PipeReturnWithEnvironment + )) as PipeReturn } /** @@ -49,7 +45,7 @@ function sequence(...fns: Fns) { return ((input: any, environment: any) => A.sequence(...applyEnvironmentToList(fns, environment))( input, - )) as SequenceReturnWithEnvironment + )) as SequenceReturn } /** @@ -92,7 +88,7 @@ function branch< if (typeof nextDf !== 'function') return result.data return fromSuccess(nextDf)(result.data, environment) })() - }) as BranchReturnWithEnvironment + }) as BranchReturn } export { branch, pipe, sequence } diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts index 9a0fa1bf..dbae6c71 100644 --- a/src/environment/tests/types.test.ts +++ b/src/environment/tests/types.test.ts @@ -85,10 +85,10 @@ namespace CommonEnvironment { > } -namespace SequenceReturnWithEnvironment { +namespace SequenceReturn { type test = Expect< Equal< - Subject.SequenceReturnWithEnvironment< + Subject.SequenceReturn< [ Composable<(a: number, e?: unknown) => number>, Composable<(a: number, e: number) => number>, @@ -101,7 +101,7 @@ namespace SequenceReturnWithEnvironment { type test2 = Expect< Equal< - Subject.SequenceReturnWithEnvironment< + Subject.SequenceReturn< [ Composable<(a?: unknown, e?: unknown) => { id: number }>, Composable<(a?: unknown, e?: unknown) => number>, @@ -112,10 +112,10 @@ namespace SequenceReturnWithEnvironment { > } -namespace PipeReturnWithEnvironment { +namespace PipeReturn { type test = Expect< Equal< - Subject.PipeReturnWithEnvironment< + Subject.PipeReturn< [ Composable<(a: number, e?: unknown) => number>, Composable<(a: number, e: number) => number>, @@ -128,7 +128,7 @@ namespace PipeReturnWithEnvironment { type test2 = Expect< Equal< - Subject.PipeReturnWithEnvironment< + Subject.PipeReturn< [ Composable<(a?: unknown, e?: unknown) => { id: number }>, Composable<(a?: unknown, e?: unknown) => number>, @@ -139,6 +139,18 @@ namespace PipeReturnWithEnvironment { > } +namespace BranchReturn { + // type test = Expect< + // Equal< + // Subject.BranchReturn< + // Composable<(a: number, e?: unknown) => number>, + // (a: number) => Composable<(a: number, e: number) => string> + // >, + // Composable<(a: number, e?: unknown) => string> + // > + // > +} + namespace GetEnv { type test1 = Expect< Equal< diff --git a/src/environment/types.ts b/src/environment/types.ts index e01a044f..6480f261 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -1,5 +1,10 @@ import { Internal } from '../internal/types.ts' -import { Composable, PipeReturn, SequenceReturn, UnpackData } from '../types.ts' +import { + Composable, + PipeReturn as BasePipeReturn, + SequenceReturn as BaseSequenceReturn, + UnpackData, +} from '../types.ts' type CommonEnvironment< Fns extends Composable[], @@ -19,27 +24,27 @@ type CommonEnvironment< : never : never -type SequenceReturnWithEnvironment = SequenceReturn< - PipeArgumentsWithEnvironment +type SequenceReturn = BaseSequenceReturn< + CanComposeInSequence > extends Composable<(...args: any[]) => infer CReturn> ? CommonEnvironment extends { 'Incompatible arguments ': true } ? CommonEnvironment : Composable< (...args: SetEnv, CommonEnvironment>) => CReturn > - : PipeArgumentsWithEnvironment + : CanComposeInSequence -type PipeReturnWithEnvironment = PipeReturn< - PipeArgumentsWithEnvironment +type PipeReturn = BasePipeReturn< + CanComposeInSequence > extends Composable<(...args: any[]) => infer CReturn> ? CommonEnvironment extends { 'Incompatible arguments ': true } ? CommonEnvironment : Composable< (...args: SetEnv, CommonEnvironment>) => CReturn > - : PipeArgumentsWithEnvironment + : CanComposeInSequence -type PipeArgumentsWithEnvironment< +type CanComposeInSequence< Fns extends any[], Arguments extends any[] = [], > = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] @@ -57,7 +62,7 @@ type PipeArgumentsWithEnvironment< ? Internal.FailToCompose : Awaited extends FirstBParameter ? Internal.EveryElementTakes extends true - ? PipeArgumentsWithEnvironment< + ? CanComposeInSequence< restA, [...Arguments, Composable<(...a: PA) => OA>] > @@ -83,42 +88,37 @@ type SetEnv< ? [firstOptional?, ...Env] : never -type BranchReturnWithEnvironment< +type BranchReturn< SourceComposable extends Composable, Resolver extends ( ...args: any[] ) => Composable | null | Promise, -> = PipeArgumentsWithEnvironment< +> = CanComposeInSequence< [SourceComposable, Composable] > extends Composable[] - ? Awaited> extends null - ? SourceComposable - : PipeArgumentsWithEnvironment< - [SourceComposable, Awaited>] - > extends [Composable, ...any] - ? Composable< - ( - ...args: Parameters< - PipeArgumentsWithEnvironment< - [SourceComposable, Awaited>] - >[0] - > - ) => null extends Awaited> - ? - | UnpackData - | UnpackData>, Composable>> - : UnpackData>, Composable>> - > - : PipeArgumentsWithEnvironment< - [SourceComposable, Awaited>] - > - : PipeArgumentsWithEnvironment<[SourceComposable, Composable]> + ? Awaited> extends null ? SourceComposable + : CanComposeInSequence< + [SourceComposable, Awaited>] + > extends [Composable, ...any] ? Composable< + ( + ...args: Parameters< + CanComposeInSequence< + [SourceComposable, Awaited>] + >[0] + > + ) => null extends Awaited> ? + | UnpackData + | UnpackData>, Composable>> + : UnpackData>, Composable>> + > + : CanComposeInSequence<[SourceComposable, Awaited>]> + : CanComposeInSequence<[SourceComposable, Composable]> export type { - BranchReturnWithEnvironment, + BranchReturn, CommonEnvironment, GetEnv, - PipeReturnWithEnvironment, - SequenceReturnWithEnvironment, + PipeReturn, + SequenceReturn, SetEnv, } diff --git a/src/internal/types.ts b/src/internal/types.ts index 74f7c07d..ca561404 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -70,10 +70,10 @@ namespace Internal { ? restK extends string[] ? restV extends unknown[] ? Prettify> - : V // in this case V has the AllArguments failure type + : V // in this case V has the CanComposeInParallel failure type : never : never - : O + : never : O export type EveryElementTakes = T extends [ diff --git a/src/tests/types.test.ts b/src/tests/types.test.ts index 9168c8fb..53745b5b 100644 --- a/src/tests/types.test.ts +++ b/src/tests/types.test.ts @@ -51,14 +51,19 @@ namespace PipeReturn { > } -namespace PipeArguments { - type testNoEmptyArgumentList = Expect, never>> +namespace CanComposeInSequence { + type testNoEmptyArgumentList = Expect< + Equal, never> + > type testOneComposable = Expect< - Equal, [Subject.Composable]> + Equal< + Subject.CanComposeInSequence<[Subject.Composable]>, + [Subject.Composable] + > > type testForTwoComposables = Expect< Equal< - Subject.PipeArguments< + Subject.CanComposeInSequence< [ Subject.Composable<(x: string) => number>, Subject.Composable<(y: number) => boolean>, @@ -72,7 +77,7 @@ namespace PipeArguments { > type testForComponentsWithArityGreaterThan1WithOptionalParameters = Expect< Equal< - Subject.PipeArguments< + Subject.CanComposeInSequence< [ Subject.Composable<(x: string) => number>, Subject.Composable<(y: number, optionalArgument?: string) => boolean>, @@ -86,7 +91,7 @@ namespace PipeArguments { > type testForComponentsWithArityGreaterThan1 = Expect< Equal< - Subject.PipeArguments< + Subject.CanComposeInSequence< [ Subject.Composable<(x: string) => number>, Subject.Composable<(y: number, willBeUndefined: string) => boolean>, @@ -97,7 +102,7 @@ namespace PipeArguments { > type testFailureToCompose = Expect< Equal< - Subject.PipeArguments< + Subject.CanComposeInSequence< [ Subject.Composable<(x: string) => void>, Subject.Composable<(y: number) => boolean>, @@ -108,7 +113,7 @@ namespace PipeArguments { > type testFailureToComposeOnThirdElement = Expect< Equal< - Subject.PipeArguments< + Subject.CanComposeInSequence< [ Subject.Composable<(x: string) => number>, Subject.Composable<(y: number) => string>, @@ -120,14 +125,19 @@ namespace PipeArguments { > } -namespace AllArguments { - type testNoEmptyArgumentList = Expect, never>> +namespace CanComposeInParallel { + type testNoEmptyArgumentList = Expect< + Equal, never> + > type testOneComposable = Expect< - Equal, [Subject.Composable]> + Equal< + Subject.CanComposeInParallel<[Subject.Composable]>, + [Subject.Composable] + > > type testSubtypesForTwoComposables = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: string, y: 1) => void>, Subject.Composable<(x: 'foo', y: number) => void>, @@ -141,7 +151,7 @@ namespace AllArguments { > type testSubtypesForThreeComposables = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: unknown) => void>, Subject.Composable<(x: string) => void>, @@ -157,7 +167,7 @@ namespace AllArguments { > type testSubtypesForStricterOptional = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: string, y?: 1) => void>, Subject.Composable<(x: 'foo', y: number) => void>, @@ -171,7 +181,7 @@ namespace AllArguments { > type testSubtypesForOptionalsOnBoth = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: string, y?: number) => void>, Subject.Composable<(x: 'foo', y?: number) => void>, @@ -185,7 +195,7 @@ namespace AllArguments { > type testSubtypesForConflictingOptionals = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: string, y?: number) => void>, Subject.Composable<(x: 'foo', y?: string) => void>, @@ -199,7 +209,7 @@ namespace AllArguments { > type testMaxArityForTwoComposables = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: string, y: number) => void>, Subject.Composable<(x: 'foo') => void>, @@ -213,7 +223,7 @@ namespace AllArguments { > type testMaxArityForTwoComposablesInverse = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: string) => void>, Subject.Composable<(x: 'foo', y: number) => void>, @@ -227,7 +237,7 @@ namespace AllArguments { > type testCompositionFailure = Expect< Equal< - Subject.AllArguments< + Subject.CanComposeInParallel< [ Subject.Composable<(x: string, y: string) => void>, Subject.Composable<(x: 'foo', y: number) => void>, diff --git a/src/types.ts b/src/types.ts index 8e53a413..15f2bda2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -54,7 +54,7 @@ type PipeReturn = Fns extends [ ] ? Composable<(...args: P) => UnpackData, Composable>>> : Fns -type PipeArguments< +type CanComposeInSequence< Fns extends any[], Arguments extends any[] = [], > = Fns extends [Composable<(...a: infer PA) => infer OA>, ...infer restA] @@ -68,18 +68,22 @@ type PipeArguments< ? Internal.FailToCompose : Awaited extends FirstBParameter ? Internal.EveryElementTakes extends true - ? PipeArguments OA>]> + ? CanComposeInSequence< + restA, + [...Arguments, Composable<(...a: PA) => OA>] + > : Internal.EveryElementTakes : Internal.FailToCompose, FirstBParameter> : [...Arguments, Composable<(...a: PA) => OA>] : never -type AllArguments< +type CanComposeInParallel< Fns extends any[], OriginalFns extends any[] = Fns, > = Fns extends [Composable<(...a: infer PA) => any>, ...infer restA] ? restA extends [Composable<(...b: infer PB) => infer OB>, ...infer restB] - ? Internal.SubtypesTuple extends [...infer MergedP] ? AllArguments< + ? Internal.SubtypesTuple extends [...infer MergedP] + ? CanComposeInParallel< [Composable<(...args: MergedP) => OB>, ...restB], OriginalFns > @@ -125,36 +129,36 @@ type BranchReturn< Resolver extends ( ...args: any[] ) => Composable | null | Promise, -> = PipeArguments<[SourceComposable, Composable]> extends Composable[] - ? Awaited> extends null - ? SourceComposable - : PipeArguments<[SourceComposable, Awaited>]> extends [ - Composable, - ...any, - ] - ? Composable< - ( - ...args: Parameters< - PipeArguments<[SourceComposable, Awaited>]>[0] - > - ) => null extends Awaited> - ? - | UnpackData - | UnpackData>, Composable>> - : UnpackData>, Composable>> - > - : PipeArguments<[SourceComposable, Awaited>]> - : PipeArguments<[SourceComposable, Composable]> +> = CanComposeInSequence< + [SourceComposable, Composable] +> extends Composable[] + ? Awaited> extends null ? SourceComposable + : CanComposeInSequence< + [SourceComposable, Awaited>] + > extends [Composable, ...any] ? Composable< + ( + ...args: Parameters< + CanComposeInSequence< + [SourceComposable, Awaited>] + >[0] + > + ) => null extends Awaited> ? + | UnpackData + | UnpackData>, Composable>> + : UnpackData>, Composable>> + > + : CanComposeInSequence<[SourceComposable, Awaited>]> + : CanComposeInSequence<[SourceComposable, Composable]> export type { - AllArguments, BranchReturn, + CanComposeInParallel, + CanComposeInSequence, Composable, Failure, Last, MergeObjs, ParserSchema, - PipeArguments, PipeReturn, RecordToTuple, Result, From d82d7858f526d4cda6a110b4639437c6156139d1 Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Sat, 4 May 2024 10:03:18 -0400 Subject: [PATCH 146/238] Relax the type constraints since we can receive an error type in these cases --- src/environment/tests/types.test.ts | 22 +++++++++++----------- src/types.ts | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts index dbae6c71..93822db6 100644 --- a/src/environment/tests/types.test.ts +++ b/src/environment/tests/types.test.ts @@ -139,17 +139,17 @@ namespace PipeReturn { > } -namespace BranchReturn { - // type test = Expect< - // Equal< - // Subject.BranchReturn< - // Composable<(a: number, e?: unknown) => number>, - // (a: number) => Composable<(a: number, e: number) => string> - // >, - // Composable<(a: number, e?: unknown) => string> - // > - // > -} +// namespace BranchReturn { +// type test = Expect< +// Equal< +// Subject.BranchReturn< +// Composable<(a: number, e?: unknown) => number>, +// (a: number) => Composable<(a: number, e: number) => string> +// >, +// Composable<(a: number, e: number) => string> +// > +// > +// } namespace GetEnv { type test1 = Expect< diff --git a/src/types.ts b/src/types.ts index 15f2bda2..7c005fa7 100644 --- a/src/types.ts +++ b/src/types.ts @@ -42,13 +42,13 @@ type UnpackAll = { [K in keyof List]: UnpackData } -type SequenceReturn = Fns extends [ +type SequenceReturn = Fns extends [ Composable<(...args: infer P) => any>, ...any, ] ? Composable<(...args: P) => UnpackAll> : Fns -type PipeReturn = Fns extends [ +type PipeReturn = Fns extends [ Composable<(...args: infer P) => any>, ...any, ] ? Composable<(...args: P) => UnpackData, Composable>>> From 3b83fb892be5b6a134ad3ae21da78dabc8c791cf Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Sat, 4 May 2024 10:49:06 -0400 Subject: [PATCH 147/238] Now we have a proper environment in the BranchReturn --- src/environment/tests/types.test.ts | 31 +++++++++++++++++++---------- src/environment/types.ts | 20 +++++++++++++++---- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/environment/tests/types.test.ts b/src/environment/tests/types.test.ts index 93822db6..c7dc5595 100644 --- a/src/environment/tests/types.test.ts +++ b/src/environment/tests/types.test.ts @@ -139,17 +139,26 @@ namespace PipeReturn { > } -// namespace BranchReturn { -// type test = Expect< -// Equal< -// Subject.BranchReturn< -// Composable<(a: number, e?: unknown) => number>, -// (a: number) => Composable<(a: number, e: number) => string> -// >, -// Composable<(a: number, e: number) => string> -// > -// > -// } +namespace BranchReturn { + type testCommonEnv = Expect< + Equal< + Subject.BranchReturn< + Composable<(a: number, e?: unknown) => number>, + (a: number) => Composable<(a: number, e: number) => string> + >, + Composable<(a: number, e: number) => string> + > + > + type test = Expect< + Equal< + Subject.BranchReturn< + Composable<(a?: unknown, e?: unknown) => number>, + (a: number) => null | Composable<(a?: unknown, e?: unknown) => string> + >, + Composable<(a?: unknown, e?: unknown) => string | number> + > + > +} namespace GetEnv { type test1 = Expect< diff --git a/src/environment/types.ts b/src/environment/types.ts index 6480f261..3274ccec 100644 --- a/src/environment/types.ts +++ b/src/environment/types.ts @@ -88,6 +88,15 @@ type SetEnv< ? [firstOptional?, ...Env] : never +type BranchEnvironment< + SourceComposable extends Composable, + Resolver extends ( + ...args: any[] + ) => Composable | null | Promise, +> = Awaited> extends Composable + ? CommonEnvironment<[SourceComposable, Awaited>]> + : GetEnv> + type BranchReturn< SourceComposable extends Composable, Resolver extends ( @@ -101,10 +110,13 @@ type BranchReturn< [SourceComposable, Awaited>] > extends [Composable, ...any] ? Composable< ( - ...args: Parameters< - CanComposeInSequence< - [SourceComposable, Awaited>] - >[0] + ...args: SetEnv< + Parameters< + CanComposeInSequence< + [SourceComposable, Awaited>] + >[0] + >, + BranchEnvironment > ) => null extends Awaited> ? | UnpackData From 046648e8b5b858a3944d58e873897cd50fe6deaa Mon Sep 17 00:00:00 2001 From: Diogo Biazus Date: Mon, 6 May 2024 12:53:24 -0400 Subject: [PATCH 148/238] Update Docs & JSDocs (#25) * JSDocs for types * Updating old references do domain functions in docs to composables * Update README.md --------- Co-authored-by: Guga Guichard --- DFs.md | 110 ++++++++++++------------- README.md | 4 +- deno.json | 2 +- examples/arktype/src/index.ts | 4 +- examples/remix/app/routes/_index.tsx | 4 +- examples/remix/package-lock.json | 8 +- src/combinators.ts | 86 +++++++++---------- src/constructors.ts | 10 ++- src/environment/combinators.ts | 43 +++------- src/environment/tests/branch.test.ts | 2 +- src/environment/tests/pipe.test.ts | 2 +- src/environment/tests/sequence.test.ts | 2 +- src/errors.ts | 4 +- src/tests/trace.test.ts | 2 +- src/types.ts | 54 +++++++++++- 15 files changed, 185 insertions(+), 152 deletions(-) diff --git a/DFs.md b/DFs.md index 45211682..72f67a35 100644 --- a/DFs.md +++ b/DFs.md @@ -18,7 +18,7 @@ It does this by enforcing the parameters' types at runtime (through [Zod](https: - [Using error messages in the UI](#using-error-messages-in-the-ui) - [errorMessagesFor](#errormessagesfor) - [Tracing](#tracing) -- [Combining domain functions](#combining-domain-functions) +- [Combining domain functions](#combining-composable-functions) - [all](#all) - [collect](#collect) - [merge](#merge) @@ -36,7 +36,7 @@ It does this by enforcing the parameters' types at runtime (through [Zod](https: - [UnpackData](#unpackdata) - [UnpackSuccess](#unpacksuccess) - [UnpackResult](#unpackresult) -- [Extracting input values for domain functions](#extracting-input-values-for-domain-functions) +- [Extracting input values for domain functions](#extracting-input-values-for-composable-functions) - [inputFromForm](#inputfromform) - [inputFromFormData](#inputfromformdata) - [inputFromUrl](#inputfromurl) @@ -56,11 +56,11 @@ It does this by enforcing the parameters' types at runtime (through [Zod](https: ## Quickstart ``` -npm i domain-functions zod +npm i composable-functions zod ``` ```tsx -import { makeDomainFunction, inputFromForm } from 'domain-functions' +import { makeDomainFunction, inputFromForm } from 'composable-functions' import * as z from 'zod' const schema = z.object({ number: z.coerce.number() }) @@ -97,7 +97,7 @@ If you are using [Deno](https://deno.land/), just directly import the functions import { makeDomainFunction } from "https://deno.land/x/domain_functions/mod.ts"; ``` -This documentation will use Node.JS imports by convention, just replace `domain-functions` with `https://deno.land/x/domain_functions/mod.ts` when using [Deno](https://deno.land/). +This documentation will use Node.JS imports by convention, just replace `composable-functions` with `https://deno.land/x/domain_functions/mod.ts` when using [Deno](https://deno.land/). ## Taking parameters that are not user input @@ -105,7 +105,7 @@ Sometimes you want to ensure the safety of certain values that weren't explicitl ```tsx // In some app/domain/*.server.ts file -const sendEmail = mdf( +const sendEmail = withSchema( z.object({ email: z.string().email() }), // user input schema z.object({ origin: z.string() }) // environment schema )( @@ -134,7 +134,7 @@ We usually use the environment for ensuring authenticated requests. In this case, assume you have a `currentUser` function that returns the authenticated user: ```tsx -const dangerousFunction = mdf( +const dangerousFunction = withSchema( someInputSchema, z.object({ user: z.object({ id: z.string(), admin: z.literal(true) }) }) )(async (input, { user }) => { @@ -158,7 +158,7 @@ type ErrorResult = { The `inputErrors` and `environmentErrors` fields will be the errors from parsing the corresponding Zod schemas, and the `errors` field will be for any exceptions thrown inside the domain function (in which case we keep a reference to the original exception): ```ts -const alwaysFails = mdf(input, environment)(async () => { +const alwaysFails = withSchema(input, environment)(async () => { throw new Error('Some error') }) @@ -180,7 +180,7 @@ failedResult = { Whenever you want more control over the domain function's `ErrorResult`, you can throw a `ResultError` from the domain function's handler. You will then be able to add multiple error messages to the structure: ```ts -const alwaysFails = mdf(inputSchema)(async () => { +const alwaysFails = withSchema(inputSchema)(async () => { throw new ResultError({ errors: [{ message: 'Some error' }], inputErrors: [{ path: ['number'], message: 'Expected number, received nan' }], @@ -194,7 +194,7 @@ const alwaysFails = mdf(inputSchema)(async () => { You can also throw an `InputError` whenever you want a custom input error that cannot be generated by your schema. ```ts -const alwaysFails = mdf(input, environment)(async () => { +const alwaysFails = withSchema(input, environment)(async () => { throw new InputError('Email already taken', 'email') }) @@ -273,9 +273,9 @@ It will pass the same input and environment to each provided function. If __all constituent functions__ are successful, The `data` field (on the composite domain function's result) will be a tuple containing each function's output. ```ts -const a = mdf(z.object({ id: z.number() }))(({ id }) => String(id)) -const b = mdf(z.object({ id: z.number() }))(({ id }) => id + 1) -const c = mdf(z.object({ id: z.number() }))(({ id }) => Boolean(id)) +const a = withSchema(z.object({ id: z.number() }))(({ id }) => String(id)) +const b = withSchema(z.object({ id: z.number() }))(({ id }) => id + 1) +const c = withSchema(z.object({ id: z.number() }))(({ id }) => Boolean(id)) const results = await all(a, b, c)({ id: 1 }) // ^? Result<[string, number, boolean]> @@ -296,10 +296,10 @@ For the example above, the result will be: If any of the constituent functions fail, the `errors` field (on the composite domain function's result) will be an array of the concatenated errors from each failing function: ```ts -const a = mdf(z.object({ id: z.number() }))(() => { +const a = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) -const b = mdf(z.object({ id: z.number() }))(() => { +const b = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) @@ -324,9 +324,9 @@ const results = await all(a, b)({ id: 1 }) The motivation for this is that an object with named fields is often preferable to long tuples, when composing many domain functions. ```ts -const a = mdf(z.object({}))(() => '1') -const b = mdf(z.object({}))(() => 2) -const c = mdf(z.object({}))(() => true) +const a = withSchema(z.object({}))(() => '1') +const b = withSchema(z.object({}))(() => 2) +const c = withSchema(z.object({}))(() => true) const results = await collect({ a, b, c })({}) // ^? Result<{ a: string, b: number, c: boolean }> @@ -359,13 +359,13 @@ map(all(a, b, c), mergeObjects) The resulting data of every domain function will be merged into one object. __This could potentially lead to values of the leftmost functions being overwritten by the rightmost ones__. ```ts -const a = mdf(z.object({}))(() => ({ +const a = withSchema(z.object({}))(() => ({ resultA: 'string', resultB: 'string', resultC: 'string', })) -const b = mdf(z.object({}))(() => ({ resultB: 2 })) -const c = mdf(z.object({}))(async () => ({ resultC: true })) +const b = withSchema(z.object({}))(() => ({ resultB: 2 })) +const c = withSchema(z.object({}))(async () => ({ resultC: true })) const results = await merge(a, b, c)({}) // ^? Result<{ resultA: string, resultB: number, resultC: boolean }> @@ -388,10 +388,10 @@ For the example above, the result will be: __It is important to notice__ that all constituent domain functions will be executed in parallel, so be mindful of the side effects. ```ts -const a = mdf( +const a = withSchema( z.object({ n: z.number(), operation: z.literal('increment') }), )(({ n }) => n + 1) -const b = mdf( +const b = withSchema( z.object({ n: z.number(), operation: z.literal('decrement') }), )(({ n }) => n - 1) @@ -414,10 +414,10 @@ For the example above, the result will be: The composite domain function's result type will be a union of each constituent domain function's result type. ```ts -const a = mdf(z.object({ operation: z.literal('A') }))(() => ({ +const a = withSchema(z.object({ operation: z.literal('A') }))(() => ({ resultA: 'A', })) -const b = mdf(z.object({ operation: z.literal('B') }))(() => ({ +const b = withSchema(z.object({ operation: z.literal('B') }))(() => ({ resultB: 'B', })) @@ -432,10 +432,10 @@ return console.log('function B succeeded') If every constituent domain function fails, the `errors` field will contain the concatenated errors from each failing function's result: ```ts -const a = mdf(z.object({ id: z.number() }))(() => { +const a = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error A') }) -const b = mdf(z.object({ id: z.number() }))(() => { +const b = withSchema(z.object({ id: z.number() }))(() => { throw new Error('Error B') }) @@ -462,17 +462,17 @@ The resulting data will be the output of the rightmost function. Note that there is no type-level assurance that a function's output will align with and be succesfully parsed by the next function in the pipeline. ```ts -const a = mdf(z.object({ aNumber: z.number() }))( +const a = withSchema(z.object({ aNumber: z.number() }))( ({ aNumber }) => ({ aString: String(aNumber), }), ) -const b = mdf(z.object({ aString: z.string() }))( +const b = withSchema(z.object({ aString: z.string() }))( ({ aString }) => ({ aBoolean: aString == '1', }), ) -const c = mdf(z.object({ aBoolean: z.boolean() }))( +const c = withSchema(z.object({ aBoolean: z.boolean() }))( async ({ aBoolean }) => !aBoolean, ) @@ -502,8 +502,8 @@ If one functions fails, execution halts and the error is returned. Instead of the `data` field being the output of the last domain function, it will be a tuple containing each intermediate output (similar to the `all` function). ```ts -const a = mdf(z.number())((aNumber) => String(aNumber)) -const b = mdf(z.string())((aString) => aString === '1') +const a = withSchema(z.number())((aNumber) => String(aNumber)) +const b = withSchema(z.string())((aString) => aString === '1') const c = sequence(a, b) @@ -526,12 +526,12 @@ For the example above, the result will be: If you'd rather have an object instead of a tuple (similar to the `merge` function), you can use the `map` and `mergeObjects` functions like so: ```ts -import { mergeObjects } from 'domain-functions' +import { mergeObjects } from 'composable-functions' -const a = mdf(z.number())((aNumber) => ({ +const a = withSchema(z.number())((aNumber) => ({ aString: String(aNumber) })) -const b = mdf(z.object({ aString: z.string() }))( +const b = withSchema(z.object({ aString: z.string() }))( ({ aString }) => ({ aBoolean: aString === '1' }) ) @@ -553,8 +553,8 @@ This feature relies on JS's order of objects' keys (guaranteed since ECMAScript2 **NOTE :** For number-like object keys (eg: { 2: dfA, 1: dfB }) JS will follow ascendent order. ```ts -const a = mdf(z.number())((aNumber) => String(aNumber)) -const b = mdf(z.string())((aString) => aString === '1') +const a = withSchema(z.number())((aNumber) => String(aNumber)) +const b = withSchema(z.string())((aString) => aString === '1') const c = collectSequence({ a, b }) @@ -581,13 +581,13 @@ Use `branch` to add conditional logic to your domain functions' compositions. It receives a domain function and a predicate function that should return the next domain function to be executed based on the previous domain function's output, like `pipe`. ```ts -const getIdOrEmail = mdf(z.object({ id: z.number().optional, email: z.string().optional() }))((data) => { +const getIdOrEmail = withSchema(z.object({ id: z.number().optional, email: z.string().optional() }))((data) => { return data.id ?? data.email }) -const findUserById = mdf(z.number())((id) => { +const findUserById = withSchema(z.number())((id) => { return db.users.find({ id }) }) -const findUserByEmail = mdf(z.string().email())((email) => { +const findUserByEmail = withSchema(z.string().email())((email) => { return db.users.find({ email }) }) const findUserByIdOrEmail = branch( @@ -609,9 +609,9 @@ For the example above, the result will be: ``` If you don't want to pipe when a certain condition is matched, you can return `null` like so: ```ts -const a = mdf()(() => 'a') -const b = mdf()(() => 'b') -const df = branch(a, (output) => output === 'a' ? null : b) +const a = withSchema()(() => 'a') +const b = withSchema()(() => 'b') +const aComposable = branch(a, (output) => output === 'a' ? null : b) // ^? DomainFunction<'a' | 'b'> ``` @@ -645,14 +645,14 @@ If successful, the `data` field will contain the output of the first function ar This can be useful when composing domain functions. For example, you might need to align input/output types in a pipeline: ```ts -const fetchAsText = mdf(z.object({ userId: z.number() }))( +const fetchAsText = withSchema(z.object({ userId: z.number() }))( ({ userId }) => fetch(`https://reqres.in/api/users/${String(userId)}`).then((r) => r.json(), ), ) -const fullName = mdf( +const fullName = withSchema( z.object({ first_name: z.string(), last_name: z.string() }), )(({ first_name, last_name }) => `${first_name} ${last_name}`) @@ -686,7 +686,7 @@ This could be useful when adding any layer of error handling. In the example below, we are counting the errors but disregarding the contents: ```ts -const increment = mdf(z.object({ id: z.number() }))( +const increment = withSchema(z.object({ id: z.number() }))( ({ id }) => id + 1, ) @@ -724,7 +724,7 @@ For the example above, the `result` will be: Whenever the composition utilities fall short, and you want to call other domain functions from inside your current one, you can use the `fromSuccess` function to create a domain function that is expected to always succeed. ```ts -const domainFunctionA = mdf( +const domainFunctionA = withSchema( z.object({ id: z.string() }), )(async ({ id }) => { const valueB = await fromSuccess(domainFunctionB)({ userId: id }) @@ -760,7 +760,7 @@ The resulting object will be: `UnpackData` infers the returned data of a successful domain function: ```ts -const fn = mdf()(async () => '') +const fn = withSchema()(async () => '') type Data = UnpackData // ^? string @@ -771,7 +771,7 @@ type Data = UnpackData `UnpackSuccess` infers the success result of a domain function: ```ts -const fn = mdf()(async () => '') +const fn = withSchema()(async () => '') type Success = UnpackSuccess // ^? SuccessResult @@ -782,7 +782,7 @@ type Success = UnpackSuccess `UnpackResult` infers the result of a domain function: ```ts -const fn = mdf()(async () => '') +const fn = withSchema()(async () => '') type Result = UnpackResult // ^? Result @@ -898,15 +898,15 @@ To better understand how to structure your data, refer to [this test file](./src ## Resources -- [The case for domain-functions](https://dev.to/diogob/the-case-for-domain-functions-f4e) -- [How domain-functions improves the already awesome DX of Remix projects](https://dev.to/gugaguichard/how-remix-domains-improves-the-already-awesome-dx-of-remix-projects-56lm) +- [The case for composable-functions](https://dev.to/diogob/the-case-for-composable-functions-f4e) +- [How composable-functions improves the already awesome DX of Remix projects](https://dev.to/gugaguichard/how-remix-domains-improves-the-already-awesome-dx-of-remix-projects-56lm) ## FAQ -- I want to use domain-functions in a project that does not have Zod, how can I use other schema validation libraries? +- I want to use composable-functions in a project that does not have Zod, how can I use other schema validation libraries? - Although we code against Zod during the library development, any schema validation can be used as long as you are able to create an adapter of the type [`ParserSchema`](./src/types.ts#L183). - Why are the inputs and the environment not type-safe? - - Short answer: Similar to how Zod's `.parse` operates, we won't presume you're providing the right data to the domain function. We will validate it only at runtime. The domain function's inner code won't execute if the input/environment is invalid, ensuring that the data you receive is valid. Once validated, we can also infer the output type. Read more about it in [@danielweinmann 's comment](https://github.com/seasonedcc/domain-functions/issues/80#issuecomment-1642453221). + - Short answer: Similar to how Zod's `.parse` operates, we won't presume you're providing the right data to the domain function. We will validate it only at runtime. The domain function's inner code won't execute if the input/environment is invalid, ensuring that the data you receive is valid. Once validated, we can also infer the output type. Read more about it in [@danielweinmann 's comment](https://github.com/seasonedcc/composable-functions/issues/80#issuecomment-1642453221). - How do I carry out conditional branching in a composition of domain functions? - Before 1.8.0: You would have to use either the [`first`](#first) operator or `if` statements within the function. The `first` operator was not ideal because it could execute all the functions in the composition (assuming the input and environment validate) until one of them returns a success. For the `if` approach, we'd recommend using [`fromSuccess`](#fromsuccess) to invoke the other domain functions, as it would propagate any errors that could occur within them. Read more about it [here](https://twitter.com/gugaguichard/status/1684280544387899393). - After 1.8.0: We introduced the [`branch`](#branch) operator, which enables you to conduct more complex conditional branching without breaking compositions. @@ -914,7 +914,7 @@ To better understand how to structure your data, refer to [this test file](./src ## Acknowlegements We are grateful for [Zod](https://github.com/colinhacks/zod), as it is a great library and it informed our design. -It's worth mentioning two other projects that inspired domain-functions: +It's worth mentioning two other projects that inspired composable-functions: - [Servant](https://github.com/haskell-servant/servant/) - [tRPC](https://trpc.io) diff --git a/README.md b/README.md index a9fe3187..bcdcdf79 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ npm i composable-functions ``` ```tsx -import { composable, pipe } from 'domain-functions' +import { composable, pipe } from 'composable-functions' const faultyAdd = composable((a: number, b: number) => { if (a === 1) throw new Error('a is 1') @@ -172,5 +172,5 @@ If you are using [Deno](https://deno.land/), just directly import the functions import { makeDomainFunction } from "https://deno.land/x/domain_functions/mod.ts"; ``` -This documentation will use Node.JS imports by convention, just replace `domain-functions` with `https://deno.land/x/domain_functions/mod.ts` when using [Deno](https://deno.land/). +This documentation will use Node.JS imports by convention, just replace `composable-functions` with `https://deno.land/x/composable_functions/mod.ts` when using [Deno](https://deno.land/). diff --git a/deno.json b/deno.json index 3ea68c6c..f85a65c5 100644 --- a/deno.json +++ b/deno.json @@ -4,7 +4,7 @@ "test": "deno test --allow-env --allow-net src", "publish": "deno task build-npm && cd npm/ && npm publish", "build-npm": "deno run -A scripts/build-npm.ts", - "docs": "deno doc --html --name='domain-functions' ./mod.ts" + "docs": "deno doc --html --name='composable-functions' ./mod.ts" }, "lint": { "include": [ diff --git a/examples/arktype/src/index.ts b/examples/arktype/src/index.ts index b1899c96..ee3d2cfe 100644 --- a/examples/arktype/src/index.ts +++ b/examples/arktype/src/index.ts @@ -4,13 +4,13 @@ import { type } from 'arktype' const fn = composable((a: number, b: number) => a + b) const schemaFn = applyArkSchema(fn, type('number'), type('number')) -const df = withArkSchema(type('number'), type('number'))((a, b) => a + b) +const aComposable = withArkSchema(type('number'), type('number'))((a, b) => a + b) const result = await schemaFn(1, 2) console.log(result) // { success: true, data: 3, errors: [] } -const result2 = await df('1', 2) +const result2 = await aComposable('1', 2) console.log(result2) // { // success: false, diff --git a/examples/remix/app/routes/_index.tsx b/examples/remix/app/routes/_index.tsx index 59426fc6..7727e95d 100644 --- a/examples/remix/app/routes/_index.tsx +++ b/examples/remix/app/routes/_index.tsx @@ -5,7 +5,7 @@ import { listColors } from '~/business/colors' import { listUsers } from '~/business/users' import { loaderResponseOrThrow } from '~/lib' -// We'll run these 2 domain functions in parallel with Promise.all +// We'll run these 2 composables in parallel with Promise.all const getData = collect({ // The second argument will transform the successful result of listColors, // we only care about what is in the "data" field @@ -24,7 +24,7 @@ export default function Index() { const qs = new URLSearchParams(location.search) return ( <> -

Domain Functions

+

Composables