arocapi 5.0.0-beta.2 → 5.0.0-beta.4

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.
Files changed (117) hide show
  1. package/README.md +37 -824
  2. package/dist/app.d.ts +20 -7
  3. package/dist/app.js +42 -28
  4. package/dist/app.js.map +1 -1
  5. package/dist/app.test.js +41 -56
  6. package/dist/app.test.js.map +1 -1
  7. package/dist/errorHandling.test.d.ts +1 -0
  8. package/dist/errorHandling.test.js +222 -0
  9. package/dist/errorHandling.test.js.map +1 -0
  10. package/dist/index.dev.js +4 -3
  11. package/dist/index.dev.js.map +1 -1
  12. package/dist/routes/capabilities.test.js +8 -8
  13. package/dist/routes/capabilities.test.js.map +1 -1
  14. package/dist/routes/crate.test.js +67 -19
  15. package/dist/routes/crate.test.js.map +1 -1
  16. package/dist/routes/entities.d.ts +5 -2
  17. package/dist/routes/entities.js +31 -49
  18. package/dist/routes/entities.js.map +1 -1
  19. package/dist/routes/entities.test.js +16 -12
  20. package/dist/routes/entities.test.js.map +1 -1
  21. package/dist/routes/entity.d.ts +7 -2
  22. package/dist/routes/entity.js +14 -29
  23. package/dist/routes/entity.js.map +1 -1
  24. package/dist/routes/entity.test.js +19 -13
  25. package/dist/routes/entity.test.js.map +1 -1
  26. package/dist/routes/file.d.ts +6 -0
  27. package/dist/routes/file.js +67 -59
  28. package/dist/routes/file.js.map +1 -1
  29. package/dist/routes/file.test.js +135 -25
  30. package/dist/routes/file.test.js.map +1 -1
  31. package/dist/routes/files.d.ts +5 -2
  32. package/dist/routes/files.js +24 -39
  33. package/dist/routes/files.js.map +1 -1
  34. package/dist/routes/files.test.js +44 -21
  35. package/dist/routes/files.test.js.map +1 -1
  36. package/dist/routes/metadata.d.ts +6 -0
  37. package/dist/routes/metadata.js +49 -54
  38. package/dist/routes/metadata.js.map +1 -1
  39. package/dist/routes/search.d.ts +6 -2
  40. package/dist/routes/search.js +95 -99
  41. package/dist/routes/search.js.map +1 -1
  42. package/dist/routes/search.test.js +85 -39
  43. package/dist/routes/search.test.js.map +1 -1
  44. package/dist/test/helpers/fastify.js +2 -3
  45. package/dist/test/helpers/fastify.js.map +1 -1
  46. package/dist/test/integration.setup.d.ts +18 -0
  47. package/dist/test/integration.setup.js +15 -7
  48. package/dist/test/integration.setup.js.map +1 -1
  49. package/dist/test/integration.test.js +368 -2
  50. package/dist/test/integration.test.js.map +1 -1
  51. package/dist/transformers/default.d.ts +10 -18
  52. package/dist/transformers/default.js +41 -15
  53. package/dist/transformers/default.js.map +1 -1
  54. package/dist/transformers/default.test.js +109 -47
  55. package/dist/transformers/default.test.js.map +1 -1
  56. package/dist/transformers/transformer.test.js +12 -34
  57. package/dist/transformers/transformer.test.js.map +1 -1
  58. package/dist/types/access.d.ts +9 -0
  59. package/dist/types/access.js +2 -0
  60. package/dist/types/access.js.map +1 -0
  61. package/dist/types/context.d.ts +6 -0
  62. package/dist/types/context.js +2 -0
  63. package/dist/types/context.js.map +1 -0
  64. package/dist/types/fileHandlers.d.ts +5 -9
  65. package/dist/types/transformers.d.ts +4 -10
  66. package/dist/types/visibility.d.ts +5 -0
  67. package/dist/types/visibility.js +2 -0
  68. package/dist/types/visibility.js.map +1 -0
  69. package/dist/utils/access.d.ts +17 -0
  70. package/dist/utils/access.js +41 -0
  71. package/dist/utils/access.js.map +1 -0
  72. package/dist/utils/errors.d.ts +13 -4
  73. package/dist/utils/errors.js +44 -8
  74. package/dist/utils/errors.js.map +1 -1
  75. package/dist/utils/errors.test.js +14 -1
  76. package/dist/utils/errors.test.js.map +1 -1
  77. package/dist/utils/validation.d.ts +2 -0
  78. package/dist/utils/validation.js +8 -0
  79. package/dist/utils/validation.js.map +1 -0
  80. package/dist/utils/visibility.d.ts +18 -0
  81. package/dist/utils/visibility.js +16 -0
  82. package/dist/utils/visibility.js.map +1 -0
  83. package/package.json +6 -4
  84. package/src/app.test.ts +45 -66
  85. package/src/app.ts +85 -54
  86. package/src/errorHandling.test.ts +288 -0
  87. package/src/index.dev.ts +6 -4
  88. package/src/routes/__snapshots__/search.test.ts.snap +2 -2
  89. package/src/routes/capabilities.test.ts +8 -8
  90. package/src/routes/crate.test.ts +80 -19
  91. package/src/routes/entities.test.ts +16 -12
  92. package/src/routes/entities.ts +40 -59
  93. package/src/routes/entity.test.ts +19 -13
  94. package/src/routes/entity.ts +22 -35
  95. package/src/routes/file.test.ts +156 -25
  96. package/src/routes/file.ts +84 -62
  97. package/src/routes/files.test.ts +52 -26
  98. package/src/routes/files.ts +31 -47
  99. package/src/routes/metadata.ts +64 -58
  100. package/src/routes/search.test.ts +88 -39
  101. package/src/routes/search.ts +123 -119
  102. package/src/test/helpers/fastify.ts +2 -3
  103. package/src/test/integration.setup.ts +18 -7
  104. package/src/test/integration.test.ts +472 -1
  105. package/src/transformers/default.test.ts +139 -47
  106. package/src/transformers/default.ts +103 -83
  107. package/src/transformers/transformer.test.ts +18 -44
  108. package/src/types/access.ts +20 -0
  109. package/src/types/context.ts +15 -0
  110. package/src/types/fileHandlers.ts +5 -13
  111. package/src/types/transformers.ts +4 -32
  112. package/src/types/visibility.ts +18 -0
  113. package/src/utils/access.ts +80 -0
  114. package/src/utils/errors.test.ts +16 -1
  115. package/src/utils/errors.ts +67 -10
  116. package/src/utils/validation.ts +11 -0
  117. package/src/utils/visibility.ts +56 -0
@@ -1,10 +1,15 @@
1
1
  import type { FastifyPluginAsync } from 'fastify';
2
2
  import type { PrismaClient } from '../generated/prisma/client.js';
3
- import type { AccessTransformer, EntityTransformer } from '../types/transformers.js';
3
+ import type { AccessFunction } from '../types/access.js';
4
+ import type { EntityTransformer } from '../types/transformers.js';
5
+ import type { EntityVisibilityFilter } from '../types/visibility.js';
6
+ import { type RefusalOptions } from '../utils/visibility.js';
4
7
  type EntityRouteOptions = {
5
8
  prisma: PrismaClient;
6
- accessTransformer: AccessTransformer;
9
+ access: AccessFunction;
7
10
  entityTransformers?: EntityTransformer[];
11
+ entityVisibilityFilter: EntityVisibilityFilter;
12
+ refusal: RefusalOptions;
8
13
  };
9
14
  declare const entity: FastifyPluginAsync<EntityRouteOptions>;
10
15
  export default entity;
@@ -1,44 +1,29 @@
1
1
  import { z } from 'zod';
2
- import { baseEntityTransformer, resolveEntityReferences } from '../transformers/default.js';
3
- import { createInternalError, createNotFoundError } from '../utils/errors.js';
2
+ import { applyTransformers, authoriseEntities } from '../transformers/default.js';
3
+ import { createEntityNotVisibleResponder } from '../utils/visibility.js';
4
4
  const paramsSchema = z.object({
5
5
  id: z.url(),
6
6
  });
7
7
  const entity = async (fastify, opts) => {
8
- const { prisma, accessTransformer, entityTransformers = [] } = opts;
8
+ const { prisma, access, entityTransformers = [], entityVisibilityFilter, refusal } = opts;
9
+ const sendEntityNotVisible = createEntityNotVisibleResponder(prisma, refusal);
9
10
  fastify.withTypeProvider().get('/entity/:id', {
10
11
  schema: {
11
12
  params: paramsSchema,
12
13
  },
13
14
  }, async (request, reply) => {
14
15
  const { id } = request.params;
15
- try {
16
- const entity = await prisma.entity.findUnique({
17
- where: { id },
18
- include: { file: { select: { id: true } } },
19
- });
20
- if (!entity) {
21
- return reply.code(404).send(createNotFoundError('The requested entity was not found', id));
22
- }
23
- const refMap = await resolveEntityReferences([entity], prisma);
24
- const base = baseEntityTransformer(entity);
25
- const standardEntity = {
26
- ...base,
27
- memberOf: base.memberOf ? (refMap.get(base.memberOf) ?? null) : null,
28
- rootCollection: base.rootCollection ? (refMap.get(base.rootCollection) ?? null) : null,
29
- };
30
- const authorisedEntity = await accessTransformer(standardEntity, { request, fastify });
31
- let result = authorisedEntity;
32
- for (const transformer of entityTransformers) {
33
- result = await transformer(result, { request, fastify });
34
- }
35
- return result;
36
- }
37
- catch (error) {
38
- const err = error;
39
- fastify.log.error(`Database error: ${err.message}`);
40
- return reply.code(500).send(createInternalError());
16
+ const context = { request, fastify };
17
+ const visibilityWhere = await entityVisibilityFilter(context);
18
+ const entity = await prisma.entity.findFirst({
19
+ where: { AND: [{ id }, visibilityWhere] },
20
+ include: { file: { select: { id: true } } },
21
+ });
22
+ if (!entity) {
23
+ return sendEntityNotVisible(reply, id, context);
41
24
  }
25
+ const [authorisedEntity] = await authoriseEntities([entity], prisma, access, context);
26
+ return applyTransformers(authorisedEntity, entityTransformers, context);
42
27
  });
43
28
  };
44
29
  export default entity;
@@ -1 +1 @@
1
- {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/routes/entity.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE;CACZ,CAAC,CAAC;AAQH,MAAM,MAAM,GAA2C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC7E,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;IACpE,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,aAAa,EACb;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC5C,KAAK,EAAE,EAAE,EAAE,EAAE;gBACb,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;aAC5C,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,oCAAoC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7F,CAAC;YAGD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;YAC3C,MAAM,cAAc,GAAG;gBACrB,GAAG,IAAI;gBACP,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;gBACpE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;aACvF,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAEvF,IAAI,MAAM,GAAG,gBAAgB,CAAC;YAC9B,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE,CAAC;gBAC7C,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3D,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAEpD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/routes/entity.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAIlF,OAAO,EAAE,+BAA+B,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE;CACZ,CAAC,CAAC;AAUH,MAAM,MAAM,GAA2C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC7E,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,EAAE,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC1F,MAAM,oBAAoB,GAAG,+BAA+B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE9E,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,aAAa,EACb;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;YAC3C,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE;YACzC,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;SAC5C,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,oBAAoB,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,iBAAiB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtF,OAAO,iBAAiB,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -1,11 +1,17 @@
1
1
  import { afterEach, beforeEach, describe, expect, it } from 'vitest';
2
2
  import { fastify, fastifyAfter, fastifyBefore, prisma } from '../test/helpers/fastify.js';
3
- import { AllPublicAccessTransformer } from '../transformers/default.js';
3
+ import { AllPublicAccess } from '../utils/access.js';
4
+ import { AllVisibleEntityFilter } from '../utils/visibility.js';
4
5
  import entityRoute from './entity.js';
5
6
  describe('Entity Route', () => {
6
7
  beforeEach(async () => {
7
8
  await fastifyBefore();
8
- await fastify.register(entityRoute, { prisma, accessTransformer: AllPublicAccessTransformer });
9
+ await fastify.register(entityRoute, {
10
+ entityVisibilityFilter: AllVisibleEntityFilter,
11
+ refusal: { promptLoginForHidden: false },
12
+ prisma,
13
+ access: AllPublicAccess,
14
+ });
9
15
  });
10
16
  afterEach(async () => {
11
17
  await fastifyAfter();
@@ -25,7 +31,7 @@ describe('Entity Route', () => {
25
31
  updatedAt: new Date(),
26
32
  meta: {},
27
33
  };
28
- prisma.entity.findUnique.mockResolvedValue(mockEntity);
34
+ prisma.entity.findFirst.mockResolvedValue(mockEntity);
29
35
  const response = await fastify.inject({
30
36
  method: 'GET',
31
37
  url: `/entity/${encodeURIComponent('http://example.com/entity/123')}`,
@@ -33,15 +39,13 @@ describe('Entity Route', () => {
33
39
  const body = JSON.parse(response.body);
34
40
  expect(response.statusCode).toBe(200);
35
41
  expect(body).toMatchSnapshot();
36
- expect(prisma.entity.findUnique).toHaveBeenCalledWith({
37
- where: {
38
- id: 'http://example.com/entity/123',
39
- },
42
+ expect(prisma.entity.findFirst).toHaveBeenCalledWith({
43
+ where: { AND: [{ id: 'http://example.com/entity/123' }, {}] },
40
44
  include: { file: { select: { id: true } } },
41
45
  });
42
46
  });
43
47
  it('should return 404 when entity not found', async () => {
44
- prisma.entity.findUnique.mockResolvedValue(null);
48
+ prisma.entity.findFirst.mockResolvedValue(null);
45
49
  const response = await fastify.inject({
46
50
  method: 'GET',
47
51
  url: `/entity/${encodeURIComponent('http://example.com/entity/nonexistent')}`,
@@ -51,7 +55,7 @@ describe('Entity Route', () => {
51
55
  expect(body).toMatchSnapshot();
52
56
  });
53
57
  it('should return 500 when database error occurs', async () => {
54
- prisma.entity.findUnique.mockRejectedValue(new Error('Database connection failed'));
58
+ prisma.entity.findFirst.mockRejectedValue(new Error('Database connection failed'));
55
59
  const response = await fastify.inject({
56
60
  method: 'GET',
57
61
  url: `/entity/${encodeURIComponent('http://example.com/entity/123')}`,
@@ -67,7 +71,7 @@ describe('Entity Route', () => {
67
71
  });
68
72
  const body = JSON.parse(response.body);
69
73
  expect(response.statusCode).toBe(400);
70
- expect(body.error).toBe('Bad Request');
74
+ expect(body.error.code).toBe('VALIDATION_ERROR');
71
75
  });
72
76
  it('should apply custom entity transformers', async () => {
73
77
  const customTransformer = async (entity) => ({
@@ -76,8 +80,10 @@ describe('Entity Route', () => {
76
80
  });
77
81
  await fastifyBefore();
78
82
  await fastify.register(entityRoute, {
83
+ entityVisibilityFilter: AllVisibleEntityFilter,
84
+ refusal: { promptLoginForHidden: false },
79
85
  prisma,
80
- accessTransformer: AllPublicAccessTransformer,
86
+ access: AllPublicAccess,
81
87
  entityTransformers: [customTransformer],
82
88
  });
83
89
  const mockEntity = {
@@ -92,7 +98,7 @@ describe('Entity Route', () => {
92
98
  createdAt: new Date(),
93
99
  updatedAt: new Date(),
94
100
  };
95
- prisma.entity.findUnique.mockResolvedValue(mockEntity);
101
+ prisma.entity.findFirst.mockResolvedValue(mockEntity);
96
102
  const response = await fastify.inject({
97
103
  method: 'GET',
98
104
  url: `/entity/${encodeURIComponent('http://example.com/entity/123')}`,
@@ -115,7 +121,7 @@ describe('Entity Route', () => {
115
121
  updatedAt: new Date(),
116
122
  meta: {},
117
123
  };
118
- prisma.entity.findUnique.mockResolvedValue(mockEntity);
124
+ prisma.entity.findFirst.mockResolvedValue(mockEntity);
119
125
  prisma.entity.findMany.mockResolvedValue([]);
120
126
  const response = await fastify.inject({
121
127
  method: 'GET',
@@ -1 +1 @@
1
- {"version":3,"file":"entity.test.js","sourceRoot":"","sources":["../../src/routes/entity.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity.test.js","sourceRoot":"","sources":["../../src/routes/entity.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,WAAW,MAAM,aAAa,CAAC;AAEtC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,aAAa,EAAE,CAAC;QACtB,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE;YAClC,sBAAsB,EAAE,sBAAsB;YAC9C,OAAO,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE;YACxC,MAAM;YACN,MAAM,EAAE,eAAe;SACxB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,YAAY,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,UAAU,GAAG;gBACjB,EAAE,EAAE,+BAA+B;gBACnC,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,eAAe;gBAC5B,UAAU,EAAE,0BAA0B;gBAEtC,QAAQ,EAAE,IAAI;gBACd,cAAc,EAAE,IAAI;gBACpB,iBAAiB,EAAE,8CAA8C;gBACjE,gBAAgB,EAAE,8CAA8C;gBAChE,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,IAAI,EAAE,EAAE;aACT,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,WAAW,kBAAkB,CAAC,+BAA+B,CAAC,EAAE;aACtE,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEvC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC;gBACnD,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,+BAA+B,EAAE,EAAE,EAAE,CAAC,EAAE;gBAC7D,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;aAC5C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAEhD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,WAAW,kBAAkB,CAAC,uCAAuC,CAAC,EAAE;aAC9E,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEvC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAEnF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,WAAW,kBAAkB,CAAC,+BAA+B,CAAC,EAAE;aACtE,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEvC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,oBAAoB;aAC1B,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAA0B,CAAC;YAEhE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YAEvD,MAAM,iBAAiB,GAAG,KAAK,EAAE,MAAW,EAAE,EAAE,CAAC,CAAC;gBAChD,GAAG,MAAM;gBACT,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;YAEH,MAAM,aAAa,EAAE,CAAC;YACtB,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE;gBAClC,sBAAsB,EAAE,sBAAsB;gBAC9C,OAAO,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE;gBACxC,MAAM;gBACN,MAAM,EAAE,eAAe;gBACvB,kBAAkB,EAAE,CAAC,iBAAiB,CAAC;aACxC,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG;gBACjB,EAAE,EAAE,+BAA+B;gBACnC,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,eAAe;gBAC5B,UAAU,EAAE,mCAAmC;gBAC/C,QAAQ,EAAE,IAAI;gBACd,cAAc,EAAE,IAAI;gBACpB,iBAAiB,EAAE,8CAA8C;gBACjE,gBAAgB,EAAE,8CAA8C;gBAChE,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC;YAGF,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,WAAW,kBAAkB,CAAC,+BAA+B,CAAC,EAAE;aACtE,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEvC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;YAC3F,MAAM,UAAU,GAAG;gBACjB,EAAE,EAAE,+BAA+B;gBACnC,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,eAAe;gBAC5B,UAAU,EAAE,+BAA+B;gBAE3C,QAAQ,EAAE,mCAAmC;gBAC7C,cAAc,EAAE,mCAAmC;gBACnD,iBAAiB,EAAE,8CAA8C;gBACjE,gBAAgB,EAAE,8CAA8C;gBAChE,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,IAAI,EAAE,EAAE;aACT,CAAC;YAGF,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YACtD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;YAE7C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,WAAW,kBAAkB,CAAC,+BAA+B,CAAC,EAAE;aACtE,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEvC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1,9 +1,15 @@
1
1
  import type { FastifyPluginAsync } from 'fastify';
2
2
  import type { PrismaClient } from '../generated/prisma/client.js';
3
+ import type { AccessFunction } from '../types/access.js';
3
4
  import type { FileHandler } from '../types/fileHandlers.js';
5
+ import type { EntityVisibilityFilter } from '../types/visibility.js';
6
+ import { type RefusalOptions } from '../utils/visibility.js';
4
7
  type FileRouteOptions = {
5
8
  prisma: PrismaClient;
6
9
  fileHandler: FileHandler;
10
+ access: AccessFunction;
11
+ entityVisibilityFilter: EntityVisibilityFilter;
12
+ refusal: RefusalOptions;
7
13
  };
8
14
  declare const file: FastifyPluginAsync<FileRouteOptions>;
9
15
  export default file;
@@ -1,7 +1,10 @@
1
1
  import { createReadStream } from 'node:fs';
2
+ import { create as contentDisposition } from 'content-disposition';
2
3
  import { z } from 'zod';
3
- import { createInternalError, createNotFoundError } from '../utils/errors.js';
4
+ import { createAccessGuard } from '../utils/access.js';
5
+ import { createNotFoundError } from '../utils/errors.js';
4
6
  import { setFileHeaders } from '../utils/headers.js';
7
+ import { createNotVisibleResponder } from '../utils/visibility.js';
5
8
  const paramsSchema = z.object({
6
9
  id: z.url(),
7
10
  });
@@ -11,32 +14,45 @@ const querySchema = z.object({
11
14
  noRedirect: z.coerce.boolean().optional().default(false),
12
15
  });
13
16
  const file = async (fastify, opts) => {
14
- const { prisma, fileHandler } = opts;
17
+ const { prisma, fileHandler, access, entityVisibilityFilter, refusal } = opts;
18
+ const findVisibleFile = async (id, context) => {
19
+ const found = await prisma.file.findFirst({
20
+ where: { id, entity: await entityVisibilityFilter(context) },
21
+ include: { entity: { omit: { meta: true } } },
22
+ });
23
+ if (!found) {
24
+ return null;
25
+ }
26
+ const { entity, ...file } = found;
27
+ return { file, entity };
28
+ };
29
+ const denyContent = createAccessGuard({ access, isAuthenticated: refusal.isAuthenticated, level: 'content' });
30
+ const sendFileNotVisible = createNotVisibleResponder({
31
+ ...refusal,
32
+ notFoundMessage: 'The requested file was not found',
33
+ exists: async (id) => (await prisma.file.count({ where: { id } })) > 0,
34
+ });
15
35
  fastify.withTypeProvider().head('/file/:id', {
16
36
  schema: {
17
37
  params: paramsSchema,
18
38
  },
19
39
  }, async (request, reply) => {
20
40
  const { id } = request.params;
21
- try {
22
- const file = await prisma.file.findUnique({
23
- where: { id },
24
- });
25
- if (!file) {
26
- return reply.code(404).send(createNotFoundError('The requested file was not found', id));
27
- }
28
- const metadata = await fileHandler.head(file, { request, fastify });
29
- if (!metadata) {
30
- return reply.code(404).send(createNotFoundError('The requested file metadata was not found', id));
31
- }
32
- setFileHeaders(reply, metadata);
33
- return reply.code(200).send();
41
+ const context = { request, fastify };
42
+ const visible = await findVisibleFile(id, context);
43
+ if (!visible) {
44
+ return sendFileNotVisible(reply, id, context);
34
45
  }
35
- catch (error) {
36
- const err = error;
37
- fastify.log.error(`File metadata retrieval error: ${err.message}`);
38
- return reply.code(500).send(createInternalError());
46
+ const { file, entity } = visible;
47
+ if (await denyContent(reply, entity, context)) {
48
+ return reply;
39
49
  }
50
+ const metadata = await fileHandler.head(file, context);
51
+ if (!metadata) {
52
+ return reply.code(404).send(createNotFoundError('The requested file metadata was not found', id));
53
+ }
54
+ setFileHeaders(reply, metadata);
55
+ return reply.code(200).send();
40
56
  });
41
57
  fastify.withTypeProvider().get('/file/:id', {
42
58
  schema: {
@@ -45,49 +61,41 @@ const file = async (fastify, opts) => {
45
61
  },
46
62
  }, async (request, reply) => {
47
63
  const { id } = request.params;
48
- try {
49
- const file = await prisma.file.findUnique({
50
- where: { id },
51
- });
52
- if (!file) {
53
- return reply.code(404).send(createNotFoundError('The requested file was not found', id));
54
- }
55
- const result = await fileHandler.get(file, { request, fastify });
56
- if (!result) {
57
- return reply.code(404).send(createNotFoundError('The requested file could not be retrieved', id));
58
- }
59
- if (result.type === 'redirect') {
60
- if (request.query.noRedirect) {
61
- return reply.code(200).send({ location: result.url });
62
- }
63
- return reply.code(302).redirect(result.url);
64
- }
65
- const { disposition, filename: customFilename } = request.query;
66
- const filename = customFilename || file.filename;
67
- setFileHeaders(reply, result.metadata);
68
- reply.header('Content-Disposition', `${disposition}; filename="${filename}"`);
69
- if (result.type === 'stream') {
70
- return reply.code(200).send(result.stream);
71
- }
72
- if (result.type === 'file') {
73
- if (result.accelPath) {
74
- reply.header('X-Accel-Redirect', result.accelPath);
75
- return reply.code(200).send();
76
- }
77
- const stream = createReadStream(result.path);
78
- return reply.code(200).send(stream);
64
+ const context = { request, fastify };
65
+ const visible = await findVisibleFile(id, context);
66
+ if (!visible) {
67
+ return sendFileNotVisible(reply, id, context);
68
+ }
69
+ const { file, entity } = visible;
70
+ if (await denyContent(reply, entity, context)) {
71
+ return reply;
72
+ }
73
+ const result = await fileHandler.get(file, context);
74
+ if (!result) {
75
+ return reply.code(404).send(createNotFoundError('The requested file could not be retrieved', id));
76
+ }
77
+ if (result.type === 'redirect') {
78
+ if (request.query.noRedirect) {
79
+ return reply.code(200).send({ location: result.url });
79
80
  }
80
- console.error(`Unexpected file result type: ${result.type}`);
81
- reply.removeHeader('Content-Disposition');
82
- reply.removeHeader('Content-Type');
83
- reply.removeHeader('Content-Length');
84
- return reply.code(500).send(createInternalError());
81
+ return reply.code(302).redirect(result.url);
82
+ }
83
+ const { disposition, filename: customFilename } = request.query;
84
+ setFileHeaders(reply, result.metadata);
85
+ reply.header('Content-Disposition', contentDisposition(customFilename || file.filename, { type: disposition }));
86
+ if (result.type === 'stream') {
87
+ return reply.code(200).send(result.stream);
85
88
  }
86
- catch (error) {
87
- const err = error;
88
- fastify.log.error(`File retrieval error: ${err}`);
89
- return reply.code(500).send(createInternalError());
89
+ if (result.type === 'file') {
90
+ if (result.accelPath) {
91
+ reply.header('X-Accel-Redirect', result.accelPath);
92
+ return reply.code(200).send();
93
+ }
94
+ const stream = createReadStream(result.path);
95
+ return reply.code(200).send(stream);
90
96
  }
97
+ reply.removeHeader('Content-Disposition');
98
+ throw new Error(`Unexpected file result type: ${result.type}`);
91
99
  });
92
100
  };
93
101
  export default file;
@@ -1 +1 @@
1
- {"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/routes/file.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/routes/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,MAAM,IAAI,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAGnE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAuB,MAAM,wBAAwB,CAAC;AAExF,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE;CACZ,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC1E,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CACzD,CAAC,CAAC;AAUH,MAAM,IAAI,GAAyC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACzE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAG9E,MAAM,eAAe,GAAG,KAAK,EAAE,EAAU,EAAE,OAAuB,EAAE,EAAE;QACpE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YACxC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC,OAAO,CAAC,EAAE;YAC5D,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;SAC9C,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;QAElC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1B,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,iBAAiB,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAE9G,MAAM,kBAAkB,GAAG,yBAAyB,CAAC;QACnD,GAAG,OAAO;QACV,eAAe,EAAE,kCAAkC;QACnD,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC;KACvE,CAAC,CAAC;IAEH,OAAO,CAAC,gBAAgB,EAAmB,CAAC,IAAI,CAC9C,WAAW,EACX;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,kBAAkB,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QACjC,IAAI,MAAM,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,QAAQ,GAAyB,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,2CAA2C,EAAE,EAAE,CAAC,CAAC,CAAC;QACpG,CAAC;QAED,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEhC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC,CACF,CAAC;IAEF,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,WAAW,EACX;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;YACpB,WAAW,EAAE,WAAW;SACzB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,kBAAkB,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QACjC,IAAI,MAAM,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,2CAA2C,EAAE,EAAE,CAAC,CAAC,CAAC;QACpG,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;YACxD,CAAC;YAED,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QAChE,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvC,KAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAGhH,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;gBACnD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAChC,CAAC;YAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAGD,KAAK,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,gCAAiC,MAA2B,CAAC,IAAI,EAAE,CAAC,CAAC;IACvF,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}