@paroicms/server 1.102.3 → 1.104.0

package/dist/admin-backend/site-constants/site-constants.resolver.js

@@ -1,23 +1,23 @@
 import { cmsVersion } from "../../context.js";
+import { siteReadyGuard } from "../../graphql/graphql.types.js";
 import { authGuard } from "../auth/auth.helper.js";
 export const siteConstantsResolvers = {
     Query: {
         siteConstants: async (_parent, _args, { siteContext, httpContext }) => {
             authGuard(httpContext);
+            siteReadyGuard(siteContext);
             return {
                 cmsVersion,
                 siteConfiguration: {
                     enableMetaKeywords: siteContext.siteConfiguration.adminUi?.enableMetaKeywords ?? false,
                 },
-                trusted: siteContext.trusted,
+                trusted: siteContext.regSite.trusted,
             };
         },
-        routingIds: async (_parent, _args, { siteContext, httpContext }) => {
-            authGuard(httpContext);
-            return JSON.stringify(siteContext.siteIds.homeIds);
-        },
         plugins: async (_parent, _args, { siteContext, httpContext }) => {
             authGuard(httpContext);
+            if (siteContext.status === "migration")
+                return [];
             return Array.from(siteContext.plugins.values())
                 .filter((p) => !!p.adminUiPluginBaseUrl)
                 .map((p) => ({
@@ -34,6 +34,7 @@ export const siteConstantsResolvers = {
             return siteContext.themeConf;
         },
         siteSchema: async (_parent, _args, { siteContext }) => {
+            siteReadyGuard(siteContext);
             return JSON.stringify(siteContext.siteSchema);
         },
     },

package/dist/admin-backend/site-constants/site-constants.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-constants.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/site-constants/site-constants.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,CAAC,MAAM,sBAAsB,GAAiC;IAClE,KAAK,EAAE;QACL,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACpE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,OAAO;gBACL,UAAU;gBACV,iBAAiB,EAAE;oBACjB,kBAAkB,EAAE,WAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,IAAI,KAAK;iBACvF;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO;aAC7B,CAAC;QACJ,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACjE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9D,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;iBACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACX,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,oBAAoB,EAAE,CAAC,CAAC,oBAA8B;gBACtD,QAAQ,EACN,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS;oBACvD,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC;aAClE,CAAC,CAAC,CAAC;QACR,CAAC;KACF;IAED,aAAa,EAAE;QACb,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACnD,OAAO,WAAW,CAAC,SAAS,CAAC;QAC/B,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACpD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"site-constants.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/site-constants/site-constants.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,CAAC,MAAM,sBAAsB,GAAiC;IAClE,KAAK,EAAE;QACL,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACpE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,cAAc,CAAC,WAAW,CAAC,CAAC;YAE5B,OAAO;gBACL,UAAU;gBACV,iBAAiB,EAAE;oBACjB,kBAAkB,EAAE,WAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,IAAI,KAAK;iBACvF;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO;aACrC,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9D,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,EAAE,CAAC;YAElD,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;iBACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACX,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,oBAAoB,EAAE,CAAC,CAAC,oBAA8B;gBACtD,QAAQ,EACN,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS;oBACvD,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC;aAClE,CAAC,CAAC,CAAC;QACR,CAAC;KACF;IAED,aAAa,EAAE;QACb,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACnD,OAAO,WAAW,CAAC,SAAS,CAAC;QAC/B,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACpD,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC;KACF;CACF,CAAC"}

package/dist/admin-backend/unprotected/unprotected.resolver.js

@@ -4,11 +4,18 @@ import { appConf, platformAuthUrl } from "../../context.js";
 export const unprotectedResolvers = {
     Query: {
         publicSiteConstants: async (_parent, _args, { siteContext }) => {
-            return {
-                languageWithLabels: siteContext.siteSchema.languages.map((language) => ({
+            const languageWithLabels = siteContext.status === "migration"
+                ? siteContext.deprecatedSiteSchema.languages.map((language) => ({
+                    language,
+                    label: language,
+                }))
+                : siteContext.siteSchema.languages.map((language) => ({
                     language,
                     label: siteContext.siteSchema.languageLabels[language],
-                })),
+                }));
+            return {
+                siteStatus: siteContext.status,
+                languageWithLabels,
                 publicSiteUrl: siteContext.siteUrl,
                 platformAuthUrl: !appConf.googleAuth || appConf.googleAuth.disabled ? undefined : platformAuthUrl,
             };
@@ -16,12 +23,16 @@ export const unprotectedResolvers = {
     },
     PublicSiteConstants: {
         faviconThumb: async (_parent, _args, { siteContext }) => {
+            if (siteContext.status === "migration")
+                return null;
             const thumb = await makeFaviconThumbReady(siteContext, getHandleOfSiteFavicon());
             if (!thumb)
                 return null;
             return JSON.stringify(thumb);
         },
         adminUiFaviconThumb: async (_parent, _args, { siteContext }) => {
+            if (siteContext.status === "migration")
+                return null;
             const thumb = await makeFaviconThumbReady(siteContext, getHandleOfSiteAdminFavicon());
             if (!thumb)
                 return null;

package/dist/admin-backend/unprotected/unprotected.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAI5D,MAAM,CAAC,MAAM,oBAAoB,GAAiC;IAChE,KAAK,EAAE;QACL,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,OAAO;gBACL,kBAAkB,EAAE,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACtE,QAAQ;oBACR,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;iBACvD,CAAC,CAAC;gBACH,aAAa,EAAE,WAAW,CAAC,OAAO;gBAClC,eAAe,EACb,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe;aACnF,CAAC;QACJ,CAAC;KACF;IAED,mBAAmB,EAAE;QACnB,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACtD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,sBAAsB,EAAE,CAAC,CAAC;YACjF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,2BAA2B,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAI5D,MAAM,CAAC,MAAM,oBAAoB,GAAiC;IAChE,KAAK,EAAE;QACL,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,MAAM,kBAAkB,GACtB,WAAW,CAAC,MAAM,KAAK,WAAW;gBAChC,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAC5D,QAAQ;oBACR,KAAK,EAAE,QAAQ;iBAChB,CAAC,CAAC;gBACL,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClD,QAAQ;oBACR,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;iBACvD,CAAC,CAAC,CAAC;YAEV,OAAO;gBACL,UAAU,EAAE,WAAW,CAAC,MAAM;gBAC9B,kBAAkB;gBAClB,aAAa,EAAE,WAAW,CAAC,OAAO;gBAClC,eAAe,EACb,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe;aACnF,CAAC;QACJ,CAAC;KACF;IAED,mBAAmB,EAAE;QACnB,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACtD,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,IAAI,CAAC;YAEpD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,sBAAsB,EAAE,CAAC,CAAC;YACjF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,IAAI,CAAC;YAEpD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,2BAA2B,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;KACF;CACF,CAAC"}

package/dist/common/data-format.d.ts

@@ -1,4 +1,4 @@
-import type { AccountRow, DocumentRow } from "@paroicms/connector";
+import type { AccountRow, DocumentRow } from "../connector/row-types.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
 export interface Account {
     id: string;

package/dist/common/data-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-format.js","sourceRoot":"","sources":["../../src/common/data-format.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAkBtE,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,kBAAkB;IAC/B,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,UAAU,0BAA0B,CAAC,IAAgB;IACzD,OAAO;QACL,GAAG,aAAa,CAAC,IAAI,CAAC;QACtB,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KAC1F,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAgB;IAC5C,OAAO;QACL,GAAG,IAAI;QACP,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAaD,MAAM,UAAU,cAAc,CAAC,QAAqB;IAClD,OAAO;QACL,OAAO,EAAE,aAAa,CAAC;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;QACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,mBAAmB,EAAE,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAAyC;IACxE,OAAO,WAAW,WAAW,CAAC,OAAO,IAAI,UAAU,EAAE,CAAC;AACxD,CAAC"}
+{"version":3,"file":"data-format.js","sourceRoot":"","sources":["../../src/common/data-format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAkBtE,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,kBAAkB;IAC/B,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,UAAU,0BAA0B,CAAC,IAAgB;IACzD,OAAO;QACL,GAAG,aAAa,CAAC,IAAI,CAAC;QACtB,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KAC1F,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAgB;IAC5C,OAAO;QACL,GAAG,IAAI;QACP,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAaD,MAAM,UAAU,cAAc,CAAC,QAAqB;IAClD,OAAO;QACL,OAAO,EAAE,aAAa,CAAC;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;QACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,mBAAmB,EAAE,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAAyC;IACxE,OAAO,WAAW,WAAW,CAAC,OAAO,IAAI,UAAU,EAAE,CAAC;AACxD,CAAC"}

package/dist/common/media-handles.helpers.d.ts

@@ -3,16 +3,16 @@ import type { SiteContext } from "../site-context/site-context.types.js";
 export declare function getHandleOfFeaturedImage(nodeId: string): string;
 export declare function getHandleOfSiteAdminFavicon(): string;
 export declare function getHandleOfSiteFavicon(): string;
-export declare function getHandleOfField(siteContext: Pick<SiteContext, "siteIds">, options: {
+export declare function getHandleOfField(siteContext: Pick<SiteContext, "siteNodeId">, options: {
     fieldType: ScFieldType;
     nodeId: string;
     language?: string;
 }): string;
-export declare function getHandleOfFieldOnNode(siteContext: Pick<SiteContext, "siteIds">, options: {
+export declare function getHandleOfFieldOnNode(siteContext: Pick<SiteContext, "siteNodeId">, options: {
     fieldType: ScFieldType;
     nodeId: string;
 }): string;
-export declare function getHandleOfSiteField(siteContext: Pick<SiteContext, "siteIds" | "siteSchema">, options: {
+export declare function getHandleOfSiteField(siteContext: Pick<SiteContext, "siteNodeId" | "siteSchema">, options: {
     fieldName: string;
     language?: string;
 }): string;

package/dist/common/media-handles.helpers.js

@@ -12,7 +12,7 @@ export function getHandleOfField(siteContext, options) {
     if (fieldType.localized && !fieldType.withGallery) {
         if (language === undefined)
             throw new Error("Missing language for lNode field");
-        if (nodeId === siteContext.siteIds.siteNodeId)
+        if (nodeId === siteContext.siteNodeId)
             return `site:${fieldType.name}:${language}`;
         return `sect:${nodeId}:${fieldType.name}:${language}`;
     }
@@ -20,7 +20,7 @@ export function getHandleOfField(siteContext, options) {
 }
 export function getHandleOfFieldOnNode(siteContext, options) {
     const { fieldType, nodeId } = options;
-    if (nodeId === siteContext.siteIds.siteNodeId)
+    if (nodeId === siteContext.siteNodeId)
         return `site:${fieldType.name}`;
     return `node:${nodeId}:${fieldType.name}`;
 }
@@ -31,7 +31,7 @@ export function getHandleOfSiteField(siteContext, options) {
         throw new Error(`Unknown site field '${fieldName}'`);
     return getHandleOfField(siteContext, {
         fieldType,
-        nodeId: siteContext.siteIds.siteNodeId,
+        nodeId: siteContext.siteNodeId,
         language,
     });
 }

package/dist/common/media-handles.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"media-handles.helpers.js","sourceRoot":"","sources":["../../src/common/media-handles.helpers.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,wBAAwB,CAAC,MAAc;IACrD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,WAAyC,EACzC,OAIC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAChD,IAAI,SAAS,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAClD,IAAI,QAAQ,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAChF,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;YAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC3F,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,sBAAsB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,WAAyC,EACzC,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;QAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;IAC/E,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,WAAwD,EACxD,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAClG,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,GAAG,CAAC,CAAC;IACrE,OAAO,gBAAgB,CAAC,WAAW,EAAE;QACnC,SAAS;QACT,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;QACtC,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3C,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC"}
+{"version":3,"file":"media-handles.helpers.js","sourceRoot":"","sources":["../../src/common/media-handles.helpers.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,wBAAwB,CAAC,MAAc;IACrD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,WAA4C,EAC5C,OAIC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAChD,IAAI,SAAS,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAClD,IAAI,QAAQ,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAChF,IAAI,MAAM,KAAK,WAAW,CAAC,UAAU;YAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;QACnF,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,sBAAsB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,WAA4C,EAC5C,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,MAAM,KAAK,WAAW,CAAC,UAAU;QAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;IACvE,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,WAA2D,EAC3D,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAClG,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,GAAG,CAAC,CAAC;IACrE,OAAO,gBAAgB,CAAC,WAAW,EAAE;QACnC,SAAS;QACT,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3C,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC"}

package/dist/common/medias/media-lib.js

@@ -84,7 +84,7 @@ export async function createAdminFaviconFrom(siteContext, binaryFile) {
             lossless: result.lossless,
         },
         replace: true,
-        nodeId: siteContext.siteIds.siteNodeId,
+        nodeId: siteContext.homeRoutingCluster.siteNodeId,
     });
 }
 export async function registerImageVariant(siteContext, { sourceImage, resizeRule, mediaType, pixelRatio, autoCrop = false, absoluteUrl, versionedUrl, ownerHandle, isHandleReusable, canBeRetrievedByOwner, originalName, }) {

package/dist/common/medias/media-lib.js.map

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

package/dist/connector/app-conf/app-conf-formatter.d.ts

@@ -0,0 +1,3 @@
+import type { JtConfiguration } from "@paroicms/public-server-lib";
+import type { AppConf } from "./app-conf.types.d.ts";
+export declare function toAppConf(conf: JtConfiguration): AppConf;

package/dist/connector/app-conf/app-conf-formatter.js

@@ -0,0 +1,144 @@
+import { isObj } from "@paroicms/public-anywhere-lib";
+export function toAppConf(conf) {
+    if (conf.thisServer) {
+        console.warn(`[WARNING] "thisServer" is deprecated, use "port", "publicPort", "adminUiPort" and "hostname" instead.`);
+    }
+    if (conf.log) {
+        console.warn(`[WARNING] "log" is deprecated, use "logLevel" and "logFile" instead.`);
+    }
+    if (conf.boPort) {
+        console.warn(`[WARNING] "boPort" is deprecated, use "adminUiPort" 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 adminUiPort = conf.adminUiPort ?? 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 ? "30d" : "disabled");
+    if (!isCacheDuration(cacheTimeToIdle)) {
+        throw new Error(`Invalid cacheTimeToIdle: ${cacheTimeToIdle}`);
+    }
+    const base = {
+        port,
+        publicPort: publicPort ?? port,
+        adminUiPort: adminUiPort ?? 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,
+        imageProcessor: conf.imageProcessor
+            ? formatImageProcessor(conf.imageProcessor)
+            : {
+                allowConcurrency: false,
+            },
+        devAccount: conf.devAccount,
+        platformAdminAccounts: conf.platformAdminAccounts,
+        plugins: createPluginStaticConfigurations(conf),
+        httpRedirections: conf.httpRedirections,
+    };
+    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,
+    };
+}
+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;
+}
+function createPluginStaticConfigurations(conf) {
+    let plugins = conf.plugins ?? [];
+    if (!Array.isArray(plugins)) {
+        console.warn(`[WARNING] "plugins" as object is deprecated. Please convert it to the array format.`);
+        plugins = Object.entries(plugins).map(([name, configuration]) => ({ name, configuration }));
+    }
+    const result = {};
+    if (conf.awsSesMail) {
+        console.warn('[WARNING] "awsSesMail" is deprecated, use "@paroicms/send-mail-aws-ses-plugin" instead.');
+        if (!conf.awsSesMail.disabled &&
+            !plugins.find((p) => p.name === "@paroicms/send-mail-aws-ses-plugin")) {
+            result["@paroicms/send-mail-aws-ses-plugin"] = {
+                platform: true,
+                configuration: {
+                    from: conf.awsSesMail.from,
+                    awsAccessKeyId: conf.awsSesMail.accessKeyId,
+                    awsSecretAccessKey: conf.awsSesMail.secretAccessKey,
+                    awsRegion: conf.awsSesMail.region,
+                },
+            };
+        }
+    }
+    if (conf.googleRecaptcha) {
+        console.warn('[WARNING] "googleRecaptcha" configuration is deprecated, set it in "@paroicms/contact-form-plugin" instead.');
+        if (!conf.googleRecaptcha.disabled) {
+            let pluginConf = plugins.find((p) => p.name === "@paroicms/contact-form-plugin");
+            if (!pluginConf) {
+                pluginConf = {
+                    name: "@paroicms/contact-form-plugin",
+                    configuration: {},
+                };
+                plugins.push(pluginConf);
+            }
+            if (!pluginConf.configuration) {
+                pluginConf.configuration = {};
+            }
+            pluginConf.configuration.googleRecaptchaSiteKey = conf.googleRecaptcha.siteKey;
+            pluginConf.configuration.googleRecaptchaSecretKey = conf.googleRecaptcha.secretKey;
+        }
+    }
+    for (const pluginConf of plugins) {
+        const { name, disabled, platform, configuration } = pluginConf;
+        if (result[name])
+            throw new Error(`Plugin "${name}" already has a configuration`);
+        if (disabled)
+            continue;
+        if (configuration && "adminUi" in configuration && !isObj(configuration.adminUi)) {
+            throw new Error(`Invalid plugin configuration for plugin "${name}": "adminUi" should be an object`);
+        }
+        result[name] = {
+            platform: platform ?? false,
+            configuration: configuration ?? {},
+        };
+    }
+    return result;
+}
+//# sourceMappingURL=app-conf-formatter.js.map

package/dist/connector/app-conf/app-conf-formatter.js.map

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

package/dist/connector/app-conf/app-conf-reader.d.ts

@@ -0,0 +1,3 @@
+import type { TypeOnlyValidator } from "@typeonly/validator";
+import type { AppConf } from "./app-conf.types.js";
+export declare function readAppConfSync(jsonTypeValidator: TypeOnlyValidator, siteDir?: string): AppConf;

package/dist/connector/app-conf/app-conf-reader.js

@@ -0,0 +1,11 @@
+import { readConfigFileSync } from "@paroicms/internal-server-lib";
+import { join } from "node:path";
+import { toAppConf } from "./app-conf-formatter.js";
+export function readAppConfSync(jsonTypeValidator, siteDir) {
+    return toAppConf(readConfigFileSync({
+        jsonTypeValidator,
+        typeName: "JtConfiguration",
+        defaultFileName: siteDir ? join(siteDir, "config.json") : "config.json",
+    }));
+}
+//# sourceMappingURL=app-conf-reader.js.map

package/dist/connector/app-conf/app-conf-reader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-conf-reader.js","sourceRoot":"","sources":["../../../src/connector/app-conf/app-conf-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,MAAM,UAAU,eAAe,CAAC,iBAAoC,EAAE,OAAgB;IACpF,OAAO,SAAS,CACd,kBAAkB,CAAkB;QAClC,iBAAiB;QACjB,QAAQ,EAAE,iBAAiB;QAC3B,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa;KACxE,CAAC,CACH,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,45 @@
+import type { AppLoggerLevel } from "@paroicms/internal-server-lib";
+import type { JtDevAccountConf, JtFqdnSitePackConf, JtGoogleAuthConf, JtHttpRedirection, JtImageProcessorConf, JtPlatformAdminAccountConf, JtSingleSiteConf, JtSubDomainSitePackConf, PluginStaticConfigurations } from "@paroicms/public-server-lib";
+export type AppConf = SingleSiteAppConf | MultisiteAppConf;
+export interface AppConfBase {
+    port: number;
+    hostname?: string;
+    publicProtocol: "http" | "https";
+    publicPort: number;
+    adminUiPort: number;
+    logLevel: "silent" | AppLoggerLevel;
+    logFile?: string;
+    allowRobots: boolean;
+    immutableAssets: boolean;
+    cacheTimeToIdle: CacheDuration;
+    clearCacheAfterStart?: boolean;
+    clearImageCacheAfterStart?: boolean;
+    graphqlDevTools?: boolean;
+    generateMissingDatabases?: boolean;
+    googleAuth?: GoogleAuthConf;
+    imageProcessor: ImageProcessorConf;
+    devAccount?: DevAccountConf;
+    platformAdminAccounts?: PlatformAdminAccountConf[];
+    plugins: PluginStaticConfigurations;
+    httpRedirections?: HttpRedirectionConf[];
+}
+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)[];
+}
+export type SingleSiteConf = JtSingleSiteConf;
+export type FqdnSitePackConf = JtFqdnSitePackConf;
+export type SubDomainSitePackConf = JtSubDomainSitePackConf;
+export type GoogleAuthConf = JtGoogleAuthConf;
+export type ImageProcessorConf = JtImageProcessorConf;
+export type DevAccountConf = JtDevAccountConf;
+export type PlatformAdminAccountConf = JtPlatformAdminAccountConf;
+export type HttpRedirectionConf = JtHttpRedirection;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=app-conf.types.js.map

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

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

package/dist/connector/db-init/db-constants.d.ts

@@ -0,0 +1,2 @@
+export declare const mainDbSchemaName = "main";
+export declare const mainDbSchemaVersion = 15;

package/dist/connector/db-init/db-constants.js

@@ -0,0 +1,3 @@
+export const mainDbSchemaName = "main";
+export const mainDbSchemaVersion = 15;
+//# sourceMappingURL=db-constants.js.map

package/dist/connector/db-init/db-constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"db-constants.js","sourceRoot":"","sources":["../../../src/connector/db-init/db-constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AACvC,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,CAAC"}

package/dist/connector/db-init/db-init.d.ts

@@ -0,0 +1,10 @@
+import type { AppLogger } from "@paroicms/public-server-lib";
+import type { Knex } from "knex";
+export declare function createOrOpenMainConnection(dataDir: string, { logger, canCreate }: {
+    canCreate: boolean;
+    logger: AppLogger;
+}): Promise<{
+    cn: Knex;
+    logNextQuery: (count?: number) => void;
+    isNewDatabase: boolean;
+}>;

package/dist/connector/db-init/db-init.js

@@ -0,0 +1,42 @@
+import { createOrOpenSqliteConnection, createSqlLogger, getMetadataDbSchemaVersion, } from "@paroicms/internal-server-lib";
+import { join } from "node:path";
+import { packageDir } from "../../context.js";
+import { mainDbSchemaName, mainDbSchemaVersion } from "./db-constants.js";
+import { migrateMainDb } from "./ddl-migration.js";
+export async function createOrOpenMainConnection(dataDir, { logger, canCreate }) {
+    const { logNextQuery, knexLogger } = createSqlLogger({
+        logger,
+        dbSchemaName: mainDbSchemaName,
+    });
+    const { cn, isNewDatabase } = await createOrOpenSqliteConnection({
+        canCreate,
+        dbSchemaName: mainDbSchemaName,
+        sqliteFile: join(dataDir, "main.sqlite"),
+        ddlFile: join(packageDir, "ddl", "main.ddl.sql"),
+        migrateDb,
+        knexLogger,
+        logger,
+    });
+    async function migrateDb(cn) {
+        const dbVersion = await getMetadataDbSchemaVersion(cn, {
+            dbSchemaName: mainDbSchemaName,
+        });
+        if (dbVersion === mainDbSchemaVersion) {
+            return {
+                migrated: false,
+                schemaVersion: dbVersion,
+            };
+        }
+        await migrateMainDb(cn, {
+            fromVersion: dbVersion,
+            logger,
+        });
+        return {
+            migrated: true,
+            fromVersion: dbVersion,
+            schemaVersion: mainDbSchemaVersion,
+        };
+    }
+    return { cn, logNextQuery, isNewDatabase };
+}
+//# sourceMappingURL=db-init.js.map

package/dist/connector/db-init/db-init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../../src/connector/db-init/db-init.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,eAAe,EAEf,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAe,EACf,EAAE,MAAM,EAAE,SAAS,EAA6C;IAMhE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC;QACnD,MAAM;QACN,YAAY,EAAE,gBAAgB;KAC/B,CAAC,CAAC;IAEH,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,MAAM,4BAA4B,CAAC;QAC/D,SAAS;QACT,YAAY,EAAE,gBAAgB;QAC9B,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC;QACxC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,CAAC;QAChD,SAAS;QACT,UAAU;QACV,MAAM;KACP,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAQ;QAC/B,MAAM,SAAS,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE;YACrD,YAAY,EAAE,gBAAgB;SAC/B,CAAC,CAAC;QACH,IAAI,SAAS,KAAK,mBAAmB,EAAE,CAAC;YACtC,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,aAAa,CAAC,EAAE,EAAE;YACtB,WAAW,EAAE,SAAS;YACtB,MAAM;SACP,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,mBAAmB;SACnC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;AAC7C,CAAC"}

package/dist/connector/db-init/ddl-migration.d.ts

@@ -0,0 +1,6 @@
+import type { AppLogger } from "@paroicms/public-server-lib";
+import type { Knex } from "knex";
+export declare function migrateMainDb(cn: Knex, { fromVersion, logger }: {
+    fromVersion: number;
+    logger: AppLogger;
+}): Promise<void>;