@voidhash/mimic 0.0.1-alpha.5 → 0.0.1-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voidhash/mimic",
-  "version": "0.0.1-alpha.5",
+  "version": "0.0.1-alpha.7",
   "type": "module",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "typescript": "5.8.3",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4",
-    "@voidhash/tsconfig": "0.0.1-alpha.5"
+    "@voidhash/tsconfig": "0.0.1-alpha.7"
   },
   "peerDependencies": {
     "effect": "^3.19.12"

package/src/client/ClientDocument.ts

@@ -43,7 +43,7 @@ type InitState =
 /**
  * Listener for presence changes.
  */
-export interface PresenceListener<TData> {
+export interface PresenceListener<_TData> {
   /** Called when any presence changes (self or others) */
   readonly onPresenceChange?: () => void;
 }

package/src/client/errors.ts

@@ -19,7 +19,7 @@ export class MimicClientError extends Error {
  * Error thrown when a transaction is rejected by the server.
  */
 export class TransactionRejectedError extends MimicClientError {
-  readonly _tag = "TransactionRejectedError";
+  override readonly _tag = "TransactionRejectedError";
   readonly transaction: Transaction.Transaction;
   readonly reason: string;
 
@@ -35,7 +35,7 @@ export class TransactionRejectedError extends MimicClientError {
  * Error thrown when the transport is not connected.
  */
 export class NotConnectedError extends MimicClientError {
-  readonly _tag = "NotConnectedError";
+  override readonly _tag = "NotConnectedError";
   constructor() {
     super("Transport is not connected");
     this.name = "NotConnectedError";
@@ -46,8 +46,8 @@ export class NotConnectedError extends MimicClientError {
  * Error thrown when connection to the server fails.
  */
 export class ConnectionError extends MimicClientError {
-  readonly _tag = "ConnectionError";
-  readonly cause?: Error;
+  override readonly _tag = "ConnectionError";
+  override readonly cause?: Error;
 
   constructor(message: string, cause?: Error) {
     super(message);
@@ -60,7 +60,7 @@ export class ConnectionError extends MimicClientError {
  * Error thrown when state drift is detected and cannot be recovered.
  */
 export class StateDriftError extends MimicClientError {
-  readonly _tag = "StateDriftError";
+  override readonly _tag = "StateDriftError";
   readonly expectedVersion: number;
   readonly receivedVersion: number;
 
@@ -78,7 +78,7 @@ export class StateDriftError extends MimicClientError {
  * Error thrown when a pending transaction times out waiting for confirmation.
  */
 export class TransactionTimeoutError extends MimicClientError {
-  readonly _tag = "TransactionTimeoutError";
+  override readonly _tag = "TransactionTimeoutError";
   readonly transaction: Transaction.Transaction;
   readonly timeoutMs: number;
 
@@ -96,7 +96,7 @@ export class TransactionTimeoutError extends MimicClientError {
  * Error thrown when rebasing operations fails.
  */
 export class RebaseError extends MimicClientError {
-  readonly _tag = "RebaseError";
+  override readonly _tag = "RebaseError";
   readonly transactionId: string;
 
   constructor(transactionId: string, message: string) {
@@ -110,7 +110,7 @@ export class RebaseError extends MimicClientError {
  * Error thrown when the client document is in an invalid state.
  */
 export class InvalidStateError extends MimicClientError {
-  readonly _tag = "InvalidStateError";
+  override readonly _tag = "InvalidStateError";
   constructor(message: string) {
     super(message);
     this.name = "InvalidStateError";
@@ -121,7 +121,7 @@ export class InvalidStateError extends MimicClientError {
  * Error thrown when WebSocket connection or communication fails.
  */
 export class WebSocketError extends MimicClientError {
-  readonly _tag = "WebSocketError";
+  override readonly _tag = "WebSocketError";
   readonly code?: number;
   readonly reason?: string;
 
@@ -137,7 +137,7 @@ export class WebSocketError extends MimicClientError {
  * Error thrown when authentication fails.
  */
 export class AuthenticationError extends MimicClientError {
-  readonly _tag = "AuthenticationError";
+  override readonly _tag = "AuthenticationError";
   constructor(message: string) {
     super(message);
     this.name = "AuthenticationError";

package/src/primitives/Array.ts

@@ -7,7 +7,8 @@ import * as Transform from "../Transform";
 import * as FractionalIndex from "../FractionalIndex";
 import type { Primitive, PrimitiveInternal, MaybeUndefined, AnyPrimitive, Validator, InferState, InferProxy, InferSnapshot } from "../Primitive";
 import { ValidationError } from "../Primitive";
-import { runValidators } from "./shared";
+import { runValidators, applyDefaults, StructSetInput } from "./shared";
+import type { StructPrimitive } from "./Struct";
 
 
 /**
@@ -46,15 +47,25 @@ export interface ArrayEntrySnapshot<TElement extends AnyPrimitive> {
  */
 export type ArraySnapshot<TElement extends AnyPrimitive> = readonly ArrayEntrySnapshot<TElement>[];
 
+/**
+ * Compute the input type for array element values.
+ * If the element is a struct, uses StructSetInput (partial with defaults).
+ * Otherwise uses the full state type.
+ */
+export type ArrayElementSetInput<TElement extends AnyPrimitive> =
+  TElement extends StructPrimitive<infer TFields, any, any>
+    ? StructSetInput<TFields>
+    : InferState<TElement>;
+
 export interface ArrayProxy<TElement extends AnyPrimitive> {
   /** Gets the current array entries (sorted by position) */
   get(): ArrayState<TElement>;
-  /** Replaces the entire array with new values (generates new IDs and positions) */
-  set(values: readonly InferState<TElement>[]): void;
-  /** Appends a value to the end of the array */
-  push(value: InferState<TElement>): void;
-  /** Inserts a value at the specified visual index */
-  insertAt(index: number, value: InferState<TElement>): void;
+  /** Replaces the entire array with new values (generates new IDs and positions, applies defaults) */
+  set(values: readonly ArrayElementSetInput<TElement>[]): void;
+  /** Appends a value to the end of the array (applies defaults for struct elements) */
+  push(value: ArrayElementSetInput<TElement>): void;
+  /** Inserts a value at the specified visual index (applies defaults for struct elements) */
+  insertAt(index: number, value: ArrayElementSetInput<TElement>): void;
   /** Removes the element with the specified ID */
   remove(id: string): void;
   /** Moves an element to a new visual index */
@@ -77,12 +88,14 @@ interface ArrayPrimitiveSchema<TElement extends AnyPrimitive> {
   readonly validators: readonly Validator<ArrayState<TElement>>[];
 }
 
-export class ArrayPrimitive<TElement extends AnyPrimitive>
-  implements Primitive<ArrayState<TElement>, ArrayProxy<TElement>>
+export class ArrayPrimitive<TElement extends AnyPrimitive, TDefined extends boolean = false, THasDefault extends boolean = false>
+  implements Primitive<ArrayState<TElement>, ArrayProxy<TElement>, TDefined, THasDefault>
 {
   readonly _tag = "ArrayPrimitive" as const;
   readonly _State!: ArrayState<TElement>;
   readonly _Proxy!: ArrayProxy<TElement>;
+  readonly _TDefined!: TDefined;
+  readonly _THasDefault!: THasDefault;
 
   private readonly _schema: ArrayPrimitiveSchema<TElement>;
 
@@ -118,7 +131,7 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
   }
 
   /** Mark this array as required */
-  required(): ArrayPrimitive<TElement> {
+  required(): ArrayPrimitive<TElement, true, THasDefault> {
     return new ArrayPrimitive({
       ...this._schema,
       required: true,
@@ -126,7 +139,7 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
   }
 
   /** Set a default value for this array */
-  default(defaultValue: ArrayState<TElement>): ArrayPrimitive<TElement> {
+  default(defaultValue: ArrayState<TElement>): ArrayPrimitive<TElement, true, true> {
     return new ArrayPrimitive({
       ...this._schema,
       defaultValue,
@@ -139,7 +152,7 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
   }
 
   /** Add a custom validation rule */
-  refine(fn: (value: ArrayState<TElement>) => boolean, message: string): ArrayPrimitive<TElement> {
+  refine(fn: (value: ArrayState<TElement>) => boolean, message: string): ArrayPrimitive<TElement, TDefined, THasDefault> {
     return new ArrayPrimitive({
       ...this._schema,
       validators: [...this._schema.validators, { validate: fn, message }],
@@ -147,7 +160,7 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
   }
 
   /** Minimum array length */
-  minLength(length: number): ArrayPrimitive<TElement> {
+  minLength(length: number): ArrayPrimitive<TElement, TDefined, THasDefault> {
     return this.refine(
       (v) => v.length >= length,
       `Array must have at least ${length} elements`
@@ -155,7 +168,7 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
   }
 
   /** Maximum array length */
-  maxLength(length: number): ArrayPrimitive<TElement> {
+  maxLength(length: number): ArrayPrimitive<TElement, TDefined, THasDefault> {
     return this.refine(
       (v) => v.length <= length,
       `Array must have at most ${length} elements`
@@ -173,12 +186,17 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
         return sortByPos(state);
       };
 
+      // Helper to apply defaults for element values
+      const applyElementDefaults = (value: ArrayElementSetInput<TElement>): InferState<TElement> => {
+        return applyDefaults(elementPrimitive, value as Partial<InferState<TElement>>) as InferState<TElement>;
+      };
+
       return {
         get: (): ArrayState<TElement> => {
           return getCurrentState();
         },
 
-        set: (values: readonly InferState<TElement>[]) => {
+        set: (values: readonly ArrayElementSetInput<TElement>[]) => {
           // Generate entries with new IDs and sequential positions
           const entries: ArrayEntry<InferState<TElement>>[] = [];
           let prevPos: string | null = null;
@@ -186,7 +204,9 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
           for (const value of values) {
             const id = env.generateId();
             const pos = generatePosBetween(prevPos, null);
-            entries.push({ id, pos, value });
+            // Apply defaults to element value
+            const mergedValue = applyElementDefaults(value);
+            entries.push({ id, pos, value: mergedValue });
             prevPos = pos;
           }
           
@@ -195,27 +215,31 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
           );
         },
 
-        push: (value: InferState<TElement>) => {
+        push: (value: ArrayElementSetInput<TElement>) => {
           const sorted = getCurrentState();
           const lastPos = sorted.length > 0 ? sorted[sorted.length - 1]!.pos : null;
           const id = env.generateId();
           const pos = generatePosBetween(lastPos, null);
+          // Apply defaults to element value
+          const mergedValue = applyElementDefaults(value);
           
           env.addOperation(
-            Operation.fromDefinition(operationPath, this._opDefinitions.insert, { id, pos, value })
+            Operation.fromDefinition(operationPath, this._opDefinitions.insert, { id, pos, value: mergedValue })
           );
         },
 
-        insertAt: (index: number, value: InferState<TElement>) => {
+        insertAt: (index: number, value: ArrayElementSetInput<TElement>) => {
           const sorted = getCurrentState();
           const leftPos = index > 0 && sorted[index - 1] ? sorted[index - 1]!.pos : null;
           const rightPos = index < sorted.length && sorted[index] ? sorted[index]!.pos : null;
           
           const id = env.generateId();
           const pos = generatePosBetween(leftPos, rightPos);
+          // Apply defaults to element value
+          const mergedValue = applyElementDefaults(value);
           
           env.addOperation(
-            Operation.fromDefinition(operationPath, this._opDefinitions.insert, { id, pos, value })
+            Operation.fromDefinition(operationPath, this._opDefinitions.insert, { id, pos, value: mergedValue })
           );
         },
 
@@ -452,6 +476,6 @@ export class ArrayPrimitive<TElement extends AnyPrimitive>
 }
 
 /** Creates a new ArrayPrimitive with the given element type */
-export const Array = <TElement extends AnyPrimitive>(element: TElement): ArrayPrimitive<TElement> =>
+export const Array = <TElement extends AnyPrimitive>(element: TElement): ArrayPrimitive<TElement, false, false> =>
   new ArrayPrimitive({ required: false, defaultValue: undefined, element, validators: [] });
 

package/src/primitives/Boolean.ts

@@ -23,10 +23,12 @@ interface BooleanPrimitiveSchema {
   readonly validators: readonly Validator<boolean>[];
 }
 
-export class BooleanPrimitive<TDefined extends boolean = false> implements Primitive<boolean, BooleanProxy<TDefined>> {
+export class BooleanPrimitive<TDefined extends boolean = false, THasDefault extends boolean = false> implements Primitive<boolean, BooleanProxy<TDefined>, TDefined, THasDefault> {
   readonly _tag = "BooleanPrimitive" as const;
   readonly _State!: boolean;
   readonly _Proxy!: BooleanProxy<TDefined>;
+  readonly _TDefined!: TDefined;
+  readonly _THasDefault!: THasDefault;
 
   private readonly _schema: BooleanPrimitiveSchema;
 
@@ -44,7 +46,7 @@ export class BooleanPrimitive<TDefined extends boolean = false> implements Primi
   }
 
   /** Mark this boolean as required */
-  required(): BooleanPrimitive<true> {
+  required(): BooleanPrimitive<true, THasDefault> {
     return new BooleanPrimitive({
       ...this._schema,
       required: true,
@@ -52,7 +54,7 @@ export class BooleanPrimitive<TDefined extends boolean = false> implements Primi
   }
 
   /** Set a default value for this boolean */
-  default(defaultValue: boolean): BooleanPrimitive<true> {
+  default(defaultValue: boolean): BooleanPrimitive<true, true> {
     return new BooleanPrimitive({
       ...this._schema,
       defaultValue,
@@ -60,7 +62,7 @@ export class BooleanPrimitive<TDefined extends boolean = false> implements Primi
   }
 
   /** Add a custom validation rule */
-  refine(fn: (value: boolean) => boolean, message: string): BooleanPrimitive<TDefined> {
+  refine(fn: (value: boolean) => boolean, message: string): BooleanPrimitive<TDefined, THasDefault> {
     return new BooleanPrimitive({
       ...this._schema,
       validators: [...this._schema.validators, { validate: fn, message }],
@@ -87,7 +89,7 @@ export class BooleanPrimitive<TDefined extends boolean = false> implements Primi
       };
     },
 
-    applyOperation: (state: boolean | undefined, operation: Operation.Operation<any, any, any>): boolean => {
+    applyOperation: (_state: boolean | undefined, operation: Operation.Operation<any, any, any>): boolean => {
       if (operation.kind !== "boolean.set") {
         throw new ValidationError(`BooleanPrimitive cannot apply operation of kind: ${operation.kind}`);
       }
@@ -123,6 +125,6 @@ export class BooleanPrimitive<TDefined extends boolean = false> implements Primi
 }
 
 /** Creates a new BooleanPrimitive */
-export const Boolean = (): BooleanPrimitive<false> =>
+export const Boolean = (): BooleanPrimitive<false, false> =>
   new BooleanPrimitive({ required: false, defaultValue: undefined, validators: [] });
 

package/src/primitives/Either.ts

@@ -19,10 +19,10 @@ import { LiteralPrimitive, LiteralValue } from "./Literal";
  * Scalar primitives that can be used as variants in Either
  */
 export type ScalarPrimitive =
-  | StringPrimitive<any>
-  | NumberPrimitive<any>
-  | BooleanPrimitive<any>
-  | LiteralPrimitive<any, any>;
+  | StringPrimitive<any, any>
+  | NumberPrimitive<any, any>
+  | BooleanPrimitive<any, any>
+  | LiteralPrimitive<any, any, any>;
 
 /**
  * Infer the union state type from a tuple of scalar primitives
@@ -69,12 +69,14 @@ interface EitherPrimitiveSchema<TVariants extends readonly ScalarPrimitive[]> {
   readonly variants: TVariants;
 }
 
-export class EitherPrimitive<TVariants extends readonly ScalarPrimitive[], TDefined extends boolean = false>
-  implements Primitive<InferEitherState<TVariants>, EitherProxy<TVariants, TDefined>>
+export class EitherPrimitive<TVariants extends readonly ScalarPrimitive[], TDefined extends boolean = false, THasDefault extends boolean = false>
+  implements Primitive<InferEitherState<TVariants>, EitherProxy<TVariants, TDefined>, TDefined, THasDefault>
 {
   readonly _tag = "EitherPrimitive" as const;
   readonly _State!: InferEitherState<TVariants>;
   readonly _Proxy!: EitherProxy<TVariants, TDefined>;
+  readonly _TDefined!: TDefined;
+  readonly _THasDefault!: THasDefault;
 
   private readonly _schema: EitherPrimitiveSchema<TVariants>;
 
@@ -92,7 +94,7 @@ export class EitherPrimitive<TVariants extends readonly ScalarPrimitive[], TDefi
   }
 
   /** Mark this either as required */
-  required(): EitherPrimitive<TVariants, true> {
+  required(): EitherPrimitive<TVariants, true, THasDefault> {
     return new EitherPrimitive({
       ...this._schema,
       required: true,
@@ -100,7 +102,7 @@ export class EitherPrimitive<TVariants extends readonly ScalarPrimitive[], TDefi
   }
 
   /** Set a default value for this either */
-  default(defaultValue: InferEitherState<TVariants>): EitherPrimitive<TVariants, true> {
+  default(defaultValue: InferEitherState<TVariants>): EitherPrimitive<TVariants, true, true> {
     return new EitherPrimitive({
       ...this._schema,
       defaultValue,
@@ -121,7 +123,7 @@ export class EitherPrimitive<TVariants extends readonly ScalarPrimitive[], TDefi
     // Check for literal matches first (they take priority)
     for (const variant of this._schema.variants) {
       if (variant._tag === "LiteralPrimitive") {
-        const literalVariant = variant as LiteralPrimitive<any, any>;
+        const literalVariant = variant as LiteralPrimitive<any, any, any>;
         if (value === literalVariant.literal) {
           return "literal";
         }
@@ -166,7 +168,7 @@ export class EitherPrimitive<TVariants extends readonly ScalarPrimitive[], TDefi
     // Check for literal matches first (they take priority)
     for (const variant of this._schema.variants) {
       if (variant._tag === "LiteralPrimitive") {
-        const literalVariant = variant as LiteralPrimitive<any, any>;
+        const literalVariant = variant as LiteralPrimitive<any, any, any>;
         if (value === literalVariant.literal) {
           return variant;
         }
@@ -350,7 +352,7 @@ export class EitherPrimitive<TVariants extends readonly ScalarPrimitive[], TDefi
  */
 export function Either<TVariants extends readonly ScalarPrimitive[]>(
   ...variants: TVariants
-): EitherPrimitive<TVariants, false> {
+): EitherPrimitive<TVariants, false, false> {
   if (variants.length === 0) {
     throw new ValidationError("Either requires at least one variant");
   }

package/src/primitives/Literal.ts

@@ -27,10 +27,12 @@ interface LiteralPrimitiveSchema<T extends LiteralValue> {
   readonly literal: T;
 }
 
-export class LiteralPrimitive<T extends LiteralValue, TDefined extends boolean = false> implements Primitive<T, LiteralProxy<T, TDefined>> {
+export class LiteralPrimitive<T extends LiteralValue, TDefined extends boolean = false, THasDefault extends boolean = false> implements Primitive<T, LiteralProxy<T, TDefined>, TDefined, THasDefault> {
   readonly _tag = "LiteralPrimitive" as const;
   readonly _State!: T;
   readonly _Proxy!: LiteralProxy<T, TDefined>;
+  readonly _TDefined!: TDefined;
+  readonly _THasDefault!: THasDefault;
 
   private readonly _schema: LiteralPrimitiveSchema<T>;
 
@@ -48,7 +50,7 @@ export class LiteralPrimitive<T extends LiteralValue, TDefined extends boolean =
   }
 
   /** Mark this literal as required */
-  required(): LiteralPrimitive<T, true> {
+  required(): LiteralPrimitive<T, true, THasDefault> {
     return new LiteralPrimitive({
       ...this._schema,
       required: true,
@@ -56,7 +58,7 @@ export class LiteralPrimitive<T extends LiteralValue, TDefined extends boolean =
   }
 
   /** Set a default value for this literal */
-  default(defaultValue: T): LiteralPrimitive<T, true> {
+  default(defaultValue: T): LiteralPrimitive<T, true, true> {
     return new LiteralPrimitive({
       ...this._schema,
       defaultValue,
@@ -88,7 +90,7 @@ export class LiteralPrimitive<T extends LiteralValue, TDefined extends boolean =
       };
     },
 
-    applyOperation: (state: T | undefined, operation: Operation.Operation<any, any, any>): T => {
+    applyOperation: (_state: T | undefined, operation: Operation.Operation<any, any, any>): T => {
       if (operation.kind !== "literal.set") {
         throw new ValidationError(`LiteralPrimitive cannot apply operation of kind: ${operation.kind}`);
       }
@@ -123,6 +125,6 @@ export class LiteralPrimitive<T extends LiteralValue, TDefined extends boolean =
 }
 
 /** Creates a new LiteralPrimitive with the given literal value */
-export const Literal = <T extends LiteralValue>(literal: T): LiteralPrimitive<T, false> =>
+export const Literal = <T extends LiteralValue>(literal: T): LiteralPrimitive<T, false, false> =>
   new LiteralPrimitive({ required: false, defaultValue: undefined, literal });
 

package/src/primitives/Number.ts

@@ -24,10 +24,12 @@ interface NumberPrimitiveSchema {
   readonly validators: readonly Validator<number>[];
 }
 
-export class NumberPrimitive<TDefined extends boolean = false> implements Primitive<number, NumberProxy<TDefined>> {
+export class NumberPrimitive<TDefined extends boolean = false, THasDefault extends boolean = false> implements Primitive<number, NumberProxy<TDefined>, TDefined, THasDefault> {
   readonly _tag = "NumberPrimitive" as const;
   readonly _State!: number;
   readonly _Proxy!: NumberProxy<TDefined>;
+  readonly _TDefined!: TDefined;
+  readonly _THasDefault!: THasDefault;
 
   private readonly _schema: NumberPrimitiveSchema;
 
@@ -45,7 +47,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Mark this number as required */
-  required(): NumberPrimitive<true> {
+  required(): NumberPrimitive<true, THasDefault> {
     return new NumberPrimitive({
       ...this._schema,
       required: true,
@@ -53,7 +55,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Set a default value for this number */
-  default(defaultValue: number): NumberPrimitive<true> {
+  default(defaultValue: number): NumberPrimitive<true, true> {
     return new NumberPrimitive({
       ...this._schema,
       defaultValue,
@@ -61,7 +63,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Add a custom validation rule */
-  refine(fn: (value: number) => boolean, message: string): NumberPrimitive<TDefined> {
+  refine(fn: (value: number) => boolean, message: string): NumberPrimitive<TDefined, THasDefault> {
     return new NumberPrimitive({
       ...this._schema,
       validators: [...this._schema.validators, { validate: fn, message }],
@@ -69,7 +71,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Minimum value (inclusive) */
-  min(value: number): NumberPrimitive<TDefined> {
+  min(value: number): NumberPrimitive<TDefined, THasDefault> {
     return this.refine(
       (v) => v >= value,
       `Number must be at least ${value}`
@@ -77,7 +79,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Maximum value (inclusive) */
-  max(value: number): NumberPrimitive<TDefined> {
+  max(value: number): NumberPrimitive<TDefined, THasDefault> {
     return this.refine(
       (v) => v <= value,
       `Number must be at most ${value}`
@@ -85,7 +87,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Must be positive (> 0) */
-  positive(): NumberPrimitive<TDefined> {
+  positive(): NumberPrimitive<TDefined, THasDefault> {
     return this.refine(
       (v) => v > 0,
       "Number must be positive"
@@ -93,7 +95,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Must be negative (< 0) */
-  negative(): NumberPrimitive<TDefined> {
+  negative(): NumberPrimitive<TDefined, THasDefault> {
     return this.refine(
       (v) => v < 0,
       "Number must be negative"
@@ -101,7 +103,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
   }
 
   /** Must be an integer */
-  int(): NumberPrimitive<TDefined> {
+  int(): NumberPrimitive<TDefined, THasDefault> {
     return this.refine(
       (v) => globalThis.Number.isInteger(v),
       "Number must be an integer"
@@ -128,7 +130,7 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
       };
     },
 
-    applyOperation: (state: number | undefined, operation: Operation.Operation<any, any, any>): number => {
+    applyOperation: (_state: number | undefined, operation: Operation.Operation<any, any, any>): number => {
       if (operation.kind !== "number.set") {
         throw new ValidationError(`NumberPrimitive cannot apply operation of kind: ${operation.kind}`);
       }
@@ -164,6 +166,6 @@ export class NumberPrimitive<TDefined extends boolean = false> implements Primit
 }
 
 /** Creates a new NumberPrimitive */
-export const Number = (): NumberPrimitive<false> =>
+export const Number = (): NumberPrimitive<false, false> =>
   new NumberPrimitive({ required: false, defaultValue: undefined, validators: [] });