@paroicms/server 1.102.2 → 1.103.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -16
- package/ddl/main.ddl.sql +92 -0
- package/dist/admin-backend/account/account.queries.d.ts +3 -3
- package/dist/admin-backend/account/account.queries.js.map +1 -1
- package/dist/admin-backend/account/account.resolver.d.ts +1 -1
- package/dist/admin-backend/account/account.resolver.js +9 -0
- package/dist/admin-backend/account/account.resolver.js.map +1 -1
- package/dist/admin-backend/auth/auth.service.d.ts +12 -3
- package/dist/admin-backend/auth/auth.service.js +7 -7
- package/dist/admin-backend/auth/auth.service.js.map +1 -1
- package/dist/admin-backend/backup/backup.controller.js +2 -1
- package/dist/admin-backend/backup/backup.controller.js.map +1 -1
- package/dist/admin-backend/backup/backup.resolver.d.ts +1 -1
- package/dist/admin-backend/backup/backup.resolver.js +2 -0
- package/dist/admin-backend/backup/backup.resolver.js.map +1 -1
- package/dist/admin-backend/backup/hardened-backup.service.js +2 -1
- package/dist/admin-backend/backup/hardened-backup.service.js.map +1 -1
- package/dist/admin-backend/document/document.resolver.d.ts +1 -1
- package/dist/admin-backend/document/document.resolver.extend.d.ts +1 -1
- package/dist/admin-backend/document/document.resolver.extend.js +2 -0
- package/dist/admin-backend/document/document.resolver.extend.js.map +1 -1
- package/dist/admin-backend/document/document.resolver.js +9 -0
- package/dist/admin-backend/document/document.resolver.js.map +1 -1
- package/dist/admin-backend/document/load-documents.queries.d.ts +1 -1
- package/dist/admin-backend/document/load-documents.queries.js.map +1 -1
- package/dist/admin-backend/document/save-documents.queries.js +1 -1
- package/dist/admin-backend/document/save-documents.queries.js.map +1 -1
- package/dist/admin-backend/fields/fields.resolver.d.ts +1 -1
- package/dist/admin-backend/fields/fields.resolver.js +8 -0
- package/dist/admin-backend/fields/fields.resolver.js.map +1 -1
- package/dist/admin-backend/lnode/lnode-wrap.resolver.d.ts +1 -1
- package/dist/admin-backend/lnode/lnode-wrap.resolver.js +9 -0
- package/dist/admin-backend/lnode/lnode-wrap.resolver.js.map +1 -1
- package/dist/admin-backend/lnode/lnode.queries.js +1 -1
- package/dist/admin-backend/lnode/lnode.queries.js.map +1 -1
- package/dist/admin-backend/login/login.controller.d.ts +2 -2
- package/dist/admin-backend/login/login.controller.js +17 -5
- package/dist/admin-backend/login/login.controller.js.map +1 -1
- package/dist/admin-backend/media/media.resolver.d.ts +1 -1
- package/dist/admin-backend/media/media.resolver.extend.d.ts +1 -1
- package/dist/admin-backend/media/media.resolver.extend.js +2 -0
- package/dist/admin-backend/media/media.resolver.extend.js.map +1 -1
- package/dist/admin-backend/media/media.resolver.js +11 -0
- package/dist/admin-backend/media/media.resolver.js.map +1 -1
- package/dist/admin-backend/migration/migration.resolver.d.ts +3 -0
- package/dist/admin-backend/migration/migration.resolver.js +38 -0
- package/dist/admin-backend/migration/migration.resolver.js.map +1 -0
- package/dist/admin-backend/node/node.queries.js +1 -1
- package/dist/admin-backend/node/node.queries.js.map +1 -1
- package/dist/admin-backend/node/node.resolver.d.ts +1 -1
- package/dist/admin-backend/node/node.resolver.extend.d.ts +1 -1
- package/dist/admin-backend/node/node.resolver.extend.js +2 -0
- package/dist/admin-backend/node/node.resolver.extend.js.map +1 -1
- package/dist/admin-backend/node/node.resolver.js +5 -0
- package/dist/admin-backend/node/node.resolver.js.map +1 -1
- package/dist/admin-backend/part/part.queries.js +1 -1
- package/dist/admin-backend/part/part.queries.js.map +1 -1
- package/dist/admin-backend/part/part.resolver.d.ts +1 -1
- package/dist/admin-backend/part/part.resolver.extend.d.ts +1 -1
- package/dist/admin-backend/part/part.resolver.extend.js +3 -0
- package/dist/admin-backend/part/part.resolver.extend.js.map +1 -1
- package/dist/admin-backend/part/part.resolver.js +7 -0
- package/dist/admin-backend/part/part.resolver.js.map +1 -1
- package/dist/admin-backend/site-constants/site-constants.resolver.d.ts +1 -1
- package/dist/admin-backend/site-constants/site-constants.resolver.js +7 -1
- package/dist/admin-backend/site-constants/site-constants.resolver.js.map +1 -1
- package/dist/admin-backend/unprotected/unprotected.resolver.js +14 -3
- package/dist/admin-backend/unprotected/unprotected.resolver.js.map +1 -1
- package/dist/common/data-format.d.ts +1 -1
- package/dist/common/data-format.js.map +1 -1
- package/dist/connector/app-conf/app-conf-formatter.d.ts +3 -0
- package/dist/connector/app-conf/app-conf-formatter.js +144 -0
- package/dist/connector/app-conf/app-conf-formatter.js.map +1 -0
- package/dist/connector/app-conf/app-conf-reader.d.ts +3 -0
- package/dist/connector/app-conf/app-conf-reader.js +11 -0
- package/dist/connector/app-conf/app-conf-reader.js.map +1 -0
- package/dist/connector/app-conf/app-conf.types.d.ts +45 -0
- package/dist/connector/app-conf/app-conf.types.js +2 -0
- package/dist/connector/app-conf/app-conf.types.js.map +1 -0
- package/dist/connector/db-init/db-constants.d.ts +2 -0
- package/dist/connector/db-init/db-constants.js +3 -0
- package/dist/connector/db-init/db-constants.js.map +1 -0
- package/dist/connector/db-init/db-init.d.ts +10 -0
- package/dist/connector/db-init/db-init.js +42 -0
- package/dist/connector/db-init/db-init.js.map +1 -0
- package/dist/connector/db-init/ddl-migration.d.ts +6 -0
- package/dist/connector/db-init/ddl-migration.js +185 -0
- package/dist/connector/db-init/ddl-migration.js.map +1 -0
- package/dist/connector/db-init/init-node-queries.d.ts +12 -0
- package/dist/connector/db-init/init-node-queries.js +96 -0
- package/dist/connector/db-init/init-node-queries.js.map +1 -0
- package/dist/connector/db-init/load-routing-documents.d.ts +3 -0
- package/dist/connector/db-init/load-routing-documents.js +85 -0
- package/dist/connector/db-init/load-routing-documents.js.map +1 -0
- package/dist/connector/db-init/populate-routing-documents.d.ts +4 -0
- package/dist/connector/db-init/populate-routing-documents.js +68 -0
- package/dist/connector/db-init/populate-routing-documents.js.map +1 -0
- package/dist/connector/media-storage.d.ts +4 -0
- package/dist/connector/media-storage.js +14 -0
- package/dist/connector/media-storage.js.map +1 -0
- package/dist/connector/plugin-loader/init-plugins.d.ts +8 -0
- package/dist/connector/plugin-loader/init-plugins.js +98 -0
- package/dist/connector/plugin-loader/init-plugins.js.map +1 -0
- package/dist/connector/plugin-loader/plugin-loader.d.ts +8 -0
- package/dist/connector/plugin-loader/plugin-loader.js +76 -0
- package/dist/connector/plugin-loader/plugin-loader.js.map +1 -0
- package/dist/connector/plugin-loader/plugin-public-helpers.d.ts +2 -0
- package/dist/connector/plugin-loader/plugin-public-helpers.js +4 -0
- package/dist/connector/plugin-loader/plugin-public-helpers.js.map +1 -0
- package/dist/connector/plugin-loader/plugin-types.d.ts +53 -0
- package/dist/connector/plugin-loader/plugin-types.js +2 -0
- package/dist/connector/plugin-loader/plugin-types.js.map +1 -0
- package/dist/connector/public-site-context-types.d.ts +16 -0
- package/dist/connector/public-site-context-types.js +2 -0
- package/dist/connector/public-site-context-types.js.map +1 -0
- package/dist/connector/row-types.d.ts +59 -0
- package/dist/connector/row-types.js +2 -0
- package/dist/connector/row-types.js.map +1 -0
- package/dist/connector/single-site-builder/default-config.d.ts +3 -0
- package/dist/connector/single-site-builder/default-config.js +24 -0
- package/dist/connector/single-site-builder/default-config.js.map +1 -0
- package/dist/connector/single-site-builder/default-readme.d.ts +1 -0
- package/dist/connector/single-site-builder/default-readme.js +4 -0
- package/dist/connector/single-site-builder/default-readme.js.map +1 -0
- package/dist/connector/single-site-builder/site-builder.d.ts +27 -0
- package/dist/connector/single-site-builder/site-builder.js +91 -0
- package/dist/connector/single-site-builder/site-builder.js.map +1 -0
- package/dist/connector/site-backup/archiver.helper.d.ts +12 -0
- package/dist/connector/site-backup/archiver.helper.js +36 -0
- package/dist/connector/site-backup/archiver.helper.js.map +1 -0
- package/dist/connector/site-backup/backup-tasks.d.ts +14 -0
- package/dist/connector/site-backup/backup-tasks.js +42 -0
- package/dist/connector/site-backup/backup-tasks.js.map +1 -0
- package/dist/connector/site-backup/backup.d.ts +12 -0
- package/dist/connector/site-backup/backup.helper.d.ts +3 -0
- package/dist/connector/site-backup/backup.helper.js +8 -0
- package/dist/connector/site-backup/backup.helper.js.map +1 -0
- package/dist/connector/site-backup/backup.js +34 -0
- package/dist/connector/site-backup/backup.js.map +1 -0
- package/dist/connector/site-conf/site-conf.d.ts +8 -0
- package/dist/connector/site-conf/site-conf.js +117 -0
- package/dist/connector/site-conf/site-conf.js.map +1 -0
- package/dist/connector/site-conf/site-place-types.d.ts +5 -0
- package/dist/connector/site-conf/site-place-types.js +2 -0
- package/dist/connector/site-conf/site-place-types.js.map +1 -0
- package/dist/connector/site-schema/common-schema-reader.d.ts +2 -0
- package/dist/connector/site-schema/common-schema-reader.js +56 -0
- package/dist/connector/site-schema/common-schema-reader.js.map +1 -0
- package/dist/connector/site-schema/common-schema-types.d.ts +13 -0
- package/dist/connector/site-schema/common-schema-types.js +2 -0
- package/dist/connector/site-schema/common-schema-types.js.map +1 -0
- package/dist/connector/site-schema/default-media-policy.d.ts +3 -0
- package/dist/connector/site-schema/default-media-policy.js +21 -0
- package/dist/connector/site-schema/default-media-policy.js.map +1 -0
- package/dist/connector/site-schema/read-locales.d.ts +23 -0
- package/dist/connector/site-schema/read-locales.js +214 -0
- package/dist/connector/site-schema/read-locales.js.map +1 -0
- package/dist/connector/site-schema/schema-lib.d.ts +29 -0
- package/dist/connector/site-schema/schema-lib.js +62 -0
- package/dist/connector/site-schema/schema-lib.js.map +1 -0
- package/dist/connector/site-schema/site-configuration.d.ts +4 -0
- package/dist/connector/site-schema/site-configuration.js +2 -0
- package/dist/connector/site-schema/site-configuration.js.map +1 -0
- package/dist/connector/site-schema/site-schema-factory.d.ts +21 -0
- package/dist/connector/site-schema/site-schema-factory.js +574 -0
- package/dist/connector/site-schema/site-schema-factory.js.map +1 -0
- package/dist/connector/site-schema/site-schema-helpers.d.ts +3 -0
- package/dist/connector/site-schema/site-schema-helpers.js +7 -0
- package/dist/connector/site-schema/site-schema-helpers.js.map +1 -0
- package/dist/connector/site-schema/site-schema-lib-reader.d.ts +8 -0
- package/dist/connector/site-schema/site-schema-lib-reader.js +42 -0
- package/dist/connector/site-schema/site-schema-lib-reader.js.map +1 -0
- package/dist/connector/site-schema/site-schema-public-helpers.d.ts +3 -0
- package/dist/connector/site-schema/site-schema-public-helpers.js +15 -0
- package/dist/connector/site-schema/site-schema-public-helpers.js.map +1 -0
- package/dist/connector/theme-conf/theme-conf-reader.d.ts +4 -0
- package/dist/connector/theme-conf/theme-conf-reader.js +31 -0
- package/dist/connector/theme-conf/theme-conf-reader.js.map +1 -0
- package/dist/context.d.ts +3 -3
- package/dist/context.js +3 -3
- package/dist/context.js.map +1 -1
- package/dist/express/http-helpers.d.ts +3 -3
- package/dist/express/http-redirection-url.d.ts +1 -1
- package/dist/express/local-testing-route.js +5 -1
- package/dist/express/local-testing-route.js.map +1 -1
- package/dist/express/route-handler-wrapper.d.ts +9 -1
- package/dist/express/route-handler-wrapper.js +25 -2
- package/dist/express/route-handler-wrapper.js.map +1 -1
- package/dist/express/serve-file.js +1 -1
- package/dist/express/serve-file.js.map +1 -1
- package/dist/express/site-middleware.js +3 -6
- package/dist/express/site-middleware.js.map +1 -1
- package/dist/express/static-files.req-handler.d.ts +2 -2
- package/dist/express/static-files.req-handler.js +3 -3
- package/dist/express/static-files.req-handler.js.map +1 -1
- package/dist/graphql/apollo-server-init.js +2 -0
- package/dist/graphql/apollo-server-init.js.map +1 -1
- package/dist/graphql/graphql.types.d.ts +7 -2
- package/dist/graphql/graphql.types.js +6 -1
- package/dist/graphql/graphql.types.js.map +1 -1
- package/dist/helpers/special-account.helpers.d.ts +1 -1
- package/dist/helpers/special-account.helpers.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/maintenance/maintenance-task.js +4 -2
- package/dist/maintenance/maintenance-task.js.map +1 -1
- package/dist/plugin-services/make-backend-plugin-service.d.ts +1 -1
- package/dist/plugin-services/make-backend-plugin-service.js +3 -3
- package/dist/plugin-services/make-backend-plugin-service.js.map +1 -1
- package/dist/public-api/password-reset/password-reset.service.js.map +1 -1
- package/dist/rendered-site/feed/feed-generator.js +1 -1
- package/dist/rendered-site/feed/feed-generator.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/head-tags-filter.d.ts +1 -1
- package/dist/rendered-site/liquidjs-filters/open-graph-filter.d.ts +1 -1
- package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js +1 -1
- package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/get-docs-tag.js +1 -1
- package/dist/rendered-site/liquidjs-tags/get-docs-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js +1 -1
- package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js.map +1 -1
- package/dist/rendered-site/page-route/make-url.js +1 -1
- package/dist/rendered-site/page-route/make-url.js.map +1 -1
- package/dist/rendering-payload/doc-values.queries.js +1 -1
- package/dist/rendering-payload/doc-values.queries.js.map +1 -1
- package/dist/rendering-payload/excerpt.queries.js +1 -1
- package/dist/rendering-payload/excerpt.queries.js.map +1 -1
- package/dist/rendering-payload/get-siblings.queries.js +1 -1
- package/dist/rendering-payload/get-siblings.queries.js.map +1 -1
- package/dist/rendering-payload/parts.queries.js +1 -1
- package/dist/rendering-payload/parts.queries.js.map +1 -1
- package/dist/rendering-payload/translations.queries.js +1 -1
- package/dist/rendering-payload/translations.queries.js.map +1 -1
- package/dist/running-server/running-server-connector.d.ts +2 -0
- package/dist/{helpers/running-instance-connector.js → running-server/running-server-connector.js} +17 -5
- package/dist/running-server/running-server-connector.js.map +1 -0
- package/dist/running-server/single-site-generator.d.ts +2 -0
- package/dist/running-server/single-site-generator.js +23 -0
- package/dist/running-server/single-site-generator.js.map +1 -0
- package/dist/site-context/core-plugin/core-hooks.d.ts +1 -1
- package/dist/site-context/core-plugin/create-core-plugin.d.ts +1 -1
- package/dist/site-context/core-plugin/create-core-plugin.js.map +1 -1
- package/dist/site-context/load-site-context.d.ts +2 -2
- package/dist/site-context/load-site-context.js +54 -3
- package/dist/site-context/load-site-context.js.map +1 -1
- package/dist/site-context/site-context.d.ts +7 -7
- package/dist/site-context/site-context.js +17 -7
- package/dist/site-context/site-context.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +26 -3
- package/dist/site-schema-migration/migrations/site-schema-migration-6-to-7.d.ts +9 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-6-to-7.js +61 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-6-to-7.js.map +1 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-7-to-8.d.ts +9 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-7-to-8.js +54 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-7-to-8.js.map +1 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-8-to-9.d.ts +9 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-8-to-9.js +44 -0
- package/dist/site-schema-migration/migrations/site-schema-migration-8-to-9.js.map +1 -0
- package/dist/site-schema-migration/site-schema-migration.d.ts +3 -0
- package/dist/site-schema-migration/site-schema-migration.js +43 -0
- package/dist/site-schema-migration/site-schema-migration.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -9
- package/schema.graphql +21 -0
- package/site-schema-lib/common-schema.json +40 -0
- package/site-schema-lib/common-schema.l10n.de.json +10 -0
- package/site-schema-lib/common-schema.l10n.en.json +10 -0
- package/site-schema-lib/common-schema.l10n.es.json +10 -0
- package/site-schema-lib/common-schema.l10n.fr.json +10 -0
- package/site-schema-lib/common-schema.l10n.it.json +10 -0
- package/site-schema-lib/common-schema.l10n.pt.json +10 -0
- package/site-schema-lib/field-lib.site-schema.json +84 -0
- package/site-schema-lib/field-lib.site-schema.l10n.de.json +38 -0
- package/site-schema-lib/field-lib.site-schema.l10n.en.json +38 -0
- package/site-schema-lib/field-lib.site-schema.l10n.es.json +38 -0
- package/site-schema-lib/field-lib.site-schema.l10n.fr.json +41 -0
- package/site-schema-lib/field-lib.site-schema.l10n.it.json +38 -0
- package/site-schema-lib/field-lib.site-schema.l10n.pt.json +38 -0
- package/dist/helpers/running-instance-connector.d.ts +0 -2
- package/dist/helpers/running-instance-connector.js.map +0 -1
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { jsonTypeValidator } from "@paroicms/public-server-lib";
|
|
2
|
+
import { readdir, readFile } from "node:fs/promises";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { appendToSchemaLocales, createEmptyLocalizedTranslations, } from "./read-locales.js";
|
|
5
|
+
import { checkSiteSchemaFormatVersion } from "./site-schema-helpers.js";
|
|
6
|
+
const siteSchemaSuffix = ".site-schema.json";
|
|
7
|
+
export async function readSiteSchemaLibrary(dir) {
|
|
8
|
+
const result = [];
|
|
9
|
+
const filenames = await readdir(dir);
|
|
10
|
+
for (const filename of filenames) {
|
|
11
|
+
if (!filename.endsWith(siteSchemaSuffix))
|
|
12
|
+
continue;
|
|
13
|
+
const moduleName = filename.substring(0, filename.length - siteSchemaSuffix.length);
|
|
14
|
+
const module = await readJtSiteSchema({ filename, dir });
|
|
15
|
+
const l10n = createEmptyLocalizedTranslations(module.languages);
|
|
16
|
+
await appendToSchemaLocales({
|
|
17
|
+
dir,
|
|
18
|
+
baseFileName: `${moduleName}.site-schema.l10n`,
|
|
19
|
+
jsonTOnly: "JtSiteSchemaTranslations",
|
|
20
|
+
}, l10n);
|
|
21
|
+
result.push({
|
|
22
|
+
schemaName: moduleName,
|
|
23
|
+
module,
|
|
24
|
+
l10n,
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
return result;
|
|
28
|
+
}
|
|
29
|
+
async function readJtSiteSchema({ dir, filename }) {
|
|
30
|
+
const file = join(dir, filename);
|
|
31
|
+
const json = await readFile(file, {
|
|
32
|
+
encoding: "utf8",
|
|
33
|
+
});
|
|
34
|
+
const data = JSON.parse(json);
|
|
35
|
+
checkSiteSchemaFormatVersion(data.ParoiCMSSiteSchemaFormatVersion, { file });
|
|
36
|
+
const result = jsonTypeValidator.validate("JtSiteSchema", data);
|
|
37
|
+
if (!result.valid) {
|
|
38
|
+
throw new Error(`invalid site-schema module file '${filename}': ${result.error ?? "(missing message)"}`);
|
|
39
|
+
}
|
|
40
|
+
return data;
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=site-schema-lib-reader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"site-schema-lib-reader.js","sourceRoot":"","sources":["../../../src/connector/site-schema/site-schema-lib-reader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,qBAAqB,EACrB,gCAAgC,GAEjC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAExE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAQ7C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAW;IACrD,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAAE,SAAS;QAEnD,MAAM,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACpF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;QAEzD,MAAM,IAAI,GAAG,gCAAgC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChE,MAAM,qBAAqB,CACzB;YACE,GAAG;YACH,YAAY,EAAE,GAAG,UAAU,mBAAmB;YAC9C,SAAS,EAAE,0BAA0B;SACtC,EACD,IAAI,CACL,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC;YACV,UAAU,EAAE,UAAU;YACtB,MAAM;YACN,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAqC;IAClF,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE;QAChC,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IACH,MAAM,IAAI,GAAiB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,4BAA4B,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACb,oCAAoC,QAAQ,MAAM,MAAM,CAAC,KAAK,IAAI,mBAAmB,EAAE,CACxF,CAAC;IACJ,CAAC;IACD,OAAO,IAAoB,CAAC;AAC9B,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export function parseSorting(val) {
|
|
2
|
+
if (val === "manual")
|
|
3
|
+
return "manual";
|
|
4
|
+
const regularChildrenSorting = [];
|
|
5
|
+
const arr = typeof val === "string" ? val.split(/\s*,\s*/) : val;
|
|
6
|
+
for (const item of arr) {
|
|
7
|
+
const [fieldName, direction] = item.split(/\s+/);
|
|
8
|
+
if ((direction !== "asc" && direction !== "desc") || !/^[a-zA-Z]+$/.test(fieldName)) {
|
|
9
|
+
throw new Error(`invalid child ordering '${item}'`);
|
|
10
|
+
}
|
|
11
|
+
regularChildrenSorting.push([fieldName, direction]);
|
|
12
|
+
}
|
|
13
|
+
return regularChildrenSorting;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=site-schema-public-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"site-schema-public-helpers.js","sourceRoot":"","sources":["../../../src/connector/site-schema/site-schema-public-helpers.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,YAAY,CAAC,GAAc;IACzC,IAAI,GAAG,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAEtC,MAAM,sBAAsB,GAA+B,EAAE,CAAC;IAC9D,MAAM,GAAG,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjE,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACpF,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,GAAG,CAAC,CAAC;QACtD,CAAC;QACD,sBAAsB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,sBAAsB,CAAC;AAChC,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type ThemeConf } from "@paroicms/public-anywhere-lib";
|
|
2
|
+
import type { JtThemeConf } from "@paroicms/public-server-lib";
|
|
3
|
+
export declare function readThemeConfFile(themeDir: string): Promise<ThemeConf>;
|
|
4
|
+
export declare function formatThemeConf(val: JtThemeConf): ThemeConf;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { isResizeRule, messageOf, } from "@paroicms/public-anywhere-lib";
|
|
2
|
+
import { jsonTypeValidator } from "@paroicms/public-server-lib";
|
|
3
|
+
import { readFile } from "node:fs/promises";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
export async function readThemeConfFile(themeDir) {
|
|
6
|
+
const themeFile = join(themeDir, "theme.json");
|
|
7
|
+
try {
|
|
8
|
+
const content = await readFile(themeFile, "utf-8");
|
|
9
|
+
const data = JSON.parse(content);
|
|
10
|
+
const result = jsonTypeValidator.validate("JtThemeConf", data);
|
|
11
|
+
if (!result.valid)
|
|
12
|
+
throw new Error(result.error ?? "(missing message)");
|
|
13
|
+
return formatThemeConf(data);
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
throw new Error(`invalid theme configuration '${themeFile}': ${messageOf(error)} `);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export function formatThemeConf(val) {
|
|
20
|
+
val.fTextImages.forEach(checkResizeRule);
|
|
21
|
+
const pixelRatio = val.pixelRatio ?? 1;
|
|
22
|
+
return {
|
|
23
|
+
fTextImageResizeRules: val.fTextImages,
|
|
24
|
+
pixelRatio,
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
function checkResizeRule(val) {
|
|
28
|
+
if (!isResizeRule(val))
|
|
29
|
+
throw new Error(`invalid image size '${val}'`);
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=theme-conf-reader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"theme-conf-reader.js","sourceRoot":"","sources":["../../../src/connector/theme-conf/theme-conf-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,GAGV,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,QAAgB;IACtD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAE/C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,mBAAmB,CAAC,CAAC;QACxE,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,SAAS,MAAM,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtF,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAgB;IAC9C,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,IAAI,CAAC,CAAC;IAEvC,OAAO;QACL,qBAAqB,EAAE,GAAG,CAAC,WAA2B;QACtD,UAAU;KACX,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,CAAC;AACzE,CAAC"}
|
package/dist/context.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { type CommonSchemaLibrary } from "@paroicms/connector";
|
|
2
1
|
import { type RegisteredSite, type SimpleTranslator } from "@paroicms/public-server-lib";
|
|
2
|
+
import type { CommonSchemaLibrary } from "./connector/site-schema/common-schema-types.js";
|
|
3
3
|
export declare const dbAnyLanguage = ".";
|
|
4
4
|
export declare const adminUiOwnerHandle = "adminUi";
|
|
5
5
|
export declare const packageDir: string;
|
|
6
6
|
export declare const cmsVersion: string, appName: string;
|
|
7
7
|
export declare let appVersion: string | undefined;
|
|
8
8
|
export declare function setAppVersion(version: string): void;
|
|
9
|
-
export declare const appConf: import("
|
|
9
|
+
export declare const appConf: import("./connector/app-conf/app-conf.types.js").AppConf;
|
|
10
10
|
export declare const platformLogger: import("@paroicms/internal-server-lib").PlatformLog;
|
|
11
11
|
export declare let registeredSites: Map<string, RegisteredSite>;
|
|
12
|
-
export declare const httpRedirections: Map<string, import("@paroicms/
|
|
12
|
+
export declare const httpRedirections: Map<string, import("@paroicms/public-server-lib").JtHttpRedirection>;
|
|
13
13
|
export declare function initCommonSchemaLib(val: CommonSchemaLibrary): void;
|
|
14
14
|
export declare function getCommonSchemaLib(): CommonSchemaLibrary;
|
|
15
15
|
export declare const platformDataDir: string;
|
package/dist/context.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { readAppConfSync } from "@paroicms/connector";
|
|
2
1
|
import { createPlatformLog, makeUrl, readOrCreateJwtSecretSync, } from "@paroicms/internal-server-lib";
|
|
3
2
|
import { coreLanguages } from "@paroicms/public-anywhere-lib";
|
|
4
|
-
import { loadSimpleTranslatorFromDirectory, } from "@paroicms/public-server-lib";
|
|
3
|
+
import { jsonTypeValidator, loadSimpleTranslatorFromDirectory, } from "@paroicms/public-server-lib";
|
|
5
4
|
import { esmDirName, extractPackageNameAndVersionSync } from "@paroicms/script-lib";
|
|
6
5
|
import { existsSync, renameSync, unlinkSync } from "node:fs";
|
|
7
6
|
import { dirname, join } from "node:path";
|
|
7
|
+
import { readAppConfSync } from "./connector/app-conf/app-conf-reader.js";
|
|
8
8
|
export const dbAnyLanguage = ".";
|
|
9
9
|
export const adminUiOwnerHandle = "adminUi";
|
|
10
10
|
export const packageDir = dirname(esmDirName(import.meta.url));
|
|
@@ -13,7 +13,7 @@ export let appVersion;
|
|
|
13
13
|
export function setAppVersion(version) {
|
|
14
14
|
appVersion = version;
|
|
15
15
|
}
|
|
16
|
-
export const appConf = readAppConfSync();
|
|
16
|
+
export const appConf = readAppConfSync(jsonTypeValidator);
|
|
17
17
|
export const platformLogger = createPlatformLog({
|
|
18
18
|
level: appConf.logLevel,
|
|
19
19
|
file: appConf.logFile,
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { PaHttpContext } from "@paroicms/public-server-lib";
|
|
2
2
|
import type { Request } from "express";
|
|
3
|
-
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
3
|
+
import type { MigrationSiteContext, SiteContext } from "../site-context/site-context.types.js";
|
|
4
4
|
declare module "express" {
|
|
5
5
|
interface Request {
|
|
6
|
-
paSiteContext?: SiteContext;
|
|
6
|
+
paSiteContext?: SiteContext | MigrationSiteContext;
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
|
-
export declare function getPaSiteContext(req: Request): SiteContext;
|
|
9
|
+
export declare function getPaSiteContext(req: Request): SiteContext | MigrationSiteContext;
|
|
10
10
|
export declare function getRouteParameter(params: Record<string, string | undefined>, parameterName: string): string;
|
|
11
11
|
export declare function getRouteParameter(params: Record<string, string | undefined>, parameterName: string, options: {
|
|
12
12
|
optional: true;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { HttpRedirectionConf } from "@paroicms/connector";
|
|
2
1
|
import type { Request } from "express";
|
|
2
|
+
import type { HttpRedirectionConf } from "../connector/app-conf/app-conf.types.js";
|
|
3
3
|
export declare function createRedirectUrl(req: Request, entry: HttpRedirectionConf): string;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { messageOf } from "@paroicms/public-anywhere-lib";
|
|
1
2
|
import { type } from "arktype";
|
|
2
3
|
import { executeHardenedBackup } from "../admin-backend/backup/hardened-backup.service.js";
|
|
4
|
+
import { siteReadyGuard } from "../graphql/graphql.types.js";
|
|
3
5
|
import { getActiveSiteContext, getSiteContext, unloadSiteContext, } from "../site-context/site-context.js";
|
|
4
6
|
const TestingRequestAT = type({
|
|
5
7
|
command: '"loadSiteContext"|"unloadSiteContext"|"backupSite"',
|
|
@@ -20,6 +22,7 @@ export async function localTestingRoute(req, res) {
|
|
|
20
22
|
switch (body.command) {
|
|
21
23
|
case "loadSiteContext": {
|
|
22
24
|
const siteContext = await getSiteContext(body.fqdn);
|
|
25
|
+
siteReadyGuard(siteContext);
|
|
23
26
|
res.json({
|
|
24
27
|
success: true,
|
|
25
28
|
message: `Site context loaded for ${body.fqdn}`,
|
|
@@ -55,6 +58,7 @@ export async function localTestingRoute(req, res) {
|
|
|
55
58
|
});
|
|
56
59
|
return;
|
|
57
60
|
}
|
|
61
|
+
siteReadyGuard(siteContext);
|
|
58
62
|
const startTime = Date.now();
|
|
59
63
|
const result = await executeHardenedBackup(siteContext);
|
|
60
64
|
const duration = Date.now() - startTime;
|
|
@@ -79,7 +83,7 @@ export async function localTestingRoute(req, res) {
|
|
|
79
83
|
}
|
|
80
84
|
}
|
|
81
85
|
catch (error) {
|
|
82
|
-
const errorMessage = error
|
|
86
|
+
const errorMessage = messageOf(error);
|
|
83
87
|
res.status(500).json({
|
|
84
88
|
success: false,
|
|
85
89
|
error: errorMessage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-testing-route.js","sourceRoot":"","sources":["../../src/express/local-testing-route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AAEzC,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,oDAAoD;IAC7D,IAAI,EAAE,QAAQ;IACd,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAKH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,GAAa;IACjE,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,UAAU,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;YACtC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,wBAAwB;gBAC/B,OAAO,EAAE,UAAU,CAAC,OAAO;aAC5B,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,UAAU,CAAC;QAExB,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpD,GAAG,CAAC,IAAI,CAAC;oBACP,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,2BAA2B,IAAI,CAAC,IAAI,EAAE;oBAC/C,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC,KAAK;oBACvC,eAAe,EAAE,WAAW,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI;iBACjE,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YAED,KAAK,mBAAmB,CAAC,CAAC,CAAC;gBACzB,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5E,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,GAAG,CAAC,IAAI,CAAC;wBACP,OAAO,EAAE,IAAI;wBACb,OAAO,EAAE,oBAAoB,IAAI,CAAC,IAAI,iBAAiB;wBACvD,SAAS,EAAE,KAAK;qBACjB,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;gBAED,MAAM,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBACrC,GAAG,CAAC,IAAI,CAAC;oBACP,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,6BAA6B,IAAI,CAAC,IAAI,EAAE;oBACjD,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YAED,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5E,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,oBAAoB,IAAI,CAAC,IAAI,qDAAqD;qBAC1F,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;
|
|
1
|
+
{"version":3,"file":"local-testing-route.js","sourceRoot":"","sources":["../../src/express/local-testing-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
import type { PaHttpContext } from "@paroicms/public-server-lib";
|
|
2
2
|
import type { NextFunction, Request, Response } from "express";
|
|
3
|
-
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
3
|
+
import type { MigrationSiteContext, SiteContext } from "../site-context/site-context.types.js";
|
|
4
4
|
import type { ExpressMiddleware } from "./express-utils.js";
|
|
5
5
|
export declare function loadPaSiteContextMiddleware(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
6
6
|
export type PaRouteController = (siteContext: SiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>) => Promise<unknown>;
|
|
7
|
+
export type PaMigrationCapableRouteController = (siteContext: SiteContext | MigrationSiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>) => Promise<unknown>;
|
|
7
8
|
export declare function wrapRouteController(handler: PaRouteController): (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
9
|
+
export declare function wrapRouteController(handler: PaMigrationCapableRouteController, options: {
|
|
10
|
+
allowMigration: true;
|
|
11
|
+
}): (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
8
12
|
export type PaReqHandler = (siteContext: SiteContext, httpContext: PaHttpContext) => Promise<boolean>;
|
|
13
|
+
export type PaMigrationCapableReqHandler = (siteContext: SiteContext | MigrationSiteContext, httpContext: PaHttpContext) => Promise<boolean>;
|
|
9
14
|
export declare function reqHandlerToExpressMiddleware(handler: PaReqHandler): ExpressMiddleware;
|
|
15
|
+
export declare function reqHandlerToExpressMiddleware(handler: PaMigrationCapableReqHandler, options: {
|
|
16
|
+
allowMigration: true;
|
|
17
|
+
}): ExpressMiddleware;
|
|
10
18
|
export declare function mergeReqHandlers(handlers: PaReqHandler[]): PaReqHandler;
|
|
11
19
|
export declare function wrapExpressRoute(handler: (req: Request, res: Response) => Promise<unknown>): (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
@@ -5,6 +5,13 @@ import { generateRequestId, queueRequest, trackRequest, untrackRequest, } from "
|
|
|
5
5
|
import { getSiteContext } from "../site-context/site-context.js";
|
|
6
6
|
import { getPaSiteContext, serve404SimpleHtml, serve500Html, serve503ServiceUnavailable, } from "./http-helpers.js";
|
|
7
7
|
import { toPaHttpContext } from "./pa-http-context.js";
|
|
8
|
+
function isMigrationModeAllowedPath(path) {
|
|
9
|
+
if (path === "/api/v1/login")
|
|
10
|
+
return true;
|
|
11
|
+
if (path === "/adm" || path.startsWith("/adm/"))
|
|
12
|
+
return true;
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
8
15
|
export async function loadPaSiteContextMiddleware(req, res, next) {
|
|
9
16
|
try {
|
|
10
17
|
const siteContext = await getSiteContext(req.hostname, { returnsUndef: true });
|
|
@@ -14,6 +21,14 @@ export async function loadPaSiteContextMiddleware(req, res, next) {
|
|
|
14
21
|
return;
|
|
15
22
|
}
|
|
16
23
|
req.paSiteContext = siteContext;
|
|
24
|
+
if (siteContext.status === "migration") {
|
|
25
|
+
if (isMigrationModeAllowedPath(req.path)) {
|
|
26
|
+
next();
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
serve503ServiceUnavailable(toPaHttpContext(req, res), "Site requires migration");
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
17
32
|
const requestState = siteContext.requestTracker.state;
|
|
18
33
|
if (requestState === "gracefulShutdown") {
|
|
19
34
|
serve503ServiceUnavailable(toPaHttpContext(req, res), "Site shutting down");
|
|
@@ -44,10 +59,14 @@ export async function loadPaSiteContextMiddleware(req, res, next) {
|
|
|
44
59
|
handleErrorSafely(req, res, error, undefined);
|
|
45
60
|
}
|
|
46
61
|
}
|
|
47
|
-
export function wrapRouteController(handler) {
|
|
62
|
+
export function wrapRouteController(handler, options = {}) {
|
|
48
63
|
return async (req, res) => {
|
|
49
64
|
const httpContext = toPaHttpContext(req, res);
|
|
50
65
|
const siteContext = getPaSiteContext(req);
|
|
66
|
+
if (siteContext.status === "migration" && !options.allowMigration) {
|
|
67
|
+
serve503ServiceUnavailable(httpContext, "Site not ready");
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
51
70
|
try {
|
|
52
71
|
let result = await handler(siteContext, httpContext, req.params);
|
|
53
72
|
if (result instanceof Stream) {
|
|
@@ -76,10 +95,14 @@ export function wrapRouteController(handler) {
|
|
|
76
95
|
}
|
|
77
96
|
};
|
|
78
97
|
}
|
|
79
|
-
export function reqHandlerToExpressMiddleware(handler) {
|
|
98
|
+
export function reqHandlerToExpressMiddleware(handler, options = {}) {
|
|
80
99
|
return async (req, res, next) => {
|
|
81
100
|
const httpContext = toPaHttpContext(req, res);
|
|
82
101
|
const siteContext = getPaSiteContext(req);
|
|
102
|
+
if (siteContext.status === "migration" && !options.allowMigration) {
|
|
103
|
+
next();
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
83
106
|
try {
|
|
84
107
|
const done = await handler(siteContext, httpContext);
|
|
85
108
|
if (!done) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,cAAc,GACf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAC/F,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/E,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,cAAc,CAAC,KAAK,CAClB,yBAAyB,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAC5E,CAAC;YACF,kBAAkB,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC;QAEhC,MAAM,YAAY,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC;QACtD,IAAI,YAAY,KAAK,kBAAkB,EAAE,CAAC;YACxC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAC5E,OAAO;QACT,CAAC;QAED,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;YAClC,IAAI,CAAC;gBACH,MAAM,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;YAAC,MAAM,CAAC;gBACP,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;gBACvF,OAAO;YACT,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-file.js","sourceRoot":"","sources":["../../src/express/serve-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAEtD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AASjC,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,EAAE,GAAG,EAAE,GAAG,EAAiB,EAC3B,IAAY,EACZ,UAA2B,EAAE;IAE7B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhD,IAAI,CAAC;QAEH,IAAI,QAAe,CAAC;QACpB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,GAAG,CAAC;YACnD,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,KAAK,EAAE,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"serve-file.js","sourceRoot":"","sources":["../../src/express/serve-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,18 +63,15 @@ export function createMinimalSiteMiddleware() {
|
|
|
63
63
|
router.post("/adm/backend/upload", upload.single("file"), wrapRouteController(uploadMediaController));
|
|
64
64
|
router.get("/adm/backend/backup/:backupName", wrapRouteController(downloadBackupController));
|
|
65
65
|
router.get("/api/v1/healthcheck", wrapRouteController(healthCheckController));
|
|
66
|
-
router.post("/api/v1/login", wrapRouteController(loginController));
|
|
66
|
+
router.post("/api/v1/login", wrapRouteController(loginController, { allowMigration: true }));
|
|
67
67
|
router.post("/api/v1/set-account-password", wrapRouteController(setAccountPasswordController));
|
|
68
68
|
router.post("/api/v1/check-password-reset", wrapRouteController(checkPasswordResetController));
|
|
69
69
|
router.post("/api/v1/protected-access", wrapRouteController(protectedAccessController));
|
|
70
70
|
router.get("/robots.txt", wrapRouteController(robotsTxtController));
|
|
71
71
|
router.get("/favicon.ico", wrapRouteController(favicon16x16Controller));
|
|
72
72
|
return mergeExpressMiddlewares([
|
|
73
|
-
reqHandlerToExpressMiddleware(mergeReqHandlers([
|
|
74
|
-
|
|
75
|
-
adminUiPluginsReqHandler,
|
|
76
|
-
adminUiFilesReqHandler,
|
|
77
|
-
])),
|
|
73
|
+
reqHandlerToExpressMiddleware(mergeReqHandlers([unprotectedStaticFilesReqHandler, adminUiPluginsReqHandler])),
|
|
74
|
+
reqHandlerToExpressMiddleware(adminUiFilesReqHandler, { allowMigration: true }),
|
|
78
75
|
router,
|
|
79
76
|
]);
|
|
80
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { PaHttpContext } from "@paroicms/public-server-lib";
|
|
2
|
-
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
2
|
+
import type { MigrationSiteContext, SiteContext } from "../site-context/site-context.types.js";
|
|
3
3
|
export declare function renderedPageAssetsReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;
|
|
4
|
-
export declare function adminUiFilesReqHandler(
|
|
4
|
+
export declare function adminUiFilesReqHandler(_siteContext: SiteContext | MigrationSiteContext, httpContext: PaHttpContext): Promise<boolean>;
|
|
5
5
|
export declare function adminUiPluginsReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { distDir as adminUiDistDir } from "@paroicms/admin-ui";
|
|
2
|
-
import { getPluginAssetsUrl } from "@paroicms/connector";
|
|
3
2
|
import { pathExists } from "@paroicms/internal-server-lib";
|
|
4
3
|
import { join } from "node:path";
|
|
5
4
|
import { getAssetsBaseUrl } from "../common/data-format.js";
|
|
6
5
|
import { render404Html } from "../common/serve-text-or.js";
|
|
6
|
+
import { getPluginAssetsUrl } from "../connector/plugin-loader/plugin-public-helpers.js";
|
|
7
7
|
import { appConf } from "../context.js";
|
|
8
8
|
import { HTTP_MAX_AGE } from "./http-constants.js";
|
|
9
9
|
import { serve404SimpleHtml, serve500Html } from "./http-helpers.js";
|
|
@@ -47,7 +47,7 @@ export async function renderedPageAssetsReqHandler(siteContext, httpContext) {
|
|
|
47
47
|
});
|
|
48
48
|
return true;
|
|
49
49
|
}
|
|
50
|
-
export async function adminUiFilesReqHandler(
|
|
50
|
+
export async function adminUiFilesReqHandler(_siteContext, httpContext) {
|
|
51
51
|
const { req } = httpContext;
|
|
52
52
|
let path = req.path;
|
|
53
53
|
if (!["GET", "HEAD"].includes(req.method) ||
|
|
@@ -63,7 +63,7 @@ export async function adminUiFilesReqHandler(siteContext, httpContext) {
|
|
|
63
63
|
}
|
|
64
64
|
await serveFile(httpContext, path, {
|
|
65
65
|
root: adminUiDistDir,
|
|
66
|
-
on404: () =>
|
|
66
|
+
on404: () => serve404SimpleHtml(httpContext),
|
|
67
67
|
});
|
|
68
68
|
return true;
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-files.req-handler.js","sourceRoot":"","sources":["../../src/express/static-files.req-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"static-files.req-handler.js","sourceRoot":"","sources":["../../src/express/static-files.req-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { extendLNodeWrapWithFieldValuesResolvers, extendPartWithFieldValuesResol
|
|
|
8
8
|
import { lNodeWrapResolvers } from "../admin-backend/lnode/lnode-wrap.resolver.js";
|
|
9
9
|
import { extendDocumentWithMediaResolver } from "../admin-backend/media/media.resolver.extend.js";
|
|
10
10
|
import { mediaResolvers } from "../admin-backend/media/media.resolver.js";
|
|
11
|
+
import { migrationResolvers } from "../admin-backend/migration/migration.resolver.js";
|
|
11
12
|
import { extendLNodeWrapWithNodeResolver } from "../admin-backend/node/node.resolver.extend.js";
|
|
12
13
|
import { nodeResolvers } from "../admin-backend/node/node.resolver.js";
|
|
13
14
|
import { extendLNodeWrapWithPartResolvers } from "../admin-backend/part/part.resolver.extend.js";
|
|
@@ -21,6 +22,7 @@ export function federateResolvers() {
|
|
|
21
22
|
return [
|
|
22
23
|
accountResolvers,
|
|
23
24
|
backupResolvers,
|
|
25
|
+
migrationResolvers,
|
|
24
26
|
documentResolvers,
|
|
25
27
|
extendWithDocumentResolver,
|
|
26
28
|
fieldResolvers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apollo-server-init.js","sourceRoot":"","sources":["../../src/graphql/apollo-server-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EACL,uCAAuC,EACvC,iCAAiC,EACjC,cAAc,GACf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,gCAAgC,EAAE,MAAM,+CAA+C,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAIhF,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;AAEjF,MAAM,UAAU,iBAAiB;IAC/B,OAAO;QACL,gBAAgB;QAChB,eAAe;QACf,iBAAiB;QACjB,0BAA0B;QAC1B,cAAc;QACd,uCAAuC;QACvC,iCAAiC;QACjC,aAAa;QACb,+BAA+B;QAC/B,cAAc;QACd,aAAa;QACb,gCAAgC;QAChC,kBAAkB;QAClB,sBAAsB;QACtB,oBAAoB;QACpB,mBAAmB;QACnB,+BAA+B;KAChC,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"apollo-server-init.js","sourceRoot":"","sources":["../../src/graphql/apollo-server-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EACL,uCAAuC,EACvC,iCAAiC,EACjC,cAAc,GACf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,gCAAgC,EAAE,MAAM,+CAA+C,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAIhF,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;AAEjF,MAAM,UAAU,iBAAiB;IAC/B,OAAO;QACL,gBAAgB;QAChB,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QACjB,0BAA0B;QAC1B,cAAc;QACd,uCAAuC;QACvC,iCAAiC;QACjC,aAAa;QACb,+BAA+B;QAC/B,cAAc;QACd,aAAa;QACb,gCAAgC;QAChC,kBAAkB;QAClB,sBAAsB;QACtB,oBAAoB;QACpB,mBAAmB;QACnB,+BAA+B;KAChC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
1
|
+
import { type PaHttpContext } from "@paroicms/public-server-lib";
|
|
2
|
+
import type { MigrationSiteContext, SiteContext } from "../site-context/site-context.types.js";
|
|
3
3
|
export interface GraphqlContext {
|
|
4
|
+
httpContext: PaHttpContext;
|
|
5
|
+
siteContext: SiteContext | MigrationSiteContext;
|
|
6
|
+
}
|
|
7
|
+
export interface ReadyGraphqlContext {
|
|
4
8
|
httpContext: PaHttpContext;
|
|
5
9
|
siteContext: SiteContext;
|
|
6
10
|
}
|
|
11
|
+
export declare function siteReadyGuard(siteContext: SiteContext | MigrationSiteContext): asserts siteContext is SiteContext;
|
|
@@ -1,2 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
import { ApiError } from "@paroicms/public-server-lib";
|
|
2
|
+
export function siteReadyGuard(siteContext) {
|
|
3
|
+
if (siteContext.status !== "ready") {
|
|
4
|
+
throw new ApiError(`Site "${siteContext.fqdn}" is not ready`, 503);
|
|
5
|
+
}
|
|
6
|
+
}
|
|
2
7
|
//# sourceMappingURL=graphql.types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql.types.js","sourceRoot":"","sources":["../../src/graphql/graphql.types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"graphql.types.js","sourceRoot":"","sources":["../../src/graphql/graphql.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAsB,MAAM,6BAA6B,CAAC;AAa3E,MAAM,UAAU,cAAc,CAC5B,WAA+C;IAE/C,IAAI,WAAW,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,IAAI,QAAQ,CAAC,SAAS,WAAW,CAAC,IAAI,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACrE,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AccountRow } from "
|
|
1
|
+
import type { AccountRow } from "../connector/row-types.js";
|
|
2
2
|
export declare const devAccountId = "dev:0";
|
|
3
3
|
export declare function isDevAccountId(id: string): boolean;
|
|
4
4
|
export interface ParsedPlatformAdminAccountId {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"special-account.helpers.js","sourceRoot":"","sources":["../../src/helpers/special-account.helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"special-account.helpers.js","sourceRoot":"","sources":["../../src/helpers/special-account.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC;AAEpC,MAAM,UAAU,cAAc,CAAC,EAAU;IACvC,OAAO,EAAE,KAAK,YAAY,CAAC;AAC7B,CAAC;AAMD,MAAM,UAAU,2BAA2B,CAAC,EAAU;IACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO;IACrC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,EAAU;IACtC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,CAAC,UAAU,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;QACvC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,EAAE,EAAE,YAAY;QAChB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,OAAO,EAAE,KAAK;KACf,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,EAAE,KAAK,EAAgC;IAC7E,MAAM,OAAO,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,EAAE,EAAE,SAAS,KAAK,EAAE;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,eAAe;KACzB,CAAC;AACJ,CAAC"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { createRegisteredSitesFromSingle, loadRegisteredSitesFromPacks, readCommonSchemaLibrary, } from "@paroicms/connector";
|
|
2
1
|
import { eachDay, makeUrl, startCronLike } from "@paroicms/internal-server-lib";
|
|
3
2
|
import { setupImageProcessor } from "@paroicms/server-image-cache-engine";
|
|
4
3
|
import compression from "compression";
|
|
5
4
|
import cookieParser from "cookie-parser";
|
|
6
5
|
import express from "express";
|
|
7
6
|
import rateLimit from "express-rate-limit";
|
|
7
|
+
import { createRegisteredSitesFromSingle, loadRegisteredSitesFromPacks, } from "./connector/site-conf/site-conf.js";
|
|
8
|
+
import { readCommonSchemaLibrary } from "./connector/site-schema/common-schema-reader.js";
|
|
8
9
|
import { appConf, cmsVersion, initCommonSchemaLib, initializeContext, platformAuthUrl, platformLogger, registeredSites, setAppVersion, } from "./context.js";
|
|
9
10
|
import { httpRedirectionMiddleware } from "./express/http-redirection-middleware.js";
|
|
10
11
|
import { loadPaSiteContextMiddleware, reqHandlerToExpressMiddleware, } from "./express/route-handler-wrapper.js";
|