@scalar/cli 0.1.0 → 0.2.1

package/dist/index.js

@@ -1,18 +1,19 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
-import fs from 'node:fs';
 import kleur from 'kleur';
+import fs from 'node:fs';
+import { openapi } from '@scalar/openapi-parser';
+import watcher from '@parcel/watcher';
+import path from 'node:path';
 import { format } from 'prettier';
-import { Validator } from '@seriousme/openapi-schema-validator';
-import toml from 'toml-js';
 import prompts from 'prompts';
 import { serve } from '@hono/node-server';
-import { getExampleFromSchema } from '@scalar/api-reference';
+import { createMockServer } from '@scalar/mock-server';
 import { Hono } from 'hono';
 import { stream } from 'hono/streaming';
 import prettyjson from 'prettyjson';
 
-var version = "0.1.0";
+var version = "0.2.1";
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -93,49 +94,19 @@ function getMethodColor(method) {
     return (_a = colors[method.toLowerCase()]) !== null && _a !== void 0 ? _a : 'grey';
 }
 
-function getOperationByMethodAndPath(schema, method, path) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    // Compare just the strings
-    if ((_b = (_a = schema.paths) === null || _a === void 0 ? void 0 : _a[path]) === null || _b === void 0 ? void 0 : _b[method.toLowerCase()]) {
-        return (_d = (_c = schema.paths) === null || _c === void 0 ? void 0 : _c[path]) === null || _d === void 0 ? void 0 : _d[method.toLowerCase()];
-    }
-    // Loop through all pathRegex and find the one where the regex matches the path
-    // Create a Regex for all paths with variables
-    var pathRegex = Object.keys((_e = schema.paths) !== null && _e !== void 0 ? _e : {})
-        .filter(function (path) {
-        return path.includes('{');
-    })
-        .map(function (operationPath) {
-        return {
-            path: operationPath,
-            regex: new RegExp(operationPath.replace(/{([^}]+)}/g, function (_, name) { return "(?<".concat(name, ">[^/]+)"); })),
-        };
-    });
-    // Find a Regex that matches the given path
-    var matchedPath = pathRegex.find(function (_a) {
-        var regex = _a.regex;
-        return regex.test(path);
-    });
-    // Return the operation
-    if (matchedPath === null || matchedPath === void 0 ? void 0 : matchedPath.path) {
-        return (_g = (_f = schema.paths) === null || _f === void 0 ? void 0 : _f[matchedPath === null || matchedPath === void 0 ? void 0 : matchedPath.path]) === null || _g === void 0 ? void 0 : _g[method.toLowerCase()];
-    }
-    return null;
-}
-
 function loadOpenApiFile(file) {
     return __awaiter(this, void 0, void 0, function () {
-        var validator, result, schema, pathsCount, operationsCount, path, method;
+        var specification, result, valid, version, schema, pathsCount, operationsCount, path, method;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    validator = new Validator();
-                    return [4 /*yield*/, validator.validate(file)];
+                    specification = fs.readFileSync(file, 'utf8');
+                    return [4 /*yield*/, openapi().load(specification).resolve()];
                 case 1:
                     result = _a.sent();
-                    if (result.valid) {
-                        schema = validator.resolveRefs();
-                        console.log(kleur.bold().white('[INFO]'), kleur.bold().white(schema.info.title), kleur.grey("(OpenAPI v".concat(validator.version, ")")));
+                    valid = result.valid, version = result.version, schema = result.schema;
+                    if (valid) {
+                        console.log(kleur.bold().white('[INFO]'), kleur.bold().white(schema.info.title), kleur.grey("(OpenAPI v".concat(version, ")")));
                         pathsCount = Object.keys(schema.paths).length;
                         operationsCount = 0;
                         for (path in schema.paths) {
@@ -150,7 +121,7 @@ function loadOpenApiFile(file) {
                         console.warn(kleur.bold().yellow('[WARN]'), kleur.yellow('File doesn’t match the OpenAPI specification.'));
                         console.log();
                     }
-                    return [2 /*return*/, validator];
+                    return [2 /*return*/, result];
             }
         });
     });
@@ -158,6 +129,9 @@ function loadOpenApiFile(file) {
 
 function readFile(file) {
     try {
+        if (fs.existsSync(file) === false) {
+            return undefined;
+        }
         return fs.readFileSync(file, 'utf8');
     }
     catch (err) {
@@ -165,6 +139,7 @@ function readFile(file) {
     }
 }
 
+var CONFIG_FILE = 'scalar.config.json';
 function useGivenFileOrConfiguration(file) {
     var _a;
     // If a specific file is given, use it.
@@ -173,7 +148,9 @@ function useGivenFileOrConfiguration(file) {
     }
     // Try to load the configuration
     try {
-        var configuration = toml.parse(readFile('scalar.toml'));
+        // check if file exists
+        var content = readFile(CONFIG_FILE);
+        var configuration = JSON.parse(content);
         if ((_a = configuration === null || configuration === void 0 ? void 0 : configuration.reference) === null || _a === void 0 ? void 0 : _a.file) {
             return configuration.reference.file;
         }
@@ -186,6 +163,86 @@ function useGivenFileOrConfiguration(file) {
     process.exit(1);
 }
 
+/**
+ * Watch a foobar for changes and call a callback when it does.
+ */
+function watchFile(file, callback, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var absoluteFilePath;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    absoluteFilePath = path.join(process.cwd(), file);
+                    // Check if file exists
+                    if (!fs.existsSync(absoluteFilePath)) {
+                        throw new Error("File ".concat(absoluteFilePath, " does not exist"));
+                    }
+                    // Watch the file for changes
+                    console.log("[INFO] Watch ".concat(file));
+                    // Start the watcher
+                    return [4 /*yield*/, watcher.subscribe(process.cwd(), function (err, events) {
+                            // Match the file path
+                            if (events.some(function (event) { return event.path === absoluteFilePath; })) {
+                                callback();
+                            }
+                        })
+                        // Call the callback immediately
+                    ];
+                case 1:
+                    // Start the watcher
+                    _a.sent();
+                    // Call the callback immediately
+                    if (options === null || options === void 0 ? void 0 : options.immediate) {
+                        callback();
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+
+function BundleCommand() {
+    var _this = this;
+    var cmd = new Command('bundle');
+    cmd.description('Resolve all references in an OpenAPI file');
+    cmd.argument('[file]', 'file to bundle');
+    cmd.option('-o, --output <file>', 'output file');
+    cmd.action(function (fileArgument) { return __awaiter(_this, void 0, void 0, function () {
+        var output, startTime, file, newContent, cache, json, endTime;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    output = cmd.opts().output;
+                    startTime = performance.now();
+                    file = useGivenFileOrConfiguration(fileArgument);
+                    return [4 /*yield*/, loadOpenApiFile(file)
+                        // Replace file content with newContent
+                    ];
+                case 1:
+                    newContent = (_a.sent()).specification;
+                    cache = [];
+                    json = JSON.stringify(newContent, function (key, value) {
+                        if (typeof value === 'object' && value !== null) {
+                            if (cache.indexOf(value) !== -1) {
+                                // Circular reference found, discard key
+                                return;
+                            }
+                            // Store value in our collection
+                            cache.push(value);
+                        }
+                        return value;
+                    }, 2);
+                    fs.writeFileSync(output !== null && output !== void 0 ? output : file, json, 'utf8');
+                    endTime = performance.now();
+                    console.log(kleur.green('OpenAPI Schema bundled'), kleur.grey("in ".concat(kleur.white("".concat(kleur.bold("".concat(Math.round(endTime - startTime))), " ms")))));
+                    console.log();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    return cmd;
+}
+
 function FormatCommand() {
     var _this = this;
     var cmd = new Command('format');
@@ -226,79 +283,81 @@ function FormatCommand() {
 function InitCommand() {
     var _this = this;
     var cmd = new Command('init');
-    cmd.description('Create a new `scalar.toml` file');
+    cmd.description('Create a new `scalar.config.json` file to configure where your OpenAPI file is placed.');
     cmd.option('-f, --file [file]', 'your OpenAPI file');
-    cmd.action(function (_a) {
-        var file = _a.file;
-        return __awaiter(_this, void 0, void 0, function () {
-            var overwrite, configuration, input, _b, content;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (!fs.existsSync('scalar.toml')) return [3 /*break*/, 2];
-                        console.warn(kleur.yellow('A `scalar.toml` file already exists.'));
-                        console.log();
-                        return [4 /*yield*/, prompts({
-                                type: 'toggle',
-                                name: 'overwrite',
-                                message: 'Do you want to override the file?',
-                                initial: false,
-                                active: 'yes',
-                                inactive: 'no',
-                            })];
-                    case 1:
-                        overwrite = (_c.sent()).overwrite;
-                        if (overwrite === false) {
-                            console.log();
-                            process.exit(1);
-                        }
-                        _c.label = 2;
-                    case 2:
-                        configuration = {
-                            reference: { file: '' },
-                        };
-                        if (!file) return [3 /*break*/, 3];
-                        _b = {
-                            input: file,
-                        };
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, prompts({
-                            type: 'text',
-                            name: 'input',
-                            message: 'Where is your OpenAPI file?',
-                            initial: './openapi.json',
-                            validate: function (input) {
-                                return fs.existsSync(input) ? true : 'File doesn’t exist.';
-                            },
+    cmd.action(function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+        var configFile, overwrite, configuration, input, _c, content;
+        var file = _b.file;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    configFile = path.resolve(CONFIG_FILE);
+                    if (!fs.existsSync(configFile)) return [3 /*break*/, 2];
+                    console.warn(kleur.yellow("A ".concat(CONFIG_FILE, " file already exists.")));
+                    console.log();
+                    return [4 /*yield*/, prompts({
+                            type: 'toggle',
+                            name: 'overwrite',
+                            message: 'Do you want to override the file?',
+                            initial: false,
+                            active: 'yes',
+                            inactive: 'no',
                         })];
-                    case 4:
-                        _b = _c.sent();
-                        _c.label = 5;
-                    case 5:
-                        input = (_b).input;
-                        configuration.reference.file = input;
-                        content = toml.dump(configuration);
-                        console.log();
-                        console.log(kleur.bold().white('    scalar.toml'));
-                        console.log();
-                        console.log(content
-                            .trim()
-                            .split('\n')
-                            .map(function (line) { return kleur.grey("    ".concat(line)); })
-                            .join('\n'));
-                        console.log();
-                        // Create `scalar.toml` file
-                        fs.writeFileSync('scalar.toml', content);
-                        console.log(kleur.green('Created a new project configuration.'));
-                        console.log(kleur.white("Run ".concat(kleur
-                            .grey()
-                            .bold('scalar --help'), " to see all available commands.")));
+                case 1:
+                    overwrite = (_d.sent()).overwrite;
+                    if (overwrite === false) {
                         console.log();
-                        return [2 /*return*/];
-                }
-            });
+                        process.exit(1);
+                    }
+                    _d.label = 2;
+                case 2:
+                    configuration = {
+                        references: [],
+                    };
+                    if (!file) return [3 /*break*/, 3];
+                    _c = {
+                        input: file,
+                    };
+                    return [3 /*break*/, 5];
+                case 3: return [4 /*yield*/, prompts({
+                        type: 'text',
+                        name: 'input',
+                        message: 'Where is your OpenAPI file?',
+                        initial: './openapi.json',
+                        validate: function (input) {
+                            return fs.existsSync(input) ? true : 'File doesn’t exist.';
+                        },
+                    })];
+                case 4:
+                    _c = _d.sent();
+                    _d.label = 5;
+                case 5:
+                    input = (_c).input;
+                    configuration.references.push({
+                        name: 'API Reference',
+                        path: input,
+                    });
+                    content = JSON.stringify(configuration, null, 2);
+                    console.log();
+                    console.log(kleur.bold().white("    ".concat(CONFIG_FILE)));
+                    console.log();
+                    console.log(content
+                        .trim()
+                        .split('\n')
+                        .map(function (line) { return kleur.grey("    ".concat(line)); })
+                        .join('\n'));
+                    console.log();
+                    // Create `scalar.config.json` file
+                    fs.writeFileSync(configFile, content);
+                    console.log(kleur.green('Created a new project configuration.'));
+                    console.log(kleur.white("Run ".concat(kleur
+                        .grey()
+                        .bold('scalar --help'), " to see all available commands.")));
+                    console.log();
+                    return [2 /*return*/];
+            }
         });
-    });
+    }); });
     return cmd;
 }
 
@@ -309,87 +368,107 @@ function MockCommand() {
     cmd.argument('[file]', 'OpenAPI file to mock the server for');
     cmd.option('-w, --watch', 'watch the file for changes');
     cmd.option('-p, --port <port>', 'set the HTTP port for the mock server');
-    cmd.action(function (fileArgument, _a) {
-        var watch = _a.watch, port = _a.port;
-        return __awaiter(_this, void 0, void 0, function () {
-            var file, schema, path, method, app;
-            var _this = this;
-            var _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        file = useGivenFileOrConfiguration(fileArgument);
-                        return [4 /*yield*/, loadOpenApiFile(file)];
-                    case 1:
-                        schema = (_d.sent())
-                            .specification;
-                        // watch file for changes
-                        if (watch) {
-                            fs.watchFile(file, function () { return __awaiter(_this, void 0, void 0, function () {
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            console.log(kleur.bold().white('[INFO]'), kleur.grey('Mock Server was updated.'));
-                                            return [4 /*yield*/, loadOpenApiFile(file)];
-                                        case 1:
-                                            schema = (_a.sent()).resolveRefs();
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); });
-                        }
-                        console.log(kleur.bold().white('Available Paths'));
-                        console.log();
-                        if ((schema === null || schema === void 0 ? void 0 : schema.paths) === undefined ||
-                            Object.keys(schema === null || schema === void 0 ? void 0 : schema.paths).length === 0) {
-                            console.log(kleur.bold().yellow('[WARN]'), kleur.grey('Couldn’t find any paths in the OpenAPI file.'));
-                        }
-                        // loop through all paths
-                        for (path in (_b = schema === null || schema === void 0 ? void 0 : schema.paths) !== null && _b !== void 0 ? _b : []) {
-                            // loop through all methods
-                            for (method in (_c = schema.paths) === null || _c === void 0 ? void 0 : _c[path]) {
-                                console.log("".concat(kleur
-                                    .bold()[getMethodColor(method)](method.toUpperCase().padEnd(6)), " ").concat(kleur.grey("".concat(path))));
-                            }
-                        }
-                        console.log();
-                        app = new Hono();
-                        app.all('/*', function (c) {
-                            var _a = c.req, method = _a.method, path = _a.path;
-                            var operation = getOperationByMethodAndPath(schema, method, path);
-                            console.log("".concat(kleur
-                                .bold()[getMethodColor(method)](method.toUpperCase().padEnd(6)), " ").concat(kleur.grey("".concat(path))), "".concat(kleur.grey('→'), " ").concat((operation === null || operation === void 0 ? void 0 : operation.operationId)
-                                ? kleur.white(operation.operationId)
-                                : kleur.red('[ERROR] 404 Not Found')));
-                            if (!operation) {
-                                return c.text('Not found', 404);
-                            }
-                            // if (!operation) {
-                            //   return c.text('Method not allowed', 405)
-                            // }
-                            var jsonResponseConfiguration = operation.responses['200'].content['application/json'];
-                            var response = jsonResponseConfiguration.example
-                                ? jsonResponseConfiguration.example
-                                : jsonResponseConfiguration.schema
-                                    ? getExampleFromSchema(jsonResponseConfiguration.schema, {
-                                        emptyString: '…',
-                                    })
-                                    : null;
-                            return c.json(response);
-                        });
-                        serve({
+    cmd.action(function (fileArgument_1, _a) { return __awaiter(_this, [fileArgument_1, _a], void 0, function (fileArgument, _b) {
+        var server, file, specification;
+        var _this = this;
+        var watch = _b.watch, port = _b.port;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    server = null;
+                    file = useGivenFileOrConfiguration(fileArgument);
+                    return [4 /*yield*/, loadOpenApiFile(file)
+                        // Watch OpenAPI file for changes
+                    ];
+                case 1:
+                    specification = (_c.sent()).specification;
+                    if (!watch) return [3 /*break*/, 3];
+                    return [4 /*yield*/, watchFile(file, function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        console.log(kleur.bold().white('[INFO]'), kleur.grey('Mock Server was updated.'));
+                                        return [4 /*yield*/, loadOpenApiFile(file)];
+                                    case 1:
+                                        specification = (_a.sent()).specification;
+                                        server.close();
+                                        return [4 /*yield*/, bootServer({
+                                                specification: specification,
+                                                port: port,
+                                            })];
+                                    case 2:
+                                        server = _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                case 2:
+                    _c.sent();
+                    _c.label = 3;
+                case 3:
+                    // Show all paths from the specification
+                    printAvailablePaths(specification);
+                    return [4 /*yield*/, bootServer({
+                            specification: specification,
+                            port: port,
+                        })];
+                case 4:
+                    // Listen for requests
+                    server = _c.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    return cmd;
+}
+function bootServer(_a) {
+    return __awaiter(this, arguments, void 0, function (_b) {
+        var app;
+        var specification = _b.specification, port = _b.port;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, createMockServer({
+                        specification: specification,
+                        onRequest: onRequest,
+                    })];
+                case 1:
+                    app = _c.sent();
+                    return [2 /*return*/, serve({
                             fetch: app.fetch,
                             port: port !== null && port !== void 0 ? port : 3000,
                         }, function (info) {
                             console.log("".concat(kleur.bold().green('➜ Mock Server'), " ").concat(kleur.white('listening on'), " ").concat(kleur.cyan("http://localhost:".concat(info.port))));
                             console.log();
-                        });
-                        return [2 /*return*/];
-                }
-            });
+                        })];
+            }
         });
     });
-    return cmd;
+}
+function printAvailablePaths(specification) {
+    var _a, _b;
+    console.log(kleur.bold().white('Available Paths'));
+    console.log();
+    if ((specification === null || specification === void 0 ? void 0 : specification.paths) === undefined ||
+        Object.keys(specification === null || specification === void 0 ? void 0 : specification.paths).length === 0) {
+        console.log(kleur.bold().yellow('[WARN]'), kleur.grey('Couldn’t find any paths in the OpenAPI file.'));
+    }
+    // loop through all paths
+    for (var path in (_a = specification === null || specification === void 0 ? void 0 : specification.paths) !== null && _a !== void 0 ? _a : []) {
+        // loop through all methods
+        for (var method in (_b = specification.paths) === null || _b === void 0 ? void 0 : _b[path]) {
+            console.log("".concat(kleur
+                .bold()[getMethodColor(method)](method.toUpperCase().padEnd(6)), " ").concat(kleur.grey("".concat(path))));
+        }
+    }
+    console.log();
+}
+function onRequest(_a) {
+    var context = _a.context, operation = _a.operation;
+    var method = context.req.method;
+    console.log("".concat(kleur
+        .bold()[getMethodColor(method)](method.toUpperCase().padEnd(6)), " ").concat(kleur.grey("".concat(context.req.path))), "".concat(kleur.grey('→'), " ").concat((operation === null || operation === void 0 ? void 0 : operation.operationId)
+        ? kleur.white(operation.operationId)
+        : kleur.red('[ERROR] 404 Not Found')));
 }
 
 function ReferenceCommand() {
@@ -399,88 +478,83 @@ function ReferenceCommand() {
     cmd.argument('[file]', 'OpenAPI file to show the reference for');
     cmd.option('-w, --watch', 'watch the file for changes');
     cmd.option('-p, --port <port>', 'set the HTTP port for the API reference server');
-    cmd.action(function (fileArgument, _a) {
-        var watch = _a.watch, port = _a.port;
-        return __awaiter(_this, void 0, void 0, function () {
-            var file, specification, app;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        file = useGivenFileOrConfiguration(fileArgument);
-                        return [4 /*yield*/, loadOpenApiFile(file)];
-                    case 1:
-                        specification = (_b.sent())
-                            .specification;
-                        if ((specification === null || specification === void 0 ? void 0 : specification.paths) === undefined ||
-                            Object.keys(specification === null || specification === void 0 ? void 0 : specification.paths).length === 0) {
-                            console.log(kleur.bold().yellow('[WARN]'), kleur.grey('Couldn’t find any paths in the OpenAPI file.'));
-                        }
-                        app = new Hono();
-                        app.get('/', function (c) {
-                            return c.html(getHtmlDocument(specification, watch));
+    cmd.action(function (fileArgument_1, _a) { return __awaiter(_this, [fileArgument_1, _a], void 0, function (fileArgument, _b) {
+        var file, specification, app;
+        var _this = this;
+        var watch = _b.watch, port = _b.port;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    file = useGivenFileOrConfiguration(fileArgument);
+                    return [4 /*yield*/, loadOpenApiFile(file)];
+                case 1:
+                    specification = (_c.sent()).specification;
+                    if ((specification === null || specification === void 0 ? void 0 : specification.paths) === undefined ||
+                        Object.keys(specification === null || specification === void 0 ? void 0 : specification.paths).length === 0) {
+                        console.log(kleur.bold().yellow('[WARN]'), kleur.grey('Couldn’t find any paths in the OpenAPI file.'));
+                    }
+                    app = new Hono();
+                    app.get('/', function (c) {
+                        return c.html(getHtmlDocument(specification, watch));
+                    });
+                    app.use('/__watcher', function (c, next) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    c.header('Content-Type', 'text/event-stream');
+                                    c.header('Cache-Control', 'no-cache');
+                                    c.header('Connection', 'keep-alive');
+                                    return [4 /*yield*/, next()];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
                         });
-                        app.use('/__watcher', function (c, next) { return __awaiter(_this, void 0, void 0, function () {
+                    }); });
+                    app.get('/__watcher', function (c) {
+                        return stream(c, function (stream) { return __awaiter(_this, void 0, void 0, function () {
+                            var _this = this;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        c.header('Content-Type', 'text/event-stream');
-                                        c.header('Cache-Control', 'no-cache');
-                                        c.header('Connection', 'keep-alive');
-                                        return [4 /*yield*/, next()];
+                                        // watch file for changes
+                                        if (watch) {
+                                            watchFile(file, function () { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0:
+                                                            console.log(kleur.bold().white('[INFO]'), kleur.grey('OpenAPI file modified'));
+                                                            return [4 /*yield*/, loadOpenApiFile(file)];
+                                                        case 1:
+                                                            specification = (_a.sent()).specification;
+                                                            stream.write('data: file modified\n\n');
+                                                            return [2 /*return*/];
+                                                    }
+                                                });
+                                            }); });
+                                        }
+                                        _a.label = 1;
                                     case 1:
+                                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 100); })];
+                                    case 2:
                                         _a.sent();
-                                        return [2 /*return*/];
+                                        return [3 /*break*/, 1];
+                                    case 3: return [2 /*return*/];
                                 }
                             });
                         }); });
-                        app.get('/__watcher', function (c) {
-                            return stream(c, function (stream) { return __awaiter(_this, void 0, void 0, function () {
-                                var _this = this;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            // watch file for changes
-                                            if (watch) {
-                                                console.log("Watch ".concat(file));
-                                                fs.watchFile(file, function () { return __awaiter(_this, void 0, void 0, function () {
-                                                    return __generator(this, function (_a) {
-                                                        switch (_a.label) {
-                                                            case 0:
-                                                                console.log(kleur.bold().white('[INFO]'), kleur.grey('OpenAPI file modified'));
-                                                                return [4 /*yield*/, loadOpenApiFile(file)];
-                                                            case 1:
-                                                                specification = (_a.sent())
-                                                                    .specification;
-                                                                stream.write('data: file modified\n\n');
-                                                                return [2 /*return*/];
-                                                        }
-                                                    });
-                                                }); });
-                                            }
-                                            _a.label = 1;
-                                        case 1:
-                                            return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 100); })];
-                                        case 2:
-                                            _a.sent();
-                                            return [3 /*break*/, 1];
-                                        case 3: return [2 /*return*/];
-                                    }
-                                });
-                            }); });
-                        });
-                        serve({
-                            fetch: app.fetch,
-                            port: port !== null && port !== void 0 ? port : 3000,
-                        }, function (info) {
-                            console.log("".concat(kleur.bold().green('➜ API Reference Server'), " ").concat(kleur.white('listening on'), " ").concat(kleur.cyan("http://localhost:".concat(info.port))));
-                            console.log();
-                        });
-                        return [2 /*return*/];
-                }
-            });
+                    });
+                    serve({
+                        fetch: app.fetch,
+                        port: port !== null && port !== void 0 ? port : 3000,
+                    }, function (info) {
+                        console.log("".concat(kleur.bold().green('➜ API Reference Server'), " ").concat(kleur.white('listening on'), " ").concat(kleur.cyan("http://localhost:".concat(info.port))));
+                        console.log();
+                    });
+                    return [2 /*return*/];
+            }
         });
-    });
+    }); });
     return cmd;
 }
 
@@ -541,19 +615,19 @@ function ValidateCommand() {
     cmd.description('Validate an OpenAPI file');
     cmd.argument('[file]', 'file to validate');
     cmd.action(function (fileArgument) { return __awaiter(_this, void 0, void 0, function () {
-        var startTime, file, validator, result, endTime;
+        var startTime, file, specification, result, endTime;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     startTime = performance.now();
                     file = useGivenFileOrConfiguration(fileArgument);
-                    validator = new Validator();
-                    return [4 /*yield*/, validator.validate(file)];
+                    specification = fs.readFileSync(file, 'utf8');
+                    return [4 /*yield*/, openapi().load(specification).validate()];
                 case 1:
                     result = _b.sent();
                     if (result.valid) {
-                        console.log(kleur.green("Matches the OpenAPI specification".concat(kleur.white(" (OpenAPI ".concat(kleur.bold(validator.version), ")")))));
+                        console.log(kleur.green("Matches the OpenAPI specification".concat(kleur.white(" (OpenAPI ".concat(kleur.bold(result.version), ")")))));
                         endTime = performance.now();
                         console.log();
                         console.log(kleur.green('File validated'), kleur.grey("in ".concat(kleur.white("".concat(kleur.bold("".concat(Math.round(endTime - startTime))), " ms")))));
@@ -585,6 +659,7 @@ program.addCommand(InitCommand(), {
 });
 program.addCommand(FormatCommand());
 program.addCommand(ValidateCommand());
+program.addCommand(BundleCommand());
 program.addCommand(ReferenceCommand());
 program.addCommand(MockCommand());
 program.addCommand(ShareCommand());