test: improve type benches with baseline + .ts files, avoiding build (#…

…2988)

package.json

@@ -29,6 +29,7 @@
     "sort-package-json": "npx sort-package-json package.json 'packages/*/package.json' 'templates/*/package.json' 'templates/*/packages/*/package.json' 'examples/*/package.json' 'examples/*/packages/*/package.json' 'e2e/*/package.json' 'e2e/*/packages/*/package.json' 'docs/package.json' 'test/*/package.json'",
     "test": "pnpm run --recursive test",
     "test:ci": "pnpm run --recursive --parallel test:ci",
+    "type-bench": "pnpm --filter ./test/ts-benchmarks bench",
     "type-stats-repo": "attest stats packages/*"
   },
   "lint-staged": {
@@ -37,7 +38,7 @@
     "package.json": "pnpm sort-package-json"
   },
   "devDependencies": {
-    "@arktype/attest": "0.7.5",
+    "@ark/attest": "0.10.2",
     "@changesets/cli": "^2.27.7",
     "@types/node": "^18.15.11",
     "@typescript-eslint/eslint-plugin": "7.1.1",
@@ -56,9 +57,9 @@
     "turbo": "^1.9.3",
     "typescript": "5.4.2"
   },
-  "packageManager": "pnpm@9.1.1",
+  "packageManager": "pnpm@9.6.0",
   "engines": {
     "node": "^18.20.1",
-    "pnpm": "^9.1.1"
+    "pnpm": "^9.6.0"
   }
 }

packages/config/package.json

@@ -40,7 +40,7 @@
     "test:ci": "pnpm run test"
   },
   "dependencies": {
-    "@arktype/util": "0.0.40",
+    "@ark/util": "catalog:",
     "@latticexyz/common": "workspace:*",
     "@latticexyz/schema-type": "workspace:*",
     "esbuild": "^0.17.15",

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 "@arktype/util";
+import { satisfy } from "@ark/util";
 
 /**
  * Common output types of a MUD config. We use these types as inputs for libraries.

packages/query/package.json

@@ -34,7 +34,7 @@
     "test:ci": "pnpm run test"
   },
   "dependencies": {
-    "@arktype/util": "0.0.40",
+    "@ark/util": "catalog:",
     "@latticexyz/common": "workspace:*",
     "@latticexyz/config": "workspace:*",
     "@latticexyz/schema-type": "workspace:*",

packages/query/src/api.ts

@@ -1,5 +1,5 @@
 import { Hex } from "viem";
-import { satisfy } from "@arktype/util";
+import { satisfy } from "@ark/util";
 import { StaticPrimitiveType, DynamicPrimitiveType, SchemaAbiType } from "@latticexyz/schema-type/internal";
 import { SchemaToPrimitives } from "@latticexyz/store/internal";
 import { Table } from "@latticexyz/config";

packages/store-sync/package.json

@@ -62,7 +62,7 @@
     "test:ci": "vitest --run"
   },
   "dependencies": {
-    "@arktype/util": "0.1.0",
+    "@ark/util": "catalog:",
     "@latticexyz/block-logs-stream": "workspace:*",
     "@latticexyz/common": "workspace:*",
     "@latticexyz/config": "workspace:*",

packages/store-sync/src/common.test.ts

@@ -1,6 +1,6 @@
 import { describe, it } from "vitest";
-import { attest } from "@arktype/attest";
-import { isDisjoint } from "@arktype/util";
+import { attest } from "@ark/attest";
+import { isDisjoint } from "@ark/util";
 import storeConfig from "@latticexyz/store/mud.config";
 import worldConfig from "@latticexyz/world/mud.config";
 import { configToTables } from "./configToTables";

packages/store-sync/src/configToTables.test.ts

@@ -2,7 +2,7 @@ import { describe, it } from "vitest";
 import { configToTables } from "./configToTables";
 import { defineWorld } from "@latticexyz/world";
 import { resourceToHex } from "@latticexyz/common";
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 
 describe("configToTables", () => {
   it("flattens tables from single namespace", async () => {

packages/store-sync/src/configToTables.ts

@@ -1,4 +1,4 @@
-import { show } from "@arktype/util";
+import { show } from "@ark/util";
 import { Store } from "@latticexyz/store";
 
 type flattenedTableKeys<config extends Store> = config extends { readonly namespaces: infer namespaces }

packages/store-sync/src/recs/createStorageAdapter.ts

@@ -12,7 +12,7 @@ import { hexKeyTupleToEntity } from "./hexKeyTupleToEntity";
 import { StorageAdapter, StorageAdapterBlock } from "../common";
 import { singletonEntity } from "./singletonEntity";
 import { tablesToComponents } from "./tablesToComponents";
-import { merge } from "@arktype/util";
+import { merge } from "@ark/util";
 
 export type CreateStorageAdapterOptions<tables extends Tables> = {
   world: RecsWorld;

packages/store-sync/src/recs/syncToRecs.ts

@@ -7,9 +7,12 @@ import { createStoreSync } from "../createStoreSync";
 import { singletonEntity } from "./singletonEntity";
 import { SyncStep } from "../SyncStep";
 import { configToTables } from "../configToTables";
-import { merge } from "@arktype/util";
+import { merge } from "@ark/util";
 
-export type SyncToRecsOptions<config extends StoreConfig, extraTables extends Tables> = Omit<SyncOptions, "config"> & {
+export type SyncToRecsOptions<config extends StoreConfig = StoreConfig, extraTables extends Tables = Tables> = Omit<
+  SyncOptions,
+  "config"
+> & {
   world: RecsWorld;
   config: config;
   tables?: extraTables;

packages/store-sync/src/recs/tablesToComponents.ts

@@ -1,7 +1,7 @@
 import { Tables } from "@latticexyz/config";
 import { tableToComponent } from "./tableToComponent";
 import { World } from "@latticexyz/recs";
-import { show } from "@arktype/util";
+import { show } from "@ark/util";
 
 export type tablesToComponents<tables extends Tables> = {
   [label in keyof tables as tables[label]["label"]]: tableToComponent<tables[label]>;

packages/store-sync/src/zustand/syncToZustand.ts

@@ -7,7 +7,7 @@ import { Address } from "viem";
 import { SyncStep } from "../SyncStep";
 import { Store as StoreConfig } from "@latticexyz/store";
 import { Tables } from "@latticexyz/config";
-import { merge } from "@arktype/util";
+import { merge } from "@ark/util";
 import { configToTables } from "../configToTables";
 
 export type SyncToZustandOptions<config extends StoreConfig, extraTables extends Tables> = Omit<

packages/store-sync/vitestSetup.ts

@@ -1 +1 @@
-export { setup, cleanup as teardown } from "@arktype/attest";
+export { setup, cleanup as teardown } from "@ark/attest";

packages/store/package.json

@@ -59,7 +59,7 @@
     "test:ci": "pnpm run test"
   },
   "dependencies": {
-    "@arktype/util": "0.0.40",
+    "@ark/util": "catalog:",
     "@latticexyz/common": "workspace:*",
     "@latticexyz/config": "workspace:*",
     "@latticexyz/protocol-parser": "workspace:*",
@@ -69,7 +69,6 @@
     "viem": "2.9.20"
   },
   "devDependencies": {
-    "@arktype/attest": "0.7.5",
     "@latticexyz/abi-ts": "workspace:*",
     "@latticexyz/gas-report": "workspace:*",
     "@types/ejs": "^3.1.1",

packages/store/ts/config/v2/enums.ts

@@ -1,4 +1,4 @@
-import { flatMorph } from "@arktype/util";
+import { flatMorph } from "@ark/util";
 import { EnumsInput } from "./input";
 import { AbiTypeScope, extendScope } from "./scope";
 import { parseNumber } from "./generics";

packages/store/ts/config/v2/flattenNamespacedTables.ts

@@ -1,4 +1,4 @@
-import { show } from "@arktype/util";
+import { show } from "@ark/util";
 import { Namespaces } from "./output";
 
 type flattenNamespacedTableKeys<config> = config extends {

packages/store/ts/config/v2/namespace.ts

@@ -1,4 +1,4 @@
-import { ErrorMessage, flatMorph } from "@arktype/util";
+import { ErrorMessage, flatMorph } from "@ark/util";
 import { hasOwnKey, mergeIfUndefined } from "./generics";
 import { NamespaceInput } from "./input";
 import { resolveTables, validateTables } from "./tables";

packages/store/ts/config/v2/namespaces.test.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "vitest";
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 import { defineNamespaces } from "./namespaces";
 
 describe("defineNamespaces", () => {

packages/store/ts/config/v2/namespaces.ts

@@ -1,4 +1,4 @@
-import { show, flatMorph } from "@arktype/util";
+import { show, flatMorph } from "@ark/util";
 import { isObject, mergeIfUndefined } from "./generics";
 import { NamespacesInput } from "./input";
 import { AbiTypeScope, Scope } from "./scope";

packages/store/ts/config/v2/output.ts

@@ -1,4 +1,4 @@
-import { show } from "@arktype/util";
+import { show } from "@ark/util";
 import { AbiType, Schema, Table as BaseTable } from "@latticexyz/config";
 import { EnumsInput } from "./input";
 

packages/store/ts/config/v2/schema.test.ts

@@ -2,7 +2,7 @@ import { describe, it } from "vitest";
 import { defineSchema } from "./schema";
 import { Schema } from "./output";
 import { extendScope, AbiTypeScope } from "./scope";
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 
 describe("resolveSchema", () => {
   it("should map user types to their primitive type", () => {
@@ -19,11 +19,16 @@ describe("resolveSchema", () => {
       },
     } as const;
 
-    attest<typeof expected>(resolved)
-      .equals(expected)
-      .type.toString.snap(
-        '{ readonly regular: { readonly type: "uint256"; readonly internalType: "uint256"; }; readonly user: { readonly type: "address"; readonly internalType: "CustomType"; }; }',
-      );
+    attest<typeof expected>(resolved).equals(expected).type.toString.snap(`{
+	readonly regular: {
+		readonly type: "uint256"
+		readonly internalType: "uint256"
+	}
+	readonly user: {
+		readonly type: "address"
+		readonly internalType: "CustomType"
+	}
+}`);
   });
 
   it("should throw if a type is not part of the scope", () => {
@@ -57,8 +62,11 @@ describe("resolveSchema", () => {
       },
     } as const;
 
-    attest<typeof expected>(resolved)
-      .equals(expected)
-      .type.toString.snap('{ readonly coordinate: { readonly type: "int32[]"; readonly internalType: "int32[2]"; }; }');
+    attest<typeof expected>(resolved).equals(expected).type.toString.snap(`{
+	readonly coordinate: {
+		readonly type: "int32[]"
+		readonly internalType: "int32[2]"
+	}
+}`);
   });
 });

packages/store/ts/config/v2/schema.ts

@@ -1,4 +1,4 @@
-import { conform, show } from "@arktype/util";
+import { conform, show } from "@ark/util";
 import { AbiTypeScope, Scope } from "./scope";
 import { hasOwnKey, isObject } from "./generics";
 import { SchemaInput } from "./input";

packages/store/ts/config/v2/scope.test.ts

@@ -1,20 +1,25 @@
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 import { describe, it } from "vitest";
 import { AbiTypeScope, Scope, ScopeOptions, extendScope, getStaticAbiTypeKeys } from "./scope";
 
 describe("extendScope", () => {
   it("should extend the provided scope", () => {
     const extendedScope = extendScope(Scope, { static: "uint256", dynamic: "string" });
     attest<ScopeOptions<{ static: "uint256"; dynamic: "string" }>>(extendedScope).type.toString.snap(
-      '{ types: { static: "uint256"; dynamic: "string"; }; }',
+      '{ types: { static: "uint256"; dynamic: "string" } }',
     );
 
     const furtherExtendedScope = extendScope(extendedScope, { static2: "uint256", dynamic2: "string" });
     attest<ScopeOptions<{ static: "uint256"; dynamic: "string"; static2: "uint256"; dynamic2: "string" }>>(
       furtherExtendedScope,
-    ).type.toString.snap(
-      '{ types: { static: "uint256"; dynamic: "string"; static2: "uint256"; dynamic2: "string"; }; }',
-    );
+    ).type.toString.snap(`{
+	types: {
+		static: "uint256"
+		dynamic: "string"
+		static2: "uint256"
+		dynamic2: "string"
+	}
+}`);
   });
 });
 

packages/store/ts/config/v2/scope.ts

@@ -1,4 +1,4 @@
-import { Dict, show } from "@arktype/util";
+import { Dict, show } from "@ark/util";
 import { SchemaInput } from "./input";
 import { StaticAbiType, schemaAbiTypes } from "@latticexyz/schema-type/internal";
 import { AbiType } from "./output";

packages/store/ts/config/v2/store.test.ts

@@ -1,9 +1,9 @@
 import { describe, it } from "vitest";
 import { defineStore } from "./store";
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 import { resourceToHex } from "@latticexyz/common";
 import { Store } from "./output";
-import { satisfy } from "@arktype/util";
+import { satisfy } from "@ark/util";
 import { Hex } from "viem";
 
 describe("defineStore", () => {

packages/store/ts/config/v2/store.ts

@@ -1,4 +1,4 @@
-import { ErrorMessage, show, narrow } from "@arktype/util";
+import { ErrorMessage, show, narrow } from "@ark/util";
 import { get, hasOwnKey } from "./generics";
 import { UserTypes } from "./output";
 import { CONFIG_DEFAULTS } from "./defaults";

packages/store/ts/config/v2/table.test.ts

@@ -1,4 +1,4 @@
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 import { describe, it } from "vitest";
 import { getStaticAbiTypeKeys, AbiTypeScope, extendScope } from "./scope";
 import { validateKeys, defineTable } from "./table";

packages/store/ts/config/v2/table.ts

@@ -1,4 +1,4 @@
-import { ErrorMessage, conform, show, narrow, requiredKeyOf } from "@arktype/util";
+import { ErrorMessage, conform, show, narrow, requiredKeyOf } from "@ark/util";
 import { isStaticAbiType } from "@latticexyz/schema-type/internal";
 import { Hex } from "viem";
 import { get, hasOwnKey, mergeIfUndefined } from "./generics";

packages/store/ts/config/v2/tableShorthand.test.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "vitest";
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 import { AbiTypeScope, extendScope } from "./scope";
 import { NoStaticKeyFieldError, defineTableShorthand } from "./tableShorthand";
 

packages/store/ts/config/v2/tableShorthand.ts

@@ -3,7 +3,7 @@ import { hasOwnKey, isObject } from "./generics";
 import { SchemaInput, ScopedSchemaInput, TableShorthandInput } from "./input";
 import { isSchemaInput } from "./schema";
 import { AbiTypeScope, Scope, getStaticAbiTypeKeys } from "./scope";
-import { ErrorMessage, conform } from "@arktype/util";
+import { ErrorMessage, conform } from "@ark/util";
 
 export const NoStaticKeyFieldError =
   "Invalid schema. Expected an `id` field with a static ABI type or an explicit `key` option.";

packages/store/ts/config/v2/tables.test.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "vitest";
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 import { AbiTypeScope, extendScope } from "./scope";
 import { defineTables, validateTables } from "./tables";
 

packages/store/ts/config/v2/tables.ts

@@ -1,4 +1,4 @@
-import { ErrorMessage, show } from "@arktype/util";
+import { ErrorMessage, show } from "@ark/util";
 import { isObject, mergeIfUndefined } from "./generics";
 import { TableShorthandInput, TablesInput } from "./input";
 import { Scope, AbiTypeScope } from "./scope";

packages/store/vitestSetup.ts

@@ -1 +1 @@
-export { setup, cleanup as teardown } from "@arktype/attest";
+export { setup, cleanup as teardown } from "@ark/attest";

packages/world/package.json

@@ -59,7 +59,7 @@
     "test:ci": "pnpm run test"
   },
   "dependencies": {
-    "@arktype/util": "0.0.40",
+    "@ark/util": "catalog:",
     "@latticexyz/common": "workspace:*",
     "@latticexyz/config": "workspace:*",
     "@latticexyz/protocol-parser": "workspace:*",
@@ -70,7 +70,6 @@
     "viem": "2.9.20"
   },
   "devDependencies": {
-    "@arktype/attest": "0.7.5",
     "@latticexyz/abi-ts": "workspace:*",
     "@latticexyz/gas-report": "workspace:*",
     "@types/ejs": "^3.1.1",

packages/world/ts/config/v2/namespaces.ts

@@ -1,4 +1,4 @@
-import { show, flatMorph } from "@arktype/util";
+import { show, flatMorph } from "@ark/util";
 import { NamespacesInput } from "./input";
 import { validateNamespace, resolveNamespace } from "./namespace";
 import { groupBy } from "@latticexyz/common/utils";

packages/world/ts/config/v2/system.test.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "vitest";
-import { attest } from "@arktype/attest";
+import { attest } from "@ark/attest";
 import { resourceToHex } from "@latticexyz/common";
 import { defineSystem } from "./system";
 import { SYSTEM_DEFAULTS } from "./defaults";

packages/world/ts/config/v2/system.ts

@@ -1,7 +1,7 @@
 import { SYSTEM_DEFAULTS } from "./defaults";
 import { SystemInput } from "./input";
 import { hasOwnKey, mergeIfUndefined } from "@latticexyz/store/config/v2";
-import { ErrorMessage, narrow, requiredKeyOf } from "@arktype/util";
+import { ErrorMessage, narrow, requiredKeyOf } from "@ark/util";
 import { Hex } from "viem";
 import { resourceToHex } from "@latticexyz/common";
 

packages/world/ts/config/v2/systems.ts

@@ -1,4 +1,4 @@
-import { ErrorMessage } from "@arktype/util";
+import { ErrorMessage } from "@ark/util";
 import { isObject } from "@latticexyz/store/config/v2";
 import { SystemsInput } from "./input";
 import { resolveSystem, validateSystem } from "./system";