@aeriajs/compiler 0.0.10 → 0.0.12

package/dist/codegen/generateContracts.js

@@ -31,8 +31,9 @@ const makeJSContractsCode = (contractAst) => {
     };
     const declarations = contractAst.map((contractNode) => {
         const { name, kind, roles, response, ...contractProperty } = contractNode;
-        let responseString = '';
+        let responseString;
         if (response) {
+            responseString = '';
             if (Array.isArray(response)) {
                 const responseArray = [];
                 for (const responseElement of response) {
@@ -47,10 +48,15 @@ const makeJSContractsCode = (contractAst) => {
             }
         }
         const contractSchema = (0, utils_js_1.getProperties)(contractProperty);
-        contractSchema.response = {
-            [utils_js_1.UnquotedSymbol]: responseString,
-        };
-        return `export const ${name}Contract = defineContract(${(0, utils_js_1.stringify)(contractSchema)})`;
+        if (responseString) {
+            contractSchema.response = {
+                [utils_js_1.UnquotedSymbol]: responseString,
+            };
+        }
+        if (roles) {
+            contractSchema.roles = roles;
+        }
+        return `export const ${name} = defineContract(${(0, utils_js_1.stringify)(contractSchema)})`;
     }).join('\n\n');
     return `import { ${Array.from(imports).join(', ')} } from \'aeria\'\n\n` + declarations;
 };
@@ -76,9 +82,12 @@ const makeTSContractsCode = (contractAst) => {
             }
         }
         const contractProperties = (0, utils_js_1.getProperties)(contractSchema);
-        return `export declare const ${contractNode.name}Contract: ${(0, utils_js_1.stringify)({
-            ...contractProperties,
-            response: responseSchema,
-        })}`;
+        if (responseSchema) {
+            contractProperties.response = responseSchema;
+        }
+        if (roles) {
+            contractProperties.roles = roles;
+        }
+        return `export declare const ${contractNode.name}: ${(0, utils_js_1.stringify)(contractProperties)}`;
     }).join('\n\n');
 };

package/dist/codegen/generateContracts.mjs

@@ -26,8 +26,9 @@ const makeJSContractsCode = (contractAst) => {
   };
   const declarations = contractAst.map((contractNode) => {
     const { name, kind, roles, response, ...contractProperty } = contractNode;
-    let responseString = "";
+    let responseString;
     if (response) {
+      responseString = "";
       if (Array.isArray(response)) {
         const responseArray = [];
         for (const responseElement of response) {
@@ -41,10 +42,15 @@ const makeJSContractsCode = (contractAst) => {
       }
     }
     const contractSchema = getProperties(contractProperty);
-    contractSchema.response = {
-      [UnquotedSymbol]: responseString
-    };
-    return `export const ${name}Contract = defineContract(${stringify(contractSchema)})`;
+    if (responseString) {
+      contractSchema.response = {
+        [UnquotedSymbol]: responseString
+      };
+    }
+    if (roles) {
+      contractSchema.roles = roles;
+    }
+    return `export const ${name} = defineContract(${stringify(contractSchema)})`;
   }).join("\n\n");
   return `import { ${Array.from(imports).join(", ")} } from 'aeria'
 
@@ -69,9 +75,12 @@ const makeTSContractsCode = (contractAst) => {
       }
     }
     const contractProperties = getProperties(contractSchema);
-    return `export declare const ${contractNode.name}Contract: ${stringify({
-      ...contractProperties,
-      response: responseSchema
-    })}`;
+    if (responseSchema) {
+      contractProperties.response = responseSchema;
+    }
+    if (roles) {
+      contractProperties.roles = roles;
+    }
+    return `export declare const ${contractNode.name}: ${stringify(contractProperties)}`;
   }).join("\n\n");
 };

package/dist/codegen/utils.d.ts

@@ -13,7 +13,7 @@ export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<s
     code: string[];
     modifiedSymbols: Record<string, string>;
 };
-export declare const propertyToSchema: (propertyNode: AST.PropertyNode) => Property;
+export declare const propertyToSchema: ({ property, nestedProperties }: Pick<AST.PropertyNode, "property" | "nestedProperties">) => Property;
 /** Transforms the AST properties to the format of aeria schema properties */
 export declare const getProperties: <TProperties extends Record<string, AST.PropertyNode | AST.PropertyNode[]>, TReturnType = TProperties[keyof TProperties] extends unknown[] ? Record<string, Property[]> : Record<string, Property>>(properties: TProperties) => TReturnType;
 export declare const UnquotedSymbol: unique symbol;

package/dist/codegen/utils.js

@@ -14,8 +14,7 @@ exports.DEFAULT_FUNCTIONS = [
 ];
 exports.ArraySymbol = Symbol('array');
 const getExposedFunctions = (astFunctions) => {
-    return Object.fromEntries(Object.entries(astFunctions)
-        .map(([key, value]) => [
+    return Object.fromEntries(Object.entries(astFunctions).map(([key, value]) => [
         key,
         value.accessCondition,
     ]));
@@ -56,22 +55,22 @@ const makeASTImports = (ast, initialImports) => {
     };
 };
 exports.makeASTImports = makeASTImports;
-const propertyToSchema = (propertyNode) => {
-    const propertySchema = propertyNode.property;
+const propertyToSchema = ({ property, nestedProperties }) => {
+    const propertySchema = property;
     if ('$ref' in propertySchema) {
         propertySchema.$ref = (0, exports.getCollectionId)(propertySchema.$ref);
     }
     else if ('items' in propertySchema && '$ref' in propertySchema.items) {
         propertySchema.items.$ref = (0, exports.getCollectionId)(propertySchema.items.$ref);
     }
-    if (propertyNode.nestedProperties && 'type' in propertySchema) {
+    if (nestedProperties && 'type' in propertySchema) {
         if (propertySchema.type === 'object' && 'properties' in propertySchema) {
-            propertySchema.properties = (0, exports.getProperties)(propertyNode.nestedProperties);
+            propertySchema.properties = (0, exports.getProperties)(nestedProperties);
         }
         else if (propertySchema.type === 'array') {
             propertySchema.items = {
                 type: 'object',
-                properties: (0, exports.getProperties)(propertyNode.nestedProperties),
+                properties: (0, exports.getProperties)(nestedProperties),
             };
         }
     }

package/dist/codegen/utils.mjs

@@ -48,20 +48,20 @@ export const makeASTImports = (ast, initialImports) => {
     modifiedSymbols
   };
 };
-export const propertyToSchema = (propertyNode) => {
-  const propertySchema = propertyNode.property;
+export const propertyToSchema = ({ property, nestedProperties }) => {
+  const propertySchema = property;
   if ("$ref" in propertySchema) {
     propertySchema.$ref = getCollectionId(propertySchema.$ref);
   } else if ("items" in propertySchema && "$ref" in propertySchema.items) {
     propertySchema.items.$ref = getCollectionId(propertySchema.items.$ref);
   }
-  if (propertyNode.nestedProperties && "type" in propertySchema) {
+  if (nestedProperties && "type" in propertySchema) {
     if (propertySchema.type === "object" && "properties" in propertySchema) {
-      propertySchema.properties = getProperties(propertyNode.nestedProperties);
+      propertySchema.properties = getProperties(nestedProperties);
     } else if (propertySchema.type === "array") {
       propertySchema.items = {
         type: "object",
-        properties: getProperties(propertyNode.nestedProperties)
+        properties: getProperties(nestedProperties)
       };
     }
   }

package/dist/compile.js

@@ -99,7 +99,7 @@ const compileFromFiles = async (schemaDir, options) => {
         });
     }
     const result = await (0, exports.parseAndCheck)(sources, options);
-    if (!result.ast) {
+    if (!result.ast || result.errorCount > 0) {
         return result;
     }
     const emittedFiles = await (0, codegen_js_1.generateCode)(result.ast, options);

package/dist/compile.mjs

@@ -59,7 +59,7 @@ export const compileFromFiles = async (schemaDir, options) => {
     });
   }
   const result = await parseAndCheck(sources, options);
-  if (!result.ast) {
+  if (!result.ast || result.errorCount > 0) {
     return result;
   }
   const emittedFiles = await generateCode(result.ast, options);

package/dist/lexer.d.ts

@@ -4,7 +4,7 @@ export type Keyword = typeof COLLECTION_KEYWORDS[number] | typeof COLLECTION_ACT
 export declare const COLLECTION_KEYWORDS: readonly ["actions", "filters", "form", "functions", "icon", "indexes", "individualActions", "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 CONTRACT_KEYWORDS: readonly ["payload", "query", "response"];
+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 declare const KEYWORDS: Keyword[];

package/dist/lexer.js

@@ -43,6 +43,7 @@ exports.COLLECTION_SEARCH_KEYWORDS = [
     'exactMatches',
 ];
 exports.CONTRACT_KEYWORDS = [
+    'roles',
     'payload',
     'query',
     'response',

package/dist/lexer.mjs

@@ -41,6 +41,7 @@ export const COLLECTION_SEARCH_KEYWORDS = [
   "exactMatches"
 ];
 export const CONTRACT_KEYWORDS = [
+  "roles",
   "payload",
   "query",
   "response"

package/dist/parser.d.ts

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

package/dist/parser.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = exports.locationMap = void 0;
+exports.parse = exports.memoTable = exports.locationMap = void 0;
 const token_js_1 = require("./token.js");
 const types_1 = require("@aeriajs/types");
 const core_1 = require("@phosphor-icons/core");
@@ -44,9 +44,22 @@ const lexer = __importStar(require("./lexer.js"));
 const MAX_ERROR_MESSAGE_ITEMS = 20;
 const ICON_NAMES = core_1.icons.map((icon) => icon.name);
 exports.locationMap = new WeakMap();
+exports.memoTable = {};
 const isFileProperty = (property) => {
     return property.$ref === 'File';
 };
+const checkForValidRoles = (roles, symbols) => {
+    if (exports.memoTable.roles) {
+        for (const [i, role] of roles.entries()) {
+            const symbol = symbols[i];
+            if (!exports.memoTable.roles.includes(role)) {
+                const location = exports.locationMap.get(symbol);
+                throw new diagnostic_js_1.Diagnostic(`invalid role "${role}"`, location);
+            }
+        }
+    }
+    return roles;
+};
 const parse = (tokens) => {
     let index = 0;
     const ast = {
@@ -126,18 +139,35 @@ const parse = (tokens) => {
             }
         }
     };
-    const parseArray = (type) => {
-        consume(token_js_1.TokenType.LeftSquareBracket);
+    const parseArray = (types) => {
+        const { location: openingLocation } = consume(token_js_1.TokenType.LeftSquareBracket);
         const array = [];
+        const symbols = [];
+        let type;
+        for (const typeCandidate of types) {
+            if (match(typeCandidate)) {
+                type = typeCandidate;
+                break;
+            }
+        }
+        if (!type) {
+            throw new diagnostic_js_1.Diagnostic(`array got an invalid type, accepted ones are: ${types.join(' | ')}`, openingLocation);
+        }
         while (!match(token_js_1.TokenType.RightSquareBracket)) {
-            const { value } = consume(type);
+            const { value, location } = consume(type);
+            const elemSymbol = Symbol();
             array.push(value);
+            symbols.push(elemSymbol);
+            exports.locationMap.set(elemSymbol, location);
             if (match(token_js_1.TokenType.Comma)) {
                 consume(token_js_1.TokenType.Comma);
             }
         }
         consume(token_js_1.TokenType.RightSquareBracket);
-        return array;
+        return {
+            value: array,
+            symbols,
+        };
     };
     const parseArrayBlock = (value) => {
         const array = [];
@@ -189,7 +219,10 @@ const parse = (tokens) => {
             return true;
         };
         if ('enum' in property && attributeName === 'values') {
-            property.enum = parseArray(token_js_1.TokenType.QuotedString);
+            property.enum = parseArray([
+                token_js_1.TokenType.QuotedString,
+                token_js_1.TokenType.Number,
+            ]).value;
             return;
         }
         switch (attributeName) {
@@ -216,7 +249,7 @@ const parse = (tokens) => {
                 case 'form':
                 case 'populate':
                 case 'indexes': {
-                    property[attributeName] = parseArray(token_js_1.TokenType.Identifier);
+                    property[attributeName] = parseArray([token_js_1.TokenType.Identifier]).value;
                     return;
                 }
                 case 'populateDepth': {
@@ -229,7 +262,7 @@ const parse = (tokens) => {
                 switch (attributeName) {
                     case 'extensions':
                     case 'accept': {
-                        property[attributeName] = parseArray(token_js_1.TokenType.QuotedString);
+                        property[attributeName] = parseArray([token_js_1.TokenType.QuotedString]).value;
                         return;
                     }
                 }
@@ -246,7 +279,7 @@ const parse = (tokens) => {
                         }
                         case 'mask': {
                             if (match(token_js_1.TokenType.LeftSquareBracket)) {
-                                property[attributeName] = parseArray(token_js_1.TokenType.QuotedString);
+                                property[attributeName] = parseArray([token_js_1.TokenType.QuotedString]).value;
                                 return;
                             }
                             else {
@@ -584,15 +617,15 @@ const parse = (tokens) => {
                     }
                     case 'icon': {
                         const { value } = consume(token_js_1.TokenType.QuotedString, ICON_NAMES);
-                        node.icon = value;
+                        node[keyword] = value;
                         break;
                     }
                     case 'properties': {
-                        node.properties = parsePropertiesBlock();
+                        node[keyword] = parsePropertiesBlock();
                         break;
                     }
                     case 'functions': {
-                        node.functions = parseFunctionsBlock(ast);
+                        node[keyword] = parseFunctionsBlock(ast);
                         break;
                     }
                     case 'individualActions':
@@ -647,6 +680,26 @@ const parse = (tokens) => {
         while (!match(token_js_1.TokenType.RightBracket)) {
             const { value: keyword } = consume(token_js_1.TokenType.Keyword, lexer.CONTRACT_KEYWORDS);
             switch (keyword) {
+                case 'roles': {
+                    if (match(token_js_1.TokenType.Boolean)) {
+                        const { value: boolean } = consume(token_js_1.TokenType.Boolean);
+                        node.roles = boolean;
+                    }
+                    else if (match(token_js_1.TokenType.QuotedString, 'unauthenticated')) {
+                        consume(token_js_1.TokenType.QuotedString);
+                        node.roles = 'unauthenticated';
+                    }
+                    else if (match(token_js_1.TokenType.QuotedString, 'unauthenticated-only')) {
+                        consume(token_js_1.TokenType.QuotedString);
+                        node.roles = 'unauthenticated-only';
+                    }
+                    else {
+                        const { value, symbols } = parseArrayBlock();
+                        const roles = checkForValidRoles(value, symbols);
+                        node.roles = roles;
+                    }
+                    break;
+                }
                 case 'payload': {
                     node.payload = parsePropertyType({
                         allowModifiers: true,
@@ -716,9 +769,10 @@ const parse = (tokens) => {
                         };
                     }
                     else {
-                        const value = parseArray(token_js_1.TokenType.QuotedString);
+                        const { value, symbols } = parseArray([token_js_1.TokenType.QuotedString]);
+                        const roles = checkForValidRoles(value, symbols);
                         functions[functionName] = {
-                            accessCondition: value,
+                            accessCondition: roles,
                         };
                     }
                     consume(token_js_1.TokenType.RightParens);
@@ -780,9 +834,14 @@ const parse = (tokens) => {
                         baseSlots[keyword] = value;
                         break;
                     }
-                    case 'roles':
+                    case 'roles': {
+                        const { value, symbols } = parseArray([token_js_1.TokenType.Identifier]);
+                        const roles = checkForValidRoles(value, symbols);
+                        baseSlots[keyword] = roles;
+                        break;
+                    }
                     case 'requires': {
-                        const value = parseArray(token_js_1.TokenType.Identifier);
+                        const { value } = parseArray([token_js_1.TokenType.Identifier]);
                         baseSlots[keyword] = value;
                         break;
                     }
@@ -875,7 +934,14 @@ const parse = (tokens) => {
         try {
             switch (declType) {
                 case 'collection': {
-                    ast.collections.push(parseCollection(ast));
+                    const collection = parseCollection(ast);
+                    if (collection.name === 'User') {
+                        const { properties } = collection;
+                        if ('roles' in properties && 'items' in properties.roles.property && 'enum' in properties.roles.property.items) {
+                            exports.memoTable.roles = properties.roles.property.items.enum;
+                        }
+                    }
+                    ast.collections.push(collection);
                     break;
                 }
                 case 'contract': {

package/dist/parser.mjs

@@ -9,9 +9,22 @@ import * as lexer from "./lexer.mjs";
 const MAX_ERROR_MESSAGE_ITEMS = 20;
 const ICON_NAMES = icons.map((icon) => icon.name);
 export const locationMap = /* @__PURE__ */ new WeakMap();
+export const memoTable = {};
 const isFileProperty = (property) => {
   return property.$ref === "File";
 };
+const checkForValidRoles = (roles, symbols) => {
+  if (memoTable.roles) {
+    for (const [i, role] of roles.entries()) {
+      const symbol = symbols[i];
+      if (!memoTable.roles.includes(role)) {
+        const location = locationMap.get(symbol);
+        throw new Diagnostic(`invalid role "${role}"`, location);
+      }
+    }
+  }
+  return roles;
+};
 export const parse = (tokens) => {
   let index = 0;
   const ast = {
@@ -88,18 +101,35 @@ export const parse = (tokens) => {
       }
     }
   };
-  const parseArray = (type) => {
-    consume(TokenType.LeftSquareBracket);
+  const parseArray = (types) => {
+    const { location: openingLocation } = consume(TokenType.LeftSquareBracket);
     const array = [];
+    const symbols = [];
+    let type;
+    for (const typeCandidate of types) {
+      if (match(typeCandidate)) {
+        type = typeCandidate;
+        break;
+      }
+    }
+    if (!type) {
+      throw new Diagnostic(`array got an invalid type, accepted ones are: ${types.join(" | ")}`, openingLocation);
+    }
     while (!match(TokenType.RightSquareBracket)) {
-      const { value } = consume(type);
+      const { value, location } = consume(type);
+      const elemSymbol = Symbol();
       array.push(value);
+      symbols.push(elemSymbol);
+      locationMap.set(elemSymbol, location);
       if (match(TokenType.Comma)) {
         consume(TokenType.Comma);
       }
     }
     consume(TokenType.RightSquareBracket);
-    return array;
+    return {
+      value: array,
+      symbols
+    };
   };
   const parseArrayBlock = (value) => {
     const array = [];
@@ -148,7 +178,10 @@ export const parse = (tokens) => {
       return true;
     };
     if ("enum" in property && attributeName === "values") {
-      property.enum = parseArray(TokenType.QuotedString);
+      property.enum = parseArray([
+        TokenType.QuotedString,
+        TokenType.Number
+      ]).value;
       return;
     }
     switch (attributeName) {
@@ -175,7 +208,7 @@ export const parse = (tokens) => {
         case "form":
         case "populate":
         case "indexes": {
-          property[attributeName] = parseArray(TokenType.Identifier);
+          property[attributeName] = parseArray([TokenType.Identifier]).value;
           return;
         }
         case "populateDepth": {
@@ -188,7 +221,7 @@ export const parse = (tokens) => {
         switch (attributeName) {
           case "extensions":
           case "accept": {
-            property[attributeName] = parseArray(TokenType.QuotedString);
+            property[attributeName] = parseArray([TokenType.QuotedString]).value;
             return;
           }
         }
@@ -205,7 +238,7 @@ export const parse = (tokens) => {
             }
             case "mask": {
               if (match(TokenType.LeftSquareBracket)) {
-                property[attributeName] = parseArray(TokenType.QuotedString);
+                property[attributeName] = parseArray([TokenType.QuotedString]).value;
                 return;
               } else {
                 const { value } = consume(TokenType.QuotedString);
@@ -535,15 +568,15 @@ export const parse = (tokens) => {
           }
           case "icon": {
             const { value } = consume(TokenType.QuotedString, ICON_NAMES);
-            node.icon = value;
+            node[keyword] = value;
             break;
           }
           case "properties": {
-            node.properties = parsePropertiesBlock();
+            node[keyword] = parsePropertiesBlock();
             break;
           }
           case "functions": {
-            node.functions = parseFunctionsBlock(ast2);
+            node[keyword] = parseFunctionsBlock(ast2);
             break;
           }
           case "individualActions":
@@ -597,6 +630,23 @@ export const parse = (tokens) => {
     while (!match(TokenType.RightBracket)) {
       const { value: keyword } = consume(TokenType.Keyword, lexer.CONTRACT_KEYWORDS);
       switch (keyword) {
+        case "roles": {
+          if (match(TokenType.Boolean)) {
+            const { value: boolean } = consume(TokenType.Boolean);
+            node.roles = boolean;
+          } else if (match(TokenType.QuotedString, "unauthenticated")) {
+            consume(TokenType.QuotedString);
+            node.roles = "unauthenticated";
+          } else if (match(TokenType.QuotedString, "unauthenticated-only")) {
+            consume(TokenType.QuotedString);
+            node.roles = "unauthenticated-only";
+          } else {
+            const { value, symbols } = parseArrayBlock();
+            const roles = checkForValidRoles(value, symbols);
+            node.roles = roles;
+          }
+          break;
+        }
         case "payload": {
           node.payload = parsePropertyType({
             allowModifiers: true
@@ -664,9 +714,10 @@ export const parse = (tokens) => {
               accessCondition: value
             };
           } else {
-            const value = parseArray(TokenType.QuotedString);
+            const { value, symbols } = parseArray([TokenType.QuotedString]);
+            const roles = checkForValidRoles(value, symbols);
             functions[functionName] = {
-              accessCondition: value
+              accessCondition: roles
             };
           }
           consume(TokenType.RightParens);
@@ -727,9 +778,14 @@ export const parse = (tokens) => {
             baseSlots[keyword] = value;
             break;
           }
-          case "roles":
+          case "roles": {
+            const { value, symbols } = parseArray([TokenType.Identifier]);
+            const roles = checkForValidRoles(value, symbols);
+            baseSlots[keyword] = roles;
+            break;
+          }
           case "requires": {
-            const value = parseArray(TokenType.Identifier);
+            const { value } = parseArray([TokenType.Identifier]);
             baseSlots[keyword] = value;
             break;
           }
@@ -821,7 +877,14 @@ export const parse = (tokens) => {
     try {
       switch (declType) {
         case "collection": {
-          ast.collections.push(parseCollection(ast));
+          const collection = parseCollection(ast);
+          if (collection.name === "User") {
+            const { properties } = collection;
+            if ("roles" in properties && "items" in properties.roles.property && "enum" in properties.roles.property.items) {
+              memoTable.roles = properties.roles.property.items.enum;
+            }
+          }
+          ast.collections.push(collection);
           break;
         }
         case "contract": {

package/package.json

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