Skip to content

Commit 4cb3720

Browse files
committed
chore: lint & format
1 parent 51ef5cd commit 4cb3720

File tree

7 files changed

+70
-62
lines changed

7 files changed

+70
-62
lines changed

src/alias/index.ts

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
1-
import { ConnectionREST } from "../index.js";
2-
import { WeaviateAlias, WeaviateAliasResponse } from "../openapi/types.js";
3-
import { Alias, CreateAliasInput, UpdateAliasInput } from "./types.js";
1+
import { ConnectionREST } from '../index.js';
2+
import { WeaviateAlias, WeaviateAliasResponse } from '../openapi/types.js';
3+
import { Alias, CreateAliasInput, UpdateAliasInput } from './types.js';
44

55
export interface Aliases {
66
create: (opt: CreateAliasInput) => Promise<void>;
7-
listAll: (collection?: string) => Promise<Alias[] | undefined>
7+
listAll: (collection?: string) => Promise<Alias[] | undefined>;
88
get: (alias: string) => Promise<Alias>;
99
update: (opt: UpdateAliasInput) => Promise<void>;
1010
delete: (alias: string) => Promise<void>;
1111
}
1212

1313
const alias = (connection: ConnectionREST): Aliases => {
1414
return {
15-
create: (opt: CreateAliasInput) => connection.postReturn<WeaviateAlias, void>(
16-
`/aliases/`, { ...opt, class: opt.collection }),
17-
listAll: (collection?: string) => connection.get<WeaviateAliasResponse>(
18-
`/aliases${collection !== undefined ? "/?class=" + collection : ""}`)
19-
.then(aliases => aliases.aliases !== undefined
20-
? aliases.aliases.map(alias => ({ alias: alias.alias, collection: alias.class }))
21-
: []),
22-
get: (alias: string) => connection.get<WeaviateAlias>(`/aliases/${alias}`)
23-
.then(alias => ({ alias: alias.alias!, collection: alias.class! })),
24-
update: (opt: UpdateAliasInput) => connection.put(
25-
`/aliases/${opt.alias}`, { class: opt.newTargetCollection }),
26-
delete: (alias: string) => connection.delete(
27-
`/aliases/${alias}`, null),
28-
}
29-
}
15+
create: (opt: CreateAliasInput) =>
16+
connection.postReturn<WeaviateAlias, void>(`/aliases/`, { ...opt, class: opt.collection }),
17+
listAll: (collection?: string) =>
18+
connection
19+
.get<WeaviateAliasResponse>(`/aliases${collection !== undefined ? '/?class=' + collection : ''}`)
20+
.then((aliases) =>
21+
aliases.aliases !== undefined
22+
? aliases.aliases.map((alias) => ({ alias: alias.alias, collection: alias.class }))
23+
: []
24+
),
25+
get: (alias: string) =>
26+
connection
27+
.get<WeaviateAlias>(`/aliases/${alias}`)
28+
.then((alias) => ({ alias: alias.alias!, collection: alias.class! })),
29+
update: (opt: UpdateAliasInput) =>
30+
connection.put(`/aliases/${opt.alias}`, { class: opt.newTargetCollection }),
31+
delete: (alias: string) => connection.delete(`/aliases/${alias}`, null),
32+
};
33+
};
3034

3135
export default alias;

src/alias/journey.test.ts

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
import { assert } from 'console';
2-
import weaviate, {
3-
WeaviateClient,
4-
} from '..';
1+
import weaviate, { WeaviateClient } from '..';
52
import { requireAtLeast } from '../../test/version';
63
import { Alias } from './types';
74

8-
requireAtLeast(1, 32, 0).describe("manages collection aliases", () => {
5+
requireAtLeast(1, 32, 0).describe('manages collection aliases', () => {
96
let client: WeaviateClient;
10-
const collectionsWithAliases = ["PaulHewson", "GeorgeBarnes", "ColsonBaker"];
7+
const collectionsWithAliases = ['PaulHewson', 'GeorgeBarnes', 'ColsonBaker'];
118

129
beforeAll(async () => {
1310
client = await weaviate.connectToLocal();
1411
await Promise.all(collectionsWithAliases.map(client.collections.delete));
15-
await Promise.all(collectionsWithAliases.map(name => client.collections.create({ name })));
12+
await Promise.all(collectionsWithAliases.map((name) => client.collections.create({ name })));
1613
});
1714

18-
it("should create alias", () => {
15+
it('should create alias', () => {
1916
return Promise.all([
20-
client.alias.create({ collection: "PaulHewson", alias: "Bono" }),
21-
client.alias.create({ collection: "GeorgeBarnes", alias: "MachineGunKelly" }),
17+
client.alias.create({ collection: 'PaulHewson', alias: 'Bono' }),
18+
client.alias.create({ collection: 'GeorgeBarnes', alias: 'MachineGunKelly' }),
2219
])
2320
.then(() => client.alias.listAll())
24-
.then(aliases => {
21+
.then((aliases) => {
2522
expect(aliases).not.toBeUndefined();
2623
expect(aliases).toHaveLength(2);
2724
expect(aliases).toEqual<Alias[]>([
28-
{ collection: "PaulHewson", alias: "Bono" },
29-
{ collection: "GeorgeBarnes", alias: "MachineGunKelly" },
25+
{ collection: 'PaulHewson', alias: 'Bono' },
26+
{ collection: 'GeorgeBarnes', alias: 'MachineGunKelly' },
3027
]);
3128
});
32-
})
29+
});
3330

34-
it("should update alias", () => {
35-
return client.alias.update({ alias: "MachineGunKelly", newTargetCollection: "ColsonBaker" })
36-
.then(() => client.alias.get("MachineGunKelly"))
37-
.then(alias => {
38-
expect(alias.collection).toEqual("ColsonBaker");
39-
})
40-
})
31+
it('should update alias', () => {
32+
return client.alias
33+
.update({ alias: 'MachineGunKelly', newTargetCollection: 'ColsonBaker' })
34+
.then(() => client.alias.get('MachineGunKelly'))
35+
.then((alias) => {
36+
expect(alias.collection).toEqual('ColsonBaker');
37+
});
38+
});
4139

42-
it("should delete alias Bono", () => {
43-
return client.alias.delete("Bono")
44-
.then(() => client.alias.listAll("PaulHewson"))
45-
.then(aliases => expect(aliases).toEqual([]));
46-
})
40+
it('should delete alias Bono', () => {
41+
return client.alias
42+
.delete('Bono')
43+
.then(() => client.alias.listAll('PaulHewson'))
44+
.then((aliases) => expect(aliases).toEqual([]));
45+
});
4746

48-
it("should delete alias MachineGunKelly", () => {
49-
return client.alias.delete("MachineGunKelly")
50-
.then(() => client.alias.listAll("ColsonBaker"))
51-
.then(aliases => expect(aliases).toEqual([]));
52-
})
53-
})
47+
it('should delete alias MachineGunKelly', () => {
48+
return client.alias
49+
.delete('MachineGunKelly')
50+
.then(() => client.alias.listAll('ColsonBaker'))
51+
.then((aliases) => expect(aliases).toEqual([]));
52+
});
53+
});

src/alias/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export type Alias = {
22
collection: string;
33
alias: string;
4-
}
4+
};
55

66
export type CreateAliasInput = {
77
collection: string;

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import { LiveChecker, OpenidConfigurationGetter, ReadyChecker } from './misc/ind
3838

3939
import weaviateV2 from './v2/index.js';
4040

41+
import alias, { Aliases } from './alias/index.js';
4142
import filter from './collections/filters/index.js';
4243
import { ConsistencyLevel } from './data/replication.js';
4344
import users, { Users } from './users/index.js';
44-
import alias, { Aliases } from './alias/index.js';
4545

4646
export type ProtocolParams = {
4747
/**

src/roles/integration.test.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ const testCases: TestCase[] = [
291291
name: 'aliases',
292292
...emptyPermissions,
293293
aliasPermissions: [{ alias: 'SomeAlias', actions: ['create_aliases', 'delete_aliases'] }],
294-
}
294+
},
295295
},
296296
];
297297

@@ -361,13 +361,14 @@ requireAtLeast(1, 29, 0).describe('Integration testing of the roles namespace',
361361

362362
describe('should be able to create roles using the permissions factory', () => {
363363
testCases.forEach((testCase) => {
364-
(testCase.requireVersion !== undefined
365-
? requireAtLeast(...testCase.requireVersion).it
366-
: it)(`with ${testCase.roleName} permissions`, async () => {
364+
(testCase.requireVersion !== undefined ? requireAtLeast(...testCase.requireVersion).it : it)(
365+
`with ${testCase.roleName} permissions`,
366+
async () => {
367367
await client.roles.create(testCase.roleName, testCase.permissions);
368368
const role = await client.roles.byName(testCase.roleName);
369369
expect(role).toEqual(testCase.expected);
370-
});
370+
}
371+
);
371372
});
372373
});
373374

src/roles/types.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { Action, WeaviateUserType } from '../openapi/types.js';
22

3-
export type AliasAction = Extract<Action, 'create_aliases' | 'read_aliases' | 'update_aliases' | 'delete_aliases'>;
3+
export type AliasAction = Extract<
4+
Action,
5+
'create_aliases' | 'read_aliases' | 'update_aliases' | 'delete_aliases'
6+
>;
47
export type BackupsAction = Extract<Action, 'manage_backups'>;
58
export type ClusterAction = Extract<Action, 'read_cluster'>;
69
export type CollectionsAction = Extract<
@@ -31,7 +34,7 @@ export type UserAssignment = {
3134
export type AliasPermission = {
3235
alias: string;
3336
actions: AliasAction[];
34-
}
37+
};
3538

3639
export type BackupsPermission = {
3740
collection: string;

src/roles/util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class PermissionGuards {
4343
'create_aliases',
4444
'read_aliases',
4545
'update_aliases',
46-
'delete_aliases',
46+
'delete_aliases'
4747
);
4848
static isBackups = (permission: Permission): permission is BackupsPermission =>
4949
PermissionGuards.includes<BackupsAction>(permission, 'manage_backups');
@@ -236,7 +236,7 @@ class PermissionsMapping {
236236
if (this.mappings.aliases[key] === undefined) this.mappings.aliases[key] = { alias: key, actions: [] };
237237
this.mappings.aliases[key].actions.push(permission.action as AliasAction);
238238
}
239-
}
239+
};
240240

241241
private backups = (permission: WeaviatePermission) => {
242242
if (permission.backups !== undefined) {

0 commit comments

Comments
 (0)