extract_i18n 0.6.2 → 0.7.1

data/lib/extract_i18n/adapters/adapter.rb

@@ -7,6 +7,7 @@ module ExtractI18n::Adapters
       when /\.rb$/ then RubyAdapter
       when /\.erb$/ then ErbAdapter
       when /\.slim$/ then SlimAdapter
+      when /\.ts$/, /\.js$/, /\.mjs/, /\.jsx$/ then JsAdapter
       when /\.vue$/
         if File.read(file_path)[/lang=.pug./]
           VuePugAdapter

data/lib/extract_i18n/adapters/js_adapter.rb

@@ -0,0 +1,79 @@
+require 'open3'
+require 'json'
+
+module ExtractI18n::Adapters
+  class JsAdapter < Adapter
+    IGNORE_AFTER = /(key: *|import .*|require\(.*)/
+
+    def run(original_context)
+      path = '../../../js/find_string_tokens.js'
+      abs_path = File.expand_path(path, __dir__)
+      stdout, stderr, status = Open3.capture3('node', abs_path, stdin_data: original_context)
+      unless status.success?
+        warn stderr
+        warn "Failed to run js/find_string_tokens.js: #{status}"
+        return original_context
+      end
+      @current_buffer = original_context.dup
+      @original_context = original_context.dup.freeze
+
+      @t_template = %[t('%s'%s)]
+      if vue2?(original_context)
+        @t_template = %[this.$t('%s'%s)]
+      end
+
+      @byte_offset = 0
+
+      results = ::JSON.parse(stdout, symbolize_names: true)
+      results.each do |item|
+        if item[:type] == 'literal'
+          replace_string(item)
+        else
+          warn "Template String literals not implemented yet: #{JSON.pretty_generate(item)}"
+        end
+      end
+      @current_buffer
+    end
+
+    def replace_string(item)
+      content = item[:value]
+      start = [item.dig(:loc, :start, :line) - 1, item.dig(:loc, :start, :column)]
+      finish = [item.dig(:loc, :end, :line) - 1, item.dig(:loc, :end, :column)]
+
+      source_line = @original_context.lines[start[0]]
+      change = ExtractI18n::SourceChange.new(
+        i18n_key: "#{@file_key}.#{ExtractI18n.key(content)}",
+        i18n_string: content,
+        source_line: source_line,
+        remove: item[:raw],
+        t_template: @t_template,
+        interpolation_type: :vue,
+        interpolate_arguments: {},
+      )
+
+      if ExtractI18n.ignore?(change.i18n_string)
+        return
+      end
+      token = Regexp.escape(item[:raw])
+      regexp = Regexp.new(IGNORE_AFTER.to_s + token)
+      return if source_line.match?(regexp)
+      return if change.i18n_string[file_key]
+
+      byte_from = @original_context.lines[0...start[0]].join.length + start[1]
+      byte_to = @original_context.lines[0...finish[0]].join.length + finish[1]
+
+      if @on_ask.call(change)
+        byte_from += @byte_offset
+        byte_to += @byte_offset
+
+        @current_buffer = @current_buffer[0...byte_from] + change.i18n_t + @current_buffer[byte_to..]
+
+        @byte_offset += change.i18n_t.length - item[:raw].length
+      end
+    end
+
+    def vue2?(content)
+      content['data()'] || content['computed:'] || content['this.$i18n'] || content['this.$t'] || content['this.$store']
+    end
+  end
+end

data/lib/extract_i18n/adapters/vue_adapter.rb

@@ -37,7 +37,9 @@ module ExtractI18n::Adapters
           all_match
         end
       end
-      out
+      @new_content = out.split("\n")
+      check_javascript_for_strings!
+      @new_content.join("\n")
     end
 
     # nokogir::html can parse @click.prevent stuff, but transforms all CamelCase Attributes to kebab-case by default
@@ -134,5 +136,20 @@ module ExtractI18n::Adapters
       end
       [args, translation]
     end
+
+    def check_javascript_for_strings!
+      lines = @new_content
+      # drop lines until <script
+      start = lines.find_index { |line| line[/^<script/] }
+      finish = lines.find_index { |line| line[/^<\/script/] }
+      return if start.nil? || finish.nil?
+
+      js_content = lines[(start + 1)...finish].join("\n")
+
+      js_adapter = ExtractI18n::Adapters::JsAdapter.new(file_key: @file_key, on_ask: @on_ask, options: @options)
+      js_replaced = js_adapter.run(js_content)
+
+      @new_content = lines[0..start] + js_replaced.split("\n") + lines[(finish)..-1]
+    end
   end
 end

data/lib/extract_i18n/adapters/vue_pug_adapter.rb

@@ -2,6 +2,27 @@
 
 module ExtractI18n::Adapters
   class VuePugAdapter < SlimAdapter
+    def run(original_content)
+      super
+      check_javascript_for_strings!
+      @new_content.join("\n")
+    end
+
+    def check_javascript_for_strings!
+      lines = @new_content
+      # drop lines until <script
+      start = lines.find_index { |line| line[/^<script/] }
+      finish = lines.find_index { |line| line[/^<\/script/] }
+      return if start.nil? || finish.nil?
+
+      js_content = lines[(start + 1)...finish].join("\n")
+
+      js_adapter = ExtractI18n::Adapters::JsAdapter.new(file_key: @file_key, on_ask: @on_ask, options: @options)
+      js_replaced = js_adapter.run(js_content)
+
+      @new_content = lines[0..start] + js_replaced.split("\n") + lines[(finish)..-1]
+    end
+
     def process_line(old_line)
       @mode ||= :template
       if old_line[/^<template/]
@@ -19,6 +40,9 @@ module ExtractI18n::Adapters
         if change.nil? # nothing to do
           return old_line
         end
+        if ExtractI18n.ignore?(change.i18n_string) || change.i18n_string.empty?
+          return old_line
+        end
 
         if @on_ask.call(change)
           change.i18n_t

data/lib/extract_i18n/version.rb

@@ -1,3 +1,3 @@
 module ExtractI18n
-  VERSION = "0.6.2"
+  VERSION = "0.7.1"
 end

data/lib/extract_i18n.rb

@@ -22,10 +22,19 @@ module ExtractI18n
   self.ignorelist = [
     '_',
     '::',
-    %r{^/}
+    'v-else',
+    'v-else-if',
+    ' ',
+    %r{^#[^ ]+$},
+    %r{^/},
+    %r{^(mdi|fa|fas|far|icon)-},
   ]
   self.html_fields_with_plaintext = %w[title placeholder alt label aria-label modal-title]
 
+  def self.ignore?(string)
+    ExtractI18n.ignorelist.any? { |item| string.to_s[item] }
+  end
+
   def self.key(string, length: 25)
     string.strip.
       unicode_normalize(:nfkd).gsub(/(\p{Letter})\p{Mark}+/, '\\1').
@@ -35,9 +44,10 @@ module ExtractI18n
 
   def self.file_key(path)
     path.gsub(strip_path, '').
-      gsub(%r{^/|/$}, '').
-      gsub(/\.(vue|rb|html\.slim|\.slim)$/, '').
-      gsub(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').
+      gsub(%r{^/|/$}, '').      # remove leading and trailing slashes
+      gsub(/\.[a-z\.]+$/, '').  # remove file extension
+      gsub(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'). # convert camelcase to underscore
+      gsub(/([a-z\d])([A-Z])/, '\1_\2').
       gsub('/_', '.').
       gsub('/', '.').
       tr("-", "_").downcase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extract_i18n
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Stefan Wienert
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -121,6 +121,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,9 +130,13 @@ files:
 - bin/setup
 - exe/extract-i18n
 - extract_i18n.gemspec
+- js/.gitignore
+- js/.tool-versions
+- js/find_string_tokens.js
 - lib/extract_i18n.rb
 - lib/extract_i18n/adapters/adapter.rb
 - lib/extract_i18n/adapters/erb_adapter.rb
+- lib/extract_i18n/adapters/js_adapter.rb
 - lib/extract_i18n/adapters/ruby_adapter.rb
 - lib/extract_i18n/adapters/slim_adapter.rb
 - lib/extract_i18n/adapters/slim_adapter_wip.rb
@@ -157,8 +162,9 @@ files:
 homepage: https://github.com/pludoni/extract_i18n
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -166,15 +172,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.5.11
+signing_key: 
 specification_version: 4
 summary: Extact i18n from Ruby files using Ruby parser and slim files using regex
 test_files: []