@aeriajs/compiler 0.0.16 → 0.0.17

package/dist/codegen.js

@@ -51,7 +51,7 @@ const path = __importStar(require("node:path"));
  *  ['outDir/folderX/folderY/file']: ...
  * }
  */
-const generateFileMap = async (fileTree, outDir) => {
+const generateFileMap = async (fileTree, outDir = '.') => {
     const mappedPaths = {};
     const mapPathTree = async (tree, previousPath) => {
         for (const treePath in tree) {

package/dist/codegen.mjs

@@ -2,7 +2,7 @@
 import { generateContracts, generateExports, generateJSCollections, generateTSCollections } from "./codegen/index.mjs";
 import * as fsPromises from "node:fs/promises";
 import * as path from "node:path";
-const generateFileMap = async (fileTree, outDir) => {
+const generateFileMap = async (fileTree, outDir = ".") => {
   const mappedPaths = {};
   const mapPathTree = async (tree, previousPath) => {
     for (const treePath in tree) {

package/dist/compile.d.ts

@@ -1,9 +1,8 @@
 import type { CompilationOptions, CompilationResult } from './types.js';
 import { Diagnostic } from './diagnostic.js';
-export declare const FILE_PRECEDENCE: string[];
+export declare const GLOB_PATTERN = "**/*.aeria";
 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: (globPattern: string, options: CompilationOptions) => Promise<CompilationResult | {
+export declare const compileFromFiles: (options: CompilationOptions) => Promise<CompilationResult | {
     emittedFiles: Record<string, string>;
     success: boolean;
     ast?: import("./ast.js").ProgramNode;

package/dist/compile.js

@@ -33,18 +33,16 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileFromFiles = exports.generateScaffolding = exports.parseAndCheck = exports.FILE_PRECEDENCE = void 0;
+exports.compileFromFiles = exports.parseAndCheck = 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");
 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'];
+exports.GLOB_PATTERN = '**/*.aeria';
 const parseAndCheck = async (sources, options = {}) => {
     const errors = [];
-    let ast;
     const allTokens = [];
     for (const fileName in sources) {
         diagnostic_js_1.Diagnostic.currentFile = fileName;
@@ -54,8 +52,8 @@ const parseAndCheck = async (sources, options = {}) => {
         }
         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);
+    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));
     return {
         success: errors.length === 0,
@@ -65,31 +63,11 @@ const parseAndCheck = async (sources, options = {}) => {
     };
 };
 exports.parseAndCheck = parseAndCheck;
-const generateScaffolding = async (options) => {
-    const directories = [path.join(options.outDir, 'collections')];
-    for (const dir of directories) {
-        await fs.promises.mkdir(dir, {
-            recursive: true,
-        });
-    }
-    return directories;
-};
-exports.generateScaffolding = generateScaffolding;
-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));
-        if (!~aIndex && !~bIndex) {
-            return 1;
-        }
-        return aIndex > bIndex
-            ? 1
-            : -1;
-    });
+const compileFromFiles = async (options) => {
+    const fileList = await Array.fromAsync(fs.promises.glob(exports.GLOB_PATTERN));
     const sources = {};
-    for (const file of sortedFileList) {
-        sources[file] = await fs.promises.readFile(file, {
+    for (const fileName of fileList) {
+        sources[fileName] = await fs.promises.readFile(fileName, {
             encoding: 'utf-8',
         });
     }
@@ -97,10 +75,13 @@ const compileFromFiles = async (globPattern, options) => {
     if (!result.ast || result.errorCount > 0) {
         return result;
     }
-    const emittedFiles = await (0, codegen_js_1.generateCode)(result.ast, options);
-    return {
-        ...result,
-        emittedFiles,
-    };
+    if (options.outDir) {
+        const emittedFiles = await (0, codegen_js_1.generateCode)(result.ast, options);
+        return {
+            ...result,
+            emittedFiles,
+        };
+    }
+    return result;
 };
 exports.compileFromFiles = compileFromFiles;

package/dist/compile.mjs

@@ -4,12 +4,10 @@ import { tokenize } from "./lexer.mjs";
 import { parse } from "./parser.mjs";
 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 GLOB_PATTERN = "**/*.aeria";
 export const parseAndCheck = async (sources, options = {}) => {
   const errors = [];
-  let ast;
   const allTokens = [];
   for (const fileName in sources) {
     Diagnostic.currentFile = fileName;
@@ -19,8 +17,8 @@ export const parseAndCheck = async (sources, options = {}) => {
     }
     allTokens.push(...tokens);
   }
-  const { errors: parserErrors, ast: currentAst } = parse(allTokens);
-  const { errors: semanticErrors } = await analyze(currentAst, options);
+  const { errors: parserErrors, ast } = parse(allTokens);
+  const { errors: semanticErrors } = await analyze(ast, options);
   errors.push(...parserErrors.concat(semanticErrors));
   return {
     success: errors.length === 0,
@@ -29,28 +27,11 @@ export const parseAndCheck = async (sources, options = {}) => {
     ast
   };
 };
-export const generateScaffolding = async (options) => {
-  const directories = [path.join(options.outDir, "collections")];
-  for (const dir of directories) {
-    await fs.promises.mkdir(dir, {
-      recursive: true
-    });
-  }
-  return directories;
-};
-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));
-    if (!~aIndex && !~bIndex) {
-      return 1;
-    }
-    return aIndex > bIndex ? 1 : -1;
-  });
+export const compileFromFiles = async (options) => {
+  const fileList = await Array.fromAsync(fs.promises.glob(GLOB_PATTERN));
   const sources = {};
-  for (const file of sortedFileList) {
-    sources[file] = await fs.promises.readFile(file, {
+  for (const fileName of fileList) {
+    sources[fileName] = await fs.promises.readFile(fileName, {
       encoding: "utf-8"
     });
   }
@@ -58,9 +39,12 @@ export const compileFromFiles = async (globPattern, options) => {
   if (!result.ast || result.errorCount > 0) {
     return result;
   }
-  const emittedFiles = await generateCode(result.ast, options);
-  return {
-    ...result,
-    emittedFiles
-  };
+  if (options.outDir) {
+    const emittedFiles = await generateCode(result.ast, options);
+    return {
+      ...result,
+      emittedFiles
+    };
+  }
+  return result;
 };

package/dist/parser.js

@@ -380,7 +380,6 @@ const parse = (tokens) => {
         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 = {
@@ -428,6 +427,7 @@ const parse = (tokens) => {
                 ...arrayProperty,
                 items,
             };
+            exports.locationMap.set(typeSymbol, current().location);
             return {
                 kind: 'property',
                 property,
@@ -441,6 +441,7 @@ const parse = (tokens) => {
                 modifierToken = consume(token_js_1.TokenType.Identifier);
             }
         }
+        exports.locationMap.set(typeSymbol, current().location);
         if (match(token_js_1.TokenType.LeftBracket)) {
             consume(token_js_1.TokenType.LeftBracket);
             property = {

package/dist/parser.mjs

@@ -338,7 +338,6 @@ export const parse = (tokens) => {
     let nestedProperties;
     let modifierToken;
     const typeSymbol = Symbol();
-    locationMap.set(typeSymbol, next().location);
     if (match(TokenType.LeftSquareBracket)) {
       consume(TokenType.LeftSquareBracket);
       const arrayProperty = {
@@ -384,6 +383,7 @@ export const parse = (tokens) => {
         ...arrayProperty,
         items
       };
+      locationMap.set(typeSymbol, current().location);
       return {
         kind: "property",
         property,
@@ -397,6 +397,7 @@ export const parse = (tokens) => {
         modifierToken = consume(TokenType.Identifier);
       }
     }
+    locationMap.set(typeSymbol, current().location);
     if (match(TokenType.LeftBracket)) {
       consume(TokenType.LeftBracket);
       property = {

package/dist/types.d.ts

@@ -7,7 +7,7 @@ export type CompilationResult = {
     errorCount: number;
 };
 export type CompilationOptions = {
-    outDir: string;
+    outDir?: string;
     dryRun?: boolean;
     languageServer?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/compiler",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -10,8 +10,8 @@
   },
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     }
   },
   "keywords": [],