@manyducks.co/dolla 2.0.0 → 3.1.0

package/dist/translate.js

@@ -0,0 +1,125 @@
+import { n as e, r as t, s as n, u as r } from "./signals-CMJPGr_M.js";
+//#region src/translate/index.ts
+var i = Symbol("Dolla.Translator");
+function a(e) {
+	return async function(t) {
+		let n = s(e);
+		t[i] = n, await n.setLocale(e.locale);
+	};
+}
+function o(e) {
+	if (!e[i]) throw Error("Translate plugin isn't loaded.");
+	return e[i];
+}
+function s(r) {
+	let i = /* @__PURE__ */ new Map();
+	if (i.set("number", (e, t, n) => new Intl.NumberFormat(e, n).format(Number(t))), i.set("datetime", (e, t, n) => new Intl.DateTimeFormat(e, n).format(new Date(t))), i.set("list", (e, t, n) => new Intl.ListFormat(e, n).format(t)), r.formatters) for (let e in r.formatters) i.set(e, r.formatters[e]);
+	let a, [o, s] = t("en"), l = [...Object.keys(r.translations)];
+	async function u(e) {
+		let t;
+		if (e === void 0) {
+			let e = [];
+			if (typeof navigator < "u") {
+				let t = navigator;
+				t.languages?.length > 0 ? e.push(...t.languages) : t.language ? e.push(t.language) : t.browserLanguage ? e.push(t.browserLanguage) : t.userLanguage && e.push(t.userLanguage);
+			}
+			for (let n of e) if (n in r.translations) {
+				t = n;
+				break;
+			}
+		} else e in r.translations && (t = e);
+		if (t == null) {
+			let e = Object.keys(r.translations).at(0);
+			e && (t = e);
+		}
+		if (!t || !(t in r.translations)) throw Error(`Locale '${e}' has no translation.`);
+		a = await c(t, i, r.translations[t]), s(t);
+	}
+	function d(t, n) {
+		return e(() => (o(), a?.(t, n) ?? t));
+	}
+	function f(t, r, a) {
+		let s = i.get(t);
+		if (!s) throw Error(`Unknown format: ${t}`);
+		return e(() => s(o(), n(r), a ?? {}));
+	}
+	return {
+		supportedLocales: l,
+		currentLocale: o,
+		setLocale: u,
+		t: d,
+		format: f
+	};
+}
+async function c(e, t, i) {
+	let a = l(r(i) ? await i() : i), o = new Map(a);
+	return function(r, i) {
+		if (i && (i.context != null && (r += "_" + i.context), i.count != null)) if (i.ordinal) {
+			let t = `${r}_ordinal_(=${i.count})`;
+			o.has(t) ? r = t : r += "_ordinal_" + new Intl.PluralRules(e, { type: "ordinal" }).select(n(i.count));
+		} else {
+			let t = `${r}_(=${i.count})`;
+			o.has(t) ? r = t : r += "_" + new Intl.PluralRules(e).select(n(i.count));
+		}
+		let a = o.get(r);
+		if (!a) return r;
+		let s = "";
+		for (let n = 0; n < a.length; n++) s += a[n](i, t, e);
+		return s;
+	};
+}
+function l(e, t = []) {
+	let n = [];
+	for (let r in e) switch (typeof e[r]) {
+		case "string":
+			n.push([[...t, r].join("."), u(e[r])]);
+			break;
+		case "object":
+			n.push(...l(e[r], [...t, r]));
+			break;
+		default: throw Error(`Expected to find a string or object at ${[...t, r].join(".")}. Got: ${typeof e[r]}`);
+	}
+	return n;
+}
+function u(e) {
+	let t = e.split(/(\{\{.*?\}\})/g), r = [];
+	for (let e = 0; e < t.length; e++) {
+		let i = t[e];
+		if (i) if (i.startsWith("{{") && i.endsWith("}}")) {
+			let e = i.slice(2, -2).trim().split("|").map((e) => e.trim()), t = e[0], a = [];
+			for (let t = 1; t < e.length; t++) {
+				let n = e[t], r = n.match(/^([a-zA-Z0-9_]+)(?:\((.*)\))?$/);
+				if (r) {
+					let e = r[1], t = r[2], n = {};
+					if (t) {
+						let e = t.split(",");
+						for (let t = 0; t < e.length; t++) {
+							let r = e[t], i = r.indexOf(":");
+							i > -1 && (n[r.slice(0, i).trim()] = r.slice(i + 1).trim());
+						}
+					}
+					a.push({
+						name: e,
+						options: n
+					});
+				} else a.push({
+					name: n,
+					options: {}
+				});
+			}
+			r.push((e, r, i) => {
+				let o = e ? n(e[t]) : void 0;
+				for (let e = 0; e < a.length; e++) {
+					let t = a[e], n = r.get(t.name);
+					n && (o = n(i, o, t.options));
+				}
+				return o == null ? "" : String(o);
+			});
+		} else r.push(() => i);
+	}
+	return r;
+}
+//#endregion
+export { l as compile, a as createTranslatePlugin, o as getTranslate, u as parseTemplate };
+
+//# sourceMappingURL=translate.js.map

package/dist/translate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"translate.js","names":[],"sources":["../src/translate/index.ts"],"sourcesContent":["import { Context } from \"../core/context.js\";\nimport { DollaPlugin } from \"../core/root.js\";\nimport { unwrap, compose, createAtom, type Getter } from \"../core/signals.js\";\nimport { isFunction } from \"../utils.js\";\n\n// ----- Types ----- //\n\n/**\n * A JSON object of translated strings. Values can be string templates or nested objects.\n */\nexport interface LocalizedStrings extends Record<string, string | LocalizedStrings> {}\n\n/**\n * A function that returns an object of localized strings.\n */\nexport type TranslationFetchFn = () => LocalizedStrings | Promise<LocalizedStrings>;\n\nexport type TOptions = {\n  /**\n   *\n   */\n  count?: Getter<number> | number;\n\n  /**\n   *\n   */\n  context?: Getter<string> | string;\n\n  [value: string]: Getter<any> | any;\n};\n\nexport type LookupFn = (selector: string, options?: TOptions) => string;\n\nexport type Formatter = (locale: string, value: any, options: Record<string, any>) => string;\n\ntype BuiltInFormatters = {\n  number: [number | bigint, Intl.NumberFormatOptions?];\n  datetime: [Date, Intl.DateTimeFormatOptions?];\n  list: [Iterable<string>, Intl.ListFormatOptions?];\n};\n\nexport interface Translator {\n  /**\n   * An array of locale names for all translations the app supports.\n   */\n  supportedLocales: string[];\n\n  /**\n   * A Readable containing the currently loaded locale.\n   */\n  currentLocale: Getter<string>;\n\n  /**\n   * Updates the locale, fetching any translation files as required.\n   * Returns a promise that resolves when the new locale is applied.\n   *\n   * If `name` is undefined the library will try to match the browser language automatically.\n   */\n  setLocale(name?: string): Promise<void>;\n\n  /**\n   * Returns a Readable of the value at `key`.\n\n   * @param selector - Key to the translated value.\n   * @param options - A map of `{{placeholder}}` names and the values to replace them with.\n   *\n   * @example\n   * const value = t(\"your.key.here\", { count: 5 });\n   */\n  t(selector: string, options?: TOptions): Getter<string>;\n\n  format<K extends keyof BuiltInFormatters, V extends BuiltInFormatters[K][0], O extends BuiltInFormatters[K][1]>(\n    name: K,\n    value: Getter<V> | V,\n    options?: O,\n  ): Getter<string>;\n\n  format<V, O>(name: string, value: Getter<V> | V, options?: O): Getter<string>;\n}\n\nexport interface TranslatorOptions {\n  translations: Record<string, LocalizedStrings | TranslationFetchFn>;\n\n  /**\n   * Default locale to load on startup. The translator will try to match the user's browser language if left undefined.\n   */\n  locale?: string;\n\n  formatters?: Record<string, Formatter>;\n}\n\nconst TRANSLATE = Symbol(\"Dolla.Translator\");\n\nexport function createTranslatePlugin(options: TranslatorOptions): DollaPlugin {\n  return async function (context) {\n    const translator = createTranslator(options);\n    context[TRANSLATE] = translator;\n    await translator.setLocale(options.locale);\n  };\n}\n\nexport function getTranslate(context: Context): Translator {\n  if (!context[TRANSLATE]) throw new Error(\"Translate plugin isn't loaded.\");\n  return context[TRANSLATE];\n}\n\n// ----- Code ----- //\n\nfunction createTranslator(options: TranslatorOptions): Translator {\n  const formatters = new Map<string, Formatter>();\n\n  formatters.set(\"number\", (locale, value, options) => {\n    return new Intl.NumberFormat(locale, options).format(Number(value));\n  });\n  formatters.set(\"datetime\", (locale, value, options) => {\n    return new Intl.DateTimeFormat(locale, options).format(new Date(value));\n  });\n  formatters.set(\"list\", (locale, value, options) => {\n    return new Intl.ListFormat(locale, options).format(value);\n  });\n\n  if (options.formatters) {\n    for (const key in options.formatters) {\n      formatters.set(key, options.formatters[key]);\n    }\n  }\n\n  let lookup: LookupFn | undefined;\n\n  const [currentLocale, setCurrentLocale] = createAtom(\"en\");\n  const supportedLocales = [...Object.keys(options.translations)];\n\n  /**\n   * Loads translation for the locale.\n   */\n  async function setLocale(name?: string) {\n    let locale!: string;\n\n    if (name === undefined) {\n      let names = [];\n\n      if (typeof navigator !== \"undefined\") {\n        const nav = navigator as any;\n\n        if (nav.languages?.length > 0) {\n          names.push(...nav.languages);\n        } else if (nav.language) {\n          names.push(nav.language);\n        } else if (nav.browserLanguage) {\n          names.push(nav.browserLanguage);\n        } else if (nav.userLanguage) {\n          names.push(nav.userLanguage);\n        }\n      }\n\n      for (const name of names) {\n        if (name in options.translations) {\n          // Found a matching language.\n          locale = name;\n          break;\n        }\n      }\n    } else {\n      // Tag is the actual tag to set.\n      if (name in options.translations) {\n        locale = name;\n      }\n    }\n\n    if (locale == null) {\n      const firstLanguage = Object.keys(options.translations).at(0);\n      if (firstLanguage) {\n        locale = firstLanguage;\n      }\n    }\n\n    if (!locale || !(locale in options.translations)) {\n      throw new Error(`Locale '${name}' has no translation.`);\n    }\n\n    lookup = await createLookup(locale, formatters, options.translations[locale]);\n\n    // Update locale string after init so t() signals will update.\n    setCurrentLocale(locale);\n  }\n\n  function t(selector: string, options?: TOptions): Getter<string> {\n    return compose(() => {\n      currentLocale(); // track locale\n      return lookup?.(selector, options) ?? selector;\n    });\n  }\n\n  function format<\n    K extends keyof BuiltInFormatters,\n    V extends BuiltInFormatters[K][0],\n    O extends BuiltInFormatters[K][1],\n  >(name: K, value: Getter<V> | V, options?: O): Getter<string>;\n\n  function format<V, O>(name: string, value: Getter<V> | V, options?: O): Getter<string>;\n\n  function format(name: string, value: unknown, options?: Record<string, any>): Getter<string> {\n    const callback = formatters.get(name);\n    if (!callback) {\n      throw new Error(`Unknown format: ${name}`);\n    }\n\n    return compose(() => callback(currentLocale(), unwrap(value), options ?? {}));\n  }\n\n  return {\n    supportedLocales,\n    currentLocale,\n    setLocale,\n    t,\n    format,\n  };\n}\n\n/**\n * Loads the translation and produces an efficient lookup function.\n */\nasync function createLookup(\n  locale: string,\n  formatters: Map<string, Formatter>,\n  translation: TranslationFetchFn | LocalizedStrings,\n) {\n  const strings = isFunction(translation) ? await translation() : translation;\n  const entries = compile(strings);\n  const templates = new Map(entries);\n\n  /**\n   * Looks up the template and produces the output. Any reactive values in `options` are tracked when used.\n   */\n  return function lookup(selector: string, options?: TOptions): string {\n    if (options) {\n      // Handle count (pluralization) and context. Keys become \"key_context_pluralization\".\n      if (options.context != null) {\n        selector += \"_\" + options.context;\n      }\n      if (options.count != null) {\n        if (options.ordinal) {\n          // Try to match the exact number key if there is one (e.g. \"myExampleKey_ordinal_(=2)\" when count is 2).\n          const exact = `${selector}_ordinal_(=${options.count})`;\n          if (templates.has(exact)) {\n            selector = exact;\n          } else {\n            selector += \"_ordinal_\" + new Intl.PluralRules(locale, { type: \"ordinal\" }).select(unwrap(options.count));\n          }\n        } else {\n          // Try to match the exact number key if there is one (e.g. \"myExampleKey_(=2)\" when count is 2).\n          const exact = `${selector}_(=${options.count})`;\n          if (templates.has(exact)) {\n            selector = exact;\n          } else {\n            selector += \"_\" + new Intl.PluralRules(locale).select(unwrap(options.count));\n          }\n        }\n      }\n    }\n\n    const template = templates.get(selector);\n    if (!template) return selector;\n\n    let output = \"\";\n\n    for (let i = 0; i < template.length; i++) {\n      output += template[i](options, formatters, locale);\n    }\n\n    return output;\n  };\n}\n\n/**\n * Compiles an object of translated strings into a set of function templates.\n */\nexport function compile(strings: { [key: string]: any }, path: string[] = []): [string, CompiledTemplate][] {\n  const entries: [string, CompiledTemplate][] = [];\n\n  for (const key in strings) {\n    switch (typeof strings[key]) {\n      case \"string\":\n        entries.push([[...path, key].join(\".\"), parseTemplate(strings[key])]);\n        break;\n      case \"object\":\n        entries.push(...compile(strings[key], [...path, key]));\n        break;\n      default:\n        throw new Error(\n          `Expected to find a string or object at ${[...path, key].join(\".\")}. Got: ${typeof strings[key]}`,\n        );\n    }\n  }\n\n  return entries;\n}\n\nexport type TemplateSegmentFn = (\n  options: Record<string, any> | undefined,\n  formatters: Map<string, Formatter>,\n  locale: string,\n) => string;\n\nexport type CompiledTemplate = TemplateSegmentFn[];\n\n/**\n * Parse a string template into an array of functions that will produce each piece of the output when called.\n */\nexport function parseTemplate(template: string): CompiledTemplate {\n  const tokens = template.split(/(\\{\\{.*?\\}\\})/g);\n  const segments: TemplateSegmentFn[] = [];\n\n  for (let i = 0; i < tokens.length; i++) {\n    const token = tokens[i];\n    if (!token) continue;\n\n    if (token.startsWith(\"{{\") && token.endsWith(\"}}\")) {\n      const inner = token.slice(2, -2).trim();\n      const parts = inner.split(\"|\").map((p) => p.trim());\n\n      const name = parts[0];\n      const parsedFormats: { name: string; options: Record<string, string> }[] = [];\n\n      // Parse formatters at build-time to prevent string splitting on every render\n      for (let j = 1; j < parts.length; j++) {\n        const formatStr = parts[j];\n        const match = formatStr.match(/^([a-zA-Z0-9_]+)(?:\\((.*)\\))?$/);\n\n        if (match) {\n          const formatName = match[1];\n          const optionsStr = match[2];\n          const optsObj: Record<string, string> = {};\n\n          if (optionsStr) {\n            const pairs = optionsStr.split(\",\");\n            for (let k = 0; k < pairs.length; k++) {\n              const pair = pairs[k];\n              const colonIndex = pair.indexOf(\":\");\n              if (colonIndex > -1) {\n                optsObj[pair.slice(0, colonIndex).trim()] = pair.slice(colonIndex + 1).trim();\n              }\n            }\n          }\n          parsedFormats.push({ name: formatName, options: optsObj });\n        } else {\n          parsedFormats.push({ name: formatStr, options: {} });\n        }\n      }\n\n      // Push the dynamic closure\n      segments.push((options, formatters, locale) => {\n        // Evaluate and track the specific option at runtime.\n        // This code runs in the t() computed context.\n        let value = options ? unwrap(options[name]) : undefined;\n\n        for (let k = 0; k < parsedFormats.length; k++) {\n          const fmt = parsedFormats[k];\n          const formatterFn = formatters.get(fmt.name);\n          if (formatterFn) {\n            value = formatterFn(locale, value, fmt.options);\n          }\n        }\n\n        return value != null ? String(value) : \"\";\n      });\n    } else {\n      // Push a static closure that just returns the token\n      segments.push(() => token);\n    }\n  }\n\n  return segments;\n}\n"],"mappings":";;AA2FA,IAAM,IAAY,OAAO,mBAAmB;AAE5C,SAAgB,EAAsB,GAAyC;AAC7E,QAAO,eAAgB,GAAS;EAC9B,IAAM,IAAa,EAAiB,EAAQ;AAE5C,EADA,EAAQ,KAAa,GACrB,MAAM,EAAW,UAAU,EAAQ,OAAO;;;AAI9C,SAAgB,EAAa,GAA8B;AACzD,KAAI,CAAC,EAAQ,GAAY,OAAU,MAAM,iCAAiC;AAC1E,QAAO,EAAQ;;AAKjB,SAAS,EAAiB,GAAwC;CAChE,IAAM,oBAAa,IAAI,KAAwB;AAY/C,KAVA,EAAW,IAAI,WAAW,GAAQ,GAAO,MAChC,IAAI,KAAK,aAAa,GAAQ,EAAQ,CAAC,OAAO,OAAO,EAAM,CAAC,CACnE,EACF,EAAW,IAAI,aAAa,GAAQ,GAAO,MAClC,IAAI,KAAK,eAAe,GAAQ,EAAQ,CAAC,OAAO,IAAI,KAAK,EAAM,CAAC,CACvE,EACF,EAAW,IAAI,SAAS,GAAQ,GAAO,MAC9B,IAAI,KAAK,WAAW,GAAQ,EAAQ,CAAC,OAAO,EAAM,CACzD,EAEE,EAAQ,WACV,MAAK,IAAM,KAAO,EAAQ,WACxB,GAAW,IAAI,GAAK,EAAQ,WAAW,GAAK;CAIhD,IAAI,GAEE,CAAC,GAAe,KAAoB,EAAW,KAAK,EACpD,IAAmB,CAAC,GAAG,OAAO,KAAK,EAAQ,aAAa,CAAC;CAK/D,eAAe,EAAU,GAAe;EACtC,IAAI;AAEJ,MAAI,MAAS,KAAA,GAAW;GACtB,IAAI,IAAQ,EAAE;AAEd,OAAI,OAAO,YAAc,KAAa;IACpC,IAAM,IAAM;AAEZ,IAAI,EAAI,WAAW,SAAS,IAC1B,EAAM,KAAK,GAAG,EAAI,UAAU,GACnB,EAAI,WACb,EAAM,KAAK,EAAI,SAAS,GACf,EAAI,kBACb,EAAM,KAAK,EAAI,gBAAgB,GACtB,EAAI,gBACb,EAAM,KAAK,EAAI,aAAa;;AAIhC,QAAK,IAAM,KAAQ,EACjB,KAAI,KAAQ,EAAQ,cAAc;AAEhC,QAAS;AACT;;SAKA,KAAQ,EAAQ,iBAClB,IAAS;AAIb,MAAI,KAAU,MAAM;GAClB,IAAM,IAAgB,OAAO,KAAK,EAAQ,aAAa,CAAC,GAAG,EAAE;AAC7D,GAAI,MACF,IAAS;;AAIb,MAAI,CAAC,KAAU,EAAE,KAAU,EAAQ,cACjC,OAAU,MAAM,WAAW,EAAK,uBAAuB;AAMzD,EAHA,IAAS,MAAM,EAAa,GAAQ,GAAY,EAAQ,aAAa,GAAQ,EAG7E,EAAiB,EAAO;;CAG1B,SAAS,EAAE,GAAkB,GAAoC;AAC/D,SAAO,SACL,GAAe,EACR,IAAS,GAAU,EAAQ,IAAI,GACtC;;CAWJ,SAAS,EAAO,GAAc,GAAgB,GAA+C;EAC3F,IAAM,IAAW,EAAW,IAAI,EAAK;AACrC,MAAI,CAAC,EACH,OAAU,MAAM,mBAAmB,IAAO;AAG5C,SAAO,QAAc,EAAS,GAAe,EAAE,EAAO,EAAM,EAAE,KAAW,EAAE,CAAC,CAAC;;AAG/E,QAAO;EACL;EACA;EACA;EACA;EACA;EACD;;AAMH,eAAe,EACb,GACA,GACA,GACA;CAEA,IAAM,IAAU,EADA,EAAW,EAAY,GAAG,MAAM,GAAa,GAAG,EAChC,EAC1B,IAAY,IAAI,IAAI,EAAQ;AAKlC,QAAO,SAAgB,GAAkB,GAA4B;AACnE,MAAI,MAEE,EAAQ,WAAW,SACrB,KAAY,MAAM,EAAQ,UAExB,EAAQ,SAAS,MACnB,KAAI,EAAQ,SAAS;GAEnB,IAAM,IAAQ,GAAG,EAAS,aAAa,EAAQ,MAAM;AACrD,GAAI,EAAU,IAAI,EAAM,GACtB,IAAW,IAEX,KAAY,cAAc,IAAI,KAAK,YAAY,GAAQ,EAAE,MAAM,WAAW,CAAC,CAAC,OAAO,EAAO,EAAQ,MAAM,CAAC;SAEtG;GAEL,IAAM,IAAQ,GAAG,EAAS,KAAK,EAAQ,MAAM;AAC7C,GAAI,EAAU,IAAI,EAAM,GACtB,IAAW,IAEX,KAAY,MAAM,IAAI,KAAK,YAAY,EAAO,CAAC,OAAO,EAAO,EAAQ,MAAM,CAAC;;EAMpF,IAAM,IAAW,EAAU,IAAI,EAAS;AACxC,MAAI,CAAC,EAAU,QAAO;EAEtB,IAAI,IAAS;AAEb,OAAK,IAAI,IAAI,GAAG,IAAI,EAAS,QAAQ,IACnC,MAAU,EAAS,GAAG,GAAS,GAAY,EAAO;AAGpD,SAAO;;;AAOX,SAAgB,EAAQ,GAAiC,IAAiB,EAAE,EAAgC;CAC1G,IAAM,IAAwC,EAAE;AAEhD,MAAK,IAAM,KAAO,EAChB,SAAQ,OAAO,EAAQ,IAAvB;EACE,KAAK;AACH,KAAQ,KAAK,CAAC,CAAC,GAAG,GAAM,EAAI,CAAC,KAAK,IAAI,EAAE,EAAc,EAAQ,GAAK,CAAC,CAAC;AACrE;EACF,KAAK;AACH,KAAQ,KAAK,GAAG,EAAQ,EAAQ,IAAM,CAAC,GAAG,GAAM,EAAI,CAAC,CAAC;AACtD;EACF,QACE,OAAU,MACR,0CAA0C,CAAC,GAAG,GAAM,EAAI,CAAC,KAAK,IAAI,CAAC,SAAS,OAAO,EAAQ,KAC5F;;AAIP,QAAO;;AAcT,SAAgB,EAAc,GAAoC;CAChE,IAAM,IAAS,EAAS,MAAM,iBAAiB,EACzC,IAAgC,EAAE;AAExC,MAAK,IAAI,IAAI,GAAG,IAAI,EAAO,QAAQ,KAAK;EACtC,IAAM,IAAQ,EAAO;AAChB,QAEL,KAAI,EAAM,WAAW,KAAK,IAAI,EAAM,SAAS,KAAK,EAAE;GAElD,IAAM,IADQ,EAAM,MAAM,GAAG,GAAG,CAAC,MACnB,CAAM,MAAM,IAAI,CAAC,KAAK,MAAM,EAAE,MAAM,CAAC,EAE7C,IAAO,EAAM,IACb,IAAqE,EAAE;AAG7E,QAAK,IAAI,IAAI,GAAG,IAAI,EAAM,QAAQ,KAAK;IACrC,IAAM,IAAY,EAAM,IAClB,IAAQ,EAAU,MAAM,iCAAiC;AAE/D,QAAI,GAAO;KACT,IAAM,IAAa,EAAM,IACnB,IAAa,EAAM,IACnB,IAAkC,EAAE;AAE1C,SAAI,GAAY;MACd,IAAM,IAAQ,EAAW,MAAM,IAAI;AACnC,WAAK,IAAI,IAAI,GAAG,IAAI,EAAM,QAAQ,KAAK;OACrC,IAAM,IAAO,EAAM,IACb,IAAa,EAAK,QAAQ,IAAI;AACpC,OAAI,IAAa,OACf,EAAQ,EAAK,MAAM,GAAG,EAAW,CAAC,MAAM,IAAI,EAAK,MAAM,IAAa,EAAE,CAAC,MAAM;;;AAInF,OAAc,KAAK;MAAE,MAAM;MAAY,SAAS;MAAS,CAAC;UAE1D,GAAc,KAAK;KAAE,MAAM;KAAW,SAAS,EAAE;KAAE,CAAC;;AAKxD,KAAS,MAAM,GAAS,GAAY,MAAW;IAG7C,IAAI,IAAQ,IAAU,EAAO,EAAQ,GAAM,GAAG,KAAA;AAE9C,SAAK,IAAI,IAAI,GAAG,IAAI,EAAc,QAAQ,KAAK;KAC7C,IAAM,IAAM,EAAc,IACpB,IAAc,EAAW,IAAI,EAAI,KAAK;AAC5C,KAAI,MACF,IAAQ,EAAY,GAAQ,GAAO,EAAI,QAAQ;;AAInD,WAAO,KAAS,OAAuB,KAAhB,OAAO,EAAM;KACpC;QAGF,GAAS,WAAW,EAAM;;AAI9B,QAAO"}

package/dist/types.d.ts

@@ -1,30 +1,21 @@
 import type * as CSS from "csstype";
-import type { Markup, MarkupNode } from "./core/markup.js";
-import type { Signal } from "./core/signals.js";
+import type { ComponentState, Context } from "./core/context.js";
+import type { Markup, MarkupNode } from "./core/markup/types.js";
+import type { Getter } from "./core/signals.js";
 export type Env = "production" | "development";
 /**
  * Represents everything that can be handled as a DOM node.
  * These are all the items considered valid to pass as children to any element.
  */
-export type Renderable = string | number | Node | Markup | MarkupNode | false | null | undefined | Signal<any> | (string | number | Node | Markup | MarkupNode | false | null | undefined | Signal<any>)[];
+export type Renderable = string | number | Node | Markup | MarkupNode | false | null | undefined | void | Getter<any> | Renderable[];
 export interface BaseProps {
     children?: Renderable;
 }
-/**
- *
- */
-export type View<Props> = (props: Props) => Renderable;
-/**
- *
- */
-export type Store<Options, Value> = (options: Options) => Value;
-/**
- *
- */
-export type Mixin<E extends Element = Element> = (element: E) => void;
-type MaybeSignal<T> = T | Signal<T> | Signal<T | undefined>;
-type OptionalProperty<T> = MaybeSignal<T>;
-type RequiredProperty<T> = T | Signal<T>;
+export type View<Props = {}, State = Record<string | symbol, any>> = (this: Context<ComponentState & State>, props: Props, context: Context<ComponentState & State>) => Renderable;
+export type Store<Props, Value, State = Record<string | symbol, any>> = (this: Context<ComponentState & State>, props: Props, context: Context<ComponentState & State>) => Value;
+export type MaybeGetter<T> = Getter<T> | T;
+type RequiredProperty<T> = Getter<T> | T;
+type OptionalProperty<T> = Getter<T> | Getter<T | undefined> | T;
 type AutocapitalizeValues = "off" | "on" | "none" | "sentences" | "words" | "characters";
 type ContentEditableValues = true | false | "true" | "false" | "plaintext-only" | "inherit";
 type ClassListValues = string | ClassMap | Array<string | ClassMap | (string | ClassMap)[]>;
@@ -48,12 +39,6 @@ export interface ElementProps {
      * Attaches an event listener to the element (with `addEventListener`).
      */
     [key: `on:${string}`]: OptionalProperty<EventHandler<Event>>;
-    /**
-     * HTML attributes to assign to the element.
-     */
-    /**
-     * Object of event listeners.
-     */
     /**
      * CSS classes to be applied to this element. In addition to the standard space-separated list of class names,
      * this property also supports a class map object with class names as keys and booleans as values.
@@ -158,7 +143,7 @@ export interface ElementProps {
      *
      * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/style
      */
-    style?: string | CSSProperties | Signal<string> | Signal<CSSProperties> | Signal<string | CSSProperties> | Signal<string | undefined> | Signal<CSSProperties | undefined> | Signal<string | CSSProperties | undefined>;
+    style?: string | CSSProperties | Getter<string> | Getter<CSSProperties> | Getter<string | CSSProperties> | Getter<string | undefined> | Getter<CSSProperties | undefined> | Getter<string | CSSProperties | undefined>;
     /**
      * Fired when a CSS animation unexpectedly aborts.
      *
@@ -721,6 +706,10 @@ export interface ElementProps {
     onwheel?: OptionalProperty<EventHandler<WheelEvent>>;
 }
 export interface HTMLElementProps extends ElementProps {
+    /**
+     * Data attribute.
+     */
+    [key: `data-${string}`]: OptionalProperty<any>;
     /**
      * Sets the key a user can press to jump to this element.
      *
@@ -1002,12 +991,6 @@ export interface HTMLElementProps extends ElementProps {
      */
     onpaste?: OptionalProperty<EventHandler<ClipboardEvent>>;
 }
-export interface SVGElementProps extends ElementProps {
-    /**
-     * A mixin function or an array of mixin functions to be applied to this element.
-     */
-    mixin?: Mixin<SVGElement> | Mixin<SVGElement>[];
-}
 /**
  * Mapping of event props to event names.
  */
@@ -1279,7 +1262,7 @@ export type CSSProperties = {
     [K in keyof Styles]: OptionalProperty<Styles[K]>;
 };
 export interface ClassMap {
-    [className: string]: MaybeSignal<any>;
+    [className: string]: OptionalProperty<any>;
 }
 export type EventHandler<E> = (event: E) => void;
 export interface PropertiesOf<E extends HTMLElement> extends HTMLElementProps {
@@ -1289,12 +1272,9 @@ export interface PropertiesOf<E extends HTMLElement> extends HTMLElementProps {
     children?: any;
     /**
      * Receives a reference to the DOM node when rendered.
+     * Returns a cleanup function that is called when the node is removed.
      */
-    ref?: ((value: E | undefined) => void) | ((value: HTMLElement | undefined) => void) | ((value: Element | undefined) => void) | ((value: Node | undefined) => void);
-    /**
-     * A mixin function or an array of mixin functions to be applied to this element.
-     */
-    mixin?: Mixin<E> | Mixin<E>[];
+    ref?: ((value: E) => () => void) | ((value: HTMLElement) => () => void) | ((value: Element) => () => void) | ((value: Node) => () => void);
 }
 /**
  * The following elements are defined based on the WHATWG HTML spec:
@@ -2171,7 +2151,7 @@ interface HTMLMediaElementProps<T extends HTMLMediaElement> extends HTMLElementP
      *
      * @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/srcObject
      */
-    srcObject?: MediaStream | MediaSource | Blob | File | Signal<MediaStream> | Signal<MediaStream | undefined> | Signal<MediaSource> | Signal<MediaSource | undefined> | Signal<Blob> | Signal<Blob | undefined> | Signal<File> | Signal<File | undefined>;
+    srcObject?: MediaStream | MediaSource | Blob | File | Getter<MediaStream> | Getter<MediaStream | undefined> | Getter<MediaSource> | Getter<MediaSource | undefined> | Getter<Blob> | Getter<Blob | undefined> | Getter<File> | Getter<File | undefined>;
     /**
      * The current audio volume of the media element. Must be a number between 0 and 1.
      *
@@ -2670,7 +2650,7 @@ interface HTMLImageElementProps extends PropertiesOf<HTMLImageElement> {
      *
      * @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/sizes
      */
-    sizes?: MaybeSignal<string>;
+    sizes?: OptionalProperty<string>;
     /**
      * The image URL.
      *
@@ -3425,4 +3405,6 @@ interface HTMLCanvasElementProps extends PropertiesOf<HTMLCanvasElement> {
      */
     height?: OptionalProperty<string | number> | OptionalProperty<string> | OptionalProperty<number>;
 }
+export interface IntrinsicElements {
+}
 export {};

package/dist/utils.d.ts

@@ -1,46 +1,58 @@
-export declare const noOp: () => void;
-export declare function getUniqueId(): string;
-export declare function getIntegerId(): number;
+export declare function uniqueId(): string;
 /**
- * Equality check that passes if both values are the same object.
- * This is the default equality check for states.
+ * Returns a new object without the specified keys.
+ * If called without object, returns a function that takes an object
+ * and returns a version with the original keys omitted.
+ *
+ * @param keys - An array of keys to omit.
+ * @param object - An object to clone without the omitted keys.
  */
-export declare function strictEqual(a: any, b: any): boolean;
+export declare function omit<O extends Record<any, any>>(keys: (keyof O)[], object: O): Record<any, any>;
 /**
- * Equality check that passes if both values are the same object, or if both are objects or arrays with equal keys and values.
+ * Throws a TypeError unless `condition` is truthy.
+ *
+ * @param value - Value whose truthiness is in question.
+ * @param errorMessage - Optional message for the thrown TypeError.
  */
-export declare function shallowEqual(a: any, b: any): boolean;
+export declare function assert<T = any>(value: T, errorMessage: string): asserts value is NonNullable<T>;
 /**
- * Equality check that passes if two objects have equal values, even if they are not the same object.
+ * Returns true if `value` is an array.
  */
-export declare function deepEqual(a: any, b: any): boolean;
+export declare function isArray(value: unknown): value is Array<unknown>;
 /**
- * Takes an old value and a new value.  Returns a merged copy if both are objects, otherwise returns the new value.
+ * Returns true when `value` is an array and `check` returns true for every item.
+ *
+ * @param check - Function to check items against.
+ * @param value - A possible array.
  */
-export declare function merge(one: unknown, two: unknown): any;
+export declare function isArrayOf<T>(check: (item: unknown) => boolean, value: unknown): value is T[];
+export declare function isArrayOf<T>(check: (item: unknown) => boolean): (value: unknown) => value is T[];
 /**
- * Returns a new object without the specified keys.
- * If called without object, returns a function that takes an object
- * and returns a version with the original keys omitted.
- *
- * @param keys - An array of keys to omit.
- * @param object - An object to clone without the omitted keys.
+ * Returns true if `value` is a string.
  */
-export declare function omit<O extends Record<any, any>>(keys: (keyof O)[], object: O): Record<any, any>;
-export declare function toArray<T>(value: T | T[]): T[];
-export declare function toCamelCase(s: string): string;
+export declare function isString(value: unknown): value is string;
 /**
- * Moves an element using `moveBefore` if the browser supports it, otherwise falls back to `insertBefore`.
+ * Returns true if `value` is a function (but not a class).
  */
-export declare function moveBefore(parent: Node, node: Node, child: Node | null): void;
+export declare function isFunction<T = (...args: unknown[]) => unknown>(value: unknown): value is T;
+export declare function isClass(value: unknown): boolean;
 /**
- * Takes any string and returns an OKLCH color.
+ * Returns true if `value` is a number.
  */
-export declare function okhash(value: string): string;
-export type MatcherFunction = (value: string) => boolean;
+export declare function isNumber(value: unknown): value is number;
 /**
- * Parses a filter string into a matcher function.
+ * Returns `true` if `value` is an instance of `constructor`.
  *
- * @param pattern - A string or regular expression that specifies a pattern for names of loggers whose messages you want to display.
+ * @param constructor - The constructor `value` must be an instance of.
+ * @param value - A value that may be an instance of `constructor`.
+ */
+export declare function isInstanceOf<T extends Function>(constructor: T, value: unknown): value is T;
+export declare function isInstanceOf<T extends Function>(constructor: T): (value: unknown) => value is T;
+/**
+ * Returns true if `value` is a JavaScript Promise.
+ */
+export declare function isPromise<T = unknown>(value: unknown): value is Promise<T>;
+/**
+ * Returns true if `value` is a plain JavaScript object.
  */
-export declare function createMatcher(pattern: string | RegExp): MatcherFunction;
+export declare function isObject<T = Record<string | number | symbol, unknown>>(value: unknown): value is T;

package/dist/utils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/virtual/index.d.ts

@@ -0,0 +1 @@
+export { createVirtualList } from "./list";

package/dist/virtual/list.d.ts

@@ -0,0 +1,53 @@
+import { type Getter } from "../core/signals.js";
+import { View } from "../types.js";
+export interface VirtualListAPI<T> {
+    scrollToBottom: (smooth?: boolean) => void;
+    scrollToTop: (smooth?: boolean) => void;
+    scrollToIndex: (index: number, options?: {
+        smooth?: boolean;
+        align?: "start" | "center" | "end";
+    }) => void;
+    scrollToItem: (item: T, options?: {
+        smooth?: boolean;
+        align?: "start" | "center" | "end";
+    }) => void;
+    isAtBottom: Getter<boolean>;
+}
+export interface VirtualListContext {
+    isEntering: Getter<boolean>;
+}
+export interface VirtualListOptions<T> {
+    items: Getter<T[]>;
+    /** A stable identifier for each item, crucial for detecting changes accurately */
+    keyFn: (item: T) => string | number;
+    bottomUp?: boolean;
+    enterAnimationMs?: number;
+    /** Configuration for the virtual pool */
+    estimatedItemHeight?: number;
+    poolSize?: number;
+    /** Infinite scroll callbacks */
+    onTopReached?: () => void;
+    onBottomReached?: () => void;
+    threshold?: number;
+    render: (item: Getter<T>, index: Getter<number>, context: VirtualListContext) => any;
+    renderEmpty?: () => any;
+    isSticky?: (item: T) => boolean;
+    renderSticky?: (item: Getter<T>) => any;
+}
+export declare function createVirtualList<T>(props: VirtualListOptions<T>): [View, VirtualListAPI<T>];
+export declare function createOffsetEngine(defaultAssumption: number): {
+    averageHeight: Getter<number>;
+    getTotalHeight: (totalItems: number) => number;
+    getOffset: (index: number, avg: number) => number;
+    findIndexAtScroll: (scrollPos: number, totalItems: number, avg: number) => number;
+    findSticky: (scrollPos: number, indices: number[], avg: number) => {
+        activeIdx: number;
+        nextIdx: number;
+    };
+    updateHeights: (entries: {
+        index: number;
+        height: number;
+    }[], avg: number) => boolean;
+    clearCache: () => void;
+    getItemHeight: (index: number) => number | undefined;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manyducks.co/dolla",
-  "version": "2.0.0",
-  "description": "A fast, batteries-included JavaScript framework with a React-like API and the power of Signals.",
+  "version": "3.1.0",
+  "description": "A fast, batteries-included JavaScript framework with a React-inspired API and the power of signals.",
   "main": "dist/index.js",
   "types": "dist/core/index.d.ts",
   "type": "module",
@@ -21,7 +21,8 @@
     "web app",
     "front end framework",
     "functional",
-    "reactive state"
+    "reactive state",
+    "signals"
   ],
   "author": "tony@manyducks.co",
   "license": "MIT",
@@ -34,14 +35,14 @@
       "import": "./dist/router.js",
       "types": "./dist/router/index.d.ts"
     },
+    "./translate": {
+      "import": "./dist/translate.js",
+      "types": "./dist/translate/index.d.ts"
+    },
     "./http": {
       "import": "./dist/http.js",
       "types": "./dist/http/index.d.ts"
     },
-    "./i18n": {
-      "import": "./dist/i18n.js",
-      "types": "./dist/i18n/index.d.ts"
-    },
     "./jsx-runtime": {
       "import": "./dist/jsx-runtime.js",
       "types": "./jsx-runtime.d.ts"
@@ -51,15 +52,17 @@
       "types": "./jsx-dev-runtime.d.ts"
     }
   },
-  "dependencies": {
-    "alien-signals": "^2.0.5"
-  },
+  "files": [
+    "dist",
+    "*.d.ts"
+  ],
   "devDependencies": {
-    "@types/node": "^24.1.0",
-    "csstype": "^3.1.3",
-    "prettier": "^3.6.2",
-    "typescript": "^5.8.3",
-    "vite": "^7.0.6",
-    "vitest": "^3.2.4"
+    "@types/node": "^25.6.0",
+    "csstype": "^3.2.3",
+    "jsdom": "^29.0.2",
+    "prettier": "^3.8.3",
+    "typescript": "^6.0.3",
+    "vite": "^8.0.10",
+    "vitest": "^4.1.5"
   }
 }

package/dist/core/app.d.ts

@@ -1,24 +0,0 @@
-import { Router, RouterOptions } from "../router/router";
-import { View } from "../types";
-import { Context } from "./context";
-import { LoggerCrashProps } from "./logger";
-interface AppOptions {
-    view?: View<{}>;
-    router?: Router;
-    context?: Context;
-}
-declare class App {
-    #private;
-    get context(): Context;
-    constructor(options: AppOptions);
-    setCrashView(view: View<LoggerCrashProps>): this;
-    mount(element: string | Element): Promise<void>;
-    unmount(): Promise<void>;
-}
-export interface CreateAppOptions {
-    context?: Context;
-}
-export declare function createApp(view: View<{}>, options?: CreateAppOptions): App;
-export declare function createApp(routerOptions: RouterOptions, options?: CreateAppOptions): App;
-export declare function createApp(router: Router, options?: CreateAppOptions): App;
-export {};

package/dist/core/env.d.ts

@@ -1,3 +0,0 @@
-import type { Env } from "../types";
-export declare function getEnv(): string;
-export declare function setEnv(value: Env): void;

package/dist/core/hooks.d.ts

@@ -1,70 +0,0 @@
-import { type Context, type Ref, type Store } from "../core";
-import { type EffectFn, type MaybeSignal, type Setter, type Signal, type SignalOptions } from "../core/signals";
-/**
- * Returns the Context object of the `View`, `Store` or `Mixin` this hook is called in.
- *
- * @param name - If passed, the context will be renamed. Context takes the name of the component function by default.
- */
-export declare function useContext(name?: MaybeSignal<string>): Context;
-/**
- * Returns the nearest instance of a Store provided to this context.
- */
-export declare function useStore<T>(store: Store<any, T>): T;
-/**
- * Adds a store to this context and returns the store instance.
- */
-export declare function useStoreProvider<T, O>(store: Store<O, T>, options?: O): T;
-/**
- * Schedules `callback` to run just after the component is mounted.
- * If `callback` returns a function, that function will run when the context is unmounted.
- */
-export declare function useMount(callback: () => void | (() => void)): void;
-/**
- * Schedules `callback` to run when the context is unmounted.
- */
-export declare function useUnmount(callback: () => void): void;
-/**
- * Creates a new read-only Signal. Returns bound Getter and Setter functions.
- *
- * @example
- * const [$count, setCount] = useSignal(5);
- * $count(); // 5
- * setCount(6);
- * setCount((current) => current + 1);
- * $count(); // 7
- */
-export declare function useSignal<T>(value: T, options?: SignalOptions<T>): [Signal<T>, Setter<T>];
-export declare function useSignal<T>(value: undefined, options: SignalOptions<T>): [Signal<T | undefined>, Setter<T | undefined>];
-export declare function useSignal<T>(): [Signal<T | undefined>, Setter<T | undefined>];
-export declare function useMemo<T>(compute: (current?: T) => MaybeSignal<T>, deps?: Signal<any>[], options?: SignalOptions<T>): Signal<T>;
-/**
- * Takes the current state and a dispatched action. Returns a new state based on the action.
- * Typically the body of this function will be a large switch statement.
- */
-export type Reducer<State, Action> = (state: State, action: Action) => State;
-/**
- * Dispatches an action to this reducer, causing the state to update.
- */
-export type Dispatcher<Action> = (action: Action) => void;
-/**
- *
- */
-export declare function useReducer<State, Action>(reducer: Reducer<State, Action>, initialState: State): [Signal<State>, Dispatcher<Action>];
-/**
- * Creates an effect bound to the current context.
- * The `fn` is called when the component is mounted, then again each time the dependencies are updated until the component is unmounted.
- */
-export declare function useEffect(fn: EffectFn, deps?: Signal<any>[]): void;
-/**
- * A hybrid Ref which is both a function ref and a React-style object ref with a `current` property.
- * Both the `current` property and the function syntax access the same value.
- */
-export interface HybridRef<T> extends Ref<T> {
-    current: T;
-}
-/**
- * Creates a Ref. Useful for getting references to DOM nodes.
- *
- * @deprecated use ref()
- */
-export declare function useRef<T>(initialValue?: T): HybridRef<T>;

package/dist/core/logger.d.ts

@@ -1,42 +0,0 @@
-import type { Env } from "../types.js";
-import { type MaybeSignal } from "./signals.js";
-export interface LogLevels {
-    info: boolean | Env;
-    log: boolean | Env;
-    warn: boolean | Env;
-    error: boolean | Env;
-}
-export interface Logger {
-    info(...args: any[]): void;
-    log(...args: any[]): void;
-    warn(...args: any[]): void;
-    error(...args: any[]): void;
-    crash(error: Error): Error;
-}
-export interface LoggerOptions {
-    /**
-     * Tag value to print with logs.
-     */
-    tag?: string;
-    /**
-     * Label for tag value. Will be printed without a label if not specified.
-     */
-    tagName?: string;
-    /**
-     * Console object to use for logging (mostly for testing). Uses window.console by default.
-     */
-    console?: any;
-}
-export interface LoggerCrashProps {
-    error: Error;
-    loggerName: string;
-    tag?: string;
-    tagName?: string;
-}
-/**
- * Listen for logged crashes.
- */
-export declare function onLoggerCrash(listener: (context: LoggerCrashProps) => void): () => void;
-export declare function createLogger(name: MaybeSignal<string>, options?: LoggerOptions): Logger;
-export declare function setLogFilter(filter: string | RegExp): void;
-export declare function setLogLevels(options: Partial<LogLevels>): void;