arktypeio · ssalbdivad · Nov 9, 2024 · Nov 8, 2024 · Nov 9, 2024 · Nov 9, 2024
diff --git a/ark/attest/__tests__/unwrap.test.ts b/ark/attest/__tests__/unwrap.test.ts
@@ -0,0 +1,15 @@
+import { attest, contextualize } from "@ark/attest"
+
+contextualize(() => {
+	it("unwraps unversioned", () => {
+		attest(attest({ foo: "bar" }).unwrap()).equals({
+			foo: "bar"
+		})
+	})
+
+	it("unwraps serialized", () => {
+		attest(
+			attest({ foo: Symbol("unwrappedSymbol") }).unwrap({ serialize: true })
+		).snap({ foo: "Symbol(unwrappedSymbol)" })
+	})
+})
diff --git a/ark/attest/assert/attest.ts b/ark/attest/assert/attest.ts
@@ -8,7 +8,11 @@ import {
 	type VersionedTypeAssertion
 } from "../cache/getCachedAssertions.ts"
 import { getConfig, type AttestConfig } from "../config.ts"
-import { assertEquals, typeEqualityMapping } from "./assertions.ts"
+import {
+	assertEquals,
+	typeEqualityMapping,
+	type TypeAssertionMapping
+} from "./assertions.ts"
 import {
 	ChainableAssertions,
 	type AssertionKind,
@@ -29,8 +33,10 @@ export type AttestFn = {
 	instantiations: (count?: Measure<"instantiations"> | undefined) => void
 }
 
+export type VersionableActual = {} | null | undefined | TypeAssertionMapping
+
 export type AssertionContext = {
-	actual: unknown
+	versionableActual: VersionableActual
 	originalAssertedValue: unknown
 	cfg: AttestConfig
 	allowRegex: boolean
@@ -54,7 +60,7 @@ export const attestInternal = (
 	const position = caller()
 	const cfg = { ...getConfig(), ...cfgHooks }
 	const ctx: AssertionContext = {
-		actual: value,
+		versionableActual: value,
 		allowRegex: false,
 		originalAssertedValue: value,
 		position,

diff --git a/ark/attest/assert/chainableAssertions.ts b/ark/attest/assert/chainableAssertions.ts
@@ -22,7 +22,7 @@ import {
 	getThrownMessage,
 	throwAssertionError
 } from "./assertions.ts"
-import type { AssertionContext } from "./attest.ts"
+import type { AssertionContext, VersionableActual } from "./attest.ts"
 
 export type ChainableAssertionOptions = {
 	allowRegex?: boolean
@@ -31,29 +31,40 @@ export type ChainableAssertionOptions = {
 
 type AssertionRecord = Record<keyof rootAssertions<any, AssertionKind>, unknown>
 
+export type UnwrapOptions = {
+	versionable?: boolean
+	serialize?: boolean
+}
+
 export class ChainableAssertions implements AssertionRecord {
 	private ctx: AssertionContext
 
 	constructor(ctx: AssertionContext) {
 		this.ctx = ctx
 	}
 
-	private serialize(value: unknown) {
-		return snapshot(value)
-	}
-
-	private get unversionedActual() {
-		if (this.ctx.actual instanceof TypeAssertionMapping) {
-			return this.ctx.actual.fn(
+	private get unversionedActual(): unknown {
+		if (this.versionableActual instanceof TypeAssertionMapping) {
+			return this.versionableActual.fn(
 				this.ctx.typeRelationshipAssertionEntries![0][1],
 				this.ctx
 			)!.actual
 		}
-		return this.ctx.actual
+		return this.versionableActual
+	}
+
+	private get versionableActual(): VersionableActual {
+		return this.ctx.versionableActual
+	}
+
+	private get serializedActual(): unknown {
+		return snapshot(this.unversionedActual)
 	}
 
-	private get serializedActual() {
-		return this.serialize(this.unversionedActual)
+	unwrap(opts?: UnwrapOptions): unknown {
+		const value =
+			opts?.versionable ? this.versionableActual : this.unversionedActual
+		return opts?.serialize ? snapshot(value) : value
 	}
 
 	private snapRequiresUpdate(expectedSerialized: unknown) {
@@ -75,22 +86,25 @@ export class ChainableAssertions implements AssertionRecord {
 	}
 
 	equals(expected: unknown): this {
-		assertEquals(expected, this.ctx.actual, this.ctx)
+		assertEquals(expected, this.versionableActual, this.ctx)
 		return this
 	}
 
 	satisfies(def: unknown): this {
-		assertSatisfies(type.raw(def), this.ctx.actual, this.ctx)
+		assertSatisfies(type.raw(def), this.versionableActual, this.ctx)
 		return this
 	}
 
 	instanceOf(expected: Constructor): this {
-		if (!(this.ctx.actual instanceof expected)) {
+		if (!(this.versionableActual instanceof expected)) {
 			throwAssertionError({
 				stack: this.ctx.assertionStack,
 				message: `Expected an instance of ${expected.name} (was ${
-					typeof this.ctx.actual === "object" && this.ctx.actual !== null ?
-						this.ctx.actual.constructor.name
+					(
+						typeof this.versionableActual === "object" &&
+						this.versionableActual !== null
+					) ?
+						this.versionableActual.constructor.name
 					:	this.serializedActual
 				})`
 			})
@@ -102,7 +116,7 @@ export class ChainableAssertions implements AssertionRecord {
 		// Use variadic args to distinguish undefined being passed explicitly from no args
 		const inline = (...args: unknown[]) => {
 			const snapName = this.ctx.lastSnapName ?? "snap"
-			const expectedSerialized = this.serialize(args[0])
+			const expectedSerialized = snapshot(args[0])
 			if (!args.length || this.ctx.cfg.updateSnapshots) {
 				if (this.snapRequiresUpdate(expectedSerialized)) {
 					const snapshotArgs: SnapshotArgs = {
@@ -157,8 +171,8 @@ export class ChainableAssertions implements AssertionRecord {
 				}
 			}
 			if (this.ctx.allowRegex)
-				assertEqualOrMatching(expected, this.ctx.actual, this.ctx)
-			else assertEquals(expected, this.ctx.actual, this.ctx)
+				assertEqualOrMatching(expected, this.versionableActual, this.ctx)
+			else assertEquals(expected, this.versionableActual, this.ctx)
 
 			return this
 		}
@@ -169,7 +183,7 @@ export class ChainableAssertions implements AssertionRecord {
 
 	get throws(): unknown {
 		const result = callAssertedFunction(this.unversionedActual as Function)
-		this.ctx.actual = getThrownMessage(result, this.ctx)
+		this.ctx.versionableActual = getThrownMessage(result, this.ctx)
 		this.ctx.allowRegex = true
 		this.ctx.defaultExpected = ""
 		return this.immediateOrChained()
@@ -198,7 +212,7 @@ export class ChainableAssertions implements AssertionRecord {
 	get completions(): any {
 		if (this.ctx.cfg.skipTypes) return chainableNoOpProxy
 
-		this.ctx.actual = new TypeAssertionMapping(data => {
+		this.ctx.versionableActual = new TypeAssertionMapping(data => {
 			if (typeof data.completions === "string") {
 				// if the completions were ambiguously defined, e.g. two string
 				// literals with the same value, they are writen as an error
@@ -218,14 +232,14 @@ export class ChainableAssertions implements AssertionRecord {
 		const self = this
 		return {
 			get toString() {
-				self.ctx.actual = new TypeAssertionMapping(data => ({
+				self.ctx.versionableActual = new TypeAssertionMapping(data => ({
 					actual: formatTypeString(data.args[0].type)
 				}))
 				self.ctx.allowRegex = true
 				return self.immediateOrChained()
 			},
 			get errors() {
-				self.ctx.actual = new TypeAssertionMapping(data => ({
+				self.ctx.versionableActual = new TypeAssertionMapping(data => ({
 					actual: data.errors.join("\n")
 				}))
 				self.ctx.allowRegex = true
@@ -311,6 +325,7 @@ export type comparableValueAssertion<expected, kind extends AssertionKind> = {
 	satisfies: <def>(def: type.validate<def>) => nextAssertions<kind>
 	// This can be used to assert values without type constraints
 	unknown: Omit<comparableValueAssertion<unknown, kind>, "unknown">
+	unwrap: (opts?: UnwrapOptions) => unknown
 }
 
 export type TypeAssertionsRoot = {

diff --git a/ark/attest/package.json b/ark/attest/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ark/attest",
-	"version": "0.26.0",
+	"version": "0.27.0",
 	"license": "MIT",
 	"author": {
 		"name": "David Blass",

diff --git a/ark/fs/package.json b/ark/fs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ark/fs",
-	"version": "0.22.0",
+	"version": "0.23.0",
 	"license": "MIT",
 	"author": {
 		"name": "David Blass",

diff --git a/ark/repo/ts.js b/ark/repo/ts.js
@@ -13,7 +13,6 @@ const versionedFlags =
 		),
 		"--import tsx")
 
-execSync(
-	`node --conditions ark-ts ${versionedFlags} ${process.argv.slice(2).join(" ")}`,
-	{ stdio: "inherit" }
-)
+process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS ?? ""} --conditions ark-ts ${versionedFlags}`
+
+execSync(`node ${process.argv.slice(2).join(" ")}`, { stdio: "inherit" })
diff --git a/ark/schema/package.json b/ark/schema/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ark/schema",
-	"version": "0.22.0",
+	"version": "0.23.0",
 	"license": "MIT",
 	"author": {
 		"name": "David Blass",

diff --git a/ark/schema/roots/root.ts b/ark/schema/roots/root.ts
@@ -51,7 +51,10 @@ import {
 import { intersectNodesRoot, pipeNodesRoot } from "../shared/intersections.ts"
 import type { JsonSchema } from "../shared/jsonSchema.ts"
 import { $ark } from "../shared/registry.ts"
-import type { StandardSchema } from "../shared/standardSchema.ts"
+import type {
+	ArkTypeStandardSchemaProps,
+	StandardSchema
+} from "../shared/standardSchema.ts"
 import { arkKind, hasArkKind } from "../shared/utils.ts"
 import { assertDefaultValueAssignability } from "../structure/optional.ts"
 import type { Prop } from "../structure/prop.ts"
@@ -92,22 +95,18 @@ export abstract class BaseRoot<
 		return this
 	}
 
-	get "~standard"(): 1 {
-		return 1
-	}
-
-	get "~vendor"(): "arktype" {
-		return "arktype"
-	}
-
-	"~validate"(input: StandardSchema.Input): StandardSchema.Result<unknown> {
-		const out = this(input.value)
-		if (out instanceof ArkErrors) return out
-		return { value: out }
+	get "~standard"(): ArkTypeStandardSchemaProps {
+		return {
+			vendor: "arktype",
+			version: 1,
+			validate: input => {
+				const out = this(input)
+				if (out instanceof ArkErrors) return out
+				return { value: out }
+			}
+		}
 	}
 
-	declare "~types": StandardSchema.Types<unknown, unknown>
-
 	get optionalMeta(): boolean {
 		return this.cacheGetter(
 			"optionalMeta",

diff --git a/ark/schema/shared/errors.ts b/ark/schema/shared/errors.ts
@@ -12,7 +12,7 @@ import {
 import type { ResolvedArkConfig } from "../config.ts"
 import type { Prerequisite, errorContext } from "../kinds.ts"
 import type { NodeKind } from "./implement.ts"
-import type { StandardSchema } from "./standardSchema.ts"
+import type { StandardFailureResult } from "./standardSchema.ts"
 import type { TraversalContext } from "./traversal.ts"
 import { arkKind } from "./utils.ts"
 
@@ -84,7 +84,7 @@ export class ArkError<
 
 export class ArkErrors
 	extends ReadonlyArray<ArkError>
-	implements StandardSchema.Failure
+	implements StandardFailureResult
 {
 	protected ctx: TraversalContext