@mojir/lits 2.1.35 → 2.1.37

package/dist/testFramework.js

@@ -11800,7 +11800,6 @@ var lambdaSpecialExpression = {
             _b.arity = arity,
             _b.docString = docString,
             _b);
-        evaluatedFunction[2].self = { value: litsFunction };
         return litsFunction;
     },
     getUndefinedSymbols: function (node, contextStack, _a) {
@@ -12475,13 +12474,13 @@ var functionExecutors = {
             var args = evaluatedFunction[0];
             var nbrOfNonRestArgs = args.filter(function (arg) { return arg[0] !== bindingTargetTypes.rest; }).length;
             var newContextStack = contextStack.create(fn.evaluatedfunction[2]);
-            var newContext = {};
+            var newContext = { self: { value: fn } };
             var rest = [];
             for (var i = 0; i < params.length; i += 1) {
                 if (i < nbrOfNonRestArgs) {
                     var param = toAny(params[i]);
-                    var valueRecord = evalueateBindingNodeValues(args[i], param, function (Node) {
-                        return evaluateNode(Node, newContextStack.create(newContext));
+                    var valueRecord = evalueateBindingNodeValues(args[i], param, function (node) {
+                        return evaluateNode(node, newContextStack.create(newContext));
                     });
                     Object.entries(valueRecord).forEach(function (_a) {
                         var _b = __read(_a, 2), key = _b[0], value = _b[1];
@@ -12495,8 +12494,8 @@ var functionExecutors = {
             for (var i = params.length; i < nbrOfNonRestArgs; i++) {
                 var arg = args[i];
                 var defaultValue = evaluateNode(arg[1][1], contextStack.create(newContext));
-                var valueRecord = evalueateBindingNodeValues(arg, defaultValue, function (Node) {
-                    return evaluateNode(Node, contextStack.create(newContext));
+                var valueRecord = evalueateBindingNodeValues(arg, defaultValue, function (node) {
+                    return evaluateNode(node, contextStack.create(newContext));
                 });
                 Object.entries(valueRecord).forEach(function (_a) {
                     var _b = __read(_a, 2), key = _b[0], value = _b[1];
@@ -12505,7 +12504,7 @@ var functionExecutors = {
             }
             var restArgument = args.find(function (arg) { return arg[0] === bindingTargetTypes.rest; });
             if (restArgument !== undefined) {
-                var valueRecord = evalueateBindingNodeValues(restArgument, rest, function (Node) { return evaluateNode(Node, contextStack.create(newContext)); });
+                var valueRecord = evalueateBindingNodeValues(restArgument, rest, function (node) { return evaluateNode(node, contextStack.create(newContext)); });
                 Object.entries(valueRecord).forEach(function (_a) {
                     var _b = __read(_a, 2), key = _b[0], value = _b[1];
                     newContext[key] = { value: value };
@@ -13044,6 +13043,21 @@ var ContextStackImpl = /** @class */ (function () {
     };
     return ContextStackImpl;
 }());
+function checkNotDefined(name) {
+    if (specialExpressionKeys.includes(name)) {
+        console.warn("Cannot shadow special expression \"".concat(name, "\", ignoring."));
+        return false;
+    }
+    if (normalExpressionKeys.includes(name)) {
+        console.warn("Cannot shadow builtin function \"".concat(name, "\", ignoring."));
+        return false;
+    }
+    if (name === 'self') {
+        console.warn("Cannot shadow builtin value \"".concat(name, "\", ignoring."));
+        return false;
+    }
+    return true;
+}
 function createContextStack(params) {
     var _a;
     if (params === void 0) { params = {}; }
@@ -13055,26 +13069,53 @@ function createContextStack(params) {
         values: params.values,
         nativeJsFunctions: params.jsFunctions
             && Object.entries(params.jsFunctions).reduce(function (acc, _a) {
-                var _b;
-                var _c, _d;
-                var _e = __read(_a, 2), name = _e[0], jsFunction = _e[1];
-                if (specialExpressionKeys.includes(name)) {
-                    console.warn("Cannot shadow special expression \"".concat(name, "\", ignoring."));
+                var e_5, _b, _c;
+                var _d, _e;
+                var _f = __read(_a, 2), identifier = _f[0], entry = _f[1];
+                var identifierParts = identifier.split('.');
+                var name = identifierParts.pop();
+                if (/^[A-Z]/.test(name)) {
+                    console.warn("Invalid identifier \"".concat(identifier, "\" in jsFunctions, function name must not start with an uppercase letter"), undefined);
                     return acc;
                 }
-                if (normalExpressionKeys.includes(name)) {
-                    console.warn("Cannot shadow builtin function \"".concat(name, "\", ignoring."));
-                    return acc;
+                var scope = acc;
+                try {
+                    for (var identifierParts_1 = __values(identifierParts), identifierParts_1_1 = identifierParts_1.next(); !identifierParts_1_1.done; identifierParts_1_1 = identifierParts_1.next()) {
+                        var part = identifierParts_1_1.value;
+                        if (part.length === 0) {
+                            console.warn("Invalid empty identifier \"".concat(identifier, "\" in nativeJsFunctions"), undefined);
+                            return acc;
+                        }
+                        if (!/^[A-Z]/.test(part)) {
+                            console.warn("Invalid identifier \"".concat(identifier, "\" in jsFunctions, namespace must start with an uppercase letter"), undefined);
+                            return acc;
+                        }
+                        if (!scope[part]) {
+                            scope[part] = {};
+                        }
+                        scope = scope[part];
+                    }
                 }
-                acc[name] = (_b = {
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (identifierParts_1_1 && !identifierParts_1_1.done && (_b = identifierParts_1.return)) _b.call(identifierParts_1);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
+                var natifeFn = (_c = {
                         functionType: 'NativeJsFunction',
-                        nativeFn: jsFunction,
+                        nativeFn: entry,
                         name: name
                     },
-                    _b[FUNCTION_SYMBOL] = true,
-                    _b.arity = (_c = jsFunction.arity) !== null && _c !== void 0 ? _c : {},
-                    _b.docString = (_d = jsFunction.docString) !== null && _d !== void 0 ? _d : '',
-                    _b);
+                    _c[FUNCTION_SYMBOL] = true,
+                    _c.arity = (_d = entry.arity) !== null && _d !== void 0 ? _d : {},
+                    _c.docString = (_e = entry.docString) !== null && _e !== void 0 ? _e : '',
+                    _c);
+                if (scope === acc && !checkNotDefined(name)) {
+                    return acc;
+                }
+                scope[name] = natifeFn;
                 return acc;
             }, {}),
     });
@@ -13915,9 +13956,6 @@ var Parser = /** @class */ (function () {
                 case 'doseq':
                     left = this.parseForOrDoseq(firstToken);
                     break;
-                // cas:
-                //   left = this.parseDo(firstToken)
-                //   break
                 case 'loop':
                     left = this.parseLoop(firstToken);
                     break;
@@ -14119,6 +14157,12 @@ var Parser = /** @class */ (function () {
                     params.push(withSourceCodeInfo([NodeTypes.String, value], token[2]));
                     this.advance();
                 }
+                else if (isLBracketToken(token)) {
+                    this.advance();
+                    params.push(this.parseExpression());
+                    assertRBracketToken(this.peek());
+                    this.advance();
+                }
                 else {
                     throw new LitsError('Expected key to be a symbol or a string', this.peekSourceCodeInfo());
                 }
@@ -14249,9 +14293,17 @@ var Parser = /** @class */ (function () {
             var nodes = void 0;
             var docString = '';
             if (isLBraceToken(this.peek())) {
-                var parsedBlock = this.parseBlock(true);
-                docString = parsedBlock[1];
-                nodes = parsedBlock[0][1][1];
+                var positionBefore = this.parseState.position;
+                try {
+                    var objectNode = this.parseObject();
+                    nodes = [objectNode];
+                }
+                catch (_a) {
+                    this.parseState.position = positionBefore;
+                    var parsedBlock = this.parseBlock(true);
+                    docString = parsedBlock[1];
+                    nodes = parsedBlock[0][1][1];
+                }
             }
             else {
                 nodes = [this.parseExpression()];
@@ -14268,7 +14320,7 @@ var Parser = /** @class */ (function () {
                 ],
             ], firstToken[2]);
         }
-        catch (_a) {
+        catch (_b) {
             return null;
         }
     };
@@ -14318,9 +14370,17 @@ var Parser = /** @class */ (function () {
         var nodes;
         var docString = '';
         if (isLBraceToken(this.peek())) {
-            var parsedBlock = this.parseBlock(true);
-            docString = parsedBlock[1];
-            nodes = parsedBlock[0][1][1];
+            var positionBefore = this.parseState.position;
+            try {
+                var objectNode = this.parseObject();
+                nodes = [objectNode];
+            }
+            catch (_b) {
+                this.parseState.position = positionBefore;
+                var parsedBlock = this.parseBlock(true);
+                docString = parsedBlock[1];
+                nodes = parsedBlock[0][1][1];
+            }
         }
         else {
             nodes = [this.parseExpression()];
@@ -14518,9 +14578,6 @@ var Parser = /** @class */ (function () {
                 throw new LitsError('Expected }', this.peekSourceCodeInfo());
             }
         }
-        if (expressions.length === 0) {
-            expressions.push(withSourceCodeInfo([NodeTypes.ReservedSymbol, 'null'], token[2]));
-        }
         assertRBraceToken(this.peek());
         this.advance();
         return [
@@ -26633,6 +26690,50 @@ var sequenceReference = {
 };
 
 var specialExpressionsReference = {
+    'doseq': {
+        title: 'doseq',
+        category: 'Special expression',
+        customVariants: ['doseq (...binding) -> body'],
+        details: [
+            ['binding', 'loop-var in collection [...let-binding] [where whereExpr] [while whileExp]', 'A doseq loop binding'],
+            ['loop-var', 'symbol', 'The name of the loop variable.'],
+            ['collection', 'any', 'The collection to iterate over.'],
+            ['let-binding', 'let binding', 'A let binding to create a local variable.'],
+            ['whereExpr', 'expression', 'An expression that must evaluate to truthy for the loop body to be executed.'],
+            ['whileExp', 'expression', 'An expression that must evaluate to truthy for the loop to continue.'],
+            ['body', 'expressions', 'The expressions to evaluate for each iteration of the loop.'],
+        ],
+        returns: {
+            type: 'null',
+        },
+        description: 'Iterates over `bindings`, evaluates `body` for each `binding` and returns `null`. This is useful for side effects.',
+        examples: [
+            "\ndoseq (i in [1, 2, 3]) -> write!(i * 2)\n      ",
+        ],
+    },
+    'for': {
+        title: 'for',
+        category: 'Special expression',
+        customVariants: ['for (...binding) -> body'],
+        details: [
+            ['binding', 'loop-var in collection [...let-binding] [where whereExpr] [while whileExp]', 'A for loop binding'],
+            ['loop-var', 'symbol', 'The name of the loop variable.'],
+            ['collection', 'any', 'The collection to iterate over.'],
+            ['let-binding', 'let binding', 'A let binding to create a local variable.'],
+            ['whereExpr', 'expression', 'An expression that must evaluate to truthy for the loop body to be executed.'],
+            ['whileExp', 'expression', 'An expression that must evaluate to truthy for the loop to continue.'],
+            ['body', 'expressions', 'The expressions to evaluate for each iteration of the loop.'],
+        ],
+        returns: {
+            type: 'any',
+            array: true,
+        },
+        description: 'Iterates over `bindings`, evaluates `body` for each `binding` and returns an `array` of results.',
+        examples: [
+            "\nfor (i in [1, 2, 3]) -> i * 2\n      ",
+            "\nfor (\n  i in range(10) let ii = i ^ 2 while ii < 40 when ii % 3 == 0,\n  j in range(10) when j % 2 == 1\n) -> ii + j\n      ",
+        ],
+    },
     'array': {
         title: 'array',
         category: 'Special expression',