saykit 0.5.0 → 0.6.0

package/dist/runtime.d.mts

@@ -2,6 +2,15 @@
 type Tuple = [any, ...any[]];
 type Disallow<T, K extends PropertyKey> = T & Partial<Record<K, never>>;
 type Awaitable<T> = T | PromiseLike<T>;
+/**
+ * A value wrapped in the name its ICU placeholder should take, written inline
+ * as a single-key object: `` say`Total: ${{ cartTotal: getTotal() }}` ``. The
+ * transform reads the key at build time and compiles only the value, so this
+ * is never a real object at runtime.
+ */
+type Named<T> = {
+  [name: string]: T;
+};
 interface NumeralOptions extends Omit<Partial<Record<Intl.LDMLPluralRule, string>>, 'other'> {
   other: string;
   [digit: number]: string;
@@ -31,9 +40,13 @@ interface Say {
   /**
    * Define a message.
    *
+   * An interpolated variable is named after itself. Anything else is numbered,
+   * unless it is written as a single-key object, which names it.
+   *
    * @example
    * ```ts
    * say`Hello, ${name}!`
+   * say`Your total is ${{ cartTotal: getCartTotal() }}`
    * ```
    *
    * @remark This is a macro and must be used with the relevant saykit plugin
@@ -163,7 +176,7 @@ declare class Say<Locale extends string = string, Loader extends Say.Loader<Loca
    * @returns The plural form of the number
    * @remark This is a macro and must be used with the relevant saykit plugin
    */
-  plural(_: number, options: Disallow<NumeralOptions, 'id' | 'context'>): string;
+  plural(_: number | Named<number>, options: Disallow<NumeralOptions, 'id' | 'context'>): string;
   /**
    * Define an ordinal message (e.g. "1st", "2nd", "3rd").
    * The `#` symbol inside options is replaced with the numeric value.
@@ -183,7 +196,7 @@ declare class Say<Locale extends string = string, Loader extends Say.Loader<Loca
    * @returns The ordinal form of the number
    * @remark This is a macro and must be used with the relevant saykit plugin
    */
-  ordinal(_: number, options: Disallow<NumeralOptions, 'id' | 'context'>): string;
+  ordinal(_: number | Named<number>, options: Disallow<NumeralOptions, 'id' | 'context'>): string;
   /**
    * Define a select message, useful for handling gender, status, or other categories.
    *
@@ -201,7 +214,7 @@ declare class Say<Locale extends string = string, Loader extends Say.Loader<Loca
    * @returns The select form of the value
    * @remark This is a macro and must be used with the relevant saykit plugin
    */
-  select(_: string, options: Disallow<SelectOptions, 'id' | 'context'>): string;
+  select(_: string | Named<string>, options: Disallow<SelectOptions, 'id' | 'context'>): string;
 }
 //#endregion
-export { Awaitable, Disallow, NumeralOptions, ReadonlySay, Say, SelectOptions, Tuple };
+export { Awaitable, Disallow, Named, NumeralOptions, ReadonlySay, Say, SelectOptions, Tuple };

package/dist/runtime.mjs

@@ -33,6 +33,20 @@ function _classPrivateFieldGet2(s, a) {
 //#region src/runtime.ts
 let _Symbol$iterator;
 let _Symbol$for;
+/**
+* Map a descriptor's keys back to the placeholders the message names. The
+* transform emits every value with one underscore in front, which keeps a
+* message's values out of the descriptor's own namespace, so stripping exactly
+* one is the whole inverse — `_0` is `0`, and `__total` is a placeholder named
+* `_total`. Keys without one are passed through, so a hand-written
+* `call({ id, name })` still formats `{name}`.
+*
+* Built from the descriptor's own entries so a value named `__proto__` stays a
+* placeholder rather than reaching through to the prototype.
+*/
+function resolveDescriptorValues(descriptor) {
+	return Object.fromEntries(Object.entries(descriptor).filter(([key]) => key !== "id").map(([key, value]) => [key.startsWith("_") ? key.slice(1) : key, value]));
+}
 var _locales = /* @__PURE__ */ new WeakMap();
 var _loader = /* @__PURE__ */ new WeakMap();
 var _messages = /* @__PURE__ */ new WeakMap();
@@ -250,7 +264,7 @@ function _call(locale, messages, descriptor) {
 	if (typeof message !== "string") throw new Error(`Message for ${descriptor.id} is not a string`);
 	const key = `${locale}:${descriptor.id}`;
 	const format = _classPrivateFieldGet2(_formats, this).get(key) ?? _classPrivateFieldGet2(_formats, this).set(key, mf1ToMessage(locale, message)).get(key);
-	return String(format.format(descriptor));
+	return String(format.format(resolveDescriptorValues(descriptor)));
 }
 //#endregion
 export { Say };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saykit",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Type-safe i18n library with compile-time macro transforms",
   "keywords": [
     "i18n",