@welshman/store 0.0.2 → 0.0.3

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.
@@ -17,18 +17,20 @@ const custom = (start, opts = {}) => {
17
17
  const subs = [];
18
18
  let value;
19
19
  let stop;
20
+ const set = (newValue) => {
21
+ for (const sub of subs) {
22
+ sub(newValue);
23
+ }
24
+ value = newValue;
25
+ };
20
26
  return {
27
+ set,
21
28
  subscribe: (sub) => {
22
29
  if (opts.throttle) {
23
30
  sub = (0, throttle_debounce_1.throttle)(opts.throttle, sub);
24
31
  }
25
32
  if (subs.length === 0) {
26
- stop = start((newValue) => {
27
- for (const sub of subs) {
28
- sub(newValue);
29
- }
30
- value = newValue;
31
- });
33
+ stop = start(set);
32
34
  }
33
35
  subs.push(sub);
34
36
  sub(value);
@@ -57,8 +59,8 @@ const createEventStore = (repository) => {
57
59
  }
58
60
  });
59
61
  return {
60
- get: () => repository.dump(),
61
62
  set: (events) => repository.load(events),
63
+ update: (f) => repository.load(f(repository.dump())),
62
64
  subscribe: (f) => {
63
65
  f(repository.dump());
64
66
  subs.push(f);
@@ -75,8 +77,31 @@ const createEventStore = (repository) => {
75
77
  };
76
78
  };
77
79
  exports.createEventStore = createEventStore;
78
- const deriveEventsMapped = ({ filters, repository, eventToItem, itemToEvent, includeDeleted = false, }) => (0, exports.custom)(setter => {
79
- let data = repository.query(filters, { includeDeleted }).map(eventToItem).filter(lib_1.identity);
80
+ const deriveEventsMapped = (repository, { filters, eventToItem, itemToEvent, throttle = 300, includeDeleted = false, }) => (0, exports.custom)(setter => {
81
+ let data = [];
82
+ const deferred = new Set();
83
+ const defer = (event, item) => {
84
+ deferred.add(event.id);
85
+ item.then($item => {
86
+ if (deferred.has(event.id)) {
87
+ deferred.delete(event.id);
88
+ data.push($item);
89
+ setter(data);
90
+ }
91
+ });
92
+ };
93
+ for (const event of repository.query(filters, { includeDeleted })) {
94
+ const item = eventToItem(event);
95
+ if (!item) {
96
+ continue;
97
+ }
98
+ if (item instanceof Promise) {
99
+ defer(event, item);
100
+ }
101
+ else {
102
+ data.push(item);
103
+ }
104
+ }
80
105
  setter(data);
81
106
  const onUpdate = (0, lib_1.batch)(300, (updates) => {
82
107
  const removed = new Set();
@@ -89,13 +114,17 @@ const deriveEventsMapped = ({ filters, repository, eventToItem, itemToEvent, inc
89
114
  for (const id of update.removed) {
90
115
  removed.add(id);
91
116
  added.delete(id);
117
+ deferred.delete(id);
92
118
  }
93
119
  }
94
120
  let dirty = false;
95
121
  for (const event of added.values()) {
96
122
  if ((0, util_1.matchFilters)(filters, event)) {
97
123
  const item = eventToItem(event);
98
- if (item) {
124
+ if (item instanceof Promise) {
125
+ defer(event, item);
126
+ }
127
+ else if (item) {
99
128
  dirty = true;
100
129
  data.push(item);
101
130
  }
@@ -114,11 +143,10 @@ const deriveEventsMapped = ({ filters, repository, eventToItem, itemToEvent, inc
114
143
  });
115
144
  repository.on("update", onUpdate);
116
145
  return () => repository.off("update", onUpdate);
117
- });
146
+ }, { throttle });
118
147
  exports.deriveEventsMapped = deriveEventsMapped;
119
- const deriveEvents = (repository, opts) => (0, exports.deriveEventsMapped)({
148
+ const deriveEvents = (repository, opts) => (0, exports.deriveEventsMapped)(repository, {
120
149
  ...opts,
121
- repository,
122
150
  eventToItem: lib_1.identity,
123
151
  itemToEvent: lib_1.identity,
124
152
  });
@@ -1 +1 @@
1
- {"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,15 @@
1
1
  import { throttle } from "throttle-debounce";
2
- import type { Readable, Writable } from "svelte/store";
2
+ import type { Readable, Writable, Subscriber, Unsubscriber } from "svelte/store";
3
+ import type { Maybe } from "@welshman/lib";
3
4
  import type { Repository } from "@welshman/util";
4
5
  import type { Filter, TrustedEvent } from "@welshman/util";
5
6
  export declare const getter: <T>(store: Readable<T>) => () => T;
6
- type Stop = () => void;
7
- type Sub<T> = (x: T) => void;
8
- type Start<T> = (set: Sub<T>) => Stop;
7
+ type Start<T> = (set: Subscriber<T>) => Unsubscriber;
9
8
  export declare const custom: <T>(start: Start<T>, opts?: {
10
9
  throttle?: number;
11
10
  }) => {
12
- subscribe: (sub: Sub<T>) => () => void;
11
+ set: (newValue: T) => void;
12
+ subscribe: (sub: Subscriber<T>) => () => void;
13
13
  };
14
14
  export declare function withGetter<T>(store: Writable<T>): Writable<T> & {
15
15
  get: () => T;
@@ -18,30 +18,30 @@ export declare function withGetter<T>(store: Readable<T>): Readable<T> & {
18
18
  get: () => T;
19
19
  };
20
20
  export declare const throttled: <T>(delay: number, store: Readable<T>) => {
21
- subscribe: (sub: Sub<unknown>) => () => void;
21
+ set: (newValue: unknown) => void;
22
+ subscribe: (sub: Subscriber<unknown>) => () => void;
22
23
  };
23
- export declare const createEventStore: <E extends TrustedEvent>(repository: Repository<E>) => {
24
- get: () => E[];
25
- set: (events: E[]) => Promise<void>;
26
- subscribe: (f: Sub<E[]>) => () => void;
27
- };
28
- export declare const deriveEventsMapped: <T, E extends TrustedEvent>({ filters, repository, eventToItem, itemToEvent, includeDeleted, }: {
24
+ export declare const createEventStore: (repository: Repository) => Writable<TrustedEvent[]>;
25
+ export declare const deriveEventsMapped: <T>(repository: Repository, { filters, eventToItem, itemToEvent, throttle, includeDeleted, }: {
29
26
  filters: Filter[];
30
- repository: Repository<E>;
31
- eventToItem: (event: E) => T;
32
- itemToEvent: (item: T) => E;
27
+ eventToItem: (event: TrustedEvent) => Maybe<T | Promise<T>>;
28
+ itemToEvent: (item: T) => TrustedEvent;
29
+ throttle?: number | undefined;
33
30
  includeDeleted?: boolean | undefined;
34
31
  }) => {
35
- subscribe: (sub: Sub<T[]>) => () => void;
32
+ set: (newValue: T[]) => void;
33
+ subscribe: (sub: Subscriber<T[]>) => () => void;
36
34
  };
37
- export declare const deriveEvents: <E extends TrustedEvent>(repository: Repository<E>, opts: {
35
+ export declare const deriveEvents: (repository: Repository, opts: {
38
36
  filters: Filter[];
39
37
  includeDeleted?: boolean;
40
38
  }) => {
41
- subscribe: (sub: Sub<E[]>) => () => void;
39
+ set: (newValue: TrustedEvent[]) => void;
40
+ subscribe: (sub: Subscriber<TrustedEvent[]>) => () => void;
42
41
  };
43
- export declare const deriveEvent: <E extends TrustedEvent>(repository: Repository<E>, idOrAddress: string) => Readable<E>;
44
- export declare const deriveIsDeletedByAddress: <E extends TrustedEvent>(repository: Repository<E>, event: E) => {
45
- subscribe: (sub: Sub<boolean>) => () => void;
42
+ export declare const deriveEvent: (repository: Repository, idOrAddress: string) => Readable<TrustedEvent>;
43
+ export declare const deriveIsDeletedByAddress: (repository: Repository, event: TrustedEvent) => {
44
+ set: (newValue: boolean) => void;
45
+ subscribe: (sub: Subscriber<boolean>) => () => void;
46
46
  };
47
47
  export {};
@@ -13,18 +13,20 @@ export const custom = (start, opts = {}) => {
13
13
  const subs = [];
14
14
  let value;
15
15
  let stop;
16
+ const set = (newValue) => {
17
+ for (const sub of subs) {
18
+ sub(newValue);
19
+ }
20
+ value = newValue;
21
+ };
16
22
  return {
23
+ set,
17
24
  subscribe: (sub) => {
18
25
  if (opts.throttle) {
19
26
  sub = throttle(opts.throttle, sub);
20
27
  }
21
28
  if (subs.length === 0) {
22
- stop = start((newValue) => {
23
- for (const sub of subs) {
24
- sub(newValue);
25
- }
26
- value = newValue;
27
- });
29
+ stop = start(set);
28
30
  }
29
31
  subs.push(sub);
30
32
  sub(value);
@@ -50,8 +52,8 @@ export const createEventStore = (repository) => {
50
52
  }
51
53
  });
52
54
  return {
53
- get: () => repository.dump(),
54
55
  set: (events) => repository.load(events),
56
+ update: (f) => repository.load(f(repository.dump())),
55
57
  subscribe: (f) => {
56
58
  f(repository.dump());
57
59
  subs.push(f);
@@ -67,8 +69,31 @@ export const createEventStore = (repository) => {
67
69
  },
68
70
  };
69
71
  };
70
- export const deriveEventsMapped = ({ filters, repository, eventToItem, itemToEvent, includeDeleted = false, }) => custom(setter => {
71
- let data = repository.query(filters, { includeDeleted }).map(eventToItem).filter(identity);
72
+ export const deriveEventsMapped = (repository, { filters, eventToItem, itemToEvent, throttle = 300, includeDeleted = false, }) => custom(setter => {
73
+ let data = [];
74
+ const deferred = new Set();
75
+ const defer = (event, item) => {
76
+ deferred.add(event.id);
77
+ item.then($item => {
78
+ if (deferred.has(event.id)) {
79
+ deferred.delete(event.id);
80
+ data.push($item);
81
+ setter(data);
82
+ }
83
+ });
84
+ };
85
+ for (const event of repository.query(filters, { includeDeleted })) {
86
+ const item = eventToItem(event);
87
+ if (!item) {
88
+ continue;
89
+ }
90
+ if (item instanceof Promise) {
91
+ defer(event, item);
92
+ }
93
+ else {
94
+ data.push(item);
95
+ }
96
+ }
72
97
  setter(data);
73
98
  const onUpdate = batch(300, (updates) => {
74
99
  const removed = new Set();
@@ -81,13 +106,17 @@ export const deriveEventsMapped = ({ filters, repository, eventToItem, itemToEve
81
106
  for (const id of update.removed) {
82
107
  removed.add(id);
83
108
  added.delete(id);
109
+ deferred.delete(id);
84
110
  }
85
111
  }
86
112
  let dirty = false;
87
113
  for (const event of added.values()) {
88
114
  if (matchFilters(filters, event)) {
89
115
  const item = eventToItem(event);
90
- if (item) {
116
+ if (item instanceof Promise) {
117
+ defer(event, item);
118
+ }
119
+ else if (item) {
91
120
  dirty = true;
92
121
  data.push(item);
93
122
  }
@@ -106,10 +135,9 @@ export const deriveEventsMapped = ({ filters, repository, eventToItem, itemToEve
106
135
  });
107
136
  repository.on("update", onUpdate);
108
137
  return () => repository.off("update", onUpdate);
109
- });
110
- export const deriveEvents = (repository, opts) => deriveEventsMapped({
138
+ }, { throttle });
139
+ export const deriveEvents = (repository, opts) => deriveEventsMapped(repository, {
111
140
  ...opts,
112
- repository,
113
141
  eventToItem: identity,
114
142
  itemToEvent: identity,
115
143
  });
@@ -1 +1 @@
1
- {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@welshman/store",
3
- "version": "0.0.2",
3
+ "version": "0.0.3",
4
4
  "author": "hodlbod",
5
5
  "license": "MIT",
6
6
  "description": "A collection of utilities based on svelte/store for use with welshman",
@@ -31,6 +31,8 @@
31
31
  "typescript": "~5.1.6"
32
32
  },
33
33
  "dependencies": {
34
+ "@welshman/lib": "0.0.15",
35
+ "@welshman/util": "0.0.27",
34
36
  "svelte": "^4.2.18"
35
37
  }
36
38
  }