glotstack 0.0.8 → 0.0.10

package/dist/util/findConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"findConfig.js","sourceRoot":"","sources":["../../src/util/findConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA+B;AAC/B,0CAAsC;AACtC,2CAA4B;AAE5B;;;;GAIG;AACH,SAAsB,mBAAmB;yDAAC,WAAmB,OAAO,CAAC,GAAG,EAAE;QACxE,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACvC,IAAI,UAAU,GAAG,IAAI,CAAA;QAErB,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YAC1D,IAAI,IAAA,eAAU,EAAC,SAAS,CAAC,EAAE,CAAC;gBAC1B,UAAU,GAAG,SAAS,CAAA;YACxB,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAC1C,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;gBAC7B,MAAK,CAAC,eAAe;YACvB,CAAC;YACD,UAAU,GAAG,SAAS,CAAA;QACxB,CAAC;QAED,IAAI,MAAM,GAAG,EAAE,CAAA;QAEf,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAA;YACnD,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE,OAAO,CAAC,CAAA;gBAChD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBACzB,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;gBAC1C,OAAO,MAAM,CAAA;YACf,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAA;YACnD,CAAC;QACH,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAA;IACb,CAAC;CAAA;AAhCD,kDAgCC"}
+{"version":3,"file":"findConfig.js","sourceRoot":"","sources":["../../src/util/findConfig.ts"],"names":[],"mappings":"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"}

package/dist/util/object.d.ts

@@ -1,5 +1,3 @@
 export declare function isObject(val: any): val is Record<string, any>;
-type MergeTarget = Record<string | number | symbol, any>;
-export declare function merge(target: MergeTarget, ...sources: MergeTarget[]): MergeTarget;
+export declare function merge<T extends object>(target: T, ...sources: Partial<T>[]): T;
 export declare function isEqual(a: any, b: any): boolean;
-export {};

package/dist/util/object.js

@@ -24,9 +24,7 @@ function _merge(target, source) {
     return target;
 }
 function merge(target, ...sources) {
-    return sources.reduce((previous, current) => {
-        return _merge(previous, current);
-    }, target);
+    return sources.reduce((previous, current) => _merge(previous, current), target);
 }
 exports.merge = merge;
 function isEqual(a, b) {

package/dist/util/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/util/object.ts"],"names":[],"mappings":";;;AAAA,SAAgB,QAAQ,CAAC,GAAQ;IAC/B,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACxE,CAAC;AAFD,4BAEC;AAED,SAAS,MAAM,CAAC,MAAW,EAAE,MAAW;IACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAE1D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QACvB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAID,SAAgB,KAAK,CAAC,MAAmB,EAAE,GAAG,OAAsB;IAClE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;QAC1C,OAAO,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC,EAAE,MAAM,CAAC,CAAA;AACZ,CAAC;AAJD,sBAIC;AAED,SAAgB,OAAO,CAAC,CAAM,EAAE,CAAM;IACpC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzB,IAAI,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAElE,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC7D,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAEhD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAnBD,0BAmBC"}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/util/object.ts"],"names":[],"mappings":";;;AAAA,SAAgB,QAAQ,CAAC,GAAQ;IAC/B,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACxE,CAAC;AAFD,4BAEC;AAED,SAAS,MAAM,CAAC,MAAW,EAAE,MAAW;IACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAE1D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QACvB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAiB,KAAK,CAAmB,MAAS,EAAE,GAAG,OAAqB;IAC1E,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,MAAM,CAAM,CAAA;AACtF,CAAC;AAFD,sBAEC;AAED,SAAgB,OAAO,CAAC,CAAM,EAAE,CAAM;IACpC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzB,IAAI,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAElE,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC7D,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAEhD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAnBD,0BAmBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glotstack",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "JD Cumpson",
@@ -35,8 +35,8 @@
   },
   "scripts": {
     "build": "tsc && scripts/fix-shebang.sh dist/cli.js",
-    "watch": "nodemon --watch src --ext ts,tsx,mjs,json --exec \"bash -c 'npm run build'\"",
-    "prepublishOnly": "yarn run build",
+    "watch": "nodemon --watch src --ext ts,tsx,mjs,json --exec \"bash -c 'yarn build'\"",
+    "prepublishOnly": "yarn build",
     "glotstack": "node dist/cli.js"
   }
 }

package/src/cli.tsx

@@ -1,7 +1,7 @@
 import { Command, program } from 'commander'
 import path from 'path'
 import { promises as fs, createReadStream } from 'fs'
-import { findGlotstackConfig } from './util/findConfig'
+import { findGlotstackConfig, GlotstackConfig } from './util/findConfig'
 import { cwd } from 'process'
 import { merge } from './util/object'
 import { loadYaml } from './util/yaml'
@@ -67,27 +67,34 @@ function unflatten(flat: Record<string, any>): Record<string, any> {
 const DEFAULT_OPTIONS: Record<string, string> = {
   sourcePath: '.',
   sourceLocale: 'en-US',
-  apiOrigin: 'https://glotstack.ai'
+  apiOrigin: 'https://glotstack.ai',
+  yaml: 'false',
 }
 
-async function resolveConfigAndOptions(options: Record<string, any>) {
+// TODO: downcase yaml files
+function downcaseKeys(obj: Record<string, any>): Record<string, any> {
+  return Object.fromEntries(
+    Object.entries(obj).map(([key, value]) => [key.toLowerCase(), value])
+  )
+}
 
-  const config = await findGlotstackConfig(cwd()) ?? {}
 
-  if ('outputLocales' in options) {
-    if ((options.outputLocales as string[]).includes('en-US')) {
-      console.warn('en-US detected in outputLocales, removing')
-      options.outputLocales = options.outputLocales.filter((x: string) => x !== 'en-US')
-    }
-  }
+async function resolveConfigAndOptions(options: Record<string, any>): Promise<GlotstackConfig & { yes?: boolean; yaml?: boolean }> {
 
-  const resolved = merge({}, DEFAULT_OPTIONS, config, options)
+  const config = await findGlotstackConfig(cwd()) ?? {}
+  const resolved = merge<GlotstackConfig>({} as GlotstackConfig, DEFAULT_OPTIONS, config, options)
 
   // special case to match source
   if (resolved.outputDir == null) {
     resolved.outputDir = resolved.sourcePath
   }
 
+  if ('outputLocales' in options) {
+    if ((resolved.outputLocales as string[]).includes(resolved.sourceLocale)) {
+      console.warn(`${resolved.sourceLocale} detected in outputLocales, removing`)
+      options.outputLocales = options.outputLocales.filter((x: string) => x !== resolved.sourceLocale)
+    }
+  }
   return resolved
 }
 
@@ -98,18 +105,20 @@ async function run(args: string[]) {
     .description('extract translations from all compatible source files.')
     .option('--source-path [path]', `path directory containing [locale].json files (default=${DEFAULT_OPTIONS['sourcePath']})`)
     .option('--source-locale [locale]', `the locale you provide "context" in, your primary locale (default=${DEFAULT_OPTIONS['sourceLocale']})`)
+    .option('--yaml', 'Use a .yaml source file and allow conversion to JSON')
     .option('--api-origin [url]', `glotstack api origin (default=${DEFAULT_OPTIONS['apiOrigin']})`)
     .option('--output-dir [path]', 'path to output directory (default=<source-path>')
     .option('--api-key [key]', 'api key for glotstack.ai')
     .option('--yes', 'skip confirm checks')
-    .action(async (inputOptions: Record<string, any>) => {
+    .argument('[directories...]', 'Directories to scan', './**/*')
+    .action(async (directories: string[], inputOptions: Record<string, any>) => {
       const options = await resolveConfigAndOptions(inputOptions)
       if (!options.apiOrigin) {
         throw new Error('apiOrigin must be specified')
       }
 
       const linter = new eslint.ESLint({ overrideConfigFile: path.join(__dirname, '..', 'eslint-raw-string.mjs') })
-      const results = await linter.lintFiles(["./**/*"])
+      const results = await linter.lintFiles(directories)
       const filesWithIssues = results
         .filter((r) => r.errorCount + r.warningCount > 0)
         .map((r) => r.filePath)
@@ -133,7 +142,12 @@ async function run(args: string[]) {
       const send = await askToSend()
       if (send) {
         console.info('Sending files to generate new source and extracted strings')
-        const url = `${options.apiOrigin}/uploads/translations/extract`
+        let url = `${options.apiOrigin}/uploads/translations/extract`
+
+        if (options.yaml) {
+          url = `${url}?yaml=true`
+        }
+
         const form = new FormData()
 
         for (let i = 0; i < filesWithIssues.length; i++) {
@@ -154,10 +168,12 @@ async function run(args: string[]) {
     .description('fetch translations for all [output-locals...]. Use .glotstack.json for repeatable results.')
     .option('--source-path [path]', `path directory containing [locale].json files (default=${DEFAULT_OPTIONS['sourcePath']})`)
     .option('--source-locale [locale]', `the locale you provide "context" in, your primary locale (default=${DEFAULT_OPTIONS['sourceLocale']})`)
+    .option('--yaml', 'Expect to use yaml source file')
     .option('--api-origin [url]', `glotstack api origin (default=${DEFAULT_OPTIONS['apiOrigin']})`)
     .option('--output-dir [path]', 'path to output directory (default=<source-path>')
     .option('--api-key [key]', 'api key for glotstack.ai')
     .option('--project-id [id]', '(optional) specific project to use')
+    .option('--only [locale]', '(optional) only translate for this locale')
     .argument('[output-locales...]', 'locales to get translations for')
     .action(async (outputLocales: string[], options: Record<string, any>, command: Command) => {
       const resolved = await resolveConfigAndOptions({ ...options, outputLocales: outputLocales })
@@ -171,7 +187,8 @@ async function run(args: string[]) {
         throw new Error('outputDir must be specified')
       }
 
-      const absPath = path.resolve(resolved.sourcePath, `${resolved.sourceLocale}.json`)
+      const ext = options.yaml == true ? '.yaml' : '.json'
+      const absPath = path.resolve(resolved.sourcePath, `${resolved.sourceLocale}${ext}`)
       const fileContent = await fs.readFile(absPath, 'utf-8')
 
       let json = null
@@ -185,23 +202,50 @@ async function run(args: string[]) {
           throw err
         }
       }
+      let locales: string[] = (resolved.outputLocales as string[]).map(l => l)
+      if (options.only != null) {
+        locales = locales.filter(l => l === options.only)
+      }
 
       const body = {
-        locales: resolved.outputLocales,
+        locales,
         translations: json,
+        usage: options.usage,
         ...{ ... (resolved.projectId != null ? { projectId: resolved.projectId } : {}) },
       }
 
       const url = `${resolved.apiOrigin}/api/translations`
+      console.info('Getting translations for: ', locales)
       const data = await fetchGlotstack<{ data: Translations }>(url, resolved.apiKey, body)
       console.info('Received translations:', data)
       Object.entries(data.data).map(([key, val]) => {
         const p = `${resolved.outputDir}/${key}.json`
         console.info(`Writing file ${p}`)
-        fs.writeFile(`${resolved.outputDir}/${key}.json`, JSON.stringify(val, null, 2))
+        fs.writeFile(`${resolved.outputDir}/${key}.json`, JSON.stringify(val, null, 2), 'utf-8')
       })
+
+      if (options.yaml) {
+        const fp = `${resolved.outputDir}/${path.parse(absPath).name}.json`
+        console.info(`Writing file ${fp}`)
+        fs.writeFile(fp, JSON.stringify(json, null, 2), 'utf-8')
+      }
+    })
+
+  program
+    .command('yaml-to-json')
+    .option('--source-path [path]', `path directory containing [locale].json files (default=${DEFAULT_OPTIONS['sourcePath']})`)
+    .action(async (inputOptions: Record<string, any>) => {
+      const options = await resolveConfigAndOptions(inputOptions)
+
+      const absPath = path.resolve(options.sourcePath, `${options.sourceLocale}.yaml`)
+      const fileContent = await fs.readFile(absPath, 'utf-8')
+      const fp = `${options.outputDir}/${path.parse(absPath).name}.json`
+      const json = loadYaml(fileContent)
+      console.info(`Writing file ${fp}`)
+      fs.writeFile(fp, JSON.stringify(json, null, 2), 'utf-8')
     })
 
+
   program
     .command('format-json')
     .description('format files in --source-path [path] to nested (not flat)')
@@ -236,7 +280,7 @@ async function run(args: string[]) {
           const text = await readFile(fp, 'utf-8')
           const json = JSON.parse(text)
           const formatted = JSON.stringify(unflatten(json), null, 2)
-          await writeFile(fp, formatted)
+          await writeFile(fp, formatted, 'utf-8')
         }
         rl.close()
       }

package/src/index.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react'
 import { merge } from './util/object'
-import { debug } from 'node:console'
 
 export type LocaleRegion = string
 
@@ -14,15 +13,27 @@ export interface Translations {
   [key: string]: Translations | TranslationLeaf
 }
 
+interface TranslateOptsBase {
+  locale?: LocaleRegion
+  assigns?: Record<string, React.ReactNode>
+}
+
+export type TranslateFn = {
+  (key: string, opts: TranslateOptsBase & { asString: true }): string
+  (
+    key: string,
+    opts?: TranslateOptsBase & { asString?: false },
+  ): React.ReactNode
+}
+
 
 export interface ContextType {
-  translations: Translations
+  translations: Record<string, Translations>
   locale: string | null
   loadTranslations: (locale: LocaleRegion) => Promise<Translations>
   setLocale: (locale: LocaleRegion) => void
-  importMethod: (locale: LocaleRegion) => Promise<Translations> 
-  t: (key: string, options?: { locale?: LocaleRegion }) => string
-  ssr: boolean
+  importMethod: (locale: LocaleRegion) => Promise<Translations>
+  t: TranslateFn
 }
 
 export const GlotstackContext = React.createContext<ContextType>({
@@ -32,7 +43,6 @@ export const GlotstackContext = React.createContext<ContextType>({
   locale: null,
   importMethod: (_locale: LocaleRegion) => { throw new Error('import method not set') },
   t: () => { throw new Error('import method not set') },
-  ssr: false
 })
 
 interface GlotstackProviderProps {
@@ -53,6 +63,14 @@ export enum LogLevel {
   ERROR = 4,
 }
 
+const LogName = {
+  [LogLevel.DEBUG]: 'debug',
+  [LogLevel.LOG]: 'log',
+  [LogLevel.INFO]: 'info',
+  [LogLevel.WARNING]: 'warning',
+  [LogLevel.ERROR]: 'error',
+} as const
+
 const LogLevelToFunc: Record<LogLevel, (...args: Parameters<typeof console.info>) => void> = {
   [LogLevel.DEBUG]: console.debug,
   [LogLevel.INFO]: console.info,
@@ -72,7 +90,7 @@ const makeLoggingFunction = (level: LogLevel) => (...args: Parameters<typeof con
   if (level < logLevel) {
     return
   }
-  return func(`[level=${level} logLevel=${logLevel}][glotstack.ai]`, ...args)
+  return func(`[${LogName[level]}][glotstack.ai]`, ...args)
 }
 
 const logger = {
@@ -102,15 +120,221 @@ export const access = (key: string, locale: LocaleRegion, translations: Translat
   return (value?.value ?? key) as string
 }
 
-export const GlotstackProvider = ({ children, initialLocale, initialTranslations, onLocaleChange, onTranslationLoaded, importMethod, ssr}: GlotstackProviderProps) => {
+
+function isAsStringTrue(
+  opts: (TranslateOptsBase & { asString?: boolean }) | undefined,
+): opts is TranslateOptsBase & { asString: true } {
+  return opts?.asString === true
+}
+
+function translate(
+  key: string,
+  opts: {
+    locale?: LocaleRegion
+    assigns?: Record<string, React.ReactNode>
+    asString?: boolean
+    glotstack: ReturnType<typeof useGlotstack>
+    globalLocale: LocaleRegion
+    translations: Record<LocaleRegion, Translations>
+    localeRef: React.MutableRefObject<LocaleRegion>
+    accessedRef: React.MutableRefObject<Record<string, Record<string, string>>>
+    extractionsRef: React.MutableRefObject<
+      Record<
+        string,
+        Record<string, ParsedSimplePlaceholder[] | undefined> | undefined
+      >
+    >
+    outputRef: React.MutableRefObject<
+      Record<string, Record<string, React.ReactNode | undefined> | undefined>
+    >
+  },
+): string | React.ReactNode {
+  const {
+    glotstack,
+    globalLocale,
+    translations,
+    localeRef,
+    accessedRef,
+    extractionsRef,
+    outputRef,
+  } = opts
+  const locale = opts?.locale ?? globalLocale
+  localeRef.current = locale
+  glotstack.loadTranslations(localeRef.current)
+
+  let string = ''
+  if (translations != null) {
+    string = access(key, locale, translations ?? {})
+  }
+
+  if (string === key) return key
+
+  if (outputRef.current == null) {
+    outputRef.current = {}
+  }
+
+  if (!outputRef.current[locale]) {
+    outputRef.current[locale] = {}
+  }
+
+  if (!accessedRef.current[locale]) {
+    accessedRef.current[locale] = {}
+  }
+
+  if (
+    outputRef.current[locale]?.[key] != null &&
+    string === accessedRef.current[locale]?.[key]
+  ) {
+    return outputRef.current[locale]![key]
+  }
+
+  accessedRef.current[locale] ??= {}
+  accessedRef.current[locale][key] = string
+
+  extractionsRef.current[locale] ??= {}
+  if (!extractionsRef.current[locale]![key]) {
+    const newExtractions = extractSimplePlaceholders(string)
+    extractionsRef.current[locale]![key]! = newExtractions
+  }
+
+  if (outputRef.current[locale] == null) {
+    outputRef.current[locale] = {}
+  }
+
+  if (outputRef.current[locale]![key] == null) {
+    const output = renderPlaceholdersToNodes(
+      string,
+      extractionsRef.current[locale]![key]!,
+      opts?.assigns ?? {},
+    )
+    outputRef.current[locale]![key] = output
+  }
+
+  let output = outputRef.current[locale]![key]
+
+  if (isAsStringTrue(opts)) {
+    // Convert any possible value to string safely
+    output = Array.isArray(output)
+      ? output.join('')
+      : typeof output === 'string'
+        ? output
+        : String(output ?? '')
+
+    if (outputRef.current != null) {
+      outputRef.current[locale]![key] = output
+    }
+  }
+  return output as React.ReactNode
+}
+
+function createTranslate(
+  glotstack: ReturnType<typeof useGlotstack>,
+  globalLocale: LocaleRegion,
+  translations: Record<LocaleRegion, Translations>,
+  localeRef: React.MutableRefObject<LocaleRegion>,
+  accessedRef: React.MutableRefObject<Record<string, Record<string, string>>>,
+  extractionsRef: React.MutableRefObject<
+    Record<
+      string,
+      Record<string, ParsedSimplePlaceholder[] | undefined> | undefined
+    >
+  >,
+  outputRef: React.MutableRefObject<
+    Record<string, Record<string, React.ReactNode | undefined> | undefined>
+  >,
+): TranslateFn {
+  function t(
+    key: string,
+    opts?: {
+      locale?: LocaleRegion
+      assigns?: Record<string, React.ReactNode>
+      asString: true
+    },
+  ): string
+  function t(
+    key: string,
+    opts?: {
+      locale?: LocaleRegion
+      assigns?: Record<string, React.ReactNode>
+      asString?: false
+    },
+  ): React.ReactNode
+  function t(
+    key: string,
+    opts?: {
+      locale?: LocaleRegion
+      assigns?: Record<string, React.ReactNode>
+      asString?: boolean
+    },
+  ) {
+    return translate(
+      key,
+      merge<Parameters<typeof translate>[1]>(
+        {
+          glotstack,
+          globalLocale,
+          translations,
+          localeRef,
+          accessedRef,
+          extractionsRef,
+          outputRef,
+        },
+        opts ?? {},
+      ),
+    )
+  }
+
+  return t
+}
+
+// export const useReduxGlotstack = () => {
+//   const glotstack = useGlotstack()
+//   const globalLocale = useSelector(selectLocale)
+//   const localeRef = React.useRef(globalLocale)
+//   localeRef.current = globalLocale
+
+//   const translations = useSelector(selectTranslations)
+
+//   React.useEffect(() => {
+//     glotstack.loadTranslations(localeRef.current)
+//   }, [localeRef.current])
+
+//   const accessedRef = React.useRef<Record<string, Record<string, string>>>({})
+//   const extractionsRef = React.useRef<
+//     Record<string, Record<string, ParsedSimplePlaceholder[]>>
+//   >({})
+//   const outputRef = React.useRef<
+//     Record<string, Record<string, React.ReactNode>>
+//   >({})
+
+//   const t: TranslateFn = React.useMemo(() => {
+//     return createTranslate(
+//       glotstack,
+//       globalLocale,
+//       translations ?? {},
+//       localeRef,
+//       accessedRef,
+//       extractionsRef,
+//       outputRef,
+//     )
+//   }, [globalLocale, translations])
+
+//   return { t }
+// }
+
+export const GlotstackProvider = ({ children, initialLocale, initialTranslations, onLocaleChange, onTranslationLoaded, importMethod }: GlotstackProviderProps) => {
   if (initialLocale == null) {
     throw new Error('initialLocale must be set')
   }
   const [locale, setLocale] = React.useState<LocaleRegion>(initialLocale)
-  const translationsRef = React.useRef<Record<string, Translations>|null>(initialTranslations || null)
+  const translationsRef = React.useRef<Record<string, Translations> | null>(initialTranslations || null)
+  const accessedRef = React.useRef<Record<string, Record<string, string>>>({})
+  const outputRef = React.useRef<Record<string, Record<string, React.ReactNode>>>({})
+  const extractionsRef = React.useRef<Record<string, Record<string, ParsedSimplePlaceholder[]>>>({})
   const loadingRef = React.useRef<Record<string, Promise<Translations>>>({})
+  const localeRef = React.useRef<string>('en-US')
 
-  const loadTranslations = React.useCallback(async (locale: string, opts?: {force?: boolean}) => {
+  const loadTranslations = React.useCallback(async (locale: string, opts?: { force?: boolean }) => {
     // TODO: if translations are loaded only reload if some condition is
     try {
       if (loadingRef.current?.[locale] != null && opts?.force != true) {
@@ -152,20 +376,30 @@ export const GlotstackProvider = ({ children, initialLocale, initialTranslations
   }, [locale])
 
   const context = React.useMemo(() => {
-    return {
+    const context: ContextType = {
       setLocale,
       translations: translationsRef.current ?? {},
       locale,
       importMethod,
       loadTranslations,
-      t: (key: string, opts?: { locale?: LocaleRegion }) => {
-        const resolvedLocale = opts?.locale ?? locale
-        loadTranslations(resolvedLocale)
-        return access(key, opts?.locale ?? locale, translationsRef.current ?? {})
-      },
-      ssr: ssr == true,
+      t: () => '',
     }
-  }, [locale, importMethod])
+    localeRef.current = locale
+
+    const t = createTranslate(
+      context,
+      context.locale ?? 'en-US',
+      context.translations ?? {},
+      localeRef,
+      accessedRef,
+      extractionsRef,
+      outputRef,
+    )
+
+    context.t = t
+    return context
+
+  }, [locale, importMethod, loadTranslations])
 
   return <GlotstackContext.Provider value={context}>
     {children}
@@ -181,3 +415,104 @@ export const useTranslations = (_options?: Record<never, never>) => {
   return context
 }
 
+
+export type ParsedSimplePlaceholder = {
+  key: string
+  options: string[]
+  raw: string
+  index: number
+  kind: 'doubleCurly' | 'component'
+}
+
+const curlyRegex = /(?<!\\)({{\s*([a-zA-Z0-9_]+)\s*(?:,\s*([^{}]*?))?\s*}})/g
+const componentRegex = /<([A-Z][a-zA-Z0-9]*)>([\s\S]*?)<\/\1>/g
+
+export function extractSimplePlaceholders(input: string): ParsedSimplePlaceholder[] {
+  const results: ParsedSimplePlaceholder[] = []
+
+  for (const match of input.matchAll(curlyRegex)) {
+    const raw = match[1]
+    const key = match[2]
+    const rawOptions = match[3]
+    const index = match.index ?? -1
+
+    const options = rawOptions
+      ? rawOptions.split(',').map(opt => opt.trim()).filter(Boolean)
+      : []
+
+    results.push({ key, options, raw, index, kind: 'doubleCurly' })
+  }
+
+  for (const match of input.matchAll(componentRegex)) {
+    const raw = match[0]
+    const key = match[1]
+    const index = match.index ?? -1
+
+    results.push({ key, options: [], raw, index, kind: 'component' })
+  }
+
+  return results.sort((a, b) => a.index - b.index)
+}
+
+type Renderer = (props: { children: React.ReactNode }) => React.ReactNode
+
+export function renderPlaceholdersToNodes(
+  input: string,
+  placeholders: ParsedSimplePlaceholder[],
+  assigns: Record<string, React.ReactNode | Renderer>
+): React.ReactNode[] {
+  const nodes: React.ReactNode[] = []
+  let cursor = 0
+
+  for (const { index, raw, key, kind } of placeholders) {
+    if (cursor < index) {
+      nodes.push(input.slice(cursor, index))
+    }
+    let value: React.ReactNode = raw
+
+    if (kind === 'component') {
+      const Render = assigns[key]
+      const inner = raw.replace(new RegExp(`^<${key}>`), '').replace(new RegExp(`</${key}>$`), '')
+
+      if (React.isValidElement(Render)) {
+        value = React.cloneElement(Render, {}, inner)
+      } else if (typeof Render === 'function') {
+        value = <Render>{inner}</Render>
+      } else {
+        logger.warn(`Invalid assign substitution for:\n\n  ${raw}\n\nDid you remember to pass assigns?\n`,
+          `
+t('key', { assigns: {
+  ${key}: <something />  // children will be copied via React.cloneElement
+}})\n\nor\n
+t('key', { assigns: {
+  ${key}: MyComponent  // component will be rendered with <Component/>
+}})\n
+`
+        )
+      }
+    } else if (kind === 'doubleCurly') {
+      const Render = assigns[key]
+      value = typeof Render !== 'function' ? Render : raw ?? raw
+    }
+    nodes.push(value)
+    cursor = index + raw.length
+  }
+
+  if (cursor < input.length) {
+    nodes.push(input.slice(cursor))
+  }
+
+  // Unescape \{{...}} to {{...}}, and wrap ReactNodes
+  return nodes.map((node, i) =>
+    typeof node === 'string'
+      ? node.replace(/\\({{[^{}]+}})/g, '$1')
+      : <React.Fragment key={i}>{node}</React.Fragment>
+  )
+}
+
+
+
+export function useRenderPlaceholdersToNodes(...args: Parameters<typeof renderPlaceholdersToNodes>) {
+  const nodes = React.useMemo(() => renderPlaceholdersToNodes(...args), [...args])
+  return nodes
+}