@aeriajs/compiler 0.0.7 → 0.0.9

package/dist/codegen.d.ts

@@ -1,3 +1,3 @@
-import type { CompilationOptions } from './compile.js';
-import type * as AST from './ast';
+import type * as AST from './ast.js';
+import type { CompilationOptions } from './types.js';
 export declare const generateCode: (ast: AST.ProgramNode, options: CompilationOptions) => Promise<Record<string, string>>;

package/dist/compile.d.ts

@@ -1,21 +1,11 @@
-import type * as AST from './ast.js';
+import type { CompilationOptions, CompilationResult } from './types.js';
 import { Diagnostic } from './diagnostic.js';
-export type CompilationResult = {
-    success: boolean;
-    ast: AST.ProgramNode;
-    errors: Diagnostic[];
-    errorCount: number;
-};
-export type CompilationOptions = {
-    outDir: string;
-    dryRun?: true;
-};
-export declare const parseAndCheck: (sources: Record<string, string>) => Promise<CompilationResult>;
+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<{
+export declare const compileFromFiles: (schemaDir: string, options: CompilationOptions) => Promise<CompilationResult | {
     emittedFiles: Record<string, string>;
     success: boolean;
-    ast: AST.ProgramNode;
+    ast?: import("./ast.js").ProgramNode;
     errors: Diagnostic[];
     errorCount: number;
 }>;

package/dist/compile.js

@@ -40,8 +40,8 @@ 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 fsPromises = __importStar(require("node:fs/promises"));
-const parseAndCheck = async (sources) => {
+const fs = __importStar(require("node:fs"));
+const parseAndCheck = async (sources, options = {}) => {
     const errors = [];
     let errorCount = 0;
     let ast;
@@ -49,7 +49,7 @@ const parseAndCheck = async (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);
+        const { errors: semanticErrors } = await (0, semantic_js_1.analyze)(currentAst, options);
         errors.push(...lexerErrors.concat(parserErrors, semanticErrors));
         errorCount += errors.length;
         if (!ast) {
@@ -65,14 +65,14 @@ const parseAndCheck = async (sources) => {
         success: errorCount === 0,
         errors,
         errorCount,
-        ast: ast,
+        ast,
     };
 };
 exports.parseAndCheck = parseAndCheck;
 const generateScaffolding = async (options) => {
     const directories = [path.join(options.outDir, 'collections')];
     for (const dir of directories) {
-        await fsPromises.mkdir(dir, {
+        await fs.promises.mkdir(dir, {
             recursive: true,
         });
     }
@@ -80,16 +80,20 @@ const generateScaffolding = async (options) => {
 };
 exports.generateScaffolding = generateScaffolding;
 const compileFromFiles = async (schemaDir, options) => {
-    const fileList = await fsPromises.readdir(schemaDir);
+    const fileList = await fs.promises.readdir(schemaDir);
     const sources = {};
     for (const file of fileList) {
-        const fileContent = await fsPromises.readFile(`${schemaDir}/${file}`);
-        sources[file] = fileContent.toString();
+        sources[file] = await fs.promises.readFile(`${schemaDir}/${file}`, {
+            encoding: 'utf-8',
+        });
+    }
+    const result = await (0, exports.parseAndCheck)(sources, options);
+    if (!result.ast) {
+        return result;
     }
-    const parsed = await (0, exports.parseAndCheck)(sources);
-    const emittedFiles = await (0, codegen_js_1.generateCode)(parsed.ast, options);
+    const emittedFiles = await (0, codegen_js_1.generateCode)(result.ast, options);
     return {
-        ...parsed,
+        ...result,
         emittedFiles,
     };
 };

package/dist/compile.mjs

@@ -5,8 +5,8 @@ import { parse } from "./parser.mjs";
 import { analyze } from "./semantic.mjs";
 import { generateCode } from "./codegen.mjs";
 import * as path from "node:path";
-import * as fsPromises from "node:fs/promises";
-export const parseAndCheck = async (sources) => {
+import * as fs from "node:fs";
+export const parseAndCheck = async (sources, options = {}) => {
   const errors = [];
   let errorCount = 0;
   let ast;
@@ -14,7 +14,7 @@ export const parseAndCheck = async (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);
+    const { errors: semanticErrors } = await analyze(currentAst, options);
     errors.push(...lexerErrors.concat(parserErrors, semanticErrors));
     errorCount += errors.length;
     if (!ast) {
@@ -35,23 +35,27 @@ export const parseAndCheck = async (sources) => {
 export const generateScaffolding = async (options) => {
   const directories = [path.join(options.outDir, "collections")];
   for (const dir of directories) {
-    await fsPromises.mkdir(dir, {
+    await fs.promises.mkdir(dir, {
       recursive: true
     });
   }
   return directories;
 };
 export const compileFromFiles = async (schemaDir, options) => {
-  const fileList = await fsPromises.readdir(schemaDir);
+  const fileList = await fs.promises.readdir(schemaDir);
   const sources = {};
   for (const file of fileList) {
-    const fileContent = await fsPromises.readFile(`${schemaDir}/${file}`);
-    sources[file] = fileContent.toString();
+    sources[file] = await fs.promises.readFile(`${schemaDir}/${file}`, {
+      encoding: "utf-8"
+    });
+  }
+  const result = await parseAndCheck(sources, options);
+  if (!result.ast) {
+    return result;
   }
-  const parsed = await parseAndCheck(sources);
-  const emittedFiles = await generateCode(parsed.ast, options);
+  const emittedFiles = await generateCode(result.ast, options);
   return {
-    ...parsed,
+    ...result,
     emittedFiles
   };
 };

package/dist/lexer.d.ts

@@ -8,7 +8,7 @@ export declare const CONTRACT_KEYWORDS: readonly ["payload", "query", "response"
 export declare const TOPLEVEL_KEYWORDS: readonly ["collection", "contract", "functionset"];
 export declare const MISC_KEYWORDS: readonly ["extends"];
 export declare const KEYWORDS: Keyword[];
-export declare const tokenize: (input: string) => {
+export declare const tokenize: (rawInput: string) => {
     tokens: Token[];
     errors: Diagnostic[];
 };

package/dist/lexer.js

@@ -156,7 +156,8 @@ const TOKENS = [
         valueExtractor: (value) => value.slice(1),
     },
 ];
-const tokenize = function (input) {
+const tokenize = function (rawInput) {
+    const input = rawInput.replace(/\r\n/g, '\n');
     let index = 0, line = 1, start = 0, end = 0;
     const tokens = [];
     const errors = [];

package/dist/lexer.mjs

@@ -161,7 +161,8 @@ const TOKENS = [
     valueExtractor: (value) => value.slice(1)
   }
 ];
-export const tokenize = function(input) {
+export const tokenize = function(rawInput) {
+  const input = rawInput.replace(/\r\n/g, "\n");
   let index = 0, line = 1, start = 0, end = 0;
   const tokens = [];
   const errors = [];

package/dist/semantic.d.ts

@@ -1,5 +1,6 @@
+import type { CompilationOptions } from './types.js';
 import { Diagnostic } from './diagnostic.js';
 import * as AST from './ast.js';
-export declare const analyze: (ast: AST.ProgramNode, errors?: Diagnostic[]) => Promise<{
+export declare const analyze: (ast: AST.ProgramNode, options: Pick<CompilationOptions, "languageServer">, errors?: Diagnostic[]) => Promise<{
     errors: Diagnostic[];
 }>;

package/dist/semantic.js

@@ -38,9 +38,12 @@ const common_1 = require("@aeriajs/common");
 const parser_js_1 = require("./parser.js");
 const diagnostic_js_1 = require("./diagnostic.js");
 const AST = __importStar(require("./ast.js"));
-const collectionHasProperty = async (collection, propName) => {
+const collectionHasProperty = async (collection, propName, options) => {
     let hasProperty = propName in collection.properties;
     if (!hasProperty) {
+        if (options.languageServer) {
+            return true;
+        }
         if (collection.extends) {
             const { packageName, symbolName } = collection.extends;
             const { [symbolName]: importedCollection } = await Promise.resolve(`${packageName}`).then(s => __importStar(require(s)));
@@ -52,13 +55,13 @@ const collectionHasProperty = async (collection, propName) => {
     }
     return hasProperty;
 };
-const analyze = async (ast, errors = []) => {
+const analyze = async (ast, options, errors = []) => {
     const checkCollectionForeignProperties = async (foreignCollection, property, attributeName) => {
         if (!property[attributeName]) {
             return;
         }
         for (const foreignPropName of property[attributeName]) {
-            if (!await collectionHasProperty(foreignCollection, foreignPropName)) {
+            if (!await collectionHasProperty(foreignCollection, foreignPropName, options)) {
                 let location;
                 if (property[AST.LOCATION_SYMBOL]) {
                     location = parser_js_1.locationMap.get(property[AST.LOCATION_SYMBOL].attributes[attributeName]);
@@ -74,7 +77,7 @@ const analyze = async (ast, errors = []) => {
         for (const index in node[attributeName]) {
             const propName = node[attributeName][index];
             const symbol = node[AST.LOCATION_SYMBOL].arrays[attributeName][index];
-            if (!await collectionHasProperty(node, propName)) {
+            if (!await collectionHasProperty(node, propName, options)) {
                 const location = parser_js_1.locationMap.get(symbol);
                 errors.push(new diagnostic_js_1.Diagnostic(`collection "${node.name}" hasn't such property "${propName}"`, location));
             }

package/dist/semantic.mjs

@@ -3,9 +3,12 @@ import { isValidCollection } from "@aeriajs/common";
 import { locationMap } from "./parser.mjs";
 import { Diagnostic } from "./diagnostic.mjs";
 import * as AST from "./ast.mjs";
-const collectionHasProperty = async (collection, propName) => {
+const collectionHasProperty = async (collection, propName, options) => {
   let hasProperty = propName in collection.properties;
   if (!hasProperty) {
+    if (options.languageServer) {
+      return true;
+    }
     if (collection.extends) {
       const { packageName, symbolName } = collection.extends;
       const { [symbolName]: importedCollection } = await import(packageName);
@@ -17,13 +20,13 @@ const collectionHasProperty = async (collection, propName) => {
   }
   return hasProperty;
 };
-export const analyze = async (ast, errors = []) => {
+export const analyze = async (ast, options, errors = []) => {
   const checkCollectionForeignProperties = async (foreignCollection, property, attributeName) => {
     if (!property[attributeName]) {
       return;
     }
     for (const foreignPropName of property[attributeName]) {
-      if (!await collectionHasProperty(foreignCollection, foreignPropName)) {
+      if (!await collectionHasProperty(foreignCollection, foreignPropName, options)) {
         let location;
         if (property[AST.LOCATION_SYMBOL]) {
           location = locationMap.get(property[AST.LOCATION_SYMBOL].attributes[attributeName]);
@@ -39,7 +42,7 @@ export const analyze = async (ast, errors = []) => {
     for (const index in node[attributeName]) {
       const propName = node[attributeName][index];
       const symbol = node[AST.LOCATION_SYMBOL].arrays[attributeName][index];
-      if (!await collectionHasProperty(node, propName)) {
+      if (!await collectionHasProperty(node, propName, options)) {
         const location = locationMap.get(symbol);
         errors.push(new Diagnostic(`collection "${node.name}" hasn't such property "${propName}"`, location));
       }

package/dist/types.d.ts

@@ -0,0 +1,13 @@
+import type * as AST from './ast.js';
+import { type Diagnostic } from './diagnostic.js';
+export type CompilationResult = {
+    success: boolean;
+    ast?: AST.ProgramNode;
+    errors: Diagnostic[];
+    errorCount: number;
+};
+export type CompilationOptions = {
+    outDir: string;
+    dryRun?: boolean;
+    languageServer?: boolean;
+};

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types.mjs

@@ -0,0 +1 @@
+"use strict";

package/package.json

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