annosearch 0.4.3 → 0.4.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/README.md +112 -22
- package/dist/highlight.js +2 -2
- package/dist/highlight.js.map +1 -1
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/load.js +7 -7
- package/dist/load.js.map +1 -1
- package/dist/search.js +6 -1
- package/dist/search.js.map +1 -1
- package/dist/validate.js +9 -12
- package/dist/validate.js.map +1 -1
- package/package.json +2 -2
- package/dist/index-config.yaml +0 -11
package/README.md
CHANGED
|
@@ -74,7 +74,9 @@ After Quickwit finishes ingesting and indexing the data we can perform a search.
|
|
|
74
74
|
|
|
75
75
|
## Usage
|
|
76
76
|
|
|
77
|
-
|
|
77
|
+
You can use AnnoSearch either natively with npm or via Docker containers.
|
|
78
|
+
|
|
79
|
+
### Native Installation (npm)
|
|
78
80
|
|
|
79
81
|
Make sure you have Quickwit installed and [running](https://quickwit.io/docs/get-started/quickstart) and then install AnnoSearch.
|
|
80
82
|
|
|
@@ -82,34 +84,31 @@ Make sure you have Quickwit installed and [running](https://quickwit.io/docs/get
|
|
|
82
84
|
npm install -g annosearch
|
|
83
85
|
```
|
|
84
86
|
|
|
85
|
-
|
|
87
|
+
Once installed, you can use all the commands directly (see [Commands](#commands) section below).
|
|
88
|
+
|
|
89
|
+
### Docker Usage
|
|
90
|
+
|
|
91
|
+
For containerized deployments, you can use Docker instead of installing npm packages.
|
|
86
92
|
|
|
87
|
-
|
|
93
|
+
#### Using Docker Compose
|
|
94
|
+
|
|
95
|
+
The docker-compose.yml file supports both pulling the published image from GitHub Container Registry (GHCR) or building locally:
|
|
88
96
|
|
|
89
97
|
```bash
|
|
98
|
+
# Pull from GHCR (recommended for production)
|
|
99
|
+
docker compose pull
|
|
100
|
+
docker compose up
|
|
101
|
+
|
|
102
|
+
# Or build locally (for development)
|
|
103
|
+
docker compose build
|
|
90
104
|
docker compose up
|
|
91
105
|
```
|
|
92
106
|
|
|
93
|
-
|
|
94
|
-
```bash
|
|
95
|
-
❯ http :3000/version
|
|
96
|
-
HTTP/1.1 200 OK
|
|
97
|
-
Access-Control-Allow-Credentials: true
|
|
98
|
-
Access-Control-Allow-Origin: *
|
|
99
|
-
Connection: keep-alive
|
|
100
|
-
Content-Length: 19
|
|
101
|
-
Content-Type: application/json; charset=utf-8
|
|
102
|
-
Date: Wed, 11 Jun 2025 13:01:46 GMT
|
|
103
|
-
ETag: W/"13-iZUY2mYGnAauZNa8YzHxtZrPkFE"
|
|
104
|
-
Keep-Alive: timeout=5
|
|
105
|
-
X-Powered-By: Express
|
|
107
|
+
The published image is available at `ghcr.io/annosearch/annosearch:latest`.
|
|
106
108
|
|
|
107
|
-
|
|
108
|
-
"version": "0.3.6"
|
|
109
|
-
}
|
|
110
|
-
```
|
|
109
|
+
## Commands
|
|
111
110
|
|
|
112
|
-
|
|
111
|
+
The following commands work with both native npm installation and Docker. For each command, expand the "Docker example" section to see how to run it in a container.
|
|
113
112
|
|
|
114
113
|
#### `init`
|
|
115
114
|
|
|
@@ -119,6 +118,22 @@ Initialize a new index with a specified ID.
|
|
|
119
118
|
annosearch init --index <index-id>
|
|
120
119
|
```
|
|
121
120
|
|
|
121
|
+
<details>
|
|
122
|
+
<summary>Docker example</summary>
|
|
123
|
+
|
|
124
|
+
```bash
|
|
125
|
+
# Using docker-compose
|
|
126
|
+
docker compose run --rm annosearch init --index <index-id>
|
|
127
|
+
|
|
128
|
+
# Using standalone docker (with published image)
|
|
129
|
+
docker run --rm --network annosearch_default \
|
|
130
|
+
-e QUICKWIT_BASE_URL=http://quickwit:7280/api/v1/ \
|
|
131
|
+
-v $(pwd)/qwdata:/quickwit/qwdata \
|
|
132
|
+
ghcr.io/annosearch/annosearch:latest init --index <index-id>
|
|
133
|
+
```
|
|
134
|
+
|
|
135
|
+
</details>
|
|
136
|
+
|
|
122
137
|
#### `load`
|
|
123
138
|
|
|
124
139
|
Load an index from a URI, specifying the type of content being loaded (e.g., Manifest, Collection, or AnnotationCollection).
|
|
@@ -130,6 +145,22 @@ annosearch load --index <index-id> --type <type> --uri <uri>
|
|
|
130
145
|
- `type`: The type of content (Manifest, Collection, AnnotationCollection).
|
|
131
146
|
- `uri`: The URI to load the content from.
|
|
132
147
|
|
|
148
|
+
<details>
|
|
149
|
+
<summary>Docker example</summary>
|
|
150
|
+
|
|
151
|
+
```bash
|
|
152
|
+
# Using docker-compose
|
|
153
|
+
docker compose run --rm annosearch load --index <index-id> --type <type> --uri <uri>
|
|
154
|
+
|
|
155
|
+
# Using standalone docker (with published image)
|
|
156
|
+
docker run --rm --network annosearch_default \
|
|
157
|
+
-e QUICKWIT_BASE_URL=http://quickwit:7280/api/v1/ \
|
|
158
|
+
-v $(pwd)/qwdata:/quickwit/qwdata \
|
|
159
|
+
ghcr.io/annosearch/annosearch:latest load --index <index-id> --type <type> --uri <uri>
|
|
160
|
+
```
|
|
161
|
+
|
|
162
|
+
</details>
|
|
163
|
+
|
|
133
164
|
#### `delete`
|
|
134
165
|
|
|
135
166
|
Delete an existing index by ID.
|
|
@@ -138,6 +169,22 @@ Delete an existing index by ID.
|
|
|
138
169
|
annosearch delete --index <index-id>
|
|
139
170
|
```
|
|
140
171
|
|
|
172
|
+
<details>
|
|
173
|
+
<summary>Docker example</summary>
|
|
174
|
+
|
|
175
|
+
```bash
|
|
176
|
+
# Using docker-compose
|
|
177
|
+
docker compose run --rm annosearch delete --index <index-id>
|
|
178
|
+
|
|
179
|
+
# Using standalone docker (with published image)
|
|
180
|
+
docker run --rm --network annosearch_default \
|
|
181
|
+
-e QUICKWIT_BASE_URL=http://quickwit:7280/api/v1/ \
|
|
182
|
+
-v $(pwd)/qwdata:/quickwit/qwdata \
|
|
183
|
+
ghcr.io/annosearch/annosearch:latest delete --index <index-id>
|
|
184
|
+
```
|
|
185
|
+
|
|
186
|
+
</details>
|
|
187
|
+
|
|
141
188
|
#### `search`
|
|
142
189
|
|
|
143
190
|
Perform a search on a specified index.
|
|
@@ -150,7 +197,23 @@ annosearch search --index <index-id> --query <search-query> [--page <page-number
|
|
|
150
197
|
- `page`: Optional page number (defaults to 0).
|
|
151
198
|
- `motivation`: Optional space separated list of motivation terms.
|
|
152
199
|
- `date`: Optional space separated list of date ranges.
|
|
153
|
-
- `user`: Optional space separated list of URIs that are the identities of users.
|
|
200
|
+
- `user`: Optional space separated list of URIs that are the identities of users.
|
|
201
|
+
|
|
202
|
+
<details>
|
|
203
|
+
<summary>Docker example</summary>
|
|
204
|
+
|
|
205
|
+
```bash
|
|
206
|
+
# Using docker-compose
|
|
207
|
+
docker compose run --rm annosearch search --index <index-id> --query <search-query>
|
|
208
|
+
|
|
209
|
+
# Using standalone docker (with published image)
|
|
210
|
+
docker run --rm --network annosearch_default \
|
|
211
|
+
-e QUICKWIT_BASE_URL=http://quickwit:7280/api/v1/ \
|
|
212
|
+
-v $(pwd)/qwdata:/quickwit/qwdata \
|
|
213
|
+
ghcr.io/annosearch/annosearch:latest search --index <index-id> --query <search-query>
|
|
214
|
+
```
|
|
215
|
+
|
|
216
|
+
</details>
|
|
154
217
|
|
|
155
218
|
#### `serve`
|
|
156
219
|
|
|
@@ -170,6 +233,24 @@ For example, if you have indexed a collection called `foobar`, you can search it
|
|
|
170
233
|
http://localhost:3000/foobar/search?q=baz
|
|
171
234
|
```
|
|
172
235
|
|
|
236
|
+
<details>
|
|
237
|
+
<summary>Docker example</summary>
|
|
238
|
+
|
|
239
|
+
```bash
|
|
240
|
+
# Using docker-compose (recommended)
|
|
241
|
+
docker compose up
|
|
242
|
+
|
|
243
|
+
# Using standalone docker (with published image)
|
|
244
|
+
docker run --rm --network annosearch_default \
|
|
245
|
+
-e QUICKWIT_BASE_URL=http://quickwit:7280/api/v1/ \
|
|
246
|
+
-e ANNOSEARCH_PUBLIC_URL=http://localhost:3000 \
|
|
247
|
+
-p 3000:3000 \
|
|
248
|
+
-v $(pwd)/qwdata:/quickwit/qwdata \
|
|
249
|
+
ghcr.io/annosearch/annosearch:latest serve --port 3000 --host 0.0.0.0
|
|
250
|
+
```
|
|
251
|
+
|
|
252
|
+
</details>
|
|
253
|
+
|
|
173
254
|
#### `version`
|
|
174
255
|
|
|
175
256
|
Display the current version of AnnoSearch.
|
|
@@ -178,6 +259,15 @@ Display the current version of AnnoSearch.
|
|
|
178
259
|
annosearch version
|
|
179
260
|
```
|
|
180
261
|
|
|
262
|
+
<details>
|
|
263
|
+
<summary>Docker example</summary>
|
|
264
|
+
|
|
265
|
+
```bash
|
|
266
|
+
docker run --rm ghcr.io/annosearch/annosearch:latest version
|
|
267
|
+
```
|
|
268
|
+
|
|
269
|
+
</details>
|
|
270
|
+
|
|
181
271
|
|
|
182
272
|
## Configuration
|
|
183
273
|
|
package/dist/highlight.js
CHANGED
|
@@ -86,12 +86,12 @@ function createItem(id, term, prefix, suffix, counter, language) {
|
|
|
86
86
|
}
|
|
87
87
|
function highlightTerms(annotation_page, query, snippetLength = 25) {
|
|
88
88
|
const terms = query.split(/\s+/).map(utils_1.normalizeTerm).filter(Boolean); // Split into terms, normalize, remove empty ones
|
|
89
|
-
const annotationPageParser = new maniiifest_1.
|
|
89
|
+
const annotationPageParser = new maniiifest_1.ManiiifestAnnotationPage(annotation_page);
|
|
90
90
|
const annotations = annotationPageParser.iterateAnnotationPageAnnotation();
|
|
91
91
|
let matchCounter = 1;
|
|
92
92
|
let annotationItems = [];
|
|
93
93
|
for (const annotation of annotations) {
|
|
94
|
-
const annotationParser = new maniiifest_1.
|
|
94
|
+
const annotationParser = new maniiifest_1.ManiiifestAnnotation(annotation);
|
|
95
95
|
const bodyParser = annotationParser.iterateAnnotationTextualBody();
|
|
96
96
|
for (const body of bodyParser) {
|
|
97
97
|
const bodyValue = body.value;
|
package/dist/highlight.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"highlight.js","sourceRoot":"","sources":["../src/highlight.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgDA,wCAmDC;AAnGD,2BAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"highlight.js","sourceRoot":"","sources":["../src/highlight.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -19,7 +19,6 @@ const AnnoSearch_1 = __importDefault(require("./AnnoSearch"));
|
|
|
19
19
|
const server_1 = require("./server");
|
|
20
20
|
const utils_1 = require("./utils");
|
|
21
21
|
const package_json_1 = require("../package.json"); // Import version from package.json
|
|
22
|
-
const validate_1 = require("./validate");
|
|
23
22
|
const client = new AnnoSearch_1.default();
|
|
24
23
|
function searchOptions(yargs) {
|
|
25
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -40,7 +39,6 @@ function searchOptions(yargs) {
|
|
|
40
39
|
alias: 'm',
|
|
41
40
|
type: 'string',
|
|
42
41
|
description: 'Motivation',
|
|
43
|
-
choices: validate_1.motivations,
|
|
44
42
|
demandOption: false,
|
|
45
43
|
})
|
|
46
44
|
.option('date', {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,kDAA0B;AAC1B,2CAAwC;AACxC,8DAAsC;AACtC,qCAAiC;AACjC,mCAA8C;AAC9C,kDAA0C,CAAC,mCAAmC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/load.js
CHANGED
|
@@ -105,7 +105,7 @@ function processAutocompleteTerms(parser) {
|
|
|
105
105
|
}
|
|
106
106
|
function* processAnnotationsWorker(parser, uri, type) {
|
|
107
107
|
for (const annotation of parser.iterateAnnotationPageAnnotation()) {
|
|
108
|
-
const annotation_parser = new maniiifest_1.
|
|
108
|
+
const annotation_parser = new maniiifest_1.ManiiifestAnnotation(annotation);
|
|
109
109
|
const modifiedTarget = modifyAnnotationTarget(annotation_parser, uri, type).target;
|
|
110
110
|
yield Object.assign(Object.assign({}, annotation), { target: modifiedTarget });
|
|
111
111
|
}
|
|
@@ -124,7 +124,7 @@ function processAnnotations(indexId, uri, type, parser, commit) {
|
|
|
124
124
|
if (!jsonData) {
|
|
125
125
|
throw new errors_1.AnnoSearchValidationError('No JSON data returned from fetchJson');
|
|
126
126
|
}
|
|
127
|
-
currentParser = new maniiifest_1.
|
|
127
|
+
currentParser = new maniiifest_1.ManiiifestAnnotationPage(jsonData);
|
|
128
128
|
}
|
|
129
129
|
else {
|
|
130
130
|
currentParser = null;
|
|
@@ -135,13 +135,13 @@ function processAnnotations(indexId, uri, type, parser, commit) {
|
|
|
135
135
|
function processAnnotationPageRef(indexId, uri, type, annotationPageUrl, commit) {
|
|
136
136
|
return __awaiter(this, void 0, void 0, function* () {
|
|
137
137
|
const jsonData = yield (0, utils_1.fetchJson)(annotationPageUrl);
|
|
138
|
-
const parser = new maniiifest_1.
|
|
138
|
+
const parser = new maniiifest_1.ManiiifestAnnotationPage(jsonData);
|
|
139
139
|
yield processAnnotations(indexId, uri, type, parser, commit);
|
|
140
140
|
});
|
|
141
141
|
}
|
|
142
142
|
function processAnnotationPage(indexId, uri, type, page, commit) {
|
|
143
143
|
return __awaiter(this, void 0, void 0, function* () {
|
|
144
|
-
const parser = new maniiifest_1.
|
|
144
|
+
const parser = new maniiifest_1.ManiiifestAnnotationPage(page);
|
|
145
145
|
yield processAnnotations(indexId, uri, type, parser, commit);
|
|
146
146
|
});
|
|
147
147
|
}
|
|
@@ -176,7 +176,7 @@ function processManifest(indexId, manifestUrl, commit) {
|
|
|
176
176
|
yield ingestData(indexId + '_annotations', uniqueAnnotations, commit);
|
|
177
177
|
});
|
|
178
178
|
if (page.items) {
|
|
179
|
-
const parser = new maniiifest_1.
|
|
179
|
+
const parser = new maniiifest_1.ManiiifestAnnotationPage(page);
|
|
180
180
|
processAutocompleteTerms(parser);
|
|
181
181
|
const annotations = Array.from(processAnnotationsWorker(parser, manifestUrl, type));
|
|
182
182
|
yield filterAndProcess(annotations);
|
|
@@ -186,7 +186,7 @@ function processManifest(indexId, manifestUrl, commit) {
|
|
|
186
186
|
throw new errors_1.AnnoSearchValidationError('Annotation page ID is undefined');
|
|
187
187
|
}
|
|
188
188
|
const jsonData = yield (0, utils_1.fetchJson)(pageId);
|
|
189
|
-
const parser = new maniiifest_1.
|
|
189
|
+
const parser = new maniiifest_1.ManiiifestAnnotationPage(jsonData);
|
|
190
190
|
processAutocompleteTerms(parser);
|
|
191
191
|
const annotations = Array.from(processAnnotationsWorker(parser, manifestUrl, type));
|
|
192
192
|
yield filterAndProcess(annotations);
|
|
@@ -234,7 +234,7 @@ function processCollection(indexId, uri, commit) {
|
|
|
234
234
|
function processAnnotationCollection(indexId, annotationCollectionUrl, commit) {
|
|
235
235
|
return __awaiter(this, void 0, void 0, function* () {
|
|
236
236
|
const jsonData = yield (0, utils_1.fetchJson)(annotationCollectionUrl);
|
|
237
|
-
const parser = new maniiifest_1.
|
|
237
|
+
const parser = new maniiifest_1.ManiiifestAnnotationCollection(jsonData);
|
|
238
238
|
const type = parser.getAnnotationCollectionType();
|
|
239
239
|
if (type !== 'AnnotationCollection') {
|
|
240
240
|
throw new errors_1.AnnoSearchParseError('Should be a W3C annotation collection');
|
package/dist/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":";;;;;;;;;;;AA2PA,8BA6BC;AAxRD,
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../src/load.ts"],"names":[],"mappings":"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"}
|
package/dist/search.js
CHANGED
|
@@ -71,7 +71,12 @@ function searchIndex(indexId_1, q_1, motivation_1, maxHits_1, page_1, searchUrl_
|
|
|
71
71
|
(0, validate_1.validateMotivation)(motivation);
|
|
72
72
|
(0, validate_1.validateUser)(user);
|
|
73
73
|
const qQuery = buildSearchQueryFromString(q);
|
|
74
|
-
const
|
|
74
|
+
const motivationTerms = motivation ? motivation.trim().split(/\s+/) : [];
|
|
75
|
+
const motivationQuery = motivationTerms.length === 1
|
|
76
|
+
? ` AND motivation:"${(0, utils_1.escapeQuickwitQuery)(motivationTerms[0])}"`
|
|
77
|
+
: motivationTerms.length > 1
|
|
78
|
+
? ` AND (${motivationTerms.map(t => `motivation:"${(0, utils_1.escapeQuickwitQuery)(t)}"`).join(' OR ')})`
|
|
79
|
+
: '';
|
|
75
80
|
const dateQuery = date ? ` AND (${buildDateQueryFromString(date)})` : '';
|
|
76
81
|
const userQuery = user ? ` AND (${buildUserQueryFromString(user)})` : '';
|
|
77
82
|
const fullQuery = `${qQuery}${motivationQuery}${dateQuery}${userQuery}`;
|
package/dist/search.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../src/search.ts"],"names":[],"mappings":";;;;;;;;;;;AAuDA,
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../src/search.ts"],"names":[],"mappings":"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"}
|
package/dist/validate.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.motivations = void 0;
|
|
4
3
|
exports.validateSearchQueryParameter = validateSearchQueryParameter;
|
|
5
4
|
exports.validateAutocompleteQueryParameter = validateAutocompleteQueryParameter;
|
|
6
5
|
exports.validateOffset = validateOffset;
|
|
@@ -11,15 +10,6 @@ exports.validateDateRanges = validateDateRanges;
|
|
|
11
10
|
exports.validateUser = validateUser;
|
|
12
11
|
const errors_1 = require("./errors");
|
|
13
12
|
const utils_1 = require("./utils");
|
|
14
|
-
exports.motivations = [
|
|
15
|
-
'painting',
|
|
16
|
-
'supplementing',
|
|
17
|
-
'contextualizing',
|
|
18
|
-
'contentState',
|
|
19
|
-
'highlighting',
|
|
20
|
-
'commenting',
|
|
21
|
-
'tagging'
|
|
22
|
-
];
|
|
23
13
|
function validateSearchQueryParameter(query) {
|
|
24
14
|
const trimmedQuery = query.trim();
|
|
25
15
|
if (!trimmedQuery) {
|
|
@@ -90,8 +80,15 @@ function validateMotivation(motivation) {
|
|
|
90
80
|
if (!motivation) {
|
|
91
81
|
return;
|
|
92
82
|
}
|
|
93
|
-
if (
|
|
94
|
-
throw new errors_1.AnnoSearchValidationError('Invalid motivation parameter');
|
|
83
|
+
if (motivation.length > 100) {
|
|
84
|
+
throw new errors_1.AnnoSearchValidationError('Invalid motivation parameter: too long');
|
|
85
|
+
}
|
|
86
|
+
const terms = motivation.trim().split(/\s+/);
|
|
87
|
+
if (terms.length > 5) {
|
|
88
|
+
throw new errors_1.AnnoSearchValidationError('Too many motivation terms (max 5)');
|
|
89
|
+
}
|
|
90
|
+
for (const term of terms) {
|
|
91
|
+
(0, utils_1.validateNoSpecialChars)(term);
|
|
95
92
|
}
|
|
96
93
|
}
|
|
97
94
|
function validateDateRanges(ranges) {
|
package/dist/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "annosearch",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.5",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist/**/*"
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"cors": "^2.8.5",
|
|
37
37
|
"express": "^4.21.2",
|
|
38
38
|
"jest": "^29.7.0",
|
|
39
|
-
"maniiifest": "^
|
|
39
|
+
"maniiifest": "^2.0.0",
|
|
40
40
|
"nock": "^13.5.6",
|
|
41
41
|
"pino": "^9.5.0",
|
|
42
42
|
"pino-http": "^10.3.0",
|