@paroicms/server-database-media-storage 1.11.0 → 1.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/ddl/medias.ddl.sql +2 -2
  2. package/dist/db-init/ddl-migration.d.ts +1 -1
  3. package/dist/db-init/ddl-migration.js +6 -1
  4. package/dist/db-init/ddl-migration.js.map +1 -1
  5. package/dist/entities/pa-media-handle.model.d.ts +1 -1
  6. package/dist/entities/pa-media-handle.model.js +2 -2
  7. package/dist/media-storage-types.d.ts +1 -1
  8. package/dist/media-storage.d.ts +2 -2
  9. package/dist/media-storage.js +2 -2
  10. package/dist/media.queries.d.ts +1 -1
  11. package/dist/media.queries.js +4 -4
  12. package/package.json +5 -5
package/ddl/medias.ddl.sql CHANGED
@@ -8,7 +8,7 @@ create table PaMetadata (
8
8
  primary key (dbSchema, k)
9
9
  );
10
10
 
11
- insert into PaMetadata (dbSchema, k, val) values ('medias', 'dbSchemaVersion', '5');
11
+ insert into PaMetadata (dbSchema, k, val) values ('medias', 'dbSchemaVersion', '6');
12
12
 
13
13
  create table PaMedia (
14
14
  uid char(36) not null primary key,
@@ -32,6 +32,6 @@ create table PaMediaHandle (
32
32
  mediaUid char(36) not null references PaMedia (uid) on delete cascade,
33
33
  handle varchar(200) not null,
34
34
  orderNum integer,
35
- leafId bigint,
35
+ nodeId bigint,
36
36
  primary key (mediaUid, handle)
37
37
  );
package/dist/db-init/ddl-migration.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { AppLog } from "@paroicms/public-server-lib";
2
2
  import type { DataSource } from "typeorm";
3
3
  export declare const dbSchemaName = "medias";
4
- export declare const currentDbSchemaVersion = 5;
4
+ export declare const currentDbSchemaVersion = 6;
5
5
  export declare function migrateMediasDb(cn: DataSource, { fromVersion, appLog }: {
6
6
  fromVersion: number;
7
7
  appLog: AppLog;
package/dist/db-init/ddl-migration.js CHANGED
@@ -5,7 +5,7 @@ exports.migrateMediasDb = migrateMediasDb;
5
5
  const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
6
6
  const internal_server_lib_1 = require("@paroicms/internal-server-lib");
7
7
  exports.dbSchemaName = "medias";
8
- exports.currentDbSchemaVersion = 5;
8
+ exports.currentDbSchemaVersion = 6;
9
9
  async function migrateMediasDb(cn, { fromVersion, appLog }) {
10
10
  const toVersion = exports.currentDbSchemaVersion;
11
11
  let currentVersion = fromVersion;
@@ -39,6 +39,11 @@ where uid = '${uid}'`, [originalName]);
39
39
  await (0, internal_server_lib_1.setMetadataDbSchemaVersion)(cn, { dbSchemaName: exports.dbSchemaName, value: 5 });
40
40
  currentVersion = 5;
41
41
  }
42
+ if (currentVersion === 5) {
43
+ await cn.query("alter table PaMediaHandle rename column leafId to nodeId");
44
+ await (0, internal_server_lib_1.setMetadataDbSchemaVersion)(cn, { dbSchemaName: exports.dbSchemaName, value: 6 });
45
+ currentVersion = 6;
46
+ }
42
47
  if (currentVersion !== toVersion) {
43
48
  throw new Error(`version of ${exports.dbSchemaName} database should be '${toVersion}', but is '${currentVersion}'`);
44
49
  }
package/dist/db-init/ddl-migration.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AAQA,0CAmDC;AA3DD,oEAA4E;AAC5E,uEAAoG;AAIvF,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAEjC,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAE,WAAW,EAAE,MAAM,EAA2C;IAEhE,MAAM,SAAS,GAAG,8BAAsB,CAAC;IACzC,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,6CAAuB,GAAE;;eAEjC,GAAG,GAAG,EACX,CAAC,YAAY,CAAC,CACf,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,CAAC,KAAK,CACZ,yCAAyC,IAAA,6CAAuB,GAAE,kBAAkB,GAAG,GAAG,CAC3F,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,IAAA,gDAA0B,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,oEAAoE;QACpE,MAAM,IAAA,gDAA0B,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,MAAM,CAAC,IAAI,CAAC,GAAG,oBAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC;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"}
1
+ {"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"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"}
package/dist/entities/pa-media-handle.model.d.ts CHANGED
@@ -2,5 +2,5 @@ export declare class PaMediaHandleEntity {
2
2
  mediaUid: string;
3
3
  handle: string;
4
4
  orderNum?: number;
5
- leafId?: string;
5
+ nodeId?: string;
6
6
  }
package/dist/entities/pa-media-handle.model.js CHANGED
@@ -15,7 +15,7 @@ let PaMediaHandleEntity = class PaMediaHandleEntity {
15
15
  mediaUid;
16
16
  handle;
17
17
  orderNum;
18
- leafId;
18
+ nodeId;
19
19
  };
20
20
  exports.PaMediaHandleEntity = PaMediaHandleEntity;
21
21
  __decorate([
@@ -33,7 +33,7 @@ __decorate([
33
33
  __decorate([
34
34
  (0, typeorm_1.Column)({ type: "bigint", nullable: true }),
35
35
  __metadata("design:type", String)
36
- ], PaMediaHandleEntity.prototype, "leafId", void 0);
36
+ ], PaMediaHandleEntity.prototype, "nodeId", void 0);
37
37
  exports.PaMediaHandleEntity = PaMediaHandleEntity = __decorate([
38
38
  (0, typeorm_1.Entity)("PaMediaHandle")
39
39
  ], PaMediaHandleEntity);
package/dist/media-storage-types.d.ts CHANGED
@@ -18,5 +18,5 @@ export interface ImageProperties {
18
18
  export interface NewMediaWithHandle extends NewMediaPayload {
19
19
  handle: string;
20
20
  replace?: boolean;
21
- leafId: string;
21
+ nodeId: string;
22
22
  }
package/dist/media-storage.d.ts CHANGED
@@ -57,8 +57,8 @@ export declare class MediaStorage {
57
57
  values: string;
58
58
  }): Promise<Media | Image | undefined>;
59
59
  reorderMedias(options: ReorderMediasInput): Promise<(Media | Image)[]>;
60
- countMedias({ leafId, exceptHandle }: {
61
- leafId: string;
60
+ countMedias({ nodeId, exceptHandle }: {
61
+ nodeId: string;
62
62
  exceptHandle?: string;
63
63
  }): Promise<number>;
64
64
  getAttachedDocumentsWeight(): Promise<number>;
package/dist/media-storage.js CHANGED
@@ -72,9 +72,9 @@ class MediaStorage {
72
72
  await (0, media_queries_1.reorderMedias)(this.#context, options);
73
73
  return await this.getMedias({ handle: options.handle });
74
74
  }
75
- async countMedias({ leafId, exceptHandle }) {
75
+ async countMedias({ nodeId, exceptHandle }) {
76
76
  this.#checkStatus();
77
- return await (0, media_queries_1.countMediasByLeafId)(this.#context.cn(), leafId, { exceptHandle });
77
+ return await (0, media_queries_1.countMediasByNodeId)(this.#context.cn(), nodeId, { exceptHandle });
78
78
  }
79
79
  async getAttachedDocumentsWeight() {
80
80
  this.#checkStatus();
package/dist/media.queries.d.ts CHANGED
@@ -7,7 +7,7 @@ export declare function getFirstImageForHandle(cn: QueryBuilderConnection, handl
7
7
  export declare function getMediasByHandle(cn: QueryBuilderConnection, handle: string): Promise<(Image | Media)[]>;
8
8
  export declare function getMediasByHandles(cn: QueryBuilderConnection, handles: string[]): Promise<Map<string, Image | Media>>;
9
9
  export declare function getMedia(cn: QueryBuilderConnection, uid: string): Promise<Media | Image | undefined>;
10
- export declare function countMediasByLeafId(cn: QueryBuilderConnection, leafId: string, options?: {
10
+ export declare function countMediasByNodeId(cn: QueryBuilderConnection, nodeId: string, options?: {
11
11
  exceptHandle?: string;
12
12
  }): Promise<number>;
13
13
  export declare function getAttachedDocumentsWeight(cn: QueryBuilderConnection): Promise<number>;
package/dist/media.queries.js CHANGED
@@ -5,7 +5,7 @@ exports.getFirstImageForHandle = getFirstImageForHandle;
5
5
  exports.getMediasByHandle = getMediasByHandle;
6
6
  exports.getMediasByHandles = getMediasByHandles;
7
7
  exports.getMedia = getMedia;
8
- exports.countMediasByLeafId = countMediasByLeafId;
8
+ exports.countMediasByNodeId = countMediasByNodeId;
9
9
  exports.getAttachedDocumentsWeight = getAttachedDocumentsWeight;
10
10
  exports.getMediaByHandle = getMediaByHandle;
11
11
  exports.getMediaWithBinary = getMediaWithBinary;
@@ -58,7 +58,7 @@ async function createMedia(ctx, payload) {
58
58
  mediaUid: uid,
59
59
  handle: payload.handle,
60
60
  orderNum: maxNum === undefined ? 1 : maxNum + 1,
61
- leafId: payload.leafId,
61
+ nodeId: payload.nodeId,
62
62
  })
63
63
  .execute();
64
64
  });
@@ -123,12 +123,12 @@ async function getMedia(cn, uid) {
123
123
  return;
124
124
  return (0, data_formatters_lib_1.isDef)(row.width) ? (0, data_formatters_helpers_1.formatImage)(row) : (0, data_formatters_helpers_1.formatMedia)(row);
125
125
  }
126
- async function countMediasByLeafId(cn, leafId, options = {}) {
126
+ async function countMediasByNodeId(cn, nodeId, options = {}) {
127
127
  const query = cn
128
128
  .createQueryBuilder()
129
129
  .select("count(1)", "cnt")
130
130
  .from("PaMediaHandle", "h")
131
- .andWhere("h.leafId = :leafId", { leafId });
131
+ .andWhere("h.nodeId = :nodeId", { nodeId });
132
132
  if (options.exceptHandle) {
133
133
  query.andWhere("h.handle <> :handle", { handle: options.exceptHandle });
134
134
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paroicms/server-database-media-storage",
3
- "version": "1.11.0",
3
+ "version": "1.12.1",
4
4
  "description": "A library to make back-end for media galleries.",
5
5
  "keywords": [
6
6
  "paroicms",
@@ -33,10 +33,10 @@
33
33
  "dependencies": {
34
34
  "@paroi/async-lib": "~0.3.1",
35
35
  "@paroi/data-formatters-lib": "~0.4.0",
36
- "@paroicms/internal-anywhere-lib": "1.19.0",
37
- "@paroicms/internal-server-lib": "1.9.0",
38
- "@paroicms/public-server-lib": "0.19.0",
39
- "@paroicms/public-anywhere-lib": "0.11.0"
36
+ "@paroicms/internal-anywhere-lib": "1.20.0",
37
+ "@paroicms/internal-server-lib": "1.9.1",
38
+ "@paroicms/public-server-lib": "0.20.0",
39
+ "@paroicms/public-anywhere-lib": "0.12.0"
40
40
  },
41
41
  "peerDependencies": {
42
42
  "typeorm": "0.3"