@yimingliao/cms 0.0.45 → 0.0.47

package/dist/server/index.d.ts

@@ -869,7 +869,7 @@ declare const signInValidator: (schemas: ReturnType<typeof createSchemas>) => zo
     password: zod.ZodString;
 }, zod_v4_core.$strip>;
 
-type SignInFormData = zod__default.infer<typeof signInValidator>;
+type SignInFormData = zod__default.infer<ReturnType<typeof signInValidator>>;
 interface CreateSignInActionParams {
     executeAction: ReturnType<typeof createExecuteAction>;
     ipRateLimiter: (options: RateLimiterOptions) => Promise<void>;
@@ -913,7 +913,7 @@ declare const changePasswordValidator: (schemas: ReturnType<typeof createSchemas
     newPasswordConfirm: zod.ZodString;
 }, zod_v4_core.$strip>;
 
-type ChangePasswordFormData = zod__default.infer<typeof changePasswordValidator>;
+type ChangePasswordFormData = zod__default.infer<ReturnType<typeof changePasswordValidator>>;
 interface CreateChangePasswordActionParams {
     executeAction: ReturnType<typeof createExecuteAction>;
     ipRateLimiter: (options: RateLimiterOptions) => Promise<void>;
@@ -930,7 +930,7 @@ declare const verifyEmailValidator: (schemas: ReturnType<typeof createSchemas>)
     emailVerificationToken: zod.ZodString;
 }, zod_v4_core.$strip>;
 
-type VerifyEmailFormData = zod__default.infer<typeof verifyEmailValidator>;
+type VerifyEmailFormData = zod__default.infer<ReturnType<typeof verifyEmailValidator>>;
 interface CreateVerifyEmailActionParams {
     executeAction: ReturnType<typeof createExecuteAction>;
     ipRateLimiter: (options: RateLimiterOptions) => Promise<void>;
@@ -948,7 +948,7 @@ declare const emailUnverifiedValidator: (schemas: ReturnType<typeof createSchema
     email: zod.ZodEmail;
 }, zod_v4_core.$strip>;
 
-type EmailUnverifiedFormData = zod__default.infer<typeof emailUnverifiedValidator>;
+type EmailUnverifiedFormData = zod__default.infer<ReturnType<typeof emailUnverifiedValidator>>;
 interface CreateEmailUnverifiedActionParams {
     executeAction: ReturnType<typeof createExecuteAction>;
     ipRateLimiter: (options: RateLimiterOptions) => Promise<void>;
@@ -964,7 +964,7 @@ declare const forgetPasswordValidator: (schemas: ReturnType<typeof createSchemas
     email: zod.ZodEmail;
 }, zod_v4_core.$strip>;
 
-type ForgotPasswordFormData = zod__default.infer<typeof forgetPasswordValidator>;
+type ForgotPasswordFormData = zod__default.infer<ReturnType<typeof forgetPasswordValidator>>;
 interface CreateForgotPasswordActionParams {
     executeAction: ReturnType<typeof createExecuteAction>;
     ipRateLimiter: (options: RateLimiterOptions) => Promise<void>;
@@ -982,7 +982,7 @@ declare const resetPasswordValidator: (schemas: ReturnType<typeof createSchemas>
     newPasswordConfirm: zod.ZodString;
 }, zod_v4_core.$strip>;
 
-type ResetPasswordFormData = zod__default.infer<typeof resetPasswordValidator>;
+type ResetPasswordFormData = zod__default.infer<ReturnType<typeof resetPasswordValidator>>;
 interface CreateResetPasswordActionParams {
     executeAction: ReturnType<typeof createExecuteAction>;
     ipRateLimiter: (options: RateLimiterOptions) => Promise<void>;
@@ -1011,4 +1011,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, createAuthMiddleware, createAuthUseCases, createCache, createCacheResult, createChangePasswordAction, createCookieService, createCryptoService, createEmailUnverifiedAction, createEmailVerificationEmail, createExecuteAction, createExecuteApi, createExist, createFileCommandRepository, createFileQueryRepository, createFileSchema, createFolderCommandRepository, createFolderQueryRepository, createForgotPasswordAction, createForgotPasswordEmail, createIpRateLimiter, createJwtService, createMultiFileSchema, createPostCommandRepository, createPostQueryRepository, createRenderEmailTemplate, createResetPasswordAction, createSchemas, createSendEmail, createSeoMetadataCommandRepository, createSignInAction, createSignOutAction, createTocItemSchema, createTransporter, createUnique, createVerifyAccessToken, createVerifyAction, createVerifyEmailAction, createVerifyRefreshToken, createZod, normalizeCacheKey };
+export { ADMIN_ORDER_BY, type ChangePasswordFormData, type EmailUnverifiedFormData, type ForgotPasswordFormData, ORDER_BY, POST_ORDER_BY, type RawCacheKey, type ResetPasswordFormData, ServerError, type SignInFormData, type VerifyEmailFormData, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createAuthMiddleware, createAuthUseCases, createCache, createCacheResult, createChangePasswordAction, createCookieService, createCryptoService, createEmailUnverifiedAction, createEmailVerificationEmail, createExecuteAction, createExecuteApi, createExist, createFileCommandRepository, createFileQueryRepository, createFileSchema, createFolderCommandRepository, createFolderQueryRepository, createForgotPasswordAction, createForgotPasswordEmail, createIpRateLimiter, createJwtService, createMultiFileSchema, createPostCommandRepository, createPostQueryRepository, createRenderEmailTemplate, createResetPasswordAction, createSchemas, createSendEmail, createSeoMetadataCommandRepository, createSignInAction, createSignOutAction, createTocItemSchema, createTransporter, createUnique, createVerifyAccessToken, createVerifyAction, createVerifyEmailAction, createVerifyRefreshToken, createZod, normalizeCacheKey };

package/dist/server/index.js

@@ -244,7 +244,7 @@ var normalizeCacheKey = (key, delimiter = CACHE_KEY_DELIMITER) => {
 
 // src/server/infrastructure/cache/create-cache-result.ts
 var DAY = 1e3 * 60 * 60 * 24;
-function createCacheResult(cache, logger) {
+function createCacheResult(cache2, logger) {
   return async function cacheResult({
     key: rawKey,
     ttl = DAY,
@@ -259,13 +259,13 @@ function createCacheResult(cache, logger) {
       return load();
     }
     try {
-      const cached = await cache.get(key);
+      const cached = await cache2.get(key);
       if (cached !== void 0) {
         return cached;
       }
       const data = await load();
       if (data !== void 0) {
-        await cache.set(key, data, ttl);
+        await cache2.set(key, data, ttl);
       }
       return data;
     } catch (error) {
@@ -287,13 +287,13 @@ var lua = `
     end
     return current
   `;
-function createIpRateLimiter(cache, appName) {
+function createIpRateLimiter(cache2, appName) {
   return async function ipRateLimiter({
     key: rawKey,
     maxAttempts = DEFAULT_MAX_ATTEMPTS,
     timeWindow = DEFAULT_TIME_WINDOW
   }) {
-    const secondaryStore = cache.store;
+    const secondaryStore = cache2.store;
     const redis = await secondaryStore.getClient();
     if (!redis) return true;
     const headersStore = await headers();
@@ -643,23 +643,29 @@ function createSendEmail({
 }
 var TEMPLATE_DIR = path.resolve(process.cwd(), "emails");
 var LAYOUT_PATH = path.join(TEMPLATE_DIR, "layout.html");
-var templateCache = /* @__PURE__ */ new Map();
+var isDev = process.env.NODE_ENV !== "production";
+var cache = /* @__PURE__ */ new Map();
 async function readTemplate(filePath) {
-  if (templateCache.has(filePath)) return templateCache.get(filePath);
+  if (!isDev && cache.has(filePath)) {
+    return cache.get(filePath);
+  }
   try {
     const html = await readFile(filePath, "utf8");
-    templateCache.set(filePath, html);
+    if (!isDev) cache.set(filePath, html);
     return html;
   } catch (error) {
     throw new Error(`Email template file not found: ${filePath}`);
   }
 }
-function applyReplacements(html, replacements) {
-  let result2 = html;
-  for (const [key, value] of Object.entries(replacements)) {
-    result2 = result2.replaceAll(`{{{${key}}}}`, value);
-  }
-  return result2;
+function applyReplacements(html, replacements, logger) {
+  return html.replace(/\{\{\{(.*?)\}\}\}/g, (_, key) => {
+    const value = replacements[key];
+    if (value == null) {
+      logger?.warn({ msg: "Email template variable missing", variable: key });
+      return "";
+    }
+    return value;
+  });
 }
 function createRenderEmailTemplate({
   storageUrl,
@@ -670,17 +676,18 @@ function createRenderEmailTemplate({
       const contentPath = path.join(TEMPLATE_DIR, `${templateKey}.html`);
       const layoutHtml = await readTemplate(LAYOUT_PATH);
       let contentHtml = await readTemplate(contentPath);
-      contentHtml = applyReplacements(contentHtml, {
-        STORAGE_URL: storageUrl,
-        ...replacements
-      });
+      contentHtml = applyReplacements(
+        contentHtml,
+        { STORAGE_URL: storageUrl, ...replacements },
+        logger
+      );
       return layoutHtml.replaceAll("{{{content}}}", contentHtml);
     } catch (error) {
       logger.error({
         msg: "Email template render failed",
         templateKey,
         templateDir: TEMPLATE_DIR,
-        error
+        error: error instanceof Error ? error.stack : error
       });
       throw new Error(`Email template error: ${templateKey}`);
     }
@@ -1853,7 +1860,7 @@ var normalizeError = (error, translator) => {
 function createExecuteAction({
   initI18n,
   cacheResult,
-  cache,
+  cache: cache2,
   logger
 }) {
   return async function executeAction(fn, options = {}) {
@@ -1865,7 +1872,7 @@ function createExecuteAction({
         ...options.ttl ? { ttl: options.ttl } : {},
         load: async () => fn(translator)
       }) : await fn(translator);
-      if (options.type === "command") cache.clear();
+      if (options.type === "command") cache2.clear();
       const finalMessage = i18nKey ? translator.t(i18nKey) : message;
       return result.success({
         ...finalMessage ? { message: finalMessage } : {},

package/package.json

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