@paroicms/server 4.7.0 → 5.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (108) hide show
  1. package/dist/admin-backend/auth/authorization.helper.d.ts +2 -2
  2. package/dist/admin-backend/auth/authorization.helper.d.ts.map +1 -1
  3. package/dist/admin-backend/auth/authorization.helper.js.map +1 -1
  4. package/dist/admin-backend/login/login.controller.d.ts +2 -2
  5. package/dist/admin-backend/login/login.controller.d.ts.map +1 -1
  6. package/dist/admin-backend/login/login.controller.js +2 -3
  7. package/dist/admin-backend/login/login.controller.js.map +1 -1
  8. package/dist/admin-backend/site-constants/site-constants.resolver.js +1 -1
  9. package/dist/admin-backend/site-constants/site-constants.resolver.js.map +1 -1
  10. package/dist/admin-backend/unprotected/unprotected.resolver.d.ts.map +1 -1
  11. package/dist/admin-backend/unprotected/unprotected.resolver.js +12 -11
  12. package/dist/admin-backend/unprotected/unprotected.resolver.js.map +1 -1
  13. package/dist/common/serve-text-or.d.ts +1 -8
  14. package/dist/common/serve-text-or.d.ts.map +1 -1
  15. package/dist/common/serve-text-or.js +5 -8
  16. package/dist/common/serve-text-or.js.map +1 -1
  17. package/dist/connector/plugin-loader/init-plugins.d.ts +2 -2
  18. package/dist/connector/plugin-loader/init-plugins.d.ts.map +1 -1
  19. package/dist/connector/plugin-loader/init-plugins.js +14 -5
  20. package/dist/connector/plugin-loader/init-plugins.js.map +1 -1
  21. package/dist/connector/plugin-loader/plugin-loader.d.ts +5 -4
  22. package/dist/connector/plugin-loader/plugin-loader.d.ts.map +1 -1
  23. package/dist/connector/plugin-loader/plugin-loader.js +29 -20
  24. package/dist/connector/plugin-loader/plugin-loader.js.map +1 -1
  25. package/dist/connector/plugin-loader/plugin-test-fixtures.d.ts +13 -0
  26. package/dist/connector/plugin-loader/plugin-test-fixtures.d.ts.map +1 -0
  27. package/dist/connector/plugin-loader/plugin-test-fixtures.js +30 -0
  28. package/dist/connector/plugin-loader/plugin-test-fixtures.js.map +1 -0
  29. package/dist/connector/plugin-loader/plugin-types.d.ts +9 -0
  30. package/dist/connector/plugin-loader/plugin-types.d.ts.map +1 -1
  31. package/dist/connector/site-schema/schema-lib.d.ts +3 -6
  32. package/dist/connector/site-schema/schema-lib.d.ts.map +1 -1
  33. package/dist/connector/site-schema/schema-lib.js +1 -4
  34. package/dist/connector/site-schema/schema-lib.js.map +1 -1
  35. package/dist/connector/site-schema/site-schema-factory.d.ts +20 -11
  36. package/dist/connector/site-schema/site-schema-factory.d.ts.map +1 -1
  37. package/dist/connector/site-schema/site-schema-factory.js +41 -16
  38. package/dist/connector/site-schema/site-schema-factory.js.map +1 -1
  39. package/dist/express/http-helpers.d.ts +3 -3
  40. package/dist/express/http-helpers.d.ts.map +1 -1
  41. package/dist/express/route-handler-wrapper.d.ts +7 -7
  42. package/dist/express/route-handler-wrapper.d.ts.map +1 -1
  43. package/dist/express/route-handler-wrapper.js +8 -6
  44. package/dist/express/route-handler-wrapper.js.map +1 -1
  45. package/dist/express/site-middleware.js +3 -3
  46. package/dist/express/site-middleware.js.map +1 -1
  47. package/dist/express/static-files.req-handler.d.ts +2 -2
  48. package/dist/express/static-files.req-handler.d.ts.map +1 -1
  49. package/dist/express/static-files.req-handler.js.map +1 -1
  50. package/dist/graphql/graphql.types.d.ts +3 -3
  51. package/dist/graphql/graphql.types.d.ts.map +1 -1
  52. package/dist/graphql/graphql.types.js.map +1 -1
  53. package/dist/helpers/url-helpers.d.ts +5 -1
  54. package/dist/helpers/url-helpers.d.ts.map +1 -1
  55. package/dist/helpers/url-helpers.js +22 -0
  56. package/dist/helpers/url-helpers.js.map +1 -1
  57. package/dist/rendered-site/page-route/make-url.js +2 -2
  58. package/dist/rendered-site/page-route/make-url.js.map +1 -1
  59. package/dist/rendered-site/page-route/page-route-parser.d.ts +4 -2
  60. package/dist/rendered-site/page-route/page-route-parser.d.ts.map +1 -1
  61. package/dist/rendered-site/page-route/page-route-parser.js +36 -33
  62. package/dist/rendered-site/page-route/page-route-parser.js.map +1 -1
  63. package/dist/rendered-site/page-route/raw-document-payload.d.ts +2 -2
  64. package/dist/rendered-site/preview.req-handler.d.ts.map +1 -1
  65. package/dist/rendered-site/preview.req-handler.js +3 -2
  66. package/dist/rendered-site/preview.req-handler.js.map +1 -1
  67. package/dist/rendered-site/serve-document/serve-document.d.ts +6 -6
  68. package/dist/rendered-site/serve-document/serve-document.d.ts.map +1 -1
  69. package/dist/rendered-site/serve-document/serve-document.js +8 -18
  70. package/dist/rendered-site/serve-document/serve-document.js.map +1 -1
  71. package/dist/rendered-site/serve-index-page.d.ts.map +1 -1
  72. package/dist/rendered-site/serve-index-page.js +2 -5
  73. package/dist/rendered-site/serve-index-page.js.map +1 -1
  74. package/dist/rendered-site/site-router.req-handler.d.ts.map +1 -1
  75. package/dist/rendered-site/site-router.req-handler.js +70 -15
  76. package/dist/rendered-site/site-router.req-handler.js.map +1 -1
  77. package/dist/rendering-payload/create-doc-drop.d.ts +1 -1
  78. package/dist/rendering-payload/create-doc-drop.d.ts.map +1 -1
  79. package/dist/rendering-payload/create-doc-drop.js +5 -3
  80. package/dist/rendering-payload/create-doc-drop.js.map +1 -1
  81. package/dist/rendering-payload/json-ld-payload.d.ts +1 -0
  82. package/dist/rendering-payload/json-ld-payload.d.ts.map +1 -1
  83. package/dist/rendering-payload/json-ld-payload.js +3 -2
  84. package/dist/rendering-payload/json-ld-payload.js.map +1 -1
  85. package/dist/rendering-payload/make-public-payload.d.ts +1 -1
  86. package/dist/rendering-payload/make-public-payload.d.ts.map +1 -1
  87. package/dist/site-context/load-site-context.d.ts +2 -2
  88. package/dist/site-context/load-site-context.d.ts.map +1 -1
  89. package/dist/site-context/load-site-context.js +152 -119
  90. package/dist/site-context/load-site-context.js.map +1 -1
  91. package/dist/site-context/site-context.d.ts +8 -7
  92. package/dist/site-context/site-context.d.ts.map +1 -1
  93. package/dist/site-context/site-context.js +19 -5
  94. package/dist/site-context/site-context.js.map +1 -1
  95. package/dist/site-context/site-context.types.d.ts +12 -3
  96. package/dist/site-context/site-context.types.d.ts.map +1 -1
  97. package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.d.ts +15 -0
  98. package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.d.ts.map +1 -0
  99. package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.js +33 -0
  100. package/dist/site-schema-migration/migrations/site-schema-migration-10-to-11.js.map +1 -0
  101. package/dist/site-schema-migration/site-schema-migration.d.ts.map +1 -1
  102. package/dist/site-schema-migration/site-schema-migration.js +6 -1
  103. package/dist/site-schema-migration/site-schema-migration.js.map +1 -1
  104. package/package.json +18 -18
  105. package/schema.graphql +1 -1
  106. package/site-schema-lib/authors-lib.site-schema.json +1 -1
  107. package/site-schema-lib/common-schema.json +1 -1
  108. package/site-schema-lib/field-lib.site-schema.json +1 -1
@@ -1,6 +1,6 @@
1
1
  import type { LoginMethod } from "@paroicms/public-anywhere-lib";
2
2
  import { type PaHttpContext } from "@paroicms/public-server-lib";
3
- import type { MigrationSiteContext, SiteContext } from "../../site-context/site-context.types.js";
3
+ import type { AnySiteContext, SiteContext } from "../../site-context/site-context.types.js";
4
4
  export interface AuthorizedAccount {
5
5
  id: string;
6
6
  accountId: string;
@@ -10,6 +10,6 @@ export interface AuthorizedAccount {
10
10
  roles: string[];
11
11
  permissions: string[];
12
12
  }
13
- export declare function permissionGuard(siteContext: SiteContext | MigrationSiteContext, httpContext: PaHttpContext, requiredPermission: string): Promise<AuthorizedAccount>;
13
+ export declare function permissionGuard(siteContext: AnySiteContext, httpContext: PaHttpContext, requiredPermission: string): Promise<AuthorizedAccount>;
14
14
  export declare function permissionPatGuard(siteContext: Pick<SiteContext, "cn" | "fqdn" | "regSite">, pat: string, requiredPermission: string): Promise<AuthorizedAccount>;
15
15
  //# sourceMappingURL=authorization.helper.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"authorization.helper.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAY,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAgBlG,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,WAAW,EAAE,aAAa,EAC1B,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAgB5B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC,EACzD,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAsB5B"}
1
+ {"version":3,"file":"authorization.helper.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAY,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAgB5F,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,cAAc,EAC3B,WAAW,EAAE,aAAa,EAC1B,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAgB5B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC,EACzD,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAsB5B"}
@@ -1 +1 @@
1
- {"version":3,"file":"authorization.helper.js","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAsB,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,SAAS,kBAAkB,CAAC,IAAY;IACtC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO;YACV,OAAO,iBAAiB,CAAC;QAC3B,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAC;QAC5B;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAYD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA+C,EAC/C,WAA0B,EAC1B,kBAA0B;IAE1B,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,KAAK;QACL,WAAW;QACX,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAyD,EACzD,GAAW,EACX,kBAA0B;IAE1B,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE;QAChE,gBAAgB,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB;KACvD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,EAAE,EAAE,EAAE,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;IACtE,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;QACL,EAAE,EAAE,UAAU,CAAC,SAAS;QACxB,SAAS,EAAE,UAAU,CAAC,SAAS;QAC/B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,WAAW,EAAE,KAAK;QAClB,KAAK;QACL,WAAW;KACZ,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"authorization.helper.js","sourceRoot":"","sources":["../../../src/admin-backend/auth/authorization.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAsB,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,SAAS,kBAAkB,CAAC,IAAY;IACtC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO;YACV,OAAO,iBAAiB,CAAC;QAC3B,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAC;QAC5B;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAYD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA2B,EAC3B,WAA0B,EAC1B,kBAA0B;IAE1B,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,KAAK;QACL,WAAW;QACX,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAyD,EACzD,GAAW,EACX,kBAA0B;IAE1B,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE;QAChE,gBAAgB,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB;KACvD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,EAAE,EAAE,EAAE,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;IACtE,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,OAAO;QACL,EAAE,EAAE,UAAU,CAAC,SAAS;QACxB,SAAS,EAAE,UAAU,CAAC,SAAS;QAC/B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,WAAW,EAAE,KAAK;QAClB,KAAK;QACL,WAAW;KACZ,CAAC;AACJ,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import type { PaHttpContext } from "@paroicms/public-server-lib";
2
2
  import type { PaRouteParams } from "../../express/http-helpers.js";
3
- import type { MigrationSiteContext, SiteContext } from "../../site-context/site-context.types.js";
4
- export declare function loginController(siteContext: SiteContext | MigrationSiteContext, httpContext: PaHttpContext, _routeParams: PaRouteParams): Promise<import("../auth/auth.types.js").LoginFailed | import("../auth/auth.types.js").LoginSuccess>;
3
+ import type { AnySiteContext } from "../../site-context/site-context.types.js";
4
+ export declare function loginController(siteContext: AnySiteContext, httpContext: PaHttpContext, _routeParams: PaRouteParams): Promise<import("../auth/auth.types.js").LoginFailed | import("../auth/auth.types.js").LoginSuccess>;
5
5
  //# sourceMappingURL=login.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"login.controller.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/login/login.controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAUlG,wBAAsB,eAAe,CACnC,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,WAAW,EAAE,aAAa,EAC1B,YAAY,EAAE,aAAa,uGA6D5B"}
1
+ {"version":3,"file":"login.controller.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/login/login.controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAU/E,wBAAsB,eAAe,CACnC,WAAW,EAAE,cAAc,EAC3B,WAAW,EAAE,aAAa,EAC1B,YAAY,EAAE,aAAa,uGA0D5B"}
@@ -1,11 +1,10 @@
1
1
  import { ApiError, assertBody } from "@paroicms/public-server-lib";
2
2
  import { type } from "arktype";
3
+ import { getSiteLanguages } from "../../site-context/site-context.js";
3
4
  import { getVerifiedAccountFromToken, loginByPlatformToken, loginLocalUser, } from "../auth/auth.service.js";
4
5
  import { recordEvent } from "../event-log/event-log.service.js";
5
6
  export async function loginController(siteContext, httpContext, _routeParams) {
6
- const defaultLanguage = siteContext.status === "migration"
7
- ? (siteContext.deprecatedSiteSchema.languages[0] ?? "en")
8
- : siteContext.siteSchema.defaultLanguage;
7
+ const defaultLanguage = getSiteLanguages(siteContext)[0] ?? "en";
9
8
  const loginInput = formatLoginAction(httpContext);
10
9
  if (loginInput.action === "loginWithPlatformToken") {
11
10
  const result = await loginByPlatformToken(siteContext, {
@@ -1 +1 @@
1
- {"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/login/login.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/B,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,EACpB,cAAc,GACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAGhE,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA+C,EAC/C,WAA0B,EAC1B,YAA2B;IAE3B,MAAM,eAAe,GACnB,WAAW,CAAC,MAAM,KAAK,WAAW;QAChC,CAAC,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACzD,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC7C,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAElD,IAAI,UAAU,CAAC,MAAM,KAAK,wBAAwB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE;YACrD,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,eAAe;SAChB,CAAC,CAAC;QAEH,IAAI,aAAa,IAAI,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAClD,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,eAAe;gBAC1B,OAAO,EAAE,MAAM,CAAC,EAAE;gBAClB,UAAU,EAAE,SAAS;gBACrB,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,SAAS,EAAE;oBACT,SAAS,EAAE,MAAM,CAAC,EAAE;oBACpB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;iBACA;aAClC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;YAC/C,IAAI,EAAE;gBACJ,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAC9B;YACD,eAAe;SAChB,CAAC,CAAC;QAEH,IAAI,aAAa,IAAI,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAClD,WAAW,CAAC,WAAW,EAAE;gBACvB,SAAS,EAAE,eAAe;gBAC1B,OAAO,EAAE,MAAM,CAAC,EAAE;gBAClB,UAAU,EAAE,SAAS;gBACrB,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,SAAS,EAAE;oBACT,SAAS,EAAE,MAAM,CAAC,EAAE;oBACpB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;iBACA;aAClC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,2BAA2B,CAAC,WAAW,EAAE;QAC9C,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,eAAe;KAChB,CAAC,CAAC;AACL,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,WAA0B;IACnD,MAAM,SAAS,GAAG,UAAU,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;IAC/D,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"}
1
+ {"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/login/login.controller.ts"],"names":[],"mappings":"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"}
@@ -16,7 +16,7 @@ export const siteConstantsResolvers = {
16
16
  },
17
17
  plugins: async (_parent, _args, { siteContext, httpContext }) => {
18
18
  authGuard(httpContext);
19
- if (siteContext.status === "migration")
19
+ if (siteContext.status !== "ready")
20
20
  return [];
21
21
  return Array.from(siteContext.plugins.values())
22
22
  .filter((p) => !!p.adminUiPluginBaseUrl)
@@ -1 +1 @@
1
- {"version":3,"file":"site-constants.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/site-constants/site-constants.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,CAAC,MAAM,sBAAsB,GAAiC;IAClE,KAAK,EAAE;QACL,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACpE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,cAAc,CAAC,WAAW,CAAC,CAAC;YAE5B,OAAO;gBACL,UAAU;gBACV,iBAAiB,EAAE;oBACjB,kBAAkB,EAAE,WAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,IAAI,KAAK;iBACvF;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO;aACrC,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9D,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,EAAE,CAAC;YAElD,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;iBACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACX,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,oBAAoB,EAAE,CAAC,CAAC,oBAA8B;gBACtD,QAAQ,EACN,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS;oBACvD,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC;aAClE,CAAC,CAAC,CAAC;QACR,CAAC;KACF;IAED,aAAa,EAAE;QACb,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACnD,OAAO,WAAW,CAAC,SAAS,CAAC;QAC/B,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACpD,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC;QAED,aAAa,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE;KACxC;CACF,CAAC"}
1
+ {"version":3,"file":"site-constants.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/site-constants/site-constants.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,CAAC,MAAM,sBAAsB,GAAiC;IAClE,KAAK,EAAE;QACL,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACpE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,cAAc,CAAC,WAAW,CAAC,CAAC;YAE5B,OAAO;gBACL,UAAU;gBACV,iBAAiB,EAAE;oBACjB,kBAAkB,EAAE,WAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,IAAI,KAAK;iBACvF;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO;aACrC,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9D,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,IAAI,WAAW,CAAC,MAAM,KAAK,OAAO;gBAAE,OAAO,EAAE,CAAC;YAE9C,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;iBACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACX,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,oBAAoB,EAAE,CAAC,CAAC,oBAA8B;gBACtD,QAAQ,EACN,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS;oBACvD,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC;aAClE,CAAC,CAAC,CAAC;QACR,CAAC;KACF;IAED,aAAa,EAAE;QACb,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACnD,OAAO,WAAW,CAAC,SAAS,CAAC;QAC/B,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACpD,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC;QAED,aAAa,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE;KACxC;CACF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"unprotected.resolver.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAGrE,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,cAAc,CAoD7D,CAAC"}
1
+ {"version":3,"file":"unprotected.resolver.d.ts","sourceRoot":"","sources":["../../../src/admin-backend/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIrE,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,cAAc,CAoD7D,CAAC"}
@@ -2,24 +2,25 @@ import { getHandleOfSiteAdminFavicon, getHandleOfSiteFavicon, } from "../../comm
2
2
  import { makeFaviconThumbReady } from "../../common/medias/media-lib.js";
3
3
  import { appConf, platformAuthUrl } from "../../context.js";
4
4
  import { getHomeUrl } from "../../rendered-site/page-route/make-url.js";
5
+ import { getSiteLanguages } from "../../site-context/site-context.js";
5
6
  export const unprotectedResolvers = {
6
7
  Query: {
7
8
  publicSiteConstants: async (_parent, _args, { siteContext }) => {
8
- const languageWithLabels = siteContext.status === "migration"
9
- ? siteContext.deprecatedSiteSchema.languages.map((language) => ({
9
+ const languageWithLabels = siteContext.status === "ready"
10
+ ? siteContext.siteSchema.languages.map((language) => ({
10
11
  language,
11
- label: language,
12
+ label: siteContext.siteSchema.languageLabels[language],
12
13
  }))
13
- : siteContext.siteSchema.languages.map((language) => ({
14
+ : getSiteLanguages(siteContext).map((language) => ({
14
15
  language,
15
- label: siteContext.siteSchema.languageLabels[language],
16
+ label: language,
16
17
  }));
17
- const homeUrls = siteContext.status === "migration"
18
- ? []
19
- : siteContext.siteSchema.languages.map((language) => ({
18
+ const homeUrls = siteContext.status === "ready"
19
+ ? siteContext.siteSchema.languages.map((language) => ({
20
20
  language,
21
21
  url: getHomeUrl(siteContext, language, { absoluteUrl: true }),
22
- }));
22
+ }))
23
+ : [];
23
24
  return {
24
25
  fqdn: siteContext.fqdn,
25
26
  publicSiteUrl: siteContext.siteUrl,
@@ -33,7 +34,7 @@ export const unprotectedResolvers = {
33
34
  },
34
35
  PublicSiteConstants: {
35
36
  faviconThumb: async (_parent, _args, { siteContext }) => {
36
- if (siteContext.status === "migration")
37
+ if (siteContext.status !== "ready")
37
38
  return null;
38
39
  const thumb = await makeFaviconThumbReady(siteContext, getHandleOfSiteFavicon());
39
40
  if (!thumb)
@@ -41,7 +42,7 @@ export const unprotectedResolvers = {
41
42
  return JSON.stringify(thumb);
42
43
  },
43
44
  adminUiFaviconThumb: async (_parent, _args, { siteContext }) => {
44
- if (siteContext.status === "migration")
45
+ if (siteContext.status !== "ready")
45
46
  return null;
46
47
  const thumb = await makeFaviconThumbReady(siteContext, getHandleOfSiteAdminFavicon());
47
48
  if (!thumb)
@@ -1 +1 @@
1
- {"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAG5D,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE,MAAM,CAAC,MAAM,oBAAoB,GAAiC;IAChE,KAAK,EAAE;QACL,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,MAAM,kBAAkB,GACtB,WAAW,CAAC,MAAM,KAAK,WAAW;gBAChC,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAC5D,QAAQ;oBACR,KAAK,EAAE,QAAQ;iBAChB,CAAC,CAAC;gBACL,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClD,QAAQ;oBACR,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;iBACvD,CAAC,CAAC,CAAC;YAEV,MAAM,QAAQ,GACZ,WAAW,CAAC,MAAM,KAAK,WAAW;gBAChC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClD,QAAQ;oBACR,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;iBAC9D,CAAC,CAAC,CAAC;YAEV,OAAO;gBACL,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,aAAa,EAAE,WAAW,CAAC,OAAO;gBAClC,eAAe,EACb,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe;gBAClF,UAAU,EAAE,WAAW,CAAC,MAAM;gBAC9B,kBAAkB;gBAClB,QAAQ;gBACR,gBAAgB,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB;aACvD,CAAC;QACJ,CAAC;KACF;IAED,mBAAmB,EAAE;QACnB,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACtD,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,IAAI,CAAC;YAEpD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,sBAAsB,EAAE,CAAC,CAAC;YACjF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,IAAI,CAAC;YAEpD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,2BAA2B,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAG5D,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,MAAM,CAAC,MAAM,oBAAoB,GAAiC;IAChE,KAAK,EAAE;QACL,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,MAAM,kBAAkB,GACtB,WAAW,CAAC,MAAM,KAAK,OAAO;gBAC5B,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClD,QAAQ;oBACR,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;iBACvD,CAAC,CAAC;gBACL,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAC/C,QAAQ;oBACR,KAAK,EAAE,QAAQ;iBAChB,CAAC,CAAC,CAAC;YAEV,MAAM,QAAQ,GACZ,WAAW,CAAC,MAAM,KAAK,OAAO;gBAC5B,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClD,QAAQ;oBACR,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;iBAC9D,CAAC,CAAC;gBACL,CAAC,CAAC,EAAE,CAAC;YAET,OAAO;gBACL,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,aAAa,EAAE,WAAW,CAAC,OAAO;gBAClC,eAAe,EACb,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe;gBAClF,UAAU,EAAE,WAAW,CAAC,MAAM;gBAC9B,kBAAkB;gBAClB,QAAQ;gBACR,gBAAgB,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB;aACvD,CAAC;QACJ,CAAC;KACF;IAED,mBAAmB,EAAE;QACnB,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACtD,IAAI,WAAW,CAAC,MAAM,KAAK,OAAO;gBAAE,OAAO,IAAI,CAAC;YAEhD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,sBAAsB,EAAE,CAAC,CAAC;YACjF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,IAAI,WAAW,CAAC,MAAM,KAAK,OAAO;gBAAE,OAAO,IAAI,CAAC;YAEhD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,2BAA2B,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;KACF;CACF,CAAC"}
@@ -5,18 +5,11 @@ export interface ServeTextOr {
5
5
  serveFromCache: () => Promise<boolean>;
6
6
  putInCacheAndServe: (html: string, dependencyKeys: string[]) => Promise<void>;
7
7
  }
8
- export interface ServeTextOrWithCacheKey {
9
- serveFromCache: () => Promise<boolean>;
10
- putInCacheAndServe: (html: string, dependencyKeys: string[], cacheKey: string) => Promise<void>;
11
- }
12
8
  export declare function serveTextFromCacheOr(siteContext: SiteContext, httpContext: PaHttpContext, tracker: Tracker, options: {
13
9
  cacheKey: string;
14
10
  contentType?: string;
11
+ transform?: (text: string) => string;
15
12
  }): ServeTextOr;
16
- export declare function serveTextFromCacheOr(siteContext: SiteContext, httpContext: PaHttpContext, tracker: Tracker, options: {
17
- cacheKey: string[];
18
- contentType?: string;
19
- }): ServeTextOrWithCacheKey;
20
13
  export declare function render404Html(siteContext: SiteContext, httpContext: PaHttpContext, options?: {
21
14
  language?: string;
22
15
  }): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"serve-text-or.d.ts","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAKjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAIzE,MAAM,WAAW,WAAW;IAC1B,cAAc,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/E;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjG;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IACP,QAAQ,EAAE,MAAM,CAAC;IAIjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GACA,WAAW,CAAC;AACf,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IACP,QAAQ,EAAE,MAAM,EAAE,CAAC;IAInB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GACA,uBAAuB,CAAC;AAqD3B,wBAAsB,aAAa,CACjC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAoCf"}
1
+ {"version":3,"file":"serve-text-or.d.ts","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAKjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAIzE,MAAM,WAAW,WAAW;IAC1B,cAAc,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/E;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IACP,QAAQ,EAAE,MAAM,CAAC;IAIjB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACtC,GACA,WAAW,CAoCb;AAED,wBAAsB,aAAa,CACjC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAoCf"}
@@ -6,7 +6,7 @@ import { makeDetachedTemplatePayload } from "../rendering-payload/make-public-pa
6
6
  import { makeCacheKey } from "./text-cache.js";
7
7
  import { trackerReportToMessage } from "./tracker-report.js";
8
8
  export function serveTextFromCacheOr(siteContext, httpContext, tracker, options) {
9
- const { cacheKey, contentType } = options;
9
+ const { cacheKey, contentType, transform } = options;
10
10
  return {
11
11
  async serveFromCache() {
12
12
  const cacheVal = await siteContext.textCache.getCacheValue(cacheKey, tracker);
@@ -14,7 +14,7 @@ export function serveTextFromCacheOr(siteContext, httpContext, tracker, options)
14
14
  return false;
15
15
  serveTextContent(httpContext, {
16
16
  contentType,
17
- text: cacheVal.value,
17
+ text: transform ? transform(cacheVal.value) : cacheVal.value,
18
18
  or304: cacheVal.resourceVersion
19
19
  ? {
20
20
  etag: cacheVal.resourceVersion,
@@ -23,18 +23,15 @@ export function serveTextFromCacheOr(siteContext, httpContext, tracker, options)
23
23
  });
24
24
  return true;
25
25
  },
26
- async putInCacheAndServe(html, dependencyKeys, k) {
27
- const writeK = k ?? cacheKey;
28
- if (Array.isArray(writeK))
29
- throw new Error("Missing 'cacheKey' parameter");
26
+ async putInCacheAndServe(html, dependencyKeys) {
30
27
  const cacheVal = await siteContext.textCache.setCacheValue({
31
- cacheKey: writeK,
28
+ cacheKey,
32
29
  dependencyKeys,
33
30
  value: html,
34
31
  }, tracker);
35
32
  serveTextContent(httpContext, {
36
33
  contentType,
37
- text: cacheVal.value,
34
+ text: transform ? transform(cacheVal.value) : cacheVal.value,
38
35
  or304: cacheVal.resourceVersion ? { etag: cacheVal.resourceVersion } : undefined,
39
36
  });
40
37
  },
@@ -1 +1 @@
1
- {"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,MAAM,6CAA6C,CAAC;AAE1F,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAoC7D,MAAM,UAAU,oBAAoB,CAClC,WAAwB,EACxB,WAA0B,EAC1B,OAAgB,EAChB,OAMC;IAED,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1C,OAAO;QACL,KAAK,CAAC,cAAc;YAClB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAE5B,gBAAgB,CAAC,WAAW,EAAE;gBAC5B,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc,EAAE,CAAqB;YAClE,MAAM,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAE3E,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACxD;gBACE,QAAQ,EAAE,MAAM;gBAChB,cAAc;gBACd,KAAK,EAAE,IAAI;aACZ,EACD,OAAO,CACR,CAAC;YAEF,gBAAgB,CAAC,WAAW,EAAE;gBAC5B,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,WAA0B,EAC1B,OAA+B;IAE/B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;YACjE,QAAQ;YACR,QAAQ,EAAE,OAAO,EAAE,QAAQ;YAC3B,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,gBAAgB,EAAE;YACxD,aAAa,EAAE,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,2BAA2B,CAAC,gBAAgB,EAAE;gBACrD,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK;aAChC,CAAC;SACH,CAAC,CAAC;QAEH,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAClD;YACE,QAAQ;YACR,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;YACpD,KAAK,EAAE,IAAI;SACZ,EACD,OAAO,CACR,CAAC;QAEF,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,gBAAgB,CAAC,WAAW,EAAE;QAC5B,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,QAAQ,CAAC,KAAK;KACrB,CAAC,CAAC;IACH,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;AACvF,CAAC"}
1
+ {"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import type { AppLogger, JtPluginRef, PluginStaticConfigurations, RegisteredSite } from "@paroicms/public-server-lib";
2
- import type { InitializingSitePlugin } from "./plugin-types.js";
2
+ import type { LoadedSitePlugins } from "./plugin-types.js";
3
3
  export declare function initialiseSitePlugins({ logger, regSite, pluginStaticConfigurations, pluginNamesOrRefs, }: {
4
4
  logger: AppLogger;
5
5
  regSite: RegisteredSite;
6
6
  pluginStaticConfigurations: PluginStaticConfigurations;
7
7
  pluginNamesOrRefs: (string | JtPluginRef)[] | undefined;
8
- }): Promise<InitializingSitePlugin[]>;
8
+ }): Promise<LoadedSitePlugins>;
9
9
  //# sourceMappingURL=init-plugins.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"init-plugins.d.ts","sourceRoot":"","sources":["../../../src/connector/plugin-loader/init-plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAET,WAAW,EAEX,0BAA0B,EAC1B,cAAc,EACf,MAAM,6BAA6B,CAAC;AAGrC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,wBAAsB,qBAAqB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,0BAA0B,EAC1B,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;IACxB,0BAA0B,EAAE,0BAA0B,CAAC;IACvD,iBAAiB,EAAE,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,GAAG,SAAS,CAAC;CACzD,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAgDpC"}
1
+ {"version":3,"file":"init-plugins.d.ts","sourceRoot":"","sources":["../../../src/connector/plugin-loader/init-plugins.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EAET,WAAW,EAEX,0BAA0B,EAC1B,cAAc,EACf,MAAM,6BAA6B,CAAC;AAGrC,OAAO,KAAK,EAA0B,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEnF,wBAAsB,qBAAqB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,0BAA0B,EAC1B,iBAAiB,GAClB,EAAE;IACD,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;IACxB,0BAA0B,EAAE,0BAA0B,CAAC;IACvD,iBAAiB,EAAE,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,GAAG,SAAS,CAAC;CACzD,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyD7B"}
@@ -1,8 +1,9 @@
1
+ import { messageOf } from "@paroicms/public-anywhere-lib";
1
2
  import { loadSitePlugins } from "./plugin-loader.js";
2
3
  import { getPluginAssetsUrl } from "./plugin-public-helpers.js";
3
4
  export async function initialiseSitePlugins({ logger, regSite, pluginStaticConfigurations, pluginNamesOrRefs, }) {
4
5
  if (!pluginNamesOrRefs)
5
- return [];
6
+ return { plugins: [], disabledPlugins: [] };
6
7
  const pluginNames = [];
7
8
  const mergedStaticConfs = new Map();
8
9
  for (const [name, conf] of Object.entries(pluginStaticConfigurations)) {
@@ -34,22 +35,30 @@ export async function initialiseSitePlugins({ logger, regSite, pluginStaticConfi
34
35
  }
35
36
  }
36
37
  }
37
- const plugins = await loadSitePlugins({
38
- regSite,
38
+ const { plugins, disabledPlugins } = await loadSitePlugins({
39
39
  logger,
40
+ regSite,
40
41
  pluginNames,
41
42
  pluginStaticConfigurations: mergedStaticConfs,
42
43
  });
44
+ const initialized = [];
43
45
  for (const p of plugins) {
44
46
  const service = createBackendPluginInitService(logger, p, regSite);
45
47
  try {
46
48
  await p.plugin.siteInit?.(service);
47
49
  }
48
50
  catch (error) {
49
- logger.error(`Failed initializing plugin '${p.pluginName}'`, error);
51
+ logger.error(`Plugin '${p.pluginName}' is disabled: ${messageOf(error)}`, error);
52
+ disabledPlugins.push({
53
+ pluginName: p.pluginName,
54
+ phase: "siteInit",
55
+ message: messageOf(error),
56
+ });
57
+ continue;
50
58
  }
59
+ initialized.push(p);
51
60
  }
52
- return plugins;
61
+ return { plugins: initialized, disabledPlugins };
53
62
  }
54
63
  function createBackendPluginInitService(logger, plugin, regSite) {
55
64
  const { initData } = plugin;
@@ -1 +1 @@
1
- {"version":3,"file":"init-plugins.js","sourceRoot":"","sources":["../../../src/connector/plugin-loader/init-plugins.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init-plugins.js","sourceRoot":"","sources":["../../../src/connector/plugin-loader/init-plugins.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import type { AppLogger, PluginStaticConfiguration, RegisteredSite } from "@paroicms/public-server-lib";
2
- import type { InitializingSitePlugin } from "./plugin-types.js";
3
- export declare function loadSitePlugins({ regSite, logger, pluginNames, pluginStaticConfigurations, }: {
4
- regSite: Pick<RegisteredSite, "siteDir" | "siteUrl">;
2
+ import type { LoadedSitePlugins } from "./plugin-types.js";
3
+ export type PluginSite = Pick<RegisteredSite, "siteDir" | "siteUrl">;
4
+ export declare function loadSitePlugins({ logger, regSite, pluginNames, pluginStaticConfigurations, }: {
5
5
  logger: AppLogger;
6
+ regSite: PluginSite;
6
7
  pluginNames: string[];
7
8
  pluginStaticConfigurations: Map<string, PluginStaticConfiguration>;
8
- }): Promise<InitializingSitePlugin[]>;
9
+ }): Promise<LoadedSitePlugins>;
9
10
  //# sourceMappingURL=plugin-loader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-loader.d.ts","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EAET,yBAAyB,EACzB,cAAc,EACf,MAAM,6BAA6B,CAAC;AAKrC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAIhE,wBAAsB,eAAe,CAAC,EACpC,OAAO,EACP,MAAM,EACN,WAAW,EACX,0BAA0B,GAC3B,EAAE;IACD,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;IACrD,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;CACpE,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA+BpC"}
1
+ {"version":3,"file":"plugin-loader.d.ts","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EAET,yBAAyB,EACzB,cAAc,EACf,MAAM,6BAA6B,CAAC;AAKrC,OAAO,KAAK,EAA0C,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAInG,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;AAErE,wBAAsB,eAAe,CAAC,EACpC,MAAM,EACN,OAAO,EACP,WAAW,EACX,0BAA0B,GAC3B,EAAE;IACD,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;CACpE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAuC7B"}
@@ -1,16 +1,23 @@
1
- import { isObj } from "@paroicms/public-anywhere-lib";
1
+ import { isObj, messageOf } from "@paroicms/public-anywhere-lib";
2
2
  import { getPluginSlug } from "@paroicms/script-lib";
3
3
  import { createRequire } from "node:module";
4
4
  import { join } from "node:path";
5
5
  import { pathToFileURL } from "node:url";
6
6
  const importedPlugins = new Map();
7
- export async function loadSitePlugins({ regSite, logger, pluginNames, pluginStaticConfigurations, }) {
7
+ export async function loadSitePlugins({ logger, regSite, pluginNames, pluginStaticConfigurations, }) {
8
8
  const urlProvider = createAdminUiPluginUrlProvider(regSite.siteUrl);
9
9
  const plugins = [];
10
+ const disabledPlugins = [];
10
11
  for (const pluginName of pluginNames) {
11
- const plugin = await getImportedPlugin(regSite.siteDir, pluginName, logger);
12
- if (!plugin)
12
+ let plugin;
13
+ try {
14
+ plugin = await importPlugin(regSite, pluginName);
15
+ }
16
+ catch (error) {
17
+ logger.error(`Plugin '${pluginName}' is disabled: ${messageOf(error)}`, error);
18
+ disabledPlugins.push({ pluginName, phase: "import", message: messageOf(error) });
13
19
  continue;
20
+ }
14
21
  const { adminUiPluginBaseUrl, slug } = urlProvider(plugin, pluginName);
15
22
  plugins.push({
16
23
  pluginName,
@@ -33,7 +40,7 @@ export async function loadSitePlugins({ regSite, logger, pluginNames, pluginStat
33
40
  },
34
41
  });
35
42
  }
36
- return plugins;
43
+ return { plugins, disabledPlugins };
37
44
  }
38
45
  function createAdminUiPluginUrlProvider(siteUrl) {
39
46
  const slugs = new Set();
@@ -49,34 +56,36 @@ function createAdminUiPluginUrlProvider(siteUrl) {
49
56
  };
50
57
  };
51
58
  }
52
- async function getImportedPlugin(siteDir, pluginName, logger) {
59
+ async function importPlugin(regSite, pluginName) {
60
+ const { siteDir, siteUrl } = regSite;
53
61
  const cacheKey = `${siteDir}\0${pluginName}`;
54
- if (importedPlugins.has(cacheKey)) {
55
- return importedPlugins.get(cacheKey);
56
- }
62
+ const cached = importedPlugins.get(cacheKey);
63
+ if (cached)
64
+ return cached;
65
+ let exported;
57
66
  try {
58
67
  const pluginPath = createRequire(join(siteDir, "package.json")).resolve(pluginName);
59
- const plugin = (await import(pathToFileURL(pluginPath).href)).default;
60
- checkPluginFormat(plugin);
61
- importedPlugins.set(cacheKey, plugin);
62
- return plugin;
68
+ exported = (await import(pathToFileURL(pluginPath).href)).default;
63
69
  }
64
70
  catch (error) {
65
- logger.error(`Invalid plugin "${pluginName}"`, error);
66
- importedPlugins.set(cacheKey, undefined);
71
+ throw new Error(`Cannot load the plugin "${pluginName}" listed by the site "${siteUrl}": ${messageOf(error)}`, { cause: error });
67
72
  }
73
+ checkPluginFormat(exported, pluginName);
74
+ importedPlugins.set(cacheKey, exported);
75
+ return exported;
68
76
  }
69
- function checkPluginFormat(plugin) {
77
+ function checkPluginFormat(plugin, pluginName) {
78
+ const invalid = (reason) => new Error(`Invalid plugin "${pluginName}": ${reason}`);
70
79
  if (!isObj(plugin))
71
- throw new Error("should export a 'plugin' object");
80
+ throw invalid("should export a 'plugin' object");
72
81
  if (!plugin.version || typeof plugin.version !== "string") {
73
- throw new Error("'plugin.version' should be a string");
82
+ throw invalid("'plugin.version' should be a string");
74
83
  }
75
84
  if ("slug" in plugin && typeof plugin.slug !== "string") {
76
- throw new Error("'plugin.slug' should be a string");
85
+ throw invalid("'plugin.slug' should be a string");
77
86
  }
78
87
  if (plugin.siteInit && typeof plugin.siteInit !== "function") {
79
- throw new Error("'plugin.siteInit' should be a function");
88
+ throw invalid("'plugin.siteInit' should be a function");
80
89
  }
81
90
  }
82
91
  //# sourceMappingURL=plugin-loader.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-loader.js","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-loader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-loader.js","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-loader.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ import type { AppLogger } from "@paroicms/public-server-lib";
2
+ export interface PluginPackageOptions {
3
+ pluginName?: string;
4
+ version?: string;
5
+ source?: string;
6
+ }
7
+ export declare function createSitePackage(options?: PluginPackageOptions): Promise<string>;
8
+ export declare function addPluginPackage(siteDir: string, { pluginName, version, source }?: PluginPackageOptions): Promise<void>;
9
+ export interface TestLogger extends AppLogger {
10
+ errors: unknown[];
11
+ }
12
+ export declare function createLogger(): TestLogger;
13
+ //# sourceMappingURL=plugin-test-fixtures.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"plugin-test-fixtures.d.ts","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-test-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAK7D,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAGD,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,CAK3F;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,EAAE,UAA8B,EAAE,OAAiB,EAAE,MAAM,EAAE,GAAE,oBAAyB,iBAYzF;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB;AAED,wBAAgB,YAAY,IAAI,UAAU,CAazC"}
@@ -0,0 +1,30 @@
1
+ import { mkdir, mkdtemp, writeFile } from "node:fs/promises";
2
+ import { tmpdir } from "node:os";
3
+ import { join } from "node:path";
4
+ export async function createSitePackage(options = {}) {
5
+ const siteDir = await mkdtemp(join(tmpdir(), "paroicms-plugin-"));
6
+ await writeFile(join(siteDir, "package.json"), JSON.stringify({ type: "module" }));
7
+ await addPluginPackage(siteDir, options);
8
+ return siteDir;
9
+ }
10
+ export async function addPluginPackage(siteDir, { pluginName = "consumer-plugin", version = "1.2.3", source } = {}) {
11
+ const pluginDir = join(siteDir, "node_modules", pluginName);
12
+ await mkdir(pluginDir, { recursive: true });
13
+ await writeFile(join(pluginDir, "package.json"), JSON.stringify({ name: pluginName, type: "module", main: "index.js" }));
14
+ await writeFile(join(pluginDir, "index.js"), source ?? `export default { version: "${version}" };`);
15
+ }
16
+ export function createLogger() {
17
+ const errors = [];
18
+ const logger = {
19
+ errors,
20
+ error: (...args) => {
21
+ errors.push(args);
22
+ },
23
+ warn: () => { },
24
+ info: () => { },
25
+ debug: () => { },
26
+ trace: () => { },
27
+ };
28
+ return logger;
29
+ }
30
+ //# sourceMappingURL=plugin-test-fixtures.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"plugin-test-fixtures.js","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-test-fixtures.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAUjC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAO,GAAyB,EAAE;IACxE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAClE,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACnF,MAAM,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAe,EACf,EAAE,UAAU,GAAG,iBAAiB,EAAE,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,GAAyB,EAAE;IAExF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IAC5D,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,SAAS,CACb,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAC/B,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CACvE,CAAC;IACF,MAAM,SAAS,CACb,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,EAC3B,MAAM,IAAI,8BAA8B,OAAO,MAAM,CACtD,CAAC;AACJ,CAAC;AAMD,MAAM,UAAU,YAAY;IAC1B,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG;QACb,MAAM;QACN,KAAK,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;KAChB,CAAC;IACF,OAAO,MAA+B,CAAC;AACzC,CAAC"}
@@ -1,4 +1,13 @@
1
1
  import type { BackendHookHandler, HeadTagsHandler, ParoiCmsPlugin, PluginLiquidFilterHandler, PluginOutLiquidTagHandler, PluginSetLiquidTagHandler, PluginStaticConfiguration, PublicApiHandler, RenderingHookHandler } from "@paroicms/public-server-lib";
2
+ export interface LoadedSitePlugins {
3
+ plugins: InitializingSitePlugin[];
4
+ disabledPlugins: DisabledPlugin[];
5
+ }
6
+ export interface DisabledPlugin {
7
+ pluginName: string;
8
+ phase: "import" | "siteInit";
9
+ message: string;
10
+ }
2
11
  export interface SitePlugin {
3
12
  pluginName: string;
4
13
  staticConfiguration: PluginStaticConfiguration;
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-types.d.ts","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,yBAAyB,EACzB,yBAAyB,EACzB,yBAAyB,EACzB,yBAAyB,EACzB,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,6BAA6B,CAAC;AAErC,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,yBAAyB,CAAC;IAC/C,MAAM,EAAE,cAAc,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,WAAW,sBAAuB,SAAQ,UAAU;IACxD,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,sBAAsB,EAAE,CAAC;IACxC,oBAAoB,EAAE,mCAAmC,EAAE,CAAC;IAC5D,oBAAoB,EAAE,mCAAmC,EAAE,CAAC;IAC5D,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,4BAA4B,EAAE,MAAM,EAAE,CAAC;IACvC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,cAAc,EAAE,uBAAuB,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACjC;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,yBAAyB,CAAC;IACnC,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC7B;AAED,MAAM,WAAW,mCAAmC;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,yBAAyB,CAAC;IACnC,GAAG,EAAE,OAAO,CAAC;CACd;AAED,MAAM,WAAW,mCAAmC;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,yBAAyB,CAAC;CACpC"}
1
+ {"version":3,"file":"plugin-types.d.ts","sourceRoot":"","sources":["../../../src/connector/plugin-loader/plugin-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,yBAAyB,EACzB,yBAAyB,EACzB,yBAAyB,EACzB,yBAAyB,EACzB,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,6BAA6B,CAAC;AAErC,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,sBAAsB,EAAE,CAAC;IAClC,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,yBAAyB,CAAC;IAC/C,MAAM,EAAE,cAAc,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,WAAW,sBAAuB,SAAQ,UAAU;IACxD,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,sBAAsB,EAAE,CAAC;IACxC,oBAAoB,EAAE,mCAAmC,EAAE,CAAC;IAC5D,oBAAoB,EAAE,mCAAmC,EAAE,CAAC;IAC5D,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,4BAA4B,EAAE,MAAM,EAAE,CAAC;IACvC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,cAAc,EAAE,uBAAuB,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACjC;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,yBAAyB,CAAC;IACnC,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC7B;AAED,MAAM,WAAW,mCAAmC;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,yBAAyB,CAAC;IACnC,GAAG,EAAE,OAAO,CAAC;CACd;AAED,MAAM,WAAW,mCAAmC;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,yBAAyB,CAAC;CACpC"}
@@ -1,4 +1,4 @@
1
- import type { AppLogger, JtFieldType, JtImageCompressionQualityPolicyStep, JtMediaPolicy, JtNodeType, JtPluginRef, PluginStaticConfigurations, RegisteredSite } from "@paroicms/public-server-lib";
1
+ import type { JtFieldType, JtImageCompressionQualityPolicyStep, JtMediaPolicy, JtNodeType } from "@paroicms/public-server-lib";
2
2
  import type { InitializingSitePlugin } from "../plugin-loader/plugin-types.js";
3
3
  import type { CommonSchema, CommonSchemaLibrary } from "./common-schema-types.js";
4
4
  import { type LocalizedTranslations } from "./read-locales.js";
@@ -19,12 +19,9 @@ export interface MergedSchemaLib {
19
19
  };
20
20
  l10n: LocalizedTranslations;
21
21
  }
22
- export declare function prepareLib(options: {
23
- logger: AppLogger;
24
- regSite: RegisteredSite;
25
- pluginStaticConfigurations: PluginStaticConfigurations;
22
+ export declare function prepareLib({ commonSchemaLib, languages, plugins, }: {
26
23
  commonSchemaLib: CommonSchemaLibrary;
27
24
  languages: string[];
28
- pluginNamesOrRefs: (string | JtPluginRef)[] | undefined;
25
+ plugins: InitializingSitePlugin[];
29
26
  }): Promise<MergedSchemaLib>;
30
27
  //# sourceMappingURL=schema-lib.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema-lib.d.ts","sourceRoot":"","sources":["../../../src/connector/site-schema/schema-lib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,mCAAmC,EACnC,aAAa,EACb,UAAU,EACV,WAAW,EACX,0BAA0B,EAC1B,cAAc,EACf,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,GAAG,SAAS,CAAC;IAC1D,MAAM,EAAE;QACN,SAAS,EAAE;YACT,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAC;SAChC,CAAC;QACF,UAAU,EAAE;YACV,CAAC,kBAAkB,EAAE,MAAM,GAAG,WAAW,CAAC;SAC3C,CAAC;QACF,aAAa,EAAE;YACb,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC;SACrC,CAAC;QACF,kBAAkB,CAAC,EAAE,mCAAmC,EAAE,CAAC;KAC5D,CAAC;IACF,IAAI,EAAE,qBAAqB,CAAC;CAC7B;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IACxC,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;IACxB,0BAA0B,EAAE,0BAA0B,CAAC;IACvD,eAAe,EAAE,mBAAmB,CAAC;IACrC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,iBAAiB,EAAE,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,GAAG,SAAS,CAAC;CACzD,GAAG,OAAO,CAAC,eAAe,CAAC,CA8D3B"}
1
+ {"version":3,"file":"schema-lib.d.ts","sourceRoot":"","sources":["../../../src/connector/site-schema/schema-lib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,mCAAmC,EACnC,aAAa,EACb,UAAU,EACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,GAAG,SAAS,CAAC;IAC1D,MAAM,EAAE;QACN,SAAS,EAAE;YACT,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAC;SAChC,CAAC;QACF,UAAU,EAAE;YACV,CAAC,kBAAkB,EAAE,MAAM,GAAG,WAAW,CAAC;SAC3C,CAAC;QACF,aAAa,EAAE;YACb,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC;SACrC,CAAC;QACF,kBAAkB,CAAC,EAAE,mCAAmC,EAAE,CAAC;KAC5D,CAAC;IACF,IAAI,EAAE,qBAAqB,CAAC;CAC7B;AAED,wBAAsB,UAAU,CAAC,EAC/B,eAAe,EACf,SAAS,EACT,OAAO,GACR,EAAE;IACD,eAAe,EAAE,mBAAmB,CAAC;IACrC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,sBAAsB,EAAE,CAAC;CACnC,GAAG,OAAO,CAAC,eAAe,CAAC,CA2D3B"}