@aeriajs/compiler 0.0.31 → 0.0.33

package/dist/ast.d.ts

@@ -1,4 +1,4 @@
-import type { Property, AccessCondition, CollectionActions, SearchOptions, DescriptionPreset, Icon, OwnershipMode, Layout, LayoutOptions, FormLayout, Description, FormLayoutField } from '@aeriajs/types';
+import type { Property, AccessCondition, CollectionActions, SearchOptions, DescriptionPreset, Icon, OwnershipMode, Layout, LayoutOptions, FormLayout, Description, FormLayoutField, RequiredProperties } from '@aeriajs/types';
 import type { ArrayProperties } from './utils.js';
 export declare const LOCATION_SYMBOL: unique symbol;
 export declare const PropertyType: {
@@ -34,7 +34,7 @@ export type FormLayoutNode = NodeBase<'formLayout'> & FormLayout<Description> &
                 field: FormLayoutField<Description>;
             };
         };
-        terms?: [string, symbol][];
+        terms?: readonly [string, symbol][];
     };
 };
 export type PropertyNode = NodeBase<'property'> & {
@@ -56,6 +56,7 @@ export type PropertyNode = NodeBase<'property'> & {
 export type CollectionNode = NodeBase<'collection'> & {
     name: string;
     extends?: ExportSymbol;
+    middlewares?: readonly string[];
     owned?: OwnershipMode;
     icon?: Icon;
     actions?: CollectionActions;
@@ -64,13 +65,13 @@ export type CollectionNode = NodeBase<'collection'> & {
     functions?: Record<string, {
         accessCondition: AccessCondition;
     }>;
-    required?: Record<string, unknown> | string[];
-    indexes?: string[];
+    required?: RequiredProperties;
+    indexes?: readonly string[];
     presets?: DescriptionPreset[];
-    form?: string[];
-    table?: string[];
-    tableMeta?: string[];
-    filters?: string[];
+    form?: readonly string[];
+    table?: readonly string[];
+    tableMeta?: readonly string[];
+    filters?: readonly string[];
     search?: SearchOptions<any>;
     layout?: LayoutNode;
     formLayout?: FormLayoutNode;
@@ -78,6 +79,7 @@ export type CollectionNode = NodeBase<'collection'> & {
         arrays: {
             [P in ArrayProperties<CollectionNode>]?: symbol[];
         };
+        requiredTerms?: readonly [string, symbol][];
     };
 };
 export type ContractNode = NodeBase<'contract'> & {

package/dist/codegen/generateJSCollections.js

@@ -10,8 +10,10 @@ const generateJSCollections = (ast) => {
     let javascriptCode = '';
     const importsResult = (0, utils_js_1.makeASTImports)(ast, {
         [utils_js_1.PACKAGE_NAME]: new Set(initialImportedFunctions),
+    }, {
+        includeRuntimeOnlyImports: true,
     });
-    javascriptCode += importsResult.code + '\n\n';
+    javascriptCode += importsResult.code.join('\n') + '\n\n';
     javascriptCode += makeJSCollections(ast, importsResult.modifiedSymbols) + '\n\n';
     return javascriptCode;
 };
@@ -37,8 +39,10 @@ const makeJSCollections = (ast, modifiedSymbols) => {
 };
 const makeJSCollectionSchema = (collectionNode, collectionId) => {
     const collectionSchema = {
+        item: {},
         description: {
             $id: collectionId,
+            properties: {},
         },
     };
     for (const key of Object.keys(collectionNode)) {
@@ -52,6 +56,11 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
             case 'owned':
                 collectionSchema.description[key] = collectionNode[key];
                 break;
+            case 'middlewares':
+                collectionSchema.middlewares = {
+                    [utils_js_1.UnquotedSymbol]: `[ ${collectionNode[key].join(', ')} ]`,
+                };
+                break;
             case 'functions':
                 collectionSchema.functions = {
                     [utils_js_1.UnquotedSymbol]: `{ ${makeJSFunctions(collectionNode[key])} }`,

package/dist/codegen/generateJSCollections.mjs

@@ -8,8 +8,10 @@ export const generateJSCollections = (ast) => {
   let javascriptCode = "";
   const importsResult = makeASTImports(ast, {
     [PACKAGE_NAME]: new Set(initialImportedFunctions)
+  }, {
+    includeRuntimeOnlyImports: true
   });
-  javascriptCode += importsResult.code + "\n\n";
+  javascriptCode += importsResult.code.join("\n") + "\n\n";
   javascriptCode += makeJSCollections(ast, importsResult.modifiedSymbols) + "\n\n";
   return javascriptCode;
 };
@@ -30,8 +32,10 @@ const makeJSCollections = (ast, modifiedSymbols) => {
 };
 const makeJSCollectionSchema = (collectionNode, collectionId) => {
   const collectionSchema = {
+    item: {},
     description: {
-      $id: collectionId
+      $id: collectionId,
+      properties: {}
     }
   };
   for (const key of Object.keys(collectionNode)) {
@@ -45,6 +49,11 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
       case "owned":
         collectionSchema.description[key] = collectionNode[key];
         break;
+      case "middlewares":
+        collectionSchema.middlewares = {
+          [UnquotedSymbol]: `[ ${collectionNode[key].join(", ")} ]`
+        };
+        break;
       case "functions":
         collectionSchema.functions = {
           [UnquotedSymbol]: `{ ${makeJSFunctions(collectionNode[key])} }`

package/dist/codegen/generateTSCollections.js

@@ -12,7 +12,7 @@ const generateTSCollections = (ast) => {
     let code = '';
     code += `import type { ${initialImportedTypes.join(', ')} } from '${utils_js_1.PACKAGE_NAME}'\n`; //Used types
     const importsResult = (0, utils_js_1.makeASTImports)(ast);
-    code += importsResult.code + '\n\n';
+    code += importsResult.code.join('\n') + '\n\n';
     code += makeTSCollections(ast, importsResult.modifiedSymbols) + '\n';
     return code;
 };
@@ -49,8 +49,10 @@ const makeTSCollections = (ast, modifiedSymbols) => {
 };
 const makeTSCollectionSchema = (collectionNode, collectionId) => {
     const collectionSchema = {
+        item: {},
         description: {
             $id: collectionId,
+            properties: {},
         },
     };
     for (const key of Object.keys(collectionNode)) {
@@ -64,6 +66,11 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
             case 'owned':
                 collectionSchema.description.owned = collectionNode[key];
                 break;
+            case 'middlewares':
+                collectionSchema.middlewares = {
+                    [utils_js_1.UnquotedSymbol]: 'import(\'@aeriajs/types\').CollectionMiddleware<unknown>[]',
+                };
+                break;
             case 'functions':
                 collectionSchema.functions = makeTSFunctions(collectionNode[key]);
                 collectionSchema.exposedFunctions = (0, utils_js_1.getExposedFunctions)(collectionNode[key]);

package/dist/codegen/generateTSCollections.mjs

@@ -11,7 +11,7 @@ export const generateTSCollections = (ast) => {
   code += `import type { ${initialImportedTypes.join(", ")} } from '${PACKAGE_NAME}'
 `;
   const importsResult = makeASTImports(ast);
-  code += importsResult.code + "\n\n";
+  code += importsResult.code.join("\n") + "\n\n";
   code += makeTSCollections(ast, importsResult.modifiedSymbols) + "\n";
   return code;
 };
@@ -44,8 +44,10 @@ const makeTSCollections = (ast, modifiedSymbols) => {
 };
 const makeTSCollectionSchema = (collectionNode, collectionId) => {
   const collectionSchema = {
+    item: {},
     description: {
-      $id: collectionId
+      $id: collectionId,
+      properties: {}
     }
   };
   for (const key of Object.keys(collectionNode)) {
@@ -59,6 +61,11 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
       case "owned":
         collectionSchema.description.owned = collectionNode[key];
         break;
+      case "middlewares":
+        collectionSchema.middlewares = {
+          [UnquotedSymbol]: "import('@aeriajs/types').CollectionMiddleware<unknown>[]"
+        };
+        break;
       case "functions":
         collectionSchema.functions = makeTSFunctions(collectionNode[key]);
         collectionSchema.exposedFunctions = getExposedFunctions(collectionNode[key]);

package/dist/codegen/utils.d.ts

@@ -1,6 +1,7 @@
 import type * as AST from '../ast.js';
 import type { Property } from '@aeriajs/types';
 export declare const PACKAGE_NAME = "aeria";
+export declare const MIDDLEWARES_RUNTIME_PATH = "../../../dist/middlewares/index.js";
 export declare const DEFAULT_FUNCTIONS: string[];
 export declare const ArraySymbol: unique symbol;
 export declare const getExposedFunctions: (astFunctions: NonNullable<AST.CollectionNode["functions"]>) => {
@@ -9,7 +10,9 @@ export declare const getExposedFunctions: (astFunctions: NonNullable<AST.Collect
 /**
  * Obs: It will save and return any modified symbols to avoid name duplication later
 */
-export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<string, Set<string>>) => {
+export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<string, Set<string>>, options?: {
+    includeRuntimeOnlyImports: boolean;
+}) => {
     code: string[];
     modifiedSymbols: Record<string, string>;
 };

package/dist/codegen/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtendName = exports.getCollectionId = exports.resizeFirstChar = exports.stringify = exports.UnquotedSymbol = exports.recursivelyUnwrapPropertyNodes = exports.unwrapPropertyNode = exports.unwrapNode = exports.makeASTImports = exports.getExposedFunctions = exports.ArraySymbol = exports.DEFAULT_FUNCTIONS = exports.PACKAGE_NAME = void 0;
+exports.getExtendName = exports.getCollectionId = exports.resizeFirstChar = exports.stringify = exports.UnquotedSymbol = exports.recursivelyUnwrapPropertyNodes = exports.unwrapPropertyNode = exports.unwrapNode = exports.makeASTImports = exports.getExposedFunctions = exports.ArraySymbol = exports.DEFAULT_FUNCTIONS = exports.MIDDLEWARES_RUNTIME_PATH = exports.PACKAGE_NAME = void 0;
 exports.PACKAGE_NAME = 'aeria';
+exports.MIDDLEWARES_RUNTIME_PATH = '../../../dist/middlewares/index.js';
 exports.DEFAULT_FUNCTIONS = [
     'count',
     'get',
@@ -24,7 +25,9 @@ exports.getExposedFunctions = getExposedFunctions;
 /**
  * Obs: It will save and return any modified symbols to avoid name duplication later
 */
-const makeASTImports = (ast, initialImports) => {
+const makeASTImports = (ast, initialImports, options = {
+    includeRuntimeOnlyImports: false,
+}) => {
     const modifiedSymbols = {};
     const toImport = ast.reduce((imports, node) => {
         if (node.kind === 'collection') {
@@ -39,14 +42,20 @@ const makeASTImports = (ast, initialImports) => {
             if (node.functions) {
                 const functionsToImport = Object.keys(node.functions).filter((key) => exports.DEFAULT_FUNCTIONS.includes(key));
                 if (functionsToImport.length > 0) {
-                    if (!(exports.PACKAGE_NAME in imports)) {
-                        imports[exports.PACKAGE_NAME] = new Set();
-                    }
+                    imports[exports.PACKAGE_NAME] ??= new Set();
                     for (const key of functionsToImport) {
                         imports[exports.PACKAGE_NAME].add(key);
                     }
                 }
             }
+            if (options.includeRuntimeOnlyImports) {
+                if (node.middlewares) {
+                    imports[exports.MIDDLEWARES_RUNTIME_PATH] ??= new Set();
+                    for (const middleware of node.middlewares) {
+                        imports[exports.MIDDLEWARES_RUNTIME_PATH].add(middleware);
+                    }
+                }
+            }
         }
         return imports;
     }, initialImports ?? {});

package/dist/codegen/utils.mjs

@@ -1,5 +1,6 @@
 "use strict";
 export const PACKAGE_NAME = "aeria";
+export const MIDDLEWARES_RUNTIME_PATH = "../../../dist/middlewares/index.mjs";
 export const DEFAULT_FUNCTIONS = [
   "count",
   "get",
@@ -18,7 +19,9 @@ export const getExposedFunctions = (astFunctions) => {
     value.accessCondition
   ]));
 };
-export const makeASTImports = (ast, initialImports) => {
+export const makeASTImports = (ast, initialImports, options = {
+  includeRuntimeOnlyImports: false
+}) => {
   const modifiedSymbols = {};
   const toImport = ast.reduce((imports, node) => {
     if (node.kind === "collection") {
@@ -33,14 +36,20 @@ export const makeASTImports = (ast, initialImports) => {
       if (node.functions) {
         const functionsToImport = Object.keys(node.functions).filter((key) => DEFAULT_FUNCTIONS.includes(key));
         if (functionsToImport.length > 0) {
-          if (!(PACKAGE_NAME in imports)) {
-            imports[PACKAGE_NAME] = /* @__PURE__ */ new Set();
-          }
+          imports[PACKAGE_NAME] ??= /* @__PURE__ */ new Set();
           for (const key of functionsToImport) {
             imports[PACKAGE_NAME].add(key);
           }
         }
       }
+      if (options.includeRuntimeOnlyImports) {
+        if (node.middlewares) {
+          imports[MIDDLEWARES_RUNTIME_PATH] ??= /* @__PURE__ */ new Set();
+          for (const middleware of node.middlewares) {
+            imports[MIDDLEWARES_RUNTIME_PATH].add(middleware);
+          }
+        }
+      }
     }
     return imports;
   }, initialImports ?? {});

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", "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"];
 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

@@ -14,6 +14,7 @@ exports.COLLECTION_KEYWORDS = [
     'indexes',
     'individualActions',
     'layout',
+    'middlewares',
     'owned',
     'presets',
     'properties',
@@ -338,7 +339,7 @@ const tokenize = function (rawInput) {
                                 break;
                             }
                             case token_js_1.TokenType.RightParens: {
-                                if (state.variableScopeStack.length > 0) {
+                                if (state.variableExpressionStack.length > 0) {
                                     state.variableExpressionStack.pop();
                                 }
                                 break;

package/dist/lexer.mjs

@@ -12,6 +12,7 @@ export const COLLECTION_KEYWORDS = [
   "indexes",
   "individualActions",
   "layout",
+  "middlewares",
   "owned",
   "presets",
   "properties",
@@ -341,7 +342,7 @@ export const tokenize = function(rawInput) {
                 break;
               }
               case TokenType.RightParens: {
-                if (state.variableScopeStack.length > 0) {
+                if (state.variableExpressionStack.length > 0) {
                   state.variableExpressionStack.pop();
                 }
                 break;

package/dist/parser.d.ts

@@ -3,7 +3,7 @@ import { Diagnostic } from './diagnostic.js';
 import * as AST from './ast.js';
 export declare const locationMap: WeakMap<symbol, Location>;
 export declare const memoTable: {
-    roles?: string[];
+    roles?: readonly string[];
 };
 export declare const parse: (tokens: (Token | undefined)[]) => {
     ast: AST.ProgramNode;

package/dist/parser.js

@@ -189,23 +189,20 @@ const parse = (tokens) => {
             symbols,
         };
     };
-    const parseArrayBlockWithAttributes = () => {
+    const parseArrayBlockWithAttributes = (allowedAttributes, cb) => {
         const array = {};
         let hasAttributes = false;
         consume(token_js_1.TokenType.LeftBracket);
         while (!match(token_js_1.TokenType.RightBracket)) {
             const { value: identifier } = consume(token_js_1.TokenType.Identifier);
-            array[identifier] = {};
-            while (match(token_js_1.TokenType.AttributeName)) {
+            array[identifier] = true;
+            if (match(token_js_1.TokenType.AttributeName)) {
                 hasAttributes = true;
-                const { value: attributeName } = consume(token_js_1.TokenType.AttributeName);
-                if (match(token_js_1.TokenType.LeftParens)) {
-                    consume(token_js_1.TokenType.LeftParens);
-                    consume(token_js_1.TokenType.RightParens);
-                }
-                else {
-                    array[identifier][attributeName] = true;
-                }
+            }
+            while (match(token_js_1.TokenType.AttributeName)) {
+                array[identifier] = {};
+                const { value: attributeName } = consume(token_js_1.TokenType.AttributeName, allowedAttributes);
+                cb(attributeName, array, identifier);
             }
         }
         consume(token_js_1.TokenType.RightBracket);
@@ -679,6 +676,10 @@ const parse = (tokens) => {
             const { value: keyword } = consume(token_js_1.TokenType.Keyword, lexer.COLLECTION_KEYWORDS);
             try {
                 switch (keyword) {
+                    case 'middlewares': {
+                        node.middlewares = parseArrayBlock().value;
+                        break;
+                    }
                     case 'owned': {
                         if (match(token_js_1.TokenType.Boolean)) {
                             node.owned = consume(token_js_1.TokenType.Boolean).value;
@@ -710,7 +711,16 @@ const parse = (tokens) => {
                         break;
                     }
                     case 'required': {
-                        node.required = parseArrayBlockWithAttributes();
+                        node.required = parseArrayBlockWithAttributes(['if'], (attributeName, array, identifier) => {
+                            switch (attributeName) {
+                                case 'if': {
+                                    const ifTerms = [];
+                                    array[identifier] = parseCondition(ifTerms);
+                                    node[AST.LOCATION_SYMBOL].requiredTerms = ifTerms;
+                                    break;
+                                }
+                            }
+                        });
                         break;
                     }
                     case 'presets': {
@@ -803,7 +813,6 @@ const parse = (tokens) => {
                 if (match(token_js_1.TokenType.MacroName)) {
                     const { value: macroName } = consume(token_js_1.TokenType.MacroName, ['include']);
                     switch (macroName) {
-                        /* eslint-disable-next-line */
                         case 'include': {
                             const { value: functionSetName, location } = consume(token_js_1.TokenType.Identifier);
                             const functionset = ast.functionsets.find((node) => node.name === functionSetName);
@@ -812,6 +821,7 @@ const parse = (tokens) => {
                             }
                             Object.assign(functions, functionset.functions);
                             consume(token_js_1.TokenType.RightParens);
+                            break;
                         }
                     }
                     continue;
@@ -1223,7 +1233,7 @@ const parse = (tokens) => {
                 operator = 'lt';
                 break;
             default: {
-                throw new diagnostic_js_1.Diagnostic(`unsuported operator: "${operatorSymbol}"`, location);
+                throw new diagnostic_js_1.Diagnostic(`unsupported operator: "${operatorSymbol}"`, location);
             }
         }
         return {

package/dist/parser.mjs

@@ -151,22 +151,20 @@ export const parse = (tokens) => {
       symbols
     };
   };
-  const parseArrayBlockWithAttributes = () => {
+  const parseArrayBlockWithAttributes = (allowedAttributes, cb) => {
     const array = {};
     let hasAttributes = false;
     consume(TokenType.LeftBracket);
     while (!match(TokenType.RightBracket)) {
       const { value: identifier } = consume(TokenType.Identifier);
-      array[identifier] = {};
-      while (match(TokenType.AttributeName)) {
+      array[identifier] = true;
+      if (match(TokenType.AttributeName)) {
         hasAttributes = true;
-        const { value: attributeName } = consume(TokenType.AttributeName);
-        if (match(TokenType.LeftParens)) {
-          consume(TokenType.LeftParens);
-          consume(TokenType.RightParens);
-        } else {
-          array[identifier][attributeName] = true;
-        }
+      }
+      while (match(TokenType.AttributeName)) {
+        array[identifier] = {};
+        const { value: attributeName } = consume(TokenType.AttributeName, allowedAttributes);
+        cb(attributeName, array, identifier);
       }
     }
     consume(TokenType.RightBracket);
@@ -625,6 +623,10 @@ export const parse = (tokens) => {
       const { value: keyword } = consume(TokenType.Keyword, lexer.COLLECTION_KEYWORDS);
       try {
         switch (keyword) {
+          case "middlewares": {
+            node.middlewares = parseArrayBlock().value;
+            break;
+          }
           case "owned": {
             if (match(TokenType.Boolean)) {
               node.owned = consume(TokenType.Boolean).value;
@@ -655,7 +657,16 @@ export const parse = (tokens) => {
             break;
           }
           case "required": {
-            node.required = parseArrayBlockWithAttributes();
+            node.required = parseArrayBlockWithAttributes(["if"], (attributeName, array, identifier) => {
+              switch (attributeName) {
+                case "if": {
+                  const ifTerms = [];
+                  array[identifier] = parseCondition(ifTerms);
+                  node[AST.LOCATION_SYMBOL].requiredTerms = ifTerms;
+                  break;
+                }
+              }
+            });
             break;
           }
           case "presets": {
@@ -755,6 +766,7 @@ export const parse = (tokens) => {
               }
               Object.assign(functions, functionset.functions);
               consume(TokenType.RightParens);
+              break;
             }
           }
           continue;
@@ -1159,7 +1171,7 @@ export const parse = (tokens) => {
         operator = "lt";
         break;
       default: {
-        throw new Diagnostic(`unsuported operator: "${operatorSymbol}"`, location);
+        throw new Diagnostic(`unsupported operator: "${operatorSymbol}"`, location);
       }
     }
     return {

package/dist/semantic.js

@@ -140,6 +140,14 @@ const analyze = async (ast, options, errors = []) => {
             const subNode = node.properties[propName];
             await recurseProperty(subNode);
         }
+        if (node[AST.LOCATION_SYMBOL].requiredTerms) {
+            for (const [name, symbol] of node[AST.LOCATION_SYMBOL].requiredTerms) {
+                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));
+                }
+            }
+        }
         if (node.layout) {
             if (node.layout.options) {
                 for (const [name, value] of Object.entries(node.layout[AST.LOCATION_SYMBOL].options)) {

package/dist/semantic.mjs

@@ -103,6 +103,14 @@ export const analyze = async (ast, options, errors = []) => {
       const subNode = node.properties[propName];
       await recurseProperty(subNode);
     }
+    if (node[AST.LOCATION_SYMBOL].requiredTerms) {
+      for (const [name, symbol] of node[AST.LOCATION_SYMBOL].requiredTerms) {
+        if (!(name in node.properties)) {
+          const location = locationMap.get(symbol);
+          errors.push(new Diagnostic(`invalid left operand "${name}"`, location));
+        }
+      }
+    }
     if (node.layout) {
       if (node.layout.options) {
         for (const [name, value] of Object.entries(node.layout[AST.LOCATION_SYMBOL].options)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/compiler",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -21,8 +21,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.142",
-    "@aeriajs/types": "^0.0.124"
+    "@aeriajs/common": "^0.0.143",
+    "@aeriajs/types": "^0.0.125"
   },
   "devDependencies": {
     "@aeriajs/common": "link:../common",