@aeriajs/compiler 0.0.24 → 0.0.26

package/dist/ast.d.ts

@@ -1,4 +1,4 @@
-import type { Property, AccessCondition, CollectionActions, SearchOptions, DescriptionPreset, Icon, OwnershipMode, Layout } from '@aeriajs/types';
+import type { Property, AccessCondition, CollectionActions, SearchOptions, DescriptionPreset, Icon, OwnershipMode, Layout, LayoutOptions } from '@aeriajs/types';
 import type { ArrayProperties } from './utils.js';
 export declare const LOCATION_SYMBOL: unique symbol;
 export declare const PropertyType: {
@@ -19,6 +19,13 @@ export type ExportSymbol = {
 export type NodeBase<TType> = {
     kind: TType;
 };
+export type LayoutNode = NodeBase<'layout'> & Layout & {
+    [LOCATION_SYMBOL]: {
+        options: {
+            [P in keyof LayoutOptions]?: readonly string[] extends LayoutOptions[P] ? symbol | symbol[] : symbol;
+        };
+    };
+};
 export type PropertyNode = NodeBase<'property'> & {
     modifier?: keyof typeof PropertyModifiers;
     property: Property & {
@@ -53,7 +60,7 @@ export type CollectionNode = NodeBase<'collection'> & {
     table?: string[];
     filters?: string[];
     search?: SearchOptions<any>;
-    layout?: Layout;
+    layout?: LayoutNode;
     [LOCATION_SYMBOL]: {
         arrays: {
             [P in ArrayProperties<CollectionNode>]?: symbol[];

package/dist/codegen/generateTSCollections.js

@@ -87,6 +87,9 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
             case 'search':
                 collectionSchema.description[key] = collectionNode[key];
                 break;
+            case 'layout':
+                collectionSchema.description[key] = collectionNode[key];
+                break;
             case 'required':
                 collectionSchema.description[key] = collectionNode[key];
                 break;

package/dist/codegen/generateTSCollections.mjs

@@ -82,6 +82,9 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
       case "search":
         collectionSchema.description[key] = collectionNode[key];
         break;
+      case "layout":
+        collectionSchema.description[key] = collectionNode[key];
+        break;
       case "required":
         collectionSchema.description[key] = collectionNode[key];
         break;

package/dist/lexer.js

@@ -149,7 +149,20 @@ const TOKENS = [
     {
         type: token_js_1.TokenType.Keyword,
         matcher: Array.from(keywordsSet),
-        condition: (state) => !state.inPropertiesStack.at(-1),
+        condition: (state, lastToken) => {
+            if (state.variableScopeStack.at(-1)) {
+                return false;
+            }
+            if (lastToken && lastToken.type === token_js_1.TokenType.Keyword) {
+                switch (lastToken.value) {
+                    case 'badge':
+                    case 'title': {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        },
     },
     {
         type: token_js_1.TokenType.MacroName,
@@ -177,15 +190,16 @@ const tokenize = function (rawInput) {
     const tokens = [];
     const errors = [];
     const state = {
-        inPropertiesStack: [],
+        variableScopeStack: [],
     };
     while (index < input.length) {
         let hasMatch = false;
         for (const { type, matcher, valueExtractor, construct, condition } of TOKENS) {
             let value;
             let token;
+            const lastToken = tokens.at(-1);
             if (condition) {
-                if (!condition(state)) {
+                if (!condition(state, lastToken)) {
                     continue;
                 }
             }
@@ -246,9 +260,10 @@ const tokenize = function (rawInput) {
                         };
                         switch (type) {
                             case token_js_1.TokenType.LeftBracket: {
-                                const lastToken = tokens.at(-1);
+                                let variableScope = false;
                                 if (lastToken && lastToken.type === token_js_1.TokenType.Keyword) {
                                     switch (lastToken.value) {
+                                        case 'information':
                                         case 'form':
                                         case 'table':
                                         case 'indexes':
@@ -256,19 +271,17 @@ const tokenize = function (rawInput) {
                                         case 'writable':
                                         case 'required':
                                         case 'properties': {
-                                            state.inPropertiesStack.push(true);
+                                            variableScope = true;
                                             break;
                                         }
-                                        default: {
-                                            state.inPropertiesStack.push(false);
-                                        }
                                     }
                                 }
+                                state.variableScopeStack.push(variableScope);
                                 break;
                             }
                             case token_js_1.TokenType.RightBracket: {
-                                if (state.inPropertiesStack.length > 0) {
-                                    state.inPropertiesStack.pop();
+                                if (state.variableScopeStack.length > 0) {
+                                    state.variableScopeStack.pop();
                                 }
                                 break;
                             }

package/dist/lexer.mjs

@@ -156,7 +156,20 @@ const TOKENS = [
   {
     type: TokenType.Keyword,
     matcher: Array.from(keywordsSet),
-    condition: (state) => !state.inPropertiesStack.at(-1)
+    condition: (state, lastToken) => {
+      if (state.variableScopeStack.at(-1)) {
+        return false;
+      }
+      if (lastToken && lastToken.type === TokenType.Keyword) {
+        switch (lastToken.value) {
+          case "badge":
+          case "title": {
+            return false;
+          }
+        }
+      }
+      return true;
+    }
   },
   {
     type: TokenType.MacroName,
@@ -184,15 +197,16 @@ export const tokenize = function(rawInput) {
   const tokens = [];
   const errors = [];
   const state = {
-    inPropertiesStack: []
+    variableScopeStack: []
   };
   while (index < input.length) {
     let hasMatch = false;
     for (const { type, matcher, valueExtractor, construct, condition } of TOKENS) {
       let value;
       let token;
+      const lastToken = tokens.at(-1);
       if (condition) {
-        if (!condition(state)) {
+        if (!condition(state, lastToken)) {
           continue;
         }
       }
@@ -248,9 +262,10 @@ export const tokenize = function(rawInput) {
             };
             switch (type) {
               case TokenType.LeftBracket: {
-                const lastToken = tokens.at(-1);
+                let variableScope = false;
                 if (lastToken && lastToken.type === TokenType.Keyword) {
                   switch (lastToken.value) {
+                    case "information":
                     case "form":
                     case "table":
                     case "indexes":
@@ -258,19 +273,17 @@ export const tokenize = function(rawInput) {
                     case "writable":
                     case "required":
                     case "properties": {
-                      state.inPropertiesStack.push(true);
+                      variableScope = true;
                       break;
                     }
-                    default: {
-                      state.inPropertiesStack.push(false);
-                    }
                   }
                 }
+                state.variableScopeStack.push(variableScope);
                 break;
               }
               case TokenType.RightBracket: {
-                if (state.inPropertiesStack.length > 0) {
-                  state.inPropertiesStack.pop();
+                if (state.variableScopeStack.length > 0) {
+                  state.variableScopeStack.pop();
                 }
                 break;
               }

package/dist/parser.js

@@ -985,6 +985,7 @@ const parse = (tokens) => {
     const parseLayoutBlock = () => {
         let name;
         const options = {};
+        const optionsSymbols = {};
         const { location } = consume(token_js_1.TokenType.LeftBracket);
         while (!match(token_js_1.TokenType.RightBracket)) {
             const { value: keyword } = consume(token_js_1.TokenType.Keyword, lexer.COLLECTION_LAYOUT_KEYWORDS);
@@ -1003,16 +1004,25 @@ const parse = (tokens) => {
                                 case 'title':
                                 case 'picture':
                                 case 'badge': {
-                                    const { value } = consume(token_js_1.TokenType.QuotedString);
+                                    const { value, location } = consume(token_js_1.TokenType.Identifier);
+                                    const symbol = Symbol();
                                     options[optionsKeyword] = value;
+                                    optionsSymbols[optionsKeyword] = symbol;
+                                    exports.locationMap.set(symbol, location);
                                     break;
                                 }
                                 case 'information': {
                                     if (match(token_js_1.TokenType.LeftBracket)) {
-                                        options[optionsKeyword] = parseArrayBlock().value;
+                                        const { value, symbols } = parseArrayBlock();
+                                        options[optionsKeyword] = value;
+                                        optionsSymbols[optionsKeyword] = symbols;
                                     }
                                     else {
-                                        options[optionsKeyword] = consume(token_js_1.TokenType.QuotedString).value;
+                                        const { value, location } = consume(token_js_1.TokenType.Identifier);
+                                        const symbol = Symbol();
+                                        options[optionsKeyword] = value;
+                                        optionsSymbols[optionsKeyword] = symbol;
+                                        exports.locationMap.set(symbol, location);
                                     }
                                     break;
                                 }
@@ -1033,8 +1043,12 @@ const parse = (tokens) => {
         }
         consume(token_js_1.TokenType.RightBracket);
         return {
+            kind: 'layout',
             name,
             options,
+            [AST.LOCATION_SYMBOL]: {
+                options: optionsSymbols,
+            },
         };
     };
     while (index < tokens.length) {

package/dist/parser.mjs

@@ -926,6 +926,7 @@ export const parse = (tokens) => {
   const parseLayoutBlock = () => {
     let name;
     const options = {};
+    const optionsSymbols = {};
     const { location } = consume(TokenType.LeftBracket);
     while (!match(TokenType.RightBracket)) {
       const { value: keyword } = consume(TokenType.Keyword, lexer.COLLECTION_LAYOUT_KEYWORDS);
@@ -944,15 +945,24 @@ export const parse = (tokens) => {
                 case "title":
                 case "picture":
                 case "badge": {
-                  const { value } = consume(TokenType.QuotedString);
+                  const { value, location: location2 } = consume(TokenType.Identifier);
+                  const symbol = Symbol();
                   options[optionsKeyword] = value;
+                  optionsSymbols[optionsKeyword] = symbol;
+                  locationMap.set(symbol, location2);
                   break;
                 }
                 case "information": {
                   if (match(TokenType.LeftBracket)) {
-                    options[optionsKeyword] = parseArrayBlock().value;
+                    const { value, symbols } = parseArrayBlock();
+                    options[optionsKeyword] = value;
+                    optionsSymbols[optionsKeyword] = symbols;
                   } else {
-                    options[optionsKeyword] = consume(TokenType.QuotedString).value;
+                    const { value, location: location2 } = consume(TokenType.Identifier);
+                    const symbol = Symbol();
+                    options[optionsKeyword] = value;
+                    optionsSymbols[optionsKeyword] = symbol;
+                    locationMap.set(symbol, location2);
                   }
                   break;
                 }
@@ -973,8 +983,12 @@ export const parse = (tokens) => {
     }
     consume(TokenType.RightBracket);
     return {
+      kind: "layout",
       name,
-      options
+      options,
+      [AST.LOCATION_SYMBOL]: {
+        options: optionsSymbols
+      }
     };
   };
   while (index < tokens.length) {

package/dist/semantic.js

@@ -92,7 +92,7 @@ const analyze = async (ast, options, errors = []) => {
             const symbol = node.property[AST.LOCATION_SYMBOL].arrays[attributeName][index];
             if (!(propName in node.property.properties)) {
                 const location = parser_js_1.locationMap.get(symbol);
-                errors.push(new diagnostic_js_1.Diagnostic(`object "xxx" hasn't such property "${propName}"`, location));
+                errors.push(new diagnostic_js_1.Diagnostic(`object hasn't such property "${propName}"`, location));
             }
         }
     };
@@ -139,6 +139,27 @@ const analyze = async (ast, options, errors = []) => {
             const subNode = node.properties[propName];
             await recurseProperty(subNode);
         }
+        if (node.layout) {
+            if (node.layout.options) {
+                for (const [name, value] of Object.entries(node.layout[AST.LOCATION_SYMBOL].options)) {
+                    const option = node.layout.options[name];
+                    if (Array.isArray(option)) {
+                        for (const [i, propName] of option.entries()) {
+                            if (!(propName in node.properties)) {
+                                const location = parser_js_1.locationMap.get(value[i]);
+                                errors.push(new diagnostic_js_1.Diagnostic(`invalid property "${propName}"`, location));
+                            }
+                        }
+                    }
+                    else {
+                        if (!(option in node.properties)) {
+                            const location = parser_js_1.locationMap.get(value);
+                            errors.push(new diagnostic_js_1.Diagnostic(`invalid property "${option}"`, location));
+                        }
+                    }
+                }
+            }
+        }
     }
     for (const node of ast.contracts) {
         if (node.payload) {

package/dist/semantic.mjs

@@ -57,7 +57,7 @@ export const analyze = async (ast, options, errors = []) => {
       const symbol = node.property[AST.LOCATION_SYMBOL].arrays[attributeName][index];
       if (!(propName in node.property.properties)) {
         const location = locationMap.get(symbol);
-        errors.push(new Diagnostic(`object "xxx" hasn't such property "${propName}"`, location));
+        errors.push(new Diagnostic(`object hasn't such property "${propName}"`, location));
       }
     }
   };
@@ -102,6 +102,26 @@ export const analyze = async (ast, options, errors = []) => {
       const subNode = node.properties[propName];
       await recurseProperty(subNode);
     }
+    if (node.layout) {
+      if (node.layout.options) {
+        for (const [name, value] of Object.entries(node.layout[AST.LOCATION_SYMBOL].options)) {
+          const option = node.layout.options[name];
+          if (Array.isArray(option)) {
+            for (const [i, propName] of option.entries()) {
+              if (!(propName in node.properties)) {
+                const location = locationMap.get(value[i]);
+                errors.push(new Diagnostic(`invalid property "${propName}"`, location));
+              }
+            }
+          } else {
+            if (!(option in node.properties)) {
+              const location = locationMap.get(value);
+              errors.push(new Diagnostic(`invalid property "${option}"`, location));
+            }
+          }
+        }
+      }
+    }
   }
   for (const node of ast.contracts) {
     if (node.payload) {

package/package.json

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