@aeriajs/compiler 0.0.27 → 0.0.29

package/dist/ast.d.ts

@@ -34,6 +34,7 @@ export type FormLayoutNode = NodeBase<'formLayout'> & FormLayout<Description> &
                 field: FormLayoutField<Description>;
             };
         };
+        terms?: [string, symbol][];
     };
 };
 export type PropertyNode = NodeBase<'property'> & {

package/dist/codegen/generateJSCollections.js

@@ -58,6 +58,9 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
                 };
                 collectionSchema.exposedFunctions = (0, utils_js_1.getExposedFunctions)(collectionNode[key]);
                 break;
+            case 'required':
+                collectionSchema.description[key] = collectionNode[key];
+                break;
             case 'table':
             case 'filters':
             case 'indexes':
@@ -78,13 +81,10 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
                 collectionSchema.description[key] = collectionNode[key];
                 break;
             case 'layout':
-                collectionSchema.description[key] = collectionNode[key];
+                collectionSchema.description[key] = (0, utils_js_1.unwrapNode)(collectionNode[key]);
                 break;
             case 'formLayout':
-                collectionSchema.description[key] = collectionNode[key];
-                break;
-            case 'required':
-                collectionSchema.description[key] = collectionNode[key];
+                collectionSchema.description[key] = (0, utils_js_1.unwrapNode)(collectionNode[key]);
                 break;
         }
     }

package/dist/codegen/generateJSCollections.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { makeASTImports, recursivelyUnwrapPropertyNodes, stringify, getExtendName, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
+import { unwrapNode, recursivelyUnwrapPropertyNodes, stringify, makeASTImports, getCollectionId, UnquotedSymbol, getExposedFunctions, getExtendName, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
 const initialImportedFunctions = [
   "extendCollection",
   "defineCollection"
@@ -51,6 +51,9 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
         };
         collectionSchema.exposedFunctions = getExposedFunctions(collectionNode[key]);
         break;
+      case "required":
+        collectionSchema.description[key] = collectionNode[key];
+        break;
       case "table":
       case "filters":
       case "indexes":
@@ -71,13 +74,10 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
         collectionSchema.description[key] = collectionNode[key];
         break;
       case "layout":
-        collectionSchema.description[key] = collectionNode[key];
+        collectionSchema.description[key] = unwrapNode(collectionNode[key]);
         break;
       case "formLayout":
-        collectionSchema.description[key] = collectionNode[key];
-        break;
-      case "required":
-        collectionSchema.description[key] = collectionNode[key];
+        collectionSchema.description[key] = unwrapNode(collectionNode[key]);
         break;
     }
   }

package/dist/codegen/generateTSCollections.js

@@ -68,6 +68,9 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
                 collectionSchema.functions = makeTSFunctions(collectionNode[key]);
                 collectionSchema.exposedFunctions = (0, utils_js_1.getExposedFunctions)(collectionNode[key]);
                 break;
+            case 'required':
+                collectionSchema.description[key] = collectionNode[key];
+                break;
             case 'table':
             case 'filters':
             case 'indexes':
@@ -88,13 +91,10 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
                 collectionSchema.description[key] = collectionNode[key];
                 break;
             case 'layout':
-                collectionSchema.description[key] = collectionNode[key];
+                collectionSchema.description[key] = (0, utils_js_1.unwrapNode)(collectionNode[key]);
                 break;
             case 'formLayout':
-                collectionSchema.description[key] = collectionNode[key];
-                break;
-            case 'required':
-                collectionSchema.description[key] = collectionNode[key];
+                collectionSchema.description[key] = (0, utils_js_1.unwrapNode)(collectionNode[key]);
                 break;
         }
     }

package/dist/codegen/generateTSCollections.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { recursivelyUnwrapPropertyNodes, stringify, makeASTImports, resizeFirstChar, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
+import { unwrapNode, recursivelyUnwrapPropertyNodes, stringify, makeASTImports, resizeFirstChar, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
 const initialImportedTypes = [
   "Collection",
   "SchemaWithId",
@@ -63,6 +63,9 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
         collectionSchema.functions = makeTSFunctions(collectionNode[key]);
         collectionSchema.exposedFunctions = getExposedFunctions(collectionNode[key]);
         break;
+      case "required":
+        collectionSchema.description[key] = collectionNode[key];
+        break;
       case "table":
       case "filters":
       case "indexes":
@@ -83,13 +86,10 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
         collectionSchema.description[key] = collectionNode[key];
         break;
       case "layout":
-        collectionSchema.description[key] = collectionNode[key];
+        collectionSchema.description[key] = unwrapNode(collectionNode[key]);
         break;
       case "formLayout":
-        collectionSchema.description[key] = collectionNode[key];
-        break;
-      case "required":
-        collectionSchema.description[key] = collectionNode[key];
+        collectionSchema.description[key] = unwrapNode(collectionNode[key]);
         break;
     }
   }

package/dist/codegen/utils.d.ts

@@ -13,6 +13,9 @@ export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<s
     code: string[];
     modifiedSymbols: Record<string, string>;
 };
+export declare const unwrapNode: <TNode extends {
+    kind: string;
+}>(node: TNode) => Omit<TNode, "kind" | symbol>;
 export declare const unwrapPropertyNode: ({ property, nestedProperties, nestedAdditionalProperties }: Pick<AST.PropertyNode, "property" | "nestedProperties" | "nestedAdditionalProperties">) => Property;
 /** Transforms the AST properties to the format of aeria schema properties */
 export declare const recursivelyUnwrapPropertyNodes: <TProperties extends Record<string, AST.PropertyNode | AST.PropertyNode[]>, TReturnType = TProperties[keyof TProperties] extends Array<unknown> ? Record<string, Property[]> : Record<string, Property>>(properties: TProperties) => TReturnType;

package/dist/codegen/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtendName = exports.getCollectionId = exports.resizeFirstChar = exports.stringify = exports.UnquotedSymbol = exports.recursivelyUnwrapPropertyNodes = exports.unwrapPropertyNode = 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.PACKAGE_NAME = void 0;
 exports.PACKAGE_NAME = 'aeria';
 exports.DEFAULT_FUNCTIONS = [
     'count',
@@ -56,6 +56,11 @@ const makeASTImports = (ast, initialImports) => {
     };
 };
 exports.makeASTImports = makeASTImports;
+const unwrapNode = (node) => {
+    const { kind, ...unwrappedNode } = Object.fromEntries(Object.entries(node).filter(([key]) => typeof key === 'string'));
+    return unwrappedNode;
+};
+exports.unwrapNode = unwrapNode;
 const unwrapPropertyNode = ({ property, nestedProperties, nestedAdditionalProperties }) => {
     const propertyOrPropertyItems = 'items' in property
         ? property.items

package/dist/codegen/utils.mjs

@@ -49,6 +49,10 @@ export const makeASTImports = (ast, initialImports) => {
     modifiedSymbols
   };
 };
+export const unwrapNode = (node) => {
+  const { kind, ...unwrappedNode } = Object.fromEntries(Object.entries(node).filter(([key]) => typeof key === "string"));
+  return unwrappedNode;
+};
 export const unwrapPropertyNode = ({ property, nestedProperties, nestedAdditionalProperties }) => {
   const propertyOrPropertyItems = "items" in property ? property.items : property;
   let unwrappedProperty = propertyOrPropertyItems;

package/dist/lexer.d.ts

@@ -11,7 +11,8 @@ export declare const TOPLEVEL_KEYWORDS: readonly ["collection", "contract", "fun
 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 COLLECTION_FORM_LAYOUT_KEYWORDS[number] | typeof CONTRACT_KEYWORDS[number] | typeof TOPLEVEL_KEYWORDS[number] | typeof MISC_KEYWORDS[number];
 export declare const KEYWORDS: Keyword[];
-export declare const OPERATORS: readonly ["&&", "||", "==", "in", ">=", "<=", ">", "<"];
+export declare const FINAL_OPERATORS: readonly ["==", "in", ">=", "<=", ">", "<", "!"];
+export declare const LOGICAL_OPERATORS: readonly ["&&", "||"];
 export declare const tokenize: (rawInput: string) => {
     tokens: Token[];
     errors: Diagnostic[];

package/dist/lexer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tokenize = exports.OPERATORS = exports.KEYWORDS = exports.MISC_KEYWORDS = exports.TOPLEVEL_KEYWORDS = exports.CONTRACT_KEYWORDS = exports.COLLECTION_FORM_LAYOUT_KEYWORDS = exports.COLLECTION_LAYOUT_OPTIONS_KEYWORDS = exports.COLLECTION_LAYOUT_KEYWORDS = exports.COLLECTION_SEARCH_KEYWORDS = exports.COLLECTION_ACTIONS_KEYWORDS = exports.COLLECTION_KEYWORDS = void 0;
+exports.tokenize = exports.LOGICAL_OPERATORS = exports.FINAL_OPERATORS = exports.KEYWORDS = exports.MISC_KEYWORDS = exports.TOPLEVEL_KEYWORDS = exports.CONTRACT_KEYWORDS = exports.COLLECTION_FORM_LAYOUT_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 = [
@@ -77,15 +77,18 @@ exports.TOPLEVEL_KEYWORDS = [
 ];
 exports.MISC_KEYWORDS = ['extends'];
 exports.KEYWORDS = [].concat(exports.COLLECTION_KEYWORDS, exports.COLLECTION_ACTIONS_KEYWORDS, exports.COLLECTION_SEARCH_KEYWORDS, exports.COLLECTION_LAYOUT_KEYWORDS, exports.COLLECTION_LAYOUT_OPTIONS_KEYWORDS, exports.COLLECTION_FORM_LAYOUT_KEYWORDS, exports.CONTRACT_KEYWORDS, exports.TOPLEVEL_KEYWORDS, exports.MISC_KEYWORDS);
-exports.OPERATORS = [
-    '&&',
-    '||',
+exports.FINAL_OPERATORS = [
     '==',
     'in',
     '>=',
     '<=',
     '>',
     '<',
+    '!',
+];
+exports.LOGICAL_OPERATORS = [
+    '&&',
+    '||',
 ];
 const keywordsSet = new Set();
 for (const keyword of exports.KEYWORDS) {
@@ -130,7 +133,7 @@ const TOKENS = [
     },
     {
         type: token_js_1.TokenType.Operator,
-        matcher: exports.OPERATORS,
+        matcher: [].concat(exports.FINAL_OPERATORS, exports.LOGICAL_OPERATORS),
     },
     {
         type: token_js_1.TokenType.Pipe,

package/dist/lexer.mjs

@@ -85,15 +85,18 @@ export const KEYWORDS = [].concat(
   TOPLEVEL_KEYWORDS,
   MISC_KEYWORDS
 );
-export const OPERATORS = [
-  "&&",
-  "||",
+export const FINAL_OPERATORS = [
   "==",
   "in",
   ">=",
   "<=",
   ">",
-  "<"
+  "<",
+  "!"
+];
+export const LOGICAL_OPERATORS = [
+  "&&",
+  "||"
 ];
 const keywordsSet = /* @__PURE__ */ new Set();
 for (const keyword of KEYWORDS) {
@@ -138,7 +141,7 @@ const TOKENS = [
   },
   {
     type: TokenType.Operator,
-    matcher: OPERATORS
+    matcher: [].concat(FINAL_OPERATORS, LOGICAL_OPERATORS)
   },
   {
     type: TokenType.Pipe,

package/dist/parser.js

@@ -1088,7 +1088,9 @@ const parse = (tokens) => {
                             const { value: keyword, location: keywordLocation } = consume(token_js_1.TokenType.Keyword, lexer.COLLECTION_FORM_LAYOUT_KEYWORDS);
                             switch (keyword) {
                                 case 'if': {
-                                    fields[identifier].if = parseCondition();
+                                    const ifTerms = [];
+                                    fields[identifier].if = parseCondition(ifTerms);
+                                    node[AST.LOCATION_SYMBOL].terms = ifTerms;
                                     break;
                                 }
                                 case 'span':
@@ -1123,13 +1125,13 @@ const parse = (tokens) => {
         consume(token_js_1.TokenType.RightBracket);
         return node;
     };
-    const parseCondition = () => {
+    const parseCondition = (symbols = []) => {
         if (match(token_js_1.TokenType.LeftParens)) {
             consume(token_js_1.TokenType.LeftParens);
             let operatorType, newOp = operatorType;
             const conditions = [];
             while (!match(token_js_1.TokenType.RightParens)) {
-                conditions.push(parseCondition());
+                conditions.push(parseCondition(symbols));
                 if (match(token_js_1.TokenType.RightParens)) {
                     break;
                 }
@@ -1167,10 +1169,34 @@ const parse = (tokens) => {
                 }
             }
         }
-        const { value: term1 } = consume(token_js_1.TokenType.Identifier);
+        if (match(token_js_1.TokenType.Operator, '!')) {
+            consume(token_js_1.TokenType.Operator);
+            return {
+                not: parseCondition(symbols),
+            };
+        }
+        const { value: term1, location: term1Location } = consume(token_js_1.TokenType.Identifier);
+        const term1Symbol = Symbol();
+        exports.locationMap.set(term1Symbol, term1Location);
+        symbols.push([
+            term1,
+            term1Symbol,
+        ]);
+        if (!match(token_js_1.TokenType.Operator, lexer.FINAL_OPERATORS)) {
+            return {
+                operator: 'truthy',
+                term1,
+            };
+        }
         const { value: operatorSymbol, location } = consume(token_js_1.TokenType.Operator);
-        const { value: term2 } = current();
-        advance();
+        let term2;
+        if (match(token_js_1.TokenType.LeftParens)) {
+            term2 = parseCondition(symbols);
+        }
+        else {
+            term2 = current().value;
+            advance();
+        }
         let operator;
         switch (operatorSymbol) {
             case '==':

package/dist/parser.mjs

@@ -1027,7 +1027,9 @@ export const parse = (tokens) => {
               const { value: keyword2, location: keywordLocation2 } = consume(TokenType.Keyword, lexer.COLLECTION_FORM_LAYOUT_KEYWORDS);
               switch (keyword2) {
                 case "if": {
-                  fields[identifier].if = parseCondition();
+                  const ifTerms = [];
+                  fields[identifier].if = parseCondition(ifTerms);
+                  node[AST.LOCATION_SYMBOL].terms = ifTerms;
                   break;
                 }
                 case "span":
@@ -1060,13 +1062,13 @@ export const parse = (tokens) => {
     consume(TokenType.RightBracket);
     return node;
   };
-  const parseCondition = () => {
+  const parseCondition = (symbols = []) => {
     if (match(TokenType.LeftParens)) {
       consume(TokenType.LeftParens);
       let operatorType, newOp = operatorType;
       const conditions = [];
       while (!match(TokenType.RightParens)) {
-        conditions.push(parseCondition());
+        conditions.push(parseCondition(symbols));
         if (match(TokenType.RightParens)) {
           break;
         }
@@ -1104,10 +1106,33 @@ export const parse = (tokens) => {
         }
       }
     }
-    const { value: term1 } = consume(TokenType.Identifier);
+    if (match(TokenType.Operator, "!")) {
+      consume(TokenType.Operator);
+      return {
+        not: parseCondition(symbols)
+      };
+    }
+    const { value: term1, location: term1Location } = consume(TokenType.Identifier);
+    const term1Symbol = Symbol();
+    locationMap.set(term1Symbol, term1Location);
+    symbols.push([
+      term1,
+      term1Symbol
+    ]);
+    if (!match(TokenType.Operator, lexer.FINAL_OPERATORS)) {
+      return {
+        operator: "truthy",
+        term1
+      };
+    }
     const { value: operatorSymbol, location } = consume(TokenType.Operator);
-    const { value: term2 } = current();
-    advance();
+    let term2;
+    if (match(TokenType.LeftParens)) {
+      term2 = parseCondition(symbols);
+    } else {
+      term2 = current().value;
+      advance();
+    }
     let operator;
     switch (operatorSymbol) {
       case "==":

package/dist/semantic.js

@@ -169,6 +169,14 @@ const analyze = async (ast, options, errors = []) => {
                     }
                 }
             }
+            if (node.formLayout[AST.LOCATION_SYMBOL].terms) {
+                for (const [name, symbol] of node.formLayout[AST.LOCATION_SYMBOL].terms) {
+                    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));
+                    }
+                }
+            }
         }
     }
     for (const node of ast.contracts) {

package/dist/semantic.mjs

@@ -131,6 +131,14 @@ export const analyze = async (ast, options, errors = []) => {
           }
         }
       }
+      if (node.formLayout[AST.LOCATION_SYMBOL].terms) {
+        for (const [name, symbol] of node.formLayout[AST.LOCATION_SYMBOL].terms) {
+          if (!(name in node.properties)) {
+            const location = locationMap.get(symbol);
+            errors.push(new Diagnostic(`invalid left operand "${name}"`, location));
+          }
+        }
+      }
     }
   }
   for (const node of ast.contracts) {

package/package.json

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