@paroicms/server 1.90.0 → 1.91.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 (257) hide show
  1. package/dist/admin-backend/account/account.formatters.js.map +1 -0
  2. package/dist/{admin-ui-backend → admin-backend}/account/account.queries.d.ts +1 -13
  3. package/dist/{admin-ui-backend → admin-backend}/account/account.queries.js +93 -54
  4. package/dist/admin-backend/account/account.queries.js.map +1 -0
  5. package/dist/admin-backend/account/account.resolver.js.map +1 -0
  6. package/dist/admin-backend/auth/auth.helper.js.map +1 -0
  7. package/dist/{admin-ui-backend → admin-backend}/auth/auth.service.js +12 -9
  8. package/dist/admin-backend/auth/auth.service.js.map +1 -0
  9. package/dist/admin-backend/auth/auth.types.js.map +1 -0
  10. package/dist/{admin-ui-backend → admin-backend}/backup/backup.controller.js +7 -2
  11. package/dist/admin-backend/backup/backup.controller.js.map +1 -0
  12. package/dist/admin-backend/backup/backup.helper.js.map +1 -0
  13. package/dist/admin-backend/backup/backup.resolver.js.map +1 -0
  14. package/dist/admin-backend/document/document.helper.js.map +1 -0
  15. package/dist/{admin-ui-backend → admin-backend}/document/document.resolver.extend.js +2 -2
  16. package/dist/admin-backend/document/document.resolver.extend.js.map +1 -0
  17. package/dist/{admin-ui-backend → admin-backend}/document/document.resolver.js +7 -8
  18. package/dist/admin-backend/document/document.resolver.js.map +1 -0
  19. package/dist/{admin-ui-backend → admin-backend}/document/load-documents.queries.js +57 -20
  20. package/dist/admin-backend/document/load-documents.queries.js.map +1 -0
  21. package/dist/{admin-ui-backend → admin-backend}/document/save-documents.queries.js +19 -5
  22. package/dist/admin-backend/document/save-documents.queries.js.map +1 -0
  23. package/dist/admin-backend/fields/_fields.helpers.js.map +1 -0
  24. package/dist/admin-backend/fields/fields.resolver.js.map +1 -0
  25. package/dist/{admin-ui-backend → admin-backend}/fields/labeling.queries.js +25 -9
  26. package/dist/admin-backend/fields/labeling.queries.js.map +1 -0
  27. package/dist/{admin-ui-backend → admin-backend}/fields/load-fields-of.queries.js +8 -2
  28. package/dist/admin-backend/fields/load-fields-of.queries.js.map +1 -0
  29. package/dist/{admin-ui-backend → admin-backend}/fields/load-fields.queries.js +25 -9
  30. package/dist/admin-backend/fields/load-fields.queries.js.map +1 -0
  31. package/dist/admin-backend/fields/preprocess-fields.js.map +1 -0
  32. package/dist/{admin-ui-backend → admin-backend}/fields/save-fields.queries.js +19 -12
  33. package/dist/admin-backend/fields/save-fields.queries.js.map +1 -0
  34. package/dist/{admin-ui-backend → admin-backend}/login/login.controller.js +18 -8
  35. package/dist/admin-backend/login/login.controller.js.map +1 -0
  36. package/dist/admin-backend/media/add-media-to-node.js.map +1 -0
  37. package/dist/{admin-ui-backend → admin-backend}/media/media-upload.controller.js +16 -5
  38. package/dist/admin-backend/media/media-upload.controller.js.map +1 -0
  39. package/dist/admin-backend/media/media.resolver.extend.js.map +1 -0
  40. package/dist/admin-backend/media/media.resolver.js.map +1 -0
  41. package/dist/{admin-ui-backend → admin-backend}/node/node.queries.js +65 -14
  42. package/dist/admin-backend/node/node.queries.js.map +1 -0
  43. package/dist/admin-backend/node/node.resolver.extend.js.map +1 -0
  44. package/dist/admin-backend/node/node.resolver.js.map +1 -0
  45. package/dist/{admin-ui-backend → admin-backend}/node/ordered-node.queries.js +10 -5
  46. package/dist/admin-backend/node/ordered-node.queries.js.map +1 -0
  47. package/dist/admin-backend/nodel/nodel-wrap.formatters.js.map +1 -0
  48. package/dist/{admin-ui-backend → admin-backend}/nodel/nodel-wrap.resolver.js +9 -5
  49. package/dist/admin-backend/nodel/nodel-wrap.resolver.js.map +1 -0
  50. package/dist/{admin-ui-backend → admin-backend}/nodel/nodel.queries.js +60 -28
  51. package/dist/admin-backend/nodel/nodel.queries.js.map +1 -0
  52. package/dist/{admin-ui-backend → admin-backend}/part/part-node.queries.js +12 -4
  53. package/dist/admin-backend/part/part-node.queries.js.map +1 -0
  54. package/dist/{admin-ui-backend → admin-backend}/part/part.queries.js +106 -43
  55. package/dist/admin-backend/part/part.queries.js.map +1 -0
  56. package/dist/admin-backend/part/part.resolver.extend.js.map +1 -0
  57. package/dist/admin-backend/part/part.resolver.js.map +1 -0
  58. package/dist/admin-backend/site-constants/site-constants.resolver.js.map +1 -0
  59. package/dist/admin-backend/unprotected/unprotected.resolver.js.map +1 -0
  60. package/dist/common/data-format.d.ts +20 -11
  61. package/dist/common/data-format.js +15 -33
  62. package/dist/common/data-format.js.map +1 -1
  63. package/dist/common/text-cache.js +1 -1
  64. package/dist/common/text-cache.js.map +1 -1
  65. package/dist/context.js +2 -2
  66. package/dist/context.js.map +1 -1
  67. package/dist/express/route-handler-wrapper.js +1 -1
  68. package/dist/express/route-handler-wrapper.js.map +1 -1
  69. package/dist/express/serve-file.js +1 -1
  70. package/dist/express/serve-file.js.map +1 -1
  71. package/dist/express/site-middleware.js +3 -3
  72. package/dist/express/site-middleware.js.map +1 -1
  73. package/dist/express/static-files.req-handler.js +1 -1
  74. package/dist/express/static-files.req-handler.js.map +1 -1
  75. package/dist/graphql/apollo-server-init.js +14 -14
  76. package/dist/graphql/apollo-server-init.js.map +1 -1
  77. package/dist/helpers/make-backend-plugin-service.js +2 -3
  78. package/dist/helpers/make-backend-plugin-service.js.map +1 -1
  79. package/dist/helpers/running-instance-connector.js +7 -7
  80. package/dist/helpers/running-instance-connector.js.map +1 -1
  81. package/dist/index.js +1 -1
  82. package/dist/index.js.map +1 -1
  83. package/dist/liquidjs-tools/liquidjs-utils.d.ts +1 -1
  84. package/dist/liquidjs-tools/liquidjs-utils.js +1 -1
  85. package/dist/liquidjs-tools/liquidjs-utils.js.map +1 -1
  86. package/dist/oauth/account-auth.service.d.ts +1 -1
  87. package/dist/oauth/oauth2-client.controller.js +1 -1
  88. package/dist/oauth/oauth2-client.controller.js.map +1 -1
  89. package/dist/protected-site/protected-access-token.js +1 -1
  90. package/dist/protected-site/protected-access-token.js.map +1 -1
  91. package/dist/public-api/password-reset/password-reset.controller.js +22 -31
  92. package/dist/public-api/password-reset/password-reset.controller.js.map +1 -1
  93. package/dist/public-api/password-reset/password-reset.service.js +18 -10
  94. package/dist/public-api/password-reset/password-reset.service.js.map +1 -1
  95. package/dist/public-api/public-api-rendering.js +6 -5
  96. package/dist/public-api/public-api-rendering.js.map +1 -1
  97. package/dist/public-api/search-text/search-text.queries.d.ts +1 -1
  98. package/dist/public-api/search-text/search-text.queries.js +6 -2
  99. package/dist/public-api/search-text/search-text.queries.js.map +1 -1
  100. package/dist/rendered-site/feed/feed-generator.d.ts +0 -12
  101. package/dist/rendered-site/feed/feed-generator.js +27 -20
  102. package/dist/rendered-site/feed/feed-generator.js.map +1 -1
  103. package/dist/rendered-site/liquidjs-filters/format-date.js +2 -3
  104. package/dist/rendered-site/liquidjs-filters/format-date.js.map +1 -1
  105. package/dist/rendered-site/liquidjs-filters/format-number.d.ts +1 -1
  106. package/dist/rendered-site/liquidjs-filters/format-number.js +9 -5
  107. package/dist/rendered-site/liquidjs-filters/format-number.js.map +1 -1
  108. package/dist/rendered-site/liquidjs-filters/head-tags-filter.js +10 -5
  109. package/dist/rendered-site/liquidjs-filters/head-tags-filter.js.map +1 -1
  110. package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js +2 -3
  111. package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js.map +1 -1
  112. package/dist/rendered-site/liquidjs-filters/make-excerpt.js +6 -2
  113. package/dist/rendered-site/liquidjs-filters/make-excerpt.js.map +1 -1
  114. package/dist/rendered-site/liquidjs-filters/obfuscate.js +3 -4
  115. package/dist/rendered-site/liquidjs-filters/obfuscate.js.map +1 -1
  116. package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js +4 -3
  117. package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js.map +1 -1
  118. package/dist/rendered-site/liquidjs-filters/translate-filter.js +3 -2
  119. package/dist/rendered-site/liquidjs-filters/translate-filter.js.map +1 -1
  120. package/dist/rendered-site/liquidjs-tags/get-doc-tag.js +13 -8
  121. package/dist/rendered-site/liquidjs-tags/get-doc-tag.js.map +1 -1
  122. package/dist/rendered-site/liquidjs-tags/get-docs-tag.js +23 -13
  123. package/dist/rendered-site/liquidjs-tags/get-docs-tag.js.map +1 -1
  124. package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js +22 -11
  125. package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js.map +1 -1
  126. package/dist/rendered-site/liquidjs-tags/grouping-media-query.js +1 -1
  127. package/dist/rendered-site/liquidjs-tags/grouping-media-query.js.map +1 -1
  128. package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.d.ts +1 -0
  129. package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.js +11 -2
  130. package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.js.map +1 -1
  131. package/dist/rendered-site/liquidjs-tags/use-image-tag.js +24 -13
  132. package/dist/rendered-site/liquidjs-tags/use-image-tag.js.map +1 -1
  133. package/dist/rendered-site/page-route/make-url.d.ts +1 -1
  134. package/dist/rendered-site/page-route/make-url.js +12 -7
  135. package/dist/rendered-site/page-route/make-url.js.map +1 -1
  136. package/dist/rendering-payload/breadcrumb.queries.js +1 -1
  137. package/dist/rendering-payload/breadcrumb.queries.js.map +1 -1
  138. package/dist/rendering-payload/create-doc-drop.d.ts +1 -1
  139. package/dist/rendering-payload/create-doc-drop.js +11 -7
  140. package/dist/rendering-payload/create-doc-drop.js.map +1 -1
  141. package/dist/rendering-payload/doc-values.queries.d.ts +2 -3
  142. package/dist/rendering-payload/doc-values.queries.js +41 -15
  143. package/dist/rendering-payload/doc-values.queries.js.map +1 -1
  144. package/dist/rendering-payload/excerpt.queries.js +9 -3
  145. package/dist/rendering-payload/excerpt.queries.js.map +1 -1
  146. package/dist/rendering-payload/field-values.js +3 -3
  147. package/dist/rendering-payload/field-values.js.map +1 -1
  148. package/dist/rendering-payload/get-siblings.queries.js +19 -7
  149. package/dist/rendering-payload/get-siblings.queries.js.map +1 -1
  150. package/dist/rendering-payload/parts.queries.d.ts +1 -1
  151. package/dist/rendering-payload/parts.queries.js +59 -25
  152. package/dist/rendering-payload/parts.queries.js.map +1 -1
  153. package/dist/rendering-payload/translations.queries.js +7 -3
  154. package/dist/rendering-payload/translations.queries.js.map +1 -1
  155. package/dist/site-context/load-site-context.js +1 -1
  156. package/dist/site-context/load-site-context.js.map +1 -1
  157. package/dist/site-context/site-values-for-site-context.js +1 -1
  158. package/dist/site-context/site-values-for-site-context.js.map +1 -1
  159. package/dist/tsconfig.tsbuildinfo +1 -1
  160. package/package.json +13 -13
  161. package/dist/admin-ui-backend/account/account.formatters.js.map +0 -1
  162. package/dist/admin-ui-backend/account/account.queries.js.map +0 -1
  163. package/dist/admin-ui-backend/account/account.resolver.js.map +0 -1
  164. package/dist/admin-ui-backend/auth/auth.helper.js.map +0 -1
  165. package/dist/admin-ui-backend/auth/auth.service.js.map +0 -1
  166. package/dist/admin-ui-backend/auth/auth.types.js.map +0 -1
  167. package/dist/admin-ui-backend/backup/backup.controller.js.map +0 -1
  168. package/dist/admin-ui-backend/backup/backup.helper.js.map +0 -1
  169. package/dist/admin-ui-backend/backup/backup.resolver.js.map +0 -1
  170. package/dist/admin-ui-backend/document/document.helper.js.map +0 -1
  171. package/dist/admin-ui-backend/document/document.resolver.extend.js.map +0 -1
  172. package/dist/admin-ui-backend/document/document.resolver.js.map +0 -1
  173. package/dist/admin-ui-backend/document/load-documents.queries.js.map +0 -1
  174. package/dist/admin-ui-backend/document/save-documents.queries.js.map +0 -1
  175. package/dist/admin-ui-backend/fields/_fields.helpers.js.map +0 -1
  176. package/dist/admin-ui-backend/fields/fields.resolver.js.map +0 -1
  177. package/dist/admin-ui-backend/fields/labeling.queries.js.map +0 -1
  178. package/dist/admin-ui-backend/fields/load-fields-of.queries.js.map +0 -1
  179. package/dist/admin-ui-backend/fields/load-fields.queries.js.map +0 -1
  180. package/dist/admin-ui-backend/fields/preprocess-fields.js.map +0 -1
  181. package/dist/admin-ui-backend/fields/save-fields.queries.js.map +0 -1
  182. package/dist/admin-ui-backend/login/login.controller.js.map +0 -1
  183. package/dist/admin-ui-backend/media/add-media-to-node.js.map +0 -1
  184. package/dist/admin-ui-backend/media/media-upload.controller.js.map +0 -1
  185. package/dist/admin-ui-backend/media/media.resolver.extend.js.map +0 -1
  186. package/dist/admin-ui-backend/media/media.resolver.js.map +0 -1
  187. package/dist/admin-ui-backend/node/node.queries.js.map +0 -1
  188. package/dist/admin-ui-backend/node/node.resolver.extend.js.map +0 -1
  189. package/dist/admin-ui-backend/node/node.resolver.js.map +0 -1
  190. package/dist/admin-ui-backend/node/ordered-node.queries.js.map +0 -1
  191. package/dist/admin-ui-backend/nodel/nodel-wrap.formatters.js.map +0 -1
  192. package/dist/admin-ui-backend/nodel/nodel-wrap.resolver.js.map +0 -1
  193. package/dist/admin-ui-backend/nodel/nodel.queries.js.map +0 -1
  194. package/dist/admin-ui-backend/part/part-node.queries.js.map +0 -1
  195. package/dist/admin-ui-backend/part/part.queries.js.map +0 -1
  196. package/dist/admin-ui-backend/part/part.resolver.extend.js.map +0 -1
  197. package/dist/admin-ui-backend/part/part.resolver.js.map +0 -1
  198. package/dist/admin-ui-backend/site-constants/site-constants.resolver.js.map +0 -1
  199. package/dist/admin-ui-backend/unprotected/unprotected.resolver.js.map +0 -1
  200. /package/dist/{admin-ui-backend → admin-backend}/account/account.formatters.d.ts +0 -0
  201. /package/dist/{admin-ui-backend → admin-backend}/account/account.formatters.js +0 -0
  202. /package/dist/{admin-ui-backend → admin-backend}/account/account.resolver.d.ts +0 -0
  203. /package/dist/{admin-ui-backend → admin-backend}/account/account.resolver.js +0 -0
  204. /package/dist/{admin-ui-backend → admin-backend}/auth/auth.helper.d.ts +0 -0
  205. /package/dist/{admin-ui-backend → admin-backend}/auth/auth.helper.js +0 -0
  206. /package/dist/{admin-ui-backend → admin-backend}/auth/auth.service.d.ts +0 -0
  207. /package/dist/{admin-ui-backend → admin-backend}/auth/auth.types.d.ts +0 -0
  208. /package/dist/{admin-ui-backend → admin-backend}/auth/auth.types.js +0 -0
  209. /package/dist/{admin-ui-backend → admin-backend}/backup/backup.controller.d.ts +0 -0
  210. /package/dist/{admin-ui-backend → admin-backend}/backup/backup.helper.d.ts +0 -0
  211. /package/dist/{admin-ui-backend → admin-backend}/backup/backup.helper.js +0 -0
  212. /package/dist/{admin-ui-backend → admin-backend}/backup/backup.resolver.d.ts +0 -0
  213. /package/dist/{admin-ui-backend → admin-backend}/backup/backup.resolver.js +0 -0
  214. /package/dist/{admin-ui-backend → admin-backend}/document/document.helper.d.ts +0 -0
  215. /package/dist/{admin-ui-backend → admin-backend}/document/document.helper.js +0 -0
  216. /package/dist/{admin-ui-backend → admin-backend}/document/document.resolver.d.ts +0 -0
  217. /package/dist/{admin-ui-backend → admin-backend}/document/document.resolver.extend.d.ts +0 -0
  218. /package/dist/{admin-ui-backend → admin-backend}/document/load-documents.queries.d.ts +0 -0
  219. /package/dist/{admin-ui-backend → admin-backend}/document/save-documents.queries.d.ts +0 -0
  220. /package/dist/{admin-ui-backend → admin-backend}/fields/_fields.helpers.d.ts +0 -0
  221. /package/dist/{admin-ui-backend → admin-backend}/fields/_fields.helpers.js +0 -0
  222. /package/dist/{admin-ui-backend → admin-backend}/fields/fields.resolver.d.ts +0 -0
  223. /package/dist/{admin-ui-backend → admin-backend}/fields/fields.resolver.js +0 -0
  224. /package/dist/{admin-ui-backend → admin-backend}/fields/labeling.queries.d.ts +0 -0
  225. /package/dist/{admin-ui-backend → admin-backend}/fields/load-fields-of.queries.d.ts +0 -0
  226. /package/dist/{admin-ui-backend → admin-backend}/fields/load-fields.queries.d.ts +0 -0
  227. /package/dist/{admin-ui-backend → admin-backend}/fields/preprocess-fields.d.ts +0 -0
  228. /package/dist/{admin-ui-backend → admin-backend}/fields/preprocess-fields.js +0 -0
  229. /package/dist/{admin-ui-backend → admin-backend}/fields/save-fields.queries.d.ts +0 -0
  230. /package/dist/{admin-ui-backend → admin-backend}/login/login.controller.d.ts +0 -0
  231. /package/dist/{admin-ui-backend → admin-backend}/media/add-media-to-node.d.ts +0 -0
  232. /package/dist/{admin-ui-backend → admin-backend}/media/add-media-to-node.js +0 -0
  233. /package/dist/{admin-ui-backend → admin-backend}/media/media-upload.controller.d.ts +0 -0
  234. /package/dist/{admin-ui-backend → admin-backend}/media/media.resolver.d.ts +0 -0
  235. /package/dist/{admin-ui-backend → admin-backend}/media/media.resolver.extend.d.ts +0 -0
  236. /package/dist/{admin-ui-backend → admin-backend}/media/media.resolver.extend.js +0 -0
  237. /package/dist/{admin-ui-backend → admin-backend}/media/media.resolver.js +0 -0
  238. /package/dist/{admin-ui-backend → admin-backend}/node/node.queries.d.ts +0 -0
  239. /package/dist/{admin-ui-backend → admin-backend}/node/node.resolver.d.ts +0 -0
  240. /package/dist/{admin-ui-backend → admin-backend}/node/node.resolver.extend.d.ts +0 -0
  241. /package/dist/{admin-ui-backend → admin-backend}/node/node.resolver.extend.js +0 -0
  242. /package/dist/{admin-ui-backend → admin-backend}/node/node.resolver.js +0 -0
  243. /package/dist/{admin-ui-backend → admin-backend}/node/ordered-node.queries.d.ts +0 -0
  244. /package/dist/{admin-ui-backend → admin-backend}/nodel/nodel-wrap.formatters.d.ts +0 -0
  245. /package/dist/{admin-ui-backend → admin-backend}/nodel/nodel-wrap.formatters.js +0 -0
  246. /package/dist/{admin-ui-backend → admin-backend}/nodel/nodel-wrap.resolver.d.ts +0 -0
  247. /package/dist/{admin-ui-backend → admin-backend}/nodel/nodel.queries.d.ts +0 -0
  248. /package/dist/{admin-ui-backend → admin-backend}/part/part-node.queries.d.ts +0 -0
  249. /package/dist/{admin-ui-backend → admin-backend}/part/part.queries.d.ts +0 -0
  250. /package/dist/{admin-ui-backend → admin-backend}/part/part.resolver.d.ts +0 -0
  251. /package/dist/{admin-ui-backend → admin-backend}/part/part.resolver.extend.d.ts +0 -0
  252. /package/dist/{admin-ui-backend → admin-backend}/part/part.resolver.extend.js +0 -0
  253. /package/dist/{admin-ui-backend → admin-backend}/part/part.resolver.js +0 -0
  254. /package/dist/{admin-ui-backend → admin-backend}/site-constants/site-constants.resolver.d.ts +0 -0
  255. /package/dist/{admin-ui-backend → admin-backend}/site-constants/site-constants.resolver.js +0 -0
  256. /package/dist/{admin-ui-backend → admin-backend}/unprotected/unprotected.resolver.d.ts +0 -0
  257. /package/dist/{admin-ui-backend → admin-backend}/unprotected/unprotected.resolver.js +0 -0
@@ -1,7 +1,7 @@
1
- import { nbVal, strVal } from "@paroi/data-formatters-lib";
2
1
  import { createNode } from "@paroicms/connector";
3
2
  import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
4
3
  import { ApiError } from "@paroicms/public-server-lib";
4
+ import { type } from "arktype";
5
5
  import { getHandleOfFeaturedImage } from "../../common/media-handles.helpers.js";
6
6
  import { invalidateDocumentInCache, invalidateDocumentRelationCache, invalidateMultipleDocumentsInCache, } from "../../common/text-cache.js";
7
7
  import { countNodeChildrenOf, getTypeNameOf } from "../node/node.queries.js";
@@ -80,6 +80,12 @@ export async function createNodeWithDocument(siteContext, { parentId, values, fo
80
80
  }
81
81
  return documentId;
82
82
  }
83
+ const DeleteDocumentNodeRowAT = type({
84
+ id: "number",
85
+ "+": "reject",
86
+ }).pipe((r) => ({
87
+ id: String(r.id),
88
+ }));
83
89
  export async function deleteNodeAndDocuments(siteContext, nodeId) {
84
90
  const { cn, mediaStorage } = siteContext;
85
91
  const parentDocumentIds = await getParentDocumentIdsOf(siteContext, { nodeId });
@@ -90,7 +96,7 @@ export async function deleteNodeAndDocuments(siteContext, nodeId) {
90
96
  .whereNotExists(function () {
91
97
  this.select(1).from("PaDocument as d").where("d.nodeId", "l.id");
92
98
  });
93
- const partNodeIds = nodeRows.map((r) => strVal(r.id));
99
+ const partNodeIds = nodeRows.map((r) => DeleteDocumentNodeRowAT.assert(r).id);
94
100
  await fullDeleteParts(partNodeIds, tx);
95
101
  await tx("PaFieldVarchar").where("nodeId", nodeId).delete();
96
102
  await tx("PaFieldText").where("nodeId", nodeId).delete();
@@ -108,6 +114,10 @@ export async function deleteNodeAndDocuments(siteContext, nodeId) {
108
114
  fully: true,
109
115
  });
110
116
  }
117
+ const DeleteDocumentCountRowAT = type({
118
+ cnt: "number",
119
+ "+": "reject",
120
+ });
111
121
  export async function deleteDocument(siteContext, documentId) {
112
122
  const { cn, mediaStorage } = siteContext;
113
123
  const { nodeId, language } = documentId;
@@ -117,7 +127,7 @@ export async function deleteDocument(siteContext, documentId) {
117
127
  .where("s.nodeId", nodeId)
118
128
  .andWhereNot("language", documentId.language)
119
129
  .first();
120
- const count = nbVal(countRow?.cnt);
130
+ const count = countRow ? DeleteDocumentCountRowAT.assert(countRow).cnt : 0;
121
131
  const shouldDeleteNode = count === 0;
122
132
  const { partNodeIds } = await cn.transaction(async (tx) => {
123
133
  const nodeRows = await tx("PaNode as l")
@@ -126,7 +136,7 @@ export async function deleteDocument(siteContext, documentId) {
126
136
  .whereNotExists(function () {
127
137
  this.select(1).from("PaDocument as d").where("d.nodeId", "l.id");
128
138
  });
129
- const partNodeIds = nodeRows.map((r) => strVal(r.id));
139
+ const partNodeIds = nodeRows.map((r) => DeleteDocumentNodeRowAT.assert(r).id);
130
140
  await deleteParts({
131
141
  language,
132
142
  nodeIdList: partNodeIds,
@@ -163,6 +173,10 @@ export async function deleteDocument(siteContext, documentId) {
163
173
  await siteContext.imageCache.invalidate({ mediaIds: deletedIds });
164
174
  }
165
175
  }
176
+ const DeletePartCountRowAT = type({
177
+ cnt: "number",
178
+ "+": "reject",
179
+ });
166
180
  async function deleteParts({ nodeIdList, cn, language, }) {
167
181
  if (nodeIdList.length === 0)
168
182
  return;
@@ -174,7 +188,7 @@ async function deleteParts({ nodeIdList, cn, language, }) {
174
188
  .first();
175
189
  if (!countRow)
176
190
  continue;
177
- if (nbVal(countRow.cnt) === 0) {
191
+ if (DeletePartCountRowAT.assert(countRow).cnt === 0) {
178
192
  await cn("PaFieldVarchar").where("nodeId", nodeId).delete();
179
193
  await cn("PaFieldText").where("nodeId", nodeId).delete();
180
194
  await cn("PaNode").where("id", nodeId).delete();
@@ -0,0 +1 @@
1
+ {"version":3,"file":"save-documents.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/document/save-documents.queries.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"_fields.helpers.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/_fields.helpers.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe,CAC7B,QAA4B,EAC5B,SAAyC;IAEzC,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1D,IAAI,SAAS,CAAC,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fields.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/fields.resolver.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,18 @@
1
- import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
1
+ import { type } from "arktype";
2
+ const LabelingFieldRowAT = type({
3
+ field: "string",
4
+ termId: "number",
5
+ typeName: "string",
6
+ language: "string",
7
+ title: "string|null",
8
+ "+": "reject",
9
+ }).pipe((r) => ({
10
+ fieldName: r.field,
11
+ nodeId: String(r.termId),
12
+ typeName: r.typeName,
13
+ language: r.language,
14
+ title: r.title ?? undefined,
15
+ }));
2
16
  export async function loadFieldLabelingValues(siteContext, { nodeId, fieldTypes, publishedOnly, }) {
3
17
  if (fieldTypes.length === 0)
4
18
  return;
@@ -20,13 +34,7 @@ export async function loadFieldLabelingValues(siteContext, { nodeId, fieldTypes,
20
34
  query.whereRaw("o.publishDate <= current_timestamp");
21
35
  }
22
36
  const rows = await query;
23
- const fetchedTerms = rows.map((row) => ({
24
- fieldName: strVal(row.field),
25
- nodeId: strVal(row.termId),
26
- typeName: strVal(row.typeName),
27
- language: strVal(row.language),
28
- title: strValOrUndef(row.title),
29
- }));
37
+ const fetchedTerms = rows.map((row) => LabelingFieldRowAT.assert(row));
30
38
  const result = new Map();
31
39
  for (const fetchedTerm of fetchedTerms) {
32
40
  const { fieldName, nodeId, language, title, typeName } = fetchedTerm;
@@ -49,6 +57,14 @@ export async function loadFieldLabelingValues(siteContext, { nodeId, fieldTypes,
49
57
  }
50
58
  return result;
51
59
  }
60
+ const TaxonomyRowAT = type({
61
+ id: "number",
62
+ typeName: "string",
63
+ "+": "reject",
64
+ }).pipe((r) => ({
65
+ id: String(r.id),
66
+ typeName: r.typeName,
67
+ }));
52
68
  export async function saveFieldLabeling(tx, { fieldType, nodeId, termNodeIds, }) {
53
69
  await tx("PaFieldLabeling")
54
70
  .where({
@@ -66,7 +82,7 @@ export async function saveFieldLabeling(tx, { fieldType, nodeId, termNodeIds, })
66
82
  if (taxonomyRows.length !== 1) {
67
83
  throw new Error(`Invalid terms for "${fieldType.name}" field: "${termNodeIds.join()}"`);
68
84
  }
69
- const taxonomyTypeName = strVal(taxonomyRows[0].typeName);
85
+ const taxonomyTypeName = TaxonomyRowAT.assert(taxonomyRows[0]).typeName;
70
86
  if (taxonomyTypeName !== fieldType.taxonomy) {
71
87
  throw new Error(`Terms don't belong to taxonomy "${fieldType.name}"`);
72
88
  }
@@ -0,0 +1 @@
1
+ {"version":3,"file":"labeling.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/labeling.queries.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
- import { strVal } from "@paroi/data-formatters-lib";
2
1
  import { PART_DEFAULT_LIST_NAME, getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
3
2
  import { encodeNodelId, parseNodelId, } from "@paroicms/public-anywhere-lib";
4
3
  import { ApiError } from "@paroicms/public-server-lib";
4
+ import { type } from "arktype";
5
5
  import { createNoRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
6
6
  import { getTypeNameOf } from "../node/node.queries.js";
7
7
  import { getFieldTypesByNames, loadFieldValues } from "./load-fields.queries.js";
@@ -69,6 +69,12 @@ export async function getFieldValuesOfOneList(siteContext, options) {
69
69
  }
70
70
  throw new ApiError(`invalid node kind '${parentNodeType.kind}'`, 400);
71
71
  }
72
+ const FieldValuesOfListRowAT = type({
73
+ nodeId: "number",
74
+ "+": "reject",
75
+ }).pipe((r) => ({
76
+ nodeId: String(r.nodeId),
77
+ }));
72
78
  async function getFieldValuesOfList(siteContext, options) {
73
79
  const { parentNodelId, listType, fieldNames, preprocess, publishedOnly } = options;
74
80
  const { nodeId: parentNodeId, language } = parseNodelId(parentNodelId);
@@ -80,7 +86,7 @@ async function getFieldValuesOfList(siteContext, options) {
80
86
  .where("l.parentId", parentNodeId)
81
87
  .where("p.listName", listType.listName)
82
88
  .where("s.language", language);
83
- const partNodeIds = rows.map((row) => strVal(row.nodeId));
89
+ const partNodeIds = rows.map((row) => FieldValuesOfListRowAT.assert(row).nodeId);
84
90
  const result = new Map();
85
91
  for (const nodeId of partNodeIds) {
86
92
  const nodelId = encodeNodelId({ nodeId, language });
@@ -0,0 +1 @@
1
+ {"version":3,"file":"load-fields-of.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/load-fields-of.queries.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
2
1
  import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
2
+ import { type } from "arktype";
3
3
  import { getHandleOfField } from "../../common/media-handles.helpers.js";
4
4
  import { dbAnyLanguage } from "../../context.js";
5
5
  import { languageIfNodel } from "./_fields.helpers.js";
@@ -108,6 +108,16 @@ export async function loadFieldValues(siteContext, { fieldTypes, nodeId, languag
108
108
  }
109
109
  return result;
110
110
  }
111
+ const FieldVarcharRowAT = type({
112
+ field: "string",
113
+ dataType: "string",
114
+ val: "string|null",
115
+ "+": "reject",
116
+ }).pipe((data) => ({
117
+ field: data.field,
118
+ dataType: data.dataType,
119
+ val: data.val ?? undefined,
120
+ }));
111
121
  async function loadVarcharFieldValues(siteContext, options) {
112
122
  const { nodeId, language, fieldTypes } = options;
113
123
  const values = new Map();
@@ -116,14 +126,12 @@ async function loadVarcharFieldValues(siteContext, options) {
116
126
  const typeMap = new Map(fieldTypes.map((item) => [item.name, item]));
117
127
  const rows = await siteContext
118
128
  .cn("PaFieldVarchar as f")
119
- .select(["f.field as field", "f.val as val", "f.dataType as dataType"])
129
+ .select(["f.field", "f.dataType", "f.val"])
120
130
  .where("f.nodeId", nodeId)
121
131
  .whereIn("f.field", [...typeMap.keys()])
122
132
  .where("f.language", language ?? dbAnyLanguage);
123
133
  for (const row of rows) {
124
- const fieldName = strVal(row.field);
125
- const dataType = strVal(row.dataType);
126
- const val = strValOrUndef(row.val);
134
+ const { field: fieldName, dataType, val } = FieldVarcharRowAT.assert(row);
127
135
  const fieldType = typeMap.get(fieldName);
128
136
  if (!fieldType)
129
137
  throw new Error(`should have the field type of '${fieldName}'`);
@@ -134,6 +142,16 @@ async function loadVarcharFieldValues(siteContext, options) {
134
142
  }
135
143
  return values;
136
144
  }
145
+ const FieldTextRowAT = type({
146
+ field: "string",
147
+ dataType: "string",
148
+ val: "string|null",
149
+ "+": "reject",
150
+ }).pipe((data) => ({
151
+ field: data.field,
152
+ dataType: data.dataType,
153
+ val: data.val ?? undefined,
154
+ }));
137
155
  async function loadTextFieldValues(siteContext, options) {
138
156
  const { nodeId, language, fieldTypes } = options;
139
157
  const values = new Map();
@@ -142,14 +160,12 @@ async function loadTextFieldValues(siteContext, options) {
142
160
  const typeMap = new Map(fieldTypes.map((item) => [item.name, item]));
143
161
  const rows = await siteContext
144
162
  .cn("PaFieldText as f")
145
- .select(["f.field as field", "f.val as val", "f.dataType as dataType"])
163
+ .select(["f.field", "f.dataType", "f.val"])
146
164
  .where("f.nodeId", nodeId)
147
165
  .whereIn("f.field", Array.from(typeMap.keys()))
148
166
  .where("f.language", language ?? dbAnyLanguage);
149
167
  for (const row of rows) {
150
- const fieldName = strVal(row.field);
151
- const dataType = strVal(row.dataType);
152
- const rawVal = strValOrUndef(row.val);
168
+ const { field: fieldName, dataType, val: rawVal } = FieldTextRowAT.assert(row);
153
169
  const fieldType = typeMap.get(fieldName);
154
170
  if (!fieldType)
155
171
  throw new Error(`should have the field type of '${fieldName}'`);
@@ -0,0 +1 @@
1
+ {"version":3,"file":"load-fields.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/load-fields.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AASpE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,WAA+D,EAC/D,OAKC;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE;QAChD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;QACtC,QAAQ,EAAE,QAAQ,IAAI,SAAS;QAC/B,UAAU,EAAE,oBAAoB,CAAC,WAAW,EAAE;YAC5C,QAAQ,EAAE,OAAO;YACjB,UAAU,EAAE,CAAC,SAAS,CAAC;SACxB,CAAC;QACF,aAAa;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,WAA4C,EAC5C,OAAuF;IAEvF,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC;IACpF,IAAI,CAAC,UAAU;QAAE,OAAO,UAAU,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CACb,mCAAmC,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,QAAQ,GAAG,CACvF,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA+D,EAC/D,EACE,UAAU,EACV,MAAM,EACN,QAAQ,EACR,aAAa,GAOd;IAED,MAAM,MAAM,GAAgC,EAAE,CAAC;IAC/C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAE3C,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,CAClC,CAAC;IACzB,MAAM,iBAAiB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QAClE,UAAU,EAAE,cAAc;QAC1B,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,CACjC,CAAC;IACzB,IAAI,QAAQ,KAAK,SAAS,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,wBAAwB,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACnE,UAAU,EAAE,eAAe;QAC3B,MAAM;QACN,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAC1C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAC/B,CAAC;IACzB,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,WAAW,EAAE;QAC5D,UAAU,EAAE,kBAAkB;QAC9B,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAC3C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,CAC9B,CAAC;IACzB,IAAI,QAAQ,KAAK,SAAS,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CACb,wBAAwB,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClF,CAAC;IACJ,CAAC;IACD,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,WAAW,EAAE;QAC7D,UAAU,EAAE,mBAAmB;QAC/B,MAAM;QACN,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC;IACrF,MAAM,cAAc,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE;QAChE,MAAM;QACN,UAAU,EAAE,kBAAkB;QAC9B,aAAa;KACd,CAAC,CAAC;IAEH,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;QAChD,IAAI,KAAiC,CAAC;QACtC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;aAAM,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;aAAM,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5C,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACnD,CAAC;aAAM,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;YACtC,KAAK,GAAG;gBACN,CAAC,EAAE,gBAAgB,CAAC,WAAW,EAAE;oBAC/B,SAAS;oBACT,MAAM;oBACN,QAAQ,EAAE,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC;iBAC/C,CAAC;aACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,2BAA4B,SAAyB,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,WAAW;YAClC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,EAAE,EAAE,CAAC,EAAE,gBAAgB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC9E,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,QAAQ;IACf,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,aAAa;IAClB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjB,KAAK,EAAE,IAAI,CAAC,KAAK;IACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;IACvB,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,SAAS;CAC3B,CAAC,CAAC,CAAC;AAEJ,KAAK,UAAU,sBAAsB,CACnC,WAAgD,EAChD,OAA+E;IAE/E,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqD,CAAC;IAC5E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAE3C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAErE,MAAM,IAAI,GAAU,MAAM,WAAW;SAClC,EAAE,CAAC,qBAAqB,CAAC;SACzB,MAAM,CAAC,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC1C,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC;SACzB,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;SACvC,KAAK,CAAC,YAAY,EAAE,QAAQ,IAAI,aAAa,CAAC,CAAC;IAElD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;QAChF,IAAI,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,0BAA0B,SAAS,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,GAAG,CACrF,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,cAAc,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,QAAQ;IACf,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,aAAa;IAClB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjB,KAAK,EAAE,IAAI,CAAC,KAAK;IACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;IACvB,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,SAAS;CAC3B,CAAC,CAAC,CAAC;AAEJ,KAAK,UAAU,mBAAmB,CAChC,WAAgD,EAChD,OAIC;IAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,GAAG,EAA8D,CAAC;IACrF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAE3C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAErE,MAAM,IAAI,GAAU,MAAM,WAAW;SAClC,EAAE,CAAC,kBAAkB,CAAC;SACtB,MAAM,CAAC,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SAC1C,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC;SACzB,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;SAC9C,KAAK,CAAC,YAAY,EAAE,QAAQ,IAAI,aAAa,CAAC,CAAC;IAElD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE/E,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;QAChF,IAAI,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,0BAA0B,SAAS,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,GAAG,CACrF,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,sBAAsB,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,sBAAsB,CAC7B,MAA0B,EAC1B,OAAyD;IAEzD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,QAAQ,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC3B,KAAK,QAAQ;YACX,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3D,KAAK,SAAS;YACZ,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC;QAC3D,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC;QAChB,KAAK,MAAM;YACT,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QACtE;YACE,MAAM,IAAI,KAAK,CAAC,qBAAsB,SAA+B,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvF,CAAC;AACH,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"preprocess-fields.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/preprocess-fields.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
- import { boolVal, isDef, nbVal, objVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
2
1
  import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
3
- import { isJsonFieldValue, isUpdateLabelingFieldValue, } from "@paroicms/public-anywhere-lib";
2
+ import { isDef, isJsonFieldValue, isObj, isUpdateLabelingFieldValue, } from "@paroicms/public-anywhere-lib";
4
3
  import { ApiError, stripHtmlTags } from "@paroicms/public-server-lib";
4
+ import { type } from "arktype";
5
5
  import { invalidateDocumentRelationCache, invalidateMultipleDocumentsInCache, } from "../../common/text-cache.js";
6
6
  import { dbAnyLanguage } from "../../context.js";
7
7
  import { truncExcerptToWord } from "../../helpers/excerpt.helpers.js";
@@ -10,13 +10,20 @@ import { loadSiteAccess } from "../../site-context/site-values-for-site-context.
10
10
  import { languageIfNodel } from "./_fields.helpers.js";
11
11
  import { saveFieldLabeling } from "./labeling.queries.js";
12
12
  import { preprocessFieldForExcerpt } from "./preprocess-fields.js";
13
+ const StringOrUndefinedAT = type("string|undefined");
14
+ const StringAT = type("string");
15
+ const NumberAT = type("number");
16
+ const BooleanAT = type("boolean");
13
17
  export function parseFieldValues(jsonVal) {
18
+ let obj;
14
19
  try {
15
- return objVal(JSON.parse(jsonVal));
20
+ obj = JSON.parse(jsonVal);
16
21
  }
17
22
  catch {
18
- throw new ApiError("invalid fieldValues", 400);
19
23
  }
24
+ if (!obj || !isObj(obj))
25
+ throw new ApiError("invalid fieldValues", 400);
26
+ return obj;
20
27
  }
21
28
  export async function saveFieldValues(siteContext, options) {
22
29
  const { typeName, nodeId } = options;
@@ -112,11 +119,11 @@ async function generateAllExcerpts(siteContext, options) {
112
119
  if (!isJsonFieldValue(value) && typeof value !== "string") {
113
120
  throw new Error(`should be a json or string value '${fieldName}'`);
114
121
  }
115
- let plainText = strValOrUndef(await preprocessFieldForExcerpt(renderingContext, value, fieldType, {
122
+ let plainText = StringOrUndefinedAT.assert(await preprocessFieldForExcerpt(renderingContext, value, fieldType, {
116
123
  outputType: "plainText",
117
124
  }));
118
125
  if (fieldType.renderAs === "html" && fieldType.dataType === "string" && plainText === value) {
119
- plainText = stripHtmlTags(strVal(value), { blockSeparator: " – " });
126
+ plainText = stripHtmlTags(StringAT.assert(value), { blockSeparator: " – " });
120
127
  }
121
128
  const excerpt = plainText ? truncExcerptToWord(plainText, 299) : undefined;
122
129
  excerpts[fieldName] = excerpt;
@@ -181,17 +188,17 @@ function fieldValueToDbString(value, dataType) {
181
188
  if (value === null)
182
189
  return value;
183
190
  if (dataType === "number")
184
- return String(nbVal(value));
191
+ return String(NumberAT.assert(value));
185
192
  if (dataType === "boolean")
186
- return boolVal(value) ? "1" : "0";
193
+ return BooleanAT.assert(value) ? "1" : "0";
187
194
  if (dataType === "time")
188
- return strVal(value);
195
+ return StringAT.assert(value);
189
196
  if (dataType === "date")
190
- return strVal(value);
197
+ return StringAT.assert(value);
191
198
  if (dataType === "dateTime")
192
- return strVal(value);
199
+ return StringAT.assert(value);
193
200
  if (dataType === "string")
194
- return strVal(value);
201
+ return StringAT.assert(value);
195
202
  if (dataType === "json")
196
203
  return isJsonFieldValue(value) && isDef(value.j) ? JSON.stringify(value.j) : null;
197
204
  throw new Error(`invalid data type '${dataType}'`);
@@ -0,0 +1 @@
1
+ {"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/save-fields.queries.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { objVal, strVal } from "@paroi/data-formatters-lib";
2
1
  import { ApiError } from "@paroicms/public-server-lib";
2
+ import { type } from "arktype";
3
3
  import { getVerifiedAccountFromToken, loginByPlatformToken, loginUser, } from "../auth/auth.service.js";
4
4
  export async function loginController(siteContext, httpContext) {
5
5
  const loginInput = formatLoginAction(httpContext.req.body);
@@ -14,17 +14,27 @@ export async function loginController(siteContext, httpContext) {
14
14
  }
15
15
  return getVerifiedAccountFromToken(siteContext, loginInput.token);
16
16
  }
17
+ const LoginActionUrlQuery = type({
18
+ action: "string",
19
+ "email?": "string|undefined",
20
+ "password?": "string|undefined",
21
+ "token?": "string|undefined",
22
+ "+": "reject",
23
+ });
17
24
  function formatLoginAction(val) {
18
- const obj = objVal(val);
19
- const action = strVal(obj.action, { varName: "action" });
25
+ const validated = LoginActionUrlQuery.assert(val);
26
+ const action = validated.action;
20
27
  if (action === "signIn") {
21
- const email = strVal(obj.email, { varName: "email" });
22
- const password = strVal(obj.password, { varName: "password" });
23
- return { action, email, password };
28
+ if (!validated.email || !validated.password) {
29
+ throw new ApiError("Email and password are required for signIn action", 400);
30
+ }
31
+ return { action, email: validated.email, password: validated.password };
24
32
  }
25
33
  if (action === "verify" || action === "loginWithPlatformToken") {
26
- const token = strVal(obj.token, { varName: "token" });
27
- return { action, token };
34
+ if (!validated.token) {
35
+ throw new ApiError("Token is required for verify/loginWithPlatformToken action", 400);
36
+ }
37
+ return { action, token: validated.token };
28
38
  }
29
39
  throw new ApiError(`Invalid login action: ${action}`, 400);
30
40
  }
@@ -0,0 +1 @@
1
+ {"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/login/login.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,EACpB,SAAS,GACV,MAAM,yBAAyB,CAAC;AAGjC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,WAAwB,EAAE,WAA0B;IACxF,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAE3D,IAAI,UAAU,CAAC,MAAM,KAAK,wBAAwB,EAAE,CAAC;QACnD,OAAO,MAAM,oBAAoB,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,MAAM,SAAS,CAAC,WAAW,EAAE;YAClC,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,2BAA2B,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,CAAC;IAC/B,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,kBAAkB;IAC5B,WAAW,EAAE,kBAAkB;IAC/B,QAAQ,EAAE,kBAAkB;IAC5B,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,GAAY;IACrC,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAChC,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,QAAQ,CAAC,mDAAmD,EAAE,GAAG,CAAC,CAAC;QAC/E,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC1E,CAAC;IACD,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,wBAAwB,EAAE,CAAC;QAC/D,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,IAAI,QAAQ,CAAC,4DAA4D,EAAE,GAAG,CAAC,CAAC;QACxF,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC;IAC5C,CAAC;IACD,MAAM,IAAI,QAAQ,CAAC,yBAAyB,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;AAC7D,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"add-media-to-node.js","sourceRoot":"","sources":["../../../src/admin-backend/media/add-media-to-node.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAGhF,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,IAKC,EACD,OAMC;IAED,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAC9D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACpE,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,IAAI,SAAS,CAAC;IACrD,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAErE,MAAM,gBAAgB,CAAC,WAAW,EAAE;QAClC,WAAW;QACX,SAAS;QACT,OAAO;QACP,QAAQ;QACR,MAAM;QACN,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;KAC3C,CAAC,CAAC;IAEH,MAAM,cAAc,GAAqB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,CACrE,oBAAoB,CAAC;QACnB,UAAU;QACV,SAAS;QACT,QAAQ;QACR,MAAM,EAAE,WAAW,CAAC,KAAK;QACzB,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK;QACjE,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,kBAAkB;KACzD,CAAC,CAAC;IAEL,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CACnD;QACE,UAAU,EAAE,UAAU;QACtB,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,OAAO;QAChB,MAAM;QACN,YAAY;QACZ,YAAY;QACZ,OAAO;QACP,MAAM;KACP,EACD;QACE,cAAc;KACf,CACF,CAAC;IAEF,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,KAAK,sBAAsB,EAAE,EAAE,CAAC;QAClE,MAAM,sBAAsB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,kCAAkC,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,cAAc,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,WAAwB,EACxB,EACE,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACR,MAAM,EACN,YAAY,GAQb;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC7B,MAAM,KAAK,GACT,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC;QAC/F,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC;gBACvD,MAAM;gBACN,YAAY;aACb,CAAC,CAAC;YACH,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,QAAQ,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;QACpC,MAAM,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;QACxE,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,uBAAuB,EAAE,CAAC;YAC9E,IAAI,YAAY,GAAG,OAAO,GAAG,gBAAgB,EAAE,CAAC;gBAC9C,MAAM,IAAI,QAAQ,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -1,23 +1,34 @@
1
- import { boolVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
2
1
  import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
3
2
  import { ApiError } from "@paroicms/public-server-lib";
3
+ import { type } from "arktype";
4
4
  import { makeDefaultThumbAvailableForAdminUi } from "../../common/medias/media-lib.js";
5
5
  import { removeExtensionFromFileName } from "../../helpers/utils-helper.js";
6
6
  import { getTypeNameOf } from "../node/node.queries.js";
7
7
  import { addMediaToNode } from "./add-media-to-node.js";
8
+ const UploadBodyAT = type({
9
+ "nodeId?": "string|undefined",
10
+ handle: "string",
11
+ "attachedData?": "string|undefined",
12
+ replace: `"0"|"1"`,
13
+ "+": "reject",
14
+ }).pipe((d) => ({
15
+ ...d,
16
+ replace: d.replace === "1",
17
+ }));
8
18
  export async function uploadMediaController(siteContext, httpContext) {
9
19
  const { req } = httpContext;
10
20
  const file = req.file;
11
21
  const body = req.body;
12
22
  if (!file)
13
23
  throw new ApiError("missing 'file'", 400);
14
- const nodeId = strValOrUndef(body.nodeId) ?? siteContext.siteIds.siteNodeId;
15
- const handle = strVal(body.handle, { varName: "handle" });
16
- const attachedDataStr = strValOrUndef(body.attachedData);
24
+ const validated = UploadBodyAT.assert(body);
25
+ const nodeId = validated.nodeId ?? siteContext.siteIds.siteNodeId;
26
+ const handle = validated.handle;
27
+ const attachedDataStr = validated.attachedData;
17
28
  const attachedData = attachedDataStr
18
29
  ? JSON.parse(attachedDataStr)
19
30
  : undefined;
20
- const replace = boolVal(body.replace);
31
+ const replace = validated.replace;
21
32
  const typeName = await getTypeNameOf(siteContext, nodeId);
22
33
  const nodeType = getNodeTypeByName(siteContext.siteSchema, typeName);
23
34
  const { buffer: binaryFile, mimetype: mediaType } = file;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"media-upload.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/media/media-upload.controller.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"media.resolver.extend.js","sourceRoot":"","sources":["../../../src/admin-backend/media/media.resolver.extend.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,CAAC,MAAM,+BAA+B,GAAiC;IAC3E,QAAQ,EAAE;QACR,aAAa,EAAE,KAAK,EAClB,MAAoB,EACpB,KAAU,EACV,EAAE,WAAW,EAAE,WAAW,EAAkB,EAC5C,EAAE;YACF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;gBACpD,MAAM,EAAE,MAAM,CAAC,mBAAmB;gBAClC,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAC;YACH,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,MAAM,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;KACF;CACF,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"media.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/media/media.resolver.ts"],"names":[],"mappings":"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"}