@aeriajs/compiler 0.0.17 → 0.0.19

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/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,6 +378,7 @@ const parse = (tokens) => {
     }) => {
         let property;
         let nestedProperties;
+        let nestedAdditionalProperties;
         let modifierToken;
         const typeSymbol = Symbol();
         if (match(token_js_1.TokenType.LeftSquareBracket)) {
@@ -469,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);
                 }
@@ -545,6 +556,7 @@ const parse = (tokens) => {
             kind: 'property',
             property,
             nestedProperties,
+            nestedAdditionalProperties,
         };
         if (modifierToken) {
             node.modifier = modifierToken.value;
@@ -663,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,6 +336,7 @@ export const parse = (tokens) => {
   }) => {
     let property;
     let nestedProperties;
+    let nestedAdditionalProperties;
     let modifierToken;
     const typeSymbol = Symbol();
     if (match(TokenType.LeftSquareBracket)) {
@@ -425,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);
         }
@@ -497,7 +507,8 @@ export const parse = (tokens) => {
     const node = {
       kind: "property",
       property,
-      nestedProperties
+      nestedProperties,
+      nestedAdditionalProperties
     };
     if (modifierToken) {
       node.modifier = modifierToken.value;
@@ -610,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/compiler",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -21,8 +21,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.136",
-    "@aeriajs/types": "^0.0.118"
+    "@aeriajs/common": "^0.0.137",
+    "@aeriajs/types": "^0.0.119"
   },
   "devDependencies": {
     "@aeriajs/common": "link:../common",