@api-client/core 0.18.11 → 0.18.13

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

@@ -42065,18 +42065,18 @@
 "@id": "#191"
 },
 {
-"@id": "#194"
-},
-{
 "@id": "#197"
 },
 {
-"@id": "#203"
+"@id": "#194"
 },
 {
 "@id": "#200"
 },
 {
+"@id": "#203"
+},
+{
 "@id": "#206"
 },
 {
@@ -42810,16 +42810,16 @@
 "@id": "#219"
 },
 {
-"@id": "#216"
+"@id": "#210"
 },
 {
-"@id": "#219"
+"@id": "#213"
 },
 {
-"@id": "#210"
+"@id": "#216"
 },
 {
-"@id": "#213"
+"@id": "#219"
 }
 ],
 "doc:root": false,
@@ -43457,7 +43457,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "addressType: 'REGISTERED-OFFICE-ADDRESS'\nstreetName: 'UITBREIDINGSTRAAT'\nhouseNumber: '84'\nhouseNumberAddition: '/1'\npostalCode: '2600'\ncity: 'BERCHEM (ANTWERPEN)'\ncountry: 'Belgium'\ncountryCode: 'BE'\nfullFormatedAddress: \"UITBREIDINGSTRAAT 84 /1, 2600 BERCHEM (ANTWERPEN), BELIUM\"\n",
+"doc:raw": "code: '5'\ndescription: 'Limited company'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43478,7 +43478,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: '5'\ndescription: 'Limited company'\n",
+"doc:raw": "addressType: 'REGISTERED-OFFICE-ADDRESS'\nstreetName: 'UITBREIDINGSTRAAT'\nhouseNumber: '84'\nhouseNumberAddition: '/1'\npostalCode: '2600'\ncity: 'BERCHEM (ANTWERPEN)'\ncountry: 'Belgium'\ncountryCode: 'BE'\nfullFormatedAddress: \"UITBREIDINGSTRAAT 84 /1, 2600 BERCHEM (ANTWERPEN), BELIUM\"\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43499,7 +43499,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": [
 {
@@ -43520,7 +43520,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": [
 {
@@ -44232,7 +44232,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": [
 {
@@ -44253,7 +44253,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\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": [
 {
@@ -44274,7 +44274,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": "-\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": [
 {
@@ -44761,22 +44761,22 @@
 {
 "@id": "#196/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#196",
-"sourcemaps:value": "[(1,0)-(10,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#199/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#199",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(10,0)]"
 },
 {
 "@id": "#202/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#202",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(5,0)]"
 },
 {
 "@id": "#205/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#205",
-"sourcemaps:value": "[(1,0)-(5,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#208/source-map/lexical/element_0",
@@ -45116,22 +45116,22 @@
 {
 "@id": "#212/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#212",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(6,0)]"
 },
 {
 "@id": "#215/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#215",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(6,0)]"
 },
 {
 "@id": "#218/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#218",
-"sourcemaps:value": "[(1,0)-(6,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.11",
+  "version": "0.18.13",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {
@@ -97,6 +97,7 @@
     "dompurify": "^3.2.6",
     "jsdom": "^26.1.0",
     "nanoid": "^5.1.5",
+    "tslog": "^4.9.3",
     "ws": "^8.12.0",
     "xpath": "^0.0.34"
   },
@@ -136,7 +137,6 @@
     "globals": "^16.0.0",
     "husky": "^9.0.11",
     "lint-staged": "^16.0.0",
-    "nock": "^14.0.1",
     "oauth2-mock-server": "^8.0.0",
     "prettier": "^3.5.1",
     "schema-org-json-schemas": "^2.1.4",

package/src/lib/logging/DefaultLogger.ts

@@ -1,20 +1,52 @@
 /* eslint-disable no-console */
 import { Logger } from './Logger.js'
 
+export enum LogLevel {
+  Silly,
+  Debug,
+  Verbose,
+  Info,
+  Warn,
+  Error,
+  Silent,
+}
+
+export interface LoggerConfig {
+  level?: LogLevel
+}
+
 export class DefaultLogger extends Logger {
+  level: LogLevel = LogLevel.Info
+
+  constructor(config: LoggerConfig = {}) {
+    super()
+    if (typeof config.level !== 'undefined') {
+      this.level = config.level
+    }
+  }
+
   warn(...args: unknown[]): void {
+    if (this.level > LogLevel.Warn) return
     console.warn(...args)
   }
+
   info(...args: unknown[]): void {
+    if (this.level > LogLevel.Info) return
     console.info(...args)
   }
+
   error(...args: unknown[]): void {
+    if (this.level > LogLevel.Error) return
     console.error(...args)
   }
+
   log(...args: unknown[]): void {
+    if (this.level > LogLevel.Debug) return
     console.log(...args)
   }
+
   debug(...args: unknown[]): void {
+    if (this.level > LogLevel.Debug) return
     console.debug(...args)
   }
 }

package/src/modeling/DomainModel.ts

@@ -271,11 +271,18 @@ export class DomainModel extends DomainElement {
       throw new AttachException(`Trying to attach the ${key} entity, but it is already a child of this model`)
     }
     parent.detachEntity(key)
-    this.fields.push({
-      type: 'entity',
-      key: key,
-    })
+    if (!this.fields.some((item) => item.key === key)) {
+      this.fields.push({
+        type: 'entity',
+        key: key,
+      })
+    }
     this.root.graph.setParent(key, this.key)
+    // verify that the entity is moved to the current model
+    const graphParent = this.root.graph.parent(key)
+    if (graphParent !== this.key) {
+      throw new AttachException(`Trying to attach the ${key} entity, but it is not a child of this model`)
+    }
     this.root.notifyChange()
     return this
   }

package/src/models/ClientCertificate.ts

@@ -37,7 +37,7 @@ export interface ICertificateData {
 export interface ICertificate {
   kind: typeof Kind
   /**
-   * The data store key to refer.
+   * The data store key to refer under which this certificate is stored.
    */
   key: string
   /**

package/src/models/RequestConfig.ts

@@ -56,7 +56,7 @@ export interface IRequestBaseConfig {
    */
   proxyPassword?: string
   /**
-   * THe type of proxy authentication to use.
+   * The type of proxy authentication to use.
    */
   proxyAuthorization?: 'Basic'
   /**

package/src/models/SerializableError.ts

@@ -23,7 +23,7 @@ export class SerializableError {
     return this.stackValue
   }
 
-  readonly name = 'SerializableError'
+  readonly name: string = 'SerializableError'
 
   constructor(message?: string | Error, options: IErrorOptions | number | string = {}) {
     if (typeof message === 'string') {

package/src/proxy/RequestProxy.ts

@@ -3,12 +3,12 @@ import { IRequestAuthorization } from '../models/RequestAuthorization.js'
 import { IRequestConfig } from '../models/RequestConfig.js'
 import Proxy, { IProxyResult } from './Proxy.js'
 import { HttpCertificate } from '../models/ClientCertificate.js'
-import { DummyLogger } from '../lib/logging/DummyLogger.js'
 import { HttpRequestRunner } from '../runtime/http-runner/HttpRequestRunner.js'
 import { IRequestLog } from '../models/RequestLog.js'
 import { IHttpFlow } from '../models/http-flows/HttpFlows.js'
 import { IHttpAssertion } from '../models/http-flows/HttpAssertion.js'
 import { Exception } from '../exceptions/exception.js'
+import { createLogger } from '../lib/logging/index.js'
 
 export interface IRequestProxyInit {
   kind: typeof HttpRequestKind
@@ -78,7 +78,7 @@ export default class RequestProxy extends Proxy {
     const { request, authorization, certificate, config = {}, variables = {}, flows, assertions } = data
     const factory = new HttpRequestRunner()
     factory.variables = variables
-    factory.logger = new DummyLogger()
+    factory.logger = createLogger()
     factory.config = { ...config, enabled: true } as IRequestConfig
     if (Array.isArray(authorization) && authorization.length) {
       factory.authorization = authorization