@paroicms/server 1.16.0 → 1.18.0

package/ddl/main.ddl.sql

@@ -1,12 +1,14 @@
 PRAGMA journal_mode = TRUNCATE;
 PRAGMA foreign_keys = 1;
 
-create table PaDbMetadata (
-  dbSchema varchar(100) not null primary key,
-  dbVersion integer not null
+create table PaMetadata (
+  dbSchema varchar(100) not null,
+  k varchar(100) not null,
+  val varchar(250) not null,
+  primary key (dbSchema, k)
 );
 
-insert into PaDbMetadata (dbSchema, dbVersion) values ('main', 6);
+insert into PaMetadata (dbSchema, k, val) values ('main', 'dbSchemaVersion', '7');
 
 create table PaAccount (
   id integer not null primary key autoincrement,
@@ -27,7 +29,7 @@ create table PaLeaf (
   unique (parentId, relativeId)
 );
 
-create index PaLeaf_leafType_index on PaLeaf (leafType);
+create index PaLeaf_leafType_idx on PaLeaf (leafType);
 
 create table PaLeafItem (
   leafId integer not null primary key references PaLeaf (id) on delete cascade,
@@ -35,7 +37,7 @@ create table PaLeafItem (
   itemNum integer
 );
 
-create index PaLeafItem_listName_index on PaLeafItem (listName);
+create index PaLeafItem_listName_idx on PaLeafItem (listName);
 
 create table PaTermFlag (
   termId integer not null references PaLeaf (id) on delete cascade,

package/dist/app-conf/app-conf-provider.d.ts

@@ -0,0 +1,3 @@
+import type { Configuration } from "../typeonly/configuration-types";
+import type { AppConf } from "./app-conf.types";
+export declare function toAppConf(conf: Configuration): AppConf;

package/dist/app-conf/app-conf-provider.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toAppConf = void 0;
+function toAppConf(conf) {
+    if (conf.thisServer) {
+        console.warn(`[WARNING] "thisServer" is deprecated, use "port", "publicPort", "boPort" and "hostname" instead.`);
+    }
+    if (conf.log) {
+        console.warn(`[WARNING] "log" is deprecated, use "logLevel" and "logFile" instead.`);
+    }
+    const port = conf.port ?? conf.thisServer?.port;
+    if (!port)
+        throw new Error("missing port in the configuration");
+    const publicPort = conf.publicPort ?? conf.thisServer?.publicPort;
+    const boPort = conf.boPort ?? conf.thisServer?.boPublicPort;
+    const hostName = conf.hostname ?? conf.thisServer?.hostName;
+    if (conf.clearImageCacheAfterStart && !conf.clearCacheAfterStart) {
+        throw new Error('"clearImageCacheAfterStart" can\'t be set when "clearCacheAfterStart" is not set');
+    }
+    const cacheTimeToIdle = conf.cacheTimeToIdle ?? (conf.enableCache ? "7d" : "disabled");
+    if (!isCacheDuration(cacheTimeToIdle)) {
+        throw new Error(`Invalid cacheTimeToIdle: ${cacheTimeToIdle}`);
+    }
+    const base = {
+        port,
+        publicPort: publicPort ?? port,
+        boPort: boPort ?? publicPort ?? port,
+        hostname: hostName ?? undefined,
+        publicProtocol: conf.publicProtocol ?? (conf.thisServer?.https ? "https" : undefined) ?? "http",
+        logLevel: conf.logLevel ?? conf.log?.level ?? "info",
+        logFile: conf.logFile ?? conf.log?.file,
+        allowRobots: conf.allowRobots,
+        immutableAssets: conf.immutableAssets ?? !!conf.enableCache,
+        cacheTimeToIdle,
+        clearCacheAfterStart: conf.clearCacheAfterStart,
+        clearImageCacheAfterStart: conf.clearImageCacheAfterStart,
+        graphqlDevTools: conf.graphqlDevTools,
+        generateMissingDatabases: conf.generateMissingDatabases,
+        googleAuth: conf.googleAuth,
+        awsSesMail: conf.awsSesMail,
+        googleRecaptcha: conf.googleRecaptcha,
+        imageProcessor: conf.imageProcessor
+            ? formatImageProcessor(conf.imageProcessor)
+            : {
+                allowConcurrency: false,
+            },
+        devAccount: conf.devAccount,
+        platformAdminAccounts: conf.platformAdminAccounts,
+    };
+    if ("singleSite" in conf) {
+        return {
+            kind: "singleSite",
+            ...base,
+            singleSite: conf.singleSite,
+        };
+    }
+    const sitePacks = conf.sitePacks.map((item) => {
+        if ("serveOn" in item) {
+            return item;
+        }
+        console.warn(`[WARNING] "serveAs" configuration is deprecated, please rename it to "serveOn" in pack '${item.packName}'`);
+        const { serveAs, ...rest } = item;
+        return { ...rest, serveOn: serveAs };
+    });
+    return {
+        kind: "multisite",
+        ...base,
+        platform: conf.platform,
+        sitePacks,
+    };
+}
+exports.toAppConf = toAppConf;
+function isCacheDuration(value) {
+    if (value === "disabled" || value === "infinite")
+        return true;
+    return /^[0-9]+d$/.test(value);
+}
+function formatImageProcessor(conf) {
+    if ("oneSharpAtATime" in conf) {
+        console.warn('[WARNING] "oneSharpAtATime" is deprecated, use "allowConcurrency" instead (inverse the value)');
+        return {
+            allowConcurrency: !conf.oneSharpAtATime,
+            cpuCoresPerFile: conf.cpuCoresPerFile,
+        };
+    }
+    return conf;
+}
+//# sourceMappingURL=app-conf-provider.js.map

package/dist/app-conf/app-conf-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-conf-provider.js","sourceRoot":"","sources":["../../src/app-conf/app-conf-provider.ts"],"names":[],"mappings":"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"}

package/dist/app-conf/app-conf.types.d.ts

@@ -0,0 +1,37 @@
+import type { AppLogLevel } from "../share/pino-app-log";
+import type { AwsSesMailConf, DevAccount, FqdnSitePackConf, GoogleAuthConf, GoogleRecaptchaConf, ImageProcessorConf, PlatformAdminAccount, SingleSiteConf, SubDomainSitePackConf } from "../typeonly/configuration-types";
+export type AppConf = SingleSiteAppConf | MultisiteAppConf;
+export interface AppConfBase {
+    port: number;
+    hostname?: string;
+    publicProtocol: "http" | "https";
+    publicPort: number;
+    boPort: number;
+    logLevel: "silent" | AppLogLevel;
+    logFile?: string;
+    allowRobots: boolean;
+    immutableAssets: boolean;
+    cacheTimeToIdle: CacheDuration;
+    clearCacheAfterStart?: boolean;
+    clearImageCacheAfterStart?: boolean;
+    graphqlDevTools?: boolean;
+    generateMissingDatabases?: boolean;
+    googleAuth?: GoogleAuthConf;
+    awsSesMail?: AwsSesMailConf;
+    googleRecaptcha?: GoogleRecaptchaConf;
+    imageProcessor: ImageProcessorConf;
+    devAccount?: DevAccount;
+    platformAdminAccounts?: PlatformAdminAccount[];
+}
+export type CacheDuration = `${number}d` | "disabled" | "infinite";
+export interface SingleSiteAppConf extends AppConfBase {
+    kind: "singleSite";
+    singleSite: SingleSiteConf;
+}
+export interface MultisiteAppConf extends AppConfBase {
+    kind: "multisite";
+    platform: {
+        dataDir: string;
+    };
+    sitePacks: (FqdnSitePackConf | SubDomainSitePackConf)[];
+}

package/dist/app-conf/app-conf.types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=app-conf.types.js.map

package/dist/app-conf/app-conf.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-conf.types.js","sourceRoot":"","sources":["../../src/app-conf/app-conf.types.ts"],"names":[],"mappings":""}

package/dist/common/child-ordering-query.d.ts

@@ -1,7 +1,7 @@
 import { type ChildOrdering, type DocumentSchema, type OrderByItem } from "@paroicms/anywhere-lib";
 import type { SelectQueryBuilder } from "typeorm";
 import type { SiteContext } from "../site-context/site-context.types";
-export declare function applyChildOrderingOnQuery(siteContext: Pick<SiteContext, "mainCn" | "siteSchema">, options: {
+export declare function applyChildOrderingOnQuery(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
     query: SelectQueryBuilder<any>;
     parentDocumentType: DocumentSchema;
     childOrdering?: ChildOrdering;

package/dist/common/child-ordering-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}

package/dist/common/text-cache.d.ts

@@ -29,7 +29,7 @@ export declare function makeCacheKey(options: {
     kind: "api";
     url: string;
 }): string;
-export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext, "mainCn" | "textCache" | "siteSchema">, options: {
+export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
     parentOf: ParsedSectionId;
 } | {
     documentId: ParsedSectionId;
@@ -39,6 +39,9 @@ export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext,
     fully: true;
     parentId: ParsedSectionId | undefined;
 }): Promise<void>;
+export declare function invalidateLeafInCache(siteContext: Pick<SiteContext, "textCache" | "cn" | "siteSchema">, { leafId }: {
+    leafId: string;
+}): Promise<void>;
 export declare function invalidateDocumentRelationCache(siteContext: Pick<SiteContext, "textCache">, options: {
     documentId: ParsedSectionId;
     relation: "children";
@@ -47,7 +50,11 @@ export declare function invalidateDocumentRelationCache(siteContext: Pick<SiteCo
     relation: "flagged";
     taxonomyLeafType: string;
 }): Promise<void>;
-export declare function invalidateMultipleDocumentsInCache(siteContext: Pick<SiteContext, "mainCn" | "textCache" | "siteSchema">, options: {
+export declare function depKeysOfLeafRelationCache(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
+    parentOfLeafId: string;
+    relation: "children";
+}): Promise<string[]>;
+export declare function invalidateMultipleDocumentsInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
     leafId: string;
     parentIds?: ParsedSectionId[];
     fully?: boolean;

package/dist/common/text-cache.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.invalidateMultipleDocumentsInCache = exports.invalidateDocumentRelationCache = exports.invalidateDocumentInCache = exports.makeCacheKey = exports.makeCacheDependencyKey = void 0;
+exports.invalidateMultipleDocumentsInCache = exports.depKeysOfLeafRelationCache = exports.invalidateDocumentRelationCache = exports.invalidateLeafInCache = exports.invalidateDocumentInCache = exports.makeCacheKey = exports.makeCacheDependencyKey = void 0;
 const anywhere_lib_1 = require("@paroicms/anywhere-lib");
 const load_documents_queries_1 = require("../modules/core/document/load-documents.queries");
 function makeCacheDependencyKey(options) {
@@ -33,7 +33,6 @@ function makeCacheKey(options) {
 }
 exports.makeCacheKey = makeCacheKey;
 async function invalidateDocumentInCache(siteContext, options) {
-    const dependencyKeys = [];
     const documentId = "documentId" in options
         ? options.documentId
         : await (0, load_documents_queries_1.getParentSectionIdOf)(siteContext, options.parentOf);
@@ -41,7 +40,10 @@ async function invalidateDocumentInCache(siteContext, options) {
         return;
     const fully = "fully" in options && options.fully;
     const withSlug = ("perimeter" in options && options.perimeter === "slug") || fully;
-    dependencyKeys.push(makeCacheDependencyKey({ documentId }), makeCacheDependencyKey({ leafId: documentId.leafId }));
+    const dependencyKeys = [
+        makeCacheDependencyKey({ documentId }),
+        makeCacheDependencyKey({ leafId: documentId.leafId }),
+    ];
     if (withSlug) {
         dependencyKeys.push(makeCacheDependencyKey({ documentId, perimeter: "slug" }));
     }
@@ -55,10 +57,31 @@ async function invalidateDocumentInCache(siteContext, options) {
     await siteContext.textCache.invalidate(dependencyKeys);
 }
 exports.invalidateDocumentInCache = invalidateDocumentInCache;
+async function invalidateLeafInCache(siteContext, { leafId }) {
+    const langs = siteContext.siteSchema.langs;
+    const documentIds = langs.map((lang) => ({ lang, leafId }));
+    const dependencyKeys = documentIds.map((documentId) => makeCacheDependencyKey({ documentId }));
+    dependencyKeys.push(...documentIds.map((documentId) => makeCacheDependencyKey({ leafId: documentId.leafId })));
+    const parentLeafId = await (0, load_documents_queries_1.getParentLeafIdOf)(siteContext, leafId);
+    if (parentLeafId) {
+        const parentDocumentIds = siteContext.siteSchema.langs.map((lang) => ({ lang, leafId }));
+        dependencyKeys.push(...parentDocumentIds.map((documentId) => makeCacheDependencyKey({ documentId, relation: "children" })));
+    }
+    await siteContext.textCache.invalidate(dependencyKeys);
+}
+exports.invalidateLeafInCache = invalidateLeafInCache;
 async function invalidateDocumentRelationCache(siteContext, options) {
     await siteContext.textCache.invalidate([makeCacheDependencyKey(options)]);
 }
 exports.invalidateDocumentRelationCache = invalidateDocumentRelationCache;
+async function depKeysOfLeafRelationCache(siteContext, options) {
+    const leafId = await (0, load_documents_queries_1.getParentLeafIdOf)(siteContext, options.parentOfLeafId);
+    if (leafId === undefined)
+        return [];
+    const documentIds = siteContext.siteSchema.langs.map((lang) => ({ lang, leafId }));
+    return documentIds.map((documentId) => makeCacheDependencyKey({ documentId, relation: "children" }));
+}
+exports.depKeysOfLeafRelationCache = depKeysOfLeafRelationCache;
 async function invalidateMultipleDocumentsInCache(siteContext, options) {
     const langs = siteContext.siteSchema.langs;
     const leafId = "leafId" in options

package/dist/common/text-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":";;;AAAA,yDAA+E;AAC/E,4FAIyD;AAGzD,SAAgB,sBAAsB,CACpC,OAIsB;IAEtB,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,UAAU,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5D,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;YAC7C,OAAO,KAAK,MAAM,YAAY,gBAAgB,EAAE,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,8BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,UAAU,IAAI,OAAO;QAAE,OAAO,GAAG,SAAS,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IACrE,IAAI,OAAO,CAAC,SAAS;QAAE,OAAO,GAAG,SAAS,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAClE,OAAO,SAAS,CAAC;AACnB,CAAC;AAnBD,wDAmBC;AAMD,SAAgB,YAAY,CAAC,OAK5B;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAClD,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IAC7C,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IAC5C,IAAI,IAAI,KAAK,UAAU;QAAE,OAAO,GAAG,IAAI,IAAI,MAAM,EAAE,CAAC;IACpD,IAAI,UAAU;QAAE,OAAO,GAAG,IAAI,IAAI,IAAA,8BAAe,EAAC,UAAU,CAAC,EAAE,CAAC;IAChE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;AACvC,CAAC;AAZD,oCAYC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,WAAqE,EACrE,OAGuF;IAEvF,MAAM,cAAc,GAAG,EAAE,CAAC;IAE1B,MAAM,UAAU,GACd,YAAY,IAAI,OAAO;QACrB,CAAC,CAAC,OAAO,CAAC,UAAU;QACpB,CAAC,CAAC,MAAM,IAAA,6CAAoB,EAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,MAAM,KAAK,GAAG,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC;IAClD,MAAM,QAAQ,GAAG,CAAC,WAAW,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC;IAEnF,cAAc,CAAC,IAAI,CACjB,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,EACtC,sBAAsB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CACtD,CAAC;IACF,IAAI,QAAQ,EAAE,CAAC;QACb,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,MAAM,QAAQ,GACZ,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAA,6CAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACjG,IAAI,QAAQ,EAAE,CAAC;QACb,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AACzD,CAAC;AApCD,8DAoCC;AAEM,KAAK,UAAU,+BAA+B,CACnD,WAA2C,EAC3C,OAEqE;IAErE,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AAPD,0EAOC;AAEM,KAAK,UAAU,kCAAkC,CACtD,WAAqE,EACrE,OAE+C;IAE/C,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC;IAE3C,MAAM,MAAM,GACV,QAAQ,IAAI,OAAO;QACjB,CAAC,CAAC,OAAO,CAAC,MAAM;QAChB,CAAC,CAAC,MAAM,IAAA,0CAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACnE,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO;IAEjC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAE5D,MAAM,cAAc,GAAG,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,cAAc,CAAC,IAAI,CACjB,sBAAsB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EACzD,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAC7D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GACb,WAAW,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS;QACvD,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,IAAA,+CAAsB,EAAC,WAAW,EAAE;YACxC,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACT,cAAc,CAAC,IAAI,CACjB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC5B,sBAAsB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CACvE,CACF,CAAC;IAEF,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AACzD,CAAC;AAzCD,gFAyCC"}
+{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":"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"}

package/dist/context.d.ts

@@ -2,18 +2,12 @@ import type { VariantName } from "@paroicms/anywhere-lib";
 import { type SimpleTranslator } from "./helpers/simple-i18n";
 import type { SiteConf } from "./site-context/site-conf";
 import type { SiteSchemaLibrary } from "./site-schema/site-schema-lib-reader";
-import type { Configuration } from "./typeonly/configuration-types";
 export declare const dbAnyLang = ".";
 export declare const packageDir: string;
 export declare const appVersion: any, appName: any;
 export declare const typeValidator: import("@typeonly/validator").TypeOnlyValidator;
-export declare const appConf: Configuration;
+export declare const appConf: import("./app-conf/app-conf.types").AppConf;
 export declare const platformLog: import("./share/pino-app-log").PlatformLog;
-export declare const boAppVersion: {
-    version: any;
-};
-export declare const publicPort: number;
-export declare const boPublicPort: number;
 export declare const langs: string[];
 export declare const langLabels: {
     [lang: string]: string;
@@ -24,7 +18,7 @@ export declare function initSiteSchemaLib(val: SiteSchemaLibrary): void;
 export declare function getSiteSchemaLib(): SiteSchemaLibrary;
 export declare const jwtSecret: string;
 export declare const jwtExpiresIn = "180d";
-export declare const platformJwtSecret: string;
+export declare const platformJwtSecret: string | undefined;
 export declare const platformAuthUrl: string | undefined;
 export declare let simpleI18n: SimpleTranslator;
 export declare function initializeContext(siteConfsVal: Map<string, SiteConf>): Promise<void>;

package/dist/context.js

@@ -1,10 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeContext = exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.getSiteSchemaLib = exports.initSiteSchemaLib = exports.siteConfs = exports.thumbVariantName = exports.langLabels = exports.langs = exports.boPublicPort = exports.publicPort = exports.boAppVersion = exports.platformLog = exports.appConf = exports.typeValidator = exports.appName = exports.appVersion = exports.packageDir = exports.dbAnyLang = void 0;
+exports.initializeContext = exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.getSiteSchemaLib = exports.initSiteSchemaLib = exports.siteConfs = exports.thumbVariantName = exports.langLabels = exports.langs = exports.platformLog = exports.appConf = exports.typeValidator = exports.appName = exports.appVersion = exports.packageDir = exports.dbAnyLang = void 0;
 const validator_1 = require("@typeonly/validator");
+const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const configuration_helpers_1 = require("./helpers/configuration.helpers");
+const app_conf_provider_1 = require("./app-conf/app-conf-provider");
 const jwt_secret_helpers_1 = require("./helpers/jwt-secret.helpers");
 const simple_i18n_1 = require("./helpers/simple-i18n");
 const pino_app_log_1 = require("./share/pino-app-log");
@@ -15,17 +16,12 @@ _a = require((0, node_path_1.join)(exports.packageDir, "package.json")), exports
 exports.typeValidator = (0, validator_1.createValidator)({
     bundle: require((0, node_path_1.join)(exports.packageDir, "dist", "types.to.json")),
 });
-exports.appConf = (0, read_configuration_1.readConfigFileSync)({
+exports.appConf = (0, app_conf_provider_1.toAppConf)((0, read_configuration_1.readConfigFileSync)({
     typeValidator: exports.typeValidator,
     typeName: "Configuration",
     defaultFileName: "config.json",
-});
-exports.platformLog = (0, pino_app_log_1.createPlatformLog)(exports.appConf.log);
-exports.boAppVersion = {
-    version: exports.appVersion,
-};
-exports.publicPort = exports.appConf.thisServer.publicPort ?? exports.appConf.thisServer.port;
-exports.boPublicPort = exports.appConf.thisServer.boPublicPort ?? exports.publicPort;
+}));
+exports.platformLog = (0, pino_app_log_1.createPlatformLog)({ level: exports.appConf.logLevel, file: exports.appConf.logFile });
 exports.langs = ["en", "fr"];
 exports.langLabels = {
     en: "English",
@@ -44,12 +40,21 @@ function getSiteSchemaLib() {
     return siteSchemaLib;
 }
 exports.getSiteSchemaLib = getSiteSchemaLib;
-exports.jwtSecret = (0, jwt_secret_helpers_1.getJwtSecretSync)((0, node_path_1.join)((0, configuration_helpers_1.isMultiSiteConfiguration)(exports.appConf) ? exports.appConf.platform.dataDir : exports.appConf.singleSite.dataDir, "jwt-secret.txt"));
+const platformDataDir = exports.appConf.kind === "multisite" ? exports.appConf.platform.dataDir : exports.appConf.singleSite.dataDir;
+exports.jwtSecret = (0, jwt_secret_helpers_1.getJwtSecretSync)((0, node_path_1.join)(platformDataDir, "jwt-secret.txt"));
 exports.jwtExpiresIn = "180d";
-exports.platformJwtSecret = (0, jwt_secret_helpers_1.getJwtSecretSync)((0, node_path_1.join)((0, configuration_helpers_1.isMultiSiteConfiguration)(exports.appConf) ? exports.appConf.platform.dataDir : exports.appConf.singleSite.dataDir, "platform-jwt-secret.txt"));
-const protocol = exports.appConf.thisServer.https ? "https" : "http";
+const oldFile = (0, node_path_1.join)(platformDataDir, "platform-jwt-secret.txt");
+if ((0, node_fs_1.existsSync)(oldFile)) {
+    if (exports.appConf.googleAuth)
+        (0, node_fs_1.renameSync)(oldFile, (0, node_path_1.join)(platformDataDir, "jwt-secret-pl.txt"));
+    else
+        (0, node_fs_1.unlinkSync)(oldFile);
+}
+exports.platformJwtSecret = exports.appConf.googleAuth
+    ? (0, jwt_secret_helpers_1.getJwtSecretSync)((0, node_path_1.join)(platformDataDir, "jwt-secret-pl.txt"))
+    : undefined;
 exports.platformAuthUrl = exports.appConf.googleAuth && !exports.appConf.googleAuth.disabled
-    ? `${protocol}://${exports.appConf.googleAuth.fqdn}${exports.publicPort !== 80 ? `:${exports.publicPort}` : ""}/auth`
+    ? `${exports.appConf.publicProtocol}://${exports.appConf.googleAuth.fqdn}${exports.appConf.publicPort === 80 ? "" : `:${exports.appConf.publicPort}`}/auth`
     : undefined;
 async function initializeContext(siteConfsVal) {
     exports.siteConfs = siteConfsVal;

package/dist/context.js.map

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

package/dist/helpers/url.helpers.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileExtensionOf = exports.makeUrlOfImageVariant = exports.makeUrlOfMediaFile = exports.getBoUrl = void 0;
 const context_1 = require("../context");
 function getBoUrl(siteConf, path) {
-    const { https } = context_1.appConf.thisServer;
+    const { publicProtocol, boPort } = context_1.appConf;
     const { fqdn } = siteConf;
-    const protocol = https ? "https" : "http";
-    return `${protocol}://${fqdn}${context_1.boPublicPort !== 80 ? `:${context_1.boPublicPort}` : ""}${path ?? ""}`;
+    return `${publicProtocol}://${fqdn}${boPort === 80 ? "" : `:${boPort}`}${path ?? ""}`;
 }
 exports.getBoUrl = getBoUrl;
 function makeUrlOfMediaFile(siteContext, values, options) {

package/dist/helpers/url.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.helpers.js","sourceRoot":"","sources":["../../src/helpers/url.helpers.ts"],"names":[],"mappings":";;;AACA,wCAAmD;AAInD,SAAgB,QAAQ,CAAC,QAAkB,EAAE,IAAa;IACxD,MAAM,EAAE,KAAK,EAAE,GAAG,iBAAO,CAAC,UAAU,CAAC;IACrC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC1C,OAAO,GAAG,QAAQ,MAAM,IAAI,GAAG,sBAAY,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,sBAAY,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;AAC9F,CAAC;AALD,4BAKC;AAkBD,SAAgB,kBAAkB,CAChC,WAAyC,EACzC,MAA4B,EAC5B,OAAiC;IAEjC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAClE,MAAM,QAAQ,GAAG,GAAG,YAAY,IAAI,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;IAE5E,MAAM,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,SAAS,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAE9F,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtD,CAAC;AAZD,gDAYC;AAoBD,SAAgB,qBAAqB,CACnC,WAAyC,EACzC,MAA+B,EAC/B,OAAiC;IAEjC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,mBAAmB,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAEhG,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,QAAQ,IAAI,mBAAmB,GAAG,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;IAC3F,IAAI,MAAc,CAAC;IACnB,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,UAAU,kBAAkB,CAC1E,eAAe,CAChB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,UAAU,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC3F,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtD,CAAC;AAnBD,sDAmBC;AAED,SAAgB,eAAe,CAAC,SAAiB;IAC/C,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,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;AAClC,CAAC;AARD,0CAQC"}
+{"version":3,"file":"url.helpers.js","sourceRoot":"","sources":["../../src/helpers/url.helpers.ts"],"names":[],"mappings":";;;AACA,wCAAqC;AAIrC,SAAgB,QAAQ,CAAC,QAAkB,EAAE,IAAa;IACxD,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,iBAAO,CAAC;IAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IAC1B,OAAO,GAAG,cAAc,MAAM,IAAI,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;AACxF,CAAC;AAJD,4BAIC;AAkBD,SAAgB,kBAAkB,CAChC,WAAyC,EACzC,MAA4B,EAC5B,OAAiC;IAEjC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAClE,MAAM,QAAQ,GAAG,GAAG,YAAY,IAAI,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;IAE5E,MAAM,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,SAAS,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAE9F,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtD,CAAC;AAZD,gDAYC;AAoBD,SAAgB,qBAAqB,CACnC,WAAyC,EACzC,MAA+B,EAC/B,OAAiC;IAEjC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,mBAAmB,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAEhG,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,QAAQ,IAAI,mBAAmB,GAAG,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;IAC3F,IAAI,MAAc,CAAC;IACnB,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,UAAU,kBAAkB,CAC1E,eAAe,CAChB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,WAAW,kBAAkB,CAAC,QAAQ,CAAC,UAAU,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC3F,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtD,CAAC;AAnBD,sDAmBC;AAED,SAAgB,eAAe,CAAC,SAAiB;IAC/C,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,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;AAClC,CAAC;AARD,0CAQC"}

package/dist/index.js

@@ -12,7 +12,6 @@ const compression_1 = __importDefault(require("compression"));
 const express_1 = __importDefault(require("express"));
 const context_1 = require("./context");
 const static_middlewares_1 = require("./express/static-middlewares");
-const configuration_helpers_1 = require("./helpers/configuration.helpers");
 const maintenance_task_1 = require("./maintenance/maintenance-task");
 const shutdown_1 = require("./maintenance/shutdown");
 const app_module_1 = require("./modules/app.module");
@@ -25,7 +24,7 @@ async function start(options = {}) {
         await context_1.platformLog.untilReady;
         (0, site_context_1.watchForIdleSiteContexts)();
         (0, server_image_cache_engine_1.setupImageProcessor)({ ...context_1.appConf.imageProcessor, appLog: context_1.platformLog });
-        const siteConfs = (0, configuration_helpers_1.isMultiSiteConfiguration)(context_1.appConf)
+        const siteConfs = context_1.appConf.kind === "multisite"
             ? await (0, site_conf_1.loadSitePackConfs)(context_1.appConf.sitePacks, options.sitePackPlaces)
             : await (0, site_conf_1.createSiteConfsFromSingle)(context_1.appConf.singleSite);
         await (0, context_1.initializeContext)(siteConfs);
@@ -43,11 +42,11 @@ async function start(options = {}) {
         app.use(static_middlewares_1.boPluginsMiddleware);
         app.use(static_middlewares_1.boMiddleware);
         app.use(static_middlewares_1.themeAssetsMiddleware);
-        if (context_1.appConf.thisServer.hostName) {
-            await app.listen(context_1.appConf.thisServer.port, context_1.appConf.thisServer.hostName);
+        if (context_1.appConf.hostname) {
+            await app.listen(context_1.appConf.port, context_1.appConf.hostname);
         }
         else {
-            await app.listen(context_1.appConf.thisServer.port);
+            await app.listen(context_1.appConf.port);
         }
         (0, shutdown_1.handleShutdownEvents)({
             appLog: context_1.platformLog,
@@ -55,14 +54,14 @@ async function start(options = {}) {
                 await Promise.all([stopCron(), (0, maintenance_task_1.unloadAllActiveSites)(), app.close()]);
             },
         });
-        context_1.platformLog.info(`paroi-web-platform is up and running on port '${context_1.appConf.thisServer.port}', it serves:${getListOfSiteUrls()
+        context_1.platformLog.info(`ParoiCMS is up and running on port '${context_1.appConf.port}', it serves:${getListOfSiteUrls()
             .map((url) => `\n- ${url}`)
             .join("")}`);
-        if (context_1.publicPort !== context_1.appConf.thisServer.port) {
-            context_1.platformLog.info(`Public port is ${context_1.publicPort}`);
+        if (context_1.appConf.publicPort !== context_1.appConf.port) {
+            context_1.platformLog.info(`Public port is ${context_1.appConf.publicPort}`);
         }
-        if (context_1.boPublicPort !== context_1.publicPort) {
-            context_1.platformLog.info(`Back-office port is ${context_1.boPublicPort}`);
+        if (context_1.appConf.boPort !== context_1.appConf.publicPort) {
+            context_1.platformLog.info(`Back-office port is ${context_1.appConf.boPort}`);
         }
     }
     catch (error) {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA2C;AAC3C,+DAAuF;AACvF,mFAA0E;AAC1E,qDAA8D;AAC9D,8DAAsC;AACtC,sDAA8B;AAC9B,uCAQmB;AACnB,qEAIsC;AACtC,2EAA2E;AAC3E,qEAAuF;AACvF,qDAA8D;AAC9D,qDAAiD;AACjD,6DAAwD;AAExD,wDAAwF;AACxF,8DAAuE;AACvE,iFAA+E;AAQxE,KAAK,UAAU,KAAK,CAAC,UAAwB,EAAE;IACpD,IAAI,CAAC;QACH,MAAM,qBAAW,CAAC,UAAU,CAAC;QAC7B,IAAA,uCAAwB,GAAE,CAAC;QAE3B,IAAA,+CAAmB,EAAC,EAAE,GAAG,iBAAO,CAAC,cAAc,EAAE,MAAM,EAAE,qBAAW,EAAE,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,IAAA,gDAAwB,EAAC,iBAAO,CAAC;YACjD,CAAC,CAAC,MAAM,IAAA,6BAAiB,EAAC,iBAAO,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC;YACpE,CAAC,CAAC,MAAM,IAAA,qCAAyB,EAAC,iBAAO,CAAC,UAAU,CAAC,CAAC;QAExD,MAAM,IAAA,2BAAiB,EAAC,SAAS,CAAC,CAAC;QACnC,IAAA,2BAAiB,EAAC,MAAM,IAAA,gDAAuB,GAAE,CAAC,CAAC;QAEnD,MAAM,QAAQ,GAAG,IAAA,0BAAa,EAAC,kCAAe,EAAE;YAC9C,aAAa,EAAE,IAAA,oBAAO,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACpC,MAAM,EAAE,qBAAW;SACpB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAA,iBAAO,GAAE,CAAC;QAG7B,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAClC,sBAAS,EACT,IAAI,iCAAc,CAAC,UAAU,CAAC,EAC9B;YACE,MAAM,EAAE,IAAI,qCAAgB,EAAE;SAC/B,CACF,CAAC;QACF,GAAG,CAAC,GAAG,CAAC,IAAA,qBAAW,GAAE,CAAC,CAAC;QACvB,GAAG,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,GAAG,CAAC,GAAG,CAAC,wCAAmB,CAAC,CAAC;QAC7B,GAAG,CAAC,GAAG,CAAC,iCAAY,CAAC,CAAC;QACtB,GAAG,CAAC,GAAG,CAAC,0CAAqB,CAAC,CAAC;QAE/B,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,CAAC,IAAI,EAAE,iBAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QAED,IAAA,+BAAoB,EAAC;YACnB,MAAM,EAAE,qBAAW;YACnB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAA,uCAAoB,GAAE,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACvE,CAAC;SACF,CAAC,CAAC;QAEH,qBAAW,CAAC,IAAI,CACd,iDACE,iBAAO,CAAC,UAAU,CAAC,IACrB,gBAAgB,iBAAiB,EAAE;aAChC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;aAC1B,IAAI,CAAC,EAAE,CAAC,EAAE,CACd,CAAC;QACF,IAAI,oBAAU,KAAK,iBAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAC3C,qBAAW,CAAC,IAAI,CAAC,kBAAkB,oBAAU,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,sBAAY,KAAK,oBAAU,EAAE,CAAC;YAChC,qBAAW,CAAC,IAAI,CAAC,uBAAuB,sBAAY,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qBAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AA/DD,sBA+DC;AAED,SAAS,iBAAiB;IACxB,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAS,CAAC,MAAM,EAAE,CAAC;SAClC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;SACnC,IAAI,EAAE,CAAC;AACZ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}