medusajs-documents-plugin 1.1.4 → 1.1.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/.medusa/server/src/api/admin/documents/[id]/document/route.js +16 -6
- package/.medusa/server/src/api/admin/documents/route.js +37 -6
- package/.medusa/server/src/api/admin/documents/settings/route.js +74 -13
- package/.medusa/server/src/api/documents/[id]/document/route.js +17 -5
- package/.medusa/server/src/modules/documents/service.js +193 -83
- package/CHANGELOG.md +11 -0
- package/package.json +1 -1
|
@@ -5,23 +5,33 @@ const documents_1 = require("../../../../../modules/documents");
|
|
|
5
5
|
// GET /admin/documents/:id/document
|
|
6
6
|
async function GET(req, res) {
|
|
7
7
|
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
8
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
9
|
+
const sharedContext = manager ? { manager } : {};
|
|
8
10
|
const id = req.params.id;
|
|
9
11
|
try {
|
|
10
12
|
let record = null;
|
|
11
13
|
// Check by ID or display_id
|
|
12
14
|
try {
|
|
13
|
-
record = await documentService.retrieveDocumentRecord(id);
|
|
15
|
+
record = await documentService.retrieveDocumentRecord(id, {}, sharedContext);
|
|
14
16
|
}
|
|
15
17
|
catch (e) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
try {
|
|
19
|
+
const records = await documentService.listDocumentRecords({ display_id: id }, {}, sharedContext);
|
|
20
|
+
if (records && records.length > 0) {
|
|
21
|
+
record = records[0];
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
catch (err2) {
|
|
25
|
+
const pg = req.scope.resolve("pg_connection", { allowUnregistered: true });
|
|
26
|
+
if (pg) {
|
|
27
|
+
record = await pg("document_records").where({ id }).orWhere({ display_id: id }).first();
|
|
28
|
+
}
|
|
19
29
|
}
|
|
20
30
|
}
|
|
21
31
|
if (!record) {
|
|
22
32
|
return res.status(404).send("Document not found");
|
|
23
33
|
}
|
|
24
|
-
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope);
|
|
34
|
+
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope, sharedContext);
|
|
25
35
|
res.setHeader("Content-Type", "application/pdf");
|
|
26
36
|
res.setHeader("Content-Disposition", `inline; filename="${record.display_id}.pdf"`);
|
|
27
37
|
res.setHeader("Content-Length", String(pdfBuffer.length));
|
|
@@ -33,4 +43,4 @@ async function GET(req, res) {
|
|
|
33
43
|
return res.status(500).send(`Failed to generate document: ${err.message}`);
|
|
34
44
|
}
|
|
35
45
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9baWRdL2RvY3VtZW50L3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBS0Esa0JBd0NDO0FBNUNELGdFQUFvRTtBQUdwRSxvQ0FBb0M7QUFDN0IsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFrQyxFQUFFLEdBQW1CO0lBQy9FLE1BQU0sZUFBZSxHQUEwQixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyw0QkFBZ0IsQ0FBQyxDQUFDO0lBQ25GLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDMUUsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFDakQsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7SUFFekIsSUFBSSxDQUFDO1FBQ0gsSUFBSSxNQUFNLEdBQVEsSUFBSSxDQUFDO1FBQ3ZCLDRCQUE0QjtRQUM1QixJQUFJLENBQUM7WUFDSCxNQUFNLEdBQUcsTUFBTSxlQUFlLENBQUMsc0JBQXNCLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUMvRSxDQUFDO1FBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNYLElBQUksQ0FBQztnQkFDSCxNQUFNLE9BQU8sR0FBRyxNQUFNLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsYUFBYSxDQUFDLENBQUM7Z0JBQ2pHLElBQUksT0FBTyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7b0JBQ2xDLE1BQU0sR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3RCLENBQUM7WUFDSCxDQUFDO1lBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQztnQkFDZCxNQUFNLEVBQUUsR0FBUSxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO2dCQUNoRixJQUFJLEVBQUUsRUFBRSxDQUFDO29CQUNQLE1BQU0sR0FBRyxNQUFNLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLEtBQUssQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsVUFBVSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQzFGLENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNaLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUNwRCxDQUFDO1FBRUQsTUFBTSxTQUFTLEdBQUcsTUFBTSxlQUFlLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsR0FBRyxDQUFDLEtBQUssRUFBRSxhQUFhLENBQUMsQ0FBQztRQUU3RixHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ2pELEdBQUcsQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUscUJBQXFCLE1BQU0sQ0FBQyxVQUFVLE9BQU8sQ0FBQyxDQUFDO1FBQ3BGLEdBQUcsQ0FBQyxTQUFTLENBQUMsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQzFELEdBQUcsQ0FBQyxTQUFTLENBQUMsZUFBZSxFQUFFLHFDQUFxQyxDQUFDLENBQUM7UUFDdEUsT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFBQyxPQUFPLEdBQVEsRUFBRSxDQUFDO1FBQ2xCLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEtBQUssQ0FBQyx3Q0FBd0MsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDMUYsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxnQ0FBZ0MsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDN0UsQ0FBQztBQUNILENBQUMifQ==
|
|
@@ -5,6 +5,8 @@ const documents_1 = require("../../../modules/documents");
|
|
|
5
5
|
// GET /admin/documents
|
|
6
6
|
async function GET(req, res) {
|
|
7
7
|
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
8
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
9
|
+
const sharedContext = manager ? { manager } : {};
|
|
8
10
|
const { type, source, status, search, take = 50, skip = 0 } = req.query;
|
|
9
11
|
const filters = {};
|
|
10
12
|
if (type && type !== "all")
|
|
@@ -13,11 +15,40 @@ async function GET(req, res) {
|
|
|
13
15
|
filters.source = source;
|
|
14
16
|
if (status && status !== "all")
|
|
15
17
|
filters.status = status;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
let records = [];
|
|
19
|
+
let count = 0;
|
|
20
|
+
try {
|
|
21
|
+
const [fetchedRecords, fetchedCount] = await documentService.listAndCountDocumentRecords(filters, {
|
|
22
|
+
take: Number(take),
|
|
23
|
+
skip: Number(skip),
|
|
24
|
+
order: { created_at: "DESC" },
|
|
25
|
+
}, sharedContext);
|
|
26
|
+
records = fetchedRecords;
|
|
27
|
+
count = fetchedCount;
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
// Fallback: If MikroORM fork error occurs, query pg_connection directly
|
|
31
|
+
const pgConnection = req.scope.resolve("pg_connection", { allowUnregistered: true });
|
|
32
|
+
if (pgConnection) {
|
|
33
|
+
let query = pgConnection("document_records");
|
|
34
|
+
if (filters.type)
|
|
35
|
+
query = query.where({ type: filters.type });
|
|
36
|
+
if (filters.source)
|
|
37
|
+
query = query.where({ source: filters.source });
|
|
38
|
+
if (filters.status)
|
|
39
|
+
query = query.where({ status: filters.status });
|
|
40
|
+
const countResult = await query.clone().count("id as count").first();
|
|
41
|
+
count = Number(countResult?.count || 0);
|
|
42
|
+
records = await query
|
|
43
|
+
.orderBy("created_at", "desc")
|
|
44
|
+
.limit(Number(take))
|
|
45
|
+
.offset(Number(skip));
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
req.scope.resolve("logger")?.error(`[Documents-API] Error listing documents: ${err.message}`);
|
|
49
|
+
return res.status(500).json({ message: err.message, error: true });
|
|
50
|
+
}
|
|
51
|
+
}
|
|
21
52
|
let filteredRecords = records;
|
|
22
53
|
if (search && typeof search === "string" && search.trim() !== "") {
|
|
23
54
|
const q = search.toLowerCase();
|
|
@@ -33,4 +64,4 @@ async function GET(req, res) {
|
|
|
33
64
|
skip: Number(skip),
|
|
34
65
|
});
|
|
35
66
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLGtCQW9FQztBQXhFRCwwREFBOEQ7QUFHOUQsdUJBQXVCO0FBQ2hCLEtBQUssVUFBVSxHQUFHLENBQUMsR0FBa0IsRUFBRSxHQUFtQjtJQUMvRCxNQUFNLGVBQWUsR0FBMEIsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsNEJBQWdCLENBQUMsQ0FBQztJQUVuRixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBRWpELE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUUsRUFBRSxJQUFJLEdBQUcsQ0FBQyxFQUFFLEdBQUcsR0FBRyxDQUFDLEtBQVksQ0FBQztJQUUvRSxNQUFNLE9BQU8sR0FBd0IsRUFBRSxDQUFDO0lBQ3hDLElBQUksSUFBSSxJQUFJLElBQUksS0FBSyxLQUFLO1FBQUUsT0FBTyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7SUFDaEQsSUFBSSxNQUFNLElBQUksTUFBTSxLQUFLLEtBQUs7UUFBRSxPQUFPLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUN4RCxJQUFJLE1BQU0sSUFBSSxNQUFNLEtBQUssS0FBSztRQUFFLE9BQU8sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBRXhELElBQUksT0FBTyxHQUFVLEVBQUUsQ0FBQztJQUN4QixJQUFJLEtBQUssR0FBRyxDQUFDLENBQUM7SUFFZCxJ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
|
|
@@ -6,9 +6,35 @@ const documents_1 = require("../../../../modules/documents");
|
|
|
6
6
|
// GET /admin/documents/settings
|
|
7
7
|
async function GET(req, res) {
|
|
8
8
|
try {
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
|
|
9
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
10
|
+
const sharedContext = manager ? { manager } : {};
|
|
11
|
+
try {
|
|
12
|
+
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
13
|
+
const settings = await documentService.getSettings(sharedContext, req.scope);
|
|
14
|
+
return res.json({ settings, success: true });
|
|
15
|
+
}
|
|
16
|
+
catch (err) {
|
|
17
|
+
// Fallback: If MikroORM fork error occurs, query pg_connection directly
|
|
18
|
+
const pgConnection = req.scope.resolve("pg_connection", { allowUnregistered: true });
|
|
19
|
+
if (pgConnection) {
|
|
20
|
+
let settings = await pgConnection("document_settings").first();
|
|
21
|
+
if (!settings) {
|
|
22
|
+
const [created] = await pgConnection("document_settings")
|
|
23
|
+
.insert({
|
|
24
|
+
company_name: "Store",
|
|
25
|
+
email_notifications_enabled: true,
|
|
26
|
+
sms_notifications_enabled: true,
|
|
27
|
+
whatsapp_notifications_enabled: true,
|
|
28
|
+
created_at: new Date(),
|
|
29
|
+
updated_at: new Date(),
|
|
30
|
+
})
|
|
31
|
+
.returning("*");
|
|
32
|
+
settings = created;
|
|
33
|
+
}
|
|
34
|
+
return res.json({ settings, success: true });
|
|
35
|
+
}
|
|
36
|
+
throw err;
|
|
37
|
+
}
|
|
12
38
|
}
|
|
13
39
|
catch (err) {
|
|
14
40
|
req.scope.resolve("logger")?.error(`[Documents-API] Error fetching settings: ${err.message}`);
|
|
@@ -18,21 +44,56 @@ async function GET(req, res) {
|
|
|
18
44
|
// POST /admin/documents/settings
|
|
19
45
|
async function POST(req, res) {
|
|
20
46
|
try {
|
|
21
|
-
const
|
|
22
|
-
|
|
47
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
48
|
+
const sharedContext = manager ? { manager } : {};
|
|
23
49
|
// Filter out read-only / metadata columns that cause MikroORM update errors
|
|
24
50
|
const { id, created_at, updated_at, deleted_at, ...cleanData } = req.body || {};
|
|
25
51
|
if (cleanData.zoho_payment_terms_days !== undefined) {
|
|
26
52
|
cleanData.zoho_payment_terms_days = Number(cleanData.zoho_payment_terms_days || 0);
|
|
27
53
|
}
|
|
28
|
-
|
|
29
|
-
|
|
54
|
+
let settings = null;
|
|
55
|
+
try {
|
|
56
|
+
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
57
|
+
let [existingSettings] = await documentService.listDocumentSettings({}, {}, sharedContext);
|
|
58
|
+
if (!existingSettings) {
|
|
59
|
+
settings = await documentService.createDocumentSettings(cleanData, sharedContext);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
settings = await documentService.updateDocumentSettings({
|
|
63
|
+
id: existingSettings.id,
|
|
64
|
+
...cleanData,
|
|
65
|
+
}, sharedContext);
|
|
66
|
+
}
|
|
30
67
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
68
|
+
catch (err) {
|
|
69
|
+
// Fallback: If MikroORM fork error occurs, update via pg_connection directly
|
|
70
|
+
const pgConnection = req.scope.resolve("pg_connection", { allowUnregistered: true });
|
|
71
|
+
if (pgConnection) {
|
|
72
|
+
const existing = await pgConnection("document_settings").first();
|
|
73
|
+
if (existing) {
|
|
74
|
+
const [updated] = await pgConnection("document_settings")
|
|
75
|
+
.where({ id: existing.id })
|
|
76
|
+
.update({
|
|
77
|
+
...cleanData,
|
|
78
|
+
updated_at: new Date(),
|
|
79
|
+
})
|
|
80
|
+
.returning("*");
|
|
81
|
+
settings = updated;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
const [created] = await pgConnection("document_settings")
|
|
85
|
+
.insert({
|
|
86
|
+
...cleanData,
|
|
87
|
+
created_at: new Date(),
|
|
88
|
+
updated_at: new Date(),
|
|
89
|
+
})
|
|
90
|
+
.returning("*");
|
|
91
|
+
settings = created;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
throw err;
|
|
96
|
+
}
|
|
36
97
|
}
|
|
37
98
|
return res.json({ settings, success: true });
|
|
38
99
|
}
|
|
@@ -41,4 +102,4 @@ async function POST(req, res) {
|
|
|
41
102
|
return res.status(500).json({ message: err.message, error: true });
|
|
42
103
|
}
|
|
43
104
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9zZXR0aW5ncy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLGtCQW1DQztBQUdELG9CQTREQztBQXRHRCw2REFBaUU7QUFHakUsZ0NBQWdDO0FBQ3pCLEtBQUssVUFBVSxHQUFHLENBQUMsR0FBa0IsRUFBRSxHQUFtQjtJQUMvRCxJQUFJLENBQUM7UUFDSCxNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzFFLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBRWpELElBQUksQ0FBQztZQUNILE1BQU0sZUFBZSxHQUEwQixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyw0QkFBZ0IsQ0FBQyxDQUFDO1lBQ25GLE1BQU0sUUFBUSxHQUFHLE1BQU0sZUFBZSxDQUFDLFdBQVcsQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzdFLE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMvQyxDQUFDO1FBQUMsT0FBTyxHQUFRLEVBQUUsQ0FBQztZQUNsQix3RUFBd0U7WUFDeEUsTUFBTSxZQUFZLEdBQVEsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUMxRixJQUFJLFlBQVksRUFBRSxDQUFDO2dCQUNqQixJQUFJLFFBQVEsR0FBRyxNQUFNLFlBQVksQ0FBQyxtQkFBbUIsQ0FBQyxD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
|
|
@@ -6,25 +6,37 @@ const documents_1 = require("../../../../modules/documents");
|
|
|
6
6
|
async function GET(req, res) {
|
|
7
7
|
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
8
8
|
const cleanId = (req.params.id || "").replace(/\.pdf$/i, "");
|
|
9
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
10
|
+
const sharedContext = manager ? { manager } : {};
|
|
9
11
|
try {
|
|
10
12
|
let record = null;
|
|
11
13
|
// Check by primary ID or human display_id (e.g. INV-1092, JOB-101, RCPT-101)
|
|
12
14
|
try {
|
|
13
|
-
record = await documentService.retrieveDocumentRecord(cleanId);
|
|
15
|
+
record = await documentService.retrieveDocumentRecord(cleanId, {}, sharedContext);
|
|
14
16
|
}
|
|
15
17
|
catch (e) { }
|
|
16
18
|
if (!record) {
|
|
17
|
-
const records = await documentService.listDocumentRecords({ display_id: cleanId }).catch(() => []);
|
|
19
|
+
const records = await documentService.listDocumentRecords({ display_id: cleanId }, {}, sharedContext).catch(() => []);
|
|
18
20
|
if (records && records.length > 0) {
|
|
19
21
|
record = records[0];
|
|
20
22
|
}
|
|
21
23
|
}
|
|
22
24
|
if (!record) {
|
|
23
|
-
const records = await documentService.listDocumentRecords({ repair_ticket_id: cleanId }).catch(() => []);
|
|
25
|
+
const records = await documentService.listDocumentRecords({ repair_ticket_id: cleanId }, {}, sharedContext).catch(() => []);
|
|
24
26
|
if (records && records.length > 0) {
|
|
25
27
|
record = records[0];
|
|
26
28
|
}
|
|
27
29
|
}
|
|
30
|
+
if (!record) {
|
|
31
|
+
const pg = req.scope.resolve("pg_connection", { allowUnregistered: true });
|
|
32
|
+
if (pg) {
|
|
33
|
+
record = await pg("document_records")
|
|
34
|
+
.where({ id: cleanId })
|
|
35
|
+
.orWhere({ display_id: cleanId })
|
|
36
|
+
.orWhere({ repair_ticket_id: cleanId })
|
|
37
|
+
.first();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
28
40
|
// Fallback: If not in documents table, check if cleanId is an approval token or ID in repair module
|
|
29
41
|
if (!record) {
|
|
30
42
|
try {
|
|
@@ -48,7 +60,7 @@ async function GET(req, res) {
|
|
|
48
60
|
if (!record) {
|
|
49
61
|
return res.status(404).send("Document not found");
|
|
50
62
|
}
|
|
51
|
-
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope);
|
|
63
|
+
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope, sharedContext);
|
|
52
64
|
res.setHeader("Content-Type", "application/pdf");
|
|
53
65
|
res.setHeader("Content-Disposition", `inline; filename="${record.display_id}.pdf"`);
|
|
54
66
|
res.setHeader("Content-Length", String(pdfBuffer.length));
|
|
@@ -60,4 +72,4 @@ async function GET(req, res) {
|
|
|
60
72
|
return res.status(500).send(`Failed to generate document: ${err.message}`);
|
|
61
73
|
}
|
|
62
74
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2RvY3VtZW50cy9baWRdL2RvY3VtZW50L3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBS0Esa0JBMEVDO0FBOUVELDZEQUFpRTtBQUdqRSwwRUFBMEU7QUFDbkUsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFrQyxFQUFFLEdBQW1CO0lBQy9FLE1BQU0sZUFBZSxHQUEwQixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyw0QkFBZ0IsQ0FBQyxDQUFDO0lBQ25GLE1BQU0sT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUU3RCxNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBRWpELElBQUksQ0FBQztRQUNILElBQUksTUFBTSxHQUFRLElBQUksQ0FBQztRQUN2Qiw2RUFBNkU7UUFDN0UsSUFBSSxDQUFDO1lBQ0gsTUFBTSxHQUFHLE1BQU0sZUFBZSxDQUFDLHNCQUFzQixDQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFDcEYsQ0FBQztRQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDO1FBRWQsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osTUFBTSxPQUFPLEdBQUcsTUFBTSxlQUFlLENBQUMsbUJBQW1CLENBQUMsRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLGFB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
|
|
@@ -17,53 +17,93 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
17
17
|
/**
|
|
18
18
|
* Retrieves or initializes default plugin settings
|
|
19
19
|
*/
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
/**
|
|
21
|
+
* Retrieves or initializes default plugin settings
|
|
22
|
+
*/
|
|
23
|
+
async getSettings(sharedContext, container) {
|
|
24
|
+
try {
|
|
25
|
+
const [settings] = await this.listDocumentSettings({}, {}, sharedContext);
|
|
26
|
+
if (settings) {
|
|
27
|
+
return settings;
|
|
28
|
+
}
|
|
29
|
+
return await this.createDocumentSettings({
|
|
30
|
+
company_name: "Store",
|
|
31
|
+
email_notifications_enabled: true,
|
|
32
|
+
sms_notifications_enabled: true,
|
|
33
|
+
whatsapp_notifications_enabled: true,
|
|
34
|
+
event_order_placed_enabled: true,
|
|
35
|
+
event_order_completed_enabled: true,
|
|
36
|
+
event_payment_captured_enabled: true,
|
|
37
|
+
event_order_fulfillment_enabled: true,
|
|
38
|
+
event_order_canceled_enabled: true,
|
|
39
|
+
event_repair_status_changed_enabled: true,
|
|
40
|
+
event_repair_compliance_enabled: true,
|
|
41
|
+
event_repair_created_enabled: true,
|
|
42
|
+
event_repair_completed_enabled: true,
|
|
43
|
+
event_repair_reminder_enabled: true,
|
|
44
|
+
invoice_template: "modern",
|
|
45
|
+
packing_slip_template: "modern",
|
|
46
|
+
receipt_template: "modern",
|
|
47
|
+
estimate_template: "modern",
|
|
48
|
+
job_card_template: "modern",
|
|
49
|
+
custom_doc_template: "modern",
|
|
50
|
+
email_subject_template: null,
|
|
51
|
+
email_body_template: null,
|
|
52
|
+
sms_body_template: null,
|
|
53
|
+
whatsapp_body_template: null,
|
|
54
|
+
order_placed_email_subject: null,
|
|
55
|
+
order_placed_email_template: null,
|
|
56
|
+
order_placed_sms_template: null,
|
|
57
|
+
order_placed_whatsapp_template: null,
|
|
58
|
+
order_payment_email_subject: null,
|
|
59
|
+
order_payment_email_template: null,
|
|
60
|
+
order_payment_sms_template: null,
|
|
61
|
+
order_payment_whatsapp_template: null,
|
|
62
|
+
order_fulfillment_email_subject: null,
|
|
63
|
+
order_fulfillment_email_template: null,
|
|
64
|
+
order_fulfillment_sms_template: null,
|
|
65
|
+
order_fulfillment_whatsapp_template: null,
|
|
66
|
+
order_canceled_email_subject: null,
|
|
67
|
+
order_canceled_email_template: null,
|
|
68
|
+
order_canceled_sms_template: null,
|
|
69
|
+
order_canceled_whatsapp_template: null,
|
|
70
|
+
}, sharedContext);
|
|
71
|
+
}
|
|
72
|
+
catch (err) {
|
|
73
|
+
const conn = container?.resolve?.("pg_connection", { allowUnregistered: true }) ||
|
|
74
|
+
this.__container__?.["pg_connection"];
|
|
75
|
+
if (conn) {
|
|
76
|
+
let row = await conn("document_settings").first();
|
|
77
|
+
if (row)
|
|
78
|
+
return row;
|
|
79
|
+
const [created] = await conn("document_settings").insert({
|
|
80
|
+
company_name: "Store",
|
|
81
|
+
email_notifications_enabled: true,
|
|
82
|
+
sms_notifications_enabled: true,
|
|
83
|
+
whatsapp_notifications_enabled: true,
|
|
84
|
+
event_order_placed_enabled: true,
|
|
85
|
+
event_order_completed_enabled: true,
|
|
86
|
+
event_payment_captured_enabled: true,
|
|
87
|
+
event_order_fulfillment_enabled: true,
|
|
88
|
+
event_order_canceled_enabled: true,
|
|
89
|
+
event_repair_status_changed_enabled: true,
|
|
90
|
+
event_repair_compliance_enabled: true,
|
|
91
|
+
event_repair_created_enabled: true,
|
|
92
|
+
event_repair_completed_enabled: true,
|
|
93
|
+
event_repair_reminder_enabled: true,
|
|
94
|
+
invoice_template: "modern",
|
|
95
|
+
packing_slip_template: "modern",
|
|
96
|
+
receipt_template: "modern",
|
|
97
|
+
estimate_template: "modern",
|
|
98
|
+
job_card_template: "modern",
|
|
99
|
+
custom_doc_template: "modern",
|
|
100
|
+
created_at: new Date(),
|
|
101
|
+
updated_at: new Date(),
|
|
102
|
+
}).returning("*");
|
|
103
|
+
return created;
|
|
104
|
+
}
|
|
105
|
+
throw err;
|
|
24
106
|
}
|
|
25
|
-
return await this.createDocumentSettings({
|
|
26
|
-
company_name: "Store",
|
|
27
|
-
email_notifications_enabled: true,
|
|
28
|
-
sms_notifications_enabled: true,
|
|
29
|
-
whatsapp_notifications_enabled: true,
|
|
30
|
-
event_order_placed_enabled: true,
|
|
31
|
-
event_order_completed_enabled: true,
|
|
32
|
-
event_payment_captured_enabled: true,
|
|
33
|
-
event_order_fulfillment_enabled: true,
|
|
34
|
-
event_order_canceled_enabled: true,
|
|
35
|
-
event_repair_status_changed_enabled: true,
|
|
36
|
-
event_repair_compliance_enabled: true,
|
|
37
|
-
event_repair_created_enabled: true,
|
|
38
|
-
event_repair_completed_enabled: true,
|
|
39
|
-
event_repair_reminder_enabled: true,
|
|
40
|
-
invoice_template: "modern",
|
|
41
|
-
packing_slip_template: "modern",
|
|
42
|
-
receipt_template: "modern",
|
|
43
|
-
estimate_template: "modern",
|
|
44
|
-
job_card_template: "modern",
|
|
45
|
-
custom_doc_template: "modern",
|
|
46
|
-
email_subject_template: null,
|
|
47
|
-
email_body_template: null,
|
|
48
|
-
sms_body_template: null,
|
|
49
|
-
whatsapp_body_template: null,
|
|
50
|
-
order_placed_email_subject: null,
|
|
51
|
-
order_placed_email_template: null,
|
|
52
|
-
order_placed_sms_template: null,
|
|
53
|
-
order_placed_whatsapp_template: null,
|
|
54
|
-
order_payment_email_subject: null,
|
|
55
|
-
order_payment_email_template: null,
|
|
56
|
-
order_payment_sms_template: null,
|
|
57
|
-
order_payment_whatsapp_template: null,
|
|
58
|
-
order_fulfillment_email_subject: null,
|
|
59
|
-
order_fulfillment_email_template: null,
|
|
60
|
-
order_fulfillment_sms_template: null,
|
|
61
|
-
order_fulfillment_whatsapp_template: null,
|
|
62
|
-
order_canceled_email_subject: null,
|
|
63
|
-
order_canceled_email_template: null,
|
|
64
|
-
order_canceled_sms_template: null,
|
|
65
|
-
order_canceled_whatsapp_template: null,
|
|
66
|
-
});
|
|
67
107
|
}
|
|
68
108
|
/**
|
|
69
109
|
* Creates or returns an existing short URL
|
|
@@ -428,43 +468,101 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
428
468
|
}
|
|
429
469
|
// Save Record to Database
|
|
430
470
|
const initialPdfUrl = `${storeUrl}/api/admin/documents/temp/document`;
|
|
431
|
-
const
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
471
|
+
const manager = container?.resolve?.("manager", { allowUnregistered: true });
|
|
472
|
+
const sharedContext = manager ? { manager } : {};
|
|
473
|
+
let record = null;
|
|
474
|
+
try {
|
|
475
|
+
record = await this.createDocumentRecords({
|
|
476
|
+
display_id: displayId,
|
|
477
|
+
title: input.title || (input.type === "invoice" ? "Tax Invoice" :
|
|
478
|
+
input.type === "receipt" ? "Payment Receipt" :
|
|
479
|
+
input.type === "packing_slip" ? "Packing Slip" :
|
|
480
|
+
input.type === "estimate" ? "Quotation" : "Document"),
|
|
481
|
+
type: input.type,
|
|
482
|
+
source: source,
|
|
483
|
+
status: input.payment_status === "paid" ? "paid" : "sent",
|
|
484
|
+
customer_name: input.customer.name,
|
|
485
|
+
customer_email: input.customer.email,
|
|
486
|
+
customer_phone: input.customer.phone,
|
|
487
|
+
order_id: input.order_id,
|
|
488
|
+
repair_ticket_id: input.repair_ticket_id,
|
|
489
|
+
zoho_document_id: zohoDocumentId,
|
|
490
|
+
total_amount: input.total,
|
|
491
|
+
currency_code: input.currency_code,
|
|
492
|
+
payment_status: input.payment_status || "unpaid",
|
|
493
|
+
payment_link: input.payment_link,
|
|
494
|
+
short_payment_link: shortPaymentLink,
|
|
495
|
+
pdf_url: `${(process.env.MEDUSA_BACKEND_URL || process.env.BACKEND_URL || process.env.MEDUSA_URL || "http://localhost:9000").replace(/\/$/, "")}/documents/${displayId}/document`,
|
|
496
|
+
metadata: {
|
|
497
|
+
items: input.items,
|
|
498
|
+
notes: input.notes,
|
|
499
|
+
body_text: input.body_text,
|
|
500
|
+
custom_fields: input.custom_fields,
|
|
501
|
+
},
|
|
502
|
+
}, sharedContext);
|
|
503
|
+
}
|
|
504
|
+
catch (err) {
|
|
505
|
+
const conn = container?.resolve?.("pg_connection", { allowUnregistered: true }) ||
|
|
506
|
+
this.__container__?.["pg_connection"];
|
|
507
|
+
if (conn) {
|
|
508
|
+
const [inserted] = await conn("document_records").insert({
|
|
509
|
+
display_id: displayId,
|
|
510
|
+
title: input.title || (input.type === "invoice" ? "Tax Invoice" :
|
|
511
|
+
input.type === "receipt" ? "Payment Receipt" :
|
|
512
|
+
input.type === "packing_slip" ? "Packing Slip" :
|
|
513
|
+
input.type === "estimate" ? "Quotation" : "Document"),
|
|
514
|
+
type: input.type,
|
|
515
|
+
source: source,
|
|
516
|
+
status: input.payment_status === "paid" ? "paid" : "sent",
|
|
517
|
+
customer_name: input.customer.name,
|
|
518
|
+
customer_email: input.customer.email,
|
|
519
|
+
customer_phone: input.customer.phone,
|
|
520
|
+
order_id: input.order_id,
|
|
521
|
+
repair_ticket_id: input.repair_ticket_id,
|
|
522
|
+
zoho_document_id: zohoDocumentId,
|
|
523
|
+
total_amount: input.total,
|
|
524
|
+
currency_code: input.currency_code,
|
|
525
|
+
payment_status: input.payment_status || "unpaid",
|
|
526
|
+
payment_link: input.payment_link,
|
|
527
|
+
short_payment_link: shortPaymentLink,
|
|
528
|
+
pdf_url: `${(process.env.MEDUSA_BACKEND_URL || process.env.BACKEND_URL || process.env.MEDUSA_URL || "http://localhost:9000").replace(/\/$/, "")}/documents/${displayId}/document`,
|
|
529
|
+
metadata: JSON.stringify({
|
|
530
|
+
items: input.items,
|
|
531
|
+
notes: input.notes,
|
|
532
|
+
body_text: input.body_text,
|
|
533
|
+
custom_fields: input.custom_fields,
|
|
534
|
+
}),
|
|
535
|
+
created_at: new Date(),
|
|
536
|
+
updated_at: new Date(),
|
|
537
|
+
}).returning("*");
|
|
538
|
+
record = inserted;
|
|
539
|
+
}
|
|
540
|
+
else {
|
|
541
|
+
throw err;
|
|
542
|
+
}
|
|
543
|
+
}
|
|
459
544
|
// Update with real public URL and short URL for document
|
|
460
545
|
const backendUrl = (process.env.MEDUSA_BACKEND_URL || process.env.BACKEND_URL || process.env.MEDUSA_URL || "http://localhost:9000").replace(/\/$/, "");
|
|
461
546
|
const realPdfUrl = `${backendUrl}/documents/${record.id}/document`;
|
|
462
547
|
const shortPdfLink = await this.getOrGenerateShortUrl(realPdfUrl, storeUrl);
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
548
|
+
try {
|
|
549
|
+
await this.updateDocumentRecords({
|
|
550
|
+
id: record.id,
|
|
551
|
+
pdf_url: realPdfUrl,
|
|
552
|
+
short_pdf_link: shortPdfLink,
|
|
553
|
+
}, sharedContext);
|
|
554
|
+
}
|
|
555
|
+
catch (err) {
|
|
556
|
+
const conn = container?.resolve?.("pg_connection", { allowUnregistered: true }) ||
|
|
557
|
+
this.__container__?.["pg_connection"];
|
|
558
|
+
if (conn) {
|
|
559
|
+
await conn("document_records").where({ id: record.id }).update({
|
|
560
|
+
pdf_url: realPdfUrl,
|
|
561
|
+
short_pdf_link: shortPdfLink,
|
|
562
|
+
updated_at: new Date(),
|
|
563
|
+
});
|
|
564
|
+
}
|
|
565
|
+
}
|
|
468
566
|
record.pdf_url = realPdfUrl;
|
|
469
567
|
record.short_pdf_link = shortPdfLink;
|
|
470
568
|
// Multi-channel notification auto-dispatch
|
|
@@ -500,9 +598,21 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
500
598
|
/**
|
|
501
599
|
* Fetches or regenerates the PDF buffer for an existing DocumentRecord
|
|
502
600
|
*/
|
|
503
|
-
async getPdfForRecord(recordId, container) {
|
|
504
|
-
|
|
505
|
-
|
|
601
|
+
async getPdfForRecord(recordId, container, sharedContext) {
|
|
602
|
+
let record = null;
|
|
603
|
+
try {
|
|
604
|
+
record = await this.retrieveDocumentRecord(recordId, {}, sharedContext);
|
|
605
|
+
}
|
|
606
|
+
catch (e) {
|
|
607
|
+
const conn = container?.resolve?.("pg_connection", { allowUnregistered: true }) ||
|
|
608
|
+
this.__container__?.["pg_connection"];
|
|
609
|
+
if (conn) {
|
|
610
|
+
record = await conn("document_records").where({ id: recordId }).orWhere({ display_id: recordId }).first();
|
|
611
|
+
}
|
|
612
|
+
if (!record)
|
|
613
|
+
throw e;
|
|
614
|
+
}
|
|
615
|
+
const settings = await this.getSettings(sharedContext, container);
|
|
506
616
|
// If source is Zoho and zoho_document_id exists, fetch from Zoho API
|
|
507
617
|
if (record.source === "zoho" &&
|
|
508
618
|
record.zoho_document_id &&
|
|
@@ -585,4 +695,4 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
585
695
|
}
|
|
586
696
|
exports.DocumentModuleService = DocumentModuleService;
|
|
587
697
|
exports.default = DocumentModuleService;
|
|
588
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/documents/service.ts"],"names":[],"mappings":";;;AAAA,qDAAqF;AACrF,kEAA8D;AAC9D,8DAA0D;AAC1D,0DAAsD;AACtD,0DAA6D;AAC7D,sEAA0F;AAC1F,0EAAmE;AACnE,4EAAwE;AAiCxE,MAAa,qBAAsB,SAAQ,IAAA,qBAAa,EAAC;IACvD,gBAAgB,EAAhB,oCAAgB;IAChB,cAAc,EAAd,gCAAc;IACd,YAAY,EAAZ,4BAAY;CACb,CAAC;IACA;;OAEG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QACvD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC;YACvC,YAAY,EAAE,OAAO;YACrB,2BAA2B,EAAE,IAAI;YACjC,yBAAyB,EAAE,IAAI;YAC/B,8BAA8B,EAAE,IAAI;YACpC,0BAA0B,EAAE,IAAI;YAChC,6BAA6B,EAAE,IAAI;YACnC,8BAA8B,EAAE,IAAI;YACpC,+BAA+B,EAAE,IAAI;YACrC,4BAA4B,EAAE,IAAI;YAClC,mCAAmC,EAAE,IAAI;YACzC,+BAA+B,EAAE,IAAI;YACrC,4BAA4B,EAAE,IAAI;YAClC,8BAA8B,EAAE,IAAI;YACpC,6BAA6B,EAAE,IAAI;YACnC,gBAAgB,EAAE,QAAQ;YAC1B,qBAAqB,EAAE,QAAQ;YAC/B,gBAAgB,EAAE,QAAQ;YAC1B,iBAAiB,EAAE,QAAQ;YAC3B,iBAAiB,EAAE,QAAQ;YAC3B,mBAAmB,EAAE,QAAQ;YAC7B,sBAAsB,EAAE,IAAI;YAC5B,mBAAmB,EAAE,IAAI;YACzB,iBAAiB,EAAE,IAAI;YACvB,sBAAsB,EAAE,IAAI;YAC5B,0BAA0B,EAAE,IAAI;YAChC,2BAA2B,EAAE,IAAI;YACjC,yBAAyB,EAAE,IAAI;YAC/B,8BAA8B,EAAE,IAAI;YACpC,2BAA2B,EAAE,IAAI;YACjC,4BAA4B,EAAE,IAAI;YAClC,0BAA0B,EAAE,IAAI;YAChC,+BAA+B,EAAE,IAAI;YACrC,+BAA+B,EAAE,IAAI;YACrC,gCAAgC,EAAE,IAAI;YACtC,8BAA8B,EAAE,IAAI;YACpC,mCAAmC,EAAE,IAAI;YACzC,4BAA4B,EAAE,IAAI;YAClC,6BAA6B,EAAE,IAAI;YACnC,2BAA2B,EAAE,IAAI;YACjC,gCAAgC,EAAE,IAAI;SACvC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,GAAW,EAAE,OAAgB;QACvD,IAAI,CAAC,GAAG;YAAE,OAAO,GAAG,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YACvD,IAAI,IAAI,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAE5F,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,OAAO,GAAG,IAAI,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAC9C,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAC7B,SAAS;gBACT,GAAG;aACJ,CAAC,CAAC;YAEH,OAAO,GAAG,IAAI,MAAM,SAAS,EAAE,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,GAAG,CAAC;QACb,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB,CAAC,KAA4B,EAAE,SAAe;QAIlE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,CAAC,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAElH,+CAA+C;QAC/C,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAC5F,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,iCAAyB,CAAC,KAAK,CAAC,CAAC;gBACpE,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;wBAC1C,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE;4BACN,GAAG;4BACH,UAAU;4BACV,oBAAoB;4BACpB,2BAA2B;4BAC3B,4BAA4B;yBAC7B;wBACD,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,gBAAgB,EAAE;qBACxC,CAAC,CAAC;oBACH,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAClC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC1B,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;wBAClI,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;wBACjG,IAAI,YAAY,GAAG,iBAAiB,CAAC;wBACrC,IAAI,aAAa,GAAuB,SAAS,CAAC;wBAClD,IAAI,aAAa,GAAuB,SAAS,CAAC;wBAClD,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;4BACvB,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;4BAC3E,IAAI,OAAO,EAAE,CAAC;gCACZ,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gCAC7D,IAAI,CAAC,EAAE,CAAC;oCACN,YAAY,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,YAAY,CAAC;oCACtG,aAAa,GAAG,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;oCACrC,aAAa,GAAG,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;gCACvC,CAAC;4BACH,CAAC;wBACH,CAAC;wBACD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;4BACpB,KAAK,CAAC,QAAQ,GAAG;gCACf,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,aAAa;gCACpB,KAAK,EAAE,aAAa;6BACrB,CAAC;wBACJ,CAAC;wBACD,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BAC7C,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;4BACjB,sFAAsF;4BACtF,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;gCAC5B,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;oCACzC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAK,EAAU,CAAC,KAAK,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC;oCACpE,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;oCACnF,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK;wCACjC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,KAAK,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;wCAC5F,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,gBAAgB,CAAC;oCACtD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;wCACf,KAAK,EAAE,SAAS;wCAChB,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wCAC9F,QAAQ,EAAE,GAAG;wCACb,UAAU,EAAE,SAAS;wCACrB,KAAK,EAAE,GAAG,GAAG,SAAS;qCACvB,CAAC,CAAC;gCACL,CAAC;4BACH,CAAC;4BACD,mCAAmC;4BACnC,IAAI,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;gCAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oCAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;oCACvC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;oCAC7D,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;wCACf,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,kBAAkB;wCACpD,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE;wCAC/C,QAAQ,EAAE,GAAG;wCACb,UAAU,EAAE,SAAS;wCACrB,KAAK,EAAE,GAAG,GAAG,SAAS;qCACvB,CAAC,CAAC;gCACL,CAAC;4BACH,CAAC;4BACD,mBAAmB;4BACnB,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gCACxB,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;oCACrC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;oCACrC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;oCACzD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;wCACf,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,IAAI,uBAAuB;wCACrD,WAAW,EAAE,EAAE,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wCAC/D,QAAQ,EAAE,GAAG;wCACb,UAAU,EAAE,SAAS;wCACrB,KAAK,EAAE,GAAG,GAAG,SAAS;qCACvB,CAAC,CAAC;gCACL,CAAC;4BACH,CAAC;4BACD,iBAAiB;4BACjB,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gCAC3C,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;oCACf,KAAK,EAAE,cAAc;oCACrB,QAAQ,EAAE,CAAC;oCACX,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;oCACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;iCACrC,CAAC,CAAC;4BACL,CAAC;4BACD,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gCAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC;gCACtH,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;oCACf,KAAK,EAAE,oCAAoC,MAAM,CAAC,aAAa,GAAG;oCAClE,WAAW,EAAE,MAAM,CAAC,iBAAiB,IAAI,gCAAgC;oCACzE,QAAQ,EAAE,CAAC;oCACX,UAAU,EAAE,GAAG;oCACf,KAAK,EAAE,GAAG;iCACX,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;wBACD,KAAK,CAAC,aAAa,GAAG;4BACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,IAAI,KAAK;4BAClD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,KAAK;4BACtC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,KAAK;4BAC7E,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI,eAAe;4BACxD,aAAa,EAAE,MAAM,CAAC,WAAW,IAAI,MAAM;4BAC3C,YAAY,EAAE,MAAM,CAAC,eAAe,IAAI,YAAY;4BACpD,gBAAgB,EAAE,MAAM,CAAC,iBAAiB,IAAI,iBAAiB;4BAC/D,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC;yBAC/B,CAAC;wBACF,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;4BACvD,KAAK,CAAC,YAAY,GAAG,GAAG,QAAQ,wBAAwB,MAAM,CAAC,cAAc,EAAE,CAAC;wBAClF,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,KAAK,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACjB,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;QACnB,CAAC;QAED,0CAA0C;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,mBAAmB,IAAI,MAAM,CAAC,CAAC;QAC7F,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QAEhG,wDAAwD;QACxD,IAAI,gBAAgB,GAAuB,SAAS,CAAC;QACrD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACvB,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACpF,CAAC;QAED,IAAI,MAAM,GAAsB,QAAQ,CAAC;QACzC,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,IAAI,SAAS,GAAkB,IAAI,CAAC;QAEpC,qCAAqC;QACrC,MAAM,UAAU,GACd,KAAK,CAAC,YAAY,KAAK,QAAQ;YAC/B,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,cAAc;YACvB,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,oBAAoB;YAC7B,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QAEtF,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,IAAI,6BAAgB,CAC/B;oBACE,SAAS,EAAE,QAAQ,CAAC,cAAc;oBAClC,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,eAAe,EAAE,QAAQ,CAAC,oBAAoB;oBAC9C,MAAM,EAAE,QAAQ,CAAC,WAAW,IAAI,KAAK;iBACtC,EACD,MAAM,CACP,CAAC;gBAEF,0BAA0B;gBAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;oBACvC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;oBAC/B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBAC3B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;iBAC5B,CAAC,CAAC;gBAEH,mEAAmE;gBACnE,IAAI,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,kBAAkB,IAAI,8BAA8B,CAAC;gBAC7F,IAAI,gBAAgB,EAAE,CAAC;oBACrB,SAAS,IAAI,mBAAmB,gBAAgB,EAAE,CAAC;gBACrD,CAAC;gBACD,MAAM,SAAS,GAAG,QAAQ,CAAC,kBAAkB,IAAI,EAAE,CAAC;gBAEpD,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBACrD,IAAI,EAAE,EAAE,CAAC,KAAK;oBACd,WAAW,EAAE,EAAE,CAAC,WAAW,IAAI,EAAE;oBACjC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC3C,QAAQ,EAAE,EAAE,CAAC,QAAQ,IAAI,CAAC;iBAC3B,CAAC,CAAC,CAAC;gBAEJ,MAAM,YAAY,GAA4C,EAAE,CAAC;gBACjE,IAAI,gBAAgB,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;oBAC3C,YAAY,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,QAAQ,CAAC,8BAA8B,IAAI,cAAc;wBAChE,KAAK,EAAE,CAAC,gBAAgB,IAAI,KAAK,CAAC,YAAY,CAAW;qBAC1D,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;wBAC9C,gBAAgB,EAAE,SAAS;wBAC3B,UAAU,EAAE,aAAa;wBACzB,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,SAAS;wBAChB,aAAa,EAAE,QAAQ,CAAC,uBAAuB,IAAI,CAAC;wBACpD,gBAAgB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,KAAK;wBACtD,aAAa,EAAE,YAAY;qBAC5B,CAAC,CAAC;oBACH,cAAc,GAAG,GAAG,CAAC,UAAU,CAAC;oBAChC,MAAM,GAAG,MAAM,CAAC;oBAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;oBACvE,MAAM,YAAY,GAAG,QAAQ,CAAC,uBAAuB,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBACvH,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACvD,KAAK,EAAE,YAAY;wBACnB,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;wBAC/C,gBAAgB,EAAE,SAAS;wBAC3B,UAAU,EAAE,aAAa;wBACzB,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,SAAS;wBAChB,gBAAgB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,KAAK;qBACvD,CAAC,CAAC;oBACH,cAAc,GAAG,GAAG,CAAC,WAAW,CAAC;oBACjC,MAAM,GAAG,MAAM,CAAC;oBAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;oBACzE,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACvD,KAAK,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;wBAC7C,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACpC,yHAAyH;oBACzH,IAAI,eAAe,GAAkB,IAAI,CAAC;oBAE1C,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;wBACnB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;4BAClD,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;wBACH,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;wBAC9D,IAAI,GAAG,EAAE,CAAC;4BACR,eAAe,GAAG,GAAG,CAAC,gBAAgB,CAAC;wBACzC,CAAC;oBACH,CAAC;yBAAM,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;wBAClC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;4BAClD,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;4BACxC,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;wBACH,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;wBAC9D,IAAI,GAAG,EAAE,CAAC;4BACR,eAAe,GAAG,GAAG,CAAC,gBAAgB,CAAC;wBACzC,CAAC;oBACH,CAAC;oBAED,sFAAsF;oBACtF,IAAI,CAAC,eAAe,EAAE,CAAC;wBACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;4BACjD,gBAAgB,EAAE,SAAS;4BAC3B,UAAU,EAAE,aAAa;4BACzB,KAAK,EAAE,SAAS;4BAChB,KAAK,EAAE,SAAS;4BAChB,aAAa,EAAE,CAAC;4BAChB,gBAAgB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,KAAK;4BACtD,aAAa,EAAE,YAAY;yBAC5B,CAAC,CAAC;wBACH,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC;oBACtC,CAAC;oBAED,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;oBAC/C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAC1C,eAAe,EACf,aAAa,EACb,SAAS,EACT,QAAQ,EACR,SAAS,CACV,CAAC;oBAEF,cAAc,GAAG,SAAS,CAAC;oBAC3B,MAAM,GAAG,MAAM,CAAC;oBAEhB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;oBAC7D,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACvD,KAAK,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;wBAC7C,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAAC,OAAO,OAAY,EAAE,CAAC;gBACtB,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,oDAAoD,OAAO,CAAC,OAAO,4BAA4B,CAAC,CAAC;gBACpI,MAAM,GAAG,QAAQ,CAAC;gBAClB,cAAc,GAAG,IAAI,CAAC;gBACtB,SAAS,GAAG,IAAI,CAAC;YACnB,CAAC;QACH,CAAC;QAED,gEAAgE;QAChE,uCAAuC;QACvC,gEAAgE;QAChE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,GAAG,QAAQ,CAAC;YAClB,IAAI,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;YACzD,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;gBAAE,YAAY,GAAG,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC;iBACxF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;gBAAE,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;iBACnF,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;iBACrF,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;iBACrF,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAAE,YAAY,GAAG,QAAQ,CAAC,mBAAmB,IAAI,QAAQ,CAAC;YAE1F,MAAM,OAAO,GAAiB;gBAC5B,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC5C,QAAQ,EAAE;oBACR,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;oBACzB,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBAC3B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBAC3B,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAO;iBAChC;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ,CAAC,YAAY,IAAI,OAAO;oBACtC,QAAQ,EAAE,QAAQ,CAAC,YAAY;oBAC/B,OAAO,EAAE,QAAQ,CAAC,WAAW;oBAC7B,KAAK,EAAE,QAAQ,CAAC,SAAS;oBACzB,KAAK,EAAE,QAAQ,CAAC,SAAS;oBACzB,OAAO,EAAE,QAAQ,CAAC,WAAW;oBAC7B,eAAe,EAAE,QAAQ,CAAC,mBAAmB;oBAC7C,KAAK,EAAE,QAAQ,CAAC,SAAS;iBAC1B;gBACD,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC5C,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,KAAK;gBAC3C,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,QAAQ;gBAChD,YAAY,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;gBACpD,MAAM,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;gBAC9C,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;aACnC,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACxE,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,SAAS,EAAE;gBAC1C,KAAK,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;aAC9C,CAAC,CAAC;QACL,CAAC;QAED,0BAA0B;QAC1B,MAAM,aAAa,GAAG,GAAG,QAAQ,oCAAoC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAC9C,UAAU,EAAE,SAAS;YACrB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,CACpB,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;gBAC1C,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;oBAC9C,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;wBAChD,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CACrD;YACD,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,KAAK,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YACzD,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;YAClC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;YACpC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;YACpC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,gBAAgB,EAAE,cAAc;YAChC,YAAY,EAAE,KAAK,CAAC,KAAK;YACzB,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,QAAQ;YAChD,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,kBAAkB,EAAE,gBAAgB;YACpC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,SAAS,WAAW;YACjL,QAAQ,EAAE;gBACR,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;aACnC;SACF,CAAC,CAAC;QAEH,yDAAyD;QACzD,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvJ,MAAM,UAAU,GAAG,GAAG,UAAU,cAAc,MAAM,CAAC,EAAE,WAAW,CAAC;QACnE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE5E,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAC/B,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,OAAO,EAAE,UAAU;YACnB,cAAc,EAAE,YAAY;SAC7B,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC;QAC5B,MAAM,CAAC,cAAc,GAAG,YAAY,CAAC;QAErC,2CAA2C;QAC3C,IAAI,KAAK,CAAC,SAAS,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,wCAAkB,CAAC,IAAI,CAAC;gBAC5B,SAAS;gBACT,QAAQ,EAAE;oBACR,EAAE,EAAE,MAAM,CAAC,EAAE;oBACb,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,aAAa,EAAE,MAAM,CAAC,aAAa;oBACnC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,aAAa,EAAE,MAAM,CAAC,aAAa;oBACnC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;oBAC7C,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,cAAc,EAAE,KAAK,CAAC,oBAAoB;oBAC1C,OAAO,EAAE,KAAK,CAAC,aAAa;oBAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;iBAC1C;gBACD,QAAQ,EAAE,KAAK,CAAC,qBAAqB;gBACrC,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,QAAgB,EAAE,SAAe;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAE1C,qEAAqE;QACrE,IACE,MAAM,CAAC,MAAM,KAAK,MAAM;YACxB,MAAM,CAAC,gBAAgB;YACvB,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,cAAc,EACvB,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,IAAI,6BAAgB,CAC/B;oBACE,SAAS,EAAE,QAAQ,CAAC,cAAc;oBAClC,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,eAAe,EAAE,QAAQ,CAAC,oBAAoB;oBAC9C,MAAM,EAAE,QAAQ,CAAC,WAAW,IAAI,KAAK;iBACtC,EACD,MAAM,CACP,CAAC;gBAEF,IAAI,MAAmB,CAAC;gBACxB,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;gBACpE,CAAC;qBAAM,CAAC;oBACN,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;oBACpE,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;gBACvE,CAAC;gBAED,OAAO,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBAC/C,KAAK,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;oBACvD,iBAAiB,EAAE,IAAI;iBACxB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,qDAAqD,GAAG,CAAC,OAAO,6BAA6B,CAAC,CAAC;YACpI,CAAC;QACH,CAAC;QAED,6BAA6B;QAC7B,IAAI,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;QACzD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc;YAAE,YAAY,GAAG,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC;aACzF,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;YAAE,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;aACpF,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU;YAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;aACtF,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU;YAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;aACtF,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ;YAAE,YAAY,GAAG,QAAQ,CAAC,mBAAmB,IAAI,QAAQ,CAAC;QAE3F,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAQ,CAAC;QAC5C,MAAM,OAAO,GAAiB;YAC5B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,IAAI,EAAE,MAAM,CAAC,IAAW;YACxB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5C,QAAQ,EAAE;gBACR,IAAI,EAAE,MAAM,CAAC,aAAa,IAAI,iBAAiB;gBAC/C,KAAK,EAAE,MAAM,CAAC,cAAc,IAAI,SAAS;gBACzC,KAAK,EAAE,MAAM,CAAC,cAAc,IAAI,SAAS;aAC1C;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ,CAAC,YAAY,IAAI,OAAO;gBACtC,QAAQ,EAAE,QAAQ,CAAC,YAAY;gBAC/B,OAAO,EAAE,QAAQ,CAAC,WAAW;gBAC7B,KAAK,EAAE,QAAQ,CAAC,SAAS;gBACzB,KAAK,EAAE,QAAQ,CAAC,SAAS;gBACzB,OAAO,EAAE,QAAQ,CAAC,WAAW;gBAC7B,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,KAAK,EAAE,QAAQ,CAAC,SAAS;aAC1B;YACD,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,KAAK,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC;YAC/B,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,KAAK;YAC5C,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,YAAY,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;YAC9D,MAAM,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;YACxD,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxE,OAAO,MAAM,IAAA,mCAAc,EAAC,SAAS,EAAE;YACrC,KAAK,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;SACxD,CAAC,CAAC;IACL,CAAC;CACF;AAnmBD,sDAmmBC;AAED,kBAAe,qBAAqB,CAAC"}
|
|
698
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/documents/service.ts"],"names":[],"mappings":"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"}
|
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
---
|
|
9
9
|
|
|
10
|
+
## [1.1.5] - 2026-10-16
|
|
11
|
+
|
|
12
|
+
### Patch Release: Dual Transaction Context Injection & Direct Knex Fallback for Settings & Documents
|
|
13
|
+
|
|
14
|
+
- **Resolved `reading 'fork'` Exception**: Fixed runtime `TypeError: Cannot read properties of undefined (reading 'fork')` encountered when loading or saving plugin settings (`GET/POST /admin/documents/settings`) and viewing documents (`GET /admin/documents`).
|
|
15
|
+
- **Transaction Context Resolution**: Injected `sharedContext` with the resolved MikroORM `manager` from `req.scope` into all generated `MedusaService` operations.
|
|
16
|
+
- **Fail-Safe PostgreSQL/Knex Fallbacks**: Added direct Knex fallback queries (`pg_connection`) for retrieving and persisting settings (`document_settings`) and document records (`document_records`), ensuring zero runtime crashes even in non-standard plugin loading or standalone module environments.
|
|
17
|
+
- **Resilient PDF Streaming**: Updated admin and public PDF retrieval routes to pass transaction context and fallback to Knex if module repository manager is uninitialized.
|
|
18
|
+
|
|
19
|
+
---
|
|
20
|
+
|
|
10
21
|
## [1.1.1] - 2026-10-15
|
|
11
22
|
|
|
12
23
|
### Patch Release: Public Stream Endpoints, Shortlink Normalization & Repair Handover
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "medusajs-documents-plugin",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.5",
|
|
4
4
|
"description": "Comprehensive document generation and management module for Medusa v2 with Zoho Books integration, PDFKit fallback, QR codes, shortlinks, multi-channel notifications and unified admin hub.",
|
|
5
5
|
"author": "Urban Device Care <info@urbandevicecare.co.uk>",
|
|
6
6
|
"license": "MIT",
|