@highstate/contract 0.27.0 → 0.28.0

package/dist/index.js

@@ -599,7 +599,7 @@ var instanceModelPatchSchema = z4.object({
   inputs: z4.record(z4.string(), z4.array(instanceInputSchema)).optional(),
   hubInputs: z4.record(z4.string(), z4.array(hubInputSchema)).optional(),
   injectionInputs: z4.array(hubInputSchema).optional(),
-  position: positionSchema.optional()
+  position: positionSchema.partial().nullable().optional()
 });
 var instanceModelSchema = z4.object({
   id: instanceIdSchema,
@@ -607,19 +607,21 @@ var instanceModelSchema = z4.object({
   type: versionedNameSchema,
   name: genericNameSchema,
   ...instanceModelPatchSchema.shape,
+  position: positionSchema.optional(),
   resolvedInputs: z4.record(z4.string(), z4.array(instanceInputSchema)).optional(),
   parentId: instanceIdSchema.optional(),
   outputs: z4.record(z4.string(), z4.array(instanceInputSchema)).optional(),
   resolvedOutputs: z4.record(z4.string(), z4.array(instanceInputSchema)).optional()
 });
 var hubModelPatchSchema = z4.object({
-  position: positionSchema.optional(),
+  position: positionSchema.partial().nullable().optional(),
   inputs: z4.array(instanceInputSchema).optional(),
   injectionInputs: z4.array(hubInputSchema).optional()
 });
 var hubModelSchema = z4.object({
   id: z4.cuid2(),
-  ...hubModelPatchSchema.shape
+  ...hubModelPatchSchema.shape,
+  position: positionSchema.optional()
 });
 function parseInstanceId(instanceId) {
   const parts = instanceId.split(":");
@@ -634,7 +636,7 @@ function selectInput(inputs, name) {
     throw new Error(`Cannot select input "${name}": empty input group has no boundary metadata to build a missing input reference.`);
   }
   const input = inputs.find((input2) => input2.provided && (input2.instanceId === name || parseInstanceId(input2.instanceId)[1] === name));
-  if (!input || !input.provided) {
+  if (!input?.provided) {
     const fallbackBoundary = groupBoundary ?? inputs.find((input2) => Boolean(input2[boundaryInput]))?.[boundaryInput] ?? inputs[0]?.[boundaryInput];
     if (!fallbackBoundary) {
       throw new Error(`Cannot select input "${name}": input group has no boundary metadata to build a missing input reference.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/contract",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "type": "module",
   "files": [
     "dist",
@@ -44,7 +44,7 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.0",
+    "@biomejs/biome": "2.5.0",
     "@typescript/native-preview": "^7.0.0-dev.20250920.1",
     "@vitest/coverage-v8": "2.1.8",
     "vitest": "^3.2.4"

package/src/component.ts

@@ -194,13 +194,14 @@ export type ComponentInputOptionsToSpec<T extends ComponentInputOptions> = T ext
 export type ComponentOutputOptionsToSpec<
   TOutput extends ComponentOutputOptions<TInputs>,
   TInputs extends Record<string, ComponentInputOptions>,
-> = TOutput extends FromInputComponentOutputOptions<infer TInputName>
-  ? TInputName extends keyof TInputs
-    ? ComponentInputOptionsToSpec<TInputs[TInputName]>
-    : never
-  : TOutput extends ComponentInputOptions
-    ? ComponentInputOptionsToSpec<TOutput>
-    : never
+> =
+  TOutput extends FromInputComponentOutputOptions<infer TInputName>
+    ? TInputName extends keyof TInputs
+      ? ComponentInputOptionsToSpec<TInputs[TInputName]>
+      : never
+    : TOutput extends ComponentInputOptions
+      ? ComponentInputOptionsToSpec<TOutput>
+      : never
 
 export type ComponentInputOptionsMapToSpecMap<T extends Record<string, ComponentInputOptions>> =
   T extends Record<string, never>
@@ -221,9 +222,10 @@ type ComponentOutputMapToCreateOutputValue<
 type ComponentOutputMapToReturnType<
   TOutputs extends Record<string, ComponentOutputOptions<TInputs>>,
   TInputs extends Record<string, ComponentInputOptions>,
-> = TOutputs extends Record<string, never> // biome-ignore lint/suspicious/noConfusingVoidType: this is return type
-  ? void
-  : Partial<ComponentOutputMapToCreateOutputValue<TOutputs, TInputs>>
+> =
+  TOutputs extends Record<string, never> // biome-ignore lint/suspicious/noConfusingVoidType: this is return type
+    ? void
+    : Partial<ComponentOutputMapToCreateOutputValue<TOutputs, TInputs>>
 
 export type ComponentParams<
   TArgs extends Record<string, ComponentArgumentOptions>,
@@ -397,13 +399,14 @@ export type InputSpecMapToInputRefMap<TInputs extends Record<string, ComponentIn
 export type OutputRefMap<
   TInputs extends Record<string, ComponentInputSpec>,
   TKind extends ComponentKind = "composite",
-> = TInputs extends Record<string, [string, never, never]>
-  ? Record<string, never>
-  : {
-      [K in keyof TInputs]: TKind extends "unit"
-        ? InputSpecToUnitOutputRef<TInputs[K]>
-        : InputSpecToCompositeOutputRef<TInputs[K]>
-    }
+> =
+  TInputs extends Record<string, [string, never, never]>
+    ? Record<string, never>
+    : {
+        [K in keyof TInputs]: TKind extends "unit"
+          ? InputSpecToUnitOutputRef<TInputs[K]>
+          : InputSpecToCompositeOutputRef<TInputs[K]>
+      }
 
 type StaticOutputRefByKind<
   TOutputSpec extends ComponentInputSpec,
@@ -426,9 +429,10 @@ type ResolveOutputRefForCall<
   TCallInputs extends Record<string, unknown>,
   TFallbackSpec extends ComponentInputSpec,
   TKind extends ComponentKind,
-> = TOutputOption extends FromInputComponentOutputOptions<infer TInputName>
-  ? ResolveForwardedOutputRef<TInputName, TCallInputs, TFallbackSpec, TKind>
-  : StaticOutputRefByKind<TFallbackSpec, TKind>
+> =
+  TOutputOption extends FromInputComponentOutputOptions<infer TInputName>
+    ? ResolveForwardedOutputRef<TInputName, TCallInputs, TFallbackSpec, TKind>
+    : StaticOutputRefByKind<TFallbackSpec, TKind>
 
 type ResolveOutputRefMapForCall<
   TOutputSpecs extends Record<string, ComponentInputSpec>,
@@ -449,11 +453,12 @@ type IncludesAllExpectedTypes<
   TExpected extends Record<string, unknown>,
 > = Exclude<keyof TExpected, keyof TProvided> extends never ? true : false
 
-type ExtractProvidedInputTypes<TValue> = TValue extends RuntimeInput<infer TTypes, any>
-  ? TTypes
-  : TValue extends Array<infer TItem>
-    ? ExtractProvidedInputTypes<TItem>
-    : never
+type ExtractProvidedInputTypes<TValue> =
+  TValue extends RuntimeInput<infer TTypes, any>
+    ? TTypes
+    : TValue extends Array<infer TItem>
+      ? ExtractProvidedInputTypes<TItem>
+      : never
 
 type ValidateProvidedInputValue<TValue, TExpectedSpec extends ComponentInputSpec> = [
   ExtractProvidedInputTypes<TValue>,

package/src/entity.ts

@@ -177,23 +177,25 @@ type IsIncludeRequired<TIncludeRef> = TIncludeRef extends { required?: infer R }
     : true
   : true
 
-type IsOptionalOutputInclude<TIncludeRef> = IsIncludeMultiple<TIncludeRef> extends true
-  ? false
-  : IsIncludeRequired<TIncludeRef> extends false
-    ? true
-    : false
+type IsOptionalOutputInclude<TIncludeRef> =
+  IsIncludeMultiple<TIncludeRef> extends true
+    ? false
+    : IsIncludeRequired<TIncludeRef> extends false
+      ? true
+      : false
 
-type IsOptionalInputInclude<TIncludeRef> = IsIncludeRequired<TIncludeRef> extends false
-  ? true
-  : false
+type IsOptionalInputInclude<TIncludeRef> =
+  IsIncludeRequired<TIncludeRef> extends false ? true : false
 
-type IncludeOutputValue<TIncludeRef> = IsIncludeMultiple<TIncludeRef> extends true
-  ? EntityValue<ResolveIncludeEntity<TIncludeRef>>[]
-  : EntityValue<ResolveIncludeEntity<TIncludeRef>>
+type IncludeOutputValue<TIncludeRef> =
+  IsIncludeMultiple<TIncludeRef> extends true
+    ? EntityValue<ResolveIncludeEntity<TIncludeRef>>[]
+    : EntityValue<ResolveIncludeEntity<TIncludeRef>>
 
-type IncludeInputValue<TIncludeRef> = IsIncludeMultiple<TIncludeRef> extends true
-  ? EntityValueInput<ResolveIncludeEntity<TIncludeRef>>[]
-  : EntityValueInput<ResolveIncludeEntity<TIncludeRef>>
+type IncludeInputValue<TIncludeRef> =
+  IsIncludeMultiple<TIncludeRef> extends true
+    ? EntityValueInput<ResolveIncludeEntity<TIncludeRef>>[]
+    : EntityValueInput<ResolveIncludeEntity<TIncludeRef>>
 
 type InclusionValueShape<TIncludes extends Record<string, EntityIncludeRef>> =
   TIncludes extends Record<string, never>
@@ -330,58 +332,58 @@ type InclusionShape<TImplements extends Record<string, EntityIncludeRef>> = {
         : never
 }
 
-type AddSchemaExtensions<
-  TSchema extends z.ZodTypeAny,
-  TExtends extends Record<string, Entity>,
-> = TExtends extends Record<string, never>
-  ? TSchema
-  : IsEmptyObject<TExtends> extends true
+type AddSchemaExtensions<TSchema extends z.ZodTypeAny, TExtends extends Record<string, Entity>> =
+  TExtends extends Record<string, never>
     ? TSchema
-    : {
-        [K in keyof TExtends]: AddSchemaExtensions<
-          z.ZodIntersection<TSchema, TExtends[K]["schema"]>,
-          Omit<TExtends, K>
-        >
-      }[keyof TExtends]
+    : IsEmptyObject<TExtends> extends true
+      ? TSchema
+      : {
+          [K in keyof TExtends]: AddSchemaExtensions<
+            z.ZodIntersection<TSchema, TExtends[K]["schema"]>,
+            Omit<TExtends, K>
+          >
+        }[keyof TExtends]
 
 type AddTypeExtensions<
   TImplementedTypes extends EntityTypes,
   TExtends extends Record<string, Entity>,
-> = TExtends extends Record<string, never>
-  ? TImplementedTypes
-  : IsEmptyObject<TExtends> extends true
+> =
+  TExtends extends Record<string, never>
     ? TImplementedTypes
-    : {
-        [K in keyof TExtends]: AddTypeExtensions<
-          TImplementedTypes & TExtends[K][typeof implementedTypes],
-          Omit<TExtends, K>
-        >
-      }[keyof TExtends]
+    : IsEmptyObject<TExtends> extends true
+      ? TImplementedTypes
+      : {
+          [K in keyof TExtends]: AddTypeExtensions<
+            TImplementedTypes & TExtends[K][typeof implementedTypes],
+            Omit<TExtends, K>
+          >
+        }[keyof TExtends]
 
 type AddIncludeExtensions<
   TIncludes extends Record<string, EntityIncludeRef>,
   TExtends extends Record<string, Entity>,
-> = TExtends extends Record<string, never>
-  ? TIncludes
-  : IsEmptyObject<TExtends> extends true
+> =
+  TExtends extends Record<string, never>
     ? TIncludes
-    : {
-        [K in keyof TExtends]: AddIncludeExtensions<
-          TIncludes & ExtractEntityIncludes<TExtends[K][typeof entityIncludes]>,
-          Omit<TExtends, K>
-        >
-      }[keyof TExtends]
-
-type ExtractEntityIncludes<T> = T extends Record<string, EntityIncludeRef>
-  ? T
-  : Record<string, never>
+    : IsEmptyObject<TExtends> extends true
+      ? TIncludes
+      : {
+          [K in keyof TExtends]: AddIncludeExtensions<
+            TIncludes & ExtractEntityIncludes<TExtends[K][typeof entityIncludes]>,
+            Omit<TExtends, K>
+          >
+        }[keyof TExtends]
+
+type ExtractEntityIncludes<T> =
+  T extends Record<string, EntityIncludeRef> ? T : Record<string, never>
 
 type AddSchemaInclusions<
   TSchema extends z.ZodTypeAny,
   TImplements extends Record<string, EntityIncludeRef>,
-> = TImplements extends Record<string, never>
-  ? TSchema
-  : z.ZodIntersection<TSchema, z.ZodObject<InclusionShape<TImplements>>>
+> =
+  TImplements extends Record<string, never>
+    ? TSchema
+    : z.ZodIntersection<TSchema, z.ZodObject<InclusionShape<TImplements>>>
 
 /**
  * The common ancestor of all entities. Any entity can be assigned to this entity.

package/src/instance.ts

@@ -86,19 +86,20 @@ export type RequiredMultipleInput<TInput extends RuntimeInput = RuntimeInput> =
 export type RequiredMultipleInputs<TInput extends RuntimeInput = RuntimeInput> =
   RequiredMultipleInput<TInput>
 
-export type EntityInput<TEntity extends Entity> = TEntity extends Entity<
-  VersionedName,
-  infer TImplementedTypes,
-  z.ZodTypeAny,
-  unknown,
-  unknown,
-  infer TIncludes
->
-  ? RuntimeInput<TImplementedTypes, undefined> &
-      (TIncludes extends Record<string, EntityIncludeRef>
-        ? EntityInputIncludes<TIncludes>
-        : Record<never, never>)
-  : never
+export type EntityInput<TEntity extends Entity> =
+  TEntity extends Entity<
+    VersionedName,
+    infer TImplementedTypes,
+    z.ZodTypeAny,
+    unknown,
+    unknown,
+    infer TIncludes
+  >
+    ? RuntimeInput<TImplementedTypes, undefined> &
+        (TIncludes extends Record<string, EntityIncludeRef>
+          ? EntityInputIncludes<TIncludes>
+          : Record<never, never>)
+    : never
 
 export type RequiredEntityInput<TEntity extends Entity> = RequiredInput<EntityInput<TEntity>>
 
@@ -126,34 +127,32 @@ type IncludeRequired<TIncludeRef> = TIncludeRef extends { required?: infer R }
     : true
   : true
 
-type IncludeRefValue<
-  TIncludeRef,
-  TDepth extends readonly unknown[],
-> = ResolveIncludeEntity<TIncludeRef> extends infer TEntity
-  ? TEntity extends Entity
-    ? IncludeMultiple<TIncludeRef> extends true
-      ? MultipleInput<
-          EntityInputWithDepth<TEntity, TDepth>,
-          TDepth extends readonly []
-            ? Record<never, never>
-            : TEntity extends Entity<
-                  VersionedName,
-                  EntityTypes,
-                  z.ZodTypeAny,
-                  unknown,
-                  unknown,
-                  infer TIncludes
-                >
-              ? TIncludes extends Record<string, EntityIncludeRef>
-                ? LiftMultipleSelectorFields<EntityInputIncludes<TIncludes, DecDepth<TDepth>>>
+type IncludeRefValue<TIncludeRef, TDepth extends readonly unknown[]> =
+  ResolveIncludeEntity<TIncludeRef> extends infer TEntity
+    ? TEntity extends Entity
+      ? IncludeMultiple<TIncludeRef> extends true
+        ? MultipleInput<
+            EntityInputWithDepth<TEntity, TDepth>,
+            TDepth extends readonly []
+              ? Record<never, never>
+              : TEntity extends Entity<
+                    VersionedName,
+                    EntityTypes,
+                    z.ZodTypeAny,
+                    unknown,
+                    unknown,
+                    infer TIncludes
+                  >
+                ? TIncludes extends Record<string, EntityIncludeRef>
+                  ? LiftMultipleSelectorFields<EntityInputIncludes<TIncludes, DecDepth<TDepth>>>
+                  : Record<never, never>
                 : Record<never, never>
-              : Record<never, never>
-        >
-      : IncludeRequired<TIncludeRef> extends false
-        ? OptionalEntityInput<TEntity, TDepth>
-        : EntityInputWithDepth<TEntity, TDepth>
+          >
+        : IncludeRequired<TIncludeRef> extends false
+          ? OptionalEntityInput<TEntity, TDepth>
+          : EntityInputWithDepth<TEntity, TDepth>
+      : never
     : never
-  : never
 
 type OptionalEntityInput<TEntity extends Entity, TDepth extends readonly unknown[]> =
   | ({ provided: true } & EntityInputWithDepth<TEntity, TDepth>)
@@ -185,11 +184,12 @@ type RuntimeInputSelectorFields<TInput extends RuntimeInput> = {
     : K]: LiftMultipleSelectorValue<TInput[K]>
 }
 
-type LiftMultipleSelectorValue<T> = T extends MultipleInput<infer TItem, infer TSelectors>
-  ? MultipleInput<TItem, LiftMultipleSelectorFields<TSelectors>>
-  : T extends RuntimeInput
-    ? MultipleInput<T, RuntimeInputSelectorFields<T>>
-    : T
+type LiftMultipleSelectorValue<T> =
+  T extends MultipleInput<infer TItem, infer TSelectors>
+    ? MultipleInput<TItem, LiftMultipleSelectorFields<TSelectors>>
+    : T extends RuntimeInput
+      ? MultipleInput<T, RuntimeInputSelectorFields<T>>
+      : T
 
 type LiftMultipleSelectorFields<TSelectors extends Record<string, unknown>> = {
   [K in keyof TSelectors]: LiftMultipleSelectorValue<TSelectors[K]>
@@ -201,43 +201,41 @@ type OptionalizedInputFields<TInput extends RuntimeInput> = {
     : K]: OptionalizeInputValue<TInput[K]>
 }
 
-type EntityInputWithDepth<
-  TEntity extends Entity,
-  TDepth extends readonly unknown[],
-> = TEntity extends Entity<
-  VersionedName,
-  infer TImplementedTypes,
-  z.ZodTypeAny,
-  unknown,
-  unknown,
-  infer TIncludes
->
-  ? RuntimeInput<TImplementedTypes, undefined> &
-      (TDepth extends readonly []
-        ? Record<never, never>
-        : TIncludes extends Record<string, EntityIncludeRef>
-          ? EntityInputIncludes<TIncludes, DecDepth<TDepth>>
-          : Record<never, never>)
-  : never
+type EntityInputWithDepth<TEntity extends Entity, TDepth extends readonly unknown[]> =
+  TEntity extends Entity<
+    VersionedName,
+    infer TImplementedTypes,
+    z.ZodTypeAny,
+    unknown,
+    unknown,
+    infer TIncludes
+  >
+    ? RuntimeInput<TImplementedTypes, undefined> &
+        (TDepth extends readonly []
+          ? Record<never, never>
+          : TIncludes extends Record<string, EntityIncludeRef>
+            ? EntityInputIncludes<TIncludes, DecDepth<TDepth>>
+            : Record<never, never>)
+    : never
 
 type EntityInputIncludes<
   TIncludes extends Record<string, EntityIncludeRef>,
   TDepth extends readonly unknown[] = EntityInputDepth,
-> = TIncludes extends Record<string, never>
-  ? Record<never, never>
-  : string extends keyof TIncludes
+> =
+  TIncludes extends Record<string, never>
     ? Record<never, never>
-    : {
-        [K in keyof TIncludes]: IncludeRefValue<TIncludes[K], TDepth>
-      }
+    : string extends keyof TIncludes
+      ? Record<never, never>
+      : {
+          [K in keyof TIncludes]: IncludeRefValue<TIncludes[K], TDepth>
+        }
 
 export type InstanceInputGroup<TTypes extends EntityTypes = EntityTypes> = MultipleInput<
   RuntimeInput<TTypes>
 >
 
-type SelectInputResult<TInput extends RuntimeInput> = TInput extends RequiredInput<infer TRuntime>
-  ? TRuntime
-  : TInput
+type SelectInputResult<TInput extends RuntimeInput> =
+  TInput extends RequiredInput<infer TRuntime> ? TRuntime : TInput
 
 export const positionSchema = z.object({
   x: z.number(),
@@ -295,7 +293,7 @@ export const instanceModelPatchSchema = z.object({
    *
    * Only for designer-first instances.
    */
-  position: positionSchema.optional(),
+  position: positionSchema.partial().nullable().optional(),
 })
 
 export const instanceModelSchema = z.object({
@@ -327,6 +325,8 @@ export const instanceModelSchema = z.object({
 
   ...instanceModelPatchSchema.shape,
 
+  position: positionSchema.optional(),
+
   /**
    * The id of the top level parent instance.
    *
@@ -362,7 +362,7 @@ export const hubModelPatchSchema = z.object({
   /**
    * The position of the hub on the canvas.
    */
-  position: positionSchema.optional(),
+  position: positionSchema.partial().nullable().optional(),
 
   /**
    * The inputs of the hub.
@@ -385,6 +385,8 @@ export const hubModelSchema = z.object({
   id: z.cuid2(),
 
   ...hubModelPatchSchema.shape,
+
+  position: positionSchema.optional(),
 })
 
 export type InstanceModelPatch = z.infer<typeof instanceModelPatchSchema>
@@ -439,7 +441,7 @@ export function selectInput<TInput extends RuntimeInput>(
       (input.instanceId === name || parseInstanceId(input.instanceId)[1] === name),
   )
 
-  if (!input || !input.provided) {
+  if (!input?.provided) {
     const fallbackBoundary =
       groupBoundary ??
       inputs.find(input => Boolean(input[boundaryInput]))?.[boundaryInput] ??

package/src/utils.ts

@@ -1,29 +1,28 @@
 import type { z } from "zod"
 import { isNonNullish, pickBy } from "remeda"
 
-type PickUndefinedKeys<T extends Record<string, unknown>> = T extends Record<string, never>
-  ? never
-  : Exclude<
-      {
-        [K in keyof T]: undefined extends T[K] ? K : never
-      }[keyof T],
-      undefined
-    >
-
-type AllOptionalKeys<T extends Record<string, unknown>> = T extends Record<string, never>
-  ? never
-  : Exclude<
-      {
-        [K in keyof T]: undefined extends T[K] ? K : never
-      }[keyof T],
-      undefined
-    >
-
-type HasRequired<T extends Record<string, unknown>> = T extends Record<string, never>
-  ? false
-  : [keyof T] extends [AllOptionalKeys<T>]
-    ? false
-    : true
+type PickUndefinedKeys<T extends Record<string, unknown>> =
+  T extends Record<string, never>
+    ? never
+    : Exclude<
+        {
+          [K in keyof T]: undefined extends T[K] ? K : never
+        }[keyof T],
+        undefined
+      >
+
+type AllOptionalKeys<T extends Record<string, unknown>> =
+  T extends Record<string, never>
+    ? never
+    : Exclude<
+        {
+          [K in keyof T]: undefined extends T[K] ? K : never
+        }[keyof T],
+        undefined
+      >
+
+type HasRequired<T extends Record<string, unknown>> =
+  T extends Record<string, never> ? false : [keyof T] extends [AllOptionalKeys<T>] ? false : true
 
 type PickRecordsWithAnyRequired<T extends Record<string, Record<string, unknown>>> =
   T extends Record<string, never>