From 962625f97698ca18664a52a7ec4102c1cd7b390c Mon Sep 17 00:00:00 2001 From: David Blass Date: Mon, 13 May 2024 15:10:54 -0400 Subject: [PATCH 1/8] fix: preserve JsDoc on defineWorld output, bump @arktype/util --- packages/common/src/type-utils/evaluate.ts | 2 -- packages/common/src/type-utils/index.ts | 2 -- packages/common/src/type-utils/satisfy.ts | 1 - packages/config/package.json | 1 + packages/config/src/common.ts | 2 +- packages/store/package.json | 2 +- packages/store/ts/config/v2/input.ts | 4 ++-- packages/store/ts/config/v2/output.ts | 4 ++-- packages/store/ts/config/v2/schema.ts | 4 ++-- packages/store/ts/config/v2/scope.ts | 6 +++--- packages/store/ts/config/v2/table.ts | 4 ++-- packages/store/ts/config/v2/tables.ts | 4 ++-- packages/world/package.json | 2 +- packages/world/ts/config/v2/input.ts | 4 ++-- packages/world/ts/config/v2/world.ts | 14 ++++++++------ pnpm-lock.yaml | 21 ++++++++++++--------- 16 files changed, 39 insertions(+), 38 deletions(-) delete mode 100644 packages/common/src/type-utils/evaluate.ts delete mode 100644 packages/common/src/type-utils/satisfy.ts diff --git a/packages/common/src/type-utils/evaluate.ts b/packages/common/src/type-utils/evaluate.ts deleted file mode 100644 index 14f9b55283..0000000000 --- a/packages/common/src/type-utils/evaluate.ts +++ /dev/null @@ -1,2 +0,0 @@ -// https://github.com/arktypeio/arktype/blob/93e79fa3d28567b7547e8e2df9a84e3c5b86e8e1/src/utils/generics.ts#L23 -export type evaluate = { [k in keyof t]: t[k] } & unknown; diff --git a/packages/common/src/type-utils/index.ts b/packages/common/src/type-utils/index.ts index 1cd21a40c7..866ee2904c 100644 --- a/packages/common/src/type-utils/index.ts +++ b/packages/common/src/type-utils/index.ts @@ -1,4 +1,2 @@ export * from "./abi"; export * from "./common"; -export * from "./evaluate"; -export * from "./satisfy"; diff --git a/packages/common/src/type-utils/satisfy.ts b/packages/common/src/type-utils/satisfy.ts deleted file mode 100644 index 61f7863418..0000000000 --- a/packages/common/src/type-utils/satisfy.ts +++ /dev/null @@ -1 +0,0 @@ -export type satisfy = t; diff --git a/packages/config/package.json b/packages/config/package.json index fd447e1cd6..3e9ddfb6ef 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -45,6 +45,7 @@ "test:ci": "pnpm run test" }, "dependencies": { + "@arktype/util": "0.0.39", "@latticexyz/common": "workspace:*", "@latticexyz/schema-type": "workspace:*", "esbuild": "^0.17.15", diff --git a/packages/config/src/common.ts b/packages/config/src/common.ts index 037a910698..e08c34634a 100644 --- a/packages/config/src/common.ts +++ b/packages/config/src/common.ts @@ -1,7 +1,7 @@ import { Hex } from "viem"; import { DynamicAbiType, StaticAbiType } from "@latticexyz/schema-type/internal"; import { ResourceType } from "@latticexyz/common"; -import { satisfy } from "@latticexyz/common/type-utils"; +import { satisfy } from "@arktype/util"; /** * Common output types of a MUD config. We use these types as inputs for libraries. diff --git a/packages/store/package.json b/packages/store/package.json index 7840af94eb..7554b84d59 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -59,7 +59,7 @@ "test:ci": "pnpm run test" }, "dependencies": { - "@arktype/util": "0.0.29", + "@arktype/util": "0.0.39", "@latticexyz/common": "workspace:*", "@latticexyz/config": "workspace:*", "@latticexyz/protocol-parser": "workspace:*", diff --git a/packages/store/ts/config/v2/input.ts b/packages/store/ts/config/v2/input.ts index 07a36188d7..6dd20d5e87 100644 --- a/packages/store/ts/config/v2/input.ts +++ b/packages/store/ts/config/v2/input.ts @@ -1,7 +1,7 @@ import { Hex } from "viem"; import { Codegen, Enums, TableCodegen, TableDeploy, UserTypes } from "./output"; import { Scope } from "./scope"; -import { evaluate } from "@arktype/util"; +import { show } from "@arktype/util"; export type SchemaInput = { readonly [key: string]: string; @@ -42,4 +42,4 @@ export type TablesWithShorthandsInput = { readonly [key: string]: TableInput | TableShorthandInput; }; -export type StoreWithShorthandsInput = evaluate & { tables: TablesWithShorthandsInput }>; +export type StoreWithShorthandsInput = show & { tables: TablesWithShorthandsInput }>; diff --git a/packages/store/ts/config/v2/output.ts b/packages/store/ts/config/v2/output.ts index 23e79ad15b..d7043e3222 100644 --- a/packages/store/ts/config/v2/output.ts +++ b/packages/store/ts/config/v2/output.ts @@ -1,4 +1,4 @@ -import { evaluate } from "@arktype/util"; +import { show } from "@arktype/util"; import { AbiType, Schema, Table as BaseTable } from "@latticexyz/config"; export type { AbiType, Schema }; @@ -22,7 +22,7 @@ export type TableDeploy = { readonly disabled: boolean; }; -export type Table = evaluate< +export type Table = show< BaseTable & { readonly codegen: TableCodegen; readonly deploy: TableDeploy; diff --git a/packages/store/ts/config/v2/schema.ts b/packages/store/ts/config/v2/schema.ts index 099d2fd820..e053a67b9c 100644 --- a/packages/store/ts/config/v2/schema.ts +++ b/packages/store/ts/config/v2/schema.ts @@ -1,4 +1,4 @@ -import { conform, evaluate } from "@arktype/util"; +import { conform, show } from "@arktype/util"; import { AbiTypeScope, Scope } from "./scope"; import { hasOwnKey, isObject } from "./generics"; import { SchemaInput } from "./input"; @@ -27,7 +27,7 @@ export function validateSchema( } } -export type resolveSchema = evaluate<{ +export type resolveSchema = show<{ readonly [key in keyof schema]: { /** the Solidity primitive ABI type */ readonly type: schema[key] extends FixedArrayAbiType diff --git a/packages/store/ts/config/v2/scope.ts b/packages/store/ts/config/v2/scope.ts index a5f70e6f5d..7c033f23cb 100644 --- a/packages/store/ts/config/v2/scope.ts +++ b/packages/store/ts/config/v2/scope.ts @@ -1,4 +1,4 @@ -import { Dict, evaluate } from "@arktype/util"; +import { Dict, show } from "@arktype/util"; import { SchemaInput } from "./input"; import { StaticAbiType, schemaAbiTypes } from "@latticexyz/schema-type/internal"; import { AbiType } from "./output"; @@ -24,8 +24,8 @@ export type getStaticAbiTypeKeys< [key in keyof schema]: scope["types"] extends { [_ in schema[key]]: StaticAbiType } ? key : never; }[keyof schema]; -export type extendScope> = evaluate< - ScopeOptions> +export type extendScope> = show< + ScopeOptions> >; export function extendScope>( diff --git a/packages/store/ts/config/v2/table.ts b/packages/store/ts/config/v2/table.ts index cd5f59003b..a1541c5035 100644 --- a/packages/store/ts/config/v2/table.ts +++ b/packages/store/ts/config/v2/table.ts @@ -1,4 +1,4 @@ -import { ErrorMessage, conform, evaluate, narrow, requiredKeyOf } from "@arktype/util"; +import { ErrorMessage, conform, show, narrow, requiredKeyOf } from "@arktype/util"; import { isStaticAbiType } from "@latticexyz/schema-type/internal"; import { Hex } from "viem"; import { get, hasOwnKey, mergeIfUndefined } from "./generics"; @@ -101,7 +101,7 @@ export function validateTable( } } -export type resolveTableCodegen = evaluate<{ +export type resolveTableCodegen = show<{ [key in keyof TableCodegen]-?: key extends keyof input["codegen"] ? undefined extends input["codegen"][key] ? key extends "dataStruct" diff --git a/packages/store/ts/config/v2/tables.ts b/packages/store/ts/config/v2/tables.ts index 3e25809b91..0e36f029bd 100644 --- a/packages/store/ts/config/v2/tables.ts +++ b/packages/store/ts/config/v2/tables.ts @@ -1,4 +1,4 @@ -import { ErrorMessage, evaluate } from "@arktype/util"; +import { ErrorMessage, show } from "@arktype/util"; import { isObject, mergeIfUndefined } from "./generics"; import { TablesInput } from "./input"; import { Scope, AbiTypeScope } from "./scope"; @@ -23,7 +23,7 @@ export function validateTables( throw new Error(`Expected store config, received ${JSON.stringify(input)}`); } -export type resolveTables = evaluate<{ +export type resolveTables = show<{ readonly [key in keyof tables]: resolveTable, scope>; }>; diff --git a/packages/world/package.json b/packages/world/package.json index 45a5c62196..34942569fe 100644 --- a/packages/world/package.json +++ b/packages/world/package.json @@ -54,7 +54,7 @@ "test:ci": "pnpm run test" }, "dependencies": { - "@arktype/util": "0.0.29", + "@arktype/util": "0.0.39", "@latticexyz/common": "workspace:*", "@latticexyz/config": "workspace:*", "@latticexyz/protocol-parser": "workspace:*", diff --git a/packages/world/ts/config/v2/input.ts b/packages/world/ts/config/v2/input.ts index 6e784cabfc..04dea33eba 100644 --- a/packages/world/ts/config/v2/input.ts +++ b/packages/world/ts/config/v2/input.ts @@ -1,4 +1,4 @@ -import { evaluate } from "@arktype/util"; +import { show } from "@arktype/util"; import { StoreInput, StoreWithShorthandsInput } from "@latticexyz/store/config/v2"; import { DynamicResolution, ValueWithType } from "./dynamicResolution"; @@ -76,7 +76,7 @@ export type CodegenInput = { worldImportPath?: string; }; -export type WorldInput = evaluate< +export type WorldInput = show< StoreInput & { namespaces?: NamespacesInput; /** diff --git a/packages/world/ts/config/v2/world.ts b/packages/world/ts/config/v2/world.ts index df5882a4de..a09069c3df 100644 --- a/packages/world/ts/config/v2/world.ts +++ b/packages/world/ts/config/v2/world.ts @@ -1,4 +1,4 @@ -import { ErrorMessage, conform, evaluate, narrow } from "@arktype/util"; +import { ErrorMessage, conform, narrow, type withExactJsDoc } from "@arktype/util"; import { UserTypes, extendedScope, @@ -20,6 +20,7 @@ import { resolveSystems } from "./systems"; import { resolveNamespacedTables } from "./namespaces"; import { resolveCodegen } from "./codegen"; import { resolveDeploy } from "./deploy"; +import type { World } from "./output.js"; export type validateWorld = { readonly [key in keyof world]: key extends "tables" @@ -52,7 +53,7 @@ export function validateWorld(world: unknown): asserts world is WorldInput { } } -export type resolveWorld = evaluate< +export type resolveWorld = withExactJsDoc< resolveStore & mergeIfUndefined< { tables: resolveNamespacedTables } & Omit< @@ -68,7 +69,8 @@ export type resolveWorld = evaluate< "namespaces" | keyof Store >, CONFIG_DEFAULTS - > + >, + World >; export function resolveWorld(world: world): resolveWorld { @@ -107,7 +109,7 @@ export function resolveWorld(world: world): reso ) as never; } -export function defineWorld(world: validateWorld): resolveWorld { - validateWorld(world); - return resolveWorld(world) as never; +export function defineWorld(input: validateWorld): resolveWorld { + validateWorld(input); + return resolveWorld(input) as never; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b3a13810f0..c36268b0bd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.0' +lockfileVersion: '6.1' settings: autoInstallPeers: true @@ -339,6 +339,9 @@ importers: packages/config: dependencies: + '@arktype/util': + specifier: 0.0.39 + version: 0.0.39 '@latticexyz/common': specifier: workspace:* version: link:../common @@ -751,8 +754,8 @@ importers: packages/store: dependencies: '@arktype/util': - specifier: 0.0.29 - version: 0.0.29 + specifier: 0.0.39 + version: 0.0.39 '@latticexyz/common': specifier: workspace:* version: link:../common @@ -1046,8 +1049,8 @@ importers: packages/world: dependencies: '@arktype/util': - specifier: 0.0.29 - version: 0.0.29 + specifier: 0.0.39 + version: 0.0.39 '@latticexyz/common': specifier: workspace:* version: link:../common @@ -1278,14 +1281,14 @@ packages: resolution: {integrity: sha512-MwtDGjbgfXWxlExjIL78HvPlWOma1XFEcDd3VWuCPMt/f+3TR7fXyiGFNlIYZGOYdOIU7qgjaE8dmbd6jdJa3Q==} dev: true - /@arktype/util@0.0.29: - resolution: {integrity: sha512-fDTBSVzxLj9k1ZjinkawmaQdcXFKMBVK8c+vqMPxwoa94mPMZxBo84yQcqyFVcIcWIkg6qQQmH1ozyT4nqFT/g==} - dev: false - /@arktype/util@0.0.38: resolution: {integrity: sha512-IvYMGnkUASJllRk3mdBVgckomKx2LNsDTrWCxz04EBK1OuU+4fJ/smSjxgZVWfopNXZds9sHNxZgTJOIw7GvJw==} dev: true + /@arktype/util@0.0.39: + resolution: {integrity: sha512-wd8czBqQz3scri2T5GM6kH9cdFHpzmDjGf0ER6NxyvZH4dnx/AqC57kBFOWIAj5+idvUgHusWAS1xocaDbtyuA==} + dev: false + /@aws-crypto/ie11-detection@3.0.0: resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==} dependencies: From 744a4b3ecfef56690eaac536618a9533b40527d5 Mon Sep 17 00:00:00 2001 From: David Blass Date: Mon, 13 May 2024 17:33:43 -0400 Subject: [PATCH 2/8] update withJsDoc to handle base optional keys --- packages/config/package.json | 2 +- packages/store/package.json | 2 +- packages/world/package.json | 2 +- packages/world/ts/config/v2/world.ts | 4 ++-- pnpm-lock.yaml | 16 ++++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/config/package.json b/packages/config/package.json index 3e9ddfb6ef..3315e576fd 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -45,7 +45,7 @@ "test:ci": "pnpm run test" }, "dependencies": { - "@arktype/util": "0.0.39", + "@arktype/util": "0.0.40", "@latticexyz/common": "workspace:*", "@latticexyz/schema-type": "workspace:*", "esbuild": "^0.17.15", diff --git a/packages/store/package.json b/packages/store/package.json index 7554b84d59..88200e3d10 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -59,7 +59,7 @@ "test:ci": "pnpm run test" }, "dependencies": { - "@arktype/util": "0.0.39", + "@arktype/util": "0.0.40", "@latticexyz/common": "workspace:*", "@latticexyz/config": "workspace:*", "@latticexyz/protocol-parser": "workspace:*", diff --git a/packages/world/package.json b/packages/world/package.json index 34942569fe..d094b56fd3 100644 --- a/packages/world/package.json +++ b/packages/world/package.json @@ -54,7 +54,7 @@ "test:ci": "pnpm run test" }, "dependencies": { - "@arktype/util": "0.0.39", + "@arktype/util": "0.0.40", "@latticexyz/common": "workspace:*", "@latticexyz/config": "workspace:*", "@latticexyz/protocol-parser": "workspace:*", diff --git a/packages/world/ts/config/v2/world.ts b/packages/world/ts/config/v2/world.ts index a09069c3df..842600bec8 100644 --- a/packages/world/ts/config/v2/world.ts +++ b/packages/world/ts/config/v2/world.ts @@ -1,4 +1,4 @@ -import { ErrorMessage, conform, narrow, type withExactJsDoc } from "@arktype/util"; +import { ErrorMessage, conform, narrow, type withJsDoc } from "@arktype/util"; import { UserTypes, extendedScope, @@ -53,7 +53,7 @@ export function validateWorld(world: unknown): asserts world is WorldInput { } } -export type resolveWorld = withExactJsDoc< +export type resolveWorld = withJsDoc< resolveStore & mergeIfUndefined< { tables: resolveNamespacedTables } & Omit< diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c36268b0bd..6ffbc483e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -340,8 +340,8 @@ importers: packages/config: dependencies: '@arktype/util': - specifier: 0.0.39 - version: 0.0.39 + specifier: 0.0.40 + version: 0.0.40 '@latticexyz/common': specifier: workspace:* version: link:../common @@ -754,8 +754,8 @@ importers: packages/store: dependencies: '@arktype/util': - specifier: 0.0.39 - version: 0.0.39 + specifier: 0.0.40 + version: 0.0.40 '@latticexyz/common': specifier: workspace:* version: link:../common @@ -1049,8 +1049,8 @@ importers: packages/world: dependencies: '@arktype/util': - specifier: 0.0.39 - version: 0.0.39 + specifier: 0.0.40 + version: 0.0.40 '@latticexyz/common': specifier: workspace:* version: link:../common @@ -1285,8 +1285,8 @@ packages: resolution: {integrity: sha512-IvYMGnkUASJllRk3mdBVgckomKx2LNsDTrWCxz04EBK1OuU+4fJ/smSjxgZVWfopNXZds9sHNxZgTJOIw7GvJw==} dev: true - /@arktype/util@0.0.39: - resolution: {integrity: sha512-wd8czBqQz3scri2T5GM6kH9cdFHpzmDjGf0ER6NxyvZH4dnx/AqC57kBFOWIAj5+idvUgHusWAS1xocaDbtyuA==} + /@arktype/util@0.0.40: + resolution: {integrity: sha512-dwC3xZh9Bz6LWSJq71AUoh06zB0qM65N4zS/NNogbumhbO55yot7yqDlv0qeBMNOWXj/gX7l7l58v0EqEaXN2w==} dev: false /@aws-crypto/ie11-detection@3.0.0: From 139f57bce7e301cd2cf0b76e75f8f8acc77a8a2b Mon Sep 17 00:00:00 2001 From: David Blass Date: Mon, 13 May 2024 17:43:07 -0400 Subject: [PATCH 3/8] fix missing satisfy import --- packages/query/package.json | 1 + packages/query/src/api.ts | 2 +- pnpm-lock.yaml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/query/package.json b/packages/query/package.json index b24bc6a0c8..257e6390d4 100644 --- a/packages/query/package.json +++ b/packages/query/package.json @@ -31,6 +31,7 @@ "test:ci": "pnpm run test" }, "dependencies": { + "@arktype/util": "0.0.40", "@latticexyz/common": "workspace:*", "@latticexyz/config": "workspace:*", "@latticexyz/schema-type": "workspace:*", diff --git a/packages/query/src/api.ts b/packages/query/src/api.ts index 48479801cd..27108ff30a 100644 --- a/packages/query/src/api.ts +++ b/packages/query/src/api.ts @@ -1,6 +1,6 @@ import { Hex } from "viem"; +import { satisfy } from "@arktype/util"; import { StaticPrimitiveType, DynamicPrimitiveType, SchemaAbiType } from "@latticexyz/schema-type/internal"; -import { satisfy } from "@latticexyz/common/type-utils"; import { SchemaToPrimitives } from "@latticexyz/store/internal"; import { Table } from "@latticexyz/config"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ffbc483e1..77f2d10bb6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -576,6 +576,9 @@ importers: packages/query: dependencies: + '@arktype/util': + specifier: 0.0.40 + version: 0.0.40 '@latticexyz/common': specifier: workspace:* version: link:../common From 1068283885bc400643e836fcc9337e57a8b126e3 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Thu, 11 Jul 2024 12:23:29 +0100 Subject: [PATCH 4/8] remove unused workspace deps --- package.json | 2 - pnpm-lock.yaml | 147 ------------------------------------------------- 2 files changed, 149 deletions(-) diff --git a/package.json b/package.json index b6350d9599..dc0100ac15 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,6 @@ "package.json": "pnpm sort-package-json" }, "devDependencies": { - "@arktype/attest": "0.7.5", - "@arktype/util": "0.0.43", "@changesets/cli": "^2.26.1", "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": "7.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7385e1083b..d932a49105 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,12 +8,6 @@ importers: .: devDependencies: - '@arktype/attest': - specifier: 0.7.5 - version: 0.7.5(typescript@5.4.2) - '@arktype/util': - specifier: 0.0.43 - version: 0.0.43 '@changesets/cli': specifier: ^2.26.1 version: 2.26.1 @@ -1196,30 +1190,9 @@ packages: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} - '@arktype/attest@0.7.5': - resolution: {integrity: sha512-ZOF9uqLbvoVO6RHhlByJEBBj5qhWLpaCK/wWa5guD1OQR1/a7JZ9jCrDAcaASt6tYBA3dGhDerXhc7FcDWlRQw==} - hasBin: true - peerDependencies: - typescript: '*' - - '@arktype/fs@0.0.19': - resolution: {integrity: sha512-ZEiSc6DgJANSgMTee9lueumCH/3gIikJWT8wlN8CyVk/IDFKFbJb3/BHj906Aw+APvCc8oyvu+2Hanshkgh4Bg==} - - '@arktype/schema@0.1.2': - resolution: {integrity: sha512-ggvxs5P0toqd/4/XK76URQrtyOYpbYcLhirEZeTso6FxkloPa0lT+whPg7DNQj5qi2OQXLUHBYKMx9DOb13ViQ==} - - '@arktype/util@0.0.38': - resolution: {integrity: sha512-IvYMGnkUASJllRk3mdBVgckomKx2LNsDTrWCxz04EBK1OuU+4fJ/smSjxgZVWfopNXZds9sHNxZgTJOIw7GvJw==} - '@arktype/util@0.0.40': resolution: {integrity: sha512-dwC3xZh9Bz6LWSJq71AUoh06zB0qM65N4zS/NNogbumhbO55yot7yqDlv0qeBMNOWXj/gX7l7l58v0EqEaXN2w==} - '@arktype/util@0.0.41': - resolution: {integrity: sha512-0YURzJ42v+lhlP1t5Dj90YezETRTCdFU0oM4xMVpYsmPx/DHJzr9n7AX1QPAlYWH4wY7hYY3gwai3O+8VntPgw==} - - '@arktype/util@0.0.43': - resolution: {integrity: sha512-tVrvIoghAI/OY6Oc8wo8dpgiZc/a+C8M7NnpSDvfkagAasW9CzLtEbybP1xAALf3A6y5cuJOV6cCcIi9NKQRzA==} - '@aws-crypto/ie11-detection@3.0.0': resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==} @@ -2674,13 +2647,6 @@ packages: resolution: {integrity: sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ==} engines: {node: ^16.0.0 || >=18.0.0} - '@typescript/analyze-trace@0.10.1': - resolution: {integrity: sha512-RnlSOPh14QbopGCApgkSx5UBgGda5MX1cHqp2fsqfiDyCwGL/m1jaeB9fzu7didVS81LQqGZZuxFBcg8YU8EVw==} - hasBin: true - - '@typescript/vfs@1.5.0': - resolution: {integrity: sha512-AJS307bPgbsZZ9ggCT3wwpg3VbTKMFNHfaY/uF0ahSkYYrPF2dSSKDNIDIQAHm9qJqbLvCsSJH7yN4Vs/CsMMg==} - '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -2895,9 +2861,6 @@ packages: arktype@1.0.29-alpha: resolution: {integrity: sha512-glMLgVhIQRSkR3tymiS+POAcWVJH09sfrgic0jHnyFL8BlhHAJZX2BzdImU9zYr1y9NBqy+U93ZNrRTHXsKRDw==} - arktype@2.0.0-dev.11: - resolution: {integrity: sha512-k+WVQoHsHsTyTiVQkO201mxLQxyXHmy3buJW8TXLOkr4X2yOUCp0K1SBscuG9OEJoc8MjpvoIharjPHEkFI7kg==} - array-includes@3.1.6: resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} engines: {node: '>= 0.4'} @@ -3225,9 +3188,6 @@ packages: cliui@6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} - cliui@7.0.4: - resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} - cliui@8.0.1: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} @@ -4729,15 +4689,6 @@ packages: jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} - jsonparse@1.3.1: - resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} - engines: {'0': node >= 0.2.0} - - jsonstream-next@3.0.0: - resolution: {integrity: sha512-aAi6oPhdt7BKyQn1SrIIGZBt0ukKuOUE1qV6kJ3GgioSOYzsRc8z9Hfr1BVmacA/jLe9nARfmgMGgn68BqIAgg==} - engines: {node: '>=10'} - hasBin: true - jsx-ast-utils@3.3.3: resolution: {integrity: sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==} engines: {node: '>=4.0'} @@ -6033,9 +5984,6 @@ packages: spdx-license-ids@3.0.13: resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==} - split2@3.2.2: - resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==} - split2@4.2.0: resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==} engines: {node: '>= 10.x'} @@ -6272,9 +6220,6 @@ packages: through2@2.0.5: resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==} - through2@4.0.2: - resolution: {integrity: sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==} - through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} @@ -6336,10 +6281,6 @@ packages: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true - treeify@1.1.0: - resolution: {integrity: sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==} - engines: {node: '>=0.6'} - trim-newlines@3.0.1: resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==} engines: {node: '>=8'} @@ -6827,10 +6768,6 @@ packages: resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} engines: {node: '>=6'} - yargs-parser@20.2.9: - resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} - engines: {node: '>=10'} - yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -6842,10 +6779,6 @@ packages: resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} engines: {node: '>=8'} - yargs@16.2.0: - resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} - engines: {node: '>=10'} - yargs@17.7.1: resolution: {integrity: sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==} engines: {node: '>=12'} @@ -6900,31 +6833,8 @@ snapshots: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.18 - '@arktype/attest@0.7.5(typescript@5.4.2)': - dependencies: - '@arktype/fs': 0.0.19 - '@arktype/util': 0.0.41 - '@typescript/analyze-trace': 0.10.1 - '@typescript/vfs': 1.5.0 - arktype: 2.0.0-dev.11 - typescript: 5.4.2 - transitivePeerDependencies: - - supports-color - - '@arktype/fs@0.0.19': {} - - '@arktype/schema@0.1.2': - dependencies: - '@arktype/util': 0.0.38 - - '@arktype/util@0.0.38': {} - '@arktype/util@0.0.40': {} - '@arktype/util@0.0.41': {} - - '@arktype/util@0.0.43': {} - '@aws-crypto/ie11-detection@3.0.0': dependencies: tslib: 1.14.1 @@ -9098,23 +9008,6 @@ snapshots: '@typescript-eslint/types': 7.1.1 eslint-visitor-keys: 3.4.3 - '@typescript/analyze-trace@0.10.1': - dependencies: - chalk: 4.1.2 - exit: 0.1.2 - jsonparse: 1.3.1 - jsonstream-next: 3.0.0 - p-limit: 3.1.0 - split2: 3.2.2 - treeify: 1.1.0 - yargs: 16.2.0 - - '@typescript/vfs@1.5.0': - dependencies: - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - '@ungap/structured-clone@1.2.0': {} '@viem/anvil@0.0.7(debug@4.3.4)': @@ -9311,11 +9204,6 @@ snapshots: arktype@1.0.29-alpha: {} - arktype@2.0.0-dev.11: - dependencies: - '@arktype/schema': 0.1.2 - '@arktype/util': 0.0.38 - array-includes@3.1.6: dependencies: call-bind: 1.0.2 @@ -9720,12 +9608,6 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 6.2.0 - cliui@7.0.4: - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - cliui@8.0.1: dependencies: string-width: 4.2.3 @@ -11594,13 +11476,6 @@ snapshots: optionalDependencies: graceful-fs: 4.2.11 - jsonparse@1.3.1: {} - - jsonstream-next@3.0.0: - dependencies: - jsonparse: 1.3.1 - through2: 4.0.2 - jsx-ast-utils@3.3.3: dependencies: array-includes: 3.1.6 @@ -12934,10 +12809,6 @@ snapshots: spdx-license-ids@3.0.13: {} - split2@3.2.2: - dependencies: - readable-stream: 3.6.0 - split2@4.2.0: {} sprintf-js@1.0.3: {} @@ -13221,10 +13092,6 @@ snapshots: readable-stream: 2.3.8 xtend: 4.0.2 - through2@4.0.2: - dependencies: - readable-stream: 3.6.0 - through@2.3.8: {} timers-ext@0.1.7: @@ -13275,8 +13142,6 @@ snapshots: tree-kill@1.2.2: {} - treeify@1.1.0: {} - trim-newlines@3.0.1: {} trpc-koa-adapter@1.1.3(@trpc/server@10.34.0)(koa@2.14.2): @@ -13728,8 +13593,6 @@ snapshots: camelcase: 5.3.1 decamelize: 1.2.0 - yargs-parser@20.2.9: {} - yargs-parser@21.1.1: {} yargs@14.2.3: @@ -13760,16 +13623,6 @@ snapshots: y18n: 4.0.3 yargs-parser: 18.1.3 - yargs@16.2.0: - dependencies: - cliui: 7.0.4 - escalade: 3.1.2 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 20.2.9 - yargs@17.7.1: dependencies: cliui: 8.0.1 From 8dac1c49ef01f757c4dcc07a2ac3f8371626aa4a Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Thu, 11 Jul 2024 04:25:06 -0700 Subject: [PATCH 5/8] Create ninety-mirrors-pretend.md --- .changeset/ninety-mirrors-pretend.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ninety-mirrors-pretend.md diff --git a/.changeset/ninety-mirrors-pretend.md b/.changeset/ninety-mirrors-pretend.md new file mode 100644 index 0000000000..c19441bf20 --- /dev/null +++ b/.changeset/ninety-mirrors-pretend.md @@ -0,0 +1,5 @@ +--- +"@latticexyz/common": patch +--- + +Removed `evaluate` and `satisfy` type utils in favor of `show` and `satisfy` from `@arktype/util`. From 817aa9f4af4bc236a7430f8822407a2f0634b09f Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Thu, 11 Jul 2024 04:27:06 -0700 Subject: [PATCH 6/8] Create good-rice-bathe.md --- .changeset/good-rice-bathe.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/good-rice-bathe.md diff --git a/.changeset/good-rice-bathe.md b/.changeset/good-rice-bathe.md new file mode 100644 index 0000000000..1016ac7f1b --- /dev/null +++ b/.changeset/good-rice-bathe.md @@ -0,0 +1,8 @@ +--- +"@latticexyz/config": patch +"@latticexyz/query": patch +"@latticexyz/store": patch +"@latticexyz/world": patch +--- + +Bumped `@arktype/util` and moved `evaluate`/`satisfy` usages to its `show`/`satisfy` helpers. From 8cf59917f0da83cf6e50325144b707f07c85ac16 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Thu, 11 Jul 2024 12:30:04 +0100 Subject: [PATCH 7/8] fix store reference --- packages/store/ts/config/v2/store.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/store/ts/config/v2/store.ts b/packages/store/ts/config/v2/store.ts index 1337a38286..7f7fe8cff8 100644 --- a/packages/store/ts/config/v2/store.ts +++ b/packages/store/ts/config/v2/store.ts @@ -1,4 +1,4 @@ -import { ErrorMessage, evaluate, flatMorph, narrow } from "@arktype/util"; +import { ErrorMessage, show, flatMorph, narrow } from "@arktype/util"; import { get, hasOwnKey, mergeIfUndefined } from "./generics"; import { UserTypes } from "./output"; import { CONFIG_DEFAULTS } from "./defaults"; @@ -59,8 +59,8 @@ export type resolveStore = { > : {}; readonly userTypes: "userTypes" extends keyof store ? store["userTypes"] : {}; - readonly enums: "enums" extends keyof store ? evaluate> : {}; - readonly enumValues: "enums" extends keyof store ? evaluate> : {}; + readonly enums: "enums" extends keyof store ? show> : {}; + readonly enumValues: "enums" extends keyof store ? show> : {}; readonly namespace: "namespace" extends keyof store ? store["namespace"] : CONFIG_DEFAULTS["namespace"]; readonly codegen: "codegen" extends keyof store ? resolveCodegen : resolveCodegen<{}>; }; From e9db3c47f7a485e476069e381bbf1e264f945792 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Thu, 11 Jul 2024 12:32:16 +0100 Subject: [PATCH 8/8] add missing deps --- packages/store/package.json | 1 + packages/world/package.json | 1 + pnpm-lock.yaml | 142 ++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/packages/store/package.json b/packages/store/package.json index 660238b3b3..6d0df9bd52 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -78,6 +78,7 @@ "zod": "^3.22.2" }, "devDependencies": { + "@arktype/attest": "0.7.5", "@latticexyz/abi-ts": "workspace:*", "@latticexyz/gas-report": "workspace:*", "@types/ejs": "^3.1.1", diff --git a/packages/world/package.json b/packages/world/package.json index 05f2047893..0b7ce19f61 100644 --- a/packages/world/package.json +++ b/packages/world/package.json @@ -75,6 +75,7 @@ "zod": "^3.22.2" }, "devDependencies": { + "@arktype/attest": "0.7.5", "@latticexyz/abi-ts": "workspace:*", "@latticexyz/gas-report": "workspace:*", "@types/ejs": "^3.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d932a49105..38b03accc0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -738,6 +738,9 @@ importers: specifier: ^3.22.2 version: 3.23.7 devDependencies: + '@arktype/attest': + specifier: 0.7.5 + version: 0.7.5(typescript@5.4.2) '@latticexyz/abi-ts': specifier: workspace:* version: link:../abi-ts @@ -1039,6 +1042,9 @@ importers: specifier: ^3.22.2 version: 3.23.7 devDependencies: + '@arktype/attest': + specifier: 0.7.5 + version: 0.7.5(typescript@5.4.2) '@latticexyz/abi-ts': specifier: workspace:* version: link:../abi-ts @@ -1190,9 +1196,27 @@ packages: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} + '@arktype/attest@0.7.5': + resolution: {integrity: sha512-ZOF9uqLbvoVO6RHhlByJEBBj5qhWLpaCK/wWa5guD1OQR1/a7JZ9jCrDAcaASt6tYBA3dGhDerXhc7FcDWlRQw==} + hasBin: true + peerDependencies: + typescript: '*' + + '@arktype/fs@0.0.19': + resolution: {integrity: sha512-ZEiSc6DgJANSgMTee9lueumCH/3gIikJWT8wlN8CyVk/IDFKFbJb3/BHj906Aw+APvCc8oyvu+2Hanshkgh4Bg==} + + '@arktype/schema@0.1.2': + resolution: {integrity: sha512-ggvxs5P0toqd/4/XK76URQrtyOYpbYcLhirEZeTso6FxkloPa0lT+whPg7DNQj5qi2OQXLUHBYKMx9DOb13ViQ==} + + '@arktype/util@0.0.38': + resolution: {integrity: sha512-IvYMGnkUASJllRk3mdBVgckomKx2LNsDTrWCxz04EBK1OuU+4fJ/smSjxgZVWfopNXZds9sHNxZgTJOIw7GvJw==} + '@arktype/util@0.0.40': resolution: {integrity: sha512-dwC3xZh9Bz6LWSJq71AUoh06zB0qM65N4zS/NNogbumhbO55yot7yqDlv0qeBMNOWXj/gX7l7l58v0EqEaXN2w==} + '@arktype/util@0.0.41': + resolution: {integrity: sha512-0YURzJ42v+lhlP1t5Dj90YezETRTCdFU0oM4xMVpYsmPx/DHJzr9n7AX1QPAlYWH4wY7hYY3gwai3O+8VntPgw==} + '@aws-crypto/ie11-detection@3.0.0': resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==} @@ -2647,6 +2671,13 @@ packages: resolution: {integrity: sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ==} engines: {node: ^16.0.0 || >=18.0.0} + '@typescript/analyze-trace@0.10.1': + resolution: {integrity: sha512-RnlSOPh14QbopGCApgkSx5UBgGda5MX1cHqp2fsqfiDyCwGL/m1jaeB9fzu7didVS81LQqGZZuxFBcg8YU8EVw==} + hasBin: true + + '@typescript/vfs@1.5.0': + resolution: {integrity: sha512-AJS307bPgbsZZ9ggCT3wwpg3VbTKMFNHfaY/uF0ahSkYYrPF2dSSKDNIDIQAHm9qJqbLvCsSJH7yN4Vs/CsMMg==} + '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -2861,6 +2892,9 @@ packages: arktype@1.0.29-alpha: resolution: {integrity: sha512-glMLgVhIQRSkR3tymiS+POAcWVJH09sfrgic0jHnyFL8BlhHAJZX2BzdImU9zYr1y9NBqy+U93ZNrRTHXsKRDw==} + arktype@2.0.0-dev.11: + resolution: {integrity: sha512-k+WVQoHsHsTyTiVQkO201mxLQxyXHmy3buJW8TXLOkr4X2yOUCp0K1SBscuG9OEJoc8MjpvoIharjPHEkFI7kg==} + array-includes@3.1.6: resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} engines: {node: '>= 0.4'} @@ -3188,6 +3222,9 @@ packages: cliui@6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} + cliui@7.0.4: + resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} + cliui@8.0.1: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} @@ -4689,6 +4726,15 @@ packages: jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} + jsonparse@1.3.1: + resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} + engines: {'0': node >= 0.2.0} + + jsonstream-next@3.0.0: + resolution: {integrity: sha512-aAi6oPhdt7BKyQn1SrIIGZBt0ukKuOUE1qV6kJ3GgioSOYzsRc8z9Hfr1BVmacA/jLe9nARfmgMGgn68BqIAgg==} + engines: {node: '>=10'} + hasBin: true + jsx-ast-utils@3.3.3: resolution: {integrity: sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==} engines: {node: '>=4.0'} @@ -5984,6 +6030,9 @@ packages: spdx-license-ids@3.0.13: resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==} + split2@3.2.2: + resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==} + split2@4.2.0: resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==} engines: {node: '>= 10.x'} @@ -6220,6 +6269,9 @@ packages: through2@2.0.5: resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==} + through2@4.0.2: + resolution: {integrity: sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==} + through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} @@ -6281,6 +6333,10 @@ packages: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true + treeify@1.1.0: + resolution: {integrity: sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==} + engines: {node: '>=0.6'} + trim-newlines@3.0.1: resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==} engines: {node: '>=8'} @@ -6768,6 +6824,10 @@ packages: resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} engines: {node: '>=6'} + yargs-parser@20.2.9: + resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} + engines: {node: '>=10'} + yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -6779,6 +6839,10 @@ packages: resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} engines: {node: '>=8'} + yargs@16.2.0: + resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} + engines: {node: '>=10'} + yargs@17.7.1: resolution: {integrity: sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==} engines: {node: '>=12'} @@ -6833,8 +6897,29 @@ snapshots: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.18 + '@arktype/attest@0.7.5(typescript@5.4.2)': + dependencies: + '@arktype/fs': 0.0.19 + '@arktype/util': 0.0.41 + '@typescript/analyze-trace': 0.10.1 + '@typescript/vfs': 1.5.0 + arktype: 2.0.0-dev.11 + typescript: 5.4.2 + transitivePeerDependencies: + - supports-color + + '@arktype/fs@0.0.19': {} + + '@arktype/schema@0.1.2': + dependencies: + '@arktype/util': 0.0.38 + + '@arktype/util@0.0.38': {} + '@arktype/util@0.0.40': {} + '@arktype/util@0.0.41': {} + '@aws-crypto/ie11-detection@3.0.0': dependencies: tslib: 1.14.1 @@ -9008,6 +9093,23 @@ snapshots: '@typescript-eslint/types': 7.1.1 eslint-visitor-keys: 3.4.3 + '@typescript/analyze-trace@0.10.1': + dependencies: + chalk: 4.1.2 + exit: 0.1.2 + jsonparse: 1.3.1 + jsonstream-next: 3.0.0 + p-limit: 3.1.0 + split2: 3.2.2 + treeify: 1.1.0 + yargs: 16.2.0 + + '@typescript/vfs@1.5.0': + dependencies: + debug: 4.3.4 + transitivePeerDependencies: + - supports-color + '@ungap/structured-clone@1.2.0': {} '@viem/anvil@0.0.7(debug@4.3.4)': @@ -9204,6 +9306,11 @@ snapshots: arktype@1.0.29-alpha: {} + arktype@2.0.0-dev.11: + dependencies: + '@arktype/schema': 0.1.2 + '@arktype/util': 0.0.38 + array-includes@3.1.6: dependencies: call-bind: 1.0.2 @@ -9608,6 +9715,12 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 6.2.0 + cliui@7.0.4: + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + cliui@8.0.1: dependencies: string-width: 4.2.3 @@ -11476,6 +11589,13 @@ snapshots: optionalDependencies: graceful-fs: 4.2.11 + jsonparse@1.3.1: {} + + jsonstream-next@3.0.0: + dependencies: + jsonparse: 1.3.1 + through2: 4.0.2 + jsx-ast-utils@3.3.3: dependencies: array-includes: 3.1.6 @@ -12809,6 +12929,10 @@ snapshots: spdx-license-ids@3.0.13: {} + split2@3.2.2: + dependencies: + readable-stream: 3.6.0 + split2@4.2.0: {} sprintf-js@1.0.3: {} @@ -13092,6 +13216,10 @@ snapshots: readable-stream: 2.3.8 xtend: 4.0.2 + through2@4.0.2: + dependencies: + readable-stream: 3.6.0 + through@2.3.8: {} timers-ext@0.1.7: @@ -13142,6 +13270,8 @@ snapshots: tree-kill@1.2.2: {} + treeify@1.1.0: {} + trim-newlines@3.0.1: {} trpc-koa-adapter@1.1.3(@trpc/server@10.34.0)(koa@2.14.2): @@ -13593,6 +13723,8 @@ snapshots: camelcase: 5.3.1 decamelize: 1.2.0 + yargs-parser@20.2.9: {} + yargs-parser@21.1.1: {} yargs@14.2.3: @@ -13623,6 +13755,16 @@ snapshots: y18n: 4.0.3 yargs-parser: 18.1.3 + yargs@16.2.0: + dependencies: + cliui: 7.0.4 + escalade: 3.1.2 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 20.2.9 + yargs@17.7.1: dependencies: cliui: 8.0.1