@paroicms/server 0.146.0

package/dist/modules/public-site/liquidjs-tags/get-breadcrumb-liquidjs-tag.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGetBreadcrumbLiquidJsTag = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+const anywhere_lib_1 = require("@paroicms/anywhere-lib");
+const liquidjs_1 = require("liquidjs");
+const text_cache_1 = require("../../../common/text-cache");
+const context_1 = require("../../../context");
+const breadcrumb_queries_1 = require("../../../public-payload/breadcrumb.queries");
+const rendering_context_1 = require("../liquidjs-rendering/rendering-context");
+const availableParameterNames = new Set(["id"]);
+function createGetBreadcrumbLiquidJsTag(siteContext) {
+    return class GetBreadcrumbTag extends liquidjs_1.Tag {
+        #varName;
+        #args;
+        constructor(token, remainTokens, liquid) {
+            super(token, remainTokens, liquid);
+            this.#varName = this.tokenizer.readIdentifier().content;
+            this.#args = new liquidjs_1.Hash(token.args);
+        }
+        *render(ctx) {
+            const options = validateParameters(yield this.#args.render(ctx), this.#varName);
+            const documentId = (0, anywhere_lib_1.parseSectionId)(options.id);
+            const cacheKey = (0, rendering_context_1.makeTagCacheKeyForRendering)("getBreadcrumb", { tagParameters: options });
+            const renderingContext = (0, rendering_context_1.getRenderingContext)(ctx);
+            const cacheVal = renderingContext.getValueFromCache(cacheKey);
+            if (cacheVal.found) {
+                ctx.bottom()[this.#varName] = cacheVal.val;
+                return;
+            }
+            const val = yield (0, breadcrumb_queries_1.getPublicBreadcrumb)(siteContext, renderingContext.tracker, documentId);
+            renderingContext.addDependencyKey(...val.map((item) => (0, text_cache_1.makeCacheDependencyKey)({ documentId: (0, anywhere_lib_1.parseSectionId)(item.id) })));
+            renderingContext.setValueIntoCache(cacheKey, val);
+            ctx.bottom()[this.#varName] = val;
+        }
+    };
+}
+exports.createGetBreadcrumbLiquidJsTag = createGetBreadcrumbLiquidJsTag;
+function validateParameters(values, varName) {
+    for (const name of Object.keys(values)) {
+        if (!availableParameterNames.has(name) && name !== varName) {
+            context_1.appLog.warn(`[getBreadcrumb] unknown parameter "${name}"`);
+        }
+    }
+    return {
+        id: (0, data_formatters_lib_1.strVal)(values.id, { varName: "id" }),
+    };
+}
+//# sourceMappingURL=get-breadcrumb-liquidjs-tag.js.map

package/dist/modules/public-site/liquidjs-tags/get-breadcrumb-liquidjs-tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-breadcrumb-liquidjs-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/get-breadcrumb-liquidjs-tag.ts"],"names":[],"mappings":";;;AAAA,oEAAoD;AACpD,yDAA6D;AAC7D,uCAA+E;AAC/E,2DAAoE;AACpE,8CAA0C;AAC1C,mFAGoD;AAEpD,+EAGiD;AAEjD,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAEhD,SAAgB,8BAA8B,CAAC,WAAwB;IACrE,OAAO,MAAM,gBAAiB,SAAQ,cAAG;QAEvC,QAAQ,CAAS;QACjB,KAAK,CAAO;QAEZ,YAAY,KAAe,EAAE,YAA6B,EAAE,MAAc;YACxE,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC;YACxD,IAAI,CAAC,KAAK,GAAG,IAAI,eAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QAED,CAAC,MAAM,CAAC,GAAY;YAClB,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChF,MAAM,UAAU,GAAG,IAAA,6BAAc,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,IAAA,+CAA2B,EAAC,eAAe,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;YAC1F,MAAM,gBAAgB,GAAG,IAAA,uCAAmB,EAAC,GAAG,CAAC,CAAC;YAElD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC9D,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAClB,GAAG,CAAC,MAAM,EAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;gBACpD,OAAO;YACT,CAAC;YAED,MAAM,GAAG,GAA2B,MAAM,IAAA,wCAAmB,EAC3D,WAAW,EACX,gBAAgB,CAAC,OAAO,EACxB,UAAU,CACX,CAAC;YAEF,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mCAAsB,EAAC,EAAE,UAAU,EAAE,IAAA,6BAAc,EAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACtF,CAAC;YAEF,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACjD,GAAG,CAAC,MAAM,EAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;QAC7C,CAAC;KACF,CAAC;AACJ,CAAC;AAtCD,wEAsCC;AAED,SAAS,kBAAkB,CAAC,MAAW,EAAE,OAAe;IACtD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3D,gBAAM,CAAC,IAAI,CAAC,sCAAsC,IAAI,GAAG,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAA,4BAAM,EAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;KACzC,CAAC;AACJ,CAAC"}

package/dist/modules/public-site/liquidjs-tags/get-page-tag.d.ts

@@ -0,0 +1,13 @@
+import { Context, Hash, Liquid, TagToken, TopLevelToken } from "liquidjs";
+import { SiteContext } from "../../../site-context/site-context.types";
+export declare function createGetPageLiquidJsTag(siteContext: SiteContext): {
+    new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
+        tokenizer: any;
+        "__#4@#varName": string;
+        "__#4@#args": Hash;
+        render(ctx: Context): Generator<unknown, void, any>;
+        name: string;
+        liquid: Liquid;
+        token: TagToken;
+    };
+};

package/dist/modules/public-site/liquidjs-tags/get-page-tag.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGetPageLiquidJsTag = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+const anywhere_lib_1 = require("@paroicms/anywhere-lib");
+const liquidjs_1 = require("liquidjs");
+const text_cache_1 = require("../../../common/text-cache");
+const create_page_drop_1 = require("../../../public-payload/create-page-drop");
+const page_values_queries_1 = require("../../../public-payload/page-values.queries");
+const rendering_context_1 = require("../liquidjs-rendering/rendering-context");
+const availableParameterNames = new Set(["id", "fields"]);
+function createGetPageLiquidJsTag(siteContext) {
+    return class GetPageTag extends liquidjs_1.Tag {
+        #varName;
+        #args;
+        constructor(token, remainTokens, liquid) {
+            super(token, remainTokens, liquid);
+            this.#varName = this.tokenizer.readIdentifier().content;
+            this.#args = new liquidjs_1.Hash(token.args);
+        }
+        *render(ctx) {
+            const options = validateParameters(yield this.#args.render(ctx), this.#varName, siteContext);
+            const cacheKey = (0, rendering_context_1.makeTagCacheKeyForRendering)("getPage", { tagParameters: options });
+            const renderingContext = (0, rendering_context_1.getRenderingContext)(ctx);
+            let documentId;
+            if ((0, data_formatters_lib_1.isNumeric)(options.id)) {
+                const page = ctx.getSync(["page"]);
+                const lang = (0, data_formatters_lib_1.strValOrUndef)(page?.lang) ?? "en";
+                documentId = {
+                    lang,
+                    leafId: options.id,
+                };
+            }
+            else {
+                documentId = (0, anywhere_lib_1.parseSectionId)(options.id);
+            }
+            renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({ documentId }));
+            const cacheVal = renderingContext.getValueFromCache(cacheKey);
+            if (cacheVal.found) {
+                ctx.bottom()[this.#varName] = cacheVal.val;
+                return;
+            }
+            const val = yield loadPage(siteContext, renderingContext, documentId, options);
+            renderingContext.setValueIntoCache(cacheKey, val);
+            ctx.bottom()[this.#varName] = val;
+        }
+    };
+}
+exports.createGetPageLiquidJsTag = createGetPageLiquidJsTag;
+function validateParameters(values, varName, { siteLog }) {
+    for (const name of Object.keys(values)) {
+        if (!availableParameterNames.has(name) && name !== varName) {
+            siteLog.warn(`[getPage] unknown parameter "${name}"`);
+        }
+    }
+    return {
+        id: (0, data_formatters_lib_1.strVal)(values.id, { varName: "id" }),
+        fields: (0, data_formatters_lib_1.strValOrUndef)(values.fields, { varName: "fields" }),
+    };
+}
+async function loadPage(siteContext, renderingContext, documentId, options) {
+    const fieldNames = options.fields?.trim().split(/\s*,\s*/);
+    const pageValues = await (0, page_values_queries_1.getPageItem)(siteContext, renderingContext.tracker, documentId);
+    return (0, create_page_drop_1.createPagePayloadDrop)(siteContext, renderingContext, pageValues, {
+        fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
+    });
+}
+//# sourceMappingURL=get-page-tag.js.map

package/dist/modules/public-site/liquidjs-tags/get-page-tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-page-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/get-page-tag.ts"],"names":[],"mappings":"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"}

package/dist/modules/public-site/liquidjs-tags/get-pages-tag.d.ts

@@ -0,0 +1,13 @@
+import { Context, Hash, Liquid, TagToken, TopLevelToken } from "liquidjs";
+import { SiteContext } from "../../../site-context/site-context.types";
+export declare function createGetPagesLiquidJsTag(siteContext: SiteContext): {
+    new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
+        tokenizer: any;
+        "__#5@#varName": string;
+        "__#5@#args": Hash;
+        render(ctx: Context): Generator<unknown, void, any>;
+        name: string;
+        liquid: Liquid;
+        token: TagToken;
+    };
+};

package/dist/modules/public-site/liquidjs-tags/get-pages-tag.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGetPagesLiquidJsTag = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+const anywhere_lib_1 = require("@paroicms/anywhere-lib");
+const liquidjs_1 = require("liquidjs");
+const text_cache_1 = require("../../../common/text-cache");
+const utils_helper_1 = require("../../../helpers/utils-helper");
+const create_page_drop_1 = require("../../../public-payload/create-page-drop");
+const page_values_queries_1 = require("../../../public-payload/page-values.queries");
+const site_schema_helpers_1 = require("../../../site-schema/site-schema-helpers");
+const rendering_context_1 = require("../liquidjs-rendering/rendering-context");
+const availableParameterNames = new Set([
+    "parentId",
+    "orderBy",
+    "limit",
+    "withTotal",
+    "fields",
+    "flaggedWithId",
+]);
+function createGetPagesLiquidJsTag(siteContext) {
+    return class GetPagesTag extends liquidjs_1.Tag {
+        #varName;
+        #args;
+        constructor(token, remainTokens, liquid) {
+            super(token, remainTokens, liquid);
+            this.#varName = this.tokenizer.readIdentifier().content;
+            this.#args = new liquidjs_1.Hash(token.args);
+        }
+        *render(ctx) {
+            const options = validateParameters(yield this.#args.render(ctx), this.#varName, siteContext);
+            const parentId = (0, anywhere_lib_1.parseSectionId)(options.parentId);
+            const cacheKey = (0, rendering_context_1.makeTagCacheKeyForRendering)("getPages", { tagParameters: options });
+            const renderingContext = (0, rendering_context_1.getRenderingContext)(ctx);
+            renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({ documentId: parentId, relation: "children" }));
+            const cacheVal = renderingContext.getValueFromCache(cacheKey);
+            if (cacheVal.found) {
+                ctx.bottom()[this.#varName] = cacheVal.val;
+                return;
+            }
+            const val = yield loadPagesWithTotal(siteContext, renderingContext, parentId, options);
+            renderingContext.setValueIntoCache(cacheKey, val);
+            ctx.bottom()[this.#varName] = val;
+        }
+    };
+}
+exports.createGetPagesLiquidJsTag = createGetPagesLiquidJsTag;
+function validateParameters(values, varName, { siteLog }) {
+    for (const name of Object.keys(values)) {
+        if (!availableParameterNames.has(name) && name !== varName) {
+            siteLog.warn(`[getPages] unknown parameter "${name}"`);
+        }
+    }
+    return {
+        parentId: (0, data_formatters_lib_1.strVal)(values.parentId, { varName: "parentId" }),
+        orderBy: (0, data_formatters_lib_1.strValOrUndef)(values.orderBy, { varName: "orderBy" }),
+        limit: (0, data_formatters_lib_1.nbValOrUndef)(values.limit, { varName: "limit" }),
+        withTotal: (0, data_formatters_lib_1.boolValOrUndef)(values.withTotal, { varName: "withTotal" }),
+        fields: (0, data_formatters_lib_1.strValOrUndef)(values.fields, { varName: "fields" }),
+        flaggedWithId: (0, data_formatters_lib_1.strValOrUndef)(values.flaggedWithId, { varName: "flaggedWithId" }),
+    };
+}
+async function loadPagesWithTotal(siteContext, renderingContext, parentId, options) {
+    const fieldNames = options.fields?.trim().split(/\s*,\s*/);
+    const flaggedWithLeafId = (0, anywhere_lib_1.isDef)(options.flaggedWithId)
+        ? (0, utils_helper_1.toLeafId)(options.flaggedWithId)
+        : undefined;
+    const result = options.withTotal
+        ? await (0, page_values_queries_1.getPageItemsWithTotal)(siteContext, renderingContext.tracker, {
+            ...options,
+            parentId,
+            orderBy: options.orderBy ? (0, site_schema_helpers_1.parseChildOrdering)(options.orderBy) : undefined,
+            flaggedWithTermId: flaggedWithLeafId,
+        })
+        : {
+            list: await (0, page_values_queries_1.getPageItems)(siteContext, renderingContext.tracker, {
+                ...options,
+                parentId,
+                orderBy: options.orderBy ? (0, site_schema_helpers_1.parseChildOrdering)(options.orderBy) : undefined,
+                flaggedWithTermId: flaggedWithLeafId,
+            }),
+            total: undefined,
+        };
+    const val = {
+        list: result.list.length === 0
+            ? undefined
+            : result.list.map((item) => (0, create_page_drop_1.createPagePayloadDrop)(siteContext, renderingContext, item, {
+                fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
+            })),
+        total: result.total,
+    };
+    return val;
+}
+//# sourceMappingURL=get-pages-tag.js.map

package/dist/modules/public-site/liquidjs-tags/get-pages-tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-pages-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/get-pages-tag.ts"],"names":[],"mappings":"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"}

package/dist/modules/public-site/liquidjs-tags/get-siblings-liquidjs-tag.d.ts

@@ -0,0 +1,13 @@
+import { Context, Hash, Liquid, TagToken, TopLevelToken } from "liquidjs";
+import { SiteContext } from "../../../site-context/site-context.types";
+export declare function createGetSiblingsLiquidJsTag(siteContext: SiteContext): {
+    new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
+        tokenizer: any;
+        "__#7@#varName": string;
+        "__#7@#args": Hash;
+        render(ctx: Context): Generator<unknown, void, any>;
+        name: string;
+        liquid: Liquid;
+        token: TagToken;
+    };
+};

package/dist/modules/public-site/liquidjs-tags/get-siblings-liquidjs-tag.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGetSiblingsLiquidJsTag = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+const anywhere_lib_1 = require("@paroicms/anywhere-lib");
+const liquidjs_1 = require("liquidjs");
+const text_cache_1 = require("../../../common/text-cache");
+const context_1 = require("../../../context");
+const create_page_payload_drop_1 = require("../../../public-payload/create-page-payload-drop");
+const get_siblings_queries_1 = require("../../../public-payload/get-siblings.queries");
+const rendering_context_1 = require("../liquidjs-rendering/rendering-context");
+const availableParameterNames = new Set(["id"]);
+function createGetSiblingsLiquidJsTag(siteContext) {
+    return class GetSiblingsTag extends liquidjs_1.Tag {
+        #varName;
+        #args;
+        constructor(token, remainTokens, liquid) {
+            super(token, remainTokens, liquid);
+            this.#varName = this.tokenizer.readIdentifier().content;
+            this.#args = new liquidjs_1.Hash(token.args);
+        }
+        *render(ctx) {
+            const options = validateParameters(yield this.#args.render(ctx), this.#varName);
+            const documentId = (0, anywhere_lib_1.parseSectionId)(options.id);
+            const cacheKey = (0, rendering_context_1.makeTagCacheKeyForRendering)("getSiblings", { tagParameters: options });
+            const renderingContext = (0, rendering_context_1.getRenderingContext)(ctx);
+            const cacheVal = renderingContext.getValueFromCache(cacheKey);
+            if (cacheVal.found) {
+                ctx.bottom()[this.#varName] = cacheVal.val;
+                return;
+            }
+            const raw = yield (0, get_siblings_queries_1.getSiblingDocuments)(siteContext, renderingContext.tracker, documentId);
+            const val = {
+                previous: raw.previous
+                    ? (0, create_page_payload_drop_1.createPagePayloadDrop)(siteContext, renderingContext, raw.previous)
+                    : undefined,
+                next: raw.next ? (0, create_page_payload_drop_1.createPagePayloadDrop)(siteContext, renderingContext, raw.next) : undefined,
+            };
+            if (raw.previous) {
+                renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({ documentId: raw.previous }));
+            }
+            if (raw.next) {
+                renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({ documentId: raw.next }));
+            }
+            renderingContext.setValueIntoCache(cacheKey, val);
+            ctx.bottom()[this.#varName] = val;
+        }
+    };
+}
+exports.createGetSiblingsLiquidJsTag = createGetSiblingsLiquidJsTag;
+function validateParameters(values, varName) {
+    for (const name of Object.keys(values)) {
+        if (!availableParameterNames.has(name) && name !== varName) {
+            context_1.appLog.warn(`[getSiblings] unknown parameter "${name}"`);
+        }
+    }
+    return {
+        id: (0, data_formatters_lib_1.strVal)(values.id, { varName: "id" }),
+    };
+}
+//# sourceMappingURL=get-siblings-liquidjs-tag.js.map

package/dist/modules/public-site/liquidjs-tags/get-siblings-liquidjs-tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-siblings-liquidjs-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/get-siblings-liquidjs-tag.ts"],"names":[],"mappings":"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"}

package/dist/modules/public-site/liquidjs-tags/use-image-tag.d.ts

@@ -0,0 +1,13 @@
+import { Context, Hash, Liquid, TagToken, TopLevelToken } from "liquidjs";
+import { SiteContext } from "../../../site-context/site-context.types";
+export declare function createUseImageLiquidJsTag(siteContext: SiteContext): {
+    new (tagToken: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
+        tokenizer: any;
+        "__#6@#hash": Hash;
+        "__#6@#varName": string;
+        render(ctx: Context): Generator<unknown, void, unknown>;
+        name: string;
+        liquid: Liquid;
+        token: TagToken;
+    };
+};

package/dist/modules/public-site/liquidjs-tags/use-image-tag.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUseImageLiquidJsTag = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
+const liquidjs_1 = require("liquidjs");
+const make_image_available_1 = require("../../../public-payload/make-image-available");
+const rendering_context_1 = require("../liquidjs-rendering/rendering-context");
+const availableParameterNames = new Set(["uid", "handle", "size", "autoCrop"]);
+function createUseImageLiquidJsTag(siteContext) {
+    return class UseImageTag extends liquidjs_1.Tag {
+        #hash;
+        #varName;
+        constructor(tagToken, remainTokens, liquid) {
+            super(tagToken, remainTokens, liquid);
+            this.#varName = this.tokenizer.readIdentifier().content;
+            this.#hash = new liquidjs_1.Hash(tagToken.args);
+        }
+        *render(ctx) {
+            const options = validateParameters(yield this.#hash.render(ctx), this.#varName, siteContext);
+            const cacheKey = (0, rendering_context_1.makeTagCacheKeyForRendering)("useImage", { tagParameters: options });
+            const renderingContext = (0, rendering_context_1.getRenderingContext)(ctx);
+            const cacheVal = renderingContext.getValueFromCache(cacheKey);
+            if (cacheVal.found) {
+                ctx.bottom()[this.#varName] = cacheVal.val;
+                return;
+            }
+            const val = yield (0, make_image_available_1.makeImageAvailable)(siteContext, renderingContext, options);
+            renderingContext.setValueIntoCache(cacheKey, val);
+            ctx.bottom()[this.#varName] = val;
+        }
+    };
+}
+exports.createUseImageLiquidJsTag = createUseImageLiquidJsTag;
+function validateParameters(values, varName, { siteLog }) {
+    for (const name of Object.keys(values)) {
+        if (!availableParameterNames.has(name) && name !== varName) {
+            siteLog.warn(`[useImage] unknown parameter "${name}"`);
+        }
+    }
+    const size = (0, data_formatters_lib_1.strVal)(values.size);
+    if (!(0, server_image_cache_engine_1.isVariantName)(size))
+        throw new Error(`useImage param size is not valid, size:${size}`);
+    const uid = (0, data_formatters_lib_1.strValOrUndef)(values.uid);
+    const handle = (0, data_formatters_lib_1.strValOrUndef)(values.handle);
+    const autoCrop = (0, data_formatters_lib_1.boolValOrUndef)(values.autoCrop);
+    if (uid)
+        return { imageSel: { uid }, size, autoCrop };
+    if (handle)
+        return { imageSel: { handle }, size, autoCrop };
+    throw new Error("useImage: missing 'uid' parameter");
+}
+//# sourceMappingURL=use-image-tag.js.map

package/dist/modules/public-site/liquidjs-tags/use-image-tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-image-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/use-image-tag.ts"],"names":[],"mappings":";;;AAAA,oEAAmF;AACnF,mFAAoE;AACpE,uCAA+E;AAC/E,uFAIsD;AAEtD,+EAGiD;AAEjD,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;AAE/E,SAAgB,yBAAyB,CAAC,WAAwB;IAChE,OAAO,MAAM,WAAY,SAAQ,cAAG;QAElC,KAAK,CAAO;QACZ,QAAQ,CAAS;QAEjB,YAAY,QAAkB,EAAE,YAA6B,EAAE,MAAc;YAC3E,KAAK,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YAEtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC;YAExD,IAAI,CAAC,KAAK,GAAG,IAAI,eAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QAED,CAAC,MAAM,CAAC,GAAY;YAClB,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAC7F,MAAM,QAAQ,GAAG,IAAA,+CAA2B,EAAC,UAAU,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;YACrF,MAAM,gBAAgB,GAAG,IAAA,uCAAmB,EAAC,GAAG,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC9D,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAClB,GAAG,CAAC,MAAM,EAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;gBACpD,OAAO;YACT,CAAC;YAED,MAAM,GAAG,GAAG,MAAM,IAAA,yCAAkB,EAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAE7E,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACjD,GAAG,CAAC,MAAM,EAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;QAC7C,CAAC;KACF,CAAC;AACJ,CAAC;AA9BD,8DA8BC;AAED,SAAS,kBAAkB,CACzB,MAAW,EACX,OAAe,EACf,EAAE,OAAO,EAAgC;IAEzC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3D,OAAO,CAAC,IAAI,CAAC,iCAAiC,IAAI,GAAG,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG,IAAA,4BAAM,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,CAAC,IAAA,yCAAa,EAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,EAAE,CAAC,CAAC;IAE5F,MAAM,GAAG,GAAG,IAAA,mCAAa,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,IAAA,mCAAa,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,IAAA,oCAAc,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEjD,IAAI,GAAG;QAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACtD,IAAI,MAAM;QAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;AACvD,CAAC"}

package/dist/modules/public-site/media-serve/_media-serve-helpers.d.ts

@@ -0,0 +1,11 @@
+import { CompleteVariantName } from "@paroicms/server-image-cache-engine";
+export interface ParsedMediaName {
+    mediaUid: string;
+    variantName?: CompleteVariantName;
+}
+export declare function parseMediaName(param: string): ParsedMediaName | undefined;
+export declare function makeMediaName({ mediaUid, variantSize, mediaType, }: {
+    mediaUid: string;
+    variantSize?: `${number}x${number}`;
+    mediaType: string;
+}): string;

package/dist/modules/public-site/media-serve/_media-serve-helpers.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeMediaName = exports.parseMediaName = void 0;
+function parseMediaName(param) {
+    const found = param.match(/^([0-9a-f-]{36})(?:\-([0-9]+x[0-9]+))?\.[0-9a-z]+$/);
+    if (!found)
+        return;
+    const [_, mediaUid, variantName] = found;
+    return {
+        mediaUid,
+        variantName: variantName,
+    };
+}
+exports.parseMediaName = parseMediaName;
+function makeMediaName({ mediaUid, variantSize, mediaType, }) {
+    return `${mediaUid}${variantSize ? `-${variantSize}` : ""}.${mediaTypeToFileExtension(mediaType)}`;
+}
+exports.makeMediaName = makeMediaName;
+function mediaTypeToFileExtension(mediaType) {
+    const regexMatchArray = mediaType.match(/\w+\/([-+.\w]+)/);
+    if (!regexMatchArray) {
+        throw new Error("media extension is incorrect.");
+    }
+    return regexMatchArray[1];
+}
+//# sourceMappingURL=_media-serve-helpers.js.map

package/dist/modules/public-site/media-serve/_media-serve-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_media-serve-helpers.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/_media-serve-helpers.ts"],"names":[],"mappings":";;;AAOA,SAAgB,cAAc,CAAC,KAAa;IAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAChF,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;IACzC,OAAO;QACL,QAAQ;QACR,WAAW,EAAE,WAA8C;KAC5D,CAAC;AACJ,CAAC;AARD,wCAQC;AAED,SAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,WAAW,EACX,SAAS,GAKV;IACC,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,wBAAwB,CACnF,SAAS,CACV,EAAE,CAAC;AACN,CAAC;AAZD,sCAYC;AAED,SAAS,wBAAwB,CAAC,SAAiB;IACjD,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAE3D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC"}

package/dist/modules/public-site/media-serve/media-serve.controller.d.ts

@@ -0,0 +1,4 @@
+import type { Request, Response } from "express";
+export declare class MediaServeController {
+    serveMedia(param: string, res: Response, req: Request): Promise<void>;
+}

package/dist/modules/public-site/media-serve/media-serve.controller.js

@@ -0,0 +1,140 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MediaServeController = void 0;
+const common_1 = require("@nestjs/common");
+const stream_1 = require("stream");
+const http_helpers_1 = require("../../../express/http-helpers");
+const utils_helper_1 = require("../../../helpers/utils-helper");
+const site_context_1 = require("../../../site-context/site-context");
+const _media_serve_helpers_1 = require("./_media-serve-helpers");
+let MediaServeController = class MediaServeController {
+    async serveMedia(param, res, req) {
+        const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+        const parsedName = (0, _media_serve_helpers_1.parseMediaName)(param);
+        if (!parsedName) {
+            throw new common_1.NotFoundException("media not found");
+        }
+        const fts = parsedName.variantName
+            ? await getImageToServe(siteContext, {
+                mediaUid: parsedName.mediaUid,
+                variantName: parsedName.variantName,
+                ifModifiedSince: req.headers["if-modified-since"],
+            })
+            : await getFileToServe(siteContext, {
+                mediaUid: parsedName.mediaUid,
+                ifModifiedSince: req.headers["if-modified-since"],
+            });
+        if (fts.status === 304) {
+            res.setHeader("content-type", fts.mediaType);
+            res.append("Last-Modified", fts.lastModified);
+            return (0, http_helpers_1.serve304NotModified)(res);
+        }
+        const { file, lastModified } = fts;
+        const mediaName = (0, _media_serve_helpers_1.makeMediaName)({
+            mediaType: file.mediaType,
+            mediaUid: parsedName.mediaUid,
+            variantSize: parsedName.variantName,
+        });
+        if (mediaName !== param) {
+            (0, http_helpers_1.serve301Redirect)(res, `/medias/${mediaName}`);
+            return;
+        }
+        res.setHeader("content-type", file.mediaType);
+        res.append("Last-Modified", lastModified);
+        stream_1.Readable.from(file.binaryFile)
+            .on("data", (chunk) => {
+            res.write(chunk);
+        })
+            .on("error", (error) => {
+            res.end(error);
+        })
+            .on("end", () => {
+            res.end();
+        });
+    }
+};
+exports.MediaServeController = MediaServeController;
+__decorate([
+    (0, common_1.Get)(":param"),
+    __param(0, (0, common_1.Param)("param")),
+    __param(1, (0, common_1.Res)()),
+    __param(2, (0, common_1.Req)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object, Object]),
+    __metadata("design:returntype", Promise)
+], MediaServeController.prototype, "serveMedia", null);
+exports.MediaServeController = MediaServeController = __decorate([
+    (0, common_1.Controller)("medias"),
+    (0, common_1.UseInterceptors)(common_1.ClassSerializerInterceptor)
+], MediaServeController);
+async function getImageToServe(siteContext, options) {
+    const { mediaUid, variantName, ifModifiedSince } = options;
+    let file = await siteContext.imageCache.getImageVariantWithBinary({
+        imageUid: mediaUid,
+        variantName,
+    });
+    if (file) {
+        if (ifModifiedSince === file.lastModified) {
+            return {
+                status: 304,
+                lastModified: file.lastModified,
+                mediaType: file.mediaType,
+            };
+        }
+    }
+    else {
+        file = await tryToCreateImageVariant(siteContext, { mediaUid, variantName });
+        if (!file)
+            throw new common_1.NotFoundException("image not found");
+    }
+    return {
+        status: 200,
+        lastModified: file.lastModified,
+        file,
+    };
+}
+async function getFileToServe(siteContext, options) {
+    const { mediaUid, ifModifiedSince } = options;
+    const media = await siteContext.mediaStorage.getMediaWithBinary(mediaUid);
+    if (!media)
+        throw new common_1.NotFoundException(`media '${mediaUid}' not found`);
+    const lastModified = (0, utils_helper_1.toHttpHeaderIfModifiedSince)(media.modifiedTs);
+    if (lastModified === ifModifiedSince) {
+        return { status: 304, lastModified, mediaType: media.mediaType };
+    }
+    return {
+        status: 200,
+        lastModified,
+        file: media,
+    };
+}
+async function tryToCreateImageVariant(siteContext, options) {
+    const { mediaUid, variantName } = options;
+    const media = await siteContext.mediaStorage.getMedia({ uid: mediaUid });
+    if (!media || media.kind !== "image") {
+        throw new common_1.NotFoundException(`image '${mediaUid}' not found`);
+    }
+    return await siteContext.imageCache.conditionallyCreateImageVariantWithBinary({
+        imageUid: media.uid,
+        mediaType: media.mediaType,
+        width: media.width,
+        height: media.height,
+    }, {
+        authorisedVariantNames: siteContext.themeConf.fTextImages,
+        variantName,
+        dependsOnCacheKey: "themeConf.fTextImages",
+    });
+}
+//# sourceMappingURL=media-serve.controller.js.map

package/dist/modules/public-site/media-serve/media-serve.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AAGxB,mCAAkC;AAClC,gEAAsF;AACtF,gEAA4E;AAC5E,qEAAoE;AAEpE,iEAAuE;AAIhE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEzB,AAAN,KAAK,CAAC,UAAU,CAAiB,KAAa,EAAS,GAAa,EAAS,GAAY;QACvF,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,IAAA,qCAAc,EAAC,KAAK,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,0BAAiB,CAAC,iBAAiB,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,GAAG,GAAG,UAAU,CAAC,WAAW;YAChC,CAAC,CAAC,MAAM,eAAe,CAAC,WAAW,EAAE;gBACjC,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC;aAClD,CAAC;YACJ,CAAC,CAAC,MAAM,cAAc,CAAC,WAAW,EAAE;gBAChC,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC;aAClD,CAAC,CAAC;QAEP,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;YAC9C,OAAO,IAAA,kCAAmB,EAAC,GAAG,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC;QAEnC,MAAM,SAAS,GAAG,IAAA,oCAAa,EAAC;YAC9B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,WAAW,EAAE,UAAU,CAAC,WAAW;SACpC,CAAC,CAAC;QACH,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACxB,IAAA,+BAAgB,EAAC,GAAG,EAAE,WAAW,SAAS,EAAE,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAE1C,iBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;aAC3B,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YACpB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACrB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC;aACD,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACd,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;CACF,CAAA;AArDY,oDAAoB;AAEzB;IADL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACI,WAAA,IAAA,cAAK,EAAC,OAAO,CAAC,CAAA;IAAiB,WAAA,IAAA,YAAG,GAAE,CAAA;IAAiB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;sDAkD3E;+BApDU,oBAAoB;IAFhC,IAAA,mBAAU,EAAC,QAAQ,CAAC;IACpB,IAAA,wBAAe,EAAC,mCAA0B,CAAC;GAC/B,oBAAoB,CAqDhC;AAcD,KAAK,UAAU,eAAe,CAC5B,WAAwB,EACxB,OAAyF;IAEzF,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAE3D,IAAI,IAAI,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAChE,QAAQ,EAAE,QAAQ;QAClB,WAAW;KACZ,CAAC,CAAC;IACH,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,eAAe,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1C,OAAO;gBACL,MAAM,EAAE,GAAG;gBACX,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,0BAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,MAAM,EAAE,GAAG;QACX,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,IAAI;KACL,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAwB,EACxB,OAAuD;IAEvD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAC9C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC1E,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,0BAAiB,CAAC,UAAU,QAAQ,aAAa,CAAC,CAAC;IACzE,MAAM,YAAY,GAAG,IAAA,0CAA2B,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACnE,IAAI,YAAY,KAAK,eAAe,EAAE,CAAC;QACrC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;IACnE,CAAC;IACD,OAAO;QACL,MAAM,EAAE,GAAG;QACX,YAAY;QACZ,IAAI,EAAE,KAAK;KACZ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,WAAwB,EACxB,OAA+D;IAE/D,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACrC,MAAM,IAAI,0BAAiB,CAAC,UAAU,QAAQ,aAAa,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,MAAM,WAAW,CAAC,UAAU,CAAC,yCAAyC,CAC3E;QACE,QAAQ,EAAE,KAAK,CAAC,GAAG;QACnB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,EACD;QACE,sBAAsB,EAAE,WAAW,CAAC,SAAS,CAAC,WAAW;QACzD,WAAW;QACX,iBAAiB,EAAE,uBAAuB;KAC3C,CACF,CAAC;AACJ,CAAC"}

package/dist/modules/public-site/media-serve/media-serve.module.d.ts

@@ -0,0 +1,2 @@
+export declare class MediaServeModule {
+}