arocapi 2.1.0 → 3.0.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/README.md +57 -9
- package/dist/app.d.ts +1 -1
- package/dist/app.js +5 -1
- package/dist/app.js.map +1 -1
- package/dist/index.dev.js +11 -1
- package/dist/index.dev.js.map +1 -1
- package/dist/routes/crate.js +5 -18
- package/dist/routes/crate.js.map +1 -1
- package/dist/routes/crate.test.js +20 -22
- package/dist/routes/crate.test.js.map +1 -1
- package/dist/routes/entities.js +12 -10
- package/dist/routes/entities.js.map +1 -1
- package/dist/routes/entities.test.js +18 -18
- package/dist/routes/entities.test.js.map +1 -1
- package/dist/routes/entity.js +3 -4
- package/dist/routes/entity.js.map +1 -1
- package/dist/routes/entity.test.js +11 -16
- package/dist/routes/entity.test.js.map +1 -1
- package/dist/routes/file.js +5 -18
- package/dist/routes/file.js.map +1 -1
- package/dist/routes/file.test.js +18 -22
- package/dist/routes/file.test.js.map +1 -1
- package/dist/routes/files.js +12 -11
- package/dist/routes/files.js.map +1 -1
- package/dist/routes/files.test.js +5 -34
- package/dist/routes/files.test.js.map +1 -1
- package/dist/routes/search.js +15 -12
- package/dist/routes/search.js.map +1 -1
- package/dist/routes/search.test.js +53 -23
- package/dist/routes/search.test.js.map +1 -1
- package/dist/test/integration.setup.d.ts +2 -4
- package/dist/test/integration.setup.js +18 -21
- package/dist/test/integration.setup.js.map +1 -1
- package/dist/transformers/default.d.ts +11 -18
- package/dist/transformers/default.js +5 -18
- package/dist/transformers/default.js.map +1 -1
- package/dist/transformers/default.test.js +6 -15
- package/dist/transformers/default.test.js.map +1 -1
- package/dist/transformers/transformer.test.js +2 -6
- package/dist/transformers/transformer.test.js.map +1 -1
- package/dist/utils/errors.d.ts +7 -1
- package/dist/utils/errors.js +2 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/headers.d.ts +7 -0
- package/dist/utils/headers.js +11 -0
- package/dist/utils/headers.js.map +1 -0
- package/dist/utils/queryBuilder.d.ts +2 -2
- package/dist/utils/queryBuilder.js +2 -3
- package/dist/utils/queryBuilder.js.map +1 -1
- package/package.json +24 -23
- package/prisma/models/entity.prisma +17 -13
- package/prisma/models/file.prisma +9 -13
- package/prisma.config.ts +0 -2
- package/src/app.ts +7 -2
- package/src/index.dev.ts +12 -1
- package/src/routes/__snapshots__/search.test.ts.snap +2 -2
- package/src/routes/crate.test.ts +20 -22
- package/src/routes/crate.ts +6 -24
- package/src/routes/entities.test.ts +21 -18
- package/src/routes/entities.ts +12 -12
- package/src/routes/entity.test.ts +13 -16
- package/src/routes/entity.ts +3 -4
- package/src/routes/file.test.ts +18 -22
- package/src/routes/file.ts +6 -24
- package/src/routes/files.test.ts +5 -37
- package/src/routes/files.ts +12 -13
- package/src/routes/search.test.ts +62 -25
- package/src/routes/search.ts +19 -12
- package/src/test/integration.setup.ts +19 -21
- package/src/transformers/default.test.ts +10 -20
- package/src/transformers/default.ts +14 -27
- package/src/transformers/transformer.test.ts +4 -6
- package/src/utils/errors.ts +10 -6
- package/src/utils/headers.ts +16 -0
- package/src/utils/queryBuilder.ts +3 -5
- package/prisma/migrations/20250515034400_entities/migration.sql +0 -14
- package/prisma/migrations/20250515050009_extend_entity_fields/migration.sql +0 -7
- package/prisma/migrations/20250804225438_add_record_type/migration.sql +0 -8
- package/prisma/migrations/20250805040110_add_rocrate_field/migration.sql +0 -2
- package/prisma/migrations/20250827033956_record_type_scalar/migration.sql +0 -10
- package/prisma/migrations/20250923032753_api_refactor/migration.sql +0 -39
- package/prisma/migrations/20250923223119_entity_type_to_string/migration.sql +0 -8
- package/prisma/migrations/20251020140329_add_meta_column/migration.sql +0 -2
- package/prisma/migrations/20251027010713_add_file_table/migration.sql +0 -17
- package/prisma/migrations/20251027221138_add_file_id_to_entity/migration.sql +0 -2
- package/prisma/migrations/20251211025510_remove_rocrate_column/migration.sql +0 -8
- package/prisma/migrations/migration_lock.toml +0 -3
- package/prisma/schema.prisma +0 -17
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Client } from '@opensearch-project/opensearch';
|
|
2
|
+
import { PrismaMariaDb } from '@prisma/adapter-mariadb';
|
|
2
3
|
import Fastify from 'fastify';
|
|
3
4
|
import app, { AllPublicAccessTransformer, AllPublicFileAccessTransformer } from '../app.js';
|
|
4
5
|
import { PrismaClient } from '../generated/prisma/client.js';
|
|
@@ -10,13 +11,16 @@ export async function setupIntegrationTests() {
|
|
|
10
11
|
process.env.DATABASE_URL = 'mysql://root:password@localhost:3307/catalog_test';
|
|
11
12
|
process.env.OPENSEARCH_URL = 'http://localhost:9201';
|
|
12
13
|
process.env.NODE_ENV = 'test';
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
const adapter = new PrismaMariaDb({
|
|
15
|
+
host: 'localhost',
|
|
16
|
+
user: 'root',
|
|
17
|
+
password: 'password',
|
|
18
|
+
database: 'catalog_test',
|
|
19
|
+
port: 3307,
|
|
20
|
+
connectionLimit: 5,
|
|
21
|
+
allowPublicKeyRetrieval: true,
|
|
19
22
|
});
|
|
23
|
+
prisma = new PrismaClient({ adapter });
|
|
20
24
|
opensearch = new Client({
|
|
21
25
|
node: process.env.OPENSEARCH_URL,
|
|
22
26
|
});
|
|
@@ -53,6 +57,7 @@ export async function teardownIntegrationTests() {
|
|
|
53
57
|
opensearch.close();
|
|
54
58
|
}
|
|
55
59
|
export async function cleanupTestData() {
|
|
60
|
+
await prisma.file.deleteMany({});
|
|
56
61
|
await prisma.entity.deleteMany({});
|
|
57
62
|
await opensearch.indices.delete({
|
|
58
63
|
index: 'entities',
|
|
@@ -63,8 +68,7 @@ export async function seedTestData() {
|
|
|
63
68
|
await cleanupTestData();
|
|
64
69
|
const testEntities = [
|
|
65
70
|
{
|
|
66
|
-
id: 1,
|
|
67
|
-
rocrateId: 'http://example.com/entity/1',
|
|
71
|
+
id: 'http://example.com/entity/1',
|
|
68
72
|
name: 'Test Collection',
|
|
69
73
|
description: 'First test entity',
|
|
70
74
|
entityType: 'http://pcdm.org/models#Collection',
|
|
@@ -76,8 +80,7 @@ export async function seedTestData() {
|
|
|
76
80
|
updatedAt: new Date(),
|
|
77
81
|
},
|
|
78
82
|
{
|
|
79
|
-
id: 2,
|
|
80
|
-
rocrateId: 'http://example.com/entity/2',
|
|
83
|
+
id: 'http://example.com/entity/2',
|
|
81
84
|
name: 'Test Object',
|
|
82
85
|
description: 'Second test entity',
|
|
83
86
|
entityType: 'http://pcdm.org/models#Object',
|
|
@@ -89,8 +92,7 @@ export async function seedTestData() {
|
|
|
89
92
|
updatedAt: new Date(),
|
|
90
93
|
},
|
|
91
94
|
{
|
|
92
|
-
id: 3,
|
|
93
|
-
rocrateId: 'http://example.com/entity/3',
|
|
95
|
+
id: 'http://example.com/entity/3',
|
|
94
96
|
name: 'Test Person',
|
|
95
97
|
description: 'Third test entity',
|
|
96
98
|
entityType: 'http://schema.org/Person',
|
|
@@ -102,8 +104,7 @@ export async function seedTestData() {
|
|
|
102
104
|
updatedAt: new Date(),
|
|
103
105
|
},
|
|
104
106
|
{
|
|
105
|
-
id: 4,
|
|
106
|
-
rocrateId: 'http://example.com/entity/4',
|
|
107
|
+
id: 'http://example.com/entity/4',
|
|
107
108
|
name: 'test-audio.wav',
|
|
108
109
|
description: 'Test audio file',
|
|
109
110
|
entityType: 'http://schema.org/MediaObject',
|
|
@@ -115,8 +116,7 @@ export async function seedTestData() {
|
|
|
115
116
|
updatedAt: new Date(),
|
|
116
117
|
},
|
|
117
118
|
{
|
|
118
|
-
id: 5,
|
|
119
|
-
rocrateId: 'http://example.com/entity/5',
|
|
119
|
+
id: 'http://example.com/entity/5',
|
|
120
120
|
name: 'collection-metadata.csv',
|
|
121
121
|
description: 'Collection metadata file',
|
|
122
122
|
entityType: 'http://schema.org/MediaObject',
|
|
@@ -136,7 +136,7 @@ export async function seedTestData() {
|
|
|
136
136
|
body: {
|
|
137
137
|
mappings: {
|
|
138
138
|
properties: {
|
|
139
|
-
|
|
139
|
+
id: { type: 'keyword' },
|
|
140
140
|
name: {
|
|
141
141
|
type: 'text',
|
|
142
142
|
fields: {
|
|
@@ -155,10 +155,7 @@ export async function seedTestData() {
|
|
|
155
155
|
},
|
|
156
156
|
},
|
|
157
157
|
});
|
|
158
|
-
const testDocs = testEntities.flatMap((entity
|
|
159
|
-
{ index: { _index: 'entities', _id: `${index + 1}` } },
|
|
160
|
-
entity,
|
|
161
|
-
]);
|
|
158
|
+
const testDocs = testEntities.flatMap((entity) => [{ index: { _index: 'entities', _id: entity.id } }, entity]);
|
|
162
159
|
await opensearch.bulk({
|
|
163
160
|
body: testDocs,
|
|
164
161
|
refresh: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration.setup.js","sourceRoot":"","sources":["../../src/test/integration.setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAExD,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,GAAG,EAAE,EAAE,0BAA0B,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,IAAI,OAAwB,CAAC;AAC7B,IAAI,MAAoB,CAAC;AACzB,IAAI,UAAkB,CAAC;AAEvB,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,mDAAmD,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,uBAAuB,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC;IAE9B,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"integration.setup.js","sourceRoot":"","sources":["../../src/test/integration.setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,41 +1,37 @@
|
|
|
1
1
|
import type { Entity, File, PrismaClient } from '../generated/prisma/client.js';
|
|
2
|
+
type EntityWithFile = Entity & {
|
|
3
|
+
file?: {
|
|
4
|
+
id: string;
|
|
5
|
+
} | null;
|
|
6
|
+
};
|
|
2
7
|
type EntityReference = {
|
|
3
8
|
id: string;
|
|
4
9
|
name: string;
|
|
5
10
|
};
|
|
6
11
|
export type BaseEntity = {
|
|
7
12
|
id: string;
|
|
13
|
+
entityType: string;
|
|
8
14
|
name: string;
|
|
9
15
|
description: string;
|
|
10
16
|
memberOf: string | null;
|
|
11
17
|
rootCollection: string | null;
|
|
12
18
|
metadataLicenseId: string;
|
|
13
19
|
contentLicenseId: string;
|
|
14
|
-
}
|
|
15
|
-
entityType: string;
|
|
16
|
-
fileId?: never;
|
|
17
|
-
} | {
|
|
18
|
-
entityType: 'http://schema.org/MediaObject';
|
|
19
|
-
fileId: string;
|
|
20
|
-
});
|
|
20
|
+
};
|
|
21
21
|
export type StandardEntity = {
|
|
22
22
|
id: string;
|
|
23
|
+
entityType: string;
|
|
23
24
|
name: string;
|
|
24
25
|
description: string;
|
|
25
26
|
memberOf: EntityReference | null;
|
|
26
27
|
rootCollection: EntityReference | null;
|
|
27
28
|
metadataLicenseId: string;
|
|
28
29
|
contentLicenseId: string;
|
|
29
|
-
}
|
|
30
|
-
entityType: string;
|
|
31
|
-
fileId?: never;
|
|
32
|
-
} | {
|
|
33
|
-
entityType: 'http://schema.org/MediaObject';
|
|
34
|
-
fileId: string;
|
|
35
|
-
});
|
|
30
|
+
};
|
|
36
31
|
type AccessInfo = {
|
|
37
32
|
metadata: boolean;
|
|
38
33
|
content: boolean;
|
|
34
|
+
metadataAuthorizationUrl?: string;
|
|
39
35
|
contentAuthorizationUrl?: string;
|
|
40
36
|
};
|
|
41
37
|
export type AuthorisedEntity = StandardEntity & {
|
|
@@ -50,14 +46,11 @@ export type StandardFile = {
|
|
|
50
46
|
filename: string;
|
|
51
47
|
mediaType: string;
|
|
52
48
|
size: number;
|
|
53
|
-
memberOf: string;
|
|
54
|
-
rootCollection: string;
|
|
55
|
-
contentLicenseId: string;
|
|
56
49
|
};
|
|
57
50
|
export type AuthorisedFile = StandardFile & {
|
|
58
51
|
access: FileAccessInfo;
|
|
59
52
|
};
|
|
60
|
-
export declare const baseEntityTransformer: (entity:
|
|
53
|
+
export declare const baseEntityTransformer: (entity: EntityWithFile) => BaseEntity;
|
|
61
54
|
export declare const AllPublicAccessTransformer: (entity: StandardEntity) => AuthorisedEntity;
|
|
62
55
|
export declare const baseFileTransformer: (file: File) => StandardFile;
|
|
63
56
|
export declare const AllPublicFileAccessTransformer: (file: StandardFile) => AuthorisedFile;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export const baseEntityTransformer = (entity) => {
|
|
2
2
|
const base = {
|
|
3
|
-
id: entity.
|
|
3
|
+
id: entity.id,
|
|
4
4
|
name: entity.name,
|
|
5
5
|
description: entity.description,
|
|
6
6
|
entityType: entity.entityType,
|
|
@@ -9,16 +9,6 @@ export const baseEntityTransformer = (entity) => {
|
|
|
9
9
|
metadataLicenseId: entity.metadataLicenseId,
|
|
10
10
|
contentLicenseId: entity.contentLicenseId,
|
|
11
11
|
};
|
|
12
|
-
if (base.entityType === 'http://schema.org/MediaObject') {
|
|
13
|
-
if (!entity.fileId) {
|
|
14
|
-
return base;
|
|
15
|
-
}
|
|
16
|
-
return {
|
|
17
|
-
...base,
|
|
18
|
-
entityType: base.entityType,
|
|
19
|
-
fileId: entity.fileId,
|
|
20
|
-
};
|
|
21
|
-
}
|
|
22
12
|
return base;
|
|
23
13
|
};
|
|
24
14
|
export const AllPublicAccessTransformer = (entity) => ({
|
|
@@ -29,13 +19,10 @@ export const AllPublicAccessTransformer = (entity) => ({
|
|
|
29
19
|
},
|
|
30
20
|
});
|
|
31
21
|
export const baseFileTransformer = (file) => ({
|
|
32
|
-
id: file.
|
|
22
|
+
id: file.id,
|
|
33
23
|
filename: file.filename,
|
|
34
24
|
mediaType: file.mediaType,
|
|
35
25
|
size: Number(file.size),
|
|
36
|
-
memberOf: file.memberOf,
|
|
37
|
-
rootCollection: file.rootCollection,
|
|
38
|
-
contentLicenseId: file.contentLicenseId,
|
|
39
26
|
});
|
|
40
27
|
export const AllPublicFileAccessTransformer = (file) => ({
|
|
41
28
|
...file,
|
|
@@ -57,9 +44,9 @@ export const resolveEntityReferences = async (entities, prisma) => {
|
|
|
57
44
|
return new Map();
|
|
58
45
|
}
|
|
59
46
|
const refs = await prisma.entity.findMany({
|
|
60
|
-
where: {
|
|
61
|
-
select: {
|
|
47
|
+
where: { id: { in: [...refIds] } },
|
|
48
|
+
select: { id: true, name: true },
|
|
62
49
|
});
|
|
63
|
-
return new Map(refs.map((r) => [r.
|
|
50
|
+
return new Map(refs.map((r) => [r.id, { id: r.id, name: r.name }]));
|
|
64
51
|
};
|
|
65
52
|
//# sourceMappingURL=default.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/transformers/default.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/transformers/default.ts"],"names":[],"mappings":"AA8FA,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAsB,EAAc,EAAE;IAC1E,MAAM,IAAI,GAAe;QACvB,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;KAC1C,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAoBF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,MAAsB,EAAoB,EAAE,CAAC,CAAC;IACvF,GAAG,MAAM;IACT,MAAM,EAAE;QACN,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACd;CACF,CAAC,CAAC;AAMH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAU,EAAgB,EAAE,CAAC,CAAC;IAChE,EAAE,EAAE,IAAI,CAAC,EAAE;IACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;IACvB,SAAS,EAAE,IAAI,CAAC,SAAS;IACzB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;CACxB,CAAC,CAAC;AAwBH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,IAAkB,EAAkB,EAAE,CAAC,CAAC;IACrF,GAAG,IAAI;IACP,MAAM,EAAE;QACN,OAAO,EAAE,IAAI;KACd;CACF,CAAC,CAAC;AAUH,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,QAA2E,EAC3E,MAAoB,EACmB,EAAE;IACzC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IAEjC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;QACxC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE;QAClC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;KACjC,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
|
|
@@ -3,12 +3,10 @@ import { AllPublicAccessTransformer, baseEntityTransformer } from './default.js'
|
|
|
3
3
|
describe('baseEntityTransformer', () => {
|
|
4
4
|
it('should transform entity to standard entity shape', () => {
|
|
5
5
|
const entity = {
|
|
6
|
-
id:
|
|
7
|
-
rocrateId: 'http://example.com/entity/123',
|
|
6
|
+
id: 'http://example.com/entity/123',
|
|
8
7
|
name: 'Test Entity',
|
|
9
8
|
description: 'A test entity description',
|
|
10
9
|
entityType: 'http://pcdm.org/models#Collection',
|
|
11
|
-
fileId: null,
|
|
12
10
|
memberOf: 'http://example.com/parent',
|
|
13
11
|
rootCollection: 'http://example.com/root',
|
|
14
12
|
metadataLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
@@ -31,12 +29,10 @@ describe('baseEntityTransformer', () => {
|
|
|
31
29
|
});
|
|
32
30
|
it('should handle null memberOf and rootCollection', () => {
|
|
33
31
|
const entity = {
|
|
34
|
-
id:
|
|
35
|
-
rocrateId: 'http://example.com/collection',
|
|
32
|
+
id: 'http://example.com/collection',
|
|
36
33
|
name: 'Top Collection',
|
|
37
34
|
description: 'A top-level collection',
|
|
38
35
|
entityType: 'http://pcdm.org/models#Collection',
|
|
39
|
-
fileId: null,
|
|
40
36
|
memberOf: null,
|
|
41
37
|
rootCollection: null,
|
|
42
38
|
metadataLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
@@ -51,12 +47,10 @@ describe('baseEntityTransformer', () => {
|
|
|
51
47
|
});
|
|
52
48
|
it('should exclude database-specific fields', () => {
|
|
53
49
|
const entity = {
|
|
54
|
-
id:
|
|
55
|
-
rocrateId: 'http://example.com/entity/456',
|
|
50
|
+
id: 'http://example.com/entity/456',
|
|
56
51
|
name: 'Test',
|
|
57
52
|
description: 'Test',
|
|
58
53
|
entityType: 'http://pcdm.org/models#Object',
|
|
59
|
-
fileId: null,
|
|
60
54
|
memberOf: null,
|
|
61
55
|
rootCollection: null,
|
|
62
56
|
metadataLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
@@ -81,14 +75,12 @@ describe('baseEntityTransformer', () => {
|
|
|
81
75
|
'contentLicenseId',
|
|
82
76
|
]);
|
|
83
77
|
});
|
|
84
|
-
it('should handle File entity (MediaObject) with
|
|
78
|
+
it('should handle File entity (MediaObject) with file relation', () => {
|
|
85
79
|
const entity = {
|
|
86
|
-
id:
|
|
87
|
-
rocrateId: 'http://example.com/file/audio.wav',
|
|
80
|
+
id: 'http://example.com/file/audio.wav',
|
|
88
81
|
name: 'Audio File',
|
|
89
82
|
description: 'An audio recording',
|
|
90
83
|
entityType: 'http://schema.org/MediaObject',
|
|
91
|
-
fileId: 'http://example.com/files/audio.wav',
|
|
92
84
|
memberOf: 'http://example.com/collection',
|
|
93
85
|
rootCollection: 'http://example.com/collection',
|
|
94
86
|
metadataLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
@@ -96,6 +88,7 @@ describe('baseEntityTransformer', () => {
|
|
|
96
88
|
createdAt: new Date(),
|
|
97
89
|
updatedAt: new Date(),
|
|
98
90
|
meta: null,
|
|
91
|
+
file: { id: 'http://example.com/files/audio.wav' },
|
|
99
92
|
};
|
|
100
93
|
const result = baseEntityTransformer(entity);
|
|
101
94
|
expect(result).toEqual({
|
|
@@ -103,13 +96,11 @@ describe('baseEntityTransformer', () => {
|
|
|
103
96
|
name: 'Audio File',
|
|
104
97
|
description: 'An audio recording',
|
|
105
98
|
entityType: 'http://schema.org/MediaObject',
|
|
106
|
-
fileId: 'http://example.com/files/audio.wav',
|
|
107
99
|
memberOf: 'http://example.com/collection',
|
|
108
100
|
rootCollection: 'http://example.com/collection',
|
|
109
101
|
metadataLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
110
102
|
contentLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
111
103
|
});
|
|
112
|
-
expect(result.fileId).toBe('http://example.com/files/audio.wav');
|
|
113
104
|
});
|
|
114
105
|
});
|
|
115
106
|
describe('AllPublicAccessTransformer', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.test.js","sourceRoot":"","sources":["../../src/transformers/default.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAEjF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"default.test.js","sourceRoot":"","sources":["../../src/transformers/default.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,12 +25,10 @@ describe('Entity Transformers', () => {
|
|
|
25
25
|
describe('baseEntityTransformer', () => {
|
|
26
26
|
it('should transform raw entity to base shape with unresolved references', () => {
|
|
27
27
|
const rawEntity = {
|
|
28
|
-
id:
|
|
29
|
-
rocrateId: 'http://example.com/entity/123',
|
|
28
|
+
id: 'http://example.com/entity/123',
|
|
30
29
|
name: 'Test Entity',
|
|
31
30
|
description: 'A test entity',
|
|
32
31
|
entityType: 'http://schema.org/Person',
|
|
33
|
-
fileId: null,
|
|
34
32
|
memberOf: 'http://example.com/collection',
|
|
35
33
|
rootCollection: 'http://example.com/root',
|
|
36
34
|
metadataLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
@@ -139,12 +137,10 @@ describe('Entity Transformers', () => {
|
|
|
139
137
|
});
|
|
140
138
|
it('should demonstrate full pipeline: base -> resolve -> access -> custom', async () => {
|
|
141
139
|
const rawEntity = {
|
|
142
|
-
id:
|
|
143
|
-
rocrateId: 'http://example.com/entity/123',
|
|
140
|
+
id: 'http://example.com/entity/123',
|
|
144
141
|
name: 'Test Entity',
|
|
145
142
|
description: 'A test entity',
|
|
146
143
|
entityType: 'http://schema.org/Person',
|
|
147
|
-
fileId: null,
|
|
148
144
|
memberOf: 'http://example.com/collection',
|
|
149
145
|
rootCollection: 'http://example.com/root',
|
|
150
146
|
metadataLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformer.test.js","sourceRoot":"","sources":["../../src/transformers/transformer.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EACL,0BAA0B,EAG1B,qBAAqB,GAEtB,MAAM,cAAc,CAAC;AAEtB,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,MAAM,WAAW,GAAuB;QACtC,OAAO,EAAE,EAAoB;QAC7B,OAAO,EAAE,EAAqB;KAC/B,CAAC;IAEF,MAAM,kBAAkB,GAAmB;QACzC,EAAE,EAAE,+BAA+B;QACnC,IAAI,EAAE,aAAa;QACnB,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,0BAA0B;QACtC,QAAQ,EAAE,EAAE,EAAE,EAAE,+BAA+B,EAAE,IAAI,EAAE,iBAAiB,EAAE;QAC1E,cAAc,EAAE,EAAE,EAAE,EAAE,yBAAyB,EAAE,IAAI,EAAE,iBAAiB,EAAE;QAC1E,iBAAiB,EAAE,8CAA8C;QACjE,gBAAgB,EAAE,8CAA8C;KACjE,CAAC;IAEF,MAAM,oBAAoB,GAAqB;QAC7C,GAAG,kBAAkB;QACrB,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,IAAI;SACd;KACF,CAAC;IAEF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;YAC9E,MAAM,SAAS,GAAG;gBAChB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"transformer.test.js","sourceRoot":"","sources":["../../src/transformers/transformer.test.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/errors.d.ts
CHANGED
|
@@ -17,7 +17,13 @@ export type StandardErrorResponse = {
|
|
|
17
17
|
details?: ErrorDetails;
|
|
18
18
|
};
|
|
19
19
|
};
|
|
20
|
-
|
|
20
|
+
type ValidationViolation = {
|
|
21
|
+
field: string;
|
|
22
|
+
message: string;
|
|
23
|
+
value?: unknown;
|
|
24
|
+
};
|
|
25
|
+
export declare const createValidationError: (message: string, violations: ValidationViolation[]) => StandardErrorResponse;
|
|
21
26
|
export declare const createNotFoundError: (message: string, entityId?: string) => StandardErrorResponse;
|
|
27
|
+
export declare const createInvalidRequestError: (message: string) => StandardErrorResponse;
|
|
22
28
|
export declare const createInternalError: (message?: string) => StandardErrorResponse;
|
|
23
29
|
export {};
|
package/dist/utils/errors.js
CHANGED
|
@@ -13,8 +13,9 @@ const createErrorResponse = (code, message, details) => ({
|
|
|
13
13
|
details,
|
|
14
14
|
},
|
|
15
15
|
});
|
|
16
|
-
export const createValidationError = (message,
|
|
16
|
+
export const createValidationError = (message, violations) => createErrorResponse(ERROR_CODES.VALIDATION_ERROR, message, { violations });
|
|
17
17
|
export const createNotFoundError = (message, entityId) => createErrorResponse(ERROR_CODES.NOT_FOUND, message, entityId ? { entityId } : undefined);
|
|
18
|
+
export const createInvalidRequestError = (message) => createErrorResponse(ERROR_CODES.INVALID_REQUEST, message);
|
|
18
19
|
export const createInternalError = (message = 'Internal server error') => {
|
|
19
20
|
return createErrorResponse(ERROR_CODES.INTERNAL_ERROR, message);
|
|
20
21
|
};
|
package/dist/utils/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG;IAClB,gBAAgB,EAAE,kBAAkB;IACpC,SAAS,EAAE,WAAW;IACtB,mBAAmB,EAAE,qBAAqB;IAC1C,cAAc,EAAE,gBAAgB;IAChC,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,qBAAqB;CAClC,CAAC;AAgBX,MAAM,mBAAmB,GAAG,CAAC,IAAe,EAAE,OAAe,EAAE,OAAsB,EAAyB,EAAE,CAAC,CAAC;IAChH,KAAK,EAAE;QACL,IAAI;QACJ,OAAO;QACP,OAAO;KACR;CACF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG;IAClB,gBAAgB,EAAE,kBAAkB;IACpC,SAAS,EAAE,WAAW;IACtB,mBAAmB,EAAE,qBAAqB;IAC1C,cAAc,EAAE,gBAAgB;IAChC,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,qBAAqB;CAClC,CAAC;AAgBX,MAAM,mBAAmB,GAAG,CAAC,IAAe,EAAE,OAAe,EAAE,OAAsB,EAAyB,EAAE,CAAC,CAAC;IAChH,KAAK,EAAE;QACL,IAAI;QACJ,OAAO;QACP,OAAO;KACR;CACF,CAAC,CAAC;AAQH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAE,UAAiC,EAAyB,EAAE,CACjH,mBAAmB,CAAC,WAAW,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,QAAiB,EAAyB,EAAE,CAC/F,mBAAmB,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAE3F,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAe,EAAyB,EAAE,CAClF,mBAAmB,CAAC,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAO,GAAG,uBAAuB,EAAyB,EAAE;IAC9F,OAAO,mBAAmB,CAAC,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export const setFileHeaders = (reply, metadata) => {
|
|
2
|
+
reply.header('Content-Type', metadata.contentType);
|
|
3
|
+
reply.header('Content-Length', metadata.contentLength.toString());
|
|
4
|
+
if (metadata.etag) {
|
|
5
|
+
reply.header('ETag', metadata.etag);
|
|
6
|
+
}
|
|
7
|
+
if (metadata.lastModified) {
|
|
8
|
+
reply.header('Last-Modified', metadata.lastModified.toUTCString());
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
//# sourceMappingURL=headers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/utils/headers.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAAmB,EACnB,QAA4F,EAC5F,EAAE;IACF,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnD,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;IAElE,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC1B,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IACrE,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -23,13 +23,13 @@ export declare class OpensearchQueryBuilder {
|
|
|
23
23
|
filter: import("@opensearch-project/opensearch/api/_types/_common.query_dsl.js").QueryContainer[];
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
|
-
buildAggregations(geohashPrecision
|
|
26
|
+
buildAggregations(geohashPrecision?: number, boundingBox?: BoundingBox): {
|
|
27
27
|
[x: string]: import("@opensearch-project/opensearch/api/_types/_common.aggregations.js").AggregationContainer;
|
|
28
28
|
};
|
|
29
29
|
buildSort(sort: string, order: SortOrder): {
|
|
30
30
|
'name.keyword': SortOrder;
|
|
31
31
|
}[] | {
|
|
32
|
-
[
|
|
32
|
+
[sort]: SortOrder;
|
|
33
33
|
}[] | undefined;
|
|
34
34
|
}
|
|
35
35
|
export {};
|
|
@@ -89,11 +89,10 @@ export class OpensearchQueryBuilder {
|
|
|
89
89
|
if (sort === 'relevance') {
|
|
90
90
|
return;
|
|
91
91
|
}
|
|
92
|
-
|
|
93
|
-
if (sortField === 'name') {
|
|
92
|
+
if (sort === 'name') {
|
|
94
93
|
return [{ 'name.keyword': order }];
|
|
95
94
|
}
|
|
96
|
-
return [{ [
|
|
95
|
+
return [{ [sort]: order }];
|
|
97
96
|
}
|
|
98
97
|
}
|
|
99
98
|
//# sourceMappingURL=queryBuilder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryBuilder.js","sourceRoot":"","sources":["../../src/utils/queryBuilder.ts"],"names":[],"mappings":"AAqBA,MAAM,OAAO,sBAAsB;IACjC,YAAY,CAAe;IAE3B,YAAY,IAA0B;QACpC,IAAI,CAAC,YAAY;YACf,IAAI,EAAE,YAAY;gBAClB,MAAM,CAAC,WAAW,CAChB,CAAC,YAAY,EAAE,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC3E,IAAI;oBACJ,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;iBAClD,CAAC,CACH,CAAC;IACN,CAAC;IAED,UAAU,CAAC,UAAkB,EAAE,KAAa,EAAE,OAAkC,EAAE,WAAyB;QACzG,MAAM,IAAI,GAAsB,EAAE,CAAC;QACnC,MAAM,MAAM,GAAwB,EAAE,CAAC;QAEvC,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC;gBACR,WAAW,EAAE;oBACX,KAAK;oBACL,MAAM,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC;oBACjC,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,MAAM;oBACjB,gBAAgB,EAAE,KAAK;iBACxB;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC;gBACR,YAAY,EAAE;oBACZ,KAAK;oBACL,MAAM,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC;oBACjC,gBAAgB,EAAE,KAAK;iBACxB;aACF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE;gBAClD,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE;wBACL,CAAC,KAAK,CAAC,EAAE,MAAM;qBAChB;iBACF,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC;gBACV,gBAAgB,EAAE;oBAChB,QAAQ,EAAE;wBACR,QAAQ,EAAE;4BACR,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG;4BAC7B,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG;yBAChC;wBACD,YAAY,EAAE;4BACZ,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG;4BAC/B,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG;yBAC9B;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,IAAI,EAAE;gBACJ,IAAI;gBACJ,MAAM;aACP;SACF,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"queryBuilder.js","sourceRoot":"","sources":["../../src/utils/queryBuilder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"type": "module",
|
|
3
3
|
"name": "arocapi",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "3.0.0",
|
|
5
5
|
"description": "An RO-Crate API",
|
|
6
6
|
"main": "dist/app.js",
|
|
7
7
|
"exports": {
|
|
@@ -15,40 +15,41 @@
|
|
|
15
15
|
"author": "John Ferlito <johnf@inodes.org>",
|
|
16
16
|
"license": "ISC",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@fastify/cors": "^11.
|
|
18
|
+
"@fastify/cors": "^11.2.0",
|
|
19
19
|
"@fastify/sensible": "^6.0.4",
|
|
20
20
|
"@opensearch-project/opensearch": "^3.5.1",
|
|
21
|
-
"@prisma/config": "^
|
|
22
|
-
"dotenv": "^17.
|
|
21
|
+
"@prisma/config": "^7.5.0",
|
|
22
|
+
"dotenv": "^17.3.1",
|
|
23
23
|
"express": "^5.2.1",
|
|
24
|
-
"fastify": "^5.
|
|
24
|
+
"fastify": "^5.8.4",
|
|
25
25
|
"fastify-plugin": "^5.1.0",
|
|
26
26
|
"fastify-type-provider-zod": "^6.1.0",
|
|
27
|
-
"zod": "^4.
|
|
27
|
+
"zod": "^4.3.6"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@biomejs/biome": "^2.
|
|
30
|
+
"@biomejs/biome": "^2.4.9",
|
|
31
31
|
"@commitlint/cli": "^20.5.0",
|
|
32
32
|
"@commitlint/config-conventional": "^20.5.0",
|
|
33
|
-
"@prisma/
|
|
33
|
+
"@prisma/adapter-mariadb": "^7.5.0",
|
|
34
|
+
"@prisma/client": "^7.5.0",
|
|
34
35
|
"@semantic-release/changelog": "^6.0.3",
|
|
35
36
|
"@semantic-release/git": "^10.0.1",
|
|
36
37
|
"@total-typescript/ts-reset": "^0.6.1",
|
|
37
38
|
"@types/express": "^5.0.6",
|
|
38
|
-
"@types/node": "^
|
|
39
|
-
"@vitest/coverage-v8": "^4.
|
|
40
|
-
"@vitest/ui": "^4.
|
|
39
|
+
"@types/node": "^24.12.0",
|
|
40
|
+
"@vitest/coverage-v8": "^4.1.1",
|
|
41
|
+
"@vitest/ui": "^4.1.1",
|
|
41
42
|
"concurrently": "^9.2.1",
|
|
42
|
-
"conventional-changelog-conventionalcommits": "^9.
|
|
43
|
+
"conventional-changelog-conventionalcommits": "^9.3.0",
|
|
43
44
|
"fastify-tsconfig": "^3.0.0",
|
|
44
|
-
"knip": "^
|
|
45
|
+
"knip": "^6.0.5",
|
|
45
46
|
"lefthook": "^2.1.4",
|
|
46
|
-
"prisma": "^
|
|
47
|
-
"prisma-json-types-generator": "^
|
|
48
|
-
"semantic-release": "^25.0.
|
|
47
|
+
"prisma": "^7.5.0",
|
|
48
|
+
"prisma-json-types-generator": "^4.1.1",
|
|
49
|
+
"semantic-release": "^25.0.3",
|
|
49
50
|
"tsx": "^4.21.0",
|
|
50
|
-
"typescript": "^
|
|
51
|
-
"vitest": "^4.
|
|
51
|
+
"typescript": "^6.0.2",
|
|
52
|
+
"vitest": "^4.1.1",
|
|
52
53
|
"vitest-mock-extended": "^3.1.0"
|
|
53
54
|
},
|
|
54
55
|
"peerDependencies": {
|
|
@@ -60,13 +61,13 @@
|
|
|
60
61
|
"dist",
|
|
61
62
|
"!dist/generated",
|
|
62
63
|
"README.md",
|
|
63
|
-
"prisma",
|
|
64
|
+
"prisma/models",
|
|
64
65
|
"prisma.config.ts"
|
|
65
66
|
],
|
|
66
67
|
"scripts": {
|
|
67
|
-
"build
|
|
68
|
-
"watch
|
|
69
|
-
"dev": "pnpm run dev:clean && pnpm run build
|
|
68
|
+
"build": "tsc",
|
|
69
|
+
"watch": "tsc -w",
|
|
70
|
+
"dev": "pnpm run dev:clean && pnpm run build && concurrently -k -p \"[{name}]\" -n \"TypeScript,App\" -c \"yellow.bold,cyan.bold\" \"pnpm:dev:start\" \"pnpm:watch\" ",
|
|
70
71
|
"dev:start": "node --watch --env-file=.env dist/index.dev.js",
|
|
71
72
|
"dev:clean": "rm -rf dist",
|
|
72
73
|
"dbconsole": "docker compose exec db mysql --password=password catalog",
|
|
@@ -82,7 +83,7 @@
|
|
|
82
83
|
"generate": "npx prisma generate",
|
|
83
84
|
"db:generate": "prisma generate",
|
|
84
85
|
"db:migrate": "prisma migrate deploy",
|
|
85
|
-
"seed": "rm -rf dist && pnpm run build
|
|
86
|
+
"seed": "rm -rf dist && pnpm run build && node --env-file=.env example/data/seed.ts"
|
|
86
87
|
},
|
|
87
88
|
"repository": {
|
|
88
89
|
"type": "git",
|