@yimingliao/cms 0.0.21 → 0.0.23

package/dist/server/index.d.ts

@@ -4,6 +4,8 @@ import { cookies } from 'next/headers';
 import Keyv from 'keyv';
 import { Logger } from 'logry';
 import { e as AdminRole, v as SingleItem, B as BaseTranslation, a as Admin, c as AdminFull, f as AdminSafe, D as DeviceInfo, d as AdminRefreshToken, k as File, m as FileFull, o as FileType, p as Folder, F as FolderFull, u as PostType, M as MultiItems, E as ExternalLink, j as Faq, T as TocItem, q as Post, s as PostListCard, t as PostTranslation, r as PostFull, S as SeoMetadata, g as AdminTranslation, n as FileTranslation, h as Alternate } from '../base-DbGnfZr6.js';
+import { BaseTranslator, LocaleMessages } from 'intor';
+import { S as SuccessResult, R as Result, E as ErrorDetail } from '../types-DHlRoJwv.js';
 
 interface CreateJwtServiceOptions {
     defaultSecret: string;
@@ -596,4 +598,37 @@ declare const POST_ORDER_BY: ({
     index: "asc";
 })[];
 
-export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };
+type Action<D> = (translator: BaseTranslator<LocaleMessages>) => Promise<Omit<SuccessResult<D>, "success"> & {
+    i18nKey?: string;
+}>;
+interface CreateServerActionOptions {
+    initI18n: () => Promise<BaseTranslator<LocaleMessages>>;
+    cacheResult: <T>({ key, ttl, load }: CacheResultOptions<T>) => Promise<T>;
+    cache: Keyv<unknown>;
+    logger: Logger;
+}
+interface ServerActionOptions {
+    type?: "command" | "query";
+    key?: RawCacheKey;
+    ttl?: number;
+}
+declare function createExecuteAction({ initI18n, cacheResult, cache, logger, }: CreateServerActionOptions): <D = void>(fn: Action<D>, options?: ServerActionOptions) => Promise<Result<D>>;
+
+declare const normalizeError: (error: unknown, translator: BaseTranslator<LocaleMessages>) => {
+    message: string;
+    errors?: ErrorDetail[];
+    statusCode: number;
+    isInternal?: boolean;
+};
+
+declare class ServerError extends Error {
+    readonly i18nKey?: string;
+    readonly statusCode?: number;
+    constructor({ message, i18nKey, statusCode, }: {
+        message?: string;
+        i18nKey?: string;
+        statusCode?: number;
+    });
+}
+
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey, normalizeError };

package/dist/server/index.js

@@ -1,5 +1,5 @@
 import { ADMIN_ROLES, ROOT_FOLDER_ID } from '../chunk-ZCOYQ5BG.js';
-import { mimeToExtension, classifyFileType } from '../chunk-YX7IPIGU.js';
+import { result, mimeToExtension, classifyFileType } from '../chunk-YX7IPIGU.js';
 import jwt from 'jsonwebtoken';
 import argon2 from 'argon2';
 import crypto, { timingSafeEqual } from 'crypto';
@@ -7,6 +7,7 @@ import { headers } from 'next/headers';
 import KeyvRedis from '@keyv/redis';
 import Keyv from 'keyv';
 import { ulid } from 'ulid';
+import { ZodError } from 'zod';
 
 function createJwtService({
   defaultSecret,
@@ -1421,4 +1422,84 @@ function createSeoMetadataCommandRepository(prisma) {
   };
 }
 
-export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };
+// src/server/server-error.ts
+var ServerError = class extends Error {
+  i18nKey;
+  statusCode;
+  constructor({
+    message,
+    i18nKey,
+    statusCode
+  }) {
+    super(message);
+    this.name = this.constructor.name;
+    if (i18nKey) this.i18nKey = i18nKey;
+    if (statusCode) this.statusCode = statusCode;
+  }
+};
+
+// src/server/interfaces/execute-action/normalize-error.ts
+var normalizeError = (error, translator) => {
+  if (error instanceof ZodError) {
+    const errors = error.issues.map((issue) => {
+      let message = issue.message;
+      if (issue.code === "custom" && issue.params?.["i18nKey"]) {
+        message = translator.t(issue.params["i18nKey"]);
+      }
+      return {
+        field: issue.path.join("."),
+        // e.path: string[]  e.g. ["name", "email"]
+        message,
+        code: issue.code
+      };
+    });
+    return { message: "Validation faild", errors, statusCode: 422 };
+  }
+  if (error instanceof ServerError) {
+    const message = translator.t(
+      error.i18nKey ?? "error.internal-server-error"
+    );
+    return { message, statusCode: error.statusCode ?? 500 };
+  }
+  return {
+    message: error instanceof Error ? error.message : JSON.stringify(error),
+    statusCode: 500,
+    isInternal: true
+  };
+};
+
+// src/server/interfaces/execute-action/create-execute-action.ts
+function createExecuteAction({
+  initI18n,
+  cacheResult,
+  cache,
+  logger
+}) {
+  return async function executeAction(fn, options = {}) {
+    const translator = await initI18n();
+    const withCache = options.key && options.type === "query";
+    try {
+      const { data, i18nKey, message, meta } = withCache ? await cacheResult({
+        key: options.key,
+        ...options.ttl ? { ttl: options.ttl } : {},
+        load: async () => fn(translator)
+      }) : await fn(translator);
+      if (options.type === "command") cache.clear();
+      const finalMessage = i18nKey ? translator.t(i18nKey) : message;
+      return result.success({
+        ...finalMessage ? { message: finalMessage } : {},
+        ...data ? { data: data ?? {} } : {},
+        ...meta ? { meta } : {}
+      });
+    } catch (error) {
+      const { message, errors, isInternal } = normalizeError(error, translator);
+      logger.error({ message, errors });
+      return result.error({
+        message: isInternal ? "Internal server error" : message,
+        ...errors !== void 0 ? { errors } : {}
+      });
+    }
+  };
+}
+
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey, normalizeError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yimingliao/cms",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",
@@ -56,10 +56,12 @@
     "@types/mime-types": "^3.0.1",
     "@types/ssh2-sftp-client": "^9.0.6",
     "generic-pool": "^3.9.0",
+    "intor": "^2.5.0",
     "next": "^16.1.6",
     "prisma": "6.5.0",
     "tsup": "^8.5.1",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "zod": "^4.3.6"
   },
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",