@aeriajs/compiler 0.0.41 → 0.0.42

package/dist/ast.d.ts

@@ -66,6 +66,7 @@ export type CollectionNode = NodeBase<'collection'> & {
     functions?: Record<string, {
         accessCondition: AccessCondition;
     }>;
+    functionSets?: [string, symbol][];
     required?: RequiredProperties;
     indexes?: readonly string[];
     presets?: DescriptionPreset[];
@@ -97,6 +98,7 @@ export type FunctionSetNode = NodeBase<'functionset'> & {
         accessCondition: AccessCondition;
         fromFunctionSet?: true;
     }>;
+    functionSets: [string, symbol][];
 };
 export type ProgramNode = NodeBase<'program'> & {
     collections: CollectionNode[];

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 | {
+export declare const generateContracts: (ast: AST.ProgramNode) => false | {
     js: string;
     dts: string;
 };

package/dist/codegen/generateContracts.js

@@ -4,17 +4,16 @@ exports.generateContracts = void 0;
 const types_1 = require("@aeriajs/types");
 const utils_js_1 = require("./utils.js");
 const generateContracts = (ast) => {
-    const contractNodes = ast.filter((node) => node.kind === 'contract');
-    if (contractNodes.length === 0) {
+    if (ast.contracts.length === 0) {
         return false;
     }
     return {
-        js: makeJSContractsCode(contractNodes),
-        dts: makeTSContractsCode(contractNodes),
+        js: makeJSContractsCode(ast),
+        dts: makeTSContractsCode(ast),
     };
 };
 exports.generateContracts = generateContracts;
-const makeJSContractsCode = (contractAst) => {
+const makeJSContractsCode = (ast) => {
     const imports = new Set(['defineContract']);
     const getCodeForResponse = (responseProperty) => {
         const { kind, modifier, ...propertyNode } = responseProperty;
@@ -29,8 +28,8 @@ const makeJSContractsCode = (contractAst) => {
         }
         return `${modifierSymbol}(${(0, utils_js_1.stringify)((0, utils_js_1.unwrapPropertyNode)(propertyNode))})`;
     };
-    const declarations = contractAst.map((contractNode) => {
-        const { name, kind, roles, response, ...contractProperty } = contractNode;
+    const declarations = ast.contracts.map((node) => {
+        const { name, kind, roles, response, ...contractProperty } = node;
         let responseString;
         if (response) {
             responseString = '';
@@ -69,9 +68,9 @@ const getResponseSchema = (response) => {
         (0, types_1.resultSchema)(responseSchema) :
         (0, types_1.errorSchema)(responseSchema);
 };
-const makeTSContractsCode = (contractAst) => {
-    return contractAst.map((contractNode) => {
-        const { name, kind, roles, ...contractSchema } = contractNode;
+const makeTSContractsCode = (ast) => {
+    return ast.contracts.map((node) => {
+        const { name, kind, roles, ...contractSchema } = node;
         let responseSchema = null;
         if (contractSchema.response) {
             if (Array.isArray(contractSchema.response)) {
@@ -88,6 +87,6 @@ const makeTSContractsCode = (contractAst) => {
         if (roles) {
             contractProperties.roles = roles;
         }
-        return `export declare const ${contractNode.name}: ${(0, utils_js_1.stringify)(contractProperties)}`;
+        return `export declare const ${node.name}: ${(0, utils_js_1.stringify)(contractProperties)}`;
     }).join('\n\n');
 };

package/dist/codegen/generateContracts.mjs

@@ -2,16 +2,15 @@
 import { errorSchema, resultSchema } from "@aeriajs/types";
 import { recursivelyUnwrapPropertyNodes, unwrapPropertyNode, stringify, UnquotedSymbol } from "./utils.mjs";
 export const generateContracts = (ast) => {
-  const contractNodes = ast.filter((node) => node.kind === "contract");
-  if (contractNodes.length === 0) {
+  if (ast.contracts.length === 0) {
     return false;
   }
   return {
-    js: makeJSContractsCode(contractNodes),
-    dts: makeTSContractsCode(contractNodes)
+    js: makeJSContractsCode(ast),
+    dts: makeTSContractsCode(ast)
   };
 };
-const makeJSContractsCode = (contractAst) => {
+const makeJSContractsCode = (ast) => {
   const imports = /* @__PURE__ */ new Set(["defineContract"]);
   const getCodeForResponse = (responseProperty) => {
     const { kind, modifier, ...propertyNode } = responseProperty;
@@ -24,8 +23,8 @@ const makeJSContractsCode = (contractAst) => {
     }
     return `${modifierSymbol}(${stringify(unwrapPropertyNode(propertyNode))})`;
   };
-  const declarations = contractAst.map((contractNode) => {
-    const { name, kind, roles, response, ...contractProperty } = contractNode;
+  const declarations = ast.contracts.map((node) => {
+    const { name, kind, roles, response, ...contractProperty } = node;
     let responseString;
     if (response) {
       responseString = "";
@@ -63,9 +62,9 @@ const getResponseSchema = (response) => {
   }
   return response.modifier === "Result" ? resultSchema(responseSchema) : errorSchema(responseSchema);
 };
-const makeTSContractsCode = (contractAst) => {
-  return contractAst.map((contractNode) => {
-    const { name, kind, roles, ...contractSchema } = contractNode;
+const makeTSContractsCode = (ast) => {
+  return ast.contracts.map((node) => {
+    const { name, kind, roles, ...contractSchema } = node;
     let responseSchema = null;
     if (contractSchema.response) {
       if (Array.isArray(contractSchema.response)) {
@@ -81,6 +80,6 @@ const makeTSContractsCode = (contractAst) => {
     if (roles) {
       contractProperties.roles = roles;
     }
-    return `export declare const ${contractNode.name}: ${stringify(contractProperties)}`;
+    return `export declare const ${node.name}: ${stringify(contractProperties)}`;
   }).join("\n\n");
 };

package/dist/codegen/generateJSCollections.d.ts

@@ -1,2 +1,2 @@
 import type * as AST from '../ast.js';
-export declare const generateJSCollections: (ast: AST.CollectionNode[]) => string;
+export declare const generateJSCollections: (ast: AST.ProgramNode) => string;

package/dist/codegen/generateJSCollections.js

@@ -8,7 +8,7 @@ const initialImportedFunctions = [
 ];
 const generateJSCollections = (ast) => {
     let javascriptCode = '';
-    const importsResult = (0, utils_js_1.makeASTImports)(ast, {
+    const importsResult = (0, utils_js_1.makeASTImports)(ast.collections, {
         [utils_js_1.PACKAGE_NAME]: new Set(initialImportedFunctions),
     }, {
         includeRuntimeOnlyImports: true,
@@ -20,14 +20,14 @@ const generateJSCollections = (ast) => {
 exports.generateJSCollections = generateJSCollections;
 const makeJSCollections = (ast, modifiedSymbols) => {
     const collectionCodes = {};
-    for (const collectionNode of ast) {
+    for (const collectionNode of ast.collections) {
         const id = (0, utils_js_1.getCollectionId)(collectionNode.name); // CollectionName -> collectionName
         const extendCollectionName = (0, utils_js_1.getExtendName)(collectionNode.name);
         const collectionDefinition = `export const ${id} = ${collectionNode.extends
             ? `extendCollection(${id in modifiedSymbols
                 ? modifiedSymbols[id]
-                : id}, ${makeJSCollectionSchema(collectionNode, id)})`
-            : `defineCollection(${makeJSCollectionSchema(collectionNode, id)})`}`;
+                : id}, ${makeJSCollectionSchema(ast, collectionNode, id)})`
+            : `defineCollection(${makeJSCollectionSchema(ast, collectionNode, id)})`}`;
         const collectionDeclaration = `export const ${extendCollectionName} = (collection) => extendCollection(${id}, collection)`;
         collectionCodes[collectionNode.name] = [
             '//' + collectionNode.name,
@@ -37,7 +37,7 @@ const makeJSCollections = (ast, modifiedSymbols) => {
     }
     return Object.values(collectionCodes).join('\n\n');
 };
-const makeJSCollectionSchema = (collectionNode, collectionId) => {
+const makeJSCollectionSchema = (ast, collectionNode, collectionId) => {
     const collectionSchema = {
         item: {},
         description: {

package/dist/codegen/generateJSCollections.mjs

@@ -6,7 +6,7 @@ const initialImportedFunctions = [
 ];
 export const generateJSCollections = (ast) => {
   let javascriptCode = "";
-  const importsResult = makeASTImports(ast, {
+  const importsResult = makeASTImports(ast.collections, {
     [PACKAGE_NAME]: new Set(initialImportedFunctions)
   }, {
     includeRuntimeOnlyImports: true
@@ -17,10 +17,10 @@ export const generateJSCollections = (ast) => {
 };
 const makeJSCollections = (ast, modifiedSymbols) => {
   const collectionCodes = {};
-  for (const collectionNode of ast) {
+  for (const collectionNode of ast.collections) {
     const id = getCollectionId(collectionNode.name);
     const extendCollectionName = getExtendName(collectionNode.name);
-    const collectionDefinition = `export const ${id} = ${collectionNode.extends ? `extendCollection(${id in modifiedSymbols ? modifiedSymbols[id] : id}, ${makeJSCollectionSchema(collectionNode, id)})` : `defineCollection(${makeJSCollectionSchema(collectionNode, id)})`}`;
+    const collectionDefinition = `export const ${id} = ${collectionNode.extends ? `extendCollection(${id in modifiedSymbols ? modifiedSymbols[id] : id}, ${makeJSCollectionSchema(ast, collectionNode, id)})` : `defineCollection(${makeJSCollectionSchema(ast, collectionNode, id)})`}`;
     const collectionDeclaration = `export const ${extendCollectionName} = (collection) => extendCollection(${id}, collection)`;
     collectionCodes[collectionNode.name] = [
       "//" + collectionNode.name,
@@ -30,7 +30,7 @@ const makeJSCollections = (ast, modifiedSymbols) => {
   }
   return Object.values(collectionCodes).join("\n\n");
 };
-const makeJSCollectionSchema = (collectionNode, collectionId) => {
+const makeJSCollectionSchema = (ast, collectionNode, collectionId) => {
   const collectionSchema = {
     item: {},
     description: {

package/dist/codegen/generateTSCollections.d.ts

@@ -1,2 +1,2 @@
 import type * as AST from '../ast.js';
-export declare const generateTSCollections: (ast: AST.CollectionNode[]) => string;
+export declare const generateTSCollections: (ast: AST.ProgramNode) => string;

package/dist/codegen/generateTSCollections.js

@@ -11,7 +11,7 @@ const initialImportedTypes = [
 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);
+    const importsResult = (0, utils_js_1.makeASTImports)(ast.collections);
     code += importsResult.code.join('\n') + '\n\n';
     code += makeTSCollections(ast, importsResult.modifiedSymbols) + '\n';
     return code;
@@ -19,7 +19,7 @@ const generateTSCollections = (ast) => {
 exports.generateTSCollections = generateTSCollections;
 const makeTSCollections = (ast, modifiedSymbols) => {
     const collectionCodes = {};
-    for (const collectionNode of ast) {
+    for (const collectionNode of ast.collections) {
         const id = (0, utils_js_1.getCollectionId)(collectionNode.name); // CollectionName -> collectionName
         const schemaName = (0, utils_js_1.resizeFirstChar)(collectionNode.name, true); // collectionName -> CollectionName
         const typeName = id + 'Collection'; // Pet -> petCollection

package/dist/codegen/generateTSCollections.mjs

@@ -10,14 +10,14 @@ export const generateTSCollections = (ast) => {
   let code = "";
   code += `import type { ${initialImportedTypes.join(", ")} } from '${PACKAGE_NAME}'
 `;
-  const importsResult = makeASTImports(ast);
+  const importsResult = makeASTImports(ast.collections);
   code += importsResult.code.join("\n") + "\n\n";
   code += makeTSCollections(ast, importsResult.modifiedSymbols) + "\n";
   return code;
 };
 const makeTSCollections = (ast, modifiedSymbols) => {
   const collectionCodes = {};
-  for (const collectionNode of ast) {
+  for (const collectionNode of ast.collections) {
     const id = getCollectionId(collectionNode.name);
     const schemaName = resizeFirstChar(collectionNode.name, true);
     const typeName = id + "Collection";

package/dist/codegen.js

@@ -57,14 +57,14 @@ const generateFileMap = async (fileTree, outDir = '.') => {
     return mappedPaths;
 };
 const generateCode = async (ast, options) => {
-    const contracts = (0, index_js_1.generateContracts)(ast.contracts);
+    const contracts = (0, index_js_1.generateContracts)(ast);
     const exports = (0, index_js_1.generateExports)(ast, {
         hasContracts: !!contracts,
     });
     const fileTree = {
         ['collections']: {
-            ['collections.d.ts']: (0, index_js_1.generateTSCollections)(ast.collections),
-            ['collections.js']: (0, index_js_1.generateJSCollections)(ast.collections),
+            ['collections.d.ts']: (0, index_js_1.generateTSCollections)(ast),
+            ['collections.js']: (0, index_js_1.generateJSCollections)(ast),
             ['index.d.ts']: exports.collections.dts,
             ['index.js']: exports.collections.js,
         },

package/dist/codegen.mjs

@@ -22,14 +22,14 @@ const generateFileMap = async (fileTree, outDir = ".") => {
   return mappedPaths;
 };
 export const generateCode = async (ast, options) => {
-  const contracts = generateContracts(ast.contracts);
+  const contracts = generateContracts(ast);
   const exports = generateExports(ast, {
     hasContracts: !!contracts
   });
   const fileTree = {
     ["collections"]: {
-      ["collections.d.ts"]: generateTSCollections(ast.collections),
-      ["collections.mjs"]: generateJSCollections(ast.collections),
+      ["collections.d.ts"]: generateTSCollections(ast),
+      ["collections.mjs"]: generateJSCollections(ast),
       ["index.d.ts"]: exports.collections.dts,
       ["index.mjs"]: exports.collections.js
     },

package/dist/compile.d.ts

@@ -1,11 +1,15 @@
+import type * as AST from './ast.js';
 import type { CompilationOptions, CompilationResult } from './types.js';
 import { Diagnostic } from './diagnostic.js';
 export declare const GLOB_PATTERN = "**/*.aeria";
+export declare const postflight: (ast: AST.ProgramNode) => {
+    errors: Diagnostic[];
+};
 export declare const parseAndCheck: (sources: Record<string, string>, options?: Pick<CompilationOptions, "languageServer">) => Promise<CompilationResult>;
 export declare const compileFromFiles: (options: CompilationOptions) => Promise<CompilationResult | {
     emittedFiles: Record<string, string>;
     success: boolean;
-    ast?: import("./ast.js").ProgramNode;
+    ast?: AST.ProgramNode;
     errors: Diagnostic[];
     errorCount: number;
 }>;

package/dist/compile.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileFromFiles = exports.parseAndCheck = exports.GLOB_PATTERN = void 0;
+exports.compileFromFiles = exports.parseAndCheck = exports.postflight = exports.GLOB_PATTERN = void 0;
 const diagnostic_js_1 = require("./diagnostic.js");
 const lexer_js_1 = require("./lexer.js");
 const parser_js_1 = require("./parser.js");
@@ -41,12 +41,31 @@ const semantic_js_1 = require("./semantic.js");
 const codegen_js_1 = require("./codegen.js");
 const fs = __importStar(require("node:fs"));
 exports.GLOB_PATTERN = '**/*.aeria';
+const postflight = (ast) => {
+    const errors = [];
+    for (const node of ast.collections) {
+        if (node.functionSets?.length) {
+            for (const [functionSetName, locationSymbol] of node.functionSets) {
+                const functionSet = ast.functionsets.find(({ name }) => name === functionSetName);
+                if (!functionSet) {
+                    const location = parser_js_1.locationMap.get(locationSymbol);
+                    errors.push(new diagnostic_js_1.Diagnostic(`invalid function set "${functionSetName}"`, location));
+                    continue;
+                }
+                Object.assign(node.functions, functionSet.functions);
+            }
+        }
+    }
+    return {
+        errors,
+    };
+};
+exports.postflight = postflight;
 const parseAndCheck = async (sources, options = {}) => {
     const errors = [];
     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: lexerErrors, tokens } = (0, lexer_js_1.tokenize)(sources[fileName], fileName);
         if (lexerErrors.length > 0) {
             errors.push(...lexerErrors);
         }
@@ -54,7 +73,8 @@ const parseAndCheck = async (sources, options = {}) => {
     }
     const { errors: parserErrors, ast } = (0, parser_js_1.parse)(allTokens);
     const { errors: semanticErrors } = await (0, semantic_js_1.analyze)(ast, options);
-    errors.push(...parserErrors.concat(semanticErrors));
+    const { errors: postflightErrors } = (0, exports.postflight)(ast);
+    errors.push(...parserErrors.concat(semanticErrors, postflightErrors));
     return {
         success: errors.length === 0,
         errors,

package/dist/compile.mjs

@@ -1,17 +1,35 @@
 "use strict";
 import { Diagnostic } from "./diagnostic.mjs";
 import { tokenize } from "./lexer.mjs";
-import { parse } from "./parser.mjs";
+import { parse, locationMap } from "./parser.mjs";
 import { analyze } from "./semantic.mjs";
 import { generateCode } from "./codegen.mjs";
 import * as fs from "node:fs";
 export const GLOB_PATTERN = "**/*.aeria";
+export const postflight = (ast) => {
+  const errors = [];
+  for (const node of ast.collections) {
+    if (node.functionSets?.length) {
+      for (const [functionSetName, locationSymbol] of node.functionSets) {
+        const functionSet = ast.functionsets.find(({ name }) => name === functionSetName);
+        if (!functionSet) {
+          const location = locationMap.get(locationSymbol);
+          errors.push(new Diagnostic(`invalid function set "${functionSetName}"`, location));
+          continue;
+        }
+        Object.assign(node.functions, functionSet.functions);
+      }
+    }
+  }
+  return {
+    errors
+  };
+};
 export const parseAndCheck = async (sources, options = {}) => {
   const errors = [];
   const allTokens = [];
   for (const fileName in sources) {
-    Diagnostic.currentFile = fileName;
-    const { errors: lexerErrors, tokens } = tokenize(sources[fileName]);
+    const { errors: lexerErrors, tokens } = tokenize(sources[fileName], fileName);
     if (lexerErrors.length > 0) {
       errors.push(...lexerErrors);
     }
@@ -19,7 +37,8 @@ export const parseAndCheck = async (sources, options = {}) => {
   }
   const { errors: parserErrors, ast } = parse(allTokens);
   const { errors: semanticErrors } = await analyze(ast, options);
-  errors.push(...parserErrors.concat(semanticErrors));
+  const { errors: postflightErrors } = postflight(ast);
+  errors.push(...parserErrors.concat(semanticErrors, postflightErrors));
   return {
     success: errors.length === 0,
     errors,

package/dist/diagnostic.d.ts

@@ -2,7 +2,5 @@ import type { Location } from './token.js';
 export declare class Diagnostic extends Error {
     message: string;
     location: Location;
-    fileLocation: string | undefined;
-    static currentFile: string | undefined;
-    constructor(message: string, location?: Location, fileLocation?: string | undefined);
+    constructor(message: string, location?: Location);
 }

package/dist/diagnostic.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Diagnostic = void 0;
 const emptyLocation = {
+    file: '',
     index: 0,
     line: 0,
     start: 0,
@@ -10,13 +11,10 @@ const emptyLocation = {
 class Diagnostic extends Error {
     message;
     location;
-    fileLocation;
-    static currentFile;
-    constructor(message, location = emptyLocation, fileLocation = Diagnostic.currentFile) {
+    constructor(message, location = emptyLocation) {
         super();
         this.message = message;
         this.location = location;
-        this.fileLocation = fileLocation;
         if (process.env.NODE_ENV === 'debug') {
             console.error(message, location);
         }

package/dist/diagnostic.mjs

@@ -1,19 +1,18 @@
 "use strict";
 const emptyLocation = {
+  file: "",
   index: 0,
   line: 0,
   start: 0,
   end: 0
 };
 export class Diagnostic extends Error {
-  constructor(message, location = emptyLocation, fileLocation = Diagnostic.currentFile) {
+  constructor(message, location = emptyLocation) {
     super();
     this.message = message;
     this.location = location;
-    this.fileLocation = fileLocation;
     if (false) {
       console.error(message, location);
     }
   }
-  static currentFile;
 }

package/dist/lexer.d.ts

@@ -13,7 +13,7 @@ export type Keyword = typeof COLLECTION_KEYWORDS[number] | typeof COLLECTION_ACT
 export declare const KEYWORDS: Keyword[];
 export declare const FINAL_OPERATORS: readonly ["==", "in", ">=", "<=", ">", "<", "!"];
 export declare const LOGICAL_OPERATORS: readonly ["&&", "||"];
-export declare const tokenize: (rawInput: string) => {
+export declare const tokenize: (rawInput: string, fileLocation: string) => {
     tokens: Token[];
     errors: Diagnostic[];
 };

package/dist/lexer.js

@@ -212,7 +212,7 @@ const TOKENS = [
         valueExtractor: (value) => value.slice(1),
     },
 ];
-const tokenize = function (rawInput) {
+const tokenize = function (rawInput, fileLocation) {
     const input = rawInput.replace(/\r\n/g, '\n');
     let index = 0, line = 1, start = 0, end = 0;
     const tokens = [];
@@ -254,6 +254,7 @@ const tokenize = function (rawInput) {
             if (value) {
                 let tokenValue;
                 const location = {
+                    file: fileLocation,
                     index: index += value.length,
                     line,
                     end: end += value.length,
@@ -354,6 +355,7 @@ const tokenize = function (rawInput) {
         if (!hasMatch) {
             index += input.slice(index).search(/[ \t\n\{\}\(\)\[\]]/);
             errors.push(new diagnostic_js_1.Diagnostic('unexpected token', {
+                file: fileLocation,
                 index,
                 line,
                 start,

package/dist/lexer.mjs

@@ -220,7 +220,7 @@ const TOKENS = [
     valueExtractor: (value) => value.slice(1)
   }
 ];
-export const tokenize = function(rawInput) {
+export const tokenize = function(rawInput, fileLocation) {
   const input = rawInput.replace(/\r\n/g, "\n");
   let index = 0, line = 1, start = 0, end = 0;
   const tokens = [];
@@ -260,6 +260,7 @@ export const tokenize = function(rawInput) {
       if (value) {
         let tokenValue;
         const location = {
+          file: fileLocation,
           index: index += value.length,
           line,
           end: end += value.length,
@@ -357,6 +358,7 @@ export const tokenize = function(rawInput) {
     if (!hasMatch) {
       index += input.slice(index).search(/[ \t\n\{\}\(\)\[\]]/);
       errors.push(new Diagnostic("unexpected token", {
+        file: fileLocation,
         index,
         line,
         start,

package/dist/parser.js

@@ -667,7 +667,7 @@ const parse = (tokens) => {
             return checkForValidRoles(value, symbols);
         }
     };
-    const parseCollection = (ast) => {
+    const parseCollection = () => {
         consume(token_js_1.TokenType.Keyword, 'collection');
         const { value: name } = consume(token_js_1.TokenType.Identifier);
         const node = {
@@ -719,7 +719,9 @@ const parse = (tokens) => {
                         break;
                     }
                     case 'functions': {
-                        node[keyword] = parseFunctionsBlock(ast);
+                        const { functions, functionSets } = parseFunctionsBlock();
+                        node.functions = functions;
+                        node.functionSets = functionSets;
                         break;
                     }
                     case 'individualActions':
@@ -824,9 +826,10 @@ const parse = (tokens) => {
         consume(token_js_1.TokenType.RightBracket);
         return node;
     };
-    const parseFunctionsBlock = (ast) => {
+    const parseFunctionsBlock = () => {
         consume(token_js_1.TokenType.LeftBracket);
         const functions = {};
+        const functionSets = [];
         while (!match(token_js_1.TokenType.RightBracket)) {
             try {
                 if (match(token_js_1.TokenType.MacroName)) {
@@ -834,11 +837,12 @@ const parse = (tokens) => {
                     switch (macroName) {
                         case 'include': {
                             const { value: functionSetName, location } = consume(token_js_1.TokenType.Identifier);
-                            const functionset = ast.functionsets.find((node) => node.name === functionSetName);
-                            if (!functionset) {
-                                throw new diagnostic_js_1.Diagnostic(`functionset "${functionSetName}" not found`, location);
-                            }
-                            Object.assign(functions, functionset.functions);
+                            const functionSetSymbol = Symbol();
+                            exports.locationMap.set(functionSetSymbol, location);
+                            functionSets.push([
+                                functionSetName,
+                                functionSetSymbol,
+                            ]);
                             consume(token_js_1.TokenType.RightParens);
                             break;
                         }
@@ -880,15 +884,20 @@ const parse = (tokens) => {
             }
         }
         consume(token_js_1.TokenType.RightBracket);
-        return functions;
+        return {
+            functions,
+            functionSets,
+        };
     };
-    const parseFunctionSet = (ast) => {
+    const parseFunctionSet = () => {
         consume(token_js_1.TokenType.Keyword, 'functionset');
         const { value: name } = consume(token_js_1.TokenType.Identifier);
+        const { functions, functionSets } = parseFunctionsBlock();
         const node = {
             kind: 'functionset',
             name,
-            functions: parseFunctionsBlock(ast),
+            functions,
+            functionSets,
         };
         return node;
     };
@@ -1272,7 +1281,7 @@ const parse = (tokens) => {
         try {
             switch (declType) {
                 case 'collection': {
-                    const collection = parseCollection(ast);
+                    const collection = parseCollection();
                     if (collection.name === 'User') {
                         const { properties } = collection;
                         if ('roles' in properties && 'items' in properties.roles.property && 'enum' in properties.roles.property.items) {
@@ -1287,7 +1296,7 @@ const parse = (tokens) => {
                     break;
                 }
                 case 'functionset': {
-                    ast.functionsets.push(parseFunctionSet(ast));
+                    ast.functionsets.push(parseFunctionSet());
                     break;
                 }
                 default:

package/dist/parser.mjs

@@ -614,7 +614,7 @@ export const parse = (tokens) => {
       return checkForValidRoles(value, symbols);
     }
   };
-  const parseCollection = (ast2) => {
+  const parseCollection = () => {
     consume(TokenType.Keyword, "collection");
     const { value: name } = consume(TokenType.Identifier);
     const node = {
@@ -665,7 +665,9 @@ export const parse = (tokens) => {
             break;
           }
           case "functions": {
-            node[keyword] = parseFunctionsBlock(ast2);
+            const { functions, functionSets } = parseFunctionsBlock();
+            node.functions = functions;
+            node.functionSets = functionSets;
             break;
           }
           case "individualActions":
@@ -769,9 +771,10 @@ export const parse = (tokens) => {
     consume(TokenType.RightBracket);
     return node;
   };
-  const parseFunctionsBlock = (ast2) => {
+  const parseFunctionsBlock = () => {
     consume(TokenType.LeftBracket);
     const functions = {};
+    const functionSets = [];
     while (!match(TokenType.RightBracket)) {
       try {
         if (match(TokenType.MacroName)) {
@@ -779,11 +782,12 @@ export const parse = (tokens) => {
           switch (macroName) {
             case "include": {
               const { value: functionSetName, location } = consume(TokenType.Identifier);
-              const functionset = ast2.functionsets.find((node) => node.name === functionSetName);
-              if (!functionset) {
-                throw new Diagnostic(`functionset "${functionSetName}" not found`, location);
-              }
-              Object.assign(functions, functionset.functions);
+              const functionSetSymbol = Symbol();
+              locationMap.set(functionSetSymbol, location);
+              functionSets.push([
+                functionSetName,
+                functionSetSymbol
+              ]);
               consume(TokenType.RightParens);
               break;
             }
@@ -823,15 +827,20 @@ export const parse = (tokens) => {
       }
     }
     consume(TokenType.RightBracket);
-    return functions;
+    return {
+      functions,
+      functionSets
+    };
   };
-  const parseFunctionSet = (ast2) => {
+  const parseFunctionSet = () => {
     consume(TokenType.Keyword, "functionset");
     const { value: name } = consume(TokenType.Identifier);
+    const { functions, functionSets } = parseFunctionsBlock();
     const node = {
       kind: "functionset",
       name,
-      functions: parseFunctionsBlock(ast2)
+      functions,
+      functionSets
     };
     return node;
   };
@@ -1209,7 +1218,7 @@ export const parse = (tokens) => {
     try {
       switch (declType) {
         case "collection": {
-          const collection = parseCollection(ast);
+          const collection = parseCollection();
           if (collection.name === "User") {
             const { properties } = collection;
             if ("roles" in properties && "items" in properties.roles.property && "enum" in properties.roles.property.items) {
@@ -1224,7 +1233,7 @@ export const parse = (tokens) => {
           break;
         }
         case "functionset": {
-          ast.functionsets.push(parseFunctionSet(ast));
+          ast.functionsets.push(parseFunctionSet());
           break;
         }
         default:

package/dist/token.d.ts

@@ -29,6 +29,7 @@ export type TypeMap = {
     [TokenType.Range]: readonly [number, number];
 };
 export type Location = {
+    file: string;
     index: number;
     line: number;
     start: number;

package/package.json

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