@api-client/core 0.12.0 → 0.12.2

package/src/models/HttpProject.ts

@@ -12,7 +12,7 @@ import { IProjectFolder, ProjectFolder } from './ProjectFolder.js'
 import { IProjectRequest, ProjectRequest, Kind as ProjectRequestKind } from './ProjectRequest.js'
 import { ProjectSchema, IProjectSchema } from './ProjectSchema.js'
 import { Request } from './Request.js'
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { ARCSavedRequest, ARCHistoryRequest } from './legacy/request/ArcRequest.js'
 import { ArcLegacyProject, ARCProject } from './legacy/models/ArcLegacyProject.js'
 import { PostmanDataTransformer } from './transformers/PostmanDataTransformer.js'
@@ -372,7 +372,7 @@ export class HttpProject extends ProjectParent {
     } else {
       init = {
         kind: Kind,
-        key: v4(),
+        key: nanoid(),
         definitions: {},
         items: [],
         info: Thing.fromName('').toJSON(),
@@ -390,7 +390,7 @@ export class HttpProject extends ProjectParent {
     if (!init || !init.definitions || !init.items) {
       throw new Error(`Not a project.`)
     }
-    const { key = v4(), definitions = {}, items, info, license, provider } = init
+    const { key = nanoid(), definitions = {}, items, info, license, provider } = init
     this.key = key
     if (license) {
       this.license = new License(license)
@@ -739,7 +739,7 @@ export class HttpProject extends ProjectParent {
       finalRequest = new ProjectRequest(this, request)
     }
     if (!finalRequest.key) {
-      finalRequest.key = v4()
+      finalRequest.key = nanoid()
     }
 
     let root: ProjectFolder | HttpProject
@@ -1039,7 +1039,7 @@ export class HttpProject extends ProjectParent {
   clone(opts: IProjectCloneOptions = {}): HttpProject {
     const copy = new HttpProject(this.toJSON())
     if (!opts.withoutRevalidate) {
-      copy.key = v4()
+      copy.key = nanoid()
       HttpProject.regenerateKeys(copy)
     }
     return copy
@@ -1072,7 +1072,7 @@ export class HttpProject extends ProjectParent {
       if (!indexObject) {
         return
       }
-      const newKey = v4()
+      const newKey = nanoid()
       indexObject.key = newKey
       folder.key = newKey
     })
@@ -1082,15 +1082,15 @@ export class HttpProject extends ProjectParent {
       if (!indexObject) {
         return
       }
-      const newKey = v4()
+      const newKey = nanoid()
       indexObject.key = newKey
       request.key = newKey
     })
     ;(definitions.schemas || []).forEach((schema) => {
-      schema.key = v4()
+      schema.key = nanoid()
     })
     ;(definitions.certificates || []).forEach((cert) => {
-      cert.key = v4()
+      cert.key = nanoid()
     })
     ;(definitions.environments || []).forEach((environment) => {
       const oldKey = environment.key
@@ -1098,7 +1098,7 @@ export class HttpProject extends ProjectParent {
       if (!indexObject) {
         return
       }
-      const newKey = v4()
+      const newKey = nanoid()
       indexObject.key = newKey
       environment.key = newKey
     })
@@ -1133,7 +1133,7 @@ export class HttpProject extends ProjectParent {
       finalSchema = new ProjectSchema(schema)
     }
     if (!finalSchema.key) {
-      finalSchema.key = v4()
+      finalSchema.key = nanoid()
     }
     const { index } = opts
     const hasIndex = typeof index === 'number'
@@ -1328,7 +1328,7 @@ export class HttpProject extends ProjectParent {
       finalEnv = new Environment(env)
     }
     if (!finalEnv.key) {
-      finalEnv.key = v4()
+      finalEnv.key = nanoid()
     }
     return finalEnv
   }

package/src/models/Project.ts

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

package/src/models/ProjectFolder.ts

@@ -1,3 +1,4 @@
+import { nanoid } from 'nanoid'
 import { ProjectParent } from './ProjectParent.js'
 import { type IProjectDefinitionProperty } from './ProjectDefinitionProperty.js'
 import { ProjectItem, type IProjectItem } from './ProjectItem.js'
@@ -6,7 +7,6 @@ import { type HttpProject, type IEnvironmentCreateOptions } from './HttpProject.
 import { type IThing, Thing } from './Thing.js'
 import { Environment, type IEnvironment } from './Environment.js'
 import { ProjectFolderKind } from './kinds.js'
-import v4 from '../lib/uuid.js'
 
 export const DefaultFolderName = 'New folder'
 
@@ -110,7 +110,7 @@ export class ProjectFolder extends ProjectParent {
         created: now,
         updated: now,
         items: [],
-        key: v4(),
+        key: nanoid(),
       }
     }
     this.new(init)
@@ -125,7 +125,7 @@ export class ProjectFolder extends ProjectParent {
     if (!ProjectFolder.isProjectFolder(init)) {
       throw new Error(`Not a project folder.`)
     }
-    const { key = v4(), created = Date.now(), updated = Date.now(), items, info } = init
+    const { key = nanoid(), created = Date.now(), updated = Date.now(), items, info } = init
     this.kind = ProjectFolderKind
     this.key = key
     this.created = created
@@ -175,7 +175,7 @@ export class ProjectFolder extends ProjectParent {
    */
   static fromName(project: HttpProject, name = DefaultFolderName): ProjectFolder {
     const now = Date.now()
-    const key = v4()
+    const key = nanoid()
     const info = Thing.fromName(name)
     const definition = new ProjectFolder(project, {
       key,
@@ -350,7 +350,7 @@ export class ProjectFolder extends ProjectParent {
   clone(opts: IFolderCloneOptions = {}): ProjectFolder {
     const { targetProject = this.project, targetFolder } = opts
     const copy = new ProjectFolder(targetProject, this.toJSON())
-    copy.key = v4()
+    copy.key = nanoid()
 
     const extProject = targetProject !== this.project
     if (extProject) {
@@ -428,7 +428,7 @@ export class ProjectFolder extends ProjectParent {
         return
       }
       const copy = new ProjectFolder(folder.getProject(), definition.toJSON())
-      copy.key = v4()
+      copy.key = nanoid()
       copy.items = []
       folder.addFolder(copy)
       if (withRequests) {

package/src/models/ProjectRequest.ts

@@ -1,8 +1,8 @@
+import { nanoid } from 'nanoid'
 import { ProjectDefinitionProperty, IProjectDefinitionProperty } from './ProjectDefinitionProperty.js'
 import { ProjectFolder } from './ProjectFolder.js'
 import { IHttpRequest, Kind as HttpRequestKind } from './HttpRequest.js'
 import { HttpProject } from './HttpProject.js'
-import v4 from '../lib/uuid.js'
 import { IRequest, Request } from './Request.js'
 import { Environment } from './Environment.js'
 import { Property } from './Property.js'
@@ -109,7 +109,7 @@ export class ProjectRequest extends Request implements ProjectDefinitionProperty
     }
     const now: number = Date.now()
     const request = new ProjectRequest(project, {
-      key: v4(),
+      key: nanoid(),
       kind: Kind,
       created: now,
       updated: now,
@@ -136,7 +136,7 @@ export class ProjectRequest extends Request implements ProjectDefinitionProperty
     }
     const now: number = Date.now()
     const request = new ProjectRequest(project, {
-      key: v4(),
+      key: nanoid(),
       kind: Kind,
       created: now,
       updated: now,
@@ -163,7 +163,7 @@ export class ProjectRequest extends Request implements ProjectDefinitionProperty
     }
     const now: number = Date.now()
     const request = new ProjectRequest(project, {
-      key: v4(),
+      key: nanoid(),
       kind: Kind,
       created: now,
       updated: now,
@@ -183,7 +183,7 @@ export class ProjectRequest extends Request implements ProjectDefinitionProperty
    * Creates a project request for a schema of a Request.
    */
   static fromRequest(request: IRequest, project: HttpProject): ProjectRequest {
-    const key = v4()
+    const key = nanoid()
     const init: IProjectRequest = { ...request, key, kind: Kind }
     const result = new ProjectRequest(project, init)
     return result
@@ -200,7 +200,7 @@ export class ProjectRequest extends Request implements ProjectDefinitionProperty
     } else {
       const now: number = Date.now()
       init = {
-        key: v4(),
+        key: nanoid(),
         kind: Kind,
         created: now,
         updated: now,
@@ -219,7 +219,7 @@ export class ProjectRequest extends Request implements ProjectDefinitionProperty
     super.new(init)
 
     const { key, environment } = init as IProjectRequest
-    this.key = key || v4()
+    this.key = key || nanoid()
     if (environment) {
       this.environment = environment
     }
@@ -282,7 +282,7 @@ export class ProjectRequest extends Request implements ProjectDefinitionProperty
   clone(opts: IRequestCloneOptions = {}): ProjectRequest {
     const copy = new ProjectRequest(this.project, this.toJSON())
     if (!opts.withoutRevalidate) {
-      copy.key = v4()
+      copy.key = nanoid()
     }
     if (!opts.withoutAttach) {
       // if the parent is the project then add the request to the project.

package/src/models/ProjectSchema.ts

@@ -1,4 +1,4 @@
-import v4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { Property, IProperty, PropertyType, Kind as PropertyKind } from './Property.js'
 export const Kind = 'Core#ProjectSchema'
 
@@ -78,7 +78,7 @@ export class ProjectSchema {
     const init: IProjectSchema = {
       kind: Kind,
       name,
-      key: v4(),
+      key: nanoid(),
     }
     return new ProjectSchema(init)
   }
@@ -94,7 +94,7 @@ export class ProjectSchema {
     const init: IProjectSchema = {
       kind: Kind,
       name,
-      key: v4(),
+      key: nanoid(),
       content,
       mime,
     }
@@ -114,7 +114,7 @@ export class ProjectSchema {
       init = {
         kind: Kind,
         name: '',
-        key: v4(),
+        key: nanoid(),
       }
     }
     this.new(init)
@@ -124,7 +124,7 @@ export class ProjectSchema {
    * Creates a new schema definition clearing anything that is so far defined.
    */
   new(init: IProjectSchema): void {
-    const { key = v4(), content, properties, mime, name = '' } = init
+    const { key = nanoid(), content, properties, mime, name = '' } = init
     this.name = name
     this.key = key
     if (content) {
@@ -148,7 +148,7 @@ export class ProjectSchema {
     const result: IProjectSchema = {
       kind: Kind,
       name: this.name || '',
-      key: this.key || v4(),
+      key: this.key || nanoid(),
     }
     if (this.content) {
       result.content = this.content

package/src/models/store/DataFile.ts

@@ -1,4 +1,4 @@
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { File, IFile } from './File.js'
 import { Thing } from '../Thing.js'
 import { DataNamespace, IDataNamespace } from '../../modeling/legacy/DataNamespace.js'
@@ -61,7 +61,7 @@ export class DataFile extends File {
     } else {
       init = {
         kind: Kind,
-        key: v4(),
+        key: nanoid(),
         organization: '',
         info: Thing.fromName('').toJSON(),
         parents: [],

package/src/models/store/File.ts

@@ -1,9 +1,9 @@
+import { nanoid } from 'nanoid'
 import { IPermission, Permission, PermissionRole } from './Permission.js'
 import { IModification } from './Modification.js'
 import { IDeletion } from './Deletion.js'
 import { IUser, Kind as UserKind } from './User.js'
 import { IThing, Thing } from '../Thing.js'
-import v4 from '../../lib/uuid.js'
 import { ICapabilities } from './Capabilities.js'
 import { FolderKind } from '../kinds.js'
 // this causes error
@@ -206,7 +206,7 @@ export class StoredFile {
   }
 
   new(init: IStoredFile): this {
-    const { key = v4(), info, kind, owner, iconColor, organization, shortcutTarget } = init
+    const { key = nanoid(), info, kind, owner, iconColor, organization, shortcutTarget } = init
     this.key = key
     this.organization = organization
     this.kind = kind
@@ -485,7 +485,7 @@ export class File extends StoredFile {
    * @param owner The user id that is the owner of the file.
    */
   static fromName(name: string, organization: string, owner?: string, kind = ''): File {
-    const key = v4()
+    const key = nanoid()
     const definition = new File()
     definition.new({
       key,

package/src/models/store/Organization.ts

@@ -1,4 +1,4 @@
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import type { IDeletion } from './Deletion.js'
 
 export const Kind = 'Core#Organization'
@@ -63,7 +63,7 @@ export class Organization implements IOrganization {
     } else {
       init = {
         kind: Kind,
-        key: v4(),
+        key: nanoid(),
         name: '',
         createdBy: '',
         createdDate: Date.now(),
@@ -79,7 +79,7 @@ export class Organization implements IOrganization {
       throw new Error(`Not an Organization.`)
     }
     const {
-      key = v4(),
+      key = nanoid(),
       name,
       createdBy,
       createdDate = Date.now(),

package/src/models/store/Permission.ts

@@ -1,4 +1,4 @@
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 
 export const Kind = 'Core#Permission'
 
@@ -129,7 +129,7 @@ export class Permission {
    */
   static fromUserRole(role: PermissionRole, itemId: string, user: string, addingUser: string): Permission {
     const init: IPermission = {
-      key: v4(),
+      key: nanoid(),
       kind: Kind,
       itemId,
       granteeId: user,
@@ -150,7 +150,7 @@ export class Permission {
    */
   static fromGroupRole(role: PermissionRole, itemId: string, group: string, addingUser: string): Permission {
     const init: IPermission = {
-      key: v4(),
+      key: nanoid(),
       kind: Kind,
       itemId,
       granteeId: group,
@@ -175,7 +175,7 @@ export class Permission {
     addingUser: string
   ): Permission {
     const init: IPermission = {
-      key: v4(),
+      key: nanoid(),
       kind: Kind,
       itemId,
       granteeId: organizationId,
@@ -192,7 +192,7 @@ export class Permission {
   static fromValues(init: IBasePermission): Permission {
     return new Permission({
       ...init,
-      key: v4(),
+      key: nanoid(),
       kind: Kind,
     })
   }
@@ -206,7 +206,7 @@ export class Permission {
     } else {
       init = {
         kind: Kind,
-        key: v4(),
+        key: nanoid(),
         granteeId: '',
         itemId: '',
         role: 'reader',
@@ -221,7 +221,7 @@ export class Permission {
     if (!Permission.isPermission(init)) {
       throw new Error(`Not a permission.`)
     }
-    const { key = v4(), granteeId, role, type, displayName, expirationTime, addingUser, itemId } = init
+    const { key = nanoid(), granteeId, role, type, displayName, expirationTime, addingUser, itemId } = init
     this.kind = Kind
     this.key = key
     this.granteeId = granteeId

package/src/models/store/UserIdentity.ts

@@ -1,4 +1,4 @@
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 
 export const Kind = 'Core#UserIdentity'
 
@@ -57,7 +57,7 @@ export class UserIdentity implements IUserIdentity {
     } else {
       init = {
         kind: Kind,
-        key: v4(),
+        key: nanoid(),
         userId: '',
         provider: 'google',
         providerId: '',
@@ -71,7 +71,7 @@ export class UserIdentity implements IUserIdentity {
     if (!UserIdentity.isUserIdentity(init)) {
       throw new Error(`Not a UserIdentity.`)
     }
-    const { key = v4(), emailVerified, provider, providerId, userId, hostDomain } = init
+    const { key = nanoid(), emailVerified, provider, providerId, userId, hostDomain } = init
     this.kind = Kind
     this.key = key
     this.provider = provider

package/src/models/transformers/ArcDexieTransformer.ts

@@ -1,4 +1,4 @@
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { BaseTransformer, dataValue } from './BaseTransformer.js'
 import { Creator, Browser, Page, Entry, Header } from './har.js'
 import {
@@ -131,7 +131,7 @@ export class ArcDexieTransformer extends BaseTransformer {
       updateData: item.requestIds,
       legacyProject: {
         kind: 'ARC#Project',
-        key: v4(),
+        key: nanoid(),
         name: item.name,
         order: item.order,
         updated: item.updateTime,
@@ -205,7 +205,7 @@ export class ArcDexieTransformer extends BaseTransformer {
     const updated = { ...item }
     updated.updateTime = updated.updateTime || Date.now()
     const obj: ExportArcHistoryRequest = {
-      key: v4(),
+      key: nanoid(),
       method: updated.method,
       url: updated.url,
       updated: new Date(updated.updateTime).getTime(),
@@ -245,7 +245,7 @@ export class ArcDexieTransformer extends BaseTransformer {
       url: item.url,
       type: 'saved',
       kind: 'ARC#HttpRequest',
-      key: v4(),
+      key: nanoid(),
     }
     // payload and headers
     const harIndex = item.referenceEntry || 0

package/src/models/transformers/ArcLegacyTransformer.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { BaseTransformer, dataValue } from './BaseTransformer.js'
 import { ArcExportObject, ExportArcProjects, ExportArcSavedRequest } from '../legacy/DataExport.js'
 
@@ -113,7 +113,7 @@ export class ArcLegacyTransformer extends BaseTransformer {
       }
       return {
         kind: 'ARC#ProjectData',
-        key: v4(),
+        key: nanoid(),
         created,
         name: item.name || 'unnamed',
         order: 0,
@@ -153,7 +153,7 @@ export class ArcLegacyTransformer extends BaseTransformer {
 
     const project = this.findProject(item.project, projects)
     const projectId = project ? project.key : undefined
-    const id = v4()
+    const id = nanoid()
     let created = Number(item.time)
     if (Number.isNaN(created)) {
       created = Date.now()

package/src/models/transformers/ArcPouchTransformer.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { BaseTransformer, dataValue } from './BaseTransformer.js'
 import {
   ArcExportObject,
@@ -91,7 +91,7 @@ export class ArcPouchTransformer extends BaseTransformer {
     return projects.map((item) => {
       const project = { ...item }
       if (!project.key) {
-        project.key = v4()
+        project.key = nanoid()
       }
       return updateItemTimings(project)
     })

package/src/models/transformers/PostmanV21Transformer.ts

@@ -4,7 +4,7 @@ import { HttpProject, IHttpProject, Kind as ProjectKind } from '../HttpProject.j
 import { ProjectFolder } from '../ProjectFolder.js'
 import { ProjectRequest } from '../ProjectRequest.js'
 import { IMultipartBody } from '../../lib/transformers/PayloadSerializer.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { Environment } from '../Environment.js'
 import { Thing } from '../Thing.js'
 
@@ -137,7 +137,7 @@ export class PostmanV21Transformer extends PostmanTransformer {
       definitions: {},
       info: Thing.fromName(info.name || 'Unnamed Postman project').toJSON(),
       items: [],
-      key: info._postman_id || v4(),
+      key: info._postman_id || nanoid(),
     }
     if (info.description) {
       init.info.description = info.description

package/src/models/transformers/PostmanV2Transformer.ts

@@ -4,7 +4,7 @@ import { HttpProject, IHttpProject, Kind as HttpProjectKind } from '../HttpProje
 import { ProjectFolder } from '../ProjectFolder.js'
 import { ProjectRequest } from '../ProjectRequest.js'
 import { IMultipartBody } from '../../lib/transformers/PayloadSerializer.js'
-import v4 from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { Environment } from '../Environment.js'
 import { Thing } from '../Thing.js'
 
@@ -137,7 +137,7 @@ export class PostmanV2Transformer extends PostmanTransformer {
       definitions: {},
       info: Thing.fromName(info.name || 'Unnamed Postman project').toJSON(),
       items: [],
-      key: info._postman_id || v4(),
+      key: info._postman_id || nanoid(),
     }
     if (info.description) {
       init.info.description = info.description

package/src/patch/PatchClient.ts

@@ -1,5 +1,5 @@
 import { Operation, JsonDocument } from '@api-client/json'
-import uuidV4 from '../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import type { MediaPatchInfo, PatchInfo } from './types.js'
 
 /**
@@ -78,7 +78,7 @@ export class PatchClient<T extends object> extends JsonDocument<T> {
       patch: operations,
       app: this.app,
       appVersion: this.appVersion,
-      id: uuidV4(),
+      id: nanoid(),
     }
     if (this.version !== undefined) {
       const casted = result as MediaPatchInfo

package/src/runtime/store/FilesSdk.ts

@@ -18,7 +18,7 @@ import {
   ContextListOptions,
 } from '../../events/BaseEvents.js'
 import { IAccessAddOperation, IAccessRemoveOperation, PermissionRole } from '../../models/store/Permission.js'
-import uuid from '../../lib/uuid.js'
+import { nanoid } from 'nanoid'
 import { Folder, type IFolder } from '../../models/Folder.js'
 import type { AccessPatchInfo, MediaPatchInfo, MediaPatchRevision, PatchInfo } from '../../patch/types.js'
 
@@ -549,7 +549,7 @@ export class FilesSdk extends SdkBase {
     }
     const patch: AccessPatchInfo = {
       patch: [op],
-      id: uuid(),
+      id: nanoid(),
     }
     return this.patchUsers(organization, key, patch, request)
   }
@@ -569,7 +569,7 @@ export class FilesSdk extends SdkBase {
     }
     const patch: AccessPatchInfo = {
       patch: [op],
-      id: uuid(),
+      id: nanoid(),
     }
     return this.patchUsers(organization, key, patch, request)
   }

package/tests/unit/modeling/data_domain_associations.spec.ts

@@ -37,7 +37,7 @@ test.group('DataDomain.addAssociation()', () => {
     assert.instanceOf(association, DomainAssociation)
     assert.isTrue(dataDomain.graph.hasNode(association.key))
     assert.typeOf(association.key, 'string')
-    assert.equal(association.info.name, 'New association')
+    assert.equal(association.info.name, 'new_association')
   })
 
   test('addAssociation notifies change', async ({ assert }) => {

package/tests/unit/modeling/data_domain_property.spec.ts

@@ -19,7 +19,7 @@ test.group('DataDomain.addProperty()', () => {
     const property = dataDomain.addProperty(entity.key)
     assert.instanceOf(property, DomainProperty)
     assert.isTrue(dataDomain.graph.hasNode(property.key))
-    assert.equal(property.info.name, 'New property')
+    assert.equal(property.info.name, 'new_property')
     assert.equal(property.type, 'string')
   })