@aeriajs/compiler 0.0.48 → 0.0.50

package/dist/ast.d.ts

@@ -74,7 +74,7 @@ export type CollectionNode = NodeBase<'collection'> & {
     table?: readonly string[];
     tableMeta?: readonly string[];
     filters?: readonly string[];
-    search?: SearchOptions<any>;
+    search?: SearchOptions;
     layout?: LayoutNode;
     formLayout?: FormLayoutNode;
     [LOCATION_SYMBOL]: {
@@ -83,6 +83,7 @@ export type CollectionNode = NodeBase<'collection'> & {
         };
         required?: symbol[];
         requiredTerms?: readonly [string, symbol][];
+        searchIndexes?: symbol[];
     };
 };
 export type ContractNode = NodeBase<'contract'> & {

package/dist/codegen/generateTSCollections.js

@@ -111,7 +111,7 @@ const makeTSFunctions = (functions) => {
         acc[key] = {
             [utils_js_1.UnquotedSymbol]: utils_js_1.DEFAULT_FUNCTIONS.includes(key)
                 ? `typeof ${key}`
-                : '() => never',
+                : 'unknown',
         };
         return acc;
     }, {});

package/dist/codegen/generateTSCollections.mjs

@@ -105,7 +105,7 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
 const makeTSFunctions = (functions) => {
   return Object.keys(functions).reduce((acc, key) => {
     acc[key] = {
-      [UnquotedSymbol]: DEFAULT_FUNCTIONS.includes(key) ? `typeof ${key}` : "() => never"
+      [UnquotedSymbol]: DEFAULT_FUNCTIONS.includes(key) ? `typeof ${key}` : "unknown"
     };
     return acc;
   }, {});

package/dist/lexer.d.ts

@@ -1,6 +1,6 @@
 import { type Token } from './token.js';
 import { Diagnostic } from './diagnostic.js';
-export declare const COLLECTION_KEYWORDS: readonly ["actions", "additionalProperties", "filters", "form", "formLayout", "functions", "icon", "indexes", "individualActions", "layout", "middlewares", "owned", "presets", "properties", "required", "search", "table", "tableMeta"];
+export declare const COLLECTION_KEYWORDS: readonly ["actions", "additionalProperties", "filters", "form", "formLayout", "functions", "icon", "indexes", "individualActions", "layout", "middlewares", "owned", "presets", "properties", "required", "search", "table", "tableMeta", "writable"];
 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"];

package/dist/lexer.js

@@ -22,6 +22,7 @@ exports.COLLECTION_KEYWORDS = [
     'search',
     'table',
     'tableMeta',
+    'writable',
 ];
 exports.COLLECTION_ACTIONS_KEYWORDS = [
     'ask',

package/dist/lexer.mjs

@@ -19,7 +19,8 @@ export const COLLECTION_KEYWORDS = [
   "required",
   "search",
   "table",
-  "tableMeta"
+  "tableMeta",
+  "writable"
 ];
 export const COLLECTION_ACTIONS_KEYWORDS = [
   "ask",

package/dist/parser.js

@@ -473,23 +473,20 @@ const parse = (tokens) => {
                 },
             };
             while (!match(token_js_1.TokenType.RightBracket)) {
-                const { value: keyword, location } = current();
+                const { value: keyword, location } = consume(token_js_1.TokenType.Keyword, lexer.COLLECTION_KEYWORDS);
                 switch (keyword) {
                     case 'writable':
                     case 'required': {
-                        consume(token_js_1.TokenType.Keyword);
                         const { value, symbols } = parseArrayBlock();
                         property[keyword] = value;
                         property[AST.LOCATION_SYMBOL].arrays[keyword] = symbols;
                         break;
                     }
                     case 'properties': {
-                        consume(token_js_1.TokenType.Keyword);
                         nestedProperties = parsePropertiesBlock(options);
                         break;
                     }
                     case 'additionalProperties': {
-                        consume(token_js_1.TokenType.Keyword);
                         if (match(token_js_1.TokenType.Boolean)) {
                             nestedAdditionalProperties = consume(token_js_1.TokenType.Boolean).value;
                         }
@@ -761,7 +758,9 @@ const parse = (tokens) => {
                         break;
                     }
                     case 'search': {
-                        node[keyword] = parseSearchBlock();
+                        const { options, indexesSymbols } = parseSearchBlock();
+                        node[keyword] = options;
+                        node[AST.LOCATION_SYMBOL].searchIndexes = indexesSymbols;
                         break;
                     }
                     case 'layout': {
@@ -1003,9 +1002,16 @@ const parse = (tokens) => {
     const parseSearchBlock = () => {
         const searchSlots = {};
         const { location } = consume(token_js_1.TokenType.LeftBracket);
+        let indexesSymbols;
         while (!match(token_js_1.TokenType.RightBracket)) {
             const { value: keyword } = consume(token_js_1.TokenType.Keyword, lexer.COLLECTION_SEARCH_KEYWORDS);
             switch (keyword) {
+                case 'indexes': {
+                    const { value, symbols } = parseArrayBlock();
+                    searchSlots[keyword] = value;
+                    indexesSymbols = symbols;
+                    break;
+                }
                 case 'placeholder': {
                     const { value } = consume(token_js_1.TokenType.QuotedString);
                     searchSlots[keyword] = value;
@@ -1016,11 +1022,6 @@ const parse = (tokens) => {
                     searchSlots[keyword] = value;
                     break;
                 }
-                case 'indexes': {
-                    const { value } = parseArrayBlock();
-                    searchSlots[keyword] = value;
-                    break;
-                }
             }
         }
         const { indexes } = searchSlots;
@@ -1028,10 +1029,14 @@ const parse = (tokens) => {
             throw new diagnostic_js_1.Diagnostic('"indexes" option is required', location);
         }
         consume(token_js_1.TokenType.RightBracket);
-        return {
+        const options = {
             ...searchSlots,
             indexes,
         };
+        return {
+            options,
+            indexesSymbols,
+        };
     };
     const parseLayoutBlock = () => {
         let name;

package/dist/parser.mjs

@@ -430,23 +430,20 @@ export const parse = (tokens) => {
         }
       };
       while (!match(TokenType.RightBracket)) {
-        const { value: keyword, location } = current();
+        const { value: keyword, location } = consume(TokenType.Keyword, lexer.COLLECTION_KEYWORDS);
         switch (keyword) {
           case "writable":
           case "required": {
-            consume(TokenType.Keyword);
             const { value, symbols } = parseArrayBlock();
             property[keyword] = value;
             property[AST.LOCATION_SYMBOL].arrays[keyword] = symbols;
             break;
           }
           case "properties": {
-            consume(TokenType.Keyword);
             nestedProperties = parsePropertiesBlock(options);
             break;
           }
           case "additionalProperties": {
-            consume(TokenType.Keyword);
             if (match(TokenType.Boolean)) {
               nestedAdditionalProperties = consume(TokenType.Boolean).value;
             } else {
@@ -707,7 +704,9 @@ export const parse = (tokens) => {
             break;
           }
           case "search": {
-            node[keyword] = parseSearchBlock();
+            const { options, indexesSymbols } = parseSearchBlock();
+            node[keyword] = options;
+            node[AST.LOCATION_SYMBOL].searchIndexes = indexesSymbols;
             break;
           }
           case "layout": {
@@ -945,9 +944,16 @@ export const parse = (tokens) => {
   const parseSearchBlock = () => {
     const searchSlots = {};
     const { location } = consume(TokenType.LeftBracket);
+    let indexesSymbols;
     while (!match(TokenType.RightBracket)) {
       const { value: keyword } = consume(TokenType.Keyword, lexer.COLLECTION_SEARCH_KEYWORDS);
       switch (keyword) {
+        case "indexes": {
+          const { value, symbols } = parseArrayBlock();
+          searchSlots[keyword] = value;
+          indexesSymbols = symbols;
+          break;
+        }
         case "placeholder": {
           const { value } = consume(TokenType.QuotedString);
           searchSlots[keyword] = value;
@@ -958,11 +964,6 @@ export const parse = (tokens) => {
           searchSlots[keyword] = value;
           break;
         }
-        case "indexes": {
-          const { value } = parseArrayBlock();
-          searchSlots[keyword] = value;
-          break;
-        }
       }
     }
     const { indexes } = searchSlots;
@@ -970,10 +971,14 @@ export const parse = (tokens) => {
       throw new Diagnostic('"indexes" option is required', location);
     }
     consume(TokenType.RightBracket);
-    return {
+    const options = {
       ...searchSlots,
       indexes
     };
+    return {
+      options,
+      indexesSymbols
+    };
   };
   const parseLayoutBlock = () => {
     let name;

package/dist/semantic.js

@@ -208,6 +208,15 @@ const analyze = async (ast, options, errors = []) => {
                 }
             }
         }
+        if (node.search) {
+            for (const [i, symbol] of node[AST.LOCATION_SYMBOL].searchIndexes.entries()) {
+                const propName = node.search.indexes[i];
+                if (!(propName in node.properties)) {
+                    const location = parser_js_1.locationMap.get(symbol);
+                    errors.push(new diagnostic_js_1.Diagnostic(`invalid property "${propName}"`, location));
+                }
+            }
+        }
     }
     for (const node of ast.contracts) {
         if (node.payload) {

package/dist/semantic.mjs

@@ -168,6 +168,15 @@ export const analyze = async (ast, options, errors = []) => {
         }
       }
     }
+    if (node.search) {
+      for (const [i, symbol] of node[AST.LOCATION_SYMBOL].searchIndexes.entries()) {
+        const propName = node.search.indexes[i];
+        if (!(propName in node.properties)) {
+          const location = locationMap.get(symbol);
+          errors.push(new Diagnostic(`invalid property "${propName}"`, location));
+        }
+      }
+    }
   }
   for (const node of ast.contracts) {
     if (node.payload) {

package/package.json

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