@proto-kit/protocol 0.1.1-develop.1355 → 0.1.1-develop.1376

package/dist/state/protocol/ProtocolState.d.ts

@@ -1,5 +1,3 @@
-import { Reference } from "@proto-kit/common";
-import { State } from "../State";
 import { StateServiceProvider } from "../StateServiceProvider";
 export interface StatefulModule {
     name?: string;
@@ -7,10 +5,6 @@ export interface StatefulModule {
         stateServiceProvider: StateServiceProvider;
     };
 }
-export declare function createStateGetter<TargetModule extends StatefulModule>(target: TargetModule, propertyKey: string, valueReference: Reference<State<unknown> | undefined>, prefix: string, debugInfo: {
-    parentName: string;
-    baseModuleNames: string;
-}): () => State<unknown> | undefined;
 /**
  * Decorates a runtime module property as state, passing down some
  * underlying values to improve developer experience.

package/dist/state/protocol/ProtocolState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProtocolState.d.ts","sourceRoot":"","sources":["../../../src/state/protocol/ProtocolState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAkB/D,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE;QACP,oBAAoB,EAAE,oBAAoB,CAAC;KAC5C,CAAC;CACH;AAED,wBAAgB,iBAAiB,CAAC,YAAY,SAAS,cAAc,EACnE,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,EACrD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,oCA4B3D;AAED;;;GAGG;AACH,wBAAgB,KAAK,uGAGJ,MAAM,UA8BtB"}
+{"version":3,"file":"ProtocolState.d.ts","sourceRoot":"","sources":["../../../src/state/protocol/ProtocolState.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAkB/D,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE;QACP,oBAAoB,EAAE,oBAAoB,CAAC;KAC5C,CAAC;CACH;AAED;;;GAGG;AACH,wBAAgB,KAAK,uGAGJ,MAAM,UA6DtB"}

package/dist/state/protocol/ProtocolState.js

@@ -8,46 +8,50 @@ const errors = {
     missingParent: (className, type, moduleType) => new Error(`Unable to provide parent '${type}' for state, ${className} is missing a name. 
       Did you forget to extend your module with 'extends ${moduleType}'?`),
 };
-export function createStateGetter(target, propertyKey, valueReference, prefix, debugInfo) {
-    return () => {
-        const { value } = valueReference;
-        // Short-circuit this to return the state in case its already initialized
-        if (value !== undefined && value.path !== undefined) {
-            return value;
-        }
-        if (target.name === undefined) {
-            throw errors.missingName(target.constructor.name);
-        }
-        if (!target.parent) {
-            throw errors.missingParent(target.constructor.name, debugInfo.parentName, debugInfo.baseModuleNames);
-        }
-        const path = Path.fromProperty(target.name, propertyKey, prefix);
-        if (value) {
-            value.path = path;
-            value.stateServiceProvider = target.parent.stateServiceProvider;
-        }
-        return value;
-    };
-}
 /**
  * Decorates a runtime module property as state, passing down some
  * underlying values to improve developer experience.
  */
 export function state() {
     return (target, propertyKey) => {
-        const stateReference = createReference(undefined);
-        const isProtocol = target instanceof TransitioningProtocolModule;
-        const statePrefix = isProtocol
-            ? PROTOKIT_PREFIXES.STATE_PROTOCOL
-            : PROTOKIT_PREFIXES.STATE_RUNTIME;
-        const debugInfo = isProtocol
-            ? { parentName: "protocol", baseModuleNames: "...Hook" }
-            : { parentName: "runtime", baseModuleNames: "RuntimeModule" };
         Object.defineProperty(target, propertyKey, {
             enumerable: true,
-            get: createStateGetter(target, propertyKey, stateReference, statePrefix, debugInfo),
-            set: (newValue) => {
-                stateReference.value = newValue;
+            get: function get() {
+                // The reason for why we store the state value in this weird way is that
+                // in the decorator on the prototype of the class. This means that if there
+                // are multiple instances of this class, any closure that this getter shares
+                // will be the same for all instances.
+                // Therefore, we need to somehow save the set instance on the instance itself
+                // eslint-disable-next-line max-len
+                // eslint-disable-next-line @typescript-eslint/consistent-type-assertions,@typescript-eslint/no-unsafe-assignment
+                const reference = this[`protokit_state_cache_${propertyKey}`];
+                // Short-circuit this to return the state in case its already initialized
+                if (reference !== undefined && reference.value.path !== undefined) {
+                    return reference.value;
+                }
+                if (this.name === undefined) {
+                    throw errors.missingName(this.constructor.name);
+                }
+                const isProtocol = target instanceof TransitioningProtocolModule;
+                if (!this.parent) {
+                    const debugInfo = isProtocol
+                        ? { parentName: "protocol", baseModuleNames: "...Hook" }
+                        : { parentName: "runtime", baseModuleNames: "RuntimeModule" };
+                    throw errors.missingParent(this.constructor.name, debugInfo.parentName, debugInfo.baseModuleNames);
+                }
+                const statePrefix = isProtocol
+                    ? PROTOKIT_PREFIXES.STATE_PROTOCOL
+                    : PROTOKIT_PREFIXES.STATE_RUNTIME;
+                const path = Path.fromProperty(this.name, propertyKey, statePrefix);
+                if (reference) {
+                    const { value } = reference;
+                    value.path = path;
+                    value.stateServiceProvider = this.parent.stateServiceProvider;
+                }
+                return reference?.value;
+            },
+            set: function set(newValue) {
+                this[`protokit_state_cache_${propertyKey}`] = createReference(newValue);
             },
         });
     };

package/dist/state/protocol/ProtocolState.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProtocolState.js","sourceRoot":"","sources":["../../../src/state/protocol/ProtocolState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAa,MAAM,mBAAmB,CAAC;AAG/D,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AAEzF,MAAM,MAAM,GAAG;IACb,WAAW,EAAE,CAAC,SAAiB,EAAE,EAAE,CACjC,IAAI,KAAK,CACP,oDAAoD,SAAS;yEACM,CACpE;IAEH,aAAa,EAAE,CAAC,SAAiB,EAAE,IAAY,EAAE,UAAkB,EAAE,EAAE,CACrE,IAAI,KAAK,CACP,6BAA6B,IAAI,gBAAgB,SAAS;2DACL,UAAU,IAAI,CACpE;CACJ,CAAC;AASF,MAAM,UAAU,iBAAiB,CAC/B,MAAoB,EACpB,WAAmB,EACnB,cAAqD,EACrD,MAAc,EACd,SAA0D;IAE1D,OAAO,GAAG,EAAE;QACV,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC;QACjC,yEAAyE;QACzE,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YACnD,OAAO,KAAK,CAAC;SACd;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;YAC7B,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,MAAM,CAAC,aAAa,CACxB,MAAM,CAAC,WAAW,CAAC,IAAI,EACvB,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,eAAe,CAC1B,CAAC;SACH;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QACjE,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;YAClB,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;SACjE;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,KAAK;IACnB,OAAO,CACL,MAAiC,EACjC,WAAmB,EACnB,EAAE;QACF,MAAM,cAAc,GAAG,eAAe,CACpC,SAAS,CACV,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,YAAY,2BAA2B,CAAC;QACjE,MAAM,WAAW,GAAG,UAAU;YAC5B,CAAC,CAAC,iBAAiB,CAAC,cAAc;YAClC,CAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC;QACpC,MAAM,SAAS,GAAG,UAAU;YAC1B,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE;YACxD,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;QAEhE,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YACzC,UAAU,EAAE,IAAI;YAEhB,GAAG,EAAE,iBAAiB,CACpB,MAAM,EACN,WAAW,EACX,cAAc,EACd,WAAW,EACX,SAAS,CACV;YAED,GAAG,EAAE,CAAC,QAAwB,EAAE,EAAE;gBAChC,cAAc,CAAC,KAAK,GAAG,QAAQ,CAAC;YAClC,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ProtocolState.js","sourceRoot":"","sources":["../../../src/state/protocol/ProtocolState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAa,MAAM,mBAAmB,CAAC;AAG/D,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AAEzF,MAAM,MAAM,GAAG;IACb,WAAW,EAAE,CAAC,SAAiB,EAAE,EAAE,CACjC,IAAI,KAAK,CACP,oDAAoD,SAAS;yEACM,CACpE;IAEH,aAAa,EAAE,CAAC,SAAiB,EAAE,IAAY,EAAE,UAAkB,EAAE,EAAE,CACrE,IAAI,KAAK,CACP,6BAA6B,IAAI,gBAAgB,SAAS;2DACL,UAAU,IAAI,CACpE;CACJ,CAAC;AASF;;;GAGG;AACH,MAAM,UAAU,KAAK;IACnB,OAAO,CACL,MAAiC,EACjC,WAAmB,EACnB,EAAE;QACF,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YACzC,UAAU,EAAE,IAAI;YAEhB,GAAG,EAAE,SAAS,GAAG;gBACf,wEAAwE;gBACxE,2EAA2E;gBAC3E,4EAA4E;gBAC5E,sCAAsC;gBACtC,6EAA6E;gBAE7E,mCAAmC;gBACnC,iHAAiH;gBACjH,MAAM,SAAS,GAA2C,IAAY,CACpE,wBAAwB,WAAW,EAAE,CACtC,CAAC;gBAEF,yEAAyE;gBACzE,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;oBACjE,OAAO,SAAS,CAAC,KAAK,CAAC;iBACxB;gBAED,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC3B,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;iBACjD;gBAED,MAAM,UAAU,GAAG,MAAM,YAAY,2BAA2B,CAAC;gBAEjE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBAChB,MAAM,SAAS,GAAG,UAAU;wBAC1B,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE;wBACxD,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;oBAEhE,MAAM,MAAM,CAAC,aAAa,CACxB,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,eAAe,CAC1B,CAAC;iBACH;gBAED,MAAM,WAAW,GAAG,UAAU;oBAC5B,CAAC,CAAC,iBAAiB,CAAC,cAAc;oBAClC,CAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC;gBACpC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;gBACpE,IAAI,SAAS,EAAE;oBACb,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;oBAC5B,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;oBAClB,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;iBAC/D;gBACD,OAAO,SAAS,EAAE,KAAK,CAAC;YAC1B,CAAC;YAED,GAAG,EAAE,SAAS,GAAG,CAEf,QAAwB;gBAExB,IAAI,CAAC,wBAAwB,WAAW,EAAE,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC1E,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "version": "0.1.1-develop.1355+f14da2ed",
+  "version": "0.1.1-develop.1376+41dfeeb9",
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
@@ -32,5 +32,5 @@
     "@jest/globals": "^29.5.0",
     "@types/lodash": "^4.14.194"
   },
-  "gitHead": "f14da2ed8b847db951f6daf9d65a6790e8201c1c"
+  "gitHead": "41dfeeb9771addf0d97dce8edd2a963ccd5f9482"
 }

package/src/state/protocol/ProtocolState.ts

@@ -27,41 +27,6 @@ export interface StatefulModule {
   };
 }
 
-export function createStateGetter<TargetModule extends StatefulModule>(
-  target: TargetModule,
-  propertyKey: string,
-  valueReference: Reference<State<unknown> | undefined>,
-  prefix: string,
-  debugInfo: { parentName: string; baseModuleNames: string }
-) {
-  return () => {
-    const { value } = valueReference;
-    // Short-circuit this to return the state in case its already initialized
-    if (value !== undefined && value.path !== undefined) {
-      return value;
-    }
-
-    if (target.name === undefined) {
-      throw errors.missingName(target.constructor.name);
-    }
-
-    if (!target.parent) {
-      throw errors.missingParent(
-        target.constructor.name,
-        debugInfo.parentName,
-        debugInfo.baseModuleNames
-      );
-    }
-
-    const path = Path.fromProperty(target.name, propertyKey, prefix);
-    if (value) {
-      value.path = path;
-      value.stateServiceProvider = target.parent.stateServiceProvider;
-    }
-    return value;
-  };
-}
-
 /**
  * Decorates a runtime module property as state, passing down some
  * underlying values to improve developer experience.
@@ -71,31 +36,62 @@ export function state() {
     target: TargetTransitioningModule,
     propertyKey: string
   ) => {
-    const stateReference = createReference<State<unknown> | undefined>(
-      undefined
-    );
-
-    const isProtocol = target instanceof TransitioningProtocolModule;
-    const statePrefix = isProtocol
-      ? PROTOKIT_PREFIXES.STATE_PROTOCOL
-      : PROTOKIT_PREFIXES.STATE_RUNTIME;
-    const debugInfo = isProtocol
-      ? { parentName: "protocol", baseModuleNames: "...Hook" }
-      : { parentName: "runtime", baseModuleNames: "RuntimeModule" };
-
     Object.defineProperty(target, propertyKey, {
       enumerable: true,
 
-      get: createStateGetter(
-        target,
-        propertyKey,
-        stateReference,
-        statePrefix,
-        debugInfo
-      ),
+      get: function get(this: TargetTransitioningModule) {
+        // The reason for why we store the state value in this weird way is that
+        // in the decorator on the prototype of the class. This means that if there
+        // are multiple instances of this class, any closure that this getter shares
+        // will be the same for all instances.
+        // Therefore, we need to somehow save the set instance on the instance itself
+
+        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions,@typescript-eslint/no-unsafe-assignment
+        const reference: Reference<State<unknown>> | undefined = (this as any)[
+          `protokit_state_cache_${propertyKey}`
+        ];
+
+        // Short-circuit this to return the state in case its already initialized
+        if (reference !== undefined && reference.value.path !== undefined) {
+          return reference.value;
+        }
+
+        if (this.name === undefined) {
+          throw errors.missingName(this.constructor.name);
+        }
+
+        const isProtocol = target instanceof TransitioningProtocolModule;
+
+        if (!this.parent) {
+          const debugInfo = isProtocol
+            ? { parentName: "protocol", baseModuleNames: "...Hook" }
+            : { parentName: "runtime", baseModuleNames: "RuntimeModule" };
+
+          throw errors.missingParent(
+            this.constructor.name,
+            debugInfo.parentName,
+            debugInfo.baseModuleNames
+          );
+        }
+
+        const statePrefix = isProtocol
+          ? PROTOKIT_PREFIXES.STATE_PROTOCOL
+          : PROTOKIT_PREFIXES.STATE_RUNTIME;
+        const path = Path.fromProperty(this.name, propertyKey, statePrefix);
+        if (reference) {
+          const { value } = reference;
+          value.path = path;
+          value.stateServiceProvider = this.parent.stateServiceProvider;
+        }
+        return reference?.value;
+      },
 
-      set: (newValue: State<unknown>) => {
-        stateReference.value = newValue;
+      set: function set(
+        this: TargetTransitioningModule & any,
+        newValue: State<unknown>
+      ) {
+        this[`protokit_state_cache_${propertyKey}`] = createReference(newValue);
       },
     });
   };