@joist/observable 3.1.2 → 3.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@joist/observable",
3
- "version": "3.1.2",
3
+ "version": "3.2.1",
4
4
  "type": "module",
5
5
  "main": "./target/lib.js",
6
6
  "module": "./target/lib.js",
@@ -8,7 +8,7 @@ describe('meta:meta', () => {
8
8
 
9
9
  expect(data).to.deep.equal({
10
10
  changes: new Set(),
11
- scheduler: null,
11
+ scheduler: null
12
12
  });
13
13
  });
14
14
 
@@ -2,16 +2,14 @@
2
2
 
3
3
  export type EffectFn = (changes: Set<string | symbol>) => void;
4
4
 
5
- export abstract class MetadataStore<Metadata> {
6
- #data = new WeakMap<object, Metadata>();
7
-
8
- read<T extends object>(value: T): Metadata {
9
- let data = this.#data.get(value);
5
+ export abstract class MetadataStore<Metadata> extends WeakMap<object, Metadata> {
6
+ read(key: object): Metadata {
7
+ let data = this.get(key);
10
8
 
11
9
  if (!data) {
12
10
  data = this.init();
13
11
 
14
- this.#data.set(value, data);
12
+ this.set(key, data);
15
13
  }
16
14
 
17
15
  return data;
@@ -40,7 +40,7 @@ export function observe<This extends object, Value>(
40
40
  instanceMeta.changes.add(ctx.name);
41
41
 
42
42
  base.set.call(this, value);
43
- },
43
+ }
44
44
  };
45
45
  }
46
46
 
@@ -1,7 +1,6 @@
1
1
  export type EffectFn = (changes: Set<string | symbol>) => void;
2
- export declare abstract class MetadataStore<Metadata> {
3
- #private;
4
- read<T extends object>(value: T): Metadata;
2
+ export declare abstract class MetadataStore<Metadata> extends WeakMap<object, Metadata> {
3
+ read(key: object): Metadata;
5
4
  abstract init(): Metadata;
6
5
  }
7
6
  export declare class ObservableInstanceMetadata {
@@ -1,11 +1,10 @@
1
1
  Symbol.metadata ??= Symbol('Symbol.metadata');
2
- export class MetadataStore {
3
- #data = new WeakMap();
4
- read(value) {
5
- let data = this.#data.get(value);
2
+ export class MetadataStore extends WeakMap {
3
+ read(key) {
4
+ let data = this.get(key);
6
5
  if (!data) {
7
6
  data = this.init();
8
- this.#data.set(value, data);
7
+ this.set(key, data);
9
8
  }
10
9
  return data;
11
10
  }
@@ -1 +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,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"}
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"}
@@ -6,7 +6,7 @@ describe('meta:meta', () => {
6
6
  const data = new ObservableInstanceMetaDataStore().read(key);
7
7
  expect(data).to.deep.equal({
8
8
  changes: new Set(),
9
- scheduler: null,
9
+ scheduler: null
10
10
  });
11
11
  });
12
12
  it('should return the same metadata object after init', () => {
@@ -27,7 +27,7 @@ export function observe(base, ctx) {
27
27
  }
28
28
  instanceMeta.changes.add(ctx.name);
29
29
  base.set.call(this, value);
30
- },
30
+ }
31
31
  };
32
32
  }
33
33
  export function effect(value, ctx) {