@aeriajs/compiler 0.0.15 → 0.0.16

package/dist/ast.d.ts

@@ -23,6 +23,7 @@ export type PropertyNode = NodeBase<'property'> & {
     modifier?: keyof typeof PropertyModifiers;
     property: Property & {
         [LOCATION_SYMBOL]?: {
+            type: symbol;
             attributes: Record<string, symbol>;
             arrays: {
                 [P in ArrayProperties<Extract<Property, {

package/dist/codegen/generateContracts.d.ts

@@ -1,5 +1,5 @@
 import type * as AST from '../ast.js';
 export declare const generateContracts: (ast: AST.Node[]) => false | {
     js: string;
-    dTs: string;
+    dts: string;
 };

package/dist/codegen/generateContracts.js

@@ -10,7 +10,7 @@ const generateContracts = (ast) => {
     }
     return {
         js: makeJSContractsCode(contractNodes),
-        dTs: makeTSContractsCode(contractNodes),
+        dts: makeTSContractsCode(contractNodes),
     };
 };
 exports.generateContracts = generateContracts;

package/dist/codegen/generateContracts.mjs

@@ -8,7 +8,7 @@ export const generateContracts = (ast) => {
   }
   return {
     js: makeJSContractsCode(contractNodes),
-    dTs: makeTSContractsCode(contractNodes)
+    dts: makeTSContractsCode(contractNodes)
   };
 };
 const makeJSContractsCode = (contractAst) => {

package/dist/codegen/generateExports.d.ts

@@ -2,14 +2,14 @@ import type * as AST from '../ast.js';
 export declare const generateExports: (ast: AST.ProgramNode, hasContracts?: boolean) => {
     main: {
         js: string;
-        dTs: string;
+        dts: string;
     };
     collections: {
         js: string;
-        dTs: string;
+        dts: string;
     };
     contracts?: {
         js: string;
-        dTs: string;
+        dts: string;
     };
 };

package/dist/codegen/generateExports.js

@@ -15,7 +15,7 @@ const generateExports = (ast, hasContracts = false) => {
     const exports = {
         collections: {
             js: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(', ')} } from './collections.js'`,
-            dTs: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(', ')} } from './collections.js'`,
+            dts: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(', ')} } from './collections.js'`,
         },
         main: {
             js: (hasContracts
@@ -23,7 +23,7 @@ const generateExports = (ast, hasContracts = false) => {
                 : '') +
                 'export * as collections from \'./collections/index.js\'\n' +
                 `export { ${symbolsToExport.map((symbol) => symbol.extend).join(', ')} } from './collections/collections.js'`,
-            dTs: (hasContracts
+            dts: (hasContracts
                 ? 'export * as contracts from \'./contracts/index.js\'\n'
                 : '') +
                 'export * as collections from \'./collections/index.js\'\n' +
@@ -33,7 +33,7 @@ const generateExports = (ast, hasContracts = false) => {
     if (hasContracts) {
         exports.contracts = {
             js: 'export * from \'./contracts.js\'',
-            dTs: 'export * from \'./contracts.js\'',
+            dts: 'export * from \'./contracts.js\'',
         };
     }
     return exports;

package/dist/codegen/generateExports.mjs

@@ -13,19 +13,19 @@ export const generateExports = (ast, hasContracts = false) => {
   const exports = {
     collections: {
       js: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(", ")} } from './collections.mjs'`,
-      dTs: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(", ")} } from './collections.mjs'`
+      dts: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(", ")} } from './collections.mjs'`
     },
     main: {
       js: (hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
 export { ${symbolsToExport.map((symbol) => symbol.extend).join(", ")} } from './collections/collections.mjs'`,
-      dTs: (hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
+      dts: (hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
 export { ${symbolsToExport.map((symbol) => `${symbol.extend}, ${symbol.schema}`).join(", ")} } from './collections/collections.mjs'`
     }
   };
   if (hasContracts) {
     exports.contracts = {
       js: "export * from './contracts.mjs'",
-      dTs: "export * from './contracts.mjs'"
+      dts: "export * from './contracts.mjs'"
     };
   }
   return exports;

package/dist/codegen/generateJSCollections.js

@@ -47,10 +47,10 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
         }
         switch (key) {
             case 'properties':
-                collectionSchema.description.properties = (0, utils_js_1.getProperties)(collectionNode[key]);
+                collectionSchema.description[key] = (0, utils_js_1.getProperties)(collectionNode[key]);
                 break;
             case 'owned':
-                collectionSchema.description.owned = collectionNode[key];
+                collectionSchema.description[key] = collectionNode[key];
                 break;
             case 'functions':
                 collectionSchema.functions = {

package/dist/codegen/generateJSCollections.mjs

@@ -40,10 +40,10 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
     }
     switch (key) {
       case "properties":
-        collectionSchema.description.properties = getProperties(collectionNode[key]);
+        collectionSchema.description[key] = getProperties(collectionNode[key]);
         break;
       case "owned":
-        collectionSchema.description.owned = collectionNode[key];
+        collectionSchema.description[key] = collectionNode[key];
         break;
       case "functions":
         collectionSchema.functions = {

package/dist/codegen/utils.d.ts

@@ -15,7 +15,7 @@ export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<s
 };
 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 getProperties: <TProperties extends Record<string, AST.PropertyNode | AST.PropertyNode[]>, TReturnType = TProperties[keyof TProperties] extends Array<unknown> ? Record<string, Property[]> : Record<string, Property>>(properties: TProperties) => TReturnType;
 export declare const UnquotedSymbol: unique symbol;
 /** Serves to know if the value must be unquoted on strinfigy function */
 export type StringifyProperty = unknown | {

package/dist/codegen.js

@@ -77,17 +77,17 @@ const generateCode = async (ast, options) => {
         ['collections']: {
             ['collections.d.ts']: (0, index_js_1.generateTSCollections)(ast.collections),
             ['collections.js']: (0, index_js_1.generateJSCollections)(ast.collections),
-            ['index.d.ts']: exports.collections.dTs,
+            ['index.d.ts']: exports.collections.dts,
             ['index.js']: exports.collections.js,
         },
-        ['index.d.ts']: exports.main.dTs,
+        ['index.d.ts']: exports.main.dts,
         ['index.js']: exports.main.js,
     };
     if (contracts) {
         fileTree.contracts = {
             ['contracts.js']: contracts.js,
-            ['contracts.d.ts']: contracts.dTs,
-            ['index.d.ts']: exports.contracts.dTs,
+            ['contracts.d.ts']: contracts.dts,
+            ['index.d.ts']: exports.contracts.dts,
             ['index.js']: exports.contracts.js,
         };
     }

package/dist/codegen.mjs

@@ -28,17 +28,17 @@ export const generateCode = async (ast, options) => {
     ["collections"]: {
       ["collections.d.ts"]: generateTSCollections(ast.collections),
       ["collections.mjs"]: generateJSCollections(ast.collections),
-      ["index.d.ts"]: exports.collections.dTs,
+      ["index.d.ts"]: exports.collections.dts,
       ["index.mjs"]: exports.collections.js
     },
-    ["index.d.ts"]: exports.main.dTs,
+    ["index.d.ts"]: exports.main.dts,
     ["index.mjs"]: exports.main.js
   };
   if (contracts) {
     fileTree.contracts = {
       ["contracts.mjs"]: contracts.js,
-      ["contracts.d.ts"]: contracts.dTs,
-      ["index.d.ts"]: exports.contracts.dTs,
+      ["contracts.d.ts"]: contracts.dts,
+      ["index.d.ts"]: exports.contracts.dts,
       ["index.mjs"]: exports.contracts.js
     };
   }

package/dist/compile.d.ts

@@ -3,7 +3,7 @@ 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 | {
+export declare const compileFromFiles: (globPattern: string, options: CompilationOptions) => Promise<CompilationResult | {
     emittedFiles: Record<string, string>;
     success: boolean;
     ast?: import("./ast.js").ProgramNode;

package/dist/compile.js

@@ -44,28 +44,23 @@ const fs = __importStar(require("node:fs"));
 exports.FILE_PRECEDENCE = ['contract'];
 const parseAndCheck = async (sources, options = {}) => {
     const errors = [];
-    let errorCount = 0;
     let ast;
+    const allTokens = [];
     for (const fileName in sources) {
         diagnostic_js_1.Diagnostic.currentFile = fileName;
         const { errors: lexerErrors, tokens } = (0, lexer_js_1.tokenize)(sources[fileName]);
-        const { errors: parserErrors, ast: currentAst } = (0, parser_js_1.parse)(Array.from(tokens));
-        const { errors: semanticErrors } = await (0, semantic_js_1.analyze)(currentAst, options);
-        errors.push(...lexerErrors.concat(parserErrors, semanticErrors));
-        errorCount += errors.length;
-        if (!ast) {
-            ast = currentAst;
-        }
-        else {
-            ast.collections.push(...currentAst.collections);
-            ast.contracts.push(...currentAst.contracts);
-            ast.functionsets.push(...currentAst.functionsets);
+        if (lexerErrors.length > 0) {
+            errors.push(...lexerErrors);
         }
+        allTokens.push(...tokens);
     }
+    const { errors: parserErrors, ast: currentAst } = (0, parser_js_1.parse)(allTokens);
+    const { errors: semanticErrors } = await (0, semantic_js_1.analyze)(currentAst, options);
+    errors.push(...parserErrors.concat(semanticErrors));
     return {
-        success: errorCount === 0,
+        success: errors.length === 0,
         errors,
-        errorCount,
+        errorCount: errors.length,
         ast,
     };
 };
@@ -80,8 +75,8 @@ const generateScaffolding = async (options) => {
     return directories;
 };
 exports.generateScaffolding = generateScaffolding;
-const compileFromFiles = async (schemaDir, options) => {
-    const fileList = await Array.fromAsync(fs.promises.glob(`${schemaDir}/*.aeria`));
+const compileFromFiles = async (globPattern, options) => {
+    const fileList = await Array.fromAsync(fs.promises.glob(globPattern));
     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));

package/dist/compile.mjs

@@ -9,27 +9,23 @@ import * as fs from "node:fs";
 export const FILE_PRECEDENCE = ["contract"];
 export const parseAndCheck = async (sources, options = {}) => {
   const errors = [];
-  let errorCount = 0;
   let ast;
+  const allTokens = [];
   for (const fileName in sources) {
     Diagnostic.currentFile = fileName;
     const { errors: lexerErrors, tokens } = tokenize(sources[fileName]);
-    const { errors: parserErrors, ast: currentAst } = parse(Array.from(tokens));
-    const { errors: semanticErrors } = await analyze(currentAst, options);
-    errors.push(...lexerErrors.concat(parserErrors, semanticErrors));
-    errorCount += errors.length;
-    if (!ast) {
-      ast = currentAst;
-    } else {
-      ast.collections.push(...currentAst.collections);
-      ast.contracts.push(...currentAst.contracts);
-      ast.functionsets.push(...currentAst.functionsets);
+    if (lexerErrors.length > 0) {
+      errors.push(...lexerErrors);
     }
+    allTokens.push(...tokens);
   }
+  const { errors: parserErrors, ast: currentAst } = parse(allTokens);
+  const { errors: semanticErrors } = await analyze(currentAst, options);
+  errors.push(...parserErrors.concat(semanticErrors));
   return {
-    success: errorCount === 0,
+    success: errors.length === 0,
     errors,
-    errorCount,
+    errorCount: errors.length,
     ast
   };
 };
@@ -42,8 +38,8 @@ export const generateScaffolding = async (options) => {
   }
   return directories;
 };
-export const compileFromFiles = async (schemaDir, options) => {
-  const fileList = await Array.fromAsync(fs.promises.glob(`${schemaDir}/*.aeria`));
+export const compileFromFiles = async (globPattern, options) => {
+  const fileList = await Array.fromAsync(fs.promises.glob(globPattern));
   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));

package/dist/parser.js

@@ -379,6 +379,8 @@ const parse = (tokens) => {
         let property;
         let nestedProperties;
         let modifierToken;
+        const typeSymbol = Symbol();
+        exports.locationMap.set(typeSymbol, next().location);
         if (match(token_js_1.TokenType.LeftSquareBracket)) {
             consume(token_js_1.TokenType.LeftSquareBracket);
             const arrayProperty = {
@@ -387,6 +389,7 @@ const parse = (tokens) => {
             while (!match(token_js_1.TokenType.RightSquareBracket)) {
                 const attributeSymbol = Symbol();
                 arrayProperty[AST.LOCATION_SYMBOL] ??= {
+                    type: typeSymbol,
                     attributes: {},
                     arrays: {},
                 };
@@ -444,6 +447,7 @@ const parse = (tokens) => {
                 type: 'object',
                 properties: {},
                 [AST.LOCATION_SYMBOL]: {
+                    type: typeSymbol,
                     attributes: {},
                     arrays: {},
                 },
@@ -471,7 +475,7 @@ const parse = (tokens) => {
             consume(token_js_1.TokenType.RightBracket);
         }
         else {
-            const { value: identifier, location } = consume(token_js_1.TokenType.Identifier);
+            const { value: identifier } = consume(token_js_1.TokenType.Identifier);
             if (guards.isNativePropertyType(identifier)) {
                 switch (identifier) {
                     case 'enum': {
@@ -507,12 +511,13 @@ const parse = (tokens) => {
                 }
             }
             else {
-                const collection = ast.collections.find((node) => node.name === identifier);
-                if (!collection) {
-                    throw new diagnostic_js_1.Diagnostic(`invalid reference "${identifier}"`, location);
-                }
                 property = {
                     $ref: identifier,
+                    [AST.LOCATION_SYMBOL]: {
+                        type: typeSymbol,
+                        attributes: {},
+                        arrays: {},
+                    },
                 };
             }
         }
@@ -523,6 +528,7 @@ const parse = (tokens) => {
                 const attributeSymbol = Symbol();
                 exports.locationMap.set(attributeSymbol, next().location);
                 property[AST.LOCATION_SYMBOL] ??= {
+                    type: typeSymbol,
                     attributes: {},
                     arrays: {},
                 };

package/dist/parser.mjs

@@ -337,6 +337,8 @@ export const parse = (tokens) => {
     let property;
     let nestedProperties;
     let modifierToken;
+    const typeSymbol = Symbol();
+    locationMap.set(typeSymbol, next().location);
     if (match(TokenType.LeftSquareBracket)) {
       consume(TokenType.LeftSquareBracket);
       const arrayProperty = {
@@ -345,6 +347,7 @@ export const parse = (tokens) => {
       while (!match(TokenType.RightSquareBracket)) {
         const attributeSymbol = Symbol();
         arrayProperty[AST.LOCATION_SYMBOL] ??= {
+          type: typeSymbol,
           attributes: {},
           arrays: {}
         };
@@ -400,6 +403,7 @@ export const parse = (tokens) => {
         type: "object",
         properties: {},
         [AST.LOCATION_SYMBOL]: {
+          type: typeSymbol,
           attributes: {},
           arrays: {}
         }
@@ -426,7 +430,7 @@ export const parse = (tokens) => {
       }
       consume(TokenType.RightBracket);
     } else {
-      const { value: identifier, location } = consume(TokenType.Identifier);
+      const { value: identifier } = consume(TokenType.Identifier);
       if (guards.isNativePropertyType(identifier)) {
         switch (identifier) {
           case "enum": {
@@ -461,12 +465,13 @@ export const parse = (tokens) => {
             };
         }
       } else {
-        const collection = ast.collections.find((node2) => node2.name === identifier);
-        if (!collection) {
-          throw new Diagnostic(`invalid reference "${identifier}"`, location);
-        }
         property = {
-          $ref: identifier
+          $ref: identifier,
+          [AST.LOCATION_SYMBOL]: {
+            type: typeSymbol,
+            attributes: {},
+            arrays: {}
+          }
         };
       }
     }
@@ -477,6 +482,7 @@ export const parse = (tokens) => {
         const attributeSymbol = Symbol();
         locationMap.set(attributeSymbol, next().location);
         property[AST.LOCATION_SYMBOL] ??= {
+          type: typeSymbol,
           attributes: {},
           arrays: {}
         };

package/dist/semantic.js

@@ -110,7 +110,9 @@ const analyze = async (ast, options, errors = []) => {
             const refName = node.property.$ref;
             const foreignCollection = ast.collections.find(({ name }) => name === refName);
             if (!foreignCollection) {
-                throw new Error;
+                const location = parser_js_1.locationMap.get(node.property[AST.LOCATION_SYMBOL].type);
+                errors.push(new diagnostic_js_1.Diagnostic(`invalid reference "${refName}"`, location));
+                return;
             }
             await checkCollectionForeignProperties(foreignCollection, node.property, 'indexes');
             await checkCollectionForeignProperties(foreignCollection, node.property, 'populate');

package/dist/semantic.mjs

@@ -74,7 +74,9 @@ export const analyze = async (ast, options, errors = []) => {
       const refName = node.property.$ref;
       const foreignCollection = ast.collections.find(({ name }) => name === refName);
       if (!foreignCollection) {
-        throw new Error();
+        const location = locationMap.get(node.property[AST.LOCATION_SYMBOL].type);
+        errors.push(new Diagnostic(`invalid reference "${refName}"`, location));
+        return;
       }
       await checkCollectionForeignProperties(foreignCollection, node.property, "indexes");
       await checkCollectionForeignProperties(foreignCollection, node.property, "populate");

package/package.json

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