sitero 0.2.0 → 0.4.0

package/dist/src/core/infrastructure/prisma/file/include.js

@@ -1,14 +1,13 @@
-const livePostReference = { deletedAt: null };
 const FILE_USAGE_INCLUDE = {
   adminAsAvatarImage: true,
-  postsAsCoverImage: { where: livePostReference },
-  postsAsContentImage: { where: livePostReference },
-  postsAsFiles1: { where: livePostReference },
-  postsAsFiles2: { where: livePostReference },
-  postsAsFile1: { where: livePostReference },
-  postsAsFile2: { where: livePostReference },
-  postsAsFile3: { where: livePostReference },
-  postsAsFile4: { where: livePostReference },
+  postsAsCoverImage: true,
+  postsAsContentImage: true,
+  postsAsFiles1: true,
+  postsAsFiles2: true,
+  postsAsFile1: true,
+  postsAsFile2: true,
+  postsAsFile3: true,
+  postsAsFile4: true,
   configsAsFiles1: true,
   configsAsFiles2: true,
   configsAsFile1: true,
@@ -18,14 +17,14 @@ const FILE_USAGE_INCLUDE = {
 };
 const FILE_USAGE_COUNT_SELECT = {
   adminAsAvatarImage: true,
-  postsAsCoverImage: { where: livePostReference },
-  postsAsContentImage: { where: livePostReference },
-  postsAsFiles1: { where: livePostReference },
-  postsAsFiles2: { where: livePostReference },
-  postsAsFile1: { where: livePostReference },
-  postsAsFile2: { where: livePostReference },
-  postsAsFile3: { where: livePostReference },
-  postsAsFile4: { where: livePostReference },
+  postsAsCoverImage: true,
+  postsAsContentImage: true,
+  postsAsFiles1: true,
+  postsAsFiles2: true,
+  postsAsFile1: true,
+  postsAsFile2: true,
+  postsAsFile3: true,
+  postsAsFile4: true,
   configsAsFiles1: true,
   configsAsFiles2: true,
   configsAsFile1: true,
@@ -35,14 +34,14 @@ const FILE_USAGE_COUNT_SELECT = {
 };
 const FILE_NOT_IN_USE_WHERE = {
   adminAsAvatarImage: { none: {} },
-  postsAsCoverImage: { none: livePostReference },
-  postsAsContentImage: { none: livePostReference },
-  postsAsFiles1: { none: livePostReference },
-  postsAsFiles2: { none: livePostReference },
-  postsAsFile1: { none: livePostReference },
-  postsAsFile2: { none: livePostReference },
-  postsAsFile3: { none: livePostReference },
-  postsAsFile4: { none: livePostReference },
+  postsAsCoverImage: { none: {} },
+  postsAsContentImage: { none: {} },
+  postsAsFiles1: { none: {} },
+  postsAsFiles2: { none: {} },
+  postsAsFile1: { none: {} },
+  postsAsFile2: { none: {} },
+  postsAsFile3: { none: {} },
+  postsAsFile4: { none: {} },
   configsAsFiles1: { none: {} },
   configsAsFiles2: { none: {} },
   configsAsFile1: { none: {} },
@@ -54,5 +53,22 @@ const FILE_DETAIL_INCLUDE = {
   ...FILE_USAGE_INCLUDE,
   translations: true
 };
+const FILE_RELATIONS_INCLUDE = {
+  adminAsAvatarImage: { select: { id: true } },
+  postsAsCoverImage: { select: { id: true } },
+  postsAsContentImage: { select: { id: true } },
+  postsAsFiles1: { select: { id: true } },
+  postsAsFiles2: { select: { id: true } },
+  postsAsFile1: { select: { id: true } },
+  postsAsFile2: { select: { id: true } },
+  postsAsFile3: { select: { id: true } },
+  postsAsFile4: { select: { id: true } },
+  configsAsFiles1: { select: { slug: true } },
+  configsAsFiles2: { select: { slug: true } },
+  configsAsFile1: { select: { slug: true } },
+  configsAsFile2: { select: { slug: true } },
+  configsAsFile3: { select: { slug: true } },
+  configsAsFile4: { select: { slug: true } }
+};
 
-export { FILE_DETAIL_INCLUDE, FILE_NOT_IN_USE_WHERE, FILE_USAGE_COUNT_SELECT, FILE_USAGE_INCLUDE };
+export { FILE_DETAIL_INCLUDE, FILE_NOT_IN_USE_WHERE, FILE_RELATIONS_INCLUDE, FILE_USAGE_COUNT_SELECT, FILE_USAGE_INCLUDE };

package/dist/src/core/infrastructure/prisma/file/mappers.js

@@ -7,7 +7,6 @@ import 'react/jsx-runtime';
 import '@tanstack/react-query';
 import 'clsx';
 import 'tailwind-merge';
-import 'zod';
 import { adminToSafe } from '../admin/base-mappers.js';
 import { configToDomain } from '../config/mappers.js';
 import { postToDomain } from '../post/base-mappers.js';
@@ -48,5 +47,36 @@ function fileDetailToDomain(file) {
     configsAsFile4: file.configsAsFile4.map(configToDomain)
   };
 }
+function fileRelationsToDomain(file) {
+  const postIds = /* @__PURE__ */ new Set();
+  const configSlugs = /* @__PURE__ */ new Set();
+  for (const posts of [
+    file.postsAsCoverImage,
+    file.postsAsContentImage,
+    file.postsAsFiles1,
+    file.postsAsFiles2,
+    file.postsAsFile1,
+    file.postsAsFile2,
+    file.postsAsFile3,
+    file.postsAsFile4
+  ]) {
+    for (const post of posts) postIds.add(post.id);
+  }
+  for (const configs of [
+    file.configsAsFiles1,
+    file.configsAsFiles2,
+    file.configsAsFile1,
+    file.configsAsFile2,
+    file.configsAsFile3,
+    file.configsAsFile4
+  ]) {
+    for (const config of configs) configSlugs.add(config.slug);
+  }
+  return {
+    adminIds: file.adminAsAvatarImage.map((admin) => admin.id),
+    postIds: [...postIds],
+    configSlugs: [...configSlugs]
+  };
+}
 
-export { fileDetailToDomain, toFileContentData };
+export { fileDetailToDomain, fileRelationsToDomain, toFileContentData };

package/dist/src/core/infrastructure/prisma/helpers/active-file-references.js

@@ -0,0 +1,20 @@
+import { FileNotFoundError } from 'sitero-server';
+
+async function withActiveFileReferences(prisma, items, write) {
+  return prisma.$transaction(async (transaction) => {
+    const ids = [
+      ...new Set(items.flatMap((item) => item ? [item.id] : []))
+    ].sort();
+    for (const id of ids) {
+      const rows = await transaction.$queryRaw`
+        SELECT deleted_at, purge_started_at FROM files WHERE id = ${id} FOR UPDATE
+      `;
+      const file = rows[0];
+      if (!file || file.deleted_at || file.purge_started_at)
+        throw new FileNotFoundError();
+    }
+    return write(transaction);
+  });
+}
+
+export { withActiveFileReferences };

package/dist/src/core/infrastructure/prisma/post/include.js

@@ -30,5 +30,13 @@ const POST_DETAIL_INCLUDE = {
   file4: { include: { translations: true } },
   seoMetadatas: true
 };
+const POST_RELATIONS_INCLUDE = {
+  children: { where: { deletedAt: null }, select: { id: true, type: true } },
+  taggedPosts: { where: { deletedAt: null }, select: { id: true, type: true } },
+  referencingPosts: {
+    where: { deletedAt: null },
+    select: { id: true, type: true }
+  }
+};
 
-export { POST_DETAIL_INCLUDE, POST_LIST_CARD_INCLUDE, POST_REFERENCE_INCLUDE };
+export { POST_DETAIL_INCLUDE, POST_LIST_CARD_INCLUDE, POST_REFERENCE_INCLUDE, POST_RELATIONS_INCLUDE };

package/dist/src/core/infrastructure/prisma/post/mappers.js

@@ -1,3 +1,4 @@
+import { POST_TYPES } from 'sitero-domain';
 import { adminListCardToDomain } from '../admin/mappers.js';
 import { fileToCard } from '../file/base-mappers.js';
 import { seoMetadataToDomain } from '../seo-metadata/mappers.js';
@@ -46,5 +47,23 @@ function postDetailToDomain(post) {
     seoMetadatas: post.seoMetadatas.map(seoMetadataToDomain)
   };
 }
+function postRelationsToDomain(post) {
+  const idsByType = (posts) => ({
+    categoryIds: posts.filter((item) => item.type === POST_TYPES.CATEGORY).map((item) => item.id),
+    subcategoryIds: posts.filter((item) => item.type === POST_TYPES.SUBCATEGORY).map((item) => item.id),
+    postIds: posts.filter((item) => item.type === POST_TYPES.POST).map((item) => item.id)
+  });
+  const children = idsByType(post.children);
+  const tagged = idsByType(post.taggedPosts);
+  const referencing = idsByType(post.referencingPosts);
+  return {
+    childSubcategoryIds: children.subcategoryIds,
+    childPostIds: children.postIds,
+    taggedCategoryIds: tagged.categoryIds,
+    taggedSubcategoryIds: tagged.subcategoryIds,
+    taggedPostIds: tagged.postIds,
+    referencingPostIds: referencing.postIds
+  };
+}
 
-export { postDetailToDomain, postListCardToDomain, postReferenceToDomain };
+export { postDetailToDomain, postListCardToDomain, postReferenceToDomain, postRelationsToDomain };

package/dist/src/core/infrastructure/prisma/post/post-prisma-ports.js

@@ -1,9 +1,10 @@
 import { ulid } from 'ulid';
+import { withActiveFileReferences } from '../helpers/active-file-references.js';
 import { connectOrDisconnectOne, setMany, connectOne, connectMany } from '../helpers/relation-writes.js';
 import { createSearchWhere } from '../helpers/search-where.js';
 import { postToDomain } from './base-mappers.js';
-import { POST_DETAIL_INCLUDE, POST_LIST_CARD_INCLUDE, POST_REFERENCE_INCLUDE } from './include.js';
-import { postListCardToDomain, postDetailToDomain, postReferenceToDomain } from './mappers.js';
+import { POST_RELATIONS_INCLUDE, POST_DETAIL_INCLUDE, POST_LIST_CARD_INCLUDE, POST_REFERENCE_INCLUDE } from './include.js';
+import { postRelationsToDomain, postListCardToDomain, postDetailToDomain, postReferenceToDomain } from './mappers.js';
 
 const SEARCH_TEXT_FIELDS = [
   "text1",
@@ -54,105 +55,135 @@ function createPostPrismaPorts(prisma) {
     // ------------------------------------------------------------
     postCommandPort: {
       async create(input) {
-        const id = ulid();
-        const {
-          author,
-          topic,
-          parents,
-          tags,
-          relatedPosts,
-          coverImage,
-          contentImages,
-          files1,
-          files2,
-          file1,
-          file2,
-          file3,
-          file4,
-          translations,
-          slug,
-          ...scalars
-        } = input;
-        const authorWrite = connectOne(author);
-        const topicWrite = connectOne(topic);
-        const coverImageWrite = connectOne(coverImage);
-        const file1Write = connectOne(file1);
-        const file2Write = connectOne(file2);
-        const file3Write = connectOne(file3);
-        const file4Write = connectOne(file4);
-        const post = await prisma.post.create({
-          data: {
-            ...scalars,
-            id,
-            slug: slug?.trim() || id,
-            ...authorWrite ? { author: authorWrite } : {},
-            ...topicWrite ? { topic: topicWrite } : {},
-            parents: connectMany(parents),
-            tags: connectMany(tags),
-            relatedPosts: connectMany(relatedPosts),
-            ...coverImageWrite ? { coverImage: coverImageWrite } : {},
-            contentImages: connectMany(contentImages),
-            files1: connectMany(files1),
-            files2: connectMany(files2),
-            ...file1Write ? { file1: file1Write } : {},
-            ...file2Write ? { file2: file2Write } : {},
-            ...file3Write ? { file3: file3Write } : {},
-            ...file4Write ? { file4: file4Write } : {},
-            translations: { create: translations.map(translationToWrite) }
+        return withActiveFileReferences(
+          prisma,
+          [
+            input.coverImage,
+            ...input.contentImages,
+            ...input.files1,
+            ...input.files2,
+            input.file1,
+            input.file2,
+            input.file3,
+            input.file4
+          ],
+          async (transaction) => {
+            const id = ulid();
+            const {
+              author,
+              topic,
+              parents,
+              tags,
+              relatedPosts,
+              coverImage,
+              contentImages,
+              files1,
+              files2,
+              file1,
+              file2,
+              file3,
+              file4,
+              translations,
+              slug,
+              ...scalars
+            } = input;
+            const authorWrite = connectOne(author);
+            const topicWrite = connectOne(topic);
+            const coverImageWrite = connectOne(coverImage);
+            const file1Write = connectOne(file1);
+            const file2Write = connectOne(file2);
+            const file3Write = connectOne(file3);
+            const file4Write = connectOne(file4);
+            const post = await transaction.post.create({
+              data: {
+                ...scalars,
+                id,
+                slug: slug?.trim() || id,
+                ...authorWrite ? { author: authorWrite } : {},
+                ...topicWrite ? { topic: topicWrite } : {},
+                parents: connectMany(parents),
+                tags: connectMany(tags),
+                relatedPosts: connectMany(relatedPosts),
+                ...coverImageWrite ? { coverImage: coverImageWrite } : {},
+                contentImages: connectMany(contentImages),
+                files1: connectMany(files1),
+                files2: connectMany(files2),
+                ...file1Write ? { file1: file1Write } : {},
+                ...file2Write ? { file2: file2Write } : {},
+                ...file3Write ? { file3: file3Write } : {},
+                ...file4Write ? { file4: file4Write } : {},
+                translations: { create: translations.map(translationToWrite) }
+              }
+            });
+            return postToDomain(post);
           }
-        });
-        return postToDomain(post);
+        );
       },
       async update(input) {
-        const {
-          id,
-          author,
-          topic,
-          parents,
-          tags,
-          relatedPosts,
-          coverImage,
-          contentImages,
-          files1,
-          files2,
-          file1,
-          file2,
-          file3,
-          file4,
-          translations,
-          slug,
-          ...scalars
-        } = input;
-        const post = await prisma.post.update({
-          where: { id },
-          data: {
-            ...scalars,
-            slug: slug?.trim() || id,
-            author: connectOrDisconnectOne(author),
-            topic: connectOrDisconnectOne(topic),
-            parents: setMany(parents),
-            tags: setMany(tags),
-            relatedPosts: setMany(relatedPosts),
-            coverImage: connectOrDisconnectOne(coverImage),
-            contentImages: setMany(contentImages),
-            files1: setMany(files1),
-            files2: setMany(files2),
-            file1: connectOrDisconnectOne(file1),
-            file2: connectOrDisconnectOne(file2),
-            file3: connectOrDisconnectOne(file3),
-            file4: connectOrDisconnectOne(file4),
-            translations: {
-              upsert: translations.map((translation) => ({
-                where: {
-                  postId_locale: { postId: id, locale: translation.locale }
-                },
-                update: translationToWrite(translation),
-                create: translationToWrite(translation)
-              }))
-            }
+        return withActiveFileReferences(
+          prisma,
+          [
+            input.coverImage,
+            ...input.contentImages,
+            ...input.files1,
+            ...input.files2,
+            input.file1,
+            input.file2,
+            input.file3,
+            input.file4
+          ],
+          async (transaction) => {
+            const {
+              id,
+              author,
+              topic,
+              parents,
+              tags,
+              relatedPosts,
+              coverImage,
+              contentImages,
+              files1,
+              files2,
+              file1,
+              file2,
+              file3,
+              file4,
+              translations,
+              slug,
+              ...scalars
+            } = input;
+            const post = await transaction.post.update({
+              where: { id },
+              data: {
+                ...scalars,
+                slug: slug?.trim() || id,
+                author: connectOrDisconnectOne(author),
+                topic: connectOrDisconnectOne(topic),
+                parents: setMany(parents),
+                tags: setMany(tags),
+                relatedPosts: setMany(relatedPosts),
+                coverImage: connectOrDisconnectOne(coverImage),
+                contentImages: setMany(contentImages),
+                files1: setMany(files1),
+                files2: setMany(files2),
+                file1: connectOrDisconnectOne(file1),
+                file2: connectOrDisconnectOne(file2),
+                file3: connectOrDisconnectOne(file3),
+                file4: connectOrDisconnectOne(file4),
+                translations: {
+                  upsert: translations.map((translation) => ({
+                    where: {
+                      postId_locale: { postId: id, locale: translation.locale }
+                    },
+                    update: translationToWrite(translation),
+                    create: translationToWrite(translation)
+                  }))
+                }
+              }
+            });
+            return postToDomain(post);
           }
-        });
-        return postToDomain(post);
+        );
       },
       async delete({ id }) {
         return postToDomain(
@@ -200,6 +231,7 @@ function createPostPrismaPorts(prisma) {
           ...input.topicSlug ? { topic: { slug: input.topicSlug } } : {},
           ...input.parentId ? { parents: { some: { id: input.parentId } } } : {},
           ...input.parentSlug ? { parents: { some: { slug: input.parentSlug } } } : {},
+          ...input.authorId ? { authorId: input.authorId } : {},
           ...input.postIds || input.excludeIds ? {
             id: {
               ...input.postIds ? { in: input.postIds } : {},
@@ -276,6 +308,15 @@ function createPostPrismaPorts(prisma) {
           next: next ? postListCardToDomain(next) : null
         };
       }
+    },
+    postRelationsQueryPort: {
+      async findRelations({ id }) {
+        const post = await prisma.post.findUnique({
+          where: { id },
+          include: POST_RELATIONS_INCLUDE
+        });
+        return post ? postRelationsToDomain(post) : null;
+      }
     }
   };
 }

package/dist/src/core/infrastructure/storage/sftp/sftp-service.js

@@ -6,9 +6,7 @@ function createSftpService({
   basePath,
   logger
 }) {
-  async function upload({
-    file
-  }) {
+  async function upload({ file }) {
     const key = createObjectKey({
       filename: file.name,
       mimeType: file.type

package/dist/src/core/infrastructure/storage/utils.js

@@ -10,7 +10,6 @@ import 'react/jsx-runtime';
 import '@tanstack/react-query';
 import 'clsx';
 import 'tailwind-merge';
-import 'zod';
 
 function createObjectKey({
   filename,

package/dist/src/core/sitero-server/create-sitero-server.js

@@ -94,7 +94,9 @@ function createSiteroServer(input) {
         },
         file: {
           fileCommandPort: filePrismaPorts.fileCommandPort,
+          filePurgePort: filePrismaPorts.filePurgePort,
           fileQueryPort: filePrismaPorts.fileQueryPort,
+          fileRelationsQueryPort: filePrismaPorts.fileRelationsQueryPort,
           fileReplaceContentPort: filePrismaPorts.fileReplaceContentPort,
           storageRemovePort: storage
         },
@@ -104,7 +106,8 @@ function createSiteroServer(input) {
         },
         post: {
           postCommandPort: postPrismaPorts.postCommandPort,
-          postQueryPort: postPrismaPorts.postQueryPort
+          postQueryPort: postPrismaPorts.postQueryPort,
+          postRelationsQueryPort: postPrismaPorts.postRelationsQueryPort
         },
         seoMetadata: {
           seoMetadataCommandPort: seoMetadataPrismaPorts.seoMetadataCommandPort

package/dist/src/core/sitero-server/email.js

@@ -5,7 +5,7 @@ import { CMS_PATHS } from '../../constants/paths/cms-paths.js';
 import '../../constants/paths/redirect.js';
 import '../../constants/cms-locale.js';
 import { createTransporter, createNodemailerEmailDeliveryPort } from '../infrastructure/email/delivery.js';
-import { createFilesystemEmailComposer } from '../infrastructure/email/filesystem-email-composer.js';
+import { createReactEmailComposer } from '../infrastructure/email/react-email-composer.js';
 import { createUrlEmailLinkBuilderPort } from '../infrastructure/email/link.js';
 
 function createEmailComposition({
@@ -18,7 +18,7 @@ function createEmailComposition({
     transporter,
     logger
   });
-  const emailComposer = createFilesystemEmailComposer({
+  const emailComposer = createReactEmailComposer({
     catalog: email.catalog,
     url: email.rendering.webUrl,
     logoUrl: email.rendering.logoUrl,
@@ -95,16 +95,22 @@ function createEmailComposition({
         }
       },
       emailTemplateRendererPort: {
-        render: ({ key, locale }) => emailComposer.compose({
-          key,
-          locale,
-          // Preview data never generates tokens or invokes a sender.
-          replacements: {
-            emailVerificationUrl: "https://example.invalid/email-preview/verify",
-            passwordResetUrl: "https://example.invalid/email-preview/reset",
-            url: "https://example.invalid/email-preview/inquiry"
-          }
-        })
+        render: async ({ key, locale }) => {
+          const preview = await emailComposer.compose({
+            key,
+            locale,
+            // Preview data never generates tokens or invokes a sender.
+            replacements: {
+              emailVerificationUrl: "https://example.invalid/email-preview/verify",
+              passwordResetUrl: "https://example.invalid/email-preview/reset",
+              url: "https://example.invalid/email-preview/inquiry"
+            }
+          });
+          return {
+            ...preview,
+            supportedLocales: Object.keys(email.catalog[key].locales)
+          };
+        }
       }
     }
   };

package/dist/src/shared/blob-file/get-media-info/get-audio-info.js

@@ -3,12 +3,19 @@ function getAudioInfo(file) {
     const audio = document.createElement("audio");
     const objectUrl = URL.createObjectURL(file);
     audio.preload = "metadata";
+    const timeout = setTimeout(() => onError(), 1e4);
     const cleanup = () => {
+      clearTimeout(timeout);
       audio.removeEventListener("loadedmetadata", onLoadedMetadata);
       audio.removeEventListener("error", onError);
+      audio.src = "";
       URL.revokeObjectURL(objectUrl);
     };
     const onLoadedMetadata = () => {
+      if (!Number.isFinite(audio.duration)) {
+        onError();
+        return;
+      }
       const duration = audio.duration;
       cleanup();
       resolve({ duration });

package/dist/src/shared/blob-file/get-media-info/get-image-info.js

@@ -2,7 +2,9 @@ function getImageInfo(file) {
   return new Promise((resolve, reject) => {
     const img = new Image();
     const objectUrl = URL.createObjectURL(file);
+    const timeout = setTimeout(() => onError(), 1e4);
     const cleanup = () => {
+      clearTimeout(timeout);
       img.removeEventListener("load", onLoad);
       img.removeEventListener("error", onError);
       URL.revokeObjectURL(objectUrl);

package/dist/src/shared/blob-file/get-media-info/get-media-info.js

@@ -24,7 +24,7 @@ const getMediaInfo = async (file) => {
     }
     return fallback;
   } catch {
-    return fallback;
+    return { ...fallback, metadataError: true };
   }
 };
 

package/dist/src/shared/blob-file/get-media-info/get-video-info.js

@@ -3,13 +3,19 @@ function getVideoInfo(file) {
     const video = document.createElement("video");
     const objectUrl = URL.createObjectURL(file);
     video.preload = "metadata";
+    const timeout = setTimeout(() => onError(), 1e4);
     const cleanup = () => {
+      clearTimeout(timeout);
       video.removeEventListener("loadedmetadata", onLoadedMetadata);
       video.removeEventListener("error", onError);
       video.src = "";
       URL.revokeObjectURL(objectUrl);
     };
     const onLoadedMetadata = () => {
+      if (!Number.isFinite(video.duration)) {
+        onError();
+        return;
+      }
       const info = {
         width: video.videoWidth,
         height: video.videoHeight,

package/dist/src/shared/client/react-query/field-errors.js

@@ -0,0 +1,13 @@
+function mapOperationFieldErrors(fields) {
+  return (fields ?? []).map((field) => ({
+    path: field.path.join("."),
+    kind: field.kind,
+    code: field.code,
+    ...field.meta ? { meta: field.meta } : {}
+  }));
+}
+function getFieldError(fieldErrors, path) {
+  return fieldErrors.find((field) => field.path === path);
+}
+
+export { getFieldError, mapOperationFieldErrors };

package/dist/src/shared/client/react-query/operation-client-error.js

@@ -0,0 +1,13 @@
+class OperationClientError extends Error {
+  operation;
+  constructor(operation) {
+    super(operation.code);
+    this.name = "OperationClientError";
+    this.operation = operation;
+  }
+}
+function getOperationError(error) {
+  return error instanceof OperationClientError ? error.operation : void 0;
+}
+
+export { OperationClientError, getOperationError };