@tstdl/base 0.71.65 → 0.71.66
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 +10 -10
- package/search-index/elastic/index.d.ts +1 -0
- package/search-index/elastic/index.js +1 -0
- package/search-index/elastic/index.js.map +1 -1
- package/search-index/elastic/keyword-rewriter.d.ts +8 -0
- package/search-index/elastic/keyword-rewriter.js +22 -0
- package/search-index/elastic/keyword-rewriter.js.map +1 -0
- package/search-index/elastic/search-index.d.ts +3 -2
- package/search-index/elastic/search-index.js +4 -3
- package/search-index/elastic/search-index.js.map +1 -1
- package/search-index/elastic/sort-converter.d.ts +2 -1
- package/search-index/elastic/sort-converter.js +2 -3
- package/search-index/elastic/sort-converter.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.66",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -15,22 +15,22 @@
|
|
|
15
15
|
"pub": "npm run build:prod && rm -vf dist/test* && npm publish dist/"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"luxon": "^2",
|
|
18
|
+
"luxon": "^2.4",
|
|
19
19
|
"reflect-metadata": "^0.1",
|
|
20
|
-
"rxjs": "^7",
|
|
21
|
-
"type-fest": "^2"
|
|
20
|
+
"rxjs": "^7.5",
|
|
21
|
+
"type-fest": "^2.14"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@types/chroma-js": "
|
|
24
|
+
"@types/chroma-js": "2.1",
|
|
25
25
|
"@types/koa__router": "8.0",
|
|
26
26
|
"@types/luxon": "2.3",
|
|
27
27
|
"@types/minio": "7.0",
|
|
28
28
|
"@types/mjml": "4.7",
|
|
29
|
-
"@types/node": "
|
|
30
|
-
"@types/nodemailer": "
|
|
29
|
+
"@types/node": "18",
|
|
30
|
+
"@types/nodemailer": "6.4",
|
|
31
31
|
"@types/yup": "0.29",
|
|
32
|
-
"@typescript-eslint/eslint-plugin": "5
|
|
33
|
-
"@typescript-eslint/parser": "5
|
|
32
|
+
"@typescript-eslint/eslint-plugin": "5",
|
|
33
|
+
"@typescript-eslint/parser": "5",
|
|
34
34
|
"eslint": "8.18",
|
|
35
35
|
"ttypescript": "1.5",
|
|
36
36
|
"typedoc": "0.23",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"mjml": "^4.12",
|
|
50
50
|
"mongodb": "^4.7",
|
|
51
51
|
"nodemailer": "^6.7",
|
|
52
|
-
"puppeteer": "^
|
|
52
|
+
"puppeteer": "^15.1",
|
|
53
53
|
"superstruct": "^0.16",
|
|
54
54
|
"undici": "^5.5",
|
|
55
55
|
"urlpattern-polyfill": "^4.0"
|
|
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./config"), exports);
|
|
18
|
+
__exportStar(require("./keyword-rewriter"), exports);
|
|
18
19
|
__exportStar(require("./model"), exports);
|
|
19
20
|
__exportStar(require("./module"), exports);
|
|
20
21
|
__exportStar(require("./search-index"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/search-index/elastic/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,iDAA+B;AAC/B,0CAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/search-index/elastic/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,qDAAmC;AACnC,0CAAwB;AACxB,2CAAyB;AACzB,iDAA+B;AAC/B,0CAAwB"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.KeywordRewriter = void 0;
|
|
4
|
+
class KeywordRewriter {
|
|
5
|
+
constructor(fields) {
|
|
6
|
+
this.fields = new Set(fields);
|
|
7
|
+
}
|
|
8
|
+
add(field) {
|
|
9
|
+
this.fields.add(field);
|
|
10
|
+
}
|
|
11
|
+
remove(field) {
|
|
12
|
+
this.fields.delete(field);
|
|
13
|
+
}
|
|
14
|
+
requiresRewrite(field) {
|
|
15
|
+
return this.fields.has(field);
|
|
16
|
+
}
|
|
17
|
+
rewriteIfRequired(field) {
|
|
18
|
+
return this.requiresRewrite(field) ? `${field}.keyword` : field;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.KeywordRewriter = KeywordRewriter;
|
|
22
|
+
//# sourceMappingURL=keyword-rewriter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keyword-rewriter.js","sourceRoot":"","sources":["../../../source/search-index/elastic/keyword-rewriter.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;IAG1B,YAAY,MAAwB;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,GAAG,CAAC,KAAa;QACf,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,iBAAiB,CAAC,KAAa;QAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,CAAC;CACF;AAtBD,0CAsBC"}
|
|
@@ -7,6 +7,7 @@ import { SearchIndex } from "..";
|
|
|
7
7
|
import type { Client } from '@elastic/elasticsearch';
|
|
8
8
|
import type { IndicesIndexSettings } from '@elastic/elasticsearch/lib/api/types';
|
|
9
9
|
import type { ElasticSearchIndexConfig } from './config';
|
|
10
|
+
import { KeywordRewriter } from './keyword-rewriter';
|
|
10
11
|
import type { ElasticIndexMapping } from './model';
|
|
11
12
|
export declare class ElasticSearchIndex<T extends Entity> extends SearchIndex<T> implements AfterResolve {
|
|
12
13
|
private readonly logger;
|
|
@@ -14,8 +15,8 @@ export declare class ElasticSearchIndex<T extends Entity> extends SearchIndex<T>
|
|
|
14
15
|
readonly indexName: string;
|
|
15
16
|
readonly indexSettings: IndicesIndexSettings;
|
|
16
17
|
readonly indexMapping: ElasticIndexMapping<T>;
|
|
17
|
-
readonly
|
|
18
|
-
constructor(client: Client, config: ElasticSearchIndexConfig<T>, indexSettings: IndicesIndexSettings, indexMapping: ElasticIndexMapping<T>,
|
|
18
|
+
readonly keywordRewriter: KeywordRewriter;
|
|
19
|
+
constructor(client: Client, config: ElasticSearchIndexConfig<T>, indexSettings: IndicesIndexSettings, indexMapping: ElasticIndexMapping<T>, keywordRewrites: Iterable<string>, logger: Logger);
|
|
19
20
|
[afterResolve](): Promise<void>;
|
|
20
21
|
initialize(): Promise<void>;
|
|
21
22
|
refresh(): Promise<void>;
|
|
@@ -8,17 +8,18 @@ const base64_1 = require("../../utils/base64");
|
|
|
8
8
|
const encoding_1 = require("../../utils/encoding");
|
|
9
9
|
const object_1 = require("../../utils/object");
|
|
10
10
|
const type_guards_1 = require("../../utils/type-guards");
|
|
11
|
+
const keyword_rewriter_1 = require("./keyword-rewriter");
|
|
11
12
|
const query_converter_1 = require("./query-converter");
|
|
12
13
|
const sort_converter_1 = require("./sort-converter");
|
|
13
14
|
class ElasticSearchIndex extends search_index_1.SearchIndex {
|
|
14
|
-
constructor(client, config, indexSettings, indexMapping,
|
|
15
|
+
constructor(client, config, indexSettings, indexMapping, keywordRewrites, logger) {
|
|
15
16
|
super();
|
|
16
17
|
this.client = client;
|
|
17
18
|
this.indexName = config.indexName;
|
|
18
19
|
this.indexSettings = indexSettings;
|
|
19
20
|
this.indexMapping = indexMapping;
|
|
20
|
-
this.sortKeywordRewrites = sortKeywordRewrites;
|
|
21
21
|
this.logger = logger;
|
|
22
|
+
this.keywordRewriter = new keyword_rewriter_1.KeywordRewriter(keywordRewrites);
|
|
22
23
|
}
|
|
23
24
|
async [container_1.afterResolve]() {
|
|
24
25
|
await this.initialize();
|
|
@@ -91,7 +92,7 @@ class ElasticSearchIndex extends search_index_1.SearchIndex {
|
|
|
91
92
|
if ((0, type_guards_1.isDefined)(cursorData) && (0, type_guards_1.isDefined)(options?.skip)) {
|
|
92
93
|
throw new Error('cursor and skip cannot be used at the same time');
|
|
93
94
|
}
|
|
94
|
-
const sort = cursorData?.sort ?? (options?.sort ?? []).map((sortItem) => (0, sort_converter_1.convertSort)(sortItem, this.
|
|
95
|
+
const sort = cursorData?.sort ?? (options?.sort ?? []).map((sortItem) => (0, sort_converter_1.convertSort)(sortItem, this.keywordRewriter));
|
|
95
96
|
search.sort = sort;
|
|
96
97
|
search.from = options?.skip;
|
|
97
98
|
search.size = options?.limit ?? cursorData?.options?.limit;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-index.js","sourceRoot":"","sources":["../../../source/search-index/elastic/search-index.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,uCAAsD;AAGtD,qCAA+D;AAC/D,+CAA4D;AAC5D,mDAA0D;AAC1D,+CAA8C;AAC9C,yDAAoE;
|
|
1
|
+
{"version":3,"file":"search-index.js","sourceRoot":"","sources":["../../../source/search-index/elastic/search-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { Entity, Sort } from "../../database";
|
|
2
|
+
import type { KeywordRewriter } from './keyword-rewriter';
|
|
2
3
|
import type { SortCombinations } from './model';
|
|
3
|
-
export declare function convertSort<T extends Entity>(sort: Sort<T>,
|
|
4
|
+
export declare function convertSort<T extends Entity>(sort: Sort<T>, keywordRewriter: KeywordRewriter): SortCombinations<T>;
|
|
@@ -6,10 +6,9 @@ const renameMap = new Map([
|
|
|
6
6
|
['$score', '_score']
|
|
7
7
|
]);
|
|
8
8
|
// eslint-disable-next-line max-lines-per-function, max-statements, complexity
|
|
9
|
-
function convertSort(sort,
|
|
9
|
+
function convertSort(sort, keywordRewriter) {
|
|
10
10
|
const name = renameMap.get(sort.field) ?? sort.field;
|
|
11
|
-
const
|
|
12
|
-
const field = rewrite ? `${name}.keyword` : name;
|
|
11
|
+
const field = keywordRewriter.rewriteIfRequired(name);
|
|
13
12
|
const order = sort.order ?? 'asc';
|
|
14
13
|
if (((field != '_score') && (order == 'asc')) || ((field == '_score') && (order == 'desc'))) {
|
|
15
14
|
return field;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort-converter.js","sourceRoot":"","sources":["../../../source/search-index/elastic/sort-converter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"sort-converter.js","sourceRoot":"","sources":["../../../source/search-index/elastic/sort-converter.ts"],"names":[],"mappings":";;;AAIA,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC;IACxB,CAAC,IAAI,EAAE,KAAK,CAAC;IACb,CAAC,QAAQ,EAAE,QAAQ,CAAC;CACrB,CAAC,CAAC;AAEH,8EAA8E;AAC9E,SAAgB,WAAW,CAAmB,IAAa,EAAE,eAAgC;IAC3F,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,KAAe,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC;IAC/D,MAAM,KAAK,GAAG,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,KAAK,GAAc,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;IAE7C,IAAI,CAAC,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,EAAE;QAC3F,OAAO,KAAgB,CAAC;KACzB;IAED,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAyB,CAAC;AACnD,CAAC;AAVD,kCAUC"}
|