@fluffjs/cli 0.1.12 → 0.1.14

package/CodeGenerator.js

@@ -247,6 +247,12 @@ export class CodeGenerator {
             throw new Error(`Binding for ${binding.name} is missing expression`);
         }
         result.e = this.internExpression(binding.expression);
+        if (binding.pipes && binding.pipes.length > 0) {
+            result.p = binding.pipes.map(pipe => ({
+                n: pipe.name,
+                a: pipe.args.map(arg => this.internExpression(arg))
+            }));
+        }
         return result;
     }
     internExpression(expr) {

package/ExpressionTransformer.js

@@ -190,7 +190,7 @@ export class ExpressionTransformer {
         const { loc } = e;
         return loc !== null && typeof loc === 'object' && 'index' in loc && typeof loc.index === 'number';
     }
-    static tokenizeExpression(code, startPos = 0) {
+    static tokenizeExpression(code, delimiters, startPos = 0) {
         const substring = code.slice(startPos);
         let tokens = [];
         try {
@@ -237,7 +237,7 @@ export class ExpressionTransformer {
                 tokenCount = i;
                 break;
             }
-            if (depth === 0 && (token.type.label === '|' || token.type.label === ';' || token.type.label === ':')) {
+            if (depth === 0 && delimiters.includes(token.type.label)) {
                 stopIndex = token.start;
                 stopReason = 'delimiter';
                 tokenCount = i;
@@ -305,7 +305,7 @@ export class ExpressionTransformer {
     static parsePrimaryExpression(text, startPos) {
         const offset = startPos ?? 0;
         const pipes = [];
-        const tokenResult = ExpressionTransformer.tokenizeExpression(text, offset);
+        const tokenResult = ExpressionTransformer.tokenizeExpression(text, ['|', ';'], offset);
         if (tokenResult.tokenCount === 0) {
             return {
                 expression: text.slice(offset)
@@ -344,7 +344,7 @@ export class ExpressionTransformer {
                 }
                 const prefix = `_arg${args.length + 1}=`;
                 const argText = prefix + text.slice(pos);
-                const argTokenResult = ExpressionTransformer.tokenizeExpression(argText, 0);
+                const argTokenResult = ExpressionTransformer.tokenizeExpression(argText, ['|', ':', ';'], 0);
                 const argEndPos = argTokenResult.index - prefix.length;
                 if (argTokenResult.tokenCount > 0) {
                     const argCandidate = text.slice(pos, pos + argEndPos)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluffjs/cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "type": "module",
   "main": "./index.js",
   "module": "./index.js",