@paroicms/server 1.23.0 → 1.24.0

package/dist/public-payload/load-default-image.js

@@ -5,17 +5,17 @@ const anywhere_lib_1 = require("@paroicms/anywhere-lib");
 const media_handles_helpers_1 = require("../common/media-handles.helpers");
 const medias_helpers_1 = require("../modules/public-site/helpers/medias.helpers");
 async function loadDefaultImageUid(siteContext, tracker, options) {
-    const { fieldTypes, leafId, lang } = options;
+    const { fieldTypes, leafId, language } = options;
     const featuredImage = await (0, medias_helpers_1.getFeaturedImageOf)(siteContext, {
         leafId,
     });
     const defaultImageUid = featuredImage
         ? featuredImage.uid
-        : await getFirstImageUid(siteContext, tracker, { leafId, fieldTypes, lang });
+        : await getFirstImageUid(siteContext, tracker, { leafId, fieldTypes, language });
     return defaultImageUid;
 }
 exports.loadDefaultImageUid = loadDefaultImageUid;
-async function getFirstImageUid(siteContext, _tracker, { leafId, fieldTypes, lang }) {
+async function getFirstImageUid(siteContext, _tracker, { leafId, fieldTypes, language }) {
     const selectedFields = [];
     for (const f of fieldTypes ?? []) {
         if (f.storedAs !== "mediaHandle" && (!(0, anywhere_lib_1.isFTextFieldType)(f) || !f.withGallery)) {
@@ -29,7 +29,7 @@ async function getFirstImageUid(siteContext, _tracker, { leafId, fieldTypes, lan
     const orderedFieldTypes = selectedFields.sort((a, b) => a.useAsDefaultImage - b.useAsDefaultImage);
     let newFeaturedImageUid;
     for (const item of orderedFieldTypes) {
-        const handle = (0, media_handles_helpers_1.getHandleOfField)(siteContext, { leafId, fieldType: item.f, lang });
+        const handle = (0, media_handles_helpers_1.getHandleOfField)(siteContext, { leafId, fieldType: item.f, language });
         const firstImageUid = await siteContext.mediaStorage.getFirstImageUid({
             handle,
         });

package/dist/public-payload/load-default-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-default-image.js","sourceRoot":"","sources":["../../src/public-payload/load-default-image.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAE1E,2EAAmE;AACnE,kFAAmF;AAG5E,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,OAAgB,EAChB,OAA8E;IAE9E,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,aAAa,GAAG,MAAM,IAAA,mCAAkB,EAAC,WAAW,EAAE;QAC1D,MAAM;KACP,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,aAAa;QACnC,CAAC,CAAC,aAAa,CAAC,GAAG;QACnB,CAAC,CAAC,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/E,OAAO,eAAe,CAAC;AACzB,CAAC;AAbD,kDAaC;AAED,KAAK,UAAU,gBAAgB,CAC7B,WAAwB,EACxB,QAAiB,EACjB,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAA8D;IAExF,MAAM,cAAc,GAGd,EAAE,CAAC;IACT,KAAK,MAAM,CAAC,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACjC,IAAI,CAAC,CAAC,QAAQ,KAAK,aAAa,IAAI,CAAC,CAAC,IAAA,+BAAgB,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7E,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACtC,MAAM,iBAAiB,GAAG,CAAC,CAAC,iBAAiB,CAAC;YAC9C,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,iBAAiB,CACpD,CAAC;IAEF,IAAI,mBAAuC,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,IAAA,wCAAgB,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAClF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC;YACpE,MAAM;SACP,CAAC,CAAC;QACH,IAAI,aAAa,EAAE,CAAC;YAClB,mBAAmB,GAAG,aAAa,CAAC;YACpC,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"load-default-image.js","sourceRoot":"","sources":["../../src/public-payload/load-default-image.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAE1E,2EAAmE;AACnE,kFAAmF;AAG5E,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,OAAgB,EAChB,OAAkF;IAElF,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,aAAa,GAAG,MAAM,IAAA,mCAAkB,EAAC,WAAW,EAAE;QAC1D,MAAM;KACP,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,aAAa;QACnC,CAAC,CAAC,aAAa,CAAC,GAAG;QACnB,CAAC,CAAC,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnF,OAAO,eAAe,CAAC;AACzB,CAAC;AAbD,kDAaC;AAED,KAAK,UAAU,gBAAgB,CAC7B,WAAwB,EACxB,QAAiB,EACjB,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAkE;IAEhG,MAAM,cAAc,GAGd,EAAE,CAAC;IACT,KAAK,MAAM,CAAC,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACjC,IAAI,CAAC,CAAC,QAAQ,KAAK,aAAa,IAAI,CAAC,CAAC,IAAA,+BAAgB,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7E,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACtC,MAAM,iBAAiB,GAAG,CAAC,CAAC,iBAAiB,CAAC;YAC9C,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,iBAAiB,CACpD,CAAC;IAEF,IAAI,mBAAuC,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,IAAA,wCAAgB,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC;YACpE,MAAM;SACP,CAAC,CAAC;QACH,IAAI,aAAa,EAAE,CAAC;YAClB,mBAAmB,GAAG,aAAa,CAAC;YACpC,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}

package/dist/public-payload/make-basic-payload.d.ts

@@ -2,5 +2,5 @@ import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rend
 import type { SiteContext } from "../site-context/site-context.types";
 import type * as publicPayload from "./public-payload.types";
 export declare function makePublicBasicPayload(siteContext: SiteContext, renderingContext: RenderingContext, options?: {
-    lang?: string;
+    language?: string;
 }): publicPayload.DetachedPublicPayload;

package/dist/public-payload/make-basic-payload.js

@@ -4,13 +4,13 @@ exports.makePublicBasicPayload = void 0;
 const site_payload_1 = require("./site-payload");
 const translations_queries_1 = require("./translations.queries");
 function makePublicBasicPayload(siteContext, renderingContext, options = {}) {
-    const lang = options.lang ?? siteContext.siteSchema.defaultLang;
+    const language = options.language ?? siteContext.siteSchema.defaultLanguage;
     return {
-        site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, lang),
-        page: {
+        site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, language),
+        doc: {
             kind: "detached",
-            lang,
-            langLabel: siteContext.siteSchema.langLabels[lang],
+            language,
+            languageLabel: siteContext.siteSchema.languageLabels[language],
             translations: (0, translations_queries_1.makeBasicTranslationsPayload)(siteContext),
         },
     };

package/dist/public-payload/make-basic-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-basic-payload.js","sourceRoot":"","sources":["../../src/public-payload/make-basic-payload.ts"],"names":[],"mappings":";;;AAGA,iDAAiD;AACjD,iEAAsE;AAEtE,SAAgB,sBAAsB,CACpC,WAAwB,EACxB,gBAAkC,EAClC,UAA6B,EAAE;IAE/B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC;IAChE,OAAO;QACL,IAAI,EAAE,IAAA,8BAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE,IAAI,CAAC;QAC1D,IAAI,EAAE;YACJ,IAAI,EAAE,UAAU;YAChB,IAAI;YACJ,SAAS,EAAE,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC;YAClD,YAAY,EAAE,IAAA,mDAA4B,EAAC,WAAW,CAAC;SACxD;KACF,CAAC;AACJ,CAAC;AAfD,wDAeC"}
+{"version":3,"file":"make-basic-payload.js","sourceRoot":"","sources":["../../src/public-payload/make-basic-payload.ts"],"names":[],"mappings":";;;AAGA,iDAAiD;AACjD,iEAAsE;AAEtE,SAAgB,sBAAsB,CACpC,WAAwB,EACxB,gBAAkC,EAClC,UAAiC,EAAE;IAEnC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC5E,OAAO;QACL,IAAI,EAAE,IAAA,8BAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QAC9D,GAAG,EAAE;YACH,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,YAAY,EAAE,IAAA,mDAA4B,EAAC,WAAW,CAAC;SACxD;KACF,CAAC;AACJ,CAAC;AAfD,wDAeC"}

package/dist/public-payload/make-image-available.d.ts

@@ -1,4 +1,4 @@
-import type { VariantName } from "@paroicms/anywhere-lib";
+import type { ImageSize } from "@paroicms/anywhere-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
 import type { SiteContext } from "../site-context/site-context.types";
 export interface PublicImage {
@@ -11,14 +11,14 @@ export interface MakeImageAvailableByHandleOptions {
     imageSel: {
         handle: string;
     };
-    size: VariantName;
+    size: ImageSize;
     autoCrop?: boolean;
 }
 export interface MakeImageAvailableByUidOptions {
     imageSel: {
         uid: string;
     };
-    size: VariantName;
+    size: ImageSize;
     autoCrop?: boolean;
 }
 export declare function makeImageAvailable(siteContext: SiteContext, renderingContext: RenderingContext, options: MakeImageAvailableByHandleOptions): Promise<PublicImage | undefined>;

package/dist/public-payload/make-image-available.js

@@ -12,14 +12,14 @@ async function makeImageAvailable(siteContext, renderingContext, { imageSel, siz
     }
     if (media.kind !== "image")
         throw new Error(`media '${media.uid}' should be an image`);
-    const { width, height, completeVariantName, resourceVersion, mediaType, slug } = await siteContext.imageCache.makeImageAvailable({
+    const { width, height, variantName, resourceVersion, mediaType, slug } = await siteContext.imageCache.makeImageAvailable({
         imageRef: {
             imageUid: media.uid,
             width: media.width,
             height: media.height,
             mediaType: media.mediaType,
         },
-        variantName: size,
+        imageSize: size,
         autoCrop,
         dependsOnUsedKey: renderingContext.cacheKey,
         slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
@@ -28,7 +28,7 @@ async function makeImageAvailable(siteContext, renderingContext, { imageSel, siz
         url: (0, url_helpers_1.makeUrlOfImageVariant)(siteContext, {
             mediaUid: media.uid,
             mediaType,
-            completeVariantName: completeVariantName,
+            variantName,
             resourceVersion,
             slug,
         }),

package/dist/public-payload/make-image-available.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AACA,mFAAwE;AACxE,wDAA+D;AAsCxD,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GAC5E,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ;QACR,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;QAC3C,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS;YACT,mBAAmB,EAAE,mBAAmB;YACxC,eAAe;YACf,IAAI;SACL,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA3CD,gDA2CC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AACA,mFAAwE;AACxE,wDAA+D;AAsCxD,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GACpE,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,SAAS,EAAE,IAAI;QACf,QAAQ;QACR,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;QAC3C,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS;YACT,WAAW;YACX,eAAe;YACf,IAAI;SACL,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA3CD,gDA2CC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}

package/dist/public-payload/parts.queries.d.ts

@@ -2,5 +2,5 @@ import { type ParsedSectionId, type PartListSchema } from "@paroicms/anywhere-li
 import type { Tracker } from "@paroicms/server-lib";
 import type { SiteContext } from "../site-context/site-context.types";
 import type * as publicPayload from "./public-payload.types";
-export declare function loadPartsOf(siteContext: SiteContext, tracker: Tracker, parentId: ParsedSectionId, listType: Pick<PartListSchema, "listName">): Promise<publicPayload.PagePartValues[]>;
+export declare function loadPartsOf(siteContext: SiteContext, tracker: Tracker, parentId: ParsedSectionId, listType: Pick<PartListSchema, "listName">): Promise<publicPayload.DocPartValues[]>;
 export declare function countPartsOf(siteContext: SiteContext, tracker: Tracker, parentId: ParsedSectionId, listType: Pick<PartListSchema, "listName">): Promise<number>;

package/dist/public-payload/parts.queries.js

@@ -14,24 +14,24 @@ async function loadPartsOf(siteContext, tracker, parentId, listType) {
         .addSelect("s.leafId", "tLeafId")
         .from("PaLeaf", "l")
         .innerJoin("PaLeafItem", "i", "i.leafId = l.id")
-        .leftJoin("PaSection", "s", "s.leafId = l.id and s.lang = :lang", {
-        lang: parentId.lang,
+        .leftJoin("PaSection", "s", "s.leafId = l.id and s.lang = :language", {
+        language: parentId.language,
     })
         .where("l.parentId = :leafId", { leafId: parentId.leafId })
         .andWhere("i.listName = :listName", { listName })
         .orderBy("i.itemNum", "ASC")
         .getRawMany();
     tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaSection", "read");
-    const oneLangItems = rows.map((row) => {
-        const inRightLang = (0, data_formatters_lib_1.strValOrUndef)(row.tLeafId) !== undefined;
-        return inRightLang
+    const oneLanguageItems = rows.map((row) => {
+        const inRightLanguage = (0, data_formatters_lib_1.strValOrUndef)(row.tLeafId) !== undefined;
+        return inRightLanguage
             ? {
                 leafId: (0, data_formatters_lib_1.strVal)(row.leafId),
                 leafType: (0, data_formatters_lib_1.strVal)(row.leafType),
                 itemNum: (0, data_formatters_lib_1.nbVal)(row.itemNum),
                 listName,
-                inRightLang,
-                lang: parentId.lang,
+                inRightLanguage,
+                language: parentId.language,
                 title: (0, data_formatters_lib_1.strValOrUndef)(row.title),
             }
             : {
@@ -39,24 +39,24 @@ async function loadPartsOf(siteContext, tracker, parentId, listType) {
                 leafType: (0, data_formatters_lib_1.strVal)(row.leafType),
                 itemNum: (0, data_formatters_lib_1.nbVal)(row.itemNum),
                 listName,
-                inRightLang,
-                lang: undefined,
+                inRightLanguage,
+                language: undefined,
                 title: (0, data_formatters_lib_1.strValOrUndef)(row.title),
             };
     });
-    const completed = await completeMissingTranslations(siteContext, tracker, oneLangItems);
+    const completed = await completeMissingTranslations(siteContext, tracker, oneLanguageItems);
     const result = [];
     for (const item of completed) {
-        if (!item.lang) {
-            siteContext.siteLog.warn("should have lang here", item);
+        if (!item.language) {
+            siteContext.siteLog.warn("should have language here", item);
             continue;
         }
         result.push({
             leafType: item.leafType,
             num: item.itemNum,
-            inRightLang: item.inRightLang,
-            lang: item.lang,
-            langLabel: siteContext.siteSchema.langLabels[item.lang],
+            inRightLanguage: item.inRightLanguage,
+            language: item.language,
+            languageLabel: siteContext.siteSchema.languageLabels[item.language],
             leafId: item.leafId,
         });
     }
@@ -64,13 +64,13 @@ async function loadPartsOf(siteContext, tracker, parentId, listType) {
 }
 exports.loadPartsOf = loadPartsOf;
 async function completeMissingTranslations(siteContext, tracker, list) {
-    const missingLeafIds = list.filter((item) => !item.inRightLang).map((item) => item.leafId);
-    let otherLangItems;
+    const missingLeafIds = list.filter((item) => !item.inRightLanguage).map((item) => item.leafId);
+    let otherLanguageItems;
     if (missingLeafIds.length > 0) {
         const rows = await siteContext.cn
             .createQueryBuilder()
             .addSelect("s.leafId", "leafId")
-            .addSelect("s.lang", "lang")
+            .addSelect("s.lang", "language")
             .addSelect("l.leafType", "leafType")
             .from("PaSection", "s")
             .innerJoin("PaLeaf", "l", "l.id = s.leafId")
@@ -81,24 +81,24 @@ async function completeMissingTranslations(siteContext, tracker, list) {
             return {
                 leafType: (0, data_formatters_lib_1.strVal)(row.leafType),
                 leafId: (0, data_formatters_lib_1.strVal)(row.leafId),
-                lang: (0, data_formatters_lib_1.strVal)(row.lang),
+                language: (0, data_formatters_lib_1.strVal)(row.language),
             };
         });
-        otherLangItems = new Map(formatted.map((item) => [(0, anywhere_lib_1.encodeSectionId)(item), item]));
+        otherLanguageItems = new Map(formatted.map((item) => [(0, anywhere_lib_1.encodeSectionId)(item), item]));
     }
     return list.map((item) => {
-        if (item.inRightLang)
+        if (item.inRightLanguage)
             return item;
-        for (const lang of siteContext.siteSchema.langs) {
-            const found = otherLangItems?.get((0, anywhere_lib_1.encodeSectionId)({ leafId: item.leafId, lang }));
+        for (const language of siteContext.siteSchema.languages) {
+            const found = otherLanguageItems?.get((0, anywhere_lib_1.encodeSectionId)({ leafId: item.leafId, language }));
             if (found) {
                 return {
                     leafType: item.leafType,
                     leafId: item.leafId,
-                    lang,
+                    language,
                     itemNum: item.itemNum,
                     listName: item.listName,
-                    inRightLang: false,
+                    inRightLanguage: false,
                     title: found.title,
                 };
             }

package/dist/public-payload/parts.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parts.queries.js","sourceRoot":"","sources":["../../src/public-payload/parts.queries.ts"],"names":[],"mappings":"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"}

package/dist/public-payload/public-payload.types.d.ts

@@ -2,11 +2,11 @@ import type { FieldValues } from "../modules/core/fields/load-fields.queries";
 export type PublicPayload = DetachedPublicPayload | RegularPublicPayload;
 export interface DetachedPublicPayload {
     site: SitePayload;
-    page: DetachedPagePayload;
+    doc: DetachedDocPayload;
 }
 export interface RegularPublicPayload {
     site: SitePayload;
-    page: PagePayload;
+    doc: DocPayload;
 }
 export interface BaseSitePayload {
     fqdn: string;
@@ -21,8 +21,8 @@ export interface BaseSitePayload {
 }
 export interface SitePayload extends BaseSitePayload {
     kind: "site";
-    lang: string;
-    langLabel: string;
+    language: string;
+    languageLabel: string;
     home: HomeRoutingPointSectionIds;
 }
 export interface HomeRoutingPointSectionIds extends RoutingPointSectionIds {
@@ -32,19 +32,19 @@ export interface RoutingPointSectionIds {
     id: string;
     [leafType: string]: RoutingPointSectionIds | string;
 }
-export interface DetachedPagePayload {
+export interface DetachedDocPayload {
     kind: "detached";
     leafType?: string;
-    lang?: string;
-    langLabel?: string;
-    translations: PageTranslation[];
+    language?: string;
+    languageLabel?: string;
+    translations: DocTranslation[];
     id?: string;
     title?: string;
 }
-export interface PageValues {
+export interface DocValues {
     leafType: string;
     leafId: string;
-    lang: string;
+    language: string;
     relativeId: string;
     title?: string;
     slug?: string;
@@ -52,14 +52,14 @@ export interface PageValues {
     metaDescription?: string;
     metaKeywords?: string;
 }
-export interface PagePayload extends PageValues {
-    kind: "page";
+export interface DocPayload extends DocValues {
+    kind: "document";
     id: string;
-    langLabel: string;
+    languageLabel: string;
     url: string;
     excerpt?: string;
     parts: {
-        [listName: string]: PagePart[];
+        [listName: string]: DocPart[];
     };
     partCount: {
         [listName: string]: number;
@@ -67,7 +67,7 @@ export interface PagePayload extends PageValues {
     defaultImageUid?: string;
     featuredImageUid?: string;
     fields: FieldValues;
-    translations: PageTranslation[];
+    translations: DocTranslation[];
     flaggedWith: {
         [leafType: string]: Term[];
     };
@@ -79,29 +79,29 @@ export interface PagePayload extends PageValues {
     siblings: SiblingDocuments;
     leafTypeLabel: string;
 }
-export interface PageTranslation {
-    lang: string;
-    langLabel: string;
+export interface DocTranslation {
+    language: string;
+    languageLabel: string;
     isCurrent: boolean;
     url: string;
-    page?: PagePayload;
+    doc?: DocPayload;
 }
-export interface TermValues extends PageValues {
-    inRightLang: boolean;
+export interface TermValues extends DocValues {
+    inRightLanguage: boolean;
     isLead: boolean;
 }
-export interface Term extends TermValues, Omit<PagePayload, "kind"> {
+export interface Term extends TermValues, Omit<DocPayload, "kind"> {
     kind: "term";
 }
-export interface PagePartValues {
+export interface DocPartValues {
     leafType: string;
     num: number;
-    inRightLang: boolean;
-    lang: string;
-    langLabel: string;
+    inRightLanguage: boolean;
+    language: string;
+    languageLabel: string;
     leafId: string;
 }
-export interface PagePart extends PagePartValues {
+export interface DocPart extends DocPartValues {
     kind: "part";
     id: string;
     defaultImageUid?: string;
@@ -124,6 +124,6 @@ export interface BreadcrumbItem {
     url: string;
 }
 export interface SiblingDocuments {
-    previous?: PagePayload;
-    next?: PagePayload;
+    previous?: DocPayload;
+    next?: DocPayload;
 }

package/dist/public-payload/site-payload.d.ts

@@ -1,4 +1,4 @@
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
 import type { SiteContext } from "../site-context/site-context.types";
 import type * as publicPayload from "./public-payload.types";
-export declare function makeSitePayload(siteContext: SiteContext, renderingContext: RenderingContext, lang: string): publicPayload.SitePayload;
+export declare function makeSitePayload(siteContext: SiteContext, renderingContext: RenderingContext, language: string): publicPayload.SitePayload;

package/dist/public-payload/site-payload.js

@@ -5,9 +5,9 @@ const data_format_1 = require("../common/data-format");
 const context_1 = require("../context");
 const make_url_1 = require("../modules/public-site/public-route/make-url");
 const field_values_1 = require("./field-values");
-function makeSitePayload(siteContext, renderingContext, lang) {
+function makeSitePayload(siteContext, renderingContext, language) {
     const siteAppBaseUrl = (0, data_format_1.getSiteAppBaseUrl)();
-    const homeIds = toPublicRoutingPointSectionIds(siteContext.siteIds.homeIds, lang);
+    const homeIds = toPublicRoutingPointSectionIds(siteContext.siteIds.homeIds, language);
     return {
         kind: "site",
         fqdn: siteContext.fqdn,
@@ -15,27 +15,27 @@ function makeSitePayload(siteContext, renderingContext, lang) {
             jsUrl: `${siteAppBaseUrl}/index.js`,
         },
         assetsUrl: (0, data_format_1.getAssetsBaseUrl)(siteContext),
-        fields: (0, field_values_1.getPublicSiteFieldValues)(siteContext, renderingContext, lang),
+        fields: (0, field_values_1.getPublicSiteFieldValues)(siteContext, renderingContext, language),
         recaptchaKey: context_1.appConf.googleRecaptcha?.siteKey,
         home: {
-            url: (0, make_url_1.getHomeUrl)(siteContext, lang),
+            url: (0, make_url_1.getHomeUrl)(siteContext, language),
             ...homeIds,
         },
-        lang: lang,
-        langLabel: siteContext.siteSchema.langLabels[lang],
+        language: language,
+        languageLabel: siteContext.siteSchema.languageLabels[language],
     };
 }
 exports.makeSitePayload = makeSitePayload;
-function toPublicRoutingPointSectionIds(ids, lang) {
-    const sectionId = ids.sectionIds[lang];
+function toPublicRoutingPointSectionIds(ids, language) {
+    const sectionId = ids.sectionIds[language];
     if (sectionId === undefined) {
-        throw new Error(`missing section for '${ids.leafType}', lang '${lang}'`);
+        throw new Error(`missing section for '${ids.leafType}', language '${language}'`);
     }
     const parentIds = {
         id: sectionId,
     };
     for (const [childLeafType, childIds] of Object.entries(ids.children ?? {})) {
-        parentIds[childLeafType] = toPublicRoutingPointSectionIds(childIds, lang);
+        parentIds[childLeafType] = toPublicRoutingPointSectionIds(childIds, language);
     }
     return parentIds;
 }

package/dist/public-payload/site-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":";;;AAAA,uDAA4E;AAC5E,wCAAqC;AAErC,2EAA0E;AAE1E,iDAA0D;AAG1D,SAAgB,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,IAAY;IAEZ,MAAM,cAAc,GAAG,IAAA,+BAAiB,GAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,8BAA8B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAClF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,aAAa,EAAE;YACb,KAAK,EAAE,GAAG,cAAc,WAAW;SACpC;QACD,SAAS,EAAE,IAAA,8BAAgB,EAAC,WAAW,CAAC;QACxC,MAAM,EAAE,IAAA,uCAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,IAAI,CAAC;QACrE,YAAY,EAAE,iBAAO,CAAC,eAAe,EAAE,OAAO;QAC9C,IAAI,EAAE;YACJ,GAAG,EAAE,IAAA,qBAAU,EAAC,WAAW,EAAE,IAAI,CAAC;YAClC,GAAG,OAAO;SACX;QACD,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC;KACnD,CAAC;AACJ,CAAC;AAvBD,0CAuBC;AAED,SAAS,8BAA8B,CACrC,GAAoB,EACpB,IAAY;IAEZ,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,CAAC,QAAQ,YAAY,IAAI,GAAG,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,SAAS,GAAyC;QACtD,EAAE,EAAE,SAAS;KACd,CAAC;IACF,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,SAAS,CAAC,aAAa,CAAC,GAAG,8BAA8B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"site-payload.js","sourceRoot":"","sources":["../../src/public-payload/site-payload.ts"],"names":[],"mappings":";;;AAAA,uDAA4E;AAC5E,wCAAqC;AAErC,2EAA0E;AAE1E,iDAA0D;AAG1D,SAAgB,eAAe,CAC7B,WAAwB,EACxB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,cAAc,GAAG,IAAA,+BAAiB,GAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,8BAA8B,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,aAAa,EAAE;YACb,KAAK,EAAE,GAAG,cAAc,WAAW;SACpC;QACD,SAAS,EAAE,IAAA,8BAAgB,EAAC,WAAW,CAAC;QACxC,MAAM,EAAE,IAAA,uCAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACzE,YAAY,EAAE,iBAAO,CAAC,eAAe,EAAE,OAAO;QAC9C,IAAI,EAAE;YACJ,GAAG,EAAE,IAAA,qBAAU,EAAC,WAAW,EAAE,QAAQ,CAAC;YACtC,GAAG,OAAO;SACX;QACD,QAAQ,EAAE,QAAQ;QAClB,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;KAC/D,CAAC;AACJ,CAAC;AAvBD,0CAuBC;AAED,SAAS,8BAA8B,CACrC,GAAoB,EACpB,QAAgB;IAEhB,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,CAAC,QAAQ,gBAAgB,QAAQ,GAAG,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,SAAS,GAAyC;QACtD,EAAE,EAAE,SAAS;KACd,CAAC;IACF,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,SAAS,CAAC,aAAa,CAAC,GAAG,8BAA8B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/public-payload/taxonomies.queries.d.ts

@@ -6,8 +6,8 @@ export declare function loadFlaggedWithTerms(siteContext: SiteContext, tracker:
     documentId: ParsedSectionId;
     taxonomyLeafType: string;
 }): Promise<publicPayload.TermValues[] | undefined>;
-export declare function formatTermValues(row: Obj, { lang, leafId, leafType }?: {
-    lang?: string;
+export declare function formatTermValues(row: Obj, { language, leafId, leafType }?: {
+    language?: string;
     leafId?: string;
     leafType?: string;
 }): publicPayload.TermValues;

package/dist/public-payload/taxonomies.queries.js

@@ -3,21 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatTermValues = exports.loadFlaggedWithTerms = void 0;
 const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const ddl_migration_1 = require("../site-context/db-init/ddl-migration");
-const page_values_queries_1 = require("./page-values.queries");
+const doc_values_queries_1 = require("./doc-values.queries");
 async function loadFlaggedWithTerms(siteContext, tracker, { documentId, taxonomyLeafType }) {
     const query = siteContext.cn.createQueryBuilder();
-    (0, page_values_queries_1.querySelectPageValues)(query);
+    (0, doc_values_queries_1.querySelectDocValues)(query);
     query
         .addSelect("f.lead", "lead")
         .addSelect("d.leafId", "dLeafId")
         .from("PaLeaf", "l")
         .innerJoin("PaTermFlag", "f", "f.termId = l.id")
         .innerJoin("PaLeaf", "l2", "l2.id = l.parentId")
-        .innerJoin("PaSection", "s", "s.leafId = l.id and s.lang = :lang and s.ready = 1", {
-        lang: documentId.lang,
+        .innerJoin("PaSection", "s", "s.leafId = l.id and s.lang = :language and s.ready = 1", {
+        language: documentId.language,
     })
-        .innerJoin("PaDocument", "d", "d.leafId = s.leafId and d.lang = :lang", {
-        lang: documentId.lang,
+        .innerJoin("PaDocument", "d", "d.leafId = s.leafId and d.lang = :language", {
+        language: documentId.language,
     })
         .where("f.flaggedId = :leafId", { leafId: documentId.leafId })
         .andWhere("l.publishDate <= current_timestamp")
@@ -27,18 +27,18 @@ async function loadFlaggedWithTerms(siteContext, tracker, { documentId, taxonomy
     tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaTermFlag", "read");
     return rows.map((row) => {
         return {
-            ...(0, page_values_queries_1.formatPageValues)(row, { lang: documentId.lang }),
+            ...(0, doc_values_queries_1.formatDocValues)(row, { language: documentId.language }),
             isLead: (0, data_formatters_lib_1.boolVal)(row.lead),
-            inRightLang: (0, data_formatters_lib_1.strValOrUndef)(row.dLeafId) !== undefined,
+            inRightLanguage: (0, data_formatters_lib_1.strValOrUndef)(row.dLeafId) !== undefined,
         };
     });
 }
 exports.loadFlaggedWithTerms = loadFlaggedWithTerms;
-function formatTermValues(row, { lang, leafId, leafType } = {}) {
+function formatTermValues(row, { language, leafId, leafType } = {}) {
     return {
-        ...(0, page_values_queries_1.formatPageValues)(row, { lang, leafId, leafType }),
-        inRightLang: (0, data_formatters_lib_1.boolVal)(row.inRightLang),
-        isLead: (0, data_formatters_lib_1.boolVal)(row.inRightLang),
+        ...(0, doc_values_queries_1.formatDocValues)(row, { language, leafId, leafType }),
+        inRightLanguage: (0, data_formatters_lib_1.boolVal)(row.inRightLanguage),
+        isLead: (0, data_formatters_lib_1.boolVal)(row.inRightLanguage),
     };
 }
 exports.formatTermValues = formatTermValues;

package/dist/public-payload/taxonomies.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"taxonomies.queries.js","sourceRoot":"","sources":["../../src/public-payload/taxonomies.queries.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AAGpE,yEAAqE;AAErE,+DAAgF;AAGzE,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,OAAgB,EAChB,EAAE,UAAU,EAAE,gBAAgB,EAA6D;IAE3F,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAClD,IAAA,2CAAqB,EAAC,KAAK,CAAC,CAAC;IAC7B,KAAK;SACF,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC3B,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC;SAChC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC;SAC/C,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,oBAAoB,CAAC;SAC/C,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,oDAAoD,EAAE;QACjF,IAAI,EAAE,UAAU,CAAC,IAAI;KACtB,CAAC;SACD,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,wCAAwC,EAAE;QACtE,IAAI,EAAE,UAAU,CAAC,IAAI;KACtB,CAAC;SACD,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC;SAC7D,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,QAAQ,CAAC,iCAAiC,EAAE,EAAE,gBAAgB,EAAE,CAAC;SACjE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;IAC3C,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAExD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,OAAO;YACL,GAAG,IAAA,sCAAgB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,IAAI,CAAC;YACzB,WAAW,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS;SACtD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAlCD,oDAkCC;AAED,SAAgB,gBAAgB,CAC9B,GAAQ,EACR,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,KAA4D,EAAE;IAEtF,OAAO;QACL,GAAG,IAAA,sCAAgB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACpD,WAAW,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,WAAW,CAAC;QACrC,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,WAAW,CAAC;KACjC,CAAC;AACJ,CAAC;AATD,4CASC"}
+{"version":3,"file":"taxonomies.queries.js","sourceRoot":"","sources":["../../src/public-payload/taxonomies.queries.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AAGpE,yEAAqE;AAErE,6DAA6E;AAGtE,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,OAAgB,EAChB,EAAE,UAAU,EAAE,gBAAgB,EAA6D;IAE3F,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAClD,IAAA,yCAAoB,EAAC,KAAK,CAAC,CAAC;IAC5B,KAAK;SACF,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC3B,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC;SAChC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC;SAC/C,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,oBAAoB,CAAC;SAC/C,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,wDAAwD,EAAE;QACrF,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;SACD,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,4CAA4C,EAAE;QAC1E,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;SACD,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC;SAC7D,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,QAAQ,CAAC,iCAAiC,EAAE,EAAE,gBAAgB,EAAE,CAAC;SACjE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;IAC3C,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAExD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,OAAO;YACL,GAAG,IAAA,oCAAe,EAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,IAAI,CAAC;YACzB,eAAe,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS;SAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAlCD,oDAkCC;AAED,SAAgB,gBAAgB,CAC9B,GAAQ,EACR,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAgE,EAAE;IAE9F,OAAO;QACL,GAAG,IAAA,oCAAe,EAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACvD,eAAe,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,eAAe,CAAC;KACrC,CAAC;AACJ,CAAC;AATD,4CASC"}

package/dist/public-payload/translations.queries.d.ts

@@ -2,6 +2,6 @@ import type { ParsedSectionId } from "@paroicms/anywhere-lib";
 import { type DropInst } from "../liquidjs-tools/liquidjs-drop";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
 import type { SiteContext } from "../site-context/site-context.types";
-import type { PageTranslation } from "./public-payload.types";
-export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema" | "multilingual">): PageTranslation[];
-export declare function loadTranslationsAsDrops(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedSectionId): Promise<DropInst<PageTranslation>[]>;
+import type { DocTranslation } from "./public-payload.types";
+export declare function makeBasicTranslationsPayload(siteContext: Pick<SiteContext, "siteSchema" | "multilingual">): DocTranslation[];
+export declare function loadTranslationsAsDrops(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedSectionId): Promise<DropInst<DocTranslation>[]>;