@paroicms/server 1.89.3 → 1.91.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -6
- package/dist/admin-backend/account/account.formatters.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/account/account.queries.d.ts +1 -13
- package/dist/{bo-backend → admin-backend}/account/account.queries.js +93 -54
- package/dist/admin-backend/account/account.queries.js.map +1 -0
- package/dist/admin-backend/account/account.resolver.js.map +1 -0
- package/dist/admin-backend/auth/auth.helper.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/auth/auth.service.js +12 -9
- package/dist/admin-backend/auth/auth.service.js.map +1 -0
- package/dist/admin-backend/auth/auth.types.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/backup/backup.controller.js +7 -2
- package/dist/admin-backend/backup/backup.controller.js.map +1 -0
- package/dist/admin-backend/backup/backup.helper.js.map +1 -0
- package/dist/admin-backend/backup/backup.resolver.js.map +1 -0
- package/dist/admin-backend/document/document.helper.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/document/document.resolver.extend.js +2 -2
- package/dist/admin-backend/document/document.resolver.extend.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/document/document.resolver.js +7 -8
- package/dist/admin-backend/document/document.resolver.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/document/load-documents.queries.js +57 -20
- package/dist/admin-backend/document/load-documents.queries.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/document/save-documents.queries.js +19 -5
- package/dist/admin-backend/document/save-documents.queries.js.map +1 -0
- package/dist/admin-backend/fields/_fields.helpers.js.map +1 -0
- package/dist/admin-backend/fields/fields.resolver.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/fields/labeling.queries.js +25 -9
- package/dist/admin-backend/fields/labeling.queries.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/fields/load-fields-of.queries.js +8 -2
- package/dist/admin-backend/fields/load-fields-of.queries.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/fields/load-fields.queries.js +25 -9
- package/dist/admin-backend/fields/load-fields.queries.js.map +1 -0
- package/dist/admin-backend/fields/preprocess-fields.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/fields/save-fields.queries.js +20 -13
- package/dist/admin-backend/fields/save-fields.queries.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/login/login.controller.js +18 -8
- package/dist/admin-backend/login/login.controller.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/media/add-media-to-node.js +2 -2
- package/dist/admin-backend/media/add-media-to-node.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/media/media-upload.controller.d.ts +2 -2
- package/dist/{bo-backend → admin-backend}/media/media-upload.controller.js +18 -7
- package/dist/admin-backend/media/media-upload.controller.js.map +1 -0
- package/dist/admin-backend/media/media.resolver.extend.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/media/media.resolver.js +3 -3
- package/dist/admin-backend/media/media.resolver.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/node/node.queries.js +65 -14
- package/dist/admin-backend/node/node.queries.js.map +1 -0
- package/dist/admin-backend/node/node.resolver.extend.js.map +1 -0
- package/dist/admin-backend/node/node.resolver.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/node/ordered-node.queries.js +10 -5
- package/dist/admin-backend/node/ordered-node.queries.js.map +1 -0
- package/dist/admin-backend/nodel/nodel-wrap.formatters.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/nodel/nodel-wrap.resolver.js +9 -5
- package/dist/admin-backend/nodel/nodel-wrap.resolver.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/nodel/nodel.queries.js +60 -28
- package/dist/admin-backend/nodel/nodel.queries.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/part/part-node.queries.js +12 -4
- package/dist/admin-backend/part/part-node.queries.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/part/part.queries.js +106 -43
- package/dist/admin-backend/part/part.queries.js.map +1 -0
- package/dist/admin-backend/part/part.resolver.extend.js.map +1 -0
- package/dist/admin-backend/part/part.resolver.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/site-constants/site-constants.resolver.js +5 -5
- package/dist/admin-backend/site-constants/site-constants.resolver.js.map +1 -0
- package/dist/{bo-backend → admin-backend}/unprotected/unprotected.resolver.js +3 -3
- package/dist/admin-backend/unprotected/unprotected.resolver.js.map +1 -0
- package/dist/common/data-format.d.ts +20 -11
- package/dist/common/data-format.js +15 -33
- package/dist/common/data-format.js.map +1 -1
- package/dist/common/media-handles.helpers.d.ts +1 -1
- package/dist/common/media-handles.helpers.js +2 -2
- package/dist/common/media-handles.helpers.js.map +1 -1
- package/dist/common/medias/media-lib.d.ts +2 -2
- package/dist/common/medias/media-lib.js +11 -11
- package/dist/common/medias/media-lib.js.map +1 -1
- package/dist/common/text-cache.js +1 -1
- package/dist/common/text-cache.js.map +1 -1
- package/dist/context.d.ts +1 -1
- package/dist/context.js +3 -3
- package/dist/context.js.map +1 -1
- package/dist/express/route-handler-wrapper.js +1 -1
- 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.d.ts +1 -1
- package/dist/express/site-middleware.js +6 -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 +9 -9
- package/dist/express/static-files.req-handler.js.map +1 -1
- package/dist/graphql/apollo-server-init.js +14 -14
- package/dist/graphql/apollo-server-init.js.map +1 -1
- package/dist/graphql/disable-apollo-studio-plugin.js +1 -1
- package/dist/graphql/disable-apollo-studio-plugin.js.map +1 -1
- package/dist/helpers/make-backend-plugin-service.js +2 -3
- package/dist/helpers/make-backend-plugin-service.js.map +1 -1
- package/dist/helpers/running-instance-connector.js +7 -7
- package/dist/helpers/running-instance-connector.js.map +1 -1
- package/dist/index.js +5 -5
- package/dist/index.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-utils.d.ts +1 -1
- package/dist/liquidjs-tools/liquidjs-utils.js +1 -1
- package/dist/liquidjs-tools/liquidjs-utils.js.map +1 -1
- package/dist/oauth/account-auth.service.d.ts +1 -1
- package/dist/oauth/oauth2-client.controller.js +2 -2
- package/dist/oauth/oauth2-client.controller.js.map +1 -1
- package/dist/protected-site/protected-access-token.js +1 -1
- package/dist/protected-site/protected-access-token.js.map +1 -1
- package/dist/public-api/password-reset/password-reset.controller.js +22 -31
- package/dist/public-api/password-reset/password-reset.controller.js.map +1 -1
- package/dist/public-api/password-reset/password-reset.service.js +18 -10
- package/dist/public-api/password-reset/password-reset.service.js.map +1 -1
- package/dist/public-api/public-api-rendering.js +6 -5
- package/dist/public-api/public-api-rendering.js.map +1 -1
- package/dist/public-api/search-text/search-text.queries.d.ts +1 -1
- package/dist/public-api/search-text/search-text.queries.js +6 -2
- package/dist/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/rendered-site/feed/feed-generator.d.ts +0 -12
- package/dist/rendered-site/feed/feed-generator.js +27 -20
- package/dist/rendered-site/feed/feed-generator.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/format-date.js +2 -3
- package/dist/rendered-site/liquidjs-filters/format-date.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/format-number.d.ts +1 -1
- package/dist/rendered-site/liquidjs-filters/format-number.js +9 -5
- package/dist/rendered-site/liquidjs-filters/format-number.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/head-tags-filter.js +10 -5
- package/dist/rendered-site/liquidjs-filters/head-tags-filter.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js +2 -3
- package/dist/rendered-site/liquidjs-filters/inject-menu-items-data.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/make-excerpt.js +6 -2
- package/dist/rendered-site/liquidjs-filters/make-excerpt.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/obfuscate.js +3 -4
- package/dist/rendered-site/liquidjs-filters/obfuscate.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js +4 -3
- package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js.map +1 -1
- package/dist/rendered-site/liquidjs-filters/translate-filter.js +3 -2
- package/dist/rendered-site/liquidjs-filters/translate-filter.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/get-doc-tag.js +13 -8
- package/dist/rendered-site/liquidjs-tags/get-doc-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/get-docs-tag.js +23 -13
- package/dist/rendered-site/liquidjs-tags/get-docs-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js +22 -11
- package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/grouping-media-query.js +1 -1
- package/dist/rendered-site/liquidjs-tags/grouping-media-query.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.d.ts +1 -0
- package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.js +11 -2
- package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/use-image-tag.js +24 -13
- package/dist/rendered-site/liquidjs-tags/use-image-tag.js.map +1 -1
- package/dist/rendered-site/page-route/make-url.d.ts +1 -1
- package/dist/rendered-site/page-route/make-url.js +12 -7
- package/dist/rendered-site/page-route/make-url.js.map +1 -1
- package/dist/rendering-payload/breadcrumb.queries.js +1 -1
- package/dist/rendering-payload/breadcrumb.queries.js.map +1 -1
- package/dist/rendering-payload/create-doc-drop.d.ts +1 -1
- package/dist/rendering-payload/create-doc-drop.js +11 -7
- package/dist/rendering-payload/create-doc-drop.js.map +1 -1
- package/dist/rendering-payload/doc-values.queries.d.ts +2 -3
- package/dist/rendering-payload/doc-values.queries.js +41 -15
- package/dist/rendering-payload/doc-values.queries.js.map +1 -1
- package/dist/rendering-payload/excerpt.queries.js +9 -3
- package/dist/rendering-payload/excerpt.queries.js.map +1 -1
- package/dist/rendering-payload/field-values.js +3 -3
- package/dist/rendering-payload/field-values.js.map +1 -1
- package/dist/rendering-payload/get-siblings.queries.js +19 -7
- package/dist/rendering-payload/get-siblings.queries.js.map +1 -1
- package/dist/rendering-payload/parts.queries.d.ts +1 -1
- package/dist/rendering-payload/parts.queries.js +59 -25
- package/dist/rendering-payload/parts.queries.js.map +1 -1
- package/dist/rendering-payload/translations.queries.js +7 -3
- package/dist/rendering-payload/translations.queries.js.map +1 -1
- package/dist/site-context/{create-site-context.d.ts → load-site-context.d.ts} +1 -1
- package/dist/site-context/{create-site-context.js → load-site-context.js} +4 -4
- package/dist/site-context/load-site-context.js.map +1 -0
- package/dist/site-context/site-context.js +2 -2
- package/dist/site-context/site-context.js.map +1 -1
- package/dist/site-context/{load-site-access.js → site-values-for-site-context.js} +2 -2
- package/dist/site-context/site-values-for-site-context.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -13
- package/schema.graphql +53 -27
- package/dist/bo-backend/account/account.formatters.js.map +0 -1
- package/dist/bo-backend/account/account.queries.js.map +0 -1
- package/dist/bo-backend/account/account.resolver.js.map +0 -1
- package/dist/bo-backend/auth/auth.helper.js.map +0 -1
- package/dist/bo-backend/auth/auth.service.js.map +0 -1
- package/dist/bo-backend/auth/auth.types.js.map +0 -1
- package/dist/bo-backend/backup/backup.controller.js.map +0 -1
- package/dist/bo-backend/backup/backup.helper.js.map +0 -1
- package/dist/bo-backend/backup/backup.resolver.js.map +0 -1
- package/dist/bo-backend/document/document.helper.js.map +0 -1
- package/dist/bo-backend/document/document.resolver.extend.js.map +0 -1
- package/dist/bo-backend/document/document.resolver.js.map +0 -1
- package/dist/bo-backend/document/load-documents.queries.js.map +0 -1
- package/dist/bo-backend/document/save-documents.queries.js.map +0 -1
- package/dist/bo-backend/fields/_fields.helpers.js.map +0 -1
- package/dist/bo-backend/fields/fields.resolver.js.map +0 -1
- package/dist/bo-backend/fields/labeling.queries.js.map +0 -1
- package/dist/bo-backend/fields/load-fields-of.queries.js.map +0 -1
- package/dist/bo-backend/fields/load-fields.queries.js.map +0 -1
- package/dist/bo-backend/fields/preprocess-fields.js.map +0 -1
- package/dist/bo-backend/fields/save-fields.queries.js.map +0 -1
- package/dist/bo-backend/login/login.controller.js.map +0 -1
- package/dist/bo-backend/media/add-media-to-node.js.map +0 -1
- package/dist/bo-backend/media/media-upload.controller.js.map +0 -1
- package/dist/bo-backend/media/media.resolver.extend.js.map +0 -1
- package/dist/bo-backend/media/media.resolver.js.map +0 -1
- package/dist/bo-backend/node/node.queries.js.map +0 -1
- package/dist/bo-backend/node/node.resolver.extend.js.map +0 -1
- package/dist/bo-backend/node/node.resolver.js.map +0 -1
- package/dist/bo-backend/node/ordered-node.queries.js.map +0 -1
- package/dist/bo-backend/nodel/nodel-wrap.formatters.js.map +0 -1
- package/dist/bo-backend/nodel/nodel-wrap.resolver.js.map +0 -1
- package/dist/bo-backend/nodel/nodel.queries.js.map +0 -1
- package/dist/bo-backend/part/part-node.queries.js.map +0 -1
- package/dist/bo-backend/part/part.queries.js.map +0 -1
- package/dist/bo-backend/part/part.resolver.extend.js.map +0 -1
- package/dist/bo-backend/part/part.resolver.js.map +0 -1
- package/dist/bo-backend/site-constants/site-constants.resolver.js.map +0 -1
- package/dist/bo-backend/unprotected/unprotected.resolver.js.map +0 -1
- package/dist/site-context/create-site-context.js.map +0 -1
- package/dist/site-context/load-site-access.js.map +0 -1
- /package/dist/{bo-backend → admin-backend}/account/account.formatters.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/account/account.formatters.js +0 -0
- /package/dist/{bo-backend → admin-backend}/account/account.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/account/account.resolver.js +0 -0
- /package/dist/{bo-backend → admin-backend}/auth/auth.helper.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/auth/auth.helper.js +0 -0
- /package/dist/{bo-backend → admin-backend}/auth/auth.service.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/auth/auth.types.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/auth/auth.types.js +0 -0
- /package/dist/{bo-backend → admin-backend}/backup/backup.controller.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/backup/backup.helper.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/backup/backup.helper.js +0 -0
- /package/dist/{bo-backend → admin-backend}/backup/backup.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/backup/backup.resolver.js +0 -0
- /package/dist/{bo-backend → admin-backend}/document/document.helper.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/document/document.helper.js +0 -0
- /package/dist/{bo-backend → admin-backend}/document/document.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/document/document.resolver.extend.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/document/load-documents.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/document/save-documents.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/_fields.helpers.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/_fields.helpers.js +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/fields.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/fields.resolver.js +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/labeling.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/load-fields-of.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/load-fields.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/preprocess-fields.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/preprocess-fields.js +0 -0
- /package/dist/{bo-backend → admin-backend}/fields/save-fields.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/login/login.controller.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/media/add-media-to-node.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/media/media.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/media/media.resolver.extend.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/media/media.resolver.extend.js +0 -0
- /package/dist/{bo-backend → admin-backend}/node/node.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/node/node.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/node/node.resolver.extend.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/node/node.resolver.extend.js +0 -0
- /package/dist/{bo-backend → admin-backend}/node/node.resolver.js +0 -0
- /package/dist/{bo-backend → admin-backend}/node/ordered-node.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/nodel/nodel-wrap.formatters.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/nodel/nodel-wrap.formatters.js +0 -0
- /package/dist/{bo-backend → admin-backend}/nodel/nodel-wrap.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/nodel/nodel.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/part/part-node.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/part/part.queries.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/part/part.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/part/part.resolver.extend.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/part/part.resolver.extend.js +0 -0
- /package/dist/{bo-backend → admin-backend}/part/part.resolver.js +0 -0
- /package/dist/{bo-backend → admin-backend}/site-constants/site-constants.resolver.d.ts +0 -0
- /package/dist/{bo-backend → admin-backend}/unprotected/unprotected.resolver.d.ts +0 -0
- /package/dist/site-context/{load-site-access.d.ts → site-values-for-site-context.d.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { encodeNodelId } from "@paroicms/public-anywhere-lib";
|
|
2
|
-
import { getBreadcrumb } from "../
|
|
2
|
+
import { getBreadcrumb } from "../admin-backend/nodel/nodel.queries.js";
|
|
3
3
|
import { makeCacheDependencyKey } from "../common/text-cache.js";
|
|
4
4
|
import { getUrlOfDocument } from "../rendered-site/page-route/make-url.js";
|
|
5
5
|
export async function getPublicBreadcrumb(renderingContext, documentId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAG3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Obj } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import type { PaUrlQuery } from "@paroicms/public-server-lib";
|
|
3
3
|
import { type DropInst } from "../liquidjs-tools/liquidjs-drop.js";
|
|
4
4
|
import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
1
|
import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
3
2
|
import { toAbsoluteUrl } from "@paroicms/internal-server-lib";
|
|
4
3
|
import { encodeNodelId, } from "@paroicms/public-anywhere-lib";
|
|
5
|
-
import {
|
|
4
|
+
import { type } from "arktype";
|
|
5
|
+
import { getSiteFieldValue } from "../admin-backend/fields/load-fields.queries.js";
|
|
6
6
|
import { getHandleOfSiteField } from "../common/media-handles.helpers.js";
|
|
7
7
|
import { toMSourceMedia, toTpSourceMedia } from "../common/medias/to-media-values.js";
|
|
8
8
|
import { truncExcerptToWord } from "../helpers/excerpt.helpers.js";
|
|
@@ -20,6 +20,7 @@ import { makeImageAvailable } from "./make-image-available.js";
|
|
|
20
20
|
import { countPartsOf, formatListOfPartValues, keyOfParentPartData, loadPartsOf, } from "./parts.queries.js";
|
|
21
21
|
import { toPublicRoutingDocumentNodelIds } from "./site-payload.js";
|
|
22
22
|
import { loadTranslationsAsDrops } from "./translations.queries.js";
|
|
23
|
+
const StringOrUndefinedAT = type("string|undefined");
|
|
23
24
|
export function createDocPayloadDrop(renderingContext, docValues, options = {}) {
|
|
24
25
|
const { siteContext } = renderingContext;
|
|
25
26
|
const documentType = getDocumentTypeByName(siteContext.siteSchema, docValues.type);
|
|
@@ -174,11 +175,14 @@ async function makeOgValuesPayload(renderingContext, documentType, docValues, op
|
|
|
174
175
|
nodeId: docValues.nodeId,
|
|
175
176
|
documentType,
|
|
176
177
|
}))?.id);
|
|
177
|
-
const siteTitle = await loadOrFromRenderingCache(renderingContext, `siteFields:${docValues.language}:title`, async () =>
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
178
|
+
const siteTitle = await loadOrFromRenderingCache(renderingContext, `siteFields:${docValues.language}:title`, async () => {
|
|
179
|
+
const title = await getSiteFieldValue(siteContext, {
|
|
180
|
+
fieldName: "title",
|
|
181
|
+
language: docValues.language,
|
|
182
|
+
publishedOnly: true,
|
|
183
|
+
});
|
|
184
|
+
return StringOrUndefinedAT.assert(title);
|
|
185
|
+
});
|
|
182
186
|
const description = excerpt
|
|
183
187
|
? truncExcerptToWord(excerpt, 130)
|
|
184
188
|
: docValues.metaDescription
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import type {
|
|
3
|
-
import type { ParsedNodelId, ScDocumentKind, ScSorting } from "@paroicms/public-anywhere-lib";
|
|
1
|
+
import { type Tracker } from "@paroicms/internal-server-lib";
|
|
2
|
+
import type { Obj, ParsedNodelId, ScDocumentKind, ScSorting } from "@paroicms/public-anywhere-lib";
|
|
4
3
|
import type { LabeledBy } from "@paroicms/public-server-lib";
|
|
5
4
|
import type { Knex } from "knex";
|
|
6
5
|
import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { dateVal, nbVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
1
|
import { mainDbSchemaName } from "@paroicms/connector";
|
|
3
2
|
import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
4
|
-
import {
|
|
3
|
+
import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
|
|
4
|
+
import { type } from "arktype";
|
|
5
|
+
import { getTypeNameOf } from "../admin-backend/node/node.queries.js";
|
|
5
6
|
import { applyRegularChildrenSortingOnQuery } from "../common/child-ordering-query.js";
|
|
6
7
|
import { makeCacheDependencyKey } from "../common/text-cache.js";
|
|
7
8
|
export async function getDocItem(siteContext, tracker, documentId, options = {}) {
|
|
@@ -91,11 +92,17 @@ export async function getListOfDocValues(renderingContext, options) {
|
|
|
91
92
|
renderingContext.tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
|
|
92
93
|
return rows.map((row) => formatDocValues(row, { language: parentId.language }));
|
|
93
94
|
}
|
|
95
|
+
const CountDocItemsRowAT = type({
|
|
96
|
+
cnt: "number",
|
|
97
|
+
"+": "reject",
|
|
98
|
+
});
|
|
94
99
|
async function countDocItems(siteContext, tracker, { parentId }) {
|
|
95
100
|
const query = createBaseDocItemsQueryBuilder(siteContext, { parentId });
|
|
96
|
-
const row = await query.count("* as
|
|
101
|
+
const row = await query.count("* as cnt").first();
|
|
97
102
|
tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
|
|
98
|
-
|
|
103
|
+
if (!row)
|
|
104
|
+
return 0;
|
|
105
|
+
return CountDocItemsRowAT.assert(row).cnt;
|
|
99
106
|
}
|
|
100
107
|
export function querySelectDocValues(query, { omitId } = {}) {
|
|
101
108
|
if (!omitId) {
|
|
@@ -118,17 +125,36 @@ function createBaseDocItemsQueryBuilder(siteContext, { parentId }) {
|
|
|
118
125
|
.where("s.ready", 1)
|
|
119
126
|
.whereRaw("l.publishDate <= current_timestamp");
|
|
120
127
|
}
|
|
128
|
+
const DocValuesRowAT = type({
|
|
129
|
+
typeName: "string",
|
|
130
|
+
nodeId: "number|string",
|
|
131
|
+
language: "string",
|
|
132
|
+
relativeId: "string",
|
|
133
|
+
publishDate: "Date|string|number",
|
|
134
|
+
title: "string|null",
|
|
135
|
+
slug: "string|null",
|
|
136
|
+
metaDescription: "string|null",
|
|
137
|
+
metaKeywords: "string|null",
|
|
138
|
+
"+": "reject",
|
|
139
|
+
}).pipe((r) => ({
|
|
140
|
+
type: r.typeName,
|
|
141
|
+
nodeId: String(r.nodeId),
|
|
142
|
+
language: r.language,
|
|
143
|
+
relativeId: r.relativeId,
|
|
144
|
+
publishDate: parseSqliteDateTime(r.publishDate).toISOString(),
|
|
145
|
+
title: r.title ?? undefined,
|
|
146
|
+
slug: r.slug ?? undefined,
|
|
147
|
+
metaDescription: r.metaDescription ?? undefined,
|
|
148
|
+
metaKeywords: r.metaKeywords ?? undefined,
|
|
149
|
+
}));
|
|
121
150
|
export function formatDocValues(row, { language, nodeId, typeName } = {}) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
metaDescription: strValOrUndef(row.metaDescription),
|
|
131
|
-
metaKeywords: strValOrUndef(row.metaKeywords),
|
|
132
|
-
};
|
|
151
|
+
const completed = { ...row };
|
|
152
|
+
if (language)
|
|
153
|
+
completed.language = language;
|
|
154
|
+
if (nodeId)
|
|
155
|
+
completed.nodeId = nodeId;
|
|
156
|
+
if (typeName)
|
|
157
|
+
completed.typeName = typeName;
|
|
158
|
+
return DocValuesRowAT.assert(completed);
|
|
133
159
|
}
|
|
134
160
|
//# sourceMappingURL=doc-values.queries.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doc-values.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/doc-values.queries.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"doc-values.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/doc-values.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
import { strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
1
|
import { mainDbSchemaName } from "@paroicms/connector";
|
|
2
|
+
import { type } from "arktype";
|
|
3
3
|
import { dbAnyLanguage } from "../context.js";
|
|
4
4
|
import { truncExcerptToWord } from "../helpers/excerpt.helpers.js";
|
|
5
|
+
const ExcerptRowAT = type({
|
|
6
|
+
excerpt: "string|null",
|
|
7
|
+
"+": "reject",
|
|
8
|
+
}).pipe((data) => ({
|
|
9
|
+
excerpt: data.excerpt ?? undefined,
|
|
10
|
+
}));
|
|
5
11
|
export async function loadExcerpt(siteContext, tracker, { nodelId, fieldTypes, maxLength, }) {
|
|
6
12
|
const excerptFieldTypes = [];
|
|
7
13
|
for (const field of fieldTypes ?? []) {
|
|
@@ -20,7 +26,7 @@ export async function loadExcerpt(siteContext, tracker, { nodelId, fieldTypes, m
|
|
|
20
26
|
const dbLanguage = field.localized ? nodelId.language : dbAnyLanguage;
|
|
21
27
|
const row = await siteContext
|
|
22
28
|
.cn("PaFieldText as f")
|
|
23
|
-
.select("f.excerpt
|
|
29
|
+
.select("f.excerpt")
|
|
24
30
|
.where({
|
|
25
31
|
"f.field": field.name,
|
|
26
32
|
"f.nodeId": nodelId.nodeId,
|
|
@@ -28,7 +34,7 @@ export async function loadExcerpt(siteContext, tracker, { nodelId, fieldTypes, m
|
|
|
28
34
|
})
|
|
29
35
|
.first();
|
|
30
36
|
tracker.trackAccess(mainDbSchemaName, "PaFieldText", "read");
|
|
31
|
-
let excerpt =
|
|
37
|
+
let excerpt = row ? ExcerptRowAT.assert(row).excerpt : undefined;
|
|
32
38
|
excerpt = excerpt === "" ? undefined : excerpt;
|
|
33
39
|
if (excerpt) {
|
|
34
40
|
return maxLength === undefined ? excerpt : truncExcerptToWord(excerpt, maxLength);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"excerpt.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/excerpt.queries.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"excerpt.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/excerpt.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,MAAM,YAAY,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,aAAa;IACtB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS;CACnC,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,EACE,OAAO,EACP,UAAU,EACV,SAAS,GAKV;IAED,MAAM,iBAAiB,GAIjB,EAAE,CAAC;IAET,KAAK,MAAM,KAAK,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACrC,IACE,KAAK,CAAC,QAAQ,KAAK,MAAM;YACzB,KAAK,CAAC,QAAQ,KAAK,MAAM;YACzB,KAAK,CAAC,YAAY,KAAK,SAAS,EAChC,CAAC;YACD,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACxC,iBAAiB,CAAC,IAAI,CAAC;gBACrB,GAAG,KAAK;gBACR,YAAY;aACb,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;IAC5F,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;QACtE,MAAM,GAAG,GAAoB,MAAM,WAAW;aAC3C,EAAE,CAAC,kBAAkB,CAAC;aACtB,MAAM,CAAC,WAAW,CAAC;aACnB,KAAK,CAAC;YACL,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,UAAU,EAAE,OAAO,CAAC,MAAM;YAC1B,YAAY,EAAE,UAAU;SACzB,CAAC;aACD,KAAK,EAAE,CAAC;QAEX,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACjE,OAAO,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QAE/C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { getNodeTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
2
2
|
import { encodeNodelId, isJsonFieldValue, isMediaHandleValue, isReadLabelingFieldValue, pickATermTitle, } from "@paroicms/public-anywhere-lib";
|
|
3
|
-
import { languageIfNodel } from "../
|
|
4
|
-
import { loadFieldValues } from "../
|
|
5
|
-
import { preprocessFields } from "../
|
|
3
|
+
import { languageIfNodel } from "../admin-backend/fields/_fields.helpers.js";
|
|
4
|
+
import { loadFieldValues } from "../admin-backend/fields/load-fields.queries.js";
|
|
5
|
+
import { preprocessFields } from "../admin-backend/fields/preprocess-fields.js";
|
|
6
6
|
import { getHandleOfFieldOnNode } from "../common/media-handles.helpers.js";
|
|
7
7
|
import { toTpSourceMedia } from "../common/medias/to-media-values.js";
|
|
8
8
|
import { makeCacheDependencyKey } from "../common/text-cache.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-values.js","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAML,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,cAAc,GACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"field-values.js","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
1
|
import { mainDbSchemaName } from "@paroicms/connector";
|
|
3
2
|
import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
3
|
+
import { type } from "arktype";
|
|
4
4
|
import { applyRegularChildrenSortingOnQuery } from "../common/child-ordering-query.js";
|
|
5
5
|
import { makeCacheDependencyKey } from "../common/text-cache.js";
|
|
6
6
|
import { createDocPayloadDrop } from "./create-doc-drop.js";
|
|
@@ -34,6 +34,14 @@ export async function getSiblingDocuments(renderingContext, documentId) {
|
|
|
34
34
|
: undefined,
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
|
+
const ParentNodeRowAT = type({
|
|
38
|
+
parentTypeName: "string",
|
|
39
|
+
parentId: "number",
|
|
40
|
+
"+": "reject",
|
|
41
|
+
}).pipe((r) => ({
|
|
42
|
+
parentTypeName: r.parentTypeName,
|
|
43
|
+
parentNodeId: String(r.parentId),
|
|
44
|
+
}));
|
|
37
45
|
async function getParentNode(siteContext, tracker, nodeId) {
|
|
38
46
|
const row = await siteContext
|
|
39
47
|
.cn("PaNode as l")
|
|
@@ -44,11 +52,16 @@ async function getParentNode(siteContext, tracker, nodeId) {
|
|
|
44
52
|
tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
|
|
45
53
|
if (!row)
|
|
46
54
|
return;
|
|
47
|
-
return
|
|
48
|
-
parentTypeName: strVal(row.parentTypeName),
|
|
49
|
-
parentNodeId: strVal(row.parentId),
|
|
50
|
-
};
|
|
55
|
+
return ParentNodeRowAT.assert(row);
|
|
51
56
|
}
|
|
57
|
+
const SiblingIdsRowAT = type({
|
|
58
|
+
prevId: "number|null",
|
|
59
|
+
nextId: "number|null",
|
|
60
|
+
"+": "reject",
|
|
61
|
+
}).pipe((data) => ({
|
|
62
|
+
prevNodeId: data.prevId === null ? undefined : String(data.prevId),
|
|
63
|
+
nextNodeId: data.nextId === null ? undefined : String(data.nextId),
|
|
64
|
+
}));
|
|
52
65
|
async function getSiblingDocumentIds(siteContext, tracker, { documentId, parentNodeId, parentDocumentType, }) {
|
|
53
66
|
const { language } = documentId;
|
|
54
67
|
const { cn } = siteContext;
|
|
@@ -86,8 +99,7 @@ async function getSiblingDocumentIds(siteContext, tracker, { documentId, parentN
|
|
|
86
99
|
tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
|
|
87
100
|
if (!row)
|
|
88
101
|
return {};
|
|
89
|
-
const prevNodeId =
|
|
90
|
-
const nextNodeId = strValOrUndef(row.nextId);
|
|
102
|
+
const { prevNodeId, nextNodeId } = SiblingIdsRowAT.assert(row);
|
|
91
103
|
return {
|
|
92
104
|
previousDocumentId: prevNodeId === undefined
|
|
93
105
|
? undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-siblings.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/get-siblings.queries.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"get-siblings.queries.js","sourceRoot":"","sources":["../../src/rendering-payload/get-siblings.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type Tracker } from "@paroicms/internal-server-lib";
|
|
2
2
|
import { type ParsedNodelId, type ScListType } from "@paroicms/public-anywhere-lib";
|
|
3
3
|
import type { SiteContext } from "../site-context/site-context.types.js";
|
|
4
4
|
import type * as publicPayload from "./rendering-payload.types.js";
|
|
@@ -1,19 +1,42 @@
|
|
|
1
|
-
import { dateVal, nbValOrUndef, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
|
|
2
1
|
import { mainDbSchemaName } from "@paroicms/connector";
|
|
3
2
|
import { getPartTypeByName, sortParts } from "@paroicms/internal-anywhere-lib";
|
|
3
|
+
import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
|
|
4
4
|
import { encodeNodelId, } from "@paroicms/public-anywhere-lib";
|
|
5
|
+
import { type } from "arktype";
|
|
6
|
+
const LoadPartsRowAT = type({
|
|
7
|
+
nodeId: "number",
|
|
8
|
+
relativeId: "string",
|
|
9
|
+
typeName: "string",
|
|
10
|
+
parentId: "number",
|
|
11
|
+
orderNum: "number|null",
|
|
12
|
+
listName: "string",
|
|
13
|
+
title: "string|null",
|
|
14
|
+
publishDate: "string|number|Date",
|
|
15
|
+
tNodeId: "number|null",
|
|
16
|
+
"+": "reject",
|
|
17
|
+
}).pipe((r) => ({
|
|
18
|
+
nodeId: String(r.nodeId),
|
|
19
|
+
relativeId: r.relativeId,
|
|
20
|
+
typeName: r.typeName,
|
|
21
|
+
parentNodeId: String(r.parentId),
|
|
22
|
+
orderNum: r.orderNum ?? undefined,
|
|
23
|
+
listName: r.listName,
|
|
24
|
+
title: r.title ?? undefined,
|
|
25
|
+
publishDate: parseSqliteDateTime(r.publishDate),
|
|
26
|
+
inRightLanguage: r.tNodeId !== null,
|
|
27
|
+
}));
|
|
5
28
|
export async function loadPartsOf(siteContext, tracker, documentId, listType) {
|
|
6
29
|
const { siteSchema, cn } = siteContext;
|
|
7
30
|
const listNames = [...getRecursiveListNames(siteSchema, listType)];
|
|
8
31
|
const rows = await cn("PaNode as l")
|
|
9
32
|
.select([
|
|
10
33
|
"l.id as nodeId",
|
|
11
|
-
"l.relativeId
|
|
12
|
-
"l.publishDate
|
|
13
|
-
"l.typeName
|
|
14
|
-
"l.parentId
|
|
15
|
-
"p.listName
|
|
16
|
-
"o.orderNum
|
|
34
|
+
"l.relativeId",
|
|
35
|
+
"l.publishDate",
|
|
36
|
+
"l.typeName",
|
|
37
|
+
"l.parentId",
|
|
38
|
+
"p.listName",
|
|
39
|
+
"o.orderNum",
|
|
17
40
|
"s.nodeId as tNodeId",
|
|
18
41
|
])
|
|
19
42
|
.innerJoin("PaPartNode as p", "p.nodeId", "l.id")
|
|
@@ -28,16 +51,17 @@ export async function loadPartsOf(siteContext, tracker, documentId, listType) {
|
|
|
28
51
|
.whereRaw("l.publishDate <= current_timestamp");
|
|
29
52
|
tracker.trackAccess(mainDbSchemaName, "PaPartNode", "read");
|
|
30
53
|
const oneLanguageItems = rows.map((row) => {
|
|
31
|
-
const
|
|
54
|
+
const validated = LoadPartsRowAT.assert(row);
|
|
55
|
+
const inRightLanguage = validated.inRightLanguage;
|
|
32
56
|
const commonValues = {
|
|
33
|
-
nodeId:
|
|
34
|
-
relativeId:
|
|
35
|
-
typeName:
|
|
36
|
-
parentNodeId:
|
|
37
|
-
orderNum:
|
|
38
|
-
listName:
|
|
39
|
-
title:
|
|
40
|
-
publishDate:
|
|
57
|
+
nodeId: validated.nodeId,
|
|
58
|
+
relativeId: validated.relativeId,
|
|
59
|
+
typeName: validated.typeName,
|
|
60
|
+
parentNodeId: validated.parentNodeId,
|
|
61
|
+
orderNum: validated.orderNum,
|
|
62
|
+
listName: validated.listName,
|
|
63
|
+
title: validated.title,
|
|
64
|
+
publishDate: validated.publishDate.toISOString(),
|
|
41
65
|
};
|
|
42
66
|
return inRightLanguage
|
|
43
67
|
? {
|
|
@@ -90,23 +114,27 @@ function formatPartValues(siteContext, { item, index, numberOfType }) {
|
|
|
90
114
|
languageLabel: siteContext.siteSchema.languageLabels[item.language],
|
|
91
115
|
};
|
|
92
116
|
}
|
|
117
|
+
const MissingTranslationsRowAT = type({
|
|
118
|
+
typeName: "string",
|
|
119
|
+
nodeId: "number",
|
|
120
|
+
language: "string",
|
|
121
|
+
"+": "reject",
|
|
122
|
+
}).pipe((r) => ({
|
|
123
|
+
typeName: r.typeName,
|
|
124
|
+
nodeId: String(r.nodeId),
|
|
125
|
+
language: r.language,
|
|
126
|
+
}));
|
|
93
127
|
async function completeMissingTranslations(siteContext, tracker, list) {
|
|
94
128
|
const missingNodeIds = list.filter((item) => !item.inRightLanguage).map((item) => item.nodeId);
|
|
95
129
|
let otherLanguageItems;
|
|
96
130
|
if (missingNodeIds.length > 0) {
|
|
97
131
|
const rows = await siteContext
|
|
98
132
|
.cn("PaNodel as s")
|
|
99
|
-
.select(["s.nodeId
|
|
133
|
+
.select(["s.nodeId", "s.language", "l.typeName"])
|
|
100
134
|
.innerJoin("PaNode as l", "l.id", "s.nodeId")
|
|
101
135
|
.whereIn("s.nodeId", missingNodeIds);
|
|
102
136
|
tracker.trackAccess(mainDbSchemaName, "PaNodel", "read");
|
|
103
|
-
const formatted = rows.map((row) =>
|
|
104
|
-
return {
|
|
105
|
-
typeName: strVal(row.typeName),
|
|
106
|
-
nodeId: strVal(row.nodeId),
|
|
107
|
-
language: strVal(row.language),
|
|
108
|
-
};
|
|
109
|
-
});
|
|
137
|
+
const formatted = rows.map((row) => MissingTranslationsRowAT.assert(row));
|
|
110
138
|
otherLanguageItems = new Map(formatted.map((item) => [encodeNodelId(item), item]));
|
|
111
139
|
}
|
|
112
140
|
return list.map((item) => {
|
|
@@ -132,6 +160,12 @@ async function completeMissingTranslations(siteContext, tracker, list) {
|
|
|
132
160
|
throw new Error(`missing part for item '${item.nodeId}'`);
|
|
133
161
|
});
|
|
134
162
|
}
|
|
163
|
+
const CountPartsRowAT = type({
|
|
164
|
+
cnt: "number|null",
|
|
165
|
+
"+": "reject",
|
|
166
|
+
}).pipe((data) => ({
|
|
167
|
+
cnt: data.cnt ?? undefined,
|
|
168
|
+
}));
|
|
135
169
|
export async function countPartsOf(siteContext, tracker, parentId, listType) {
|
|
136
170
|
const { listName } = listType;
|
|
137
171
|
const result = await siteContext
|
|
@@ -142,7 +176,7 @@ export async function countPartsOf(siteContext, tracker, parentId, listType) {
|
|
|
142
176
|
.where("p.listName", listName)
|
|
143
177
|
.first();
|
|
144
178
|
tracker.trackAccess(mainDbSchemaName, "PaPartNode", "read");
|
|
145
|
-
return
|
|
179
|
+
return CountPartsRowAT.assert(result).cnt ?? 0;
|
|
146
180
|
}
|
|
147
181
|
function getRecursiveListNames(siteSchema, list) {
|
|
148
182
|
const listNames = new Set([list.listName]);
|