@aeriajs/compiler 0.0.12 → 0.0.15

package/dist/ast.d.ts

@@ -9,6 +9,7 @@ export declare const PropertyType: {
     readonly enum: "enum";
     readonly date: "string";
     readonly datetime: "string";
+    readonly const: "const";
 };
 export declare const PropertyModifiers: Record<'Error' | 'Result', ExportSymbol>;
 export type ExportSymbol = {

package/dist/ast.js

@@ -10,6 +10,7 @@ exports.PropertyType = {
     enum: 'enum',
     date: 'string',
     datetime: 'string',
+    const: 'const',
 };
 exports.PropertyModifiers = {
     Error: {

package/dist/ast.mjs

@@ -7,7 +7,8 @@ export const PropertyType = {
   bool: "boolean",
   enum: "enum",
   date: "string",
-  datetime: "string"
+  datetime: "string",
+  const: "const"
 };
 export const PropertyModifiers = {
   Error: {

package/dist/parser.js

@@ -179,6 +179,9 @@ const parse = (tokens) => {
             array.push(identifier);
             symbols.push(elemSymbol);
             exports.locationMap.set(elemSymbol, location);
+            if (match(token_js_1.TokenType.Comma)) {
+                consume(token_js_1.TokenType.Comma);
+            }
         }
         consume(token_js_1.TokenType.RightBracket);
         return {
@@ -225,6 +228,22 @@ const parse = (tokens) => {
             ]).value;
             return;
         }
+        if ('const' in property && attributeName === 'value') {
+            const token = current();
+            advance();
+            switch (token.type) {
+                case token_js_1.TokenType.Number:
+                case token_js_1.TokenType.Boolean:
+                case token_js_1.TokenType.Null:
+                case token_js_1.TokenType.QuotedString: {
+                    property.const = token.value;
+                    return;
+                }
+                default: {
+                    throw new diagnostic_js_1.Diagnostic(`const received invalid value: "${token.value}"`, location);
+                }
+            }
+        }
         switch (attributeName) {
             case 'icon': {
                 const { value } = consume(token_js_1.TokenType.QuotedString, ICON_NAMES);
@@ -461,6 +480,12 @@ const parse = (tokens) => {
                         };
                         break;
                     }
+                    case 'const': {
+                        property = {
+                            const: null,
+                        };
+                        break;
+                    }
                     case 'date': {
                         property = {
                             type: 'string',
@@ -580,6 +605,30 @@ const parse = (tokens) => {
         }
         return parsePropertyType(options);
     };
+    const parseAccessCondition = (options = {
+        arrayBlock: false,
+    }) => {
+        if (match(token_js_1.TokenType.Boolean)) {
+            const { value } = consume(token_js_1.TokenType.Boolean);
+            return value;
+        }
+        else if (match(token_js_1.TokenType.QuotedString, [
+            'unauthenticated',
+            'unauthenticated-only',
+        ])) {
+            const { value } = consume(token_js_1.TokenType.QuotedString, [
+                'unauthenticated',
+                'unauthenticated-only',
+            ]);
+            return value;
+        }
+        else {
+            const { value, symbols } = options.arrayBlock
+                ? parseArrayBlock()
+                : parseArray([token_js_1.TokenType.QuotedString]);
+            return checkForValidRoles(value, symbols);
+        }
+    };
     const parseCollection = (ast) => {
         consume(token_js_1.TokenType.Keyword, 'collection');
         const { value: name } = consume(token_js_1.TokenType.Identifier);
@@ -681,23 +730,9 @@ const parse = (tokens) => {
             const { value: keyword } = consume(token_js_1.TokenType.Keyword, lexer.CONTRACT_KEYWORDS);
             switch (keyword) {
                 case 'roles': {
-                    if (match(token_js_1.TokenType.Boolean)) {
-                        const { value: boolean } = consume(token_js_1.TokenType.Boolean);
-                        node.roles = boolean;
-                    }
-                    else if (match(token_js_1.TokenType.QuotedString, 'unauthenticated')) {
-                        consume(token_js_1.TokenType.QuotedString);
-                        node.roles = 'unauthenticated';
-                    }
-                    else if (match(token_js_1.TokenType.QuotedString, 'unauthenticated-only')) {
-                        consume(token_js_1.TokenType.QuotedString);
-                        node.roles = 'unauthenticated-only';
-                    }
-                    else {
-                        const { value, symbols } = parseArrayBlock();
-                        const roles = checkForValidRoles(value, symbols);
-                        node.roles = roles;
-                    }
+                    node.roles = parseAccessCondition({
+                        arrayBlock: true,
+                    });
                     break;
                 }
                 case 'payload': {
@@ -727,60 +762,52 @@ const parse = (tokens) => {
         consume(token_js_1.TokenType.LeftBracket);
         const functions = {};
         while (!match(token_js_1.TokenType.RightBracket)) {
-            if (match(token_js_1.TokenType.MacroName)) {
-                const { value: macroName } = consume(token_js_1.TokenType.MacroName, ['include']);
-                switch (macroName) {
-                    case 'include': {
-                        const { value: functionSetName, location } = consume(token_js_1.TokenType.Identifier);
-                        const functionset = ast.functionsets.find((node) => node.name === functionSetName);
-                        if (!functionset) {
-                            throw new diagnostic_js_1.Diagnostic(`functionset "${functionSetName}" not found`, location);
+            try {
+                if (match(token_js_1.TokenType.MacroName)) {
+                    const { value: macroName } = consume(token_js_1.TokenType.MacroName, ['include']);
+                    switch (macroName) {
+                        case 'include': {
+                            const { value: functionSetName, location } = consume(token_js_1.TokenType.Identifier);
+                            const functionset = ast.functionsets.find((node) => node.name === functionSetName);
+                            if (!functionset) {
+                                throw new diagnostic_js_1.Diagnostic(`functionset "${functionSetName}" not found`, location);
+                            }
+                            Object.assign(functions, functionset.functions);
+                            consume(token_js_1.TokenType.RightParens);
                         }
-                        Object.assign(functions, functionset.functions);
-                        consume(token_js_1.TokenType.RightParens);
                     }
+                    continue;
                 }
-                continue;
-            }
-            const { value: functionName } = consume(token_js_1.TokenType.Identifier);
-            functions[functionName] = {
-                accessCondition: false,
-            };
-            while (match(token_js_1.TokenType.AttributeName, 'expose')) {
-                consume(token_js_1.TokenType.AttributeName, 'expose');
-                if (match(token_js_1.TokenType.LeftParens)) {
-                    consume(token_js_1.TokenType.LeftParens);
-                    if (match(token_js_1.TokenType.Boolean)) {
-                        const { value } = consume(token_js_1.TokenType.Boolean);
-                        functions[functionName] = {
-                            accessCondition: value,
-                        };
-                    }
-                    else if (match(token_js_1.TokenType.QuotedString, [
-                        'unauthenticated',
-                        'unauthenticated-only',
-                    ])) {
-                        const { value } = consume(token_js_1.TokenType.QuotedString, [
-                            'unauthenticated',
-                            'unauthenticated-only',
-                        ]);
+                const { value: functionName } = consume(token_js_1.TokenType.Identifier);
+                functions[functionName] = {
+                    accessCondition: false,
+                };
+                while (match(token_js_1.TokenType.AttributeName, 'expose')) {
+                    consume(token_js_1.TokenType.AttributeName, 'expose');
+                    if (match(token_js_1.TokenType.LeftParens)) {
+                        consume(token_js_1.TokenType.LeftParens);
                         functions[functionName] = {
-                            accessCondition: value,
+                            accessCondition: parseAccessCondition(),
                         };
+                        consume(token_js_1.TokenType.RightParens);
                     }
                     else {
-                        const { value, symbols } = parseArray([token_js_1.TokenType.QuotedString]);
-                        const roles = checkForValidRoles(value, symbols);
                         functions[functionName] = {
-                            accessCondition: roles,
+                            accessCondition: true,
                         };
                     }
-                    consume(token_js_1.TokenType.RightParens);
                 }
-                else {
-                    functions[functionName] = {
-                        accessCondition: true,
-                    };
+            }
+            catch (err) {
+                if (err instanceof diagnostic_js_1.Diagnostic) {
+                    let token;
+                    while (token = tokens[++index]) {
+                        if (token.type === token_js_1.TokenType.Identifier || token.type === token_js_1.TokenType.RightBracket) {
+                            break;
+                        }
+                    }
+                    errors.push(err);
+                    continue;
                 }
             }
         }

package/dist/parser.mjs

@@ -141,6 +141,9 @@ export const parse = (tokens) => {
       array.push(identifier);
       symbols.push(elemSymbol);
       locationMap.set(elemSymbol, location);
+      if (match(TokenType.Comma)) {
+        consume(TokenType.Comma);
+      }
     }
     consume(TokenType.RightBracket);
     return {
@@ -184,6 +187,22 @@ export const parse = (tokens) => {
       ]).value;
       return;
     }
+    if ("const" in property && attributeName === "value") {
+      const token = current();
+      advance();
+      switch (token.type) {
+        case TokenType.Number:
+        case TokenType.Boolean:
+        case TokenType.Null:
+        case TokenType.QuotedString: {
+          property.const = token.value;
+          return;
+        }
+        default: {
+          throw new Diagnostic(`const received invalid value: "${token.value}"`, location);
+        }
+      }
+    }
     switch (attributeName) {
       case "icon": {
         const { value } = consume(TokenType.QuotedString, ICON_NAMES);
@@ -416,6 +435,12 @@ export const parse = (tokens) => {
             };
             break;
           }
+          case "const": {
+            property = {
+              const: null
+            };
+            break;
+          }
           case "date": {
             property = {
               type: "string",
@@ -531,6 +556,26 @@ export const parse = (tokens) => {
     }
     return parsePropertyType(options);
   };
+  const parseAccessCondition = (options = {
+    arrayBlock: false
+  }) => {
+    if (match(TokenType.Boolean)) {
+      const { value } = consume(TokenType.Boolean);
+      return value;
+    } else if (match(TokenType.QuotedString, [
+      "unauthenticated",
+      "unauthenticated-only"
+    ])) {
+      const { value } = consume(TokenType.QuotedString, [
+        "unauthenticated",
+        "unauthenticated-only"
+      ]);
+      return value;
+    } else {
+      const { value, symbols } = options.arrayBlock ? parseArrayBlock() : parseArray([TokenType.QuotedString]);
+      return checkForValidRoles(value, symbols);
+    }
+  };
   const parseCollection = (ast2) => {
     consume(TokenType.Keyword, "collection");
     const { value: name } = consume(TokenType.Identifier);
@@ -631,20 +676,9 @@ export const parse = (tokens) => {
       const { value: keyword } = consume(TokenType.Keyword, lexer.CONTRACT_KEYWORDS);
       switch (keyword) {
         case "roles": {
-          if (match(TokenType.Boolean)) {
-            const { value: boolean } = consume(TokenType.Boolean);
-            node.roles = boolean;
-          } else if (match(TokenType.QuotedString, "unauthenticated")) {
-            consume(TokenType.QuotedString);
-            node.roles = "unauthenticated";
-          } else if (match(TokenType.QuotedString, "unauthenticated-only")) {
-            consume(TokenType.QuotedString);
-            node.roles = "unauthenticated-only";
-          } else {
-            const { value, symbols } = parseArrayBlock();
-            const roles = checkForValidRoles(value, symbols);
-            node.roles = roles;
-          }
+          node.roles = parseAccessCondition({
+            arrayBlock: true
+          });
           break;
         }
         case "payload": {
@@ -674,57 +708,50 @@ export const parse = (tokens) => {
     consume(TokenType.LeftBracket);
     const functions = {};
     while (!match(TokenType.RightBracket)) {
-      if (match(TokenType.MacroName)) {
-        const { value: macroName } = consume(TokenType.MacroName, ["include"]);
-        switch (macroName) {
-          case "include": {
-            const { value: functionSetName, location } = consume(TokenType.Identifier);
-            const functionset = ast2.functionsets.find((node) => node.name === functionSetName);
-            if (!functionset) {
-              throw new Diagnostic(`functionset "${functionSetName}" not found`, location);
+      try {
+        if (match(TokenType.MacroName)) {
+          const { value: macroName } = consume(TokenType.MacroName, ["include"]);
+          switch (macroName) {
+            case "include": {
+              const { value: functionSetName, location } = consume(TokenType.Identifier);
+              const functionset = ast2.functionsets.find((node) => node.name === functionSetName);
+              if (!functionset) {
+                throw new Diagnostic(`functionset "${functionSetName}" not found`, location);
+              }
+              Object.assign(functions, functionset.functions);
+              consume(TokenType.RightParens);
             }
-            Object.assign(functions, functionset.functions);
-            consume(TokenType.RightParens);
           }
+          continue;
         }
-        continue;
-      }
-      const { value: functionName } = consume(TokenType.Identifier);
-      functions[functionName] = {
-        accessCondition: false
-      };
-      while (match(TokenType.AttributeName, "expose")) {
-        consume(TokenType.AttributeName, "expose");
-        if (match(TokenType.LeftParens)) {
-          consume(TokenType.LeftParens);
-          if (match(TokenType.Boolean)) {
-            const { value } = consume(TokenType.Boolean);
-            functions[functionName] = {
-              accessCondition: value
-            };
-          } else if (match(TokenType.QuotedString, [
-            "unauthenticated",
-            "unauthenticated-only"
-          ])) {
-            const { value } = consume(TokenType.QuotedString, [
-              "unauthenticated",
-              "unauthenticated-only"
-            ]);
+        const { value: functionName } = consume(TokenType.Identifier);
+        functions[functionName] = {
+          accessCondition: false
+        };
+        while (match(TokenType.AttributeName, "expose")) {
+          consume(TokenType.AttributeName, "expose");
+          if (match(TokenType.LeftParens)) {
+            consume(TokenType.LeftParens);
             functions[functionName] = {
-              accessCondition: value
+              accessCondition: parseAccessCondition()
             };
+            consume(TokenType.RightParens);
           } else {
-            const { value, symbols } = parseArray([TokenType.QuotedString]);
-            const roles = checkForValidRoles(value, symbols);
             functions[functionName] = {
-              accessCondition: roles
+              accessCondition: true
             };
           }
-          consume(TokenType.RightParens);
-        } else {
-          functions[functionName] = {
-            accessCondition: true
-          };
+        }
+      } catch (err) {
+        if (err instanceof Diagnostic) {
+          let token;
+          while (token = tokens[++index]) {
+            if (token.type === TokenType.Identifier || token.type === TokenType.RightBracket) {
+              break;
+            }
+          }
+          errors.push(err);
+          continue;
         }
       }
     }

package/dist/token.d.ts

@@ -12,6 +12,7 @@ export declare const TokenType: {
     readonly Dot: "DOT";
     readonly Number: "NUMBER";
     readonly Boolean: "BOOLEAN";
+    readonly Null: "NULL";
     readonly Keyword: "KEYWORD";
     readonly Identifier: "IDENTIFIER";
     readonly QuotedString: "QUOTED_STRING";
@@ -23,6 +24,7 @@ export type TokenType = typeof TokenType[keyof typeof TokenType];
 export type TypeMap = {
     [TokenType.Number]: number;
     [TokenType.Boolean]: boolean;
+    [TokenType.Null]: null;
     [TokenType.Range]: readonly [number, number];
 };
 export type Location = {

package/dist/token.js

@@ -15,6 +15,7 @@ exports.TokenType = {
     Dot: 'DOT',
     Number: 'NUMBER',
     Boolean: 'BOOLEAN',
+    Null: 'NULL',
     Keyword: 'KEYWORD',
     Identifier: 'IDENTIFIER',
     QuotedString: 'QUOTED_STRING',

package/dist/token.mjs

@@ -13,6 +13,7 @@ export const TokenType = {
   Dot: "DOT",
   Number: "NUMBER",
   Boolean: "BOOLEAN",
+  Null: "NULL",
   Keyword: "KEYWORD",
   Identifier: "IDENTIFIER",
   QuotedString: "QUOTED_STRING",

package/package.json

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