typescript-merge 7.1.1 → 7.1.4

data/lib/typescript/merge/version.rb

@@ -5,7 +5,7 @@ module TypeScript
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.1'
+      VERSION = '7.1.4'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/typescript/merge.rb

@@ -13,6 +13,10 @@ module TypeScript
     DESTINATION_WINS_ARRAY_POLICY = { surface: 'array', name: 'destination_wins_array' }.freeze
     BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new)
 
+    autoload :NodeWrapper, 'typescript/merge/node_wrapper'
+    autoload :FileAnalysis, 'typescript/merge/file_analysis'
+    autoload :Provider, 'typescript/merge/provider'
+
     def register_backend!
       BACKEND_REGISTRY.mutex.synchronize do
         return if BACKEND_REGISTRY.registered
@@ -21,13 +25,23 @@ module TypeScript
 
         grammar_finder = TreeHaver::GrammarFinder.new(:typescript)
         grammar_finder.register! if grammar_finder.available?
+        TreeHaver.register_language(
+          :tsx,
+          backend_module: TreeHaver::Backends::Tslp,
+          backend_type: :tslp,
+          gem_name: 'tree_sitter_language_pack'
+        )
 
         BACKEND_REGISTRY.registered = true
       end
     end
 
     def type_script_feature_profile
-      { family: 'typescript', supported_dialects: ['typescript'], supported_policies: [DESTINATION_WINS_ARRAY_POLICY] }
+      {
+        family: 'typescript',
+        supported_dialects: %w[typescript tsx],
+        supported_policies: [DESTINATION_WINS_ARRAY_POLICY]
+      }
     end
 
     def available_type_script_backends
@@ -66,7 +80,7 @@ module TypeScript
         diagnostic_backend = TreeHaver.current_backend_id || 'tree-sitter'
         return unsupported_feature_result("Unsupported TypeScript backend #{diagnostic_backend}.")
       end
-      return analyze_type_script_module(source) if dialect == 'typescript'
+      return analyze_type_script_module(source, dialect: dialect) if %w[typescript tsx].include?(dialect)
 
       { ok: false,
         diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: "Unsupported TypeScript dialect #{dialect}." }], policies: [] }
@@ -97,6 +111,16 @@ module TypeScript
       Ast::Merge::OwnerSelection.match_by_path(template, destination)
     end
 
+    def merge_provider
+      @merge_provider ||= Provider.new
+    end
+
+    def register_provider!(replace: false)
+      return unless Ast::Merge.respond_to?(:register_provider)
+
+      Ast::Merge.register_provider(merge_provider, replace: replace)
+    end
+
     def merge_type_script(template_source, destination_source, dialect)
       template = parse_type_script(template_source, dialect)
       return { ok: false, diagnostics: template[:diagnostics], policies: [] } unless template[:ok]
@@ -125,33 +149,28 @@ module TypeScript
         policies: [DESTINATION_WINS_ARRAY_POLICY] }
     end
 
-    def analyze_type_script_module(source)
-      parser = TreeHaver.parser_for(:typescript, backend_type: :tree_sitter)
-      tree = parser.parse(source)
-      collect_parse_errors(tree.root_node)
+    def analyze_type_script_module(source, dialect: 'typescript')
+      analysis = FileAnalysis.new(source, dialect: dialect)
+      raise analysis.errors.first unless analysis.errors.empty?
 
       imports = []
       declarations = []
-      tree.root_node.children.each do |node|
-        case node.type
-        when 'import_statement'
-          import_source = line_anchored_slice(source, node)
+      analysis.declarations.each do |wrapper|
+        signature = wrapper.signature
+        if signature.first == :import
           imports << {
             path: "/imports/#{imports.length}",
             owner_kind: 'import',
-            match_key: normalize_type_script_import_path(import_source),
-            text: import_text(source, node)
+            match_key: legacy_import_key(signature),
+            text: "#{wrapper.source_text}\n"
           }
-        when 'export_statement', 'function_declaration', 'class_declaration', 'interface_declaration',
-             'lexical_declaration', 'variable_declaration'
-          name = first_named_descendant_text(source, node, %w[identifier type_identifier])
-          next unless name
-
+        else
+          name = legacy_declaration_key(signature)
           declarations << {
             path: "/declarations/#{name}",
             owner_kind: 'declaration',
             match_key: name,
-            text: declaration_text(source, node)
+            text: "#{wrapper.source_text}\n"
           }
         end
       end
@@ -161,7 +180,7 @@ module TypeScript
         diagnostics: [],
         analysis: {
           kind: 'typescript',
-          dialect: 'typescript',
+          dialect: dialect,
           imports: imports,
           declarations: declarations,
           owners: owner_views(imports + declarations)
@@ -173,14 +192,18 @@ module TypeScript
     end
     private_class_method :analyze_type_script_module
 
-    def collect_parse_errors(node)
-      raise TreeHaver::NotAvailable, 'TypeScript parse returned no root node' unless node
-      return unless node.respond_to?(:has_error?) && node.has_error?
+    def legacy_declaration_key(signature)
+      nested = signature.first == :export_declaration ? signature.fetch(1) : signature
+      value = nested.last
+      value.is_a?(Array) ? value.join(',') : value
+    end
+    private_class_method :legacy_declaration_key
 
-      raise TreeHaver::NotAvailable,
-            'TypeScript parse contains syntax errors'
+    def legacy_import_key(signature)
+      literal = signature.fetch(1)
+      literal.byteslice(1...-1).to_s
     end
-    private_class_method :collect_parse_errors
+    private_class_method :legacy_import_key
 
     def parse_failure_result(error)
       { ok: false,
@@ -189,23 +212,6 @@ module TypeScript
     end
     private_class_method :parse_failure_result
 
-    def normalize_type_script_import_path(import_source)
-      match = import_source.match(/from\s+['"]([^'"]+)['"]/) || import_source.match(/import\s+['"]([^'"]+)['"]/)
-      match ? match[1] : import_source.sub(/\Aimport\s+/, '').strip
-    end
-    private_class_method :normalize_type_script_import_path
-
-    def first_named_descendant_text(source, node, types)
-      return slice_span(source, node) if types.include?(node.type)
-
-      node.children.each do |child|
-        value = first_named_descendant_text(source, child, types)
-        return value if value && !value.empty?
-      end
-      nil
-    end
-    private_class_method :first_named_descendant_text
-
     def owner_view(item)
       item.slice(:path, :owner_kind, :match_key)
     end
@@ -217,28 +223,6 @@ module TypeScript
     end
     private_class_method :owner_views
 
-    def import_text(source, span)
-      "#{slice_span(source, span)}\n"
-    end
-    private_class_method :import_text
-
-    def declaration_text(source, span)
-      "#{line_anchored_slice(source, span)}\n"
-    end
-    private_class_method :declaration_text
-
-    def slice_span(source, span)
-      source[span.start_byte...span.end_byte].strip
-    end
-    private_class_method :slice_span
-
-    def line_anchored_slice(source, span)
-      line_start = source.rindex("\n", [span.start_byte - 1, 0].max)
-      line_start = line_start ? line_start + 1 : 0
-      source[line_start...span.end_byte].strip
-    end
-    private_class_method :line_anchored_slice
-
     def unsupported_feature_result(message)
       {
         ok: false,
@@ -251,3 +235,4 @@ module TypeScript
 end
 
 TypeScript::Merge.register_backend!
+TypeScript::Merge.register_provider!

data/sig/typescript/merge.rbs

@@ -1,5 +1,51 @@
 module TypeScript
   module Merge
+    class NodeWrapper
+      DECLARATION_TYPES: Array[String]
+      NAMED_DECLARATIONS: Hash[String, [Symbol, Array[String]]]
+
+      attr_reader node: untyped
+      attr_reader source: String
+      attr_reader leading_comments: Array[untyped]
+      attr_reader trailing_comments: Array[untyped]
+
+      def initialize: (untyped node, source: String, ?leading_comments: Array[untyped]) -> void
+      def signature: () -> Array[untyped]
+      def membership_signature: () -> Array[untyped]
+      def grouped?: () -> bool
+      def start_byte: () -> Integer
+      def end_byte: () -> Integer
+      def start_line: () -> Integer
+      def end_line: () -> Integer
+      def source_text: () -> String
+      def semantic_tree: () -> Array[untyped]
+      def attach_trailing_comment!: (untyped comment) -> untyped
+    end
+
+    class FileAnalysis
+      attr_reader source: String
+      attr_reader root_node: untyped
+      attr_reader declarations: Array[NodeWrapper]
+      attr_reader errors: Array[StandardError]
+      attr_reader backend: Symbol
+      attr_reader dialect: Symbol
+
+      def initialize: (String source, ?dialect: Symbol) -> void
+    end
+
+    class Provider
+      def provider_id: () -> String
+      def family: () -> String
+      def capabilities: () -> Hash[Symbol, untyped]
+      def analyze: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def diff2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge3: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+    end
+
+    def self.merge_provider: () -> Provider
+    def self.register_provider!: (?replace: bool) -> untyped
+
     module Version
       VERSION: String
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typescript-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "☯️ Portable TypeScript module owner analysis and merge behavior for
   Structured Merge."
 email:
@@ -299,6 +299,9 @@ files:
 - README.md
 - lib/typescript-merge.rb
 - lib/typescript/merge.rb
+- lib/typescript/merge/file_analysis.rb
+- lib/typescript/merge/node_wrapper.rb
+- lib/typescript/merge/provider.rb
 - lib/typescript/merge/version.rb
 - sig/typescript/merge.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
@@ -307,10 +310,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.1
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.4
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/typescript-merge/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/typescript-merge/7.1.4
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/typescript-merge