@aeriajs/compiler 0.0.9 → 0.0.11

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,12 @@ 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,
+            };
+        }
+        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 +79,11 @@ const makeTSContractsCode = (contractAst) => {
             }
         }
         const contractProperties = (0, utils_js_1.getProperties)(contractSchema);
-        return `export declare const ${contractNode.name}Contract: ${(0, utils_js_1.stringify)({
+        return `export declare const ${contractNode.name}: ${(0, utils_js_1.stringify)({
             ...contractProperties,
-            response: responseSchema,
+            ...(responseSchema && {
+                response: responseSchema,
+            }),
         })}`;
     }).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,12 @@ 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
+      };
+    }
+    return `export const ${name} = defineContract(${stringify(contractSchema)})`;
   }).join("\n\n");
   return `import { ${Array.from(imports).join(", ")} } from 'aeria'
 
@@ -69,9 +72,11 @@ const makeTSContractsCode = (contractAst) => {
       }
     }
     const contractProperties = getProperties(contractSchema);
-    return `export declare const ${contractNode.name}Contract: ${stringify({
+    return `export declare const ${contractNode.name}: ${stringify({
       ...contractProperties,
-      response: responseSchema
+      ...responseSchema && {
+        response: responseSchema
+      }
     })}`;
   }).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.d.ts

@@ -1,5 +1,6 @@
 import type { CompilationOptions, CompilationResult } from './types.js';
 import { Diagnostic } from './diagnostic.js';
+export declare const FILE_PRECEDENCE: string[];
 export declare const parseAndCheck: (sources: Record<string, string>, options?: Pick<CompilationOptions, "languageServer">) => Promise<CompilationResult>;
 export declare const generateScaffolding: (options: CompilationOptions) => Promise<string[]>;
 export declare const compileFromFiles: (schemaDir: string, options: CompilationOptions) => Promise<CompilationResult | {

package/dist/compile.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileFromFiles = exports.generateScaffolding = exports.parseAndCheck = void 0;
+exports.compileFromFiles = exports.generateScaffolding = exports.parseAndCheck = exports.FILE_PRECEDENCE = void 0;
 const diagnostic_js_1 = require("./diagnostic.js");
 const lexer_js_1 = require("./lexer.js");
 const parser_js_1 = require("./parser.js");
@@ -41,6 +41,7 @@ const semantic_js_1 = require("./semantic.js");
 const codegen_js_1 = require("./codegen.js");
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
+exports.FILE_PRECEDENCE = ['contract'];
 const parseAndCheck = async (sources, options = {}) => {
     const errors = [];
     let errorCount = 0;
@@ -80,10 +81,20 @@ const generateScaffolding = async (options) => {
 };
 exports.generateScaffolding = generateScaffolding;
 const compileFromFiles = async (schemaDir, options) => {
-    const fileList = await fs.promises.readdir(schemaDir);
+    const fileList = await Array.fromAsync(fs.promises.glob(`${schemaDir}/*.aeria`));
+    const sortedFileList = fileList.sort((a, b) => {
+        const aIndex = exports.FILE_PRECEDENCE.findIndex((file) => a.split('/').at(-1).startsWith(file));
+        const bIndex = exports.FILE_PRECEDENCE.findIndex((file) => b.split('/').at(-1).startsWith(file));
+        if (!~aIndex && !~bIndex) {
+            return 1;
+        }
+        return aIndex > bIndex
+            ? 1
+            : -1;
+    });
     const sources = {};
-    for (const file of fileList) {
-        sources[file] = await fs.promises.readFile(`${schemaDir}/${file}`, {
+    for (const file of sortedFileList) {
+        sources[file] = await fs.promises.readFile(file, {
             encoding: 'utf-8',
         });
     }

package/dist/compile.mjs

@@ -6,6 +6,7 @@ import { analyze } from "./semantic.mjs";
 import { generateCode } from "./codegen.mjs";
 import * as path from "node:path";
 import * as fs from "node:fs";
+export const FILE_PRECEDENCE = ["contract"];
 export const parseAndCheck = async (sources, options = {}) => {
   const errors = [];
   let errorCount = 0;
@@ -42,10 +43,18 @@ export const generateScaffolding = async (options) => {
   return directories;
 };
 export const compileFromFiles = async (schemaDir, options) => {
-  const fileList = await fs.promises.readdir(schemaDir);
+  const fileList = await Array.fromAsync(fs.promises.glob(`${schemaDir}/*.aeria`));
+  const sortedFileList = fileList.sort((a, b) => {
+    const aIndex = FILE_PRECEDENCE.findIndex((file) => a.split("/").at(-1).startsWith(file));
+    const bIndex = FILE_PRECEDENCE.findIndex((file) => b.split("/").at(-1).startsWith(file));
+    if (!~aIndex && !~bIndex) {
+      return 1;
+    }
+    return aIndex > bIndex ? 1 : -1;
+  });
   const sources = {};
-  for (const file of fileList) {
-    sources[file] = await fs.promises.readFile(`${schemaDir}/${file}`, {
+  for (const file of sortedFileList) {
+    sources[file] = await fs.promises.readFile(file, {
       encoding: "utf-8"
     });
   }

package/dist/parser.js

@@ -126,9 +126,19 @@ const parse = (tokens) => {
             }
         }
     };
-    const parseArray = (type) => {
-        consume(token_js_1.TokenType.LeftSquareBracket);
+    const parseArray = (types) => {
+        const { location } = consume(token_js_1.TokenType.LeftSquareBracket);
         const array = [];
+        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(' | ')}`, location);
+        }
         while (!match(token_js_1.TokenType.RightSquareBracket)) {
             const { value } = consume(type);
             array.push(value);
@@ -189,7 +199,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,
+            ]);
             return;
         }
         switch (attributeName) {
@@ -216,7 +229,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]);
                     return;
                 }
                 case 'populateDepth': {
@@ -229,7 +242,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]);
                         return;
                     }
                 }
@@ -246,7 +259,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]);
                                 return;
                             }
                             else {
@@ -716,7 +729,7 @@ const parse = (tokens) => {
                         };
                     }
                     else {
-                        const value = parseArray(token_js_1.TokenType.QuotedString);
+                        const value = parseArray([token_js_1.TokenType.QuotedString]);
                         functions[functionName] = {
                             accessCondition: value,
                         };
@@ -782,7 +795,7 @@ const parse = (tokens) => {
                     }
                     case 'roles':
                     case 'requires': {
-                        const value = parseArray(token_js_1.TokenType.Identifier);
+                        const value = parseArray([token_js_1.TokenType.Identifier]);
                         baseSlots[keyword] = value;
                         break;
                     }

package/dist/parser.mjs

@@ -88,9 +88,19 @@ export const parse = (tokens) => {
       }
     }
   };
-  const parseArray = (type) => {
-    consume(TokenType.LeftSquareBracket);
+  const parseArray = (types) => {
+    const { location } = consume(TokenType.LeftSquareBracket);
     const array = [];
+    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(" | ")}`, location);
+    }
     while (!match(TokenType.RightSquareBracket)) {
       const { value } = consume(type);
       array.push(value);
@@ -148,7 +158,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
+      ]);
       return;
     }
     switch (attributeName) {
@@ -175,7 +188,7 @@ export const parse = (tokens) => {
         case "form":
         case "populate":
         case "indexes": {
-          property[attributeName] = parseArray(TokenType.Identifier);
+          property[attributeName] = parseArray([TokenType.Identifier]);
           return;
         }
         case "populateDepth": {
@@ -188,7 +201,7 @@ export const parse = (tokens) => {
         switch (attributeName) {
           case "extensions":
           case "accept": {
-            property[attributeName] = parseArray(TokenType.QuotedString);
+            property[attributeName] = parseArray([TokenType.QuotedString]);
             return;
           }
         }
@@ -205,7 +218,7 @@ export const parse = (tokens) => {
             }
             case "mask": {
               if (match(TokenType.LeftSquareBracket)) {
-                property[attributeName] = parseArray(TokenType.QuotedString);
+                property[attributeName] = parseArray([TokenType.QuotedString]);
                 return;
               } else {
                 const { value } = consume(TokenType.QuotedString);
@@ -664,7 +677,7 @@ export const parse = (tokens) => {
               accessCondition: value
             };
           } else {
-            const value = parseArray(TokenType.QuotedString);
+            const value = parseArray([TokenType.QuotedString]);
             functions[functionName] = {
               accessCondition: value
             };
@@ -729,7 +742,7 @@ export const parse = (tokens) => {
           }
           case "roles":
           case "requires": {
-            const value = parseArray(TokenType.Identifier);
+            const value = parseArray([TokenType.Identifier]);
             baseSlots[keyword] = value;
             break;
           }

package/package.json

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