@dcloudio/uni-i18n 2.0.0 → 2.0.1-32920211122002

package/dist/uni-i18n.cjs.js

@@ -2,18 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+const isArray = Array.isArray;
 const isObject = (val) => val !== null && typeof val === 'object';
+const defaultDelimiters = ['{', '}'];
 class BaseFormatter {
     constructor() {
         this._caches = Object.create(null);
     }
-    interpolate(message, values) {
+    interpolate(message, values, delimiters = defaultDelimiters) {
         if (!values) {
             return [message];
         }
         let tokens = this._caches[message];
         if (!tokens) {
-            tokens = parse(message);
+            tokens = parse(message, delimiters);
             this._caches[message] = tokens;
         }
         return compile(tokens, values);
@@ -21,24 +23,24 @@ class BaseFormatter {
 }
 const RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
 const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
-function parse(format) {
+function parse(format, [startDelimiter, endDelimiter]) {
     const tokens = [];
     let position = 0;
     let text = '';
     while (position < format.length) {
         let char = format[position++];
-        if (char === '{') {
+        if (char === startDelimiter) {
             if (text) {
                 tokens.push({ type: 'text', value: text });
             }
             text = '';
             let sub = '';
             char = format[position++];
-            while (char !== undefined && char !== '}') {
+            while (char !== undefined && char !== endDelimiter) {
                 sub += char;
                 char = format[position++];
             }
-            const isClosed = char === '}';
+            const isClosed = char === endDelimiter;
             const type = RE_TOKEN_LIST_VALUE.test(sub)
                 ? 'list'
                 : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
@@ -46,12 +48,12 @@ function parse(format) {
                     : 'unknown';
             tokens.push({ value: sub, type });
         }
-        else if (char === '%') {
-            // when found rails i18n syntax, skip text capture
-            if (format[position] !== '{') {
-                text += char;
-            }
-        }
+        //  else if (char === '%') {
+        //   // when found rails i18n syntax, skip text capture
+        //   if (format[position] !== '{') {
+        //     text += char
+        //   }
+        // }
         else {
             text += char;
         }
@@ -62,7 +64,7 @@ function parse(format) {
 function compile(tokens, values) {
     const compiled = [];
     let index = 0;
-    const mode = Array.isArray(values)
+    const mode = isArray(values)
         ? 'list'
         : isObject(values)
             ? 'named'
@@ -100,6 +102,11 @@ function compile(tokens, values) {
     return compiled;
 }
 
+const LOCALE_ZH_HANS = 'zh-Hans';
+const LOCALE_ZH_HANT = 'zh-Hant';
+const LOCALE_EN = 'en';
+const LOCALE_FR = 'fr';
+const LOCALE_ES = 'es';
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 const hasOwn = (val, key) => hasOwnProperty.call(val, key);
 const defaultFormatter = new BaseFormatter();
@@ -114,31 +121,31 @@ function normalizeLocale(locale, messages) {
         return;
     }
     locale = locale.trim().replace(/_/g, '-');
-    if (messages[locale]) {
+    if (messages && messages[locale]) {
         return locale;
     }
     locale = locale.toLowerCase();
     if (locale.indexOf('zh') === 0) {
-        if (locale.indexOf('-hans') !== -1) {
-            return 'zh-Hans';
+        if (locale.indexOf('-hans') > -1) {
+            return LOCALE_ZH_HANS;
         }
-        if (locale.indexOf('-hant') !== -1) {
-            return 'zh-Hant';
+        if (locale.indexOf('-hant') > -1) {
+            return LOCALE_ZH_HANT;
         }
         if (include(locale, ['-tw', '-hk', '-mo', '-cht'])) {
-            return 'zh-Hant';
+            return LOCALE_ZH_HANT;
         }
-        return 'zh-Hans';
+        return LOCALE_ZH_HANS;
     }
-    const lang = startsWith(locale, ['en', 'fr', 'es']);
+    const lang = startsWith(locale, [LOCALE_EN, LOCALE_FR, LOCALE_ES]);
     if (lang) {
         return lang;
     }
 }
 class I18n {
     constructor({ locale, fallbackLocale, messages, watcher, formater, }) {
-        this.locale = 'en';
-        this.fallbackLocale = 'en';
+        this.locale = LOCALE_EN;
+        this.fallbackLocale = LOCALE_EN;
         this.message = {};
         this.messages = {};
         this.watchers = [];
@@ -146,8 +153,8 @@ class I18n {
             this.fallbackLocale = fallbackLocale;
         }
         this.formater = formater || defaultFormatter;
-        this.messages = messages;
-        this.setLocale(locale);
+        this.messages = messages || {};
+        this.setLocale(locale || LOCALE_EN);
         if (watcher) {
             this.watchLocale(watcher);
         }
@@ -155,10 +162,17 @@ class I18n {
     setLocale(locale) {
         const oldLocale = this.locale;
         this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
+        if (!this.messages[this.locale]) {
+            // 可能初始化时不存在
+            this.messages[this.locale] = {};
+        }
         this.message = this.messages[this.locale];
-        this.watchers.forEach((watcher) => {
-            watcher(this.locale, oldLocale);
-        });
+        // 仅发生变化时，通知
+        if (oldLocale !== this.locale) {
+            this.watchers.forEach((watcher) => {
+                watcher(this.locale, oldLocale);
+            });
+        }
     }
     getLocale() {
         return this.locale;
@@ -169,6 +183,27 @@ class I18n {
             this.watchers.splice(index, 1);
         };
     }
+    add(locale, message, override = true) {
+        const curMessages = this.messages[locale];
+        if (curMessages) {
+            if (override) {
+                Object.assign(curMessages, message);
+            }
+            else {
+                Object.keys(message).forEach((key) => {
+                    if (!hasOwn(curMessages, key)) {
+                        curMessages[key] = message[key];
+                    }
+                });
+            }
+        }
+        else {
+            this.messages[locale] = message;
+        }
+    }
+    f(message, values, delimiters) {
+        return this.formater.interpolate(message, values, delimiters).join('');
+    }
     t(key, locale, values) {
         let message = this.message;
         if (typeof locale === 'string') {
@@ -186,94 +221,252 @@ class I18n {
     }
 }
 
-function initLocaleWatcher(appVm, i18n) {
-    appVm.$i18n &&
-        appVm.$i18n.vm.$watch('locale', (newLocale) => {
+function watchAppLocale(appVm, i18n) {
+    // 需要保证 watch 的触发在组件渲染之前
+    if (appVm.$watchLocale) {
+        // vue2
+        appVm.$watchLocale((newLocale) => {
             i18n.setLocale(newLocale);
-        }, {
-            immediate: true,
         });
+    }
+    else {
+        appVm.$watch(() => appVm.$locale, (newLocale) => {
+            i18n.setLocale(newLocale);
+        });
+    }
 }
 function getDefaultLocale() {
-    if (typeof navigator !== 'undefined') {
-        return navigator.userLanguage || navigator.language;
+    if (typeof uni !== 'undefined' && uni.getLocale) {
+        return uni.getLocale();
     }
-    if (typeof plus !== 'undefined') {
-        // TODO 待调整为最新的获取语言代码
-        return plus.os.language;
+    // 小程序平台，uni 和 uni-i18n 互相引用，导致访问不到 uni，故在 global 上挂了 getLocale
+    if (typeof global !== 'undefined' && global.getLocale) {
+        return global.getLocale();
     }
-    return uni.getSystemInfoSync().language;
+    return LOCALE_EN;
 }
-function initVueI18n(messages, fallbackLocale = 'en', locale) {
+function initVueI18n(locale, messages = {}, fallbackLocale, watcher) {
+    // 兼容旧版本入参
+    if (typeof locale !== 'string') {
+        [locale, messages] = [
+            messages,
+            locale,
+        ];
+    }
+    if (typeof locale !== 'string') {
+        // 因为小程序平台，uni-i18n 和 uni 互相引用，导致此时访问 uni 时，为 undefined
+        locale = getDefaultLocale();
+    }
+    if (typeof fallbackLocale !== 'string') {
+        fallbackLocale =
+            (typeof __uniConfig !== 'undefined' && __uniConfig.fallbackLocale) ||
+                LOCALE_EN;
+    }
     const i18n = new I18n({
-        locale: locale || fallbackLocale,
+        locale,
         fallbackLocale,
         messages,
+        watcher,
     });
     let t = (key, values) => {
         if (typeof getApp !== 'function') {
-            // app-plus view
+            // app view
             /* eslint-disable no-func-assign */
             t = function (key, values) {
                 return i18n.t(key, values);
             };
         }
         else {
-            const appVm = getApp().$vm;
-            if (!appVm.$t || !appVm.$i18n) {
-                if (!locale) {
-                    i18n.setLocale(getDefaultLocale());
-                }
-                /* eslint-disable no-func-assign */
-                t = function (key, values) {
-                    return i18n.t(key, values);
-                };
-            }
-            else {
-                initLocaleWatcher(appVm, i18n);
-                /* eslint-disable no-func-assign */
-                t = function (key, values) {
-                    const $i18n = appVm.$i18n;
-                    const silentTranslationWarn = $i18n.silentTranslationWarn;
-                    $i18n.silentTranslationWarn = true;
-                    const msg = appVm.$t(key, values);
-                    $i18n.silentTranslationWarn = silentTranslationWarn;
-                    if (msg !== key) {
-                        return msg;
+            let isWatchedAppLocale = false;
+            t = function (key, values) {
+                const appVm = getApp().$vm;
+                // 可能$vm还不存在，比如在支付宝小程序中，组件定义较早，在props的default里使用了t()函数（如uni-goods-nav），此时app还未初始化
+                // options: {
+                // 	type: Array,
+                // 	default () {
+                // 		return [{
+                // 			icon: 'shop',
+                // 			text: t("uni-goods-nav.options.shop"),
+                // 		}, {
+                // 			icon: 'cart',
+                // 			text: t("uni-goods-nav.options.cart")
+                // 		}]
+                // 	}
+                // },
+                if (appVm) {
+                    // 触发响应式
+                    appVm.$locale;
+                    if (!isWatchedAppLocale) {
+                        isWatchedAppLocale = true;
+                        watchAppLocale(appVm, i18n);
                     }
-                    return i18n.t(key, $i18n.locale, values);
-                };
-            }
+                }
+                return i18n.t(key, values);
+            };
         }
         return t(key, values);
     };
     return {
+        i18n,
+        f(message, values, delimiters) {
+            return i18n.f(message, values, delimiters);
+        },
         t(key, values) {
             return t(key, values);
         },
+        add(locale, message, override = true) {
+            return i18n.add(locale, message, override);
+        },
+        watch(fn) {
+            return i18n.watchLocale(fn);
+        },
         getLocale() {
             return i18n.getLocale();
         },
         setLocale(newLocale) {
             return i18n.setLocale(newLocale);
         },
-        mixin: {
-            beforeCreate() {
-                const unwatch = i18n.watchLocale(() => {
-                    this.$forceUpdate();
-                });
-                this.$once('hook:beforeDestroy', function () {
-                    unwatch();
+    };
+}
+
+const isString = (val) => typeof val === 'string';
+let formater;
+function hasI18nJson(jsonObj, delimiters) {
+    if (!formater) {
+        formater = new BaseFormatter();
+    }
+    return walkJsonObj(jsonObj, (jsonObj, key) => {
+        const value = jsonObj[key];
+        if (isString(value)) {
+            if (isI18nStr(value, delimiters)) {
+                return true;
+            }
+        }
+        else {
+            return hasI18nJson(value, delimiters);
+        }
+    });
+}
+function parseI18nJson(jsonObj, values, delimiters) {
+    if (!formater) {
+        formater = new BaseFormatter();
+    }
+    walkJsonObj(jsonObj, (jsonObj, key) => {
+        const value = jsonObj[key];
+        if (isString(value)) {
+            if (isI18nStr(value, delimiters)) {
+                jsonObj[key] = compileStr(value, values, delimiters);
+            }
+        }
+        else {
+            parseI18nJson(value, values, delimiters);
+        }
+    });
+    return jsonObj;
+}
+function compileI18nJsonStr(jsonStr, { locale, locales, delimiters, }) {
+    if (!isI18nStr(jsonStr, delimiters)) {
+        return jsonStr;
+    }
+    if (!formater) {
+        formater = new BaseFormatter();
+    }
+    const localeValues = [];
+    Object.keys(locales).forEach((name) => {
+        if (name !== locale) {
+            localeValues.push({
+                locale: name,
+                values: locales[name],
+            });
+        }
+    });
+    localeValues.unshift({ locale, values: locales[locale] });
+    try {
+        return JSON.stringify(compileJsonObj(JSON.parse(jsonStr), localeValues, delimiters), null, 2);
+    }
+    catch (e) { }
+    return jsonStr;
+}
+function isI18nStr(value, delimiters) {
+    return value.indexOf(delimiters[0]) > -1;
+}
+function compileStr(value, values, delimiters) {
+    return formater.interpolate(value, values, delimiters).join('');
+}
+function compileValue(jsonObj, key, localeValues, delimiters) {
+    const value = jsonObj[key];
+    if (isString(value)) {
+        // 存在国际化
+        if (isI18nStr(value, delimiters)) {
+            jsonObj[key] = compileStr(value, localeValues[0].values, delimiters);
+            if (localeValues.length > 1) {
+                // 格式化国际化语言
+                const valueLocales = (jsonObj[key + 'Locales'] = {});
+                localeValues.forEach((localValue) => {
+                    valueLocales[localValue.locale] = compileStr(value, localValue.values, delimiters);
                 });
-            },
-            methods: {
-                $$t(key, values) {
-                    return t(key, values);
-                },
-            },
-        },
+            }
+        }
+    }
+    else {
+        compileJsonObj(value, localeValues, delimiters);
+    }
+}
+function compileJsonObj(jsonObj, localeValues, delimiters) {
+    walkJsonObj(jsonObj, (jsonObj, key) => {
+        compileValue(jsonObj, key, localeValues, delimiters);
+    });
+    return jsonObj;
+}
+function walkJsonObj(jsonObj, walk) {
+    if (isArray(jsonObj)) {
+        for (let i = 0; i < jsonObj.length; i++) {
+            if (walk(jsonObj, i)) {
+                return true;
+            }
+        }
+    }
+    else if (isObject(jsonObj)) {
+        for (const key in jsonObj) {
+            if (walk(jsonObj, key)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+function resolveLocale(locales) {
+    return (locale) => {
+        if (!locale) {
+            return locale;
+        }
+        locale = normalizeLocale(locale) || locale;
+        return resolveLocaleChain(locale).find((locale) => locales.indexOf(locale) > -1);
     };
+}
+function resolveLocaleChain(locale) {
+    const chain = [];
+    const tokens = locale.split('-');
+    while (tokens.length) {
+        chain.push(tokens.join('-'));
+        tokens.pop();
+    }
+    return chain;
 }
 
+exports.Formatter = BaseFormatter;
 exports.I18n = I18n;
+exports.LOCALE_EN = LOCALE_EN;
+exports.LOCALE_ES = LOCALE_ES;
+exports.LOCALE_FR = LOCALE_FR;
+exports.LOCALE_ZH_HANS = LOCALE_ZH_HANS;
+exports.LOCALE_ZH_HANT = LOCALE_ZH_HANT;
+exports.compileI18nJsonStr = compileI18nJsonStr;
+exports.hasI18nJson = hasI18nJson;
 exports.initVueI18n = initVueI18n;
+exports.isI18nStr = isI18nStr;
+exports.isString = isString;
+exports.normalizeLocale = normalizeLocale;
+exports.parseI18nJson = parseI18nJson;
+exports.resolveLocale = resolveLocale;

package/dist/uni-i18n.d.ts

@@ -1,10 +1,25 @@
+export declare type BuiltInLocale = typeof LOCALE_ZH_HANS | typeof LOCALE_ZH_HANT | typeof LOCALE_EN | typeof LOCALE_FR | typeof LOCALE_ES;
 
-export declare type BuiltInLocale = 'zh-Hans' | 'zh-Hant' | 'en' | 'fr' | 'es';
+export declare function compileI18nJsonStr(jsonStr: string, { locale, locales, delimiters, }: {
+    locale: string;
+    locales: Record<string, Record<string, string>>;
+    delimiters: [string, string];
+}): string;
 
-export declare interface Formatter {
-    interpolate: (message: string, values?: Record<string, unknown> | Array<unknown>) => Array<unknown>;
+export declare class Formatter {
+    _caches: {
+        [key: string]: Array<Token>;
+    };
+    constructor();
+    interpolate(message: string, values?: Record<string, unknown> | Array<unknown>, delimiters?: [string, string]): Array<unknown>;
+}
+
+declare interface Formatter_2 {
+    interpolate: (message: string, values?: Record<string, unknown> | Array<unknown>, delimiters?: [string, string]) => Array<unknown>;
 }
 
+export declare function hasI18nJson(jsonObj: unknown, delimiters: [string, string]): boolean;
+
 export declare class I18n {
     private locale;
     private fallbackLocale;
@@ -14,36 +29,61 @@ export declare class I18n {
     private formater;
     constructor({ locale, fallbackLocale, messages, watcher, formater, }: I18nOptions);
     setLocale(locale: string): void;
-    getLocale(): BuiltInLocale;
+    getLocale(): string;
     watchLocale(fn: LocaleWatcher): () => void;
+    add(locale: BuiltInLocale, message: Record<string, string>, override?: boolean): void;
+    f(message: string, values?: Record<string, unknown> | Array<unknown>, delimiters?: [string, string]): string;
     t(key: string, values?: Record<string, unknown> | Array<unknown> | BuiltInLocale): string;
     t(key: string, locale?: BuiltInLocale, values?: Record<string, unknown> | Array<unknown>): string;
 }
 
 export declare interface I18nOptions {
-    locale: BuiltInLocale;
-    fallbackLocale?: BuiltInLocale;
-    messages: LocaleMessages;
-    formater?: Formatter;
+    locale: string;
+    fallbackLocale?: string;
+    messages?: LocaleMessages;
+    formater?: Formatter_2;
     watcher?: LocaleWatcher;
 }
 
-export declare function initVueI18n(messages: LocaleMessages, fallbackLocale?: BuiltInLocale, locale?: BuiltInLocale): {
+export declare function initVueI18n(locale?: string, messages?: LocaleMessages, fallbackLocale?: string, watcher?: (locale: string) => void): {
+    i18n: I18n;
+    f(message: string, values?: Record<string, unknown> | unknown[] | undefined, delimiters?: [string, string] | undefined): string;
     t(key: string, values?: Record<string, unknown> | unknown[] | undefined): string;
-    getLocale(): BuiltInLocale;
-    setLocale(newLocale: BuiltInLocale): void;
-    mixin: {
-        beforeCreate(): void;
-        methods: {
-            $$t(key: string, values?: any): string;
-        };
-    };
+    add(locale: BuiltInLocale, message: Record<string, string>, override?: boolean): void;
+    watch(fn: LocaleWatcher): () => void;
+    getLocale(): string;
+    setLocale(newLocale: string): void;
 };
 
-export declare type LocaleMessages = {
-    [name in BuiltInLocale]?: Record<string, string>;
-};
+export declare function isI18nStr(value: string, delimiters: [string, string]): boolean;
+
+export declare const isString: (val: unknown) => val is string;
+
+declare type Locale = string;
+
+export declare const LOCALE_EN = "en";
+
+export declare const LOCALE_ES = "es";
 
-export declare type LocaleWatcher = (newLocale: BuiltInLocale, oldLocale: BuiltInLocale) => void;
+export declare const LOCALE_FR = "fr";
+
+export declare const LOCALE_ZH_HANS = "zh-Hans";
+
+export declare const LOCALE_ZH_HANT = "zh-Hant";
+
+export declare type LocaleMessages = Record<string, Record<string, string>>;
+
+export declare type LocaleWatcher = (newLocale: string, oldLocale: string) => void;
+
+export declare function normalizeLocale(locale: string, messages?: LocaleMessages): BuiltInLocale | undefined;
+
+export declare function parseI18nJson(jsonObj: unknown, values: Record<string, string>, delimiters: [string, string]): unknown;
+
+export declare function resolveLocale(locales: Locale[]): (locale: Locale) => string | undefined;
+
+declare type Token = {
+    type: 'text' | 'named' | 'list' | 'unknown';
+    value: string;
+};
 
 export { }

package/dist/uni-i18n.es.js

@@ -0,0 +1,454 @@
+const isArray = Array.isArray;
+const isObject = (val) => val !== null && typeof val === 'object';
+const defaultDelimiters = ['{', '}'];
+class BaseFormatter {
+    constructor() {
+        this._caches = Object.create(null);
+    }
+    interpolate(message, values, delimiters = defaultDelimiters) {
+        if (!values) {
+            return [message];
+        }
+        let tokens = this._caches[message];
+        if (!tokens) {
+            tokens = parse(message, delimiters);
+            this._caches[message] = tokens;
+        }
+        return compile(tokens, values);
+    }
+}
+const RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
+const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
+function parse(format, [startDelimiter, endDelimiter]) {
+    const tokens = [];
+    let position = 0;
+    let text = '';
+    while (position < format.length) {
+        let char = format[position++];
+        if (char === startDelimiter) {
+            if (text) {
+                tokens.push({ type: 'text', value: text });
+            }
+            text = '';
+            let sub = '';
+            char = format[position++];
+            while (char !== undefined && char !== endDelimiter) {
+                sub += char;
+                char = format[position++];
+            }
+            const isClosed = char === endDelimiter;
+            const type = RE_TOKEN_LIST_VALUE.test(sub)
+                ? 'list'
+                : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
+                    ? 'named'
+                    : 'unknown';
+            tokens.push({ value: sub, type });
+        }
+        //  else if (char === '%') {
+        //   // when found rails i18n syntax, skip text capture
+        //   if (format[position] !== '{') {
+        //     text += char
+        //   }
+        // }
+        else {
+            text += char;
+        }
+    }
+    text && tokens.push({ type: 'text', value: text });
+    return tokens;
+}
+function compile(tokens, values) {
+    const compiled = [];
+    let index = 0;
+    const mode = isArray(values)
+        ? 'list'
+        : isObject(values)
+            ? 'named'
+            : 'unknown';
+    if (mode === 'unknown') {
+        return compiled;
+    }
+    while (index < tokens.length) {
+        const token = tokens[index];
+        switch (token.type) {
+            case 'text':
+                compiled.push(token.value);
+                break;
+            case 'list':
+                compiled.push(values[parseInt(token.value, 10)]);
+                break;
+            case 'named':
+                if (mode === 'named') {
+                    compiled.push(values[token.value]);
+                }
+                else {
+                    if (process.env.NODE_ENV !== 'production') {
+                        console.warn(`Type of token '${token.type}' and format of value '${mode}' don't match!`);
+                    }
+                }
+                break;
+            case 'unknown':
+                if (process.env.NODE_ENV !== 'production') {
+                    console.warn(`Detect 'unknown' type of token!`);
+                }
+                break;
+        }
+        index++;
+    }
+    return compiled;
+}
+
+const LOCALE_ZH_HANS = 'zh-Hans';
+const LOCALE_ZH_HANT = 'zh-Hant';
+const LOCALE_EN = 'en';
+const LOCALE_FR = 'fr';
+const LOCALE_ES = 'es';
+const hasOwnProperty = Object.prototype.hasOwnProperty;
+const hasOwn = (val, key) => hasOwnProperty.call(val, key);
+const defaultFormatter = new BaseFormatter();
+function include(str, parts) {
+    return !!parts.find((part) => str.indexOf(part) !== -1);
+}
+function startsWith(str, parts) {
+    return parts.find((part) => str.indexOf(part) === 0);
+}
+function normalizeLocale(locale, messages) {
+    if (!locale) {
+        return;
+    }
+    locale = locale.trim().replace(/_/g, '-');
+    if (messages && messages[locale]) {
+        return locale;
+    }
+    locale = locale.toLowerCase();
+    if (locale.indexOf('zh') === 0) {
+        if (locale.indexOf('-hans') > -1) {
+            return LOCALE_ZH_HANS;
+        }
+        if (locale.indexOf('-hant') > -1) {
+            return LOCALE_ZH_HANT;
+        }
+        if (include(locale, ['-tw', '-hk', '-mo', '-cht'])) {
+            return LOCALE_ZH_HANT;
+        }
+        return LOCALE_ZH_HANS;
+    }
+    const lang = startsWith(locale, [LOCALE_EN, LOCALE_FR, LOCALE_ES]);
+    if (lang) {
+        return lang;
+    }
+}
+class I18n {
+    constructor({ locale, fallbackLocale, messages, watcher, formater, }) {
+        this.locale = LOCALE_EN;
+        this.fallbackLocale = LOCALE_EN;
+        this.message = {};
+        this.messages = {};
+        this.watchers = [];
+        if (fallbackLocale) {
+            this.fallbackLocale = fallbackLocale;
+        }
+        this.formater = formater || defaultFormatter;
+        this.messages = messages || {};
+        this.setLocale(locale || LOCALE_EN);
+        if (watcher) {
+            this.watchLocale(watcher);
+        }
+    }
+    setLocale(locale) {
+        const oldLocale = this.locale;
+        this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
+        if (!this.messages[this.locale]) {
+            // 可能初始化时不存在
+            this.messages[this.locale] = {};
+        }
+        this.message = this.messages[this.locale];
+        // 仅发生变化时，通知
+        if (oldLocale !== this.locale) {
+            this.watchers.forEach((watcher) => {
+                watcher(this.locale, oldLocale);
+            });
+        }
+    }
+    getLocale() {
+        return this.locale;
+    }
+    watchLocale(fn) {
+        const index = this.watchers.push(fn) - 1;
+        return () => {
+            this.watchers.splice(index, 1);
+        };
+    }
+    add(locale, message, override = true) {
+        const curMessages = this.messages[locale];
+        if (curMessages) {
+            if (override) {
+                Object.assign(curMessages, message);
+            }
+            else {
+                Object.keys(message).forEach((key) => {
+                    if (!hasOwn(curMessages, key)) {
+                        curMessages[key] = message[key];
+                    }
+                });
+            }
+        }
+        else {
+            this.messages[locale] = message;
+        }
+    }
+    f(message, values, delimiters) {
+        return this.formater.interpolate(message, values, delimiters).join('');
+    }
+    t(key, locale, values) {
+        let message = this.message;
+        if (typeof locale === 'string') {
+            locale = normalizeLocale(locale, this.messages);
+            locale && (message = this.messages[locale]);
+        }
+        else {
+            values = locale;
+        }
+        if (!hasOwn(message, key)) {
+            console.warn(`Cannot translate the value of keypath ${key}. Use the value of keypath as default.`);
+            return key;
+        }
+        return this.formater.interpolate(message[key], values).join('');
+    }
+}
+
+function watchAppLocale(appVm, i18n) {
+    // 需要保证 watch 的触发在组件渲染之前
+    if (appVm.$watchLocale) {
+        // vue2
+        appVm.$watchLocale((newLocale) => {
+            i18n.setLocale(newLocale);
+        });
+    }
+    else {
+        appVm.$watch(() => appVm.$locale, (newLocale) => {
+            i18n.setLocale(newLocale);
+        });
+    }
+}
+function getDefaultLocale() {
+    if (typeof uni !== 'undefined' && uni.getLocale) {
+        return uni.getLocale();
+    }
+    // 小程序平台，uni 和 uni-i18n 互相引用，导致访问不到 uni，故在 global 上挂了 getLocale
+    if (typeof global !== 'undefined' && global.getLocale) {
+        return global.getLocale();
+    }
+    return LOCALE_EN;
+}
+function initVueI18n(locale, messages = {}, fallbackLocale, watcher) {
+    // 兼容旧版本入参
+    if (typeof locale !== 'string') {
+        [locale, messages] = [
+            messages,
+            locale,
+        ];
+    }
+    if (typeof locale !== 'string') {
+        // 因为小程序平台，uni-i18n 和 uni 互相引用，导致此时访问 uni 时，为 undefined
+        locale = getDefaultLocale();
+    }
+    if (typeof fallbackLocale !== 'string') {
+        fallbackLocale =
+            (typeof __uniConfig !== 'undefined' && __uniConfig.fallbackLocale) ||
+                LOCALE_EN;
+    }
+    const i18n = new I18n({
+        locale,
+        fallbackLocale,
+        messages,
+        watcher,
+    });
+    let t = (key, values) => {
+        if (typeof getApp !== 'function') {
+            // app view
+            /* eslint-disable no-func-assign */
+            t = function (key, values) {
+                return i18n.t(key, values);
+            };
+        }
+        else {
+            let isWatchedAppLocale = false;
+            t = function (key, values) {
+                const appVm = getApp().$vm;
+                // 可能$vm还不存在，比如在支付宝小程序中，组件定义较早，在props的default里使用了t()函数（如uni-goods-nav），此时app还未初始化
+                // options: {
+                // 	type: Array,
+                // 	default () {
+                // 		return [{
+                // 			icon: 'shop',
+                // 			text: t("uni-goods-nav.options.shop"),
+                // 		}, {
+                // 			icon: 'cart',
+                // 			text: t("uni-goods-nav.options.cart")
+                // 		}]
+                // 	}
+                // },
+                if (appVm) {
+                    // 触发响应式
+                    appVm.$locale;
+                    if (!isWatchedAppLocale) {
+                        isWatchedAppLocale = true;
+                        watchAppLocale(appVm, i18n);
+                    }
+                }
+                return i18n.t(key, values);
+            };
+        }
+        return t(key, values);
+    };
+    return {
+        i18n,
+        f(message, values, delimiters) {
+            return i18n.f(message, values, delimiters);
+        },
+        t(key, values) {
+            return t(key, values);
+        },
+        add(locale, message, override = true) {
+            return i18n.add(locale, message, override);
+        },
+        watch(fn) {
+            return i18n.watchLocale(fn);
+        },
+        getLocale() {
+            return i18n.getLocale();
+        },
+        setLocale(newLocale) {
+            return i18n.setLocale(newLocale);
+        },
+    };
+}
+
+const isString = (val) => typeof val === 'string';
+let formater;
+function hasI18nJson(jsonObj, delimiters) {
+    if (!formater) {
+        formater = new BaseFormatter();
+    }
+    return walkJsonObj(jsonObj, (jsonObj, key) => {
+        const value = jsonObj[key];
+        if (isString(value)) {
+            if (isI18nStr(value, delimiters)) {
+                return true;
+            }
+        }
+        else {
+            return hasI18nJson(value, delimiters);
+        }
+    });
+}
+function parseI18nJson(jsonObj, values, delimiters) {
+    if (!formater) {
+        formater = new BaseFormatter();
+    }
+    walkJsonObj(jsonObj, (jsonObj, key) => {
+        const value = jsonObj[key];
+        if (isString(value)) {
+            if (isI18nStr(value, delimiters)) {
+                jsonObj[key] = compileStr(value, values, delimiters);
+            }
+        }
+        else {
+            parseI18nJson(value, values, delimiters);
+        }
+    });
+    return jsonObj;
+}
+function compileI18nJsonStr(jsonStr, { locale, locales, delimiters, }) {
+    if (!isI18nStr(jsonStr, delimiters)) {
+        return jsonStr;
+    }
+    if (!formater) {
+        formater = new BaseFormatter();
+    }
+    const localeValues = [];
+    Object.keys(locales).forEach((name) => {
+        if (name !== locale) {
+            localeValues.push({
+                locale: name,
+                values: locales[name],
+            });
+        }
+    });
+    localeValues.unshift({ locale, values: locales[locale] });
+    try {
+        return JSON.stringify(compileJsonObj(JSON.parse(jsonStr), localeValues, delimiters), null, 2);
+    }
+    catch (e) { }
+    return jsonStr;
+}
+function isI18nStr(value, delimiters) {
+    return value.indexOf(delimiters[0]) > -1;
+}
+function compileStr(value, values, delimiters) {
+    return formater.interpolate(value, values, delimiters).join('');
+}
+function compileValue(jsonObj, key, localeValues, delimiters) {
+    const value = jsonObj[key];
+    if (isString(value)) {
+        // 存在国际化
+        if (isI18nStr(value, delimiters)) {
+            jsonObj[key] = compileStr(value, localeValues[0].values, delimiters);
+            if (localeValues.length > 1) {
+                // 格式化国际化语言
+                const valueLocales = (jsonObj[key + 'Locales'] = {});
+                localeValues.forEach((localValue) => {
+                    valueLocales[localValue.locale] = compileStr(value, localValue.values, delimiters);
+                });
+            }
+        }
+    }
+    else {
+        compileJsonObj(value, localeValues, delimiters);
+    }
+}
+function compileJsonObj(jsonObj, localeValues, delimiters) {
+    walkJsonObj(jsonObj, (jsonObj, key) => {
+        compileValue(jsonObj, key, localeValues, delimiters);
+    });
+    return jsonObj;
+}
+function walkJsonObj(jsonObj, walk) {
+    if (isArray(jsonObj)) {
+        for (let i = 0; i < jsonObj.length; i++) {
+            if (walk(jsonObj, i)) {
+                return true;
+            }
+        }
+    }
+    else if (isObject(jsonObj)) {
+        for (const key in jsonObj) {
+            if (walk(jsonObj, key)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+function resolveLocale(locales) {
+    return (locale) => {
+        if (!locale) {
+            return locale;
+        }
+        locale = normalizeLocale(locale) || locale;
+        return resolveLocaleChain(locale).find((locale) => locales.indexOf(locale) > -1);
+    };
+}
+function resolveLocaleChain(locale) {
+    const chain = [];
+    const tokens = locale.split('-');
+    while (tokens.length) {
+        chain.push(tokens.join('-'));
+        tokens.pop();
+    }
+    return chain;
+}
+
+export { BaseFormatter as Formatter, I18n, LOCALE_EN, LOCALE_ES, LOCALE_FR, LOCALE_ZH_HANS, LOCALE_ZH_HANT, compileI18nJsonStr, hasI18nJson, initVueI18n, isI18nStr, isString, normalizeLocale, parseI18nJson, resolveLocale };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dcloudio/uni-i18n",
-  "version": "2.0.0",
+  "version": "2.0.1-32920211122002",
   "description": "@dcloudio/uni-i18n",
-  "main": "dist/uni-i18n.cjs.js",
-  "module": "dist/uni-i18n.esm.js",
-  "types": "dist/uni-i18n.d.ts",
+  "main": "./dist/uni-i18n.cjs.js",
+  "module": "./dist/uni-i18n.es.js",
+  "types": "./dist/uni-i18n.d.ts",
   "files": [
     "dist"
   ],
@@ -18,5 +18,5 @@
   "bugs": {
     "url": "https://github.com/dcloudio/uni-app/issues"
   },
-  "gitHead": "b1bdfb4de3f518c1c0fbab242403ea05feced4e3"
+  "gitHead": "dc33ced4b2fff3063385d9eda8dd1f3539133a67"
 }

package/dist/uni-i18n.esm.js

@@ -1,274 +0,0 @@
-const isObject = (val) => val !== null && typeof val === 'object';
-class BaseFormatter {
-    constructor() {
-        this._caches = Object.create(null);
-    }
-    interpolate(message, values) {
-        if (!values) {
-            return [message];
-        }
-        let tokens = this._caches[message];
-        if (!tokens) {
-            tokens = parse(message);
-            this._caches[message] = tokens;
-        }
-        return compile(tokens, values);
-    }
-}
-const RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
-const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
-function parse(format) {
-    const tokens = [];
-    let position = 0;
-    let text = '';
-    while (position < format.length) {
-        let char = format[position++];
-        if (char === '{') {
-            if (text) {
-                tokens.push({ type: 'text', value: text });
-            }
-            text = '';
-            let sub = '';
-            char = format[position++];
-            while (char !== undefined && char !== '}') {
-                sub += char;
-                char = format[position++];
-            }
-            const isClosed = char === '}';
-            const type = RE_TOKEN_LIST_VALUE.test(sub)
-                ? 'list'
-                : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
-                    ? 'named'
-                    : 'unknown';
-            tokens.push({ value: sub, type });
-        }
-        else if (char === '%') {
-            // when found rails i18n syntax, skip text capture
-            if (format[position] !== '{') {
-                text += char;
-            }
-        }
-        else {
-            text += char;
-        }
-    }
-    text && tokens.push({ type: 'text', value: text });
-    return tokens;
-}
-function compile(tokens, values) {
-    const compiled = [];
-    let index = 0;
-    const mode = Array.isArray(values)
-        ? 'list'
-        : isObject(values)
-            ? 'named'
-            : 'unknown';
-    if (mode === 'unknown') {
-        return compiled;
-    }
-    while (index < tokens.length) {
-        const token = tokens[index];
-        switch (token.type) {
-            case 'text':
-                compiled.push(token.value);
-                break;
-            case 'list':
-                compiled.push(values[parseInt(token.value, 10)]);
-                break;
-            case 'named':
-                if (mode === 'named') {
-                    compiled.push(values[token.value]);
-                }
-                else {
-                    if (process.env.NODE_ENV !== 'production') {
-                        console.warn(`Type of token '${token.type}' and format of value '${mode}' don't match!`);
-                    }
-                }
-                break;
-            case 'unknown':
-                if (process.env.NODE_ENV !== 'production') {
-                    console.warn(`Detect 'unknown' type of token!`);
-                }
-                break;
-        }
-        index++;
-    }
-    return compiled;
-}
-
-const hasOwnProperty = Object.prototype.hasOwnProperty;
-const hasOwn = (val, key) => hasOwnProperty.call(val, key);
-const defaultFormatter = new BaseFormatter();
-function include(str, parts) {
-    return !!parts.find((part) => str.indexOf(part) !== -1);
-}
-function startsWith(str, parts) {
-    return parts.find((part) => str.indexOf(part) === 0);
-}
-function normalizeLocale(locale, messages) {
-    if (!locale) {
-        return;
-    }
-    locale = locale.trim().replace(/_/g, '-');
-    if (messages[locale]) {
-        return locale;
-    }
-    locale = locale.toLowerCase();
-    if (locale.indexOf('zh') === 0) {
-        if (locale.indexOf('-hans') !== -1) {
-            return 'zh-Hans';
-        }
-        if (locale.indexOf('-hant') !== -1) {
-            return 'zh-Hant';
-        }
-        if (include(locale, ['-tw', '-hk', '-mo', '-cht'])) {
-            return 'zh-Hant';
-        }
-        return 'zh-Hans';
-    }
-    const lang = startsWith(locale, ['en', 'fr', 'es']);
-    if (lang) {
-        return lang;
-    }
-}
-class I18n {
-    constructor({ locale, fallbackLocale, messages, watcher, formater, }) {
-        this.locale = 'en';
-        this.fallbackLocale = 'en';
-        this.message = {};
-        this.messages = {};
-        this.watchers = [];
-        if (fallbackLocale) {
-            this.fallbackLocale = fallbackLocale;
-        }
-        this.formater = formater || defaultFormatter;
-        this.messages = messages;
-        this.setLocale(locale);
-        if (watcher) {
-            this.watchLocale(watcher);
-        }
-    }
-    setLocale(locale) {
-        const oldLocale = this.locale;
-        this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
-        this.message = this.messages[this.locale];
-        this.watchers.forEach((watcher) => {
-            watcher(this.locale, oldLocale);
-        });
-    }
-    getLocale() {
-        return this.locale;
-    }
-    watchLocale(fn) {
-        const index = this.watchers.push(fn) - 1;
-        return () => {
-            this.watchers.splice(index, 1);
-        };
-    }
-    t(key, locale, values) {
-        let message = this.message;
-        if (typeof locale === 'string') {
-            locale = normalizeLocale(locale, this.messages);
-            locale && (message = this.messages[locale]);
-        }
-        else {
-            values = locale;
-        }
-        if (!hasOwn(message, key)) {
-            console.warn(`Cannot translate the value of keypath ${key}. Use the value of keypath as default.`);
-            return key;
-        }
-        return this.formater.interpolate(message[key], values).join('');
-    }
-}
-
-function initLocaleWatcher(appVm, i18n) {
-    appVm.$i18n &&
-        appVm.$i18n.vm.$watch('locale', (newLocale) => {
-            i18n.setLocale(newLocale);
-        }, {
-            immediate: true,
-        });
-}
-function getDefaultLocale() {
-    if (typeof navigator !== 'undefined') {
-        return navigator.userLanguage || navigator.language;
-    }
-    if (typeof plus !== 'undefined') {
-        // TODO 待调整为最新的获取语言代码
-        return plus.os.language;
-    }
-    return uni.getSystemInfoSync().language;
-}
-function initVueI18n(messages, fallbackLocale = 'en', locale) {
-    const i18n = new I18n({
-        locale: locale || fallbackLocale,
-        fallbackLocale,
-        messages,
-    });
-    let t = (key, values) => {
-        if (typeof getApp !== 'function') {
-            // app-plus view
-            /* eslint-disable no-func-assign */
-            t = function (key, values) {
-                return i18n.t(key, values);
-            };
-        }
-        else {
-            const appVm = getApp().$vm;
-            if (!appVm.$t || !appVm.$i18n) {
-                if (!locale) {
-                    i18n.setLocale(getDefaultLocale());
-                }
-                /* eslint-disable no-func-assign */
-                t = function (key, values) {
-                    return i18n.t(key, values);
-                };
-            }
-            else {
-                initLocaleWatcher(appVm, i18n);
-                /* eslint-disable no-func-assign */
-                t = function (key, values) {
-                    const $i18n = appVm.$i18n;
-                    const silentTranslationWarn = $i18n.silentTranslationWarn;
-                    $i18n.silentTranslationWarn = true;
-                    const msg = appVm.$t(key, values);
-                    $i18n.silentTranslationWarn = silentTranslationWarn;
-                    if (msg !== key) {
-                        return msg;
-                    }
-                    return i18n.t(key, $i18n.locale, values);
-                };
-            }
-        }
-        return t(key, values);
-    };
-    return {
-        t(key, values) {
-            return t(key, values);
-        },
-        getLocale() {
-            return i18n.getLocale();
-        },
-        setLocale(newLocale) {
-            return i18n.setLocale(newLocale);
-        },
-        mixin: {
-            beforeCreate() {
-                const unwatch = i18n.watchLocale(() => {
-                    this.$forceUpdate();
-                });
-                this.$once('hook:beforeDestroy', function () {
-                    unwatch();
-                });
-            },
-            methods: {
-                $$t(key, values) {
-                    return t(key, values);
-                },
-            },
-        },
-    };
-}
-
-export { I18n, initVueI18n };