@appland/appmap 3.19.0 → 3.22.0

package/built/src/cmds/record/testCaseRecording.js

@@ -0,0 +1,111 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const process_1 = require("process");
+const utils_1 = require("../../utils");
+const userInteraction_1 = __importDefault(require("../userInteraction"));
+const configuration_1 = require("./configuration");
+let TestCommands = [];
+let TestCaseProcesses = [];
+const DiagnosticCommands = {
+    ruby: ['ruby -v', 'bundle info rails', 'bundle info actionpack'],
+};
+class TestCaseRecording {
+    static async start() {
+        TestCaseProcesses.forEach((process) => {
+            if (process.pid)
+                (0, process_1.kill)(process.pid);
+        });
+        TestCommands = [];
+        TestCaseProcesses = [];
+        let testCommands = (await (0, configuration_1.readConfigOption)('test_recording.test_commands', []));
+        if (testCommands.length === 0)
+            throw new Error(`No test commands are configured`);
+        if ((0, utils_1.verbose)()) {
+            const language = (await (0, configuration_1.readConfigOption)('language', 'undefined'));
+            const diagnosticCommands = DiagnosticCommands[language];
+            if (diagnosticCommands) {
+                await Promise.all(diagnosticCommands.map((cmd) => {
+                    return new Promise((resolve) => {
+                        const args = cmd.split(' ');
+                        const process = (0, child_process_1.spawn)(args[0], args.slice(1), {
+                            shell: true,
+                            stdio: ['ignore', 'inherit', 'inherit'],
+                        });
+                        process.on('error', resolve);
+                        process.on('exit', resolve);
+                    });
+                }));
+            }
+        }
+        TestCommands = testCommands;
+    }
+    static async waitFor() {
+        let maxTime = (await (0, configuration_1.readSetting)('test_recording.max_time', -1));
+        if (maxTime === -1)
+            maxTime = undefined;
+        if (maxTime)
+            userInteraction_1.default.progress(`Running tests for up to ${maxTime} seconds`);
+        let waitTime = maxTime;
+        async function waitForProcess(process) {
+            const commandStr = process.spawnargs.join(' ');
+            const startTime = Date.now();
+            return new Promise((resolve) => {
+                let reported = false;
+                let interruptTimeout;
+                function interrupt() {
+                    if (process.pid) {
+                        userInteraction_1.default.progress(`Stopping test command after ${maxTime} seconds: ${commandStr}`);
+                        (0, process_1.kill)(process.pid, 'SIGTERM');
+                    }
+                }
+                function report(exitCode) {
+                    if (reported)
+                        return;
+                    reported = true;
+                    const elapsed = Date.now() - startTime;
+                    if (waitTime) {
+                        waitTime -= elapsed / 1000;
+                    }
+                    if (interruptTimeout)
+                        clearTimeout(interruptTimeout);
+                    if (exitCode && exitCode !== 0) {
+                        userInteraction_1.default.progress(`Test command failed with status code ${exitCode}: ${commandStr}`);
+                    }
+                    resolve(exitCode);
+                }
+                if (process.exitCode)
+                    return report(process.exitCode);
+                process.on('exit', report);
+                if (waitTime) {
+                    interruptTimeout = setTimeout(interrupt, waitTime * 1000);
+                }
+            });
+        }
+        for (const cmd of TestCommands) {
+            cmd.env || (cmd.env = {});
+            userInteraction_1.default.progress(`Running test command: ${TestCaseRecording.envString(cmd.env)}${cmd.command}`);
+            const args = cmd.command.split(' ');
+            const proc = (0, child_process_1.spawn)(args[0], args.slice(1), {
+                env: Object.assign(process.env, cmd.env),
+                shell: true,
+                stdio: ['ignore', 'inherit', 'inherit'],
+            });
+            await waitForProcess(proc);
+        }
+    }
+    static envString(env) {
+        const str = Object.keys(env).length > 0
+            ? Object.keys(env)
+                .sort()
+                .map((key) => [key, env[key]].join('='))
+                .join(' ')
+            : undefined;
+        return str ? `${str} ` : '';
+    }
+}
+exports.default = TestCaseRecording;
+//# sourceMappingURL=testCaseRecording.js.map

package/built/src/cmds/record/testCaseRecording.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"testCaseRecording.js","sourceRoot":"","sources":["../../../../src/cmds/record/testCaseRecording.ts"],"names":[],"mappings":"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"}

package/built/src/cmds/record/types/exitCode.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExitCode = void 0;
+var ExitCode;
+(function (ExitCode) {
+    ExitCode[ExitCode["Success"] = 0] = "Success";
+    ExitCode[ExitCode["Error"] = 1] = "Error";
+    ExitCode[ExitCode["Quit"] = 2] = "Quit";
+})(ExitCode = exports.ExitCode || (exports.ExitCode = {}));
+//# sourceMappingURL=exitCode.js.map

package/built/src/cmds/record/types/exitCode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exitCode.js","sourceRoot":"","sources":["../../../../../src/cmds/record/types/exitCode.ts"],"names":[],"mappings":";;;AAAA,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,6CAAW,CAAA;IACX,yCAAS,CAAA;IACT,uCAAQ,CAAA;AACV,CAAC,EAJW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAInB"}

package/built/src/cmds/record/types/fileName.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=fileName.js.map

package/built/src/cmds/record/types/fileName.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileName.js","sourceRoot":"","sources":["../../../../../src/cmds/record/types/fileName.ts"],"names":[],"mappings":""}

package/built/src/cmds/record/types/remoteRecordingStatus.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=remoteRecordingStatus.js.map

package/built/src/cmds/record/types/remoteRecordingStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remoteRecordingStatus.js","sourceRoot":"","sources":["../../../../../src/cmds/record/types/remoteRecordingStatus.ts"],"names":[],"mappings":""}

package/built/src/cmds/record/types/state.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=state.js.map

package/built/src/cmds/record/types/state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/cmds/record/types/state.ts"],"names":[],"mappings":""}

package/built/src/cmds/userInteraction.js

@@ -24,6 +24,9 @@ class UserInteraction {
         }
         return result;
     }
+    async confirm(msg) {
+        await inquirer_1.default.prompt({ type: 'input', name: 'confirm', message: msg });
+    }
     progress(msg) {
         console.log(msg);
     }
@@ -31,12 +34,14 @@ class UserInteraction {
         if (this.spinner.isSpinning) {
             this.spinner.succeed();
         }
-        console.log((0, boxen_1.default)(msg, {
-            padding: 1,
-            margin: 1,
-            borderStyle: 'round',
-            align: 'center',
-        }));
+        if (msg) {
+            console.log((0, boxen_1.default)(msg, {
+                padding: 1,
+                margin: 1,
+                borderStyle: 'round',
+                align: 'center',
+            }));
+        }
     }
     error(msg) {
         if (this.spinner.isSpinning) {

package/built/src/cmds/userInteraction.js.map

@@ -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,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"}
+{"version":3,"file":"userInteraction.js","sourceRoot":"","sources":["../../../src/cmds/userInteraction.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiE;AACjE,8CAA+B;AAC/B,kDAA0B;AAC1B,oCAAmC;AAMnC,MAAa,eAAe;IAA5B;QACU,YAAO,GAAQ,IAAA,aAAG,GAAE,CAAC;IA2E/B,CAAC;IAzEC,KAAK,CAAC,MAAM,CACV,SAA6B,EAC7B,IAAqB;QAErB,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,KAAK,CAAC,OAAO,CAAC,GAAW;QACvB,MAAM,kBAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,GAAY;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,GAAG,CACT,IAAA,eAAK,EAAC,GAAG,EAAE;gBACT,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,CAAC;gBACT,WAAW,EAAE,OAAO;gBACpB,KAAK,EAAE,QAAQ;aAChB,CAAC,CACH,CAAC;SACH;IACH,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;AA5ED,0CA4EC;AAED,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;AACjC,kBAAe,EAAE,CAAC"}

package/built/src/openapi/command.js

@@ -1,49 +1,64 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenAPICommand = void 0;
 const path_1 = require("path");
 const utils_1 = require("../utils");
-const { promises: fsp, statSync } = require('fs');
-const { queue } = require('async');
-const { glob } = require('glob');
-const yaml = require('js-yaml');
-const { parseHTTPServerRequests } = require('./util');
-const Model = require('./model');
+const fs_1 = require("fs");
+const async_1 = require("async");
+const glob_1 = require("glob");
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const model_1 = __importDefault(require("./model"));
+const parseHTTPServerRequests_1 = __importDefault(require("./parseHTTPServerRequests"));
+const rpcRequest_1 = require("./rpcRequest");
+const securitySchemes_1 = __importDefault(require("./securitySchemes"));
 class OpenAPICommand {
     constructor(directory) {
         this.directory = directory;
+        this.model = new model_1.default();
+        this.securitySchemes = new securitySchemes_1.default();
+        this.count = 0;
     }
     async execute() {
-        this.count = 0;
-        this.model = new Model();
-        const q = queue(this.collectAppMap.bind(this), 5);
+        const q = (0, async_1.queue)(this.collectAppMap.bind(this), 5);
         q.pause();
         // Make sure the directory exists -- if it doesn't, the glob below just returns nothing.
-        statSync(this.directory);
-        const files = glob.sync(`${this.directory}/**/*.appmap.json`);
+        (0, fs_1.statSync)(this.directory);
+        const files = glob_1.glob.sync(`${this.directory}/**/*.appmap.json`);
         files.forEach((f) => q.push(f));
         await new Promise((resolve, reject) => {
             q.drain(resolve);
             q.error(reject);
             q.resume();
         });
-        return this.model.openapi();
+        return {
+            paths: this.model.openapi(),
+            securitySchemes: this.securitySchemes.openapi(),
+        };
     }
     async collectAppMap(file) {
         this.count += 1;
         try {
-            parseHTTPServerRequests(JSON.parse(await fsp.readFile(file)), (e) => this.model.addRequest(e));
+            (0, parseHTTPServerRequests_1.default)(JSON.parse((await fs_1.promises.readFile(file)).toString()), (e) => {
+                const request = (0, rpcRequest_1.rpcRequestForEvent)(e);
+                this.model.addRpcRequest(request);
+                this.securitySchemes.addRpcRequest(request);
+            });
         }
         catch (e) {
-            throw new Error(`Error parsing ${file}`, { cause: e });
+            throw new Error(`Error parsing ${file}: ${e}`);
         }
     }
 }
+exports.OpenAPICommand = OpenAPICommand;
 async function loadTemplate(fileName) {
     if (!fileName) {
         // eslint-disable-next-line no-param-reassign
         fileName = (0, path_1.join)(__dirname, '../../resources/openapi-template.yaml');
     }
-    return yaml.load((await fsp.readFile(fileName)).toString());
+    return js_yaml_1.default.load((await fs_1.promises.readFile(fileName)).toString());
 }
 module.exports = {
     command: 'openapi',
@@ -51,6 +66,7 @@ module.exports = {
     describe: 'Generate OpenAPI from AppMaps in a directory',
     builder(args) {
         args.option('appmap-dir', {
+            alias: ['d'],
             describe: 'directory to recursively inspect for AppMaps',
             default: 'tmp/appmap',
             requiresArg: true,
@@ -103,10 +119,10 @@ module.exports = {
 # Customize this entire template with: --openapi-template
 #
 # 'paths' and 'components' will be populated automatically.
-${yaml.dump(template)}
+${js_yaml_1.default.dump(template)}
 `;
         if (argv.outputFile) {
-            await fsp.writeFile(argv.outputFile, fileContents);
+            await fs_1.promises.writeFile(argv.outputFile, fileContents);
         }
         else {
             console.log(fileContents);

package/built/src/openapi/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/openapi/command.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/openapi/command.ts"],"names":[],"mappings":"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"}

package/built/src/openapi/index.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.forURL = exports.forClientRequest = void 0;
+const provider_1 = __importDefault(require("./provider"));
+const model_1 = __importDefault(require("./model"));
+const securitySchemes_1 = __importDefault(require("./securitySchemes"));
+const rpcRequest_1 = require("./rpcRequest");
+const url_1 = require("url");
+const forClientRequest = (event) => {
+    const rpcRequest = (0, rpcRequest_1.rpcRequestForEvent)(event);
+    if (!rpcRequest) {
+        return;
+    }
+    const securitySchemes = new securitySchemes_1.default();
+    const model = new model_1.default();
+    securitySchemes.addRpcRequest(rpcRequest);
+    model.addRpcRequest(rpcRequest);
+    return { paths: model.openapi(), securitySchemes: securitySchemes.openapi() };
+};
+exports.forClientRequest = forClientRequest;
+const forURL = async (url, openapiSchemata) => {
+    return (0, provider_1.default)(new url_1.URL(url).host, openapiSchemata);
+};
+exports.forURL = forURL;
+//# sourceMappingURL=index.js.map

package/built/src/openapi/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/openapi/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAClC,oDAA4B;AAC5B,wEAAgD;AAChD,6CAAkD;AAGlD,6BAA0B;AAO1B,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAiC,EAAE;IACvE,MAAM,UAAU,GAAG,IAAA,+BAAkB,EAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,MAAM,eAAe,GAAG,IAAI,yBAAe,EAAE,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,eAAK,EAAE,CAAC;IAC1B,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC1C,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAEhC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,eAAe,EAAE,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;AAChF,CAAC,CAAC;AASO,4CAAgB;AAPzB,MAAM,MAAM,GAAG,KAAK,EAClB,GAAW,EACX,eAAuC,EACV,EAAE;IAC/B,OAAO,IAAA,kBAAQ,EAAC,IAAI,SAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACtD,CAAC,CAAC;AAEyB,wBAAM"}

package/built/src/openapi/method.js

@@ -1,10 +1,14 @@
 "use strict";
-const Response = require('./response');
-const Schema = require('./schema');
-const { messageToOpenAPISchema, bestPathInfo } = require('./util');
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const response_1 = __importDefault(require("./response"));
+const objectSchema_1 = __importDefault(require("./objectSchema"));
+const util_1 = require("./util");
 const bodyParamMethods = new Set(['delete', 'put', 'post', 'patch']);
-function openapiIn(event, name) {
-    const pathInfo = bestPathInfo(event.httpServerRequest);
+function openapiIn(rpcRequest, name) {
+    const pathInfo = rpcRequest.requestPath;
     // Trim format info from Rails paths, e.g. /foo/bar(.:format)
     const tokens = pathInfo.split('/').map((token) => token.split('(')[0]);
     // Recognize Rails-style normalized paths /org/:org_id and OpenAPI-style paths /org/{org_id}
@@ -14,45 +18,51 @@ function openapiIn(event, name) {
     return 'query';
 }
 class Method {
-    constructor(securitySchemes) {
-        this.securitySchemes = securitySchemes;
+    constructor() {
+        this.rpcRequests = [];
         this.responses = {};
-        this.events = [];
     }
     openapi() {
-        const responses = Object.keys(this.responses)
+        const responseByStatus = Object.keys(this.responses)
             .sort()
-            .reduce((memo, response) => {
+            .reduce((memo, status) => {
             // eslint-disable-next-line no-param-reassign
-            memo[response] = this.responses[response].openapi();
+            memo[status] = this.responses[status].openapi();
             return memo;
         }, {});
         const schemata = {};
         const parameters = [];
         let securitySchemeId;
         const uniqueNames = new Set(['controller', 'action', '_method']);
-        this.events.forEach((event) => {
-            const messages = event.message || [];
+        this.rpcRequests.forEach((rpcRequest) => {
+            const messages = rpcRequest.parameters;
             if (!securitySchemeId) {
-                securitySchemeId = this.securitySchemes.addRequest(event);
+                const authorization = rpcRequest.requestHeaders['Authorization'];
+                if (authorization) {
+                    const scheme = (0, util_1.parseScheme)(authorization);
+                    securitySchemeId = scheme.schemeId;
+                }
             }
-            let schema = null;
-            if (event.requestContentType) {
-                const contentType = event.requestContentType.split(';')[0];
-                if (!schemata[contentType]) {
-                    schemata[contentType] = new Schema();
+            let schema;
+            if (rpcRequest.requestContentType) {
+                const mimeType = rpcRequest.requestContentType.split(';')[0];
+                if (!schemata[mimeType]) {
+                    schemata[mimeType] = new objectSchema_1.default();
                 }
-                schema = schemata[contentType];
+                schema = schemata[mimeType];
             }
             messages.forEach((message) => {
+                if (!message.name) {
+                    return;
+                }
                 if (uniqueNames.has(message.name)) {
                     return;
                 }
                 uniqueNames.add(message.name);
-                const inLocation = openapiIn(event, message.name);
+                const inLocation = openapiIn(rpcRequest, message.name);
                 if (inLocation !== 'path' &&
-                    event.httpServerRequest.request_method &&
-                    bodyParamMethods.has(event.httpServerRequest.request_method.toLowerCase())) {
+                    rpcRequest.requestMethod &&
+                    bodyParamMethods.has(rpcRequest.requestMethod)) {
                     if (schema) {
                         schema.addExample(message);
                     }
@@ -61,7 +71,7 @@ class Method {
                     const parameter = {
                         name: message.name,
                         in: inLocation,
-                        schema: messageToOpenAPISchema(message),
+                        schema: (0, util_1.messageToOpenAPISchema)(message),
                     };
                     if (parameter.in === 'path') {
                         parameter.required = true;
@@ -71,46 +81,41 @@ class Method {
             });
         });
         const response = {
-            responses,
+            responses: responseByStatus,
         };
         if (securitySchemeId) {
             const securityObj = {};
             securityObj[securitySchemeId] = [];
             response.security = [securityObj];
         }
-        if (Object.keys(schemata).length > 0) {
-            response.requestBody = { content: {} };
-            Object.keys(schemata)
-                .sort()
-                .forEach((contentType) => {
-                const schema = schemata[contentType].schema();
-                if (!schema) {
-                    return;
-                }
-                response.requestBody.content[contentType] = { schema };
-            });
+        const mediaTypes = Object.keys(schemata)
+            .sort()
+            .map((contentType) => ({
+            contentType,
+            schema: schemata[contentType].schema(),
+        }))
+            .filter((entry) => entry.schema);
+        if (mediaTypes.length > 0) {
+            const content = mediaTypes.reduce((memo, entry) => {
+                memo[entry.contentType] = { schema: entry.schema };
+                return memo;
+            }, {});
+            response.requestBody = { content };
         }
         if (parameters.length > 0) {
             response.parameters = parameters.sort((a, b) => a.name.localeCompare(b.name));
         }
         return response;
     }
-    addRequest(event) {
-        if (!event.httpServerResponse) {
-            return;
-        }
-        // eslint-disable-next-line camelcase
-        const { status, status_code: statusCode } = event.httpServerResponse;
-        this.addResponse(status || statusCode, event);
-    }
-    addResponse(status, event) {
+    addRpcRequest(request) {
+        const { status } = request;
         if (!this.responses[status]) {
-            this.responses[status] = new Response(status);
+            this.responses[status] = new response_1.default(status);
         }
-        this.events.push(event);
+        this.rpcRequests.push(request);
         const responseObj = this.responses[status];
-        responseObj.addRequest(event);
+        responseObj.addRpcRequest(request);
     }
 }
-module.exports = Method;
+exports.default = Method;
 //# sourceMappingURL=method.js.map

package/built/src/openapi/method.js.map

@@ -1 +1 @@
-{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../src/openapi/method.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../src/openapi/method.ts"],"names":[],"mappings":"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"}

package/built/src/openapi/model.js

@@ -1,11 +1,12 @@
 "use strict";
-const Path = require('./path');
-const SecuritySchemes = require('./securitySchemes');
-const { bestPathInfo } = require('./util');
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("./path"));
 class Model {
     constructor() {
         this.paths = {};
-        this.securitySchemes = new SecuritySchemes();
     }
     openapi() {
         const paths = Object.keys(this.paths)
@@ -15,36 +16,32 @@ class Model {
             memo[path] = this.paths[path].openapi();
             return memo;
         }, {});
-        const securitySchemes = this.securitySchemes.openapi();
-        return { paths, components: { securitySchemes } };
+        return paths;
     }
-    addRequest(event) {
-        this.addPath(Model.basePath(event), event);
-    }
-    addPath(path, event) {
+    addRpcRequest(rpcRequest) {
+        const path = Model.basePath(rpcRequest.requestPath);
         if (!this.paths[path]) {
-            this.paths[path] = new Path(this.securitySchemes);
+            this.paths[path] = new path_1.default();
         }
         const pathObj = this.paths[path];
-        pathObj.addRequest(event);
+        pathObj.addRpcRequest(rpcRequest);
     }
-    static basePath(event) {
-        const { httpServerRequest } = event;
-        let pathInfo = bestPathInfo(httpServerRequest);
-        // eslint-disable-next-line prefer-destructuring
-        pathInfo = pathInfo.split('(')[0];
-        const path = pathInfo.split('/').map((entry) => {
+    static basePath(path) {
+        const pathTokens = path
+            .split('(')[0]
+            .split('/')
+            .map((entry) => {
             if (entry.match(/^:(.*)/)) {
                 // eslint-disable-next-line no-param-reassign
                 entry = `{${entry.substring(1)}}`;
             }
             return entry;
         });
-        if (path.length === 1 && path[0] === '') {
-            path.push('');
+        if (pathTokens.length === 1 && path[0] === '') {
+            pathTokens.push('');
         }
-        return path.join('/');
+        return pathTokens.join('/');
     }
 }
-module.exports = Model;
+exports.default = Model;
 //# sourceMappingURL=model.js.map