@mojir/lits 2.0.4 → 2.0.6

package/dist/lits.iife.js

@@ -3163,7 +3163,7 @@ var Lits = (function (exports) {
         },
     };
 
-    var version = "2.0.4";
+    var version = "2.0.6";
 
     var uuidTemplate = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
     var xyRegexp = /[xy]/g;
@@ -7386,14 +7386,22 @@ var Lits = (function (exports) {
                     return parseReservedSymbol(this.tokenStream, this.parseState);
                 case 'PolNotation': {
                     this.parseState.algebraic = false;
-                    var astNode = void 0;
+                    var astNodes = [];
                     this.advance();
                     do {
-                        astNode = this.parseState.parseToken(this.tokenStream, this.parseState);
+                        astNodes.push(this.parseState.parseToken(this.tokenStream, this.parseState));
                     } while (!isEndNotationToken(this.peek()));
                     this.advance();
                     this.parseState.algebraic = true;
-                    return astNode;
+                    if (astNodes.length === 1) {
+                        return astNodes[0];
+                    }
+                    return {
+                        t: exports.AstNodeType.SpecialExpression,
+                        n: 'do',
+                        p: astNodes,
+                        token: getTokenDebugData(token) && token,
+                    };
                 }
                 case 'AlgNotation': {
                     this.advance();
@@ -7888,13 +7896,21 @@ var Lits = (function (exports) {
                 return node;
             }
             case 'PolNotation': {
-                var node = void 0;
+                var astNodes = [];
                 parseState.position += 1;
                 do {
-                    node = parsePolishToken(tokenStream, parseState);
+                    astNodes.push(parsePolishToken(tokenStream, parseState));
                 } while (!isEndNotationToken(asToken(tokenStream.tokens[parseState.position])));
                 parseState.position += 1;
-                return node;
+                if (astNodes.length === 1) {
+                    return astNodes[0];
+                }
+                return {
+                    t: exports.AstNodeType.SpecialExpression,
+                    n: 'do',
+                    p: astNodes,
+                    token: astNodes[0].token,
+                };
             }
             case 'P_CollectionAccessor':
             case 'P_Modifier':
@@ -8815,10 +8831,9 @@ var Lits = (function (exports) {
             return analyze(ast, params);
         };
         Lits.prototype.tokenize = function (program, tokenizeParams) {
-            var _a, _b;
             if (tokenizeParams === void 0) { tokenizeParams = {}; }
-            var debug = (_a = tokenizeParams.debug) !== null && _a !== void 0 ? _a : this.debug;
-            var algebraic = (_b = tokenizeParams.algebraic) !== null && _b !== void 0 ? _b : this.algebraic;
+            var debug = this.debug;
+            var algebraic = this.algebraic;
             return tokenize(program, __assign(__assign({}, tokenizeParams), { debug: debug, algebraic: algebraic }));
         };
         Lits.prototype.parse = function (tokenStream) {
@@ -8838,12 +8853,7 @@ var Lits = (function (exports) {
             var _a;
             if (params === void 0) { params = {}; }
             var fnName = 'FN_2eb7b316-471c-5bfa-90cb-d3dfd9164a59';
-            var paramsString = fnParams
-                .map(function (_, index) {
-                return "".concat(fnName, "_").concat(index);
-            })
-                .join(' ');
-            var program = "(".concat(fnName, " ").concat(paramsString, ")");
+            var program = this.generateApplyFunctionCall(fnName, fnParams);
             var ast = this.generateAst(program, params);
             var hostValues = fnParams.reduce(function (result, param, index) {
                 result["".concat(fnName, "_").concat(index)] = param;
@@ -8852,20 +8862,26 @@ var Lits = (function (exports) {
             params.values = __assign(__assign({}, params.values), hostValues);
             return this.evaluate(ast, params);
         };
+        Lits.prototype.generateApplyFunctionCall = function (fnName, fnParams) {
+            var paramsString = fnParams
+                .map(function (_, index) {
+                return "".concat(fnName, "_").concat(index);
+            })
+                .join(this.algebraic ? ', ' : ' ');
+            return this.algebraic ? "".concat(fnName, "(").concat(paramsString, ")") : "(".concat(fnName, " ").concat(paramsString, ")");
+        };
         Lits.prototype.generateAst = function (program, params) {
-            var _a, _b, _c;
+            var _a;
             if (this.astCache) {
                 var cachedAst = this.astCache.get(program);
                 if (cachedAst)
                     return cachedAst;
             }
             var tokenStream = this.tokenize(program, {
-                debug: (_a = params.debug) !== null && _a !== void 0 ? _a : this.debug,
                 filePath: params.filePath,
-                algebraic: (_b = params.algebraic) !== null && _b !== void 0 ? _b : this.algebraic,
             });
             var ast = this.parse(tokenStream);
-            (_c = this.astCache) === null || _c === void 0 ? void 0 : _c.set(program, ast);
+            (_a = this.astCache) === null || _a === void 0 ? void 0 : _a.set(program, ast);
             return ast;
         };
         return Lits;