@aeriajs/compiler 0.0.38 → 0.0.40

package/dist/codegen/generateExports.d.ts

@@ -1,5 +1,7 @@
 import type * as AST from '../ast.js';
-export declare const generateExports: (ast: AST.ProgramNode, hasContracts?: boolean) => {
+export declare const generateExports: (ast: AST.ProgramNode, options?: {
+    hasContracts: boolean;
+}) => {
     main: {
         js: string;
         dts: string;

package/dist/codegen/generateExports.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateExports = void 0;
 const utils_js_1 = require("./utils.js");
-const generateExports = (ast, hasContracts = false) => {
+const generateExports = (ast, options = {
+    hasContracts: false,
+}) => {
     const symbolsToExport = Object.values(ast.collections.reduce((symbols, node) => {
         const id = (0, utils_js_1.getCollectionId)(node.name);
         symbols[id] = {
@@ -18,19 +20,19 @@ const generateExports = (ast, hasContracts = false) => {
             dts: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(', ')} } from './collections.js'`,
         },
         main: {
-            js: (hasContracts
+            js: (options.hasContracts
                 ? 'export * as contracts from \'./contracts/index.js\'\n'
                 : '') +
                 'export * as collections from \'./collections/index.js\'\n' +
                 `export { ${symbolsToExport.map((symbol) => symbol.extend).join(', ')} } from './collections/collections.js'`,
-            dts: (hasContracts
+            dts: (options.hasContracts
                 ? 'export * as contracts from \'./contracts/index.js\'\n'
                 : '') +
                 'export * as collections from \'./collections/index.js\'\n' +
                 `export { ${symbolsToExport.map((symbol) => `${symbol.extend}, ${symbol.schema}`).join(', ')} } from './collections/collections.js'`,
         },
     };
-    if (hasContracts) {
+    if (options.hasContracts) {
         exports.contracts = {
             js: 'export * from \'./contracts.js\'',
             dts: 'export * from \'./contracts.js\'',

package/dist/codegen/generateExports.mjs

@@ -1,6 +1,8 @@
 "use strict";
 import { resizeFirstChar, getExtendName, getCollectionId } from "./utils.mjs";
-export const generateExports = (ast, hasContracts = false) => {
+export const generateExports = (ast, options = {
+  hasContracts: false
+}) => {
   const symbolsToExport = Object.values(ast.collections.reduce((symbols, node) => {
     const id = getCollectionId(node.name);
     symbols[id] = {
@@ -16,13 +18,13 @@ export const generateExports = (ast, hasContracts = false) => {
       dts: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(", ")} } from './collections.mjs'`
     },
     main: {
-      js: (hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
+      js: (options.hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
 export { ${symbolsToExport.map((symbol) => symbol.extend).join(", ")} } from './collections/collections.mjs'`,
-      dts: (hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
+      dts: (options.hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
 export { ${symbolsToExport.map((symbol) => `${symbol.extend}, ${symbol.schema}`).join(", ")} } from './collections/collections.mjs'`
     }
   };
-  if (hasContracts) {
+  if (options.hasContracts) {
     exports.contracts = {
       js: "export * from './contracts.mjs'",
       dts: "export * from './contracts.mjs'"

package/dist/codegen.js

@@ -72,7 +72,9 @@ const generateFileMap = async (fileTree, outDir = '.') => {
 };
 const generateCode = async (ast, options) => {
     const contracts = (0, index_js_1.generateContracts)(ast.contracts);
-    const exports = (0, index_js_1.generateExports)(ast, Boolean(contracts));
+    const exports = (0, index_js_1.generateExports)(ast, {
+        hasContracts: !!contracts,
+    });
     const fileTree = {
         ['collections']: {
             ['collections.d.ts']: (0, index_js_1.generateTSCollections)(ast.collections),

package/dist/codegen.mjs

@@ -23,7 +23,9 @@ const generateFileMap = async (fileTree, outDir = ".") => {
 };
 export const generateCode = async (ast, options) => {
   const contracts = generateContracts(ast.contracts);
-  const exports = generateExports(ast, Boolean(contracts));
+  const exports = generateExports(ast, {
+    hasContracts: !!contracts
+  });
   const fileTree = {
     ["collections"]: {
       ["collections.d.ts"]: generateTSCollections(ast.collections),

package/dist/parser.js

@@ -70,6 +70,7 @@ const parse = (tokens) => {
     };
     const errors = [];
     const advance = () => index++;
+    const rollback = () => index--;
     const next = () => {
         const token = tokens[index + 1];
         if (!token) {
@@ -287,8 +288,10 @@ const parse = (tokens) => {
                 }
                 case 'constraints': {
                     const constraintTerms = [];
+                    rollback();
                     property[attributeName] = parseCondition(constraintTerms);
                     property[AST.LOCATION_SYMBOL].contraintTerms = constraintTerms;
+                    rollback();
                     return;
                 }
             }

package/dist/parser.mjs

@@ -35,6 +35,7 @@ export const parse = (tokens) => {
   };
   const errors = [];
   const advance = () => index++;
+  const rollback = () => index--;
   const next = () => {
     const token = tokens[index + 1];
     if (!token) {
@@ -247,8 +248,10 @@ export const parse = (tokens) => {
         }
         case "constraints": {
           const constraintTerms = [];
+          rollback();
           property[attributeName] = parseCondition(constraintTerms);
           property[AST.LOCATION_SYMBOL].contraintTerms = constraintTerms;
+          rollback();
           return;
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/compiler",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -21,8 +21,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.144",
-    "@aeriajs/types": "^0.0.126"
+    "@aeriajs/common": "^0.0.145",
+    "@aeriajs/types": "^0.0.127"
   },
   "devDependencies": {
     "@aeriajs/common": "link:../common",