sitero 0.1.7 → 0.3.0

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

@@ -2,8 +2,8 @@ import { ulid } from 'ulid';
 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",
@@ -200,6 +200,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 +277,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

@@ -26,7 +26,6 @@ function createSiteroServer(input) {
     storage,
     uploads,
     policies,
-    publicResources,
     email
   } = input;
   const authenticationToken = createAuthenticationTokenPort({
@@ -64,7 +63,6 @@ function createSiteroServer(input) {
       }
     },
     email: emailComposition.email,
-    ...publicResources ? { publicResources } : {},
     ...policies ? { policies } : {},
     uploads,
     rateLimits: createRateLimits(input.rateLimits),
@@ -97,6 +95,7 @@ function createSiteroServer(input) {
         file: {
           fileCommandPort: filePrismaPorts.fileCommandPort,
           fileQueryPort: filePrismaPorts.fileQueryPort,
+          fileRelationsQueryPort: filePrismaPorts.fileRelationsQueryPort,
           fileReplaceContentPort: filePrismaPorts.fileReplaceContentPort,
           storageRemovePort: storage
         },
@@ -106,7 +105,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 };

package/dist/src/shared/client/react-query/use-command.js

@@ -1,11 +1,16 @@
 "use client";
 import { useMutation } from '@tanstack/react-query';
-import { useState } from 'react';
+import { useState, useRef } from 'react';
 import { queryClient } from './client.js';
+import { mapOperationFieldErrors } from './field-errors.js';
+import { OperationClientError, getOperationError } from './operation-client-error.js';
 
 function useCommand(fn, mutationOptions) {
   const [isRedirecting, setIsRedirecting] = useState(false);
-  const [errors, setErrors] = useState([]);
+  const [fieldErrors, setFieldErrors] = useState([]);
+  const latestExecutionIdRef = useRef(0);
+  const latestMutationIdRef = useRef(0);
+  const errors = fieldErrors.map((field) => field.path);
   const {
     shouldTrigger,
     clearAll = true,
@@ -15,36 +20,48 @@ function useCommand(fn, mutationOptions) {
   const mutation = useMutation({
     ...reactQueryOptions,
     mutationFn: async (params) => {
+      const mutationId = ++latestMutationIdRef.current;
+      const isLatestMutation = () => mutationId === latestMutationIdRef.current;
       const response = await fn(params);
       if (response.success) {
-        setErrors([]);
+        if (isLatestMutation()) setFieldErrors([]);
         if (clearAll) await queryClient.invalidateQueries();
         return response.data;
       }
-      setErrors(
-        (response.error.fields ?? []).map((field) => field.path.join(".")).filter((f) => typeof f === "string")
-      );
-      onFailure?.(response.error);
-      throw new Error(response.error.code);
+      const nextFieldErrors = mapOperationFieldErrors(response.error.fields);
+      if (isLatestMutation()) {
+        setFieldErrors(nextFieldErrors);
+        onFailure?.(response.error);
+      }
+      throw new OperationClientError(response.error);
     }
   });
   const execute = (async (params) => {
+    let executionId;
     try {
       if (shouldTrigger) {
         const shouldProceed = await shouldTrigger(params);
-        if (!shouldProceed) {
-          setIsRedirecting(false);
-          return void 0;
-        }
+        if (!shouldProceed) return void 0;
       }
+      executionId = ++latestExecutionIdRef.current;
       setIsRedirecting(true);
       return await mutation.mutateAsync(params);
     } catch {
-      setIsRedirecting(false);
       return void 0;
+    } finally {
+      if (executionId !== void 0 && latestExecutionIdRef.current === executionId) {
+        setIsRedirecting(false);
+      }
     }
   });
-  return { ...mutation, execute, isRedirecting, errors };
+  return {
+    ...mutation,
+    execute,
+    isRedirecting,
+    errors,
+    fieldErrors,
+    operationError: getOperationError(mutation.error)
+  };
 }
 
 export { useCommand };

package/dist/src/shared/client/react-query/use-query.js

@@ -1,19 +1,20 @@
 "use client";
 import { useQuery as useQuery$1 } from '@tanstack/react-query';
+import { OperationClientError, getOperationError } from './operation-client-error.js';
 
 function useQuery(fn, queryKey, queryOptions) {
-  const { params, ...rest } = queryOptions || {};
   const query = useQuery$1({
-    queryKey: params ? [...queryKey, params] : queryKey,
+    queryKey,
     queryFn: async () => {
-      const response = await fn(params);
+      const response = await fn();
       if (response.success) return response.data;
-      throw new Error(response.error.code);
+      throw new OperationClientError(response.error);
     },
-    ...rest
+    ...queryOptions
   });
+  const operationError = getOperationError(query.error);
   const isNotFound = !query.isPending && !query.data;
-  return { ...query, isNotFound };
+  return { ...query, operationError, isNotFound };
 }
 
 export { useQuery };

package/dist/src/shared/client/storage/local-storage.js

@@ -0,0 +1,62 @@
+const LOCAL_STORAGE_CHANGE_EVENT = "sitero:local-storage-change";
+function getLocalStorage() {
+  if (typeof window === "undefined") return null;
+  try {
+    return window.localStorage;
+  } catch {
+    return null;
+  }
+}
+function notifyChange(key) {
+  window.dispatchEvent(
+    new CustomEvent(LOCAL_STORAGE_CHANGE_EVENT, {
+      detail: { key }
+    })
+  );
+}
+const localStorageService = {
+  get(key) {
+    try {
+      return getLocalStorage()?.getItem(key) ?? null;
+    } catch {
+      return null;
+    }
+  },
+  set(key, value) {
+    const storage = getLocalStorage();
+    if (!storage) return;
+    try {
+      storage.setItem(key, value);
+      notifyChange(key);
+    } catch {
+    }
+  },
+  remove(key) {
+    const storage = getLocalStorage();
+    if (!storage) return;
+    try {
+      storage.removeItem(key);
+      notifyChange(key);
+    } catch {
+    }
+  },
+  subscribe(key, onChange) {
+    if (typeof window === "undefined") return () => {
+    };
+    const handleStorageChange = (event) => {
+      if (event.key === key) onChange();
+    };
+    const handleLocalChange = (event) => {
+      const { detail } = event;
+      if (detail?.key === key) onChange();
+    };
+    window.addEventListener("storage", handleStorageChange);
+    window.addEventListener(LOCAL_STORAGE_CHANGE_EVENT, handleLocalChange);
+    return () => {
+      window.removeEventListener("storage", handleStorageChange);
+      window.removeEventListener(LOCAL_STORAGE_CHANGE_EVENT, handleLocalChange);
+    };
+  }
+};
+
+export { localStorageService };

package/dist/src/shared/next/server/response.js

@@ -1,12 +1,7 @@
 import { NextResponse } from 'next/server';
-import { operationResult } from 'sitero-server';
+import { operationResult, normalizeOperationError } from 'sitero-server';
 import { ZodError } from 'zod';
 
-function toFieldPath(path) {
-  return path.filter(
-    (item) => typeof item === "string" || typeof item === "number"
-  );
-}
 function getOperationFailureStatus(error) {
   switch (error.code) {
     case "RATE_LIMITED":
@@ -33,11 +28,7 @@ function toNextErrorResponse(error) {
   if (error instanceof ZodError) {
     return toNextFailureJsonResponse(
       {
-        code: "VALIDATION_FAILED",
-        fields: error.issues.map((issue) => ({
-          path: toFieldPath(issue.path),
-          code: issue.code
-        }))
+        ...normalizeOperationError(error)
       },
       { status: 422 }
     );

package/dist/src/shared/seo-metadata.js

@@ -12,11 +12,6 @@ const OG_TYPE_ARRAY = [
   "video.movie",
   "video.episode"
 ];
-const TWITTER_CARD_ARRAY = [
-  "summary",
-  "summary_large_image",
-  "player",
-  "app"
-];
+const TWITTER_CARD_ARRAY = ["summary", "summary_large_image"];
 
 export { OG_TYPE_ARRAY, TWITTER_CARD_ARRAY };

package/dist/src/shared/translation/find-translation.js

@@ -1,5 +1,8 @@
-function findTranslation(translations, locale, defaultValue) {
-  const fallback = translations?.[0];
+function findTranslation(translations, locale, {
+  fallbackToFirst = true,
+  defaultValue
+} = {}) {
+  const fallback = fallbackToFirst ? translations?.[0] : void 0;
   const translation = translations?.find((t) => t.locale === locale) ?? fallback;
   if (!translation) return { locale: locale ?? "" };
   const result = { ...translation };

package/dist/src/shared/translation/get-translation-value.js

@@ -0,0 +1,10 @@
+function getTranslationValue(translations = [], locale, fieldName = "") {
+  const translation = translations.find((translation2) => {
+    return translation2.locale === locale;
+  });
+  if (!translation) return null;
+  const value = translation[fieldName];
+  return value === null || value === void 0 ? null : value;
+}
+
+export { getTranslationValue };

package/dist/src/shared/translation/update-translations.js

@@ -0,0 +1,14 @@
+function updateTranslations(translations = [], locale, fieldName, value) {
+  const hasLocale = translations.some((translation) => {
+    return translation.locale === locale;
+  });
+  const updatedTranslations = translations.map((translation) => {
+    return translation.locale === locale ? { ...translation, [fieldName]: value } : translation;
+  });
+  if (!hasLocale) {
+    updatedTranslations.push({ locale, [fieldName]: value });
+  }
+  return updatedTranslations;
+}
+
+export { updateTranslations };

package/dist/src/shared/utils/get-locale-language-code.js

@@ -0,0 +1,5 @@
+function getLocaleLanguageCode(locale) {
+  return locale?.split("-")[0];
+}
+
+export { getLocaleLanguageCode };

package/dist/src/web/client/applications/structured-data/build-breadcrumb.js

@@ -0,0 +1,15 @@
+function buildBreadcrumb(items, resolveUrl) {
+  if (items.length === 0) return void 0;
+  return {
+    "@context": "https://schema.org",
+    "@type": "BreadcrumbList",
+    itemListElement: items.map((item, index) => ({
+      "@type": "ListItem",
+      position: index + 1,
+      name: item.name,
+      item: resolveUrl(item.pathname)
+    }))
+  };
+}
+
+export { buildBreadcrumb };

package/dist/src/web/server/create-web-server.js

@@ -1,14 +1,20 @@
+import { resolveRequestContext } from '../../shared/next/server/request.js';
+import 'next/server';
+import 'sitero-server';
+import 'zod';
 import { createWebInquiryActions } from './features/inquiry/actions.js';
 import { createWebConfigActions } from './resources/config/actions.js';
 import { createWebPostActions } from './resources/post/actions.js';
 
 function createWebServer({
-  getRequestIp,
   siteroServer,
   staticTopics
 }) {
   const config = createWebConfigActions({ siteroServer });
-  const inquiry = createWebInquiryActions({ siteroServer, getRequestIp });
+  const inquiry = createWebInquiryActions({
+    siteroServer,
+    resolveRequestContext
+  });
   const post = createWebPostActions({ siteroServer, staticTopics });
   return {
     actions: {

package/dist/src/web/server/features/inquiry/actions.js

@@ -1,15 +1,11 @@
 function createWebInquiryActions({
   siteroServer,
-  getRequestIp
+  resolveRequestContext
 }) {
   const inquirySubmitAction = async ({
     formData
   }) => {
-    const context = {
-      request: {
-        ip: getRequestIp ? await getRequestIp() : "unknown"
-      }
-    };
+    const context = await resolveRequestContext();
     return siteroServer.executor.execute(
       siteroServer.features.inquiry.submit,
       {

package/dist/src/web/server/resources/config/actions.js

@@ -3,7 +3,7 @@ function createWebConfigActions({
 }) {
   const configFindDetailAction = async (input) => {
     const result = await siteroServer.executor.execute(
-      siteroServer.resources.config.findPublic,
+      siteroServer.resources.config.findDetail,
       input,
       {}
     );