@aeriajs/compiler 0.0.28 → 0.0.29

package/dist/ast.d.ts

@@ -34,6 +34,7 @@ export type FormLayoutNode = NodeBase<'formLayout'> & FormLayout<Description> &
                 field: FormLayoutField<Description>;
             };
         };
+        terms?: [string, symbol][];
     };
 };
 export type PropertyNode = NodeBase<'property'> & {

package/dist/parser.js

@@ -1088,7 +1088,9 @@ const parse = (tokens) => {
                             const { value: keyword, location: keywordLocation } = consume(token_js_1.TokenType.Keyword, lexer.COLLECTION_FORM_LAYOUT_KEYWORDS);
                             switch (keyword) {
                                 case 'if': {
-                                    fields[identifier].if = parseCondition();
+                                    const ifTerms = [];
+                                    fields[identifier].if = parseCondition(ifTerms);
+                                    node[AST.LOCATION_SYMBOL].terms = ifTerms;
                                     break;
                                 }
                                 case 'span':
@@ -1123,13 +1125,13 @@ const parse = (tokens) => {
         consume(token_js_1.TokenType.RightBracket);
         return node;
     };
-    const parseCondition = () => {
+    const parseCondition = (symbols = []) => {
         if (match(token_js_1.TokenType.LeftParens)) {
             consume(token_js_1.TokenType.LeftParens);
             let operatorType, newOp = operatorType;
             const conditions = [];
             while (!match(token_js_1.TokenType.RightParens)) {
-                conditions.push(parseCondition());
+                conditions.push(parseCondition(symbols));
                 if (match(token_js_1.TokenType.RightParens)) {
                     break;
                 }
@@ -1170,20 +1172,26 @@ const parse = (tokens) => {
         if (match(token_js_1.TokenType.Operator, '!')) {
             consume(token_js_1.TokenType.Operator);
             return {
-                not: parseCondition(),
+                not: parseCondition(symbols),
             };
         }
-        const { value: term1 } = consume(token_js_1.TokenType.Identifier);
+        const { value: term1, location: term1Location } = consume(token_js_1.TokenType.Identifier);
+        const term1Symbol = Symbol();
+        exports.locationMap.set(term1Symbol, term1Location);
+        symbols.push([
+            term1,
+            term1Symbol,
+        ]);
         if (!match(token_js_1.TokenType.Operator, lexer.FINAL_OPERATORS)) {
             return {
                 operator: 'truthy',
-                term1: term1,
+                term1,
             };
         }
         const { value: operatorSymbol, location } = consume(token_js_1.TokenType.Operator);
         let term2;
         if (match(token_js_1.TokenType.LeftParens)) {
-            term2 = parseCondition();
+            term2 = parseCondition(symbols);
         }
         else {
             term2 = current().value;

package/dist/parser.mjs

@@ -1027,7 +1027,9 @@ export const parse = (tokens) => {
               const { value: keyword2, location: keywordLocation2 } = consume(TokenType.Keyword, lexer.COLLECTION_FORM_LAYOUT_KEYWORDS);
               switch (keyword2) {
                 case "if": {
-                  fields[identifier].if = parseCondition();
+                  const ifTerms = [];
+                  fields[identifier].if = parseCondition(ifTerms);
+                  node[AST.LOCATION_SYMBOL].terms = ifTerms;
                   break;
                 }
                 case "span":
@@ -1060,13 +1062,13 @@ export const parse = (tokens) => {
     consume(TokenType.RightBracket);
     return node;
   };
-  const parseCondition = () => {
+  const parseCondition = (symbols = []) => {
     if (match(TokenType.LeftParens)) {
       consume(TokenType.LeftParens);
       let operatorType, newOp = operatorType;
       const conditions = [];
       while (!match(TokenType.RightParens)) {
-        conditions.push(parseCondition());
+        conditions.push(parseCondition(symbols));
         if (match(TokenType.RightParens)) {
           break;
         }
@@ -1107,10 +1109,16 @@ export const parse = (tokens) => {
     if (match(TokenType.Operator, "!")) {
       consume(TokenType.Operator);
       return {
-        not: parseCondition()
+        not: parseCondition(symbols)
       };
     }
-    const { value: term1 } = consume(TokenType.Identifier);
+    const { value: term1, location: term1Location } = consume(TokenType.Identifier);
+    const term1Symbol = Symbol();
+    locationMap.set(term1Symbol, term1Location);
+    symbols.push([
+      term1,
+      term1Symbol
+    ]);
     if (!match(TokenType.Operator, lexer.FINAL_OPERATORS)) {
       return {
         operator: "truthy",
@@ -1120,7 +1128,7 @@ export const parse = (tokens) => {
     const { value: operatorSymbol, location } = consume(TokenType.Operator);
     let term2;
     if (match(TokenType.LeftParens)) {
-      term2 = parseCondition();
+      term2 = parseCondition(symbols);
     } else {
       term2 = current().value;
       advance();

package/dist/semantic.js

@@ -169,6 +169,14 @@ const analyze = async (ast, options, errors = []) => {
                     }
                 }
             }
+            if (node.formLayout[AST.LOCATION_SYMBOL].terms) {
+                for (const [name, symbol] of node.formLayout[AST.LOCATION_SYMBOL].terms) {
+                    if (!(name in node.properties)) {
+                        const location = parser_js_1.locationMap.get(symbol);
+                        errors.push(new diagnostic_js_1.Diagnostic(`invalid left operand "${name}"`, location));
+                    }
+                }
+            }
         }
     }
     for (const node of ast.contracts) {

package/dist/semantic.mjs

@@ -131,6 +131,14 @@ export const analyze = async (ast, options, errors = []) => {
           }
         }
       }
+      if (node.formLayout[AST.LOCATION_SYMBOL].terms) {
+        for (const [name, symbol] of node.formLayout[AST.LOCATION_SYMBOL].terms) {
+          if (!(name in node.properties)) {
+            const location = locationMap.get(symbol);
+            errors.push(new Diagnostic(`invalid left operand "${name}"`, location));
+          }
+        }
+      }
     }
   }
   for (const node of ast.contracts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/compiler",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",