joist-core 2.2.0-next.10 → 2.2.0-next.11
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IndexManager.d.ts","sourceRoot":"","sources":["../src/IndexManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"IndexManager.d.ts","sourceRoot":"","sources":["../src/IndexManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,cAAc,EAA2B,MAAM,kBAAkB,CAAC;AAW3E,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC;;;;;;;GAOG;AACH,qBAAa,YAAY;;IAGvB,8DAA8D;IAC9D,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAI7C,2BAA2B;IAC3B,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAInC,uFAAuF;IACvF,qBAAqB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAqBpG,8CAA8C;IAC9C,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAYtC,kDAAkD;IAClD,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAe5F;;;OAGG;IACH,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,EAAE;IAyBxE,OAAO,CAAC,kBAAkB;CAkB3B"}
|
package/build/IndexManager.js
CHANGED
|
@@ -49,9 +49,14 @@ class IndexManager {
|
|
|
49
49
|
}
|
|
50
50
|
/** Adds an entity to all relevant indexes. */
|
|
51
51
|
maybeIndexEntity(entity) {
|
|
52
|
+
if (this.#indexes.size === 0)
|
|
53
|
+
return;
|
|
52
54
|
const meta = (0, EntityMetadata_1.getMetadata)(entity);
|
|
53
|
-
|
|
54
|
-
|
|
55
|
+
const fieldIndexes = this.#indexes.get(meta.tagName);
|
|
56
|
+
if (fieldIndexes) {
|
|
57
|
+
for (const [fieldName, { field, index }] of fieldIndexes) {
|
|
58
|
+
index.add(getFieldValue(entity, fieldName, field), entity);
|
|
59
|
+
}
|
|
55
60
|
}
|
|
56
61
|
}
|
|
57
62
|
/** Updates indexes when a field value changes. */
|
|
@@ -63,7 +68,7 @@ class IndexManager {
|
|
|
63
68
|
const fieldIndexes = this.#indexes.get(meta.tagName);
|
|
64
69
|
if (!fieldIndexes)
|
|
65
70
|
return; // Type not indexed
|
|
66
|
-
const fieldIndex = fieldIndexes.get(fieldName);
|
|
71
|
+
const fieldIndex = fieldIndexes.get(fieldName)?.index;
|
|
67
72
|
if (!fieldIndex)
|
|
68
73
|
return; // Field is not indexed
|
|
69
74
|
fieldIndex.remove(oldValue, entity);
|
|
@@ -82,7 +87,7 @@ class IndexManager {
|
|
|
82
87
|
// Start with all entities of the 1st condition, then intersect (AND) each subsequent field in `where`
|
|
83
88
|
let candidates;
|
|
84
89
|
for (const [fieldName, value] of Object.entries(where)) {
|
|
85
|
-
const fieldCandidates = fieldIndexes.get(fieldName)?.get(value);
|
|
90
|
+
const fieldCandidates = fieldIndexes.get(fieldName)?.index.get(value);
|
|
86
91
|
if (!candidates) {
|
|
87
92
|
candidates = fieldCandidates ?? emptySet; // This is the 1st clause
|
|
88
93
|
}
|
|
@@ -104,25 +109,24 @@ class IndexManager {
|
|
|
104
109
|
const indexes = this.#indexes.get(tagName);
|
|
105
110
|
// Iterate over each field so we can do a shared fieldIndex lookup
|
|
106
111
|
for (const fieldName of fieldNames) {
|
|
107
|
-
|
|
112
|
+
const field = meta.allFields[fieldName];
|
|
113
|
+
if (!field)
|
|
108
114
|
continue;
|
|
109
|
-
let
|
|
110
|
-
if (!
|
|
111
|
-
|
|
112
|
-
indexes.set(fieldName,
|
|
115
|
+
let entry = indexes.get(fieldName);
|
|
116
|
+
if (!entry) {
|
|
117
|
+
entry = { field, index: new FieldIndex() };
|
|
118
|
+
indexes.set(fieldName, entry);
|
|
113
119
|
}
|
|
114
120
|
for (const entity of entities) {
|
|
115
|
-
const value = getFieldValue(entity, fieldName);
|
|
116
|
-
|
|
121
|
+
const value = getFieldValue(entity, fieldName, entry.field);
|
|
122
|
+
entry.index.add(value, entity);
|
|
117
123
|
}
|
|
118
124
|
}
|
|
119
125
|
}
|
|
120
126
|
}
|
|
121
127
|
exports.IndexManager = IndexManager;
|
|
122
128
|
// Use the same field access pattern as entityMatches
|
|
123
|
-
function getFieldValue(entity, fieldName) {
|
|
124
|
-
const meta = (0, EntityMetadata_1.getMetadata)(entity);
|
|
125
|
-
const field = meta.allFields[fieldName] ?? fail();
|
|
129
|
+
function getFieldValue(entity, fieldName, field) {
|
|
126
130
|
const fn = fieldName;
|
|
127
131
|
switch (field.kind) {
|
|
128
132
|
case "primaryKey":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IndexManager.js","sourceRoot":"","sources":["../src/IndexManager.ts"],"names":[],"mappings":";;;AAAA,qCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"IndexManager.js","sourceRoot":"","sources":["../src/IndexManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "joist-core",
|
|
3
|
-
"version": "2.2.0-next.
|
|
3
|
+
"version": "2.2.0-next.11",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"build"
|
|
21
21
|
],
|
|
22
22
|
"peerDependencies": {
|
|
23
|
-
"joist-utils": "2.2.0-next.
|
|
23
|
+
"joist-utils": "2.2.0-next.11"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"ansis": "^4.3.0",
|