@modern-js/plugin-i18n 1.1.2-beta.0 → 1.2.1-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @modern-js/plugin-i18n
 
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+## 1.1.2
+
+### Patch Changes
+
+- 5e3de7d8: fix: i18n get message error when system language not zh or en
+
 ## 1.1.1
 
 ### Patch Changes

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2-beta.0",
+  "version": "1.2.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,18 +35,30 @@
     "@types/lodash": "^4.14.126",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1"
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts",
+    "exports": {
+      ".": {
+        "node": {
+          "import": "./dist/js/modern/index.js",
+          "require": "./dist/js/node/index.js"
+        },
+        "default": "./dist/js/treeshaking/index.js"
+      }
+    }
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
-  }
+    "test": "jest --passWithNoTests"
+  },
+  "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/tests/index.test.ts

@@ -1,4 +1,4 @@
-import { I18n } from '@/index';
+import { I18n } from '../src';
 
 describe('i18n test', () => {
   test('Init Default language', () => {

package/tests/tsconfig.json

@@ -5,8 +5,6 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["../src/*"]
-    }
+    "paths": {}
   }
 }

package/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }

package/dist/js/modern/index.js

@@ -1,66 +0,0 @@
-import _get from "lodash/get";
-import { getObjKeyMap } from "./utils";
-
-class I18n {
-  constructor() {
-    this.language = 'en';
-    this.languageMap = {};
-  }
-
-  format(msg, vars) {
-    return msg.replace(/\{([^}]+)\}/gm, (_match, capture) => Object.prototype.hasOwnProperty.call(vars, capture) ? vars[capture] : capture);
-  }
-
-  getMessage(lang, key, vars, fallbackText) {
-    // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
-    const languages = Object.keys(this.languageMap);
-    const resultLang = languages.find(l => l === lang);
-
-    if (!resultLang && languages.length === 0) {
-      return fallbackText || key;
-    }
-
-    const model = this.languageMap[resultLang || 'en' || languages[0]];
-
-    if (!model) {
-      return fallbackText || key;
-    }
-
-    const message = _get(model, key);
-
-    const value = message || fallbackText || key;
-
-    if (typeof value === 'string') {
-      return this.format(value, vars || {});
-    }
-
-    throw new Error('key is not a string');
-  }
-
-  init(language, languageMap) {
-    this.language = language || 'en';
-
-    if (languageMap) {
-      this.languageMap = languageMap;
-    }
-
-    return getObjKeyMap(this.languageMap[this.language]);
-  }
-
-  changeLanguage(config) {
-    this.language = config.locale || 'en';
-  }
-
-  t(key, vars, fallbackText) {
-    return this.getMessage(this.language, key, vars, fallbackText);
-  }
-
-  lang(lang) {
-    return {
-      t: (key, vars, fallbackText) => this.getMessage(lang, key, vars, fallbackText)
-    };
-  }
-
-}
-
-export { I18n };

package/dist/js/modern/utils/index.js

@@ -1,13 +0,0 @@
-import _isString from "lodash/isString";
-import _isObject from "lodash/isObject";
-export function getObjKeyMap(obj, prefix = '') {
-  const result = {};
-  Object.keys(obj).forEach(key => {
-    if (_isString(obj[key])) {
-      result[key] = prefix ? `${prefix}.${key}` : key;
-    } else if (_isObject(obj[key])) {
-      result[key] = getObjKeyMap(obj[key], prefix ? `${prefix}.${key}` : key);
-    }
-  });
-  return result;
-}

package/dist/js/node/index.js

@@ -1,75 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.I18n = void 0;
-
-var _get2 = _interopRequireDefault(require("lodash/get"));
-
-var _utils = require("./utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class I18n {
-  constructor() {
-    this.language = 'en';
-    this.languageMap = {};
-  }
-
-  format(msg, vars) {
-    return msg.replace(/\{([^}]+)\}/gm, (_match, capture) => Object.prototype.hasOwnProperty.call(vars, capture) ? vars[capture] : capture);
-  }
-
-  getMessage(lang, key, vars, fallbackText) {
-    // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
-    const languages = Object.keys(this.languageMap);
-    const resultLang = languages.find(l => l === lang);
-
-    if (!resultLang && languages.length === 0) {
-      return fallbackText || key;
-    }
-
-    const model = this.languageMap[resultLang || 'en' || languages[0]];
-
-    if (!model) {
-      return fallbackText || key;
-    }
-
-    const message = (0, _get2.default)(model, key);
-    const value = message || fallbackText || key;
-
-    if (typeof value === 'string') {
-      return this.format(value, vars || {});
-    }
-
-    throw new Error('key is not a string');
-  }
-
-  init(language, languageMap) {
-    this.language = language || 'en';
-
-    if (languageMap) {
-      this.languageMap = languageMap;
-    }
-
-    return (0, _utils.getObjKeyMap)(this.languageMap[this.language]);
-  }
-
-  changeLanguage(config) {
-    this.language = config.locale || 'en';
-  }
-
-  t(key, vars, fallbackText) {
-    return this.getMessage(this.language, key, vars, fallbackText);
-  }
-
-  lang(lang) {
-    return {
-      t: (key, vars, fallbackText) => this.getMessage(lang, key, vars, fallbackText)
-    };
-  }
-
-}
-
-exports.I18n = I18n;

package/dist/js/node/utils/index.js

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getObjKeyMap = getObjKeyMap;
-
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function getObjKeyMap(obj, prefix = '') {
-  const result = {};
-  Object.keys(obj).forEach(key => {
-    if ((0, _isString2.default)(obj[key])) {
-      result[key] = prefix ? `${prefix}.${key}` : key;
-    } else if ((0, _isObject2.default)(obj[key])) {
-      result[key] = getObjKeyMap(obj[key], prefix ? `${prefix}.${key}` : key);
-    }
-  });
-  return result;
-}

package/dist/js/treeshaking/index.js

@@ -1,102 +0,0 @@
-import _get from "lodash/get";
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
-import { getObjKeyMap } from "./utils";
-
-var I18n = /*#__PURE__*/function () {
-  function I18n() {
-    _classCallCheck(this, I18n);
-
-    this.language = 'en';
-    this.languageMap = {};
-  }
-
-  _createClass(I18n, [{
-    key: "format",
-    value: function format(msg, vars) {
-      return msg.replace(/\{([^}]+)\}/gm, function (_match, capture) {
-        return Object.prototype.hasOwnProperty.call(vars, capture) ? vars[capture] : capture;
-      });
-    }
-  }, {
-    key: "getMessage",
-    value: function getMessage(lang, key, vars, fallbackText) {
-      // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
-      var languages = Object.keys(this.languageMap);
-      var resultLang = languages.find(function (l) {
-        return l === lang;
-      });
-
-      if (!resultLang && languages.length === 0) {
-        return fallbackText || key;
-      }
-
-      var model = this.languageMap[resultLang || 'en' || languages[0]];
-
-      if (!model) {
-        return fallbackText || key;
-      }
-
-      var message = _get(model, key);
-
-      var value = message || fallbackText || key;
-
-      if (typeof value === 'string') {
-        return this.format(value, vars || {});
-      }
-
-      throw new Error('key is not a string');
-    }
-  }, {
-    key: "init",
-    value: function init(language, languageMap) {
-      this.language = language || 'en';
-
-      if (languageMap) {
-        this.languageMap = languageMap;
-      }
-
-      return getObjKeyMap(this.languageMap[this.language]);
-    }
-  }, {
-    key: "changeLanguage",
-    value: function changeLanguage(config) {
-      this.language = config.locale || 'en';
-    }
-  }, {
-    key: "t",
-    value: function t(key, vars, fallbackText) {
-      return this.getMessage(this.language, key, vars, fallbackText);
-    }
-  }, {
-    key: "lang",
-    value: function (_lang) {
-      function lang(_x) {
-        return _lang.apply(this, arguments);
-      }
-
-      lang.toString = function () {
-        return _lang.toString();
-      };
-
-      return lang;
-    }(function (lang) {
-      var _this = this;
-
-      return {
-        t: function t(key, vars, fallbackText) {
-          return _this.getMessage(lang, key, vars, fallbackText);
-        }
-      };
-    })
-  }]);
-
-  return I18n;
-}();
-
-export { I18n };

package/dist/js/treeshaking/utils/index.js

@@ -1,14 +0,0 @@
-import _isString from "lodash/isString";
-import _isObject from "lodash/isObject";
-export function getObjKeyMap(obj) {
-  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  var result = {};
-  Object.keys(obj).forEach(function (key) {
-    if (_isString(obj[key])) {
-      result[key] = prefix ? "".concat(prefix, ".").concat(key) : key;
-    } else if (_isObject(obj[key])) {
-      result[key] = getObjKeyMap(obj[key], prefix ? "".concat(prefix, ".").concat(key) : key);
-    }
-  });
-  return result;
-}

package/dist/types/index.d.ts

@@ -1,36 +0,0 @@
-declare type Language = string;
-interface LanguageModel {
-  [Key: string]: string | LanguageModel;
-}
-declare type TFunc = (key: string, vars?: {
-  [key: string]: string;
-}, fallbackText?: string) => string;
-declare type TI18n = {
-  t: TFunc;
-  changeLanguage: (config: ChangeLanguageConfig) => void;
-  lang: (lang: Language) => {
-    t: TFunc;
-  };
-};
-export interface ChangeLanguageConfig {
-  locale?: Language;
-}
-
-declare class I18n implements TI18n {
-  private language;
-  private languageMap;
-  private format;
-  private getMessage;
-  init<T extends LanguageModel>(language?: Language, languageMap?: Record<Language, T>): T;
-  changeLanguage(config: ChangeLanguageConfig): void;
-  t(key: string, vars?: {
-    [key: string]: string;
-  }, fallbackText?: string): string;
-  lang(lang: string): {
-    t: (key: string, vars?: {
-      [key: string]: string;
-    } | undefined, fallbackText?: string | undefined) => string;
-  };
-}
-
-export { I18n };

package/dist/types/utils/index.d.ts

@@ -1,5 +0,0 @@
-interface ITem {
-  [key: string]: string | ITem;
-}
-export declare function getObjKeyMap(obj: ITem, prefix?: string): ITem;
-export {};

package/src/.eslintrc.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["@modern-js-app"]
-}

package/src/index.ts

@@ -1,99 +0,0 @@
-import { get } from 'lodash';
-import { getObjKeyMap } from './utils';
-
-type Language = string;
-
-interface LanguageModel {
-  [Key: string]: string | LanguageModel;
-}
-
-type LanguageModelMap = Record<Language, LanguageModel>;
-
-type TFunc = (
-  key: string,
-  vars?: { [key: string]: string },
-  fallbackText?: string,
-) => string;
-type TI18n = {
-  t: TFunc;
-  changeLanguage: (config: ChangeLanguageConfig) => void;
-  lang: (lang: Language) => { t: TFunc };
-};
-
-export interface ChangeLanguageConfig {
-  locale?: Language;
-}
-
-class I18n implements TI18n {
-  private language: Language = 'en';
-
-  private languageMap: LanguageModelMap = {};
-
-  private format(msg: string, vars: { [key: string]: string }) {
-    return msg.replace(/\{([^}]+)\}/gm, (_match, capture: string) =>
-      Object.prototype.hasOwnProperty.call(vars, capture)
-        ? vars[capture]
-        : capture,
-    );
-  }
-
-  private getMessage(
-    lang: string,
-    key: string,
-    vars?: { [key: string]: string },
-    fallbackText?: string,
-  ) {
-    // 判断语言当前语料库是否存在，不存在使用 en 作为默认语言
-    const languages = Object.keys(this.languageMap);
-    const resultLang = languages.find(l => l === lang);
-    if (!resultLang && languages.length === 0) {
-      return fallbackText || key;
-    }
-    const model: LanguageModel =
-      this.languageMap[resultLang || 'en' || languages[0]];
-    if (!model) {
-      return fallbackText || key;
-    }
-    const message = get(model, key);
-    const value = message || fallbackText || key;
-    if (typeof value === 'string') {
-      return this.format(value, vars || {});
-    }
-    throw new Error('key is not a string');
-  }
-
-  public init<T extends LanguageModel>(
-    language?: Language,
-    languageMap?: Record<Language, T>,
-  ) {
-    this.language = language || 'en';
-    if (languageMap) {
-      this.languageMap = languageMap;
-    }
-    return getObjKeyMap(this.languageMap[this.language]) as T;
-  }
-
-  public changeLanguage(config: ChangeLanguageConfig) {
-    this.language = config.locale || 'en';
-  }
-
-  public t(
-    key: string,
-    vars?: { [key: string]: string },
-    fallbackText?: string,
-  ) {
-    return this.getMessage(this.language, key, vars, fallbackText);
-  }
-
-  public lang(lang: string) {
-    return {
-      t: (
-        key: string,
-        vars?: { [key: string]: string },
-        fallbackText?: string,
-      ): string => this.getMessage(lang, key, vars, fallbackText),
-    };
-  }
-}
-
-export { I18n };

package/src/utils/index.ts

@@ -1,20 +0,0 @@
-import { isObject, isString } from 'lodash';
-
-interface ITem {
-  [key: string]: string | ITem;
-}
-
-export function getObjKeyMap(obj: ITem, prefix = '') {
-  const result: ITem = {};
-  Object.keys(obj).forEach(key => {
-    if (isString(obj[key])) {
-      result[key] = prefix ? `${prefix}.${key}` : key;
-    } else if (isObject(obj[key])) {
-      result[key] = getObjKeyMap(
-        obj[key] as ITem,
-        prefix ? `${prefix}.${key}` : key,
-      );
-    }
-  });
-  return result;
-}