@joist/observable 4.0.0-next.4 → 4.0.0-next.41

package/README.md

@@ -5,17 +5,21 @@ Adds the ability to monitor class properties (static and instance) for changes
 #### Installation:
 
 ```BASH
-npm i @joist/observable
+npm i @joist/observable@next
 ```
 
 ```TS
 import { observe, effect } from '@joist/observable';
 
 class AppState {
-  @observe accessor todos: string[] = [];
-  @observe accessor userName?: string;
+  @observe()
+  accessor todos: string[] = [];
 
-  @effect onChange(changes: Set<string | symbol>) {
+  @observe()
+  accessor userName?: string;
+
+  @effect()
+  onChange(changes: Changes) {
     console.log(changes);
   }
 }

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@joist/observable",
-  "version": "4.0.0-next.4",
+  "version": "4.0.0-next.41",
   "type": "module",
   "main": "./target/lib.js",
   "module": "./target/lib.js",
   "exports": {
-    ".": {
-      "import": "./target/lib.js"
-    },
-    "./*": {
-      "import": "./target/lib/*.js"
-    }
+    ".": "./target/lib.js",
+    "./*": "./target/lib/*",
+    "./package.json": "./package.json"
   },
   "files": [
     "src",
@@ -57,6 +54,7 @@
     "test": {
       "command": "wtr --config wtr.config.mjs",
       "files": [
+        "wtr.config.mjs",
         "target/**"
       ],
       "output": [],

package/src/lib/metadata.test.ts

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

package/src/lib/metadata.ts

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

package/src/lib/observe.test.ts

@@ -1,108 +1,102 @@
-import { expect, fixture, html } from '@open-wc/testing';
+import { assert } from 'chai';
 
 import { effect, observe } from './observe.js';
+import { Changes } from './metadata.js';
 
-describe('observable: observe()', () => {
-  it('should work with static accessors', (done) => {
+it('should work with static accessors', () => {
+  return new Promise<void>((resolve) => {
     class Counter {
-      @observe static accessor value = 0;
+      @observe()
+      static accessor value = 0;
 
-      @effect static onPropChanged() {
-        expect(Counter.value).to.equal(1);
+      @effect() static onPropChanged() {
+        assert.equal(Counter.value, 1);
 
-        done();
+        resolve();
       }
     }
 
-    expect(Counter.value).to.equal(0);
+    assert.equal(Counter.value, 0);
 
     Counter.value++;
 
-    expect(Counter.value).to.equal(1);
+    assert.equal(Counter.value, 1);
   });
+});
 
-  it('should work with instance accessors', (done) => {
+it('should work with instance accessors', () => {
+  return new Promise<void>((resolve) => {
     class Counter {
-      @observe accessor value = 0;
+      @observe()
+      accessor value = 0;
 
       // confirm it works with private methods
       // @ts-ignore
-      @effect #onChange() {
-        expect(this.value).to.equal(1);
+      @effect() #onChange() {
+        assert.equal(this.value, 1);
 
-        done();
+        resolve();
       }
     }
 
     const counter = new Counter();
 
-    expect(counter.value).to.equal(0);
+    assert.equal(counter.value, 0);
 
     counter.value++;
 
-    expect(counter.value).to.equal(1);
+    assert.equal(counter.value, 1);
   });
+});
 
-  it('should return a set of changed props', (done) => {
+it('should return a set of changed props', () => {
+  return new Promise<void>((resolve) => {
     class Counter {
-      @observe accessor value = 0;
-
-      @effect onChange(changes: Set<symbol | string>) {
-        expect(changes.has('value')).to.be.true;
-
-        done();
-      }
-    }
-
-    const counter = new Counter();
-    counter.value++;
-  });
+      @observe() accessor value = 0;
 
-  it('should work as an even emitter', (done) => {
-    class Counter extends EventTarget {
-      @observe accessor value = 0;
+      @effect() onChange(changes: Changes<this>) {
+        assert.deepEqual(changes.get('value'), {
+          oldValue: 0,
+          newValue: 1
+        });
 
-      @effect onChange() {
-        this.dispatchEvent(new Event('changed'));
+        resolve();
       }
     }
 
     const counter = new Counter();
-
-    counter.addEventListener('changed', () => {
-      expect(counter.value).to.equal(1);
-
-      done();
-    });
-
     counter.value++;
   });
+});
 
-  it('should upgrade custom elements', (done) => {
+it('should upgrade custom elements', () => {
+  return new Promise<void>((resolve) => {
     class Counter extends HTMLElement {
-      @observe accessor value = 0;
+      @observe()
+      accessor value = 0;
 
       constructor() {
         super();
 
-        expect(this.value).to.equal(100);
+        assert.equal(this.value, 100);
       }
 
-      @effect onChange() {
-        expect(this.value).to.equal(101);
+      @effect() onChange() {
+        assert.equal(this.value, 101);
 
-        done();
+        resolve();
       }
     }
 
-    fixture<any>(html`<observable-1></observable-1>`).then((el) => {
-      el.value = 100;
+    const el = document.createElement('observable-1') as Counter;
+    el.value = 100;
 
-      customElements.whenDefined('observable-1').then(() => {
-        el.value++;
-      });
+    document.body.append(el);
 
-      customElements.define('observable-1', Counter);
+    customElements.whenDefined('observable-1').then(() => {
+      el.value++;
     });
+
+    customElements.define('observable-1', Counter);
   });
 });

package/src/lib/observe.ts

@@ -1,51 +1,62 @@
 import { EffectFn, instanceMetadataStore, observableMetadataStore } from './metadata.js';
 
-export function observe<This extends object, Value>(
-  base: ClassAccessorDecoratorTarget<This, Value>,
-  ctx: ClassAccessorDecoratorContext<This, Value>
-): ClassAccessorDecoratorResult<This, Value> {
-  return {
-    init(value) {
-      let val: Value | null = null;
-
-      // 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 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);
-          }
-
-          instanceMeta.scheduler = null;
-          instanceMeta.changes.clear();
+export function observe() {
+  return function observeDecorator<This extends object, Value>(
+    base: ClassAccessorDecoratorTarget<This, Value>,
+    ctx: ClassAccessorDecoratorContext<This, Value>
+  ): ClassAccessorDecoratorResult<This, Value> {
+    const observableMeta = observableMetadataStore.read<This>(ctx.metadata);
+
+    return {
+      init(value) {
+        let val: Value | null = null;
+
+        // START: Make upgradable custom elements work
+        try {
+          val = ctx.access.get(this);
+        } catch {}
+
+        if (val) {
+          Reflect.deleteProperty(this, ctx.name);
+
+          return val;
+        }
+        // END
+
+        return value;
+      },
+      set(value) {
+        const instanceMeta = instanceMetadataStore.read<This>(this);
+
+        if (instanceMeta.scheduler === null) {
+          instanceMeta.scheduler = Promise.resolve().then(() => {
+            for (let effect of observableMeta.effects) {
+              effect.call(this, instanceMeta.changes);
+            }
+
+            instanceMeta.scheduler = null;
+            instanceMeta.changes.clear();
+          });
+        }
+
+        instanceMeta.changes.set(ctx.name as keyof This, {
+          oldValue: base.get.call(this) as This[keyof This],
+          newValue: value as This[keyof This]
         });
-      }
-
-      instanceMeta.changes.add(ctx.name);
 
-      base.set.call(this, value);
-    }
+        base.set.call(this, value);
+      }
+    };
   };
 }
 
-export function effect<T extends object>(value: EffectFn, ctx: ClassMethodDecoratorContext<T>) {
-  const data = observableMetadataStore.read(ctx.metadata);
+export function effect() {
+  return function effectDecorator<T extends object>(
+    value: EffectFn<T>,
+    ctx: ClassMethodDecoratorContext<T>
+  ): void {
+    const data = observableMetadataStore.read<T>(ctx.metadata);
 
-  data.effects.add(value);
+    data.effects.add(value);
+  };
 }

package/src/lib.ts

@@ -1 +1,2 @@
 export { observe, effect } from './lib/observe.js';
+export { Changes } from './lib/metadata.js';

package/target/lib/metadata.d.ts

@@ -1,20 +1,21 @@
-export type EffectFn = (changes: Set<string | symbol>) => void;
-export declare abstract class MetadataStore<Metadata> extends WeakMap<object, Metadata> {
-    read(key: object): Metadata;
-    abstract init(): Metadata;
+export type EffectFn<T> = (changes: Changes<T>) => void;
+export declare class Changes<T> extends Map<keyof T, {
+    oldValue: unknown;
+    newValue: unknown;
+}> {
 }
-export declare class ObservableInstanceMetadata {
+export declare class ObservableInstanceMetadata<T> {
     scheduler: Promise<void> | null;
-    changes: Set<string | symbol>;
+    changes: Changes<T>;
 }
-export declare class ObservableInstanceMetaDataStore extends MetadataStore<ObservableInstanceMetadata> {
-    init(): ObservableInstanceMetadata;
+export declare class ObservableInstanceMetaDataStore extends WeakMap<object, ObservableInstanceMetadata<unknown>> {
+    read<T extends object>(key: T): ObservableInstanceMetadata<T>;
 }
-export declare class ObservableMetadata {
-    effects: Set<EffectFn>;
+export declare class ObservableMetadata<T> {
+    effects: Set<EffectFn<T>>;
 }
-export declare class ObservableMetadataStore extends MetadataStore<ObservableMetadata> {
-    init(): ObservableMetadata;
+export declare class ObservableMetadataStore extends WeakMap<object, ObservableMetadata<unknown>> {
+    read<T extends object>(key: object): ObservableMetadata<T>;
 }
 export declare const instanceMetadataStore: ObservableInstanceMetaDataStore;
 export declare const observableMetadataStore: ObservableMetadataStore;

package/target/lib/metadata.js

@@ -1,29 +1,31 @@
 Symbol.metadata ??= Symbol('Symbol.metadata');
-export class MetadataStore extends WeakMap {
+export class Changes extends Map {
+}
+export class ObservableInstanceMetadata {
+    scheduler = null;
+    changes = new Changes();
+}
+export class ObservableInstanceMetaDataStore extends WeakMap {
     read(key) {
         let data = this.get(key);
         if (!data) {
-            data = this.init();
+            data = new ObservableInstanceMetadata();
             this.set(key, 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 class ObservableMetadataStore extends WeakMap {
+    read(key) {
+        let data = this.get(key);
+        if (!data) {
+            data = new ObservableMetadata();
+            this.set(key, data);
+        }
+        return data;
     }
 }
 export const instanceMetadataStore = new ObservableInstanceMetaDataStore();

package/target/lib/metadata.js.map

@@ -1 +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,aAAwB,SAAQ,OAAyB;IAC7E,IAAI,CAAC,GAAW;QACd,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAEnB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtB,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"}
+{"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,OAAO,OAAW,SAAQ,GAAsD;CAAG;AAEzF,MAAM,OAAO,0BAA0B;IACrC,SAAS,GAAyB,IAAI,CAAC;IACvC,OAAO,GAAe,IAAI,OAAO,EAAE,CAAC;CACrC;AAED,MAAM,OAAO,+BAAgC,SAAQ,OAGpD;IACC,IAAI,CAAmB,GAAM;QAC3B,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,IAAI,0BAA0B,EAAE,CAAC;YAExC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IAC7B,OAAO,GAAqB,IAAI,GAAG,EAAE,CAAC;CACvC;AAED,MAAM,OAAO,uBAAwB,SAAQ,OAA4C;IACvF,IAAI,CAAmB,GAAW;QAChC,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,IAAI,kBAAkB,EAAE,CAAC;YAEhC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtB,CAAC;QAED,OAAO,IAA6B,CAAC;IACvC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,qBAAqB,GAChC,IAAI,+BAA+B,EAAE,CAAC;AAExC,MAAM,CAAC,MAAM,uBAAuB,GAA4B,IAAI,uBAAuB,EAAE,CAAC"}

package/target/lib/metadata.test.js

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

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

@@ -1 +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"}
+{"version":3,"file":"metadata.test.js","sourceRoot":"","sources":["../../src/lib/metadata.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAEzE,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;IACxC,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,MAAM,IAAI,GAAG,IAAI,+BAA+B,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE7D,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC3D,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,MAAM,IAAI,GAAG,IAAI,+BAA+B,EAAE,CAAC;IAEnD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC"}

package/target/lib/observe.d.ts

@@ -1,3 +1,3 @@
 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;
+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<T>, ctx: ClassMethodDecoratorContext<T>) => void;

package/target/lib/observe.js

@@ -1,37 +1,44 @@
 import { instanceMetadataStore, observableMetadataStore } from './metadata.js';
-export function observe(base, ctx) {
-    return {
-        init(value) {
-            let val = null;
-            try {
-                val = ctx.access.get(this);
-            }
-            catch { }
-            if (val) {
-                delete this[ctx.name];
-                return val;
-            }
-            return value;
-        },
-        set(value) {
-            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);
-                    }
-                    instanceMeta.scheduler = null;
-                    instanceMeta.changes.clear();
+export function observe() {
+    return function observeDecorator(base, ctx) {
+        const observableMeta = observableMetadataStore.read(ctx.metadata);
+        return {
+            init(value) {
+                let val = null;
+                try {
+                    val = ctx.access.get(this);
+                }
+                catch { }
+                if (val) {
+                    Reflect.deleteProperty(this, ctx.name);
+                    return val;
+                }
+                return value;
+            },
+            set(value) {
+                const instanceMeta = instanceMetadataStore.read(this);
+                if (instanceMeta.scheduler === null) {
+                    instanceMeta.scheduler = Promise.resolve().then(() => {
+                        for (let effect of observableMeta.effects) {
+                            effect.call(this, instanceMeta.changes);
+                        }
+                        instanceMeta.scheduler = null;
+                        instanceMeta.changes.clear();
+                    });
+                }
+                instanceMeta.changes.set(ctx.name, {
+                    oldValue: base.get.call(this),
+                    newValue: value
                 });
+                base.set.call(this, value);
             }
-            instanceMeta.changes.add(ctx.name);
-            base.set.call(this, value);
-        }
+        };
     };
 }
-export function effect(value, ctx) {
-    const data = observableMetadataStore.read(ctx.metadata);
-    data.effects.add(value);
+export function effect() {
+    return function effectDecorator(value, ctx) {
+        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":"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"}
+{"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;IACrB,OAAO,SAAS,gBAAgB,CAC9B,IAA+C,EAC/C,GAA+C;QAE/C,MAAM,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAO,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExE,OAAO;YACL,IAAI,CAAC,KAAK;gBACR,IAAI,GAAG,GAAiB,IAAI,CAAC;gBAG7B,IAAI,CAAC;oBACH,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;gBAEV,IAAI,GAAG,EAAE,CAAC;oBACR,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBAEvC,OAAO,GAAG,CAAC;gBACb,CAAC;gBAGD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,GAAG,CAAC,KAAK;gBACP,MAAM,YAAY,GAAG,qBAAqB,CAAC,IAAI,CAAO,IAAI,CAAC,CAAC;gBAE5D,IAAI,YAAY,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;oBACpC,YAAY,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;wBACnD,KAAK,IAAI,MAAM,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;4BAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;wBAC1C,CAAC;wBAED,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC;wBAC9B,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;oBAC/B,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAkB,EAAE;oBAC/C,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAqB;oBACjD,QAAQ,EAAE,KAAyB;iBACpC,CAAC,CAAC;gBAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;SACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,MAAM;IACpB,OAAO,SAAS,eAAe,CAC7B,KAAkB,EAClB,GAAmC;QAEnC,MAAM,IAAI,GAAG,uBAAuB,CAAC,IAAI,CAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC"}

package/target/lib/observe.test.js

@@ -1,8 +1,8 @@
 import { __esDecorate, __runInitializers, __setFunctionName } from "tslib";
-import { expect, fixture, html } from '@open-wc/testing';
+import { assert } from 'chai';
 import { effect, observe } from './observe.js';
-describe('observable: observe()', () => {
-    it('should work with static accessors', (done) => {
+it('should work with static accessors', () => {
+    return new Promise((resolve) => {
         let Counter = (() => {
             let _staticExtraInitializers = [];
             let _static_value_decorators;
@@ -12,8 +12,8 @@ describe('observable: observe()', () => {
             return class Counter {
                 static {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-                    _static_value_decorators = [observe];
-                    _static_onPropChanged_decorators = [effect];
+                    _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, _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 });
@@ -22,19 +22,21 @@ describe('observable: observe()', () => {
                 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();
+                    assert.equal(Counter.value, 1);
+                    resolve();
                 }
                 static {
                     __runInitializers(this, _static_value_extraInitializers);
                 }
             };
         })();
-        expect(Counter.value).to.equal(0);
+        assert.equal(Counter.value, 0);
         Counter.value++;
-        expect(Counter.value).to.equal(1);
+        assert.equal(Counter.value, 1);
     });
-    it('should work with instance accessors', (done) => {
+});
+it('should work with instance accessors', () => {
+    return new Promise((resolve) => {
         let Counter = (() => {
             let _instanceExtraInitializers = [];
             let _value_decorators;
@@ -45,12 +47,12 @@ describe('observable: observe()', () => {
             return class Counter {
                 static {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-                    _value_decorators = [observe];
-                    _private_onChange_decorators = [effect];
+                    _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, _value_extraInitializers);
                     __esDecorate(this, _private_onChange_descriptor = { value: __setFunctionName(function () {
-                            expect(this.value).to.equal(1);
-                            done();
+                            assert.equal(this.value, 1);
+                            resolve();
                         }, "#onChange") }, _private_onChange_decorators, { kind: "method", name: "#onChange", static: false, private: true, 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 });
                 }
@@ -64,11 +66,13 @@ describe('observable: observe()', () => {
             };
         })();
         const counter = new Counter();
-        expect(counter.value).to.equal(0);
+        assert.equal(counter.value, 0);
         counter.value++;
-        expect(counter.value).to.equal(1);
+        assert.equal(counter.value, 1);
     });
-    it('should return a set of changed props', (done) => {
+});
+it('should return a set of changed props', () => {
+    return new Promise((resolve) => {
         let Counter = (() => {
             let _instanceExtraInitializers = [];
             let _value_decorators;
@@ -78,8 +82,8 @@ describe('observable: observe()', () => {
             return class Counter {
                 static {
                     const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-                    _value_decorators = [observe];
-                    _onChange_decorators = [effect];
+                    _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, _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 });
@@ -88,54 +92,23 @@ describe('observable: observe()', () => {
                 get value() { return this.#value_accessor_storage; }
                 set value(value) { this.#value_accessor_storage = value; }
                 onChange(changes) {
-                    expect(changes.has('value')).to.be.true;
-                    done();
-                }
-                constructor() {
-                    __runInitializers(this, _value_extraInitializers);
-                }
-            };
-        })();
-        const counter = new Counter();
-        counter.value++;
-    });
-    it('should work as an even emitter', (done) => {
-        let Counter = (() => {
-            let _classSuper = EventTarget;
-            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, _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 });
-                }
-                #value_accessor_storage = (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _value_initializers, 0));
-                get value() { return this.#value_accessor_storage; }
-                set value(value) { this.#value_accessor_storage = value; }
-                onChange() {
-                    this.dispatchEvent(new Event('changed'));
+                    assert.deepEqual(changes.get('value'), {
+                        oldValue: 0,
+                        newValue: 1
+                    });
+                    resolve();
                 }
                 constructor() {
-                    super(...arguments);
                     __runInitializers(this, _value_extraInitializers);
                 }
             };
         })();
         const counter = new Counter();
-        counter.addEventListener('changed', () => {
-            expect(counter.value).to.equal(1);
-            done();
-        });
         counter.value++;
     });
-    it('should upgrade custom elements', (done) => {
+});
+it('should upgrade custom elements', () => {
+    return new Promise((resolve) => {
         let Counter = (() => {
             let _classSuper = HTMLElement;
             let _instanceExtraInitializers = [];
@@ -146,8 +119,8 @@ describe('observable: observe()', () => {
             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];
+                    _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, _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 });
@@ -158,21 +131,21 @@ describe('observable: observe()', () => {
                 constructor() {
                     super();
                     __runInitializers(this, _value_extraInitializers);
-                    expect(this.value).to.equal(100);
+                    assert.equal(this.value, 100);
                 }
                 onChange() {
-                    expect(this.value).to.equal(101);
-                    done();
+                    assert.equal(this.value, 101);
+                    resolve();
                 }
             };
         })();
-        fixture(html `<observable-1></observable-1>`).then((el) => {
-            el.value = 100;
-            customElements.whenDefined('observable-1').then(() => {
-                el.value++;
-            });
-            customElements.define('observable-1', Counter);
+        const el = document.createElement('observable-1');
+        el.value = 100;
+        document.body.append(el);
+        customElements.whenDefined('observable-1').then(() => {
+            el.value++;
         });
+        customElements.define('observable-1', Counter);
     });
 });
 //# sourceMappingURL=observe.test.js.map

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.d.ts

@@ -1 +1,2 @@
 export { observe, effect } from './lib/observe.js';
+export { Changes } from './lib/metadata.js';

package/target/lib.js

@@ -1,2 +1,3 @@
 export { observe, effect } from './lib/observe.js';
+export { Changes } from './lib/metadata.js';
 //# sourceMappingURL=lib.js.map

package/target/lib.js.map

@@ -1 +1 @@
-{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC"}

package/src/lib/watch.test.ts

@@ -1,24 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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/watch.d.ts

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

package/target/lib/watch.js

@@ -1,9 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

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

package/target/lib/watch.test.js

@@ -1,35 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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"}