@api-client/core 0.12.0 → 0.12.1

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

@@ -41731,10 +41731,10 @@
 "@id": "#197"
 },
 {
-"@id": "#203"
+"@id": "#200"
 },
 {
-"@id": "#200"
+"@id": "#203"
 },
 {
 "@id": "#206"
@@ -42470,16 +42470,16 @@
 "@id": "#219"
 },
 {
-"@id": "#219"
+"@id": "#210"
 },
 {
-"@id": "#216"
+"@id": "#213"
 },
 {
-"@id": "#210"
+"@id": "#216"
 },
 {
-"@id": "#213"
+"@id": "#219"
 }
 ],
 "doc:root": false,
@@ -43159,7 +43159,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": [
 {
@@ -43180,7 +43180,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": [
 {
@@ -43892,7 +43892,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": [
 {
@@ -43913,7 +43913,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": [
 {
@@ -43934,7 +43934,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": "-\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": [
 {
@@ -43955,7 +43955,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\"\nvalue: \"www.company.be\"\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44431,12 +44431,12 @@
 {
 "@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",
@@ -44776,22 +44776,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.12.0",
+  "version": "0.12.1",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/amf/AmfShapeGenerator.ts

@@ -25,7 +25,7 @@ import {
   unionShape,
 } from './definitions/Shapes.js'
 import { AmfDataNode } from './models/AmfDataNode.js'
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { DataEntityKind, DataPropertyKind } from '../models/kinds.js'
 import { DataValueGenerator } from './DataValueGenerator.js'
 
@@ -318,7 +318,7 @@ export class AmfShapeGenerator {
     return examples.map((current) => {
       const value = AmfDataNode.scalar(current, type).toJSON()
       const item: IApiDataExample = {
-        id: v4(),
+        id: nanoid(),
         customDomainProperties: [],
         strict: true,
         types: IAmfExampleTypes,
@@ -330,7 +330,7 @@ export class AmfShapeGenerator {
 
   protected _generateArrayExamples(examples: string[], type: string): IApiDataExample[] {
     const item: IApiDataExample = {
-      id: v4(),
+      id: nanoid(),
       customDomainProperties: [],
       strict: true,
       types: IAmfExampleTypes,

package/src/amf/DataValueGenerator.ts

@@ -1,5 +1,5 @@
+import { nanoid } from 'nanoid'
 import uuidV4 from '../lib/uuid.js'
-import { randomString } from '../lib/math/Random.js'
 import { DomainPropertyType } from '../modeling/DataFormat.js'
 
 export const noValue = Symbol('noValue')
@@ -53,7 +53,8 @@ export class DataValueGenerator {
   protected generateString(fn: string): string | typeof noValue {
     switch (fn) {
       case 'random':
-        return randomString(8)
+        // TODO: we need more settings controlling the random string generation.
+        return nanoid(8)
       case 'uuid-v4':
         return uuidV4()
       default:

package/src/amf/models/AmfDataNode.ts

@@ -1,4 +1,4 @@
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { IAmfArrayNodeTypes, IAmfObjectNodeTypes, IAmfScalarNodeTypes } from '../AmfTypes.js'
 import { IApiCustomDomainProperty } from '../definitions/Base.js'
 import { AmfNamespace } from '../definitions/Namespace.js'
@@ -16,7 +16,7 @@ export type IDataNodeInit = 'scalar' | 'object' | 'array'
  * A class that manipulates the AMF's DataNode node.
  */
 export class AmfDataNode {
-  id = v4()
+  id = nanoid()
 
   /**
    * AMF domain types.

package/src/lib/uuid.ts

@@ -8,7 +8,7 @@ for (let i = 0; i < 256; i++) {
  *
  * @see http://stackoverflow.com/a/21963136/1127848
  * @example "92329D39-6F5C-4520-ABFC-AAB64544E172"
- * @return {string} Generated value
+ * @return Generated value
  */
 export default function v4(): string {
   const d0 = (Math.random() * 0xffffffff) | 0

package/src/mocking/lib/History.ts

@@ -106,7 +106,7 @@ export class History {
     } else if (Array.isArray(init.user)) {
       result.user = this.random.pickOne(init.user)
     } else {
-      result.user = this.types.uuid()
+      result.user = this.types.string(21)
     }
 
     if (typeof init.project === 'string') {
@@ -114,7 +114,7 @@ export class History {
     } else if (Array.isArray(init.project)) {
       result.project = this.random.pickOne(init.project)
     } else if (init.project) {
-      result.project = this.types.uuid()
+      result.project = this.types.string(21)
     }
 
     if (typeof init.request === 'string') {
@@ -122,7 +122,7 @@ export class History {
     } else if (Array.isArray(init.request)) {
       result.request = this.random.pickOne(init.request)
     } else if (init.request) {
-      result.request = this.types.uuid()
+      result.request = this.types.string(21)
     }
 
     if (typeof init.app === 'string') {
@@ -130,7 +130,7 @@ export class History {
     } else if (Array.isArray(init.app)) {
       result.app = this.random.pickOne(init.app)
     } else if (init.app) {
-      result.app = this.types.uuid()
+      result.app = this.types.string(21)
     }
     return result
   }
@@ -141,7 +141,7 @@ export class History {
     if (usersSize && typeof init.user === 'undefined') {
       const users: string[] = []
       for (let i = 0; i < usersSize; i++) {
-        users.push(this.types.uuid())
+        users.push(this.types.string(21))
       }
       copy.user = users
     }
@@ -155,21 +155,21 @@ export class History {
     if (projectsSize && typeof init.project === 'undefined') {
       const project: string[] = []
       for (let i = 0; i < projectsSize; i++) {
-        project.push(this.types.uuid())
+        project.push(this.types.string(21))
       }
       copy.project = project
     }
     if (requestsSize && typeof init.request === 'undefined') {
       const requests: string[] = []
       for (let i = 0; i < requestsSize; i++) {
-        requests.push(this.types.uuid())
+        requests.push(this.types.string(21))
       }
       copy.request = requests
     }
     if (appsSize && typeof init.app === 'undefined') {
       const apps: string[] = []
       for (let i = 0; i < appsSize; i++) {
-        apps.push(this.types.uuid())
+        apps.push(this.types.string(21))
       }
       copy.app = apps
     }

package/src/mocking/lib/HostRules.ts

@@ -17,7 +17,7 @@ export class HostRules {
    */
   rule(): IHostRule {
     const result: IHostRule = {
-      key: this.types.uuid(),
+      key: this.types.string(21),
       from: this.internet.uri(),
       to: this.internet.uri(),
       enabled: this.types.boolean(),

package/src/mocking/lib/User.ts

@@ -23,7 +23,7 @@ export class User {
   user(init: IUserInit = {}): IUser {
     const result: IUser = {
       kind: UserKind,
-      key: this.types.uuid(),
+      key: this.types.string(21),
       name: this.person.name(),
     }
     if (!init.noEmail) {
@@ -41,7 +41,7 @@ export class User {
     }
     if (!init.noProvider) {
       result.provider = {
-        refreshToken: this.types.uuid(),
+        refreshToken: this.types.string(21),
       }
     }
     return result

package/src/modeling/DataDomain.ts

@@ -1,4 +1,4 @@
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { Graph } from '@api-client/graph'
 import {
   DomainAssociationKind,
@@ -165,8 +165,7 @@ export class DataDomain extends EventTarget {
   accessor fields: NamespaceOrderedItem[]
 
   static createSchema(input: Partial<DataDomainSchema> = {}): DataDomainSchema {
-    // We have to stay with UUID for data domains as the API expects it for File keys.
-    const { key = v4(), fields } = input
+    const { key = nanoid(), fields } = input
     const info = Thing.fromJSON(input.info, { name: 'Unnamed domain' }).toJSON()
     const result: DataDomainSchema = {
       kind: DataDomainKind,

package/src/modeling/DomainFile.ts

@@ -1,4 +1,4 @@
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { File, type IFile } from '../models/store/File.js'
 import { Thing } from '../models/Thing.js'
 import type { DataDomain, DataDomainSchema } from './DataDomain.js'
@@ -55,7 +55,7 @@ export class DomainFile extends File {
     } else {
       init = {
         kind: DomainFileKind,
-        key: v4(),
+        key: nanoid(),
         organization: '',
         info: Thing.fromName('').toJSON(),
         parents: [],

package/src/modeling/legacy/DataAssociation.ts

@@ -1,7 +1,7 @@
 import { Json } from '@api-client/json'
 import { AmfShapeGenerator } from '../../amf/AmfShapeGenerator.js'
 import { IApiAssociationShape, IApiPropertyShape } from '../../amf/definitions/Shapes.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { IThing, Thing } from '../../models/Thing.js'
 import { DataEntity, IDataEntity } from './DataEntity.js'
 import { DataNamespace } from './DataNamespace.js'
@@ -230,7 +230,7 @@ export class DataAssociation {
     } else {
       init = {
         kind: DataAssociationKind,
-        key: v4(),
+        key: nanoid(),
         info: Thing.fromName('Unnamed association').toJSON(),
       }
     }
@@ -244,7 +244,7 @@ export class DataAssociation {
    */
   new(init: IDataAssociation): this {
     DataAssociation.validate(init)
-    const { info, key = v4(), kind = DataAssociationKind, schema, multiple, required, targets, bindings } = init
+    const { info, key = nanoid(), kind = DataAssociationKind, schema, multiple, required, targets, bindings } = init
     this.kind = kind
     this.key = key
     if (info) {

package/src/modeling/legacy/DataEntity.ts

@@ -1,5 +1,5 @@
 import { IThing, Thing } from '../../models/Thing.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { DataNamespace } from './DataNamespace.js'
 import { DataProperty } from './DataProperty.js'
 import { type DataPropertyType } from '../DataFormat.js'
@@ -185,7 +185,7 @@ export class DataEntity {
     } else {
       init = {
         kind: DataEntityKind,
-        key: v4(),
+        key: nanoid(),
         info: Thing.fromName('').toJSON(),
       }
     }
@@ -196,7 +196,7 @@ export class DataEntity {
     DataEntity.validate(init)
     const {
       info,
-      key = v4(),
+      key = nanoid(),
       kind = DataEntityKind,
       tags,
       taxonomy,

package/src/modeling/legacy/DataEntityBuilder.ts

@@ -2,7 +2,7 @@ import { DataEntity } from './DataEntity.js'
 import { DataNamespace } from './DataNamespace.js'
 import { type DataPropertyType } from '../DataFormat.js'
 import { type IThing, Thing } from '../../models/Thing.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 
 /**
  * A fluent builder for constructing `DataEntity` instances.
@@ -228,7 +228,7 @@ export class DataEntityBuilder {
    */
   build(): DataEntity {
     if (!this.entity.key) {
-      this.entity.key = v4()
+      this.entity.key = nanoid()
     }
     this.root.definitions.entities.push(this.entity)
     return this.entity

package/src/modeling/legacy/DataModel.ts

@@ -1,5 +1,5 @@
 import { IThing, Thing } from '../../models/Thing.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { DataEntity, IDataEntity } from './DataEntity.js'
 import type { DataItemAdaptingOptions, DataNamespace } from './DataNamespace.js'
 import { FileBreadcrumb } from '../../models/store/File.js'
@@ -73,7 +73,7 @@ export class DataModel {
     } else {
       init = {
         kind: DataModelKind,
-        key: v4(),
+        key: nanoid(),
         info: Thing.fromName('').toJSON(),
         entities: [],
       }
@@ -85,7 +85,7 @@ export class DataModel {
     if (!DataModel.isDataModel(init)) {
       throw new Error(`Not a data model.`)
     }
-    const { info, key = v4(), kind = DataModelKind, entities } = init
+    const { info, key = nanoid(), kind = DataModelKind, entities } = init
     this.kind = kind
     this.key = key
     if (info) {

package/src/modeling/legacy/DataNamespace.ts

@@ -11,7 +11,7 @@ import {
   DataPropertyKind,
   DataAssociationKind,
 } from '../../models/kinds.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import type { DataDomainRemoveOptions } from '../types.js'
 
 /**
@@ -288,7 +288,7 @@ export class DataNamespace {
     } else {
       init = {
         kind: DataNamespaceKind,
-        key: v4(),
+        key: nanoid(),
         definitions: {},
         items: [],
         info: Thing.fromName('').toJSON(),
@@ -301,7 +301,7 @@ export class DataNamespace {
     if (!init || !init.definitions || !init.items) {
       throw new Error(`Not a data namespace.`)
     }
-    const { key = v4(), definitions = {}, items, info } = init
+    const { key = nanoid(), definitions = {}, items, info } = init
     this.key = key
     if (info) {
       this.info = new Thing(info)

package/src/modeling/legacy/DataProperty.ts

@@ -1,6 +1,6 @@
 import { Json } from '@api-client/json'
 import { IThing, Thing } from '../../models/Thing.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { DataNamespace } from './DataNamespace.js'
 import { IApiPropertyShape } from '../../amf/definitions/Shapes.js'
 import { AmfShapeGenerator } from '../../amf/AmfShapeGenerator.js'
@@ -304,7 +304,7 @@ export class DataProperty {
     } else {
       init = {
         kind: DataPropertyKind,
-        key: v4(),
+        key: nanoid(),
         info: Thing.fromName('').toJSON(),
         type: 'string',
       }
@@ -318,7 +318,7 @@ export class DataProperty {
     }
     const {
       info,
-      key = v4(),
+      key = nanoid(),
       kind = DataPropertyKind,
       multiple,
       required,

package/src/models/AuthorizationData.ts

@@ -1,4 +1,4 @@
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 
 export interface IAuthorizationData {
   key: string
@@ -30,7 +30,7 @@ export class AuthorizationData {
       init = input
     } else {
       init = {
-        key: v4(),
+        key: nanoid(),
       }
     }
     this.new(init)
@@ -42,7 +42,7 @@ export class AuthorizationData {
    * Note, this throws an error when the provider is not an API Client provider object.
    */
   new(init: IAuthorizationData): void {
-    const { username, password, domain, key = v4() } = init
+    const { username, password, domain, key = nanoid() } = init
     this.username = username
     this.password = password
     this.domain = domain

package/src/models/CertificateFile.ts

@@ -1,4 +1,4 @@
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { Certificate, ICertificate } from './ClientCertificate.js'
 import { CertificateFileKind } from './kinds.js'
 import { IFile, File } from './store/File.js'
@@ -48,7 +48,7 @@ export class CertificateFile extends File {
     } else {
       init = {
         kind: CertificateFileKind,
-        key: v4(),
+        key: nanoid(),
         organization: '',
         info: Thing.fromName('').toJSON(),
         parents: [],

package/src/models/ClientCertificate.ts

@@ -1,5 +1,5 @@
 import { base64ToBuffer, bufferToBase64 } from '../lib/Buffer.js'
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import {
   Certificate as LegacyCertificate,
   ARCCertificateIndex,
@@ -177,7 +177,7 @@ export class Certificate {
       certKey: {
         data: key,
       },
-      key: v4(),
+      key: nanoid(),
       name,
       type: 'pem',
       created: Date.now(),
@@ -201,7 +201,7 @@ export class Certificate {
       cert: {
         data: cert,
       },
-      key: v4(),
+      key: nanoid(),
       name,
       type: 'p12',
       created: Date.now(),
@@ -220,7 +220,7 @@ export class Certificate {
    *              to its original format.
    */
   static fromLegacy(index: ARCCertificateIndex, cert: RequestCertificate): Certificate {
-    const { name = '', type, created = Date.now(), _id = v4() } = index
+    const { name = '', type, created = Date.now(), _id = nanoid() } = index
     if (type === 'pem') {
       const data = Array.isArray(cert.cert) ? cert.cert[0] : cert.cert
       const key = Array.isArray(cert.key) ? cert.key[0] : (cert.key as LegacyCertificate)
@@ -253,7 +253,7 @@ export class Certificate {
   }
 
   constructor(certificate: HttpCertificate) {
-    const { type, cert, key = v4(), name = '', created = Date.now() } = certificate
+    const { type, cert, key = nanoid(), name = '', created = Date.now() } = certificate
     this.key = key
     this.name = name
     this.type = type

package/src/models/Environment.ts

@@ -1,7 +1,7 @@
 import { Property, IProperty } from './Property.js'
 import { Server, IServer } from './Server.js'
 import { IThing, Thing } from './Thing.js'
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { ARCVariable } from './legacy/models/Variable.js'
 import { IRequestAuthorization, RequestAuthorization } from './RequestAuthorization.js'
 
@@ -91,7 +91,7 @@ export class Environment {
    * @param name The name to set.
    */
   static fromName(name: string): Environment {
-    const key = v4()
+    const key = nanoid()
     const info = Thing.fromName(name)
     const definition = new Environment({
       key,
@@ -103,7 +103,7 @@ export class Environment {
   }
 
   static fromLegacyVariables(name: string, variables: ARCVariable[]): Environment {
-    const key = v4()
+    const key = nanoid()
     const info = Thing.fromName(name)
     const definition = new Environment({
       key,
@@ -132,7 +132,7 @@ export class Environment {
     } else {
       init = {
         kind: Kind,
-        key: v4(),
+        key: nanoid(),
         info: Thing.fromName('').toJSON(),
         variables: [],
       }
@@ -149,7 +149,7 @@ export class Environment {
     if (!Environment.isEnvironment(init)) {
       throw new Error(`Not an environment.`)
     }
-    const { key = v4(), variables, info, server, encapsulated = false, authorization } = init
+    const { key = nanoid(), variables, info, server, encapsulated = false, authorization } = init
     this.kind = Kind
     this.key = key
     this.encapsulated = encapsulated
@@ -262,7 +262,7 @@ export class Environment {
   clone(opts: IEnvironmentCloneOptions = {}): Environment {
     const copy = new Environment(this.toJSON())
     if (!opts.withoutRevalidate) {
-      copy.key = v4()
+      copy.key = nanoid()
     }
     return copy
   }

package/src/models/Folder.ts

@@ -1,5 +1,5 @@
 import { IFile, File } from './store/File.js'
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { Thing } from './Thing.js'
 import { FolderKind } from './kinds.js'
 
@@ -39,7 +39,7 @@ export class Folder extends File {
     } else {
       init = {
         kind: FolderKind,
-        key: v4(),
+        key: nanoid(),
         organization: '',
         info: Thing.fromName('').toJSON(),
         parents: [],