@paroicms/server-database-media-storage 1.2.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ddl/medias.ddl.sql +5 -4
- package/dist/data-types.d.ts +1 -0
- package/dist/db-init/db-init.d.ts +1 -1
- package/dist/db-init/db-init.js +3 -3
- package/dist/db-init/db-init.js.map +1 -1
- package/dist/db-init/ddl-migration.d.ts +3 -3
- package/dist/db-init/ddl-migration.js +29 -4
- package/dist/db-init/ddl-migration.js.map +1 -1
- package/dist/entities/pa-media.model.d.ts +1 -0
- package/dist/entities/pa-media.model.js +5 -0
- package/dist/entities/pa-media.model.js.map +1 -1
- package/dist/helpers/data-formatters.helpers.js +2 -1
- package/dist/helpers/data-formatters.helpers.js.map +1 -1
- package/dist/media-storage-context.d.ts +1 -1
- package/dist/media-storage-context.js +2 -2
- package/dist/media-storage-context.js.map +1 -1
- package/dist/media-storage.d.ts +1 -1
- package/dist/media-storage.js +3 -6
- package/dist/media-storage.js.map +1 -1
- package/dist/media.queries.d.ts +1 -1
- package/dist/media.queries.js +8 -4
- package/dist/media.queries.js.map +1 -1
- package/package.json +5 -6
package/ddl/medias.ddl.sql
CHANGED
|
@@ -6,10 +6,11 @@ create table PaDbMetadata (
|
|
|
6
6
|
dbVersion integer not null
|
|
7
7
|
);
|
|
8
8
|
|
|
9
|
-
insert into PaDbMetadata (dbSchema, dbVersion) values ('medias',
|
|
9
|
+
insert into PaDbMetadata (dbSchema, dbVersion) values ('medias', 4);
|
|
10
10
|
|
|
11
11
|
create table PaMedia (
|
|
12
|
-
uid
|
|
12
|
+
uid char(36) not null primary key,
|
|
13
|
+
resourceVersion varchar(100) not null,
|
|
13
14
|
mediaType varchar(100) not null,
|
|
14
15
|
weightB integer not null,
|
|
15
16
|
modifiedTs timestamp not null default current_timestamp,
|
|
@@ -19,14 +20,14 @@ create table PaMedia (
|
|
|
19
20
|
);
|
|
20
21
|
|
|
21
22
|
create table PaImage (
|
|
22
|
-
uid
|
|
23
|
+
uid char(36) not null primary key references PaMedia (uid) on delete cascade,
|
|
23
24
|
width integer not null,
|
|
24
25
|
height integer not null,
|
|
25
26
|
lossless tinyint(1)
|
|
26
27
|
);
|
|
27
28
|
|
|
28
29
|
create table PaMediaHandle (
|
|
29
|
-
mediaUid
|
|
30
|
+
mediaUid char(36) not null references PaMedia (uid) on delete cascade,
|
|
30
31
|
handle varchar(200) not null,
|
|
31
32
|
orderNum integer,
|
|
32
33
|
leafId bigint,
|
package/dist/data-types.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare function createOrOpenMainCn({ sqliteFile, siteName, canCreate, ap
|
|
|
5
5
|
siteName: string;
|
|
6
6
|
canCreate: boolean;
|
|
7
7
|
appLog: AppLog;
|
|
8
|
-
}
|
|
8
|
+
}): Promise<{
|
|
9
9
|
mainCn: DataSource;
|
|
10
10
|
logNextQuery: (count?: number | undefined) => void;
|
|
11
11
|
}>;
|
package/dist/db-init/db-init.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createOrOpenMainCn = void 0;
|
|
4
|
-
const node_path_1 = require("node:path");
|
|
5
4
|
const server_lib_1 = require("@paroicms/server-lib");
|
|
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 createOrOpenMainCn({ sqliteFile, siteName, canCreate, appLog, }
|
|
8
|
+
async function createOrOpenMainCn({ sqliteFile, siteName, canCreate, appLog, }) {
|
|
9
9
|
const { logNextQuery, typeOrmLogger } = (0, server_lib_1.createSqlLogger)({ appLog, siteName, dbSchemaName: ddl_migration_1.dbSchemaName });
|
|
10
10
|
const { mainCn } = await (0, server_lib_1.createOrOpenSqliteConnection)({
|
|
11
11
|
siteName: siteName,
|
|
@@ -25,7 +25,7 @@ async function createOrOpenMainCn({ sqliteFile, siteName, canCreate, appLog, },
|
|
|
25
25
|
fromVersion: dbVersion,
|
|
26
26
|
siteName,
|
|
27
27
|
appLog,
|
|
28
|
-
}
|
|
28
|
+
});
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
return { mainCn, logNextQuery };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;;AAAA,qDAAkG;AAClG,yCAAiC;AAEjC,wCAAwC;AACxC,mDAKyB;AAElB,KAAK,UAAU,kBAAkB,CAAC,EACvC,UAAU,EACV,QAAQ,EACR,SAAS,EACT,MAAM,GACuE;IAC7E,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;IAE5F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QACpD,QAAQ,EAAE,QAAQ;QAClB,SAAS;QACT,YAAY,EAAZ,4BAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAA,gBAAI,EAAC,oBAAU,EAAE,KAAK,EAAE,gBAAgB,CAAC;QAClD,SAAS;QACT,QAAQ,EAAE,CAAC,GAAG,oBAAU,qBAAqB,CAAC;QAC9C,MAAM,EAAE,aAAa;QACrB,MAAM;KACP,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,4BAAY,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,IAAI,SAAS,KAAK,4CAA4B,EAAE,CAAC;YAC/C,MAAM,IAAA,+BAAe,EAAC,EAAE,EAAE;gBACxB,WAAW,EAAE,SAAS;gBACtB,QAAQ;gBACR,MAAM;aACP,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAClC,CAAC;AAhCD,gDAgCC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type AppLog } from "@paroicms/server-lib";
|
|
2
2
|
import type { DataSource } from "typeorm";
|
|
3
3
|
export declare const dbSchemaName = "medias";
|
|
4
|
-
export declare const currentMediasDbSchemaVersion =
|
|
4
|
+
export declare const currentMediasDbSchemaVersion = 4;
|
|
5
5
|
export declare function getDbVersion(cn: DataSource, { siteName }: {
|
|
6
6
|
siteName: string;
|
|
7
7
|
}): Promise<number>;
|
|
@@ -9,4 +9,4 @@ export declare function migrateMediasDb(cn: DataSource, { fromVersion, siteName,
|
|
|
9
9
|
fromVersion: number;
|
|
10
10
|
siteName: string;
|
|
11
11
|
appLog: AppLog;
|
|
12
|
-
}
|
|
12
|
+
}): Promise<void>;
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.migrateMediasDb = exports.getDbVersion = exports.currentMediasDbSchemaVersion = exports.dbSchemaName = void 0;
|
|
4
4
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
|
+
const server_lib_1 = require("@paroicms/server-lib");
|
|
5
6
|
exports.dbSchemaName = "medias";
|
|
6
|
-
exports.currentMediasDbSchemaVersion =
|
|
7
|
+
exports.currentMediasDbSchemaVersion = 4;
|
|
7
8
|
async function getDbVersion(cn, { siteName }) {
|
|
8
9
|
const [row] = await cn.query(`select dbVersion from PaDbMetadata where dbSchema = '${exports.dbSchemaName}'`);
|
|
9
10
|
if (!row)
|
|
@@ -11,12 +12,32 @@ async function getDbVersion(cn, { siteName }) {
|
|
|
11
12
|
return (0, data_formatters_lib_1.nbVal)(row.dbVersion, { varName: "dbVersion" });
|
|
12
13
|
}
|
|
13
14
|
exports.getDbVersion = getDbVersion;
|
|
14
|
-
async function migrateMediasDb(cn, { fromVersion, siteName, appLog }
|
|
15
|
+
async function migrateMediasDb(cn, { fromVersion, siteName, appLog }) {
|
|
15
16
|
const toVersion = exports.currentMediasDbSchemaVersion;
|
|
16
17
|
let currentVersion = fromVersion;
|
|
17
18
|
if (currentVersion === 3) {
|
|
18
|
-
//
|
|
19
|
-
|
|
19
|
+
// can't be not null because of the old data
|
|
20
|
+
await cn.query("alter table PaMedia add resourceVersion varchar(100)");
|
|
21
|
+
const rows = await cn.query("select uid, modifiedTs, originalName from PaMedia");
|
|
22
|
+
for (const row of rows) {
|
|
23
|
+
const uid = (0, data_formatters_lib_1.strVal)(row.uid);
|
|
24
|
+
const modifiedTs = (0, data_formatters_lib_1.dateVal)(row.modifiedTs);
|
|
25
|
+
let originalName = (0, data_formatters_lib_1.strValOrUndef)(row.originalName);
|
|
26
|
+
if (originalName) {
|
|
27
|
+
if (modifiedTs.getTime() < new Date("2024-05-01").getTime()) {
|
|
28
|
+
originalName = Buffer.from(originalName, "latin1").toString("utf8");
|
|
29
|
+
}
|
|
30
|
+
originalName = removeExtensionFromFileName(originalName);
|
|
31
|
+
await cn.query(`update PaMedia set
|
|
32
|
+
resourceVersion = '${(0, server_lib_1.generateResourceVersion)()}',
|
|
33
|
+
originalName = ?
|
|
34
|
+
where uid = '${uid}'`, [originalName]);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
await cn.query(`update PaMedia set resourceVersion = '${(0, server_lib_1.generateResourceVersion)()}' where uid = '${uid}'`);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
await cn.query(`update PaDbMetadata set dbVersion = 4 where dbSchema = '${exports.dbSchemaName}'`);
|
|
20
41
|
currentVersion = 4;
|
|
21
42
|
}
|
|
22
43
|
if (currentVersion !== toVersion) {
|
|
@@ -25,4 +46,8 @@ async function migrateMediasDb(cn, { fromVersion, siteName, appLog }, siteLeafId
|
|
|
25
46
|
appLog.info(`[${siteName}] ${exports.dbSchemaName} database was migrated from ${fromVersion} to ${currentVersion}`);
|
|
26
47
|
}
|
|
27
48
|
exports.migrateMediasDb = migrateMediasDb;
|
|
49
|
+
function removeExtensionFromFileName(fileName) {
|
|
50
|
+
const i = fileName.lastIndexOf(".");
|
|
51
|
+
return i === -1 ? fileName : fileName.slice(0, i);
|
|
52
|
+
}
|
|
28
53
|
//# sourceMappingURL=ddl-migration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AAAA,oEAAmF;AAEnF,qDAA4E;AAG/D,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,4BAA4B,GAAG,CAAC,CAAC;AAEvC,KAAK,UAAU,YAAY,CAAC,EAAc,EAAE,EAAE,QAAQ,EAAwB;IACnF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,KAAK,CAC1B,wDAAwD,oBAAY,GAAG,CACxE,CAAC;IACF,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,uBAAuB,oBAAY,eAAe,CAAC,CAAC;IAC1F,OAAO,IAAA,2BAAK,EAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;AACxD,CAAC;AAND,oCAMC;AAEM,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAA6D;IAE5F,MAAM,SAAS,GAAG,oCAA4B,CAAC;IAC/C,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,4CAA4C;QAC5C,MAAM,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAEvE,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACjF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,UAAU,GAAG,IAAA,6BAAO,EAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC3C,IAAI,YAAY,GAAG,IAAA,mCAAa,EAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACnD,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;oBAC5D,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACtE,CAAC;gBACD,YAAY,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;gBACzD,MAAM,EAAE,CAAC,KAAK,CACZ;uBACa,IAAA,oCAAuB,GAAE;;eAEjC,GAAG,GAAG,EACX,CAAC,YAAY,CAAC,CACf,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,CAAC,KAAK,CACZ,yCAAyC,IAAA,oCAAuB,GAAE,kBAAkB,GAAG,GAAG,CAC3F,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,EAAE,CAAC,KAAK,CAAC,2DAA2D,oBAAY,GAAG,CAAC,CAAC;QAC3F,cAAc,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,IAAI,QAAQ,gBAAgB,oBAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CACzG,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,IAAI,CACT,IAAI,QAAQ,KAAK,oBAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAC/F,CAAC;AACJ,CAAC;AA/CD,0CA+CC;AAED,SAAS,2BAA2B,CAAC,QAAgB;IACnD,MAAM,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -14,6 +14,7 @@ const typeorm_1 = require("typeorm");
|
|
|
14
14
|
let PaMediaEntity = class PaMediaEntity {
|
|
15
15
|
uid;
|
|
16
16
|
mediaType;
|
|
17
|
+
resourceVersion;
|
|
17
18
|
weightB;
|
|
18
19
|
modifiedTs;
|
|
19
20
|
binaryFile;
|
|
@@ -29,6 +30,10 @@ __decorate([
|
|
|
29
30
|
(0, typeorm_1.Column)({ type: "varchar" }),
|
|
30
31
|
__metadata("design:type", String)
|
|
31
32
|
], PaMediaEntity.prototype, "mediaType", void 0);
|
|
33
|
+
__decorate([
|
|
34
|
+
(0, typeorm_1.Column)({ type: "varchar" }),
|
|
35
|
+
__metadata("design:type", String)
|
|
36
|
+
], PaMediaEntity.prototype, "resourceVersion", void 0);
|
|
32
37
|
__decorate([
|
|
33
38
|
(0, typeorm_1.Column)({ type: "integer" }),
|
|
34
39
|
__metadata("design:type", Number)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pa-media.model.js","sourceRoot":"","sources":["../../src/entities/pa-media.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAExB,GAAG,CAAU;IAGb,SAAS,CAAU;IAGnB,OAAO,CAAU;IAGjB,UAAU,CAAQ;IAGlB,UAAU,CAAU;IAGpB,YAAY,CAAU;IAGtB,YAAY,CAAU;CACvB,CAAA;
|
|
1
|
+
{"version":3,"file":"pa-media.model.js","sourceRoot":"","sources":["../../src/entities/pa-media.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAExB,GAAG,CAAU;IAGb,SAAS,CAAU;IAGnB,eAAe,CAAU;IAGzB,OAAO,CAAU;IAGjB,UAAU,CAAQ;IAGlB,UAAU,CAAU;IAGpB,YAAY,CAAU;IAGtB,YAAY,CAAU;CACvB,CAAA;AAxBY,sCAAa;AAExB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;0CAC1C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;gDACT;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;sDACH;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;8CACX;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;8BACnF,IAAI;iDAAC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;8BACZ,MAAM;iDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACnB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACtB;wBAvBX,aAAa;IADzB,IAAA,gBAAM,EAAC,SAAS,CAAC;GACL,aAAa,CAwBzB"}
|
|
@@ -36,9 +36,10 @@ function formatImageWithBinary(row) {
|
|
|
36
36
|
exports.formatImageWithBinary = formatImageWithBinary;
|
|
37
37
|
function formatMediaBase(row) {
|
|
38
38
|
return {
|
|
39
|
+
uid: (0, data_formatters_lib_1.strVal)(row.uid),
|
|
40
|
+
resourceVersion: (0, data_formatters_lib_1.strVal)(row.resourceVersion),
|
|
39
41
|
mediaType: (0, data_formatters_lib_1.strVal)(row.mediaType),
|
|
40
42
|
modifiedTs: (0, sqlite_date_helper_1.parseSqliteDateTime)(row.modifiedTs),
|
|
41
|
-
uid: (0, data_formatters_lib_1.strVal)(row.uid),
|
|
42
43
|
weightB: (0, data_formatters_lib_1.nbVal)(row.weightB),
|
|
43
44
|
attachedData: (0, data_formatters_lib_1.strValOrUndef)(row.attachedData),
|
|
44
45
|
originalName: (0, data_formatters_lib_1.strValOrUndef)(row.originalName),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-formatters.helpers.js","sourceRoot":"","sources":["../../src/helpers/data-formatters.helpers.ts"],"names":[],"mappings":";;;AAAA,oEAA0F;AAE1F,6DAA2D;AAE3D,SAAgB,WAAW,CAAC,GAAQ;IAClC,OAAO;QACL,IAAI,EAAE,OAAO;QACb,GAAG,eAAe,CAAC,GAAG,CAAC;KACxB,CAAC;AACJ,CAAC;AALD,kCAKC;AAED,SAAgB,WAAW,CAAC,GAAQ;IAClC,OAAO;QACL,IAAI,EAAE,OAAO;QACb,GAAG,eAAe,CAAC,GAAG,CAAC;QACvB,MAAM,EAAE,IAAA,2BAAK,EAAC,GAAG,CAAC,MAAM,CAAC;QACzB,KAAK,EAAE,IAAA,2BAAK,EAAC,GAAG,CAAC,KAAK,CAAC;QACvB,QAAQ,EAAE,IAAA,oCAAc,EAAC,GAAG,CAAC,QAAQ,CAAC;KACvC,CAAC;AACJ,CAAC;AARD,kCAQC;AAED,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,OAAO;QACL,GAAG,WAAW,CAAC,GAAG,CAAC;QACnB,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;AACJ,CAAC;AALD,sDAKC;AAED,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,OAAO;QACL,GAAG,WAAW,CAAC,GAAG,CAAC;QACnB,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;AACJ,CAAC;AALD,sDAKC;AAED,SAAS,eAAe,CAAC,GAAQ;IAC/B,OAAO;QACL,
|
|
1
|
+
{"version":3,"file":"data-formatters.helpers.js","sourceRoot":"","sources":["../../src/helpers/data-formatters.helpers.ts"],"names":[],"mappings":";;;AAAA,oEAA0F;AAE1F,6DAA2D;AAE3D,SAAgB,WAAW,CAAC,GAAQ;IAClC,OAAO;QACL,IAAI,EAAE,OAAO;QACb,GAAG,eAAe,CAAC,GAAG,CAAC;KACxB,CAAC;AACJ,CAAC;AALD,kCAKC;AAED,SAAgB,WAAW,CAAC,GAAQ;IAClC,OAAO;QACL,IAAI,EAAE,OAAO;QACb,GAAG,eAAe,CAAC,GAAG,CAAC;QACvB,MAAM,EAAE,IAAA,2BAAK,EAAC,GAAG,CAAC,MAAM,CAAC;QACzB,KAAK,EAAE,IAAA,2BAAK,EAAC,GAAG,CAAC,KAAK,CAAC;QACvB,QAAQ,EAAE,IAAA,oCAAc,EAAC,GAAG,CAAC,QAAQ,CAAC;KACvC,CAAC;AACJ,CAAC;AARD,kCAQC;AAED,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,OAAO;QACL,GAAG,WAAW,CAAC,GAAG,CAAC;QACnB,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;AACJ,CAAC;AALD,sDAKC;AAED,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,OAAO;QACL,GAAG,WAAW,CAAC,GAAG,CAAC;QACnB,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;AACJ,CAAC;AALD,sDAKC;AAED,SAAS,eAAe,CAAC,GAAQ;IAC/B,OAAO;QACL,GAAG,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,GAAG,CAAC;QACpB,eAAe,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,eAAe,CAAC;QAC5C,SAAS,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,SAAS,CAAC;QAChC,UAAU,EAAE,IAAA,wCAAmB,EAAC,GAAG,CAAC,UAAU,CAAC;QAC/C,OAAO,EAAE,IAAA,2BAAK,EAAC,GAAG,CAAC,OAAO,CAAC;QAC3B,YAAY,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,YAAY,CAAC;QAC7C,YAAY,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,YAAY,CAAC;KAC9C,CAAC;AACJ,CAAC"}
|
|
@@ -12,7 +12,7 @@ export declare class MediaStorageContext {
|
|
|
12
12
|
logNextQuery: (count?: number | undefined) => void;
|
|
13
13
|
asyncQueue: <T extends () => Promise<any>>(task: T) => ReturnType<T>;
|
|
14
14
|
constructor(options: MediaStorageOptions);
|
|
15
|
-
init(
|
|
15
|
+
init(): Promise<void>;
|
|
16
16
|
dataSource(): DataSource;
|
|
17
17
|
dbManager(): EntityManager;
|
|
18
18
|
mediaRepository(): Repository<PaMediaEntity>;
|
|
@@ -24,13 +24,13 @@ class MediaStorageContext {
|
|
|
24
24
|
this.#dbFileStorage = options.storage.file;
|
|
25
25
|
this.logNextQuery = () => { };
|
|
26
26
|
}
|
|
27
|
-
async init(
|
|
27
|
+
async init() {
|
|
28
28
|
const { mainCn, logNextQuery } = await (0, db_init_1.createOrOpenMainCn)({
|
|
29
29
|
sqliteFile: this.#dbFileStorage,
|
|
30
30
|
appLog: this.appLog,
|
|
31
31
|
siteName: this.siteName,
|
|
32
32
|
canCreate: this.canCreate,
|
|
33
|
-
}
|
|
33
|
+
});
|
|
34
34
|
this.logNextQuery = logNextQuery;
|
|
35
35
|
this.#dataSource = mainCn;
|
|
36
36
|
this.#cn = mainCn.manager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-storage-context.js","sourceRoot":"","sources":["../src/media-storage-context.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAGpD,+CAAuD;AACvD,4EAAuE;AACvE,8DAA0D;AAG1D,MAAa,mBAAmB;IAC9B,MAAM,GAA0B,OAAO,CAAC;IACxC,QAAQ,CAAS;IACjB,SAAS,CAAU;IACnB,MAAM,CAAS;IACf,YAAY,CAAuC;IACnD,UAAU,GAAG,IAAA,4BAAgB,GAAE,CAAC;IAChC,cAAc,CAAS;IAEvB,WAAW,CAAc;IACzB,GAAG,CAAiB;IACpB,gBAAgB,CAA6B;IAC7C,sBAAsB,CAAmC;IAEzD,YAAY,OAA4B;QACtC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI
|
|
1
|
+
{"version":3,"file":"media-storage-context.js","sourceRoot":"","sources":["../src/media-storage-context.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAGpD,+CAAuD;AACvD,4EAAuE;AACvE,8DAA0D;AAG1D,MAAa,mBAAmB;IAC9B,MAAM,GAA0B,OAAO,CAAC;IACxC,QAAQ,CAAS;IACjB,SAAS,CAAU;IACnB,MAAM,CAAS;IACf,YAAY,CAAuC;IACnD,UAAU,GAAG,IAAA,4BAAgB,GAAE,CAAC;IAChC,cAAc,CAAS;IAEvB,WAAW,CAAc;IACzB,GAAG,CAAiB;IACpB,gBAAgB,CAA6B;IAC7C,sBAAsB,CAAmC;IAEzD,YAAY,OAA4B;QACtC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,4BAAkB,EAAC;YACxD,UAAU,EAAE,IAAI,CAAC,cAAc;YAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;QAC1B,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAChD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,8BAAa,CAAC,CAAC;QAC9D,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,2CAAmB,CAAC,CAAC;IAC5E,CAAC;IAED,UAAU;QACR,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,SAAS;QACP,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,eAAe;QACb,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,IAAI,CAAC,sBAAsB;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;CACF;AAxDD,kDAwDC"}
|
package/dist/media-storage.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export interface MediaStorageConf {
|
|
|
14
14
|
export declare class MediaStorage {
|
|
15
15
|
#private;
|
|
16
16
|
constructor(options: MediaStorageOptions);
|
|
17
|
-
initialise(
|
|
17
|
+
initialise(): Promise<void>;
|
|
18
18
|
addMedia(payload: NewMediaWithHandle): Promise<Media | Image>;
|
|
19
19
|
getFirstImageUid(options: {
|
|
20
20
|
handle: string;
|
package/dist/media-storage.js
CHANGED
|
@@ -8,16 +8,13 @@ class MediaStorage {
|
|
|
8
8
|
constructor(options) {
|
|
9
9
|
this.#context = new media_storage_context_1.MediaStorageContext(options);
|
|
10
10
|
}
|
|
11
|
-
|
|
12
|
-
async initialise(siteLeafId) {
|
|
11
|
+
async initialise() {
|
|
13
12
|
this.#checkStatus();
|
|
14
|
-
await this.#context.init(
|
|
13
|
+
await this.#context.init();
|
|
15
14
|
}
|
|
16
15
|
async addMedia(payload) {
|
|
17
16
|
this.#checkStatus();
|
|
18
|
-
const uid = await this.#context.asyncQueue(
|
|
19
|
-
return await (0, media_queries_1.addMedia)(this.#context, payload);
|
|
20
|
-
});
|
|
17
|
+
const uid = await this.#context.asyncQueue(() => (0, media_queries_1.createMedia)(this.#context, payload));
|
|
21
18
|
const media = await (0, media_queries_1.getMedia)(this.#context.dbManager(), uid);
|
|
22
19
|
if (!media)
|
|
23
20
|
throw new Error(`should have a media '${uid}'`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-storage.js","sourceRoot":"","sources":["../src/media-storage.ts"],"names":[],"mappings":";;;AAEA,mEAA8D;AAE9D,mDAeyB;AAczB,MAAa,YAAY;IACvB,QAAQ,CAAsB;IAE9B,YAAY,OAA4B;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,2CAAmB,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"media-storage.js","sourceRoot":"","sources":["../src/media-storage.ts"],"names":[],"mappings":"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"}
|
package/dist/media.queries.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { EntityManager } from "typeorm";
|
|
|
2
2
|
import type { Image, ImageWithBinary, Media, MediaWithBinary } from "./data-types";
|
|
3
3
|
import type { MediaStorageContext } from "./media-storage-context";
|
|
4
4
|
import type { NewMediaWithHandle, ReorderMediasInput } from "./media-storage-types";
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function createMedia(ctx: MediaStorageContext, payload: NewMediaWithHandle): Promise<string>;
|
|
6
6
|
export declare function getFirstImageUidForHandle(cn: EntityManager, handle: string): Promise<string | undefined>;
|
|
7
7
|
export declare function getMediasByHandle(cn: EntityManager, handle: string): Promise<(Image | Media)[]>;
|
|
8
8
|
export declare function getMediasByHandles(cn: EntityManager, handles: string[]): Promise<Map<string, Image | Media>>;
|
package/dist/media.queries.js
CHANGED
|
@@ -1,20 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.reorderMedias = exports.updateAttachedData = exports.deleteMediaWithHandle = exports.deleteHandles = exports.deleteHandle = exports.getMediaWithBinary = exports.getMediaByHandle = exports.getAttachedDocumentsWeight = exports.countMediasByLeafId = exports.getMedia = exports.getMediasByHandles = exports.getMediasByHandle = exports.getFirstImageUidForHandle = exports.
|
|
3
|
+
exports.reorderMedias = exports.updateAttachedData = exports.deleteMediaWithHandle = exports.deleteHandles = exports.deleteHandle = exports.getMediaWithBinary = exports.getMediaByHandle = exports.getAttachedDocumentsWeight = exports.countMediasByLeafId = exports.getMedia = exports.getMediasByHandles = exports.getMediasByHandle = exports.getFirstImageUidForHandle = exports.createMedia = void 0;
|
|
4
4
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
5
|
const anywhere_lib_1 = require("@paroicms/anywhere-lib");
|
|
6
|
+
const server_lib_1 = require("@paroicms/server-lib");
|
|
6
7
|
const node_crypto_1 = require("node:crypto");
|
|
7
8
|
const pa_image_model_1 = require("./entities/pa-image.model");
|
|
8
9
|
const pa_media_handle_model_1 = require("./entities/pa-media-handle.model");
|
|
9
10
|
const pa_media_model_1 = require("./entities/pa-media.model");
|
|
10
11
|
const data_formatters_helpers_1 = require("./helpers/data-formatters.helpers");
|
|
11
|
-
async function
|
|
12
|
+
async function createMedia(ctx, payload) {
|
|
12
13
|
const uid = (0, node_crypto_1.randomUUID)();
|
|
14
|
+
const resourceVersion = (0, server_lib_1.generateResourceVersion)();
|
|
13
15
|
await ctx.dataSource().transaction(async (cn) => {
|
|
14
16
|
if (payload.replace)
|
|
15
17
|
await deleteHandle(cn, payload.handle);
|
|
16
18
|
await cn.getRepository(pa_media_model_1.PaMediaEntity).save({
|
|
17
19
|
uid,
|
|
20
|
+
resourceVersion,
|
|
18
21
|
binaryFile: payload.binaryFile,
|
|
19
22
|
originalName: payload.originalName,
|
|
20
23
|
attachedData: payload.attachedData,
|
|
@@ -34,7 +37,7 @@ async function addMedia(ctx, payload) {
|
|
|
34
37
|
});
|
|
35
38
|
return uid;
|
|
36
39
|
}
|
|
37
|
-
exports.
|
|
40
|
+
exports.createMedia = createMedia;
|
|
38
41
|
async function getMaxOrderNum(cn, handle) {
|
|
39
42
|
const row = await cn
|
|
40
43
|
.createQueryBuilder()
|
|
@@ -236,8 +239,9 @@ function buildMediaQuery(cn) {
|
|
|
236
239
|
return cn
|
|
237
240
|
.createQueryBuilder()
|
|
238
241
|
.select("m.mediaType", "mediaType")
|
|
239
|
-
.addSelect("m.modifiedTs", "modifiedTs")
|
|
240
242
|
.addSelect("m.uid", "uid")
|
|
243
|
+
.addSelect("m.resourceVersion", "resourceVersion")
|
|
244
|
+
.addSelect("m.modifiedTs", "modifiedTs")
|
|
241
245
|
.addSelect("m.weightB", "weightB")
|
|
242
246
|
.addSelect("m.attachedData", "attachedData")
|
|
243
247
|
.addSelect("m.originalName", "originalName")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.queries.js","sourceRoot":"","sources":["../src/media.queries.ts"],"names":[],"mappings":";;;AAAA,oEAAyE;AACzE,yDAAyD;AACzD,6CAAyC;AAGzC,8DAA0D;AAC1D,4EAAuE;AACvE,8DAA0D;AAC1D,+EAK2C;AAIpC,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"media.queries.js","sourceRoot":"","sources":["../src/media.queries.ts"],"names":[],"mappings":";;;AAAA,oEAAyE;AACzE,yDAAyD;AACzD,qDAA+D;AAC/D,6CAAyC;AAGzC,8DAA0D;AAC1D,4EAAuE;AACvE,8DAA0D;AAC1D,+EAK2C;AAIpC,KAAK,UAAU,WAAW,CAC/B,GAAwB,EACxB,OAA2B;IAE3B,MAAM,GAAG,GAAG,IAAA,wBAAU,GAAE,CAAC;IACzB,MAAM,eAAe,GAAG,IAAA,oCAAuB,GAAE,CAAC;IAClD,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAC9C,IAAI,OAAO,CAAC,OAAO;YAAE,MAAM,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAE5D,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAa,CAAC,CAAC,IAAI,CAAC;YACzC,GAAG;YACH,eAAe;YACf,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAa,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEtF,MAAM,EAAE,CAAC,aAAa,CAAC,2CAAmB,CAAC,CAAC,IAAI,CAAC;YAC/C,QAAQ,EAAE,GAAG;YACb,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;YAC/C,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAhCD,kCAgCC;AAED,KAAK,UAAU,cAAc,CAAC,EAAiB,EAAE,MAAc;IAC7D,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,MAAM,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SACnC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC;SAC1B,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC;SACvC,SAAS,EAAO,CAAC;IACpB,OAAO,IAAA,kCAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACnC,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,EAAiB,EACjB,MAAc;IAEd,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC;SACzB,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;SACpB,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,eAAe,CAAC;SAC1C,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,oBAAoB,CAAC;SACrD,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC;SACvC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC;SAC5B,UAAU,CAAC,cAAc,EAAE,KAAK,CAAC;SACjC,KAAK,CAAC,CAAC,CAAC;SACR,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,IAAA,4BAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAlBD,8DAkBC;AAEM,KAAK,UAAU,iBAAiB,CACrC,EAAiB,EACjB,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC;SACnC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,oBAAoB,CAAC;SACrD,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC;SACvC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC;SAC5B,UAAU,CAAC,cAAc,EAAE,KAAK,CAAC;SACjC,UAAU,EAAO,CAAC;IAErB,MAAM,YAAY,GAAU,EAAE,CAAC;IAC/B,MAAM,kBAAkB,GAAU,EAAE,CAAC;IAErC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACjB,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE,GAAG,kBAAkB,CAAC,CAAC;IAE3D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAA,oBAAK,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC1F,CAAC;AA1BD,8CA0BC;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,OAAiB;IAEjB,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC;SACnC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,oBAAoB,CAAC;SACrD,KAAK,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,CAAC;SAC/C,UAAU,EAAO,CAAC;IAErB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC7C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAA,oBAAK,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAhBD,gDAgBC;AAEM,KAAK,UAAU,QAAQ,CAAC,EAAiB,EAAE,GAAW;IAC3D,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS,EAAO,CAAC;IACtF,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,IAAA,oBAAK,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC;AAChE,CAAC;AAJD,4BAIC;AAEM,KAAK,UAAU,mBAAmB,CACvC,EAAiB,EACjB,MAAc,EACd,UAAqC,EAAE;IAEvC,MAAM,KAAK,GAAG,EAAE;SACb,kBAAkB,EAAE;SACpB,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC;SACzB,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC;SAC1B,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,KAAK,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,EAAO,CAAC;IACzC,OAAO,IAAA,2BAAK,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACzB,CAAC;AAjBD,kDAiBC;AAEM,KAAK,UAAU,0BAA0B,CAAC,EAAiB;IAChE,MAAM,MAAM,GAAG,MAAM,EAAE;SACpB,kBAAkB,EAAE;SACpB,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC;SACnC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;SACpB,KAAK,CAAC,0BAA0B,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;SACnE,SAAS,EAAO,CAAC;IACpB,OAAO,IAAA,kCAAY,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AARD,gEAQC;AAEM,KAAK,UAAU,gBAAgB,CACpC,EAAiB,EACjB,MAAc;IAEd,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC;SAClC,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,oBAAoB,CAAC;SACrD,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC;SACvC,SAAS,EAAO,CAAC;IACpB,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,IAAA,oBAAK,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,qCAAW,EAAC,GAAG,CAAC,CAAC;AAChE,CAAC;AAVD,4CAUC;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,GAAW;IAEX,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC;SAClC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC;SACvC,KAAK,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,CAAC;SAC9B,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,IAAA,oBAAK,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,+CAAqB,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,+CAAqB,EAAC,GAAG,CAAC,CAAC;AACpF,CAAC;AAXD,gDAWC;AAED;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,EAAiB,EAAE,MAAc;IAClE,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,eAAe,CAAC;SACrB,KAAK,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC;SACrC,OAAO,EAAE,CAAC;IAEb,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAClC,OAAO,MAAM,kBAAkB,CAAC,EAAE,CAAC,CAAC;AACtC,CAAC;AAVD,oCAUC;AAED;;GAEG;AACI,KAAK,UAAU,aAAa,CAAC,EAAiB,EAAE,OAAiB;IACtE,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,eAAe,CAAC;SACrB,KAAK,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;SAC7C,OAAO,EAAE,CAAC;IAEb,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAClC,OAAO,MAAM,kBAAkB,CAAC,EAAE,CAAC,CAAC;AACtC,CAAC;AAVD,sCAUC;AAEM,KAAK,UAAU,qBAAqB,CACzC,EAAiB,EACjB,EAAE,MAAM,EAAE,GAAG,EAAmC;IAEhD,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,eAAe,CAAC;SACrB,KAAK,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,CAAC;SACjC,QAAQ,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC;SACxC,OAAO,EAAE,CAAC;IAEb,OAAO,MAAM,kBAAkB,CAAC,EAAE,CAAC,CAAC;AACtC,CAAC;AAbD,sDAaC;AAED,KAAK,UAAU,kBAAkB,CAAC,EAAiB;IACjD,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,kBAAkB,EAAE;SACpB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC;SACtB,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;SACpB,KAAK,CACJ;;;;EAIJ,CACG;SACA,UAAU,EAAO,CAAC;IAErB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4BAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAEhD,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,SAAS,CAAC;SACf,KAAK,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC;SACpC,OAAO,EAAE,CAAC;IAEb,OAAO,IAAI,CAAC;AACd,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,EAAE,QAAQ,EAAE,MAAM,EAAwC;IAE1D,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAa,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;AAC5F,CAAC;AALD,gDAKC;AAEM,KAAK,UAAU,aAAa,CACjC,GAAwB,EACxB,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAsB;IAE/C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,WAAW,GAA0B,EAAE,CAAC;IAC9C,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,GAAG,OAAO,MAAM,IAAI,CAAC,CAAC;YAC9E,SAAS;QACX,CAAC;QAED,WAAW,CAAC,IAAI,CAAC;YACf,QAAQ,EAAE,GAAG;YACb,MAAM;YACN,QAAQ;SACT,CAAC,CAAC;QAEH,EAAE,QAAQ,CAAC;IACb,CAAC;IAED,MAAM,GAAG,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACtD,CAAC;AAxBD,sCAwBC;AAED,SAAS,eAAe,CAAC,EAAiB;IACxC,OAAO,EAAE;SACN,kBAAkB,EAAE;SACpB,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC;SAClC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC;SACzB,SAAS,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;SACjD,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC;SACvC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC;SACjC,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC;SAC3C,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC;SAC3C,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC;SAC7B,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;SACpB,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;AAC/C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server-database-media-storage",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "A library to make back-end for media galleries.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"paroicms",
|
|
@@ -27,16 +27,15 @@
|
|
|
27
27
|
"eslint": "eslint ."
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@types/node": "~20.
|
|
30
|
+
"@types/node": "~20.12.8",
|
|
31
31
|
"rimraf": "~5.0.5",
|
|
32
|
-
"typescript": "~5.
|
|
32
|
+
"typescript": "~5.4.5"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@paroi/async-lib": "~0.1.2",
|
|
36
36
|
"@paroi/data-formatters-lib": "~0.1.2",
|
|
37
|
-
"@paroicms/anywhere-lib": "1.
|
|
38
|
-
"@paroicms/server-lib": "1.
|
|
39
|
-
"reflect-metadata": "~0.2.2"
|
|
37
|
+
"@paroicms/anywhere-lib": "1.4.0",
|
|
38
|
+
"@paroicms/server-lib": "1.2.0"
|
|
40
39
|
},
|
|
41
40
|
"peerDependencies": {
|
|
42
41
|
"typeorm": "0.3"
|