@appland/appmap 3.17.2 → 3.18.3
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/CHANGELOG.md +30 -0
- package/built/appmap.html +1 -1
- package/built/main.js.LICENSE.txt +5 -5
- package/built/main.js.map +1 -1
- package/built/package.json +2 -2
- package/built/src/cmds/agentInstaller/agentInstaller.js +1 -1
- package/built/src/cmds/agentInstaller/agentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/agentInstallerProcedure.js +1 -1
- package/built/src/cmds/agentInstaller/agentInstallerProcedure.js.map +1 -1
- package/built/src/cmds/agentInstaller/agentProcedure.js +6 -6
- package/built/src/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/src/cmds/agentInstaller/commandRunner.js +4 -4
- package/built/src/cmds/agentInstaller/commandRunner.js.map +1 -1
- package/built/src/cmds/agentInstaller/commandUtil.js +1 -1
- package/built/src/cmds/agentInstaller/commandUtil.js.map +1 -1
- package/built/src/cmds/agentInstaller/gradleInstaller.js +6 -6
- package/built/src/cmds/agentInstaller/gradleInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/install-agent.js +4 -4
- package/built/src/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/src/cmds/agentInstaller/javaBuildToolInstaller.js +3 -3
- package/built/src/cmds/agentInstaller/javaBuildToolInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/javaScriptAgentInstaller.js +7 -7
- package/built/src/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/mavenInstaller.js +5 -5
- package/built/src/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/projectConfiguration.js +7 -7
- package/built/src/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/built/src/cmds/agentInstaller/pythonAgentInstaller.js +8 -8
- package/built/src/cmds/agentInstaller/pythonAgentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/rubyAgentInstaller.js +5 -5
- package/built/src/cmds/agentInstaller/rubyAgentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/sourceUtil.js +1 -1
- package/built/src/cmds/agentInstaller/sourceUtil.js.map +1 -1
- package/built/src/cmds/agentInstaller/status.js +2 -2
- package/built/src/cmds/agentInstaller/status.js.map +1 -1
- package/built/src/cmds/errors.js +1 -1
- package/built/src/cmds/errors.js.map +1 -1
- package/built/src/cmds/open/open.js +4 -4
- package/built/src/cmds/open/open.js.map +1 -1
- package/built/src/cmds/open/openers.js +3 -3
- package/built/src/cmds/open/openers.js.map +1 -1
- package/built/src/cmds/open/serveAndOpenAppMap.js +13 -13
- package/built/src/cmds/open/serveAndOpenAppMap.js.map +1 -1
- package/built/src/cmds/open/showAppMap.js +1 -1
- package/built/src/cmds/open/showAppMap.js.map +1 -1
- package/built/src/cmds/prune/prune.js +2 -2
- package/built/src/cmds/prune/prune.js.map +1 -1
- package/built/src/cmds/prune/pruneAppMap.js +1 -1
- package/built/src/cmds/prune/pruneAppMap.js.map +1 -1
- package/built/src/cmds/record/configureConnection.js +3 -3
- package/built/src/cmds/record/configureConnection.js.map +1 -1
- package/built/src/cmds/record/configureRemainingRequestOptions.js +1 -1
- package/built/src/cmds/record/configureRemainingRequestOptions.js.map +1 -1
- package/built/src/cmds/record/confirmProcessCharacteristics.js +3 -3
- package/built/src/cmds/record/confirmProcessCharacteristics.js.map +1 -1
- package/built/src/cmds/record/createRecording.js +5 -1
- package/built/src/cmds/record/createRecording.js.map +1 -1
- package/built/src/cmds/record/intro.js +1 -1
- package/built/src/cmds/record/intro.js.map +1 -1
- package/built/src/cmds/record/record.js +7 -7
- package/built/src/cmds/record/record.js.map +1 -1
- package/built/src/cmds/record/testConnection.js +1 -1
- package/built/src/cmds/record/testConnection.js.map +1 -1
- package/built/src/cmds/runCommand.js +1 -1
- package/built/src/cmds/runCommand.js.map +1 -1
- package/built/src/cmds/userInteraction.js +3 -3
- package/built/src/cmds/userInteraction.js.map +1 -1
- package/built/src/fingerprint/canonicalize/info.js +2 -2
- package/built/src/fingerprint/canonicalize/info.js.map +1 -1
- package/built/src/fingerprint/canonicalize/sqlNormalized.js +2 -2
- package/built/src/fingerprint/canonicalize/sqlNormalized.js.map +1 -1
- package/built/src/fingerprint/canonicalize/sqlTables.js +3 -3
- package/built/src/fingerprint/canonicalize/sqlTables.js.map +1 -1
- package/built/src/fingerprint/canonicalize/trace.js +4 -4
- package/built/src/fingerprint/canonicalize/trace.js.map +1 -1
- package/built/src/fingerprint/canonicalize/update.js +3 -3
- package/built/src/fingerprint/canonicalize/update.js.map +1 -1
- package/built/src/functionStats.js +4 -3
- package/built/src/functionStats.js.map +1 -1
- package/built/src/openapi/command.js +2 -2
- package/built/src/openapi/command.js.map +1 -1
- package/built/src/openapi/method.js +5 -44
- package/built/src/openapi/method.js.map +1 -1
- package/built/src/openapi/response.js +2 -2
- package/built/src/openapi/response.js.map +1 -1
- package/built/src/openapi/util.js +3 -1
- package/built/src/openapi/util.js.map +1 -1
- package/built/src/search/matchSpec.js +5 -5
- package/built/src/search/matchSpec.js.map +1 -1
- package/built/src/search/trigram.js +2 -2
- package/built/src/search/trigram.js.map +1 -1
- package/built/src/service/config/validator.js +5 -3
- package/built/src/service/config/validator.js.map +1 -1
- package/built/src/telemetry.js +5 -5
- package/built/src/telemetry.js.map +1 -1
- package/package.json +2 -2
- package/built/src/database.js +0 -172
- package/built/src/database.js.map +0 -1
|
@@ -10,7 +10,7 @@ const boxen_1 = __importDefault(require("boxen"));
|
|
|
10
10
|
const utils_1 = require("../utils");
|
|
11
11
|
class UserInteraction {
|
|
12
12
|
constructor() {
|
|
13
|
-
this.spinner = ora_1.default();
|
|
13
|
+
this.spinner = (0, ora_1.default)();
|
|
14
14
|
}
|
|
15
15
|
async prompt(questions, opts) {
|
|
16
16
|
const wasSpinning = this.spinner.isSpinning;
|
|
@@ -31,7 +31,7 @@ class UserInteraction {
|
|
|
31
31
|
if (this.spinner.isSpinning) {
|
|
32
32
|
this.spinner.succeed();
|
|
33
33
|
}
|
|
34
|
-
console.log(boxen_1.default(msg, {
|
|
34
|
+
console.log((0, boxen_1.default)(msg, {
|
|
35
35
|
padding: 1,
|
|
36
36
|
margin: 1,
|
|
37
37
|
borderStyle: 'round',
|
|
@@ -58,7 +58,7 @@ class UserInteraction {
|
|
|
58
58
|
this.spinner.succeed();
|
|
59
59
|
}
|
|
60
60
|
this.spinner.text = value;
|
|
61
|
-
if (!this.spinner.isSpinning && !utils_1.verbose()) {
|
|
61
|
+
if (!this.spinner.isSpinning && !(0, utils_1.verbose)()) {
|
|
62
62
|
this.spinner.start();
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userInteraction.js","sourceRoot":"","sources":["../../../src/cmds/userInteraction.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAwD;AACxD,8CAA+B;AAC/B,kDAA0B;AAC1B,oCAAmC;AAMnC,MAAa,eAAe;IAA5B;QACU,YAAO,GAAQ,aAAG,
|
|
1
|
+
{"version":3,"file":"userInteraction.js","sourceRoot":"","sources":["../../../src/cmds/userInteraction.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAwD;AACxD,8CAA+B;AAC/B,kDAA0B;AAC1B,oCAAmC;AAMnC,MAAa,eAAe;IAA5B;QACU,YAAO,GAAQ,IAAA,aAAG,GAAE,CAAC;IAkE/B,CAAC;IAhEC,KAAK,CAAC,MAAM,CAAC,SAA6B,EAAE,IAAqB;QAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5C,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;QAED,MAAM,MAAM,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEhD,IAAI,WAAW,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,CAAA,EAAE;YACxC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,OAAO,CAAC,GAAG,CACT,IAAA,eAAK,EAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,OAAO;YACpB,KAAK,EAAE,QAAQ;SAChB,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAS;QACb,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACrB;QAED,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;IACH,CAAC;IAED,IAAI,CAAC,GAAY;QACf,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM,CAAC,KAAa;QACtB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,IAAA,eAAO,GAAE,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;SACtB;IACH,CAAC;CACF;AAnED,0CAmEC;AAED,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;AACjC,kBAAe,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable class-methods-use-this */
|
|
3
|
-
const {
|
|
3
|
+
const { analyzeSQL } = require('@appland/models');
|
|
4
4
|
const EventTree = require('./eventTree');
|
|
5
5
|
/**
|
|
6
6
|
* At INFO level, the order of labeled function calls matters. SQL query strings
|
|
@@ -11,7 +11,7 @@ class Canonicalize extends EventTree {
|
|
|
11
11
|
return {
|
|
12
12
|
kind: 'sql',
|
|
13
13
|
sql: {
|
|
14
|
-
analyzed_query:
|
|
14
|
+
analyzed_query: analyzeSQL(event.sqlQuery),
|
|
15
15
|
},
|
|
16
16
|
};
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/info.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/info.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEzC;;;GAGG;AACH,MAAM,YAAa,SAAQ,SAAS;IAClC,GAAG,CAAC,KAAK;QACP,OAAO;YACL,IAAI,EAAE,KAAK;YACX,GAAG,EAAE;gBACH,cAAc,EAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC;aAC3C;SACF,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,KAAK;QACrB,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACxE,WAAW,EAAE,KAAK,CAAC,kBAAkB;gBACnC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI;SACT,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,KAAK;QACrB,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACxE,WAAW,EAAE,KAAK,CAAC,kBAAkB;gBACnC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM;oBAC/B,KAAK,CAAC,kBAAkB,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI;SACT,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,KAAK;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;SACb;QAED,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable class-methods-use-this */
|
|
3
|
-
const {
|
|
3
|
+
const { normalizeSQL } = require('@appland/models');
|
|
4
4
|
const Unique = require('./unique');
|
|
5
5
|
/**
|
|
6
6
|
* At INFO level, the order of labeled function calls matters. SQL query strings
|
|
@@ -12,7 +12,7 @@ class Canonicalize extends Unique {
|
|
|
12
12
|
* @param {Event} event
|
|
13
13
|
*/
|
|
14
14
|
sql(event) {
|
|
15
|
-
return
|
|
15
|
+
return normalizeSQL(event.sqlQuery, event.sql.database_type);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
module.exports = (appmap) => new Canonicalize(appmap).execute();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlNormalized.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/sqlNormalized.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"sqlNormalized.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/sqlNormalized.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACpD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnC;;;GAGG;AACH,MAAM,YAAa,SAAQ,MAAM;IAC/B;;;OAGG;IACH,GAAG,CAAC,KAAK;QACP,OAAO,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/D,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable class-methods-use-this */
|
|
3
|
-
const {
|
|
3
|
+
const { analyzeSQL } = require('@appland/models');
|
|
4
4
|
const Unique = require('./unique');
|
|
5
5
|
/**
|
|
6
6
|
* At INFO level, the order of labeled function calls matters. SQL query strings
|
|
@@ -12,8 +12,8 @@ class Canonicalize extends Unique {
|
|
|
12
12
|
* @param {Event} event
|
|
13
13
|
*/
|
|
14
14
|
sql(event) {
|
|
15
|
-
const analyzedQuery =
|
|
16
|
-
if (typeof analyzedQuery === 'object') {
|
|
15
|
+
const analyzedQuery = analyzeSQL(event.sqlQuery);
|
|
16
|
+
if (analyzedQuery && typeof analyzedQuery === 'object') {
|
|
17
17
|
return analyzedQuery.tables;
|
|
18
18
|
}
|
|
19
19
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlTables.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/sqlTables.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"sqlTables.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/sqlTables.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAClD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnC;;;GAGG;AACH,MAAM,YAAa,SAAQ,MAAM;IAC/B;;;OAGG;IACH,GAAG,CAAC,KAAK;QACP,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,aAAa,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACtD,OAAO,aAAa,CAAC,MAAM,CAAC;SAC7B;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable class-methods-use-this */
|
|
3
|
-
const {
|
|
3
|
+
const { normalizeSQL, analyzeSQL } = require('@appland/models');
|
|
4
4
|
const EventTree = require('./eventTree');
|
|
5
5
|
/**
|
|
6
6
|
* At TRACE level, the order of labeled function calls matters, and all function class
|
|
@@ -9,14 +9,14 @@ const EventTree = require('./eventTree');
|
|
|
9
9
|
*/
|
|
10
10
|
class Canonicalize extends EventTree {
|
|
11
11
|
sql(event) {
|
|
12
|
-
const analyzedQuery =
|
|
12
|
+
const analyzedQuery = analyzeSQL(event.sqlQuery);
|
|
13
13
|
const result = {
|
|
14
14
|
kind: 'sql',
|
|
15
15
|
sql: {
|
|
16
|
-
normalized_query:
|
|
16
|
+
normalized_query: normalizeSQL(event.sqlQuery, event.sql.database_type),
|
|
17
17
|
},
|
|
18
18
|
};
|
|
19
|
-
if (typeof analyzedQuery === 'object') {
|
|
19
|
+
if (analyzedQuery && typeof analyzedQuery === 'object') {
|
|
20
20
|
result.analyzed_query = analyzedQuery;
|
|
21
21
|
}
|
|
22
22
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/trace.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/trace.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAChE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEzC;;;;GAIG;AACH,MAAM,YAAa,SAAQ,SAAS;IAClC,GAAG,CAAC,KAAK;QACP,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,KAAK;YACX,GAAG,EAAE;gBACH,gBAAgB,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC;aACxE;SACF,CAAC;QACF,IAAI,aAAa,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACtD,MAAM,CAAC,cAAc,GAAG,aAAa,CAAC;SACvC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,KAAK;QACrB,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACxE,WAAW,EAAE,KAAK,CAAC,kBAAkB;gBACnC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI;SACT,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,KAAK;QACrB,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACxE,WAAW,EAAE,KAAK,CAAC,kBAAkB;gBACnC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM;oBAC/B,KAAK,CAAC,kBAAkB,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI;SACT,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,KAAK;QAChB,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,EAAE;YAC7B,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;SACrC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable class-methods-use-this */
|
|
3
|
-
const {
|
|
3
|
+
const { analyzeSQL, normalizeSQL } = require('@appland/models');
|
|
4
4
|
const EventTree = require('./eventTree');
|
|
5
5
|
/**
|
|
6
6
|
* At UPDATE level, the order of events is not important, and the amount of data
|
|
@@ -14,7 +14,7 @@ class Canonicalize extends EventTree {
|
|
|
14
14
|
* @param {Event} event
|
|
15
15
|
*/
|
|
16
16
|
sql(event) {
|
|
17
|
-
const analyzedQuery =
|
|
17
|
+
const analyzedQuery = analyzeSQL(event.sqlQuery);
|
|
18
18
|
if (typeof analyzedQuery === 'string') {
|
|
19
19
|
const sqlLower = event.sqlQuery.toLowerCase();
|
|
20
20
|
if (sqlLower.indexOf('insert') !== -1 ||
|
|
@@ -22,7 +22,7 @@ class Canonicalize extends EventTree {
|
|
|
22
22
|
return {
|
|
23
23
|
kind: 'sql',
|
|
24
24
|
sql: {
|
|
25
|
-
normalized_query:
|
|
25
|
+
normalized_query: normalizeSQL(event.sqlQuery, event.sql.database_type),
|
|
26
26
|
},
|
|
27
27
|
};
|
|
28
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/update.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/fingerprint/canonicalize/update.js"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAChE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,YAAa,SAAQ,SAAS;IAClC;;;OAGG;IACH,GAAG,CAAC,KAAK;QACP,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC9C,IACE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACjC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EACjC;gBACA,OAAO;oBACL,IAAI,EAAE,KAAK;oBACX,GAAG,EAAE;wBACH,gBAAgB,EAAE,YAAY,CAC5B,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,GAAG,CAAC,aAAa,CACxB;qBACF;iBACF,CAAC;aACH;SACF;aAAM,IAAI,aAAa,IAAI,aAAa,CAAC,OAAO,EAAE;YACjD,IACE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAClC,EACD;gBACA,OAAO;oBACL,IAAI,EAAE,KAAK;oBACX,GAAG,EAAE;wBACH,cAAc,EAAE,aAAa;qBAC9B;iBACF,CAAC;aACH;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB,CAAC,KAAK;QACrB,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,WAAW,EAAE,KAAK,CAAC,kBAAkB;gBACnC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI;SACT,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,KAAK;QACrB,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,WAAW,EAAE,KAAK,CAAC,kBAAkB;gBACnC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI;SACT,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,KAAK;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;SACb;QAED,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// @ts-nocheck
|
|
3
|
-
const {
|
|
3
|
+
const { analyzeSQL, normalizeSQL } = require('@appland/models');
|
|
4
4
|
const { formatValue, formatHttpServerRequest } = require('./utils');
|
|
5
5
|
/** @typedef {import('./search/types').Trigram} Trigram */
|
|
6
6
|
/**
|
|
@@ -70,7 +70,7 @@ class FunctionStats {
|
|
|
70
70
|
...new Set(this.eventMatches
|
|
71
71
|
.map((e) => [e.event].concat(e.descendants).filter((d) => d.sql))
|
|
72
72
|
.flat()
|
|
73
|
-
.map((e) =>
|
|
73
|
+
.map((e) => normalizeSQL(e.sqlQuery, e.sql.database_type))),
|
|
74
74
|
].sort();
|
|
75
75
|
}
|
|
76
76
|
get sqlTables() {
|
|
@@ -78,7 +78,8 @@ class FunctionStats {
|
|
|
78
78
|
...new Set(this.eventMatches
|
|
79
79
|
.map((e) => [e.event].concat(e.descendants).filter((d) => d.sql))
|
|
80
80
|
.flat()
|
|
81
|
-
.map((e) =>
|
|
81
|
+
.map((e) => analyzeSQL(e.sqlQuery))
|
|
82
|
+
.filter(Boolean)
|
|
82
83
|
.filter((e) => typeof e === 'object')
|
|
83
84
|
.map((sql) => sql.tables)
|
|
84
85
|
.flat()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionStats.js","sourceRoot":"","sources":["../../src/functionStats.js"],"names":[],"mappings":";AAAA,cAAc;AACd,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"functionStats.js","sourceRoot":"","sources":["../../src/functionStats.js"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ class OpenAPICommand {
|
|
|
41
41
|
async function loadTemplate(fileName) {
|
|
42
42
|
if (!fileName) {
|
|
43
43
|
// eslint-disable-next-line no-param-reassign
|
|
44
|
-
fileName = path_1.join(__dirname, '../../resources/openapi-template.yaml');
|
|
44
|
+
fileName = (0, path_1.join)(__dirname, '../../resources/openapi-template.yaml');
|
|
45
45
|
}
|
|
46
46
|
return yaml.load((await fsp.readFile(fileName)).toString());
|
|
47
47
|
}
|
|
@@ -72,7 +72,7 @@ module.exports = {
|
|
|
72
72
|
return args.strict();
|
|
73
73
|
},
|
|
74
74
|
async handler(argv) {
|
|
75
|
-
utils_1.verbose(argv.verbose);
|
|
75
|
+
(0, utils_1.verbose)(argv.verbose);
|
|
76
76
|
const { openapiTitle, openapiVersion } = argv;
|
|
77
77
|
function tryConfigure(path, fn) {
|
|
78
78
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/openapi/command.js"],"names":[],"mappings":";;AAAA,+BAA4B;AAC5B,oCAAmC;AAEnC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAClD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAChC,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACtD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEjC,MAAM,cAAc;IAClB,YAAY,SAAS;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,KAAK,EAAE,CAAC;QACV,wFAAwF;QACxF,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,mBAAmB,CAAC,CAAC;QAC9D,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,CAAC,CAAC,MAAM,EAAE,CAAC;QACb,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAI;QACtB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,IAAI;YACF,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAClE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CACzB,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;CACF;AAED,KAAK,UAAU,YAAY,CAAC,QAAQ;IAClC,IAAI,CAAC,QAAQ,EAAE;QACb,6CAA6C;QAC7C,QAAQ,GAAG,WAAI,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/openapi/command.js"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
const { EventNavigator } = require('@appland/models');
|
|
3
2
|
const Response = require('./response');
|
|
4
3
|
const Schema = require('./schema');
|
|
5
4
|
const { messageToOpenAPISchema, bestPathInfo } = require('./util');
|
|
@@ -28,7 +27,6 @@ class Method {
|
|
|
28
27
|
memo[response] = this.responses[response].openapi();
|
|
29
28
|
return memo;
|
|
30
29
|
}, {});
|
|
31
|
-
let description;
|
|
32
30
|
const schemata = {};
|
|
33
31
|
const parameters = [];
|
|
34
32
|
let securitySchemeId;
|
|
@@ -39,46 +37,12 @@ class Method {
|
|
|
39
37
|
securitySchemeId = this.securitySchemes.addRequest(event);
|
|
40
38
|
}
|
|
41
39
|
let schema = null;
|
|
42
|
-
if (event.
|
|
43
|
-
const
|
|
44
|
-
if (!schemata[
|
|
45
|
-
schemata[
|
|
46
|
-
}
|
|
47
|
-
schema = schemata[mimeType];
|
|
48
|
-
}
|
|
49
|
-
const actionName = messages
|
|
50
|
-
.filter((msg) => msg.name === 'action')
|
|
51
|
-
.map((msg) => msg.value)[0];
|
|
52
|
-
if (actionName) {
|
|
53
|
-
const bestCommentOrCodeObjectName = (() => {
|
|
54
|
-
const descendants = new EventNavigator(event).descendants();
|
|
55
|
-
let iter = descendants.next();
|
|
56
|
-
let controller = null;
|
|
57
|
-
while (!iter.done) {
|
|
58
|
-
const evt = iter.value;
|
|
59
|
-
if (evt.event.codeObject.packageOf.indexOf('app/controllers') === 0 &&
|
|
60
|
-
evt.event.codeObject.name === actionName) {
|
|
61
|
-
controller = evt.event;
|
|
62
|
-
break;
|
|
63
|
-
}
|
|
64
|
-
iter = descendants.next();
|
|
65
|
-
}
|
|
66
|
-
if (!controller) {
|
|
67
|
-
return null;
|
|
68
|
-
}
|
|
69
|
-
const { comment } = controller.codeObject.data;
|
|
70
|
-
if (comment) {
|
|
71
|
-
const lines = comment
|
|
72
|
-
.split('\n')
|
|
73
|
-
.map((line) => line.replace(/^\s*#\s*/, '').trim())
|
|
74
|
-
.filter((line) => line && line.length > 0);
|
|
75
|
-
return lines.join('\n');
|
|
76
|
-
}
|
|
77
|
-
return controller.codeObject.name;
|
|
78
|
-
})();
|
|
79
|
-
if (!description) {
|
|
80
|
-
description = bestCommentOrCodeObjectName;
|
|
40
|
+
if (event.requestContentType) {
|
|
41
|
+
const contentType = event.requestContentType.split(';')[0];
|
|
42
|
+
if (!schemata[contentType]) {
|
|
43
|
+
schemata[contentType] = new Schema();
|
|
81
44
|
}
|
|
45
|
+
schema = schemata[contentType];
|
|
82
46
|
}
|
|
83
47
|
messages.forEach((message) => {
|
|
84
48
|
if (uniqueNames.has(message.name)) {
|
|
@@ -109,9 +73,6 @@ class Method {
|
|
|
109
73
|
const response = {
|
|
110
74
|
responses,
|
|
111
75
|
};
|
|
112
|
-
if (description) {
|
|
113
|
-
response.description = description;
|
|
114
|
-
}
|
|
115
76
|
if (securitySchemeId) {
|
|
116
77
|
const securityObj = {};
|
|
117
78
|
securityObj[securitySchemeId] = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../src/openapi/method.js"],"names":[],"mappings":";AAAA,MAAM,
|
|
1
|
+
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../src/openapi/method.js"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,8 @@ class Response {
|
|
|
9
9
|
// eslint-disable-next-line arrow-body-style
|
|
10
10
|
const mimeTypes = () => {
|
|
11
11
|
return this.events
|
|
12
|
-
.filter((event) => event.httpServerResponse && event.
|
|
13
|
-
.map((event) => event.
|
|
12
|
+
.filter((event) => event.httpServerResponse && event.responseContentType)
|
|
13
|
+
.map((event) => event.responseContentType.split(';')[0]);
|
|
14
14
|
};
|
|
15
15
|
const content = [...new Set(mimeTypes())]
|
|
16
16
|
.sort()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/openapi/response.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAEzC,MAAM,QAAQ;IACZ,YAAY,UAAU;QACpB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,OAAO;QACL,4CAA4C;QAC5C,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM;iBACf,MAAM,CACL,CAAC,KAAK,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/openapi/response.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAEzC,MAAM,QAAQ;IACZ,YAAY,UAAU;QACpB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,OAAO;QACL,4CAA4C;QAC5C,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM;iBACf,MAAM,CACL,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,mBAAmB,CACjE;iBACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;aACtC,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;YACzB,6CAA6C;YAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;IACjE,CAAC;IAED,UAAU,CAAC,KAAK;QACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC"}
|
|
@@ -17,6 +17,8 @@ function classNameToOpenAPIType(className) {
|
|
|
17
17
|
case 'trueclass':
|
|
18
18
|
case 'falseclass':
|
|
19
19
|
return 'boolean';
|
|
20
|
+
case 'string':
|
|
21
|
+
return 'string';
|
|
20
22
|
default:
|
|
21
23
|
return undefined;
|
|
22
24
|
}
|
|
@@ -51,7 +53,7 @@ function classNameToOpenAPIType(className) {
|
|
|
51
53
|
const mapper = (t) => mapRubyType(t) || mapPythonType(t) || mapJavaType(t);
|
|
52
54
|
const mapped = mapper(className.toLowerCase());
|
|
53
55
|
if (!mapped && !unrecognizedTypes.has(className)) {
|
|
54
|
-
console.warn(`Warning:
|
|
56
|
+
console.warn(`Warning: Don't know how to map "${className}" to an OpenAPI type. You'll need to update the generated file.`);
|
|
55
57
|
unrecognizedTypes.add(className);
|
|
56
58
|
return className;
|
|
57
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/openapi/util.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/openapi/util.js"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable max-classes-per-file */
|
|
3
|
-
const {
|
|
3
|
+
const { analyzeSQL, normalizeSQL } = require('@appland/models');
|
|
4
4
|
/**
|
|
5
5
|
* @typedef {import('./types').CodeObject} CodeObject
|
|
6
6
|
* @typedef {(codeObject: CodeObject) => boolean} MatchFn
|
|
@@ -70,9 +70,9 @@ function matchQuery(expectedQuery) {
|
|
|
70
70
|
}
|
|
71
71
|
// TODO: Brute force is probably not a good idea.
|
|
72
72
|
// Need to store the database type on the codeObject.
|
|
73
|
-
return (
|
|
74
|
-
|
|
75
|
-
|
|
73
|
+
return (normalizeSQL(codeObject.name, 'mysql') === expectedQuery ||
|
|
74
|
+
normalizeSQL(codeObject.name, 'postgres') === expectedQuery ||
|
|
75
|
+
normalizeSQL(codeObject.name, 'sqlite') === expectedQuery);
|
|
76
76
|
};
|
|
77
77
|
fn.toJSON = () => `query ${expectedQuery}`;
|
|
78
78
|
return fn;
|
|
@@ -86,7 +86,7 @@ function matchTable(tableName) {
|
|
|
86
86
|
if (codeObject.type !== 'query') {
|
|
87
87
|
return false;
|
|
88
88
|
}
|
|
89
|
-
const queryInfo = /** @type {SQLInfo} */
|
|
89
|
+
const queryInfo = /** @type {SQLInfo} */ analyzeSQL({
|
|
90
90
|
sql: codeObject.name,
|
|
91
91
|
database_type: codeObject.database_type,
|
|
92
92
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchSpec.js","sourceRoot":"","sources":["../../../src/search/matchSpec.js"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"matchSpec.js","sourceRoot":"","sources":["../../../src/search/matchSpec.js"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
const {
|
|
2
|
+
const { normalizeSQL } = require('@appland/models');
|
|
3
3
|
/** @typedef {import('./types').CodeObject} CodeObject */
|
|
4
4
|
/** @typedef {import('./types').Event} Event */
|
|
5
5
|
const normalizeId = (
|
|
6
6
|
/** @type {CodeObject} */ co,
|
|
7
7
|
/** @type {Event} */ evt) => {
|
|
8
8
|
if (co && co.type === 'query') {
|
|
9
|
-
return
|
|
9
|
+
return normalizeSQL(evt.sqlQuery, evt.sql.database_type);
|
|
10
10
|
}
|
|
11
11
|
return co.id;
|
|
12
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigram.js","sourceRoot":"","sources":["../../../src/search/trigram.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"trigram.js","sourceRoot":"","sources":["../../../src/search/trigram.js"],"names":[],"mappings":"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"}
|
|
@@ -19,15 +19,17 @@ function validateConfig(schema, config) {
|
|
|
19
19
|
// 'config' schema will be found within it (i.e. will have '"$id"' set to
|
|
20
20
|
// "config"). Otherwise, it's just a single schema, so just add it as a schema
|
|
21
21
|
// named "config".
|
|
22
|
-
const schemaKey = Array.isArray(schema) ? undefined :
|
|
22
|
+
const schemaKey = Array.isArray(schema) ? undefined : 'config';
|
|
23
23
|
ajv.addSchema(schema, schemaKey);
|
|
24
24
|
const validate = ajv.getSchema('config');
|
|
25
25
|
const valid = validate(config);
|
|
26
26
|
let result = { valid };
|
|
27
27
|
if (!valid) {
|
|
28
28
|
result = Object.assign(Object.assign({}, result), { errors: {
|
|
29
|
-
js: better_ajv_errors_1.default(schema, config, validate.errors, { format: 'js' }),
|
|
30
|
-
cli: better_ajv_errors_1.default(schema, config, validate.errors, {
|
|
29
|
+
js: (0, better_ajv_errors_1.default)(schema, config, validate.errors, { format: 'js' }),
|
|
30
|
+
cli: (0, better_ajv_errors_1.default)(schema, config, validate.errors, {
|
|
31
|
+
format: 'cli',
|
|
32
|
+
}),
|
|
31
33
|
} });
|
|
32
34
|
}
|
|
33
35
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../src/service/config/validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../src/service/config/validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,mFAAyD;AAUzD,MAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAqB,MAAwB;QAC3C,KAAK,CAAC,MAAM,CAAC,MAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QADjB,WAAM,GAAN,MAAM,CAAkB;IAE7C,CAAC;CACF;AAJD,sDAIC;AAED,SAAgB,cAAc,CAC5B,MAAc,EACd,MAAc;IAEd,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;IACtB,wEAAwE;IACxE,yEAAyE;IACzE,8EAA8E;IAC9E,kBAAkB;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/D,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAY,CAAC;IAC1C,IAAI,MAAM,GAAqB,EAAE,KAAK,EAAE,CAAC;IACzC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,mCACD,MAAM,KACT,MAAM,EAAE;gBACN,EAAE,EAAE,IAAA,2BAAe,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBACtE,GAAG,EAAE,IAAA,2BAAe,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE;oBACpD,MAAM,EAAE,KAAK;iBACd,CAAC;aACH,GACF,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AA1BD,wCA0BC"}
|
package/built/src/telemetry.js
CHANGED
|
@@ -54,16 +54,16 @@ function getMachineId() {
|
|
|
54
54
|
}
|
|
55
55
|
let machineIdSource;
|
|
56
56
|
// Derive a machine ID from the first network interface
|
|
57
|
-
machineIdSource = Object.values(os_1.networkInterfaces())
|
|
57
|
+
machineIdSource = Object.values((0, os_1.networkInterfaces)())
|
|
58
58
|
.flat()
|
|
59
59
|
.map((iface) => iface === null || iface === void 0 ? void 0 : iface.mac)
|
|
60
60
|
.filter((mac) => mac && !invalidMacAddresses.has(mac))
|
|
61
61
|
.shift();
|
|
62
62
|
if (!machineIdSource) {
|
|
63
63
|
// Fallback to a random string
|
|
64
|
-
machineIdSource = crypto_1.randomBytes(32);
|
|
64
|
+
machineIdSource = (0, crypto_1.randomBytes)(32);
|
|
65
65
|
}
|
|
66
|
-
const machineIdHash = crypto_1.createHash('sha256')
|
|
66
|
+
const machineIdHash = (0, crypto_1.createHash)('sha256')
|
|
67
67
|
.update(machineIdSource)
|
|
68
68
|
.digest('hex');
|
|
69
69
|
config.set('machineId', machineIdHash);
|
|
@@ -93,7 +93,7 @@ class Session {
|
|
|
93
93
|
return Date.now() + 1000 * 60 * 30;
|
|
94
94
|
}
|
|
95
95
|
static newSessionId() {
|
|
96
|
-
return crypto_1.createHash('sha256').update(crypto_1.randomBytes(32)).digest('hex');
|
|
96
|
+
return (0, crypto_1.createHash)('sha256').update((0, crypto_1.randomBytes)(32)).digest('hex');
|
|
97
97
|
}
|
|
98
98
|
touch() {
|
|
99
99
|
this.expiration = Session.expirationFromNow();
|
|
@@ -130,7 +130,7 @@ class Telemetry {
|
|
|
130
130
|
// Do not allow Application Insights to try and collect additional metadata
|
|
131
131
|
process.env.APPLICATION_INSIGHTS_NO_STATSBEAT = '1';
|
|
132
132
|
// Disable everything we can, we don't any additional collection from Application Insights.
|
|
133
|
-
applicationinsights_1.setup(INSTRUMENTATION_KEY)
|
|
133
|
+
(0, applicationinsights_1.setup)(INSTRUMENTATION_KEY)
|
|
134
134
|
.setAutoCollectRequests(false)
|
|
135
135
|
.setAutoCollectPerformance(false)
|
|
136
136
|
.setAutoCollectExceptions(false)
|