@yimingliao/cms 0.0.24 → 0.0.25

package/dist/server/index.d.ts

@@ -5,7 +5,8 @@ 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';
+import { S as SuccessResult, R as Result } from '../types-DHlRoJwv.js';
+import { NextResponse } from 'next/server';
 
 interface CreateJwtServiceOptions {
     defaultSecret: string;
@@ -601,7 +602,7 @@ declare const POST_ORDER_BY: ({
 type Action<D> = (translator: BaseTranslator<LocaleMessages>) => Promise<Omit<SuccessResult<D>, "success"> & {
     i18nKey?: string;
 }>;
-interface CreateServerActionOptions {
+interface CreateExecuteActionOptions {
     initI18n: () => Promise<BaseTranslator<LocaleMessages>>;
     cacheResult: <T>({ key, ttl, load }: CacheResultOptions<T>) => Promise<T>;
     cache: Keyv<unknown>;
@@ -612,14 +613,14 @@ interface ServerActionOptions {
     key?: RawCacheKey;
     ttl?: number;
 }
-declare function createExecuteAction({ initI18n, cacheResult, cache, logger, }: CreateServerActionOptions): <D = void>(fn: Action<D>, options?: ServerActionOptions) => Promise<Result<D>>;
+declare function createExecuteAction({ initI18n, cacheResult, cache, logger, }: CreateExecuteActionOptions): <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;
-};
+type Api = (translator: BaseTranslator<LocaleMessages>) => Promise<NextResponse<unknown>>;
+interface CreateExecuteApiOptions {
+    initI18n: () => Promise<BaseTranslator<LocaleMessages>>;
+    logger: Logger;
+}
+declare function createExecuteApi({ initI18n, logger, }: CreateExecuteApiOptions): (fn: Api) => Promise<NextResponse<unknown>>;
 
 declare class ServerError extends Error {
     readonly i18nKey?: string;
@@ -639,4 +640,4 @@ declare class ServerError extends Error {
     static internalServerError(): ServerError;
 }
 
-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 };
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createExecuteApi, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };

package/dist/server/index.js

@@ -8,6 +8,7 @@ import KeyvRedis from '@keyv/redis';
 import Keyv from 'keyv';
 import { ulid } from 'ulid';
 import { ZodError } from 'zod';
+import { NextResponse } from 'next/server';
 
 function createJwtService({
   defaultSecret,
@@ -1457,7 +1458,7 @@ var ServerError = class _ServerError extends Error {
   }
 };
 
-// src/server/interfaces/execute-action/normalize-error.ts
+// src/server/interfaces/normalize-error.ts
 var normalizeError = (error, translator) => {
   if (error instanceof ZodError) {
     const errors = error.issues.map((issue) => {
@@ -1520,5 +1521,29 @@ function createExecuteAction({
     }
   };
 }
+function createExecuteApi({
+  initI18n,
+  logger
+}) {
+  return async function serverApi(fn) {
+    const translator = await initI18n();
+    try {
+      return await fn(translator);
+    } catch (error) {
+      const { message, errors, statusCode, isInternal } = normalizeError(
+        error,
+        translator
+      );
+      logger.error({ message, errors });
+      return NextResponse.json(
+        result.error({
+          message: isInternal ? "Internal server error" : message,
+          ...errors ? { errors } : {}
+        }),
+        { status: statusCode }
+      );
+    }
+  };
+}
 
-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 };
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createExecuteApi, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yimingliao/cms",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",