.

packages/libs/codemodel/.resources/all-in-one/json/code-model.json

@@ -1690,7 +1690,7 @@
       ],
       "allOf": [
         {
-          "$ref": "#/definitions/AnySchema"
+          "$ref": "#/definitions/Schema"
         }
       ]
     },
@@ -1899,6 +1899,12 @@
           "items": {
             "$ref": "#/definitions/AnySchema"
           }
+        },
+        "anyObjects": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AnyObjectSchema"
+          }
         }
       },
       "defaultProperties": [],

packages/libs/codemodel/.resources/all-in-one/yaml/code-model.yaml

@@ -63,7 +63,7 @@ definitions:
     type: object
     additionalProperties: false
     allOf:
-      - $ref: '#/definitions/AnySchema'
+      - $ref: '#/definitions/Schema'
     required:
       - language
       - protocol
@@ -1662,6 +1662,10 @@ definitions:
         type: array
         items:
           $ref: '#/definitions/AnySchema'
+      anyObjects:
+        type: array
+        items:
+          $ref: '#/definitions/AnyObjectSchema'
       arrays:
         type: array
         description: a collection of items

packages/libs/codemodel/.resources/model/json/schemas.json

@@ -821,7 +821,7 @@
       ],
       "allOf": [
         {
-          "$ref": "./schemas.json#/definitions/AnySchema"
+          "$ref": "./schemas.json#/definitions/Schema"
         }
       ]
     },
@@ -1030,6 +1030,12 @@
           "items": {
             "$ref": "./schemas.json#/definitions/AnySchema"
           }
+        },
+        "anyObjects": {
+          "type": "array",
+          "items": {
+            "$ref": "./schemas.json#/definitions/AnyObjectSchema"
+          }
         }
       },
       "defaultProperties": [],

packages/libs/codemodel/.resources/model/yaml/schemas.yaml

@@ -4,7 +4,7 @@ definitions:
     type: object
     additionalProperties: false
     allOf:
-      - $ref: ./schemas.yaml#/definitions/AnySchema
+      - $ref: ./schemas.yaml#/definitions/Schema
     required:
       - language
       - protocol
@@ -499,6 +499,10 @@ definitions:
         type: array
         items:
           $ref: ./schemas.yaml#/definitions/AnySchema
+      anyObjects:
+        type: array
+        items:
+          $ref: ./schemas.yaml#/definitions/AnyObjectSchema
       arrays:
         type: array
         description: a collection of items

packages/libs/codemodel/src/model/common/schemas.ts

@@ -15,7 +15,7 @@ import { ConstantSchema } from "./schemas/constant";
 import { OrSchema, XorSchema } from "./schemas/relationship";
 import { BinarySchema } from "./schemas/binary";
 import { finished } from "stream";
-import { AnySchema } from "./schemas/any";
+import { AnyObjectSchema, AnySchema } from "./schemas/any";
 
 export { SchemaUsage, SchemaContext } from "./schemas/usage";
 
@@ -119,15 +119,24 @@ export interface Schemas {
   groups?: Array<GroupSchema>;
 
   any?: Array<AnySchema>;
+
+  anyObjects?: AnyObjectSchema[];
 }
 
 export class Schemas {
   add<T extends Schema>(schema: T): T {
     if (schema instanceof AnySchema) {
-      if (!(this.any && this.any[0])) {
+      if (!this.any?.[0]) {
         this.any = [schema];
       }
-      return <T>this.any[0];
+      return this.any[0] as T;
+    }
+
+    if (schema instanceof AnyObjectSchema) {
+      if (!this.anyObjects?.[0]) {
+        this.anyObjects = [schema];
+      }
+      return this.anyObjects[0] as T;
     }
 
     let group = `${camelCase(schema.type)}s`.replace(/rys$/g, "ries");

packages/libs/codemodel/src/model/common/schemas/any.ts

@@ -11,7 +11,7 @@ export class AnySchema extends Schema implements AnySchema {
   }
 }
 
-export interface AnyObjectSchema extends AnySchema {
+export interface AnyObjectSchema extends Schema {
   type: SchemaType.AnyObject;
 }