sitero 0.1.0 → 0.1.2

package/dist/src/constants/paths/cms-paths.js

@@ -51,10 +51,13 @@ const CMS_PATHS = {
       },
       category: {
         pathname: (topicSlug = "") => `${DB}/content/content-management/${topicSlug}/category`
-      }
-    },
-    topic: { pathname: `${DB}/content/topic` },
-    tag: { pathname: `${DB}/content/tag` }
+      },
+      subcategory: {
+        pathname: (topicSlug = "") => `${DB}/content/content-management/${topicSlug}/subcategory`
+      },
+      topic: { pathname: `${DB}/content/content-management/topic` },
+      tag: { pathname: `${DB}/content/content-management/tag` }
+    }
   }
 };
 

package/dist/src/core/domain/static/topics.js

@@ -0,0 +1,29 @@
+import { POST_TYPES } from 'sitero-domain';
+
+function getTopicItemsByRole(topics, slug, items, role) {
+  if (!slug || !hasTopicRole(topics, slug, role)) return [];
+  return (items ?? []).filter((item) => item.type === role);
+}
+function hasTopicRole(topics, slug, role) {
+  return topics[slug]?.roles.includes(role) ?? false;
+}
+function isContentTopic(topics, slug) {
+  return hasTopicRole(topics, slug, POST_TYPES.POST) && !hasTopicRole(topics, slug, POST_TYPES.PRODUCT);
+}
+function isProductTopic(topics, slug) {
+  return hasTopicRole(topics, slug, POST_TYPES.PRODUCT);
+}
+function getTopicCategories(topics, slug, items) {
+  return getTopicItemsByRole(topics, slug, items, POST_TYPES.CATEGORY);
+}
+function getTopicSubcategories(topics, slug, items) {
+  return getTopicItemsByRole(topics, slug, items, POST_TYPES.SUBCATEGORY);
+}
+function getTopicPosts(topics, slug, items) {
+  return getTopicItemsByRole(topics, slug, items, POST_TYPES.POST);
+}
+function getTopicProducts(topics, slug, items) {
+  return getTopicItemsByRole(topics, slug, items, POST_TYPES.PRODUCT);
+}
+
+export { getTopicCategories, getTopicPosts, getTopicProducts, getTopicSubcategories, hasTopicRole, isContentTopic, isProductTopic };

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

@@ -16,7 +16,6 @@ import '@keyv/redis';
 import 'keyv';
 import 'nodemailer';
 import './infrastructure/email/template/render-email-template.js';
-import '../domain/resources/admin/constants.js';
 import 'ulid';
 import { createCoreInterfaces } from './interfaces/create-core-interfaces.js';
 import 'next/dist/client/components/redirect-error';

package/dist/src/core/server/infrastructure/database/file/query/file-query-repository.js

@@ -1,5 +1,5 @@
-import '../../../../../domain/resources/admin/constants.js';
 import { ROOT_FOLDER_ID } from '../../../../../domain/resources/constants.js';
+import 'sitero-domain';
 import { ORDER_BY } from '../../constants.js';
 import { buildFileUsage } from '../../utils/build-file-usage.js';
 import { createPagination } from '../../utils/create-pagination.js';

package/dist/src/core/server/infrastructure/database/folder/query/folder-query-repository.js

@@ -1,5 +1,5 @@
-import '../../../../../domain/resources/admin/constants.js';
 import { ROOT_FOLDER_ID } from '../../../../../domain/resources/constants.js';
+import 'sitero-domain';
 import { ORDER_BY } from '../../constants.js';
 import { createPagination } from '../../utils/create-pagination.js';
 import { FOLDER_FULL_INCLUDE } from '../include.js';

package/dist/src/core/server/infrastructure/database/post/command/post-command-repository.js

@@ -1,165 +1,20 @@
 import { ulid } from 'ulid';
-import { updateOne, updateMany, connectOne, connectMany } from '../../utils/connect.js';
 import { postToDomain } from '../utils/post-to-domain.js';
+import { createPostCreateData } from './post-create-data.js';
+import { createPostUpdateData } from './post-update-data.js';
 
 function createPostCommandRepository(prisma) {
-  async function create({
-    slug,
-    type,
-    // ------------------------------------
-    // relations
-    // ------------------------------------
-    // Admin
-    author,
-    // Post
-    topicId,
-    parents,
-    tags,
-    relatedPosts,
-    // File
-    coverImage,
-    contentImageIds,
-    // ------------------------------------
-    // --- custom fields
-    // ------------------------------------
-    // multi images
-    files1,
-    files2,
-    // single images
-    file1,
-    file2,
-    file3,
-    file4,
-    // ------------------------------------
-    // translation
-    // ------------------------------------
-    translations,
-    // rest
-    ...params
-  }) {
+  async function create({ type, ...params }) {
     const id = ulid();
     const created = await prisma.post.create({
-      data: {
-        ...params,
-        id,
-        type,
-        // ------------------------------------------------------------------------
-        // states
-        // ------------------------------------------------------------------------
-        slug: slug?.trim() || id,
-        // Use id when slug is null or empty string
-        // ------------------------------------------------------------------------
-        // relations
-        // ------------------------------------------------------------------------
-        // Admin
-        author: connectOne(author),
-        // Post
-        topic: connectOne(topicId ? { id: topicId } : null),
-        parents: connectMany(parents),
-        tags: connectMany(tags),
-        relatedPosts: connectMany(relatedPosts),
-        // File
-        coverImage: connectOne(coverImage),
-        contentImages: connectMany(contentImageIds.map((id2) => ({ id: id2 }))),
-        // ------------------------------------------------------------------------
-        // --- custom fields
-        // ------------------------------------------------------------------------
-        // multi images
-        files1: connectMany(files1),
-        files2: connectMany(files2),
-        // single images
-        file1: connectOne(file1),
-        file2: connectOne(file2),
-        file3: connectOne(file3),
-        file4: connectOne(file4),
-        // ------------------------------------------------------------------------
-        // translation
-        // ------------------------------------------------------------------------
-        translations: { create: translations }
-      }
+      data: createPostCreateData({ id, type, params })
     });
     return postToDomain(created);
   }
-  async function update({
-    id,
-    slug,
-    type,
-    // ------------------------------------
-    // relations
-    // ------------------------------------
-    // Admin
-    author,
-    // Post
-    topicId,
-    parents,
-    tags,
-    relatedPosts,
-    // File
-    coverImage,
-    contentImageIds,
-    // ------------------------------------
-    // --- custom fields
-    // ------------------------------------
-    // multi images
-    files1,
-    files2,
-    // single images
-    file1,
-    file2,
-    file3,
-    file4,
-    // ------------------------------------
-    // translation
-    // ------------------------------------
-    translations,
-    // rest
-    ...params
-  }) {
+  async function update({ id, type, ...params }) {
     const updated = await prisma.post.update({
       where: { id },
-      data: {
-        ...params,
-        type,
-        // ------------------------------------------------------------------------
-        // states
-        // ------------------------------------------------------------------------
-        slug: slug?.trim() || id,
-        // Use id when slug is null or empty string
-        // ------------------------------------------------------------------------
-        // relations
-        // ------------------------------------------------------------------------
-        // Admin
-        author: updateOne(author),
-        // Post
-        topic: updateOne(topicId ? { id: topicId } : null),
-        parents: updateMany(parents),
-        tags: updateMany(tags),
-        relatedPosts: updateMany(relatedPosts),
-        // File
-        coverImage: updateOne(coverImage),
-        contentImages: updateMany(contentImageIds.map((id2) => ({ id: id2 }))),
-        // ------------------------------------------------------------------------
-        // --- custom fields
-        // ------------------------------------------------------------------------
-        // multi images
-        files1: updateMany(files1),
-        files2: updateMany(files2),
-        // single images
-        file1: updateOne(file1),
-        file2: updateOne(file2),
-        file3: updateOne(file3),
-        file4: updateOne(file4),
-        // ------------------------------------------------------------------------
-        // translation
-        // ------------------------------------------------------------------------
-        translations: {
-          upsert: translations.map((t) => ({
-            where: { postId_locale: { postId: id, locale: t.locale } },
-            update: t,
-            create: t
-          }))
-        }
-      }
+      data: createPostUpdateData({ id, type, params })
     });
     return postToDomain(updated);
   }

package/dist/src/core/server/infrastructure/database/post/command/post-create-data.js

@@ -0,0 +1,81 @@
+import { connectOne, connectMany } from '../../utils/connect.js';
+
+function createPostCreateData({
+  id,
+  type,
+  params
+}) {
+  const {
+    slug,
+    // ------------------------------------
+    // relations
+    // ------------------------------------
+    // Admin
+    author,
+    // Post
+    topicId,
+    parents,
+    tags,
+    relatedPosts,
+    // File
+    coverImage,
+    contentImageIds,
+    // ------------------------------------
+    // --- custom fields
+    // ------------------------------------
+    // multi images
+    files1,
+    files2,
+    // single images
+    file1,
+    file2,
+    file3,
+    file4,
+    // ------------------------------------
+    // translation
+    // ------------------------------------
+    translations,
+    // rest
+    ...rest
+  } = params;
+  return {
+    ...rest,
+    id,
+    type,
+    // ------------------------------------------------------------------------
+    // states
+    // ------------------------------------------------------------------------
+    slug: slug?.trim() || id,
+    // Use id when slug is null or empty string
+    // ------------------------------------------------------------------------
+    // relations
+    // ------------------------------------------------------------------------
+    // Admin
+    author: connectOne(author),
+    // Post
+    topic: connectOne(topicId ? { id: topicId } : null),
+    parents: connectMany(parents),
+    tags: connectMany(tags),
+    relatedPosts: connectMany(relatedPosts),
+    // File
+    coverImage: connectOne(coverImage),
+    contentImages: connectMany(contentImageIds.map((id2) => ({ id: id2 }))),
+    // ------------------------------------------------------------------------
+    // --- custom fields
+    // ------------------------------------------------------------------------
+    // multi images
+    files1: connectMany(files1),
+    files2: connectMany(files2),
+    // single images
+    file1: connectOne(file1),
+    file2: connectOne(file2),
+    file3: connectOne(file3),
+    file4: connectOne(file4),
+    // ------------------------------------------------------------------------
+    // translation
+    // ------------------------------------------------------------------------
+    translations: { create: translations }
+  };
+}
+
+export { createPostCreateData };

package/dist/src/core/server/infrastructure/database/post/command/post-update-data.js

@@ -0,0 +1,86 @@
+import { updateOne, updateMany } from '../../utils/connect.js';
+
+function createPostUpdateData({
+  id,
+  type,
+  params
+}) {
+  const {
+    slug,
+    // ------------------------------------
+    // relations
+    // ------------------------------------
+    // Admin
+    author,
+    // Post
+    topicId,
+    parents,
+    tags,
+    relatedPosts,
+    // File
+    coverImage,
+    contentImageIds,
+    // ------------------------------------
+    // --- custom fields
+    // ------------------------------------
+    // multi images
+    files1,
+    files2,
+    // single images
+    file1,
+    file2,
+    file3,
+    file4,
+    // ------------------------------------
+    // translation
+    // ------------------------------------
+    translations,
+    // rest
+    ...rest
+  } = params;
+  return {
+    ...rest,
+    type,
+    // ------------------------------------------------------------------------
+    // states
+    // ------------------------------------------------------------------------
+    slug: slug?.trim() || id,
+    // Use id when slug is null or empty string
+    // ------------------------------------------------------------------------
+    // relations
+    // ------------------------------------------------------------------------
+    // Admin
+    author: updateOne(author),
+    // Post
+    topic: updateOne(topicId ? { id: topicId } : null),
+    parents: updateMany(parents),
+    tags: updateMany(tags),
+    relatedPosts: updateMany(relatedPosts),
+    // File
+    coverImage: updateOne(coverImage),
+    contentImages: updateMany(contentImageIds.map((id2) => ({ id: id2 }))),
+    // ------------------------------------------------------------------------
+    // --- custom fields
+    // ------------------------------------------------------------------------
+    // multi images
+    files1: updateMany(files1),
+    files2: updateMany(files2),
+    // single images
+    file1: updateOne(file1),
+    file2: updateOne(file2),
+    file3: updateOne(file3),
+    file4: updateOne(file4),
+    // ------------------------------------------------------------------------
+    // translation
+    // ------------------------------------------------------------------------
+    translations: {
+      upsert: translations.map((t) => ({
+        where: { postId_locale: { postId: id, locale: t.locale } },
+        update: t,
+        create: t
+      }))
+    }
+  };
+}
+
+export { createPostUpdateData };

package/dist/src/core/server/infrastructure/i18n/messages/index.js

@@ -0,0 +1,9 @@
+import { EN_US } from './en-US/index.js';
+import { ZH_TW } from './zh-TW/index.js';
+
+const coreServerMessages = {
+  "en-US": EN_US,
+  "zh-TW": ZH_TW
+};
+
+export { coreServerMessages };

package/dist/src/core/server/interfaces/actions/resources/file/commands/purge-many/file-purge-many-action.js

@@ -1,7 +1,7 @@
 import { getTranslator } from 'intor/next/server';
 import pLimit from 'p-limit';
-import '../../../../../../../domain/resources/admin/constants.js';
 import { isFileLocked } from '../../../../../../../domain/resources/file/utils/is-file-locked.js';
+import 'sitero-domain';
 import { ServerError } from '../../../../../../server-error.js';
 import { filePurgeManyValidator } from './file-purge-many-validator.js';
 

package/dist/src/core/server/interfaces/actions/resources/file/commands/soft-delete/file-soft-delete-action.js

@@ -1,6 +1,6 @@
 import { getTranslator } from 'intor/next/server';
-import '../../../../../../../domain/resources/admin/constants.js';
 import { isFileLocked } from '../../../../../../../domain/resources/file/utils/is-file-locked.js';
+import 'sitero-domain';
 import { ServerError } from '../../../../../../server-error.js';
 
 function createFileSoftDeleteAction(ctx) {

package/dist/src/core/server/interfaces/actions/resources/file/commands/soft-delete-many/file-soft-delete-many-action.js

@@ -1,6 +1,6 @@
 import { getTranslator } from 'intor/next/server';
-import '../../../../../../../domain/resources/admin/constants.js';
 import { isFileLocked } from '../../../../../../../domain/resources/file/utils/is-file-locked.js';
+import 'sitero-domain';
 import { ServerError } from '../../../../../../server-error.js';
 import { fileSoftDeleteManyValidator } from './file-soft-delete-many-validator.js';
 

package/dist/src/core/server/interfaces/actions/resources/folder/commands/delete/folder-delete-action.js

@@ -1,6 +1,6 @@
 import { getTranslator } from 'intor/next/server';
-import '../../../../../../../domain/resources/admin/constants.js';
 import { isFolderLocked } from '../../../../../../../domain/resources/folder/utils/is-folder-locked.js';
+import 'sitero-domain';
 import { ServerError } from '../../../../../../server-error.js';
 
 function createFolderDeleteAction(ctx) {

package/dist/src/core/server/interfaces/actions/resources/folder/queries/folder-find-full-action.js

@@ -1,6 +1,6 @@
 import { getTranslator } from 'intor/next/server';
-import '../../../../../../domain/resources/admin/constants.js';
 import { ROOT_FOLDER_ID, ROOT_FOLDER } from '../../../../../../domain/resources/constants.js';
+import 'sitero-domain';
 import { ServerError } from '../../../../../server-error.js';
 
 function createFolderFindFullAction(ctx) {

package/dist/src/core/server/seeders/folder/seeder.js

@@ -1,5 +1,5 @@
-import '../../../domain/resources/admin/constants.js';
 import { SIMPLE_UPLOAD_FOLDER_NAME, SIMPLE_UPLOAD_FOLDER_KEY } from '../../../domain/resources/constants.js';
+import 'sitero-domain';
 
 function folderSeeder({ prisma }) {
   async function checkExistence() {

package/dist/src/web/server/applications/sitemap/get-post-items.js

@@ -1,24 +1,64 @@
+import { POST_TYPES } from 'sitero-domain';
 import 'mime-types';
-import 'sitero-domain';
 import 'clsx';
 import 'tailwind-merge';
 import { joinUrl } from '../../../../shared/utils/join-url.js';
 import 'zod';
 
+function getCategorySlug(post) {
+  return post.parents?.[0]?.slug;
+}
+function getSubcategorySlugs(post) {
+  const subcategorySlug = post.parents?.[0]?.slug;
+  const categorySlug = post.parents?.[0]?.parents?.[0]?.slug;
+  return {
+    categorySlug,
+    subcategorySlug
+  };
+}
 function createGetPostItems({
   loadPosts,
   buildUrlsFromPathname
 }) {
-  return async function getPostItems({ topicSlug }) {
+  return async function getPostItems({
+    topicSlug,
+    topics
+  }) {
+    const topic = topics?.[topicSlug];
+    const hasCategory = topic?.roles.includes(POST_TYPES.CATEGORY) ?? false;
+    const hasSubcategory = topic?.roles.includes(POST_TYPES.SUBCATEGORY) ?? false;
     const { posts } = await loadPosts({
       locale: "",
       // locale not important here
       topicSlug,
-      include: { parents: true }
+      include: hasSubcategory ? { parents: { include: { parents: true } } } : { parents: true }
     });
-    return posts.filter((p) => p.parents?.[0]?.slug).map((p) => {
-      const categorySlug = p.parents?.[0]?.slug ?? "";
-      const pathname = joinUrl("/", topicSlug, categorySlug, p.slug);
+    return posts.filter((p) => {
+      if (!topic) return getCategorySlug(p);
+      if (!hasCategory) return true;
+      if (!hasSubcategory) return getCategorySlug(p);
+      const { categorySlug, subcategorySlug } = getSubcategorySlugs(p);
+      return categorySlug && subcategorySlug;
+    }).map((p) => {
+      const pathname = (() => {
+        if (!topic) {
+          return joinUrl("/", topicSlug, getCategorySlug(p) ?? "", p.slug);
+        }
+        if (!hasCategory) {
+          return joinUrl("/", topicSlug, p.slug);
+        }
+        if (!hasSubcategory) {
+          return joinUrl("/", topicSlug, getCategorySlug(p) ?? "", p.slug);
+        }
+        const { categorySlug, subcategorySlug } = getSubcategorySlugs(p);
+        return joinUrl(
+          "/",
+          topicSlug,
+          categorySlug ?? "",
+          subcategorySlug ?? "",
+          p.slug
+        );
+      })();
       const entry = buildUrlsFromPathname(pathname);
       return {
         ...entry,

package/dist/src/web/server/applications/sitemap/get-subcategory-items.js

@@ -0,0 +1,34 @@
+import 'mime-types';
+import 'sitero-domain';
+import 'clsx';
+import 'tailwind-merge';
+import { joinUrl } from '../../../../shared/utils/join-url.js';
+import 'zod';
+
+function createGetSubcategoryItems({
+  loadSubcategories,
+  buildUrlsFromPathname
+}) {
+  return async function getSubcategoryItems({
+    topicSlug,
+    categorySlug
+  }) {
+    const { subcategories } = await loadSubcategories({
+      locale: "",
+      // locale not important here
+      topicSlug,
+      ...categorySlug && { categorySlug }
+    });
+    return subcategories.filter((s) => categorySlug || s.parents?.[0]?.slug).map((s) => {
+      const parentSlug = categorySlug ?? s.parents?.[0]?.slug ?? "";
+      const url = joinUrl("/", topicSlug, parentSlug, s.slug);
+      const entry = buildUrlsFromPathname(url);
+      return {
+        ...entry,
+        lastModified: new Date(s.updatedAt)
+      };
+    });
+  };
+}
+
+export { createGetSubcategoryItems };

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

@@ -14,7 +14,6 @@ import '@keyv/redis';
 import 'keyv';
 import '../../core/server/infrastructure/cookie/cookie-service.js';
 import 'node:crypto';
-import '../../core/domain/resources/admin/constants.js';
 import 'ulid';
 import 'nodemailer';
 import '../../core/server/infrastructure/email/template/render-email-template.js';

package/dist/src/web/server/interfaces/actions/resources/config/queries/config-find-action.js

@@ -12,7 +12,6 @@ import '@keyv/redis';
 import 'keyv';
 import '../../../../../../../core/server/infrastructure/cookie/cookie-service.js';
 import 'node:crypto';
-import '../../../../../../../core/domain/resources/admin/constants.js';
 import 'ulid';
 import 'nodemailer';
 import '../../../../../../../core/server/infrastructure/email/template/render-email-template.js';

package/dist/src/web/server/interfaces/actions/resources/post/queries/post-find-full-action.js

@@ -12,7 +12,6 @@ import '@keyv/redis';
 import 'keyv';
 import '../../../../../../../core/server/infrastructure/cookie/cookie-service.js';
 import 'node:crypto';
-import '../../../../../../../core/domain/resources/admin/constants.js';
 import 'ulid';
 import 'nodemailer';
 import '../../../../../../../core/server/infrastructure/email/template/render-email-template.js';

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

@@ -5,6 +5,8 @@ import { createInquiryCreateAction } from './actions/resources/inquiry/commands/
 import { createLoadPage } from './loaders/load-page.js';
 import { createLoadCategories } from './loaders/load-categories.js';
 import { createLoadCategory } from './loaders/load-category.js';
+import { createLoadSubcategories } from './loaders/load-subcategories.js';
+import { createLoadSubcategory } from './loaders/load-subcategory.js';
 import { createLoadPosts } from './loaders/load-posts.js';
 import { createLoadPost } from './loaders/load-post.js';
 import { createLoadConfig } from './loaders/load-config.js';
@@ -38,6 +40,8 @@ function createWebInterfaces(input) {
     loadPage: createLoadPage(ctx),
     loadCategories: createLoadCategories(ctx),
     loadCategory: createLoadCategory(ctx),
+    loadSubcategories: createLoadSubcategories(ctx),
+    loadSubcategory: createLoadSubcategory(ctx),
     loadPosts: createLoadPosts(ctx),
     loadPost: createLoadPost(ctx),
     loadConfig: createLoadConfig(ctx)

package/dist/src/web/server/interfaces/loaders/load-categories.js

@@ -1,3 +1,4 @@
+import { POST_TYPES } from 'sitero-domain';
 import '../../../../core/server/infrastructure/argon2/argon2-service.js';
 import '@keyv/redis';
 import 'keyv';
@@ -5,13 +6,11 @@ import 'intor/next/server';
 import '../../../../core/server/infrastructure/cookie/cookie-service.js';
 import 'node:crypto';
 import { POST_ORDER_BY } from '../../../../core/server/infrastructure/database/constants.js';
-import 'sitero-domain';
 import 'mime-types';
 import 'clsx';
 import 'tailwind-merge';
 import { ensureArray } from '../../../../shared/utils/ensure-array.js';
 import 'zod';
-import '../../../../core/domain/resources/admin/constants.js';
 import 'ulid';
 import { POST_LIST_CARD_INCLUDE } from '../../../../core/server/infrastructure/database/post/include.js';
 import 'nodemailer';
@@ -28,7 +27,10 @@ function createLoadCategories(ctx) {
     topicSlug,
     childrenCount
   }) {
-    const categoryType = constants.staticTopics[topicSlug]?.categoryType;
+    const topic = constants.staticTopics[topicSlug];
+    if (!topic?.roles.includes(POST_TYPES.CATEGORY)) {
+      return { categories: [] };
+    }
     const include = {
       children: {
         where: { isActive: true },
@@ -40,7 +42,7 @@ function createLoadCategories(ctx) {
     const { items: categories } = await coreServer.interfaces.executions.runAction(
       () => interfaces.actions.resources.post.findListCards({
         locale,
-        type: categoryType ?? null,
+        type: POST_TYPES.CATEGORY,
         topicSlug,
         isActive: true,
         // extra children posts