@aeriajs/compiler 0.0.6 → 0.0.8

package/dist/codegen/generateJSCollections.js

@@ -9,7 +9,7 @@ const initialImportedFunctions = [
 const generateJSCollections = (ast) => {
     let javascriptCode = '';
     const importsResult = (0, utils_js_1.makeASTImports)(ast, {
-        [utils_js_1.aeriaPackageName]: new Set(initialImportedFunctions),
+        [utils_js_1.PACKAGE_NAME]: new Set(initialImportedFunctions),
     });
     javascriptCode += importsResult.code + '\n\n';
     javascriptCode += makeJSCollections(ast, importsResult.modifiedSymbols) + '\n\n';
@@ -85,7 +85,7 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
     return (0, utils_js_1.stringify)(collectionSchema);
 };
 const makeJSFunctions = (functions) => {
-    return Object.entries(functions).map(([key, _value]) => utils_js_1.defaultFunctions.includes(key)
+    return Object.entries(functions).map(([key, _value]) => utils_js_1.DEFAULT_FUNCTIONS.includes(key)
         ? key
         : `${key}: () => { throw new Error('Function not implemented') }`).join(', ');
 };

package/dist/codegen/generateJSCollections.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { makeASTImports, getProperties, stringify, aeriaPackageName, getExtendName, getCollectionId, UnquotedSymbol, defaultFunctions, getExposedFunctions } from "./utils.mjs";
+import { makeASTImports, getProperties, stringify, getExtendName, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
 const initialImportedFunctions = [
   "extendCollection",
   "defineCollection"
@@ -7,7 +7,7 @@ const initialImportedFunctions = [
 export const generateJSCollections = (ast) => {
   let javascriptCode = "";
   const importsResult = makeASTImports(ast, {
-    [aeriaPackageName]: new Set(initialImportedFunctions)
+    [PACKAGE_NAME]: new Set(initialImportedFunctions)
   });
   javascriptCode += importsResult.code + "\n\n";
   javascriptCode += makeJSCollections(ast, importsResult.modifiedSymbols) + "\n\n";
@@ -78,5 +78,5 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
   return stringify(collectionSchema);
 };
 const makeJSFunctions = (functions) => {
-  return Object.entries(functions).map(([key, _value]) => defaultFunctions.includes(key) ? key : `${key}: () => { throw new Error('Function not implemented') }`).join(", ");
+  return Object.entries(functions).map(([key, _value]) => DEFAULT_FUNCTIONS.includes(key) ? key : `${key}: () => { throw new Error('Function not implemented') }`).join(", ");
 };

package/dist/codegen/generateTSCollections.js

@@ -10,7 +10,7 @@ const initialImportedTypes = [
 ];
 const generateTSCollections = (ast) => {
     let code = '';
-    code += `import type { ${initialImportedTypes.join(', ')} } from '${utils_js_1.aeriaPackageName}'\n`; //Used types
+    code += `import type { ${initialImportedTypes.join(', ')} } from '${utils_js_1.PACKAGE_NAME}'\n`; //Used types
     const importsResult = (0, utils_js_1.makeASTImports)(ast);
     code += importsResult.code + '\n\n';
     code += makeTSCollections(ast, importsResult.modifiedSymbols) + '\n';
@@ -98,7 +98,7 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
 const makeTSFunctions = (functions) => {
     return Object.keys(functions).reduce((acc, key) => {
         acc[key] = {
-            [utils_js_1.UnquotedSymbol]: utils_js_1.defaultFunctions.includes(key)
+            [utils_js_1.UnquotedSymbol]: utils_js_1.DEFAULT_FUNCTIONS.includes(key)
                 ? `typeof ${key}`
                 : '() => never',
         };

package/dist/codegen/generateTSCollections.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { getProperties, stringify, makeASTImports, resizeFirstChar, aeriaPackageName, getCollectionId, UnquotedSymbol, defaultFunctions, getExposedFunctions } from "./utils.mjs";
+import { getProperties, stringify, makeASTImports, resizeFirstChar, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
 const initialImportedTypes = [
   "Collection",
   "SchemaWithId",
@@ -8,7 +8,7 @@ const initialImportedTypes = [
 ];
 export const generateTSCollections = (ast) => {
   let code = "";
-  code += `import type { ${initialImportedTypes.join(", ")} } from '${aeriaPackageName}'
+  code += `import type { ${initialImportedTypes.join(", ")} } from '${PACKAGE_NAME}'
 `;
   const importsResult = makeASTImports(ast);
   code += importsResult.code + "\n\n";
@@ -92,7 +92,7 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
 const makeTSFunctions = (functions) => {
   return Object.keys(functions).reduce((acc, key) => {
     acc[key] = {
-      [UnquotedSymbol]: defaultFunctions.includes(key) ? `typeof ${key}` : "() => never"
+      [UnquotedSymbol]: DEFAULT_FUNCTIONS.includes(key) ? `typeof ${key}` : "() => never"
     };
     return acc;
   }, {});

package/dist/codegen/utils.d.ts

@@ -1,7 +1,7 @@
-import type * as AST from '../ast';
+import type * as AST from '../ast.js';
 import type { Property } from '@aeriajs/types';
-export declare const aeriaPackageName = "aeria";
-export declare const defaultFunctions: string[];
+export declare const PACKAGE_NAME = "aeria";
+export declare const DEFAULT_FUNCTIONS: string[];
 export declare const ArraySymbol: unique symbol;
 export declare const getExposedFunctions: (astFunctions: NonNullable<AST.CollectionNode["functions"]>) => {
     [k: string]: import("@aeriajs/types").AccessCondition;

package/dist/codegen/utils.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtendName = exports.getCollectionId = exports.resizeFirstChar = exports.stringify = exports.UnquotedSymbol = exports.getProperties = exports.propertyToSchema = exports.makeASTImports = exports.getExposedFunctions = exports.ArraySymbol = exports.defaultFunctions = exports.aeriaPackageName = void 0;
-const core_1 = require("@aeriajs/core");
-exports.aeriaPackageName = 'aeria';
-exports.defaultFunctions = Object.keys(core_1.functions);
+exports.getExtendName = exports.getCollectionId = exports.resizeFirstChar = exports.stringify = exports.UnquotedSymbol = exports.getProperties = exports.propertyToSchema = exports.makeASTImports = exports.getExposedFunctions = exports.ArraySymbol = exports.DEFAULT_FUNCTIONS = exports.PACKAGE_NAME = void 0;
+exports.PACKAGE_NAME = 'aeria';
+exports.DEFAULT_FUNCTIONS = [
+    'count',
+    'get',
+    'getAll',
+    'insert',
+    'upload',
+    'remove',
+    'removeAll',
+    'removeFile',
+];
 exports.ArraySymbol = Symbol('array');
 const getExposedFunctions = (astFunctions) => {
     return Object.fromEntries(Object.entries(astFunctions)
@@ -29,13 +37,13 @@ const makeASTImports = (ast, initialImports) => {
                 imports[node.extends.packageName].add(`${node.extends.symbolName} as ${modifiedSymbol}`);
             }
             if (node.functions) {
-                const functionsToImport = Object.keys(node.functions).filter((key) => exports.defaultFunctions.includes(key));
+                const functionsToImport = Object.keys(node.functions).filter((key) => exports.DEFAULT_FUNCTIONS.includes(key));
                 if (functionsToImport.length > 0) {
-                    if (!(exports.aeriaPackageName in imports)) {
-                        imports[exports.aeriaPackageName] = new Set();
+                    if (!(exports.PACKAGE_NAME in imports)) {
+                        imports[exports.PACKAGE_NAME] = new Set();
                     }
                     for (const key of functionsToImport) {
-                        imports[exports.aeriaPackageName].add(key);
+                        imports[exports.PACKAGE_NAME].add(key);
                     }
                 }
             }

package/dist/codegen/utils.mjs

@@ -1,7 +1,15 @@
 "use strict";
-import { functions as aeriaFunctions } from "@aeriajs/core";
-export const aeriaPackageName = "aeria";
-export const defaultFunctions = Object.keys(aeriaFunctions);
+export const PACKAGE_NAME = "aeria";
+export const DEFAULT_FUNCTIONS = [
+  "count",
+  "get",
+  "getAll",
+  "insert",
+  "upload",
+  "remove",
+  "removeAll",
+  "removeFile"
+];
 export const ArraySymbol = Symbol("array");
 export const getExposedFunctions = (astFunctions) => {
   return Object.fromEntries(Object.entries(astFunctions).map(([key, value]) => [
@@ -22,13 +30,13 @@ export const makeASTImports = (ast, initialImports) => {
         imports[node.extends.packageName].add(`${node.extends.symbolName} as ${modifiedSymbol}`);
       }
       if (node.functions) {
-        const functionsToImport = Object.keys(node.functions).filter((key) => defaultFunctions.includes(key));
+        const functionsToImport = Object.keys(node.functions).filter((key) => DEFAULT_FUNCTIONS.includes(key));
         if (functionsToImport.length > 0) {
-          if (!(aeriaPackageName in imports)) {
-            imports[aeriaPackageName] = /* @__PURE__ */ new Set();
+          if (!(PACKAGE_NAME in imports)) {
+            imports[PACKAGE_NAME] = /* @__PURE__ */ new Set();
           }
           for (const key of functionsToImport) {
-            imports[aeriaPackageName].add(key);
+            imports[PACKAGE_NAME].add(key);
           }
         }
       }

package/dist/compile.d.ts

@@ -2,7 +2,7 @@ import type * as AST from './ast.js';
 import { Diagnostic } from './diagnostic.js';
 export type CompilationResult = {
     success: boolean;
-    ast: AST.ProgramNode;
+    ast?: AST.ProgramNode;
     errors: Diagnostic[];
     errorCount: number;
 };
@@ -12,10 +12,10 @@ export type CompilationOptions = {
 };
 export declare const parseAndCheck: (sources: Record<string, string>) => 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?: AST.ProgramNode;
     errors: Diagnostic[];
     errorCount: number;
 }>;

package/dist/compile.js

@@ -40,7 +40,7 @@ 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 fs = __importStar(require("node:fs"));
 const parseAndCheck = async (sources) => {
     const errors = [];
     let errorCount = 0;
@@ -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);
+    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,7 +5,7 @@ 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";
+import * as fs from "node:fs";
 export const parseAndCheck = async (sources) => {
   const errors = [];
   let errorCount = 0;
@@ -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);
+  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/package.json

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