@vscode/telemetry-extractor 1.20.2 → 1.20.5
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/.github/dependabot.yml +11 -0
- package/.github/workflows/node.js.yml +3 -2
- package/eslint.config.js +6 -1
- package/out/cli-options.js +2 -1
- package/out/cli-options.js.map +1 -1
- package/out/extractor.js +7 -1
- package/out/extractor.js.map +1 -1
- package/out/lib/common-properties.js +51 -1
- package/out/lib/common-properties.js.map +1 -1
- package/out/lib/declarations.js.map +1 -1
- package/out/lib/event-definition.js +5 -0
- package/out/lib/event-definition.js.map +1 -0
- package/out/lib/events.js +28 -1
- package/out/lib/events.js.map +1 -1
- package/out/lib/object-converter.js +58 -4
- package/out/lib/object-converter.js.map +1 -1
- package/out/lib/operations.js +83 -66
- package/out/lib/operations.js.map +1 -1
- package/out/lib/parser.js +18 -23
- package/out/lib/parser.js.map +1 -1
- package/out/lib/ripgrep.js +14 -0
- package/out/lib/ripgrep.js.map +1 -0
- package/out/lib/save-declarations.js +32 -10
- package/out/lib/save-declarations.js.map +1 -1
- package/out/lib/ts-parser-worker.js +39 -0
- package/out/lib/ts-parser-worker.js.map +1 -0
- package/out/lib/ts-parser.js +204 -37
- package/out/lib/ts-parser.js.map +1 -1
- package/package.json +3 -3
- package/src/cli-options.ts +2 -1
- package/src/extractor.ts +8 -1
- package/src/lib/common-properties.ts +71 -5
- package/src/lib/declarations.ts +2 -1
- package/src/lib/event-definition.ts +7 -0
- package/src/lib/events.ts +33 -1
- package/src/lib/object-converter.ts +73 -4
- package/src/lib/operations.ts +75 -72
- package/src/lib/parser.ts +22 -34
- package/src/lib/ripgrep.ts +10 -0
- package/src/lib/save-declarations.ts +37 -13
- package/src/lib/ts-parser-worker.ts +38 -0
- package/src/lib/ts-parser.ts +247 -41
- package/tsconfig.json +1 -0
- package/vscode-telemetry-extractor.d.ts +21 -1
|
@@ -21,14 +21,15 @@ jobs:
|
|
|
21
21
|
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
|
|
22
22
|
|
|
23
23
|
steps:
|
|
24
|
-
- uses: actions/checkout@v4
|
|
24
|
+
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
|
|
25
25
|
with:
|
|
26
26
|
persist-credentials: false
|
|
27
27
|
- name: Use Node.js ${{ matrix.node-version }}
|
|
28
|
-
uses: actions/setup-node@v4
|
|
28
|
+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
|
|
29
29
|
with:
|
|
30
30
|
node-version: ${{ matrix.node-version }}
|
|
31
31
|
cache: 'npm'
|
|
32
32
|
- run: npm ci
|
|
33
33
|
- run: npm run compile --if-present
|
|
34
|
+
- run: npm run lint
|
|
34
35
|
- run: npm test
|
package/eslint.config.js
CHANGED
|
@@ -3,7 +3,7 @@ const tseslint = require('typescript-eslint');
|
|
|
3
3
|
|
|
4
4
|
module.exports = tseslint.config(
|
|
5
5
|
{
|
|
6
|
-
ignores: ['out/**', 'src/tests/mocha/resources/**'],
|
|
6
|
+
ignores: ['out/**', 'src/tests/mocha/resources/**', 'src/tests/mocha/tableResources/**', 'src/telemetry-sources/**'],
|
|
7
7
|
},
|
|
8
8
|
eslint.configs.recommended,
|
|
9
9
|
...tseslint.configs.recommended,
|
|
@@ -14,4 +14,9 @@ module.exports = tseslint.config(
|
|
|
14
14
|
'no-undef': 'off',
|
|
15
15
|
},
|
|
16
16
|
},
|
|
17
|
+
{
|
|
18
|
+
rules: {
|
|
19
|
+
'@typescript-eslint/no-namespace': 'off',
|
|
20
|
+
},
|
|
21
|
+
}
|
|
17
22
|
);
|
package/out/cli-options.js
CHANGED
|
@@ -52,7 +52,8 @@ exports.optionDefinitions = [
|
|
|
52
52
|
{ name: 'applyEndpoints', alias: 'e', type: Boolean, defaultValue: false },
|
|
53
53
|
{ name: 'silenceOutput', type: Boolean, description: 'Silences all progress messages.', defaultValue: false },
|
|
54
54
|
{ name: 'lowerCaseEvents', alias: 'l', type: Boolean, defaultValue: false },
|
|
55
|
-
{ name: 'verbose', alias: 'v', type: Boolean, defaultValue: false }
|
|
55
|
+
{ name: 'verbose', alias: 'v', type: Boolean, defaultValue: false },
|
|
56
|
+
{ name: 'tableInfo', alias: 't', type: Boolean, description: 'Outputs Kusto table information. If no filename is specified the default file name with -tableInfo is used.', defaultValue: false }
|
|
56
57
|
];
|
|
57
58
|
exports.options = resolveDirectories((0, command_line_args_1.default)(exports.optionDefinitions, { partial: true }));
|
|
58
59
|
//# sourceMappingURL=cli-options.js.map
|
package/out/cli-options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-options.js","sourceRoot":"","sources":["../src/cli-options.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,0EAAgD;AAChD,2CAA6B;AAE7B,SAAS,kBAAkB,CAAC,OAA2C;IACnE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,SAAS,GAAI,OAAO,CAAC,SAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAEY,QAAA,iBAAiB,GAAG;IAC7B,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,2EAA2E,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzJ,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,0FAA0F,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE;IAC5L,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,yDAAyD,EAAE,IAAI,EAAE,MAAM,EAAE;IACpH,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,4EAA4E,EAAE,IAAI,EAAE,MAAM,EAAE;IAC1I,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,qCAAqC,EAAE,IAAI,EAAE,MAAM,EAAE;IAClG,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,0DAA0D,EAAE,YAAY,EAAE,EAAE,EAAE;IAC5I,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,iFAAiF,EAAE,YAAY,EAAE,KAAK,EAAE;IAChK,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IAC1E,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,iCAAiC,EAAE,YAAY,EAAE,KAAK,EAAE;IAC7G,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IAC3E,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"cli-options.js","sourceRoot":"","sources":["../src/cli-options.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,0EAAgD;AAChD,2CAA6B;AAE7B,SAAS,kBAAkB,CAAC,OAA2C;IACnE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,SAAS,GAAI,OAAO,CAAC,SAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAEY,QAAA,iBAAiB,GAAG;IAC7B,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,2EAA2E,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzJ,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,0FAA0F,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE;IAC5L,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,yDAAyD,EAAE,IAAI,EAAE,MAAM,EAAE;IACpH,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,4EAA4E,EAAE,IAAI,EAAE,MAAM,EAAE;IAC1I,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,qCAAqC,EAAE,IAAI,EAAE,MAAM,EAAE;IAClG,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,0DAA0D,EAAE,YAAY,EAAE,EAAE,EAAE;IAC5I,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,iFAAiF,EAAE,YAAY,EAAE,KAAK,EAAE;IAChK,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IAC1E,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,iCAAiC,EAAE,YAAY,EAAE,KAAK,EAAE;IAC7G,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IAC3E,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IACnE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,6GAA6G,EAAE,YAAY,EAAE,KAAK,EAAE;CACpM,CAAC;AAEW,QAAA,OAAO,GAAG,kBAAkB,CAAC,IAAA,2BAAe,EAAC,yBAAiB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC"}
|
package/out/extractor.js
CHANGED
|
@@ -63,7 +63,13 @@ else {
|
|
|
63
63
|
};
|
|
64
64
|
(0, save_declarations_1.extractAndResolveDeclarations)([sourceSpec]).then((declarations) => {
|
|
65
65
|
if (cli_options_1.options.outputDir) {
|
|
66
|
-
|
|
66
|
+
const tableInfos = declarations.tableInfos;
|
|
67
|
+
const gdprDeclarations = { ...declarations };
|
|
68
|
+
delete gdprDeclarations.tableInfos;
|
|
69
|
+
(0, save_declarations_1.writeToFile)(cli_options_1.options.outputDir, gdprDeclarations, cli_options_1.options.fileName || 'declarations-resolved', !cli_options_1.options.silent);
|
|
70
|
+
if (cli_options_1.options.tableInfo) {
|
|
71
|
+
(0, save_declarations_1.writeToFile)(cli_options_1.options.outputDir, tableInfos, cli_options_1.options.fileName ? cli_options_1.options.fileName + '-tableInfo' : 'tableInfo', !cli_options_1.options.silent);
|
|
72
|
+
}
|
|
67
73
|
}
|
|
68
74
|
else {
|
|
69
75
|
console.log(JSON.stringify(declarations));
|
package/out/extractor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../src/extractor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAuC;AACvC,kCAAkC;AAClC,+CAAwC;AACxC,2CAA6B;AAC7B,qCAA8B;AAC9B,+DAAqF;AACrF,mDAA0F;AAC1F,yCAA0C;
|
|
1
|
+
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../src/extractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Property = exports.CommonProperties = void 0;
|
|
3
|
+
exports.Property = exports.ColumnInfo = exports.ColumnType = exports.CommonProperties = void 0;
|
|
4
4
|
class CommonProperties {
|
|
5
5
|
properties;
|
|
6
6
|
constructor() {
|
|
@@ -8,6 +8,52 @@ class CommonProperties {
|
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
exports.CommonProperties = CommonProperties;
|
|
11
|
+
var ColumnType;
|
|
12
|
+
(function (ColumnType) {
|
|
13
|
+
function fromString(type) {
|
|
14
|
+
switch (type.toLowerCase()) {
|
|
15
|
+
case 'bool':
|
|
16
|
+
case 'boolean':
|
|
17
|
+
return 'bool';
|
|
18
|
+
case 'int':
|
|
19
|
+
return 'int';
|
|
20
|
+
case 'long':
|
|
21
|
+
return 'long';
|
|
22
|
+
case 'real':
|
|
23
|
+
case 'double':
|
|
24
|
+
return 'real';
|
|
25
|
+
case 'decimal':
|
|
26
|
+
return 'decimal';
|
|
27
|
+
case 'dynamic':
|
|
28
|
+
return 'dynamic';
|
|
29
|
+
case 'guid':
|
|
30
|
+
case 'uuid':
|
|
31
|
+
case 'uniqueid':
|
|
32
|
+
return 'guid';
|
|
33
|
+
case 'string':
|
|
34
|
+
return 'string';
|
|
35
|
+
case 'datetime':
|
|
36
|
+
case 'date':
|
|
37
|
+
return 'datetime';
|
|
38
|
+
case 'timespan':
|
|
39
|
+
case 'time':
|
|
40
|
+
return 'timespan';
|
|
41
|
+
default:
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
ColumnType.fromString = fromString;
|
|
46
|
+
})(ColumnType || (exports.ColumnType = ColumnType = {}));
|
|
47
|
+
var ColumnInfo;
|
|
48
|
+
(function (ColumnInfo) {
|
|
49
|
+
function is(obj) {
|
|
50
|
+
const candidate = obj;
|
|
51
|
+
return !!candidate &&
|
|
52
|
+
(candidate.name === undefined || typeof candidate.name === 'string') &&
|
|
53
|
+
typeof candidate.type === 'string' && ColumnType.fromString(candidate.type) !== undefined;
|
|
54
|
+
}
|
|
55
|
+
ColumnInfo.is = is;
|
|
56
|
+
})(ColumnInfo || (exports.ColumnInfo = ColumnInfo = {}));
|
|
11
57
|
class Property {
|
|
12
58
|
name;
|
|
13
59
|
classification;
|
|
@@ -17,6 +63,10 @@ class Property {
|
|
|
17
63
|
expiration;
|
|
18
64
|
owner;
|
|
19
65
|
comment;
|
|
66
|
+
// The name and type of the property if mirrored into a flat table in Kusto.
|
|
67
|
+
// Needs to be removed when generating the patch for the GDPR catalog as
|
|
68
|
+
// flat table properties are not allowed in the catalog.
|
|
69
|
+
column;
|
|
20
70
|
constructor(name, classification, purpose, expiration, owner, comment, endpoint, isMeasurement) {
|
|
21
71
|
this.name = name;
|
|
22
72
|
this.classification = classification;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-properties.js","sourceRoot":"","sources":["../../src/lib/common-properties.ts"],"names":[],"mappings":";;;AAIA,MAAa,gBAAgB;IAClB,UAAU,CAAkB;IACnC;QACI,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;CACJ;AALD,4CAKC;AAED,MAAa,QAAQ;IACV,IAAI,CAAS;IACb,cAAc,CAAS;IACvB,OAAO,CAAS;IAChB,QAAQ,CAAU;IAClB,aAAa,CAAW;IACxB,UAAU,CAAU;IACpB,KAAK,CAAU;IACf,OAAO,CAAU;IAExB,YACI,IAAY,EACZ,cAAsB,EACtB,OAAe,EACf,UAAmB,EACnB,KAAc,EACd,OAAgB,EAChB,QAAiB,EACjB,aAAuB;QAEvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"common-properties.js","sourceRoot":"","sources":["../../src/lib/common-properties.ts"],"names":[],"mappings":";;;AAIA,MAAa,gBAAgB;IAClB,UAAU,CAAkB;IACnC;QACI,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;CACJ;AALD,4CAKC;AAcD,IAAiB,UAAU,CAiC1B;AAjCD,WAAiB,UAAU;IACvB,SAAgB,UAAU,CAAC,IAAY;QACnC,QAAQ,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,KAAK,MAAM,CAAC;YACZ,KAAK,SAAS;gBACV,OAAO,MAAM,CAAC;YAClB,KAAK,KAAK;gBACN,OAAO,KAAK,CAAC;YACjB,KAAK,MAAM;gBACP,OAAO,MAAM,CAAC;YAClB,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ;gBACT,OAAO,MAAM,CAAC;YAClB,KAAK,SAAS;gBACV,OAAO,SAAS,CAAC;YACrB,KAAK,SAAS;gBACV,OAAO,SAAS,CAAC;YACrB,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,UAAU;gBACX,OAAO,MAAM,CAAC;YAClB,KAAK,QAAQ;gBACT,OAAO,QAAQ,CAAC;YACpB,KAAK,UAAU,CAAC;YAChB,KAAK,MAAM;gBACP,OAAO,UAAU,CAAC;YACtB,KAAK,UAAU,CAAC;YAChB,KAAK,MAAM;gBACP,OAAO,UAAU,CAAC;YACtB;gBACI,OAAO,SAAS,CAAC;QACzB,CAAC;IACL,CAAC;IA/Be,qBAAU,aA+BzB,CAAA;AACL,CAAC,EAjCgB,UAAU,0BAAV,UAAU,QAiC1B;AAOD,IAAiB,UAAU,CAO1B;AAPD,WAAiB,UAAU;IACvB,SAAgB,EAAE,CAAC,GAAY;QAC3B,MAAM,SAAS,GAAG,GAAiB,CAAC;QACpC,OAAO,CAAC,CAAC,SAAS;YACd,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC;YACpE,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;IAClG,CAAC;IALe,aAAE,KAKjB,CAAA;AACL,CAAC,EAPgB,UAAU,0BAAV,UAAU,QAO1B;AAED,MAAa,QAAQ;IACV,IAAI,CAAS;IACb,cAAc,CAAS;IACvB,OAAO,CAAS;IAChB,QAAQ,CAAU;IAClB,aAAa,CAAW;IACxB,UAAU,CAAU;IACpB,KAAK,CAAU;IACf,OAAO,CAAU;IAExB,4EAA4E;IAC5E,wEAAwE;IACxE,wDAAwD;IACjD,MAAM,CAAc;IAE3B,YACI,IAAY,EACZ,cAAsB,EACtB,OAAe,EACf,UAAmB,EACnB,KAAc,EACd,OAAgB,EAChB,QAAiB,EACjB,aAAuB;QAEvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CACJ;AAlCD,4BAkCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../src/lib/declarations.ts"],"names":[],"mappings":";;;AAGA,qCAAmD;AACnD,2DAAiE;
|
|
1
|
+
{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../src/lib/declarations.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"event-definition.js","sourceRoot":"","sources":["../../src/lib/event-definition.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC"}
|
package/out/lib/events.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Metadata = exports.WildcardEntry = exports.Wildcard = exports.Inline = exports.Include = exports.Event = exports.Events = void 0;
|
|
3
|
+
exports.Metadata = exports.WildcardEntry = exports.Wildcard = exports.Inline = exports.Include = exports.Event = exports.TableInfo = exports.Events = void 0;
|
|
4
4
|
class Events {
|
|
5
5
|
dataPoints;
|
|
6
6
|
constructor() {
|
|
@@ -8,13 +8,40 @@ class Events {
|
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
exports.Events = Events;
|
|
11
|
+
var TableInfo;
|
|
12
|
+
(function (TableInfo) {
|
|
13
|
+
function fromObject(obj) {
|
|
14
|
+
if (typeof obj !== 'object' || obj === null) {
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
const candidate = obj;
|
|
18
|
+
if (typeof candidate.name !== 'string') {
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
const result = {
|
|
22
|
+
name: candidate.name,
|
|
23
|
+
commonProperties: 'standard',
|
|
24
|
+
backfill: false
|
|
25
|
+
};
|
|
26
|
+
if (candidate.commonProperties === 'standard') {
|
|
27
|
+
result.commonProperties = 'standard';
|
|
28
|
+
}
|
|
29
|
+
if (typeof candidate.backfill === 'boolean' || typeof candidate.backfill === 'string') {
|
|
30
|
+
result.backfill = candidate.backfill;
|
|
31
|
+
}
|
|
32
|
+
return result;
|
|
33
|
+
}
|
|
34
|
+
TableInfo.fromObject = fromObject;
|
|
35
|
+
})(TableInfo || (exports.TableInfo = TableInfo = {}));
|
|
11
36
|
class Event {
|
|
12
37
|
name;
|
|
13
38
|
// It gets a little more complicated here as events can have a bunch of different things
|
|
14
39
|
properties;
|
|
40
|
+
tableInfo;
|
|
15
41
|
constructor(name) {
|
|
16
42
|
this.name = name;
|
|
17
43
|
this.properties = [];
|
|
44
|
+
this.tableInfo = undefined;
|
|
18
45
|
}
|
|
19
46
|
}
|
|
20
47
|
exports.Event = Event;
|
package/out/lib/events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/lib/events.ts"],"names":[],"mappings":";;;AAMA,MAAa,MAAM;IACR,UAAU,CAAe;IAChC;QACI,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;CACJ;AALD,wBAKC;AAED,MAAa,KAAK;IACP,IAAI,CAAS;IACpB,wFAAwF;IACjF,UAAU,CAA2D;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/lib/events.ts"],"names":[],"mappings":";;;AAMA,MAAa,MAAM;IACR,UAAU,CAAe;IAChC;QACI,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;CACJ;AALD,wBAKC;AAOD,IAAiB,SAAS,CAuBzB;AAvBD,WAAiB,SAAS;IACtB,SAAgB,UAAU,CAAC,GAAY;QACnC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,SAAS,GAAuB,GAAgB,CAAC;QACvD,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,MAAM,GAAc;YACtB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,gBAAgB,EAAE,UAAU;YAC5B,QAAQ,EAAE,KAAK;SAElB,CAAC;QACF,IAAI,SAAS,CAAC,gBAAgB,KAAK,UAAU,EAAE,CAAC;YAC5C,MAAM,CAAC,gBAAgB,GAAG,UAAU,CAAC;QACzC,CAAC;QACD,IAAI,OAAO,SAAS,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,SAAS,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACpF,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACzC,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IArBe,oBAAU,aAqBzB,CAAA;AACL,CAAC,EAvBgB,SAAS,yBAAT,SAAS,QAuBzB;AAED,MAAa,KAAK;IACP,IAAI,CAAS;IACpB,wFAAwF;IACjF,UAAU,CAA2D;IACrE,SAAS,CAAa;IAC7B,YAAa,IAAY;QACrB,IAAI,CAAC,IAAI,GAAI,IAAI,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;CACJ;AAVD,sBAUC;AAED,MAAa,OAAO;IACT,YAAY,CAAgB;IACnC,YAAa,YAA2B;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;CACJ;AALD,0BAKC;AAED,MAAa,MAAM;IACR,UAAU,CAAS;IACnB,OAAO,CAAgB;IAC9B,YAAa,IAAY,EAAE,OAAsB;QAC7C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CACJ;AAPD,wBAOC;AAED,MAAa,QAAQ;IACV,OAAO,CAAuB;IACrC;QACI,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACtB,CAAC;CACJ;AALD,4BAKC;AAED,MAAa,aAAa;IACf,MAAM,CAAS;IACf,cAAc,CAA4C;IAC1D,QAAQ,CAAqB;IACpC,YAAa,MAAc,EAAE,cAAyD,EAAE,QAA6B;QACjH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACJ;AATD,sCASC;AAED,MAAa,QAAQ;IACV,IAAI,CAAqC;IACzC,KAAK,CAAS;IACrB,YAAa,IAAwC,EAAE,KAAa;QAChE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,YAAY;QACR,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/B,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAbD,4BAaC"}
|
|
@@ -23,24 +23,28 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.transformOutput = void 0;
|
|
26
|
+
exports.transformTypeScriptDeclaration = exports.transformOutput = void 0;
|
|
27
27
|
const common_properties_1 = require("./common-properties");
|
|
28
28
|
const events_1 = require("./events");
|
|
29
29
|
const keywords = __importStar(require("./keywords"));
|
|
30
|
-
// Converts the declarations array to an object format for easy readability.
|
|
31
30
|
async function transformOutput(output) {
|
|
32
31
|
// If there's no events or common properties, we emit a null object
|
|
33
32
|
if (output.events.dataPoints.length === 0 && output.commonProperties.properties.length === 0) {
|
|
34
|
-
return { events: Object.create(null), commonProperties: Object.create(null) };
|
|
33
|
+
return { events: Object.create(null), commonProperties: Object.create(null), tableInfos: {} };
|
|
35
34
|
}
|
|
36
35
|
const newEvents = Object.create(null);
|
|
37
36
|
const oldEvents = output.events.dataPoints;
|
|
37
|
+
const tableInfos = {};
|
|
38
38
|
for (const event of oldEvents) {
|
|
39
39
|
// Check if event.name ends with a number, if so throw an error because we don't support event names which end with numbers
|
|
40
40
|
if (/\d$/.test(event.name)) {
|
|
41
41
|
throw new Error(`Event name ${event.name} ends with a number. Event names cannot end with numbers.`);
|
|
42
42
|
}
|
|
43
43
|
newEvents[event.name] = Object.create(null);
|
|
44
|
+
const tableInfo = event.tableInfo ? { ...event.tableInfo, columns: [] } : undefined;
|
|
45
|
+
if (tableInfo) {
|
|
46
|
+
tableInfos[tableInfo.name] = tableInfo;
|
|
47
|
+
}
|
|
44
48
|
//We know there won't be anymore includes or inlines because we have resolved them
|
|
45
49
|
for (const property of event.properties) {
|
|
46
50
|
if (property instanceof events_1.Wildcard) {
|
|
@@ -91,12 +95,19 @@ async function transformOutput(output) {
|
|
|
91
95
|
if (property.isMeasurement) {
|
|
92
96
|
newEvents[event.name][propetyNameChanger(property.name)]['isMeasurement'] = property.isMeasurement;
|
|
93
97
|
}
|
|
98
|
+
if (tableInfo !== undefined && property.column) {
|
|
99
|
+
const name = property.column.name ?? property.name;
|
|
100
|
+
tableInfo.columns.push({ name, type: property.column.type, bag: { name: property.name.toLowerCase(), store: property.isMeasurement === true ? 'Measures' : 'Properties' } });
|
|
101
|
+
}
|
|
94
102
|
}
|
|
95
103
|
else {
|
|
96
104
|
// Comments, expiration, and owner metadata are handled here
|
|
97
105
|
newEvents[event.name][propetyNameChanger(property.name)] = property.value;
|
|
98
106
|
}
|
|
99
107
|
}
|
|
108
|
+
if (tableInfo !== undefined) {
|
|
109
|
+
tableInfos[tableInfo.name] = tableInfo;
|
|
110
|
+
}
|
|
100
111
|
}
|
|
101
112
|
const newCommonProperties = Object.create(null);
|
|
102
113
|
const oldCommonProperties = output.commonProperties.properties;
|
|
@@ -116,9 +127,52 @@ async function transformOutput(output) {
|
|
|
116
127
|
newCommonProperties[propetyNameChanger(property.name)]['isMeasurement'] = property.isMeasurement;
|
|
117
128
|
}
|
|
118
129
|
}
|
|
119
|
-
return { events: newEvents, commonProperties: newCommonProperties };
|
|
130
|
+
return { events: newEvents, commonProperties: newCommonProperties, tableInfos };
|
|
120
131
|
}
|
|
121
132
|
exports.transformOutput = transformOutput;
|
|
133
|
+
function transformTypeScriptDeclaration(declaration) {
|
|
134
|
+
// The property names in the TS events are already all lowercased.
|
|
135
|
+
const tableInfoProperty = declaration['$tableinfo'];
|
|
136
|
+
let tableInfo = undefined;
|
|
137
|
+
if (tableInfoProperty !== undefined) {
|
|
138
|
+
delete declaration['$tableinfo'];
|
|
139
|
+
const json = events_1.TableInfo.fromObject(tableInfoProperty);
|
|
140
|
+
if (json !== undefined) {
|
|
141
|
+
tableInfo = { name: json.name, commonProperties: json.commonProperties, backfill: json.backfill, columns: [] };
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
for (const name of Object.keys(declaration)) {
|
|
145
|
+
if (name === '$tableinfo') {
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
const property = declaration[name];
|
|
149
|
+
if (!property || typeof property !== 'object') {
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
if (tableInfo !== undefined) {
|
|
153
|
+
if (property.column !== undefined) {
|
|
154
|
+
if (common_properties_1.ColumnInfo.is(property.column)) {
|
|
155
|
+
const type = common_properties_1.ColumnType.fromString(property.column.type);
|
|
156
|
+
if (type !== undefined) {
|
|
157
|
+
const bag = { store: property.isMeasurement === true ? 'Measures' : 'Properties', name: name };
|
|
158
|
+
tableInfo.columns.push({ name: property.column.name ?? name, type: type, bag });
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
else if (typeof property.type === 'string') {
|
|
163
|
+
const columnType = common_properties_1.ColumnType.fromString(property.type);
|
|
164
|
+
if (columnType) {
|
|
165
|
+
const bag = { store: property.isMeasurement === true ? 'Measures' : 'Properties', name: name };
|
|
166
|
+
tableInfo.columns.push({ name: name, type: columnType, bag });
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
delete property.type;
|
|
171
|
+
delete property.column;
|
|
172
|
+
}
|
|
173
|
+
return { declaration, tableInfo };
|
|
174
|
+
}
|
|
175
|
+
exports.transformTypeScriptDeclaration = transformTypeScriptDeclaration;
|
|
122
176
|
function propetyNameChanger(name) {
|
|
123
177
|
name = name.toLowerCase();
|
|
124
178
|
if (name.includes('<number>')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-converter.js","sourceRoot":"","sources":["../../src/lib/object-converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,
|
|
1
|
+
{"version":3,"file":"object-converter.js","sourceRoot":"","sources":["../../src/lib/object-converter.ts"],"names":[],"mappings":"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"}
|
package/out/lib/operations.js
CHANGED
|
@@ -39,9 +39,60 @@ function merge(target, source) {
|
|
|
39
39
|
// We combine their properties together if the event already exists
|
|
40
40
|
if (found) {
|
|
41
41
|
if (target instanceof events_1.Events && source instanceof events_1.Events && found instanceof events_1.Event && item instanceof events_1.Event) {
|
|
42
|
-
if (!
|
|
42
|
+
if (!eventsAreCompatible(found, item)) {
|
|
43
43
|
continue;
|
|
44
44
|
}
|
|
45
|
+
if (found.tableInfo === undefined) {
|
|
46
|
+
found.tableInfo = item.tableInfo;
|
|
47
|
+
}
|
|
48
|
+
// Merge unique properties from source into target
|
|
49
|
+
for (const prop of item.properties) {
|
|
50
|
+
if (prop instanceof common_properties_1.Property) {
|
|
51
|
+
const exists = found.properties.some(p => p instanceof common_properties_1.Property && p.name === prop.name);
|
|
52
|
+
if (!exists) {
|
|
53
|
+
found.properties.push(prop);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
else if (prop instanceof events_1.Metadata) {
|
|
57
|
+
const exists = found.properties.some(p => p instanceof events_1.Metadata && p.name === prop.name);
|
|
58
|
+
if (!exists) {
|
|
59
|
+
found.properties.push(prop);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
else if (prop instanceof events_1.Include) {
|
|
63
|
+
const existingInclude = found.properties.find(p => p instanceof events_1.Include);
|
|
64
|
+
if (existingInclude) {
|
|
65
|
+
for (const name of prop.includeNames) {
|
|
66
|
+
if (!existingInclude.includeNames.includes(name)) {
|
|
67
|
+
existingInclude.includeNames.push(name);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
found.properties.push(new events_1.Include([...prop.includeNames]));
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
else if (prop instanceof events_1.Inline) {
|
|
76
|
+
const exists = found.properties.some(p => p instanceof events_1.Inline && p.inlineName === prop.inlineName);
|
|
77
|
+
if (!exists) {
|
|
78
|
+
found.properties.push(prop);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
else if (prop instanceof events_1.Wildcard) {
|
|
82
|
+
const existingWildcard = found.properties.find(p => p instanceof events_1.Wildcard);
|
|
83
|
+
if (existingWildcard) {
|
|
84
|
+
for (const entry of prop.entries) {
|
|
85
|
+
const entryExists = existingWildcard.entries.some(e => e.prefix === entry.prefix);
|
|
86
|
+
if (!entryExists) {
|
|
87
|
+
existingWildcard.entries.push(entry);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
found.properties.push(prop);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
45
96
|
continue;
|
|
46
97
|
}
|
|
47
98
|
found.properties = found.properties.concat(item.properties);
|
|
@@ -52,73 +103,23 @@ function merge(target, source) {
|
|
|
52
103
|
}
|
|
53
104
|
}
|
|
54
105
|
exports.merge = merge;
|
|
55
|
-
function
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
return {
|
|
69
|
-
type: 'property',
|
|
70
|
-
name: property.name,
|
|
71
|
-
classification: property.classification,
|
|
72
|
-
purpose: property.purpose,
|
|
73
|
-
expiration: property.expiration,
|
|
74
|
-
owner: property.owner,
|
|
75
|
-
comment: property.comment,
|
|
76
|
-
endPoint: property.endPoint,
|
|
77
|
-
isMeasurement: property.isMeasurement
|
|
78
|
-
};
|
|
79
|
-
}
|
|
80
|
-
if (property instanceof events_1.Metadata) {
|
|
81
|
-
return {
|
|
82
|
-
type: 'metadata',
|
|
83
|
-
name: property.name,
|
|
84
|
-
value: property.value
|
|
85
|
-
};
|
|
86
|
-
}
|
|
87
|
-
if (property instanceof events_1.Include) {
|
|
88
|
-
return {
|
|
89
|
-
type: 'include',
|
|
90
|
-
includeNames: [...property.includeNames].sort()
|
|
91
|
-
};
|
|
92
|
-
}
|
|
93
|
-
if (property instanceof events_1.Inline) {
|
|
94
|
-
return {
|
|
95
|
-
type: 'inline',
|
|
96
|
-
inlineName: property.inlineName,
|
|
97
|
-
inlines: [...property.inlines].sort()
|
|
98
|
-
};
|
|
99
|
-
}
|
|
100
|
-
return {
|
|
101
|
-
type: 'wildcard',
|
|
102
|
-
entries: property.entries.map(entry => ({
|
|
103
|
-
prefix: entry.prefix,
|
|
104
|
-
classification: entry.classification,
|
|
105
|
-
endpoint: entry.endpoint
|
|
106
|
-
})).sort((a, b) => stableSerialize(a).localeCompare(stableSerialize(b)))
|
|
107
|
-
};
|
|
108
|
-
}
|
|
109
|
-
function stableSerialize(value) {
|
|
110
|
-
if (Array.isArray(value)) {
|
|
111
|
-
return `[${value.map(stableSerialize).join(',')}]`;
|
|
112
|
-
}
|
|
113
|
-
if (value && typeof value === 'object') {
|
|
114
|
-
const entries = Object.entries(value)
|
|
115
|
-
.sort(([left], [right]) => left.localeCompare(right))
|
|
116
|
-
.map(([key, entryValue]) => `${JSON.stringify(key)}:${stableSerialize(entryValue)}`);
|
|
117
|
-
return `{${entries.join(',')}}`;
|
|
106
|
+
function eventsAreCompatible(left, right) {
|
|
107
|
+
for (const leftProp of left.properties) {
|
|
108
|
+
if (!(leftProp instanceof common_properties_1.Property))
|
|
109
|
+
continue;
|
|
110
|
+
for (const rightProp of right.properties) {
|
|
111
|
+
if (!(rightProp instanceof common_properties_1.Property))
|
|
112
|
+
continue;
|
|
113
|
+
if (leftProp.name === rightProp.name) {
|
|
114
|
+
if (leftProp.classification !== rightProp.classification || leftProp.purpose !== rightProp.purpose) {
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
118
119
|
}
|
|
119
|
-
return
|
|
120
|
+
return true;
|
|
120
121
|
}
|
|
121
|
-
// Searches the object for an event or fragment of the specific name
|
|
122
|
+
// Searches the object for an event or fragment of the specific name
|
|
122
123
|
// If found returns, if not found creates it, places it in the array, and then returns
|
|
123
124
|
function findOrCreate(searchTarget, name) {
|
|
124
125
|
let found = searchTarget.dataPoints.find((item) => {
|
|
@@ -159,6 +160,10 @@ exports.mergeWildcards = mergeWildcards;
|
|
|
159
160
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
160
161
|
function populateProperties(properties, target, applyEndpoints = false) {
|
|
161
162
|
for (const propertyName in properties) {
|
|
163
|
+
// Skip the `$tableInfo` property since it is an artificial property for the flat table support.
|
|
164
|
+
if (propertyName === '$tableInfo') {
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
162
167
|
const currentProperty = properties[propertyName];
|
|
163
168
|
if (propertyName === keywords.include) {
|
|
164
169
|
target.properties.push(new events_1.Include(currentProperty));
|
|
@@ -183,6 +188,18 @@ function populateProperties(properties, target, applyEndpoints = false) {
|
|
|
183
188
|
if (currentProperty.isMeasurement) {
|
|
184
189
|
prop.isMeasurement = currentProperty.isMeasurement;
|
|
185
190
|
}
|
|
191
|
+
if (typeof currentProperty.type === 'string') {
|
|
192
|
+
const columnType = common_properties_1.ColumnType.fromString(currentProperty.type);
|
|
193
|
+
if (columnType) {
|
|
194
|
+
prop.column = { type: columnType };
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
else if (common_properties_1.ColumnInfo.is(currentProperty.column)) {
|
|
198
|
+
const columnType = common_properties_1.ColumnType.fromString(currentProperty.column.type);
|
|
199
|
+
if (columnType) {
|
|
200
|
+
prop.column = { name: currentProperty.column.name, type: columnType };
|
|
201
|
+
}
|
|
202
|
+
}
|
|
186
203
|
target.properties.push(prop);
|
|
187
204
|
}
|
|
188
205
|
}
|