i18n-js 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5f60568907f90a59b7d19a6b2f61cf9a3fff95ea419b1b8b31deab16529dc6
-  data.tar.gz: ca65b2bf6717b93218092e8c994cdbac8af6bc69fddab421ebef976c87dc5503
+  metadata.gz: 60f1ad0e9477d8e6570573f64ac2a55136653da8e4791c6fc32e69c9547e197b
+  data.tar.gz: d46a3d8b8a25020635d9c108b2cb2caf3a256e419112a21a0d986f94e1e19c37
 SHA512:
-  metadata.gz: 3e33c8605b5197cbdc6a8f30ef1cb7e5f911f84dd177d488489fcfc82e5dd2b8fb3e387b0fe89683c3e71c6025ff7b47685163317540c4e2c5c756936660be55
-  data.tar.gz: b4367db58b89392c42c94121ccdde7179e1ea455de6c20685ded2c034304ce4c8c44cbfa1a4967610443e4f91116058ee86bc14d2e913a2c6006ee648c189dd9
+  metadata.gz: a1d63d094866a836a69a9b3fc8f2989608a1b794daf5d5c82062e17b3bcb07ab7fb0ec8f2c05aa27a2585236cff33d974c313ca81be96de129340ecce8f78490
+  data.tar.gz: 7ec126b41663f765a421950c1ddcb215d460681355088fc77731673c44f3baf590cc58c6e5841bc9dda6f58732249488cdad3b020287b57d7d1de70cf8e95716

data/.github/workflows/ruby-tests.yml

@@ -9,12 +9,15 @@ on:
 
 jobs:
   build:
-    name: Tests with Ruby ${{ matrix.ruby }} and ${{ matrix.gemfile }}
+    name:
+      Tests with Ruby ${{ matrix.ruby }}, Node ${{ matrix.node }} and ${{
+      matrix.gemfile }}
     runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
       matrix:
         ruby: ["2.7", "3.0", "3.1"]
+        node: ["16", "18"]
         gemfile:
           - Gemfile
     if: |
@@ -32,6 +35,23 @@ jobs:
             ${{ runner.os }}-${{ matrix.ruby }}-gems-${{
             hashFiles(matrix.gemfile) }}
 
+      - uses: actions/cache@v3
+        id: npm-cache
+        with:
+          path: vendor/bundle
+          key: >
+            ${{ runner.os }}-${{ matrix.node }}-npm-${{
+            hashFiles('package.json') }}
+
+      - name: Set up Node
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Install npm dependencies
+        run: |
+          yarn install
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -49,4 +69,5 @@ jobs:
         env:
           BUNDLE_GEMFILE: ${{ matrix.gemfile }}
         run: |
+          yarn compile
           bundle exec rake

data/.gitignore

@@ -9,3 +9,5 @@
 /vendor/
 *.log
 *.lock
+/lib/**/*.js
+/test/output

data/.rubocop.yml

@@ -14,3 +14,6 @@ Naming/FileName:
   Exclude:
     - lib/i18n-js.rb
     - lib/guard/i18n-js.rb
+
+Style/PerlBackrefs:
+  Enabled: false

data/CHANGELOG.md

@@ -11,13 +11,25 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
-## v4.0.1
+## v4.1.0 - Dec 09, 2022
+
+- [Added] Parse configuration files as erb.
+- [Changed] `I18n.listen(run_on_start:)` was added to control if files should be
+  exported during `I18n.listen`'s boot. The default value is `true`.
+- [Added] Now it's possible to transform translations before exporting them
+  using a stable plugin api.
+- [Deprecated] The `i18n check` has been deprecated. Use
+  `i18n lint:translations` instead.
+- [Added] Use `i18n lint:scripts` to lint JavaScript/TypeScript.
+- [Fixed] Expand paths passed to `I18nJS.listen(locales_dir:)`.
+
+## v4.0.1 - Aug 25, 2022
 
 - [Fixed] Shell out export to avoid handling I18n reloading heuristics.
 - [Changed] `I18nJS.listen` now accepts a directories list to watch.
 - [Changed] `I18nJS.listen` now accepts
   [listen](https://rubygems.org/gems/listen) options via `:options`.
 
-## Jul 29, 2022
+## v4.0.0 - Jul 29, 2022
 
 - Official release of i18n-js v4.0.0.

data/MIGRATING_FROM_V3_TO_V4.md

@@ -135,7 +135,7 @@ not even using it on my projects) or eRb files.
 
 ### Upgrading the configuration file
 
-The configuration file loaded from `config/i18nyml` has changed. Given the v3
+The configuration file loaded from `config/i18n.yml` has changed. Given the v3
 configuration below
 
 ```yaml

data/README.md

@@ -76,6 +76,22 @@ The output path can use the following placeholders:
 - `:locale`: the language that's being exported.
 - `:digest`: the MD5 hex digest of the exported file.
 
+The config file is processed as erb, so you can have dynamic content on it if
+you want. The following example shows how to use groups from a variable.
+
+```yml
+---
+<% group = "{en,pt}" %>
+
+translations:
+  - file: app/frontend/translations.json
+    patterns:
+      - "<%= group %>.*"
+      - "!<%= group %>.activerecord"
+      - "!<%= group %>.errors"
+      - "!<%= group %>.number.nth"
+```
+
 The Ruby API:
 
 ```ruby
@@ -96,7 +112,9 @@ Commands:
 - init: Initialize a project
 - export: Export translations as JSON files
 - version: Show package version
-- check: Check for missing translations
+- plugins: List plugins that will be activated
+- lint:translations: Check for missing translations
+- lint:scripts: Lint files using TypeScript
 
 Run `i18n COMMAND --help` for more information on specific commands.
 ```
@@ -105,14 +123,126 @@ By default, `i18n` will use `config/i18n.yml` and `config/environment.rb` as the
 configuration files. If you don't have these files, then you'll need to specify
 both `--config` and `--require`.
 
+### Plugins
+
+#### Built-in plugins:
+
+##### `embed_fallback_translations`:
+
+Embed fallback translations inferred from the default locale. This can be useful
+in cases where you have multiple large translation files and don't want to load
+the default locale together with the target locale.
+
+To use it, add the following to your configuration file:
+
+```yaml
+embed_fallback_translations:
+  enabled: true
+```
+
+#### Plugin API
+
+You can transform the exported translations by adding plugins. A plugin must
+inherit from `I18nJS::Plugin` and can have 3 class methods. The following
+example shows how the built-in `embed_fallback_translations` plugin is
+implemented.
+
+```ruby
+# frozen_string_literal: true
+
+module I18nJS
+  require "i18n-js/plugin"
+
+  class EmbedFallbackTranslationsPlugin < I18nJS::Plugin
+    CONFIG_KEY = :embed_fallback_translations
+
+    # This method must set up the basic plugin configuration, like adding the
+    # config's root key in case your plugin accepts configuration (defined via
+    # the config file).
+    #
+    # If you don't add this key, the linter will prevent non-default keys from
+    # being added to the configuration file.
+    def self.setup
+      I18nJS::Schema.root_keys << CONFIG_KEY
+    end
+
+    # In case your plugin accepts configuration, this is where you must validate
+    # the configuration, making sure only valid keys and type is provided.
+    # If the configuration contains invalid data, then you must raise an
+    # exception using something like
+    # `raise I18nJS::Schema::InvalidError, error_message`.
+    def self.validate_schema(config:)
+      return unless config.key?(CONFIG_KEY)
+
+      plugin_config = config[CONFIG_KEY]
+      valid_keys = %i[enabled]
+      schema = I18nJS::Schema.new(config)
+
+      schema.expect_required_keys(valid_keys, plugin_config)
+      schema.reject_extraneous_keys(valid_keys, plugin_config)
+      schema.expect_enabled_config(CONFIG_KEY, plugin_config[:enabled])
+    end
+
+    # This method is responsible for transforming the translations. The
+    # translations you'll receive may be already be filtered by other plugins
+    # and by the default filtering itself. If you need to access the original
+    # translations, use `I18nJS.translations`.
+    #
+    # Make sure you always check whether your plugin is active before
+    # transforming translations; otherwise, opting out transformation won't be
+    # possible.
+    def self.transform(translations:, config:)
+      return translations unless config.dig(CONFIG_KEY, :enabled)
+
+      translations_glob = Glob.new(translations)
+      translations_glob << "*"
+
+      mapping = translations.keys.each_with_object({}) do |locale, buffer|
+        buffer[locale] = Glob.new(translations[locale]).tap do |glob|
+          glob << "*"
+        end
+      end
+
+      default_locale = I18n.default_locale
+      default_locale_glob = mapping.delete(default_locale)
+      default_locale_paths = default_locale_glob.paths
+
+      mapping.each do |locale, glob|
+        missing_keys = default_locale_paths - glob.paths
+
+        missing_keys.each do |key|
+          components = key.split(".").map(&:to_sym)
+          fallback_translation = translations.dig(default_locale, *components)
+
+          next unless fallback_translation
+
+          translations_glob.set([locale, key].join("."), fallback_translation)
+        end
+      end
+
+      translations_glob.to_h
+    end
+  end
+
+  I18nJS.register_plugin(EmbedFallbackTranslationsPlugin)
+end
+```
+
+To distribute this plugin, you need to create a gem package that matches the
+pattern `i18n-js/*_plugin.rb`. You can test whether your plugin will be found by
+installing your gem, opening a iRB session and running
+`Gem.find_files("i18n-js/*_plugin.rb")`. If your plugin is not listed, then you
+need to double check your gem load path and see why the file is not being
+loaded.
+
 ### Listing missing translations
 
-To list missing and extraneous translations, you can use `i18n check`. This
-command will load your translations similarly to how `i18n export` does, but
-will output the list of keys that don't have a matching translation against the
-default locale. Here's an example:
+To list missing and extraneous translations, you can use
+`i18n lint:translations`. This command will load your translations similarly to
+how `i18n export` does, but will output the list of keys that don't have a
+matching translation against the default locale. Here's an example:
 
-![`i18n check` command in action](https://github.com/fnando/i18n-js/raw/main/images/i18njs-check.gif)
+![`i18n lint:translations` command in action](https://github.com/fnando/i18n-js/raw/main/images/i18njs-check.gif)
 
 This command will exist with status 1 whenever there are missing translations.
 This way you can use it as a CI linting.
@@ -133,7 +263,7 @@ translations:
     patterns:
       - "*"
 
-check:
+lint_translations:
   ignore:
     - en.mailer.login.subject
     - en.mailer.login.body
@@ -145,6 +275,82 @@ check:
 > accepts the full translation scope, rather than accepting a pattern like
 > `pt.ignored.scope.*`.
 
+### Linting your JavaScript/TypeScript files
+
+To lint your script files and check for missing translations (which can signal
+that you're either using wrong scopes or forgot to add the translation), use
+`i18n lint:scripts`. This command will parse your JavaScript/TypeScript files
+and extract all scopes being used. This command requires a Node.js runtime. You
+can either specify one via `--node-path`, or let the plugin infer a binary from
+your `$PATH`.
+
+The comparison will be made against the export JSON files, which means it'll
+consider transformations performed by plugins (e.g. the output files may be
+affected by `embed_fallback_translations` plugin).
+
+The translations that will be extract must be called as one of the following
+ways:
+
+- `i18n.t(scope, options)`
+- `i18n.translate(scope, options)`
+- `t(scope, options)`
+
+Notice that only literal strings can be used, as in `i18n.t("message")`. If
+you're using dynamic scoping through variables (e.g.
+`const scope = "message"; i18n.t(scope)`), they will be skipped.
+
+```console
+$ i18n lint:scripts --config test/config/lint.yml --require test/config/require.rb
+=> Config file: "test/config/lint.yml"
+=> Require file: "test/config/require.rb"
+=> Node: "/Users/fnando/.asdf/shims/node"
+=> Available locales: [:en, :es, :pt]
+=> Patterns: ["!(node_modules)/**/*.js", "!(node_modules)/**/*.ts", "!(node_modules)/**/*.jsx", "!(node_modules)/**/*.tsx"]
+=> 9 translations, 11 missing, 4 ignored
+   - test/scripts/lint/file.js:1:1: en.js.missing
+   - test/scripts/lint/file.js:1:1: es.js.missing
+   - test/scripts/lint/file.js:1:1: pt.js.missing
+   - test/scripts/lint/file.js:2:8: en.base.js.missing
+   - test/scripts/lint/file.js:2:8: es.base.js.missing
+   - test/scripts/lint/file.js:2:8: pt.base.js.missing
+   - test/scripts/lint/file.js:4:8: en.js.missing
+   - test/scripts/lint/file.js:4:8: es.js.missing
+   - test/scripts/lint/file.js:4:8: pt.js.missing
+   - test/scripts/lint/file.js:6:1: en.another_ignore_scope
+   - test/scripts/lint/file.js:6:1: es.another_ignore_scope
+```
+
+This command will list all locales and their missing translations. Avoid listing
+a particular translation, you can set `lint.ignore` on your config file.
+
+```yaml
+---
+translations:
+  - file: app/frontend/translations.json
+    patterns:
+      - "*"
+
+lint_scripts:
+  ignore:
+    - ignore_scope # will ignore this scope on all languages
+    - pt.another_ignore_scope # will ignore this scope only on `pt`
+```
+
+You can also set the patterns that will be looked up. By default, it scans all
+JavaScript and TypeScript files that don't live on `node_modules`.
+
+```yaml
+---
+translations:
+  - file: app/frontend/translations.json
+    patterns:
+      - "*"
+
+lint:
+  patterns:
+    - "app/assets/**/*.ts"
+```
+
 ## Automatically export translations
 
 ### Using [watchman](https://facebook.github.io/watchman/)
@@ -230,7 +436,10 @@ The code above will watch for changes based on `config/i18n.yml` and
 
 - `config_file` - i18n-js configuration file
 - `locales_dir` - one or multiple directories to watch for locales changes
-- `options` - passed directly to [listen](https://github.com/guard/listen/#options)
+- `options` - passed directly to
+  [listen](https://github.com/guard/listen/#options)
+- `run_on_start` - export files on start. Defaults to `true`. When disabled,
+  files will be exported only when there are file changes.
 
 Example:
 
@@ -238,7 +447,8 @@ Example:
 I18nJS.listen(
   config_file: "config/i18n.yml",
   locales_dir: ["config/locales", "app/views"],
-  options: {only: %r{.yml$}
+  options: {only: %r{.yml$}},
+  run_on_start: false
 )
 ```
 

data/bin/pack

@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "optparse"
+require_relative "../lib/i18n-js/version"
+
+def write_file(path, contents)
+  File.open(File.expand_path(path), "w") do |io|
+    io << contents
+  end
+end
+
+changelog_path = "./CHANGELOG.md"
+version_path = "./lib/i18n-js/version.rb"
+
+version = nil
+segments = I18nJS::VERSION.split(".")
+major, minor, patch = *segments.take(3).map(&:to_i)
+pre = segments[4].to_s
+pre_version = pre.gsub(/[^\d]/m, "").to_i
+date = Time.now.strftime("%b %d, %Y")
+release = false
+alpha = false
+
+OptionParser.new do |opts|
+  opts.on("--major") do
+    version = "#{major + 1}.0.0"
+  end
+
+  opts.on("--minor") do
+    version = "#{major}.#{minor + 1}.0"
+  end
+
+  opts.on("--patch") do
+    version = "#{major}.#{minor}.#{patch + 1}"
+  end
+
+  opts.on("--alpha") do
+    alpha = true
+  end
+
+  opts.on("--release") do
+    release = true
+  end
+end.parse!
+
+version = "#{version}.alpha#{pre_version + 1}" if alpha
+
+unless version
+  puts "ERROR: You need to use either one of: --major, --minor, --patch"
+  exit 1
+end
+
+puts "=> Current version: #{I18nJS::VERSION}"
+puts "=> Next version: #{version}"
+
+system "yarn", "install"
+system "yarn", "compile"
+
+write_file changelog_path,
+           File.read(changelog_path)
+               .gsub("Unreleased", "v#{version} - #{date}")
+
+puts "=> Updated #{changelog_path}"
+
+write_file version_path,
+           File.read(version_path)
+               .gsub(/VERSION = ".*?"/, %[VERSION = "#{version}"])
+
+puts "=> Updated #{version_path}"
+
+if release
+  system "git", "add", changelog_path, version_path
+  system "git", "commit", "-m", "Bump up version (v#{version})"
+  system "git", "tag", "v#{version}"
+end
+
+system "rake", "build"
+system "git", "checkout", changelog_path, version_path unless release

data/i18n-js.gemspec

@@ -31,16 +31,19 @@ Gem::Specification.new do |spec|
       .reject {|f| f.match(%r{^(test|spec|features|images)/}) }
   end
 
+  spec.files << "lib/i18n-js/lint.js"
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "glob"
+  spec.add_dependency "glob", ">= 0.4.0"
   spec.add_dependency "i18n"
 
   spec.add_development_dependency "activesupport"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-utils"
+  spec.add_development_dependency "mocha"
   spec.add_development_dependency "pry-meta"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"

data/lib/i18n-js/cli/check_command.rb

@@ -1,156 +1,16 @@
 # frozen_string_literal: true
 
-require "benchmark"
-
 module I18nJS
   class CLI
-    class CheckCommand < Command
+    class CheckCommand < LintTranslationsCommand
       command_name "check"
-      description "Check for missing translations"
-
-      parse do |opts|
-        opts.banner = "Usage: i18n #{name} [options]"
-
-        opts.on(
-          "-cCONFIG_FILE",
-          "--config=CONFIG_FILE",
-          "The configuration file that will be used"
-        ) do |config_file|
-          options[:config_file] = config_file
-        end
-
-        opts.on(
-          "-rREQUIRE_FILE",
-          "--require=REQUIRE_FILE",
-          "A Ruby file that must be loaded"
-        ) do |require_file|
-          options[:require_file] = require_file
-        end
-
-        opts.on(
-          "--[no-]color",
-          "Force colored output"
-        ) do |colored|
-          options[:colored] = colored
-        end
-
-        opts.on("-h", "--help", "Prints this help") do
-          ui.exit_with opts.to_s
-        end
-      end
-
-      command do
-        set_defaults!
-        ui.colored = options[:colored]
-
-        unless options[:config_file]
-          ui.fail_with("=> ERROR: you need to specify the config file")
-        end
-
-        ui.stdout_print("=> Config file:", options[:config_file].inspect)
-        config_file = File.expand_path(options[:config_file])
-
-        if options[:require_file]
-          ui.stdout_print("=> Require file:", options[:require_file].inspect)
-          require_file = File.expand_path(options[:require_file])
-        end
-
-        unless File.file?(config_file)
-          ui.fail_with(
-            "=> ERROR: config file doesn't exist at",
-            config_file.inspect
-          )
-        end
-
-        if require_file && !File.file?(require_file)
-          ui.fail_with(
-            "=> ERROR: require file doesn't exist at",
-            require_file.inspect
-          )
-        end
-
-        config = Glob::SymbolizeKeys.call(YAML.load_file(config_file))
-        Schema.validate!(config)
-
-        load_require_file!(require_file) if require_file
-
-        default_locale = I18n.default_locale
-        available_locales = I18n.available_locales
-        ignored_keys = config.dig(:check, :ignore) || []
-
-        mapping = available_locales.each_with_object({}) do |locale, buffer|
-          buffer[locale] =
-            Glob::Map.call(Glob.filter(I18nJS.translations, ["#{locale}.*"]))
-                     .map {|key| key.gsub(/^.*?\./, "") }
-        end
-
-        default_locale_keys = mapping.delete(default_locale)
-
-        if ignored_keys.any?
-          ui.stdout_print "=> Check #{options[:config_file].inspect} for " \
-                          "ignored keys."
-        end
-
-        ui.stdout_print "=> #{default_locale}: #{default_locale_keys.size} " \
-                        "translations"
-
-        total_missing_count = 0
-
-        mapping.each do |locale, partial_keys|
-          ignored_count = 0
-
-          # Compute list of filtered keys (i.e. keys not ignored)
-          filtered_keys = partial_keys.reject do |key|
-            key = "#{locale}.#{key}"
-
-            ignored = ignored_keys.include?(key)
-            ignored_count += 1 if ignored
-            ignored
-          end
-
-          extraneous = (partial_keys - default_locale_keys).reject do |key|
-            key = "#{locale}.#{key}"
-            ignored = ignored_keys.include?(key)
-            ignored_count += 1 if ignored
-            ignored
-          end
-
-          missing = (default_locale_keys - (filtered_keys - extraneous))
-                    .reject {|key| ignored_keys.include?("#{locale}.#{key}") }
-
-          ignored_count += extraneous.size
-          total_missing_count += missing.size
-
-          ui.stdout_print "=> #{locale}: #{missing.size} missing, " \
-                          "#{extraneous.size} extraneous, " \
-                          "#{ignored_count} ignored"
-
-          all_keys = (default_locale_keys + extraneous + missing).uniq.sort
-
-          all_keys.each do |key|
-            next if ignored_keys.include?("#{locale}.#{key}")
-
-            label = if extraneous.include?(key)
-                      ui.yellow("extraneous")
-                    elsif missing.include?(key)
-                      ui.red("missing")
-                    else
-                      next
-                    end
-
-            ui.stdout_print("   - #{locale}.#{key} (#{label})")
-          end
-        end
-
-        exit(1) if total_missing_count.nonzero?
-      end
-
-      private def set_defaults!
-        config_file = "./config/i18n.yml"
-        require_file = "./config/environment.rb"
+      description "Check for missing translations based on the default " \
+                  "locale (DEPRECATED: Use `i18n lint:translations` instead)"
 
-        options[:config_file] ||= config_file if File.file?(config_file)
-        options[:require_file] ||= require_file if File.file?(require_file)
+      def command
+        ui.stderr_print "=> WARNING: `i18n check` has been deprecated in " \
+                        "favor of `i18n lint:translations`"
+        super
       end
     end
   end

data/lib/i18n-js/cli/command.rb

@@ -39,6 +39,16 @@ module I18nJS
         @options ||= {}
       end
 
+      private def load_config_file(config_file)
+        config = Glob::SymbolizeKeys.call(YAML.load_file(config_file))
+
+        if config.key?(:check)
+          config[:lint_translations] ||= config.delete(:check)
+        end
+
+        config
+      end
+
       private def load_require_file!(require_file)
         require_without_warnings(require_file)
       rescue Exception => error # rubocop:disable Lint/RescueException