@aeriajs/compiler 0.0.9 → 0.0.10

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/package.json

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