@joist/observable 3.1.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joist/observable",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "type": "module",
   "main": "./target/lib.js",
   "module": "./target/lib.js",
@@ -46,7 +46,8 @@
       "clean": "if-file-deleted",
       "files": [
         "src/**",
-        "tsconfig.json"
+        "tsconfig.json",
+        "../../tsconfig.json"
       ],
       "output": [
         "target/**",

package/src/lib/{meta.test.ts → metadata.test.ts}

@@ -1,21 +1,20 @@
 import { expect } from '@open-wc/testing';
-import { MetaData } from './meta.js';
+import { ObservableInstanceMetaDataStore } from './metadata.js';
 
 describe('meta:meta', () => {
   it('should return default metadata', () => {
     const key = {};
-    const data = new MetaData().read(key);
+    const data = new ObservableInstanceMetaDataStore().read(key);
 
     expect(data).to.deep.equal({
       changes: new Set(),
-      upgradable: new Map(),
       scheduler: null,
     });
   });
 
   it('should return the same metadata object after init', () => {
     const key = {};
-    const data = new MetaData();
+    const data = new ObservableInstanceMetaDataStore();
 
     expect(data.read(key)).to.equal(data.read(key));
   });

package/src/lib/metadata.ts

@@ -0,0 +1,45 @@
+(Symbol as any).metadata ??= Symbol('Symbol.metadata');
+
+export type EffectFn = (changes: Set<string | symbol>) => void;
+
+export abstract class MetadataStore<Metadata> {
+  #data = new WeakMap<object, Metadata>();
+
+  read<T extends object>(value: T): Metadata {
+    let data = this.#data.get(value);
+
+    if (!data) {
+      data = this.init();
+
+      this.#data.set(value, data);
+    }
+
+    return data;
+  }
+
+  abstract init(): Metadata;
+}
+
+export class ObservableInstanceMetadata {
+  scheduler: Promise<void> | null = null;
+  changes = new Set<string | symbol>();
+}
+
+export class ObservableInstanceMetaDataStore extends MetadataStore<ObservableInstanceMetadata> {
+  init() {
+    return new ObservableInstanceMetadata();
+  }
+}
+
+export class ObservableMetadata {
+  effects: Set<EffectFn> = new Set();
+}
+
+export class ObservableMetadataStore extends MetadataStore<ObservableMetadata> {
+  init() {
+    return new ObservableMetadata();
+  }
+}
+
+export const instanceMetadataStore = new ObservableInstanceMetaDataStore();
+export const observableMetadataStore = new ObservableMetadataStore();

package/src/lib/observe.test.ts

@@ -98,9 +98,11 @@ describe('observable: observe()', () => {
     fixture<any>(html`<observable-1></observable-1>`).then((el) => {
       el.value = 100;
 
-      customElements.define('observable-1', Counter);
+      customElements.whenDefined('observable-1').then(() => {
+        el.value++;
+      });
 
-      el.value++;
+      customElements.define('observable-1', Counter);
     });
   });
 });

package/src/lib/observe.ts

@@ -1,76 +1,51 @@
-// ensure that the metadata symbol exists
-(Symbol as any).metadata ??= Symbol('Symbol.metadata');
-
-import { EffectFn, MetaData } from './meta.js';
-
-const metaData = new MetaData();
-
-export interface ObservableCtx {
-  metadata: {
-    effects?: Set<EffectFn>;
-  };
-}
+import { EffectFn, instanceMetadataStore, observableMetadataStore } from './metadata.js';
 
 export function observe<This extends object, Value>(
   base: ClassAccessorDecoratorTarget<This, Value>,
-  ctx: ClassAccessorDecoratorContext<This, Value> & ObservableCtx
+  ctx: ClassAccessorDecoratorContext<This, Value>
 ): ClassAccessorDecoratorResult<This, Value> {
-  // handle upgradable values (specifically custom elements)
-  ctx.addInitializer(function (this: This) {
-    const meta = metaData.read(this);
-
-    let value: Value | undefined;
-
-    // attempt to read value.
-    try {
-      value = ctx.access.get(this);
-    } catch {}
-
-    if (value) {
-      // if there is a value, delete it and cache it for init
-      delete (<any>this)[ctx.name];
-
-      meta.upgradable.set(ctx.name, value);
-    }
-  });
-
   return {
     init(value) {
-      const meta = metaData.read(this);
+      let val: Value | null = null;
 
-      if (meta.upgradable.has(ctx.name)) {
-        return meta.upgradable.get(ctx.name) as Value;
+      // START: Make upgradable custom elements work
+      try {
+        val = ctx.access.get(this);
+      } catch {}
+
+      if (val) {
+        delete (<any>this)[ctx.name];
+
+        return val;
       }
+      // END
 
       return value;
     },
     set(value) {
-      const meta = metaData.read(this);
+      const instanceMeta = instanceMetadataStore.read(this);
+      const observableMeta = observableMetadataStore.read(ctx.metadata);
 
-      if (meta.scheduler === null) {
-        meta.scheduler = Promise.resolve().then(() => {
-          if (ctx.metadata.effects) {
-            for (let effect of ctx.metadata.effects) {
-              effect.call(this, meta.changes);
-            }
+      if (instanceMeta.scheduler === null) {
+        instanceMeta.scheduler = Promise.resolve().then(() => {
+          for (let effect of observableMeta.effects) {
+            effect.call(this, instanceMeta.changes);
           }
 
-          meta.scheduler = null;
-          meta.changes.clear();
+          instanceMeta.scheduler = null;
+          instanceMeta.changes.clear();
         });
       }
 
-      meta.changes.add(ctx.name);
+      instanceMeta.changes.add(ctx.name);
 
       base.set.call(this, value);
     },
   };
 }
 
-export function effect<T extends object>(
-  value: EffectFn,
-  ctx: ClassMethodDecoratorContext<T> & ObservableCtx
-) {
-  ctx.metadata.effects ??= new Set();
-  ctx.metadata.effects.add(value);
+export function effect<T extends object>(value: EffectFn, ctx: ClassMethodDecoratorContext<T>) {
+  const data = observableMetadataStore.read(ctx.metadata);
+
+  data.effects.add(value);
 }

package/src/lib/watch.test.ts

@@ -0,0 +1,24 @@
+import { expect } from '@open-wc/testing';
+
+import { observe } from './observe.js';
+import { watch } from './watch.js';
+
+describe('observable: observe()', () => {
+  it('should watch externally from the class', (done) => {
+    class Counter {
+      @observe static accessor value = 0;
+    }
+
+    watch(Counter, () => {
+      expect(Counter.value).to.equal(1);
+
+      done();
+    });
+
+    expect(Counter.value).to.equal(0);
+
+    Counter.value++;
+
+    expect(Counter.value).to.equal(1);
+  });
+});

package/src/lib/watch.ts

@@ -0,0 +1,11 @@
+import { EffectFn, observableMetadataStore } from './metadata.js';
+
+export function watch(value: new () => object, cb: EffectFn) {
+  const key = value[Symbol.metadata];
+
+  if (key) {
+    const meta = observableMetadataStore.read(key);
+
+    meta.effects.add(cb);
+  }
+}

package/target/lib/metadata.d.ts

@@ -0,0 +1,21 @@
+export type EffectFn = (changes: Set<string | symbol>) => void;
+export declare abstract class MetadataStore<Metadata> {
+    #private;
+    read<T extends object>(value: T): Metadata;
+    abstract init(): Metadata;
+}
+export declare class ObservableInstanceMetadata {
+    scheduler: Promise<void> | null;
+    changes: Set<string | symbol>;
+}
+export declare class ObservableInstanceMetaDataStore extends MetadataStore<ObservableInstanceMetadata> {
+    init(): ObservableInstanceMetadata;
+}
+export declare class ObservableMetadata {
+    effects: Set<EffectFn>;
+}
+export declare class ObservableMetadataStore extends MetadataStore<ObservableMetadata> {
+    init(): ObservableMetadata;
+}
+export declare const instanceMetadataStore: ObservableInstanceMetaDataStore;
+export declare const observableMetadataStore: ObservableMetadataStore;

package/target/lib/metadata.js

@@ -0,0 +1,32 @@
+Symbol.metadata ??= Symbol('Symbol.metadata');
+export class MetadataStore {
+    #data = new WeakMap();
+    read(value) {
+        let data = this.#data.get(value);
+        if (!data) {
+            data = this.init();
+            this.#data.set(value, data);
+        }
+        return data;
+    }
+}
+export class ObservableInstanceMetadata {
+    scheduler = null;
+    changes = new Set();
+}
+export class ObservableInstanceMetaDataStore extends MetadataStore {
+    init() {
+        return new ObservableInstanceMetadata();
+    }
+}
+export class ObservableMetadata {
+    effects = new Set();
+}
+export class ObservableMetadataStore extends MetadataStore {
+    init() {
+        return new ObservableMetadata();
+    }
+}
+export const instanceMetadataStore = new ObservableInstanceMetaDataStore();
+export const observableMetadataStore = new ObservableMetadataStore();
+//# sourceMappingURL=metadata.js.map

package/target/lib/metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/lib/metadata.ts"],"names":[],"mappings":"AAAC,MAAc,CAAC,QAAQ,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAIvD,MAAM,OAAgB,aAAa;IACjC,KAAK,GAAG,IAAI,OAAO,EAAoB,CAAC;IAExC,IAAI,CAAmB,KAAQ;QAC7B,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAEnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CAGF;AAED,MAAM,OAAO,0BAA0B;IACrC,SAAS,GAAyB,IAAI,CAAC;IACvC,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAC;CACtC;AAED,MAAM,OAAO,+BAAgC,SAAQ,aAAyC;IAC5F,IAAI;QACF,OAAO,IAAI,0BAA0B,EAAE,CAAC;IAC1C,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IAC7B,OAAO,GAAkB,IAAI,GAAG,EAAE,CAAC;CACpC;AAED,MAAM,OAAO,uBAAwB,SAAQ,aAAiC;IAC5E,IAAI;QACF,OAAO,IAAI,kBAAkB,EAAE,CAAC;IAClC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,+BAA+B,EAAE,CAAC;AAC3E,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,EAAE,CAAC"}

package/target/lib/{meta.test.js → metadata.test.js}

@@ -1,19 +1,18 @@
 import { expect } from '@open-wc/testing';
-import { MetaData } from './meta.js';
+import { ObservableInstanceMetaDataStore } from './metadata.js';
 describe('meta:meta', () => {
     it('should return default metadata', () => {
         const key = {};
-        const data = new MetaData().read(key);
+        const data = new ObservableInstanceMetaDataStore().read(key);
         expect(data).to.deep.equal({
             changes: new Set(),
-            upgradable: new Map(),
             scheduler: null,
         });
     });
     it('should return the same metadata object after init', () => {
         const key = {};
-        const data = new MetaData();
+        const data = new ObservableInstanceMetaDataStore();
         expect(data.read(key)).to.equal(data.read(key));
     });
 });
-//# sourceMappingURL=meta.test.js.map
+//# sourceMappingURL=metadata.test.js.map

package/target/lib/metadata.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.test.js","sourceRoot":"","sources":["../../src/lib/metadata.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAEhE,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,IAAI,+BAA+B,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE7D,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACzB,OAAO,EAAE,IAAI,GAAG,EAAE;YAClB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,IAAI,+BAA+B,EAAE,CAAC;QAEnD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/target/lib/observe.d.ts

@@ -1,8 +1,3 @@
-import { EffectFn } from './meta.js';
-export interface ObservableCtx {
-    metadata: {
-        effects?: Set<EffectFn>;
-    };
-}
-export declare function observe<This extends object, Value>(base: ClassAccessorDecoratorTarget<This, Value>, ctx: ClassAccessorDecoratorContext<This, Value> & ObservableCtx): ClassAccessorDecoratorResult<This, Value>;
-export declare function effect<T extends object>(value: EffectFn, ctx: ClassMethodDecoratorContext<T> & ObservableCtx): void;
+import { EffectFn } from './metadata.js';
+export declare function observe<This extends object, Value>(base: ClassAccessorDecoratorTarget<This, Value>, ctx: ClassAccessorDecoratorContext<This, Value>): ClassAccessorDecoratorResult<This, Value>;
+export declare function effect<T extends object>(value: EffectFn, ctx: ClassMethodDecoratorContext<T>): void;

package/target/lib/observe.js

@@ -1,47 +1,37 @@
-Symbol.metadata ??= Symbol('Symbol.metadata');
-import { MetaData } from './meta.js';
-const metaData = new MetaData();
+import { instanceMetadataStore, observableMetadataStore } from './metadata.js';
 export function observe(base, ctx) {
-    ctx.addInitializer(function () {
-        const meta = metaData.read(this);
-        let value;
-        try {
-            value = ctx.access.get(this);
-        }
-        catch { }
-        if (value) {
-            delete this[ctx.name];
-            meta.upgradable.set(ctx.name, value);
-        }
-    });
     return {
         init(value) {
-            const meta = metaData.read(this);
-            if (meta.upgradable.has(ctx.name)) {
-                return meta.upgradable.get(ctx.name);
+            let val = null;
+            try {
+                val = ctx.access.get(this);
+            }
+            catch { }
+            if (val) {
+                delete this[ctx.name];
+                return val;
             }
             return value;
         },
         set(value) {
-            const meta = metaData.read(this);
-            if (meta.scheduler === null) {
-                meta.scheduler = Promise.resolve().then(() => {
-                    if (ctx.metadata.effects) {
-                        for (let effect of ctx.metadata.effects) {
-                            effect.call(this, meta.changes);
-                        }
+            const instanceMeta = instanceMetadataStore.read(this);
+            const observableMeta = observableMetadataStore.read(ctx.metadata);
+            if (instanceMeta.scheduler === null) {
+                instanceMeta.scheduler = Promise.resolve().then(() => {
+                    for (let effect of observableMeta.effects) {
+                        effect.call(this, instanceMeta.changes);
                     }
-                    meta.scheduler = null;
-                    meta.changes.clear();
+                    instanceMeta.scheduler = null;
+                    instanceMeta.changes.clear();
                 });
             }
-            meta.changes.add(ctx.name);
+            instanceMeta.changes.add(ctx.name);
             base.set.call(this, value);
         },
     };
 }
 export function effect(value, ctx) {
-    ctx.metadata.effects ??= new Set();
-    ctx.metadata.effects.add(value);
+    const data = observableMetadataStore.read(ctx.metadata);
+    data.effects.add(value);
 }
 //# sourceMappingURL=observe.js.map

package/target/lib/observe.js.map

@@ -1 +1 @@
-{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../src/lib/observe.ts"],"names":[],"mappings":"AACC,MAAc,CAAC,QAAQ,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEvD,OAAO,EAAY,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE/C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;AAQhC,MAAM,UAAU,OAAO,CACrB,IAA+C,EAC/C,GAA+D;IAG/D,GAAG,CAAC,cAAc,CAAC;QACjB,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,KAAwB,CAAC;QAG7B,IAAI,CAAC;YACH,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,IAAI,KAAK,EAAE,CAAC;YAEV,OAAa,IAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAE7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,CAAC,KAAK;YACR,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEjC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAU,CAAC;YAChD,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QACD,GAAG,CAAC,KAAK;YACP,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEjC,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;gBAC5B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC3C,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACzB,KAAK,IAAI,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;4BACxC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;wBAClC,CAAC;oBACH,CAAC;oBAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;oBACtB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAE3B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,MAAM,CACpB,KAAe,EACf,GAAmD;IAEnD,GAAG,CAAC,QAAQ,CAAC,OAAO,KAAK,IAAI,GAAG,EAAE,CAAC;IACnC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC"}
+{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../src/lib/observe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAEzF,MAAM,UAAU,OAAO,CACrB,IAA+C,EAC/C,GAA+C;IAE/C,OAAO;QACL,IAAI,CAAC,KAAK;YACR,IAAI,GAAG,GAAiB,IAAI,CAAC;YAG7B,IAAI,CAAC;gBACH,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;YAEV,IAAI,GAAG,EAAE,CAAC;gBACR,OAAa,IAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE7B,OAAO,GAAG,CAAC;YACb,CAAC;YAGD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,GAAG,CAAC,KAAK;YACP,MAAM,YAAY,GAAG,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAElE,IAAI,YAAY,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;gBACpC,YAAY,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBACnD,KAAK,IAAI,MAAM,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;wBAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;oBAC1C,CAAC;oBAED,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC;oBAC9B,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC/B,CAAC,CAAC,CAAC;YACL,CAAC;YAED,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,MAAM,CAAmB,KAAe,EAAE,GAAmC;IAC3F,MAAM,IAAI,GAAG,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAExD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC"}

package/target/lib/observe.test.js

@@ -7,24 +7,27 @@ describe('observable: observe()', () => {
             let _staticExtraInitializers = [];
             let _static_value_decorators;
             let _static_value_initializers = [];
+            let _static_value_extraInitializers = [];
             let _static_onPropChanged_decorators;
             return class Counter {
                 static {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
                     _static_value_decorators = [observe];
                     _static_onPropChanged_decorators = [effect];
-                    __esDecorate(this, null, _static_value_decorators, { kind: "accessor", name: "value", static: true, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _static_value_initializers, _staticExtraInitializers);
+                    __esDecorate(this, null, _static_value_decorators, { kind: "accessor", name: "value", static: true, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _static_value_initializers, _static_value_extraInitializers);
                     __esDecorate(this, null, _static_onPropChanged_decorators, { kind: "method", name: "onPropChanged", static: true, private: false, access: { has: obj => "onPropChanged" in obj, get: obj => obj.onPropChanged }, metadata: _metadata }, null, _staticExtraInitializers);
                     if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-                    __runInitializers(this, _staticExtraInitializers);
                 }
-                static #value_accessor_storage = __runInitializers(this, _static_value_initializers, 0);
+                static #value_accessor_storage = (__runInitializers(this, _staticExtraInitializers), __runInitializers(this, _static_value_initializers, 0));
                 static get value() { return Counter.#value_accessor_storage; }
                 static set value(value) { Counter.#value_accessor_storage = value; }
                 static onPropChanged() {
                     expect(Counter.value).to.equal(1);
                     done();
                 }
+                static {
+                    __runInitializers(this, _static_value_extraInitializers);
+                }
             };
         })();
         expect(Counter.value).to.equal(0);
@@ -36,6 +39,7 @@ describe('observable: observe()', () => {
             let _instanceExtraInitializers = [];
             let _value_decorators;
             let _value_initializers = [];
+            let _value_extraInitializers = [];
             let _private_onChange_decorators;
             let _private_onChange_descriptor;
             return class Counter {
@@ -43,7 +47,7 @@ describe('observable: observe()', () => {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
                     _value_decorators = [observe];
                     _private_onChange_decorators = [effect];
-                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _instanceExtraInitializers);
+                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _value_extraInitializers);
                     __esDecorate(this, _private_onChange_descriptor = { value: __setFunctionName(function () {
                             expect(this.value).to.equal(1);
                             done();
@@ -54,6 +58,9 @@ describe('observable: observe()', () => {
                 get value() { return this.#value_accessor_storage; }
                 set value(value) { this.#value_accessor_storage = value; }
                 get #onChange() { return _private_onChange_descriptor.value; }
+                constructor() {
+                    __runInitializers(this, _value_extraInitializers);
+                }
             };
         })();
         const counter = new Counter();
@@ -66,13 +73,14 @@ describe('observable: observe()', () => {
             let _instanceExtraInitializers = [];
             let _value_decorators;
             let _value_initializers = [];
+            let _value_extraInitializers = [];
             let _onChange_decorators;
             return class Counter {
                 static {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
                     _value_decorators = [observe];
                     _onChange_decorators = [effect];
-                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _instanceExtraInitializers);
+                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _value_extraInitializers);
                     __esDecorate(this, null, _onChange_decorators, { kind: "method", name: "onChange", static: false, private: false, access: { has: obj => "onChange" in obj, get: obj => obj.onChange }, metadata: _metadata }, null, _instanceExtraInitializers);
                     if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 }
@@ -83,6 +91,9 @@ describe('observable: observe()', () => {
                     expect(changes.has('value')).to.be.true;
                     done();
                 }
+                constructor() {
+                    __runInitializers(this, _value_extraInitializers);
+                }
             };
         })();
         const counter = new Counter();
@@ -94,13 +105,14 @@ describe('observable: observe()', () => {
             let _instanceExtraInitializers = [];
             let _value_decorators;
             let _value_initializers = [];
+            let _value_extraInitializers = [];
             let _onChange_decorators;
             return class Counter extends _classSuper {
                 static {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
                     _value_decorators = [observe];
                     _onChange_decorators = [effect];
-                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _instanceExtraInitializers);
+                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _value_extraInitializers);
                     __esDecorate(this, null, _onChange_decorators, { kind: "method", name: "onChange", static: false, private: false, access: { has: obj => "onChange" in obj, get: obj => obj.onChange }, metadata: _metadata }, null, _instanceExtraInitializers);
                     if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 }
@@ -110,6 +122,10 @@ describe('observable: observe()', () => {
                 onChange() {
                     this.dispatchEvent(new Event('changed'));
                 }
+                constructor() {
+                    super(...arguments);
+                    __runInitializers(this, _value_extraInitializers);
+                }
             };
         })();
         const counter = new Counter();
@@ -125,13 +141,14 @@ describe('observable: observe()', () => {
             let _instanceExtraInitializers = [];
             let _value_decorators;
             let _value_initializers = [];
+            let _value_extraInitializers = [];
             let _onChange_decorators;
             return class Counter extends _classSuper {
                 static {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
                     _value_decorators = [observe];
                     _onChange_decorators = [effect];
-                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _instanceExtraInitializers);
+                    __esDecorate(this, null, _value_decorators, { kind: "accessor", name: "value", static: false, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _value_initializers, _value_extraInitializers);
                     __esDecorate(this, null, _onChange_decorators, { kind: "method", name: "onChange", static: false, private: false, access: { has: obj => "onChange" in obj, get: obj => obj.onChange }, metadata: _metadata }, null, _instanceExtraInitializers);
                     if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 }
@@ -140,6 +157,7 @@ describe('observable: observe()', () => {
                 set value(value) { this.#value_accessor_storage = value; }
                 constructor() {
                     super();
+                    __runInitializers(this, _value_extraInitializers);
                     expect(this.value).to.equal(100);
                 }
                 onChange() {
@@ -150,8 +168,10 @@ describe('observable: observe()', () => {
         })();
         fixture(html `<observable-1></observable-1>`).then((el) => {
             el.value = 100;
+            customElements.whenDefined('observable-1').then(() => {
+                el.value++;
+            });
             customElements.define('observable-1', Counter);
-            el.value++;
         });
     });
 });

package/target/lib/observe.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"observe.test.js","sourceRoot":"","sources":["../../src/lib/observe.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"observe.test.js","sourceRoot":"","sources":["../../src/lib/observe.test.ts"],"names":[],"mappings":"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"}

package/target/lib/watch.d.ts

@@ -0,0 +1,2 @@
+import { EffectFn } from './metadata.js';
+export declare function watch(value: new () => object, cb: EffectFn): void;

package/target/lib/watch.js

@@ -0,0 +1,9 @@
+import { observableMetadataStore } from './metadata.js';
+export function watch(value, cb) {
+    const key = value[Symbol.metadata];
+    if (key) {
+        const meta = observableMetadataStore.read(key);
+        meta.effects.add(cb);
+    }
+}
+//# sourceMappingURL=watch.js.map

package/target/lib/watch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/lib/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAElE,MAAM,UAAU,KAAK,CAAC,KAAuB,EAAE,EAAY;IACzD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEnC,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,IAAI,GAAG,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACvB,CAAC;AACH,CAAC"}

package/target/lib/watch.test.d.ts

@@ -0,0 +1 @@
+export {};

package/target/lib/watch.test.js

@@ -0,0 +1,35 @@
+import { __esDecorate, __runInitializers } from "tslib";
+import { expect } from '@open-wc/testing';
+import { observe } from './observe.js';
+import { watch } from './watch.js';
+describe('observable: observe()', () => {
+    it('should watch externally from the class', (done) => {
+        let Counter = (() => {
+            let _static_value_decorators;
+            let _static_value_initializers = [];
+            let _static_value_extraInitializers = [];
+            return class Counter {
+                static {
+                    const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+                    _static_value_decorators = [observe];
+                    __esDecorate(this, null, _static_value_decorators, { kind: "accessor", name: "value", static: true, private: false, access: { has: obj => "value" in obj, get: obj => obj.value, set: (obj, value) => { obj.value = value; } }, metadata: _metadata }, _static_value_initializers, _static_value_extraInitializers);
+                    if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+                }
+                static #value_accessor_storage = __runInitializers(this, _static_value_initializers, 0);
+                static get value() { return Counter.#value_accessor_storage; }
+                static set value(value) { Counter.#value_accessor_storage = value; }
+                static {
+                    __runInitializers(this, _static_value_extraInitializers);
+                }
+            };
+        })();
+        watch(Counter, () => {
+            expect(Counter.value).to.equal(1);
+            done();
+        });
+        expect(Counter.value).to.equal(0);
+        Counter.value++;
+        expect(Counter.value).to.equal(1);
+    });
+});
+//# sourceMappingURL=watch.test.js.map

package/target/lib/watch.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.test.js","sourceRoot":"","sources":["../../src/lib/watch.test.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,wCAAwC,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9C,OAAO;;;;yBAAP,OAAO;;;gDACV,OAAO;oBAAC,0KAAgB,KAAK,6BAAL,KAAK,mGAAK;;;gBAA1B,MAAM,+EAAkB,CAAC,EAAC;gBAA1B,MAAM,KAAU,KAAK,YAD1B,OAAO,2BACwB;gBAA1B,WAAgB,KAAK,UAD1B,OAAO,mCACwB;;;;;;QAGrC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE;YAClB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAElC,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAElC,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/src/lib/meta.ts

@@ -1,23 +0,0 @@
-export type EffectFn = (changes: Set<string | symbol>) => void;
-
-export class ObservableMetaData {
-  scheduler: Promise<void> | null = null;
-  upgradable = new Map<string | symbol, unknown>();
-  changes = new Set<string | symbol>();
-}
-
-export class MetaData {
-  #data = new WeakMap<object, ObservableMetaData>();
-
-  read<T extends object>(value: T) {
-    if (this.#data.has(value)) {
-      return this.#data.get(value) as ObservableMetaData;
-    }
-
-    const data = new ObservableMetaData();
-
-    this.#data.set(value, data);
-
-    return data;
-  }
-}

package/target/lib/meta.d.ts

@@ -1,10 +0,0 @@
-export type EffectFn = (changes: Set<string | symbol>) => void;
-export declare class ObservableMetaData {
-    scheduler: Promise<void> | null;
-    upgradable: Map<string | symbol, unknown>;
-    changes: Set<string | symbol>;
-}
-export declare class MetaData {
-    #private;
-    read<T extends object>(value: T): ObservableMetaData;
-}

package/target/lib/meta.js

@@ -1,17 +0,0 @@
-export class ObservableMetaData {
-    scheduler = null;
-    upgradable = new Map();
-    changes = new Set();
-}
-export class MetaData {
-    #data = new WeakMap();
-    read(value) {
-        if (this.#data.has(value)) {
-            return this.#data.get(value);
-        }
-        const data = new ObservableMetaData();
-        this.#data.set(value, data);
-        return data;
-    }
-}
-//# sourceMappingURL=meta.js.map

package/target/lib/meta.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../src/lib/meta.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,kBAAkB;IAC7B,SAAS,GAAyB,IAAI,CAAC;IACvC,UAAU,GAAG,IAAI,GAAG,EAA4B,CAAC;IACjD,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAC;CACtC;AAED,MAAM,OAAO,QAAQ;IACnB,KAAK,GAAG,IAAI,OAAO,EAA8B,CAAC;IAElD,IAAI,CAAmB,KAAQ;QAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAuB,CAAC;QACrD,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAEtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/target/lib/meta.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"meta.test.js","sourceRoot":"","sources":["../../src/lib/meta.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEtC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACzB,OAAO,EAAE,IAAI,GAAG,EAAE;YAClB,UAAU,EAAE,IAAI,GAAG,EAAE;YACrB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;QAE5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}