@paroicms/server 1.90.0 → 1.91.0

package/dist/admin-backend/account/account.formatters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account.formatters.js","sourceRoot":"","sources":["../../../src/admin-backend/account/account.formatters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAIvD,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,GAAkB,CAAC;IACjE,MAAM,IAAI,QAAQ,CAAC,yBAAyB,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC"}

package/dist/{admin-ui-backend → admin-backend}/account/account.queries.d.ts

@@ -1,18 +1,6 @@
 import type { AccountRow } from "@paroicms/connector";
+import { type Account, type AuthenticatedAccount } from "../../common/data-format.js";
 import type { SiteContext } from "../../site-context/site-context.types.js";
-export interface Account {
-    id: string;
-    name?: string;
-    email: string;
-    hasPasswordResetToken?: boolean;
-    special?: "dev" | "platformAdmin";
-}
-export interface AccountPreferences {
-    language?: string;
-}
-export interface AuthenticatedAccount extends Account {
-    preferences?: AccountPreferences;
-}
 export declare function findAccountByIdAndEmail(siteContext: SiteContext, payload: {
     id: string;
     email: string;

package/dist/{admin-ui-backend → admin-backend}/account/account.queries.js

@@ -1,10 +1,36 @@
-import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
 import { makeSecret } from "@paroicms/internal-server-lib";
 import { ApiError } from "@paroicms/public-server-lib";
-import { formatToAccountObjectType, formatToAuthenticatedAccountObjectType, } from "../../common/data-format.js";
+import { type } from "arktype";
+import { formatAccount, formatAuthenticatedAccount, } from "../../common/data-format.js";
 import { sendMail } from "../../common/mail/sendMail.helpers.js";
 import { simpleI18n } from "../../context.js";
 import { getDevAccount, getPlatformAdminAccount, isDevAccountId, parsePlatformAdminAccountId, } from "../../helpers/special-account.helpers.js";
+const AccountRowAT = type({
+    id: "number",
+    email: "string",
+    name: "string|null",
+    preferences: "string|null",
+    passwordResetToken: "string|null",
+    "+": "reject",
+}).pipe((r) => ({
+    id: String(r.id),
+    email: r.email,
+    name: r.name ?? undefined,
+    preferences: r.preferences ?? undefined,
+    passwordResetToken: r.passwordResetToken ?? undefined,
+}));
+const FindAccountByIdAndEmailRowAT = type({
+    id: "number",
+    email: "string",
+    name: "string|null",
+    preferences: "string|null",
+    "+": "reject",
+}).pipe((r) => ({
+    id: String(r.id),
+    email: r.email,
+    name: r.name ?? undefined,
+    preferences: r.preferences ?? undefined,
+}));
 export async function findAccountByIdAndEmail(siteContext, payload) {
     const account = await siteContext
         .cn("PaAccount as a")
@@ -16,13 +42,22 @@ export async function findAccountByIdAndEmail(siteContext, payload) {
         .first();
     if (!account)
         throw new ApiError("Account not found", 404);
-    return {
-        id: strVal(account.id),
-        email: strVal(account.email),
-        name: strValOrUndef(account.name),
-        preferences: strValOrUndef(account.preferences),
-    };
+    return FindAccountByIdAndEmailRowAT.assert(account);
 }
+const FindAccountByEmailRowAT = type({
+    id: "number",
+    email: "string",
+    name: "string|null",
+    preferences: "string|null",
+    passwordHash: "string|null",
+    "+": "reject",
+}).pipe((r) => ({
+    id: String(r.id),
+    email: r.email,
+    name: r.name ?? undefined,
+    preferences: r.preferences ?? undefined,
+    passwordHash: r.passwordHash ?? undefined,
+}));
 export async function findAccountByEmail(siteContext, email) {
     const account = await siteContext
         .cn("PaAccount as a")
@@ -31,20 +66,26 @@ export async function findAccountByEmail(siteContext, email) {
         .first();
     if (!account)
         return;
-    return {
-        id: strVal(account.id),
-        email: strVal(account.email),
-        name: strValOrUndef(account.name),
-        preferences: strValOrUndef(account.preferences),
-        passwordHash: strValOrUndef(account.passwordHash),
-    };
+    return FindAccountByEmailRowAT.assert(account);
 }
+const GetAccountRowAT = type({
+    id: "number",
+    email: "string",
+    name: "string|null",
+    passwordResetToken: "string|null",
+    "+": "reject",
+}).pipe((r) => ({
+    id: String(r.id),
+    email: r.email,
+    name: r.name ?? undefined,
+    passwordResetToken: r.passwordResetToken ?? undefined,
+}));
 export async function getAccount(siteContext, id) {
     if (isDevAccountId(id))
-        return formatToAccountObjectType(getDevAccount(id));
+        return formatAccount(getDevAccount(id));
     const parsedPlatformAccountId = parsePlatformAdminAccountId(id);
     if (parsedPlatformAccountId) {
-        return formatToAccountObjectType(getPlatformAdminAccount(parsedPlatformAccountId));
+        return formatAccount(getPlatformAdminAccount(parsedPlatformAccountId));
     }
     const found = await siteContext
         .cn("PaAccount as a")
@@ -53,20 +94,15 @@ export async function getAccount(siteContext, id) {
         .first();
     if (!found)
         throw new ApiError("Account not found", 404);
-    const account = {
-        id: strVal(found.id),
-        email: strVal(found.email),
-        name: strValOrUndef(found.name),
-        passwordResetToken: strValOrUndef(found.passwordResetToken),
-    };
-    return formatToAccountObjectType(account);
+    const account = GetAccountRowAT.assert(found);
+    return formatAccount(account);
 }
 export async function getAuthenticatedAccount(siteContext, id) {
     if (isDevAccountId(id))
-        return formatToAuthenticatedAccountObjectType(getDevAccount(id));
+        return formatAuthenticatedAccount(getDevAccount(id));
     const parsedPlatformAccountId = parsePlatformAdminAccountId(id);
     if (parsedPlatformAccountId) {
-        return formatToAuthenticatedAccountObjectType(getPlatformAdminAccount(parsedPlatformAccountId));
+        return formatAuthenticatedAccount(getPlatformAdminAccount(parsedPlatformAccountId));
     }
     const found = await siteContext
         .cn("PaAccount as a")
@@ -75,14 +111,8 @@ export async function getAuthenticatedAccount(siteContext, id) {
         .first();
     if (!found)
         throw new ApiError("Account not found", 404);
-    const account = {
-        id: strVal(found.id),
-        email: strVal(found.email),
-        name: strValOrUndef(found.name),
-        preferences: strValOrUndef(found.preferences),
-        passwordResetToken: strValOrUndef(found.passwordResetToken),
-    };
-    return formatToAuthenticatedAccountObjectType(account);
+    const account = AccountRowAT.assert(found);
+    return formatAuthenticatedAccount(account);
 }
 export async function getAllAccounts(siteContext) {
     const accounts = await siteContext
@@ -90,15 +120,9 @@ export async function getAllAccounts(siteContext) {
         .select(["a.id", "a.email", "a.name", "a.preferences", "a.passwordResetToken"]);
     const parsedAccounts = accounts
         .map((account) => {
-        return {
-            id: strVal(account.id),
-            email: strVal(account.email),
-            name: strValOrUndef(account.name),
-            preferences: strValOrUndef(account.preferences),
-            passwordResetToken: strValOrUndef(account.passwordResetToken),
-        };
+        return AccountRowAT.assert(account);
     })
-        .map((user) => formatToAccountObjectType(user));
+        .map((user) => formatAccount(user));
     return parsedAccounts;
 }
 export async function setAccountPreferences(siteContext, accountId, values) {
@@ -107,6 +131,12 @@ export async function setAccountPreferences(siteContext, accountId, values) {
         .where({ id: accountId })
         .update({ preferences: JSON.stringify(values) });
 }
+const CreateAccountInsertedAT = type({
+    id: "number",
+    "+": "reject",
+}).pipe((r) => ({
+    id: String(r.id),
+}));
 export async function createAccount(siteContext, payload) {
     const account = await findAccountByEmail(siteContext, payload.email);
     if (account)
@@ -119,7 +149,7 @@ export async function createAccount(siteContext, payload) {
         preferences: JSON.stringify({ language: payload.language }),
     })
         .returning("id");
-    const id = strVal(inserted.id);
+    const id = CreateAccountInsertedAT.assert(inserted).id;
     const newAccount = await findAccountById(siteContext, id);
     if (!newAccount) {
         throw new ApiError("Failed to get last insert account", 500);
@@ -135,7 +165,7 @@ export async function createAccount(siteContext, payload) {
         email: newAccount.email,
         language: payload.language,
     });
-    return formatToAccountObjectType(newAccount);
+    return formatAccount(newAccount);
 }
 async function createGoogleAccount(siteContext, { payload, newAccount, }) {
     const subject = simpleI18n.translate({
@@ -152,14 +182,14 @@ async function createGoogleAccount(siteContext, { payload, newAccount, }) {
         html: message,
         to: newAccount.email,
     }, { logger: siteContext.logger });
-    return formatToAccountObjectType(newAccount);
+    return formatAccount(newAccount);
 }
 export async function updateAccount(siteContext, accountId, payload) {
     const account = await findAccountById(siteContext, accountId);
     if (!account)
         throw new ApiError("Account not found", 404);
     await siteContext.cn("PaAccount").where({ id: account.id }).update(payload);
-    return formatToAccountObjectType({
+    return formatAccount({
         ...account,
         email: payload.email ?? account.email,
         name: payload.name ?? account.name,
@@ -178,6 +208,22 @@ export async function resetAccountPassword(siteContext, accountId) {
     const language = getAccountLanguage(siteContext, account);
     await resetAccountToken(siteContext, { id: account.id, email: account.email, language });
 }
+const FindAccountByIdRowAT = type({
+    id: "number",
+    email: "string",
+    name: "string|null",
+    preferences: "string|null",
+    passwordHash: "string|null",
+    passwordResetToken: "string|null",
+    "+": "reject",
+}).pipe((data) => ({
+    id: String(data.id),
+    email: data.email,
+    name: data.name ?? undefined,
+    preferences: data.preferences ?? undefined,
+    passwordHash: data.passwordHash ?? undefined,
+    passwordResetToken: data.passwordResetToken ?? undefined,
+}));
 async function findAccountById(siteContext, id) {
     const found = await siteContext
         .cn("PaAccount as a")
@@ -193,14 +239,7 @@ async function findAccountById(siteContext, id) {
         .first();
     if (!found)
         return;
-    return {
-        id: strVal(found.id),
-        email: strVal(found.email),
-        name: strValOrUndef(found.name),
-        preferences: strValOrUndef(found.preferences),
-        passwordHash: strValOrUndef(found.passwordHash),
-        passwordResetToken: strValOrUndef(found.passwordResetToken),
-    };
+    return FindAccountByIdRowAT.assert(found);
 }
 async function resetAccountToken(siteContext, account) {
     const passwordResetToken = makeSecret(60);

package/dist/admin-backend/account/account.queries.js.map

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

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

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

package/dist/admin-backend/auth/auth.helper.js.map

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

package/dist/{admin-ui-backend → admin-backend}/auth/auth.service.js

@@ -1,11 +1,16 @@
-import { strVal } from "@paroi/data-formatters-lib";
 import { ApiError } from "@paroicms/public-server-lib";
-import { formatAccountPreferences } from "../../common/data-format.js";
+import { type } from "arktype";
+import { AccountPreferencesAT } from "../../common/data-format.js";
 import { appConf } from "../../context.js";
 import { comparePassword } from "../../helpers/passwordEncrypt-helper.js";
 import { devAccountId, getDevAccount, getPlatformAdminAccount, isDevAccountId, parsePlatformAdminAccountId, } from "../../helpers/special-account.helpers.js";
 import { findAccountByEmail, findAccountByIdAndEmail } from "../account/account.queries.js";
 import { generateAccessToken, verifyAccessToken, verifyPlatformToken, } from "./auth.helper.js";
+const JwtPayloadAT = type({
+    id: "string",
+    email: "string",
+    "+": "reject",
+});
 export async function loginUser(siteContext, user) {
     const defaultLanguage = siteContext.siteSchema.defaultLanguage;
     let account;
@@ -25,7 +30,7 @@ export async function loginUser(siteContext, user) {
         };
     }
     const parsedPreferences = account.preferences
-        ? formatAccountPreferences(account.preferences)
+        ? AccountPreferencesAT.assert(account.preferences)
         : undefined;
     return {
         id: account.id,
@@ -56,13 +61,11 @@ export async function getVerifiedAccountFromToken(siteContext, token) {
             account = getPlatformAdminAccount(parsedPlatformAccountId);
         }
         else {
-            account = await findAccountByIdAndEmail(siteContext, {
-                id: strVal(payload.id),
-                email: strVal(payload.email),
-            });
+            const validated = JwtPayloadAT.assert(payload);
+            account = await findAccountByIdAndEmail(siteContext, validated);
         }
         const parsedPreferences = account.preferences
-            ? formatAccountPreferences(account.preferences)
+            ? AccountPreferencesAT.assert(account.preferences)
             : undefined;
         return {
             email: account.email,
@@ -99,7 +102,7 @@ export async function loginByPlatformToken(siteContext, token) {
             account = foundAccount;
         }
         const parsedPreferences = account.preferences
-            ? formatAccountPreferences(account.preferences)
+            ? AccountPreferencesAT.assert(JSON.parse(account.preferences))
             : undefined;
         return {
             id: account.id,

package/dist/admin-backend/auth/auth.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/admin-backend/auth/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EACL,YAAY,EACZ,aAAa,EACb,uBAAuB,EACvB,cAAc,EACd,2BAA2B,GAC5B,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC5F,OAAO,EAEL,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,YAAY,GAAG,IAAI,CAAC;IACxB,EAAE,EAAE,QAAQ;IACZ,KAAK,EAAE,QAAQ;IACf,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,WAAwB,EACxB,IAAgB;IAEhB,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAE/D,IAAI,OAA+B,CAAC;IACpC,IAAI,OAAO,CAAC,UAAU,EAAE,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;QAC7C,OAAO,GAAG,kBAAkB,CAAC;YAC3B,IAAI;YACJ,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;YACL,OAAO,EAAE,cAAc;YACvB,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW;QAC3C,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QAClD,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,IAAI,eAAe;QACxD,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,mBAAmB,CAAC;YACzB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC;KACH,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,WAAwB,EACxB,KAAa;IAEb,IAAI,OAAuC,CAAC;IAE5C,IAAI,CAAC;QACH,OAAO,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;YACtC,MAAM,IAAI,QAAQ,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;QAE/D,IAAI,OAAmB,CAAC;QACxB,MAAM,uBAAuB,GAAG,2BAA2B,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxE,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,uBAAuB,EAAE,CAAC;YACnC,OAAO,GAAG,uBAAuB,CAAC,uBAAuB,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,OAAO,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW;YAC3C,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;YAClD,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,IAAI,eAAe;YACxD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK;SACN,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,OAAO,EAAE,CAAC;YACZ,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,cAAc;SACxB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,KAAa;IAEb,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAEjD,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;QAE/D,IAAI,OAAmB,CAAC;QACxB,MAAM,mBAAmB,GAAG,CAAC,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,SAAS,CACzE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,CAC7C,CAAC;QACF,IAAI,mBAAmB,KAAK,CAAC,CAAC,EAAE,CAAC;YAC/B,OAAO,GAAG,uBAAuB,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1E,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO,GAAG,YAAY,CAAC;QACzB,CAAC;QAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW;YAC3C,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9D,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,IAAI,eAAe;YACxD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,mBAAmB,CAAC;gBACzB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,WAAW,CAAC,IAAI;aACvB,CAAC;SACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,iBAAiB;SAC3B,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,WAAwB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAc;IACnF,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE1D,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,IAAI,EAAE,YAAY,EAAE,CAAC;QACvB,YAAY,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,EAAE,YAAY,IAAI,YAAY,CAAC;IACnD,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,EAC1B,IAAI,EACJ,UAAU,GACuC;IACjD,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ;QAAE,OAAO;IACrF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,UAAU,CAAC;IAC3C,OAAO;QACL,GAAG,MAAM;QACT,EAAE,EAAE,YAAY;KACjB,CAAC;AACJ,CAAC"}

package/dist/admin-backend/auth/auth.types.js.map

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

package/dist/{admin-ui-backend → admin-backend}/backup/backup.controller.js

@@ -1,12 +1,17 @@
-import { strValOrUndef } from "@paroi/data-formatters-lib";
 import { checkBackupFileName, getBackup } from "@paroicms/connector";
 import { ApiError } from "@paroicms/public-server-lib";
+import { type } from "arktype";
 import { getRouteParameter } from "../../express/http-helpers.js";
 import { verifyDownloadToken } from "./backup.helper.js";
+const BackupUrlQuery = type({
+    "t?": "string|undefined",
+    "+": "reject",
+});
 export async function downloadBackupController(siteContext, httpContext, routeParams) {
     const { req, res } = httpContext;
     const backupName = getRouteParameter(routeParams, "backupName");
-    const token = strValOrUndef(req.query.t);
+    const validated = BackupUrlQuery.assert(req.query);
+    const token = validated.t;
     if (!token)
         throw new Error("missing user token");
     const { backupFile, contentType } = verifyDownloadToken(token);

package/dist/admin-backend/backup/backup.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backup.controller.js","sourceRoot":"","sources":["../../../src/admin-backend/backup/backup.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,MAAM,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,kBAAkB;IACxB,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,WAAwB,EACxB,WAA0B,EAC1B,WAA+C;IAE/C,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IACjC,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC;IAE1B,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE/D,IAAI,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAE5E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,GAAG,CAAC,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,UAAU,EAAE,CAAC,CAAC;IACxE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACvB,CAAC"}

package/dist/admin-backend/backup/backup.helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backup.helper.js","sourceRoot":"","sources":["../../../src/admin-backend/backup/backup.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;AAOhE,MAAM,UAAU,mBAAmB,CAAC,OAA6B;IAC/D,OAAO,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAyB,CAAC;IACtF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"backup.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/backup/backup.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAOzD,MAAM,CAAC,MAAM,eAAe,GAAiC;IAC3D,QAAQ,EAAE;QACR,gBAAgB,EAAE,KAAK,EACrB,OAAO,EACP,OAAO,EACP,EAAE,WAAW,EAAE,WAAW,EAAE,EACP,EAAE;YACvB,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;gBACtE,aAAa,EAAE,UAAU;aAC1B,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,mBAAmB,CAAC;gBACtC,UAAU,EAAE,WAAW;gBACvB,WAAW,EAAE,iBAAiB;aAC/B,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,uBAAuB,WAAW,OAAO,WAAW,EAAE,CAAC;YAE3E,OAAO;gBACL,WAAW;gBACX,UAAU,EAAE,aAAa;aAC1B,CAAC;QACJ,CAAC;KACF;CACF,CAAC"}

package/dist/admin-backend/document/document.helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"document.helper.js","sourceRoot":"","sources":["../../../src/admin-backend/document/document.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,MAAM,UAAU,qBAAqB,CAAC,UAAwB,EAAE,QAAgB;IAC9E,MAAM,YAAY,GAAG,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACjE,OAAO,YAAY,CAAC,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,WAAW,CAAC;AAC7E,CAAC"}

package/dist/{admin-ui-backend → admin-backend}/document/document.resolver.extend.js

@@ -1,4 +1,4 @@
-import { documentToObjectType } from "../../common/data-format.js";
+import { toDocumentSeed } from "../../common/data-format.js";
 import { authGuard } from "../auth/auth.helper.js";
 import { findOneDocument } from "./load-documents.queries.js";
 export const extendWithDocumentResolver = {
@@ -9,7 +9,7 @@ export const extendWithDocumentResolver = {
                 nodeId: parent.nodeId,
                 language: parent.language,
             });
-            return document ? documentToObjectType(document) : null;
+            return document ? toDocumentSeed(document) : null;
         },
     },
 };

package/dist/admin-backend/document/document.resolver.extend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"document.resolver.extend.js","sourceRoot":"","sources":["../../../src/admin-backend/document/document.resolver.extend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,MAAM,CAAC,MAAM,0BAA0B,GAAiC;IACtE,SAAS,EAAE;QACT,QAAQ,EAAE,KAAK,EAAE,MAAqB,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7E,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE;gBAClD,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpD,CAAC;KACF;CACF,CAAC"}

package/dist/{admin-ui-backend → admin-backend}/document/document.resolver.js

@@ -1,7 +1,6 @@
-import { isDef } from "@paroi/data-formatters-lib";
 import { createNoTracker, toAbsoluteUrl } from "@paroicms/internal-server-lib";
-import { parseNodelId } from "@paroicms/public-anywhere-lib";
-import { documentToObjectType } from "../../common/data-format.js";
+import { isDef, parseNodelId } from "@paroicms/public-anywhere-lib";
+import { toDocumentSeed } from "../../common/data-format.js";
 import { getUrlOfDocument } from "../../rendered-site/page-route/make-url.js";
 import { authGuard } from "../auth/auth.helper.js";
 import { getOneDocument } from "./load-documents.queries.js";
@@ -10,7 +9,7 @@ export const documentResolvers = {
     Query: {
         document: async (_parent, { id }, { siteContext, httpContext }) => {
             authGuard(httpContext);
-            return documentToObjectType(await getOneDocument(siteContext, parseNodelId(id)));
+            return toDocumentSeed(await getOneDocument(siteContext, parseNodelId(id)));
         },
     },
     Mutation: {
@@ -24,7 +23,7 @@ export const documentResolvers = {
                     slug: values.slug ?? undefined,
                 });
             }
-            return documentToObjectType(await getOneDocument(siteContext, nodelId));
+            return toDocumentSeed(await getOneDocument(siteContext, nodelId));
         },
         updateDocumentMeta: async (_parent, { values, id }, { siteContext, httpContext }) => {
             authGuard(httpContext);
@@ -33,7 +32,7 @@ export const documentResolvers = {
             if (!empty) {
                 await updateDocument(siteContext, nodelId, values);
             }
-            return documentToObjectType(await getOneDocument(siteContext, nodelId));
+            return toDocumentSeed(await getOneDocument(siteContext, nodelId));
         },
         deleteDocument: async (_parent, { nodelId }, { siteContext, httpContext }) => {
             authGuard(httpContext);
@@ -56,7 +55,7 @@ export const documentResolvers = {
                     typeName: values.typeName,
                 },
             });
-            return documentToObjectType(await getOneDocument(siteContext, documentId));
+            return toDocumentSeed(await getOneDocument(siteContext, documentId));
         },
         createDocumentOnNode: async (_parent, { values, language, nodeId }, { siteContext, httpContext }) => {
             authGuard(httpContext);
@@ -67,7 +66,7 @@ export const documentResolvers = {
                     ? { title: values.title ?? undefined, slug: values.slug ?? undefined }
                     : undefined,
             });
-            return documentToObjectType(await getOneDocument(siteContext, documentId));
+            return toDocumentSeed(await getOneDocument(siteContext, documentId));
         },
     },
     Document: {

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

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

package/dist/{admin-ui-backend → admin-backend}/document/load-documents.queries.js

@@ -1,5 +1,21 @@
-import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
 import { ApiError } from "@paroicms/public-server-lib";
+import { type } from "arktype";
+const DocumentRowAT = type({
+    nodeId: "number",
+    language: "string",
+    title: "string|null",
+    slug: "string|null",
+    metaDescription: "string|null",
+    metaKeywords: "string|null",
+    "+": "reject",
+}).pipe((data) => ({
+    nodeId: String(data.nodeId),
+    language: data.language,
+    title: data.title ?? undefined,
+    slug: data.slug ?? undefined,
+    metaDescription: data.metaDescription ?? undefined,
+    metaKeywords: data.metaKeywords ?? undefined,
+}));
 export async function document({ cn }, documentId) {
     const document = await cn("PaDocument as d")
         .select("d.nodeId", "d.language", "d.title", "d.slug", "d.metaDescription", "d.metaKeywords")
@@ -10,14 +26,7 @@ export async function document({ cn }, documentId) {
         .first();
     if (!document)
         return;
-    return {
-        nodeId: strVal(document.nodeId),
-        language: strVal(document.language),
-        title: strValOrUndef(document.title),
-        slug: strValOrUndef(document.slug),
-        metaDescription: strValOrUndef(document.metaDescription),
-        metaKeywords: strValOrUndef(document.metaKeywords),
-    };
+    return DocumentRowAT.assert(document);
 }
 export async function getOneDocument(siteContext, id) {
     const doc = await document(siteContext, id);
@@ -30,21 +39,32 @@ export async function findOneDocument(siteContext, id) {
     const doc = await document(siteContext, id);
     return doc ? doc : undefined;
 }
+const TermDocumentRowAT = type({
+    language: "string",
+    title: "string|null",
+    "+": "reject",
+}).pipe((data) => ({
+    language: data.language,
+    title: data.title ?? undefined,
+}));
 export async function findOneTermDocument({ cn }, { language, nodeId }) {
     const rows = await cn("PaNode as l")
         .select("d.title", "d.language")
         .leftJoin("PaDocument as d", "d.nodeId", "l.id")
         .where("l.id", nodeId);
-    const candidates = rows.map((row) => ({
-        language: strVal(row.language),
-        title: strValOrUndef(row.title),
-    }));
-    let found = candidates.find((row) => strVal(row.language) === language);
+    const candidates = rows.map((row) => TermDocumentRowAT.assert(row));
+    let found = candidates.find((row) => row.language === language);
     if (!found) {
         found = candidates[0];
     }
     return found;
 }
+const ParentNodelRowAT = type({
+    parentId: "number",
+    "+": "reject",
+}).pipe((r) => ({
+    parentId: String(r.parentId),
+}));
 export async function getParentNodelIdOf(siteContext, { language, nodeId }) {
     const row = await siteContext
         .cn("PaNode as l")
@@ -60,9 +80,15 @@ export async function getParentNodelIdOf(siteContext, { language, nodeId }) {
         return undefined;
     return {
         language,
-        nodeId: strVal(row.parentId),
+        nodeId: ParentNodelRowAT.assert(row).parentId,
     };
 }
+const ParentNodeRowAT = type({
+    id: "number|null",
+    "+": "reject",
+}).pipe((r) => ({
+    id: r.id === null ? undefined : String(r.id),
+}));
 export async function getParentNodeIdOf(siteContext, nodeId) {
     const row = await siteContext
         .cn("PaNode as l")
@@ -71,8 +97,16 @@ export async function getParentNodeIdOf(siteContext, nodeId) {
         .first();
     if (!row)
         throw new Error(`cannot find parent node of '${nodeId}'`);
-    return strValOrUndef(row.id);
+    return ParentNodeRowAT.assert(row).id ?? undefined;
 }
+const ParentDocumentRowAT = type({
+    language: "string",
+    parentId: "number",
+    "+": "reject",
+}).pipe((r) => ({
+    language: r.language,
+    parentId: String(r.parentId),
+}));
 export async function getParentDocumentIdsOf(siteContext, options) {
     const languages = options.languages ?? siteContext.siteSchema.languages;
     const rows = await siteContext
@@ -82,9 +116,12 @@ export async function getParentDocumentIdsOf(siteContext, options) {
         .where("l.id", options.nodeId)
         .whereIn("d.language", languages)
         .whereNotNull("l.parentId");
-    return rows.map((row) => ({
-        language: strVal(row.language),
-        nodeId: strVal(row.parentId),
-    }));
+    return rows.map((row) => {
+        const validated = ParentDocumentRowAT.assert(row);
+        return {
+            language: validated.language,
+            nodeId: validated.parentId,
+        };
+    });
 }
 //# sourceMappingURL=load-documents.queries.js.map

package/dist/admin-backend/document/load-documents.queries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-documents.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/document/load-documents.queries.ts"],"names":[],"mappings":"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"}