@rcrsr/rill 0.8.6 → 0.10.0

package/dist/parser/parser-collect.js

@@ -4,7 +4,7 @@
  */
 import { Parser } from './parser.js';
 import { ParseError, TOKEN_TYPES } from '../types.js';
-import { check, expect, current, makeSpan, peek } from './state.js';
+import { advance, check, expect, current, makeSpan, peek } from './state.js';
 import { isClosureStart, parseBareHostCall } from './helpers.js';
 // ============================================================
 // COLLECTION OPERATOR BODY
@@ -23,9 +23,6 @@ Parser.prototype.parseIteratorBody = function () {
         check(this.state, TOKEN_TYPES.PIPE_VAR)) {
         return this.parseVariable();
     }
-    if (check(this.state, TOKEN_TYPES.STAR)) {
-        return this.parseSpread();
-    }
     // Method shorthand: .method applies method to each element
     if (check(this.state, TOKEN_TYPES.DOT)) {
         return this.parsePostfixExpr();
@@ -34,7 +31,7 @@ Parser.prototype.parseIteratorBody = function () {
     if (check(this.state, TOKEN_TYPES.IDENTIFIER)) {
         return parseBareHostCall(this.state);
     }
-    throw new ParseError('RILL-P001', `Expected collection body (closure, block, grouped, variable, spread, method, or function), got: ${current(this.state).value}`, current(this.state).span.start);
+    throw new ParseError('RILL-P001', `Expected collection body (closure, block, grouped, variable, method, or function), got: ${current(this.state).value}`, current(this.state).span.start);
 };
 Parser.prototype.hasAccumulatorPrefix = function () {
     if (!check(this.state, TOKEN_TYPES.LPAREN)) {
@@ -70,11 +67,19 @@ Parser.prototype.parseEachExpr = function () {
     if (this.hasAccumulatorPrefix()) {
         accumulator = this.parseGrouped().expression;
     }
+    let annotations;
+    if (check(this.state, TOKEN_TYPES.CARET)) {
+        advance(this.state); // consume ^
+        expect(this.state, TOKEN_TYPES.LPAREN, 'Expected (');
+        annotations = this.parseAnnotationArgs();
+        expect(this.state, TOKEN_TYPES.RPAREN, 'Expected )', 'RILL-P005');
+    }
     const body = this.parseIteratorBody();
     return {
         type: 'EachExpr',
         body,
         accumulator,
+        annotations,
         span: makeSpan(start, current(this.state).span.end),
     };
 };
@@ -84,10 +89,18 @@ Parser.prototype.parseEachExpr = function () {
 Parser.prototype.parseMapExpr = function () {
     const start = current(this.state).span.start;
     expect(this.state, TOKEN_TYPES.MAP, 'Expected map');
+    let annotations;
+    if (check(this.state, TOKEN_TYPES.CARET)) {
+        advance(this.state); // consume ^
+        expect(this.state, TOKEN_TYPES.LPAREN, 'Expected (');
+        annotations = this.parseAnnotationArgs();
+        expect(this.state, TOKEN_TYPES.RPAREN, 'Expected )', 'RILL-P005');
+    }
     const body = this.parseIteratorBody();
     return {
         type: 'MapExpr',
         body,
+        annotations,
         span: makeSpan(start, current(this.state).span.end),
     };
 };
@@ -101,11 +114,19 @@ Parser.prototype.parseFoldExpr = function () {
     if (this.hasAccumulatorPrefix()) {
         accumulator = this.parseGrouped().expression;
     }
+    let annotations;
+    if (check(this.state, TOKEN_TYPES.CARET)) {
+        advance(this.state); // consume ^
+        expect(this.state, TOKEN_TYPES.LPAREN, 'Expected (');
+        annotations = this.parseAnnotationArgs();
+        expect(this.state, TOKEN_TYPES.RPAREN, 'Expected )', 'RILL-P005');
+    }
     const body = this.parseIteratorBody();
     return {
         type: 'FoldExpr',
         body,
         accumulator,
+        annotations,
         span: makeSpan(start, current(this.state).span.end),
     };
 };
@@ -115,10 +136,18 @@ Parser.prototype.parseFoldExpr = function () {
 Parser.prototype.parseFilterExpr = function () {
     const start = current(this.state).span.start;
     expect(this.state, TOKEN_TYPES.FILTER, 'Expected filter');
+    let annotations;
+    if (check(this.state, TOKEN_TYPES.CARET)) {
+        advance(this.state); // consume ^
+        expect(this.state, TOKEN_TYPES.LPAREN, 'Expected (');
+        annotations = this.parseAnnotationArgs();
+        expect(this.state, TOKEN_TYPES.RPAREN, 'Expected )', 'RILL-P005');
+    }
     const body = this.parseIteratorBody();
     return {
         type: 'FilterExpr',
         body,
+        annotations,
         span: makeSpan(start, current(this.state).span.end),
     };
 };

package/dist/parser/parser-collect.js.map

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

package/dist/parser/parser-control.d.ts

@@ -14,7 +14,7 @@ declare module './parser.js' {
         }): ConditionalNode;
         parseLoop(condition: ExpressionNode | null): WhileLoopNode | DoWhileLoopNode;
         parseLoopWithInput(condition: BodyNode): WhileLoopNode | DoWhileLoopNode;
-        parseBlock(): BlockNode;
+        parseBlock(allowEmpty?: boolean): BlockNode;
         parseAssert(): AssertNode;
         parseError(requireMessage?: boolean): ErrorNode;
     }

package/dist/parser/parser-control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser-control.d.ts","sourceRoot":"","sources":["../../src/parser/parser-control.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAEV,UAAU,EACV,SAAS,EACT,eAAe,EACf,eAAe,EACf,SAAS,EACT,cAAc,EAEd,aAAa,EACb,QAAQ,EAET,MAAM,aAAa,CAAC;AAcrB,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,MAAM;QACd,qBAAqB,IAAI,eAAe,CAAC;QACzC,6BAA6B,CAAC,aAAa,EAAE,QAAQ,GAAG,eAAe,CAAC;QACxE,oBAAoB,CAClB,SAAS,EAAE,QAAQ,GAAG,IAAI,EAC1B,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,GACtD,eAAe,CAAC;QACnB,SAAS,CACP,SAAS,EAAE,cAAc,GAAG,IAAI,GAC/B,aAAa,GAAG,eAAe,CAAC;QACnC,kBAAkB,CAAC,SAAS,EAAE,QAAQ,GAAG,aAAa,GAAG,eAAe,CAAC;QACzE,UAAU,IAAI,SAAS,CAAC;QACxB,WAAW,IAAI,UAAU,CAAC;QAC1B,UAAU,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KACjD;CACF"}
+{"version":3,"file":"parser-control.d.ts","sourceRoot":"","sources":["../../src/parser/parser-control.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAGV,UAAU,EACV,SAAS,EACT,eAAe,EACf,eAAe,EACf,SAAS,EACT,cAAc,EAEd,aAAa,EACb,QAAQ,EAET,MAAM,aAAa,CAAC;AAcrB,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,MAAM;QACd,qBAAqB,IAAI,eAAe,CAAC;QACzC,6BAA6B,CAAC,aAAa,EAAE,QAAQ,GAAG,eAAe,CAAC;QACxE,oBAAoB,CAClB,SAAS,EAAE,QAAQ,GAAG,IAAI,EAC1B,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,GACtD,eAAe,CAAC;QACnB,SAAS,CACP,SAAS,EAAE,cAAc,GAAG,IAAI,GAC/B,aAAa,GAAG,eAAe,CAAC;QACnC,kBAAkB,CAAC,SAAS,EAAE,QAAQ,GAAG,aAAa,GAAG,eAAe,CAAC;QACzE,UAAU,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC5C,WAAW,IAAI,UAAU,CAAC;QAC1B,UAAU,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KACjD;CACF"}

package/dist/parser/parser-control.js

@@ -51,6 +51,13 @@ Parser.prototype.parseLoop = function (condition) {
         ? condition.span.start
         : current(this.state).span.start;
     expect(this.state, TOKEN_TYPES.AT, 'Expected @');
+    let annotations;
+    if (check(this.state, TOKEN_TYPES.CARET)) {
+        advance(this.state); // consume ^
+        expect(this.state, TOKEN_TYPES.LPAREN, 'Expected (');
+        annotations = this.parseAnnotationArgs();
+        expect(this.state, TOKEN_TYPES.RPAREN, 'Expected )', 'RILL-P005');
+    }
     const body = this.parseBody();
     // Check for do-while: @ body ? cond
     if (check(this.state, TOKEN_TYPES.QUESTION)) {
@@ -61,6 +68,7 @@ Parser.prototype.parseLoop = function (condition) {
             input: condition,
             body,
             condition: doWhileCondition,
+            annotations,
             span: makeSpan(start, current(this.state).span.end),
         };
     }
@@ -72,6 +80,7 @@ Parser.prototype.parseLoop = function (condition) {
         type: 'WhileLoop',
         condition,
         body,
+        annotations,
         span: makeSpan(start, current(this.state).span.end),
     };
 };
@@ -102,7 +111,7 @@ Parser.prototype.parseLoopWithInput = function (condition) {
 // ============================================================
 // BLOCKS
 // ============================================================
-Parser.prototype.parseBlock = function () {
+Parser.prototype.parseBlock = function (allowEmpty) {
     const start = current(this.state).span.start;
     expect(this.state, TOKEN_TYPES.LBRACE, 'Expected {');
     skipNewlines(this.state);
@@ -111,7 +120,7 @@ Parser.prototype.parseBlock = function () {
         statements.push(this.parseStatement());
         skipNewlines(this.state);
     }
-    if (statements.length === 0) {
+    if (statements.length === 0 && !allowEmpty) {
         throw new ParseError('RILL-P004', 'Empty blocks are not allowed', start);
     }
     const rbrace = expect(this.state, TOKEN_TYPES.RBRACE, 'Expected }');

package/dist/parser/parser-control.js.map

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

package/dist/parser/parser-expr.d.ts

@@ -2,7 +2,7 @@
  * Parser Extension: Expression Parsing
  * Expressions, precedence chain, pipe chains, and pipe targets
  */
-import type { ArithHead, BlockNode, CaptureNode, ConditionalNode, DoWhileLoopNode, ExpressionNode, WhileLoopNode, GroupedExprNode, InvokeNode, PipeChainNode, PipeTargetNode, PostfixExprNode, PrimaryNode, SourceLocation, SourceSpan, UnaryExprNode } from '../types.js';
+import type { ArithHead, BlockNode, CaptureNode, ClosureSigLiteralNode, ConditionalNode, ConvertNode, DoWhileLoopNode, ExpressionNode, WhileLoopNode, GroupedExprNode, InvokeNode, PipeChainNode, PipeTargetNode, PostfixExprNode, PrimaryNode, SourceLocation, SourceSpan, UnaryExprNode } from '../types.js';
 /** Constructs valid as both primary expressions and pipe targets */
 type CommonConstruct = ConditionalNode | WhileLoopNode | DoWhileLoopNode | BlockNode | GroupedExprNode;
 declare module './parser.js' {
@@ -31,6 +31,8 @@ declare module './parser.js' {
         tokenToComparisonOp(tokenType: string): '==' | '!=' | '<' | '>' | '<=' | '>=';
         wrapConditionalInPostfixExpr(conditional: ConditionalNode, span: SourceSpan): PostfixExprNode;
         wrapLoopInPostfixExpr(loop: WhileLoopNode | DoWhileLoopNode, span: SourceSpan): PostfixExprNode;
+        parseClosureSigLiteral(): ClosureSigLiteralNode;
+        parseConvert(): ConvertNode;
     }
 }
 export {};

package/dist/parser/parser-expr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser-expr.d.ts","sourceRoot":"","sources":["../../src/parser/parser-expr.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EACV,SAAS,EAET,SAAS,EAET,WAAW,EAEX,eAAe,EACf,eAAe,EACf,cAAc,EACd,aAAa,EACb,eAAe,EACf,UAAU,EAEV,aAAa,EACb,cAAc,EACd,eAAe,EACf,WAAW,EACX,cAAc,EACd,UAAU,EACV,aAAa,EAEd,MAAM,aAAa,CAAC;AA6BrB,oEAAoE;AACpE,KAAK,eAAe,GAChB,eAAe,GACf,aAAa,GACb,eAAe,GACf,SAAS,GACT,eAAe,CAAC;AAGpB,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,MAAM;QACd,eAAe,IAAI,cAAc,CAAC;QAClC,cAAc,IAAI,aAAa,CAAC;QAChC,gBAAgB,IAAI,eAAe,CAAC;QACpC,oBAAoB,IAAI,eAAe,CAAC;QACxC,YAAY,IAAI,WAAW,CAAC;QAC5B,eAAe,IAAI,cAAc,CAAC;QAClC,YAAY,IAAI,WAAW,CAAC;QAC5B,YAAY,IAAI,eAAe,CAAC;QAChC,oBAAoB,IAAI,eAAe,GAAG,IAAI,CAAC;QAC/C,cAAc,IAAI,SAAS,CAAC;QAC5B,eAAe,IAAI,SAAS,CAAC;QAC7B,eAAe,IAAI,SAAS,CAAC;QAC7B,aAAa,IAAI,SAAS,CAAC;QAC3B,mBAAmB,IAAI,SAAS,CAAC;QACjC,UAAU,IAAI,aAAa,GAAG,eAAe,CAAC;QAC9C,WAAW,IAAI,UAAU,CAAC;QAC1B,eAAe,CAAC,IAAI,EAAE;YACpB,KAAK,EAAE,cAAc,CAAC;YACtB,GAAG,EAAE,cAAc,CAAC;SACrB,GAAG,eAAe,CAAC;QACpB,cAAc,IAAI,OAAO,CAAC;QAC1B,mBAAmB,CACjB,SAAS,EAAE,MAAM,GAChB,IAAI,GAAG,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;QACzC,4BAA4B,CAC1B,WAAW,EAAE,eAAe,EAC5B,IAAI,EAAE,UAAU,GACf,eAAe,CAAC;QACnB,qBAAqB,CACnB,IAAI,EAAE,aAAa,GAAG,eAAe,EACrC,IAAI,EAAE,UAAU,GACf,eAAe,CAAC;KACpB;CACF"}
+{"version":3,"file":"parser-expr.d.ts","sourceRoot":"","sources":["../../src/parser/parser-expr.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAGV,SAAS,EAET,SAAS,EAET,WAAW,EAEX,qBAAqB,EACrB,eAAe,EACf,WAAW,EACX,eAAe,EACf,cAAc,EACd,aAAa,EACb,eAAe,EACf,UAAU,EAEV,aAAa,EACb,cAAc,EACd,eAAe,EACf,WAAW,EAGX,cAAc,EACd,UAAU,EAIV,aAAa,EAEd,MAAM,aAAa,CAAC;AA4BrB,oEAAoE;AACpE,KAAK,eAAe,GAChB,eAAe,GACf,aAAa,GACb,eAAe,GACf,SAAS,GACT,eAAe,CAAC;AAGpB,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,MAAM;QACd,eAAe,IAAI,cAAc,CAAC;QAClC,cAAc,IAAI,aAAa,CAAC;QAChC,gBAAgB,IAAI,eAAe,CAAC;QACpC,oBAAoB,IAAI,eAAe,CAAC;QACxC,YAAY,IAAI,WAAW,CAAC;QAC5B,eAAe,IAAI,cAAc,CAAC;QAClC,YAAY,IAAI,WAAW,CAAC;QAC5B,YAAY,IAAI,eAAe,CAAC;QAChC,oBAAoB,IAAI,eAAe,GAAG,IAAI,CAAC;QAC/C,cAAc,IAAI,SAAS,CAAC;QAC5B,eAAe,IAAI,SAAS,CAAC;QAC7B,eAAe,IAAI,SAAS,CAAC;QAC7B,aAAa,IAAI,SAAS,CAAC;QAC3B,mBAAmB,IAAI,SAAS,CAAC;QACjC,UAAU,IAAI,aAAa,GAAG,eAAe,CAAC;QAC9C,WAAW,IAAI,UAAU,CAAC;QAC1B,eAAe,CAAC,IAAI,EAAE;YACpB,KAAK,EAAE,cAAc,CAAC;YACtB,GAAG,EAAE,cAAc,CAAC;SACrB,GAAG,eAAe,CAAC;QACpB,cAAc,IAAI,OAAO,CAAC;QAC1B,mBAAmB,CACjB,SAAS,EAAE,MAAM,GAChB,IAAI,GAAG,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;QACzC,4BAA4B,CAC1B,WAAW,EAAE,eAAe,EAC5B,IAAI,EAAE,UAAU,GACf,eAAe,CAAC;QACnB,qBAAqB,CACnB,IAAI,EAAE,aAAa,GAAG,eAAe,EACrC,IAAI,EAAE,UAAU,GACf,eAAe,CAAC;QACnB,sBAAsB,IAAI,qBAAqB,CAAC;QAChD,YAAY,IAAI,WAAW,CAAC;KAC7B;CACF"}