@twin.org/tools-core 0.0.3-next.29 → 0.0.3-next.30

package/dist/es/utils/jsonSchemaBuilder.js

@@ -178,7 +178,7 @@ export class JsonSchemaBuilder {
                 }
                 else {
                     // Const-and-type enum patterns always take priority so that JsDoc descriptions
-                    // on the const object members are preserved in the generated oneOf schema.
+                    // on the const object members are preserved in the generated anyOf schema.
                     const constValues = Enum.extractEnumValuesFromConstAndType(statement.name.text, sourceFile);
                     if (constValues) {
                         schema = JsonSchemaBuilder.buildBaseSchema(context.namespace, title, statement);
@@ -399,7 +399,7 @@ export class JsonSchemaBuilder {
      * @param entries The enum entries.
      */
     static buildEnumSchema(schema, entries) {
-        schema.oneOf = entries.map(entry => ({
+        schema.anyOf = entries.map(entry => ({
             const: entry.value,
             description: entry.description
         }));
@@ -2571,19 +2571,18 @@ export class JsonSchemaBuilder {
         // Expand all allOf branches
         for (const branch of allOf) {
             if (Is.object(branch)) {
-                const branchRecord = branch;
                 let branchSourceTitle;
                 let referencedSchema;
                 // If the branch is a reference, resolve it
-                if (Is.stringValue(branchRecord.$ref) && !branchRecord.properties) {
-                    const refTitle = branchRecord.$ref.split("/").pop();
+                if (Is.stringValue(branch.$ref) && !branch.properties) {
+                    const refTitle = branch.$ref.split("/").pop();
                     if (refTitle) {
                         // Look up the referenced schema in the context
                         referencedSchema =
                             context.schemas[context.packageName]?.[refTitle] ??
                                 Object.values(context.schemas)
                                     .flatMap(entries => Object.values(entries))
-                                    .find(s => s.$id === branchRecord.$ref || s.title === refTitle);
+                                    .find(s => s.$id === branch.$ref || s.title === refTitle);
                         referencedSchema ??= JsonSchemaBuilder.tryLoadExternalSchemaByTitle(context, refTitle);
                         if (referencedSchema) {
                             branchSourceTitle = referencedSchema.title ?? refTitle;
@@ -2610,8 +2609,8 @@ export class JsonSchemaBuilder {
                 }
                 else {
                     // Merge properties from direct schema in allOf
-                    if (Is.object(branchRecord.properties)) {
-                        for (const [propertyKey, propertySchema] of Object.entries(branchRecord.properties)) {
+                    if (Is.object(branch.properties)) {
+                        for (const [propertyKey, propertySchema] of Object.entries(branch.properties)) {
                             if (Is.object(propertySchema)) {
                                 mergedProperties[propertyKey] = ObjectHelper.clone(propertySchema);
                                 if (branchSourceTitle) {
@@ -2621,8 +2620,8 @@ export class JsonSchemaBuilder {
                         }
                     }
                     // Merge required fields
-                    if (Is.array(branchRecord.required)) {
-                        for (const field of branchRecord.required) {
+                    if (Is.array(branch.required)) {
+                        for (const field of branch.required) {
                             if (Is.stringValue(field)) {
                                 mergedRequired.add(field);
                             }