@strapi/core 0.0.0-next.c3eb27c3a05a30387b6b44e15d3661201d54787d → 0.0.0-next.c72b48da735f44a3ccafb7a6dc9ba5213f3844db

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 (706) hide show
  1. package/dist/Strapi.d.ts.map +1 -1
  2. package/dist/Strapi.js +427 -403
  3. package/dist/Strapi.js.map +1 -1
  4. package/dist/Strapi.mjs +426 -402
  5. package/dist/Strapi.mjs.map +1 -1
  6. package/dist/compile.js +23 -14
  7. package/dist/compile.js.map +1 -1
  8. package/dist/compile.mjs +22 -14
  9. package/dist/compile.mjs.map +1 -1
  10. package/dist/configuration/config-loader.js +110 -97
  11. package/dist/configuration/config-loader.js.map +1 -1
  12. package/dist/configuration/config-loader.mjs +109 -96
  13. package/dist/configuration/config-loader.mjs.map +1 -1
  14. package/dist/configuration/get-dirs.js +31 -29
  15. package/dist/configuration/get-dirs.js.map +1 -1
  16. package/dist/configuration/get-dirs.mjs +30 -30
  17. package/dist/configuration/get-dirs.mjs.map +1 -1
  18. package/dist/configuration/index.d.ts +1 -0
  19. package/dist/configuration/index.d.ts.map +1 -1
  20. package/dist/configuration/index.js +85 -73
  21. package/dist/configuration/index.js.map +1 -1
  22. package/dist/configuration/index.mjs +84 -69
  23. package/dist/configuration/index.mjs.map +1 -1
  24. package/dist/configuration/urls.d.ts.map +1 -1
  25. package/dist/configuration/urls.js +74 -61
  26. package/dist/configuration/urls.js.map +1 -1
  27. package/dist/configuration/urls.mjs +73 -62
  28. package/dist/configuration/urls.mjs.map +1 -1
  29. package/dist/container.js +27 -23
  30. package/dist/container.js.map +1 -1
  31. package/dist/container.mjs +26 -24
  32. package/dist/container.mjs.map +1 -1
  33. package/dist/core-api/controller/collection-type.js +77 -76
  34. package/dist/core-api/controller/collection-type.js.map +1 -1
  35. package/dist/core-api/controller/collection-type.mjs +76 -77
  36. package/dist/core-api/controller/collection-type.mjs.map +1 -1
  37. package/dist/core-api/controller/index.js +63 -48
  38. package/dist/core-api/controller/index.js.map +1 -1
  39. package/dist/core-api/controller/index.mjs +62 -49
  40. package/dist/core-api/controller/index.mjs.map +1 -1
  41. package/dist/core-api/controller/single-type.js +41 -40
  42. package/dist/core-api/controller/single-type.js.map +1 -1
  43. package/dist/core-api/controller/single-type.mjs +40 -41
  44. package/dist/core-api/controller/single-type.mjs.map +1 -1
  45. package/dist/core-api/controller/transform.js +72 -63
  46. package/dist/core-api/controller/transform.js.map +1 -1
  47. package/dist/core-api/controller/transform.mjs +71 -64
  48. package/dist/core-api/controller/transform.mjs.map +1 -1
  49. package/dist/core-api/routes/index.js +64 -62
  50. package/dist/core-api/routes/index.js.map +1 -1
  51. package/dist/core-api/routes/index.mjs +62 -62
  52. package/dist/core-api/routes/index.mjs.map +1 -1
  53. package/dist/core-api/service/collection-type.js +73 -60
  54. package/dist/core-api/service/collection-type.js.map +1 -1
  55. package/dist/core-api/service/collection-type.mjs +72 -62
  56. package/dist/core-api/service/collection-type.mjs.map +1 -1
  57. package/dist/core-api/service/core-service.js +9 -8
  58. package/dist/core-api/service/core-service.js.map +1 -1
  59. package/dist/core-api/service/core-service.mjs +8 -9
  60. package/dist/core-api/service/core-service.mjs.map +1 -1
  61. package/dist/core-api/service/index.js +13 -13
  62. package/dist/core-api/service/index.js.map +1 -1
  63. package/dist/core-api/service/index.mjs +12 -14
  64. package/dist/core-api/service/index.mjs.map +1 -1
  65. package/dist/core-api/service/pagination.js +69 -43
  66. package/dist/core-api/service/pagination.js.map +1 -1
  67. package/dist/core-api/service/pagination.mjs +68 -47
  68. package/dist/core-api/service/pagination.mjs.map +1 -1
  69. package/dist/core-api/service/single-type.js +43 -39
  70. package/dist/core-api/service/single-type.js.map +1 -1
  71. package/dist/core-api/service/single-type.mjs +42 -41
  72. package/dist/core-api/service/single-type.mjs.map +1 -1
  73. package/dist/domain/content-type/index.js +95 -100
  74. package/dist/domain/content-type/index.js.map +1 -1
  75. package/dist/domain/content-type/index.mjs +94 -100
  76. package/dist/domain/content-type/index.mjs.map +1 -1
  77. package/dist/domain/content-type/validator.js +84 -69
  78. package/dist/domain/content-type/validator.js.map +1 -1
  79. package/dist/domain/content-type/validator.mjs +83 -68
  80. package/dist/domain/content-type/validator.mjs.map +1 -1
  81. package/dist/domain/module/index.js +109 -100
  82. package/dist/domain/module/index.js.map +1 -1
  83. package/dist/domain/module/index.mjs +108 -99
  84. package/dist/domain/module/index.mjs.map +1 -1
  85. package/dist/domain/module/validation.js +25 -20
  86. package/dist/domain/module/validation.js.map +1 -1
  87. package/dist/domain/module/validation.mjs +24 -21
  88. package/dist/domain/module/validation.mjs.map +1 -1
  89. package/dist/ee/index.d.ts +1 -0
  90. package/dist/ee/index.d.ts.map +1 -1
  91. package/dist/ee/index.js +171 -137
  92. package/dist/ee/index.js.map +1 -1
  93. package/dist/ee/index.mjs +170 -139
  94. package/dist/ee/index.mjs.map +1 -1
  95. package/dist/ee/license.d.ts.map +1 -1
  96. package/dist/ee/license.js +100 -75
  97. package/dist/ee/license.js.map +1 -1
  98. package/dist/ee/license.mjs +99 -76
  99. package/dist/ee/license.mjs.map +1 -1
  100. package/dist/factories.js +72 -67
  101. package/dist/factories.js.map +1 -1
  102. package/dist/factories.mjs +71 -71
  103. package/dist/factories.mjs.map +1 -1
  104. package/dist/index.js +29 -26
  105. package/dist/index.js.map +1 -1
  106. package/dist/index.mjs +29 -29
  107. package/dist/index.mjs.map +1 -1
  108. package/dist/loaders/admin.d.ts.map +1 -1
  109. package/dist/loaders/admin.js +21 -20
  110. package/dist/loaders/admin.js.map +1 -1
  111. package/dist/loaders/admin.mjs +20 -20
  112. package/dist/loaders/admin.mjs.map +1 -1
  113. package/dist/loaders/apis.js +143 -120
  114. package/dist/loaders/apis.js.map +1 -1
  115. package/dist/loaders/apis.mjs +142 -119
  116. package/dist/loaders/apis.mjs.map +1 -1
  117. package/dist/loaders/components.js +33 -34
  118. package/dist/loaders/components.js.map +1 -1
  119. package/dist/loaders/components.mjs +32 -34
  120. package/dist/loaders/components.mjs.map +1 -1
  121. package/dist/loaders/index.js +22 -20
  122. package/dist/loaders/index.js.map +1 -1
  123. package/dist/loaders/index.mjs +21 -21
  124. package/dist/loaders/index.mjs.map +1 -1
  125. package/dist/loaders/middlewares.js +29 -25
  126. package/dist/loaders/middlewares.js.map +1 -1
  127. package/dist/loaders/middlewares.mjs +28 -25
  128. package/dist/loaders/middlewares.mjs.map +1 -1
  129. package/dist/loaders/plugins/get-enabled-plugins.js +126 -131
  130. package/dist/loaders/plugins/get-enabled-plugins.js.map +1 -1
  131. package/dist/loaders/plugins/get-enabled-plugins.mjs +125 -108
  132. package/dist/loaders/plugins/get-enabled-plugins.mjs.map +1 -1
  133. package/dist/loaders/plugins/get-user-plugins-config.js +25 -24
  134. package/dist/loaders/plugins/get-user-plugins-config.js.map +1 -1
  135. package/dist/loaders/plugins/get-user-plugins-config.mjs +24 -23
  136. package/dist/loaders/plugins/get-user-plugins-config.mjs.map +1 -1
  137. package/dist/loaders/plugins/index.js +132 -122
  138. package/dist/loaders/plugins/index.js.map +1 -1
  139. package/dist/loaders/plugins/index.mjs +121 -112
  140. package/dist/loaders/plugins/index.mjs.map +1 -1
  141. package/dist/loaders/policies.js +24 -20
  142. package/dist/loaders/policies.js.map +1 -1
  143. package/dist/loaders/policies.mjs +23 -20
  144. package/dist/loaders/policies.mjs.map +1 -1
  145. package/dist/loaders/sanitizers.js +10 -4
  146. package/dist/loaders/sanitizers.js.map +1 -1
  147. package/dist/loaders/sanitizers.mjs +9 -6
  148. package/dist/loaders/sanitizers.mjs.map +1 -1
  149. package/dist/loaders/src-index.js +35 -27
  150. package/dist/loaders/src-index.js.map +1 -1
  151. package/dist/loaders/src-index.mjs +34 -29
  152. package/dist/loaders/src-index.mjs.map +1 -1
  153. package/dist/loaders/validators.js +9 -4
  154. package/dist/loaders/validators.js.map +1 -1
  155. package/dist/loaders/validators.mjs +8 -6
  156. package/dist/loaders/validators.mjs.map +1 -1
  157. package/dist/middlewares/body.d.ts.map +1 -1
  158. package/dist/middlewares/body.js +58 -54
  159. package/dist/middlewares/body.js.map +1 -1
  160. package/dist/middlewares/body.mjs +57 -51
  161. package/dist/middlewares/body.mjs.map +1 -1
  162. package/dist/middlewares/compression.js +6 -6
  163. package/dist/middlewares/compression.js.map +1 -1
  164. package/dist/middlewares/compression.mjs +5 -5
  165. package/dist/middlewares/compression.mjs.map +1 -1
  166. package/dist/middlewares/cors.js +59 -48
  167. package/dist/middlewares/cors.js.map +1 -1
  168. package/dist/middlewares/cors.mjs +58 -47
  169. package/dist/middlewares/cors.mjs.map +1 -1
  170. package/dist/middlewares/errors.js +32 -30
  171. package/dist/middlewares/errors.js.map +1 -1
  172. package/dist/middlewares/errors.mjs +31 -31
  173. package/dist/middlewares/errors.mjs.map +1 -1
  174. package/dist/middlewares/favicon.js +27 -17
  175. package/dist/middlewares/favicon.js.map +1 -1
  176. package/dist/middlewares/favicon.mjs +26 -16
  177. package/dist/middlewares/favicon.mjs.map +1 -1
  178. package/dist/middlewares/index.js +32 -30
  179. package/dist/middlewares/index.js.map +1 -1
  180. package/dist/middlewares/index.mjs +31 -31
  181. package/dist/middlewares/index.mjs.map +1 -1
  182. package/dist/middlewares/ip.js +6 -6
  183. package/dist/middlewares/ip.js.map +1 -1
  184. package/dist/middlewares/ip.mjs +5 -5
  185. package/dist/middlewares/ip.mjs.map +1 -1
  186. package/dist/middlewares/logger.js +10 -9
  187. package/dist/middlewares/logger.js.map +1 -1
  188. package/dist/middlewares/logger.mjs +9 -10
  189. package/dist/middlewares/logger.mjs.map +1 -1
  190. package/dist/middlewares/powered-by.js +13 -9
  191. package/dist/middlewares/powered-by.js.map +1 -1
  192. package/dist/middlewares/powered-by.mjs +12 -10
  193. package/dist/middlewares/powered-by.mjs.map +1 -1
  194. package/dist/middlewares/public.js +33 -29
  195. package/dist/middlewares/public.js.map +1 -1
  196. package/dist/middlewares/public.mjs +32 -28
  197. package/dist/middlewares/public.mjs.map +1 -1
  198. package/dist/middlewares/query.js +35 -32
  199. package/dist/middlewares/query.js.map +1 -1
  200. package/dist/middlewares/query.mjs +34 -31
  201. package/dist/middlewares/query.mjs.map +1 -1
  202. package/dist/middlewares/response-time.js +10 -9
  203. package/dist/middlewares/response-time.js.map +1 -1
  204. package/dist/middlewares/response-time.mjs +9 -10
  205. package/dist/middlewares/response-time.mjs.map +1 -1
  206. package/dist/middlewares/responses.js +14 -12
  207. package/dist/middlewares/responses.js.map +1 -1
  208. package/dist/middlewares/responses.mjs +13 -13
  209. package/dist/middlewares/responses.mjs.map +1 -1
  210. package/dist/middlewares/security.js +109 -71
  211. package/dist/middlewares/security.js.map +1 -1
  212. package/dist/middlewares/security.mjs +108 -70
  213. package/dist/middlewares/security.mjs.map +1 -1
  214. package/dist/middlewares/session.js +26 -25
  215. package/dist/middlewares/session.js.map +1 -1
  216. package/dist/middlewares/session.mjs +25 -24
  217. package/dist/middlewares/session.mjs.map +1 -1
  218. package/dist/migrations/database/5.0.0-discard-drafts.d.ts +2 -2
  219. package/dist/migrations/database/5.0.0-discard-drafts.d.ts.map +1 -1
  220. package/dist/migrations/database/5.0.0-discard-drafts.js +152 -90
  221. package/dist/migrations/database/5.0.0-discard-drafts.js.map +1 -1
  222. package/dist/migrations/database/5.0.0-discard-drafts.mjs +151 -92
  223. package/dist/migrations/database/5.0.0-discard-drafts.mjs.map +1 -1
  224. package/dist/migrations/draft-publish.d.ts +1 -1
  225. package/dist/migrations/draft-publish.d.ts.map +1 -1
  226. package/dist/migrations/draft-publish.js +61 -34
  227. package/dist/migrations/draft-publish.js.map +1 -1
  228. package/dist/migrations/draft-publish.mjs +60 -36
  229. package/dist/migrations/draft-publish.mjs.map +1 -1
  230. package/dist/migrations/i18n.js +62 -45
  231. package/dist/migrations/i18n.js.map +1 -1
  232. package/dist/migrations/i18n.mjs +61 -47
  233. package/dist/migrations/i18n.mjs.map +1 -1
  234. package/dist/migrations/index.js +24 -10
  235. package/dist/migrations/index.js.map +1 -1
  236. package/dist/migrations/index.mjs +23 -12
  237. package/dist/migrations/index.mjs.map +1 -1
  238. package/dist/package.json.js +182 -0
  239. package/dist/package.json.js.map +1 -0
  240. package/dist/package.json.mjs +159 -0
  241. package/dist/package.json.mjs.map +1 -0
  242. package/dist/providers/admin.js +27 -17
  243. package/dist/providers/admin.js.map +1 -1
  244. package/dist/providers/admin.mjs +26 -19
  245. package/dist/providers/admin.mjs.map +1 -1
  246. package/dist/providers/coreStore.js +13 -8
  247. package/dist/providers/coreStore.js.map +1 -1
  248. package/dist/providers/coreStore.mjs +12 -10
  249. package/dist/providers/coreStore.mjs.map +1 -1
  250. package/dist/providers/cron.js +19 -16
  251. package/dist/providers/cron.js.map +1 -1
  252. package/dist/providers/cron.mjs +18 -18
  253. package/dist/providers/cron.mjs.map +1 -1
  254. package/dist/providers/index.js +18 -9
  255. package/dist/providers/index.js.map +1 -1
  256. package/dist/providers/index.mjs +17 -10
  257. package/dist/providers/index.mjs.map +1 -1
  258. package/dist/providers/provider.js +4 -3
  259. package/dist/providers/provider.js.map +1 -1
  260. package/dist/providers/provider.mjs +3 -4
  261. package/dist/providers/provider.mjs.map +1 -1
  262. package/dist/providers/registries.js +37 -32
  263. package/dist/providers/registries.js.map +1 -1
  264. package/dist/providers/registries.mjs +36 -34
  265. package/dist/providers/registries.mjs.map +1 -1
  266. package/dist/providers/telemetry.js +19 -16
  267. package/dist/providers/telemetry.js.map +1 -1
  268. package/dist/providers/telemetry.mjs +18 -18
  269. package/dist/providers/telemetry.mjs.map +1 -1
  270. package/dist/providers/webhooks.js +28 -26
  271. package/dist/providers/webhooks.js.map +1 -1
  272. package/dist/providers/webhooks.mjs +27 -28
  273. package/dist/providers/webhooks.mjs.map +1 -1
  274. package/dist/registries/apis.js +23 -20
  275. package/dist/registries/apis.js.map +1 -1
  276. package/dist/registries/apis.mjs +22 -22
  277. package/dist/registries/apis.mjs.map +1 -1
  278. package/dist/registries/components.js +35 -37
  279. package/dist/registries/components.js.map +1 -1
  280. package/dist/registries/components.mjs +34 -39
  281. package/dist/registries/components.mjs.map +1 -1
  282. package/dist/registries/content-types.js +54 -59
  283. package/dist/registries/content-types.js.map +1 -1
  284. package/dist/registries/content-types.mjs +53 -61
  285. package/dist/registries/content-types.mjs.map +1 -1
  286. package/dist/registries/controllers.js +70 -71
  287. package/dist/registries/controllers.js.map +1 -1
  288. package/dist/registries/controllers.mjs +69 -73
  289. package/dist/registries/controllers.mjs.map +1 -1
  290. package/dist/registries/custom-fields.js +75 -65
  291. package/dist/registries/custom-fields.js.map +1 -1
  292. package/dist/registries/custom-fields.mjs +74 -67
  293. package/dist/registries/custom-fields.mjs.map +1 -1
  294. package/dist/registries/hooks.js +46 -49
  295. package/dist/registries/hooks.js.map +1 -1
  296. package/dist/registries/hooks.mjs +45 -51
  297. package/dist/registries/hooks.mjs.map +1 -1
  298. package/dist/registries/middlewares.js +49 -51
  299. package/dist/registries/middlewares.js.map +1 -1
  300. package/dist/registries/middlewares.mjs +48 -53
  301. package/dist/registries/middlewares.mjs.map +1 -1
  302. package/dist/registries/models.js +14 -13
  303. package/dist/registries/models.js.map +1 -1
  304. package/dist/registries/models.mjs +13 -14
  305. package/dist/registries/models.mjs.map +1 -1
  306. package/dist/registries/modules.js +39 -36
  307. package/dist/registries/modules.js.map +1 -1
  308. package/dist/registries/modules.mjs +38 -38
  309. package/dist/registries/modules.mjs.map +1 -1
  310. package/dist/registries/namespace.js +21 -20
  311. package/dist/registries/namespace.js.map +1 -1
  312. package/dist/registries/namespace.mjs +20 -23
  313. package/dist/registries/namespace.mjs.map +1 -1
  314. package/dist/registries/plugins.js +23 -20
  315. package/dist/registries/plugins.js.map +1 -1
  316. package/dist/registries/plugins.mjs +22 -22
  317. package/dist/registries/plugins.mjs.map +1 -1
  318. package/dist/registries/policies.js +103 -96
  319. package/dist/registries/policies.js.map +1 -1
  320. package/dist/registries/policies.mjs +102 -98
  321. package/dist/registries/policies.mjs.map +1 -1
  322. package/dist/registries/sanitizers.js +23 -22
  323. package/dist/registries/sanitizers.js.map +1 -1
  324. package/dist/registries/sanitizers.mjs +22 -22
  325. package/dist/registries/sanitizers.mjs.map +1 -1
  326. package/dist/registries/services.js +71 -71
  327. package/dist/registries/services.js.map +1 -1
  328. package/dist/registries/services.mjs +70 -73
  329. package/dist/registries/services.mjs.map +1 -1
  330. package/dist/registries/validators.js +23 -22
  331. package/dist/registries/validators.js.map +1 -1
  332. package/dist/registries/validators.mjs +22 -22
  333. package/dist/registries/validators.mjs.map +1 -1
  334. package/dist/services/auth/index.js +74 -74
  335. package/dist/services/auth/index.js.map +1 -1
  336. package/dist/services/auth/index.mjs +73 -74
  337. package/dist/services/auth/index.mjs.map +1 -1
  338. package/dist/services/config.js +47 -43
  339. package/dist/services/config.js.map +1 -1
  340. package/dist/services/config.mjs +46 -44
  341. package/dist/services/config.mjs.map +1 -1
  342. package/dist/services/content-api/index.js +80 -79
  343. package/dist/services/content-api/index.js.map +1 -1
  344. package/dist/services/content-api/index.mjs +79 -79
  345. package/dist/services/content-api/index.mjs.map +1 -1
  346. package/dist/services/content-api/permissions/engine.js +8 -5
  347. package/dist/services/content-api/permissions/engine.js.map +1 -1
  348. package/dist/services/content-api/permissions/engine.mjs +7 -5
  349. package/dist/services/content-api/permissions/engine.mjs.map +1 -1
  350. package/dist/services/content-api/permissions/index.js +101 -81
  351. package/dist/services/content-api/permissions/index.js.map +1 -1
  352. package/dist/services/content-api/permissions/index.mjs +100 -81
  353. package/dist/services/content-api/permissions/index.mjs.map +1 -1
  354. package/dist/services/content-api/permissions/providers/action.js +17 -14
  355. package/dist/services/content-api/permissions/providers/action.js.map +1 -1
  356. package/dist/services/content-api/permissions/providers/action.mjs +16 -16
  357. package/dist/services/content-api/permissions/providers/action.mjs.map +1 -1
  358. package/dist/services/content-api/permissions/providers/condition.js +17 -14
  359. package/dist/services/content-api/permissions/providers/condition.js.map +1 -1
  360. package/dist/services/content-api/permissions/providers/condition.mjs +16 -16
  361. package/dist/services/content-api/permissions/providers/condition.mjs.map +1 -1
  362. package/dist/services/core-store.js +115 -95
  363. package/dist/services/core-store.js.map +1 -1
  364. package/dist/services/core-store.mjs +114 -97
  365. package/dist/services/core-store.mjs.map +1 -1
  366. package/dist/services/cron.js +74 -65
  367. package/dist/services/cron.js.map +1 -1
  368. package/dist/services/cron.mjs +73 -67
  369. package/dist/services/cron.mjs.map +1 -1
  370. package/dist/services/custom-fields.js +9 -7
  371. package/dist/services/custom-fields.js.map +1 -1
  372. package/dist/services/custom-fields.mjs +8 -9
  373. package/dist/services/custom-fields.mjs.map +1 -1
  374. package/dist/services/document-service/attributes/index.js +23 -18
  375. package/dist/services/document-service/attributes/index.js.map +1 -1
  376. package/dist/services/document-service/attributes/index.mjs +22 -19
  377. package/dist/services/document-service/attributes/index.mjs.map +1 -1
  378. package/dist/services/document-service/attributes/transforms.js +16 -15
  379. package/dist/services/document-service/attributes/transforms.js.map +1 -1
  380. package/dist/services/document-service/attributes/transforms.mjs +15 -15
  381. package/dist/services/document-service/attributes/transforms.mjs.map +1 -1
  382. package/dist/services/document-service/common.js +5 -4
  383. package/dist/services/document-service/common.js.map +1 -1
  384. package/dist/services/document-service/common.mjs +4 -5
  385. package/dist/services/document-service/common.mjs.map +1 -1
  386. package/dist/services/document-service/components.d.ts.map +1 -1
  387. package/dist/services/document-service/components.js +255 -257
  388. package/dist/services/document-service/components.js.map +1 -1
  389. package/dist/services/document-service/components.mjs +254 -262
  390. package/dist/services/document-service/components.mjs.map +1 -1
  391. package/dist/services/document-service/draft-and-publish.d.ts +1 -1
  392. package/dist/services/document-service/draft-and-publish.d.ts.map +1 -1
  393. package/dist/services/document-service/draft-and-publish.js +88 -48
  394. package/dist/services/document-service/draft-and-publish.js.map +1 -1
  395. package/dist/services/document-service/draft-and-publish.mjs +87 -54
  396. package/dist/services/document-service/draft-and-publish.mjs.map +1 -1
  397. package/dist/services/document-service/entries.js +109 -91
  398. package/dist/services/document-service/entries.js.map +1 -1
  399. package/dist/services/document-service/entries.mjs +108 -92
  400. package/dist/services/document-service/entries.mjs.map +1 -1
  401. package/dist/services/document-service/events.d.ts +1 -1
  402. package/dist/services/document-service/events.d.ts.map +1 -1
  403. package/dist/services/document-service/events.js +52 -40
  404. package/dist/services/document-service/events.js.map +1 -1
  405. package/dist/services/document-service/events.mjs +51 -41
  406. package/dist/services/document-service/events.mjs.map +1 -1
  407. package/dist/services/document-service/index.js +53 -33
  408. package/dist/services/document-service/index.js.map +1 -1
  409. package/dist/services/document-service/index.mjs +52 -34
  410. package/dist/services/document-service/index.mjs.map +1 -1
  411. package/dist/services/document-service/internationalization.js +62 -46
  412. package/dist/services/document-service/internationalization.js.map +1 -1
  413. package/dist/services/document-service/internationalization.mjs +61 -50
  414. package/dist/services/document-service/internationalization.mjs.map +1 -1
  415. package/dist/services/document-service/middlewares/errors.js +23 -19
  416. package/dist/services/document-service/middlewares/errors.js.map +1 -1
  417. package/dist/services/document-service/middlewares/errors.mjs +22 -20
  418. package/dist/services/document-service/middlewares/errors.mjs.map +1 -1
  419. package/dist/services/document-service/middlewares/middleware-manager.js +46 -44
  420. package/dist/services/document-service/middlewares/middleware-manager.js.map +1 -1
  421. package/dist/services/document-service/middlewares/middleware-manager.mjs +45 -45
  422. package/dist/services/document-service/middlewares/middleware-manager.mjs.map +1 -1
  423. package/dist/services/document-service/params.js +11 -5
  424. package/dist/services/document-service/params.js.map +1 -1
  425. package/dist/services/document-service/params.mjs +10 -6
  426. package/dist/services/document-service/params.mjs.map +1 -1
  427. package/dist/services/document-service/repository.d.ts.map +1 -1
  428. package/dist/services/document-service/repository.js +354 -319
  429. package/dist/services/document-service/repository.js.map +1 -1
  430. package/dist/services/document-service/repository.mjs +353 -320
  431. package/dist/services/document-service/repository.mjs.map +1 -1
  432. package/dist/services/document-service/transform/data.js +22 -12
  433. package/dist/services/document-service/transform/data.js.map +1 -1
  434. package/dist/services/document-service/transform/data.mjs +21 -13
  435. package/dist/services/document-service/transform/data.mjs.map +1 -1
  436. package/dist/services/document-service/transform/fields.js +26 -17
  437. package/dist/services/document-service/transform/fields.js.map +1 -1
  438. package/dist/services/document-service/transform/fields.mjs +25 -18
  439. package/dist/services/document-service/transform/fields.mjs.map +1 -1
  440. package/dist/services/document-service/transform/id-map.d.ts +1 -1
  441. package/dist/services/document-service/transform/id-map.d.ts.map +1 -1
  442. package/dist/services/document-service/transform/id-map.js +115 -77
  443. package/dist/services/document-service/transform/id-map.js.map +1 -1
  444. package/dist/services/document-service/transform/id-map.mjs +114 -78
  445. package/dist/services/document-service/transform/id-map.mjs.map +1 -1
  446. package/dist/services/document-service/transform/id-transform.d.ts +1 -1
  447. package/dist/services/document-service/transform/id-transform.d.ts.map +1 -1
  448. package/dist/services/document-service/transform/id-transform.js +37 -29
  449. package/dist/services/document-service/transform/id-transform.js.map +1 -1
  450. package/dist/services/document-service/transform/id-transform.mjs +36 -30
  451. package/dist/services/document-service/transform/id-transform.mjs.map +1 -1
  452. package/dist/services/document-service/transform/populate.js +23 -18
  453. package/dist/services/document-service/transform/populate.js.map +1 -1
  454. package/dist/services/document-service/transform/populate.mjs +22 -19
  455. package/dist/services/document-service/transform/populate.mjs.map +1 -1
  456. package/dist/services/document-service/transform/query.js +11 -6
  457. package/dist/services/document-service/transform/query.js.map +1 -1
  458. package/dist/services/document-service/transform/query.mjs +10 -7
  459. package/dist/services/document-service/transform/query.mjs.map +1 -1
  460. package/dist/services/document-service/transform/relations/extract/data-ids.d.ts +1 -1
  461. package/dist/services/document-service/transform/relations/extract/data-ids.d.ts.map +1 -1
  462. package/dist/services/document-service/transform/relations/extract/data-ids.js +71 -48
  463. package/dist/services/document-service/transform/relations/extract/data-ids.js.map +1 -1
  464. package/dist/services/document-service/transform/relations/extract/data-ids.mjs +70 -49
  465. package/dist/services/document-service/transform/relations/extract/data-ids.mjs.map +1 -1
  466. package/dist/services/document-service/transform/relations/transform/data-ids.d.ts.map +1 -1
  467. package/dist/services/document-service/transform/relations/transform/data-ids.js +97 -63
  468. package/dist/services/document-service/transform/relations/transform/data-ids.js.map +1 -1
  469. package/dist/services/document-service/transform/relations/transform/data-ids.mjs +96 -64
  470. package/dist/services/document-service/transform/relations/transform/data-ids.mjs.map +1 -1
  471. package/dist/services/document-service/transform/relations/transform/default-locale.js +47 -29
  472. package/dist/services/document-service/transform/relations/transform/default-locale.js.map +1 -1
  473. package/dist/services/document-service/transform/relations/transform/default-locale.mjs +46 -30
  474. package/dist/services/document-service/transform/relations/transform/default-locale.mjs.map +1 -1
  475. package/dist/services/document-service/transform/relations/utils/dp.d.ts +1 -1
  476. package/dist/services/document-service/transform/relations/utils/dp.d.ts.map +1 -1
  477. package/dist/services/document-service/transform/relations/utils/dp.js +52 -26
  478. package/dist/services/document-service/transform/relations/utils/dp.js.map +1 -1
  479. package/dist/services/document-service/transform/relations/utils/dp.mjs +51 -27
  480. package/dist/services/document-service/transform/relations/utils/dp.mjs.map +1 -1
  481. package/dist/services/document-service/transform/relations/utils/i18n.d.ts +1 -1
  482. package/dist/services/document-service/transform/relations/utils/i18n.d.ts.map +1 -1
  483. package/dist/services/document-service/transform/relations/utils/i18n.js +20 -18
  484. package/dist/services/document-service/transform/relations/utils/i18n.js.map +1 -1
  485. package/dist/services/document-service/transform/relations/utils/i18n.mjs +19 -21
  486. package/dist/services/document-service/transform/relations/utils/i18n.mjs.map +1 -1
  487. package/dist/services/document-service/transform/relations/utils/map-relation.d.ts.map +1 -1
  488. package/dist/services/document-service/transform/relations/utils/map-relation.js +116 -77
  489. package/dist/services/document-service/transform/relations/utils/map-relation.js.map +1 -1
  490. package/dist/services/document-service/transform/relations/utils/map-relation.mjs +115 -79
  491. package/dist/services/document-service/transform/relations/utils/map-relation.mjs.map +1 -1
  492. package/dist/services/document-service/utils/bidirectional-relations.d.ts +95 -0
  493. package/dist/services/document-service/utils/bidirectional-relations.d.ts.map +1 -0
  494. package/dist/services/document-service/utils/bidirectional-relations.js +148 -0
  495. package/dist/services/document-service/utils/bidirectional-relations.js.map +1 -0
  496. package/dist/services/document-service/utils/bidirectional-relations.mjs +145 -0
  497. package/dist/services/document-service/utils/bidirectional-relations.mjs.map +1 -0
  498. package/dist/services/document-service/utils/populate.d.ts +1 -1
  499. package/dist/services/document-service/utils/populate.d.ts.map +1 -1
  500. package/dist/services/document-service/utils/populate.js +66 -42
  501. package/dist/services/document-service/utils/populate.js.map +1 -1
  502. package/dist/services/document-service/utils/populate.mjs +65 -43
  503. package/dist/services/document-service/utils/populate.mjs.map +1 -1
  504. package/dist/services/document-service/utils/unidirectional-relations.d.ts +1 -1
  505. package/dist/services/document-service/utils/unidirectional-relations.d.ts.map +1 -1
  506. package/dist/services/document-service/utils/unidirectional-relations.js +109 -62
  507. package/dist/services/document-service/utils/unidirectional-relations.js.map +1 -1
  508. package/dist/services/document-service/utils/unidirectional-relations.mjs +108 -64
  509. package/dist/services/document-service/utils/unidirectional-relations.mjs.map +1 -1
  510. package/dist/services/entity-service/index.js +230 -161
  511. package/dist/services/entity-service/index.js.map +1 -1
  512. package/dist/services/entity-service/index.mjs +229 -160
  513. package/dist/services/entity-service/index.mjs.map +1 -1
  514. package/dist/services/entity-validator/blocks-validator.js +135 -103
  515. package/dist/services/entity-validator/blocks-validator.js.map +1 -1
  516. package/dist/services/entity-validator/blocks-validator.mjs +134 -104
  517. package/dist/services/entity-validator/blocks-validator.mjs.map +1 -1
  518. package/dist/services/entity-validator/index.d.ts +1 -1
  519. package/dist/services/entity-validator/index.d.ts.map +1 -1
  520. package/dist/services/entity-validator/index.js +362 -367
  521. package/dist/services/entity-validator/index.js.map +1 -1
  522. package/dist/services/entity-validator/index.mjs +358 -364
  523. package/dist/services/entity-validator/index.mjs.map +1 -1
  524. package/dist/services/entity-validator/validators.js +268 -210
  525. package/dist/services/entity-validator/validators.js.map +1 -1
  526. package/dist/services/entity-validator/validators.mjs +267 -216
  527. package/dist/services/entity-validator/validators.mjs.map +1 -1
  528. package/dist/services/errors.js +65 -65
  529. package/dist/services/errors.js.map +1 -1
  530. package/dist/services/errors.mjs +64 -66
  531. package/dist/services/errors.mjs.map +1 -1
  532. package/dist/services/event-hub.js +82 -69
  533. package/dist/services/event-hub.js.map +1 -1
  534. package/dist/services/event-hub.mjs +81 -71
  535. package/dist/services/event-hub.mjs.map +1 -1
  536. package/dist/services/features.js +19 -14
  537. package/dist/services/features.js.map +1 -1
  538. package/dist/services/features.mjs +18 -15
  539. package/dist/services/features.mjs.map +1 -1
  540. package/dist/services/fs.js +41 -40
  541. package/dist/services/fs.js.map +1 -1
  542. package/dist/services/fs.mjs +40 -39
  543. package/dist/services/fs.mjs.map +1 -1
  544. package/dist/services/metrics/admin-user-hash.d.ts.map +1 -1
  545. package/dist/services/metrics/admin-user-hash.js +13 -11
  546. package/dist/services/metrics/admin-user-hash.js.map +1 -1
  547. package/dist/services/metrics/admin-user-hash.mjs +12 -10
  548. package/dist/services/metrics/admin-user-hash.mjs.map +1 -1
  549. package/dist/services/metrics/index.js +46 -40
  550. package/dist/services/metrics/index.js.map +1 -1
  551. package/dist/services/metrics/index.mjs +45 -42
  552. package/dist/services/metrics/index.mjs.map +1 -1
  553. package/dist/services/metrics/is-truthy.js +13 -6
  554. package/dist/services/metrics/is-truthy.js.map +1 -1
  555. package/dist/services/metrics/is-truthy.mjs +12 -6
  556. package/dist/services/metrics/is-truthy.mjs.map +1 -1
  557. package/dist/services/metrics/middleware.d.ts.map +1 -1
  558. package/dist/services/metrics/middleware.js +37 -22
  559. package/dist/services/metrics/middleware.js.map +1 -1
  560. package/dist/services/metrics/middleware.mjs +36 -24
  561. package/dist/services/metrics/middleware.mjs.map +1 -1
  562. package/dist/services/metrics/rate-limiter.d.ts.map +1 -1
  563. package/dist/services/metrics/rate-limiter.js +24 -19
  564. package/dist/services/metrics/rate-limiter.js.map +1 -1
  565. package/dist/services/metrics/rate-limiter.mjs +23 -21
  566. package/dist/services/metrics/rate-limiter.mjs.map +1 -1
  567. package/dist/services/metrics/sender.d.ts.map +1 -1
  568. package/dist/services/metrics/sender.js +78 -69
  569. package/dist/services/metrics/sender.js.map +1 -1
  570. package/dist/services/metrics/sender.mjs +77 -64
  571. package/dist/services/metrics/sender.mjs.map +1 -1
  572. package/dist/services/query-params.js +13 -10
  573. package/dist/services/query-params.js.map +1 -1
  574. package/dist/services/query-params.mjs +12 -12
  575. package/dist/services/query-params.mjs.map +1 -1
  576. package/dist/services/reloader.js +35 -32
  577. package/dist/services/reloader.js.map +1 -1
  578. package/dist/services/reloader.mjs +34 -33
  579. package/dist/services/reloader.mjs.map +1 -1
  580. package/dist/services/request-context.js +11 -8
  581. package/dist/services/request-context.js.map +1 -1
  582. package/dist/services/request-context.mjs +10 -10
  583. package/dist/services/request-context.mjs.map +1 -1
  584. package/dist/services/server/admin-api.js +11 -10
  585. package/dist/services/server/admin-api.js.map +1 -1
  586. package/dist/services/server/admin-api.mjs +10 -11
  587. package/dist/services/server/admin-api.mjs.map +1 -1
  588. package/dist/services/server/api.js +33 -27
  589. package/dist/services/server/api.js.map +1 -1
  590. package/dist/services/server/api.mjs +32 -26
  591. package/dist/services/server/api.mjs.map +1 -1
  592. package/dist/services/server/compose-endpoint.js +116 -105
  593. package/dist/services/server/compose-endpoint.js.map +1 -1
  594. package/dist/services/server/compose-endpoint.mjs +115 -105
  595. package/dist/services/server/compose-endpoint.mjs.map +1 -1
  596. package/dist/services/server/content-api.js +11 -9
  597. package/dist/services/server/content-api.js.map +1 -1
  598. package/dist/services/server/content-api.mjs +10 -10
  599. package/dist/services/server/content-api.mjs.map +1 -1
  600. package/dist/services/server/http-server.js +48 -44
  601. package/dist/services/server/http-server.js.map +1 -1
  602. package/dist/services/server/http-server.mjs +47 -43
  603. package/dist/services/server/http-server.mjs.map +1 -1
  604. package/dist/services/server/index.js +85 -82
  605. package/dist/services/server/index.js.map +1 -1
  606. package/dist/services/server/index.mjs +84 -81
  607. package/dist/services/server/index.mjs.map +1 -1
  608. package/dist/services/server/koa.js +49 -47
  609. package/dist/services/server/koa.js.map +1 -1
  610. package/dist/services/server/koa.mjs +48 -44
  611. package/dist/services/server/koa.mjs.map +1 -1
  612. package/dist/services/server/middleware.js +86 -82
  613. package/dist/services/server/middleware.js.map +1 -1
  614. package/dist/services/server/middleware.mjs +85 -82
  615. package/dist/services/server/middleware.mjs.map +1 -1
  616. package/dist/services/server/policy.js +24 -17
  617. package/dist/services/server/policy.js.map +1 -1
  618. package/dist/services/server/policy.mjs +23 -18
  619. package/dist/services/server/policy.mjs.map +1 -1
  620. package/dist/services/server/register-middlewares.js +68 -61
  621. package/dist/services/server/register-middlewares.js.map +1 -1
  622. package/dist/services/server/register-middlewares.mjs +67 -63
  623. package/dist/services/server/register-middlewares.mjs.map +1 -1
  624. package/dist/services/server/register-routes.js +90 -67
  625. package/dist/services/server/register-routes.js.map +1 -1
  626. package/dist/services/server/register-routes.mjs +89 -67
  627. package/dist/services/server/register-routes.mjs.map +1 -1
  628. package/dist/services/server/routing.js +94 -81
  629. package/dist/services/server/routing.js.map +1 -1
  630. package/dist/services/server/routing.mjs +93 -81
  631. package/dist/services/server/routing.mjs.map +1 -1
  632. package/dist/services/utils/dynamic-zones.js +13 -14
  633. package/dist/services/utils/dynamic-zones.js.map +1 -1
  634. package/dist/services/utils/dynamic-zones.mjs +12 -16
  635. package/dist/services/utils/dynamic-zones.mjs.map +1 -1
  636. package/dist/services/webhook-runner.js +124 -122
  637. package/dist/services/webhook-runner.js.map +1 -1
  638. package/dist/services/webhook-runner.mjs +123 -121
  639. package/dist/services/webhook-runner.mjs.map +1 -1
  640. package/dist/services/webhook-store.js +132 -99
  641. package/dist/services/webhook-store.js.map +1 -1
  642. package/dist/services/webhook-store.mjs +131 -101
  643. package/dist/services/webhook-store.mjs.map +1 -1
  644. package/dist/services/worker-queue.js +44 -49
  645. package/dist/services/worker-queue.js.map +1 -1
  646. package/dist/services/worker-queue.mjs +43 -49
  647. package/dist/services/worker-queue.mjs.map +1 -1
  648. package/dist/utils/convert-custom-field-type.js +17 -20
  649. package/dist/utils/convert-custom-field-type.js.map +1 -1
  650. package/dist/utils/convert-custom-field-type.mjs +16 -21
  651. package/dist/utils/convert-custom-field-type.mjs.map +1 -1
  652. package/dist/utils/cron.js +64 -30
  653. package/dist/utils/cron.js.map +1 -1
  654. package/dist/utils/cron.mjs +63 -31
  655. package/dist/utils/cron.mjs.map +1 -1
  656. package/dist/utils/fetch.js +24 -18
  657. package/dist/utils/fetch.js.map +1 -1
  658. package/dist/utils/fetch.mjs +23 -19
  659. package/dist/utils/fetch.mjs.map +1 -1
  660. package/dist/utils/filepath-to-prop-path.js +20 -28
  661. package/dist/utils/filepath-to-prop-path.js.map +1 -1
  662. package/dist/utils/filepath-to-prop-path.mjs +19 -26
  663. package/dist/utils/filepath-to-prop-path.mjs.map +1 -1
  664. package/dist/utils/is-initialized.js +21 -12
  665. package/dist/utils/is-initialized.js.map +1 -1
  666. package/dist/utils/is-initialized.mjs +20 -13
  667. package/dist/utils/is-initialized.mjs.map +1 -1
  668. package/dist/utils/lifecycles.js +6 -5
  669. package/dist/utils/lifecycles.js.map +1 -1
  670. package/dist/utils/lifecycles.mjs +5 -6
  671. package/dist/utils/lifecycles.mjs.map +1 -1
  672. package/dist/utils/load-config-file.js +40 -38
  673. package/dist/utils/load-config-file.js.map +1 -1
  674. package/dist/utils/load-config-file.mjs +39 -36
  675. package/dist/utils/load-config-file.mjs.map +1 -1
  676. package/dist/utils/load-files.js +40 -35
  677. package/dist/utils/load-files.js.map +1 -1
  678. package/dist/utils/load-files.mjs +39 -32
  679. package/dist/utils/load-files.mjs.map +1 -1
  680. package/dist/utils/open-browser.js +8 -8
  681. package/dist/utils/open-browser.js.map +1 -1
  682. package/dist/utils/open-browser.mjs +7 -7
  683. package/dist/utils/open-browser.mjs.map +1 -1
  684. package/dist/utils/resolve-working-dirs.js +23 -10
  685. package/dist/utils/resolve-working-dirs.js.map +1 -1
  686. package/dist/utils/resolve-working-dirs.mjs +22 -9
  687. package/dist/utils/resolve-working-dirs.mjs.map +1 -1
  688. package/dist/utils/signals.js +20 -14
  689. package/dist/utils/signals.js.map +1 -1
  690. package/dist/utils/signals.mjs +19 -15
  691. package/dist/utils/signals.mjs.map +1 -1
  692. package/dist/utils/startup-logger.d.ts.map +1 -1
  693. package/dist/utils/startup-logger.js +107 -78
  694. package/dist/utils/startup-logger.js.map +1 -1
  695. package/dist/utils/startup-logger.mjs +106 -75
  696. package/dist/utils/startup-logger.mjs.map +1 -1
  697. package/dist/utils/transform-content-types-to-models.js +350 -261
  698. package/dist/utils/transform-content-types-to-models.js.map +1 -1
  699. package/dist/utils/transform-content-types-to-models.mjs +349 -269
  700. package/dist/utils/transform-content-types-to-models.mjs.map +1 -1
  701. package/dist/utils/update-notifier/index.d.ts.map +1 -1
  702. package/dist/utils/update-notifier/index.js +68 -73
  703. package/dist/utils/update-notifier/index.js.map +1 -1
  704. package/dist/utils/update-notifier/index.mjs +67 -67
  705. package/dist/utils/update-notifier/index.mjs.map +1 -1
  706. package/package.json +25 -26
@@ -1,106 +1,168 @@
1
- "use strict";
2
- Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const strapiUtils = require("@strapi/utils");
4
- const index = require("../../services/document-service/index.js");
5
- const hasDraftAndPublish = async (trx, meta) => {
6
- const hasTable = await trx.schema.hasTable(meta.tableName);
7
- if (!hasTable) {
8
- return false;
9
- }
10
- const uid = meta.uid;
11
- const model = strapi.getModel(uid);
12
- const hasDP = strapiUtils.contentTypes.hasDraftAndPublish(model);
13
- if (!hasDP) {
14
- return false;
15
- }
16
- return true;
17
- };
18
- async function copyPublishedEntriesToDraft({
19
- db,
20
- trx,
21
- uid
22
- }) {
23
- const meta = db.metadata.get(uid);
24
- const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute) => {
25
- if (["id"].includes(attribute.columnName)) {
26
- return acc;
1
+ 'use strict';
2
+
3
+ var strapiUtils = require('@strapi/utils');
4
+ var index = require('../../services/document-service/index.js');
5
+
6
+ /**
7
+ * Check if the model has draft and publish enabled.
8
+ */ const hasDraftAndPublish = async (trx, meta)=>{
9
+ const hasTable = await trx.schema.hasTable(meta.tableName);
10
+ if (!hasTable) {
11
+ return false;
27
12
  }
28
- if (strapiUtils.contentTypes.isScalarAttribute(attribute)) {
29
- acc.push(attribute.columnName);
13
+ const uid = meta.uid;
14
+ const model = strapi.getModel(uid);
15
+ const hasDP = strapiUtils.contentTypes.hasDraftAndPublish(model);
16
+ if (!hasDP) {
17
+ return false;
30
18
  }
31
- return acc;
32
- }, []);
33
- await trx.into(
34
- trx.raw(`?? (${scalarAttributes.map(() => `??`).join(", ")})`, [
35
- meta.tableName,
36
- ...scalarAttributes
37
- ])
38
- ).insert((subQb) => {
39
- subQb.select(
40
- ...scalarAttributes.map((att) => {
41
- if (att === "published_at") {
42
- return trx.raw("NULL as ??", "published_at");
19
+ return true;
20
+ };
21
+ /**
22
+ * Copy all the published entries to draft entries, without it's components, dynamic zones or relations.
23
+ * This ensures all necessary draft's exist before copying it's relations.
24
+ */ async function copyPublishedEntriesToDraft({ db, trx, uid }) {
25
+ // Extract all scalar attributes to use in the insert query
26
+ const meta = db.metadata.get(uid);
27
+ // Get scalar attributes that will be copied over the new draft
28
+ const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute)=>{
29
+ if ([
30
+ 'id'
31
+ ].includes(attribute.columnName)) {
32
+ return acc;
33
+ }
34
+ if (strapiUtils.contentTypes.isScalarAttribute(attribute)) {
35
+ acc.push(attribute.columnName);
43
36
  }
44
- return att;
45
- })
46
- ).from(meta.tableName).whereNotNull("published_at");
47
- });
37
+ return acc;
38
+ }, []);
39
+ /**
40
+ * Query to copy the published entries into draft entries.
41
+ *
42
+ * INSERT INTO tableName (columnName1, columnName2, columnName3, ...)
43
+ * SELECT columnName1, columnName2, columnName3, ...
44
+ * FROM tableName
45
+ */ await trx// INSERT INTO tableName (columnName1, columnName2, columnName3, ...)
46
+ .into(trx.raw(`?? (${scalarAttributes.map(()=>`??`).join(', ')})`, [
47
+ meta.tableName,
48
+ ...scalarAttributes
49
+ ])).insert((subQb)=>{
50
+ // SELECT columnName1, columnName2, columnName3, ...
51
+ subQb.select(...scalarAttributes.map((att)=>{
52
+ // Override 'publishedAt' and 'updatedAt' attributes
53
+ if (att === 'published_at') {
54
+ return trx.raw('NULL as ??', 'published_at');
55
+ }
56
+ return att;
57
+ })).from(meta.tableName)// Only select entries that were published
58
+ .whereNotNull('published_at');
59
+ });
48
60
  }
49
- async function* getBatchToDiscard({
50
- db,
51
- trx,
52
- uid,
53
- batchSize = 1e3
54
- }) {
55
- let offset = 0;
56
- let hasMore = true;
57
- while (hasMore) {
58
- const batch = await db.queryBuilder(uid).select(["id", "documentId", "locale"]).where({ publishedAt: { $ne: null } }).limit(batchSize).offset(offset).orderBy("id").transacting(trx).execute();
59
- if (batch.length < batchSize) {
60
- hasMore = false;
61
+ /**
62
+ * Load a batch of versions to discard.
63
+ *
64
+ * Versions with only a draft version will be ignored.
65
+ * Only versions with a published version (which always have a draft version) will be discarded.
66
+ */ async function* getBatchToDiscard({ db, trx, uid, defaultBatchSize = 1000 }) {
67
+ const client = db.config.connection.client;
68
+ const isSQLite = typeof client === 'string' && [
69
+ 'sqlite',
70
+ 'sqlite3',
71
+ 'better-sqlite3'
72
+ ].includes(client);
73
+ // The SQLite documentation states that the maximum number of terms in a
74
+ // compound SELECT statement is 500 by default.
75
+ // See: https://www.sqlite.org/limits.html
76
+ // To ensure a successful migration, we limit the batch size to 500 for SQLite.
77
+ const batchSize = isSQLite ? Math.min(defaultBatchSize, 500) : defaultBatchSize;
78
+ let offset = 0;
79
+ let hasMore = true;
80
+ while(hasMore){
81
+ // Look for the published entries to discard
82
+ const batch = await db.queryBuilder(uid).select([
83
+ 'id',
84
+ 'documentId',
85
+ 'locale'
86
+ ]).where({
87
+ publishedAt: {
88
+ $ne: null
89
+ }
90
+ }).limit(batchSize).offset(offset).orderBy('id').transacting(trx).execute();
91
+ if (batch.length < batchSize) {
92
+ hasMore = false;
93
+ }
94
+ offset += batchSize;
95
+ yield batch;
61
96
  }
62
- offset += batchSize;
63
- yield batch;
64
- }
65
97
  }
66
- const migrateUp = async (trx, db) => {
67
- const dpModels = [];
68
- for (const meta of db.metadata.values()) {
69
- const hasDP = await hasDraftAndPublish(trx, meta);
70
- if (hasDP) {
71
- dpModels.push(meta);
98
+ /**
99
+ * 2 pass migration to create the draft entries for all the published entries.
100
+ * And then discard the drafts to copy the relations.
101
+ */ const migrateUp = async (trx, db)=>{
102
+ const dpModels = [];
103
+ for (const meta of db.metadata.values()){
104
+ const hasDP = await hasDraftAndPublish(trx, meta);
105
+ if (hasDP) {
106
+ dpModels.push(meta);
107
+ }
72
108
  }
73
- }
74
- for (const model of dpModels) {
75
- await copyPublishedEntriesToDraft({ db, trx, uid: model.uid });
76
- }
77
- const documentService = index.createDocumentService(strapi, {
78
- async validateEntityCreation(_, data) {
79
- return data;
80
- },
81
- async validateEntityUpdate(_, data) {
82
- return data;
109
+ /**
110
+ * Create plain draft entries for all the entries that were published.
111
+ */ for (const model of dpModels){
112
+ await copyPublishedEntriesToDraft({
113
+ db,
114
+ trx,
115
+ uid: model.uid
116
+ });
83
117
  }
84
- });
85
- for (const model of dpModels) {
86
- const discardDraft = async (entry) => documentService(model.uid).discardDraft({
87
- documentId: entry.documentId,
88
- locale: entry.locale
118
+ /**
119
+ * Discard the drafts will copy the relations from the published entries to the newly created drafts.
120
+ *
121
+ * Load a batch of entries (batched to prevent loading millions of rows at once ),
122
+ * and discard them using the document service.
123
+ *
124
+ * NOTE: This is using a custom document service without any validations,
125
+ * to prevent the migration from failing if users already had invalid data in V4.
126
+ * E.g. @see https://github.com/strapi/strapi/issues/21583
127
+ */ const documentService = index.createDocumentService(strapi, {
128
+ async validateEntityCreation (_, data) {
129
+ return data;
130
+ },
131
+ async validateEntityUpdate (_, data) {
132
+ // Data can be partially empty on partial updates
133
+ // This migration doesn't trigger any update (or partial update),
134
+ // so it's safe to return the data as is.
135
+ return data;
136
+ }
89
137
  });
90
- for await (const batch of getBatchToDiscard({ db, trx, uid: model.uid })) {
91
- await strapiUtils.async.map(batch, discardDraft, { concurrency: 10 });
138
+ for (const model of dpModels){
139
+ const discardDraft = async (entry)=>documentService(model.uid).discardDraft({
140
+ documentId: entry.documentId,
141
+ locale: entry.locale
142
+ });
143
+ for await (const batch of getBatchToDiscard({
144
+ db,
145
+ trx,
146
+ uid: model.uid
147
+ })){
148
+ // NOTE: concurrency had to be disabled to prevent a race condition with self-references
149
+ // TODO: improve performance in a safe way
150
+ await strapiUtils.async.map(batch, discardDraft, {
151
+ concurrency: 1
152
+ });
153
+ }
92
154
  }
93
- }
94
155
  };
95
156
  const discardDocumentDrafts = {
96
- name: "core::5.0.0-discard-drafts",
97
- async up(trx, db) {
98
- await migrateUp(trx, db);
99
- },
100
- async down() {
101
- throw new Error("not implemented");
102
- }
157
+ name: 'core::5.0.0-discard-drafts',
158
+ async up (trx, db) {
159
+ await migrateUp(trx, db);
160
+ },
161
+ async down () {
162
+ throw new Error('not implemented');
163
+ }
103
164
  };
165
+
104
166
  exports.discardDocumentDrafts = discardDocumentDrafts;
105
167
  exports.getBatchToDiscard = getBatchToDiscard;
106
168
  //# sourceMappingURL=5.0.0-discard-drafts.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"5.0.0-discard-drafts.js","sources":["../../../src/migrations/database/5.0.0-discard-drafts.ts"],"sourcesContent":["/**\n * This migration is responsible for creating the draft counterpart for all the entries that were in a published state.\n *\n * In v4, entries could either be in a draft or published state, but not both at the same time.\n * In v5, we introduced the concept of document, and an entry can be in a draft or published state.\n *\n * This means the migration needs to create the draft counterpart if an entry was published.\n *\n * This migration performs the following steps:\n * 1. Creates draft entries for all published entries, without it's components, dynamic zones or relations.\n * 2. Using the document service, discard those same drafts to copy its relations.\n */\n\n/* eslint-disable no-continue */\nimport type { UID } from '@strapi/types';\nimport type { Database, Migration } from '@strapi/database';\nimport { async, contentTypes } from '@strapi/utils';\nimport { createDocumentService } from '../../services/document-service';\n\ntype DocumentVersion = { documentId: string; locale: string };\ntype Knex = Parameters<Migration['up']>[0];\n\n/**\n * Check if the model has draft and publish enabled.\n */\nconst hasDraftAndPublish = async (trx: Knex, meta: any) => {\n const hasTable = await trx.schema.hasTable(meta.tableName);\n\n if (!hasTable) {\n return false;\n }\n\n const uid = meta.uid as UID.ContentType;\n const model = strapi.getModel(uid);\n const hasDP = contentTypes.hasDraftAndPublish(model);\n if (!hasDP) {\n return false;\n }\n\n return true;\n};\n\n/**\n * Copy all the published entries to draft entries, without it's components, dynamic zones or relations.\n * This ensures all necessary draft's exist before copying it's relations.\n */\nasync function copyPublishedEntriesToDraft({\n db,\n trx,\n uid,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n}) {\n // Extract all scalar attributes to use in the insert query\n const meta = db.metadata.get(uid);\n\n // Get scalar attributes that will be copied over the new draft\n const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute: any) => {\n if (['id'].includes(attribute.columnName)) {\n return acc;\n }\n\n if (contentTypes.isScalarAttribute(attribute)) {\n acc.push(attribute.columnName);\n }\n\n return acc;\n }, [] as string[]);\n\n /**\n * Query to copy the published entries into draft entries.\n *\n * INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n * SELECT columnName1, columnName2, columnName3, ...\n * FROM tableName\n */\n await trx\n // INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n .into(\n trx.raw(`?? (${scalarAttributes.map(() => `??`).join(', ')})`, [\n meta.tableName,\n ...scalarAttributes,\n ])\n )\n .insert((subQb: typeof trx) => {\n // SELECT columnName1, columnName2, columnName3, ...\n subQb\n .select(\n ...scalarAttributes.map((att: string) => {\n // Override 'publishedAt' and 'updatedAt' attributes\n if (att === 'published_at') {\n return trx.raw('NULL as ??', 'published_at');\n }\n\n return att;\n })\n )\n .from(meta.tableName)\n // Only select entries that were published\n .whereNotNull('published_at');\n });\n}\n\n/**\n * Load a batch of versions to discard.\n *\n * Versions with only a draft version will be ignored.\n * Only versions with a published version (which always have a draft version) will be discarded.\n */\nexport async function* getBatchToDiscard({\n db,\n trx,\n uid,\n batchSize = 1000,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n batchSize?: number;\n}) {\n let offset = 0;\n let hasMore = true;\n\n while (hasMore) {\n // Look for the published entries to discard\n const batch: DocumentVersion[] = await db\n .queryBuilder(uid)\n .select(['id', 'documentId', 'locale'])\n .where({ publishedAt: { $ne: null } })\n .limit(batchSize)\n .offset(offset)\n .orderBy('id')\n .transacting(trx)\n .execute();\n\n if (batch.length < batchSize) {\n hasMore = false;\n }\n\n offset += batchSize;\n yield batch;\n }\n}\n\n/**\n * 2 pass migration to create the draft entries for all the published entries.\n * And then discard the drafts to copy the relations.\n */\nconst migrateUp = async (trx: Knex, db: Database) => {\n const dpModels = [];\n for (const meta of db.metadata.values()) {\n const hasDP = await hasDraftAndPublish(trx, meta);\n if (hasDP) {\n dpModels.push(meta);\n }\n }\n\n /**\n * Create plain draft entries for all the entries that were published.\n */\n for (const model of dpModels) {\n await copyPublishedEntriesToDraft({ db, trx, uid: model.uid });\n }\n\n /**\n * Discard the drafts will copy the relations from the published entries to the newly created drafts.\n *\n * Load a batch of entries (batched to prevent loading millions of rows at once ),\n * and discard them using the document service.\n *\n * NOTE: This is using a custom document service without any validations,\n * to prevent the migration from failing if users already had invalid data in V4.\n * E.g. @see https://github.com/strapi/strapi/issues/21583\n */\n const documentService = createDocumentService(strapi, {\n async validateEntityCreation(_, data) {\n return data;\n },\n async validateEntityUpdate(_, data) {\n // Data can be partially empty on partial updates\n // This migration doesn't trigger any update (or partial update),\n // so it's safe to return the data as is.\n return data as any;\n },\n });\n\n for (const model of dpModels) {\n const discardDraft = async (entry: DocumentVersion) =>\n documentService(model.uid as UID.ContentType).discardDraft({\n documentId: entry.documentId,\n locale: entry.locale,\n });\n\n for await (const batch of getBatchToDiscard({ db, trx, uid: model.uid })) {\n await async.map(batch, discardDraft, { concurrency: 10 });\n }\n }\n};\n\nexport const discardDocumentDrafts: Migration = {\n name: 'core::5.0.0-discard-drafts',\n async up(trx, db) {\n await migrateUp(trx, db);\n },\n async down() {\n throw new Error('not implemented');\n },\n};\n"],"names":["contentTypes","createDocumentService","async"],"mappings":"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"}
1
+ {"version":3,"file":"5.0.0-discard-drafts.js","sources":["../../../src/migrations/database/5.0.0-discard-drafts.ts"],"sourcesContent":["/**\n * This migration is responsible for creating the draft counterpart for all the entries that were in a published state.\n *\n * In v4, entries could either be in a draft or published state, but not both at the same time.\n * In v5, we introduced the concept of document, and an entry can be in a draft or published state.\n *\n * This means the migration needs to create the draft counterpart if an entry was published.\n *\n * This migration performs the following steps:\n * 1. Creates draft entries for all published entries, without it's components, dynamic zones or relations.\n * 2. Using the document service, discard those same drafts to copy its relations.\n */\n\n/* eslint-disable no-continue */\nimport type { UID } from '@strapi/types';\nimport type { Database, Migration } from '@strapi/database';\nimport { async, contentTypes } from '@strapi/utils';\nimport { createDocumentService } from '../../services/document-service';\n\ntype DocumentVersion = { documentId: string; locale: string };\ntype Knex = Parameters<Migration['up']>[0];\n\n/**\n * Check if the model has draft and publish enabled.\n */\nconst hasDraftAndPublish = async (trx: Knex, meta: any) => {\n const hasTable = await trx.schema.hasTable(meta.tableName);\n\n if (!hasTable) {\n return false;\n }\n\n const uid = meta.uid as UID.ContentType;\n const model = strapi.getModel(uid);\n const hasDP = contentTypes.hasDraftAndPublish(model);\n if (!hasDP) {\n return false;\n }\n\n return true;\n};\n\n/**\n * Copy all the published entries to draft entries, without it's components, dynamic zones or relations.\n * This ensures all necessary draft's exist before copying it's relations.\n */\nasync function copyPublishedEntriesToDraft({\n db,\n trx,\n uid,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n}) {\n // Extract all scalar attributes to use in the insert query\n const meta = db.metadata.get(uid);\n\n // Get scalar attributes that will be copied over the new draft\n const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute: any) => {\n if (['id'].includes(attribute.columnName)) {\n return acc;\n }\n\n if (contentTypes.isScalarAttribute(attribute)) {\n acc.push(attribute.columnName);\n }\n\n return acc;\n }, [] as string[]);\n\n /**\n * Query to copy the published entries into draft entries.\n *\n * INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n * SELECT columnName1, columnName2, columnName3, ...\n * FROM tableName\n */\n await trx\n // INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n .into(\n trx.raw(`?? (${scalarAttributes.map(() => `??`).join(', ')})`, [\n meta.tableName,\n ...scalarAttributes,\n ])\n )\n .insert((subQb: typeof trx) => {\n // SELECT columnName1, columnName2, columnName3, ...\n subQb\n .select(\n ...scalarAttributes.map((att: string) => {\n // Override 'publishedAt' and 'updatedAt' attributes\n if (att === 'published_at') {\n return trx.raw('NULL as ??', 'published_at');\n }\n\n return att;\n })\n )\n .from(meta.tableName)\n // Only select entries that were published\n .whereNotNull('published_at');\n });\n}\n\n/**\n * Load a batch of versions to discard.\n *\n * Versions with only a draft version will be ignored.\n * Only versions with a published version (which always have a draft version) will be discarded.\n */\nexport async function* getBatchToDiscard({\n db,\n trx,\n uid,\n defaultBatchSize = 1000,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n defaultBatchSize?: number;\n}) {\n const client = db.config.connection.client;\n const isSQLite =\n typeof client === 'string' && ['sqlite', 'sqlite3', 'better-sqlite3'].includes(client);\n\n // The SQLite documentation states that the maximum number of terms in a\n // compound SELECT statement is 500 by default.\n // See: https://www.sqlite.org/limits.html\n // To ensure a successful migration, we limit the batch size to 500 for SQLite.\n const batchSize = isSQLite ? Math.min(defaultBatchSize, 500) : defaultBatchSize;\n let offset = 0;\n let hasMore = true;\n\n while (hasMore) {\n // Look for the published entries to discard\n const batch: DocumentVersion[] = await db\n .queryBuilder(uid)\n .select(['id', 'documentId', 'locale'])\n .where({ publishedAt: { $ne: null } })\n .limit(batchSize)\n .offset(offset)\n .orderBy('id')\n .transacting(trx)\n .execute();\n\n if (batch.length < batchSize) {\n hasMore = false;\n }\n\n offset += batchSize;\n yield batch;\n }\n}\n\n/**\n * 2 pass migration to create the draft entries for all the published entries.\n * And then discard the drafts to copy the relations.\n */\nconst migrateUp = async (trx: Knex, db: Database) => {\n const dpModels = [];\n for (const meta of db.metadata.values()) {\n const hasDP = await hasDraftAndPublish(trx, meta);\n if (hasDP) {\n dpModels.push(meta);\n }\n }\n\n /**\n * Create plain draft entries for all the entries that were published.\n */\n for (const model of dpModels) {\n await copyPublishedEntriesToDraft({ db, trx, uid: model.uid });\n }\n\n /**\n * Discard the drafts will copy the relations from the published entries to the newly created drafts.\n *\n * Load a batch of entries (batched to prevent loading millions of rows at once ),\n * and discard them using the document service.\n *\n * NOTE: This is using a custom document service without any validations,\n * to prevent the migration from failing if users already had invalid data in V4.\n * E.g. @see https://github.com/strapi/strapi/issues/21583\n */\n const documentService = createDocumentService(strapi, {\n async validateEntityCreation(_, data) {\n return data;\n },\n async validateEntityUpdate(_, data) {\n // Data can be partially empty on partial updates\n // This migration doesn't trigger any update (or partial update),\n // so it's safe to return the data as is.\n return data as any;\n },\n });\n\n for (const model of dpModels) {\n const discardDraft = async (entry: DocumentVersion) =>\n documentService(model.uid as UID.ContentType).discardDraft({\n documentId: entry.documentId,\n locale: entry.locale,\n });\n\n for await (const batch of getBatchToDiscard({ db, trx, uid: model.uid })) {\n // NOTE: concurrency had to be disabled to prevent a race condition with self-references\n // TODO: improve performance in a safe way\n await async.map(batch, discardDraft, { concurrency: 1 });\n }\n }\n};\n\nexport const discardDocumentDrafts: Migration = {\n name: 'core::5.0.0-discard-drafts',\n async up(trx, db) {\n await migrateUp(trx, db);\n },\n async down() {\n throw new Error('not implemented');\n },\n};\n"],"names":["hasDraftAndPublish","trx","meta","hasTable","schema","tableName","uid","model","strapi","getModel","hasDP","contentTypes","copyPublishedEntriesToDraft","db","metadata","get","scalarAttributes","Object","values","attributes","reduce","acc","attribute","includes","columnName","isScalarAttribute","push","into","raw","map","join","insert","subQb","select","att","from","whereNotNull","getBatchToDiscard","defaultBatchSize","client","config","connection","isSQLite","batchSize","Math","min","offset","hasMore","batch","queryBuilder","where","publishedAt","$ne","limit","orderBy","transacting","execute","length","migrateUp","dpModels","documentService","createDocumentService","validateEntityCreation","_","data","validateEntityUpdate","discardDraft","entry","documentId","locale","async","concurrency","discardDocumentDrafts","name","up","down","Error"],"mappings":"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"}
@@ -1,106 +1,165 @@
1
- import { async, contentTypes } from "@strapi/utils";
2
- import { createDocumentService } from "../../services/document-service/index.mjs";
3
- const hasDraftAndPublish = async (trx, meta) => {
4
- const hasTable = await trx.schema.hasTable(meta.tableName);
5
- if (!hasTable) {
6
- return false;
7
- }
8
- const uid = meta.uid;
9
- const model = strapi.getModel(uid);
10
- const hasDP = contentTypes.hasDraftAndPublish(model);
11
- if (!hasDP) {
12
- return false;
13
- }
14
- return true;
15
- };
16
- async function copyPublishedEntriesToDraft({
17
- db,
18
- trx,
19
- uid
20
- }) {
21
- const meta = db.metadata.get(uid);
22
- const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute) => {
23
- if (["id"].includes(attribute.columnName)) {
24
- return acc;
1
+ import { async, contentTypes } from '@strapi/utils';
2
+ import { createDocumentService } from '../../services/document-service/index.mjs';
3
+
4
+ /**
5
+ * Check if the model has draft and publish enabled.
6
+ */ const hasDraftAndPublish = async (trx, meta)=>{
7
+ const hasTable = await trx.schema.hasTable(meta.tableName);
8
+ if (!hasTable) {
9
+ return false;
25
10
  }
26
- if (contentTypes.isScalarAttribute(attribute)) {
27
- acc.push(attribute.columnName);
11
+ const uid = meta.uid;
12
+ const model = strapi.getModel(uid);
13
+ const hasDP = contentTypes.hasDraftAndPublish(model);
14
+ if (!hasDP) {
15
+ return false;
28
16
  }
29
- return acc;
30
- }, []);
31
- await trx.into(
32
- trx.raw(`?? (${scalarAttributes.map(() => `??`).join(", ")})`, [
33
- meta.tableName,
34
- ...scalarAttributes
35
- ])
36
- ).insert((subQb) => {
37
- subQb.select(
38
- ...scalarAttributes.map((att) => {
39
- if (att === "published_at") {
40
- return trx.raw("NULL as ??", "published_at");
17
+ return true;
18
+ };
19
+ /**
20
+ * Copy all the published entries to draft entries, without it's components, dynamic zones or relations.
21
+ * This ensures all necessary draft's exist before copying it's relations.
22
+ */ async function copyPublishedEntriesToDraft({ db, trx, uid }) {
23
+ // Extract all scalar attributes to use in the insert query
24
+ const meta = db.metadata.get(uid);
25
+ // Get scalar attributes that will be copied over the new draft
26
+ const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute)=>{
27
+ if ([
28
+ 'id'
29
+ ].includes(attribute.columnName)) {
30
+ return acc;
31
+ }
32
+ if (contentTypes.isScalarAttribute(attribute)) {
33
+ acc.push(attribute.columnName);
41
34
  }
42
- return att;
43
- })
44
- ).from(meta.tableName).whereNotNull("published_at");
45
- });
35
+ return acc;
36
+ }, []);
37
+ /**
38
+ * Query to copy the published entries into draft entries.
39
+ *
40
+ * INSERT INTO tableName (columnName1, columnName2, columnName3, ...)
41
+ * SELECT columnName1, columnName2, columnName3, ...
42
+ * FROM tableName
43
+ */ await trx// INSERT INTO tableName (columnName1, columnName2, columnName3, ...)
44
+ .into(trx.raw(`?? (${scalarAttributes.map(()=>`??`).join(', ')})`, [
45
+ meta.tableName,
46
+ ...scalarAttributes
47
+ ])).insert((subQb)=>{
48
+ // SELECT columnName1, columnName2, columnName3, ...
49
+ subQb.select(...scalarAttributes.map((att)=>{
50
+ // Override 'publishedAt' and 'updatedAt' attributes
51
+ if (att === 'published_at') {
52
+ return trx.raw('NULL as ??', 'published_at');
53
+ }
54
+ return att;
55
+ })).from(meta.tableName)// Only select entries that were published
56
+ .whereNotNull('published_at');
57
+ });
46
58
  }
47
- async function* getBatchToDiscard({
48
- db,
49
- trx,
50
- uid,
51
- batchSize = 1e3
52
- }) {
53
- let offset = 0;
54
- let hasMore = true;
55
- while (hasMore) {
56
- const batch = await db.queryBuilder(uid).select(["id", "documentId", "locale"]).where({ publishedAt: { $ne: null } }).limit(batchSize).offset(offset).orderBy("id").transacting(trx).execute();
57
- if (batch.length < batchSize) {
58
- hasMore = false;
59
+ /**
60
+ * Load a batch of versions to discard.
61
+ *
62
+ * Versions with only a draft version will be ignored.
63
+ * Only versions with a published version (which always have a draft version) will be discarded.
64
+ */ async function* getBatchToDiscard({ db, trx, uid, defaultBatchSize = 1000 }) {
65
+ const client = db.config.connection.client;
66
+ const isSQLite = typeof client === 'string' && [
67
+ 'sqlite',
68
+ 'sqlite3',
69
+ 'better-sqlite3'
70
+ ].includes(client);
71
+ // The SQLite documentation states that the maximum number of terms in a
72
+ // compound SELECT statement is 500 by default.
73
+ // See: https://www.sqlite.org/limits.html
74
+ // To ensure a successful migration, we limit the batch size to 500 for SQLite.
75
+ const batchSize = isSQLite ? Math.min(defaultBatchSize, 500) : defaultBatchSize;
76
+ let offset = 0;
77
+ let hasMore = true;
78
+ while(hasMore){
79
+ // Look for the published entries to discard
80
+ const batch = await db.queryBuilder(uid).select([
81
+ 'id',
82
+ 'documentId',
83
+ 'locale'
84
+ ]).where({
85
+ publishedAt: {
86
+ $ne: null
87
+ }
88
+ }).limit(batchSize).offset(offset).orderBy('id').transacting(trx).execute();
89
+ if (batch.length < batchSize) {
90
+ hasMore = false;
91
+ }
92
+ offset += batchSize;
93
+ yield batch;
59
94
  }
60
- offset += batchSize;
61
- yield batch;
62
- }
63
95
  }
64
- const migrateUp = async (trx, db) => {
65
- const dpModels = [];
66
- for (const meta of db.metadata.values()) {
67
- const hasDP = await hasDraftAndPublish(trx, meta);
68
- if (hasDP) {
69
- dpModels.push(meta);
96
+ /**
97
+ * 2 pass migration to create the draft entries for all the published entries.
98
+ * And then discard the drafts to copy the relations.
99
+ */ const migrateUp = async (trx, db)=>{
100
+ const dpModels = [];
101
+ for (const meta of db.metadata.values()){
102
+ const hasDP = await hasDraftAndPublish(trx, meta);
103
+ if (hasDP) {
104
+ dpModels.push(meta);
105
+ }
70
106
  }
71
- }
72
- for (const model of dpModels) {
73
- await copyPublishedEntriesToDraft({ db, trx, uid: model.uid });
74
- }
75
- const documentService = createDocumentService(strapi, {
76
- async validateEntityCreation(_, data) {
77
- return data;
78
- },
79
- async validateEntityUpdate(_, data) {
80
- return data;
107
+ /**
108
+ * Create plain draft entries for all the entries that were published.
109
+ */ for (const model of dpModels){
110
+ await copyPublishedEntriesToDraft({
111
+ db,
112
+ trx,
113
+ uid: model.uid
114
+ });
81
115
  }
82
- });
83
- for (const model of dpModels) {
84
- const discardDraft = async (entry) => documentService(model.uid).discardDraft({
85
- documentId: entry.documentId,
86
- locale: entry.locale
116
+ /**
117
+ * Discard the drafts will copy the relations from the published entries to the newly created drafts.
118
+ *
119
+ * Load a batch of entries (batched to prevent loading millions of rows at once ),
120
+ * and discard them using the document service.
121
+ *
122
+ * NOTE: This is using a custom document service without any validations,
123
+ * to prevent the migration from failing if users already had invalid data in V4.
124
+ * E.g. @see https://github.com/strapi/strapi/issues/21583
125
+ */ const documentService = createDocumentService(strapi, {
126
+ async validateEntityCreation (_, data) {
127
+ return data;
128
+ },
129
+ async validateEntityUpdate (_, data) {
130
+ // Data can be partially empty on partial updates
131
+ // This migration doesn't trigger any update (or partial update),
132
+ // so it's safe to return the data as is.
133
+ return data;
134
+ }
87
135
  });
88
- for await (const batch of getBatchToDiscard({ db, trx, uid: model.uid })) {
89
- await async.map(batch, discardDraft, { concurrency: 10 });
136
+ for (const model of dpModels){
137
+ const discardDraft = async (entry)=>documentService(model.uid).discardDraft({
138
+ documentId: entry.documentId,
139
+ locale: entry.locale
140
+ });
141
+ for await (const batch of getBatchToDiscard({
142
+ db,
143
+ trx,
144
+ uid: model.uid
145
+ })){
146
+ // NOTE: concurrency had to be disabled to prevent a race condition with self-references
147
+ // TODO: improve performance in a safe way
148
+ await async.map(batch, discardDraft, {
149
+ concurrency: 1
150
+ });
151
+ }
90
152
  }
91
- }
92
153
  };
93
154
  const discardDocumentDrafts = {
94
- name: "core::5.0.0-discard-drafts",
95
- async up(trx, db) {
96
- await migrateUp(trx, db);
97
- },
98
- async down() {
99
- throw new Error("not implemented");
100
- }
101
- };
102
- export {
103
- discardDocumentDrafts,
104
- getBatchToDiscard
155
+ name: 'core::5.0.0-discard-drafts',
156
+ async up (trx, db) {
157
+ await migrateUp(trx, db);
158
+ },
159
+ async down () {
160
+ throw new Error('not implemented');
161
+ }
105
162
  };
163
+
164
+ export { discardDocumentDrafts, getBatchToDiscard };
106
165
  //# sourceMappingURL=5.0.0-discard-drafts.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"5.0.0-discard-drafts.mjs","sources":["../../../src/migrations/database/5.0.0-discard-drafts.ts"],"sourcesContent":["/**\n * This migration is responsible for creating the draft counterpart for all the entries that were in a published state.\n *\n * In v4, entries could either be in a draft or published state, but not both at the same time.\n * In v5, we introduced the concept of document, and an entry can be in a draft or published state.\n *\n * This means the migration needs to create the draft counterpart if an entry was published.\n *\n * This migration performs the following steps:\n * 1. Creates draft entries for all published entries, without it's components, dynamic zones or relations.\n * 2. Using the document service, discard those same drafts to copy its relations.\n */\n\n/* eslint-disable no-continue */\nimport type { UID } from '@strapi/types';\nimport type { Database, Migration } from '@strapi/database';\nimport { async, contentTypes } from '@strapi/utils';\nimport { createDocumentService } from '../../services/document-service';\n\ntype DocumentVersion = { documentId: string; locale: string };\ntype Knex = Parameters<Migration['up']>[0];\n\n/**\n * Check if the model has draft and publish enabled.\n */\nconst hasDraftAndPublish = async (trx: Knex, meta: any) => {\n const hasTable = await trx.schema.hasTable(meta.tableName);\n\n if (!hasTable) {\n return false;\n }\n\n const uid = meta.uid as UID.ContentType;\n const model = strapi.getModel(uid);\n const hasDP = contentTypes.hasDraftAndPublish(model);\n if (!hasDP) {\n return false;\n }\n\n return true;\n};\n\n/**\n * Copy all the published entries to draft entries, without it's components, dynamic zones or relations.\n * This ensures all necessary draft's exist before copying it's relations.\n */\nasync function copyPublishedEntriesToDraft({\n db,\n trx,\n uid,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n}) {\n // Extract all scalar attributes to use in the insert query\n const meta = db.metadata.get(uid);\n\n // Get scalar attributes that will be copied over the new draft\n const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute: any) => {\n if (['id'].includes(attribute.columnName)) {\n return acc;\n }\n\n if (contentTypes.isScalarAttribute(attribute)) {\n acc.push(attribute.columnName);\n }\n\n return acc;\n }, [] as string[]);\n\n /**\n * Query to copy the published entries into draft entries.\n *\n * INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n * SELECT columnName1, columnName2, columnName3, ...\n * FROM tableName\n */\n await trx\n // INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n .into(\n trx.raw(`?? (${scalarAttributes.map(() => `??`).join(', ')})`, [\n meta.tableName,\n ...scalarAttributes,\n ])\n )\n .insert((subQb: typeof trx) => {\n // SELECT columnName1, columnName2, columnName3, ...\n subQb\n .select(\n ...scalarAttributes.map((att: string) => {\n // Override 'publishedAt' and 'updatedAt' attributes\n if (att === 'published_at') {\n return trx.raw('NULL as ??', 'published_at');\n }\n\n return att;\n })\n )\n .from(meta.tableName)\n // Only select entries that were published\n .whereNotNull('published_at');\n });\n}\n\n/**\n * Load a batch of versions to discard.\n *\n * Versions with only a draft version will be ignored.\n * Only versions with a published version (which always have a draft version) will be discarded.\n */\nexport async function* getBatchToDiscard({\n db,\n trx,\n uid,\n batchSize = 1000,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n batchSize?: number;\n}) {\n let offset = 0;\n let hasMore = true;\n\n while (hasMore) {\n // Look for the published entries to discard\n const batch: DocumentVersion[] = await db\n .queryBuilder(uid)\n .select(['id', 'documentId', 'locale'])\n .where({ publishedAt: { $ne: null } })\n .limit(batchSize)\n .offset(offset)\n .orderBy('id')\n .transacting(trx)\n .execute();\n\n if (batch.length < batchSize) {\n hasMore = false;\n }\n\n offset += batchSize;\n yield batch;\n }\n}\n\n/**\n * 2 pass migration to create the draft entries for all the published entries.\n * And then discard the drafts to copy the relations.\n */\nconst migrateUp = async (trx: Knex, db: Database) => {\n const dpModels = [];\n for (const meta of db.metadata.values()) {\n const hasDP = await hasDraftAndPublish(trx, meta);\n if (hasDP) {\n dpModels.push(meta);\n }\n }\n\n /**\n * Create plain draft entries for all the entries that were published.\n */\n for (const model of dpModels) {\n await copyPublishedEntriesToDraft({ db, trx, uid: model.uid });\n }\n\n /**\n * Discard the drafts will copy the relations from the published entries to the newly created drafts.\n *\n * Load a batch of entries (batched to prevent loading millions of rows at once ),\n * and discard them using the document service.\n *\n * NOTE: This is using a custom document service without any validations,\n * to prevent the migration from failing if users already had invalid data in V4.\n * E.g. @see https://github.com/strapi/strapi/issues/21583\n */\n const documentService = createDocumentService(strapi, {\n async validateEntityCreation(_, data) {\n return data;\n },\n async validateEntityUpdate(_, data) {\n // Data can be partially empty on partial updates\n // This migration doesn't trigger any update (or partial update),\n // so it's safe to return the data as is.\n return data as any;\n },\n });\n\n for (const model of dpModels) {\n const discardDraft = async (entry: DocumentVersion) =>\n documentService(model.uid as UID.ContentType).discardDraft({\n documentId: entry.documentId,\n locale: entry.locale,\n });\n\n for await (const batch of getBatchToDiscard({ db, trx, uid: model.uid })) {\n await async.map(batch, discardDraft, { concurrency: 10 });\n }\n }\n};\n\nexport const discardDocumentDrafts: Migration = {\n name: 'core::5.0.0-discard-drafts',\n async up(trx, db) {\n await migrateUp(trx, db);\n },\n async down() {\n throw new Error('not implemented');\n },\n};\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"5.0.0-discard-drafts.mjs","sources":["../../../src/migrations/database/5.0.0-discard-drafts.ts"],"sourcesContent":["/**\n * This migration is responsible for creating the draft counterpart for all the entries that were in a published state.\n *\n * In v4, entries could either be in a draft or published state, but not both at the same time.\n * In v5, we introduced the concept of document, and an entry can be in a draft or published state.\n *\n * This means the migration needs to create the draft counterpart if an entry was published.\n *\n * This migration performs the following steps:\n * 1. Creates draft entries for all published entries, without it's components, dynamic zones or relations.\n * 2. Using the document service, discard those same drafts to copy its relations.\n */\n\n/* eslint-disable no-continue */\nimport type { UID } from '@strapi/types';\nimport type { Database, Migration } from '@strapi/database';\nimport { async, contentTypes } from '@strapi/utils';\nimport { createDocumentService } from '../../services/document-service';\n\ntype DocumentVersion = { documentId: string; locale: string };\ntype Knex = Parameters<Migration['up']>[0];\n\n/**\n * Check if the model has draft and publish enabled.\n */\nconst hasDraftAndPublish = async (trx: Knex, meta: any) => {\n const hasTable = await trx.schema.hasTable(meta.tableName);\n\n if (!hasTable) {\n return false;\n }\n\n const uid = meta.uid as UID.ContentType;\n const model = strapi.getModel(uid);\n const hasDP = contentTypes.hasDraftAndPublish(model);\n if (!hasDP) {\n return false;\n }\n\n return true;\n};\n\n/**\n * Copy all the published entries to draft entries, without it's components, dynamic zones or relations.\n * This ensures all necessary draft's exist before copying it's relations.\n */\nasync function copyPublishedEntriesToDraft({\n db,\n trx,\n uid,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n}) {\n // Extract all scalar attributes to use in the insert query\n const meta = db.metadata.get(uid);\n\n // Get scalar attributes that will be copied over the new draft\n const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute: any) => {\n if (['id'].includes(attribute.columnName)) {\n return acc;\n }\n\n if (contentTypes.isScalarAttribute(attribute)) {\n acc.push(attribute.columnName);\n }\n\n return acc;\n }, [] as string[]);\n\n /**\n * Query to copy the published entries into draft entries.\n *\n * INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n * SELECT columnName1, columnName2, columnName3, ...\n * FROM tableName\n */\n await trx\n // INSERT INTO tableName (columnName1, columnName2, columnName3, ...)\n .into(\n trx.raw(`?? (${scalarAttributes.map(() => `??`).join(', ')})`, [\n meta.tableName,\n ...scalarAttributes,\n ])\n )\n .insert((subQb: typeof trx) => {\n // SELECT columnName1, columnName2, columnName3, ...\n subQb\n .select(\n ...scalarAttributes.map((att: string) => {\n // Override 'publishedAt' and 'updatedAt' attributes\n if (att === 'published_at') {\n return trx.raw('NULL as ??', 'published_at');\n }\n\n return att;\n })\n )\n .from(meta.tableName)\n // Only select entries that were published\n .whereNotNull('published_at');\n });\n}\n\n/**\n * Load a batch of versions to discard.\n *\n * Versions with only a draft version will be ignored.\n * Only versions with a published version (which always have a draft version) will be discarded.\n */\nexport async function* getBatchToDiscard({\n db,\n trx,\n uid,\n defaultBatchSize = 1000,\n}: {\n db: Database;\n trx: Knex;\n uid: string;\n defaultBatchSize?: number;\n}) {\n const client = db.config.connection.client;\n const isSQLite =\n typeof client === 'string' && ['sqlite', 'sqlite3', 'better-sqlite3'].includes(client);\n\n // The SQLite documentation states that the maximum number of terms in a\n // compound SELECT statement is 500 by default.\n // See: https://www.sqlite.org/limits.html\n // To ensure a successful migration, we limit the batch size to 500 for SQLite.\n const batchSize = isSQLite ? Math.min(defaultBatchSize, 500) : defaultBatchSize;\n let offset = 0;\n let hasMore = true;\n\n while (hasMore) {\n // Look for the published entries to discard\n const batch: DocumentVersion[] = await db\n .queryBuilder(uid)\n .select(['id', 'documentId', 'locale'])\n .where({ publishedAt: { $ne: null } })\n .limit(batchSize)\n .offset(offset)\n .orderBy('id')\n .transacting(trx)\n .execute();\n\n if (batch.length < batchSize) {\n hasMore = false;\n }\n\n offset += batchSize;\n yield batch;\n }\n}\n\n/**\n * 2 pass migration to create the draft entries for all the published entries.\n * And then discard the drafts to copy the relations.\n */\nconst migrateUp = async (trx: Knex, db: Database) => {\n const dpModels = [];\n for (const meta of db.metadata.values()) {\n const hasDP = await hasDraftAndPublish(trx, meta);\n if (hasDP) {\n dpModels.push(meta);\n }\n }\n\n /**\n * Create plain draft entries for all the entries that were published.\n */\n for (const model of dpModels) {\n await copyPublishedEntriesToDraft({ db, trx, uid: model.uid });\n }\n\n /**\n * Discard the drafts will copy the relations from the published entries to the newly created drafts.\n *\n * Load a batch of entries (batched to prevent loading millions of rows at once ),\n * and discard them using the document service.\n *\n * NOTE: This is using a custom document service without any validations,\n * to prevent the migration from failing if users already had invalid data in V4.\n * E.g. @see https://github.com/strapi/strapi/issues/21583\n */\n const documentService = createDocumentService(strapi, {\n async validateEntityCreation(_, data) {\n return data;\n },\n async validateEntityUpdate(_, data) {\n // Data can be partially empty on partial updates\n // This migration doesn't trigger any update (or partial update),\n // so it's safe to return the data as is.\n return data as any;\n },\n });\n\n for (const model of dpModels) {\n const discardDraft = async (entry: DocumentVersion) =>\n documentService(model.uid as UID.ContentType).discardDraft({\n documentId: entry.documentId,\n locale: entry.locale,\n });\n\n for await (const batch of getBatchToDiscard({ db, trx, uid: model.uid })) {\n // NOTE: concurrency had to be disabled to prevent a race condition with self-references\n // TODO: improve performance in a safe way\n await async.map(batch, discardDraft, { concurrency: 1 });\n }\n }\n};\n\nexport const discardDocumentDrafts: Migration = {\n name: 'core::5.0.0-discard-drafts',\n async up(trx, db) {\n await migrateUp(trx, db);\n },\n async down() {\n throw new Error('not implemented');\n },\n};\n"],"names":["hasDraftAndPublish","trx","meta","hasTable","schema","tableName","uid","model","strapi","getModel","hasDP","contentTypes","copyPublishedEntriesToDraft","db","metadata","get","scalarAttributes","Object","values","attributes","reduce","acc","attribute","includes","columnName","isScalarAttribute","push","into","raw","map","join","insert","subQb","select","att","from","whereNotNull","getBatchToDiscard","defaultBatchSize","client","config","connection","isSQLite","batchSize","Math","min","offset","hasMore","batch","queryBuilder","where","publishedAt","$ne","limit","orderBy","transacting","execute","length","migrateUp","dpModels","documentService","createDocumentService","validateEntityCreation","_","data","validateEntityUpdate","discardDraft","entry","documentId","locale","async","concurrency","discardDocumentDrafts","name","up","down","Error"],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Schema } from '@strapi/types';
1
+ import type { Schema } from '@strapi/types';
2
2
  export interface Input {
3
3
  oldContentTypes: Record<string, Schema.ContentType>;
4
4
  contentTypes: Record<string, Schema.ContentType>;
@@ -1 +1 @@
1
- {"version":3,"file":"draft-publish.d.ts","sourceRoot":"","sources":["../../src/migrations/draft-publish.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAIvC,MAAM,WAAW,KAAK;IACpB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACpD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;CAClD;AAED;;;;;;;GAOG;AACH,QAAA,MAAM,qBAAqB,sCAA6C,KAAK,kBAoC5E,CAAC;AAEF,QAAA,MAAM,sBAAsB,sCAA6C,KAAK,kBAqB7E,CAAC;AAEF,OAAO,EAAE,qBAAqB,IAAI,MAAM,EAAE,sBAAsB,IAAI,OAAO,EAAE,CAAC"}
1
+ {"version":3,"file":"draft-publish.d.ts","sourceRoot":"","sources":["../../src/migrations/draft-publish.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAI5C,MAAM,WAAW,KAAK;IACpB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACpD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;CAClD;AAED;;;;;;;GAOG;AACH,QAAA,MAAM,qBAAqB,sCAA6C,KAAK,kBAoC5E,CAAC;AAEF,QAAA,MAAM,sBAAsB,sCAA6C,KAAK,kBAqB7E,CAAC;AAEF,OAAO,EAAE,qBAAqB,IAAI,MAAM,EAAE,sBAAsB,IAAI,OAAO,EAAE,CAAC"}