@antelopejs/dms-media 0.7.3 → 0.8.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.
Files changed (141) hide show
  1. package/README.md +10 -10
  2. package/dist/acl/entries.js +20 -2
  3. package/dist/acl/entries.js.map +1 -1
  4. package/dist/asset-lifecycle.js +5 -1
  5. package/dist/asset-lifecycle.js.map +1 -1
  6. package/dist/bindings.d.ts +1 -0
  7. package/dist/bindings.js +36 -25
  8. package/dist/bindings.js.map +1 -1
  9. package/dist/db/models/mediaAssets.model.d.ts +3 -3
  10. package/dist/db/models/mediaDeclarations.model.d.ts +3 -3
  11. package/dist/db/models/mediaEvents.model.d.ts +3 -3
  12. package/dist/db/models/mediaFavorites.model.d.ts +3 -3
  13. package/dist/db/models/mediaFolders.model.d.ts +3 -3
  14. package/dist/db/models/mediaUploads.model.d.ts +3 -3
  15. package/dist/declared/assets.js +39 -25
  16. package/dist/declared/assets.js.map +1 -1
  17. package/dist/declared/folders.js +27 -14
  18. package/dist/declared/folders.js.map +1 -1
  19. package/dist/declared/records.d.ts +1 -0
  20. package/dist/declared/records.js +18 -1
  21. package/dist/declared/records.js.map +1 -1
  22. package/dist/fixed-id.d.ts +1 -0
  23. package/dist/fixed-id.js +16 -0
  24. package/dist/fixed-id.js.map +1 -0
  25. package/dist/routes/media/assets.d.ts +3 -2
  26. package/dist/routes/media/assets.js +11 -6
  27. package/dist/routes/media/assets.js.map +1 -1
  28. package/dist/routes/media/storage-keys.js +10 -1
  29. package/dist/routes/media/storage-keys.js.map +1 -1
  30. package/dist/test/helpers/assets.d.ts +2 -2
  31. package/dist/test/helpers/folders.d.ts +6 -6
  32. package/dist/test/helpers/permissions-world.d.ts +6 -6
  33. package/dist/test/integration/binding-folder-race.test.d.ts +1 -0
  34. package/dist/test/integration/binding-folder-race.test.js +66 -0
  35. package/dist/test/integration/binding-folder-race.test.js.map +1 -0
  36. package/dist/test/integration/declared-asset-race.test.d.ts +1 -0
  37. package/dist/test/integration/declared-asset-race.test.js +78 -0
  38. package/dist/test/integration/declared-asset-race.test.js.map +1 -0
  39. package/dist/test/integration/declared-folder-race.test.d.ts +1 -0
  40. package/dist/test/integration/declared-folder-race.test.js +43 -0
  41. package/dist/test/integration/declared-folder-race.test.js.map +1 -0
  42. package/dist/test/integration/media-activity-overview.test.js +27 -22
  43. package/dist/test/integration/media-activity-overview.test.js.map +1 -1
  44. package/dist/test/integration/media-api.test.js +9 -5
  45. package/dist/test/integration/media-api.test.js.map +1 -1
  46. package/dist/test/integration/media-bindings.test.js +16 -13
  47. package/dist/test/integration/media-bindings.test.js.map +1 -1
  48. package/dist/test/integration/media-cleanup.test.js +14 -5
  49. package/dist/test/integration/media-cleanup.test.js.map +1 -1
  50. package/dist/test/integration/media-declared-content.test.js +107 -91
  51. package/dist/test/integration/media-declared-content.test.js.map +1 -1
  52. package/dist/test/integration/media-delivery-editing.test.js +238 -215
  53. package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
  54. package/dist/test/integration/media-explorer-writes.test.js +131 -112
  55. package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
  56. package/dist/test/integration/media-guards.test.js +38 -37
  57. package/dist/test/integration/media-guards.test.js.map +1 -1
  58. package/dist/test/integration/media-library.test.js +244 -224
  59. package/dist/test/integration/media-library.test.js.map +1 -1
  60. package/dist/test/integration/media-linked-subfolders.test.js +173 -158
  61. package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
  62. package/dist/test/integration/media-permissions.test.js +31 -11
  63. package/dist/test/integration/media-permissions.test.js.map +1 -1
  64. package/dist/test/integration/media-search-query.test.js +8 -6
  65. package/dist/test/integration/media-search-query.test.js.map +1 -1
  66. package/dist/test/integration/media-search-views.test.js +12 -8
  67. package/dist/test/integration/media-search-views.test.js.map +1 -1
  68. package/dist/test/integration/media-upload-policy.test.js +228 -200
  69. package/dist/test/integration/media-upload-policy.test.js.map +1 -1
  70. package/dist/test/stack-modules.json +5 -5
  71. package/dist/test/unit/acl/entries.test.js +19 -0
  72. package/dist/test/unit/acl/entries.test.js.map +1 -1
  73. package/dist/test/unit/acl/resolver.test.js +9 -1
  74. package/dist/test/unit/acl/resolver.test.js.map +1 -1
  75. package/dist/test/unit/asset-lifecycle.test.d.ts +1 -0
  76. package/dist/test/unit/asset-lifecycle.test.js +18 -0
  77. package/dist/test/unit/asset-lifecycle.test.js.map +1 -0
  78. package/dist/test/unit/routes/storage-keys.test.d.ts +1 -0
  79. package/dist/test/unit/routes/storage-keys.test.js +18 -0
  80. package/dist/test/unit/routes/storage-keys.test.js.map +1 -0
  81. package/dist/test/unit/transform-ops.test.js +19 -0
  82. package/dist/test/unit/transform-ops.test.js.map +1 -1
  83. package/dist/transform-ops.js +25 -1
  84. package/dist/transform-ops.js.map +1 -1
  85. package/dist/validation/declared.schema.d.ts +6 -6
  86. package/dist/validation/library.schema.d.ts +4 -4
  87. package/dist/validation/media.schema.d.ts +4 -4
  88. package/frontend-vue/app/components/Explorer.vue +2 -0
  89. package/frontend-vue/app/components/FileProperties.vue +1 -1
  90. package/frontend-vue/app/components/ImageEditor.vue +5 -5
  91. package/frontend-vue/app/components/RecentFiles.vue +2 -2
  92. package/frontend-vue/app/components/UploadQueue.vue +4 -4
  93. package/frontend-vue/app/components/dialogs/DeleteFilesDialog.vue +1 -1
  94. package/frontend-vue/app/components/dialogs/ShortcutsDialog.vue +1 -1
  95. package/frontend-vue/app/components/dialogs/VisibilityDialog.vue +1 -1
  96. package/frontend-vue/app/components/explorer/ExplorerInspector.vue +1 -1
  97. package/frontend-vue/app/components/explorer/ExplorerSidebar.vue +2 -2
  98. package/frontend-vue/app/components/explorer/FolderStrip.vue +1 -1
  99. package/frontend-vue/app/components/explorer/GridView.vue +1 -1
  100. package/frontend-vue/app/components/shared/AltTextField.vue +2 -2
  101. package/frontend-vue/build/backend-boundary.ts +8 -3
  102. package/frontend-vue/eslint.config.mjs +0 -1
  103. package/frontend-vue/package.json +2 -2
  104. package/frontend-vue/pnpm-lock.yaml +45 -14
  105. package/frontend-vue/tests/backend-boundary.test.ts +6 -4
  106. package/frontend-vue/tests/fixtures/serverRender.ts +3 -3
  107. package/frontend-vue/tests/registration.test.ts +5 -0
  108. package/package.json +15 -15
  109. package/src/acl/entries.ts +30 -7
  110. package/src/asset-lifecycle.ts +6 -2
  111. package/src/bindings.ts +41 -38
  112. package/src/declared/assets.ts +45 -28
  113. package/src/declared/folders.ts +30 -21
  114. package/src/declared/records.ts +31 -2
  115. package/src/fixed-id.ts +18 -0
  116. package/src/routes/media/assets.ts +14 -6
  117. package/src/routes/media/storage-keys.ts +14 -2
  118. package/src/test/integration/binding-folder-race.test.ts +82 -0
  119. package/src/test/integration/declared-asset-race.test.ts +115 -0
  120. package/src/test/integration/declared-folder-race.test.ts +50 -0
  121. package/src/test/integration/media-activity-overview.test.ts +40 -27
  122. package/src/test/integration/media-api.test.ts +9 -5
  123. package/src/test/integration/media-bindings.test.ts +17 -13
  124. package/src/test/integration/media-cleanup.test.ts +17 -5
  125. package/src/test/integration/media-declared-content.test.ts +129 -112
  126. package/src/test/integration/media-delivery-editing.test.ts +323 -299
  127. package/src/test/integration/media-explorer-writes.test.ts +161 -135
  128. package/src/test/integration/media-guards.test.ts +40 -38
  129. package/src/test/integration/media-library.test.ts +325 -296
  130. package/src/test/integration/media-linked-subfolders.test.ts +207 -186
  131. package/src/test/integration/media-permissions.test.ts +33 -14
  132. package/src/test/integration/media-search-query.test.ts +24 -8
  133. package/src/test/integration/media-search-views.test.ts +39 -32
  134. package/src/test/integration/media-upload-policy.test.ts +283 -254
  135. package/src/test/stack-modules.json +5 -5
  136. package/src/test/unit/acl/entries.test.ts +23 -0
  137. package/src/test/unit/acl/resolver.test.ts +9 -1
  138. package/src/test/unit/asset-lifecycle.test.ts +21 -0
  139. package/src/test/unit/routes/storage-keys.test.ts +23 -0
  140. package/src/test/unit/transform-ops.test.ts +29 -1
  141. package/src/transform-ops.ts +32 -2
package/README.md CHANGED
@@ -64,16 +64,16 @@ new AssetType({
64
64
 
65
65
  <!-- antelopejs-docs-compat:start -->
66
66
 
67
- | Package | Supported | Tested with |
68
- | ------------------------------------------- | ----------------- | ----------- |
69
- | `@antelopejs/interface-api` | `>=0.3.0 <1.0.0` | `0.3.0` |
70
- | `@antelopejs/interface-api-util` | `>=0.3.0 <1.0.0` | `0.3.0` |
71
- | `@antelopejs/interface-core` | `>=0.4.0 <1.0.0` | `0.4.0` |
72
- | `@antelopejs/interface-database` | `>=0.3.0 <1.0.0` | `0.3.0` |
73
- | `@antelopejs/interface-database-decorators` | `>=0.2.0 <1.0.0` | `0.2.0` |
74
- | `@antelopejs/interface-dms` | `>=0.13.0 <1.0.0` | `0.13.0` |
75
- | `@antelopejs/interface-dms-media` | `>=0.3.0 <0.4.0` | `0.3.3` |
76
- | `@antelopejs/interface-file-storage` | `>=0.1.6 <1.0.0` | `0.1.6` |
67
+ | Package | Supported | Tested with |
68
+ | ------------------------------------------- | ------------------ | ----------- |
69
+ | `@antelopejs/interface-api` | `>=0.3.3 <0.4.0` | `0.3.3` |
70
+ | `@antelopejs/interface-api-util` | `>=0.3.2 <0.4.0` | `0.3.2` |
71
+ | `@antelopejs/interface-core` | `>=0.5.1 <0.6.0` | `0.5.1` |
72
+ | `@antelopejs/interface-database` | `>=0.4.0 <0.5.0` | `0.4.0` |
73
+ | `@antelopejs/interface-database-decorators` | `>=0.5.2 <0.6.0` | `0.5.2` |
74
+ | `@antelopejs/interface-dms` | `>=0.14.0 <0.15.0` | `0.14.0` |
75
+ | `@antelopejs/interface-dms-media` | `>=0.4.0 <0.5.0` | `0.4.0` |
76
+ | `@antelopejs/interface-file-storage` | `>=0.1.8 <0.2.0` | `0.1.8` |
77
77
 
78
78
  <!-- antelopejs-docs-compat:end -->
79
79
 
@@ -3,14 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parseFolderAcl = parseFolderAcl;
4
4
  exports.serializeAcl = serializeAcl;
5
5
  const logging_1 = require("@antelopejs/interface-core/logging");
6
+ const guards_1 = require("../guards");
7
+ function isAclRight(value) {
8
+ return value === "read" || value === "write" || value === "manage";
9
+ }
10
+ function isAclSubject(value) {
11
+ return ((0, guards_1.isObject)(value) &&
12
+ "kind" in value &&
13
+ (value.kind === "permission" || value.kind === "role") &&
14
+ "id" in value &&
15
+ (0, guards_1.isString)(value.id));
16
+ }
17
+ function isAclEntry(value) {
18
+ return ((0, guards_1.isObject)(value) &&
19
+ "subject" in value &&
20
+ isAclSubject(value.subject) &&
21
+ "rights" in value &&
22
+ Array.isArray(value.rights) &&
23
+ value.rights.every(isAclRight));
24
+ }
6
25
  function parseFolderAcl(folder) {
7
26
  if (!folder.json_acl)
8
27
  return undefined;
9
28
  try {
10
29
  const parsed = JSON.parse(folder.json_acl);
11
- if (Array.isArray(parsed)) {
30
+ if (Array.isArray(parsed) && parsed.every(isAclEntry))
12
31
  return parsed;
13
- }
14
32
  }
15
33
  catch { }
16
34
  logging_1.Logging.Warn(`Media folder '${folder._id}' has an unreadable ACL; treating it as empty.`);
@@ -1 +1 @@
1
- {"version":3,"file":"entries.js","sourceRoot":"","sources":["../../src/acl/entries.ts"],"names":[],"mappings":";;AASA,wCAaC;AAED,oCAKC;AA7BD,gEAA6D;AAS7D,SAAgB,cAAc,CAAC,MAAmB;IAChD,IAAI,CAAC,MAAM,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAE1B,OAAO,MAAoB,CAAC;QAC9B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,iBAAO,CAAC,IAAI,CACV,iBAAiB,MAAM,CAAC,GAAG,gDAAgD,CAC5E,CAAC;IACF,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,YAAY,CAC1B,OAA+B;IAE/B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC"}
1
+ {"version":3,"file":"entries.js","sourceRoot":"","sources":["../../src/acl/entries.ts"],"names":[],"mappings":";;AAmCA,wCAUC;AAED,oCAKC;AApDD,gEAA6D;AAE7D,sCAA+C;AAG/C,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,QAAQ,CAAC;AACrE,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,CACL,IAAA,iBAAQ,EAAC,KAAK,CAAC;QACf,MAAM,IAAI,KAAK;QACf,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;QACtD,IAAI,IAAI,KAAK;QACb,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE,CAAC,CACnB,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,CACL,IAAA,iBAAQ,EAAC,KAAK,CAAC;QACf,SAAS,IAAI,KAAK;QAClB,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;QAC3B,QAAQ,IAAI,KAAK;QACjB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;QAC3B,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAC/B,CAAC;AACJ,CAAC;AAOD,SAAgB,cAAc,CAAC,MAAmB;IAChD,IAAI,CAAC,MAAM,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;YAAE,OAAO,MAAM,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,iBAAO,CAAC,IAAI,CACV,iBAAiB,MAAM,CAAC,GAAG,gDAAgD,CAC5E,CAAC;IACF,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,YAAY,CAC1B,OAA+B;IAE/B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC"}
@@ -7,10 +7,14 @@ exports.cleanupAssetFiles = cleanupAssetFiles;
7
7
  exports.deleteMediaAsset = deleteMediaAsset;
8
8
  const interface_file_storage_1 = require("@antelopejs/interface-file-storage");
9
9
  const db_1 = require("./db");
10
+ const guards_1 = require("./guards");
10
11
  const storage_keys_1 = require("./routes/media/storage-keys");
11
12
  exports.TECHNICAL_MUTATION = { touchesAsset: false };
12
13
  function retiredFiles(asset) {
13
- return JSON.parse(asset.json_retiredFiles);
14
+ const parsed = JSON.parse(asset.json_retiredFiles);
15
+ if (Array.isArray(parsed) && parsed.every(guards_1.isString))
16
+ return parsed;
17
+ throw new Error(`Media asset '${asset._id}' has a file deletion queue that is not a list of storage keys`);
14
18
  }
15
19
  async function updateAssetMedia(model, asset, patch, options) {
16
20
  if (asset.isDeleting)
@@ -1 +1 @@
1
- {"version":3,"file":"asset-lifecycle.js","sourceRoot":"","sources":["../src/asset-lifecycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"asset-lifecycle.js","sourceRoot":"","sources":["../src/asset-lifecycle.ts"],"names":[],"mappings":"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"}
@@ -9,4 +9,5 @@ export declare function bindingHoldsSubfolders(bindingId: string): boolean;
9
9
  export declare function holdsSubfolders(folder: MediaFolder): boolean;
10
10
  export declare function feedingBinding(folder: MediaFolder | undefined, foldersById: ReadonlyMap<string, MediaFolder>): string | undefined;
11
11
  export declare function buildBindingAcl(config: AssetBindingConfig): AclEntry[];
12
+ export declare function bindingFolderId(tenantId: string, binding: string): string;
12
13
  export declare function ensureTenantBindings(tenantId: string, folderModel: MediaFolderModel): Promise<void>;
package/dist/bindings.js CHANGED
@@ -8,10 +8,13 @@ exports.bindingHoldsSubfolders = bindingHoldsSubfolders;
8
8
  exports.holdsSubfolders = holdsSubfolders;
9
9
  exports.feedingBinding = feedingBinding;
10
10
  exports.buildBindingAcl = buildBindingAcl;
11
+ exports.bindingFolderId = bindingFolderId;
11
12
  exports.ensureTenantBindings = ensureTenantBindings;
12
13
  const node_crypto_1 = require("node:crypto");
14
+ const interface_database_1 = require("@antelopejs/interface-database");
13
15
  const page_1 = require("@antelopejs/interface-dms/page");
14
16
  const acl_1 = require("./acl");
17
+ const fixed_id_1 = require("./fixed-id");
15
18
  exports.CONTENT_ROOT_BINDING = "dms-media.content-root";
16
19
  const CONTENT_ROOT_NAME = "Content";
17
20
  const EMPTY_ACL = "[]";
@@ -82,29 +85,25 @@ function buildBindingAcl(config) {
82
85
  ]),
83
86
  ];
84
87
  }
85
- async function ensureContentRoot(folderModel, foldersByBinding) {
86
- const existing = foldersByBinding.get(exports.CONTENT_ROOT_BINDING);
87
- if (existing)
88
- return existing._id;
89
- const [id] = await folderModel.insert({
90
- name: CONTENT_ROOT_NAME,
91
- path: [],
92
- binding: exports.CONTENT_ROOT_BINDING,
93
- json_acl: EMPTY_ACL,
94
- visibility: "private",
95
- });
96
- return id;
88
+ function bindingFolderId(tenantId, binding) {
89
+ return (0, fixed_id_1.fixedId)("dms-media:binding-folder", tenantId, binding);
97
90
  }
98
- async function ensureBindingFolder(folderModel, foldersByBinding, contentRootId, config) {
99
- const acl = (0, acl_1.serializeAcl)(buildBindingAcl(config)) ?? EMPTY_ACL;
100
- const existing = foldersByBinding.get(config.id);
101
- if (existing) {
102
- if (existing.json_acl !== acl) {
103
- await folderModel.update(existing._id, { json_acl: acl });
104
- }
105
- return;
91
+ async function insertOnce(folderModel, folder) {
92
+ try {
93
+ await folderModel.insert(folder);
94
+ return true;
106
95
  }
107
- await folderModel.insert({
96
+ catch (error) {
97
+ if (!(0, interface_database_1.IsDuplicateKeyError)(error))
98
+ throw error;
99
+ return false;
100
+ }
101
+ }
102
+ async function ensureBindingFolder(tenantId, folderModel, contentRootId, config) {
103
+ const id = bindingFolderId(tenantId, config.id);
104
+ const acl = (0, acl_1.serializeAcl)(buildBindingAcl(config)) ?? EMPTY_ACL;
105
+ const inserted = await insertOnce(folderModel, {
106
+ _id: id,
108
107
  name: config.folderName ?? config.id,
109
108
  parentId: contentRootId,
110
109
  path: [contentRootId],
@@ -112,14 +111,26 @@ async function ensureBindingFolder(folderModel, foldersByBinding, contentRootId,
112
111
  json_acl: acl,
113
112
  visibility: "private",
114
113
  });
114
+ if (inserted)
115
+ return;
116
+ const existing = await folderModel.get(id);
117
+ if (existing && existing.json_acl !== acl) {
118
+ await folderModel.update(id, { json_acl: acl });
119
+ }
115
120
  }
116
121
  async function provisionTenant(tenantId, folderModel, fingerprint) {
117
122
  if (registeredBindings.size > 0) {
118
- const folders = await folderModel.getAll();
119
- const foldersByBinding = new Map(folders.flatMap((folder) => folder.binding ? [[folder.binding, folder]] : []));
120
- const contentRootId = await ensureContentRoot(folderModel, foldersByBinding);
123
+ const contentRootId = bindingFolderId(tenantId, exports.CONTENT_ROOT_BINDING);
124
+ await insertOnce(folderModel, {
125
+ _id: contentRootId,
126
+ name: CONTENT_ROOT_NAME,
127
+ path: [],
128
+ binding: exports.CONTENT_ROOT_BINDING,
129
+ json_acl: EMPTY_ACL,
130
+ visibility: "private",
131
+ });
121
132
  for (const config of registeredBindings.values()) {
122
- await ensureBindingFolder(folderModel, foldersByBinding, contentRootId, config);
133
+ await ensureBindingFolder(tenantId, folderModel, contentRootId, config);
123
134
  }
124
135
  }
125
136
  provisionedTenants.set(tenantId, fingerprint);
@@ -1 +1 @@
1
- {"version":3,"file":"bindings.js","sourceRoot":"","sources":["../src/bindings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bindings.js","sourceRoot":"","sources":["../src/bindings.ts"],"names":[],"mappings":"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"}
@@ -7,9 +7,9 @@ declare const MediaAssetModel_base: {
7
7
  new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
8
8
  readonly table: import("@antelopejs/interface-database").Table<MediaAsset>;
9
9
  readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
10
- get(id: string): PromiseLike<MediaAsset | undefined>;
11
- getBy(index: keyof MediaAsset, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): PromiseLike<MediaAsset[]>;
12
- getAll(): PromiseLike<MediaAsset[]>;
10
+ get(id: string): Promise<MediaAsset | undefined>;
11
+ getBy(index: keyof MediaAsset, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): Promise<MediaAsset[]>;
12
+ getAll(): Promise<MediaAsset[]>;
13
13
  insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaAsset> | import("@antelopejs/interface-database-decorators").DeepPartial<MediaAsset>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
14
14
  update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaAsset>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
15
15
  update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaAsset> & {
@@ -3,9 +3,9 @@ declare const MediaDeclarationModel_base: {
3
3
  new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
4
4
  readonly table: import("@antelopejs/interface-database").Table<MediaDeclaration>;
5
5
  readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
6
- get(id: string): PromiseLike<MediaDeclaration | undefined>;
7
- getBy(index: keyof MediaDeclaration, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): PromiseLike<MediaDeclaration[]>;
8
- getAll(): PromiseLike<MediaDeclaration[]>;
6
+ get(id: string): Promise<MediaDeclaration | undefined>;
7
+ getBy(index: keyof MediaDeclaration, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): Promise<MediaDeclaration[]>;
8
+ getAll(): Promise<MediaDeclaration[]>;
9
9
  insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaDeclaration> | import("@antelopejs/interface-database-decorators").DeepPartial<MediaDeclaration>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
10
10
  update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaDeclaration>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
11
11
  update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaDeclaration> & {
@@ -3,9 +3,9 @@ declare const MediaEventModel_base: {
3
3
  new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
4
4
  readonly table: import("@antelopejs/interface-database").Table<MediaEvent>;
5
5
  readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
6
- get(id: string): PromiseLike<MediaEvent | undefined>;
7
- getBy(index: keyof MediaEvent, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): PromiseLike<MediaEvent[]>;
8
- getAll(): PromiseLike<MediaEvent[]>;
6
+ get(id: string): Promise<MediaEvent | undefined>;
7
+ getBy(index: keyof MediaEvent, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): Promise<MediaEvent[]>;
8
+ getAll(): Promise<MediaEvent[]>;
9
9
  insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaEvent> | import("@antelopejs/interface-database-decorators").DeepPartial<MediaEvent>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
10
10
  update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaEvent>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
11
11
  update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaEvent> & {
@@ -3,9 +3,9 @@ declare const MediaFavoriteModel_base: {
3
3
  new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
4
4
  readonly table: import("@antelopejs/interface-database").Table<MediaFavorite>;
5
5
  readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
6
- get(id: string): PromiseLike<MediaFavorite | undefined>;
7
- getBy(index: keyof MediaFavorite, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): PromiseLike<MediaFavorite[]>;
8
- getAll(): PromiseLike<MediaFavorite[]>;
6
+ get(id: string): Promise<MediaFavorite | undefined>;
7
+ getBy(index: keyof MediaFavorite, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): Promise<MediaFavorite[]>;
8
+ getAll(): Promise<MediaFavorite[]>;
9
9
  insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaFavorite> | import("@antelopejs/interface-database-decorators").DeepPartial<MediaFavorite>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
10
10
  update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaFavorite>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
11
11
  update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaFavorite> & {
@@ -3,9 +3,9 @@ declare const MediaFolderModel_base: {
3
3
  new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
4
4
  readonly table: import("@antelopejs/interface-database").Table<MediaFolder>;
5
5
  readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
6
- get(id: string): PromiseLike<MediaFolder | undefined>;
7
- getBy(index: keyof MediaFolder, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): PromiseLike<MediaFolder[]>;
8
- getAll(): PromiseLike<MediaFolder[]>;
6
+ get(id: string): Promise<MediaFolder | undefined>;
7
+ getBy(index: keyof MediaFolder, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): Promise<MediaFolder[]>;
8
+ getAll(): Promise<MediaFolder[]>;
9
9
  insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaFolder> | import("@antelopejs/interface-database-decorators").DeepPartial<MediaFolder>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
10
10
  update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaFolder>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
11
11
  update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaFolder> & {
@@ -3,9 +3,9 @@ declare const MediaUploadModel_base: {
3
3
  new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
4
4
  readonly table: import("@antelopejs/interface-database").Table<MediaUpload>;
5
5
  readonly database: import("@antelopejs/interface-database").SchemaInstance<any>;
6
- get(id: string): PromiseLike<MediaUpload | undefined>;
7
- getBy(index: keyof MediaUpload, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): PromiseLike<MediaUpload[]>;
8
- getAll(): PromiseLike<MediaUpload[]>;
6
+ get(id: string): Promise<MediaUpload | undefined>;
7
+ getBy(index: keyof MediaUpload, ...keys: import("@antelopejs/interface-database-decorators").IndexKey[]): Promise<MediaUpload[]>;
8
+ getAll(): Promise<MediaUpload[]>;
9
9
  insert(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaUpload> | import("@antelopejs/interface-database-decorators").DeepPartial<MediaUpload>[], options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<string[]>;
10
10
  update(id: string, obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaUpload>, options?: import("@antelopejs/interface-database-decorators").ValidateOptions): Promise<number>;
11
11
  update(obj: import("@antelopejs/interface-database-decorators").DeepPartial<MediaUpload> & {
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.importDeclaredAsset = importDeclaredAsset;
4
4
  const node_crypto_1 = require("node:crypto");
5
5
  const promises_1 = require("node:fs/promises");
6
+ const interface_database_1 = require("@antelopejs/interface-database");
6
7
  const interface_file_storage_1 = require("@antelopejs/interface-file-storage");
7
8
  const bindings_1 = require("../bindings");
8
9
  const config_1 = require("../config");
@@ -63,35 +64,48 @@ async function prepareFile({ models, declaration, fieldBinding }, bytes) {
63
64
  function writeFile({ models, declaration, folder }, file) {
64
65
  return (0, derivatives_1.uploadStorageBytes)(file.bytes, declaration.name, file.mimetype, `media/${models.tenantId}/${folder._id}`, (0, config_1.getMediaConfig)().storage);
65
66
  }
66
- async function insertAsset({ models, declaration, folder }, file, storageKey) {
67
- const [assetId] = await models.assetModel.insert({
68
- folderId: folder._id,
69
- mediaRevision: (0, node_crypto_1.randomUUID)(),
70
- json_retiredFiles: "[]",
71
- name: declaration.name,
72
- mimetype: file.mimetype,
73
- size: file.bytes.byteLength,
74
- storageKey,
75
- storage: (0, config_1.getMediaConfig)().storage,
76
- width: file.image.width,
77
- height: file.image.height,
78
- alt: declaration.alt,
79
- visibility: "inherit",
80
- createdBy: records_1.DECLARED_CONTENT_AUTHOR._id,
81
- });
82
- return models.assetModel.get(assetId);
67
+ async function insertAsset({ models, declaration, folder }, id, file, storageKey) {
68
+ try {
69
+ await models.assetModel.insert({
70
+ _id: id,
71
+ folderId: folder._id,
72
+ mediaRevision: (0, node_crypto_1.randomUUID)(),
73
+ json_retiredFiles: "[]",
74
+ name: declaration.name,
75
+ mimetype: file.mimetype,
76
+ size: file.bytes.byteLength,
77
+ storageKey,
78
+ storage: (0, config_1.getMediaConfig)().storage,
79
+ width: file.image.width,
80
+ height: file.image.height,
81
+ alt: declaration.alt,
82
+ visibility: "inherit",
83
+ createdBy: records_1.DECLARED_CONTENT_AUTHOR._id,
84
+ });
85
+ return true;
86
+ }
87
+ catch (error) {
88
+ if (!(0, interface_database_1.IsDuplicateKeyError)(error))
89
+ throw error;
90
+ return false;
91
+ }
83
92
  }
84
93
  async function createAsset(target, file) {
94
+ const { models, declaration } = target;
95
+ const id = (0, records_1.declaredId)(models.tenantId, "asset", declaration.key);
85
96
  const storageKey = await writeFile(target, file);
86
97
  const discardFile = () => (0, interface_file_storage_1.DeleteFile)(storageKey, (0, config_1.getMediaConfig)().storage).catch(() => undefined);
87
- const asset = await insertAsset(target, file, storageKey).catch(async (error) => {
98
+ const inserted = await insertAsset(target, id, file, storageKey).catch(async (error) => {
88
99
  await discardFile();
89
100
  throw error;
90
101
  });
91
- if (!asset) {
102
+ const asset = await models.assetModel.get(id);
103
+ if (!inserted || !asset)
92
104
  await discardFile();
93
- throw new records_1.MediaDeclarationError("asset", target.declaration.key, "the file could not be created");
94
- }
105
+ if (!asset)
106
+ throw new records_1.MediaDeclarationError("asset", declaration.key, "the file could not be created");
107
+ if (!inserted)
108
+ return { status: "kept", id };
95
109
  await (0, events_1.recordMediaEvent)({ tenantId: target.models.tenantId, user: records_1.DECLARED_CONTENT_AUTHOR }, {
96
110
  kind: "asset.upload",
97
111
  targetName: asset.name,
@@ -99,7 +113,7 @@ async function createAsset(target, file) {
99
113
  assetId: asset._id,
100
114
  size: asset.size,
101
115
  });
102
- return asset;
116
+ return { status: "created", id };
103
117
  }
104
118
  async function applyAssetDeclaration(declaration) {
105
119
  const models = (0, records_1.declaredModels)(declaration.tenantId);
@@ -117,9 +131,9 @@ async function applyAssetDeclaration(declaration) {
117
131
  fieldBinding: await fieldBindingOf(models, folder),
118
132
  };
119
133
  const file = await prepareFile(target, await readSource(declaration, fail));
120
- const asset = await createAsset(target, file);
121
- await (0, records_1.rememberDeclaration)(models, "asset", declaration.key, asset._id);
122
- return { status: "created", id: asset._id };
134
+ const result = await createAsset(target, file);
135
+ await (0, records_1.rememberDeclaration)(models, "asset", declaration.key, result.id);
136
+ return result;
123
137
  }
124
138
  async function importDeclaredAsset(input) {
125
139
  const declaration = (0, records_1.parseDeclaration)("asset", input, declared_schema_1.declaredAssetSchema);
@@ -1 +1 @@
1
- {"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/declared/assets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/declared/assets.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ const bindings_1 = require("../bindings");
8
8
  const events_1 = require("../library/events");
9
9
  const folders_1 = require("../routes/media/folders");
10
10
  const declared_schema_1 = require("../validation/declared.schema");
11
+ const interface_database_1 = require("@antelopejs/interface-database");
11
12
  const records_1 = require("./records");
12
13
  const guards_1 = require("../guards");
13
14
  function parentKeyOf(parent) {
@@ -44,26 +45,38 @@ async function findParentFolder(models, parent, fail) {
44
45
  return folder;
45
46
  }
46
47
  async function createFolder(models, declaration, parent) {
48
+ const id = (0, records_1.declaredId)(models.tenantId, "folder", declaration.key);
49
+ const missing = new records_1.MediaDeclarationError("folder", declaration.key, "the folder could not be created");
47
50
  const folders = await models.folderModel.getAll();
48
- if ((0, folders_1.hasSiblingNamed)(folders, declaration.name, parent?._id))
51
+ if ((0, folders_1.hasSiblingNamed)(folders, declaration.name, parent?._id, id))
49
52
  throw new records_1.MediaDeclarationError("folder", declaration.key, `a folder named '${declaration.name}' already exists there`);
50
- const [folderId] = await models.folderModel.insert({
51
- name: declaration.name,
52
- parentId: parent?._id,
53
- path: (0, folders_1.buildChildPath)(parent),
54
- visibility: declaration.visibility,
55
- json_acl: (0, acl_1.serializeAcl)(declaration.acl),
56
- });
57
- const folder = await models.folderModel.get(folderId);
53
+ try {
54
+ await models.folderModel.insert({
55
+ _id: id,
56
+ name: declaration.name,
57
+ parentId: parent?._id,
58
+ path: (0, folders_1.buildChildPath)(parent),
59
+ visibility: declaration.visibility,
60
+ json_acl: (0, acl_1.serializeAcl)(declaration.acl),
61
+ });
62
+ }
63
+ catch (error) {
64
+ if (!(0, interface_database_1.IsDuplicateKeyError)(error))
65
+ throw error;
66
+ if (!(await models.folderModel.get(id)))
67
+ throw missing;
68
+ return { status: "kept", id };
69
+ }
70
+ const folder = await models.folderModel.get(id);
58
71
  if (!folder)
59
- throw new records_1.MediaDeclarationError("folder", declaration.key, "the folder could not be created");
72
+ throw missing;
60
73
  await (0, events_1.recordMediaEvent)({ tenantId: models.tenantId, user: records_1.DECLARED_CONTENT_AUTHOR }, {
61
74
  kind: "folder.create",
62
75
  targetName: folder.name,
63
76
  folderId: parent?._id,
64
77
  details: { targetId: folder._id },
65
78
  });
66
- return folder;
79
+ return { status: "created", id };
67
80
  }
68
81
  async function applyFolderDeclaration(declaration) {
69
82
  const models = (0, records_1.declaredModels)(declaration.tenantId);
@@ -76,9 +89,9 @@ async function applyFolderDeclaration(declaration) {
76
89
  const parent = declaration.parent
77
90
  ? await findParentFolder(models, declaration.parent, fail)
78
91
  : undefined;
79
- const folder = await createFolder(models, declaration, parent);
80
- await (0, records_1.rememberDeclaration)(models, "folder", declaration.key, folder._id);
81
- return { status: "created", id: folder._id };
92
+ const result = await createFolder(models, declaration, parent);
93
+ await (0, records_1.rememberDeclaration)(models, "folder", declaration.key, result.id);
94
+ return result;
82
95
  }
83
96
  async function ensureDeclaredFolder(input) {
84
97
  const declaration = (0, records_1.parseDeclaration)("folder", input, declared_schema_1.declaredFolderSchema);
@@ -1 +1 @@
1
- {"version":3,"file":"folders.js","sourceRoot":"","sources":["../../src/declared/folders.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"folders.js","sourceRoot":"","sources":["../../src/declared/folders.ts"],"names":[],"mappings":"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"}
@@ -16,4 +16,5 @@ export declare function declaredModels(tenantId: string): DeclaredModels;
16
16
  export declare function parseDeclaration<Output>(kind: MediaDeclarationKind, input: MediaFolderDeclaration | MediaAssetDeclaration, schema: ZodType<Output, ZodTypeDef, unknown>): Output;
17
17
  export declare function withDeclarationLock<T>(tenantId: string, kind: MediaDeclarationKind, key: string, work: () => Promise<T>): Promise<T>;
18
18
  export declare function settlePendingDeclaration(tenantId: string, kind: MediaDeclarationKind, key: string): Promise<void>;
19
+ export declare function declaredId(tenantId: string, kind: MediaDeclarationKind, key: string): string;
19
20
  export declare function rememberDeclaration(models: DeclaredModels, kind: MediaDeclarationKind, key: string, targetId: string): Promise<void>;
@@ -5,8 +5,11 @@ exports.declaredModels = declaredModels;
5
5
  exports.parseDeclaration = parseDeclaration;
6
6
  exports.withDeclarationLock = withDeclarationLock;
7
7
  exports.settlePendingDeclaration = settlePendingDeclaration;
8
+ exports.declaredId = declaredId;
8
9
  exports.rememberDeclaration = rememberDeclaration;
10
+ const interface_database_1 = require("@antelopejs/interface-database");
9
11
  const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
12
+ const fixed_id_1 = require("../fixed-id");
10
13
  const guards_1 = require("../guards");
11
14
  const db_1 = require("../db");
12
15
  const declared_schema_1 = require("../validation/declared.schema");
@@ -59,7 +62,21 @@ function withDeclarationLock(tenantId, kind, key, work) {
59
62
  async function settlePendingDeclaration(tenantId, kind, key) {
60
63
  await pendingDeclarations.get(lockKey(tenantId, kind, key));
61
64
  }
65
+ function declaredId(tenantId, kind, key) {
66
+ return (0, fixed_id_1.fixedId)(`dms-media:declared-${kind}`, tenantId, key);
67
+ }
62
68
  async function rememberDeclaration(models, kind, key, targetId) {
63
- await models.declarationModel.insert({ kind, key, targetId });
69
+ try {
70
+ await models.declarationModel.insert({
71
+ _id: targetId,
72
+ kind,
73
+ key,
74
+ targetId,
75
+ });
76
+ }
77
+ catch (error) {
78
+ if (!(0, interface_database_1.IsDuplicateKeyError)(error))
79
+ throw error;
80
+ }
64
81
  }
65
82
  //# sourceMappingURL=records.js.map