fix: fix combining CreateState and CreateVars causing V to be unknown (#794)

Author: NathanFlurry

packages/actor-core/src/actor/config.ts

@@ -81,7 +81,7 @@ export interface OnConnectOptions<CP> {
 // This must have only one or the other or else S will not be able to be inferred
 type CreateState<S, CP, CS, V> =
 	| { state: S }
-	| { createState: (c: ActorContext<undefined, CP, CS, V>) => S | Promise<S> }
+	| { createState: (c: ActorContext<undefined, undefined, undefined, undefined>) => S | Promise<S> }
 	| Record<never, never>;
 
 // Creates connection state config
@@ -91,7 +91,7 @@ type CreateConnState<S, CP, CS, V> =
 	| { connState: CS }
 	| {
 			createConnState: (
-				c: ActorContext<S, CP, CS, V>,
+				c: ActorContext<undefined, undefined, undefined, undefined>,
 				opts: OnConnectOptions<CP>,
 			) => CS | Promise<CS>;
 	  }
@@ -114,7 +114,7 @@ type CreateVars<S, CP, CS, V> =
 			/**
 			 * @experimental
 			 */
-			createVars: (c: ActorContext<S, CP, CS, undefined>, driverCtx: unknown) => V | Promise<V>;
+			createVars: (c: ActorContext<undefined, undefined, undefined, undefined>, driverCtx: unknown) => V | Promise<V>;
 	  }
 	| Record<never, never>;
 

packages/actor-core/src/actor/instance.ts

@@ -171,7 +171,7 @@ export class ActorInstance<S, CP, CS, V> {
 			let vars: V | undefined = undefined;
 			if ("createVars" in this.#config) {
 				const dataOrPromise = this.#config.createVars(
-					this.actorContext as unknown as ActorContext<S, CP, CS, undefined>,
+					this.actorContext as unknown as ActorContext<undefined, undefined, undefined, undefined>,
 					this.#actorDriver.context,
 				);
 				if (dataOrPromise instanceof Promise) {
@@ -406,7 +406,7 @@ export class ActorInstance<S, CP, CS, V> {
 
 					// Convert state to undefined since state is not defined yet here
 					stateData = await this.#config.createState(
-						this.actorContext as unknown as ActorContext<undefined, CP, CS, V>,
+						this.actorContext as unknown as ActorContext<undefined, undefined, undefined, undefined>,
 					);
 				} else if ("state" in this.#config) {
 					stateData = structuredClone(this.#config.state);
@@ -509,7 +509,7 @@ export class ActorInstance<S, CP, CS, V> {
 		if (this.#connStateEnabled) {
 			if ("createConnState" in this.#config) {
 				const dataOrPromise = this.#config.createConnState(
-					this.actorContext,
+					this.actorContext as unknown as ActorContext<undefined, undefined, undefined, undefined>,
 					onBeforeConnectOpts,
 				);
 				if (dataOrPromise instanceof Promise) {

packages/actor-core/tests/vars.test.ts

@@ -7,7 +7,8 @@ describe("Actor Vars", () => {
 		test("should provide access to static vars", async () => {
 			// Define actor with static vars
 			const varActor = actor({
-				//state: { value: 0 },
+				state: { value: 0 },
+				connState: { hello: "world" },
 				vars: { counter: 42, name: "test-actor" },
 				actions: {
 					getVars: (c) => {
@@ -40,7 +41,8 @@ describe("Actor Vars", () => {
 		test("should deep clone static vars between actor instances", async () => {
 			// Define actor with nested object in vars
 			const nestedVarActor = actor({
-				//state: { value: 0 },
+				state: { value: 0 },
+				connState: { hello: "world" },
 				vars: {
 					counter: 42,
 					nested: {
@@ -95,7 +97,8 @@ describe("Actor Vars", () => {
 		test("should support dynamic vars creation", async () => {
 			// Define actor with createVars function
 			const dynamicVarActor = actor({
-				//state: { count: 0 },
+				state: { value: 0 },
+				connState: { hello: "world" },
 				createVars: () => {
 					return {
 						random: Math.random(),
@@ -130,7 +133,8 @@ describe("Actor Vars", () => {
 		test("should create different vars for different instances", async () => {
 			// Define actor with createVars function that generates unique values
 			const uniqueVarActor = actor({
-				//state: { value: 0 },
+				state: { value: 0 },
+				connState: { hello: "world" },
 				createVars: () => {
 					return {
 						id: Math.floor(Math.random() * 1000000),
@@ -178,7 +182,8 @@ describe("Actor Vars", () => {
 			}
 
 			const driverCtxActor = actor({
-				//state: { value: 0 },
+				state: { value: 0 },
+				connState: { hello: "world" },
 				createVars: (c, driverCtx: any): DriverVars => {
 					// In test environment, we get a context with a state property
 					return {

turbo.json

@@ -10,7 +10,7 @@
       "outputs": ["dist/**"]
     },
     "check-types": {
-      "inputs": ["src/**", "tsconfig.json", "tsup.config.ts", "package.json"],
+      "inputs": ["src/**", "tests/**", "tsconfig.json", "tsup.config.ts", "package.json"],
       "dependsOn": ["^build"]
     },
     "dev": {