@aeriajs/compiler 0.0.16 → 0.0.18

package/dist/ast.d.ts

@@ -33,6 +33,7 @@ export type PropertyNode = NodeBase<'property'> & {
         };
     };
     nestedProperties?: Record<string, PropertyNode>;
+    nestedAdditionalProperties?: PropertyNode | boolean;
 };
 export type CollectionNode = NodeBase<'collection'> & {
     name: string;

package/dist/codegen/generateContracts.js

@@ -19,7 +19,7 @@ const makeJSContractsCode = (contractAst) => {
     const getCodeForResponse = (responseProperty) => {
         const { kind, modifier, ...propertyNode } = responseProperty;
         if (!modifier) {
-            return (0, utils_js_1.stringify)((0, utils_js_1.propertyToSchema)(propertyNode));
+            return (0, utils_js_1.stringify)((0, utils_js_1.unwrapPropertyNode)(propertyNode));
         }
         const modifierSymbol = responseProperty.modifier === 'Result'
             ? 'resultSchema'
@@ -27,7 +27,7 @@ const makeJSContractsCode = (contractAst) => {
         if (!imports.has(modifierSymbol)) {
             imports.add(modifierSymbol);
         }
-        return `${modifierSymbol}(${(0, utils_js_1.stringify)((0, utils_js_1.propertyToSchema)(propertyNode))})`;
+        return `${modifierSymbol}(${(0, utils_js_1.stringify)((0, utils_js_1.unwrapPropertyNode)(propertyNode))})`;
     };
     const declarations = contractAst.map((contractNode) => {
         const { name, kind, roles, response, ...contractProperty } = contractNode;
@@ -47,7 +47,7 @@ const makeJSContractsCode = (contractAst) => {
                 responseString = (0, utils_js_1.stringify)(getCodeForResponse(response));
             }
         }
-        const contractSchema = (0, utils_js_1.getProperties)(contractProperty);
+        const contractSchema = (0, utils_js_1.recursivelyUnwrapPropertyNodes)(contractProperty);
         if (responseString) {
             contractSchema.response = {
                 [utils_js_1.UnquotedSymbol]: responseString,
@@ -61,7 +61,7 @@ const makeJSContractsCode = (contractAst) => {
     return `import { ${Array.from(imports).join(', ')} } from \'aeria\'\n\n` + declarations;
 };
 const getResponseSchema = (response) => {
-    const responseSchema = (0, utils_js_1.propertyToSchema)(response);
+    const responseSchema = (0, utils_js_1.unwrapPropertyNode)(response);
     if (!response.modifier) {
         return responseSchema;
     }
@@ -81,7 +81,7 @@ const makeTSContractsCode = (contractAst) => {
                 responseSchema = getResponseSchema(contractSchema.response);
             }
         }
-        const contractProperties = (0, utils_js_1.getProperties)(contractSchema);
+        const contractProperties = (0, utils_js_1.recursivelyUnwrapPropertyNodes)(contractSchema);
         if (responseSchema) {
             contractProperties.response = responseSchema;
         }

package/dist/codegen/generateContracts.mjs

@@ -1,6 +1,6 @@
 "use strict";
 import { errorSchema, resultSchema } from "@aeriajs/types";
-import { getProperties, propertyToSchema, stringify, UnquotedSymbol } from "./utils.mjs";
+import { recursivelyUnwrapPropertyNodes, unwrapPropertyNode, stringify, UnquotedSymbol } from "./utils.mjs";
 export const generateContracts = (ast) => {
   const contractNodes = ast.filter((node) => node.kind === "contract");
   if (contractNodes.length === 0) {
@@ -16,13 +16,13 @@ const makeJSContractsCode = (contractAst) => {
   const getCodeForResponse = (responseProperty) => {
     const { kind, modifier, ...propertyNode } = responseProperty;
     if (!modifier) {
-      return stringify(propertyToSchema(propertyNode));
+      return stringify(unwrapPropertyNode(propertyNode));
     }
     const modifierSymbol = responseProperty.modifier === "Result" ? "resultSchema" : "errorSchema";
     if (!imports.has(modifierSymbol)) {
       imports.add(modifierSymbol);
     }
-    return `${modifierSymbol}(${stringify(propertyToSchema(propertyNode))})`;
+    return `${modifierSymbol}(${stringify(unwrapPropertyNode(propertyNode))})`;
   };
   const declarations = contractAst.map((contractNode) => {
     const { name, kind, roles, response, ...contractProperty } = contractNode;
@@ -41,7 +41,7 @@ const makeJSContractsCode = (contractAst) => {
         responseString = stringify(getCodeForResponse(response));
       }
     }
-    const contractSchema = getProperties(contractProperty);
+    const contractSchema = recursivelyUnwrapPropertyNodes(contractProperty);
     if (responseString) {
       contractSchema.response = {
         [UnquotedSymbol]: responseString
@@ -57,7 +57,7 @@ const makeJSContractsCode = (contractAst) => {
 ` + declarations;
 };
 const getResponseSchema = (response) => {
-  const responseSchema = propertyToSchema(response);
+  const responseSchema = unwrapPropertyNode(response);
   if (!response.modifier) {
     return responseSchema;
   }
@@ -74,7 +74,7 @@ const makeTSContractsCode = (contractAst) => {
         responseSchema = getResponseSchema(contractSchema.response);
       }
     }
-    const contractProperties = getProperties(contractSchema);
+    const contractProperties = recursivelyUnwrapPropertyNodes(contractSchema);
     if (responseSchema) {
       contractProperties.response = responseSchema;
     }

package/dist/codegen/generateJSCollections.js

@@ -47,7 +47,7 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
         }
         switch (key) {
             case 'properties':
-                collectionSchema.description[key] = (0, utils_js_1.getProperties)(collectionNode[key]);
+                collectionSchema.description[key] = (0, utils_js_1.recursivelyUnwrapPropertyNodes)(collectionNode[key]);
                 break;
             case 'owned':
                 collectionSchema.description[key] = collectionNode[key];

package/dist/codegen/generateJSCollections.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { makeASTImports, getProperties, stringify, getExtendName, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
+import { makeASTImports, recursivelyUnwrapPropertyNodes, stringify, getExtendName, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
 const initialImportedFunctions = [
   "extendCollection",
   "defineCollection"
@@ -40,7 +40,7 @@ const makeJSCollectionSchema = (collectionNode, collectionId) => {
     }
     switch (key) {
       case "properties":
-        collectionSchema.description[key] = getProperties(collectionNode[key]);
+        collectionSchema.description[key] = recursivelyUnwrapPropertyNodes(collectionNode[key]);
         break;
       case "owned":
         collectionSchema.description[key] = collectionNode[key];

package/dist/codegen/generateTSCollections.js

@@ -59,7 +59,7 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
         }
         switch (key) {
             case 'properties':
-                collectionSchema.description.properties = (0, utils_js_1.getProperties)(collectionNode[key]);
+                collectionSchema.description.properties = (0, utils_js_1.recursivelyUnwrapPropertyNodes)(collectionNode[key]);
                 break;
             case 'owned':
                 collectionSchema.description.owned = collectionNode[key];

package/dist/codegen/generateTSCollections.mjs

@@ -1,5 +1,5 @@
 "use strict";
-import { getProperties, stringify, makeASTImports, resizeFirstChar, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
+import { recursivelyUnwrapPropertyNodes, stringify, makeASTImports, resizeFirstChar, getCollectionId, UnquotedSymbol, getExposedFunctions, PACKAGE_NAME, DEFAULT_FUNCTIONS } from "./utils.mjs";
 const initialImportedTypes = [
   "Collection",
   "SchemaWithId",
@@ -54,7 +54,7 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
     }
     switch (key) {
       case "properties":
-        collectionSchema.description.properties = getProperties(collectionNode[key]);
+        collectionSchema.description.properties = recursivelyUnwrapPropertyNodes(collectionNode[key]);
         break;
       case "owned":
         collectionSchema.description.owned = collectionNode[key];

package/dist/codegen/utils.d.ts

@@ -13,9 +13,9 @@ export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<s
     code: string[];
     modifiedSymbols: Record<string, string>;
 };
-export declare const propertyToSchema: ({ property, nestedProperties }: Pick<AST.PropertyNode, "property" | "nestedProperties">) => Property;
+export declare const unwrapPropertyNode: ({ property, nestedProperties, nestedAdditionalProperties }: Pick<AST.PropertyNode, "property" | "nestedProperties" | "nestedAdditionalProperties">) => Property;
 /** Transforms the AST properties to the format of aeria schema properties */
-export declare const getProperties: <TProperties extends Record<string, AST.PropertyNode | AST.PropertyNode[]>, TReturnType = TProperties[keyof TProperties] extends Array<unknown> ? Record<string, Property[]> : Record<string, Property>>(properties: TProperties) => TReturnType;
+export declare const recursivelyUnwrapPropertyNodes: <TProperties extends Record<string, AST.PropertyNode | AST.PropertyNode[]>, TReturnType = TProperties[keyof TProperties] extends Array<unknown> ? Record<string, Property[]> : Record<string, Property>>(properties: TProperties) => TReturnType;
 export declare const UnquotedSymbol: unique symbol;
 /** Serves to know if the value must be unquoted on strinfigy function */
 export type StringifyProperty = unknown | {

package/dist/codegen/utils.js

@@ -1,6 +1,6 @@
 "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.DEFAULT_FUNCTIONS = exports.PACKAGE_NAME = void 0;
+exports.getExtendName = exports.getCollectionId = exports.resizeFirstChar = exports.stringify = exports.UnquotedSymbol = exports.recursivelyUnwrapPropertyNodes = exports.unwrapPropertyNode = exports.makeASTImports = exports.getExposedFunctions = exports.ArraySymbol = exports.DEFAULT_FUNCTIONS = exports.PACKAGE_NAME = void 0;
 exports.PACKAGE_NAME = 'aeria';
 exports.DEFAULT_FUNCTIONS = [
     'count',
@@ -55,41 +55,70 @@ const makeASTImports = (ast, initialImports) => {
     };
 };
 exports.makeASTImports = makeASTImports;
-const propertyToSchema = ({ property, nestedProperties }) => {
-    const propertySchema = property;
-    if ('$ref' in propertySchema) {
-        propertySchema.$ref = (0, exports.getCollectionId)(propertySchema.$ref);
+const unwrapPropertyNode = ({ property, nestedProperties, nestedAdditionalProperties }) => {
+    const propertyOrPropertyItems = 'items' in property
+        ? property.items
+        : property;
+    let unwrappedProperty = propertyOrPropertyItems;
+    if ('$ref' in propertyOrPropertyItems) {
+        unwrappedProperty = {
+            ...propertyOrPropertyItems,
+            $ref: (0, exports.getCollectionId)(propertyOrPropertyItems.$ref),
+        };
     }
-    else if ('items' in propertySchema && '$ref' in propertySchema.items) {
-        propertySchema.items.$ref = (0, exports.getCollectionId)(propertySchema.items.$ref);
-    }
-    if (nestedProperties && 'type' in propertySchema) {
-        if (propertySchema.type === 'object' && 'properties' in propertySchema) {
-            propertySchema.properties = (0, exports.getProperties)(nestedProperties);
+    else if ('type' in propertyOrPropertyItems && propertyOrPropertyItems.type === 'object') {
+        let properties;
+        let additionalProperties;
+        if (nestedProperties) {
+            properties = (0, exports.recursivelyUnwrapPropertyNodes)(nestedProperties);
+        }
+        if (nestedAdditionalProperties) {
+            additionalProperties = typeof nestedAdditionalProperties === 'boolean'
+                ? nestedAdditionalProperties
+                : (0, exports.unwrapPropertyNode)(nestedAdditionalProperties);
+        }
+        if (properties && additionalProperties) {
+            unwrappedProperty = {
+                ...propertyOrPropertyItems,
+                properties,
+                additionalProperties,
+            };
         }
-        else if (propertySchema.type === 'array') {
-            propertySchema.items = {
-                type: 'object',
-                properties: (0, exports.getProperties)(nestedProperties),
+        else if (properties) {
+            unwrappedProperty = {
+                ...propertyOrPropertyItems,
+                properties,
             };
         }
+        else if (additionalProperties) {
+            unwrappedProperty = {
+                ...propertyOrPropertyItems,
+                additionalProperties,
+            };
+        }
+    }
+    if ('items' in property) {
+        return {
+            ...property,
+            items: unwrappedProperty,
+        };
     }
-    return propertySchema;
+    return unwrappedProperty;
 };
-exports.propertyToSchema = propertyToSchema;
+exports.unwrapPropertyNode = unwrapPropertyNode;
 /** Transforms the AST properties to the format of aeria schema properties */
-const getProperties = (properties) => {
+const recursivelyUnwrapPropertyNodes = (properties) => {
     return Object.entries(properties).reduce((acc, [key, value]) => {
         if (Array.isArray(value)) {
-            acc[key] = value.map((propertyNode) => (0, exports.propertyToSchema)(propertyNode));
+            acc[key] = value.map((propertyNode) => (0, exports.unwrapPropertyNode)(propertyNode));
         }
         else {
-            acc[key] = (0, exports.propertyToSchema)(value);
+            acc[key] = (0, exports.unwrapPropertyNode)(value);
         }
         return acc;
     }, {});
 };
-exports.getProperties = getProperties;
+exports.recursivelyUnwrapPropertyNodes = recursivelyUnwrapPropertyNodes;
 exports.UnquotedSymbol = Symbol('unquoted');
 const isRecord = (value) => typeof value === 'object';
 /** Assure if specific fields needs to be between quotes or not */

package/dist/codegen/utils.mjs

@@ -48,31 +48,55 @@ export const makeASTImports = (ast, initialImports) => {
     modifiedSymbols
   };
 };
-export const propertyToSchema = ({ property, nestedProperties }) => {
-  const propertySchema = property;
-  if ("$ref" in propertySchema) {
-    propertySchema.$ref = getCollectionId(propertySchema.$ref);
-  } else if ("items" in propertySchema && "$ref" in propertySchema.items) {
-    propertySchema.items.$ref = getCollectionId(propertySchema.items.$ref);
-  }
-  if (nestedProperties && "type" in propertySchema) {
-    if (propertySchema.type === "object" && "properties" in propertySchema) {
-      propertySchema.properties = getProperties(nestedProperties);
-    } else if (propertySchema.type === "array") {
-      propertySchema.items = {
-        type: "object",
-        properties: getProperties(nestedProperties)
+export const unwrapPropertyNode = ({ property, nestedProperties, nestedAdditionalProperties }) => {
+  const propertyOrPropertyItems = "items" in property ? property.items : property;
+  let unwrappedProperty = propertyOrPropertyItems;
+  if ("$ref" in propertyOrPropertyItems) {
+    unwrappedProperty = {
+      ...propertyOrPropertyItems,
+      $ref: getCollectionId(propertyOrPropertyItems.$ref)
+    };
+  } else if ("type" in propertyOrPropertyItems && propertyOrPropertyItems.type === "object") {
+    let properties;
+    let additionalProperties;
+    if (nestedProperties) {
+      properties = recursivelyUnwrapPropertyNodes(nestedProperties);
+    }
+    if (nestedAdditionalProperties) {
+      additionalProperties = typeof nestedAdditionalProperties === "boolean" ? nestedAdditionalProperties : unwrapPropertyNode(nestedAdditionalProperties);
+    }
+    if (properties && additionalProperties) {
+      unwrappedProperty = {
+        ...propertyOrPropertyItems,
+        properties,
+        additionalProperties
+      };
+    } else if (properties) {
+      unwrappedProperty = {
+        ...propertyOrPropertyItems,
+        properties
+      };
+    } else if (additionalProperties) {
+      unwrappedProperty = {
+        ...propertyOrPropertyItems,
+        additionalProperties
       };
     }
   }
-  return propertySchema;
+  if ("items" in property) {
+    return {
+      ...property,
+      items: unwrappedProperty
+    };
+  }
+  return unwrappedProperty;
 };
-export const getProperties = (properties) => {
+export const recursivelyUnwrapPropertyNodes = (properties) => {
   return Object.entries(properties).reduce((acc, [key, value]) => {
     if (Array.isArray(value)) {
-      acc[key] = value.map((propertyNode) => propertyToSchema(propertyNode));
+      acc[key] = value.map((propertyNode) => unwrapPropertyNode(propertyNode));
     } else {
-      acc[key] = propertyToSchema(value);
+      acc[key] = unwrapPropertyNode(value);
     }
     return acc;
   }, {});

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/lexer.d.ts

@@ -1,7 +1,7 @@
 import { type Token } from './token.js';
 import { Diagnostic } from './diagnostic.js';
 export type Keyword = typeof COLLECTION_KEYWORDS[number] | typeof COLLECTION_ACTIONS_KEYWORDS[number] | typeof COLLECTION_SEARCH_KEYWORDS[number] | typeof CONTRACT_KEYWORDS[number] | typeof TOPLEVEL_KEYWORDS[number] | typeof MISC_KEYWORDS[number];
-export declare const COLLECTION_KEYWORDS: readonly ["actions", "filters", "form", "functions", "icon", "indexes", "individualActions", "owned", "presets", "properties", "required", "search", "table"];
+export declare const COLLECTION_KEYWORDS: readonly ["actions", "additionalProperties", "filters", "form", "functions", "icon", "indexes", "individualActions", "owned", "presets", "properties", "required", "search", "table"];
 export declare const COLLECTION_ACTIONS_KEYWORDS: readonly ["ask", "button", "clearItem", "effect", "event", "fetchItem", "function", "icon", "label", "params", "query", "requires", "roles", "route", "selection", "setItem", "translate"];
 export declare const COLLECTION_SEARCH_KEYWORDS: readonly ["indexes", "placeholder", "exactMatches"];
 export declare const CONTRACT_KEYWORDS: readonly ["roles", "payload", "query", "response"];

package/dist/lexer.js

@@ -5,6 +5,7 @@ const token_js_1 = require("./token.js");
 const diagnostic_js_1 = require("./diagnostic.js");
 exports.COLLECTION_KEYWORDS = [
     'actions',
+    'additionalProperties',
     'filters',
     'form',
     'functions',

package/dist/lexer.mjs

@@ -3,6 +3,7 @@ import { TokenType } from "./token.mjs";
 import { Diagnostic } from "./diagnostic.mjs";
 export const COLLECTION_KEYWORDS = [
   "actions",
+  "additionalProperties",
   "filters",
   "form",
   "functions",

package/dist/parser.js

@@ -378,9 +378,9 @@ const parse = (tokens) => {
     }) => {
         let property;
         let nestedProperties;
+        let nestedAdditionalProperties;
         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 +428,7 @@ const parse = (tokens) => {
                 ...arrayProperty,
                 items,
             };
+            exports.locationMap.set(typeSymbol, current().location);
             return {
                 kind: 'property',
                 property,
@@ -441,6 +442,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 = {
@@ -468,6 +470,16 @@ const parse = (tokens) => {
                         nestedProperties = parsePropertiesBlock(options);
                         break;
                     }
+                    case 'additionalProperties': {
+                        consume(token_js_1.TokenType.Keyword);
+                        if (match(token_js_1.TokenType.Boolean)) {
+                            nestedAdditionalProperties = consume(token_js_1.TokenType.Boolean).value;
+                        }
+                        else {
+                            nestedAdditionalProperties = parsePropertyType();
+                        }
+                        break;
+                    }
                     default:
                         throw new diagnostic_js_1.Diagnostic(`invalid keyword "${keyword}"`, location);
                 }
@@ -544,6 +556,7 @@ const parse = (tokens) => {
             kind: 'property',
             property,
             nestedProperties,
+            nestedAdditionalProperties,
         };
         if (modifierToken) {
             node.modifier = modifierToken.value;
@@ -662,11 +675,14 @@ const parse = (tokens) => {
             try {
                 switch (keyword) {
                     case 'owned': {
-                        if (match(token_js_1.TokenType.QuotedString, [
-                            'always',
-                            'on-write',
-                        ])) {
-                            node.owned = consume(token_js_1.TokenType.QuotedString).value;
+                        if (match(token_js_1.TokenType.Boolean)) {
+                            node.owned = consume(token_js_1.TokenType.Boolean).value;
+                        }
+                        else {
+                            node.owned = consume(token_js_1.TokenType.QuotedString, [
+                                'always',
+                                'on-write',
+                            ]).value;
                         }
                         break;
                     }

package/dist/parser.mjs

@@ -336,9 +336,9 @@ export const parse = (tokens) => {
   }) => {
     let property;
     let nestedProperties;
+    let nestedAdditionalProperties;
     let modifierToken;
     const typeSymbol = Symbol();
-    locationMap.set(typeSymbol, next().location);
     if (match(TokenType.LeftSquareBracket)) {
       consume(TokenType.LeftSquareBracket);
       const arrayProperty = {
@@ -384,6 +384,7 @@ export const parse = (tokens) => {
         ...arrayProperty,
         items
       };
+      locationMap.set(typeSymbol, current().location);
       return {
         kind: "property",
         property,
@@ -397,6 +398,7 @@ export const parse = (tokens) => {
         modifierToken = consume(TokenType.Identifier);
       }
     }
+    locationMap.set(typeSymbol, current().location);
     if (match(TokenType.LeftBracket)) {
       consume(TokenType.LeftBracket);
       property = {
@@ -424,6 +426,15 @@ export const parse = (tokens) => {
             nestedProperties = parsePropertiesBlock(options);
             break;
           }
+          case "additionalProperties": {
+            consume(TokenType.Keyword);
+            if (match(TokenType.Boolean)) {
+              nestedAdditionalProperties = consume(TokenType.Boolean).value;
+            } else {
+              nestedAdditionalProperties = parsePropertyType();
+            }
+            break;
+          }
           default:
             throw new Diagnostic(`invalid keyword "${keyword}"`, location);
         }
@@ -496,7 +507,8 @@ export const parse = (tokens) => {
     const node = {
       kind: "property",
       property,
-      nestedProperties
+      nestedProperties,
+      nestedAdditionalProperties
     };
     if (modifierToken) {
       node.modifier = modifierToken.value;
@@ -609,11 +621,13 @@ export const parse = (tokens) => {
       try {
         switch (keyword) {
           case "owned": {
-            if (match(TokenType.QuotedString, [
-              "always",
-              "on-write"
-            ])) {
-              node.owned = consume(TokenType.QuotedString).value;
+            if (match(TokenType.Boolean)) {
+              node.owned = consume(TokenType.Boolean).value;
+            } else {
+              node.owned = consume(TokenType.QuotedString, [
+                "always",
+                "on-write"
+              ]).value;
             }
             break;
           }

package/dist/semantic.js

@@ -97,13 +97,18 @@ const analyze = async (ast, options, errors = []) => {
         }
     };
     const recurseProperty = async (node) => {
-        if (node.nestedProperties && 'nestedProperties' in node) {
-            await checkObjectLocalProperties(node, 'required');
-            await checkObjectLocalProperties(node, 'writable');
-            await checkObjectLocalProperties(node, 'form');
-            for (const propName in node.nestedProperties) {
-                const subProperty = node.nestedProperties[propName];
-                await recurseProperty(subProperty);
+        if ('type' in node.property && node.property.type === 'object') {
+            if (typeof node.nestedAdditionalProperties === 'object') {
+                await recurseProperty(node.nestedAdditionalProperties);
+            }
+            if (node.nestedProperties) {
+                await checkObjectLocalProperties(node, 'required');
+                await checkObjectLocalProperties(node, 'writable');
+                await checkObjectLocalProperties(node, 'form');
+                for (const propName in node.nestedProperties) {
+                    const subProperty = node.nestedProperties[propName];
+                    await recurseProperty(subProperty);
+                }
             }
         }
         else if ('$ref' in node.property) {
@@ -118,6 +123,12 @@ const analyze = async (ast, options, errors = []) => {
             await checkCollectionForeignProperties(foreignCollection, node.property, 'populate');
             await checkCollectionForeignProperties(foreignCollection, node.property, 'form');
         }
+        else if ('items' in node.property) {
+            await recurseProperty({
+                kind: 'property',
+                property: node.property.items,
+            });
+        }
     };
     for (const node of ast.collections) {
         await checkCollectionLocalProperties(node, 'indexes');

package/dist/semantic.mjs

@@ -62,13 +62,18 @@ export const analyze = async (ast, options, errors = []) => {
     }
   };
   const recurseProperty = async (node) => {
-    if (node.nestedProperties && "nestedProperties" in node) {
-      await checkObjectLocalProperties(node, "required");
-      await checkObjectLocalProperties(node, "writable");
-      await checkObjectLocalProperties(node, "form");
-      for (const propName in node.nestedProperties) {
-        const subProperty = node.nestedProperties[propName];
-        await recurseProperty(subProperty);
+    if ("type" in node.property && node.property.type === "object") {
+      if (typeof node.nestedAdditionalProperties === "object") {
+        await recurseProperty(node.nestedAdditionalProperties);
+      }
+      if (node.nestedProperties) {
+        await checkObjectLocalProperties(node, "required");
+        await checkObjectLocalProperties(node, "writable");
+        await checkObjectLocalProperties(node, "form");
+        for (const propName in node.nestedProperties) {
+          const subProperty = node.nestedProperties[propName];
+          await recurseProperty(subProperty);
+        }
       }
     } else if ("$ref" in node.property) {
       const refName = node.property.$ref;
@@ -81,6 +86,11 @@ export const analyze = async (ast, options, errors = []) => {
       await checkCollectionForeignProperties(foreignCollection, node.property, "indexes");
       await checkCollectionForeignProperties(foreignCollection, node.property, "populate");
       await checkCollectionForeignProperties(foreignCollection, node.property, "form");
+    } else if ("items" in node.property) {
+      await recurseProperty({
+        kind: "property",
+        property: node.property.items
+      });
     }
   };
   for (const node of ast.collections) {

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.18",
   "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": [],