@paroicms/server 1.36.2 → 1.36.3
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/dist/site-context/create-site-context.js +1 -1
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/db-init/db-init.d.ts +1 -2
- package/dist/site-context/db-init/db-init.js +2 -2
- package/dist/site-context/db-init/db-init.js.map +1 -1
- package/dist/site-context/db-init/ddl-migration.d.ts +1 -3
- package/dist/site-context/db-init/ddl-migration.js +5 -66
- package/dist/site-context/db-init/ddl-migration.js.map +1 -1
- package/package.json +1 -1
|
@@ -59,7 +59,7 @@ async function createSiteContext(siteConf) {
|
|
|
59
59
|
const { cn, logNextQuery } = await (0, db_init_1.createOrOpenConnection)(siteSchema, dataDir, {
|
|
60
60
|
canCreate: !!context_1.appConf.generateMissingDatabases,
|
|
61
61
|
siteLog,
|
|
62
|
-
}
|
|
62
|
+
});
|
|
63
63
|
const siteIds = await (0, init_routing_points_1.loadOrInsertSiteIds)(cn, siteSchema, siteLog);
|
|
64
64
|
const { imageCache, textCache, isClearedTextCache } = await createCaches({
|
|
65
65
|
cacheDir,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-site-context.js","sourceRoot":"","sources":["../../src/site-context/create-site-context.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAmD;AAEnD,2FAAuE;AACvE,mFAA6E;AAC7E,qDAAuD;AACvD,iFAI4C;AAC5C,uCAAkC;AAClC,yCAAiC;AAEjC,qDAA0F;AAC1F,wCAA8D;AAC9D,wDAAgE;AAChE,uEAA4E;AAC5E,mFAA8D;AAC9D,sEAAsE;AACtE,oEAAsE;AACtE,qFAA+F;AAC/F,yFAAmG;AACnG,+FAAwG;AACxG,2FAAoG;AACpG,qFAAyF;AACzF,uGAAgH;AAChH,2GAAqG;AACrG,uFAAiG;AACjG,iFAG2D;AAC3D,iGAA8G;AAC9G,+FAAmG;AACnG,kFAA2F;AAC3F,oFAA6F;AAC7F,wGAAgH;AAChH,sFAA+F;AAC/F,sDAA0D;AAE1D,4EAAoE;AAEpE,+CAA2D;AAC3D,uEAAoE;AAGpE,2DAAwD;AAEjD,KAAK,UAAU,iBAAiB,CAAC,QAAkB;IACxD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IAC3E,MAAM,QAAQ,GAAG,IAAA,gBAAI,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,qBAAW,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAErD,MAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,IAAA,4BAAe,EAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,IAAA,4BAAe,EAAC,SAAS,CAAC,CAAC;IAEjC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,oCAAc,EAAC,QAAQ,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,IAAI,4CAAY,CAAC;QACpC,QAAQ;QACR,SAAS,EAAE,CAAC,CAAC,iBAAO,CAAC,wBAAwB;QAC7C,MAAM,EAAE,OAAO;QACf,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAA,gBAAI,EAAC,OAAO,EAAE,eAAe,CAAC;SACrC;KACF,CAAC,CAAC;IACH,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;IAEhC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,gCAAsB,
|
|
1
|
+
{"version":3,"file":"create-site-context.js","sourceRoot":"","sources":["../../src/site-context/create-site-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import type { SiteSchema } from "@paroicms/anywhere-lib";
|
|
2
|
-
import type { MediaStorage } from "@paroicms/server-database-media-storage";
|
|
3
2
|
import { type AppLog } from "@paroicms/server-lib";
|
|
4
3
|
import type { DataSource } from "typeorm";
|
|
5
4
|
export declare function createOrOpenConnection(siteSchema: SiteSchema, dataDir: string, { siteLog, canCreate }: {
|
|
6
5
|
canCreate: boolean;
|
|
7
6
|
siteLog: AppLog;
|
|
8
|
-
}
|
|
7
|
+
}): Promise<{
|
|
9
8
|
cn: DataSource;
|
|
10
9
|
logNextQuery: (count?: number | undefined) => void;
|
|
11
10
|
}>;
|
|
@@ -5,7 +5,7 @@ const server_lib_1 = require("@paroicms/server-lib");
|
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
6
|
const context_1 = require("../../context");
|
|
7
7
|
const ddl_migration_1 = require("./ddl-migration");
|
|
8
|
-
async function createOrOpenConnection(siteSchema, dataDir, { siteLog, canCreate }
|
|
8
|
+
async function createOrOpenConnection(siteSchema, dataDir, { siteLog, canCreate }) {
|
|
9
9
|
const { logNextQuery, typeOrmLogger } = (0, server_lib_1.createSqlLogger)({
|
|
10
10
|
appLog: siteLog,
|
|
11
11
|
dbSchemaName: ddl_migration_1.dbSchemaName,
|
|
@@ -31,7 +31,7 @@ async function createOrOpenConnection(siteSchema, dataDir, { siteLog, canCreate
|
|
|
31
31
|
await (0, ddl_migration_1.migrateMainDb)(siteSchema, cn, {
|
|
32
32
|
fromVersion: dbVersion,
|
|
33
33
|
siteLog,
|
|
34
|
-
}
|
|
34
|
+
});
|
|
35
35
|
return {
|
|
36
36
|
migrated: true,
|
|
37
37
|
fromVersion: dbVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../../src/site-context/db-init/db-init.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../../src/site-context/db-init/db-init.ts"],"names":[],"mappings":";;;AACA,qDAM8B;AAC9B,yCAAiC;AAEjC,2CAA2C;AAC3C,mDAA0F;AAEnF,KAAK,UAAU,sBAAsB,CAC1C,UAAsB,EACtB,OAAe,EACf,EAAE,OAAO,EAAE,SAAS,EAA2C;IAE/D,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC;QACtD,MAAM,EAAE,OAAO;QACf,YAAY,EAAZ,4BAAY;KACb,CAAC,CAAC;IAEH,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QAChD,SAAS;QACT,YAAY,EAAZ,4BAAY;QACZ,UAAU,EAAE,IAAA,gBAAI,EAAC,OAAO,EAAE,aAAa,CAAC;QACxC,OAAO,EAAE,IAAA,gBAAI,EAAC,oBAAU,EAAE,KAAK,EAAE,cAAc,CAAC;QAChD,SAAS;QACT,QAAQ,EAAE,CAAC,GAAG,oBAAU,qBAAqB,CAAC;QAC9C,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,OAAO;KAChB,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,uCAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;QACzE,IAAI,SAAS,KAAK,0CAA0B,EAAE,CAAC;YAC7C,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,IAAA,6BAAa,EAAC,UAAU,EAAE,EAAE,EAAE;YAClC,WAAW,EAAE,SAAS;YACtB,OAAO;SACR,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,0CAA0B;SAC1C,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;AAC9B,CAAC;AAzCD,wDAyCC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { SiteSchema } from "@paroicms/anywhere-lib";
|
|
2
|
-
import type { MediaStorage } from "@paroicms/server-database-media-storage";
|
|
3
2
|
import { type AppLog } from "@paroicms/server-lib";
|
|
4
3
|
import type { DataSource } from "typeorm";
|
|
5
4
|
export declare const dbSchemaName = "main";
|
|
@@ -7,5 +6,4 @@ export declare const currentMainDbSchemaVersion = 8;
|
|
|
7
6
|
export declare function migrateMainDb(siteSchema: SiteSchema, cn: DataSource, { fromVersion, siteLog }: {
|
|
8
7
|
fromVersion: number;
|
|
9
8
|
siteLog: AppLog;
|
|
10
|
-
}
|
|
11
|
-
export declare function replaceMediaUrls(val: string, mediaStorage: MediaStorage, siteLog: AppLog): Promise<string>;
|
|
9
|
+
}): Promise<void>;
|
|
@@ -1,29 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
|
-
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
3
|
+
exports.migrateMainDb = exports.currentMainDbSchemaVersion = exports.dbSchemaName = void 0;
|
|
6
4
|
const server_lib_1 = require("@paroicms/server-lib");
|
|
7
5
|
exports.dbSchemaName = "main";
|
|
8
6
|
exports.currentMainDbSchemaVersion = 8;
|
|
9
|
-
async function migrateMainDb(siteSchema, cn, { fromVersion, siteLog }
|
|
7
|
+
async function migrateMainDb(siteSchema, cn, { fromVersion, siteLog }) {
|
|
10
8
|
const toVersion = exports.currentMainDbSchemaVersion;
|
|
11
9
|
let currentVersion = fromVersion;
|
|
12
|
-
if (currentVersion === 5) {
|
|
13
|
-
const rows = await cn.query("select field, leafId, lang, val from PaFieldText");
|
|
14
|
-
for (const row of rows) {
|
|
15
|
-
const field = (0, data_formatters_lib_1.strVal)(row.field);
|
|
16
|
-
const leafId = (0, data_formatters_lib_1.strVal)(row.leafId);
|
|
17
|
-
const language = (0, data_formatters_lib_1.strVal)(row.lang);
|
|
18
|
-
const val = (0, data_formatters_lib_1.strVal)(row.val);
|
|
19
|
-
const val2 = await replaceMediaUrls(val, mediaStorage, siteLog);
|
|
20
|
-
if (val !== val2) {
|
|
21
|
-
await cn.query(`update PaFieldText set val = ? where field = '${field}' and leafId = '${leafId}' and lang = '${language}'`, [val2]);
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
await (0, server_lib_1.setMetadataDbSchemaVersion)(cn, { dbSchemaName: exports.dbSchemaName, value: 6 });
|
|
25
|
-
currentVersion = 6;
|
|
26
|
-
}
|
|
27
10
|
if (currentVersion === 6) {
|
|
28
11
|
await (0, server_lib_1.setMetadataDbSchemaVersion)(cn, { dbSchemaName: exports.dbSchemaName, value: 7 });
|
|
29
12
|
currentVersion = 7;
|
|
@@ -41,7 +24,9 @@ async function migrateMainDb(siteSchema, cn, { fromVersion, siteLog }, mediaStor
|
|
|
41
24
|
await cn.query(`insert into PaOrderedLeaf (leafId, orderNum)
|
|
42
25
|
select leafId, itemNum from PaLeafItem`);
|
|
43
26
|
await cn.query(`insert into PaPartLeaf (leafId, listName, documentLeafId)
|
|
44
|
-
select leafId, listName,
|
|
27
|
+
select i.leafId, i.listName, l.parentId
|
|
28
|
+
from PaLeafItem i
|
|
29
|
+
inner join PaLeaf l on l.id = i.leafId`);
|
|
45
30
|
await cn.query("drop table PaLeafItem");
|
|
46
31
|
await cn.query("alter table PaTermFlag rename column flaggedId to labeledId");
|
|
47
32
|
await cn.query("alter table PaTermFlag rename to PaLabeling");
|
|
@@ -54,50 +39,4 @@ select leafId, listName, leafId from PaLeafItem`);
|
|
|
54
39
|
siteLog.info(`${exports.dbSchemaName} database was migrated from ${fromVersion} to ${currentVersion}`);
|
|
55
40
|
}
|
|
56
41
|
exports.migrateMainDb = migrateMainDb;
|
|
57
|
-
async function replaceMediaUrls(val, mediaStorage, siteLog) {
|
|
58
|
-
const makeRegex = () => /\/medias\/([0-9a-f-]{36})(?:-([0-9]+x[0-9]+))?(\.[a-z]+)/gi;
|
|
59
|
-
const medias = new Map();
|
|
60
|
-
const found = val.matchAll(makeRegex());
|
|
61
|
-
for (const match of found) {
|
|
62
|
-
const [_, mediaUid] = match;
|
|
63
|
-
const media = await mediaStorage.getMedia({ uid: mediaUid });
|
|
64
|
-
if (media) {
|
|
65
|
-
medias.set(mediaUid, media);
|
|
66
|
-
}
|
|
67
|
-
else {
|
|
68
|
-
siteLog.warn(`Media '${mediaUid}' not found, its URL can't be replaced (skip)`);
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
return val.replace(makeRegex(), (match, mediaUid, variantName, ext) => {
|
|
72
|
-
let result;
|
|
73
|
-
const media = medias.get(mediaUid);
|
|
74
|
-
if (!media)
|
|
75
|
-
return match;
|
|
76
|
-
if (variantName) {
|
|
77
|
-
result = makeUrlOfImageVariant({
|
|
78
|
-
mediaUid,
|
|
79
|
-
ext,
|
|
80
|
-
variantName,
|
|
81
|
-
originalName: media.originalName,
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
result = makeUrlOfMediaFile({ mediaUid, ext, originalName: media.originalName });
|
|
86
|
-
}
|
|
87
|
-
siteLog.info(`... url replaced: ${match} → ${result}`);
|
|
88
|
-
return result;
|
|
89
|
-
});
|
|
90
|
-
function makeUrlOfMediaFile(values) {
|
|
91
|
-
const { mediaUid, ext, originalName } = values;
|
|
92
|
-
const fileName = `${originalName ?? "unamed"}${ext}`;
|
|
93
|
-
return `/medias/${encodeURIComponent(mediaUid)}/file/${encodeURIComponent(fileName)}`;
|
|
94
|
-
}
|
|
95
|
-
function makeUrlOfImageVariant(values) {
|
|
96
|
-
const { mediaUid, ext, variantName, originalName } = values;
|
|
97
|
-
const shortName = (0, server_image_cache_engine_1.generateImageSlug)(originalName) ?? "unamed";
|
|
98
|
-
const fileName = `${shortName}-${variantName}${ext}`;
|
|
99
|
-
return `/medias/${encodeURIComponent(mediaUid)}/image/${encodeURIComponent(fileName)}`;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
exports.replaceMediaUrls = replaceMediaUrls;
|
|
103
42
|
//# sourceMappingURL=ddl-migration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../../src/site-context/db-init/ddl-migration.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../../src/site-context/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AACA,qDAA+E;AAGlE,QAAA,YAAY,GAAG,MAAM,CAAC;AACtB,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAErC,KAAK,UAAU,aAAa,CACjC,UAAsB,EACtB,EAAc,EACd,EAAE,WAAW,EAAE,OAAO,EAA4C;IAElE,MAAM,SAAS,GAAG,kCAA0B,CAAC;IAC7C,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QAEzB,MAAM,IAAA,uCAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,oBAAY,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACjE,cAAc,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,KAAK,CAAC;;;EAGjB,CAAC,CAAC;QAEA,MAAM,EAAE,CAAC,KAAK,CAAC;;;;EAIjB,CAAC,CAAC;QAEA,MAAM,EAAE,CAAC,KAAK,CAAC;uCACoB,CAAC,CAAC;QAErC,MAAM,EAAE,CAAC,KAAK,CAAC;;;uCAGoB,CAAC,CAAC;QAErC,MAAM,EAAE,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAExC,MAAM,EAAE,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QAC9E,MAAM,EAAE,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAE9D,MAAM,IAAA,uCAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,oBAAY,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACjE,cAAc,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,cAAc,oBAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CAC3F,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,GAAG,oBAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AACjG,CAAC;AAjDD,sCAiDC"}
|