@fjell/core 4.2.12 → 4.3.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/dist/src/AItemService.js +11 -12
- package/dist/src/AItemService.js.map +1 -1
- package/dist/src/dictionary.js +2 -2
- package/dist/src/dictionary.js.map +1 -1
- package/dist/src/item/IFactory.js +1 -1
- package/dist/src/item/IFactory.js.map +1 -1
- package/dist/src/item/IQFactory.js +1 -1
- package/dist/src/item/IQFactory.js.map +1 -1
- package/dist/src/key/KUtils.js +7 -9
- package/dist/src/key/KUtils.js.map +1 -1
- package/package.json +14 -8
- package/src/key/KUtils.ts +11 -14
package/dist/src/AItemService.js
CHANGED
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
export class AItemService {
|
|
2
|
-
pkType;
|
|
3
|
-
parentService = null;
|
|
4
2
|
constructor(pkType, parentService) {
|
|
3
|
+
this.parentService = null;
|
|
4
|
+
this.getPkType = () => {
|
|
5
|
+
return this.pkType;
|
|
6
|
+
};
|
|
7
|
+
this.getKeyTypes = () => {
|
|
8
|
+
let keyTypes = [this.getPkType()];
|
|
9
|
+
if (this.parentService) {
|
|
10
|
+
keyTypes = keyTypes.concat(this.parentService.getKeyTypes());
|
|
11
|
+
}
|
|
12
|
+
return keyTypes;
|
|
13
|
+
};
|
|
5
14
|
this.pkType = pkType;
|
|
6
15
|
if (parentService) {
|
|
7
16
|
this.parentService = parentService;
|
|
8
17
|
}
|
|
9
18
|
}
|
|
10
|
-
getPkType = () => {
|
|
11
|
-
return this.pkType;
|
|
12
|
-
};
|
|
13
|
-
getKeyTypes = () => {
|
|
14
|
-
let keyTypes = [this.getPkType()];
|
|
15
|
-
if (this.parentService) {
|
|
16
|
-
keyTypes = keyTypes.concat(this.parentService.getKeyTypes());
|
|
17
|
-
}
|
|
18
|
-
return keyTypes;
|
|
19
|
-
};
|
|
20
19
|
}
|
|
21
20
|
//# sourceMappingURL=AItemService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AItemService.js","sourceRoot":"","sources":["../../src/AItemService.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,YAAY;
|
|
1
|
+
{"version":3,"file":"AItemService.js","sourceRoot":"","sources":["../../src/AItemService.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,YAAY;IAYvB,YACE,MAAS,EACT,aAAuD;QAJjD,kBAAa,GAAmD,IAAI,CAAC;QAYtE,cAAS,GAAG,GAAM,EAAE;YACzB,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC,CAAA;QAEM,gBAAW,GAAG,GAA6C,EAAE;YAClE,IAAI,QAAQ,GAAsB,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAErD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,OAAO,QAAoD,CAAC;QAC9D,CAAC,CAAA;QAjBC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACrC,CAAC;IACH,CAAC;CAeF"}
|
package/dist/src/dictionary.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import LibLogger from "./logger";
|
|
2
2
|
const logger = LibLogger.get("Dictionary");
|
|
3
3
|
export class Dictionary {
|
|
4
|
-
map = {};
|
|
5
|
-
hashFunction = (key) => JSON.stringify(key);
|
|
6
4
|
constructor(map, hashFunction) {
|
|
5
|
+
this.map = {};
|
|
6
|
+
this.hashFunction = (key) => JSON.stringify(key);
|
|
7
7
|
if (map) {
|
|
8
8
|
this.map = map;
|
|
9
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dictionary.js","sourceRoot":"","sources":["../../src/dictionary.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AAE3C,MAAM,OAAO,UAAU;
|
|
1
|
+
{"version":3,"file":"dictionary.js","sourceRoot":"","sources":["../../src/dictionary.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AAE3C,MAAM,OAAO,UAAU;IAIrB,YAAY,GAA0B,EAAE,YAAiC;QAH/D,QAAG,GAAyB,EAAE,CAAA;QAC9B,iBAAY,GAAG,CAAC,GAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAGvD,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAChB,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAClC,CAAC;IACH,CAAC;IAEM,GAAG,CAAC,GAAM,EAAE,IAAO;QACxB,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QACxC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI,CAAA;IAC5B,CAAC;IAEM,GAAG,CAAC,GAAM;QACf,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QACxC,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,CAAA;IACpC,CAAC;IAEM,MAAM,CAAC,GAAM;QAClB,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QACxC,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAC5B,CAAC;IAEM,IAAI;QACT,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IAC1D,CAAC;IAEM,MAAM;QACX,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChC,CAAC;IAEM,WAAW,CAAC,GAAM;QACvB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/D,CAAC;IAEM,KAAK;QACV,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAM,KAAK,GAAG,IAAI,UAAU,CAAO,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;QAChE,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IFactory.js","sourceRoot":"","sources":["../../../src/item/IFactory.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,MAAM,OAAO,QAAQ;
|
|
1
|
+
{"version":3,"file":"IFactory.js","sourceRoot":"","sources":["../../../src/item/IFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IQFactory.js","sourceRoot":"","sources":["../../../src/item/IQFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAKL,WAAW,EAGZ,MAAM,aAAa,CAAC;AAErB,MAAM,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"IQFactory.js","sourceRoot":"","sources":["../../../src/item/IQFactory.ts"],"names":[],"mappings":"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"}
|
package/dist/src/key/KUtils.js
CHANGED
|
@@ -107,7 +107,7 @@ export const toKeyTypeArray = (ik) => {
|
|
|
107
107
|
logger.trace('toKeyTypeArray', { ik });
|
|
108
108
|
if (isComKey(ik)) {
|
|
109
109
|
const ck = ik;
|
|
110
|
-
return [ck.kt, ...ck.loc.map(l => l.kt)];
|
|
110
|
+
return [ck.kt, ...ck.loc.map((l) => l.kt)];
|
|
111
111
|
}
|
|
112
112
|
else {
|
|
113
113
|
return [ik.kt];
|
|
@@ -118,7 +118,7 @@ export const abbrevIK = (ik) => {
|
|
|
118
118
|
if (ik) {
|
|
119
119
|
if (isComKey(ik)) {
|
|
120
120
|
const ck = ik;
|
|
121
|
-
return `${ck.kt}:${ck.pk}:${ck.loc.map(l => `${l.kt}:${l.lk}`).join(',')}`;
|
|
121
|
+
return `${ck.kt}:${ck.pk}:${ck.loc.map((l) => `${l.kt}:${l.lk}`).join(',')}`;
|
|
122
122
|
}
|
|
123
123
|
else {
|
|
124
124
|
return `${ik.kt}:${ik.pk}`;
|
|
@@ -163,12 +163,10 @@ export const itemKeyToLocKeyArray = (ik) => {
|
|
|
163
163
|
let lka = [];
|
|
164
164
|
if (isComKey(ik)) {
|
|
165
165
|
const ck = ik;
|
|
166
|
-
// @ts-expect-error
|
|
167
166
|
lka = [{ kt: ck.kt, lk: ck.pk }, ...ck.loc];
|
|
168
167
|
}
|
|
169
168
|
else {
|
|
170
169
|
const pk = ik;
|
|
171
|
-
// @ts-expect-error
|
|
172
170
|
lka = [{ kt: pk.kt, lk: pk.pk }];
|
|
173
171
|
}
|
|
174
172
|
logger.trace('itemKeyToLocKeyArray Results', { ik: abbrevIK(ik), lka: abbrevLKA(lka) });
|
|
@@ -181,19 +179,20 @@ export const ikToLKA = itemKeyToLocKeyArray;
|
|
|
181
179
|
* @returns An item key corresponding to the containing item this location refers to.
|
|
182
180
|
*/
|
|
183
181
|
export const locKeyArrayToItemKey = (lka) => {
|
|
184
|
-
// @ts-expect-error
|
|
185
182
|
logger.trace('locKeyArrayToItemKey', { lka: abbrevLKA(lka) });
|
|
186
|
-
if (lka.length === 1) {
|
|
183
|
+
if (lka && lka.length === 1) {
|
|
187
184
|
const priKey = cPK(lka[0].lk, lka[0].kt);
|
|
188
185
|
return priKey;
|
|
189
186
|
}
|
|
190
|
-
else {
|
|
187
|
+
else if (lka && lka.length > 1 && lka[0] !== undefined) {
|
|
191
188
|
const locs = lka.slice(1);
|
|
192
|
-
// @ts-expect-error
|
|
193
189
|
const priKey = cPK(lka[0].lk, lka[0].kt);
|
|
194
190
|
const comKey = { kt: priKey.kt, pk: priKey.pk, loc: locs };
|
|
195
191
|
return comKey;
|
|
196
192
|
}
|
|
193
|
+
else {
|
|
194
|
+
throw new Error('locKeyArrayToItemKey: lka is undefined or empty');
|
|
195
|
+
}
|
|
197
196
|
};
|
|
198
197
|
// TODO: This is annoying that we have to check for '' and 'null'
|
|
199
198
|
export const isValidPriKey = (key) => {
|
|
@@ -214,7 +213,6 @@ export const isValidLocKeyArray = (keyArray) => {
|
|
|
214
213
|
};
|
|
215
214
|
export const isValidComKey = (key) => {
|
|
216
215
|
return (key !== undefined
|
|
217
|
-
// @ts-expect-error
|
|
218
216
|
&& key !== null) && isValidPriKey(key) && isValidLocKeyArray(key.loc);
|
|
219
217
|
};
|
|
220
218
|
export const isValidItemKey = (key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KUtils.js","sourceRoot":"","sources":["../../../src/key/KUtils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"KUtils.js","sourceRoot":"","sources":["../../../src/key/KUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjell/core",
|
|
3
3
|
"description": "Core Items for Fjell",
|
|
4
|
-
"version": "4.
|
|
4
|
+
"version": "4.3.0",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "./dist/src/index.js",
|
|
7
|
+
"exports": {
|
|
8
|
+
".": {
|
|
9
|
+
"require": "./dist/src/index.js",
|
|
10
|
+
"types": "./dist/src/index.d.ts",
|
|
11
|
+
"default": "./dist/src/index.js"
|
|
12
|
+
}
|
|
13
|
+
},
|
|
7
14
|
"type": "module",
|
|
8
15
|
"scripts": {
|
|
9
16
|
"lint": "eslint .",
|
|
@@ -13,24 +20,23 @@
|
|
|
13
20
|
"test": "yarn run lint && yarn run jest --coverage"
|
|
14
21
|
},
|
|
15
22
|
"devDependencies": {
|
|
23
|
+
"@tsconfig/recommended": "^1.0.8",
|
|
16
24
|
"@types/jest": "^29.5.14",
|
|
17
|
-
"@types/luxon": "^3",
|
|
25
|
+
"@types/luxon": "^3.4.2",
|
|
18
26
|
"@typescript-eslint/eslint-plugin": "^8.24.1",
|
|
19
27
|
"@typescript-eslint/parser": "^8.24.1",
|
|
20
28
|
"concurrently": "^9.1.2",
|
|
21
|
-
"eslint": "^9.
|
|
29
|
+
"eslint": "^9.21.0",
|
|
22
30
|
"jest": "^29.7.0",
|
|
23
|
-
"rimraf": "^
|
|
31
|
+
"rimraf": "^6.0.1",
|
|
24
32
|
"ts-jest": "^29.2.5",
|
|
25
33
|
"tsc-alias": "^1.8.10",
|
|
26
34
|
"typescript": "^5.7.3"
|
|
27
35
|
},
|
|
28
36
|
"dependencies": {
|
|
29
|
-
"@fjell/logging": "^4.
|
|
30
|
-
"@types/node": "^22.13.4",
|
|
37
|
+
"@fjell/logging": "^4.3.3",
|
|
31
38
|
"flatted": "^3.3.3",
|
|
32
|
-
"luxon": "^3.5.0"
|
|
33
|
-
"ts-node": "^10.9.2"
|
|
39
|
+
"luxon": "^3.5.0"
|
|
34
40
|
},
|
|
35
41
|
"packageManager": "yarn@4.6.0",
|
|
36
42
|
"repository": {
|
package/src/key/KUtils.ts
CHANGED
|
@@ -163,7 +163,7 @@ export const toKeyTypeArray = <
|
|
|
163
163
|
logger.trace('toKeyTypeArray', { ik });
|
|
164
164
|
if (isComKey(ik)) {
|
|
165
165
|
const ck = ik as ComKey<S, L1, L2, L3, L4, L5>;
|
|
166
|
-
return [ck.kt, ...ck.loc.map(l => l.kt)];
|
|
166
|
+
return [ck.kt, ...ck.loc.map((l : LocKey<L1 | L2 | L3 | L4 | L5>) => l.kt)];
|
|
167
167
|
} else {
|
|
168
168
|
return [(ik as PriKey<S>).kt];
|
|
169
169
|
}
|
|
@@ -181,7 +181,7 @@ export const abbrevIK = <
|
|
|
181
181
|
if(ik) {
|
|
182
182
|
if (isComKey(ik)) {
|
|
183
183
|
const ck = ik as ComKey<S, L1, L2, L3, L4, L5>;
|
|
184
|
-
return `${ck.kt}:${ck.pk}:${ck.loc.map(l => `${l.kt}:${l.lk}`).join(',')}`;
|
|
184
|
+
return `${ck.kt}:${ck.pk}:${ck.loc.map((l : LocKey<L1 | L2 | L3 | L4 | L5>) => `${l.kt}:${l.lk}`).join(',')}`;
|
|
185
185
|
} else {
|
|
186
186
|
return `${(ik as PriKey<S>).kt}:${(ik as PriKey<S>).pk}`;
|
|
187
187
|
}
|
|
@@ -245,12 +245,10 @@ export const itemKeyToLocKeyArray =
|
|
|
245
245
|
let lka: Array<LocKey<L1 | L2 | L3 | L4 | L5>> = [];
|
|
246
246
|
if (isComKey(ik)) {
|
|
247
247
|
const ck = ik as ComKey<S, L1, L2, L3, L4, L5>;
|
|
248
|
-
|
|
249
|
-
lka = [{ kt: ck.kt, lk: ck.pk } as LocKey<S>, ...ck.loc];
|
|
248
|
+
lka = [{ kt: ck.kt, lk: ck.pk } as unknown as LocKey<L1 | L2 | L3 | L4 | L5>, ...ck.loc];
|
|
250
249
|
} else {
|
|
251
250
|
const pk = ik as PriKey<S>;
|
|
252
|
-
|
|
253
|
-
lka = [{ kt: pk.kt, lk: pk.pk } as LocKey<S>];
|
|
251
|
+
lka = [{ kt: pk.kt, lk: pk.pk } as unknown as LocKey<L1 | L2 | L3 | L4 | L5>];
|
|
254
252
|
}
|
|
255
253
|
logger.trace('itemKeyToLocKeyArray Results', { ik: abbrevIK(ik), lka: abbrevLKA(lka) });
|
|
256
254
|
return lka as LocKeyArray<S, L1, L2, L3, L4>;
|
|
@@ -272,18 +270,18 @@ export const locKeyArrayToItemKey =
|
|
|
272
270
|
L5 extends string = never
|
|
273
271
|
>(lka: LocKeyArray<L1, L2, L3, L4, L5>):
|
|
274
272
|
PriKey<L1> | ComKey<L1, L2, L3, L4, L5> => {
|
|
275
|
-
|
|
276
|
-
logger.trace('locKeyArrayToItemKey', { lka: abbrevLKA(lka) });
|
|
273
|
+
logger.trace('locKeyArrayToItemKey', { lka: abbrevLKA(lka as Array<LocKey<L1 | L2 | L3 | L4 | L5>>) });
|
|
277
274
|
|
|
278
|
-
if(lka.length === 1) {
|
|
275
|
+
if(lka && lka.length === 1) {
|
|
279
276
|
const priKey = cPK(lka[0].lk, lka[0].kt);
|
|
280
277
|
return priKey as PriKey<L1>;
|
|
281
|
-
} else {
|
|
278
|
+
} else if (lka && lka.length > 1 && lka[0] !== undefined) {
|
|
282
279
|
const locs = lka.slice(1);
|
|
283
|
-
// @ts-expect-error
|
|
284
280
|
const priKey = cPK(lka[0].lk, lka[0].kt);
|
|
285
|
-
const comKey = { kt: priKey.kt, pk: priKey.pk, loc: locs as LocKeyArray<L2, L3, L4, L5> };
|
|
281
|
+
const comKey = { kt: priKey.kt, pk: priKey.pk, loc: locs as unknown as LocKeyArray<L2, L3, L4, L5> };
|
|
286
282
|
return comKey as ComKey<L1, L2, L3, L4, L5>;
|
|
283
|
+
} else {
|
|
284
|
+
throw new Error('locKeyArrayToItemKey: lka is undefined or empty');
|
|
287
285
|
}
|
|
288
286
|
}
|
|
289
287
|
|
|
@@ -328,8 +326,7 @@ export const isValidComKey = <
|
|
|
328
326
|
L5 extends string = never
|
|
329
327
|
>(key: ComKey<S, L1, L2, L3, L4, L5>): boolean => {
|
|
330
328
|
return (key !== undefined
|
|
331
|
-
|
|
332
|
-
&& key !== null) && isValidPriKey(key) && isValidLocKeyArray(key.loc);
|
|
329
|
+
&& key !== null) && isValidPriKey(key) && isValidLocKeyArray(key.loc as Array<LocKey<L1 | L2 | L3 | L4 | L5>>);
|
|
333
330
|
}
|
|
334
331
|
|
|
335
332
|
export const isValidItemKey = <
|