@strapi/core 0.0.0-experimental.a407f3bc8fb79a53cf7975140864526b6ddbac4b → 0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95

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 (189) hide show
  1. package/dist/Strapi.d.ts +5 -3
  2. package/dist/Strapi.d.ts.map +1 -1
  3. package/dist/Strapi.js +19 -7
  4. package/dist/Strapi.js.map +1 -1
  5. package/dist/Strapi.mjs +19 -7
  6. package/dist/Strapi.mjs.map +1 -1
  7. package/dist/configuration/index.d.ts.map +1 -1
  8. package/dist/configuration/index.js +4 -4
  9. package/dist/configuration/index.js.map +1 -1
  10. package/dist/configuration/index.mjs +1 -1
  11. package/dist/configuration/index.mjs.map +1 -1
  12. package/dist/configuration/urls.d.ts +8 -0
  13. package/dist/configuration/urls.d.ts.map +1 -0
  14. package/dist/configuration/urls.js +68 -0
  15. package/dist/configuration/urls.js.map +1 -0
  16. package/dist/configuration/urls.mjs +66 -0
  17. package/dist/configuration/urls.mjs.map +1 -0
  18. package/dist/core-api/controller/index.d.ts.map +1 -1
  19. package/dist/core-api/controller/index.js +6 -1
  20. package/dist/core-api/controller/index.js.map +1 -1
  21. package/dist/core-api/controller/index.mjs +6 -1
  22. package/dist/core-api/controller/index.mjs.map +1 -1
  23. package/dist/core-api/controller/transform.d.ts +8 -7
  24. package/dist/core-api/controller/transform.d.ts.map +1 -1
  25. package/dist/core-api/controller/transform.js +18 -9
  26. package/dist/core-api/controller/transform.js.map +1 -1
  27. package/dist/core-api/controller/transform.mjs +18 -9
  28. package/dist/core-api/controller/transform.mjs.map +1 -1
  29. package/dist/core-api/service/single-type.d.ts +1 -1
  30. package/dist/core-api/service/single-type.d.ts.map +1 -1
  31. package/dist/core-api/service/single-type.js +3 -4
  32. package/dist/core-api/service/single-type.js.map +1 -1
  33. package/dist/core-api/service/single-type.mjs +3 -4
  34. package/dist/core-api/service/single-type.mjs.map +1 -1
  35. package/dist/domain/content-type/index.d.ts.map +1 -1
  36. package/dist/domain/content-type/index.js +3 -0
  37. package/dist/domain/content-type/index.js.map +1 -1
  38. package/dist/domain/content-type/index.mjs +3 -0
  39. package/dist/domain/content-type/index.mjs.map +1 -1
  40. package/dist/domain/content-type/validator.d.ts.map +1 -1
  41. package/dist/domain/content-type/validator.js +1 -1
  42. package/dist/domain/content-type/validator.js.map +1 -1
  43. package/dist/domain/content-type/validator.mjs +2 -2
  44. package/dist/domain/content-type/validator.mjs.map +1 -1
  45. package/dist/domain/module/index.d.ts.map +1 -1
  46. package/dist/domain/module/index.js +2 -3
  47. package/dist/domain/module/index.js.map +1 -1
  48. package/dist/domain/module/index.mjs +2 -3
  49. package/dist/domain/module/index.mjs.map +1 -1
  50. package/dist/ee/index.js.map +1 -1
  51. package/dist/ee/index.mjs.map +1 -1
  52. package/dist/loaders/apis.js +1 -1
  53. package/dist/loaders/apis.js.map +1 -1
  54. package/dist/loaders/apis.mjs +2 -2
  55. package/dist/loaders/apis.mjs.map +1 -1
  56. package/dist/loaders/plugins/get-enabled-plugins.js +1 -1
  57. package/dist/loaders/plugins/get-enabled-plugins.js.map +1 -1
  58. package/dist/loaders/plugins/get-enabled-plugins.mjs +2 -2
  59. package/dist/loaders/plugins/get-enabled-plugins.mjs.map +1 -1
  60. package/dist/middlewares/security.d.ts.map +1 -1
  61. package/dist/middlewares/security.js +2 -2
  62. package/dist/middlewares/security.js.map +1 -1
  63. package/dist/middlewares/security.mjs +2 -2
  64. package/dist/middlewares/security.mjs.map +1 -1
  65. package/dist/migrations/draft-publish.d.ts +17 -0
  66. package/dist/migrations/draft-publish.d.ts.map +1 -0
  67. package/dist/migrations/draft-publish.js +59 -0
  68. package/dist/migrations/draft-publish.js.map +1 -0
  69. package/dist/migrations/draft-publish.mjs +59 -0
  70. package/dist/migrations/draft-publish.mjs.map +1 -0
  71. package/dist/registries/config.d.ts +2 -2
  72. package/dist/registries/config.d.ts.map +1 -1
  73. package/dist/registries/config.js +14 -6
  74. package/dist/registries/config.js.map +1 -1
  75. package/dist/registries/config.mjs +15 -5
  76. package/dist/registries/config.mjs.map +1 -1
  77. package/dist/services/document-service/common.d.ts +2 -2
  78. package/dist/services/document-service/common.d.ts.map +1 -1
  79. package/dist/services/document-service/common.js.map +1 -1
  80. package/dist/services/document-service/common.mjs.map +1 -1
  81. package/dist/services/document-service/draft-and-publish.d.ts +9 -23
  82. package/dist/services/document-service/draft-and-publish.d.ts.map +1 -1
  83. package/dist/services/document-service/draft-and-publish.js +37 -9
  84. package/dist/services/document-service/draft-and-publish.js.map +1 -1
  85. package/dist/services/document-service/draft-and-publish.mjs +38 -10
  86. package/dist/services/document-service/draft-and-publish.mjs.map +1 -1
  87. package/dist/services/document-service/index.js +5 -5
  88. package/dist/services/document-service/index.js.map +1 -1
  89. package/dist/services/document-service/index.mjs +1 -1
  90. package/dist/services/document-service/index.mjs.map +1 -1
  91. package/dist/services/document-service/repository.d.ts +3 -0
  92. package/dist/services/document-service/repository.d.ts.map +1 -0
  93. package/dist/services/document-service/repository.js +295 -0
  94. package/dist/services/document-service/repository.js.map +1 -0
  95. package/dist/services/document-service/repository.mjs +295 -0
  96. package/dist/services/document-service/repository.mjs.map +1 -0
  97. package/dist/services/document-service/transform/id-map.d.ts +1 -1
  98. package/dist/services/document-service/transform/id-map.d.ts.map +1 -1
  99. package/dist/services/document-service/transform/id-map.js +15 -9
  100. package/dist/services/document-service/transform/id-map.js.map +1 -1
  101. package/dist/services/document-service/transform/id-map.mjs +16 -10
  102. package/dist/services/document-service/transform/id-map.mjs.map +1 -1
  103. package/dist/services/document-service/transform/id-transform.d.ts +4 -18
  104. package/dist/services/document-service/transform/id-transform.d.ts.map +1 -1
  105. package/dist/services/document-service/transform/id-transform.js +18 -12
  106. package/dist/services/document-service/transform/id-transform.js.map +1 -1
  107. package/dist/services/document-service/transform/id-transform.mjs +18 -12
  108. package/dist/services/document-service/transform/id-transform.mjs.map +1 -1
  109. package/dist/services/document-service/transform/populate.d.ts +5 -2
  110. package/dist/services/document-service/transform/populate.d.ts.map +1 -1
  111. package/dist/services/document-service/transform/populate.js.map +1 -1
  112. package/dist/services/document-service/transform/populate.mjs.map +1 -1
  113. package/dist/services/document-service/transform/relations/extract/data-ids.d.ts +1 -1
  114. package/dist/services/document-service/transform/relations/extract/data-ids.d.ts.map +1 -1
  115. package/dist/services/document-service/transform/relations/extract/data-ids.js +23 -12
  116. package/dist/services/document-service/transform/relations/extract/data-ids.js.map +1 -1
  117. package/dist/services/document-service/transform/relations/extract/data-ids.mjs +23 -12
  118. package/dist/services/document-service/transform/relations/extract/data-ids.mjs.map +1 -1
  119. package/dist/services/document-service/transform/relations/transform/data-ids.d.ts +1 -1
  120. package/dist/services/document-service/transform/relations/transform/data-ids.d.ts.map +1 -1
  121. package/dist/services/document-service/transform/relations/transform/data-ids.js +61 -37
  122. package/dist/services/document-service/transform/relations/transform/data-ids.js.map +1 -1
  123. package/dist/services/document-service/transform/relations/transform/data-ids.mjs +62 -38
  124. package/dist/services/document-service/transform/relations/transform/data-ids.mjs.map +1 -1
  125. package/dist/services/document-service/transform/relations/utils/dp.d.ts +10 -0
  126. package/dist/services/document-service/transform/relations/utils/dp.d.ts.map +1 -0
  127. package/dist/services/document-service/transform/relations/utils/dp.js +25 -0
  128. package/dist/services/document-service/transform/relations/utils/dp.js.map +1 -0
  129. package/dist/services/document-service/transform/relations/utils/dp.mjs +25 -0
  130. package/dist/services/document-service/transform/relations/utils/dp.mjs.map +1 -0
  131. package/dist/services/document-service/transform/relations/utils/types.d.ts +4 -1
  132. package/dist/services/document-service/transform/relations/utils/types.d.ts.map +1 -1
  133. package/dist/services/document-service/transform/types.d.ts +1 -1
  134. package/dist/services/document-service/transform/types.d.ts.map +1 -1
  135. package/dist/services/document-service/utils/populate.d.ts +8 -1
  136. package/dist/services/document-service/utils/populate.d.ts.map +1 -1
  137. package/dist/services/document-service/utils/populate.js +5 -5
  138. package/dist/services/document-service/utils/populate.js.map +1 -1
  139. package/dist/services/document-service/utils/populate.mjs +5 -5
  140. package/dist/services/document-service/utils/populate.mjs.map +1 -1
  141. package/dist/services/entity-service/components.d.ts +1 -4
  142. package/dist/services/entity-service/components.d.ts.map +1 -1
  143. package/dist/services/entity-service/components.js +13 -99
  144. package/dist/services/entity-service/components.js.map +1 -1
  145. package/dist/services/entity-service/components.mjs +14 -100
  146. package/dist/services/entity-service/components.mjs.map +1 -1
  147. package/dist/services/entity-service/index.d.ts +1 -3
  148. package/dist/services/entity-service/index.d.ts.map +1 -1
  149. package/dist/services/entity-service/index.js +34 -199
  150. package/dist/services/entity-service/index.js.map +1 -1
  151. package/dist/services/entity-service/index.mjs +27 -192
  152. package/dist/services/entity-service/index.mjs.map +1 -1
  153. package/dist/services/entity-service/params.d.ts +4 -4
  154. package/dist/services/entity-service/params.d.ts.map +1 -1
  155. package/dist/services/entity-service/params.js +1 -1
  156. package/dist/services/entity-service/params.js.map +1 -1
  157. package/dist/services/entity-service/params.mjs +1 -1
  158. package/dist/services/entity-service/params.mjs.map +1 -1
  159. package/dist/services/entity-validator/index.js +1 -1
  160. package/dist/services/entity-validator/index.js.map +1 -1
  161. package/dist/services/entity-validator/index.mjs +1 -1
  162. package/dist/services/entity-validator/index.mjs.map +1 -1
  163. package/dist/utils/is-initialized.js +1 -1
  164. package/dist/utils/is-initialized.js.map +1 -1
  165. package/dist/utils/is-initialized.mjs +1 -1
  166. package/dist/utils/is-initialized.mjs.map +1 -1
  167. package/dist/utils/load-config-file.js +1 -1
  168. package/dist/utils/load-config-file.js.map +1 -1
  169. package/dist/utils/load-config-file.mjs +2 -2
  170. package/dist/utils/load-config-file.mjs.map +1 -1
  171. package/package.json +14 -14
  172. package/dist/services/document-service/document-engine.d.ts +0 -8
  173. package/dist/services/document-service/document-engine.d.ts.map +0 -1
  174. package/dist/services/document-service/document-engine.js +0 -241
  175. package/dist/services/document-service/document-engine.js.map +0 -1
  176. package/dist/services/document-service/document-engine.mjs +0 -242
  177. package/dist/services/document-service/document-engine.mjs.map +0 -1
  178. package/dist/services/document-service/repositories/content-type.d.ts +0 -3
  179. package/dist/services/document-service/repositories/content-type.d.ts.map +0 -1
  180. package/dist/services/document-service/repositories/content-type.js +0 -139
  181. package/dist/services/document-service/repositories/content-type.js.map +0 -1
  182. package/dist/services/document-service/repositories/content-type.mjs +0 -139
  183. package/dist/services/document-service/repositories/content-type.mjs.map +0 -1
  184. package/dist/services/utils/upload-files.d.ts +0 -8
  185. package/dist/services/utils/upload-files.d.ts.map +0 -1
  186. package/dist/services/utils/upload-files.js +0 -64
  187. package/dist/services/utils/upload-files.js.map +0 -1
  188. package/dist/services/utils/upload-files.mjs +0 -63
  189. package/dist/services/utils/upload-files.mjs.map +0 -1
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
+ const _ = require("lodash");
4
+ const strapiUtils = require("@strapi/utils");
5
+ const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
6
+ const ___default = /* @__PURE__ */ _interopDefault(_);
7
+ const getConfigUrls = (config, forAdminBuild = false) => {
8
+ const serverConfig = config.server;
9
+ const adminConfig = config.admin;
10
+ let serverUrl = ___default.default.get(serverConfig, "url", "");
11
+ serverUrl = ___default.default.trim(serverUrl, "/ ");
12
+ if (typeof serverUrl !== "string") {
13
+ throw new Error("Invalid server url config. Make sure the url is a string.");
14
+ }
15
+ if (serverUrl.startsWith("http")) {
16
+ try {
17
+ serverUrl = ___default.default.trim(new URL(serverConfig.url).toString(), "/");
18
+ } catch (e) {
19
+ throw new Error(
20
+ "Invalid server url config. Make sure the url defined in server.js is valid."
21
+ );
22
+ }
23
+ } else if (serverUrl !== "") {
24
+ serverUrl = `/${serverUrl}`;
25
+ }
26
+ let adminUrl = ___default.default.get(adminConfig, "url", "/admin");
27
+ adminUrl = ___default.default.trim(adminUrl, "/ ");
28
+ if (typeof adminUrl !== "string") {
29
+ throw new Error("Invalid admin url config. Make sure the url is a non-empty string.");
30
+ }
31
+ if (adminUrl.startsWith("http")) {
32
+ try {
33
+ adminUrl = ___default.default.trim(new URL(adminUrl).toString(), "/");
34
+ } catch (e) {
35
+ throw new Error("Invalid admin url config. Make sure the url defined in server.js is valid.");
36
+ }
37
+ } else {
38
+ adminUrl = `${serverUrl}/${adminUrl}`;
39
+ }
40
+ let adminPath = adminUrl;
41
+ if (serverUrl.startsWith("http") && adminUrl.startsWith("http") && new URL(adminUrl).origin === new URL(serverUrl).origin && !forAdminBuild) {
42
+ adminPath = adminUrl.replace(strapiUtils.strings.getCommonPath(serverUrl, adminUrl), "");
43
+ adminPath = `/${___default.default.trim(adminPath, "/")}`;
44
+ } else if (adminUrl.startsWith("http")) {
45
+ adminPath = new URL(adminUrl).pathname;
46
+ }
47
+ return {
48
+ serverUrl,
49
+ adminUrl,
50
+ adminPath
51
+ };
52
+ };
53
+ const getAbsoluteUrl = (adminOrServer) => (config, forAdminBuild = false) => {
54
+ const { serverUrl, adminUrl } = getConfigUrls(config, forAdminBuild);
55
+ const url = adminOrServer === "server" ? serverUrl : adminUrl;
56
+ if (url.startsWith("http")) {
57
+ return url;
58
+ }
59
+ const serverConfig = config.server;
60
+ const hostname = config.environment === "development" && ["127.0.0.1", "0.0.0.0"].includes(serverConfig.host) ? "localhost" : serverConfig.host;
61
+ return `http://${hostname}:${serverConfig.port}${url}`;
62
+ };
63
+ const getAbsoluteAdminUrl = getAbsoluteUrl("admin");
64
+ const getAbsoluteServerUrl = getAbsoluteUrl("server");
65
+ exports.getAbsoluteAdminUrl = getAbsoluteAdminUrl;
66
+ exports.getAbsoluteServerUrl = getAbsoluteServerUrl;
67
+ exports.getConfigUrls = getConfigUrls;
68
+ //# sourceMappingURL=urls.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"urls.js","sources":["../../src/configuration/urls.ts"],"sourcesContent":["import _ from 'lodash';\nimport { strings } from '@strapi/utils';\n\ninterface ServerConfig {\n url: string;\n host: string;\n port: number | string;\n}\n\nexport const getConfigUrls = (config: Record<string, unknown>, forAdminBuild = false) => {\n const serverConfig = config.server as ServerConfig;\n const adminConfig = config.admin;\n\n // Defines serverUrl value\n let serverUrl = _.get(serverConfig, 'url', '');\n serverUrl = _.trim(serverUrl, '/ ');\n if (typeof serverUrl !== 'string') {\n throw new Error('Invalid server url config. Make sure the url is a string.');\n }\n\n if (serverUrl.startsWith('http')) {\n try {\n serverUrl = _.trim(new URL(serverConfig.url).toString(), '/');\n } catch (e) {\n throw new Error(\n 'Invalid server url config. Make sure the url defined in server.js is valid.'\n );\n }\n } else if (serverUrl !== '') {\n serverUrl = `/${serverUrl}`;\n }\n\n // Defines adminUrl value\n let adminUrl = _.get(adminConfig, 'url', '/admin');\n adminUrl = _.trim(adminUrl, '/ ');\n if (typeof adminUrl !== 'string') {\n throw new Error('Invalid admin url config. Make sure the url is a non-empty string.');\n }\n if (adminUrl.startsWith('http')) {\n try {\n adminUrl = _.trim(new URL(adminUrl).toString(), '/');\n } catch (e) {\n throw new Error('Invalid admin url config. Make sure the url defined in server.js is valid.');\n }\n } else {\n adminUrl = `${serverUrl}/${adminUrl}`;\n }\n\n // Defines adminPath value\n let adminPath = adminUrl;\n if (\n serverUrl.startsWith('http') &&\n adminUrl.startsWith('http') &&\n new URL(adminUrl).origin === new URL(serverUrl).origin &&\n !forAdminBuild\n ) {\n adminPath = adminUrl.replace(strings.getCommonPath(serverUrl, adminUrl), '');\n adminPath = `/${_.trim(adminPath, '/')}`;\n } else if (adminUrl.startsWith('http')) {\n adminPath = new URL(adminUrl).pathname;\n }\n\n return {\n serverUrl,\n adminUrl,\n adminPath,\n };\n};\n\nconst getAbsoluteUrl =\n (adminOrServer: 'admin' | 'server') =>\n (config: Record<string, unknown>, forAdminBuild = false) => {\n const { serverUrl, adminUrl } = getConfigUrls(config, forAdminBuild);\n const url = adminOrServer === 'server' ? serverUrl : adminUrl;\n\n if (url.startsWith('http')) {\n return url;\n }\n\n const serverConfig = config.server as ServerConfig;\n const hostname =\n config.environment === 'development' && ['127.0.0.1', '0.0.0.0'].includes(serverConfig.host)\n ? 'localhost'\n : serverConfig.host;\n\n return `http://${hostname}:${serverConfig.port}${url}`;\n };\n\nexport const getAbsoluteAdminUrl = getAbsoluteUrl('admin');\nexport const getAbsoluteServerUrl = getAbsoluteUrl('server');\n"],"names":["_","strings"],"mappings":";;;;;;AASO,MAAM,gBAAgB,CAAC,QAAiC,gBAAgB,UAAU;AACvF,QAAM,eAAe,OAAO;AAC5B,QAAM,cAAc,OAAO;AAG3B,MAAI,YAAYA,WAAAA,QAAE,IAAI,cAAc,OAAO,EAAE;AACjC,cAAAA,WAAAA,QAAE,KAAK,WAAW,IAAI;AAC9B,MAAA,OAAO,cAAc,UAAU;AAC3B,UAAA,IAAI,MAAM,2DAA2D;AAAA,EAC7E;AAEI,MAAA,UAAU,WAAW,MAAM,GAAG;AAC5B,QAAA;AACU,kBAAAA,WAAAA,QAAE,KAAK,IAAI,IAAI,aAAa,GAAG,EAAE,YAAY,GAAG;AAAA,aACrD,GAAG;AACV,YAAM,IAAI;AAAA,QACR;AAAA,MAAA;AAAA,IAEJ;AAAA,EAAA,WACS,cAAc,IAAI;AAC3B,gBAAY,IAAI,SAAS;AAAA,EAC3B;AAGA,MAAI,WAAWA,WAAAA,QAAE,IAAI,aAAa,OAAO,QAAQ;AACtC,aAAAA,WAAAA,QAAE,KAAK,UAAU,IAAI;AAC5B,MAAA,OAAO,aAAa,UAAU;AAC1B,UAAA,IAAI,MAAM,oEAAoE;AAAA,EACtF;AACI,MAAA,SAAS,WAAW,MAAM,GAAG;AAC3B,QAAA;AACS,iBAAAA,WAAAA,QAAE,KAAK,IAAI,IAAI,QAAQ,EAAE,YAAY,GAAG;AAAA,aAC5C,GAAG;AACJ,YAAA,IAAI,MAAM,4EAA4E;AAAA,IAC9F;AAAA,EAAA,OACK;AACM,eAAA,GAAG,SAAS,IAAI,QAAQ;AAAA,EACrC;AAGA,MAAI,YAAY;AAChB,MACE,UAAU,WAAW,MAAM,KAC3B,SAAS,WAAW,MAAM,KAC1B,IAAI,IAAI,QAAQ,EAAE,WAAW,IAAI,IAAI,SAAS,EAAE,UAChD,CAAC,eACD;AACA,gBAAY,SAAS,QAAQC,YAAA,QAAQ,cAAc,WAAW,QAAQ,GAAG,EAAE;AAC3E,gBAAY,IAAID,WAAA,QAAE,KAAK,WAAW,GAAG,CAAC;AAAA,EAC7B,WAAA,SAAS,WAAW,MAAM,GAAG;AAC1B,gBAAA,IAAI,IAAI,QAAQ,EAAE;AAAA,EAChC;AAEO,SAAA;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEA,MAAM,iBACJ,CAAC,kBACD,CAAC,QAAiC,gBAAgB,UAAU;AAC1D,QAAM,EAAE,WAAW,SAAA,IAAa,cAAc,QAAQ,aAAa;AAC7D,QAAA,MAAM,kBAAkB,WAAW,YAAY;AAEjD,MAAA,IAAI,WAAW,MAAM,GAAG;AACnB,WAAA;AAAA,EACT;AAEA,QAAM,eAAe,OAAO;AAC5B,QAAM,WACJ,OAAO,gBAAgB,iBAAiB,CAAC,aAAa,SAAS,EAAE,SAAS,aAAa,IAAI,IACvF,cACA,aAAa;AAEnB,SAAO,UAAU,QAAQ,IAAI,aAAa,IAAI,GAAG,GAAG;AACtD;AAEW,MAAA,sBAAsB,eAAe,OAAO;AAC5C,MAAA,uBAAuB,eAAe,QAAQ;;;;"}
@@ -0,0 +1,66 @@
1
+ import _ from "lodash";
2
+ import { strings } from "@strapi/utils";
3
+ const getConfigUrls = (config, forAdminBuild = false) => {
4
+ const serverConfig = config.server;
5
+ const adminConfig = config.admin;
6
+ let serverUrl = _.get(serverConfig, "url", "");
7
+ serverUrl = _.trim(serverUrl, "/ ");
8
+ if (typeof serverUrl !== "string") {
9
+ throw new Error("Invalid server url config. Make sure the url is a string.");
10
+ }
11
+ if (serverUrl.startsWith("http")) {
12
+ try {
13
+ serverUrl = _.trim(new URL(serverConfig.url).toString(), "/");
14
+ } catch (e) {
15
+ throw new Error(
16
+ "Invalid server url config. Make sure the url defined in server.js is valid."
17
+ );
18
+ }
19
+ } else if (serverUrl !== "") {
20
+ serverUrl = `/${serverUrl}`;
21
+ }
22
+ let adminUrl = _.get(adminConfig, "url", "/admin");
23
+ adminUrl = _.trim(adminUrl, "/ ");
24
+ if (typeof adminUrl !== "string") {
25
+ throw new Error("Invalid admin url config. Make sure the url is a non-empty string.");
26
+ }
27
+ if (adminUrl.startsWith("http")) {
28
+ try {
29
+ adminUrl = _.trim(new URL(adminUrl).toString(), "/");
30
+ } catch (e) {
31
+ throw new Error("Invalid admin url config. Make sure the url defined in server.js is valid.");
32
+ }
33
+ } else {
34
+ adminUrl = `${serverUrl}/${adminUrl}`;
35
+ }
36
+ let adminPath = adminUrl;
37
+ if (serverUrl.startsWith("http") && adminUrl.startsWith("http") && new URL(adminUrl).origin === new URL(serverUrl).origin && !forAdminBuild) {
38
+ adminPath = adminUrl.replace(strings.getCommonPath(serverUrl, adminUrl), "");
39
+ adminPath = `/${_.trim(adminPath, "/")}`;
40
+ } else if (adminUrl.startsWith("http")) {
41
+ adminPath = new URL(adminUrl).pathname;
42
+ }
43
+ return {
44
+ serverUrl,
45
+ adminUrl,
46
+ adminPath
47
+ };
48
+ };
49
+ const getAbsoluteUrl = (adminOrServer) => (config, forAdminBuild = false) => {
50
+ const { serverUrl, adminUrl } = getConfigUrls(config, forAdminBuild);
51
+ const url = adminOrServer === "server" ? serverUrl : adminUrl;
52
+ if (url.startsWith("http")) {
53
+ return url;
54
+ }
55
+ const serverConfig = config.server;
56
+ const hostname = config.environment === "development" && ["127.0.0.1", "0.0.0.0"].includes(serverConfig.host) ? "localhost" : serverConfig.host;
57
+ return `http://${hostname}:${serverConfig.port}${url}`;
58
+ };
59
+ const getAbsoluteAdminUrl = getAbsoluteUrl("admin");
60
+ const getAbsoluteServerUrl = getAbsoluteUrl("server");
61
+ export {
62
+ getAbsoluteAdminUrl,
63
+ getAbsoluteServerUrl,
64
+ getConfigUrls
65
+ };
66
+ //# sourceMappingURL=urls.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"urls.mjs","sources":["../../src/configuration/urls.ts"],"sourcesContent":["import _ from 'lodash';\nimport { strings } from '@strapi/utils';\n\ninterface ServerConfig {\n url: string;\n host: string;\n port: number | string;\n}\n\nexport const getConfigUrls = (config: Record<string, unknown>, forAdminBuild = false) => {\n const serverConfig = config.server as ServerConfig;\n const adminConfig = config.admin;\n\n // Defines serverUrl value\n let serverUrl = _.get(serverConfig, 'url', '');\n serverUrl = _.trim(serverUrl, '/ ');\n if (typeof serverUrl !== 'string') {\n throw new Error('Invalid server url config. Make sure the url is a string.');\n }\n\n if (serverUrl.startsWith('http')) {\n try {\n serverUrl = _.trim(new URL(serverConfig.url).toString(), '/');\n } catch (e) {\n throw new Error(\n 'Invalid server url config. Make sure the url defined in server.js is valid.'\n );\n }\n } else if (serverUrl !== '') {\n serverUrl = `/${serverUrl}`;\n }\n\n // Defines adminUrl value\n let adminUrl = _.get(adminConfig, 'url', '/admin');\n adminUrl = _.trim(adminUrl, '/ ');\n if (typeof adminUrl !== 'string') {\n throw new Error('Invalid admin url config. Make sure the url is a non-empty string.');\n }\n if (adminUrl.startsWith('http')) {\n try {\n adminUrl = _.trim(new URL(adminUrl).toString(), '/');\n } catch (e) {\n throw new Error('Invalid admin url config. Make sure the url defined in server.js is valid.');\n }\n } else {\n adminUrl = `${serverUrl}/${adminUrl}`;\n }\n\n // Defines adminPath value\n let adminPath = adminUrl;\n if (\n serverUrl.startsWith('http') &&\n adminUrl.startsWith('http') &&\n new URL(adminUrl).origin === new URL(serverUrl).origin &&\n !forAdminBuild\n ) {\n adminPath = adminUrl.replace(strings.getCommonPath(serverUrl, adminUrl), '');\n adminPath = `/${_.trim(adminPath, '/')}`;\n } else if (adminUrl.startsWith('http')) {\n adminPath = new URL(adminUrl).pathname;\n }\n\n return {\n serverUrl,\n adminUrl,\n adminPath,\n };\n};\n\nconst getAbsoluteUrl =\n (adminOrServer: 'admin' | 'server') =>\n (config: Record<string, unknown>, forAdminBuild = false) => {\n const { serverUrl, adminUrl } = getConfigUrls(config, forAdminBuild);\n const url = adminOrServer === 'server' ? serverUrl : adminUrl;\n\n if (url.startsWith('http')) {\n return url;\n }\n\n const serverConfig = config.server as ServerConfig;\n const hostname =\n config.environment === 'development' && ['127.0.0.1', '0.0.0.0'].includes(serverConfig.host)\n ? 'localhost'\n : serverConfig.host;\n\n return `http://${hostname}:${serverConfig.port}${url}`;\n };\n\nexport const getAbsoluteAdminUrl = getAbsoluteUrl('admin');\nexport const getAbsoluteServerUrl = getAbsoluteUrl('server');\n"],"names":[],"mappings":";;AASO,MAAM,gBAAgB,CAAC,QAAiC,gBAAgB,UAAU;AACvF,QAAM,eAAe,OAAO;AAC5B,QAAM,cAAc,OAAO;AAG3B,MAAI,YAAY,EAAE,IAAI,cAAc,OAAO,EAAE;AACjC,cAAA,EAAE,KAAK,WAAW,IAAI;AAC9B,MAAA,OAAO,cAAc,UAAU;AAC3B,UAAA,IAAI,MAAM,2DAA2D;AAAA,EAC7E;AAEI,MAAA,UAAU,WAAW,MAAM,GAAG;AAC5B,QAAA;AACU,kBAAA,EAAE,KAAK,IAAI,IAAI,aAAa,GAAG,EAAE,YAAY,GAAG;AAAA,aACrD,GAAG;AACV,YAAM,IAAI;AAAA,QACR;AAAA,MAAA;AAAA,IAEJ;AAAA,EAAA,WACS,cAAc,IAAI;AAC3B,gBAAY,IAAI,SAAS;AAAA,EAC3B;AAGA,MAAI,WAAW,EAAE,IAAI,aAAa,OAAO,QAAQ;AACtC,aAAA,EAAE,KAAK,UAAU,IAAI;AAC5B,MAAA,OAAO,aAAa,UAAU;AAC1B,UAAA,IAAI,MAAM,oEAAoE;AAAA,EACtF;AACI,MAAA,SAAS,WAAW,MAAM,GAAG;AAC3B,QAAA;AACS,iBAAA,EAAE,KAAK,IAAI,IAAI,QAAQ,EAAE,YAAY,GAAG;AAAA,aAC5C,GAAG;AACJ,YAAA,IAAI,MAAM,4EAA4E;AAAA,IAC9F;AAAA,EAAA,OACK;AACM,eAAA,GAAG,SAAS,IAAI,QAAQ;AAAA,EACrC;AAGA,MAAI,YAAY;AAChB,MACE,UAAU,WAAW,MAAM,KAC3B,SAAS,WAAW,MAAM,KAC1B,IAAI,IAAI,QAAQ,EAAE,WAAW,IAAI,IAAI,SAAS,EAAE,UAChD,CAAC,eACD;AACA,gBAAY,SAAS,QAAQ,QAAQ,cAAc,WAAW,QAAQ,GAAG,EAAE;AAC3E,gBAAY,IAAI,EAAE,KAAK,WAAW,GAAG,CAAC;AAAA,EAC7B,WAAA,SAAS,WAAW,MAAM,GAAG;AAC1B,gBAAA,IAAI,IAAI,QAAQ,EAAE;AAAA,EAChC;AAEO,SAAA;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEA,MAAM,iBACJ,CAAC,kBACD,CAAC,QAAiC,gBAAgB,UAAU;AAC1D,QAAM,EAAE,WAAW,SAAA,IAAa,cAAc,QAAQ,aAAa;AAC7D,QAAA,MAAM,kBAAkB,WAAW,YAAY;AAEjD,MAAA,IAAI,WAAW,MAAM,GAAG;AACnB,WAAA;AAAA,EACT;AAEA,QAAM,eAAe,OAAO;AAC5B,QAAM,WACJ,OAAO,gBAAgB,iBAAiB,CAAC,aAAa,SAAS,EAAE,SAAS,aAAa,IAAI,IACvF,cACA,aAAa;AAEnB,SAAO,UAAU,QAAQ,IAAI,aAAa,IAAI,GAAG,GAAG;AACtD;AAEW,MAAA,sBAAsB,eAAe,OAAO;AAC5C,MAAA,uBAAuB,eAAe,QAAQ;"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core-api/controller/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAWrD,iBAAS,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,IAAI,EAAE;IACnF,WAAW,EAAE,CAAC,CAAC;CAChB,GAAG,CAAC,SAAS,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC;AAuDpG,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core-api/controller/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAYrD,iBAAS,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,IAAI,EAAE;IACnF,WAAW,EAAE,CAAC,CAAC;CAChB,GAAG,CAAC,SAAS,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC;AA2DpG,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
@@ -5,6 +5,7 @@ const strapiUtils = require("@strapi/utils");
5
5
  const transform = require("./transform.js");
6
6
  const singleType = require("./single-type.js");
7
7
  const collectionType = require("./collection-type.js");
8
+ const requestContext = require("../../services/request-context.js");
8
9
  const isSingleType = (contentType) => strapiUtils.contentTypes.isSingleType(contentType);
9
10
  const getAuthFromKoaContext = (ctx) => _.prop("state.auth", ctx) ?? {};
10
11
  function createController({
@@ -12,7 +13,11 @@ function createController({
12
13
  }) {
13
14
  const proto = {
14
15
  transformResponse(data, meta) {
15
- return transform.transformResponse(data, meta, { contentType });
16
+ const ctx = requestContext.get();
17
+ return transform.transformResponse(data, meta, {
18
+ contentType,
19
+ useJsonAPIFormat: ctx?.headers?.["strapi-response-format"] === "v4"
20
+ });
16
21
  },
17
22
  async sanitizeOutput(data, ctx) {
18
23
  const auth = getAuthFromKoaContext(ctx);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":["../../../src/core-api/controller/index.ts"],"sourcesContent":["import { prop } from 'lodash/fp';\nimport type Koa from 'koa';\nimport { contentTypes as contentTypeUtils, sanitize, validate } from '@strapi/utils';\nimport type { CoreApi, Schema } from '@strapi/types';\n\nimport { transformResponse } from './transform';\nimport { createSingleTypeController } from './single-type';\nimport { createCollectionTypeController } from './collection-type';\n\nconst isSingleType = (contentType: Schema.ContentType): contentType is Schema.SingleType =>\n contentTypeUtils.isSingleType(contentType);\n\nconst getAuthFromKoaContext = (ctx: Koa.Context) => prop('state.auth', ctx) ?? {};\n\nfunction createController<T extends Schema.SingleType | Schema.CollectionType>(opts: {\n contentType: T;\n}): T extends Schema.SingleType ? CoreApi.Controller.SingleType : CoreApi.Controller.CollectionType;\nfunction createController({\n contentType,\n}: {\n contentType: Schema.SingleType | Schema.CollectionType;\n}) {\n // TODO: replace with Base class + SingleType and CollectionType classes\n\n const proto: CoreApi.Controller.Base = {\n transformResponse(data, meta) {\n return transformResponse(data, meta, { contentType });\n },\n\n async sanitizeOutput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.output(data, contentType, { auth });\n },\n\n async sanitizeInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.input(data, contentType, { auth });\n },\n\n async sanitizeQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.input(data, contentType, { auth });\n },\n };\n\n let ctrl;\n\n if (isSingleType(contentType)) {\n ctrl = createSingleTypeController({ contentType });\n } else {\n ctrl = createCollectionTypeController({ contentType });\n }\n\n return Object.assign(Object.create(proto), ctrl);\n}\n\nexport { createController };\n"],"names":["contentTypeUtils","prop","transformResponse","sanitize","validate","createSingleTypeController","createCollectionTypeController"],"mappings":";;;;;;;AASA,MAAM,eAAe,CAAC,gBACpBA,YAAA,aAAiB,aAAa,WAAW;AAE3C,MAAM,wBAAwB,CAAC,QAAqBC,EAAAA,KAAK,cAAc,GAAG,KAAK;AAK/E,SAAS,iBAAiB;AAAA,EACxB;AACF,GAEG;AAGD,QAAM,QAAiC;AAAA,IACrC,kBAAkB,MAAM,MAAM;AAC5B,aAAOC,UAAkB,kBAAA,MAAM,MAAM,EAAE,YAAa,CAAA;AAAA,IACtD;AAAA,IAEA,MAAM,eAAe,MAAM,KAAK;AACxB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAOC,YAAAA,SAAS,WAAW,OAAO,MAAM,aAAa,EAAE,MAAM;AAAA,IAC/D;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAOA,YAAAA,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAAA,YAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAAC,YAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAOA,YAAAA,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,EAAA;AAGE,MAAA;AAEA,MAAA,aAAa,WAAW,GAAG;AACtB,WAAAC,WAAA,2BAA2B,EAAE,YAAA,CAAa;AAAA,EAAA,OAC5C;AACE,WAAAC,eAAA,+BAA+B,EAAE,YAAA,CAAa;AAAA,EACvD;AAEA,SAAO,OAAO,OAAO,OAAO,OAAO,KAAK,GAAG,IAAI;AACjD;;"}
1
+ {"version":3,"file":"index.js","sources":["../../../src/core-api/controller/index.ts"],"sourcesContent":["import { prop } from 'lodash/fp';\nimport type Koa from 'koa';\nimport { contentTypes as contentTypeUtils, sanitize, validate } from '@strapi/utils';\nimport type { CoreApi, Schema } from '@strapi/types';\n\nimport { transformResponse } from './transform';\nimport { createSingleTypeController } from './single-type';\nimport { createCollectionTypeController } from './collection-type';\nimport requestCtx from '../../services/request-context';\n\nconst isSingleType = (contentType: Schema.ContentType): contentType is Schema.SingleType =>\n contentTypeUtils.isSingleType(contentType);\n\nconst getAuthFromKoaContext = (ctx: Koa.Context) => prop('state.auth', ctx) ?? {};\n\nfunction createController<T extends Schema.SingleType | Schema.CollectionType>(opts: {\n contentType: T;\n}): T extends Schema.SingleType ? CoreApi.Controller.SingleType : CoreApi.Controller.CollectionType;\nfunction createController({\n contentType,\n}: {\n contentType: Schema.SingleType | Schema.CollectionType;\n}) {\n // TODO: replace with Base class + SingleType and CollectionType classes\n\n const proto: CoreApi.Controller.Base = {\n transformResponse(data, meta) {\n const ctx = requestCtx.get();\n return transformResponse(data, meta, {\n contentType,\n useJsonAPIFormat: ctx?.headers?.['strapi-response-format'] === 'v4',\n });\n },\n\n async sanitizeOutput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.output(data, contentType, { auth });\n },\n\n async sanitizeInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.input(data, contentType, { auth });\n },\n\n async sanitizeQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.input(data, contentType, { auth });\n },\n };\n\n let ctrl;\n\n if (isSingleType(contentType)) {\n ctrl = createSingleTypeController({ contentType });\n } else {\n ctrl = createCollectionTypeController({ contentType });\n }\n\n return Object.assign(Object.create(proto), ctrl);\n}\n\nexport { createController };\n"],"names":["contentTypeUtils","prop","requestCtx","transformResponse","sanitize","validate","createSingleTypeController","createCollectionTypeController"],"mappings":";;;;;;;;AAUA,MAAM,eAAe,CAAC,gBACpBA,YAAA,aAAiB,aAAa,WAAW;AAE3C,MAAM,wBAAwB,CAAC,QAAqBC,EAAAA,KAAK,cAAc,GAAG,KAAK;AAK/E,SAAS,iBAAiB;AAAA,EACxB;AACF,GAEG;AAGD,QAAM,QAAiC;AAAA,IACrC,kBAAkB,MAAM,MAAM;AACtB,YAAA,MAAMC,eAAW;AAChB,aAAAC,UAAA,kBAAkB,MAAM,MAAM;AAAA,QACnC;AAAA,QACA,kBAAkB,KAAK,UAAU,wBAAwB,MAAM;AAAA,MAAA,CAChE;AAAA,IACH;AAAA,IAEA,MAAM,eAAe,MAAM,KAAK;AACxB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAOC,YAAAA,SAAS,WAAW,OAAO,MAAM,aAAa,EAAE,MAAM;AAAA,IAC/D;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAOA,YAAAA,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAAA,YAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAAC,YAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAOA,YAAAA,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,EAAA;AAGE,MAAA;AAEA,MAAA,aAAa,WAAW,GAAG;AACtB,WAAAC,WAAA,2BAA2B,EAAE,YAAA,CAAa;AAAA,EAAA,OAC5C;AACE,WAAAC,eAAA,+BAA+B,EAAE,YAAA,CAAa;AAAA,EACvD;AAEA,SAAO,OAAO,OAAO,OAAO,OAAO,KAAK,GAAG,IAAI;AACjD;;"}
@@ -3,6 +3,7 @@ import { contentTypes, sanitize, validate } from "@strapi/utils";
3
3
  import { transformResponse } from "./transform.mjs";
4
4
  import { createSingleTypeController } from "./single-type.mjs";
5
5
  import { createCollectionTypeController } from "./collection-type.mjs";
6
+ import requestCtx from "../../services/request-context.mjs";
6
7
  const isSingleType = (contentType) => contentTypes.isSingleType(contentType);
7
8
  const getAuthFromKoaContext = (ctx) => prop("state.auth", ctx) ?? {};
8
9
  function createController({
@@ -10,7 +11,11 @@ function createController({
10
11
  }) {
11
12
  const proto = {
12
13
  transformResponse(data, meta) {
13
- return transformResponse(data, meta, { contentType });
14
+ const ctx = requestCtx.get();
15
+ return transformResponse(data, meta, {
16
+ contentType,
17
+ useJsonAPIFormat: ctx?.headers?.["strapi-response-format"] === "v4"
18
+ });
14
19
  },
15
20
  async sanitizeOutput(data, ctx) {
16
21
  const auth = getAuthFromKoaContext(ctx);
@@ -1 +1 @@
1
- {"version":3,"file":"index.mjs","sources":["../../../src/core-api/controller/index.ts"],"sourcesContent":["import { prop } from 'lodash/fp';\nimport type Koa from 'koa';\nimport { contentTypes as contentTypeUtils, sanitize, validate } from '@strapi/utils';\nimport type { CoreApi, Schema } from '@strapi/types';\n\nimport { transformResponse } from './transform';\nimport { createSingleTypeController } from './single-type';\nimport { createCollectionTypeController } from './collection-type';\n\nconst isSingleType = (contentType: Schema.ContentType): contentType is Schema.SingleType =>\n contentTypeUtils.isSingleType(contentType);\n\nconst getAuthFromKoaContext = (ctx: Koa.Context) => prop('state.auth', ctx) ?? {};\n\nfunction createController<T extends Schema.SingleType | Schema.CollectionType>(opts: {\n contentType: T;\n}): T extends Schema.SingleType ? CoreApi.Controller.SingleType : CoreApi.Controller.CollectionType;\nfunction createController({\n contentType,\n}: {\n contentType: Schema.SingleType | Schema.CollectionType;\n}) {\n // TODO: replace with Base class + SingleType and CollectionType classes\n\n const proto: CoreApi.Controller.Base = {\n transformResponse(data, meta) {\n return transformResponse(data, meta, { contentType });\n },\n\n async sanitizeOutput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.output(data, contentType, { auth });\n },\n\n async sanitizeInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.input(data, contentType, { auth });\n },\n\n async sanitizeQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.input(data, contentType, { auth });\n },\n };\n\n let ctrl;\n\n if (isSingleType(contentType)) {\n ctrl = createSingleTypeController({ contentType });\n } else {\n ctrl = createCollectionTypeController({ contentType });\n }\n\n return Object.assign(Object.create(proto), ctrl);\n}\n\nexport { createController };\n"],"names":["contentTypeUtils"],"mappings":";;;;;AASA,MAAM,eAAe,CAAC,gBACpBA,aAAiB,aAAa,WAAW;AAE3C,MAAM,wBAAwB,CAAC,QAAqB,KAAK,cAAc,GAAG,KAAK;AAK/E,SAAS,iBAAiB;AAAA,EACxB;AACF,GAEG;AAGD,QAAM,QAAiC;AAAA,IACrC,kBAAkB,MAAM,MAAM;AAC5B,aAAO,kBAAkB,MAAM,MAAM,EAAE,YAAa,CAAA;AAAA,IACtD;AAAA,IAEA,MAAM,eAAe,MAAM,KAAK;AACxB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAO,SAAS,WAAW,OAAO,MAAM,aAAa,EAAE,MAAM;AAAA,IAC/D;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAO,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAO,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,EAAA;AAGE,MAAA;AAEA,MAAA,aAAa,WAAW,GAAG;AACtB,WAAA,2BAA2B,EAAE,YAAA,CAAa;AAAA,EAAA,OAC5C;AACE,WAAA,+BAA+B,EAAE,YAAA,CAAa;AAAA,EACvD;AAEA,SAAO,OAAO,OAAO,OAAO,OAAO,KAAK,GAAG,IAAI;AACjD;"}
1
+ {"version":3,"file":"index.mjs","sources":["../../../src/core-api/controller/index.ts"],"sourcesContent":["import { prop } from 'lodash/fp';\nimport type Koa from 'koa';\nimport { contentTypes as contentTypeUtils, sanitize, validate } from '@strapi/utils';\nimport type { CoreApi, Schema } from '@strapi/types';\n\nimport { transformResponse } from './transform';\nimport { createSingleTypeController } from './single-type';\nimport { createCollectionTypeController } from './collection-type';\nimport requestCtx from '../../services/request-context';\n\nconst isSingleType = (contentType: Schema.ContentType): contentType is Schema.SingleType =>\n contentTypeUtils.isSingleType(contentType);\n\nconst getAuthFromKoaContext = (ctx: Koa.Context) => prop('state.auth', ctx) ?? {};\n\nfunction createController<T extends Schema.SingleType | Schema.CollectionType>(opts: {\n contentType: T;\n}): T extends Schema.SingleType ? CoreApi.Controller.SingleType : CoreApi.Controller.CollectionType;\nfunction createController({\n contentType,\n}: {\n contentType: Schema.SingleType | Schema.CollectionType;\n}) {\n // TODO: replace with Base class + SingleType and CollectionType classes\n\n const proto: CoreApi.Controller.Base = {\n transformResponse(data, meta) {\n const ctx = requestCtx.get();\n return transformResponse(data, meta, {\n contentType,\n useJsonAPIFormat: ctx?.headers?.['strapi-response-format'] === 'v4',\n });\n },\n\n async sanitizeOutput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.output(data, contentType, { auth });\n },\n\n async sanitizeInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.input(data, contentType, { auth });\n },\n\n async sanitizeQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return sanitize.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateQuery(ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.query(ctx.query, contentType, { auth });\n },\n\n async validateInput(data, ctx) {\n const auth = getAuthFromKoaContext(ctx);\n\n return validate.contentAPI.input(data, contentType, { auth });\n },\n };\n\n let ctrl;\n\n if (isSingleType(contentType)) {\n ctrl = createSingleTypeController({ contentType });\n } else {\n ctrl = createCollectionTypeController({ contentType });\n }\n\n return Object.assign(Object.create(proto), ctrl);\n}\n\nexport { createController };\n"],"names":["contentTypeUtils"],"mappings":";;;;;;AAUA,MAAM,eAAe,CAAC,gBACpBA,aAAiB,aAAa,WAAW;AAE3C,MAAM,wBAAwB,CAAC,QAAqB,KAAK,cAAc,GAAG,KAAK;AAK/E,SAAS,iBAAiB;AAAA,EACxB;AACF,GAEG;AAGD,QAAM,QAAiC;AAAA,IACrC,kBAAkB,MAAM,MAAM;AACtB,YAAA,MAAM,WAAW;AAChB,aAAA,kBAAkB,MAAM,MAAM;AAAA,QACnC;AAAA,QACA,kBAAkB,KAAK,UAAU,wBAAwB,MAAM;AAAA,MAAA,CAChE;AAAA,IACH;AAAA,IAEA,MAAM,eAAe,MAAM,KAAK;AACxB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAO,SAAS,WAAW,OAAO,MAAM,aAAa,EAAE,MAAM;AAAA,IAC/D;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAO,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,KAAK;AACjB,YAAA,OAAO,sBAAsB,GAAG;AAE/B,aAAA,SAAS,WAAW,MAAM,IAAI,OAAO,aAAa,EAAE,MAAM;AAAA,IACnE;AAAA,IAEA,MAAM,cAAc,MAAM,KAAK;AACvB,YAAA,OAAO,sBAAsB,GAAG;AAEtC,aAAO,SAAS,WAAW,MAAM,MAAM,aAAa,EAAE,MAAM;AAAA,IAC9D;AAAA,EAAA;AAGE,MAAA;AAEA,MAAA,aAAa,WAAW,GAAG;AACtB,WAAA,2BAA2B,EAAE,YAAA,CAAa;AAAA,EAAA,OAC5C;AACE,WAAA,+BAA+B,EAAE,YAAA,CAAa;AAAA,EACvD;AAEA,SAAO,OAAO,OAAO,OAAO,OAAO,KAAK,GAAG,IAAI;AACjD;"}
@@ -1,12 +1,13 @@
1
1
  import type { Schema } from '@strapi/types';
2
- type TransformedEntry = {
3
- id: string;
4
- meta?: Record<string, unknown>;
5
- } & Record<string, unknown>;
6
- declare const transformResponse: (resource: any, meta?: unknown, opts?: {
2
+ interface TransformOptions {
7
3
  contentType?: Schema.ContentType | Schema.Component;
8
- }) => {
9
- data: TransformedEntry | TransformedEntry[] | null;
4
+ /**
5
+ * @deprecated this option is deprecated and will be removed in the next major version
6
+ */
7
+ useJsonAPIFormat?: boolean;
8
+ }
9
+ declare const transformResponse: (resource: any, meta?: unknown, opts?: TransformOptions) => {
10
+ data: any;
10
11
  meta: unknown;
11
12
  } | null | undefined;
12
13
  export { transformResponse };
@@ -1 +1 @@
1
- {"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/core-api/controller/transform.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAU,MAAM,EAAO,MAAM,eAAe,CAAC;AAEzD,KAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAoB5B,QAAA,MAAM,iBAAiB,aACX,GAAG,SACP,OAAO,SACP;IAAE,WAAW,CAAC,EAAE,OAAO,WAAW,GAAG,OAAO,SAAS,CAAA;CAAE;;;oBAU9D,CAAC;AA+EF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
1
+ {"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/core-api/controller/transform.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAU,MAAM,EAAO,MAAM,eAAe,CAAC;AA2BzD,UAAU,gBAAgB;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC;IACpD;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,QAAA,MAAM,iBAAiB,aACX,GAAG,SACP,OAAO,SACP,gBAAgB;;;oBAgBvB,CAAC;AAqFF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
@@ -7,12 +7,17 @@ function isEntry(property) {
7
7
  function isDZEntries(property) {
8
8
  return Array.isArray(property);
9
9
  }
10
- const transformResponse = (resource, meta = {}, opts = {}) => {
10
+ const transformResponse = (resource, meta = {}, opts = {
11
+ useJsonAPIFormat: false
12
+ }) => {
11
13
  if (_.isNil(resource)) {
12
14
  return resource;
13
15
  }
16
+ if (!_.isPlainObject(resource) && !Array.isArray(resource)) {
17
+ throw new Error("Entry must be an object or an arrayy of objects");
18
+ }
14
19
  return {
15
- data: transformEntry(resource, opts?.contentType),
20
+ data: opts.useJsonAPIFormat ? transformEntry(resource, opts?.contentType) : resource,
16
21
  meta
17
22
  };
18
23
  };
@@ -20,7 +25,12 @@ function transformComponent(data, component) {
20
25
  if (Array.isArray(data)) {
21
26
  return data.map((datum) => transformComponent(datum, component));
22
27
  }
23
- return transformEntry(data, component);
28
+ const res = transformEntry(data, component);
29
+ if (_.isNil(res)) {
30
+ return res;
31
+ }
32
+ const { id, attributes } = res;
33
+ return { id, ...attributes };
24
34
  }
25
35
  function transformEntry(entry, type) {
26
36
  if (_.isNil(entry)) {
@@ -32,7 +42,7 @@ function transformEntry(entry, type) {
32
42
  if (!_.isPlainObject(entry)) {
33
43
  throw new Error("Entry must be an object");
34
44
  }
35
- const { id, ...properties } = entry;
45
+ const { id, documentId, ...properties } = entry;
36
46
  const attributeValues = {};
37
47
  for (const key of Object.keys(properties)) {
38
48
  const property = properties[key];
@@ -42,7 +52,7 @@ function transformEntry(entry, type) {
42
52
  property,
43
53
  strapi.contentType(attribute.target)
44
54
  );
45
- attributeValues[key] = data;
55
+ attributeValues[key] = { data };
46
56
  } else if (attribute && attribute.type === "component" && isEntry(property)) {
47
57
  attributeValues[key] = transformComponent(property, strapi.components[attribute.component]);
48
58
  } else if (attribute && attribute.type === "dynamiczone" && isDZEntries(property)) {
@@ -54,16 +64,15 @@ function transformEntry(entry, type) {
54
64
  });
55
65
  } else if (attribute && attribute.type === "media" && isEntry(property)) {
56
66
  const data = transformEntry(property, strapi.contentType("plugin::upload.file"));
57
- attributeValues[key] = data;
67
+ attributeValues[key] = { data };
58
68
  } else {
59
69
  attributeValues[key] = property;
60
70
  }
61
71
  }
62
72
  return {
63
73
  id,
64
- ...attributeValues
65
- // NOTE: not necessary for now
66
- // meta: {},
74
+ documentId,
75
+ attributes: attributeValues
67
76
  };
68
77
  }
69
78
  exports.transformResponse = transformResponse;
@@ -1 +1 @@
1
- {"version":3,"file":"transform.js","sources":["../../../src/core-api/controller/transform.ts"],"sourcesContent":["import { isNil, isPlainObject } from 'lodash/fp';\nimport type { Common, Schema, UID } from '@strapi/types';\n\ntype TransformedEntry = {\n id: string;\n meta?: Record<string, unknown>;\n} & Record<string, unknown>;\n\ntype TransformedComponent = {\n id: string;\n [key: string]: unknown;\n};\n\ntype Entry = {\n id: string;\n [key: string]: Entry | Entry[] | string | number | null | boolean | Date;\n};\n\nfunction isEntry(property: unknown): property is Entry | Entry[] {\n return property === null || isPlainObject(property) || Array.isArray(property);\n}\n\nfunction isDZEntries(property: unknown): property is (Entry & { __component: UID.Component })[] {\n return Array.isArray(property);\n}\n\nconst transformResponse = (\n resource: any,\n meta: unknown = {},\n opts: { contentType?: Schema.ContentType | Schema.Component } = {}\n) => {\n if (isNil(resource)) {\n return resource;\n }\n\n return {\n data: transformEntry(resource, opts?.contentType),\n meta,\n };\n};\n\nfunction transformComponent<T extends Entry | Entry[] | null>(\n data: T,\n component: Schema.Component\n): T extends Entry[] ? TransformedComponent[] : T extends Entry ? TransformedComponent : null;\nfunction transformComponent(\n data: Entry | Entry[] | null,\n component: Schema.Component\n): TransformedComponent | TransformedComponent[] | null {\n if (Array.isArray(data)) {\n return data.map((datum) => transformComponent(datum, component));\n }\n\n return transformEntry(data, component);\n}\n\nfunction transformEntry<T extends Entry | Entry[] | null>(\n entry: T,\n type?: Schema.ContentType | Schema.Component\n): T extends Entry[] ? TransformedEntry[] : T extends Entry ? TransformedEntry : null;\nfunction transformEntry(\n entry: Entry | Entry[] | null,\n type?: Schema.ContentType | Schema.Component\n): TransformedEntry | TransformedEntry[] | null {\n if (isNil(entry)) {\n return entry;\n }\n\n if (Array.isArray(entry)) {\n return entry.map((singleEntry) => transformEntry(singleEntry, type));\n }\n\n if (!isPlainObject(entry)) {\n throw new Error('Entry must be an object');\n }\n\n const { id, ...properties } = entry;\n\n const attributeValues: Record<string, unknown> = {};\n\n for (const key of Object.keys(properties)) {\n const property = properties[key];\n const attribute = type && type.attributes[key];\n\n if (attribute && attribute.type === 'relation' && isEntry(property) && 'target' in attribute) {\n const data = transformEntry(\n property,\n strapi.contentType(attribute.target as Common.UID.ContentType)\n );\n\n attributeValues[key] = data;\n } else if (attribute && attribute.type === 'component' && isEntry(property)) {\n attributeValues[key] = transformComponent(property, strapi.components[attribute.component]);\n } else if (attribute && attribute.type === 'dynamiczone' && isDZEntries(property)) {\n if (isNil(property)) {\n attributeValues[key] = property;\n }\n\n attributeValues[key] = property.map((subProperty) => {\n return transformComponent(subProperty, strapi.components[subProperty.__component]);\n });\n } else if (attribute && attribute.type === 'media' && isEntry(property)) {\n const data = transformEntry(property, strapi.contentType('plugin::upload.file'));\n\n attributeValues[key] = data;\n } else {\n attributeValues[key] = property;\n }\n }\n\n return {\n id,\n ...attributeValues,\n // NOTE: not necessary for now\n // meta: {},\n };\n}\n\nexport { transformResponse };\n"],"names":["isPlainObject","isNil"],"mappings":";;;AAkBA,SAAS,QAAQ,UAAgD;AAC/D,SAAO,aAAa,QAAQA,gBAAc,QAAQ,KAAK,MAAM,QAAQ,QAAQ;AAC/E;AAEA,SAAS,YAAY,UAA2E;AACvF,SAAA,MAAM,QAAQ,QAAQ;AAC/B;AAEM,MAAA,oBAAoB,CACxB,UACA,OAAgB,CAAA,GAChB,OAAgE,CAAA,MAC7D;AACC,MAAAC,EAAAA,MAAM,QAAQ,GAAG;AACZ,WAAA;AAAA,EACT;AAEO,SAAA;AAAA,IACL,MAAM,eAAe,UAAU,MAAM,WAAW;AAAA,IAChD;AAAA,EAAA;AAEJ;AAMA,SAAS,mBACP,MACA,WACsD;AAClD,MAAA,MAAM,QAAQ,IAAI,GAAG;AACvB,WAAO,KAAK,IAAI,CAAC,UAAU,mBAAmB,OAAO,SAAS,CAAC;AAAA,EACjE;AAEO,SAAA,eAAe,MAAM,SAAS;AACvC;AAMA,SAAS,eACP,OACA,MAC8C;AAC1C,MAAAA,EAAAA,MAAM,KAAK,GAAG;AACT,WAAA;AAAA,EACT;AAEI,MAAA,MAAM,QAAQ,KAAK,GAAG;AACxB,WAAO,MAAM,IAAI,CAAC,gBAAgB,eAAe,aAAa,IAAI,CAAC;AAAA,EACrE;AAEI,MAAA,CAACD,EAAAA,cAAc,KAAK,GAAG;AACnB,UAAA,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,EAAE,IAAI,GAAG,WAAA,IAAe;AAE9B,QAAM,kBAA2C,CAAA;AAEjD,aAAW,OAAO,OAAO,KAAK,UAAU,GAAG;AACnC,UAAA,WAAW,WAAW,GAAG;AAC/B,UAAM,YAAY,QAAQ,KAAK,WAAW,GAAG;AAEzC,QAAA,aAAa,UAAU,SAAS,cAAc,QAAQ,QAAQ,KAAK,YAAY,WAAW;AAC5F,YAAM,OAAO;AAAA,QACX;AAAA,QACA,OAAO,YAAY,UAAU,MAAgC;AAAA,MAAA;AAG/D,sBAAgB,GAAG,IAAI;AAAA,IAAA,WACd,aAAa,UAAU,SAAS,eAAe,QAAQ,QAAQ,GAAG;AAC3D,sBAAA,GAAG,IAAI,mBAAmB,UAAU,OAAO,WAAW,UAAU,SAAS,CAAC;AAAA,IAAA,WACjF,aAAa,UAAU,SAAS,iBAAiB,YAAY,QAAQ,GAAG;AAC7E,UAAAC,EAAAA,MAAM,QAAQ,GAAG;AACnB,wBAAgB,GAAG,IAAI;AAAA,MACzB;AAEA,sBAAgB,GAAG,IAAI,SAAS,IAAI,CAAC,gBAAgB;AACnD,eAAO,mBAAmB,aAAa,OAAO,WAAW,YAAY,WAAW,CAAC;AAAA,MAAA,CAClF;AAAA,IAAA,WACQ,aAAa,UAAU,SAAS,WAAW,QAAQ,QAAQ,GAAG;AACvE,YAAM,OAAO,eAAe,UAAU,OAAO,YAAY,qBAAqB,CAAC;AAE/E,sBAAgB,GAAG,IAAI;AAAA,IAAA,OAClB;AACL,sBAAgB,GAAG,IAAI;AAAA,IACzB;AAAA,EACF;AAEO,SAAA;AAAA,IACL;AAAA,IACA,GAAG;AAAA;AAAA;AAAA,EAAA;AAIP;;"}
1
+ {"version":3,"file":"transform.js","sources":["../../../src/core-api/controller/transform.ts"],"sourcesContent":["import { isNil, isPlainObject } from 'lodash/fp';\nimport type { Common, Schema, UID } from '@strapi/types';\n\ntype TransformedEntry = {\n id: string;\n documentId?: string | null;\n attributes: Record<string, unknown>;\n};\n\ntype TransformedComponent = {\n id: string;\n [key: string]: unknown;\n};\n\ntype Entry = {\n id: string;\n documentId: string | null;\n [key: string]: Entry | Entry[] | string | number | null | boolean | Date;\n};\n\nfunction isEntry(property: unknown): property is Entry | Entry[] {\n return property === null || isPlainObject(property) || Array.isArray(property);\n}\n\nfunction isDZEntries(property: unknown): property is (Entry & { __component: UID.Component })[] {\n return Array.isArray(property);\n}\n\ninterface TransformOptions {\n contentType?: Schema.ContentType | Schema.Component;\n /**\n * @deprecated this option is deprecated and will be removed in the next major version\n */\n useJsonAPIFormat?: boolean;\n}\n\nconst transformResponse = (\n resource: any,\n meta: unknown = {},\n opts: TransformOptions = {\n useJsonAPIFormat: false,\n }\n) => {\n if (isNil(resource)) {\n return resource;\n }\n\n if (!isPlainObject(resource) && !Array.isArray(resource)) {\n throw new Error('Entry must be an object or an arrayy of objects');\n }\n\n return {\n data: opts.useJsonAPIFormat ? transformEntry(resource, opts?.contentType) : resource,\n meta,\n };\n};\n\nfunction transformComponent<T extends Entry | Entry[] | null>(\n data: T,\n component: Schema.Component\n): T extends Entry[] ? TransformedComponent[] : T extends Entry ? TransformedComponent : null;\nfunction transformComponent(\n data: Entry | Entry[] | null,\n component: Schema.Component\n): TransformedComponent | TransformedComponent[] | null {\n if (Array.isArray(data)) {\n return data.map((datum) => transformComponent(datum, component));\n }\n\n const res = transformEntry(data, component);\n\n if (isNil(res)) {\n return res;\n }\n\n const { id, attributes } = res;\n return { id, ...attributes };\n}\n\nfunction transformEntry<T extends Entry | Entry[] | null>(\n entry: T,\n type?: Schema.ContentType | Schema.Component\n): T extends Entry[] ? TransformedEntry[] : T extends Entry ? TransformedEntry : null;\nfunction transformEntry(\n entry: Entry | Entry[] | null,\n type?: Schema.ContentType | Schema.Component\n): TransformedEntry | TransformedEntry[] | null {\n if (isNil(entry)) {\n return entry;\n }\n\n if (Array.isArray(entry)) {\n return entry.map((singleEntry) => transformEntry(singleEntry, type));\n }\n\n if (!isPlainObject(entry)) {\n throw new Error('Entry must be an object');\n }\n\n const { id, documentId, ...properties } = entry;\n\n const attributeValues: Record<string, unknown> = {};\n\n for (const key of Object.keys(properties)) {\n const property = properties[key];\n const attribute = type && type.attributes[key];\n\n if (attribute && attribute.type === 'relation' && isEntry(property) && 'target' in attribute) {\n const data = transformEntry(\n property,\n strapi.contentType(attribute.target as Common.UID.ContentType)\n );\n\n attributeValues[key] = { data };\n } else if (attribute && attribute.type === 'component' && isEntry(property)) {\n attributeValues[key] = transformComponent(property, strapi.components[attribute.component]);\n } else if (attribute && attribute.type === 'dynamiczone' && isDZEntries(property)) {\n if (isNil(property)) {\n attributeValues[key] = property;\n }\n\n attributeValues[key] = property.map((subProperty) => {\n return transformComponent(subProperty, strapi.components[subProperty.__component]);\n });\n } else if (attribute && attribute.type === 'media' && isEntry(property)) {\n const data = transformEntry(property, strapi.contentType('plugin::upload.file'));\n\n attributeValues[key] = { data };\n } else {\n attributeValues[key] = property;\n }\n }\n\n return {\n id,\n documentId,\n attributes: attributeValues,\n };\n}\n\nexport { transformResponse };\n"],"names":["isPlainObject","isNil"],"mappings":";;;AAoBA,SAAS,QAAQ,UAAgD;AAC/D,SAAO,aAAa,QAAQA,gBAAc,QAAQ,KAAK,MAAM,QAAQ,QAAQ;AAC/E;AAEA,SAAS,YAAY,UAA2E;AACvF,SAAA,MAAM,QAAQ,QAAQ;AAC/B;AAUA,MAAM,oBAAoB,CACxB,UACA,OAAgB,CAAA,GAChB,OAAyB;AAAA,EACvB,kBAAkB;AACpB,MACG;AACC,MAAAC,EAAAA,MAAM,QAAQ,GAAG;AACZ,WAAA;AAAA,EACT;AAEI,MAAA,CAACD,gBAAc,QAAQ,KAAK,CAAC,MAAM,QAAQ,QAAQ,GAAG;AAClD,UAAA,IAAI,MAAM,iDAAiD;AAAA,EACnE;AAEO,SAAA;AAAA,IACL,MAAM,KAAK,mBAAmB,eAAe,UAAU,MAAM,WAAW,IAAI;AAAA,IAC5E;AAAA,EAAA;AAEJ;AAMA,SAAS,mBACP,MACA,WACsD;AAClD,MAAA,MAAM,QAAQ,IAAI,GAAG;AACvB,WAAO,KAAK,IAAI,CAAC,UAAU,mBAAmB,OAAO,SAAS,CAAC;AAAA,EACjE;AAEM,QAAA,MAAM,eAAe,MAAM,SAAS;AAEtC,MAAAC,EAAAA,MAAM,GAAG,GAAG;AACP,WAAA;AAAA,EACT;AAEM,QAAA,EAAE,IAAI,WAAe,IAAA;AACpB,SAAA,EAAE,IAAI,GAAG;AAClB;AAMA,SAAS,eACP,OACA,MAC8C;AAC1C,MAAAA,EAAAA,MAAM,KAAK,GAAG;AACT,WAAA;AAAA,EACT;AAEI,MAAA,MAAM,QAAQ,KAAK,GAAG;AACxB,WAAO,MAAM,IAAI,CAAC,gBAAgB,eAAe,aAAa,IAAI,CAAC;AAAA,EACrE;AAEI,MAAA,CAACD,EAAAA,cAAc,KAAK,GAAG;AACnB,UAAA,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,EAAE,IAAI,YAAY,GAAG,eAAe;AAE1C,QAAM,kBAA2C,CAAA;AAEjD,aAAW,OAAO,OAAO,KAAK,UAAU,GAAG;AACnC,UAAA,WAAW,WAAW,GAAG;AAC/B,UAAM,YAAY,QAAQ,KAAK,WAAW,GAAG;AAEzC,QAAA,aAAa,UAAU,SAAS,cAAc,QAAQ,QAAQ,KAAK,YAAY,WAAW;AAC5F,YAAM,OAAO;AAAA,QACX;AAAA,QACA,OAAO,YAAY,UAAU,MAAgC;AAAA,MAAA;AAG/C,sBAAA,GAAG,IAAI,EAAE;IAAK,WACrB,aAAa,UAAU,SAAS,eAAe,QAAQ,QAAQ,GAAG;AAC3D,sBAAA,GAAG,IAAI,mBAAmB,UAAU,OAAO,WAAW,UAAU,SAAS,CAAC;AAAA,IAAA,WACjF,aAAa,UAAU,SAAS,iBAAiB,YAAY,QAAQ,GAAG;AAC7E,UAAAC,EAAAA,MAAM,QAAQ,GAAG;AACnB,wBAAgB,GAAG,IAAI;AAAA,MACzB;AAEA,sBAAgB,GAAG,IAAI,SAAS,IAAI,CAAC,gBAAgB;AACnD,eAAO,mBAAmB,aAAa,OAAO,WAAW,YAAY,WAAW,CAAC;AAAA,MAAA,CAClF;AAAA,IAAA,WACQ,aAAa,UAAU,SAAS,WAAW,QAAQ,QAAQ,GAAG;AACvE,YAAM,OAAO,eAAe,UAAU,OAAO,YAAY,qBAAqB,CAAC;AAE/D,sBAAA,GAAG,IAAI,EAAE;IAAK,OACzB;AACL,sBAAgB,GAAG,IAAI;AAAA,IACzB;AAAA,EACF;AAEO,SAAA;AAAA,IACL;AAAA,IACA;AAAA,IACA,YAAY;AAAA,EAAA;AAEhB;;"}
@@ -5,12 +5,17 @@ function isEntry(property) {
5
5
  function isDZEntries(property) {
6
6
  return Array.isArray(property);
7
7
  }
8
- const transformResponse = (resource, meta = {}, opts = {}) => {
8
+ const transformResponse = (resource, meta = {}, opts = {
9
+ useJsonAPIFormat: false
10
+ }) => {
9
11
  if (isNil(resource)) {
10
12
  return resource;
11
13
  }
14
+ if (!isPlainObject(resource) && !Array.isArray(resource)) {
15
+ throw new Error("Entry must be an object or an arrayy of objects");
16
+ }
12
17
  return {
13
- data: transformEntry(resource, opts?.contentType),
18
+ data: opts.useJsonAPIFormat ? transformEntry(resource, opts?.contentType) : resource,
14
19
  meta
15
20
  };
16
21
  };
@@ -18,7 +23,12 @@ function transformComponent(data, component) {
18
23
  if (Array.isArray(data)) {
19
24
  return data.map((datum) => transformComponent(datum, component));
20
25
  }
21
- return transformEntry(data, component);
26
+ const res = transformEntry(data, component);
27
+ if (isNil(res)) {
28
+ return res;
29
+ }
30
+ const { id, attributes } = res;
31
+ return { id, ...attributes };
22
32
  }
23
33
  function transformEntry(entry, type) {
24
34
  if (isNil(entry)) {
@@ -30,7 +40,7 @@ function transformEntry(entry, type) {
30
40
  if (!isPlainObject(entry)) {
31
41
  throw new Error("Entry must be an object");
32
42
  }
33
- const { id, ...properties } = entry;
43
+ const { id, documentId, ...properties } = entry;
34
44
  const attributeValues = {};
35
45
  for (const key of Object.keys(properties)) {
36
46
  const property = properties[key];
@@ -40,7 +50,7 @@ function transformEntry(entry, type) {
40
50
  property,
41
51
  strapi.contentType(attribute.target)
42
52
  );
43
- attributeValues[key] = data;
53
+ attributeValues[key] = { data };
44
54
  } else if (attribute && attribute.type === "component" && isEntry(property)) {
45
55
  attributeValues[key] = transformComponent(property, strapi.components[attribute.component]);
46
56
  } else if (attribute && attribute.type === "dynamiczone" && isDZEntries(property)) {
@@ -52,16 +62,15 @@ function transformEntry(entry, type) {
52
62
  });
53
63
  } else if (attribute && attribute.type === "media" && isEntry(property)) {
54
64
  const data = transformEntry(property, strapi.contentType("plugin::upload.file"));
55
- attributeValues[key] = data;
65
+ attributeValues[key] = { data };
56
66
  } else {
57
67
  attributeValues[key] = property;
58
68
  }
59
69
  }
60
70
  return {
61
71
  id,
62
- ...attributeValues
63
- // NOTE: not necessary for now
64
- // meta: {},
72
+ documentId,
73
+ attributes: attributeValues
65
74
  };
66
75
  }
67
76
  export {
@@ -1 +1 @@
1
- {"version":3,"file":"transform.mjs","sources":["../../../src/core-api/controller/transform.ts"],"sourcesContent":["import { isNil, isPlainObject } from 'lodash/fp';\nimport type { Common, Schema, UID } from '@strapi/types';\n\ntype TransformedEntry = {\n id: string;\n meta?: Record<string, unknown>;\n} & Record<string, unknown>;\n\ntype TransformedComponent = {\n id: string;\n [key: string]: unknown;\n};\n\ntype Entry = {\n id: string;\n [key: string]: Entry | Entry[] | string | number | null | boolean | Date;\n};\n\nfunction isEntry(property: unknown): property is Entry | Entry[] {\n return property === null || isPlainObject(property) || Array.isArray(property);\n}\n\nfunction isDZEntries(property: unknown): property is (Entry & { __component: UID.Component })[] {\n return Array.isArray(property);\n}\n\nconst transformResponse = (\n resource: any,\n meta: unknown = {},\n opts: { contentType?: Schema.ContentType | Schema.Component } = {}\n) => {\n if (isNil(resource)) {\n return resource;\n }\n\n return {\n data: transformEntry(resource, opts?.contentType),\n meta,\n };\n};\n\nfunction transformComponent<T extends Entry | Entry[] | null>(\n data: T,\n component: Schema.Component\n): T extends Entry[] ? TransformedComponent[] : T extends Entry ? TransformedComponent : null;\nfunction transformComponent(\n data: Entry | Entry[] | null,\n component: Schema.Component\n): TransformedComponent | TransformedComponent[] | null {\n if (Array.isArray(data)) {\n return data.map((datum) => transformComponent(datum, component));\n }\n\n return transformEntry(data, component);\n}\n\nfunction transformEntry<T extends Entry | Entry[] | null>(\n entry: T,\n type?: Schema.ContentType | Schema.Component\n): T extends Entry[] ? TransformedEntry[] : T extends Entry ? TransformedEntry : null;\nfunction transformEntry(\n entry: Entry | Entry[] | null,\n type?: Schema.ContentType | Schema.Component\n): TransformedEntry | TransformedEntry[] | null {\n if (isNil(entry)) {\n return entry;\n }\n\n if (Array.isArray(entry)) {\n return entry.map((singleEntry) => transformEntry(singleEntry, type));\n }\n\n if (!isPlainObject(entry)) {\n throw new Error('Entry must be an object');\n }\n\n const { id, ...properties } = entry;\n\n const attributeValues: Record<string, unknown> = {};\n\n for (const key of Object.keys(properties)) {\n const property = properties[key];\n const attribute = type && type.attributes[key];\n\n if (attribute && attribute.type === 'relation' && isEntry(property) && 'target' in attribute) {\n const data = transformEntry(\n property,\n strapi.contentType(attribute.target as Common.UID.ContentType)\n );\n\n attributeValues[key] = data;\n } else if (attribute && attribute.type === 'component' && isEntry(property)) {\n attributeValues[key] = transformComponent(property, strapi.components[attribute.component]);\n } else if (attribute && attribute.type === 'dynamiczone' && isDZEntries(property)) {\n if (isNil(property)) {\n attributeValues[key] = property;\n }\n\n attributeValues[key] = property.map((subProperty) => {\n return transformComponent(subProperty, strapi.components[subProperty.__component]);\n });\n } else if (attribute && attribute.type === 'media' && isEntry(property)) {\n const data = transformEntry(property, strapi.contentType('plugin::upload.file'));\n\n attributeValues[key] = data;\n } else {\n attributeValues[key] = property;\n }\n }\n\n return {\n id,\n ...attributeValues,\n // NOTE: not necessary for now\n // meta: {},\n };\n}\n\nexport { transformResponse };\n"],"names":[],"mappings":";AAkBA,SAAS,QAAQ,UAAgD;AAC/D,SAAO,aAAa,QAAQ,cAAc,QAAQ,KAAK,MAAM,QAAQ,QAAQ;AAC/E;AAEA,SAAS,YAAY,UAA2E;AACvF,SAAA,MAAM,QAAQ,QAAQ;AAC/B;AAEM,MAAA,oBAAoB,CACxB,UACA,OAAgB,CAAA,GAChB,OAAgE,CAAA,MAC7D;AACC,MAAA,MAAM,QAAQ,GAAG;AACZ,WAAA;AAAA,EACT;AAEO,SAAA;AAAA,IACL,MAAM,eAAe,UAAU,MAAM,WAAW;AAAA,IAChD;AAAA,EAAA;AAEJ;AAMA,SAAS,mBACP,MACA,WACsD;AAClD,MAAA,MAAM,QAAQ,IAAI,GAAG;AACvB,WAAO,KAAK,IAAI,CAAC,UAAU,mBAAmB,OAAO,SAAS,CAAC;AAAA,EACjE;AAEO,SAAA,eAAe,MAAM,SAAS;AACvC;AAMA,SAAS,eACP,OACA,MAC8C;AAC1C,MAAA,MAAM,KAAK,GAAG;AACT,WAAA;AAAA,EACT;AAEI,MAAA,MAAM,QAAQ,KAAK,GAAG;AACxB,WAAO,MAAM,IAAI,CAAC,gBAAgB,eAAe,aAAa,IAAI,CAAC;AAAA,EACrE;AAEI,MAAA,CAAC,cAAc,KAAK,GAAG;AACnB,UAAA,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,EAAE,IAAI,GAAG,WAAA,IAAe;AAE9B,QAAM,kBAA2C,CAAA;AAEjD,aAAW,OAAO,OAAO,KAAK,UAAU,GAAG;AACnC,UAAA,WAAW,WAAW,GAAG;AAC/B,UAAM,YAAY,QAAQ,KAAK,WAAW,GAAG;AAEzC,QAAA,aAAa,UAAU,SAAS,cAAc,QAAQ,QAAQ,KAAK,YAAY,WAAW;AAC5F,YAAM,OAAO;AAAA,QACX;AAAA,QACA,OAAO,YAAY,UAAU,MAAgC;AAAA,MAAA;AAG/D,sBAAgB,GAAG,IAAI;AAAA,IAAA,WACd,aAAa,UAAU,SAAS,eAAe,QAAQ,QAAQ,GAAG;AAC3D,sBAAA,GAAG,IAAI,mBAAmB,UAAU,OAAO,WAAW,UAAU,SAAS,CAAC;AAAA,IAAA,WACjF,aAAa,UAAU,SAAS,iBAAiB,YAAY,QAAQ,GAAG;AAC7E,UAAA,MAAM,QAAQ,GAAG;AACnB,wBAAgB,GAAG,IAAI;AAAA,MACzB;AAEA,sBAAgB,GAAG,IAAI,SAAS,IAAI,CAAC,gBAAgB;AACnD,eAAO,mBAAmB,aAAa,OAAO,WAAW,YAAY,WAAW,CAAC;AAAA,MAAA,CAClF;AAAA,IAAA,WACQ,aAAa,UAAU,SAAS,WAAW,QAAQ,QAAQ,GAAG;AACvE,YAAM,OAAO,eAAe,UAAU,OAAO,YAAY,qBAAqB,CAAC;AAE/E,sBAAgB,GAAG,IAAI;AAAA,IAAA,OAClB;AACL,sBAAgB,GAAG,IAAI;AAAA,IACzB;AAAA,EACF;AAEO,SAAA;AAAA,IACL;AAAA,IACA,GAAG;AAAA;AAAA;AAAA,EAAA;AAIP;"}
1
+ {"version":3,"file":"transform.mjs","sources":["../../../src/core-api/controller/transform.ts"],"sourcesContent":["import { isNil, isPlainObject } from 'lodash/fp';\nimport type { Common, Schema, UID } from '@strapi/types';\n\ntype TransformedEntry = {\n id: string;\n documentId?: string | null;\n attributes: Record<string, unknown>;\n};\n\ntype TransformedComponent = {\n id: string;\n [key: string]: unknown;\n};\n\ntype Entry = {\n id: string;\n documentId: string | null;\n [key: string]: Entry | Entry[] | string | number | null | boolean | Date;\n};\n\nfunction isEntry(property: unknown): property is Entry | Entry[] {\n return property === null || isPlainObject(property) || Array.isArray(property);\n}\n\nfunction isDZEntries(property: unknown): property is (Entry & { __component: UID.Component })[] {\n return Array.isArray(property);\n}\n\ninterface TransformOptions {\n contentType?: Schema.ContentType | Schema.Component;\n /**\n * @deprecated this option is deprecated and will be removed in the next major version\n */\n useJsonAPIFormat?: boolean;\n}\n\nconst transformResponse = (\n resource: any,\n meta: unknown = {},\n opts: TransformOptions = {\n useJsonAPIFormat: false,\n }\n) => {\n if (isNil(resource)) {\n return resource;\n }\n\n if (!isPlainObject(resource) && !Array.isArray(resource)) {\n throw new Error('Entry must be an object or an arrayy of objects');\n }\n\n return {\n data: opts.useJsonAPIFormat ? transformEntry(resource, opts?.contentType) : resource,\n meta,\n };\n};\n\nfunction transformComponent<T extends Entry | Entry[] | null>(\n data: T,\n component: Schema.Component\n): T extends Entry[] ? TransformedComponent[] : T extends Entry ? TransformedComponent : null;\nfunction transformComponent(\n data: Entry | Entry[] | null,\n component: Schema.Component\n): TransformedComponent | TransformedComponent[] | null {\n if (Array.isArray(data)) {\n return data.map((datum) => transformComponent(datum, component));\n }\n\n const res = transformEntry(data, component);\n\n if (isNil(res)) {\n return res;\n }\n\n const { id, attributes } = res;\n return { id, ...attributes };\n}\n\nfunction transformEntry<T extends Entry | Entry[] | null>(\n entry: T,\n type?: Schema.ContentType | Schema.Component\n): T extends Entry[] ? TransformedEntry[] : T extends Entry ? TransformedEntry : null;\nfunction transformEntry(\n entry: Entry | Entry[] | null,\n type?: Schema.ContentType | Schema.Component\n): TransformedEntry | TransformedEntry[] | null {\n if (isNil(entry)) {\n return entry;\n }\n\n if (Array.isArray(entry)) {\n return entry.map((singleEntry) => transformEntry(singleEntry, type));\n }\n\n if (!isPlainObject(entry)) {\n throw new Error('Entry must be an object');\n }\n\n const { id, documentId, ...properties } = entry;\n\n const attributeValues: Record<string, unknown> = {};\n\n for (const key of Object.keys(properties)) {\n const property = properties[key];\n const attribute = type && type.attributes[key];\n\n if (attribute && attribute.type === 'relation' && isEntry(property) && 'target' in attribute) {\n const data = transformEntry(\n property,\n strapi.contentType(attribute.target as Common.UID.ContentType)\n );\n\n attributeValues[key] = { data };\n } else if (attribute && attribute.type === 'component' && isEntry(property)) {\n attributeValues[key] = transformComponent(property, strapi.components[attribute.component]);\n } else if (attribute && attribute.type === 'dynamiczone' && isDZEntries(property)) {\n if (isNil(property)) {\n attributeValues[key] = property;\n }\n\n attributeValues[key] = property.map((subProperty) => {\n return transformComponent(subProperty, strapi.components[subProperty.__component]);\n });\n } else if (attribute && attribute.type === 'media' && isEntry(property)) {\n const data = transformEntry(property, strapi.contentType('plugin::upload.file'));\n\n attributeValues[key] = { data };\n } else {\n attributeValues[key] = property;\n }\n }\n\n return {\n id,\n documentId,\n attributes: attributeValues,\n };\n}\n\nexport { transformResponse };\n"],"names":[],"mappings":";AAoBA,SAAS,QAAQ,UAAgD;AAC/D,SAAO,aAAa,QAAQ,cAAc,QAAQ,KAAK,MAAM,QAAQ,QAAQ;AAC/E;AAEA,SAAS,YAAY,UAA2E;AACvF,SAAA,MAAM,QAAQ,QAAQ;AAC/B;AAUA,MAAM,oBAAoB,CACxB,UACA,OAAgB,CAAA,GAChB,OAAyB;AAAA,EACvB,kBAAkB;AACpB,MACG;AACC,MAAA,MAAM,QAAQ,GAAG;AACZ,WAAA;AAAA,EACT;AAEI,MAAA,CAAC,cAAc,QAAQ,KAAK,CAAC,MAAM,QAAQ,QAAQ,GAAG;AAClD,UAAA,IAAI,MAAM,iDAAiD;AAAA,EACnE;AAEO,SAAA;AAAA,IACL,MAAM,KAAK,mBAAmB,eAAe,UAAU,MAAM,WAAW,IAAI;AAAA,IAC5E;AAAA,EAAA;AAEJ;AAMA,SAAS,mBACP,MACA,WACsD;AAClD,MAAA,MAAM,QAAQ,IAAI,GAAG;AACvB,WAAO,KAAK,IAAI,CAAC,UAAU,mBAAmB,OAAO,SAAS,CAAC;AAAA,EACjE;AAEM,QAAA,MAAM,eAAe,MAAM,SAAS;AAEtC,MAAA,MAAM,GAAG,GAAG;AACP,WAAA;AAAA,EACT;AAEM,QAAA,EAAE,IAAI,WAAe,IAAA;AACpB,SAAA,EAAE,IAAI,GAAG;AAClB;AAMA,SAAS,eACP,OACA,MAC8C;AAC1C,MAAA,MAAM,KAAK,GAAG;AACT,WAAA;AAAA,EACT;AAEI,MAAA,MAAM,QAAQ,KAAK,GAAG;AACxB,WAAO,MAAM,IAAI,CAAC,gBAAgB,eAAe,aAAa,IAAI,CAAC;AAAA,EACrE;AAEI,MAAA,CAAC,cAAc,KAAK,GAAG;AACnB,UAAA,IAAI,MAAM,yBAAyB;AAAA,EAC3C;AAEA,QAAM,EAAE,IAAI,YAAY,GAAG,eAAe;AAE1C,QAAM,kBAA2C,CAAA;AAEjD,aAAW,OAAO,OAAO,KAAK,UAAU,GAAG;AACnC,UAAA,WAAW,WAAW,GAAG;AAC/B,UAAM,YAAY,QAAQ,KAAK,WAAW,GAAG;AAEzC,QAAA,aAAa,UAAU,SAAS,cAAc,QAAQ,QAAQ,KAAK,YAAY,WAAW;AAC5F,YAAM,OAAO;AAAA,QACX;AAAA,QACA,OAAO,YAAY,UAAU,MAAgC;AAAA,MAAA;AAG/C,sBAAA,GAAG,IAAI,EAAE;IAAK,WACrB,aAAa,UAAU,SAAS,eAAe,QAAQ,QAAQ,GAAG;AAC3D,sBAAA,GAAG,IAAI,mBAAmB,UAAU,OAAO,WAAW,UAAU,SAAS,CAAC;AAAA,IAAA,WACjF,aAAa,UAAU,SAAS,iBAAiB,YAAY,QAAQ,GAAG;AAC7E,UAAA,MAAM,QAAQ,GAAG;AACnB,wBAAgB,GAAG,IAAI;AAAA,MACzB;AAEA,sBAAgB,GAAG,IAAI,SAAS,IAAI,CAAC,gBAAgB;AACnD,eAAO,mBAAmB,aAAa,OAAO,WAAW,YAAY,WAAW,CAAC;AAAA,MAAA,CAClF;AAAA,IAAA,WACQ,aAAa,UAAU,SAAS,WAAW,QAAQ,QAAQ,GAAG;AACvE,YAAM,OAAO,eAAe,UAAU,OAAO,YAAY,qBAAqB,CAAC;AAE/D,sBAAA,GAAG,IAAI,EAAE;IAAK,OACzB;AACL,sBAAgB,GAAG,IAAI;AAAA,IACzB;AAAA,EACF;AAEO,SAAA;AAAA,IACL;AAAA,IACA;AAAA,IACA,YAAY;AAAA,EAAA;AAEhB;"}
@@ -3,7 +3,7 @@ import { CoreService } from './core-service';
3
3
  export declare class SingleTypeService extends CoreService implements CoreApi.Service.SingleType {
4
4
  private contentType;
5
5
  constructor(contentType: Schema.SingleType);
6
- getDocumentId(opts?: {}): Promise<string>;
6
+ getDocumentId(): Promise<string>;
7
7
  find(params?: {}): Promise<import("@strapi/types/dist/modules/documents").AnyDocument | null>;
8
8
  createOrUpdate(params?: {}): Promise<import("@strapi/types/dist/modules/documents").AnyDocument | null>;
9
9
  delete(params?: {}): Promise<{
@@ -1 +1 @@
1
- {"version":3,"file":"single-type.d.ts","sourceRoot":"","sources":["../../../src/core-api/service/single-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,OAAO,CAAC,OAAO,CAAC,UAAU;IACtF,OAAO,CAAC,WAAW,CAAoB;gBAE3B,WAAW,EAAE,MAAM,CAAC,UAAU;IAMpC,aAAa,CAAC,IAAI,KAAK;IASvB,IAAI,CAAC,MAAM,KAAK;IAMhB,cAAc,CAAC,MAAM,KAAK;IAa1B,MAAM,CAAC,MAAM,KAAK;;;CAQzB;AAED,QAAA,MAAM,uBAAuB,gBAAiB,OAAO,UAAU,KAAG,QAAQ,OAAO,CAAC,UAEjF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
1
+ {"version":3,"file":"single-type.d.ts","sourceRoot":"","sources":["../../../src/core-api/service/single-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,OAAO,CAAC,OAAO,CAAC,UAAU;IACtF,OAAO,CAAC,WAAW,CAAoB;gBAE3B,WAAW,EAAE,MAAM,CAAC,UAAU;IAMpC,aAAa;IASb,IAAI,CAAC,MAAM,KAAK;IAMhB,cAAc,CAAC,MAAM,KAAK;IAY1B,MAAM,CAAC,MAAM,KAAK;;;CAQzB;AAED,QAAA,MAAM,uBAAuB,gBAAiB,OAAO,UAAU,KAAG,QAAQ,OAAO,CAAC,UAEjF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
@@ -7,9 +7,9 @@ class SingleTypeService extends coreService.CoreService {
7
7
  super();
8
8
  this.contentType = contentType;
9
9
  }
10
- async getDocumentId(opts = {}) {
10
+ async getDocumentId() {
11
11
  const { uid } = this.contentType;
12
- return strapi.documents(uid).findFirst(opts).then((document) => document?.documentId);
12
+ return strapi.db.query(uid).findOne().then((document) => document?.documentId);
13
13
  }
14
14
  async find(params = {}) {
15
15
  const { uid } = this.contentType;
@@ -17,8 +17,7 @@ class SingleTypeService extends coreService.CoreService {
17
17
  }
18
18
  async createOrUpdate(params = {}) {
19
19
  const { uid } = this.contentType;
20
- const fetchParams = this.getFetchParams(params);
21
- const documentId = await this.getDocumentId({ status: fetchParams.status });
20
+ const documentId = await this.getDocumentId();
22
21
  if (documentId) {
23
22
  return strapi.documents(uid).update(documentId, this.getFetchParams(params));
24
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"single-type.js","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import type { Schema, CoreApi } from '@strapi/types';\nimport { CoreService } from './core-service';\n\nexport class SingleTypeService extends CoreService implements CoreApi.Service.SingleType {\n private contentType: Schema.SingleType;\n\n constructor(contentType: Schema.SingleType) {\n super();\n\n this.contentType = contentType;\n }\n\n async getDocumentId(opts = {}) {\n const { uid } = this.contentType;\n\n return strapi\n .documents(uid)\n .findFirst(opts)\n .then((document) => document?.documentId as string);\n }\n\n async find(params = {}) {\n const { uid } = this.contentType;\n\n return strapi.documents(uid).findFirst(this.getFetchParams(params));\n }\n\n async createOrUpdate(params = {}) {\n const { uid } = this.contentType;\n\n const fetchParams = this.getFetchParams(params);\n const documentId = await this.getDocumentId({ status: fetchParams.status });\n\n if (documentId) {\n return strapi.documents(uid).update(documentId, this.getFetchParams(params));\n }\n\n return strapi.documents(uid).create(this.getFetchParams(params));\n }\n\n async delete(params = {}) {\n const { uid } = this.contentType;\n\n const documentId = await this.getDocumentId();\n if (!documentId) return { deletedEntries: 0 };\n\n return strapi.documents(uid).delete(documentId, this.getFetchParams(params));\n }\n}\n\nconst createSingleTypeService = (contentType: Schema.SingleType): CoreApi.Service.SingleType => {\n return new SingleTypeService(contentType);\n};\n\nexport { createSingleTypeService };\n"],"names":["CoreService"],"mappings":";;;AAGO,MAAM,0BAA0BA,YAAAA,YAAkD;AAAA,EAC/E;AAAA,EAER,YAAY,aAAgC;AACpC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,cAAc,OAAO,IAAI;AACvB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OACJ,UAAU,GAAG,EACb,UAAU,IAAI,EACd,KAAK,CAAC,aAAa,UAAU,UAAoB;AAAA,EACtD;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,UAAU,KAAK,eAAe,MAAM,CAAC;AAAA,EACpE;AAAA,EAEA,MAAM,eAAe,SAAS,IAAI;AAC1B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,cAAc,KAAK,eAAe,MAAM;AACxC,UAAA,aAAa,MAAM,KAAK,cAAc,EAAE,QAAQ,YAAY,QAAQ;AAE1E,QAAI,YAAY;AACP,aAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,IAC7E;AAEO,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,MAAM,OAAO,SAAS,IAAI;AAClB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAC9B,QAAI,CAAC;AAAmB,aAAA,EAAE,gBAAgB;AAEnC,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,EAC7E;AACF;AAEM,MAAA,0BAA0B,CAAC,gBAA+D;AACvF,SAAA,IAAI,kBAAkB,WAAW;AAC1C;;;"}
1
+ {"version":3,"file":"single-type.js","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import type { Schema, CoreApi } from '@strapi/types';\nimport { CoreService } from './core-service';\n\nexport class SingleTypeService extends CoreService implements CoreApi.Service.SingleType {\n private contentType: Schema.SingleType;\n\n constructor(contentType: Schema.SingleType) {\n super();\n\n this.contentType = contentType;\n }\n\n async getDocumentId() {\n const { uid } = this.contentType;\n\n return strapi.db\n .query(uid)\n .findOne()\n .then((document) => document?.documentId as string);\n }\n\n async find(params = {}) {\n const { uid } = this.contentType;\n\n return strapi.documents(uid).findFirst(this.getFetchParams(params));\n }\n\n async createOrUpdate(params = {}) {\n const { uid } = this.contentType;\n\n const documentId = await this.getDocumentId();\n\n if (documentId) {\n return strapi.documents(uid).update(documentId, this.getFetchParams(params));\n }\n\n return strapi.documents(uid).create(this.getFetchParams(params));\n }\n\n async delete(params = {}) {\n const { uid } = this.contentType;\n\n const documentId = await this.getDocumentId();\n if (!documentId) return { deletedEntries: 0 };\n\n return strapi.documents(uid).delete(documentId, this.getFetchParams(params));\n }\n}\n\nconst createSingleTypeService = (contentType: Schema.SingleType): CoreApi.Service.SingleType => {\n return new SingleTypeService(contentType);\n};\n\nexport { createSingleTypeService };\n"],"names":["CoreService"],"mappings":";;;AAGO,MAAM,0BAA0BA,YAAAA,YAAkD;AAAA,EAC/E;AAAA,EAER,YAAY,aAAgC;AACpC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,gBAAgB;AACd,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,GACX,MAAM,GAAG,EACT,UACA,KAAK,CAAC,aAAa,UAAU,UAAoB;AAAA,EACtD;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,UAAU,KAAK,eAAe,MAAM,CAAC;AAAA,EACpE;AAAA,EAEA,MAAM,eAAe,SAAS,IAAI;AAC1B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAE9B,QAAI,YAAY;AACP,aAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,IAC7E;AAEO,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,MAAM,OAAO,SAAS,IAAI;AAClB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAC9B,QAAI,CAAC;AAAmB,aAAA,EAAE,gBAAgB;AAEnC,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,EAC7E;AACF;AAEM,MAAA,0BAA0B,CAAC,gBAA+D;AACvF,SAAA,IAAI,kBAAkB,WAAW;AAC1C;;;"}
@@ -5,9 +5,9 @@ class SingleTypeService extends CoreService {
5
5
  super();
6
6
  this.contentType = contentType;
7
7
  }
8
- async getDocumentId(opts = {}) {
8
+ async getDocumentId() {
9
9
  const { uid } = this.contentType;
10
- return strapi.documents(uid).findFirst(opts).then((document) => document?.documentId);
10
+ return strapi.db.query(uid).findOne().then((document) => document?.documentId);
11
11
  }
12
12
  async find(params = {}) {
13
13
  const { uid } = this.contentType;
@@ -15,8 +15,7 @@ class SingleTypeService extends CoreService {
15
15
  }
16
16
  async createOrUpdate(params = {}) {
17
17
  const { uid } = this.contentType;
18
- const fetchParams = this.getFetchParams(params);
19
- const documentId = await this.getDocumentId({ status: fetchParams.status });
18
+ const documentId = await this.getDocumentId();
20
19
  if (documentId) {
21
20
  return strapi.documents(uid).update(documentId, this.getFetchParams(params));
22
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"single-type.mjs","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import type { Schema, CoreApi } from '@strapi/types';\nimport { CoreService } from './core-service';\n\nexport class SingleTypeService extends CoreService implements CoreApi.Service.SingleType {\n private contentType: Schema.SingleType;\n\n constructor(contentType: Schema.SingleType) {\n super();\n\n this.contentType = contentType;\n }\n\n async getDocumentId(opts = {}) {\n const { uid } = this.contentType;\n\n return strapi\n .documents(uid)\n .findFirst(opts)\n .then((document) => document?.documentId as string);\n }\n\n async find(params = {}) {\n const { uid } = this.contentType;\n\n return strapi.documents(uid).findFirst(this.getFetchParams(params));\n }\n\n async createOrUpdate(params = {}) {\n const { uid } = this.contentType;\n\n const fetchParams = this.getFetchParams(params);\n const documentId = await this.getDocumentId({ status: fetchParams.status });\n\n if (documentId) {\n return strapi.documents(uid).update(documentId, this.getFetchParams(params));\n }\n\n return strapi.documents(uid).create(this.getFetchParams(params));\n }\n\n async delete(params = {}) {\n const { uid } = this.contentType;\n\n const documentId = await this.getDocumentId();\n if (!documentId) return { deletedEntries: 0 };\n\n return strapi.documents(uid).delete(documentId, this.getFetchParams(params));\n }\n}\n\nconst createSingleTypeService = (contentType: Schema.SingleType): CoreApi.Service.SingleType => {\n return new SingleTypeService(contentType);\n};\n\nexport { createSingleTypeService };\n"],"names":[],"mappings":";AAGO,MAAM,0BAA0B,YAAkD;AAAA,EAC/E;AAAA,EAER,YAAY,aAAgC;AACpC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,cAAc,OAAO,IAAI;AACvB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OACJ,UAAU,GAAG,EACb,UAAU,IAAI,EACd,KAAK,CAAC,aAAa,UAAU,UAAoB;AAAA,EACtD;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,UAAU,KAAK,eAAe,MAAM,CAAC;AAAA,EACpE;AAAA,EAEA,MAAM,eAAe,SAAS,IAAI;AAC1B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,cAAc,KAAK,eAAe,MAAM;AACxC,UAAA,aAAa,MAAM,KAAK,cAAc,EAAE,QAAQ,YAAY,QAAQ;AAE1E,QAAI,YAAY;AACP,aAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,IAC7E;AAEO,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,MAAM,OAAO,SAAS,IAAI;AAClB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAC9B,QAAI,CAAC;AAAmB,aAAA,EAAE,gBAAgB;AAEnC,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,EAC7E;AACF;AAEM,MAAA,0BAA0B,CAAC,gBAA+D;AACvF,SAAA,IAAI,kBAAkB,WAAW;AAC1C;"}
1
+ {"version":3,"file":"single-type.mjs","sources":["../../../src/core-api/service/single-type.ts"],"sourcesContent":["import type { Schema, CoreApi } from '@strapi/types';\nimport { CoreService } from './core-service';\n\nexport class SingleTypeService extends CoreService implements CoreApi.Service.SingleType {\n private contentType: Schema.SingleType;\n\n constructor(contentType: Schema.SingleType) {\n super();\n\n this.contentType = contentType;\n }\n\n async getDocumentId() {\n const { uid } = this.contentType;\n\n return strapi.db\n .query(uid)\n .findOne()\n .then((document) => document?.documentId as string);\n }\n\n async find(params = {}) {\n const { uid } = this.contentType;\n\n return strapi.documents(uid).findFirst(this.getFetchParams(params));\n }\n\n async createOrUpdate(params = {}) {\n const { uid } = this.contentType;\n\n const documentId = await this.getDocumentId();\n\n if (documentId) {\n return strapi.documents(uid).update(documentId, this.getFetchParams(params));\n }\n\n return strapi.documents(uid).create(this.getFetchParams(params));\n }\n\n async delete(params = {}) {\n const { uid } = this.contentType;\n\n const documentId = await this.getDocumentId();\n if (!documentId) return { deletedEntries: 0 };\n\n return strapi.documents(uid).delete(documentId, this.getFetchParams(params));\n }\n}\n\nconst createSingleTypeService = (contentType: Schema.SingleType): CoreApi.Service.SingleType => {\n return new SingleTypeService(contentType);\n};\n\nexport { createSingleTypeService };\n"],"names":[],"mappings":";AAGO,MAAM,0BAA0B,YAAkD;AAAA,EAC/E;AAAA,EAER,YAAY,aAAgC;AACpC;AAEN,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,MAAM,gBAAgB;AACd,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,GACX,MAAM,GAAG,EACT,UACA,KAAK,CAAC,aAAa,UAAU,UAAoB;AAAA,EACtD;AAAA,EAEA,MAAM,KAAK,SAAS,IAAI;AAChB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEd,WAAA,OAAO,UAAU,GAAG,EAAE,UAAU,KAAK,eAAe,MAAM,CAAC;AAAA,EACpE;AAAA,EAEA,MAAM,eAAe,SAAS,IAAI;AAC1B,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAE9B,QAAI,YAAY;AACP,aAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,IAC7E;AAEO,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,KAAK,eAAe,MAAM,CAAC;AAAA,EACjE;AAAA,EAEA,MAAM,OAAO,SAAS,IAAI;AAClB,UAAA,EAAE,IAAI,IAAI,KAAK;AAEf,UAAA,aAAa,MAAM,KAAK;AAC9B,QAAI,CAAC;AAAmB,aAAA,EAAE,gBAAgB;AAEnC,WAAA,OAAO,UAAU,GAAG,EAAE,OAAO,YAAY,KAAK,eAAe,MAAM,CAAC;AAAA,EAC7E;AACF;AAEM,MAAA,0BAA0B,CAAC,gBAA+D;AACvF,SAAA,IAAI,kBAAkB,WAAW;AAC1C;"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domain/content-type/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAUF,QAAA,MAAM,iBAAiB,QAAS,MAAM,cAAc,qBAAqB,uBA+BxE,CAAC;AAqDF,QAAA,MAAM,WAAW,WAAY,OAAO,WAAW,WAAW,MAAM,WAK/D,CAAC;AAmBF,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domain/content-type/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAUF,QAAA,MAAM,iBAAiB,QAAS,MAAM,cAAc,qBAAqB,uBAiCxE,CAAC;AAyDF,QAAA,MAAM,WAAW,WAAY,OAAO,WAAW,WAAW,MAAM,WAK/D,CAAC;AAmBF,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC"}
@@ -50,6 +50,9 @@ const addTimestamps = (schema) => {
50
50
  });
51
51
  };
52
52
  const addDraftAndPublish = (schema) => {
53
+ if (!___default.default.has(schema, "options.draftAndPublish")) {
54
+ ___default.default.set(schema, "options.draftAndPublish", false);
55
+ }
53
56
  schema.attributes[PUBLISHED_AT_ATTRIBUTE] = {
54
57
  type: "datetime",
55
58
  configurable: false,