@appland/appmap 3.19.0 → 3.20.0

package/built/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@appland/appmap",
-    "version": "3.19.0",
+    "version": "3.20.0",
     "description": "",
     "bin": "built/src/cli.js",
     "publishConfig": {
@@ -91,6 +91,7 @@
         "jsdom": "^16.6.0",
         "moo": "^0.5.1",
         "open": "^8.2.1",
+        "openapi-types": "^10.0.0",
         "ora": "^5.4.1",
         "port-pid": "^0.0.7",
         "ps-node": "^0.1.6",

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

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

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/openapi/model.js"],"names":[],"mappings":";AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACrD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE3C,MAAM,KAAK;IACT;QACE,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC/C,CAAC;IAED,OAAO;QACL,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;aAClC,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrB,6CAA6C;YAC7C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACvD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,eAAe,EAAE,EAAE,CAAC;IACpD,CAAC;IAED,UAAU,CAAC,KAAK;QACd,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,CAAC,IAAI,EAAE,KAAK;QACjB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACnD;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,KAAK;QACnB,MAAM,EAAE,iBAAiB,EAAE,GAAG,KAAK,CAAC;QACpC,IAAI,QAAQ,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC;QAC/C,gDAAgD;QAChD,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC7C,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBACzB,6CAA6C;gBAC7C,KAAK,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;aACnC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACf;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/openapi/model.ts"],"names":[],"mappings":";;;;;AACA,kDAA0B;AAG1B,MAAqB,KAAK;IAA1B;QACE,UAAK,GAAyB,EAAE,CAAC;IAsCnC,CAAC;IApCC,OAAO;QACL,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;aAClC,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrB,6CAA6C;YAC7C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAA8C,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,aAAa,CAAC,UAAsB;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,cAAI,EAAE,CAAC;SAC/B;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAY;QAC1B,MAAM,UAAU,GAAG,IAAI;aACpB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACb,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBACzB,6CAA6C;gBAC7C,KAAK,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;aACnC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACL,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;YAC7C,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACrB;QACD,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACF;AAvCD,wBAuCC"}

package/built/src/openapi/objectSchema.js

@@ -0,0 +1,47 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const schemaInferrer_1 = __importDefault(require("./schemaInferrer"));
+class ObjectSchema {
+    constructor() {
+        this.examples = [];
+    }
+    addExample(message) {
+        if (!message.name) {
+            return;
+        }
+        this.examples.push(message);
+    }
+    get empty() {
+        return this.examples.length > 0;
+    }
+    schema() {
+        const schemata = {};
+        this.examples
+            .filter((message) => message.name)
+            .sort((a, b) => a.name.localeCompare(b.name))
+            .forEach((message) => {
+            if (!schemata[message.name]) {
+                schemata[message.name] = new schemaInferrer_1.default();
+            }
+            schemata[message.name].addExample(message);
+        });
+        if (Object.keys(schemata).length === 0) {
+            return;
+        }
+        const properties = Object.keys(schemata).reduce((memo, name) => {
+            const schema = schemata[name].openapi();
+            if (schema)
+                memo[name] = schema;
+            return memo;
+        }, {});
+        return {
+            type: 'object',
+            properties,
+        };
+    }
+}
+exports.default = ObjectSchema;
+//# sourceMappingURL=objectSchema.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"objectSchema.js","sourceRoot":"","sources":["../../../src/openapi/objectSchema.ts"],"names":[],"mappings":";;;;;AAEA,sEAA8C;AAE9C,MAAqB,YAAY;IAG/B;QACE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,OAAwB;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,OAAO;SACR;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,MAAM;QACJ,MAAM,QAAQ,GAAmC,EAAE,CAAC;QACpD,IAAI,CAAC,QAAQ;aACV,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;aACjC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAK,CAAC,aAAa,CAAC,CAAC,CAAC,IAAK,CAAC,CAAC;aAC9C,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACnB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAK,CAAC,EAAE;gBAC5B,QAAQ,CAAC,OAAO,CAAC,IAAK,CAAC,GAAG,IAAI,wBAAc,EAAE,CAAC;aAChD;YACD,QAAQ,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACL,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACtC,OAAO;SACR;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,MAAM;gBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAA4C,CAAC,CAAC;QACjD,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,UAAU;SACX,CAAC;IACJ,CAAC;CACF;AA3CD,+BA2CC"}

package/built/src/openapi/parseHTTPServerRequests.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const models_1 = require("@appland/models");
+function parseHTTPServerRequests(source, collector) {
+    const appmap = (0, models_1.buildAppMap)().source(source).normalize().build();
+    appmap.events
+        .filter((e) => e.httpServerRequest && e.httpServerResponse)
+        .forEach(collector);
+}
+exports.default = parseHTTPServerRequests;
+//# sourceMappingURL=parseHTTPServerRequests.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"parseHTTPServerRequests.js","sourceRoot":"","sources":["../../../src/openapi/parseHTTPServerRequests.ts"],"names":[],"mappings":";;AAAA,4CAAqD;AAGrD,SAAwB,uBAAuB,CAC7C,MAAW,EACX,SAAiC;IAEjC,MAAM,MAAM,GAAG,IAAA,oBAAW,GAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC;IAEhE,MAAM,CAAC,MAAM;SACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,kBAAkB,CAAC;SAC1D,OAAO,CAAC,SAAS,CAAC,CAAC;AACxB,CAAC;AATD,0CASC"}

package/built/src/openapi/path.js

@@ -1,8 +1,11 @@
 "use strict";
-const Method = require('./method');
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const method_1 = __importDefault(require("./method"));
 class Path {
-    constructor(securitySchemes) {
-        this.securitySchemes = securitySchemes;
+    constructor() {
         this.methods = {};
     }
     openapi() {
@@ -10,26 +13,22 @@ class Path {
             .sort()
             .reduce((memo, method) => {
             // eslint-disable-next-line no-param-reassign
-            memo[method] = this.methods[method].openapi();
+            memo[method] =
+                this.methods[method].openapi();
             return memo;
         }, {});
     }
-    addRequest(event) {
-        const method = event.httpServerRequest.request_method;
+    addRpcRequest(rpcRequest) {
+        const method = rpcRequest.requestMethod;
         if (!method) {
             return;
         }
-        this.addMethod(method, event);
-    }
-    addMethod(method, event) {
-        // eslint-disable-next-line no-param-reassign
-        method = method.toLowerCase();
         if (!this.methods[method]) {
-            this.methods[method] = new Method(this.securitySchemes);
+            this.methods[method] = new method_1.default();
         }
         const methodObj = this.methods[method];
-        methodObj.addRequest(event);
+        methodObj.addRpcRequest(rpcRequest);
     }
 }
-module.exports = Path;
+exports.default = Path;
 //# sourceMappingURL=path.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/openapi/path.js"],"names":[],"mappings":";AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnC,MAAM,IAAI;IACR,YAAY,eAAe;QACzB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,OAAO;QACL,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;aAC7B,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACvB,6CAA6C;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAED,UAAU,CAAC,KAAK;QACd,MAAM,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,MAAM,EAAE,KAAK;QACrB,6CAA6C;QAC7C,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACzD;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC"}
+{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/openapi/path.ts"],"names":[],"mappings":";;;;;AACA,sDAA8B;AAG9B,MAAqB,IAAI;IAAzB;QACE,YAAO,GAA2B,EAAE,CAAC;IAyBvC,CAAC;IAvBC,OAAO;QACL,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;aAC7B,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,IAAI,EAAE,MAAc,EAAE,EAAE;YAC/B,6CAA6C;YAC7C,IAAI,CAAC,MAA+B,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,MAA+B,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAA8D,CAAC,CAAC;IACvE,CAAC;IAED,aAAa,CAAC,UAAsB;QAClC,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,gBAAM,EAAE,CAAC;SACrC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;CACF;AA1BD,uBA0BC"}