intor-translator 1.4.5 → 1.4.6

package/dist/index.cjs

@@ -31,15 +31,11 @@ var findMessageInLocales = ({
 var findMessage = rura.rura.createHook(
   "findMessage",
   (ctx) => {
-    ctx.rawValue = void 0;
-    ctx.rawString = void 0;
-    const message = findMessageInLocales({
+    ctx.rawMessage = findMessageInLocales({
       messages: ctx.messages,
       candidateLocales: ctx.candidateLocales,
       key: ctx.key
     });
-    ctx.rawValue = message;
-    if (typeof message === "string") ctx.rawString = message;
   },
   200
 );
@@ -54,8 +50,7 @@ function makeHandlerContext(ctx) {
     key: ctx.key,
     replacements: ctx.replacements,
     candidateLocales: ctx.candidateLocales,
-    rawValue: ctx.rawValue,
-    rawString: ctx.rawString,
+    rawMessage: ctx.rawMessage,
     formattedMessage: ctx.formattedMessage,
     meta: ctx.meta
   });
@@ -65,9 +60,9 @@ function makeHandlerContext(ctx) {
 var format = rura.rura.createHook(
   "format",
   (ctx) => {
-    const { config, rawString } = ctx;
+    const { config, rawMessage } = ctx;
     const { formatHandler } = config.handlers || {};
-    if (!formatHandler || rawString === void 0) return;
+    if (!formatHandler || rawMessage === void 0) return;
     ctx.formattedMessage = formatHandler(
       makeHandlerContext(ctx)
     );
@@ -98,8 +93,8 @@ var replaceValues = (message, params) => {
 var interpolate = rura.rura.createHook(
   "interpolate",
   (ctx) => {
-    const { rawString, formattedMessage, replacements } = ctx;
-    const message = formattedMessage ?? rawString;
+    const { rawMessage, formattedMessage, replacements } = ctx;
+    const message = formattedMessage ?? rawMessage;
     if (typeof message !== "string" || !replacements) {
       ctx.finalMessage = message;
       return;
@@ -130,8 +125,8 @@ var loading = rura.rura.createHook(
 var missing = rura.rura.createHook(
   "missing",
   (ctx) => {
-    const { config, key, rawString } = ctx;
-    if (rawString !== void 0) return;
+    const { config, key, rawMessage } = ctx;
+    if (rawMessage !== void 0) return;
     const { missingHandler } = config.handlers || {};
     if (missingHandler) {
       return {
@@ -256,15 +251,6 @@ function translate(options) {
   return ctx.finalMessage;
 }
 
-// src/translators/methods/translate-raw.ts
-function translateRaw(options) {
-  const { ctx } = runTranslate(options);
-  if (ctx.rawValue === void 0) {
-    throw new Error("Invariant violated: missing hook did not produce output");
-  }
-  return ctx.rawValue;
-}
-
 // src/translators/core-translator/core-translator.ts
 var CoreTranslator = class extends BaseTranslator {
   /** User-provided options including messages, locale, and config. */
@@ -320,18 +306,6 @@ var CoreTranslator = class extends BaseTranslator {
       replacements
     });
   };
-  /** Get the raw message value for a key without formatting or interpolation. */
-  tRaw = (key, replacements) => {
-    return translateRaw({
-      hooks: this.hooks,
-      messages: this._messages,
-      locale: this._locale,
-      isLoading: this._isLoading,
-      translateConfig: this.translateConfig,
-      key,
-      replacements
-    });
-  };
 };
 
 // src/translators/scope-translator/utils/get-full-key.ts
@@ -369,18 +343,6 @@ var ScopeTranslator = class extends CoreTranslator {
           key: fullKey,
           replacements
         });
-      },
-      tRaw: (key, replacements) => {
-        const fullKey = getFullKey(preKey, key);
-        return translateRaw({
-          hooks: this.hooks,
-          messages: this._messages,
-          locale: this._locale,
-          isLoading: this._isLoading,
-          translateConfig: this.translateConfig,
-          key: fullKey,
-          replacements
-        });
       }
     };
   }

package/dist/index.d.cts

@@ -299,7 +299,7 @@ type LoadingHandler = (ctx: HandlerContext) => MessageValue;
 type MissingHandler = (ctx: HandlerContext) => MessageValue;
 /** Function to format a resolved message. */
 type FormatHandler = (ctx: HandlerContext & {
-    rawString: string;
+    rawMessage: string;
 }) => MessageValue;
 /**
  * Snapshot of the translate pipeline context exposed to handlers.
@@ -330,9 +330,7 @@ interface TranslateContext {
     /** Ordered list of locales to try, including fallbacks */
     candidateLocales: string[];
     /** Raw message value resolved from the message tree. */
-    rawValue?: MessageValue;
-    /** Raw string message before formatting. */
-    rawString?: string;
+    rawMessage?: MessageValue;
     /** Message after formatting (e.g. ICU, custom formatters) */
     formattedMessage?: MessageValue;
     /** Final value produced by the pipeline */
@@ -437,15 +435,12 @@ declare class CoreTranslator<M extends LocaleMessages | unknown = unknown, L ext
     hasKey: <K extends LocalizedLeafKeys<M, L>>(key: K, targetLocale?: Locale<M>) => boolean;
     /** Get the translated message for a key, with optional replacements. */
     t: <K extends LocalizedLeafKeys<M, L> = LocalizedLeafKeys<M, L>>(key: K, replacements?: Replacement) => LocalizedLeafValue<M, K, L>;
-    /** Get the raw message value for a key without formatting or interpolation. */
-    tRaw: <K extends LocalizedLeafKeys<M, L> = LocalizedLeafKeys<M, L>>(key: K, replacements?: Replacement) => LocalizedLeafValue<M, K, L>;
 }
 
 type ScopeTranslatorOptions<M> = CoreTranslatorOptions<M>;
 type ScopeTranslatorMethods<M extends LocaleMessages | unknown = unknown, L extends keyof M | "union" = "union", PK extends string | undefined = undefined, K extends string = PK extends string ? ScopedLeafKeys<M, PK, L> : LocalizedLeafKeys<M, L>> = {
     hasKey: (key?: K, targetLocale?: Locale<M>) => boolean;
     t: <Key extends K>(key?: Key, replacements?: Replacement) => PK extends string ? ScopedLeafValue<M, PK, Key, L> : LocalizedLeafValue<M, Key, L>;
-    tRaw: <Key extends K>(key?: Key, replacements?: Replacement) => PK extends string ? ScopedLeafValue<M, PK, Key, L> : LocalizedLeafValue<M, Key, L>;
 };
 
 declare class ScopeTranslator<M extends LocaleMessages | unknown = unknown, L extends keyof M | "union" = "union"> extends CoreTranslator<M> {

package/dist/index.d.ts

@@ -299,7 +299,7 @@ type LoadingHandler = (ctx: HandlerContext) => MessageValue;
 type MissingHandler = (ctx: HandlerContext) => MessageValue;
 /** Function to format a resolved message. */
 type FormatHandler = (ctx: HandlerContext & {
-    rawString: string;
+    rawMessage: string;
 }) => MessageValue;
 /**
  * Snapshot of the translate pipeline context exposed to handlers.
@@ -330,9 +330,7 @@ interface TranslateContext {
     /** Ordered list of locales to try, including fallbacks */
     candidateLocales: string[];
     /** Raw message value resolved from the message tree. */
-    rawValue?: MessageValue;
-    /** Raw string message before formatting. */
-    rawString?: string;
+    rawMessage?: MessageValue;
     /** Message after formatting (e.g. ICU, custom formatters) */
     formattedMessage?: MessageValue;
     /** Final value produced by the pipeline */
@@ -437,15 +435,12 @@ declare class CoreTranslator<M extends LocaleMessages | unknown = unknown, L ext
     hasKey: <K extends LocalizedLeafKeys<M, L>>(key: K, targetLocale?: Locale<M>) => boolean;
     /** Get the translated message for a key, with optional replacements. */
     t: <K extends LocalizedLeafKeys<M, L> = LocalizedLeafKeys<M, L>>(key: K, replacements?: Replacement) => LocalizedLeafValue<M, K, L>;
-    /** Get the raw message value for a key without formatting or interpolation. */
-    tRaw: <K extends LocalizedLeafKeys<M, L> = LocalizedLeafKeys<M, L>>(key: K, replacements?: Replacement) => LocalizedLeafValue<M, K, L>;
 }
 
 type ScopeTranslatorOptions<M> = CoreTranslatorOptions<M>;
 type ScopeTranslatorMethods<M extends LocaleMessages | unknown = unknown, L extends keyof M | "union" = "union", PK extends string | undefined = undefined, K extends string = PK extends string ? ScopedLeafKeys<M, PK, L> : LocalizedLeafKeys<M, L>> = {
     hasKey: (key?: K, targetLocale?: Locale<M>) => boolean;
     t: <Key extends K>(key?: Key, replacements?: Replacement) => PK extends string ? ScopedLeafValue<M, PK, Key, L> : LocalizedLeafValue<M, Key, L>;
-    tRaw: <Key extends K>(key?: Key, replacements?: Replacement) => PK extends string ? ScopedLeafValue<M, PK, Key, L> : LocalizedLeafValue<M, Key, L>;
 };
 
 declare class ScopeTranslator<M extends LocaleMessages | unknown = unknown, L extends keyof M | "union" = "union"> extends CoreTranslator<M> {

package/dist/index.js

@@ -29,15 +29,11 @@ var findMessageInLocales = ({
 var findMessage = rura.createHook(
   "findMessage",
   (ctx) => {
-    ctx.rawValue = void 0;
-    ctx.rawString = void 0;
-    const message = findMessageInLocales({
+    ctx.rawMessage = findMessageInLocales({
       messages: ctx.messages,
       candidateLocales: ctx.candidateLocales,
       key: ctx.key
     });
-    ctx.rawValue = message;
-    if (typeof message === "string") ctx.rawString = message;
   },
   200
 );
@@ -52,8 +48,7 @@ function makeHandlerContext(ctx) {
     key: ctx.key,
     replacements: ctx.replacements,
     candidateLocales: ctx.candidateLocales,
-    rawValue: ctx.rawValue,
-    rawString: ctx.rawString,
+    rawMessage: ctx.rawMessage,
     formattedMessage: ctx.formattedMessage,
     meta: ctx.meta
   });
@@ -63,9 +58,9 @@ function makeHandlerContext(ctx) {
 var format = rura.createHook(
   "format",
   (ctx) => {
-    const { config, rawString } = ctx;
+    const { config, rawMessage } = ctx;
     const { formatHandler } = config.handlers || {};
-    if (!formatHandler || rawString === void 0) return;
+    if (!formatHandler || rawMessage === void 0) return;
     ctx.formattedMessage = formatHandler(
       makeHandlerContext(ctx)
     );
@@ -96,8 +91,8 @@ var replaceValues = (message, params) => {
 var interpolate = rura.createHook(
   "interpolate",
   (ctx) => {
-    const { rawString, formattedMessage, replacements } = ctx;
-    const message = formattedMessage ?? rawString;
+    const { rawMessage, formattedMessage, replacements } = ctx;
+    const message = formattedMessage ?? rawMessage;
     if (typeof message !== "string" || !replacements) {
       ctx.finalMessage = message;
       return;
@@ -128,8 +123,8 @@ var loading = rura.createHook(
 var missing = rura.createHook(
   "missing",
   (ctx) => {
-    const { config, key, rawString } = ctx;
-    if (rawString !== void 0) return;
+    const { config, key, rawMessage } = ctx;
+    if (rawMessage !== void 0) return;
     const { missingHandler } = config.handlers || {};
     if (missingHandler) {
       return {
@@ -254,15 +249,6 @@ function translate(options) {
   return ctx.finalMessage;
 }
 
-// src/translators/methods/translate-raw.ts
-function translateRaw(options) {
-  const { ctx } = runTranslate(options);
-  if (ctx.rawValue === void 0) {
-    throw new Error("Invariant violated: missing hook did not produce output");
-  }
-  return ctx.rawValue;
-}
-
 // src/translators/core-translator/core-translator.ts
 var CoreTranslator = class extends BaseTranslator {
   /** User-provided options including messages, locale, and config. */
@@ -318,18 +304,6 @@ var CoreTranslator = class extends BaseTranslator {
       replacements
     });
   };
-  /** Get the raw message value for a key without formatting or interpolation. */
-  tRaw = (key, replacements) => {
-    return translateRaw({
-      hooks: this.hooks,
-      messages: this._messages,
-      locale: this._locale,
-      isLoading: this._isLoading,
-      translateConfig: this.translateConfig,
-      key,
-      replacements
-    });
-  };
 };
 
 // src/translators/scope-translator/utils/get-full-key.ts
@@ -367,18 +341,6 @@ var ScopeTranslator = class extends CoreTranslator {
           key: fullKey,
           replacements
         });
-      },
-      tRaw: (key, replacements) => {
-        const fullKey = getFullKey(preKey, key);
-        return translateRaw({
-          hooks: this.hooks,
-          messages: this._messages,
-          locale: this._locale,
-          isLoading: this._isLoading,
-          translateConfig: this.translateConfig,
-          key: fullKey,
-          replacements
-        });
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor-translator",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "🤖 A modern, type-safe i18n engine.",
   "author": {
     "name": "Yiming Liao",