elasticsearch-store 0.85.0 → 1.0.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/README.md +1 -1
- package/dist/src/elasticsearch-client/client.d.ts +3 -3
- package/dist/src/elasticsearch-client/client.js +7 -32
- package/dist/src/elasticsearch-client/client.js.map +1 -1
- package/dist/src/elasticsearch-client/create-client.d.ts +2 -2
- package/dist/src/elasticsearch-client/create-client.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/create-client.js +22 -50
- package/dist/src/elasticsearch-client/create-client.js.map +1 -1
- package/dist/src/elasticsearch-client/index.d.ts +3 -3
- package/dist/src/elasticsearch-client/index.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/index.js +3 -19
- package/dist/src/elasticsearch-client/index.js.map +1 -1
- package/dist/src/elasticsearch-client/interfaces.d.ts +1 -1
- package/dist/src/elasticsearch-client/interfaces.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/interfaces.js +1 -2
- package/dist/src/elasticsearch-client/log-wrapper.js +1 -5
- package/dist/src/elasticsearch-client/log-wrapper.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/bulk.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/bulk.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/catIndices.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/catIndices.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/clusterGetSettings.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/clusterGetSettings.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/clusterHealth.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/clusterHealth.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/count.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/count.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/create.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/create.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/delete.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/delete.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/deleteByQuery.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/deleteByQuery.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/exists.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/exists.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/get.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/get.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/helper-utils.js +7 -14
- package/dist/src/elasticsearch-client/method-helpers/helper-utils.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/index-method.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/index-method.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/index.d.ts +40 -40
- package/dist/src/elasticsearch-client/method-helpers/index.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/index.js +40 -56
- package/dist/src/elasticsearch-client/method-helpers/index.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesCreate.d.ts +2 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesCreate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesCreate.js +10 -14
- package/dist/src/elasticsearch-client/method-helpers/indicesCreate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDelete.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesDelete.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDeleteTemplate.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesDeleteTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesExists.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesExists.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesExistsTemplate.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesExistsTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGet.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesGet.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetFieldMapping.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesGetFieldMapping.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetIndexTemplate.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesGetIndexTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetMapping.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesGetMapping.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetSettings.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesGetSettings.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetTemplate.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesGetTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutMapping.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesPutMapping.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutSettings.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesPutSettings.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutTemplate.d.ts +2 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesPutTemplate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutTemplate.js +14 -18
- package/dist/src/elasticsearch-client/method-helpers/indicesPutTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesRecovery.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesRecovery.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesRefresh.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesRefresh.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesStats.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesStats.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesValidateQuery.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/indicesValidateQuery.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/mget.js +8 -12
- package/dist/src/elasticsearch-client/method-helpers/mget.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/msearch.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/msearch.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/nodesInfo.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/nodesInfo.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/nodesStats.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/nodesStats.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/reindex.js +9 -14
- package/dist/src/elasticsearch-client/method-helpers/reindex.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/search.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/search.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksCancel.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/tasksCancel.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksGet.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/tasksGet.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksList.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/tasksList.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/update.js +4 -8
- package/dist/src/elasticsearch-client/method-helpers/update.js.map +1 -1
- package/dist/src/index-manager.d.ts +6 -6
- package/dist/src/index-manager.d.ts.map +1 -1
- package/dist/src/index-manager.js +17 -41
- package/dist/src/index-manager.js.map +1 -1
- package/dist/src/index-model.d.ts +5 -5
- package/dist/src/index-model.d.ts.map +1 -1
- package/dist/src/index-model.js +33 -56
- package/dist/src/index-model.js.map +1 -1
- package/dist/src/index-store.d.ts +4 -5
- package/dist/src/index-store.d.ts.map +1 -1
- package/dist/src/index-store.js +103 -119
- package/dist/src/index-store.js.map +1 -1
- package/dist/src/index.d.ts +7 -7
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +8 -37
- package/dist/src/index.js.map +1 -1
- package/dist/src/interfaces.js +1 -2
- package/dist/src/test-helpers/config.js +1 -9
- package/dist/src/test-helpers/config.js.map +1 -1
- package/dist/src/test-helpers/elasticsearch.d.ts +2 -1
- package/dist/src/test-helpers/elasticsearch.d.ts.map +1 -1
- package/dist/src/test-helpers/elasticsearch.js +39 -52
- package/dist/src/test-helpers/elasticsearch.js.map +1 -1
- package/dist/src/test-helpers/fixtures/even-date-data.d.ts +1 -1
- package/dist/src/test-helpers/fixtures/even-date-data.d.ts.map +1 -1
- package/dist/src/test-helpers/fixtures/even-date-data.js +5 -8
- package/dist/src/test-helpers/fixtures/even-date-data.js.map +1 -1
- package/dist/src/test-helpers/fixtures/index.d.ts +2 -2
- package/dist/src/test-helpers/fixtures/index.d.ts.map +1 -1
- package/dist/src/test-helpers/fixtures/index.js +2 -28
- package/dist/src/test-helpers/fixtures/index.js.map +1 -1
- package/dist/src/test-helpers/fixtures/interfaces.js +1 -2
- package/dist/src/test-helpers/fixtures/uneven-date-data.d.ts +1 -1
- package/dist/src/test-helpers/fixtures/uneven-date-data.d.ts.map +1 -1
- package/dist/src/test-helpers/fixtures/uneven-date-data.js +5 -8
- package/dist/src/test-helpers/fixtures/uneven-date-data.js.map +1 -1
- package/dist/src/test-helpers/index.d.ts +3 -3
- package/dist/src/test-helpers/index.d.ts.map +1 -1
- package/dist/src/test-helpers/index.js +3 -19
- package/dist/src/test-helpers/index.js.map +1 -1
- package/dist/src/utils/elasticsearch.d.ts +8 -8
- package/dist/src/utils/elasticsearch.d.ts.map +1 -1
- package/dist/src/utils/elasticsearch.js +29 -71
- package/dist/src/utils/elasticsearch.js.map +1 -1
- package/dist/src/utils/errors.js +10 -40
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/index.d.ts +6 -6
- package/dist/src/utils/index.d.ts.map +1 -1
- package/dist/src/utils/index.js +6 -22
- package/dist/src/utils/index.js.map +1 -1
- package/dist/src/utils/misc.d.ts +1 -1
- package/dist/src/utils/misc.d.ts.map +1 -1
- package/dist/src/utils/misc.js +11 -43
- package/dist/src/utils/misc.js.map +1 -1
- package/dist/src/utils/model.d.ts.map +1 -1
- package/dist/src/utils/model.js +23 -54
- package/dist/src/utils/model.js.map +1 -1
- package/dist/src/utils/retry-config.js +6 -10
- package/dist/src/utils/retry-config.js.map +1 -1
- package/dist/src/utils/validation.d.ts +4 -4
- package/dist/src/utils/validation.d.ts.map +1 -1
- package/dist/src/utils/validation.js +29 -67
- package/dist/src/utils/validation.js.map +1 -1
- package/package.json +7 -6
|
@@ -1,59 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.getFlattenedNamesAndTypes = exports.fixMappingRequest = exports.isOpensearch2 = exports.isOpensearch1 = exports.isOpensearch = exports.isElasticsearch8 = exports.isElasticsearch6 = exports.getClientMetadata = exports.getESVersion = exports.getBulkResponseItem = exports.filterBulkRetries = exports.timeSeriesIndex = exports.__timeSeriesTest = exports.verifyIndexShards = exports.shardsPath = exports.getTimeByField = void 0;
|
|
27
|
-
const ts = __importStar(require("@terascope/utils"));
|
|
28
|
-
const types_1 = require("@terascope/types");
|
|
29
|
-
const errors_1 = require("./errors");
|
|
30
|
-
function getTimeByField(field = '') {
|
|
1
|
+
import * as ts from '@terascope/utils';
|
|
2
|
+
import { ElasticsearchDistribution } from '@terascope/types';
|
|
3
|
+
import { getErrorType } from './errors.js';
|
|
4
|
+
export function getTimeByField(field = '') {
|
|
31
5
|
return (input) => ts.getTime(ts.get(input, field)) || Date.now();
|
|
32
6
|
}
|
|
33
|
-
|
|
34
|
-
function shardsPath(index) {
|
|
7
|
+
export function shardsPath(index) {
|
|
35
8
|
return (stats) => ts.get(stats, [index, 'shards'], []);
|
|
36
9
|
}
|
|
37
|
-
|
|
38
|
-
function verifyIndexShards(shards) {
|
|
10
|
+
export function verifyIndexShards(shards) {
|
|
39
11
|
return ts.castArray(shards)
|
|
40
12
|
.filter((shard) => shard.primary)
|
|
41
13
|
.every((shard) => shard.stage === 'DONE');
|
|
42
14
|
}
|
|
43
|
-
|
|
44
|
-
exports.__timeSeriesTest = {};
|
|
15
|
+
export const __timeSeriesTest = {};
|
|
45
16
|
const formatter = {
|
|
46
17
|
daily: 10,
|
|
47
18
|
monthly: 7,
|
|
48
19
|
yearly: 4,
|
|
49
20
|
};
|
|
50
|
-
function timeSeriesIndex(index, timeSeriesFormat = 'monthly') {
|
|
21
|
+
export function timeSeriesIndex(index, timeSeriesFormat = 'monthly') {
|
|
51
22
|
const format = formatter[timeSeriesFormat];
|
|
52
23
|
if (!format)
|
|
53
24
|
throw new Error(`Unsupported format "${timeSeriesFormat}"`);
|
|
54
25
|
let dateStr;
|
|
55
|
-
if (ts.isTest &&
|
|
56
|
-
dateStr =
|
|
26
|
+
if (ts.isTest && __timeSeriesTest.date) {
|
|
27
|
+
dateStr = __timeSeriesTest.date.toISOString();
|
|
57
28
|
}
|
|
58
29
|
else {
|
|
59
30
|
dateStr = new Date().toISOString();
|
|
@@ -62,8 +33,7 @@ function timeSeriesIndex(index, timeSeriesFormat = 'monthly') {
|
|
|
62
33
|
const indexName = index.replace(/-{0,1}\*$/, '');
|
|
63
34
|
return `${indexName}-${dateStr.slice(0, format).replace(/-/g, '.')}`;
|
|
64
35
|
}
|
|
65
|
-
|
|
66
|
-
function filterBulkRetries(records, result) {
|
|
36
|
+
export function filterBulkRetries(records, result) {
|
|
67
37
|
if (!result.errors)
|
|
68
38
|
return [];
|
|
69
39
|
const retry = [];
|
|
@@ -75,7 +45,7 @@ function filterBulkRetries(records, result) {
|
|
|
75
45
|
// On a create request if a document exists it's not an error.
|
|
76
46
|
// are there cases where this is incorrect?
|
|
77
47
|
if (item.error && item.status !== 409) {
|
|
78
|
-
const type =
|
|
48
|
+
const type = getErrorType(item);
|
|
79
49
|
if (type === 'es_rejected_execution_exception') {
|
|
80
50
|
// retry this record
|
|
81
51
|
if (records[index] != null) {
|
|
@@ -91,7 +61,6 @@ function filterBulkRetries(records, result) {
|
|
|
91
61
|
}
|
|
92
62
|
return retry;
|
|
93
63
|
}
|
|
94
|
-
exports.filterBulkRetries = filterBulkRetries;
|
|
95
64
|
/**
|
|
96
65
|
* Get the first key and value from the bulk response:
|
|
97
66
|
*
|
|
@@ -116,14 +85,13 @@ exports.filterBulkRetries = filterBulkRetries;
|
|
|
116
85
|
}
|
|
117
86
|
* ```
|
|
118
87
|
*/
|
|
119
|
-
function getBulkResponseItem(input = {}) {
|
|
88
|
+
export function getBulkResponseItem(input = {}) {
|
|
120
89
|
return {
|
|
121
90
|
item: ts.getFirstValue(input),
|
|
122
91
|
action: ts.getFirstKey(input),
|
|
123
92
|
};
|
|
124
93
|
}
|
|
125
|
-
|
|
126
|
-
function getESVersion(client) {
|
|
94
|
+
export function getESVersion(client) {
|
|
127
95
|
const newClientVersion = ts.get(client, '__meta.version');
|
|
128
96
|
const version = newClientVersion || ts.get(client, 'transport._config.apiVersion', '6.5');
|
|
129
97
|
if (version && ts.isString(version)) {
|
|
@@ -132,11 +100,10 @@ function getESVersion(client) {
|
|
|
132
100
|
}
|
|
133
101
|
return 6;
|
|
134
102
|
}
|
|
135
|
-
|
|
136
|
-
function getClientMetadata(client) {
|
|
103
|
+
export function getClientMetadata(client) {
|
|
137
104
|
const newClientVersion = ts.get(client, '__meta.version');
|
|
138
105
|
const version = newClientVersion || ts.get(client, 'transport._config.apiVersion', '6.5');
|
|
139
|
-
const distribution = ts.get(client, '__meta.distribution',
|
|
106
|
+
const distribution = ts.get(client, '__meta.distribution', ElasticsearchDistribution.elasticsearch);
|
|
140
107
|
// lowest Elasticsearch we run is 6.8.6
|
|
141
108
|
const [majorVersion = 6, minorVersion = 8] = version.split('.').map(ts.toNumber);
|
|
142
109
|
return {
|
|
@@ -146,39 +113,32 @@ function getClientMetadata(client) {
|
|
|
146
113
|
minorVersion
|
|
147
114
|
};
|
|
148
115
|
}
|
|
149
|
-
|
|
150
|
-
function isElasticsearch6(client) {
|
|
116
|
+
export function isElasticsearch6(client) {
|
|
151
117
|
const { distribution, version: esVersion } = getClientMetadata(client);
|
|
152
118
|
const parsedVersion = ts.toNumber(esVersion.split('.', 1)[0]);
|
|
153
|
-
return distribution ===
|
|
119
|
+
return distribution === ElasticsearchDistribution.elasticsearch && parsedVersion === 6;
|
|
154
120
|
}
|
|
155
|
-
|
|
156
|
-
function isElasticsearch8(client) {
|
|
121
|
+
export function isElasticsearch8(client) {
|
|
157
122
|
const { distribution, version: esVersion } = getClientMetadata(client);
|
|
158
123
|
const parsedVersion = ts.toNumber(esVersion.split('.', 1)[0]);
|
|
159
|
-
return distribution ===
|
|
124
|
+
return distribution === ElasticsearchDistribution.elasticsearch && parsedVersion === 8;
|
|
160
125
|
}
|
|
161
|
-
|
|
162
|
-
function isOpensearch(client) {
|
|
126
|
+
export function isOpensearch(client) {
|
|
163
127
|
const { distribution } = getClientMetadata(client);
|
|
164
|
-
return distribution ===
|
|
128
|
+
return distribution === ElasticsearchDistribution.opensearch;
|
|
165
129
|
}
|
|
166
|
-
|
|
167
|
-
function isOpensearch1(client) {
|
|
130
|
+
export function isOpensearch1(client) {
|
|
168
131
|
const { distribution, version: esVersion } = getClientMetadata(client);
|
|
169
132
|
const parsedVersion = ts.toNumber(esVersion.split('.', 1)[0]);
|
|
170
|
-
return distribution ===
|
|
133
|
+
return distribution === ElasticsearchDistribution.opensearch && parsedVersion === 1;
|
|
171
134
|
}
|
|
172
|
-
|
|
173
|
-
function isOpensearch2(client) {
|
|
135
|
+
export function isOpensearch2(client) {
|
|
174
136
|
const { distribution, version: esVersion } = getClientMetadata(client);
|
|
175
137
|
const parsedVersion = ts.toNumber(esVersion.split('.', 1)[0]);
|
|
176
|
-
return distribution ===
|
|
138
|
+
return distribution === ElasticsearchDistribution.opensearch && parsedVersion === 2;
|
|
177
139
|
}
|
|
178
|
-
exports.isOpensearch2 = isOpensearch2;
|
|
179
140
|
// TODO: move this logic over to datatype
|
|
180
|
-
function fixMappingRequest(client, _params, isTemplate) {
|
|
181
|
-
var _a;
|
|
141
|
+
export function fixMappingRequest(client, _params, isTemplate) {
|
|
182
142
|
if (!_params || !_params.body) {
|
|
183
143
|
throw new Error('Invalid mapping request');
|
|
184
144
|
}
|
|
@@ -193,7 +153,7 @@ function fixMappingRequest(client, _params, isTemplate) {
|
|
|
193
153
|
}
|
|
194
154
|
// we do not support v5 anymore
|
|
195
155
|
if (esVersion !== 6) {
|
|
196
|
-
const mappings =
|
|
156
|
+
const mappings = params?.body?.mappings || {};
|
|
197
157
|
if (!mappings.properties && mappings._doc) {
|
|
198
158
|
// esV8/osV2 seem to convert properly if mapping._doc.properties or mapping.properties
|
|
199
159
|
// but esV7/osV1 only seem to work w/include_type_name if properties is under "_doc"
|
|
@@ -227,12 +187,11 @@ function fixMappingRequest(client, _params, isTemplate) {
|
|
|
227
187
|
}
|
|
228
188
|
return Object.assign({}, defaultParams, params);
|
|
229
189
|
}
|
|
230
|
-
exports.fixMappingRequest = fixMappingRequest;
|
|
231
190
|
/**
|
|
232
191
|
* This is useful for diffing the property mappings, the keys should be
|
|
233
192
|
* sorted so this can be stringified and diffed.
|
|
234
193
|
*/
|
|
235
|
-
function getFlattenedNamesAndTypes(config) {
|
|
194
|
+
export function getFlattenedNamesAndTypes(config) {
|
|
236
195
|
const output = Object.create(null);
|
|
237
196
|
for (const field of Object.keys(config).sort()) {
|
|
238
197
|
const { type: _type, properties, ...extra } = config[field];
|
|
@@ -254,5 +213,4 @@ function getFlattenedNamesAndTypes(config) {
|
|
|
254
213
|
}
|
|
255
214
|
return output;
|
|
256
215
|
}
|
|
257
|
-
exports.getFlattenedNamesAndTypes = getFlattenedNamesAndTypes;
|
|
258
216
|
//# sourceMappingURL=elasticsearch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils/errors.js
CHANGED
|
@@ -1,59 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.getErrorType = exports.getErrorMessage = exports.throwValidationError = exports.getErrorMessages = void 0;
|
|
27
|
-
const ts = __importStar(require("@terascope/utils"));
|
|
28
|
-
function getErrorMessages(errors) {
|
|
1
|
+
import { TSError, isString, get } from '@terascope/utils';
|
|
2
|
+
export function getErrorMessages(errors) {
|
|
29
3
|
return errors.filter(Boolean).map(getErrorMessage).join(',');
|
|
30
4
|
}
|
|
31
|
-
|
|
32
|
-
function throwValidationError(errors) {
|
|
5
|
+
export function throwValidationError(errors) {
|
|
33
6
|
if (errors == null)
|
|
34
7
|
return null;
|
|
35
8
|
if (!errors.length)
|
|
36
9
|
return null;
|
|
37
10
|
const errorMsg = getErrorMessages(errors);
|
|
38
|
-
const error = new
|
|
11
|
+
const error = new TSError(errorMsg, {
|
|
39
12
|
statusCode: 400,
|
|
40
13
|
});
|
|
41
14
|
Error.captureStackTrace(error, throwValidationError);
|
|
42
15
|
throw error;
|
|
43
16
|
}
|
|
44
|
-
|
|
45
|
-
function getErrorMessage(err) {
|
|
17
|
+
export function getErrorMessage(err) {
|
|
46
18
|
const defaultErrorMsg = 'Unknown Error';
|
|
47
|
-
if (err &&
|
|
19
|
+
if (err && isString(err)) {
|
|
48
20
|
return err;
|
|
49
21
|
}
|
|
50
|
-
const message =
|
|
51
|
-
const prefix =
|
|
22
|
+
const message = get(err, ['message']) || get(err, ['msg'], defaultErrorMsg);
|
|
23
|
+
const prefix = get(err, ['dataPath']);
|
|
52
24
|
return `${prefix ? `${prefix} ` : ''}${message}`;
|
|
53
25
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
return ts.get(err, ['error', 'type'], '');
|
|
26
|
+
export function getErrorType(err) {
|
|
27
|
+
return get(err, ['error', 'type'], '');
|
|
57
28
|
}
|
|
58
|
-
exports.getErrorType = getErrorType;
|
|
59
29
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAG1D,MAAM,UAAU,gBAAgB,CAAC,MAAmB;IAChD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAsC;IACvE,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEhC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE1C,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE;QAChC,UAAU,EAAE,GAAG;KAClB,CAAC,CAAC;IAEH,KAAK,CAAC,iBAAiB,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IACrD,MAAM,KAAK,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAc;IAC1C,MAAM,eAAe,GAAG,eAAe,CAAC;IACxC,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtB,OAAO,GAAG,CAAC;KACd;IAED,MAAM,OAAO,GAAW,GAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEtC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAY;IACrC,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export * from './errors';
|
|
2
|
-
export * from './elasticsearch';
|
|
3
|
-
export * from './misc';
|
|
4
|
-
export * from './model';
|
|
5
|
-
export * from './retry-config';
|
|
6
|
-
export * from './validation';
|
|
1
|
+
export * from './errors.js';
|
|
2
|
+
export * from './elasticsearch.js';
|
|
3
|
+
export * from './misc.js';
|
|
4
|
+
export * from './model.js';
|
|
5
|
+
export * from './retry-config.js';
|
|
6
|
+
export * from './validation.js';
|
|
7
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}
|
package/dist/src/utils/index.js
CHANGED
|
@@ -1,23 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./errors"), exports);
|
|
18
|
-
__exportStar(require("./elasticsearch"), exports);
|
|
19
|
-
__exportStar(require("./misc"), exports);
|
|
20
|
-
__exportStar(require("./model"), exports);
|
|
21
|
-
__exportStar(require("./retry-config"), exports);
|
|
22
|
-
__exportStar(require("./validation"), exports);
|
|
1
|
+
export * from './errors.js';
|
|
2
|
+
export * from './elasticsearch.js';
|
|
3
|
+
export * from './misc.js';
|
|
4
|
+
export * from './model.js';
|
|
5
|
+
export * from './retry-config.js';
|
|
6
|
+
export * from './validation.js';
|
|
23
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}
|
package/dist/src/utils/misc.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TimeSeriesFormat } from '../interfaces';
|
|
1
|
+
import { TimeSeriesFormat } from '../interfaces.js';
|
|
2
2
|
export declare function getRolloverFrequency(config: unknown): TimeSeriesFormat;
|
|
3
3
|
export declare function getSchemaVersion(config: unknown): number;
|
|
4
4
|
export declare function getSchemaVersionStr(config: unknown): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,gBAAgB,CAEtE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE3D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAEtD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAEzD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,CAEpE"}
|
package/dist/src/utils/misc.js
CHANGED
|
@@ -1,52 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.formatIndexName = exports.getDataVersionStr = exports.getDataVersion = exports.getSchemaVersionStr = exports.getSchemaVersion = exports.getRolloverFrequency = void 0;
|
|
27
|
-
const ts = __importStar(require("@terascope/utils"));
|
|
28
|
-
function getRolloverFrequency(config) {
|
|
29
|
-
return ts.get(config, ['index_schema', 'rollover_frequency'], 'monthly');
|
|
1
|
+
import { get, trim } from '@terascope/utils';
|
|
2
|
+
export function getRolloverFrequency(config) {
|
|
3
|
+
return get(config, ['index_schema', 'rollover_frequency'], 'monthly');
|
|
30
4
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
return ts.get(config, ['index_schema', 'version'], 1);
|
|
5
|
+
export function getSchemaVersion(config) {
|
|
6
|
+
return get(config, ['index_schema', 'version'], 1);
|
|
34
7
|
}
|
|
35
|
-
|
|
36
|
-
function getSchemaVersionStr(config) {
|
|
8
|
+
export function getSchemaVersionStr(config) {
|
|
37
9
|
return `s${getSchemaVersion(config)}`;
|
|
38
10
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
return ts.get(config, ['version'], 1);
|
|
11
|
+
export function getDataVersion(config) {
|
|
12
|
+
return get(config, ['version'], 1);
|
|
42
13
|
}
|
|
43
|
-
|
|
44
|
-
function getDataVersionStr(config) {
|
|
14
|
+
export function getDataVersionStr(config) {
|
|
45
15
|
return `v${getDataVersion(config)}`;
|
|
46
16
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return strs.map((val) => ts.trim(val)).filter(Boolean).join('-');
|
|
17
|
+
export function formatIndexName(strs) {
|
|
18
|
+
return strs.map((val) => trim(val)).filter(Boolean).join('-');
|
|
50
19
|
}
|
|
51
|
-
exports.formatIndexName = formatIndexName;
|
|
52
20
|
//# sourceMappingURL=misc.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAG7C,MAAM,UAAU,oBAAoB,CAAC,MAAe;IAChD,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAe;IAC5C,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAe;IAC/C,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAe;IAC1C,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAe;IAC7C,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAA4B;IACxD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/utils/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAkB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/utils/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAkB,MAAM,uBAAuB,CAAC;AAMjE,kBAAkB;AAClB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;CAwBlB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;CAC1B,GAAG,QAAQ,CAYX;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAEhF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAiB/D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAGD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAYtD"}
|
package/dist/src/utils/model.js
CHANGED
|
@@ -1,34 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.uniqueFieldQuery = exports.toInstanceName = exports.mergeDefaults = exports.addDefaultSchema = exports.makeRecordDataType = exports.schema = void 0;
|
|
27
|
-
const types_1 = require("@terascope/types");
|
|
28
|
-
const data_types_1 = require("@terascope/data-types");
|
|
29
|
-
const ts = __importStar(require("@terascope/utils"));
|
|
1
|
+
import { FieldType } from '@terascope/types';
|
|
2
|
+
import { DataType, LATEST_VERSION } from '@terascope/data-types';
|
|
3
|
+
import { cloneDeep, isPlainObject, concat, getWordParts, firstToUpper, isNumberLike } from '@terascope/utils';
|
|
30
4
|
/** JSON Schema */
|
|
31
|
-
|
|
5
|
+
export const schema = {
|
|
32
6
|
additionalProperties: false,
|
|
33
7
|
properties: {
|
|
34
8
|
_key: {
|
|
@@ -53,37 +27,35 @@ exports.schema = {
|
|
|
53
27
|
},
|
|
54
28
|
required: ['_key', 'client_id'],
|
|
55
29
|
};
|
|
56
|
-
function makeRecordDataType(arg) {
|
|
57
|
-
return new
|
|
30
|
+
export function makeRecordDataType(arg) {
|
|
31
|
+
return new DataType({
|
|
58
32
|
fields: {
|
|
59
33
|
...arg.fields,
|
|
60
|
-
_created: { type:
|
|
61
|
-
_updated: { type:
|
|
62
|
-
_deleted: { type:
|
|
63
|
-
_key: { type:
|
|
64
|
-
client_id: { type:
|
|
34
|
+
_created: { type: FieldType.Date, description: 'Record creation time' },
|
|
35
|
+
_updated: { type: FieldType.Date, description: 'Last record modified time' },
|
|
36
|
+
_deleted: { type: FieldType.Boolean, description: 'A flag to indicate whether the record is deleted' },
|
|
37
|
+
_key: { type: FieldType.Keyword, description: 'The unique ID for the record (autogenerated on creation)' },
|
|
38
|
+
client_id: { type: FieldType.Integer, description: 'The client id namespace, 0 is global' },
|
|
65
39
|
},
|
|
66
|
-
version:
|
|
40
|
+
version: LATEST_VERSION
|
|
67
41
|
}, arg.name, arg.description);
|
|
68
42
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
return mergeDefaults(input, exports.schema);
|
|
43
|
+
export function addDefaultSchema(input) {
|
|
44
|
+
return mergeDefaults(input, schema);
|
|
72
45
|
}
|
|
73
|
-
exports.addDefaultSchema = addDefaultSchema;
|
|
74
46
|
/**
|
|
75
47
|
* Deep copy two levels deep (useful for mapping and schema)
|
|
76
48
|
*/
|
|
77
|
-
function mergeDefaults(source, from) {
|
|
78
|
-
const output =
|
|
79
|
-
const _mapping = from ?
|
|
49
|
+
export function mergeDefaults(source, from) {
|
|
50
|
+
const output = cloneDeep(source);
|
|
51
|
+
const _mapping = from ? cloneDeep(from) : {};
|
|
80
52
|
for (const [key, val] of Object.entries(_mapping)) {
|
|
81
53
|
if (output[key] != null) {
|
|
82
|
-
if (
|
|
54
|
+
if (isPlainObject(val)) {
|
|
83
55
|
output[key] = Object.assign(output[key], val);
|
|
84
56
|
}
|
|
85
57
|
else if (Array.isArray(val)) {
|
|
86
|
-
output[key] =
|
|
58
|
+
output[key] = concat(output[key], val);
|
|
87
59
|
}
|
|
88
60
|
else {
|
|
89
61
|
output[key] = val;
|
|
@@ -92,18 +64,16 @@ function mergeDefaults(source, from) {
|
|
|
92
64
|
}
|
|
93
65
|
return output;
|
|
94
66
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
return ts.getWordParts(name).map(ts.firstToUpper).join('');
|
|
67
|
+
export function toInstanceName(name) {
|
|
68
|
+
return getWordParts(name).map(firstToUpper).join('');
|
|
98
69
|
}
|
|
99
|
-
exports.toInstanceName = toInstanceName;
|
|
100
70
|
const _wildcardRegex = /[^A-Za-z0-9]/gm;
|
|
101
|
-
function uniqueFieldQuery(field) {
|
|
71
|
+
export function uniqueFieldQuery(field) {
|
|
102
72
|
const parsed = field
|
|
103
73
|
.replace(_wildcardRegex, '.')
|
|
104
74
|
.split('')
|
|
105
75
|
.map((char) => {
|
|
106
|
-
if (char !== '.' && !
|
|
76
|
+
if (char !== '.' && !isNumberLike(char)) {
|
|
107
77
|
return `[${char.toLowerCase()}${char.toUpperCase()}]`;
|
|
108
78
|
}
|
|
109
79
|
return char;
|
|
@@ -111,5 +81,4 @@ function uniqueFieldQuery(field) {
|
|
|
111
81
|
.join('');
|
|
112
82
|
return `/${parsed}/`;
|
|
113
83
|
}
|
|
114
|
-
exports.uniqueFieldQuery = uniqueFieldQuery;
|
|
115
84
|
//# sourceMappingURL=model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/utils/model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/utils/model.ts"],"names":[],"mappings":"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"}
|