@apimatic/cli 1.1.0-alpha.9 → 1.1.0-beta.10

package/lib/utils/utils.js

@@ -1,348 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMessageInRedColor = exports.getMessageInMagentaColor = exports.getMessageInGreenColor = exports.getMessageInCyanColor = exports.getMessageInBlueColor = exports.getMessageInOrangeColor = exports.getNonHiddenItemsFromDirectory = exports.printValidationMessages = exports.getFileNameFromPath = exports.getGeneratedFilesPaths = exports.isJSONParsable = exports.replaceHTML = exports.zipDirectory = exports.zipDirectoryToStream = exports.writeFileUsingReadableStream = exports.deleteFile = exports.isValidUrl = exports.directoryToJson = exports.validationMessagesToJson = exports.clearDirectory = exports.createTempDirectory = exports.unzipFile = void 0;
-exports.extractZipFile = extractZipFile;
-exports.validateAndZipPortalSource = validateAndZipPortalSource;
-exports.cleanUpGeneratedPortalFiles = cleanUpGeneratedPortalFiles;
-exports.isPortInUse = isPortInUse;
-exports.parseStreamBodyToJson = parseStreamBodyToJson;
-const tslib_1 = require("tslib");
-const net = require("net");
-const path = require("path");
-const fs = require("fs-extra");
-const os = require("os");
-const archiver = require("archiver");
-const unzipper = require("unzipper");
-const stripTags = require("striptags");
-const stream_1 = require("stream");
-const AdmZip = require("adm-zip");
-const unzipFile = (stream, destination) => {
-    return new Promise((resolve, reject) => {
-        const extractStream = unzipper.Extract({ path: destination });
-        stream
-            .pipe(extractStream)
-            .on("error", (error) => reject(new Error("Error during extraction: " + error.message)));
-        extractStream.on("close", () => resolve("Extracted"));
-        extractStream.on("error", (error) => reject(new Error("Error during extraction: " + error.message)));
-    });
-};
-exports.unzipFile = unzipFile;
-const createTempDirectory = async () => {
-    return fs.mkdtempSync(path.join(os.tmpdir(), "apimatic-cli-"));
-};
-exports.createTempDirectory = createTempDirectory;
-const clearDirectory = async (folderPath) => {
-    if (!fs.existsSync(folderPath)) {
-        throw new Error(`Directory ${folderPath} does not exist`);
-    }
-    const files = await fs.readdir(folderPath);
-    for (const file of files) {
-        const filePath = path.join(folderPath, file);
-        await (0, exports.deleteFile)(filePath);
-    }
-    await (0, exports.deleteFile)(folderPath);
-};
-exports.clearDirectory = clearDirectory;
-const validationMessagesToJson = (validationMessages) => {
-    const structuredValidationMessages = {
-        "Validation Messages": {
-            Errors: [],
-            Warnings: [],
-            Messages: []
-        }
-    };
-    if (validationMessages.errors) {
-        validationMessages.errors.forEach((error) => {
-            structuredValidationMessages["Validation Messages"]["Errors"].push((0, exports.replaceHTML)(error));
-        });
-    }
-    if (validationMessages.warnings) {
-        validationMessages.warnings.forEach((warning) => {
-            structuredValidationMessages["Validation Messages"]["Warnings"].push((0, exports.replaceHTML)(warning));
-        });
-    }
-    if (validationMessages.messages) {
-        validationMessages.messages.forEach((message) => {
-            structuredValidationMessages["Validation Messages"]["Messages"].push((0, exports.replaceHTML)(message));
-        });
-    }
-    return structuredValidationMessages;
-};
-exports.validationMessagesToJson = validationMessagesToJson;
-const descriptions = Object.entries({
-    "APIMATIC-BUILD.json": "# Defines all configurations for the API portal, including programming languages and themes",
-    spec: "# Contains all API definition files",
-    content: "# Includes custom documentation pages in Markdown",
-    "content/toc.yml": "# Controls the structure of the side navigation bar in the API portal",
-    static: "# Includes all static files, such as images, GIFs, and PDFs"
-}).reduce((acc, [key, value]) => {
-    acc[path.normalize(key)] = value;
-    return acc;
-}, {});
-const directoryToJson = (dirPath, parentPath = "") => {
-    const directoryStructure = {};
-    const items = fs.readdirSync(dirPath);
-    items.forEach((item) => {
-        if (item === ".git")
-            return; // Skip .git directory
-        const itemPath = path.join(dirPath, item);
-        const relativePath = path.join(parentPath, item);
-        const stats = fs.statSync(itemPath);
-        if (stats.isDirectory()) {
-            const subdirectoryStructure = (0, exports.directoryToJson)(itemPath, relativePath);
-            const folderName = descriptions[path.normalize(relativePath)]
-                ? `${item} : ${descriptions[path.normalize(relativePath)]}`
-                : item;
-            directoryStructure[folderName] = subdirectoryStructure;
-        }
-        else {
-            directoryStructure[descriptions[path.normalize(relativePath)] ? `${item} : ${descriptions[path.normalize(relativePath)]}` : item] = null;
-        }
-    });
-    return directoryStructure;
-};
-exports.directoryToJson = directoryToJson;
-const isValidUrl = (input) => {
-    if (!input) {
-        return false;
-    }
-    try {
-        const url = new URL(input);
-        if (!["http:", "https:"].includes(url.protocol)) {
-            return false;
-        }
-        if (url.protocol === "file:" || fs.existsSync(input)) {
-            return false;
-        }
-        if (!url.host) {
-            return false;
-        }
-        return true;
-    }
-    catch (_) {
-        return false;
-    }
-};
-exports.isValidUrl = isValidUrl;
-const deleteFile = async (filePath) => {
-    return await fs.remove(filePath);
-};
-exports.deleteFile = deleteFile;
-const writeFileUsingReadableStream = (stream, destinationPath) => {
-    return new Promise((resolve) => {
-        const writeStream = fs.createWriteStream(destinationPath);
-        stream.pipe(writeStream);
-        writeStream.on("close", () => {
-            resolve("Zipped");
-        });
-    });
-};
-exports.writeFileUsingReadableStream = writeFileUsingReadableStream;
-const zipDirectoryToStream = async (sourcePath) => {
-    // Check if the directory exists for the user or not
-    await fs.ensureDir(sourcePath);
-    const archive = archiver("zip");
-    return new Promise((resolve, reject) => {
-        archive.on("error", (err) => {
-            reject(new Error(err.message));
-        });
-        const passThroughStream = new stream_1.PassThrough();
-        archive.pipe(passThroughStream);
-        archive.directory(sourcePath, false);
-        archive.finalize().catch(reject);
-        resolve(passThroughStream);
-    });
-};
-exports.zipDirectoryToStream = zipDirectoryToStream;
-/**
- * Packages local files into a ZIP archive
- *
- * @param {docsPortalFolderPath} path to portal directory.
- * @param {destinationZipPath} path to generated zip
- * return {string}
- */
-const zipDirectory = async (sourcePath, destinationPath) => {
-    // Check if the directory exists for the user or not
-    await fs.ensureDir(sourcePath);
-    const zipPath = path.join(destinationPath, ".target.zip");
-    const output = fs.createWriteStream(zipPath);
-    const archive = archiver("zip");
-    return new Promise((resolve, reject) => {
-        archive.on("error", (err) => {
-            reject(new Error(err.message));
-        });
-        output.on("error", (err) => {
-            reject(new Error(err.message));
-        });
-        output.on("close", () => {
-            resolve(zipPath);
-        });
-        archive.pipe(output);
-        archive.directory(sourcePath, false);
-        archive.finalize().catch(reject);
-    });
-};
-exports.zipDirectory = zipDirectory;
-const replaceHTML = (string) => {
+import { __asyncValues } from "tslib";
+import * as path from "path";
+import { Buffer } from "buffer";
+import stripTags from "striptags";
+export const replaceHTML = (string) => {
     return stripTags(string);
 };
-exports.replaceHTML = replaceHTML;
-const isJSONParsable = (json) => {
-    try {
-        JSON.parse(json);
-        return true;
-    }
-    catch (e) {
-        return false;
-    }
-};
-exports.isJSONParsable = isJSONParsable;
-const getGeneratedFilesPaths = (sourceDirectoryPath, generatedPortalArtifactsDirectoryPath) => {
-    const generatedBuildInputZipPath = path.join(sourceDirectoryPath, ".portal_source.zip");
-    const generatedPortalArtifactsZipFilePath = path.join(sourceDirectoryPath, ".generated_portal.zip");
-    const generatedPortalArtifactsFolderPath = path.join(path.dirname(generatedPortalArtifactsDirectoryPath), "generated_portal");
-    return [generatedBuildInputZipPath, generatedPortalArtifactsFolderPath, generatedPortalArtifactsZipFilePath];
-};
-exports.getGeneratedFilesPaths = getGeneratedFilesPaths;
-const getFileNameFromPath = (filePath) => {
+export const getFileNameFromPath = (filePath) => {
     return path.basename(filePath).split(".")[0];
 };
-exports.getFileNameFromPath = getFileNameFromPath;
-const printValidationMessages = ({ warnings, errors, messages }, { log, warn, error }) => {
-    warnings = warnings || [];
-    messages = messages || [];
-    const singleError = errors.join("\n") || "";
-    messages.forEach((message) => {
-        log(`Info: ${(0, exports.replaceHTML)(message)}`);
-    });
-    warnings.forEach((warning) => {
-        warn((0, exports.replaceHTML)(warning));
-    });
-    if (errors.length > 0) {
-        error((0, exports.replaceHTML)(singleError));
-    }
-};
-exports.printValidationMessages = printValidationMessages;
-/**
- * Extracts a ZIP file to a specified destination directory.
- *
- * @param zipFilePath Path to the ZIP file.
- * @param destinationDir Path to the destination directory where files will be extracted.
- */
-async function extractZipFile(zipFilePath, destinationDir) {
-    const MAX_ZIP_SIZE = 300 * 1024 * 1024;
-    return new Promise((resolve, reject) => {
-        try {
-            const zip = new AdmZip(zipFilePath);
-            const zipEntries = zip.getEntries();
-            let totalSize = 0;
-            zipEntries.forEach((entry) => {
-                totalSize += entry.getData().length;
-                const normalizedPath = path.normalize(entry.entryName);
-                if (normalizedPath.startsWith("..") || path.isAbsolute(normalizedPath)) {
-                    return reject(new Error(`Blocked potentially unsafe path: ${normalizedPath}`));
-                }
-            });
-            if (totalSize > MAX_ZIP_SIZE) {
-                return reject(new Error((0, exports.getMessageInRedColor)("Archive size is too large for safe extraction.")));
-            }
-            if (!fs.existsSync(destinationDir)) {
-                fs.mkdirSync(destinationDir, { recursive: true });
-            }
-            zipEntries.forEach((entry) => {
-                const resolvedPath = path.resolve(destinationDir, entry.entryName);
-                if (!resolvedPath.startsWith(path.resolve(destinationDir))) {
-                    return reject(new Error("An error occurred while extracting zip file."));
-                }
-                zip.extractEntryTo(entry, destinationDir, true, true);
-            });
-            resolve();
-        }
-        catch (error) {
-            return reject(new Error(`Failed to extract ZIP File: ${error}`));
-        }
-    });
-}
-async function validateAndZipPortalSource(sourceDir, outputPath, ignoredPaths = []) {
-    const output = fs.createWriteStream(outputPath);
-    const archive = archiver("zip", {
-        zlib: { level: 9 }
-    });
-    return new Promise((resolve, reject) => {
-        output.on("close", () => resolve(outputPath));
-        output.on("error", (err) => {
-            return reject(new Error(`Failed to zip the source directory: ${err.message}`));
-        });
-        archive.on("error", (err) => {
-            return reject(new Error(`Failed to zip the source directory: ${err.message}`));
-        });
-        archive.pipe(output);
-        // Function to recursively add files and directories to the archive, excluding ignored paths
-        const addItemsToArchive = async (currentPath, archivePath) => {
-            const items = await fs.readdir(currentPath);
-            for (const item of items) {
-                const fullPath = path.join(currentPath, item);
-                const relativePath = path.relative(sourceDir, fullPath);
-                // Check if the path is ignored.
-                const isIgnored = ignoredPaths.some((ignoredPath) => fullPath === ignoredPath ||
-                    relativePath === ignoredPath ||
-                    fullPath === path.resolve(ignoredPath) ||
-                    relativePath.startsWith(ignoredPath + "/") ||
-                    relativePath.startsWith(ignoredPath + "\\"));
-                if (!isIgnored) {
-                    const stats = await fs.stat(fullPath);
-                    if (stats.isDirectory()) {
-                        await addItemsToArchive(fullPath, archivePath ? path.join(archivePath, item) : item);
-                    }
-                    else {
-                        archive.file(fullPath, { name: archivePath ? path.join(archivePath, item) : item });
-                    }
-                }
-            }
-        };
-        // Start adding items from the source directory
-        addItemsToArchive(sourceDir, false)
-            .then(() => {
-            archive.finalize();
-        })
-            .catch((err) => {
-            return reject(new Error(`Failed to add items to the zip created for source directory: ${err.message}`));
-        });
-    });
-}
-async function cleanUpGeneratedPortalFiles(sourceDir) {
-    const generatedPortalZipFilePath = path.join(sourceDir, ".generated_portal.zip");
-    const generatedPortalSourceZipFilePath = path.join(sourceDir, ".portal_source.zip");
-    if (fs.existsSync(generatedPortalZipFilePath)) {
-        await (0, exports.deleteFile)(generatedPortalZipFilePath);
-    }
-    if (fs.existsSync(generatedPortalSourceZipFilePath)) {
-        await (0, exports.deleteFile)(generatedPortalSourceZipFilePath);
-    }
-}
-function isPortInUse(port) {
-    return new Promise((resolve) => {
-        const server = net.createServer();
-        server.once("error", (err) => {
-            if (err.code === "EADDRINUSE") {
-                resolve(true);
-            }
-            else {
-                resolve(false);
-            }
-        });
-        server.once("listening", () => {
-            server.close();
-            resolve(false);
-        });
-        server.listen(port);
-    });
-}
-async function parseStreamBodyToJson(body) {
+export async function parseStreamBodyToJson(body) {
     var _a, e_1, _b, _c;
     const chunks = [];
     try {
-        for (var _d = true, body_1 = tslib_1.__asyncValues(body), body_1_1; body_1_1 = await body_1.next(), _a = body_1_1.done, !_a; _d = true) {
+        for (var _d = true, body_1 = __asyncValues(body), body_1_1; body_1_1 = await body_1.next(), _a = body_1_1.done, !_a; _d = true) {
             _c = body_1_1.value;
             _d = false;
             const chunk = _c;
@@ -359,32 +29,10 @@ async function parseStreamBodyToJson(body) {
     const text = Buffer.concat(chunks).toString("utf-8");
     return JSON.parse(text);
 }
-const getNonHiddenItemsFromDirectory = (directoryPath) => {
-    return fs.readdirSync(directoryPath).filter((item) => !item.startsWith("."));
-};
-exports.getNonHiddenItemsFromDirectory = getNonHiddenItemsFromDirectory;
-const getMessageInOrangeColor = (message) => {
-    return `\u001b[33m${message}\u001b[0m`;
-};
-exports.getMessageInOrangeColor = getMessageInOrangeColor;
-const getMessageInBlueColor = (message) => {
-    return `\u001b[34m${message}\u001b[0m`;
-};
-exports.getMessageInBlueColor = getMessageInBlueColor;
-const getMessageInCyanColor = (message) => {
-    return `\u001b[36m${message}\u001b[0m`;
-};
-exports.getMessageInCyanColor = getMessageInCyanColor;
-const getMessageInGreenColor = (message) => {
-    return `\u001b[32m${message}\u001b[0m`;
-};
-exports.getMessageInGreenColor = getMessageInGreenColor;
-const getMessageInMagentaColor = (message) => {
-    return `\u001b[35m${message}\u001b[0m`;
-};
-exports.getMessageInMagentaColor = getMessageInMagentaColor;
-const getMessageInRedColor = (message) => {
-    return `\u001b[31m${message}\u001b[0m`;
+export const toPascalCase = (str) => {
+    return str
+        .split(" ")
+        .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+        .join("");
 };
-exports.getMessageInRedColor = getMessageInRedColor;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;AAwQA,wCAwCC;AAED,gEA2DC;AAED,kEASC;AAED,kCAmBC;AAED,sDAOC;;AAtZD,2BAA2B;AAC3B,6BAA6B;AAC7B,+BAA+B;AAC/B,yBAAyB;AACzB,qCAAqC;AACrC,qCAAqC;AACrC,uCAAuC;AACvC,mCAAqC;AACrC,kCAAmC;AAK5B,MAAM,SAAS,GAAG,CAAC,MAA6B,EAAE,WAAmB,EAAE,EAAE;IAC9E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAE9D,MAAM;aACH,IAAI,CAAC,aAAa,CAAC;aACnB,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAEjG,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACtD,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9G,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAXW,QAAA,SAAS,aAWpB;AAEK,MAAM,mBAAmB,GAAG,KAAK,IAAI,EAAE;IAC5C,OAAO,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAFW,QAAA,mBAAmB,uBAE9B;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,UAAkB,EAAE,EAAE;IACzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,aAAa,UAAU,iBAAiB,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAC;AAC/B,CAAC,CAAC;AAbW,QAAA,cAAc,kBAazB;AAEK,MAAM,wBAAwB,GAAG,CAAC,kBAAwC,EAAU,EAAE;IAC3F,MAAM,4BAA4B,GAAmD;QACnF,qBAAqB,EAAE;YACrB,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,EAAE;SACb;KACF,CAAC;IAEF,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC9B,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,4BAA4B,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,kBAAkB,CAAC,QAAQ,EAAE,CAAC;QAChC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9C,4BAA4B,CAAC,qBAAqB,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,kBAAkB,CAAC,QAAQ,EAAE,CAAC;QAChC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9C,4BAA4B,CAAC,qBAAqB,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,4BAA4B,CAAC;AACtC,CAAC,CAAC;AA1BW,QAAA,wBAAwB,4BA0BnC;AAMF,MAAM,YAAY,GAA8B,MAAM,CAAC,OAAO,CAAC;IAC7D,qBAAqB,EAAE,6FAA6F;IACpH,IAAI,EAAE,qCAAqC;IAC3C,OAAO,EAAE,mDAAmD;IAC5D,iBAAiB,EAAE,uEAAuE;IAC1F,MAAM,EAAE,6DAA6D;CACtE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;IAC9B,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;IACjC,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAA+B,CAAC,CAAC;AAE7B,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,UAAU,GAAG,EAAE,EAAiB,EAAE;IACjF,MAAM,kBAAkB,GAAkB,EAAE,CAAC;IAE7C,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO,CAAC,sBAAsB;QAEnD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,qBAAqB,GAAG,IAAA,uBAAe,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAEtE,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAC3D,CAAC,CAAC,GAAG,IAAI,MAAM,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE;gBAC3D,CAAC,CAAC,IAAI,CAAC;YAET,kBAAkB,CAAC,UAAU,CAAC,GAAG,qBAAqB,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,kBAAkB,CAChB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,MAAM,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAC9G,GAAG,IAAI,CAAC;QACX,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AA3BW,QAAA,eAAe,mBA2B1B;AAEK,MAAM,UAAU,GAAG,CAAC,KAAa,EAAW,EAAE;IACnD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAE3B,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB;AAEK,MAAM,UAAU,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IACnD,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,MAAM,4BAA4B,GAAG,CAAC,MAA6B,EAAE,eAAuB,EAAE,EAAE;IACrG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,WAAW,GAAG,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzB,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAC3B,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AARW,QAAA,4BAA4B,gCAQvC;AAEK,MAAM,oBAAoB,GAAG,KAAK,EAAE,UAAkB,EAAkC,EAAE;IAC/F,oDAAoD;IACpD,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE/B,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAI,oBAAW,EAAE,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEhC,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAErC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEjC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B;AAEF;;;;;;GAMG;AACI,MAAM,YAAY,GAAG,KAAK,EAAE,UAAkB,EAAE,eAAuB,EAAmB,EAAE;IACjG,oDAAoD;IACpD,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErB,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAErC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA1BW,QAAA,YAAY,gBA0BvB;AAEK,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IAC5C,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC,CAAC;AAFW,QAAA,WAAW,eAEtB;AAEK,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;IAC7C,IAAI,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB;AAEK,MAAM,sBAAsB,GAAG,CAAC,mBAA2B,EAAE,qCAA6C,EAAY,EAAE;IAC7H,MAAM,0BAA0B,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;IACxF,MAAM,mCAAmC,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;IACpG,MAAM,kCAAkC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,qCAAqC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAE9H,OAAO,CAAC,0BAA0B,EAAE,kCAAkC,EAAE,mCAAmC,CAAC,CAAC;AAC/G,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC;AAEK,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE;IACtD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAFW,QAAA,mBAAmB,uBAE9B;AAEK,MAAM,uBAAuB,GAAG,CACrC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAsB,EAClD,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAW,EAC7B,EAAE;IACF,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAC1B,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAC1B,MAAM,WAAW,GAAW,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEpD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,GAAG,CAAC,SAAS,IAAA,mBAAW,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AAjBW,QAAA,uBAAuB,2BAiBlC;AAEF;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAAC,WAAmB,EAAE,cAAsB;IAC9E,MAAM,YAAY,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;IAEvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC;YACpC,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;YACpC,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC3B,SAAS,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;gBAEpC,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACvD,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;oBACvE,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,oCAAoC,cAAc,EAAE,CAAC,CAAC,CAAC;gBACjF,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,SAAS,GAAG,YAAY,EAAE,CAAC;gBAC7B,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,IAAA,4BAAoB,EAAC,gDAAgD,CAAC,CAAC,CAAC,CAAC;YACnG,CAAC;YAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnC,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,CAAC;YAED,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;gBAEnE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;oBAC3D,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC,CAAC;gBAC3E,CAAC;gBAED,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,OAAO,EAAE,CAAC;QACZ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAC,CAAC;QACnE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,SAAiB,EACjB,UAAkB,EAClB,eAAyB,EAAE;IAE3B,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE;QAC9B,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;KACnB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErB,4FAA4F;QAC5F,MAAM,iBAAiB,GAAG,KAAK,EAAE,WAAmB,EAAE,WAA2B,EAAE,EAAE;YACnF,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAExD,gCAAgC;gBAChC,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CACjC,CAAC,WAAW,EAAE,EAAE,CACd,QAAQ,KAAK,WAAW;oBACxB,YAAY,KAAK,WAAW;oBAC5B,QAAQ,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;oBACtC,YAAY,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,CAAC;oBAC1C,YAAY,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,CAC9C,CAAC;gBAEF,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACtC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;wBACxB,MAAM,iBAAiB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACvF,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;oBACtF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,+CAA+C;QAC/C,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC;aAChC,IAAI,CAAC,GAAG,EAAE;YACT,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,gEAAgE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC1G,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,2BAA2B,CAAC,SAAiB;IACjE,MAAM,0BAA0B,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;IACjF,MAAM,gCAAgC,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IACpF,IAAI,EAAE,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAA,kBAAU,EAAC,0BAA0B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,EAAE,CAAC,UAAU,CAAC,gCAAgC,CAAC,EAAE,CAAC;QACpD,MAAM,IAAA,kBAAU,EAAC,gCAAgC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,IAAY;IACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAElC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;YAChC,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC5B,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,qBAAqB,CAAC,IAA2B;;IACnE,MAAM,MAAM,GAAa,EAAE,CAAC;;QAC5B,KAA0B,eAAA,SAAA,sBAAA,IAAI,CAAA,UAAA,sEAAE,CAAC;YAAP,oBAAI;YAAJ,WAAI;YAAnB,MAAM,KAAK,KAAA,CAAA;YACpB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,CAAC;;;;;;;;;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAEM,MAAM,8BAA8B,GAAG,CAAC,aAAqB,EAAY,EAAE;IAChF,OAAO,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AAFW,QAAA,8BAA8B,kCAEzC;AAEK,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,EAAE;IACzD,OAAO,aAAa,OAAO,WAAW,CAAC;AACzC,CAAC,CAAC;AAFW,QAAA,uBAAuB,2BAElC;AAEK,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAE,EAAE;IACvD,OAAO,aAAa,OAAO,WAAW,CAAC;AACzC,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAE,EAAE;IACvD,OAAO,aAAa,OAAO,WAAW,CAAC;AACzC,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,EAAE;IACxD,OAAO,aAAa,OAAO,WAAW,CAAC;AACzC,CAAC,CAAC;AAFW,QAAA,sBAAsB,0BAEjC;AAEK,MAAM,wBAAwB,GAAG,CAAC,OAAe,EAAE,EAAE;IAC1D,OAAO,aAAa,OAAO,WAAW,CAAC;AACzC,CAAC,CAAC;AAFW,QAAA,wBAAwB,4BAEnC;AAEK,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,EAAE;IACtD,OAAO,aAAa,OAAO,WAAW,CAAC;AACzC,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B"}
+//# sourceMappingURL=utils.js.map

package/lib/utils/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IAC5C,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE;IACtD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAA2B;;IACrE,MAAM,MAAM,GAAa,EAAE,CAAC;;QAC5B,KAA0B,eAAA,SAAA,cAAA,IAAI,CAAA,UAAA,sEAAE,CAAC;YAAP,oBAAI;YAAJ,WAAI;YAAnB,MAAM,KAAK,KAAA,CAAA;YACpB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,CAAC;;;;;;;;;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAClD,OAAO,GAAG;SACP,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SACzE,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC"}

package/package.json

@@ -1,12 +1,15 @@
 {
     "name": "@apimatic/cli",
     "description": "The official CLI for APIMatic.",
-    "version": "1.1.0-alpha.9",
+    "version": "1.1.0-beta.10",
     "author": "APIMatic",
     "bin": {
-        "apimatic": "./bin/run"
+        "apimatic": "./bin/run.js"
+    },
+    "bugs": {
+        "url": "https://github.com/apimatic/apimatic-cli/issues",
+        "email": "support@apimatic.io"
     },
-    "bugs": "https://github.com/apimatic/apimatic-cli/issues",
     "publishConfig": {
         "access": "public"
     },
@@ -14,13 +17,13 @@
         "node": ">=20.0.0"
     },
     "files": [
-        "/bin",
-        "/lib",
+        "./bin",
+        "./lib",
         "/npm-shrinkwrap.json",
         "/oclif.manifest.json"
     ],
     "repository": "git://github.com/apimatic/apimatic-cli.git",
-    "homepage": "https://github.com/apimatic/apimatic-cli",
+    "homepage": "https://docs.apimatic.io/apimatic-cli/intro-and-install/",
     "keywords": [
         "apimatic",
         "cli",
@@ -30,60 +33,68 @@
         "automation"
     ],
     "license": "MIT",
+    "type": "module",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
         "build": "tsc -b",
         "postpack": "rimraf oclif.manifest.json",
-        "posttest": "eslint . --ext .ts --config .eslintrc",
-        "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
+        "posttest": "eslint . --ext .ts",
         "prettier": "prettier \"src/**/*.{js,ts}\"",
         "format": "prettier --write \"src/**/*.{js,ts}\"",
         "lint": "eslint \"src/**/*.{js,ts}\"",
-        "lint:fix": "eslint --fix \"src/**/*.{js,ts}\" --quiet"
+        "lint:fix": "eslint --fix \"src/**/*.{js,ts}\" --quiet",
+        "test": "tsx node_modules/mocha/bin/_mocha --forbid-only \"test/**/*.test.ts\" --timeout 99999"
     },
     "dependencies": {
-        "@apimatic/sdk": "^0.2.0-alpha.1",
-        "@clack/prompts": "^0.11.0",
+        "@apimatic/sdk": "^0.2.0-alpha.7",
+        "@clack/prompts": "1.0.0-alpha.1",
         "@oclif/core": "^4.2.8",
         "@oclif/plugin-autocomplete": "^3.2.24",
         "@oclif/plugin-help": "^6.2.26",
-        "@oclif/plugin-not-found": "^3.2.44",
-        "adm-zip": "^0.5.14",
         "archiver": "^7.0.1",
+        "async-mutex": "^0.5.0",
         "axios": "^1.8.1",
-        "base-64": "^1.0.0",
         "chokidar": "^3.6.0",
         "connect-livereload": "^0.6.1",
+        "execa": "^9.6.0",
         "express": "^4.17.1",
-        "file-type": "^15.0.0",
+        "extract-zip": "^2.0.1",
+        "fast-levenshtein": "^3.0.0",
         "form-data": "^4.0.2",
         "fs-extra": "^11.3.0",
+        "get-port": "^7.1.0",
+        "is-in-ci": "^2.0.0",
         "livereload": "^0.9.3",
+        "neverthrow": "^8.2.0",
         "open": "^8.4.0",
-        "simple-git": "^3.27.0",
+        "prettier": "^2.8.8",
         "striptags": "^3.2.0",
-        "treeify": "^1.1.0",
-        "tslib": "^2.5.0",
-        "unzipper": "^0.12.3",
+        "tmp-promise": "^3.0.3",
+        "tslib": "^2.8.1",
+        "uuid": "^11.1.0",
         "yaml": "^2.8.0"
     },
     "devDependencies": {
         "@commitlint/cli": "^15.0.0",
         "@commitlint/config-conventional": "^15.0.0",
+        "@eslint/js": "^9.34.0",
         "@oclif/test": "^4.1.13",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
-        "@types/adm-zip": "^0.5.5",
-        "@types/archiver": "^5.1.1",
+        "@types/archiver": "^5.3.4",
         "@types/base-64": "^1.0.0",
         "@types/chai": "^4.3.20",
-        "@types/connect-livereload": "^0.5.1",
-        "@types/express": "^4.17.13",
+        "@types/connect-livereload": "^0.5.32",
+        "@types/express": "^4.17.23",
+        "@types/fast-levenshtein": "^0.0.4",
         "@types/fs-extra": "^9.0.13",
-        "@types/livereload": "^0.9.2",
+        "@types/livereload": "^0.9.5",
         "@types/mocha": "^5.2.7",
+        "@types/mock-fs": "^4.13.4",
         "@types/node": "^20.17.50",
+        "@types/prettier": "^2.7.3",
+        "@types/sinon": "^17.0.4",
         "@types/treeify": "^1.0.3",
         "@types/unzipper": "^0.10.4",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -94,24 +105,28 @@
         "eslint-plugin-import": "^2.25.2",
         "husky": "^7.0.4",
         "lint-staged": "^11.2.6",
-        "mocha": "^11.5.0",
+        "mocha": "^11.7.1",
+        "mock-fs": "^5.5.0",
         "nock": "^14.0.4",
         "nyc": "^17.1.0",
         "oclif": "^4.17.34",
-        "prettier": "^2.4.1",
         "rimraf": "^6.0.1",
-        "tmp-promise": "^3.0.3",
-        "ts-node": "^8.10.2",
+        "sinon": "^21.0.0",
+        "ts-node": "^10.9.2",
+        "tsx": "^4.20.3",
         "typescript": "^5.2.2"
     },
     "oclif": {
         "commands": "./lib/commands",
+        "dirname": "apimatic",
         "bin": "apimatic",
         "description": "The official CLI for APIMatic. \nTo get started with APIMatic's CLI using a step by step wizard, run 'apimatic portal:quickstart'.",
+        "hooks": {
+            "command_not_found": "./lib/hooks/not-found"
+        },
         "plugins": [
             "@oclif/plugin-autocomplete",
-            "@oclif/plugin-help",
-            "@oclif/plugin-not-found"
+            "@oclif/plugin-help"
         ],
         "topics": {
             "api": {
@@ -125,9 +140,13 @@
             },
             "sdk": {
                 "description": "Generate SDKs for your APIs in multiple languages."
+            },
+            "portal:toc": {
+                "description": "Generate a Table of Contents (TOC) file for your API documentation portal."
             }
         },
-        "state": "Alpha"
+        "topicSeparator": " ",
+        "state": "beta"
     },
     "lint-staged": {
         "*.js": "eslint --cache --fix",

package/bin/run

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable no-undef */
-/* eslint-disable @typescript-eslint/no-var-requires */
-
-const { run, flush, handle } = require("@oclif/core");
-
-run()
-  .then(flush)
-  .catch(handle);

package/lib/application/portal/toc/sdl-parser.d.ts

@@ -1,13 +0,0 @@
-import { PortalService } from "../../../infrastructure/services/portal-service";
-import { TocEndpoint, TocModel } from "../../../types/toc/toc";
-import { Result } from "../../../types/common/result";
-export declare class SdlParser {
-    private readonly portalService;
-    constructor(portalService: PortalService);
-    getTocComponentsFromSdl(specFolderPath: string, workingDirectory: string, configDir: string): Promise<Result<{
-        endpointGroups: Map<string, TocEndpoint[]>;
-        models: TocModel[];
-    }, string>>;
-    private extractEndpointGroups;
-    private extractModels;
-}