@mojir/lits 1.2.2-alpha.6 → 1.3.0

package/dist/cli/cli.js

@@ -92,7 +92,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "1.2.2-alpha.6";
+var version = "1.3.0";
 
 var AstNodeType;
 (function (AstNodeType) {
@@ -7450,11 +7450,9 @@ function getSugar() {
     return [applyCollectionAccessors];
 }
 
-var identifierCharacterClass = '[\\w@%^?=!$<>+*/:-]';
-var identifierFirstCharacterClass = '[a-zA-Z_@%^?=!$<>+*/-]';
-
 var NO_MATCH = [0, undefined];
-var nameRegExp$1 = new RegExp(identifierCharacterClass);
+var nameCharacters = '[\\w@%^?=!$<>+*/-]';
+var nameRegExp$1 = new RegExp(nameCharacters);
 var whitespaceRegExp = /\s|,/;
 var newLineRegExp = /\n/;
 var tokenizeNewLine = function (input, current, debugData) {
@@ -8021,575 +8019,6 @@ function assertNewLineToken(token) {
         throw new LitsError("Expected newline token, got ".concat(token === null || token === void 0 ? void 0 : token.t, "."));
 }
 
-function transformTokens(tokenStram, transformer) {
-    return __assign(__assign({}, tokenStram), { tokens: tokenStram.tokens.map(function (token) {
-            return __assign(__assign({}, token), { v: transformer(token.v) });
-        }) });
-}
-
-var UnparseOptions = /** @class */ (function () {
-    function UnparseOptions(unparse, lineLength, col, inlined, locked) {
-        if (col === void 0) { col = 0; }
-        if (inlined === void 0) { inlined = false; }
-        if (locked === void 0) { locked = false; }
-        this.unparse = unparse;
-        this.lineLength = lineLength;
-        this.col = col;
-        this.inlined = inlined;
-        this.locked = locked;
-        this.indent = ' '.repeat(col);
-    }
-    UnparseOptions.prototype.inc = function (count) {
-        if (count === void 0) { count = 1; }
-        return new UnparseOptions(this.unparse, this.lineLength, this.col + count, this.inlined, this.locked);
-    };
-    UnparseOptions.prototype.inline = function () {
-        return new UnparseOptions(this.unparse, this.lineLength, this.col, true, this.locked);
-    };
-    UnparseOptions.prototype.noInline = function () {
-        return new UnparseOptions(this.unparse, this.lineLength, this.col, false, this.locked);
-    };
-    UnparseOptions.prototype.lock = function () {
-        return new UnparseOptions(this.unparse, this.lineLength, this.col, this.inlined, true);
-    };
-    UnparseOptions.prototype.assertNotOverflown = function (value) {
-        var _this = this;
-        value.split('\n').forEach(function (line, index) {
-            var fullLine = (index === 0 && _this.inlined) ? _this.indent + line : line;
-            var length = fullLine.length;
-            if (length > _this.lineLength)
-                throw new Error("Line length exceeded ".concat(_this.lineLength, " chars, value: \"").concat(fullLine, "\" (").concat(fullLine.length, " chars)"));
-        });
-        return value;
-    };
-    return UnparseOptions;
-}());
-
-function ensureNewlineSeparator(a, b) {
-    return !a || !b || a.endsWith('\n') || b.startsWith('\n') ? "".concat(a).concat(b) : "".concat(a, "\n").concat(b);
-}
-function ensureSpaceSeparator(a, b) {
-    return !a || !b || a.endsWith(' ') || b.startsWith(' ') || b.startsWith('\n')
-        ? "".concat(a).concat(b)
-        : "".concat(a, " ").concat(b);
-}
-function applyMetaTokens(value, metaTokens, options) {
-    if (!metaTokens) {
-        return "".concat(options.inlined ? '' : options.indent).concat(value);
-    }
-    else {
-        var result = "".concat(metaTokensToString(metaTokens.leadingMetaTokens, value)).concat(value).concat((metaTokens === null || metaTokens === void 0 ? void 0 : metaTokens.inlineCommentToken) ? " ".concat(metaTokens.inlineCommentToken.v, "\n") : '');
-        return result.split('\n').map(function (line, index) {
-            return "".concat(line && (!options.inlined || index > 0) ? options.indent : '').concat(line);
-        }).join('\n');
-    }
-}
-function metaTokensToString(metaTokens, tokenValue) {
-    var isEndBracket = tokenValue === ')' || tokenValue === ']' || tokenValue === '}';
-    var isOnlyNewLine = metaTokens.length === 1 && isNewLineToken(metaTokens[0]);
-    if (isEndBracket && isOnlyNewLine)
-        return '';
-    return metaTokens.map(function (metaToken) {
-        return isNewLineToken(metaToken) ? metaToken.v : "".concat(metaToken.v, "\n");
-    }).join('');
-}
-
-function unparseParams(_a) {
-    var params = _a.params, options = _a.options, prefix = _a.prefix, inline = _a.inline, endBracket = _a.endBracket, _b = _a.body, body = _b === void 0 ? false : _b, _c = _a.name, name = _c === void 0 ? '' : _c, _d = _a.noMultilineInline, noMultilineInline = _d === void 0 ? false : _d, _e = _a.pairs, pairs = _e === void 0 ? false : _e;
-    // If no parameters, return the expression with brackets
-    if (params.length === 0)
-        return "".concat(prefix).concat(endBracket);
-    // 1. Try to unparse the parameters as a single line
-    try {
-        var unparsedParams = pairs
-            ? unparseSingleLinePairs(params, options.inline().lock())
-            : unparseSingleLineParams(params, options.inline().lock());
-        if (!unparsedParams.includes('\n'))
-            return options.assertNotOverflown("".concat(prefix, " ").concat(unparsedParams).concat(endBracket));
-    }
-    catch (error) {
-        // If locked, we do not try anything else
-        if (options.locked)
-            throw error;
-    }
-    if (pairs) {
-        if (name && !name.includes('\n')) {
-            try {
-                var unparsedParams = unparseMultilinePairwise(params, options.inline().inc(name.length + 2).lock());
-                var result = options.assertNotOverflown("".concat(prefix, " ").concat(unparsedParams).concat(endBracket));
-                return result;
-            }
-            catch (_f) {
-            }
-        }
-        try {
-            var unparsedParams = unparseMultilinePairwise(params, options.noInline().inc(body ? 2 : 1));
-            return options.assertNotOverflown(ensureNewlineSeparator(prefix, "".concat(unparsedParams).concat(endBracket)));
-        }
-        catch (_g) {
-        }
-    }
-    // 2. Try to unparse the parameters in multiple lines, first parameter on the same line
-    // e.g. (round 1 2 3 4 5)
-    // ==>  (round 1
-    //             2
-    //             3
-    //             4
-    //             5)
-    else if (inline) {
-        var newOptions = options.inc(name.length + 2).lock();
-        try {
-            var firstParam = options.unparse(params[0], noMultilineInline ? newOptions.noInline() : newOptions.inline());
-            // If the first parameter is multiline, fallback to option 3
-            if (!firstParam.startsWith('\n')) {
-                var indentedParams = unparseMultilineParams(params.slice(1), newOptions.noInline());
-                return noMultilineInline
-                    ? options.assertNotOverflown("".concat(ensureNewlineSeparator(prefix, ensureNewlineSeparator(firstParam, indentedParams))).concat(endBracket))
-                    : options.assertNotOverflown("".concat(prefix, " ").concat(ensureNewlineSeparator(firstParam, indentedParams)).concat(endBracket));
-            }
-        }
-        catch (_h) {
-            // Try option 3
-        }
-    }
-    // 3. Try to unparse the parameters in multiple lines
-    // e.g. (round 1 2 3 4 5)
-    // ==>  (round
-    //       1
-    //       2
-    //       3
-    //       4
-    //       5)
-    return "".concat(ensureNewlineSeparator(prefix, unparseMultilineParams(params, options.noInline().inc(body ? 2 : 1)))).concat(endBracket);
-}
-function unparseSingleLineParams(params, options) {
-    return params.reduce(function (acc, param) {
-        return ensureSpaceSeparator(acc, options.unparse(param, options.inline()));
-    }, '');
-}
-function unparseSingleLinePairs(params, options) {
-    return params.reduce(function (acc, param, index) {
-        if (index > 0 && index % 2 === 0)
-            acc += ',';
-        return ensureSpaceSeparator(acc, options.unparse(param, options.inline()));
-    }, '');
-}
-function unparseMultilineParams(params, options) {
-    return params.reduce(function (acc, param, index) { return ensureNewlineSeparator(acc, options.unparse(param, index === 0 && options.inlined ? options.inline() : options.noInline())); }, '');
-}
-function unparseMultilinePairwise(params, options) {
-    var keyLength;
-    return params.reduce(function (acc, param, index) {
-        var _a, _b;
-        if (index % 2 === 0) {
-            var key = options.unparse(param, options.inline());
-            var leadingMetaTokens = (_b = (_a = param.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens.leadingMetaTokens;
-            if (index === 0 && options.inlined && leadingMetaTokens && leadingMetaTokens.length > 0)
-                throw new Error('First key with leading meta tokens is not allowed.');
-            key = key.trimStart();
-            keyLength = key.length;
-            key = index === 0 && options.inlined ? key : "".concat(options.indent).concat(key);
-            if (key.includes('\n'))
-                throw new Error('Key with new line character is not allowed.');
-            return index > 0 ? ensureNewlineSeparator(acc, key) : "".concat(acc).concat(key);
-        }
-        else {
-            var value = options.unparse(param, options.inline().inc(keyLength + 1));
-            return ensureSpaceSeparator(acc, value);
-        }
-    }, '');
-}
-
-function unparseArrayLiteral(node, options) {
-    var _a, _b, _c, _d, _e;
-    var startBracket = applyMetaTokens('[', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    var endBracket = applyMetaTokens(']', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-    // If no parameters, return empty array literal
-    if (node.p.length === 0)
-        return "".concat(startBracket).concat(endBracket);
-    var firstElementOptions = startBracket.endsWith('\n') ? options.noInline().inc() : options.inline().inc();
-    var unparsedFirstElement = options.unparse(node.p[0], firstElementOptions);
-    var params = node.p.slice(1);
-    var prefix = startBracket + unparsedFirstElement;
-    // 1. Try to unparse the parameters
-    try {
-        var unparsedParams = unparseSingleLineParams(params, options.inline().lock());
-        if (!unparsedParams.includes('\n')) {
-            return options.assertNotOverflown("".concat(ensureSpaceSeparator(prefix, unparsedParams)).concat(endBracket));
-        }
-    }
-    catch (error) {
-        // If locked, we do not try anything else
-        if (options.locked)
-            throw error;
-    }
-    // 2. Try to unparse the parameters in multiple lines
-    // e.g. [1 2 3 4 5]
-    // ==>  [
-    //       1
-    //       2
-    //       3
-    //       4
-    //       5]
-    return "".concat(ensureNewlineSeparator(prefix, unparseMultilineParams(params, options.noInline().inc()))).concat(endBracket);
-}
-
-function unparseObjectLiteral(node, options) {
-    var _a, _b, _c, _d, _e;
-    var startBracket = applyMetaTokens('{', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    var endBracket = applyMetaTokens('}', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-    // If no parameters, return empty object literal
-    if (node.p.length === 0)
-        return "".concat(startBracket).concat(endBracket);
-    var params = node.p;
-    if (!startBracket.endsWith('\n')) {
-        // 1. Try to unparse the parameters as one line
-        try {
-            var unparsedParams = unparseSingleLinePairs(params, options.inline().lock());
-            if (!unparsedParams.includes('\n')) {
-                var result = "".concat(startBracket).concat(unparsedParams).concat(endBracket);
-                return options.assertNotOverflown(result);
-            }
-        }
-        catch (error) {
-            // If locked, we do not try anything else
-            if (options.locked)
-                throw error;
-        }
-    }
-    // 2. Try to unparse the parameters pairwise on multiple lines
-    // e.g. {:a 1 :b 2 :c 3 :d 4 :e 5}
-    // ==>  {:a 1
-    //       :b 2
-    //       :c 3
-    //       :d 4
-    //       :e 5}
-    var multilineOptions = startBracket.endsWith('\n') ? options.noInline().inc() : options.inline().inc();
-    try {
-        var paiwise = unparseMultilinePairwise(params, multilineOptions);
-        var result = "".concat(startBracket).concat(paiwise).concat(endBracket);
-        return options.assertNotOverflown(result);
-    }
-    catch (_f) {
-        // Continue to the next step
-    }
-    // 3. Try to unparse the parameters in multiple lines
-    return startBracket + unparseMultilineParams(node.p, multilineOptions) + endBracket;
-}
-
-function unparseNormalExpression(node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    if (isNormalExpressionNode(node)) {
-        if (((_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.t) === TokenType.Bracket && node.debugData.token.v === '[')
-            return unparseArrayLiteral(node, options);
-        else if (((_b = node.debugData) === null || _b === void 0 ? void 0 : _b.token.t) === TokenType.Bracket && node.debugData.token.v === '{')
-            return unparseObjectLiteral(node, options);
-    }
-    var startBracket = applyMetaTokens('(', (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.token.debugData) === null || _d === void 0 ? void 0 : _d.metaTokens, options);
-    var endBracket = applyMetaTokens(')', (_g = (_f = (_e = node.debugData) === null || _e === void 0 ? void 0 : _e.lastToken) === null || _f === void 0 ? void 0 : _f.debugData) === null || _g === void 0 ? void 0 : _g.metaTokens, options.inline());
-    // if expression node e.g. ("Albert" 2), first parameter is the name ("Albert")
-    var nameOptions = startBracket.endsWith('\n') ? options.noInline().inc() : options.inline().inc();
-    var name = node.n
-        ? applyMetaTokens(node.n, (_k = (_j = (_h = node.debugData) === null || _h === void 0 ? void 0 : _h.nameToken) === null || _j === void 0 ? void 0 : _j.debugData) === null || _k === void 0 ? void 0 : _k.metaTokens, nameOptions)
-        : options.unparse(node.p[0], nameOptions);
-    var params = node.n ? node.p : node.p.slice(1);
-    var prefix = startBracket + name;
-    var inline = !name.includes('\n');
-    return unparseParams({ params: params, options: options, prefix: prefix, inline: inline, name: name, endBracket: endBracket });
-}
-
-function unparseCond(node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    var startBracket = applyMetaTokens('(', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    var endBracket = applyMetaTokens(')', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-    var name = applyMetaTokens(node.n, (_h = (_g = (_f = node.debugData) === null || _f === void 0 ? void 0 : _f.nameToken) === null || _g === void 0 ? void 0 : _g.debugData) === null || _h === void 0 ? void 0 : _h.metaTokens, options.inline());
-    var prefix = startBracket + name;
-    var inline = !name.includes('\n');
-    return unparseParams({
-        params: node.p,
-        options: options,
-        prefix: prefix,
-        inline: inline,
-        name: name,
-        endBracket: endBracket,
-        body: true,
-        pairs: true,
-    });
-}
-
-function unparseDo(node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    var startBracket = applyMetaTokens('(', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    var endBracket = applyMetaTokens(')', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-    var name = applyMetaTokens(node.n, (_h = (_g = (_f = node.debugData) === null || _f === void 0 ? void 0 : _f.nameToken) === null || _g === void 0 ? void 0 : _g.debugData) === null || _h === void 0 ? void 0 : _h.metaTokens, options.inline());
-    var prefix = startBracket + name;
-    var inline = !name.includes('\n');
-    return unparseParams({
-        params: node.p,
-        options: options,
-        prefix: prefix,
-        inline: inline,
-        name: name,
-        endBracket: endBracket,
-        body: true,
-    });
-}
-
-function unparseBindings(node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-    var startBracket = applyMetaTokens('[', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    // If no parameters, return empty array literal
-    if (node.p.length === 0) {
-        var endBracket = applyMetaTokens(']', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-        return "".concat(startBracket).concat(endBracket);
-    }
-    var params = node.p;
-    // 1. Try to unparse the bindings as one line
-    try {
-        var unparsedParams = unparseSingleLinePairs(params, options.inline().lock());
-        var endBracket = applyMetaTokens(']', (_h = (_g = (_f = node.debugData) === null || _f === void 0 ? void 0 : _f.lastToken) === null || _g === void 0 ? void 0 : _g.debugData) === null || _h === void 0 ? void 0 : _h.metaTokens, options.inline());
-        if (!unparsedParams.includes('\n')) {
-            var result = "".concat(startBracket).concat(unparsedParams).concat(endBracket);
-            return options.assertNotOverflown(result);
-        }
-    }
-    catch (error) {
-        // If locked, we do not try anything else
-        if (options.locked)
-            throw error;
-    }
-    // 2. Try to unparse the bindings pairwise on multiple lines
-    // e.g. [a 1 b 2]
-    // ==>  [a 1
-    //       b 2]
-    try {
-        var endBracket = applyMetaTokens(']', (_l = (_k = (_j = node.debugData) === null || _j === void 0 ? void 0 : _j.lastToken) === null || _k === void 0 ? void 0 : _k.debugData) === null || _l === void 0 ? void 0 : _l.metaTokens, options.inline());
-        var result = startBracket + unparseMultilinePairwise(params, options.inline().inc()) + endBracket;
-        return options.assertNotOverflown(result);
-    }
-    catch (_t) {
-        // 2. Unparse the bindings on multiple lines
-        // e.g. [a 1 b 2]
-        // ==>  [a
-        //       1,
-        //       b
-        //       2]
-        var unparsedParams = unparseMultilineParams(params, options.inline().inc());
-        var endBracket = unparsedParams.endsWith('\n')
-            ? applyMetaTokens(']', (_p = (_o = (_m = node.debugData) === null || _m === void 0 ? void 0 : _m.lastToken) === null || _o === void 0 ? void 0 : _o.debugData) === null || _p === void 0 ? void 0 : _p.metaTokens, options.noInline())
-            : applyMetaTokens(']', (_s = (_r = (_q = node.debugData) === null || _q === void 0 ? void 0 : _q.lastToken) === null || _r === void 0 ? void 0 : _r.debugData) === null || _s === void 0 ? void 0 : _s.metaTokens, options.inline());
-        return startBracket + unparseMultilineParams(params, options.inline().inc()) + endBracket;
-    }
-}
-
-function unparseIfLet(node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    var startBracket = applyMetaTokens('(', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    var endBracket = applyMetaTokens(')', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-    var name = applyMetaTokens(node.n, (_h = (_g = (_f = node.debugData) === null || _f === void 0 ? void 0 : _f.nameToken) === null || _g === void 0 ? void 0 : _g.debugData) === null || _h === void 0 ? void 0 : _h.metaTokens, options.inline());
-    var letArray = node.debugData ? node.debugData.bindingArray : createLetArray$1(node.b);
-    var inc = name.includes('\n') ? 1 : name.length + 2;
-    var unparsedLetArray = unparseBindings(letArray, options.inc(inc).inline());
-    var prefix = "".concat(startBracket + name, " ").concat(unparsedLetArray);
-    var inline = !(name + unparsedLetArray).includes('\n');
-    return unparseParams({
-        params: node.p,
-        options: options,
-        prefix: prefix,
-        inline: inline,
-        endBracket: endBracket,
-        body: true,
-        noMultilineInline: true,
-    });
-}
-function createLetArray$1(bindingNode) {
-    var params = [
-        {
-            t: AstNodeType.Name,
-            n: undefined,
-            p: [],
-            debugData: undefined,
-            v: bindingNode.n,
-        },
-        bindingNode.v,
-    ];
-    var node = {
-        t: AstNodeType.NormalExpression,
-        n: 'array',
-        p: params,
-        debugData: undefined,
-    };
-    return node;
-}
-
-function unparseLet(node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    var startBracket = applyMetaTokens('(', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    var endBracket = applyMetaTokens(')', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-    var name = applyMetaTokens(node.n, (_h = (_g = (_f = node.debugData) === null || _f === void 0 ? void 0 : _f.nameToken) === null || _g === void 0 ? void 0 : _g.debugData) === null || _h === void 0 ? void 0 : _h.metaTokens, options.inline());
-    var letArray = node.debugData ? node.debugData.bindingArray : createLetArray(node.bs);
-    var inc = name.includes('\n') ? 1 : name.length + 2;
-    var unparsedLetArray = unparseBindings(letArray, options.inc(inc).inline());
-    var prefix = "".concat(startBracket + name, " ").concat(unparsedLetArray);
-    var inline = !(name + unparsedLetArray).includes('\n');
-    return unparseParams({
-        params: node.p,
-        options: options,
-        prefix: prefix,
-        inline: inline,
-        endBracket: endBracket,
-        body: true,
-        noMultilineInline: true,
-    });
-}
-function createLetArray(bindingNodes) {
-    var params = bindingNodes.flatMap(function (binding) { return [
-        {
-            t: AstNodeType.Name,
-            n: undefined,
-            p: [],
-            debugData: undefined,
-            v: binding.n,
-        },
-        binding.v,
-    ]; });
-    var node = {
-        t: AstNodeType.NormalExpression,
-        n: 'array',
-        p: params,
-        debugData: undefined,
-    };
-    return node;
-}
-
-function unparseIfOrWhenLike(node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    var startBracket = applyMetaTokens('(', (_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.debugData) === null || _b === void 0 ? void 0 : _b.metaTokens, options);
-    var endBracket = applyMetaTokens(')', (_e = (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.lastToken) === null || _d === void 0 ? void 0 : _d.debugData) === null || _e === void 0 ? void 0 : _e.metaTokens, options.inline());
-    var nameOptions = startBracket.endsWith('\n') ? options.noInline().inc() : options.inline().inc();
-    var name = applyMetaTokens(node.n, (_h = (_g = (_f = node.debugData) === null || _f === void 0 ? void 0 : _f.nameToken) === null || _g === void 0 ? void 0 : _g.debugData) === null || _h === void 0 ? void 0 : _h.metaTokens, nameOptions);
-    var inc = name.includes('\n') ? 1 : name.length + 2;
-    var unparsedCondition = options.unparse(node.p[0], options.inc(inc).inline());
-    var prefix = "".concat(startBracket + name, " ").concat(unparsedCondition);
-    var params = node.p.slice(1);
-    // const inline = !(name + unparsedCondition).includes('\n')
-    var inline = false;
-    return unparseParams({ params: params, options: options, prefix: prefix, inline: inline, name: name, endBracket: endBracket, body: node.n === 'when' || node.n === 'when-not' });
-}
-
-// type ExpressionWithSingleParamNode = Pick<NormalExpressionNode, 'debug' | 'n'> & { p: AstNode }
-// function expressionWithSingleParamUnparser(astNode: ExpressionWithSingleParamNode, options: UnparseOptions) {
-//   return unparseNormalExpressionNode({ ...astNode, p: [astNode.p] }, options)
-// }
-var specialExpressionUnparser = {
-    'and': unparseNormalExpression,
-    'comment': unparseNormalExpression,
-    'cond': unparseCond,
-    'declared?': unparseNormalExpression,
-    // 'defn': (astNode: DefnNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    'def': unparseNormalExpression,
-    // 'defns': (astNode: DefnsNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    'defs': unparseNormalExpression,
-    'do': unparseDo,
-    // 'doseq': (astNode: DoSeqNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    // 'fn': (astNode: FnNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    // 'for': (astNode: ForNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    'if-let': unparseIfLet,
-    'if': unparseIfOrWhenLike,
-    'if-not': unparseIfOrWhenLike,
-    'let': unparseLet,
-    // 'loop': (astNode: LoopNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    'or': unparseNormalExpression,
-    '??': unparseNormalExpression,
-    'recur': unparseNormalExpression,
-    'time!': unparseNormalExpression,
-    'throw': unparseNormalExpression,
-    // 'try': (astNode: TryNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    // 'when-first': (astNode: WhenFirstNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    // 'when-let': (astNode: WhenLetNode, options: UnparseOptions) => unparseNormalExpressionNode({ ...astNode, t }, options),
-    'when': unparseIfOrWhenLike,
-    'when-not': unparseIfOrWhenLike,
-};
-function unparseSpecialExpression(node, options) {
-    var unparser = specialExpressionUnparser[node.n];
-    return unparser(node, options);
-}
-
-var unparse = function (node, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    switch (node.t) {
-        case AstNodeType.String:
-            return ((_b = (_a = node.debugData) === null || _a === void 0 ? void 0 : _a.token.o) === null || _b === void 0 ? void 0 : _b.s)
-                ? applyMetaTokens(":".concat(node.v), (_d = (_c = node.debugData) === null || _c === void 0 ? void 0 : _c.token.debugData) === null || _d === void 0 ? void 0 : _d.metaTokens, options) // Keyword
-                : applyMetaTokens("\"".concat(node.v, "\""), (_f = (_e = node.debugData) === null || _e === void 0 ? void 0 : _e.token.debugData) === null || _f === void 0 ? void 0 : _f.metaTokens, options);
-        case AstNodeType.Number:
-        case AstNodeType.Name:
-        case AstNodeType.Modifier:
-        case AstNodeType.ReservedName:
-            return applyMetaTokens(node.v, (_h = (_g = node.debugData) === null || _g === void 0 ? void 0 : _g.token.debugData) === null || _h === void 0 ? void 0 : _h.metaTokens, options);
-        case AstNodeType.Comment:
-            return "".concat(applyMetaTokens(node.v, (_k = (_j = node.debugData) === null || _j === void 0 ? void 0 : _j.token.debugData) === null || _k === void 0 ? void 0 : _k.metaTokens, options), "\n");
-        case AstNodeType.NormalExpression: {
-            return unparseNormalExpression(node, options);
-        }
-        case AstNodeType.SpecialExpression:
-            return unparseSpecialExpression(node, options);
-    }
-};
-function unparseAst(ast, lineLength) {
-    var options = new UnparseOptions(unparse, lineLength || Number.MAX_SAFE_INTEGER);
-    var result = ast.b.reduce(function (acc, node) {
-        var nodeUnparsed = unparse(node, options);
-        return ensureNewlineSeparator(acc, nodeUnparsed);
-    }, '');
-    return result.trim();
-}
-
-function isNoSpaceNeededBefore(token) {
-    switch (token.t) {
-        case TokenType.Bracket:
-            return [')', ']'].includes(token.v);
-        case TokenType.CollectionAccessor:
-            return true;
-        case TokenType.NewLine:
-            return true;
-        default:
-            return false;
-    }
-}
-function isNoSpaceNeededAfter(token) {
-    switch (token.t) {
-        case TokenType.Bracket:
-            return ['(', '['].includes(token.v);
-        case TokenType.CollectionAccessor:
-            return true;
-        case TokenType.FnShorthand:
-            return true;
-        case TokenType.NewLine:
-            return true;
-        case TokenType.RegexpShorthand:
-            return true;
-        default:
-            return false;
-    }
-}
-function untokenize(tokenStream) {
-    var lastToken;
-    return tokenStream.tokens.reduce(function (acc, token) {
-        var joiner = !lastToken || isNoSpaceNeededAfter(lastToken) || isNoSpaceNeededBefore(token) ? '' : ' ';
-        lastToken = token;
-        return "".concat(acc).concat(joiner).concat(untokenizeToken(token));
-    }, '');
-}
-function untokenizeToken(token) {
-    switch (token.t) {
-        case TokenType.String:
-            return "\"".concat(token.v, "\"");
-        default:
-            return token.v;
-    }
-}
-
 var Cache = /** @class */ (function () {
     function Cache(maxSize) {
         this.cache = {};
@@ -8690,13 +8119,6 @@ var Lits = /** @class */ (function () {
         var ast = this.generateAst(program, params);
         return this.evaluate(ast, params);
     };
-    Lits.prototype.format = function (program, params) {
-        var _a;
-        if (params === void 0) { params = {}; }
-        var lineLength = (_a = params.lineLength) !== null && _a !== void 0 ? _a : 80;
-        var ast = this.generateAst(program, params);
-        return unparseAst(ast, lineLength);
-    };
     Lits.prototype.context = function (program, params) {
         if (params === void 0) { params = {}; }
         var contextStack = createContextStack(params);
@@ -8721,12 +8143,6 @@ var Lits = /** @class */ (function () {
         var contextStack = createContextStack(params);
         return evaluate(ast, contextStack);
     };
-    Lits.prototype.transform = function (tokenStream, transformer) {
-        return transformTokens(tokenStream, transformer);
-    };
-    Lits.prototype.untokenize = function (tokenStream) {
-        return untokenize(tokenStream);
-    };
     Lits.prototype.apply = function (fn, fnParams, params) {
         var _a;
         if (params === void 0) { params = {}; }
@@ -8760,86 +8176,243 @@ var Lits = /** @class */ (function () {
     return Lits;
 }());
 
-var collectionReference = {
-    'count': {
-        title: 'count',
-        category: 'Collection',
-        linkName: 'count',
-        returns: {
-            type: 'number',
-        },
-        args: {
-            coll: {
-                type: ['collection', 'string', 'nil'],
-            },
-        },
-        variants: [
-            { argumentNames: ['coll'] },
-        ],
-        description: 'Returns number of elements in $coll.',
-        examples: [
-            '(count [1 2 3])',
-            '(count [])',
-            '(count (object :a 1))',
-            '(count "")',
-            '(count "Albert")',
-            '(count nil)',
-        ],
-    },
-    'get': {
-        title: 'get',
-        category: 'Collection',
-        linkName: 'get',
-        returns: {
-            type: 'any',
-        },
-        args: {
-            'coll': {
-                type: 'collection',
-            },
-            'key': {
-                type: ['string', 'integer'],
-            },
-            'not-found': {
-                type: 'any',
-                description: 'Default value to return if $key is not found.',
-            },
-        },
-        variants: [
-            { argumentNames: ['coll', 'key'] },
-            { argumentNames: ['coll', 'key', 'not-found'] },
-        ],
-        description: 'Returns value in $coll mapped at \`key\`.',
-        examples: [
-            "\n(get\n  [1 2 3]\n  1)",
-            "\n(get\n  []\n  1)",
-            "\n(get\n  []\n  1\n  \"default\")",
-            "\n(get\n  (object :a 1)\n  :a)",
-            "\n(get\n  (object :a 1)\n  :b)",
-            "\n(get\n  (object :a 1)\n  :b\n  \"default\")",
-            "\n(get\n  nil\n  :a)",
-            "\n(get\n  nil\n  :b\n  \"default\")",
-        ],
-    },
-    'get-in': {
-        title: 'get-in',
-        category: 'Collection',
-        linkName: 'get-in',
-        returns: {
-            type: 'any',
-        },
-        args: {
-            'coll': {
-                type: 'collection',
-            },
-            'keys': {
-                type: 'array',
-            },
-            'not-found': {
-                type: 'any',
-            },
-        },
-        variants: [
+function runTest(_a) {
+    var filePath = _a.testPath, testNamePattern = _a.testNamePattern;
+    var includedFilePaths = getIncludedFilePaths(filePath);
+    var testResult = {
+        tap: 'TAP version 13\n',
+        success: true,
+    };
+    try {
+        var testChunks = getTestChunks(filePath);
+        testResult.tap += "1..".concat(testChunks.length, "\n");
+        testChunks.forEach(function (testChunkProgram, index) {
+            var testNumber = index + 1;
+            if (testNamePattern && !testNamePattern.test(testChunkProgram.name)) {
+                testResult.tap += "ok ".concat(testNumber, " ").concat(testChunkProgram.name, " # skip - Not matching testNamePattern ").concat(testNamePattern, "\n");
+            }
+            else if (testChunkProgram.directive === 'SKIP') {
+                testResult.tap += "ok ".concat(testNumber, " ").concat(testChunkProgram.name, " # skip\n");
+            }
+            else {
+                try {
+                    var lits = new Lits({ debug: true });
+                    var contexts = getContexts(includedFilePaths, lits);
+                    lits.run(testChunkProgram.program, {
+                        contexts: contexts,
+                        filePath: filePath,
+                    });
+                    testResult.tap += "ok ".concat(testNumber, " ").concat(testChunkProgram.name, "\n");
+                }
+                catch (error) {
+                    testResult.success = false;
+                    testResult.tap += "not ok ".concat(testNumber, " ").concat(testChunkProgram.name).concat(getErrorYaml(error));
+                }
+            }
+        });
+    }
+    catch (error) {
+        testResult.tap += "Bail out! ".concat(getErrorMessage$1(error), "\n");
+        testResult.success = false;
+    }
+    return testResult;
+}
+function readLitsFile(litsPath) {
+    if (!litsPath.endsWith('.lits'))
+        throw new Error("Expected .lits file, got ".concat(litsPath));
+    return fs.readFileSync(litsPath, { encoding: 'utf-8' });
+}
+function getContexts(includedFilePaths, lits) {
+    return includedFilePaths.reduce(function (acc, filePath) {
+        var fileContent = readLitsFile(filePath);
+        acc.push(lits.context(fileContent, { filePath: filePath, contexts: acc }));
+        return acc;
+    }, []);
+}
+function getIncludedFilePaths(absoluteFilePath) {
+    var result = [];
+    getIncludesRecursively(absoluteFilePath, result);
+    return result.reduce(function (acc, entry) {
+        if (!acc.includes(entry))
+            acc.push(entry);
+        return acc;
+    }, []);
+    function getIncludesRecursively(filePath, includedFilePaths) {
+        var includeFilePaths = readIncludeDirectives(filePath);
+        includeFilePaths.forEach(function (includeFilePath) {
+            getIncludesRecursively(includeFilePath, includedFilePaths);
+            includedFilePaths.push(includeFilePath);
+        });
+    }
+}
+function readIncludeDirectives(filePath) {
+    var fileContent = readLitsFile(filePath);
+    var dirname = path.dirname(filePath);
+    var okToInclude = true;
+    return fileContent.split('\n').reduce(function (acc, line) {
+        var includeMatch = line.match(/^\s*;+\s*@include\s*(\S+)\s*$/);
+        if (includeMatch) {
+            if (!okToInclude)
+                throw new Error("@include must be in the beginning of file: ".concat(filePath, ":").concat(line + 1));
+            var relativeFilePath = includeMatch[1];
+            acc.push(path.resolve(dirname, relativeFilePath));
+        }
+        if (!line.match(/^\s*;.*$/))
+            okToInclude = false;
+        return acc;
+    }, []);
+}
+// Splitting test file based on @test annotations
+function getTestChunks(testPath) {
+    var testProgram = readLitsFile(testPath);
+    var currentTest;
+    var setupCode = '';
+    return testProgram.split('\n').reduce(function (result, line, index) {
+        var _a;
+        var currentLineNbr = index + 1;
+        // eslint-disable-next-line regexp/no-super-linear-backtracking
+        var testNameAnnotationMatch = line.match(/^\s*;+\s*@(?:(skip)-)?test\s*(.*)$/);
+        if (testNameAnnotationMatch) {
+            var directive = ((_a = testNameAnnotationMatch[1]) !== null && _a !== void 0 ? _a : '').toUpperCase();
+            var testName_1 = testNameAnnotationMatch[2];
+            if (!testName_1)
+                throw new Error("Missing test name on line ".concat(currentLineNbr));
+            if (result.find(function (chunk) { return chunk.name === testName_1; }))
+                throw new Error("Duplicate test name ".concat(testName_1));
+            currentTest = {
+                directive: (directive || null),
+                name: testName_1,
+                // Adding new-lines to make lits debug information report correct rows
+                program: setupCode + __spreadArray([], __read(Array(currentLineNbr + 2 - setupCode.split('\n').length).keys()), false).map(function () { return ''; }).join('\n'),
+            };
+            result.push(currentTest);
+            return result;
+        }
+        if (!currentTest)
+            setupCode += "".concat(line, "\n");
+        else
+            currentTest.program += "".concat(line, "\n");
+        return result;
+    }, []);
+}
+function getErrorYaml(error) {
+    var message = getErrorMessage$1(error);
+    /* v8 ignore next 7 */
+    if (!isAbstractLitsError(error)) {
+        return "\n  ---\n  message: ".concat(JSON.stringify(message), "\n  ...\n");
+    }
+    var sourceCodeInfo = error.sourceCodeInfo;
+    /* v8 ignore next 8 */
+    if (!sourceCodeInfo || typeof sourceCodeInfo === 'string') {
+        return "\n  ---\n  message: ".concat(JSON.stringify(message), "\n  error: ").concat(JSON.stringify(error.name), "\n  ...\n");
+    }
+    var formattedMessage = message.includes('\n')
+        ? "|\n    ".concat(message.split(/\r?\n/).join('\n    '))
+        : JSON.stringify(message);
+    return "\n  ---\n  error: ".concat(JSON.stringify(error.name), "\n  message: ").concat(formattedMessage, "\n  location: ").concat(JSON.stringify(getLocation(sourceCodeInfo)), "\n  code:\n    - \"").concat(sourceCodeInfo.code, "\"\n    - \"").concat(getCodeMarker(sourceCodeInfo), "\"\n  ...\n");
+}
+function getLocation(sourceCodeInfo) {
+    var terms = [];
+    if (sourceCodeInfo.filePath)
+        terms.push(sourceCodeInfo.filePath);
+    if (sourceCodeInfo.position) {
+        terms.push("".concat(sourceCodeInfo.position.line));
+        terms.push("".concat(sourceCodeInfo.position.column));
+    }
+    return terms.join(':');
+}
+function getErrorMessage$1(error) {
+    if (!isAbstractLitsError(error)) {
+        // error should always be an Error (other cases is just for kicks)
+        /* v8 ignore next 1 */
+        return typeof error === 'string' ? error : error instanceof Error ? error.message : 'Unknown error';
+    }
+    return error.shortMessage;
+}
+function isAbstractLitsError(error) {
+    return error instanceof LitsError;
+}
+
+var collectionReference = {
+    'count': {
+        title: 'count',
+        category: 'Collection',
+        linkName: 'count',
+        returns: {
+            type: 'number',
+        },
+        args: {
+            coll: {
+                type: ['collection', 'string', 'nil'],
+            },
+        },
+        variants: [
+            { argumentNames: ['coll'] },
+        ],
+        description: 'Returns number of elements in $coll.',
+        examples: [
+            '(count [1 2 3])',
+            '(count [])',
+            '(count (object :a 1))',
+            '(count "")',
+            '(count "Albert")',
+            '(count nil)',
+        ],
+    },
+    'get': {
+        title: 'get',
+        category: 'Collection',
+        linkName: 'get',
+        returns: {
+            type: 'any',
+        },
+        args: {
+            'coll': {
+                type: 'collection',
+            },
+            'key': {
+                type: ['string', 'integer'],
+            },
+            'not-found': {
+                type: 'any',
+                description: 'Default value to return if $key is not found.',
+            },
+        },
+        variants: [
+            { argumentNames: ['coll', 'key'] },
+            { argumentNames: ['coll', 'key', 'not-found'] },
+        ],
+        description: 'Returns value in $coll mapped at \`key\`.',
+        examples: [
+            "\n(get\n  [1 2 3]\n  1)",
+            "\n(get\n  []\n  1)",
+            "\n(get\n  []\n  1\n  \"default\")",
+            "\n(get\n  (object :a 1)\n  :a)",
+            "\n(get\n  (object :a 1)\n  :b)",
+            "\n(get\n  (object :a 1)\n  :b\n  \"default\")",
+            "\n(get\n  nil\n  :a)",
+            "\n(get\n  nil\n  :b\n  \"default\")",
+        ],
+    },
+    'get-in': {
+        title: 'get-in',
+        category: 'Collection',
+        linkName: 'get-in',
+        returns: {
+            type: 'any',
+        },
+        args: {
+            'coll': {
+                type: 'collection',
+            },
+            'keys': {
+                type: 'array',
+            },
+            'not-found': {
+                type: 'any',
+            },
+        },
+        variants: [
             { argumentNames: ['coll', 'keys'] },
             { argumentNames: ['coll', 'keys', 'not-found'] },
         ],
@@ -15219,25 +14792,276 @@ Object.values(apiReference).forEach(function (ref) {
     ref.title = ref.title.replace(/"/g, '&quot;');
 });
 
-var e_1, _a$1, e_2, _b;
-var api = {
-    collection: [
-        'count',
-        'get',
-        'get-in',
-        'contains?',
-        'has?',
-        'has-some?',
-        'has-every?',
-        'assoc',
-        'assoc-in',
-        'concat',
-        'not-empty',
-        'every?',
-        'not-every?',
-        'any?',
-        'not-any?',
-        'update',
+function stringifyValue(value, html) {
+    var _a;
+    var gt = '>';
+    var lt = '<';
+    if (isLitsFunction(value)) {
+        if (value.t === FunctionType.Builtin)
+            return "".concat(lt, "builtin function ").concat(value.n).concat(gt);
+        else
+            return "".concat(lt, "function ").concat((_a = value.n) !== null && _a !== void 0 ? _a : '\u03BB').concat(gt);
+    }
+    if (value === null)
+        return 'null';
+    if (typeof value === 'object' && value instanceof Error)
+        return value.toString();
+    if (typeof value === 'object' && value instanceof RegExp)
+        return "".concat(value);
+    if (value === Number.POSITIVE_INFINITY)
+        return "".concat(Number.POSITIVE_INFINITY);
+    if (value === Number.NEGATIVE_INFINITY)
+        return "".concat(Number.NEGATIVE_INFINITY);
+    if (typeof value === 'number' && Number.isNaN(value))
+        return 'NaN';
+    if (isRegularExpression(value))
+        return "/".concat(value.s, "/").concat(value.f);
+    return JSON.stringify(value, null, 2);
+}
+function findAllOccurrences(input, pattern) {
+    var matches = __spreadArray([], __read(input.matchAll(pattern)), false);
+    return new Set(matches.map(function (match) { return match[0]; }));
+}
+
+var ColorEnum;
+(function (ColorEnum) {
+    ColorEnum["Reset"] = "\u001B[0m";
+    ColorEnum["Bright"] = "\u001B[1m";
+    ColorEnum["ResetBright"] = "\u001B[21m";
+    ColorEnum["Dim"] = "\u001B[2m";
+    ColorEnum["ResetDim"] = "\u001B[22m";
+    ColorEnum["Italic"] = "\u001B[3m";
+    ColorEnum["ResetItalic"] = "\u001B[23m";
+    ColorEnum["Underscore"] = "\u001B[4m";
+    ColorEnum["ResetUnderscore"] = "\u001B[24m";
+    ColorEnum["Blink"] = "\u001B[5m";
+    ColorEnum["ResetBlink"] = "\u001B[25m";
+    ColorEnum["Reverse"] = "\u001B[7m";
+    ColorEnum["ResetReverse"] = "\u001B[27m";
+    ColorEnum["Hidden"] = "\u001B[8m";
+    ColorEnum["ResetHidden"] = "\u001B[28m";
+    ColorEnum["FgBlack"] = "\u001B[30m";
+    ColorEnum["FgRed"] = "\u001B[31m";
+    ColorEnum["FgGreen"] = "\u001B[32m";
+    ColorEnum["FgYellow"] = "\u001B[33m";
+    ColorEnum["FgBlue"] = "\u001B[34m";
+    ColorEnum["FgMagenta"] = "\u001B[35m";
+    ColorEnum["FgCyan"] = "\u001B[36m";
+    ColorEnum["FgWhite"] = "\u001B[37m";
+    ColorEnum["FgGray"] = "\u001B[90m";
+    ColorEnum["BgBlack"] = "\u001B[40m";
+    ColorEnum["BgRed"] = "\u001B[41m";
+    ColorEnum["BgGreen"] = "\u001B[42m";
+    ColorEnum["BgYellow"] = "\u001B[43m";
+    ColorEnum["BgBlue"] = "\u001B[44m";
+    ColorEnum["BgMagenta"] = "\u001B[45m";
+    ColorEnum["BgCyan"] = "\u001B[46m";
+    ColorEnum["BgWhite"] = "\u001B[47m";
+    ColorEnum["BgGray"] = "\u001B[100m";
+})(ColorEnum || (ColorEnum = {}));
+function createLeftPad(length, char) {
+    if (char === void 0) { char = ' '; }
+    return function (text) {
+        return text.padStart(length, char);
+    };
+}
+function createRightPad(length, char) {
+    if (char === void 0) { char = ' '; }
+    return function (text) {
+        return text.padEnd(length, char);
+    };
+}
+function createFormatter$1(enableColors, colors, formatters) {
+    var fn = function (text) {
+        var e_1, _a;
+        try {
+            for (var formatters_1 = __values(formatters), formatters_1_1 = formatters_1.next(); !formatters_1_1.done; formatters_1_1 = formatters_1.next()) {
+                var formatter = formatters_1_1.value;
+                text = formatter(text);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (formatters_1_1 && !formatters_1_1.done && (_a = formatters_1.return)) _a.call(formatters_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return enableColors
+            ? colors.join('') + text + ColorEnum.Reset
+            : text;
+    };
+    Object.defineProperty(fn, 'black', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgBlack], false), formatters); },
+    });
+    Object.defineProperty(fn, 'red', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgRed], false), formatters); },
+    });
+    Object.defineProperty(fn, 'green', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgGreen], false), formatters); },
+    });
+    Object.defineProperty(fn, 'yellow', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgYellow], false), formatters); },
+    });
+    Object.defineProperty(fn, 'blue', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgBlue], false), formatters); },
+    });
+    Object.defineProperty(fn, 'magenta', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgMagenta], false), formatters); },
+    });
+    Object.defineProperty(fn, 'cyan', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgCyan], false), formatters); },
+    });
+    Object.defineProperty(fn, 'white', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgWhite], false), formatters); },
+    });
+    Object.defineProperty(fn, 'gray', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgGray], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgBlack', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgBlack], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgRed', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgRed], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgGreen', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgGreen], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgYellow', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgYellow], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgBlue', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgBlue], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgMagenta', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgMagenta], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgCyan', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgCyan], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgWhite', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgWhite], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bgGray', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgGray], false), formatters); },
+    });
+    Object.defineProperty(fn, 'reset', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Reset], false), formatters); },
+    });
+    Object.defineProperty(fn, 'bright', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Bright], false), formatters); },
+    });
+    Object.defineProperty(fn, 'dim', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Dim], false), formatters); },
+    });
+    Object.defineProperty(fn, 'italic', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Dim], false), formatters); },
+    });
+    Object.defineProperty(fn, 'underscore', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Underscore], false), formatters); },
+    });
+    Object.defineProperty(fn, 'blink', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Blink], false), formatters); },
+    });
+    Object.defineProperty(fn, 'reverse', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Reverse], false), formatters); },
+    });
+    Object.defineProperty(fn, 'hidden', {
+        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Hidden], false), formatters); },
+    });
+    fn.leftPad = function (length, char) { return createFormatter$1(enableColors, colors, [createLeftPad(length, char)]); };
+    fn.rightPad = function (length, char) { return createFormatter$1(enableColors, colors, [createRightPad(length, char)]); };
+    return fn;
+}
+function createColorizer(enableColors) {
+    if (enableColors === void 0) { enableColors = true; }
+    return {
+        black: createFormatter$1(enableColors, [ColorEnum.FgBlack], []),
+        red: createFormatter$1(enableColors, [ColorEnum.FgRed], []),
+        green: createFormatter$1(enableColors, [ColorEnum.FgGreen], []),
+        yellow: createFormatter$1(enableColors, [ColorEnum.FgYellow], []),
+        blue: createFormatter$1(enableColors, [ColorEnum.FgBlue], []),
+        magenta: createFormatter$1(enableColors, [ColorEnum.FgMagenta], []),
+        cyan: createFormatter$1(enableColors, [ColorEnum.FgCyan], []),
+        white: createFormatter$1(enableColors, [ColorEnum.FgWhite], []),
+        gray: createFormatter$1(enableColors, [ColorEnum.FgGray], []),
+        bgBlack: createFormatter$1(enableColors, [ColorEnum.BgBlack], []),
+        bgRed: createFormatter$1(enableColors, [ColorEnum.BgRed], []),
+        bgGreen: createFormatter$1(enableColors, [ColorEnum.BgGreen], []),
+        bgYellow: createFormatter$1(enableColors, [ColorEnum.BgYellow], []),
+        bgBlue: createFormatter$1(enableColors, [ColorEnum.BgBlue], []),
+        bgMagenta: createFormatter$1(enableColors, [ColorEnum.BgMagenta], []),
+        bgCyan: createFormatter$1(enableColors, [ColorEnum.BgCyan], []),
+        bgWhite: createFormatter$1(enableColors, [ColorEnum.BgWhite], []),
+        bgGray: createFormatter$1(enableColors, [ColorEnum.BgGray], []),
+        reset: createFormatter$1(enableColors, [ColorEnum.Reset], []),
+        bright: createFormatter$1(enableColors, [ColorEnum.Bright], []),
+        dim: createFormatter$1(enableColors, [ColorEnum.Dim], []),
+        italic: createFormatter$1(enableColors, [ColorEnum.Italic], []),
+        underscore: createFormatter$1(enableColors, [ColorEnum.Underscore], []),
+        blink: createFormatter$1(enableColors, [ColorEnum.Blink], []),
+        reverse: createFormatter$1(enableColors, [ColorEnum.Reverse], []),
+        hidden: createFormatter$1(enableColors, [ColorEnum.Hidden], []),
+        leftPad: function (length, char) { return createFormatter$1(enableColors, [], [createLeftPad(length, char)]); },
+        rightPad: function (length, char) { return createFormatter$1(enableColors, [], [createRightPad(length, char)]); },
+    };
+}
+
+function getCliType(fmt, arg) {
+    var argType = isSpecialExpressionArgument(arg) ? arg.type.slice(1) : arg.type;
+    var types = Array.isArray(argType) ? argType : [argType];
+    var typeString = types.map(function (type) {
+        return fmt.dim.red(type);
+    }).join(' | ');
+    return arg.array || arg.rest
+        ? "".concat(fmt.bright.blue('Array')).concat(fmt.bright.gray('<')).concat(fmt.white(typeString)).concat(fmt.bright.gray('>'))
+        : fmt.white(typeString);
+}
+
+function getCliFunctionSignature(fmt, _a) {
+    var name = _a.title, variants = _a.variants, args = _a.args, returns = _a.returns;
+    return variants.map(function (variant) {
+        var form = (variant.argumentNames.length === 0)
+            ? "".concat(fmt.white('(')).concat(fmt.blue(name)).concat(fmt.white(')'))
+            : "".concat(fmt.white('(')).concat(fmt.blue(name), " ").concat(variant.argumentNames.map(function (argName) {
+                var result = '';
+                var arg = args[argName];
+                if (arg) {
+                    if (arg.rest)
+                        result += fmt.white('& ');
+                    result += "".concat(fmt.green(argName));
+                    if (arg.type === '*binding' || arg.type === '*for-binding')
+                        result = "".concat(fmt.white('[')).concat(result).concat(fmt.white(']'));
+                    else if (arg.type === '*arguments')
+                        result = "".concat(fmt.white('[')).concat(result).concat(fmt.white(']'));
+                    else if (arg.type === '*catch-expression')
+                        result = "".concat(fmt.white('(')).concat(result, " ").concat(fmt.bright.blue('body')).concat(fmt.white(')'));
+                }
+                return result;
+            }).join(' ')).concat(fmt.white(')'));
+        return "".concat(form, " ").concat(fmt.gray('=>'), " ").concat(getCliType(fmt, returns));
+    }).join('\n');
+}
+
+var e_1, _a$1, e_2, _b;
+var api = {
+    collection: [
+        'count',
+        'get',
+        'get-in',
+        'contains?',
+        'has?',
+        'has-some?',
+        'has-every?',
+        'assoc',
+        'assoc-in',
+        'concat',
+        'not-empty',
+        'every?',
+        'not-every?',
+        'any?',
+        'not-any?',
+        'update',
         'update-in',
     ],
     array: [
@@ -15532,440 +15356,32 @@ try {
     for (var functionNamesFromLitsSrc_1 = __values(functionNamesFromLitsSrc), functionNamesFromLitsSrc_1_1 = functionNamesFromLitsSrc_1.next(); !functionNamesFromLitsSrc_1_1.done; functionNamesFromLitsSrc_1_1 = functionNamesFromLitsSrc_1.next()) {
         var functionName = functionNamesFromLitsSrc_1_1.value;
         if (!apiNames.includes(functionName))
-            throw new Error("Function name \"".concat(functionName, "\" is not included in the API"));
-    }
-}
-catch (e_1_1) { e_1 = { error: e_1_1 }; }
-finally {
-    try {
-        if (functionNamesFromLitsSrc_1_1 && !functionNamesFromLitsSrc_1_1.done && (_a$1 = functionNamesFromLitsSrc_1.return)) _a$1.call(functionNamesFromLitsSrc_1);
-    }
-    finally { if (e_1) throw e_1.error; }
-}
-try {
-    for (var functionNames_1 = __values(functionNames), functionNames_1_1 = functionNames_1.next(); !functionNames_1_1.done; functionNames_1_1 = functionNames_1.next()) {
-        var functionName = functionNames_1_1.value;
-        if (!functionNamesFromLitsSrc.includes(functionName))
-            throw new Error("Function name \"".concat(functionName, "\" is not included in the Lits source"));
-    }
-}
-catch (e_2_1) { e_2 = { error: e_2_1 }; }
-finally {
-    try {
-        if (functionNames_1_1 && !functionNames_1_1.done && (_b = functionNames_1.return)) _b.call(functionNames_1);
-    }
-    finally { if (e_2) throw e_2.error; }
-}
-function isApiName(arg) {
-    return apiNames.includes(arg);
-}
-
-function runTest(_a) {
-    var filePath = _a.testPath, testNamePattern = _a.testNamePattern;
-    var includedFilePaths = getIncludedFilePaths(filePath);
-    var testResult = {
-        tap: 'TAP version 13\n',
-        success: true,
-    };
-    try {
-        var testChunks = getTestChunks(filePath);
-        testResult.tap += "1..".concat(testChunks.length, "\n");
-        testChunks.forEach(function (testChunkProgram, index) {
-            var testNumber = index + 1;
-            if (testNamePattern && !testNamePattern.test(testChunkProgram.name)) {
-                testResult.tap += "ok ".concat(testNumber, " ").concat(testChunkProgram.name, " # skip - Not matching testNamePattern ").concat(testNamePattern, "\n");
-            }
-            else if (testChunkProgram.directive === 'SKIP') {
-                testResult.tap += "ok ".concat(testNumber, " ").concat(testChunkProgram.name, " # skip\n");
-            }
-            else {
-                try {
-                    var lits = new Lits({ debug: true });
-                    var contexts = getContexts(includedFilePaths, lits);
-                    lits.run(testChunkProgram.program, {
-                        contexts: contexts,
-                        filePath: filePath,
-                    });
-                    testResult.tap += "ok ".concat(testNumber, " ").concat(testChunkProgram.name, "\n");
-                }
-                catch (error) {
-                    testResult.success = false;
-                    testResult.tap += "not ok ".concat(testNumber, " ").concat(testChunkProgram.name).concat(getErrorYaml(error));
-                }
-            }
-        });
-    }
-    catch (error) {
-        testResult.tap += "Bail out! ".concat(getErrorMessage$1(error), "\n");
-        testResult.success = false;
-    }
-    return testResult;
-}
-function readLitsFile(litsPath) {
-    if (!litsPath.endsWith('.lits'))
-        throw new Error("Expected .lits file, got ".concat(litsPath));
-    return fs.readFileSync(litsPath, { encoding: 'utf-8' });
-}
-function getContexts(includedFilePaths, lits) {
-    return includedFilePaths.reduce(function (acc, filePath) {
-        var fileContent = readLitsFile(filePath);
-        acc.push(lits.context(fileContent, { filePath: filePath, contexts: acc }));
-        return acc;
-    }, []);
-}
-function getIncludedFilePaths(absoluteFilePath) {
-    var result = [];
-    getIncludesRecursively(absoluteFilePath, result);
-    return result.reduce(function (acc, entry) {
-        if (!acc.includes(entry))
-            acc.push(entry);
-        return acc;
-    }, []);
-    function getIncludesRecursively(filePath, includedFilePaths) {
-        var includeFilePaths = readIncludeDirectives(filePath);
-        includeFilePaths.forEach(function (includeFilePath) {
-            getIncludesRecursively(includeFilePath, includedFilePaths);
-            includedFilePaths.push(includeFilePath);
-        });
-    }
-}
-function readIncludeDirectives(filePath) {
-    var fileContent = readLitsFile(filePath);
-    var dirname = path.dirname(filePath);
-    var okToInclude = true;
-    return fileContent.split('\n').reduce(function (acc, line) {
-        var includeMatch = line.match(/^\s*;+\s*@include\s*(\S+)\s*$/);
-        if (includeMatch) {
-            if (!okToInclude)
-                throw new Error("@include must be in the beginning of file: ".concat(filePath, ":").concat(line + 1));
-            var relativeFilePath = includeMatch[1];
-            acc.push(path.resolve(dirname, relativeFilePath));
-        }
-        if (!line.match(/^\s*;.*$/))
-            okToInclude = false;
-        return acc;
-    }, []);
-}
-// Splitting test file based on @test annotations
-function getTestChunks(testPath) {
-    var testProgram = readLitsFile(testPath);
-    var currentTest;
-    var setupCode = '';
-    return testProgram.split('\n').reduce(function (result, line, index) {
-        var _a;
-        var currentLineNbr = index + 1;
-        // eslint-disable-next-line regexp/no-super-linear-backtracking
-        var testNameAnnotationMatch = line.match(/^\s*;+\s*@(?:(skip)-)?test\s*(.*)$/);
-        if (testNameAnnotationMatch) {
-            var directive = ((_a = testNameAnnotationMatch[1]) !== null && _a !== void 0 ? _a : '').toUpperCase();
-            var testName_1 = testNameAnnotationMatch[2];
-            if (!testName_1)
-                throw new Error("Missing test name on line ".concat(currentLineNbr));
-            if (result.find(function (chunk) { return chunk.name === testName_1; }))
-                throw new Error("Duplicate test name ".concat(testName_1));
-            currentTest = {
-                directive: (directive || null),
-                name: testName_1,
-                // Adding new-lines to make lits debug information report correct rows
-                program: setupCode + __spreadArray([], __read(Array(currentLineNbr + 2 - setupCode.split('\n').length).keys()), false).map(function () { return ''; }).join('\n'),
-            };
-            result.push(currentTest);
-            return result;
-        }
-        if (!currentTest)
-            setupCode += "".concat(line, "\n");
-        else
-            currentTest.program += "".concat(line, "\n");
-        return result;
-    }, []);
-}
-function getErrorYaml(error) {
-    var message = getErrorMessage$1(error);
-    /* v8 ignore next 7 */
-    if (!isAbstractLitsError(error)) {
-        return "\n  ---\n  message: ".concat(JSON.stringify(message), "\n  ...\n");
-    }
-    var sourceCodeInfo = error.sourceCodeInfo;
-    /* v8 ignore next 8 */
-    if (!sourceCodeInfo || typeof sourceCodeInfo === 'string') {
-        return "\n  ---\n  message: ".concat(JSON.stringify(message), "\n  error: ").concat(JSON.stringify(error.name), "\n  ...\n");
-    }
-    var formattedMessage = message.includes('\n')
-        ? "|\n    ".concat(message.split(/\r?\n/).join('\n    '))
-        : JSON.stringify(message);
-    return "\n  ---\n  error: ".concat(JSON.stringify(error.name), "\n  message: ").concat(formattedMessage, "\n  location: ").concat(JSON.stringify(getLocation(sourceCodeInfo)), "\n  code:\n    - \"").concat(sourceCodeInfo.code, "\"\n    - \"").concat(getCodeMarker(sourceCodeInfo), "\"\n  ...\n");
-}
-function getLocation(sourceCodeInfo) {
-    var terms = [];
-    if (sourceCodeInfo.filePath)
-        terms.push(sourceCodeInfo.filePath);
-    if (sourceCodeInfo.position) {
-        terms.push("".concat(sourceCodeInfo.position.line));
-        terms.push("".concat(sourceCodeInfo.position.column));
-    }
-    return terms.join(':');
-}
-function getErrorMessage$1(error) {
-    if (!isAbstractLitsError(error)) {
-        // error should always be an Error (other cases is just for kicks)
-        /* v8 ignore next 1 */
-        return typeof error === 'string' ? error : error instanceof Error ? error.message : 'Unknown error';
-    }
-    return error.shortMessage;
-}
-function isAbstractLitsError(error) {
-    return error instanceof LitsError;
-}
-
-function stringifyValue(value, html) {
-    var _a;
-    var gt = '>';
-    var lt = '<';
-    if (isLitsFunction(value)) {
-        if (value.t === FunctionType.Builtin)
-            return "".concat(lt, "builtin function ").concat(value.n).concat(gt);
-        else
-            return "".concat(lt, "function ").concat((_a = value.n) !== null && _a !== void 0 ? _a : '\u03BB').concat(gt);
+            throw new Error("Function name \"".concat(functionName, "\" is not included in the API"));
     }
-    if (value === null)
-        return 'null';
-    if (typeof value === 'object' && value instanceof Error)
-        return value.toString();
-    if (typeof value === 'object' && value instanceof RegExp)
-        return "".concat(value);
-    if (value === Number.POSITIVE_INFINITY)
-        return "".concat(Number.POSITIVE_INFINITY);
-    if (value === Number.NEGATIVE_INFINITY)
-        return "".concat(Number.NEGATIVE_INFINITY);
-    if (typeof value === 'number' && Number.isNaN(value))
-        return 'NaN';
-    if (isRegularExpression(value))
-        return "/".concat(value.s, "/").concat(value.f);
-    return JSON.stringify(value, null, 2);
-}
-function findAllOccurrences(input, pattern) {
-    var matches = __spreadArray([], __read(input.matchAll(pattern)), false);
-    return new Set(matches.map(function (match) { return match[0]; }));
-}
-
-var ColorEnum;
-(function (ColorEnum) {
-    ColorEnum["Reset"] = "\u001B[0m";
-    ColorEnum["Bright"] = "\u001B[1m";
-    ColorEnum["ResetBright"] = "\u001B[21m";
-    ColorEnum["Dim"] = "\u001B[2m";
-    ColorEnum["ResetDim"] = "\u001B[22m";
-    ColorEnum["Italic"] = "\u001B[3m";
-    ColorEnum["ResetItalic"] = "\u001B[23m";
-    ColorEnum["Underscore"] = "\u001B[4m";
-    ColorEnum["ResetUnderscore"] = "\u001B[24m";
-    ColorEnum["Blink"] = "\u001B[5m";
-    ColorEnum["ResetBlink"] = "\u001B[25m";
-    ColorEnum["Reverse"] = "\u001B[7m";
-    ColorEnum["ResetReverse"] = "\u001B[27m";
-    ColorEnum["Hidden"] = "\u001B[8m";
-    ColorEnum["ResetHidden"] = "\u001B[28m";
-    ColorEnum["FgBlack"] = "\u001B[30m";
-    ColorEnum["FgRed"] = "\u001B[31m";
-    ColorEnum["FgGreen"] = "\u001B[32m";
-    ColorEnum["FgYellow"] = "\u001B[33m";
-    ColorEnum["FgBlue"] = "\u001B[34m";
-    ColorEnum["FgMagenta"] = "\u001B[35m";
-    ColorEnum["FgCyan"] = "\u001B[36m";
-    ColorEnum["FgWhite"] = "\u001B[37m";
-    ColorEnum["FgGray"] = "\u001B[90m";
-    ColorEnum["BgBlack"] = "\u001B[40m";
-    ColorEnum["BgRed"] = "\u001B[41m";
-    ColorEnum["BgGreen"] = "\u001B[42m";
-    ColorEnum["BgYellow"] = "\u001B[43m";
-    ColorEnum["BgBlue"] = "\u001B[44m";
-    ColorEnum["BgMagenta"] = "\u001B[45m";
-    ColorEnum["BgCyan"] = "\u001B[46m";
-    ColorEnum["BgWhite"] = "\u001B[47m";
-    ColorEnum["BgGray"] = "\u001B[100m";
-})(ColorEnum || (ColorEnum = {}));
-function createLeftPad(length, char) {
-    if (char === void 0) { char = ' '; }
-    return function (text) {
-        return text.padStart(length, char);
-    };
-}
-function createRightPad(length, char) {
-    if (char === void 0) { char = ' '; }
-    return function (text) {
-        return text.padEnd(length, char);
-    };
 }
-function createFormatter$1(enableColors, colors, formatters) {
-    var fn = function (text) {
-        var e_1, _a;
-        try {
-            for (var formatters_1 = __values(formatters), formatters_1_1 = formatters_1.next(); !formatters_1_1.done; formatters_1_1 = formatters_1.next()) {
-                var formatter = formatters_1_1.value;
-                text = formatter(text);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (formatters_1_1 && !formatters_1_1.done && (_a = formatters_1.return)) _a.call(formatters_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return enableColors
-            ? colors.join('') + text + ColorEnum.Reset
-            : text;
-    };
-    Object.defineProperty(fn, 'black', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgBlack], false), formatters); },
-    });
-    Object.defineProperty(fn, 'red', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgRed], false), formatters); },
-    });
-    Object.defineProperty(fn, 'green', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgGreen], false), formatters); },
-    });
-    Object.defineProperty(fn, 'yellow', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgYellow], false), formatters); },
-    });
-    Object.defineProperty(fn, 'blue', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgBlue], false), formatters); },
-    });
-    Object.defineProperty(fn, 'magenta', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgMagenta], false), formatters); },
-    });
-    Object.defineProperty(fn, 'cyan', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgCyan], false), formatters); },
-    });
-    Object.defineProperty(fn, 'white', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgWhite], false), formatters); },
-    });
-    Object.defineProperty(fn, 'gray', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.FgGray], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgBlack', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgBlack], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgRed', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgRed], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgGreen', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgGreen], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgYellow', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgYellow], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgBlue', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgBlue], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgMagenta', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgMagenta], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgCyan', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgCyan], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgWhite', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgWhite], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bgGray', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.BgGray], false), formatters); },
-    });
-    Object.defineProperty(fn, 'reset', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Reset], false), formatters); },
-    });
-    Object.defineProperty(fn, 'bright', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Bright], false), formatters); },
-    });
-    Object.defineProperty(fn, 'dim', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Dim], false), formatters); },
-    });
-    Object.defineProperty(fn, 'italic', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Dim], false), formatters); },
-    });
-    Object.defineProperty(fn, 'underscore', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Underscore], false), formatters); },
-    });
-    Object.defineProperty(fn, 'blink', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Blink], false), formatters); },
-    });
-    Object.defineProperty(fn, 'reverse', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Reverse], false), formatters); },
-    });
-    Object.defineProperty(fn, 'hidden', {
-        get: function () { return createFormatter$1(enableColors, __spreadArray(__spreadArray([], __read(colors), false), [ColorEnum.Hidden], false), formatters); },
-    });
-    fn.leftPad = function (length, char) { return createFormatter$1(enableColors, colors, [createLeftPad(length, char)]); };
-    fn.rightPad = function (length, char) { return createFormatter$1(enableColors, colors, [createRightPad(length, char)]); };
-    return fn;
+catch (e_1_1) { e_1 = { error: e_1_1 }; }
+finally {
+    try {
+        if (functionNamesFromLitsSrc_1_1 && !functionNamesFromLitsSrc_1_1.done && (_a$1 = functionNamesFromLitsSrc_1.return)) _a$1.call(functionNamesFromLitsSrc_1);
+    }
+    finally { if (e_1) throw e_1.error; }
 }
-function createColorizer(enableColors) {
-    if (enableColors === void 0) { enableColors = true; }
-    return {
-        black: createFormatter$1(enableColors, [ColorEnum.FgBlack], []),
-        red: createFormatter$1(enableColors, [ColorEnum.FgRed], []),
-        green: createFormatter$1(enableColors, [ColorEnum.FgGreen], []),
-        yellow: createFormatter$1(enableColors, [ColorEnum.FgYellow], []),
-        blue: createFormatter$1(enableColors, [ColorEnum.FgBlue], []),
-        magenta: createFormatter$1(enableColors, [ColorEnum.FgMagenta], []),
-        cyan: createFormatter$1(enableColors, [ColorEnum.FgCyan], []),
-        white: createFormatter$1(enableColors, [ColorEnum.FgWhite], []),
-        gray: createFormatter$1(enableColors, [ColorEnum.FgGray], []),
-        bgBlack: createFormatter$1(enableColors, [ColorEnum.BgBlack], []),
-        bgRed: createFormatter$1(enableColors, [ColorEnum.BgRed], []),
-        bgGreen: createFormatter$1(enableColors, [ColorEnum.BgGreen], []),
-        bgYellow: createFormatter$1(enableColors, [ColorEnum.BgYellow], []),
-        bgBlue: createFormatter$1(enableColors, [ColorEnum.BgBlue], []),
-        bgMagenta: createFormatter$1(enableColors, [ColorEnum.BgMagenta], []),
-        bgCyan: createFormatter$1(enableColors, [ColorEnum.BgCyan], []),
-        bgWhite: createFormatter$1(enableColors, [ColorEnum.BgWhite], []),
-        bgGray: createFormatter$1(enableColors, [ColorEnum.BgGray], []),
-        reset: createFormatter$1(enableColors, [ColorEnum.Reset], []),
-        bright: createFormatter$1(enableColors, [ColorEnum.Bright], []),
-        dim: createFormatter$1(enableColors, [ColorEnum.Dim], []),
-        italic: createFormatter$1(enableColors, [ColorEnum.Italic], []),
-        underscore: createFormatter$1(enableColors, [ColorEnum.Underscore], []),
-        blink: createFormatter$1(enableColors, [ColorEnum.Blink], []),
-        reverse: createFormatter$1(enableColors, [ColorEnum.Reverse], []),
-        hidden: createFormatter$1(enableColors, [ColorEnum.Hidden], []),
-        leftPad: function (length, char) { return createFormatter$1(enableColors, [], [createLeftPad(length, char)]); },
-        rightPad: function (length, char) { return createFormatter$1(enableColors, [], [createRightPad(length, char)]); },
-    };
+try {
+    for (var functionNames_1 = __values(functionNames), functionNames_1_1 = functionNames_1.next(); !functionNames_1_1.done; functionNames_1_1 = functionNames_1.next()) {
+        var functionName = functionNames_1_1.value;
+        if (!functionNamesFromLitsSrc.includes(functionName))
+            throw new Error("Function name \"".concat(functionName, "\" is not included in the Lits source"));
+    }
 }
-
-function getCliType(fmt, arg) {
-    var argType = isSpecialExpressionArgument(arg) ? arg.type.slice(1) : arg.type;
-    var types = Array.isArray(argType) ? argType : [argType];
-    var typeString = types.map(function (type) {
-        return fmt.dim.red(type);
-    }).join(' | ');
-    return arg.array || arg.rest
-        ? "".concat(fmt.bright.blue('Array')).concat(fmt.bright.gray('<')).concat(fmt.white(typeString)).concat(fmt.bright.gray('>'))
-        : fmt.white(typeString);
+catch (e_2_1) { e_2 = { error: e_2_1 }; }
+finally {
+    try {
+        if (functionNames_1_1 && !functionNames_1_1.done && (_b = functionNames_1.return)) _b.call(functionNames_1);
+    }
+    finally { if (e_2) throw e_2.error; }
 }
-
-function getCliFunctionSignature(fmt, _a) {
-    var name = _a.title, variants = _a.variants, args = _a.args, returns = _a.returns;
-    return variants.map(function (variant) {
-        var form = (variant.argumentNames.length === 0)
-            ? "".concat(fmt.white('(')).concat(fmt.blue(name)).concat(fmt.white(')'))
-            : "".concat(fmt.white('(')).concat(fmt.blue(name), " ").concat(variant.argumentNames.map(function (argName) {
-                var result = '';
-                var arg = args[argName];
-                if (arg) {
-                    if (arg.rest)
-                        result += fmt.white('& ');
-                    result += "".concat(fmt.green(argName));
-                    if (arg.type === '*binding' || arg.type === '*for-binding')
-                        result = "".concat(fmt.white('[')).concat(result).concat(fmt.white(']'));
-                    else if (arg.type === '*arguments')
-                        result = "".concat(fmt.white('[')).concat(result).concat(fmt.white(']'));
-                    else if (arg.type === '*catch-expression')
-                        result = "".concat(fmt.white('(')).concat(result, " ").concat(fmt.bright.blue('body')).concat(fmt.white(')'));
-                }
-                return result;
-            }).join(' ')).concat(fmt.white(')'));
-        return "".concat(form, " ").concat(fmt.gray('=>'), " ").concat(getCliType(fmt, returns));
-    }).join('\n');
+function isApiName(arg) {
+    return apiNames.includes(arg);
 }
 
 function getClojureDocsLink(functionName, clojureDocs) {
@@ -16013,7 +15429,7 @@ function createFormatter(rules, options) {
     return format;
 }
 
-var variableRegExp$1 = new RegExp("^\\$".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*"));
+var variableRegExp$1 = new RegExp("^\\$".concat(nameCharacters, "+"));
 var noMatch = { count: 0, formattedText: '' };
 function createVariableRule(formatVariableName, variableNamePredicate) {
     return function (text, index) {
@@ -16036,11 +15452,11 @@ var getNumberRule = function (fmt) { return function (text, index) {
         var count = startMatch[0].length;
         var characterBefor = text[index - 1];
         var characterAfter = text[index + count];
-        if (characterBefor && new RegExp(identifierCharacterClass).test(characterBefor))
+        if (characterBefor && new RegExp(nameCharacters).test(characterBefor))
             return noMatch;
         if (characterBefor && numberRegExp.test(characterBefor))
             return noMatch;
-        if (characterAfter && new RegExp(identifierCharacterClass).test(characterAfter))
+        if (characterAfter && new RegExp(nameCharacters).test(characterAfter))
             return noMatch;
         if (characterAfter && numberRegExp.test(characterAfter))
             return noMatch;
@@ -16071,7 +15487,7 @@ var stringRule = createRule({
 });
 var shortcutStringRule = createRule({
     name: 'string',
-    startPattern: new RegExp("^:".concat(identifierCharacterClass, "+")),
+    startPattern: new RegExp("^:".concat(nameCharacters, "+")),
     startTag: ColorEnum.FgRed,
     endTag: ColorEnum.Reset,
     keepPatterns: true,
@@ -16080,7 +15496,7 @@ var shortcutStringRule = createRule({
 });
 var functionNameRule = createRule({
     name: 'functionName',
-    startPattern: new RegExp("^\\((?=".concat(identifierCharacterClass, "+)")),
+    startPattern: new RegExp("^\\((?=".concat(nameCharacters, "+)")),
     endPattern: /^[) \n]/,
     startTag: ColorEnum.FgBlue,
     endTag: ColorEnum.Reset,
@@ -16090,7 +15506,7 @@ var functionNameRule = createRule({
 });
 var nameRule = createRule({
     name: 'functionName',
-    startPattern: new RegExp("^".concat(identifierCharacterClass, "+")),
+    startPattern: new RegExp("^".concat(nameCharacters, "+")),
     startTag: "".concat(ColorEnum.Bright).concat(ColorEnum.FgBlue),
     endTag: ColorEnum.Reset,
     keepPatterns: true,
@@ -16231,7 +15647,7 @@ function createRule(_a) {
     };
 }
 
-var variableRegExp = new RegExp("\\$".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*"), 'g');
+var variableRegExp = new RegExp("\\$".concat(nameCharacters, "+"), 'g');
 function formatCliDescription(fmt, description, reference) {
     if (isFunctionReference(reference))
         return formatFunctionDescription(fmt, description, reference);
@@ -16374,9 +15790,9 @@ var historyResults = [];
 var lits = new Lits({ debug: true });
 var formatValue = getInlineCodeFormatter(fmt);
 var commands = ['`help', '`quit', '`builtins', '`context'];
-var expressionRegExp = new RegExp("^(.*\\(\\s*)(".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*)$"));
-var nameRegExp = new RegExp("^(.*?)(".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*)$"));
-var helpRegExp = new RegExp("^`help\\s+(".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "+)\\s*$"));
+var expressionRegExp = new RegExp("^(.*\\(\\s*)(".concat(nameCharacters, "*)$"));
+var nameRegExp = new RegExp("^(.*?)(".concat(nameCharacters, "*)$"));
+var helpRegExp = new RegExp("^`help\\s+(".concat(nameCharacters, "+)\\s*$"));
 var expressions = __spreadArray(__spreadArray([], __read(normalExpressionKeys), false), __read(specialExpressionKeys), false);
 var config = processArguments(process.argv.slice(2));
 if (config.eval) {