@api-client/core 0.13.5 → 0.14.0

package/tests/unit/models/Folder/create.spec.ts

@@ -1,35 +1,22 @@
 import { test } from '@japa/runner'
 import { Folder, FolderKind, IFolder, ThingKind } from '../../../../src/index.js'
 
-const organization = 'test-organization'
-
 test.group('Folder.fromName()', () => {
   test('sets the kind', ({ assert }) => {
-    const result = Folder.fromName('name', organization)
+    const result = Folder.fromName('name')
     assert.equal(result.kind, FolderKind)
   })
 
-  test('sets the organization', ({ assert }) => {
-    const result = Folder.fromName('name', organization)
-    assert.equal(result.organization, organization)
-  })
-
   test('sets the name', ({ assert }) => {
-    const result = Folder.fromName('name', organization)
+    const result = Folder.fromName('name')
     assert.equal(result.info.name, 'name')
   })
-
-  test('sets the passed owner', ({ assert }) => {
-    const result = Folder.fromName('name', organization, 'me')
-    assert.equal(result.owner, 'me')
-  })
 })
 
 test.group('Folder.constructor()', () => {
   test('creates a default Folder', ({ assert }) => {
     const result = new Folder()
     assert.equal(result.kind, FolderKind)
-    assert.isUndefined(result.owner)
     assert.typeOf(result.key, 'string')
     assert.typeOf(result.lastModified, 'object')
   })
@@ -37,13 +24,11 @@ test.group('Folder.constructor()', () => {
   test('creates a Folder from the schema values', ({ assert }) => {
     const schema: IFolder = {
       kind: FolderKind,
-      organization,
       info: {
         kind: ThingKind,
         name: 'hello',
         description: 'a desc',
       },
-      owner: 'me',
       key: '123',
       parents: ['p1'],
       permissionIds: ['pr1'],
@@ -56,6 +41,8 @@ test.group('Folder.constructor()', () => {
           role: 'commenter',
           type: 'organization',
           itemId: '678',
+          depth: 0,
+          sourceRule: 'creator_default_owner',
         },
       ],
       lastModified: { byMe: false, time: 0, user: 'id', name: 'test' },
@@ -63,9 +50,7 @@ test.group('Folder.constructor()', () => {
     }
     const result = new Folder(schema)
     assert.equal(result.kind, FolderKind)
-    assert.equal(result.organization, organization)
     assert.equal(result.info.name, 'hello')
-    assert.equal(result.owner, 'me')
     assert.equal(result.key, '123')
     assert.deepEqual(result.parents, ['p1'])
     assert.deepEqual(result.permissionIds, ['pr1'])
@@ -77,13 +62,11 @@ test.group('Folder.constructor()', () => {
   test('creates a Folder from the JSON schema string', ({ assert }) => {
     const schema: IFolder = {
       kind: FolderKind,
-      organization,
       info: {
         kind: ThingKind,
         name: 'hello',
         description: 'a desc',
       },
-      owner: 'me',
       key: '123',
       parents: ['p1'],
       permissionIds: ['pr1'],
@@ -96,15 +79,15 @@ test.group('Folder.constructor()', () => {
           role: 'commenter',
           type: 'organization',
           itemId: '678',
+          depth: 0,
+          sourceRule: 'creator_default_owner',
         },
       ],
       lastModified: { byMe: false, time: 0, user: 'id', name: 'test' },
     }
     const result = new Folder(JSON.stringify(schema))
     assert.equal(result.kind, FolderKind)
-    assert.equal(result.organization, organization)
     assert.equal(result.info.name, 'hello')
-    assert.equal(result.owner, 'me')
     assert.equal(result.key, '123')
     assert.deepEqual(result.lastModified, schema.lastModified)
   })

package/tests/unit/models/Permission/all.spec.ts

@@ -26,6 +26,8 @@ test.group('Permission', () => {
       type: 'group',
       displayName: 'Name',
       expirationTime: 321,
+      depth: 3,
+      sourceRule: 'direct_user_grant',
     }
     const result = new Permission(schema)
     assert.equal(result.kind, PermissionKind)
@@ -37,6 +39,8 @@ test.group('Permission', () => {
     assert.equal(result.type, 'group')
     assert.equal(result.displayName, 'Name')
     assert.strictEqual(result.expirationTime, 321)
+    assert.strictEqual(result.depth, 3)
+    assert.strictEqual(result.sourceRule, 'direct_user_grant')
   })
 
   test('creates permissions from the JSON schema', ({ assert }) => {
@@ -50,6 +54,8 @@ test.group('Permission', () => {
       type: 'group',
       displayName: 'Name',
       expirationTime: 321,
+      depth: 3,
+      sourceRule: 'parent_owner_editor_rule',
     }
     const result = new Permission(JSON.stringify(schema))
     assert.equal(result.kind, PermissionKind)
@@ -61,6 +67,8 @@ test.group('Permission', () => {
     assert.equal(result.type, 'group')
     assert.equal(result.displayName, 'Name')
     assert.strictEqual(result.expirationTime, 321)
+    assert.strictEqual(result.depth, 3)
+    assert.strictEqual(result.sourceRule, 'parent_owner_editor_rule')
   })
 })
 
@@ -98,6 +106,16 @@ test.group('Permission.fromUserRole', () => {
     const result = Permission.fromUserRole('owner', '3', '1', '2')
     assert.equal(result.itemId, '3')
   })
+
+  test('sets the depth', ({ assert }) => {
+    const result = Permission.fromUserRole('owner', '3', '1', '2')
+    assert.equal(result.depth, 0)
+  })
+
+  test('sets the sourceRule', ({ assert }) => {
+    const result = Permission.fromUserRole('owner', '3', '1', '2')
+    assert.equal(result.sourceRule, 'direct_user_grant')
+  })
 })
 
 test.group('Permission.fromGroupRole', () => {
@@ -134,6 +152,16 @@ test.group('Permission.fromGroupRole', () => {
     const result = Permission.fromGroupRole('owner', '3', '1', '2')
     assert.equal(result.itemId, '3')
   })
+
+  test('sets the depth', ({ assert }) => {
+    const result = Permission.fromUserRole('owner', '3', '1', '2')
+    assert.equal(result.depth, 0)
+  })
+
+  test('sets the sourceRule', ({ assert }) => {
+    const result = Permission.fromUserRole('owner', '3', '1', '2')
+    assert.equal(result.sourceRule, 'direct_user_grant')
+  })
 })
 
 test.group('Permission.fromOrganizationRole', () => {
@@ -170,6 +198,16 @@ test.group('Permission.fromOrganizationRole', () => {
     const result = Permission.fromOrganizationRole('owner', '3', '1', '2')
     assert.equal(result.itemId, '3')
   })
+
+  test('sets the depth', ({ assert }) => {
+    const result = Permission.fromUserRole('owner', '3', '1', '2')
+    assert.equal(result.depth, 0)
+  })
+
+  test('sets the sourceRule', ({ assert }) => {
+    const result = Permission.fromUserRole('owner', '3', '1', '2')
+    assert.equal(result.sourceRule, 'direct_user_grant')
+  })
 })
 
 test.group('Permission.fromValues()', () => {
@@ -180,12 +218,15 @@ test.group('Permission.fromValues()', () => {
       type: 'organization',
       granteeId: '2',
       itemId: '3',
+      depth: 3,
+      sourceRule: 'direct_user_grant',
     })
     assert.equal(result.kind, PermissionKind)
     assert.typeOf(result.key, 'string')
     assert.isNotEmpty(result.key)
     assert.isUndefined(result.displayName)
     assert.isUndefined(result.expirationTime)
+    assert.isUndefined(result.expirationTime)
   })
 
   test('sets the type', ({ assert }) => {
@@ -195,6 +236,8 @@ test.group('Permission.fromValues()', () => {
       type: 'organization',
       granteeId: '2',
       itemId: '3',
+      depth: 3,
+      sourceRule: 'direct_user_grant',
     })
     assert.equal(result.type, 'organization')
   })
@@ -206,6 +249,8 @@ test.group('Permission.fromValues()', () => {
       type: 'organization',
       granteeId: '2',
       itemId: '3',
+      depth: 3,
+      sourceRule: 'direct_user_grant',
     })
     assert.equal(result.role, 'commenter')
   })
@@ -217,6 +262,8 @@ test.group('Permission.fromValues()', () => {
       type: 'organization',
       granteeId: '2',
       itemId: '3',
+      depth: 3,
+      sourceRule: 'direct_user_grant',
     })
     assert.equal(result.addingUser, '1')
   })
@@ -228,9 +275,50 @@ test.group('Permission.fromValues()', () => {
       type: 'organization',
       granteeId: '2',
       itemId: '3',
+      depth: 3,
+      sourceRule: 'direct_user_grant',
     })
     assert.equal(result.granteeId, '2')
   })
+
+  test('sets the itemId', ({ assert }) => {
+    const result = Permission.fromValues({
+      addingUser: '1',
+      role: 'commenter',
+      type: 'organization',
+      granteeId: '2',
+      itemId: '3',
+      depth: 3,
+      sourceRule: 'direct_user_grant',
+    })
+    assert.equal(result.itemId, '3')
+  })
+
+  test('sets the depth', ({ assert }) => {
+    const result = Permission.fromValues({
+      addingUser: '1',
+      role: 'commenter',
+      type: 'organization',
+      granteeId: '2',
+      itemId: '3',
+      depth: 3,
+      sourceRule: 'direct_user_grant',
+    })
+    assert.equal(result.depth, 3)
+  })
+
+  test('sets the sourceRule', ({ assert }) => {
+    const result = Permission.fromValues({
+      addingUser: '1',
+      role: 'commenter',
+      type: 'organization',
+      granteeId: '2',
+      itemId: '3',
+      depth: 3,
+      sourceRule: 'parent_owner_editor_rule',
+    })
+    assert.equal(result.sourceRule, 'parent_owner_editor_rule')
+  })
 })
 
 test.group('Permission.hasRole()', () => {

package/tests/unit/models/Project/create.spec.ts

@@ -1,68 +1,50 @@
 import { test } from '@japa/runner'
 import { HttpProject, IProject, Project, ProjectKind, ThingKind } from '../../../../src/index.js'
 
-const organization = 'test-organization'
-
 test.group('Project.fromProject()', () => {
   test('sets the kind', ({ assert }) => {
     const p1 = HttpProject.fromName('p1')
-    const result = Project.fromProject(p1, organization)
+    const result = Project.fromProject(p1)
     assert.equal(result.kind, ProjectKind)
   })
 
-  test('sets the organization', ({ assert }) => {
-    const p1 = HttpProject.fromName('p1')
-    const result = Project.fromProject(p1, organization)
-    assert.equal(result.organization, organization)
-  })
-
   test('sets the name', ({ assert }) => {
     const p1 = HttpProject.fromName('p1')
-    const result = Project.fromProject(p1, organization)
+    const result = Project.fromProject(p1)
     assert.equal(result.info.name, 'p1')
   })
 
   test('sets the key', ({ assert }) => {
     const p1 = HttpProject.fromName('p1')
-    const result = Project.fromProject(p1, organization)
+    const result = Project.fromProject(p1)
     assert.equal(result.key, p1.key)
   })
 
   test('respects schema instead of instance', ({ assert }) => {
     const p1 = HttpProject.fromName('p1')
-    const result = Project.fromProject(p1.toJSON(), organization)
+    const result = Project.fromProject(p1.toJSON())
     assert.equal(result.info.name, 'p1')
   })
 })
 
 test.group('Project.fromName()', () => {
   test('creates project from a name', ({ assert }) => {
-    const project = Project.fromName('test', 'org-id')
+    const project = Project.fromName('test')
     assert.equal(project.info.name, 'test')
     assert.equal(project.kind, ProjectKind)
-    assert.isUndefined(project.owner)
-    assert.equal(project.organization, 'org-id')
-  })
-
-  test('sets the owner', ({ assert }) => {
-    const project = Project.fromName('test', 'org-id', 'owner-test')
-    assert.equal(project.owner, 'owner-test')
   })
 })
 
 test.group('Project.constructor()', () => {
   test('creates project from a name', ({ assert }) => {
-    const project = Project.fromName('test', 'org-id')
+    const project = Project.fromName('test')
     assert.equal(project.info.name, 'test')
     assert.equal(project.kind, ProjectKind)
-    assert.isUndefined(project.owner)
-    assert.equal(project.organization, 'org-id')
   })
 
   test('creates a default project', ({ assert }) => {
     const result = new Project()
     assert.equal(result.kind, ProjectKind)
-    assert.isUndefined(result.owner)
     assert.typeOf(result.key, 'string')
     assert.typeOf(result.lastModified, 'object')
   })
@@ -70,13 +52,11 @@ test.group('Project.constructor()', () => {
   test('creates a project from the schema values', ({ assert }) => {
     const schema: IProject = {
       kind: ProjectKind,
-      organization,
       info: {
         kind: ThingKind,
         name: 'hello',
         description: 'a desc',
       },
-      owner: 'me',
       key: '123',
       parents: ['p1'],
       permissionIds: ['pr1'],
@@ -89,6 +69,8 @@ test.group('Project.constructor()', () => {
           role: 'commenter',
           type: 'organization',
           itemId: '678',
+          depth: 0,
+          sourceRule: 'creator_default_owner',
         },
       ],
       lastModified: { byMe: false, time: 0, user: 'id', name: 'test' },
@@ -96,9 +78,7 @@ test.group('Project.constructor()', () => {
     }
     const result = new Project(schema)
     assert.equal(result.kind, ProjectKind)
-    assert.equal(result.organization, organization)
     assert.equal(result.info.name, 'hello')
-    assert.equal(result.owner, 'me')
     assert.equal(result.key, '123')
     assert.deepEqual(result.parents, ['p1'])
     assert.deepEqual(result.permissionIds, ['pr1'])
@@ -110,13 +90,11 @@ test.group('Project.constructor()', () => {
   test('creates a project from the JSON schema string', ({ assert }) => {
     const schema: IProject = {
       kind: ProjectKind,
-      organization,
       info: {
         kind: ThingKind,
         name: 'hello',
         description: 'a desc',
       },
-      owner: 'me',
       key: '123',
       parents: ['p1'],
       permissionIds: ['pr1'],
@@ -129,15 +107,15 @@ test.group('Project.constructor()', () => {
           role: 'commenter',
           type: 'organization',
           itemId: '678',
+          depth: 0,
+          sourceRule: 'creator_default_owner',
         },
       ],
       lastModified: { byMe: false, time: 0, user: 'id', name: 'test' },
     }
     const result = new Project(JSON.stringify(schema))
     assert.equal(result.kind, ProjectKind)
-    assert.equal(result.organization, organization)
     assert.equal(result.info.name, 'hello')
-    assert.equal(result.owner, 'me')
     assert.equal(result.key, '123')
     assert.deepEqual(result.lastModified, schema.lastModified)
   })

package/tests/unit/runtime/proxy/HttpProjectProxy.spec.ts

@@ -1,6 +1,6 @@
 import nock from 'nock'
 import { test } from '@japa/runner'
-import { nanoid } from 'nanoid'
+import { nanoid } from '../../../../src/nanoid.js'
 import {
   HttpProject,
   HttpProjectKind,