skir 1.2.3 → 1.2.5

package/dist/formatter.js

@@ -1,338 +0,0 @@
-import { formatImportBlock } from "./import_block_formatter.js";
-import { parseModule } from "./parser.js";
-import { tokenizeModule } from "./tokenizer.js";
-/**
- * Formats the given module and returns the new source code.
- * Preserves token ordering.
- */
-export function formatModule(sourceCode, modulePath, randomGenerator = Math.random) {
-    const makeErroredResult = (errors) => ({
-        newSourceCode: sourceCode,
-        textEdits: [],
-        errors: errors,
-    });
-    const moduleTokens = tokenizeModule(sourceCode, modulePath);
-    if (moduleTokens.errors.length > 0) {
-        return makeErroredResult(moduleTokens.errors);
-    }
-    const module = parseModule(moduleTokens.result, "lenient");
-    if (module.errors.length > 0) {
-        return makeErroredResult(module.errors);
-    }
-    const blocks = getBlocks(moduleTokens.result, module.result);
-    const context = {
-        context: null,
-        indentStack: [{ indent: "" }],
-    };
-    let newSourceCode = "";
-    const textEdits = [];
-    let lastNonCommentToken = "";
-    const appendBlock = (block) => {
-        if (block.kind === "import-block") {
-            if (block.newBlock !== block.oldBlock) {
-                textEdits.push({
-                    oldStart: block.oldRange.start,
-                    oldEnd: block.oldRange.end,
-                    newText: block.newBlock,
-                });
-            }
-            newSourceCode += block.newBlock;
-        }
-        else {
-            const { token } = block;
-            const newToken = normalizeToken(token.text, lastNonCommentToken, randomGenerator);
-            if (newToken !== token.text) {
-                textEdits.push({
-                    oldStart: token.position,
-                    oldEnd: token.position + token.text.length,
-                    newText: newToken,
-                });
-            }
-            if (!isComment(token)) {
-                lastNonCommentToken = token.text;
-            }
-            newSourceCode += newToken;
-        }
-    };
-    {
-        const firstBlock = blocks[0];
-        const firstBlockStart = getStartPosition(firstBlock);
-        if (firstBlockStart > 0) {
-            textEdits.push({
-                oldStart: 0,
-                oldEnd: firstBlockStart,
-                newText: "",
-            });
-        }
-        appendBlock(firstBlock);
-    }
-    for (let i = 1; i < blocks.length; i++) {
-        const block = blocks[i - 1];
-        const next = blocks[i];
-        // Find the next non-comment block
-        let nextNonComment = next;
-        for (let j = i; j < blocks.length; j++) {
-            const block = blocks[j];
-            if (!blockIsComment(block)) {
-                nextNonComment = block;
-                break;
-            }
-        }
-        // Determine the text to add after 'block' and before 'next': a possible
-        // trailing comma followed by whitespace.
-        let newSeparator = shouldAddTrailingComma(block, nextNonComment, context)
-            ? ","
-            : "";
-        newSeparator += getWhitespaceAfterBlock(block, next, nextNonComment, context);
-        const topOfStack = context.indentStack.at(-1);
-        if (newSeparator.endsWith("\n")) {
-            newSeparator = newSeparator + topOfStack.indent;
-        }
-        const oldSeparator = sourceCode.slice(getEndPosition(block), getStartPosition(next));
-        if (oldSeparator !== newSeparator) {
-            textEdits.push({
-                oldStart: getEndPosition(block),
-                oldEnd: getStartPosition(next),
-                newText: newSeparator,
-            });
-        }
-        newSourceCode += newSeparator;
-        appendBlock(next);
-    }
-    return {
-        newSourceCode: newSourceCode,
-        textEdits: textEdits,
-        errors: [],
-    };
-}
-function getBlocks(moduleTokens, module) {
-    const blocks = moduleTokens.tokensWithComments.map((t) => ({ kind: "token", token: t }));
-    const { importBlockRange } = module;
-    if (!importBlockRange) {
-        // No import block.
-        return blocks;
-    }
-    const importBlock = {
-        kind: "import-block",
-        newBlock: formatImportBlock(module.pathToImportedNames),
-        oldBlock: module.sourceCode.slice(importBlockRange.start, importBlockRange.end),
-        oldRange: importBlockRange,
-    };
-    // Index of the first token in the import block.
-    const importTokenIndex = blocks.findIndex((t) => t.kind === "token" && t.token.position >= importBlockRange.start);
-    // Number of tokens in the import block.
-    const importTokenCount = blocks
-        .slice(importTokenIndex)
-        .findIndex((t) => t.kind === "token" && t.token.position >= importBlockRange.end);
-    // Replace the tokens in the import block with a single "import-block" block.
-    blocks.splice(importTokenIndex, importTokenCount, importBlock);
-    return blocks;
-}
-function getWhitespaceAfterBlock(block, nextBlock, 
-// If 'next' is a comment, the next non-comment block after 'next'.
-// Otherwise, 'next' itself.
-nextNonComment, context) {
-    if (block.kind === "import-block" || nextBlock.kind === "import-block") {
-        return "\n\n";
-    }
-    const token = block.token;
-    const next = nextBlock.token;
-    const topOfStack = () => context.indentStack.at(-1);
-    const indentUnit = "  ";
-    if (token.text === "{" ||
-        token.text === "{|" ||
-        (context.context === "in-value" && token.text === "[")) {
-        context.indentStack.push({
-            indent: topOfStack().indent + indentUnit,
-        });
-    }
-    else if (token.text === "(" && !isNumberOrQuestionMark(nextNonComment)) {
-        context.indentStack.push({
-            indent: topOfStack().indent + indentUnit,
-            methodRequest: true,
-        });
-    }
-    let dedent;
-    if (next.text === "}" ||
-        next.text === "|}" ||
-        (context.context === "in-value" && next.text === "]") ||
-        (next.text === ")" && topOfStack().methodRequest)) {
-        context.indentStack.pop();
-        dedent = true;
-    }
-    // Reset context when we encounter a semicolon, even if the next token is a
-    // comment. Without this, the "in-value" context from a const declaration
-    // leaks past comments and into subsequent declarations, causing spurious
-    // trailing commas.
-    if (token.text === ";") {
-        context.context = null;
-    }
-    if (isComment(token)) {
-        return oneOrTwoLineBreaks(token, next);
-    }
-    else if (token.text !== "{" &&
-        next.text === "}" &&
-        context.context !== "in-value") {
-        return "\n";
-    }
-    else if (next.text === ")" && dedent) {
-        return "\n";
-    }
-    else if (isComment(next)) {
-        return token.line.lineNumber === next.line.lineNumber
-            ? "  "
-            : oneOrTwoLineBreaks(token, next);
-    }
-    else if (next.text === "=") {
-        return " ";
-    }
-    else if ((token.text === "[" && next.text === "]") ||
-        (token.text === "{" && next.text === "}") ||
-        (token.text === "{|" && next.text === "|}")) {
-        return "";
-    }
-    else if (["{", "{|"].includes(token.text)) {
-        return "\n";
-    }
-    else if (token.text === "[") {
-        return context.context === "in-value" ? "\n" : "";
-    }
-    else if (["*", ":"].includes(token.text)) {
-        return " ";
-    }
-    else if (token.text === "(") {
-        return isNumberOrQuestionMark(nextNonComment) ? "" : "\n";
-    }
-    else if (token.text === ")") {
-        return next.text === "{" ? " " : "";
-    }
-    else if (token.text === ";") {
-        return oneOrTwoLineBreaks(token, next);
-    }
-    else if (token.text === "}") {
-        return [",", ";"].includes(next.text)
-            ? ""
-            : oneOrTwoLineBreaks(token, next);
-    }
-    else if (token.text === ",") {
-        return context.context === "removed" || context.context === "import"
-            ? " "
-            : "\n";
-    }
-    else if (token.text === "=") {
-        if (context.context === "const") {
-            context.context = "in-value";
-        }
-        return " ";
-    }
-    else if (token.text === "const") {
-        context.context = "const";
-        return " ";
-    }
-    else if (token.text === "removed") {
-        context.context = "removed";
-        return next.text === ";" ? "" : " ";
-    }
-    else if (token.text === "import") {
-        context.context = "import";
-        return " ";
-    }
-    else if (context.context === "in-value" &&
-        ["]", "}", "|}"].includes(next.text)) {
-        return "\n";
-    }
-    else if (/^[A-Za-z]/.test(token.text) &&
-        !["(", ":", ",", ";", "|", ".", ")", "]", "?"].includes(next.text)) {
-        return " ";
-    }
-    else {
-        return "";
-    }
-}
-function shouldAddTrailingComma(first, nextNonComment, context) {
-    return (first.kind !== "import-block" &&
-        nextNonComment.kind !== "import-block" &&
-        context.context === "in-value" &&
-        ["]", "}", "|}"].includes(nextNonComment.token.text) &&
-        !["[", "{", "{|", ","].includes(first.token.text));
-}
-function oneOrTwoLineBreaks(first, second) {
-    const firstLineNumber = first.line.lineNumber + first.text.split("\n").length - 1;
-    if (firstLineNumber < second.line.lineNumber - 1 &&
-        (isComment(second) || /^[A-Za-z]/.test(second.text))) {
-        return "\n\n";
-    }
-    else {
-        return "\n";
-    }
-}
-function isComment(token) {
-    return token.text.startsWith("//") || token.text.startsWith("/*");
-}
-function blockIsComment(block) {
-    return block.kind === "token" && isComment(block.token);
-}
-function isNumberOrQuestionMark(block) {
-    return block.kind === "token" && /^[?0-9]/.test(block.token.text);
-}
-function getStartPosition(block) {
-    if (block.kind === "import-block") {
-        return block.oldRange.start;
-    }
-    else {
-        return block.token.position;
-    }
-}
-function getEndPosition(block) {
-    if (block.kind === "import-block") {
-        return block.oldRange.end;
-    }
-    else {
-        const { token } = block;
-        return token.position + token.text.length;
-    }
-}
-function normalizeToken(token, lastNonCommentToken, randomGenerator) {
-    if (token.startsWith("//")) {
-        // Make sure there is a space between the double slash and the comment text.
-        if (token.startsWith("// ") ||
-            token.startsWith("/// ") ||
-            token === "//" ||
-            token === "///") {
-            return token;
-        }
-        else if (token.startsWith("///")) {
-            return "/// " + token.slice(3);
-        }
-        else {
-            return "// " + token.slice(2);
-        }
-    }
-    else if (token.startsWith("'")) {
-        // A single-quoted string
-        if (token.includes('"')) {
-            // Remove escape characters before single quotes.
-            return token.replace(/\\(?=(?:\\\\)*')/g, "");
-        }
-        else {
-            // If the string does not contain double quotes, turn it into a
-            // double-quoted string for consistency
-            const content = token.slice(1, -1);
-            // Remove escape characters before double quotes.
-            return '"' + content.replace(/\\(?=(?:\\\\)*")/g, "") + '"';
-        }
-    }
-    else if (token.startsWith('"')) {
-        // A double-quoted string
-        // Remove escape characters before double quotes.
-        return token.replace(/\\(?=(?:\\\\)*')/g, "");
-    }
-    else if (token === "?" && ["=", "("].includes(lastNonCommentToken)) {
-        const randomNumber = Math.floor(randomGenerator() * 1000000);
-        return String(randomNumber);
-    }
-    else {
-        return token;
-    }
-}
-//# sourceMappingURL=formatter.js.map

package/dist/formatter.js.map

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

package/dist/get_dependencies_flow.d.ts

@@ -1,40 +0,0 @@
-import type { Record } from "skir-internal";
-import { ModuleSet } from "./module_set.js";
-import type { DependenciesResult, DependencyError, PackageDownloader, PackageIdToVersion, Packages } from "./package_types.js";
-export declare class GetDependenciesFlow {
-    private readonly cachedPackages;
-    private readonly githubToken;
-    private readonly packageDownloader;
-    private readonly packageBundles;
-    private readonly dependencyChain;
-    private readonly errors;
-    private allDependenciesOnDisk;
-    constructor(cachedPackages: Packages, githubToken: string | undefined, packageDownloader: PackageDownloader);
-    run(dependencies: PackageIdToVersion): Promise<DependenciesResult>;
-    private getDependency;
-    private getCachedPackage;
-}
-/**
- * Resolves a GitHub blob URL to the first record declared at the referenced line.
- *
- * Expected URL shape:
- *   https://github.com/<owner>/<repo>/blob/<version>/skir-src/<path>.skir#L<line>
- *
- * Returns:
- * - `{ kind: "success", record, moduleSet }` when a record is found.
- * - `{ kind: "error", message }` for invalid URLs, dependency download issues,
- *   compilation failures, missing modules, or when no record starts at the line.
- */
-export declare function getModuleFromGithubUrl(githubUrl: string, githubToken: string | undefined, packageDownloader?: PackageDownloader): Promise<{
-    kind: "success";
-    record: Record;
-    moduleSet: ModuleSet;
-} | DependencyError>;
-export declare function parseGithubModuleUrl(githubUrl: string): {
-    kind: "success";
-    packageId: string;
-    version: string;
-    modulePath: string;
-    lineNumber: number;
-} | DependencyError;
-//# sourceMappingURL=get_dependencies_flow.d.ts.map

package/dist/get_dependencies_flow.js

@@ -1,177 +0,0 @@
-import { ModuleSet } from "./module_set.js";
-import { downloadPackage } from "./package_downloader.js";
-export class GetDependenciesFlow {
-    constructor(cachedPackages, githubToken, packageDownloader) {
-        this.cachedPackages = cachedPackages;
-        this.githubToken = githubToken;
-        this.packageDownloader = packageDownloader;
-        this.packageBundles = {};
-        this.dependencyChain = [];
-        this.errors = [];
-        this.allDependenciesOnDisk = true;
-    }
-    async run(dependencies) {
-        for (const [packageId, version] of Object.entries(dependencies)) {
-            await this.getDependency(packageId, version);
-            if (this.errors.length > 0) {
-                return this.errors[0];
-            }
-        }
-        const changed = !(this.allDependenciesOnDisk &&
-            Object.keys(dependencies).length ===
-                Object.keys(this.cachedPackages).length);
-        return {
-            kind: "success",
-            packages: Object.fromEntries(Object.entries(this.packageBundles).map(([packageId, bundle]) => [
-                packageId,
-                bundle.pkg,
-            ])),
-            changed: changed,
-        };
-    }
-    async getDependency(packageId, version) {
-        this.dependencyChain.push({ packageId, version });
-        try {
-            const presentPackage = this.packageBundles[packageId];
-            if (presentPackage?.pkg.version === version) {
-                return;
-            }
-            else if (presentPackage) {
-                this.errors.push({
-                    kind: "error",
-                    message: [
-                        `Version conflict for package ${packageId}:`,
-                        `- ${formatDependencyChain(this.dependencyChain)}`,
-                        `- ${formatDependencyChain(presentPackage.dependencyChain)}`,
-                    ].join("\n"),
-                });
-                return;
-            }
-            let pkg = this.getCachedPackage(packageId, version);
-            if (!pkg) {
-                this.allDependenciesOnDisk = false;
-                const downloadResult = await this.packageDownloader(packageId, version, this.githubToken);
-                if (downloadResult.kind === "success") {
-                    pkg = downloadResult.package;
-                }
-                else {
-                    this.errors.push(downloadResult);
-                    return;
-                }
-            }
-            this.packageBundles[packageId] = {
-                pkg: pkg,
-                dependencyChain: [...this.dependencyChain],
-            };
-            for (const [depId, depVersion] of Object.entries(pkg.dependencies)) {
-                await this.getDependency(depId, depVersion);
-            }
-        }
-        finally {
-            this.dependencyChain.pop();
-        }
-    }
-    getCachedPackage(packageId, version) {
-        const pkg = this.cachedPackages[packageId];
-        return pkg?.version === version ? pkg : undefined;
-    }
-}
-function formatDependencyChain(chain) {
-    return ("main depends on " +
-        chain
-            .map((item) => `${item.packageId}:${item.version}`)
-            .join(" which depends on "));
-}
-/**
- * Resolves a GitHub blob URL to the first record declared at the referenced line.
- *
- * Expected URL shape:
- *   https://github.com/<owner>/<repo>/blob/<version>/skir-src/<path>.skir#L<line>
- *
- * Returns:
- * - `{ kind: "success", record, moduleSet }` when a record is found.
- * - `{ kind: "error", message }` for invalid URLs, dependency download issues,
- *   compilation failures, missing modules, or when no record starts at the line.
- */
-export async function getModuleFromGithubUrl(githubUrl, githubToken, packageDownloader = downloadPackage) {
-    const parsedUrl = parseGithubModuleUrl(githubUrl);
-    if (parsedUrl.kind === "error") {
-        return parsedUrl;
-    }
-    const { packageId, version, modulePath, lineNumber } = parsedUrl;
-    const flow = new GetDependenciesFlow({}, githubToken, packageDownloader);
-    const dependenciesResult = await flow.run({
-        [packageId]: version,
-    });
-    if (dependenciesResult.kind === "error") {
-        return dependenciesResult;
-    }
-    const modulePathToContent = new Map();
-    for (const pkg of Object.values(dependenciesResult.packages)) {
-        for (const [path, content] of Object.entries(pkg.modules)) {
-            modulePathToContent.set(path, content);
-        }
-    }
-    const moduleSet = ModuleSet.compile(modulePathToContent);
-    if (moduleSet.errors.length > 0) {
-        return {
-            kind: "error",
-            message: moduleSet.errors[0].message || "Compilation failed",
-        };
-    }
-    const moduleResult = moduleSet.modules.get(modulePath);
-    if (!moduleResult) {
-        return {
-            kind: "error",
-            message: `Module not found: ${modulePath}`,
-        };
-    }
-    const recordAtLine = moduleResult.result.records.find((record) => record.record.name.line.lineNumber === lineNumber);
-    if (!recordAtLine) {
-        return {
-            kind: "error",
-            message: `No record found at line ${lineNumber + 1} in ${modulePath}`,
-        };
-    }
-    return {
-        kind: "success",
-        record: recordAtLine.record,
-        moduleSet,
-    };
-}
-export function parseGithubModuleUrl(githubUrl) {
-    const match = githubUrl.match(/^https:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+)#L(\d+)$/);
-    if (!match) {
-        return {
-            kind: "error",
-            message: `Invalid GitHub URL: ${githubUrl}`,
-        };
-    }
-    const owner = match[1];
-    const repo = match[2];
-    const version = match[3];
-    const repoPath = match[4];
-    const lineNumberOneBased = Number(match[5]);
-    if (!repoPath.startsWith("skir-src/") || !repoPath.endsWith(".skir")) {
-        return {
-            kind: "error",
-            message: `URL must target a .skir file in skir-src: ${githubUrl}`,
-        };
-    }
-    if (!Number.isInteger(lineNumberOneBased) || lineNumberOneBased <= 0) {
-        return {
-            kind: "error",
-            message: `Invalid line number in URL: ${githubUrl}`,
-        };
-    }
-    const packageId = `@${owner}/${repo}`;
-    const modulePath = packageId + repoPath.substring("skir-src".length);
-    return {
-        kind: "success",
-        packageId,
-        version,
-        modulePath,
-        lineNumber: lineNumberOneBased - 1,
-    };
-}
-//# sourceMappingURL=get_dependencies_flow.js.map

package/dist/get_dependencies_flow.js.map

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

package/dist/import_block_formatter.d.ts

@@ -1,3 +0,0 @@
-import { PathToImportedNames } from "skir-internal";
-export declare function formatImportBlock(pathToImportedNames: Readonly<PathToImportedNames>): string;
-//# sourceMappingURL=import_block_formatter.d.ts.map

package/dist/import_block_formatter.js

@@ -1,36 +0,0 @@
-export function formatImportBlock(pathToImportedNames) {
-    const formatImport = (import_) => {
-        const [path, names] = import_;
-        const quotedPath = JSON.stringify(path);
-        if (names.kind === "all") {
-            return `import * as ${names.alias} from ${quotedPath};`;
-        }
-        else if (names.names.size <= 0) {
-            return "";
-        }
-        else if (names.names.size === 1) {
-            const name = [...names.names][0];
-            return `import { ${name} } from ${quotedPath};`;
-        }
-        else {
-            const nameLines = [...names.names].sort().map((name) => `  ${name},\n`);
-            return `import {\n${nameLines.join("")}} from ${quotedPath};`;
-        }
-    };
-    const formatImports = (imports) => {
-        imports.sort(([pathA], [pathB]) => pathA.localeCompare(pathB, "en-US"));
-        return imports
-            .map(formatImport)
-            .filter((it) => it)
-            .join("\n");
-    };
-    const imports = Object.entries(pathToImportedNames);
-    return [
-        imports.filter(([path, _]) => path.startsWith("@")),
-        imports.filter(([path, _]) => !path.startsWith("@")),
-    ]
-        .map(formatImports)
-        .filter((it) => it)
-        .join("\n\n");
-}
-//# sourceMappingURL=import_block_formatter.js.map

package/dist/import_block_formatter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"import_block_formatter.js","sourceRoot":"","sources":["../src/import_block_formatter.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAC/B,mBAAkD;IAElD,MAAM,YAAY,GAAG,CAAC,OAAgC,EAAU,EAAE;QAChE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACzB,OAAO,eAAe,KAAK,CAAC,KAAK,SAAS,UAAU,GAAG,CAAC;QAC1D,CAAC;aAAM,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,CAAC;QACZ,CAAC;aAAM,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACjC,OAAO,YAAY,IAAI,WAAW,UAAU,GAAG,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;YACxE,OAAO,aAAa,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,UAAU,GAAG,CAAC;QAChE,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,OAAuC,EAAU,EAAE;QACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,OAAO,OAAO;aACX,GAAG,CAAC,YAAY,CAAC;aACjB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;aAClB,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEpD,OAAO;QACL,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KACrD;SACE,GAAG,CAAC,aAAa,CAAC;SAClB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;SAClB,IAAI,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC"}

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}

package/dist/index.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.js.map

package/dist/index.js.map

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