@api-client/core 0.18.15 → 0.18.16

package/data/models/example-generator-api.json

@@ -42071,10 +42071,10 @@
 "@id": "#197"
 },
 {
-"@id": "#200"
+"@id": "#203"
 },
 {
-"@id": "#203"
+"@id": "#200"
 },
 {
 "@id": "#206"
@@ -42810,16 +42810,16 @@
 "@id": "#219"
 },
 {
-"@id": "#210"
+"@id": "#213"
 },
 {
-"@id": "#219"
+"@id": "#210"
 },
 {
-"@id": "#213"
+"@id": "#216"
 },
 {
-"@id": "#216"
+"@id": "#219"
 }
 ],
 "doc:root": false,
@@ -43499,7 +43499,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
+"doc:raw": "code: 'J'\ndescription: 'Information and communication'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43520,7 +43520,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: 'J'\ndescription: 'Information and communication'\n",
+"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44232,7 +44232,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '22'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)22 000000'\n",
+"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44253,7 +44253,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "-\n  type: 'GENERAL'\n  value: 'info@company.be'\n-\n  type: 'IT_DEPT'\n  value: 'it-service@company.be'\n",
+"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '22'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)22 000000'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44274,7 +44274,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\n",
+"doc:raw": "-\n  type: 'GENERAL'\n  value: 'info@company.be'\n-\n  type: 'IT_DEPT'\n  value: 'it-service@company.be'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44295,7 +44295,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
+"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44771,12 +44771,12 @@
 {
 "@id": "#202/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#202",
-"sourcemaps:value": "[(1,0)-(5,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#205/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#205",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(5,0)]"
 },
 {
 "@id": "#208/source-map/lexical/element_0",
@@ -45121,17 +45121,17 @@
 {
 "@id": "#215/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#215",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(6,0)]"
 },
 {
 "@id": "#218/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#218",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#221/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#221",
-"sourcemaps:value": "[(1,0)-(6,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#338/source-map/synthesized-field/element_1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.18.15",
+  "version": "0.18.16",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/modeling/importers/SchemaFilteringStrategy.ts

@@ -107,17 +107,9 @@ export class SchemaFilteringStrategy {
       return true
     }
 
-    // Check for schemas that only contain a single allOf with a $ref (like ActionStatusType)
-    if (
-      schema.type === 'object' &&
-      schema.allOf?.length === 1 &&
-      typeof schema.allOf[0] === 'object' &&
-      '$ref' in schema.allOf[0] &&
-      !schema.properties &&
-      !schema.additionalProperties
-    ) {
-      return true
-    }
+    // Note: We removed the check for single allOf with $ref as this represents
+    // valid schema inheritance/extension patterns (e.g., BlogPosting extending SocialMediaPosting)
+    // Such schemas should be included as they define meaningful type hierarchies
 
     // Check for schemas that only have description and type but no structure
     if (

package/tests/unit/modeling/importers/schema_filtering.spec.ts

@@ -36,14 +36,14 @@ test.group('SchemaFilteringStrategy', () => {
   test('should identify conceptual marker schemas', ({ assert }) => {
     const strategy = new SchemaFilteringStrategy({ excludeConceptualMarkers: true })
 
-    // StatusEnumeration-like schema
+    // StatusEnumeration-like schema (empty object, should be excluded)
     const statusEnum: JSONSchema7 = {
       type: 'object',
       title: 'StatusEnumeration',
       description: 'Lists or enumerations dealing with status types.',
     }
 
-    // ActionStatusType-like schema (allOf with reference only)
+    // ActionStatusType-like schema (allOf with reference only - represents inheritance, should NOT be excluded)
     const actionStatus: JSONSchema7 = {
       type: 'object',
       title: 'ActionStatusType',
@@ -61,10 +61,54 @@ test.group('SchemaFilteringStrategy', () => {
     }
 
     assert.isTrue(strategy.shouldExcludeSchema(statusEnum))
-    assert.isTrue(strategy.shouldExcludeSchema(actionStatus))
+    assert.isFalse(strategy.shouldExcludeSchema(actionStatus)) // Changed: inheritance should not be excluded
     assert.isFalse(strategy.shouldExcludeSchema(person))
   })
 
+  test('should preserve schema inheritance patterns', ({ assert }) => {
+    const strategy = new SchemaFilteringStrategy({ excludeConceptualMarkers: true })
+
+    // BlogPosting schema - extends SocialMediaPosting via allOf
+    const blogPosting: JSONSchema7 = {
+      $schema: 'https://json-schema.org/draft/2020-12/schema',
+      $id: 'schema:BlogPosting',
+      title: 'BlogPosting',
+      description: 'A blog post.',
+      type: 'object',
+      allOf: [
+        {
+          description: 'A post to a social media platform, including blog posts, tweets, Facebook posts, etc.',
+          $ref: 'schema:SocialMediaPosting',
+        },
+      ],
+    }
+
+    // SocialMediaPosting schema - has properties and extends Article
+    const socialMediaPosting: JSONSchema7 = {
+      $schema: 'https://json-schema.org/draft/2020-12/schema',
+      $id: 'schema:SocialMediaPosting',
+      title: 'SocialMediaPosting',
+      description: 'A post to a social media platform, including blog posts, tweets, Facebook posts, etc.',
+      type: 'object',
+      allOf: [
+        {
+          description: 'An article, such as a news article or piece of investigative report.',
+          $ref: 'schema:Article',
+        },
+      ],
+      properties: {
+        sharedContent: {
+          description: 'A CreativeWork such as an image, video, or audio clip shared as part of this posting.',
+          oneOf: [{ $ref: 'schema:CreativeWork' }, { type: 'array', items: { $ref: 'schema:CreativeWork' } }],
+        },
+      },
+    }
+
+    // Both schemas represent valid inheritance and should be included
+    assert.isFalse(strategy.shouldExcludeSchema(blogPosting, 'schema:BlogPosting'))
+    assert.isFalse(strategy.shouldExcludeSchema(socialMediaPosting, 'schema:SocialMediaPosting'))
+  })
+
   test('should filter by patterns', ({ assert }) => {
     const strategy = new SchemaFilteringStrategy({
       excludePatterns: [/.*Enumeration$/, /.*Type$/],