@party-stack/foundry-ontology 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/config/connectionPull.test.d.ts +2 -0
- package/lib/config/connectionPull.test.d.ts.map +1 -0
- package/lib/config/connectionPull.test.js +146 -0
- package/lib/config/connectionPull.test.js.map +1 -0
- package/lib/config/index.d.ts +11 -11
- package/lib/config/index.d.ts.map +1 -1
- package/lib/config/index.js +53 -56
- package/lib/config/index.js.map +1 -1
- package/lib/config/index.test.js +16 -6
- package/lib/config/index.test.js.map +1 -1
- package/lib/installation/createFoundryBackendInstallation.d.ts +1 -1
- package/lib/installation/createFoundryBackendInstallation.d.ts.map +1 -1
- package/lib/installation/createFoundryBackendInstallation.js +46 -25
- package/lib/installation/createFoundryBackendInstallation.js.map +1 -1
- package/lib/installation/createFoundryBackendInstallation.test.d.ts +2 -0
- package/lib/installation/createFoundryBackendInstallation.test.d.ts.map +1 -0
- package/lib/installation/createFoundryBackendInstallation.test.js +27 -0
- package/lib/installation/createFoundryBackendInstallation.test.js.map +1 -0
- package/package.json +2 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connectionPull.test.d.ts","sourceRoot":"","sources":["../../src/config/connectionPull.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
const mocks = vi.hoisted(() => ({
|
|
3
|
+
createFoundryBackendInstallation: vi.fn(),
|
|
4
|
+
createFoundryOntologyRoute: vi.fn(() => "meta-route"),
|
|
5
|
+
}));
|
|
6
|
+
vi.mock("../installation/createFoundryBackendInstallation.js", () => mocks);
|
|
7
|
+
import { createFoundryOntologyPullSource } from "./index.js";
|
|
8
|
+
function installation(connections = []) {
|
|
9
|
+
const oauth = vi.fn(() => Promise.resolve({
|
|
10
|
+
userId: "oauth-user",
|
|
11
|
+
state: { status: "active" },
|
|
12
|
+
}));
|
|
13
|
+
const apiToken = vi.fn(() => Promise.resolve({
|
|
14
|
+
userId: "token-user",
|
|
15
|
+
state: { status: "active" },
|
|
16
|
+
}));
|
|
17
|
+
return {
|
|
18
|
+
connections: {
|
|
19
|
+
values: () => connections.values(),
|
|
20
|
+
},
|
|
21
|
+
authentication: {
|
|
22
|
+
signIn: {
|
|
23
|
+
oauth,
|
|
24
|
+
apiToken,
|
|
25
|
+
},
|
|
26
|
+
},
|
|
27
|
+
oauth,
|
|
28
|
+
apiToken,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
beforeEach(() => {
|
|
32
|
+
vi.clearAllMocks();
|
|
33
|
+
});
|
|
34
|
+
describe("Foundry connection-backed pull", () => {
|
|
35
|
+
it("creates a metadata-capable backend installation", async () => {
|
|
36
|
+
const backendInstallation = installation();
|
|
37
|
+
mocks.createFoundryBackendInstallation.mockResolvedValue(backendInstallation);
|
|
38
|
+
const runtime = vi.fn();
|
|
39
|
+
const source = createFoundryOntologyPullSource({
|
|
40
|
+
baseUrl: "https://foundry.example",
|
|
41
|
+
ontologyRid: "ri.ontology.main",
|
|
42
|
+
connection: {
|
|
43
|
+
oauth: {
|
|
44
|
+
clientId: "client",
|
|
45
|
+
redirectUrl: "http://127.0.0.1:9876/callback",
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
|
+
});
|
|
49
|
+
await source.createInstallation({ runtime });
|
|
50
|
+
expect(mocks.createFoundryOntologyRoute).toHaveBeenCalledWith({
|
|
51
|
+
ontologyId: "ri.ontology.main",
|
|
52
|
+
});
|
|
53
|
+
expect(mocks.createFoundryBackendInstallation).toHaveBeenCalledWith({
|
|
54
|
+
installationId: "foundry-pull:https://foundry.example:ri.ontology.main",
|
|
55
|
+
baseUrl: "https://foundry.example",
|
|
56
|
+
runtime,
|
|
57
|
+
connections: {
|
|
58
|
+
token: undefined,
|
|
59
|
+
oauth: {
|
|
60
|
+
clientId: "client",
|
|
61
|
+
redirectUrl: "http://127.0.0.1:9876/callback",
|
|
62
|
+
scopes: ["api:use-ontologies-read", "offline_access"],
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
|
+
routes: ["meta-route"],
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
it("restores the sole active connection", async () => {
|
|
69
|
+
const backendInstallation = installation([
|
|
70
|
+
{
|
|
71
|
+
userId: "restored-user",
|
|
72
|
+
state: { status: "active" },
|
|
73
|
+
},
|
|
74
|
+
]);
|
|
75
|
+
const source = createFoundryOntologyPullSource({
|
|
76
|
+
baseUrl: "https://foundry.example",
|
|
77
|
+
ontologyRid: "ri.ontology.main",
|
|
78
|
+
connection: {
|
|
79
|
+
oauth: {
|
|
80
|
+
clientId: "client",
|
|
81
|
+
redirectUrl: "http://127.0.0.1:9876/callback",
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
await expect(source.resolveConnection(backendInstallation)).resolves.toMatchObject({
|
|
86
|
+
userId: "restored-user",
|
|
87
|
+
});
|
|
88
|
+
expect(backendInstallation.oauth).not.toHaveBeenCalled();
|
|
89
|
+
});
|
|
90
|
+
it("starts OAuth when no session can be restored", async () => {
|
|
91
|
+
const backendInstallation = installation();
|
|
92
|
+
const source = createFoundryOntologyPullSource({
|
|
93
|
+
baseUrl: "https://foundry.example",
|
|
94
|
+
ontologyRid: "ri.ontology.main",
|
|
95
|
+
connection: {
|
|
96
|
+
oauth: {
|
|
97
|
+
clientId: "client",
|
|
98
|
+
redirectUrl: "http://127.0.0.1:9876/callback",
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
});
|
|
102
|
+
await expect(source.resolveConnection(backendInstallation)).resolves.toMatchObject({
|
|
103
|
+
userId: "oauth-user",
|
|
104
|
+
});
|
|
105
|
+
expect(backendInstallation.oauth).toHaveBeenCalledOnce();
|
|
106
|
+
});
|
|
107
|
+
it("uses the API token authentication path", async () => {
|
|
108
|
+
const backendInstallation = installation();
|
|
109
|
+
const source = createFoundryOntologyPullSource({
|
|
110
|
+
baseUrl: "https://foundry.example",
|
|
111
|
+
ontologyRid: "ri.ontology.main",
|
|
112
|
+
connection: {
|
|
113
|
+
token: "token",
|
|
114
|
+
},
|
|
115
|
+
});
|
|
116
|
+
await expect(source.resolveConnection(backendInstallation)).resolves.toMatchObject({
|
|
117
|
+
userId: "token-user",
|
|
118
|
+
});
|
|
119
|
+
expect(backendInstallation.apiToken).toHaveBeenCalledOnce();
|
|
120
|
+
expect(backendInstallation.oauth).not.toHaveBeenCalled();
|
|
121
|
+
});
|
|
122
|
+
it("rejects ambiguous restored users", async () => {
|
|
123
|
+
const backendInstallation = installation([
|
|
124
|
+
{
|
|
125
|
+
userId: "one",
|
|
126
|
+
state: { status: "active" },
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
userId: "two",
|
|
130
|
+
state: { status: "active" },
|
|
131
|
+
},
|
|
132
|
+
]);
|
|
133
|
+
const source = createFoundryOntologyPullSource({
|
|
134
|
+
baseUrl: "https://foundry.example",
|
|
135
|
+
ontologyRid: "ri.ontology.main",
|
|
136
|
+
connection: {
|
|
137
|
+
oauth: {
|
|
138
|
+
clientId: "client",
|
|
139
|
+
redirectUrl: "http://127.0.0.1:9876/callback",
|
|
140
|
+
},
|
|
141
|
+
},
|
|
142
|
+
});
|
|
143
|
+
await expect(source.resolveConnection(backendInstallation)).rejects.toThrow("Multiple Foundry users are signed in");
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
//# sourceMappingURL=connectionPull.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connectionPull.test.js","sourceRoot":"","sources":["../../src/config/connectionPull.test.ts"],"names":[],"mappings":"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"}
|
package/lib/config/index.d.ts
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
import { type OntologyClient } from "@party-stack/foundry-client";
|
|
2
1
|
import { type Lens, type OntologyPullSource, type OntologyPullConfig } from "@party-stack/ontology";
|
|
2
|
+
import { type FoundryAuthenticationClient, type FoundryOAuthConnectionOptions } from "../connection.js";
|
|
3
3
|
import { type FoundryAttachmentConstraintOverride } from "./applyAttachmentConstraintOverrides.js";
|
|
4
4
|
export type { FoundryAttachmentConstraintOverride } from "./applyAttachmentConstraintOverrides.js";
|
|
5
|
-
export interface
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
foundryRedirectUrl: string;
|
|
5
|
+
export interface FoundryOntologyPullConnectionOptions {
|
|
6
|
+
oauth?: FoundryOAuthConnectionOptions;
|
|
7
|
+
token?: string;
|
|
8
|
+
userId?: string;
|
|
10
9
|
}
|
|
11
|
-
export interface
|
|
12
|
-
|
|
10
|
+
export interface CreateFoundryOntologyPullSourceOptions {
|
|
11
|
+
baseUrl: string;
|
|
12
|
+
ontologyRid: string;
|
|
13
|
+
connection: FoundryOntologyPullConnectionOptions;
|
|
13
14
|
attachmentConstraints?: FoundryAttachmentConstraintOverride[];
|
|
14
15
|
users?: {
|
|
15
16
|
objectType: string;
|
|
16
17
|
lens: Lens;
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
|
-
export declare function
|
|
20
|
-
export
|
|
21
|
-
export type FoundryOntologyPullConfig = OntologyPullConfig<FoundryOntologyPullOptions>;
|
|
20
|
+
export declare function createFoundryOntologyPullSource(options: CreateFoundryOntologyPullSourceOptions): OntologyPullSource<FoundryAuthenticationClient>;
|
|
21
|
+
export type FoundryOntologyPullConfig = OntologyPullConfig<FoundryAuthenticationClient>;
|
|
22
22
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAE1B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,2BAA2B,EAAE,KAAK,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAMxG,OAAO,EAEH,KAAK,mCAAmC,EAC3C,MAAM,yCAAyC,CAAC;AAEjD,YAAY,EAAE,mCAAmC,EAAE,MAAM,yCAAyC,CAAC;AAInG,MAAM,WAAW,oCAAoC;IACjD,KAAK,CAAC,EAAE,6BAA6B,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sCAAsC;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,oCAAoC,CAAC;IACjD,qBAAqB,CAAC,EAAE,mCAAmC,EAAE,CAAC;IAC9D,KAAK,CAAC,EAAE;QACJ,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,IAAI,CAAC;KACd,CAAC;CACL;AA0BD,wBAAgB,+BAA+B,CAC3C,OAAO,EAAE,sCAAsC,GAChD,kBAAkB,CAAC,2BAA2B,CAAC,CA+DjD;AAED,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC,2BAA2B,CAAC,CAAC"}
|
package/lib/config/index.js
CHANGED
|
@@ -1,40 +1,8 @@
|
|
|
1
|
-
import { performLocalOAuthFlow } from "@bobbyfidz/local-oauth-flow";
|
|
2
|
-
import { invariant } from "@bobbyfidz/panic";
|
|
3
|
-
import { createOntologyClient } from "@party-stack/foundry-client";
|
|
4
1
|
import { o, } from "@party-stack/ontology";
|
|
5
|
-
import {
|
|
2
|
+
import { createFoundryBackendInstallation, createFoundryOntologyRoute, } from "../installation/createFoundryBackendInstallation.js";
|
|
6
3
|
import { createFoundryUserObjectType } from "../users/foundryUser.js";
|
|
7
4
|
import { applyAttachmentConstraintOverrides, } from "./applyAttachmentConstraintOverrides.js";
|
|
8
5
|
const DEFAULT_FOUNDRY_SCOPES = ["api:use-ontologies-read", "offline_access"];
|
|
9
|
-
export async function createFoundryOntologyPullClient(config) {
|
|
10
|
-
const { accessToken } = await performLocalOAuthFlow({
|
|
11
|
-
issuerUrl: `${config.foundryUrl}/multipass/api`,
|
|
12
|
-
authorizationUrl: `${config.foundryUrl}/multipass/api/oauth2/authorize`,
|
|
13
|
-
tokenUrl: `${config.foundryUrl}/multipass/api/oauth2/token`,
|
|
14
|
-
clientId: config.foundryClientId,
|
|
15
|
-
redirectUrl: config.foundryRedirectUrl,
|
|
16
|
-
scopes: DEFAULT_FOUNDRY_SCOPES,
|
|
17
|
-
});
|
|
18
|
-
return createOntologyClient({
|
|
19
|
-
baseUrl: config.foundryUrl,
|
|
20
|
-
ontologyRid: config.foundryOntologyRid,
|
|
21
|
-
tokenProvider: () => Promise.resolve(accessToken),
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
function getDefaultEnvValue(key) {
|
|
25
|
-
const value = process.env[key] ??
|
|
26
|
-
process.env[`NEXT_PUBLIC_${key}`] ??
|
|
27
|
-
process.env[`VITE_PUBLIC_${key}`] ??
|
|
28
|
-
process.env[`EXPO_PUBLIC_${key}`];
|
|
29
|
-
invariant(value);
|
|
30
|
-
return value;
|
|
31
|
-
}
|
|
32
|
-
function getOptionalEnvValue(key) {
|
|
33
|
-
return (process.env[key] ??
|
|
34
|
-
process.env[`NEXT_PUBLIC_${key}`] ??
|
|
35
|
-
process.env[`VITE_PUBLIC_${key}`] ??
|
|
36
|
-
process.env[`EXPO_PUBLIC_${key}`]);
|
|
37
|
-
}
|
|
38
6
|
function addConfiguredUser(ontology, users) {
|
|
39
7
|
if (!users)
|
|
40
8
|
return ontology;
|
|
@@ -56,27 +24,56 @@ function addConfiguredUser(ontology, users) {
|
|
|
56
24
|
}),
|
|
57
25
|
};
|
|
58
26
|
}
|
|
59
|
-
export
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
27
|
+
export function createFoundryOntologyPullSource(options) {
|
|
28
|
+
return {
|
|
29
|
+
ontologyId: options.ontologyRid,
|
|
30
|
+
createInstallation: ({ runtime }) => createFoundryBackendInstallation({
|
|
31
|
+
installationId: `foundry-pull:${options.baseUrl}:${options.ontologyRid}`,
|
|
32
|
+
baseUrl: options.baseUrl,
|
|
33
|
+
runtime,
|
|
34
|
+
connections: {
|
|
35
|
+
token: options.connection.token,
|
|
36
|
+
oauth: options.connection.oauth
|
|
37
|
+
? {
|
|
38
|
+
...options.connection.oauth,
|
|
39
|
+
scopes: options.connection.oauth.scopes ?? DEFAULT_FOUNDRY_SCOPES,
|
|
40
|
+
}
|
|
41
|
+
: undefined,
|
|
42
|
+
},
|
|
43
|
+
routes: [
|
|
44
|
+
createFoundryOntologyRoute({
|
|
45
|
+
ontologyId: options.ontologyRid,
|
|
46
|
+
}),
|
|
47
|
+
],
|
|
48
|
+
}),
|
|
49
|
+
async resolveConnection(installation) {
|
|
50
|
+
const configuredUserId = options.connection.userId;
|
|
51
|
+
const activeConnections = [...installation.connections.values()]
|
|
52
|
+
.filter((connection) => connection.state.status === "active")
|
|
53
|
+
.map((connection) => ({
|
|
54
|
+
userId: connection.userId,
|
|
55
|
+
state: connection.state,
|
|
56
|
+
}));
|
|
57
|
+
if (!options.connection.token && !configuredUserId && activeConnections.length > 1) {
|
|
58
|
+
throw new Error("Multiple Foundry users are signed in for this project. Set connection.userId in the ontology pull source.");
|
|
59
|
+
}
|
|
60
|
+
let connection = options.connection.token
|
|
61
|
+
? await installation.authentication.signIn.apiToken()
|
|
62
|
+
: configuredUserId
|
|
63
|
+
? activeConnections.find((candidate) => candidate.userId === configuredUserId)
|
|
64
|
+
: activeConnections[0];
|
|
65
|
+
if (!connection && options.connection.oauth) {
|
|
66
|
+
connection = await installation.authentication.signIn.oauth();
|
|
67
|
+
}
|
|
68
|
+
if (!connection) {
|
|
69
|
+
throw new Error("Foundry ontology pull requires connection.oauth or connection.token.");
|
|
70
|
+
}
|
|
71
|
+
if (configuredUserId && connection.userId !== configuredUserId) {
|
|
72
|
+
throw new Error(`Foundry signed in as "${connection.userId}", but connection.userId is "${configuredUserId}".`);
|
|
73
|
+
}
|
|
74
|
+
return connection;
|
|
75
|
+
},
|
|
76
|
+
transformPulledOntology: (ontology) => addConfiguredUser(applyAttachmentConstraintOverrides(ontology, options.attachmentConstraints ?? []), options.users),
|
|
77
|
+
};
|
|
78
|
+
}
|
|
82
79
|
//# sourceMappingURL=index.js.map
|
package/lib/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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"}
|
package/lib/config/index.test.js
CHANGED
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
import { o } from "@party-stack/ontology";
|
|
2
2
|
import { describe, expect, it } from "vitest";
|
|
3
|
-
import {
|
|
4
|
-
|
|
3
|
+
import { createFoundryOntologyPullSource } from "./index.js";
|
|
4
|
+
function createSource(options) {
|
|
5
|
+
return createFoundryOntologyPullSource({
|
|
6
|
+
baseUrl: "https://foundry.example",
|
|
7
|
+
ontologyRid: "ri.ontology.main",
|
|
8
|
+
connection: {
|
|
9
|
+
token: "token",
|
|
10
|
+
},
|
|
11
|
+
...options,
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
describe("createFoundryOntologyPullSource", () => {
|
|
5
15
|
it("applies targeted attachment constraints after pull", async () => {
|
|
6
16
|
const ir = {
|
|
7
17
|
types: [],
|
|
@@ -49,7 +59,7 @@ describe("foundryOntologyPullSource", () => {
|
|
|
49
59
|
mediaTypes: ["image/png", "image/jpeg"],
|
|
50
60
|
}),
|
|
51
61
|
};
|
|
52
|
-
const transformed = await
|
|
62
|
+
const transformed = await createSource({
|
|
53
63
|
attachmentConstraints: [
|
|
54
64
|
{
|
|
55
65
|
target: {
|
|
@@ -68,7 +78,7 @@ describe("foundryOntologyPullSource", () => {
|
|
|
68
78
|
constraint,
|
|
69
79
|
},
|
|
70
80
|
],
|
|
71
|
-
});
|
|
81
|
+
}).transformPulledOntology(ir);
|
|
72
82
|
expect(transformed.objectTypes[0]?.properties[1]?.type).toEqual(o.attachment({
|
|
73
83
|
constraint,
|
|
74
84
|
meta: { type: "media" },
|
|
@@ -122,7 +132,7 @@ describe("foundryOntologyPullSource", () => {
|
|
|
122
132
|
],
|
|
123
133
|
queryFunctionTypes: [],
|
|
124
134
|
};
|
|
125
|
-
const transformed = await
|
|
135
|
+
const transformed = await createSource({
|
|
126
136
|
users: {
|
|
127
137
|
objectType: "User",
|
|
128
138
|
lens: {
|
|
@@ -137,7 +147,7 @@ describe("foundryOntologyPullSource", () => {
|
|
|
137
147
|
],
|
|
138
148
|
},
|
|
139
149
|
},
|
|
140
|
-
});
|
|
150
|
+
}).transformPulledOntology(ir);
|
|
141
151
|
expect(transformed.objectTypes.map((type) => type.name)).toContain("User");
|
|
142
152
|
expect(transformed.contextType).toEqual(o.struct({
|
|
143
153
|
fields: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/config/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAmB,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/config/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export interface CreateFoundryBackendInstallationOptions<AuthenticationClient ex
|
|
|
16
16
|
}
|
|
17
17
|
export declare function createFoundryOntologyRoute(options: {
|
|
18
18
|
ontologyId: string;
|
|
19
|
-
ir
|
|
19
|
+
ir?: OntologyIR;
|
|
20
20
|
users?: FoundryUsersIntegration | ((userId: string) => FoundryUsersIntegration);
|
|
21
21
|
persistObjects?: boolean;
|
|
22
22
|
writes?: LiveOntologyWrites;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFoundryBackendInstallation.d.ts","sourceRoot":"","sources":["../../src/installation/createFoundryBackendInstallation.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"createFoundryBackendInstallation.d.ts","sourceRoot":"","sources":["../../src/installation/createFoundryBackendInstallation.ts"],"names":[],"mappings":"AACA,OAAO,EAGH,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAGhC,KAAK,aAAa,EACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,gCAAgC,EAAoB,MAAM,0BAA0B,CAAC;AACnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAEH,KAAK,uBAAuB,EAC/B,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAEH,KAAK,qCAAqC,EAC1C,KAAK,2BAA2B,EACnC,MAAM,kBAAkB,CAAC;AAG1B,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,qCAAqC,EAAE,SAAS,CAAC,CAAC;AAC9F,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC;AAEtE,MAAM,WAAW,uCAAuC,CACpD,oBAAoB,SAAS,MAAM,GAAG,2BAA2B;IAEjE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,sBAAsB,CAAC;IAChC,WAAW,EAAE,wBAAwB,GAAG,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;IAC/F,MAAM,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACxC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnF;AA2BD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,CAAC,EAAE,uBAAuB,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,uBAAuB,CAAC,CAAC;IAChF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC/B,GAAG,oBAAoB,CA2BvB;AAED,wBAAgB,gCAAgC,CAC5C,oBAAoB,SAAS,MAAM,GAAG,2BAA2B,EAEjE,OAAO,EAAE,uCAAuC,CAAC,oBAAoB,CAAC,GACvE,OAAO,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC,CAe5D"}
|
|
@@ -1,33 +1,54 @@
|
|
|
1
1
|
import { createOntologyClient } from "@party-stack/foundry-client";
|
|
2
|
-
import { createOntologyBackendInstallation, } from "@party-stack/ontology";
|
|
2
|
+
import { createMetaOntologyConfiguration, createOntologyBackendInstallation, } from "@party-stack/ontology";
|
|
3
3
|
import { createFoundryOntologyBackend, } from "../adapter/createFoundryOntologyBackendAdapter.js";
|
|
4
4
|
import { createFoundryConnectionAdapter, } from "../connection.js";
|
|
5
|
+
import { createFoundryMetaOntologyBackendAdapter } from "../meta/createFoundryMetaOntologyBackendAdapter.js";
|
|
6
|
+
function createConnectionOntologyClient(baseUrl, ontologyId, egress) {
|
|
7
|
+
return createOntologyClient({
|
|
8
|
+
baseUrl,
|
|
9
|
+
ontologyRid: ontologyId,
|
|
10
|
+
// Authentication is applied by ConnectionEgress. This
|
|
11
|
+
// placeholder only satisfies the current OSDK client context.
|
|
12
|
+
tokenProvider: () => Promise.reject(new Error("Token access is unavailable; authentication is applied by connection egress.")),
|
|
13
|
+
fetch: egress.fetch,
|
|
14
|
+
createWebSocket: (url, protocols) => egress.createWebSocket(url, protocols),
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
function configureFoundryMeta(baseUrl, options) {
|
|
18
|
+
const client = createConnectionOntologyClient(baseUrl, options.ontologyId, options.egress);
|
|
19
|
+
return createMetaOntologyConfiguration({
|
|
20
|
+
backend: () => createFoundryMetaOntologyBackendAdapter({
|
|
21
|
+
client,
|
|
22
|
+
}),
|
|
23
|
+
});
|
|
24
|
+
}
|
|
5
25
|
export function createFoundryOntologyRoute(options) {
|
|
6
|
-
return (baseUrl) =>
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}),
|
|
26
|
-
persistObjects: options.persistObjects ?? true,
|
|
27
|
-
writes: options.writes,
|
|
26
|
+
return (baseUrl) => {
|
|
27
|
+
const route = {
|
|
28
|
+
matches: (ontologyId) => ontologyId === options.ontologyId,
|
|
29
|
+
};
|
|
30
|
+
const ir = options.ir;
|
|
31
|
+
if (ir) {
|
|
32
|
+
route.configure = ({ connection, egress }) => {
|
|
33
|
+
const client = createConnectionOntologyClient(baseUrl, options.ontologyId, egress);
|
|
34
|
+
return {
|
|
35
|
+
ir,
|
|
36
|
+
backend: createFoundryOntologyBackend({
|
|
37
|
+
client,
|
|
38
|
+
users: typeof options.users === "function"
|
|
39
|
+
? options.users(connection.userId)
|
|
40
|
+
: options.users,
|
|
41
|
+
}),
|
|
42
|
+
persistObjects: options.persistObjects ?? true,
|
|
43
|
+
writes: options.writes,
|
|
44
|
+
};
|
|
28
45
|
};
|
|
29
|
-
}
|
|
30
|
-
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
route.configureMeta = (configureOptions) => configureFoundryMeta(baseUrl, configureOptions);
|
|
49
|
+
}
|
|
50
|
+
return route;
|
|
51
|
+
};
|
|
31
52
|
}
|
|
32
53
|
export function createFoundryBackendInstallation(options) {
|
|
33
54
|
const connectionAdapter = typeof options.connections === "function"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFoundryBackendInstallation.js","sourceRoot":"","sources":["../../src/installation/createFoundryBackendInstallation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACH,iCAAiC,
|
|
1
|
+
{"version":3,"file":"createFoundryBackendInstallation.js","sourceRoot":"","sources":["../../src/installation/createFoundryBackendInstallation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createFoundryBackendInstallation.test.d.ts","sourceRoot":"","sources":["../../src/installation/createFoundryBackendInstallation.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { createFoundryOntologyRoute } from "./createFoundryBackendInstallation.js";
|
|
3
|
+
const ir = {
|
|
4
|
+
types: [],
|
|
5
|
+
objectTypes: [],
|
|
6
|
+
linkTypes: [],
|
|
7
|
+
actionTypes: [],
|
|
8
|
+
queryFunctionTypes: [],
|
|
9
|
+
};
|
|
10
|
+
describe("createFoundryOntologyRoute", () => {
|
|
11
|
+
it("creates a metadata-only route when IR is omitted", () => {
|
|
12
|
+
const route = createFoundryOntologyRoute({
|
|
13
|
+
ontologyId: "ri.ontology.main",
|
|
14
|
+
})("https://foundry.example");
|
|
15
|
+
expect(route.configure === undefined).toBe(true);
|
|
16
|
+
expect(route.configureMeta !== undefined).toBe(true);
|
|
17
|
+
});
|
|
18
|
+
it("defers IR metadata projection to the installation", () => {
|
|
19
|
+
const route = createFoundryOntologyRoute({
|
|
20
|
+
ontologyId: "ri.ontology.main",
|
|
21
|
+
ir,
|
|
22
|
+
})("https://foundry.example");
|
|
23
|
+
expect(route.configure !== undefined).toBe(true);
|
|
24
|
+
expect(route.configureMeta === undefined).toBe(true);
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
//# sourceMappingURL=createFoundryBackendInstallation.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createFoundryBackendInstallation.test.js","sourceRoot":"","sources":["../../src/installation/createFoundryBackendInstallation.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAEnF,MAAM,EAAE,GAAe;IACnB,KAAK,EAAE,EAAE;IACT,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,EAAE;IACb,WAAW,EAAE,EAAE;IACf,kBAAkB,EAAE,EAAE;CACzB,CAAC;AAEF,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QACxD,MAAM,KAAK,GAAG,0BAA0B,CAAC;YACrC,UAAU,EAAE,kBAAkB;SACjC,CAAC,CAAC,yBAAyB,CAAC,CAAC;QAE9B,MAAM,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,MAAM,KAAK,GAAG,0BAA0B,CAAC;YACrC,UAAU,EAAE,kBAAkB;YAC9B,EAAE;SACL,CAAC,CAAC,yBAAyB,CAAC,CAAC;QAE9B,MAAM,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@party-stack/foundry-ontology",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -24,7 +24,6 @@
|
|
|
24
24
|
"lib"
|
|
25
25
|
],
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@bobbyfidz/local-oauth-flow": "^0.1.0",
|
|
28
27
|
"@bobbyfidz/panic": "^0.1.0",
|
|
29
28
|
"@bobbyfidz/urls": "^0.2.1",
|
|
30
29
|
"@osdk/foundry.admin": "^2.71.0",
|
|
@@ -42,7 +41,7 @@
|
|
|
42
41
|
"@party-stack/foundry-client": "0.3.0",
|
|
43
42
|
"@party-stack/foundry-object-set-watcher": "0.4.0",
|
|
44
43
|
"@party-stack/oauth": "0.2.0",
|
|
45
|
-
"@party-stack/ontology": "0.
|
|
44
|
+
"@party-stack/ontology": "0.12.0",
|
|
46
45
|
"@party-stack/runtime": "0.3.0"
|
|
47
46
|
},
|
|
48
47
|
"devDependencies": {
|