@aeriajs/compiler 0.0.23 → 0.0.25

package/dist/ast.d.ts

@@ -1,4 +1,4 @@
-import type { Property, AccessCondition, CollectionActions, SearchOptions, DescriptionPreset, Icon, OwnershipMode } 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,6 +60,7 @@ export type CollectionNode = NodeBase<'collection'> & {
     table?: string[];
     filters?: string[];
     search?: SearchOptions<any>;
+    layout?: LayoutNode;
     [LOCATION_SYMBOL]: {
         arrays: {
             [P in ArrayProperties<CollectionNode>]?: symbol[];

package/dist/codegen/generateJSCollections.js

@@ -77,6 +77,9 @@ const makeJSCollectionSchema = (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/generateJSCollections.mjs

@@ -70,6 +70,9 @@ const makeJSCollectionSchema = (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.d.ts

@@ -1,12 +1,14 @@
 import { type Token } from './token.js';
 import { Diagnostic } from './diagnostic.js';
-export type Keyword = typeof COLLECTION_KEYWORDS[number] | typeof COLLECTION_ACTIONS_KEYWORDS[number] | typeof COLLECTION_SEARCH_KEYWORDS[number] | typeof CONTRACT_KEYWORDS[number] | typeof TOPLEVEL_KEYWORDS[number] | typeof MISC_KEYWORDS[number];
-export declare const COLLECTION_KEYWORDS: readonly ["actions", "additionalProperties", "filters", "form", "functions", "icon", "indexes", "individualActions", "owned", "presets", "properties", "required", "search", "table"];
+export declare const COLLECTION_KEYWORDS: readonly ["actions", "additionalProperties", "filters", "form", "functions", "icon", "indexes", "individualActions", "layout", "owned", "presets", "properties", "required", "search", "table"];
 export declare const COLLECTION_ACTIONS_KEYWORDS: readonly ["ask", "button", "clearItem", "effect", "event", "fetchItem", "function", "icon", "label", "params", "query", "requires", "roles", "route", "selection", "setItem", "translate"];
 export declare const COLLECTION_SEARCH_KEYWORDS: readonly ["indexes", "placeholder", "exactMatches"];
+export declare const COLLECTION_LAYOUT_KEYWORDS: readonly ["name", "options"];
+export declare const COLLECTION_LAYOUT_OPTIONS_KEYWORDS: readonly ["title", "picture", "badge", "information", "active", "translateBadge"];
 export declare const CONTRACT_KEYWORDS: readonly ["roles", "payload", "query", "response"];
 export declare const TOPLEVEL_KEYWORDS: readonly ["collection", "contract", "functionset"];
 export declare const MISC_KEYWORDS: readonly ["extends"];
+export type Keyword = typeof COLLECTION_KEYWORDS[number] | typeof COLLECTION_ACTIONS_KEYWORDS[number] | typeof COLLECTION_SEARCH_KEYWORDS[number] | typeof COLLECTION_LAYOUT_KEYWORDS[number] | typeof COLLECTION_LAYOUT_OPTIONS_KEYWORDS[number] | typeof CONTRACT_KEYWORDS[number] | typeof TOPLEVEL_KEYWORDS[number] | typeof MISC_KEYWORDS[number];
 export declare const KEYWORDS: Keyword[];
 export declare const tokenize: (rawInput: string) => {
     tokens: Token[];

package/dist/lexer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tokenize = exports.KEYWORDS = exports.MISC_KEYWORDS = exports.TOPLEVEL_KEYWORDS = exports.CONTRACT_KEYWORDS = exports.COLLECTION_SEARCH_KEYWORDS = exports.COLLECTION_ACTIONS_KEYWORDS = exports.COLLECTION_KEYWORDS = void 0;
+exports.tokenize = exports.KEYWORDS = exports.MISC_KEYWORDS = exports.TOPLEVEL_KEYWORDS = exports.CONTRACT_KEYWORDS = exports.COLLECTION_LAYOUT_OPTIONS_KEYWORDS = exports.COLLECTION_LAYOUT_KEYWORDS = exports.COLLECTION_SEARCH_KEYWORDS = exports.COLLECTION_ACTIONS_KEYWORDS = exports.COLLECTION_KEYWORDS = void 0;
 const token_js_1 = require("./token.js");
 const diagnostic_js_1 = require("./diagnostic.js");
 exports.COLLECTION_KEYWORDS = [
@@ -12,6 +12,7 @@ exports.COLLECTION_KEYWORDS = [
     'icon',
     'indexes',
     'individualActions',
+    'layout',
     'owned',
     'presets',
     'properties',
@@ -43,6 +44,18 @@ exports.COLLECTION_SEARCH_KEYWORDS = [
     'placeholder',
     'exactMatches',
 ];
+exports.COLLECTION_LAYOUT_KEYWORDS = [
+    'name',
+    'options',
+];
+exports.COLLECTION_LAYOUT_OPTIONS_KEYWORDS = [
+    'title',
+    'picture',
+    'badge',
+    'information',
+    'active',
+    'translateBadge',
+];
 exports.CONTRACT_KEYWORDS = [
     'roles',
     'payload',
@@ -55,7 +68,7 @@ exports.TOPLEVEL_KEYWORDS = [
     'functionset',
 ];
 exports.MISC_KEYWORDS = ['extends'];
-exports.KEYWORDS = [].concat(exports.COLLECTION_KEYWORDS, exports.COLLECTION_ACTIONS_KEYWORDS, exports.COLLECTION_SEARCH_KEYWORDS, exports.CONTRACT_KEYWORDS, exports.TOPLEVEL_KEYWORDS, exports.MISC_KEYWORDS);
+exports.KEYWORDS = [].concat(exports.COLLECTION_KEYWORDS, exports.COLLECTION_ACTIONS_KEYWORDS, exports.COLLECTION_SEARCH_KEYWORDS, exports.COLLECTION_LAYOUT_KEYWORDS, exports.COLLECTION_LAYOUT_OPTIONS_KEYWORDS, exports.CONTRACT_KEYWORDS, exports.TOPLEVEL_KEYWORDS, exports.MISC_KEYWORDS);
 const keywordsSet = new Set();
 for (const keyword of exports.KEYWORDS) {
     keywordsSet.add(keyword);
@@ -136,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.inPropertiesStack.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,
@@ -171,8 +197,9 @@ const tokenize = function (rawInput) {
         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;
                 }
             }
@@ -233,13 +260,22 @@ const tokenize = function (rawInput) {
                         };
                         switch (type) {
                             case token_js_1.TokenType.LeftBracket: {
-                                const lastToken = tokens.at(-1);
-                                if (lastToken) {
-                                    if (lastToken.value === 'properties') {
-                                        state.inPropertiesStack.push(true);
-                                    }
-                                    else {
-                                        state.inPropertiesStack.push(false);
+                                if (lastToken && lastToken.type === token_js_1.TokenType.Keyword) {
+                                    switch (lastToken.value) {
+                                        case 'information':
+                                        case 'form':
+                                        case 'table':
+                                        case 'indexes':
+                                        case 'filters':
+                                        case 'writable':
+                                        case 'required':
+                                        case 'properties': {
+                                            state.inPropertiesStack.push(true);
+                                            break;
+                                        }
+                                        default: {
+                                            state.inPropertiesStack.push(false);
+                                        }
                                     }
                                 }
                                 break;

package/dist/lexer.mjs

@@ -10,6 +10,7 @@ export const COLLECTION_KEYWORDS = [
   "icon",
   "indexes",
   "individualActions",
+  "layout",
   "owned",
   "presets",
   "properties",
@@ -41,6 +42,18 @@ export const COLLECTION_SEARCH_KEYWORDS = [
   "placeholder",
   "exactMatches"
 ];
+export const COLLECTION_LAYOUT_KEYWORDS = [
+  "name",
+  "options"
+];
+export const COLLECTION_LAYOUT_OPTIONS_KEYWORDS = [
+  "title",
+  "picture",
+  "badge",
+  "information",
+  "active",
+  "translateBadge"
+];
 export const CONTRACT_KEYWORDS = [
   "roles",
   "payload",
@@ -57,6 +70,8 @@ export const KEYWORDS = [].concat(
   COLLECTION_KEYWORDS,
   COLLECTION_ACTIONS_KEYWORDS,
   COLLECTION_SEARCH_KEYWORDS,
+  COLLECTION_LAYOUT_KEYWORDS,
+  COLLECTION_LAYOUT_OPTIONS_KEYWORDS,
   CONTRACT_KEYWORDS,
   TOPLEVEL_KEYWORDS,
   MISC_KEYWORDS
@@ -141,7 +156,20 @@ const TOKENS = [
   {
     type: TokenType.Keyword,
     matcher: Array.from(keywordsSet),
-    condition: (state) => !state.inPropertiesStack.at(-1)
+    condition: (state, lastToken) => {
+      if (state.inPropertiesStack.at(-1)) {
+        return false;
+      }
+      if (lastToken && lastToken.type === TokenType.Keyword) {
+        switch (lastToken.value) {
+          case "badge":
+          case "title": {
+            return false;
+          }
+        }
+      }
+      return true;
+    }
   },
   {
     type: TokenType.MacroName,
@@ -176,8 +204,9 @@ export const tokenize = function(rawInput) {
     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;
         }
       }
@@ -233,12 +262,22 @@ export const tokenize = function(rawInput) {
             };
             switch (type) {
               case TokenType.LeftBracket: {
-                const lastToken = tokens.at(-1);
-                if (lastToken) {
-                  if (lastToken.value === "properties") {
-                    state.inPropertiesStack.push(true);
-                  } else {
-                    state.inPropertiesStack.push(false);
+                if (lastToken && lastToken.type === TokenType.Keyword) {
+                  switch (lastToken.value) {
+                    case "information":
+                    case "form":
+                    case "table":
+                    case "indexes":
+                    case "filters":
+                    case "writable":
+                    case "required":
+                    case "properties": {
+                      state.inPropertiesStack.push(true);
+                      break;
+                    }
+                    default: {
+                      state.inPropertiesStack.push(false);
+                    }
                   }
                 }
                 break;

package/dist/parser.js

@@ -727,6 +727,10 @@ const parse = (tokens) => {
                         node[keyword] = parseSearchBlock();
                         break;
                     }
+                    case 'layout': {
+                        node[keyword] = parseLayoutBlock();
+                        break;
+                    }
                 }
             }
             catch (err) {
@@ -978,6 +982,75 @@ const parse = (tokens) => {
             indexes,
         };
     };
+    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);
+            switch (keyword) {
+                case 'name': {
+                    name = consume(token_js_1.TokenType.QuotedString, types_1.LAYOUT_NAMES).value;
+                    break;
+                }
+                case 'options':
+                    {
+                        consume(token_js_1.TokenType.LeftBracket);
+                        while (!match(token_js_1.TokenType.RightBracket)) {
+                            const { value: optionsKeyword } = consume(token_js_1.TokenType.Keyword, lexer.COLLECTION_LAYOUT_OPTIONS_KEYWORDS);
+                            switch (optionsKeyword) {
+                                case 'active':
+                                case 'title':
+                                case 'picture':
+                                case 'badge': {
+                                    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)) {
+                                        const { value, symbols } = parseArrayBlock();
+                                        options[optionsKeyword] = value;
+                                        optionsSymbols[optionsKeyword] = symbols;
+                                    }
+                                    else {
+                                        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 'translateBadge': {
+                                    const { value } = consume(token_js_1.TokenType.Boolean);
+                                    options[optionsKeyword] = value;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    consume(token_js_1.TokenType.RightBracket);
+                    break;
+            }
+        }
+        if (!name) {
+            throw new diagnostic_js_1.Diagnostic('layout must have a "name" property', location);
+        }
+        consume(token_js_1.TokenType.RightBracket);
+        return {
+            kind: 'layout',
+            name,
+            options,
+            [AST.LOCATION_SYMBOL]: {
+                options: optionsSymbols,
+            },
+        };
+    };
     while (index < tokens.length) {
         const { value: declType, location } = current();
         try {

package/dist/parser.mjs

@@ -1,6 +1,6 @@
 "use strict";
 import { TokenType } from "./token.mjs";
-import { DESCRIPTION_PRESETS, PROPERTY_ARRAY_ELEMENTS, PROPERTY_FORMATS, PROPERTY_INPUT_ELEMENTS, PROPERTY_INPUT_TYPES } from "@aeriajs/types";
+import { DESCRIPTION_PRESETS, LAYOUT_NAMES, PROPERTY_ARRAY_ELEMENTS, PROPERTY_FORMATS, PROPERTY_INPUT_ELEMENTS, PROPERTY_INPUT_TYPES } from "@aeriajs/types";
 import { icons } from "@phosphor-icons/core";
 import { Diagnostic } from "./diagnostic.mjs";
 import * as AST from "./ast.mjs";
@@ -672,6 +672,10 @@ export const parse = (tokens) => {
             node[keyword] = parseSearchBlock();
             break;
           }
+          case "layout": {
+            node[keyword] = parseLayoutBlock();
+            break;
+          }
         }
       } catch (err) {
         if (err instanceof Diagnostic) {
@@ -919,6 +923,74 @@ export const parse = (tokens) => {
       indexes
     };
   };
+  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);
+      switch (keyword) {
+        case "name": {
+          name = consume(TokenType.QuotedString, LAYOUT_NAMES).value;
+          break;
+        }
+        case "options":
+          {
+            consume(TokenType.LeftBracket);
+            while (!match(TokenType.RightBracket)) {
+              const { value: optionsKeyword } = consume(TokenType.Keyword, lexer.COLLECTION_LAYOUT_OPTIONS_KEYWORDS);
+              switch (optionsKeyword) {
+                case "active":
+                case "title":
+                case "picture":
+                case "badge": {
+                  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)) {
+                    const { value, symbols } = parseArrayBlock();
+                    options[optionsKeyword] = value;
+                    optionsSymbols[optionsKeyword] = symbols;
+                  } else {
+                    const { value, location: location2 } = consume(TokenType.Identifier);
+                    const symbol = Symbol();
+                    options[optionsKeyword] = value;
+                    optionsSymbols[optionsKeyword] = symbol;
+                    locationMap.set(symbol, location2);
+                  }
+                  break;
+                }
+                case "translateBadge": {
+                  const { value } = consume(TokenType.Boolean);
+                  options[optionsKeyword] = value;
+                  break;
+                }
+              }
+            }
+          }
+          consume(TokenType.RightBracket);
+          break;
+      }
+    }
+    if (!name) {
+      throw new Diagnostic('layout must have a "name" property', location);
+    }
+    consume(TokenType.RightBracket);
+    return {
+      kind: "layout",
+      name,
+      options,
+      [AST.LOCATION_SYMBOL]: {
+        options: optionsSymbols
+      }
+    };
+  };
   while (index < tokens.length) {
     const { value: declType, location } = current();
     try {

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.23",
+  "version": "0.0.25",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -21,8 +21,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.140",
-    "@aeriajs/types": "^0.0.122"
+    "@aeriajs/common": "^0.0.141",
+    "@aeriajs/types": "^0.0.123"
   },
   "devDependencies": {
     "@aeriajs/common": "link:../common",