@eightyfourthousand/data-access 2026.5.3 → 2026.5.5
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/lookup-entity.d.ts +8 -2
- package/lib/lookup-entity.js +32 -19
- package/lib/lookup-entity.js.map +1 -1
- package/package.json +2 -2
package/lib/lookup-entity.d.ts
CHANGED
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
import { DataClient } from './types';
|
|
2
|
+
export interface LookupEntityReturnType {
|
|
3
|
+
path?: string;
|
|
4
|
+
uuid?: string;
|
|
5
|
+
workUuid?: string;
|
|
6
|
+
query?: URLSearchParams;
|
|
7
|
+
}
|
|
2
8
|
export declare const lookupEntity: ({ type, entity, prefix, xmlId, searchParams, }: {
|
|
3
9
|
type: string;
|
|
4
10
|
entity: string;
|
|
5
11
|
prefix?: string;
|
|
6
12
|
xmlId?: string;
|
|
7
13
|
searchParams?: URLSearchParams;
|
|
8
|
-
}) => Promise<
|
|
14
|
+
}) => Promise<LookupEntityReturnType>;
|
|
9
15
|
export declare const lookupEntityWithClient: ({ client, type, entity, prefix, xmlId, searchParams, }: {
|
|
10
16
|
client: DataClient;
|
|
11
17
|
type: string;
|
|
@@ -13,4 +19,4 @@ export declare const lookupEntityWithClient: ({ client, type, entity, prefix, xm
|
|
|
13
19
|
prefix?: string;
|
|
14
20
|
xmlId?: string;
|
|
15
21
|
searchParams?: URLSearchParams;
|
|
16
|
-
}) => Promise<
|
|
22
|
+
}) => Promise<LookupEntityReturnType>;
|
package/lib/lookup-entity.js
CHANGED
|
@@ -13,7 +13,7 @@ const ALLOWED_TYPES = [
|
|
|
13
13
|
];
|
|
14
14
|
export const lookupEntity = async ({ type, entity, prefix = '', xmlId, searchParams, }) => {
|
|
15
15
|
if (!ALLOWED_TYPES.includes(type)) {
|
|
16
|
-
return;
|
|
16
|
+
return {};
|
|
17
17
|
}
|
|
18
18
|
const client = await createServerClient();
|
|
19
19
|
return await lookupEntityWithClient({
|
|
@@ -26,43 +26,51 @@ export const lookupEntity = async ({ type, entity, prefix = '', xmlId, searchPar
|
|
|
26
26
|
});
|
|
27
27
|
};
|
|
28
28
|
export const lookupEntityWithClient = async ({ client, type, entity, prefix = '', xmlId, searchParams, }) => {
|
|
29
|
-
let path
|
|
29
|
+
let path;
|
|
30
|
+
let workUuid;
|
|
31
|
+
let uuid;
|
|
30
32
|
const query = searchParams || new URLSearchParams();
|
|
31
33
|
switch (type) {
|
|
32
34
|
case 'bibliography':
|
|
33
35
|
{
|
|
34
36
|
const item = await getBibliographyEntry({ client, uuid: entity });
|
|
35
37
|
if (!item?.workUuid || !item.uuid) {
|
|
36
|
-
return;
|
|
38
|
+
return {};
|
|
37
39
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
+
workUuid = item.workUuid;
|
|
41
|
+
uuid = item.uuid;
|
|
42
|
+
query.set('right', `open:bibliography:${uuid}`);
|
|
43
|
+
path = `${prefix}/${workUuid}?${query.toString()}`;
|
|
40
44
|
}
|
|
41
45
|
break;
|
|
42
46
|
case 'glossary':
|
|
43
47
|
{
|
|
44
48
|
const item = await getGlossaryInstance({ client, uuid: entity });
|
|
45
49
|
if (!item?.workUuid || !item.uuid) {
|
|
46
|
-
return;
|
|
50
|
+
return {};
|
|
47
51
|
}
|
|
48
|
-
|
|
49
|
-
|
|
52
|
+
workUuid = item.workUuid;
|
|
53
|
+
uuid = item.uuid;
|
|
54
|
+
query.set('right', `open:glossary:${uuid}`);
|
|
55
|
+
path = `${prefix}/${workUuid}?${query.toString()}`;
|
|
50
56
|
}
|
|
51
57
|
break;
|
|
52
58
|
case 'passage':
|
|
53
59
|
{
|
|
54
60
|
const item = await getPassage({ client, uuid: entity });
|
|
55
61
|
if (!item?.workUuid || !item.uuid) {
|
|
56
|
-
return;
|
|
62
|
+
return {};
|
|
57
63
|
}
|
|
64
|
+
workUuid = item.workUuid;
|
|
65
|
+
uuid = item.uuid;
|
|
58
66
|
const queryTab = query.get('tab') || undefined;
|
|
59
67
|
const { panel, tab } = panelAndTabForContentType(item.type, queryTab);
|
|
60
68
|
query.delete('tab');
|
|
61
|
-
query.set(panel, `open:${tab}:${
|
|
69
|
+
query.set(panel, `open:${tab}:${uuid}`);
|
|
62
70
|
if (item.toh) {
|
|
63
71
|
query.set('toh', item.toh);
|
|
64
72
|
}
|
|
65
|
-
path = `${prefix}/${
|
|
73
|
+
path = `${prefix}/${workUuid}?${query.toString()}`;
|
|
66
74
|
}
|
|
67
75
|
break;
|
|
68
76
|
case 'translation':
|
|
@@ -73,19 +81,22 @@ export const lookupEntityWithClient = async ({ client, type, entity, prefix = ''
|
|
|
73
81
|
const item = await getPassageUuidByXmlId({ client, xmlId });
|
|
74
82
|
const queryTab = query.get('tab') || undefined;
|
|
75
83
|
const { panel, tab } = panelAndTabForContentType(item.type, queryTab);
|
|
76
|
-
|
|
77
|
-
|
|
84
|
+
uuid = item?.uuid;
|
|
85
|
+
workUuid = item?.workUuid;
|
|
86
|
+
if (uuid && workUuid) {
|
|
78
87
|
query.delete('tab');
|
|
79
88
|
query.set(panel, `open:${tab}:${uuid}`);
|
|
80
89
|
path = `${prefix}/${workUuid}?${query.toString()}`;
|
|
81
|
-
return path;
|
|
90
|
+
return { path, uuid, workUuid, query };
|
|
82
91
|
}
|
|
83
92
|
}
|
|
84
93
|
const item = await getTranslationMetadataByToh({ client, toh });
|
|
85
94
|
if (!item?.uuid) {
|
|
86
|
-
return;
|
|
95
|
+
return {};
|
|
87
96
|
}
|
|
88
|
-
|
|
97
|
+
uuid = item.uuid;
|
|
98
|
+
workUuid = item.uuid;
|
|
99
|
+
path = `${prefix}/${uuid}?${query.toString()}`;
|
|
89
100
|
}
|
|
90
101
|
break;
|
|
91
102
|
case 'work':
|
|
@@ -95,15 +106,17 @@ export const lookupEntityWithClient = async ({ client, type, entity, prefix = ''
|
|
|
95
106
|
uuid: entity,
|
|
96
107
|
});
|
|
97
108
|
if (!item?.uuid) {
|
|
98
|
-
return;
|
|
109
|
+
return {};
|
|
99
110
|
}
|
|
111
|
+
uuid = item.uuid;
|
|
112
|
+
workUuid = item.uuid;
|
|
100
113
|
path = `${prefix}/${item.uuid}?${query.toString()}`;
|
|
101
114
|
}
|
|
102
115
|
break;
|
|
103
116
|
default: {
|
|
104
|
-
return;
|
|
117
|
+
return {};
|
|
105
118
|
}
|
|
106
119
|
}
|
|
107
|
-
return path;
|
|
120
|
+
return { path, uuid, workUuid, query };
|
|
108
121
|
};
|
|
109
122
|
//# sourceMappingURL=lookup-entity.js.map
|
package/lib/lookup-entity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookup-entity.js","sourceRoot":"","sources":["../../../../libs/data-access/src/lib/lookup-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAGjD,MAAM,aAAa,GAAG;IACpB,cAAc;IACd,UAAU;IACV,SAAS;IACT,aAAa;IACb,MAAM;CACP,CAAC;
|
|
1
|
+
{"version":3,"file":"lookup-entity.js","sourceRoot":"","sources":["../../../../libs/data-access/src/lib/lookup-entity.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eightyfourthousand/data-access",
|
|
3
|
-
"version": "2026.5.
|
|
3
|
+
"version": "2026.5.5",
|
|
4
4
|
"description": "Shared data access clients, DTO mappers, and domain types for 84000 applications.",
|
|
5
5
|
"private": false,
|
|
6
6
|
"repository": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"access": "public"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@eightyfourthousand/lib-utils": "^2026.5.
|
|
20
|
+
"@eightyfourthousand/lib-utils": "^2026.5.5",
|
|
21
21
|
"@supabase/ssr": "^0.5.2",
|
|
22
22
|
"@supabase/supabase-js": "^2.48.1",
|
|
23
23
|
"@tiptap/core": "^3.13.0",
|