@peerbit/string 5.0.120-48ac6de → 5.1.0
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/LICENSE +202 -0
- package/dist/src/query.js +213 -106
- package/dist/src/query.js.map +1 -1
- package/dist/src/range.js +69 -30
- package/dist/src/range.js.map +1 -1
- package/dist/src/string-index.js +105 -54
- package/dist/src/string-index.js.map +1 -1
- package/dist/src/string-store.js +196 -156
- package/dist/src/string-store.js.map +1 -1
- package/package.json +19 -19
- package/src/string-store.ts +5 -5
package/dist/src/string-store.js
CHANGED
|
@@ -1,11 +1,36 @@
|
|
|
1
|
-
var
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
|
|
2
|
+
function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
|
|
3
|
+
var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
|
|
4
|
+
var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
|
|
5
|
+
var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
|
|
6
|
+
var _, done = false;
|
|
7
|
+
for (var i = decorators.length - 1; i >= 0; i--) {
|
|
8
|
+
var context = {};
|
|
9
|
+
for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
|
|
10
|
+
for (var p in contextIn.access) context.access[p] = contextIn.access[p];
|
|
11
|
+
context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
|
|
12
|
+
var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
|
|
13
|
+
if (kind === "accessor") {
|
|
14
|
+
if (result === void 0) continue;
|
|
15
|
+
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
|
|
16
|
+
if (_ = accept(result.get)) descriptor.get = _;
|
|
17
|
+
if (_ = accept(result.set)) descriptor.set = _;
|
|
18
|
+
if (_ = accept(result.init)) initializers.unshift(_);
|
|
19
|
+
}
|
|
20
|
+
else if (_ = accept(result)) {
|
|
21
|
+
if (kind === "field") initializers.unshift(_);
|
|
22
|
+
else descriptor[key] = _;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
26
|
+
done = true;
|
|
6
27
|
};
|
|
7
|
-
var
|
|
8
|
-
|
|
28
|
+
var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
|
|
29
|
+
var useValue = arguments.length > 2;
|
|
30
|
+
for (var i = 0; i < initializers.length; i++) {
|
|
31
|
+
value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
|
|
32
|
+
}
|
|
33
|
+
return useValue ? value : void 0;
|
|
9
34
|
};
|
|
10
35
|
import { field, variant } from "@dao-xyz/borsh";
|
|
11
36
|
import { PublicSignKey, sha256Base64Sync } from "@peerbit/crypto";
|
|
@@ -18,7 +43,7 @@ import { concat, fromString } from "uint8arrays";
|
|
|
18
43
|
import { AbstractSearchResult, NoAccess, RangeMetadata, RangeMetadatas, SearchRequest, StringMatch, StringResult, } from "./query.js";
|
|
19
44
|
import { Range } from "./range.js";
|
|
20
45
|
import { StringIndex, StringOperation, encoding } from "./string-index.js";
|
|
21
|
-
const logger = loggerFn(
|
|
46
|
+
const logger = loggerFn("peerbit:program:string");
|
|
22
47
|
export const STRING_STORE_TYPE = "string_store";
|
|
23
48
|
const findAllOccurrences = (str, substr) => {
|
|
24
49
|
str = str.toLowerCase();
|
|
@@ -30,166 +55,181 @@ const findAllOccurrences = (str, substr) => {
|
|
|
30
55
|
}
|
|
31
56
|
return result;
|
|
32
57
|
};
|
|
33
|
-
let DString =
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
58
|
+
let DString = (() => {
|
|
59
|
+
let _classDecorators = [variant("dstring")];
|
|
60
|
+
let _classDescriptor;
|
|
61
|
+
let _classExtraInitializers = [];
|
|
62
|
+
let _classThis;
|
|
63
|
+
let _classSuper = Program;
|
|
64
|
+
let __log_decorators;
|
|
65
|
+
let __log_initializers = [];
|
|
66
|
+
let __log_extraInitializers = [];
|
|
67
|
+
let _query_decorators;
|
|
68
|
+
let _query_initializers = [];
|
|
69
|
+
let _query_extraInitializers = [];
|
|
70
|
+
let __index_decorators;
|
|
71
|
+
let __index_initializers = [];
|
|
72
|
+
let __index_extraInitializers = [];
|
|
73
|
+
var DString = class extends _classSuper {
|
|
74
|
+
static { _classThis = this; }
|
|
75
|
+
static {
|
|
76
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
77
|
+
__log_decorators = [field({ type: SharedLog })];
|
|
78
|
+
_query_decorators = [field({ type: RPC })];
|
|
79
|
+
__index_decorators = [field({ type: StringIndex })];
|
|
80
|
+
__esDecorate(null, null, __log_decorators, { kind: "field", name: "_log", static: false, private: false, access: { has: obj => "_log" in obj, get: obj => obj._log, set: (obj, value) => { obj._log = value; } }, metadata: _metadata }, __log_initializers, __log_extraInitializers);
|
|
81
|
+
__esDecorate(null, null, _query_decorators, { kind: "field", name: "query", static: false, private: false, access: { has: obj => "query" in obj, get: obj => obj.query, set: (obj, value) => { obj.query = value; } }, metadata: _metadata }, _query_initializers, _query_extraInitializers);
|
|
82
|
+
__esDecorate(null, null, __index_decorators, { kind: "field", name: "_index", static: false, private: false, access: { has: obj => "_index" in obj, get: obj => obj._index, set: (obj, value) => { obj._index = value; } }, metadata: _metadata }, __index_initializers, __index_extraInitializers);
|
|
83
|
+
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
84
|
+
DString = _classThis = _classDescriptor.value;
|
|
85
|
+
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
86
|
+
__runInitializers(_classThis, _classExtraInitializers);
|
|
87
|
+
}
|
|
88
|
+
_log = __runInitializers(this, __log_initializers, void 0);
|
|
89
|
+
query = (__runInitializers(this, __log_extraInitializers), __runInitializers(this, _query_initializers, void 0));
|
|
90
|
+
_index = (__runInitializers(this, _query_extraInitializers), __runInitializers(this, __index_initializers, void 0));
|
|
91
|
+
_canRead = __runInitializers(this, __index_extraInitializers);
|
|
92
|
+
constructor(properties) {
|
|
93
|
+
super();
|
|
94
|
+
this.query = properties.query || new RPC();
|
|
95
|
+
this._log = new SharedLog({ id: properties.id });
|
|
96
|
+
this._index = new StringIndex();
|
|
97
|
+
}
|
|
98
|
+
async open(options) {
|
|
99
|
+
await this._index.open(this._log.log);
|
|
100
|
+
await this._log.open({
|
|
101
|
+
encoding,
|
|
102
|
+
/* replicas: {
|
|
103
|
+
min: 0xffffffff, // TODO assume a document can not be sharded?
|
|
104
|
+
}, */
|
|
105
|
+
replicate: {
|
|
106
|
+
factor: 1, // we need all entries to represent the full string
|
|
107
|
+
},
|
|
108
|
+
canAppend: async (entry) => {
|
|
109
|
+
const operation = await entry.getPayloadValue();
|
|
110
|
+
if (!(await this._canPerform(operation, { entry }))) {
|
|
111
|
+
return false;
|
|
112
|
+
}
|
|
113
|
+
return options?.canPerform
|
|
114
|
+
? options.canPerform(operation, { entry })
|
|
115
|
+
: true;
|
|
116
|
+
},
|
|
117
|
+
onChange: async (change) => {
|
|
118
|
+
await this._index.updateIndex(change);
|
|
119
|
+
this.events.dispatchEvent(new CustomEvent("change", {
|
|
120
|
+
detail: change,
|
|
121
|
+
}));
|
|
122
|
+
},
|
|
123
|
+
});
|
|
124
|
+
await this.query.open({
|
|
125
|
+
...options,
|
|
126
|
+
topic: sha256Base64Sync(concat([this._log.log.id, fromString("/dstring")])),
|
|
127
|
+
responseHandler: this.queryHandler.bind(this),
|
|
128
|
+
queryType: SearchRequest,
|
|
129
|
+
responseType: StringResult,
|
|
130
|
+
});
|
|
131
|
+
await this._log.reset(); // TODO make it so that it does not reload the whole log (i.e. persist the generated string in some way)
|
|
82
132
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
133
|
+
async _canPerform(operation, context) {
|
|
134
|
+
if (this._log.log.length === 0 || context.entry.meta.next.length === 0) {
|
|
135
|
+
return true;
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
for (const next of context.entry.meta.next) {
|
|
139
|
+
if (await this._log.log.has(next)) {
|
|
140
|
+
return true;
|
|
141
|
+
}
|
|
87
142
|
}
|
|
88
143
|
}
|
|
144
|
+
return false;
|
|
89
145
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
meta: { ...options?.meta }, // TODO: optimize
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
async del(index, options) {
|
|
102
|
-
return this.add("", index, options);
|
|
103
|
-
}
|
|
104
|
-
async queryHandler(query, ctx) {
|
|
105
|
-
logger.debug("Recieved query");
|
|
106
|
-
if (query instanceof SearchRequest === false) {
|
|
107
|
-
logger.debug("Recieved query which is not a StringQueryRequest");
|
|
108
|
-
return;
|
|
146
|
+
async add(value, index, options) {
|
|
147
|
+
return this._log.append(new StringOperation({
|
|
148
|
+
index,
|
|
149
|
+
value,
|
|
150
|
+
}), {
|
|
151
|
+
...options,
|
|
152
|
+
meta: { ...options?.meta }, // TODO: optimize
|
|
153
|
+
});
|
|
109
154
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
return new NoAccess();
|
|
155
|
+
async del(index, options) {
|
|
156
|
+
return this.add("", index, options);
|
|
113
157
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
158
|
+
async queryHandler(query, ctx) {
|
|
159
|
+
logger.trace("Recieved query");
|
|
160
|
+
if (query instanceof SearchRequest === false) {
|
|
161
|
+
logger.trace("Recieved query which is not a StringQueryRequest");
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
const stringQuery = query;
|
|
165
|
+
if (this._canRead && !(await this._canRead(ctx.from))) {
|
|
166
|
+
return new NoAccess();
|
|
167
|
+
}
|
|
168
|
+
const content = this._index.string;
|
|
169
|
+
const relaventQueries = stringQuery.query.filter((x) => x instanceof StringMatch);
|
|
170
|
+
if (relaventQueries.length === 0) {
|
|
171
|
+
logger.trace("Responding with all");
|
|
172
|
+
return new StringResult({
|
|
173
|
+
string: content,
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
const ranges = relaventQueries
|
|
177
|
+
.map((query) => {
|
|
178
|
+
const occurances = findAllOccurrences(query.preprocess(content), query.preprocess(query.value));
|
|
179
|
+
return occurances.map((ix) => {
|
|
180
|
+
return new RangeMetadata({
|
|
181
|
+
offset: BigInt(ix),
|
|
182
|
+
length: BigInt(query.value.length),
|
|
183
|
+
});
|
|
184
|
+
});
|
|
185
|
+
})
|
|
186
|
+
.flat(1);
|
|
187
|
+
if (ranges.length === 0) {
|
|
188
|
+
logger.trace("Could not find any matches");
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
118
191
|
return new StringResult({
|
|
119
192
|
string: content,
|
|
193
|
+
metadatas: new RangeMetadatas({
|
|
194
|
+
metadatas: ranges,
|
|
195
|
+
}),
|
|
120
196
|
});
|
|
121
197
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
metadatas: ranges,
|
|
141
|
-
}),
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
async getValue(options) {
|
|
145
|
-
if (options?.remote) {
|
|
146
|
-
const counter = new Map();
|
|
147
|
-
const responses = await this.query.request(new SearchRequest({
|
|
148
|
-
query: [],
|
|
149
|
-
}), options.remote.queryOptions);
|
|
150
|
-
for (const response of responses) {
|
|
151
|
-
if (response.response instanceof NoAccess) {
|
|
152
|
-
logger.error("Missing access");
|
|
153
|
-
continue;
|
|
154
|
-
}
|
|
155
|
-
else if (response.response instanceof StringResult) {
|
|
156
|
-
options?.remote.callback?.(response.response.string);
|
|
157
|
-
counter.set(response.response.string, (counter.get(response.response.string) || 0) + 1);
|
|
158
|
-
}
|
|
159
|
-
else {
|
|
160
|
-
throw new Error("Unsupported type: " + response?.constructor?.name);
|
|
198
|
+
async getValue(options) {
|
|
199
|
+
if (options?.remote) {
|
|
200
|
+
const counter = new Map();
|
|
201
|
+
const responses = await this.query.request(new SearchRequest({
|
|
202
|
+
query: [],
|
|
203
|
+
}), options.remote.queryOptions);
|
|
204
|
+
for (const response of responses) {
|
|
205
|
+
if (response.response instanceof NoAccess) {
|
|
206
|
+
logger.error("Missing access");
|
|
207
|
+
continue;
|
|
208
|
+
}
|
|
209
|
+
else if (response.response instanceof StringResult) {
|
|
210
|
+
options?.remote.callback?.(response.response.string);
|
|
211
|
+
counter.set(response.response.string, (counter.get(response.response.string) || 0) + 1);
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
throw new Error("Unsupported type: " + response?.constructor?.name);
|
|
215
|
+
}
|
|
161
216
|
}
|
|
217
|
+
let max = -1;
|
|
218
|
+
let ret = undefined;
|
|
219
|
+
counter.forEach((v, k) => {
|
|
220
|
+
if (max < v) {
|
|
221
|
+
max = v;
|
|
222
|
+
ret = k;
|
|
223
|
+
}
|
|
224
|
+
});
|
|
225
|
+
return ret;
|
|
226
|
+
}
|
|
227
|
+
else {
|
|
228
|
+
return this._index.string;
|
|
162
229
|
}
|
|
163
|
-
let max = -1;
|
|
164
|
-
let ret = undefined;
|
|
165
|
-
counter.forEach((v, k) => {
|
|
166
|
-
if (max < v) {
|
|
167
|
-
max = v;
|
|
168
|
-
ret = k;
|
|
169
|
-
}
|
|
170
|
-
});
|
|
171
|
-
return ret;
|
|
172
|
-
}
|
|
173
|
-
else {
|
|
174
|
-
return this._index.string;
|
|
175
230
|
}
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
field({ type: SharedLog }),
|
|
180
|
-
__metadata("design:type", SharedLog)
|
|
181
|
-
], DString.prototype, "_log", void 0);
|
|
182
|
-
__decorate([
|
|
183
|
-
field({ type: RPC }),
|
|
184
|
-
__metadata("design:type", RPC)
|
|
185
|
-
], DString.prototype, "query", void 0);
|
|
186
|
-
__decorate([
|
|
187
|
-
field({ type: StringIndex }),
|
|
188
|
-
__metadata("design:type", StringIndex)
|
|
189
|
-
], DString.prototype, "_index", void 0);
|
|
190
|
-
DString = __decorate([
|
|
191
|
-
variant("dstring"),
|
|
192
|
-
__metadata("design:paramtypes", [Object])
|
|
193
|
-
], DString);
|
|
231
|
+
};
|
|
232
|
+
return DString = _classThis;
|
|
233
|
+
})();
|
|
194
234
|
export { DString };
|
|
195
235
|
//# sourceMappingURL=string-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string-store.js","sourceRoot":"","sources":["../../src/string-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"string-store.js","sourceRoot":"","sources":["../../src/string-store.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@peerbit/string",
|
|
3
|
-
"version": "5.0
|
|
3
|
+
"version": "5.1.0",
|
|
4
4
|
"description": "String store",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -49,27 +49,27 @@
|
|
|
49
49
|
"publishConfig": {
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
|
-
"scripts": {
|
|
53
|
-
"clean": "aegir clean",
|
|
54
|
-
"build": "aegir build --no-bundle",
|
|
55
|
-
"test": "aegir test -t node",
|
|
56
|
-
"lint": "aegir lint"
|
|
57
|
-
},
|
|
58
52
|
"author": "dao.xyz",
|
|
59
53
|
"license": "MIT",
|
|
60
54
|
"dependencies": {
|
|
61
|
-
"@dao-xyz/borsh": "^
|
|
62
|
-
"
|
|
63
|
-
"@peerbit/
|
|
64
|
-
"@peerbit/
|
|
65
|
-
"@peerbit/
|
|
66
|
-
"@peerbit/
|
|
67
|
-
"@peerbit/
|
|
68
|
-
"@peerbit/
|
|
69
|
-
"
|
|
55
|
+
"@dao-xyz/borsh": "^6.0.0",
|
|
56
|
+
"uint8arrays": "^5.1.0",
|
|
57
|
+
"@peerbit/crypto": "2.4.0",
|
|
58
|
+
"@peerbit/logger": "2.0.0",
|
|
59
|
+
"@peerbit/program": "1.0.0",
|
|
60
|
+
"@peerbit/shared-log": "11.6.0",
|
|
61
|
+
"@peerbit/rpc": "5.4.0",
|
|
62
|
+
"@peerbit/time": "2.3.0",
|
|
63
|
+
"@peerbit/log": "4.2.0"
|
|
70
64
|
},
|
|
71
65
|
"devDependencies": {
|
|
72
|
-
"
|
|
73
|
-
"
|
|
66
|
+
"uuid": "^10.0.0",
|
|
67
|
+
"@peerbit/test-utils": "2.3.0"
|
|
68
|
+
},
|
|
69
|
+
"scripts": {
|
|
70
|
+
"clean": "aegir clean",
|
|
71
|
+
"build": "aegir build --no-bundle",
|
|
72
|
+
"test": "aegir test -t node",
|
|
73
|
+
"lint": "aegir lint"
|
|
74
74
|
}
|
|
75
|
-
}
|
|
75
|
+
}
|
package/src/string-store.ts
CHANGED
|
@@ -22,7 +22,7 @@ import {
|
|
|
22
22
|
import { Range } from "./range.js";
|
|
23
23
|
import { StringIndex, StringOperation, encoding } from "./string-index.js";
|
|
24
24
|
|
|
25
|
-
const logger
|
|
25
|
+
const logger = loggerFn("peerbit:program:string");
|
|
26
26
|
|
|
27
27
|
export const STRING_STORE_TYPE = "string_store";
|
|
28
28
|
const findAllOccurrences = (str: string, substr: string): number[] => {
|
|
@@ -167,9 +167,9 @@ export class DString extends Program<Args, StringEvents & ProgramEvents> {
|
|
|
167
167
|
query: SearchRequest,
|
|
168
168
|
ctx: RequestContext,
|
|
169
169
|
): Promise<AbstractSearchResult | undefined> {
|
|
170
|
-
logger.
|
|
170
|
+
logger.trace("Recieved query");
|
|
171
171
|
if (query instanceof SearchRequest === false) {
|
|
172
|
-
logger.
|
|
172
|
+
logger.trace("Recieved query which is not a StringQueryRequest");
|
|
173
173
|
return;
|
|
174
174
|
}
|
|
175
175
|
|
|
@@ -183,7 +183,7 @@ export class DString extends Program<Args, StringEvents & ProgramEvents> {
|
|
|
183
183
|
(x) => x instanceof StringMatch,
|
|
184
184
|
) as StringMatch[];
|
|
185
185
|
if (relaventQueries.length === 0) {
|
|
186
|
-
logger.
|
|
186
|
+
logger.trace("Responding with all");
|
|
187
187
|
return new StringResult({
|
|
188
188
|
string: content,
|
|
189
189
|
});
|
|
@@ -204,7 +204,7 @@ export class DString extends Program<Args, StringEvents & ProgramEvents> {
|
|
|
204
204
|
.flat(1);
|
|
205
205
|
|
|
206
206
|
if (ranges.length === 0) {
|
|
207
|
-
logger.
|
|
207
|
+
logger.trace("Could not find any matches");
|
|
208
208
|
return;
|
|
209
209
|
}
|
|
210
210
|
|