typelizer 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a6cb6187a0670a589346d969c61a17ae0b9fd60a4e6926c74c2e72c9594130
-  data.tar.gz: 4ef1a1e6e728df5ab1d5198a0254cfa68e5e477da57fb9c3c6b7ae2f7efa945d
+  metadata.gz: 505210c62639d70e95336cfb02bb0ab952089ac8433d5816774977853af264a1
+  data.tar.gz: 2878868d86acf4da05caaf5e139e3ccacf58025b8bf5fc2bc56c04b0a91049b4
 SHA512:
-  metadata.gz: 56296749f1d5478e98457afac0d2e8599e360d5b7864d596772c825e9970471de8b1d0103ada0120b9adeddab2805e65976c496ce0963785dfd39ddc3dffae91
-  data.tar.gz: 25f8667ef0f54560e1c84e8d906b50abc55e01ea761dacff012657bc7d94f7127263166b81c4e317350ee89219f92a070aa042004f42cfad3a6482fe31a0c86f
+  metadata.gz: b1522f196e8372d77e253bba7f9515043f925aa0f4d8ac6c3b1a11b837424743bba3225774b9dbd65232e46befdabbcb440ef6cf3370edc61e9dece9bf204e2e
+  data.tar.gz: 6e8acdb494ec3f5167bbfe9f53422ebd26d4e9d8dab89ec832518b1acda47aae821a002dd954daa7605f273f323092e3622699dffad88805120dbf3d3ad2fa4e

data/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.9.2] - 2026-02-26
+
+### Fixed
+
+- Fix string literal unions in OpenAPI and bracket-aware union type splitting. ([@skryukov])
+
+## [0.9.1] - 2026-02-26
+
+### Fixed
+
+- Fix crash when using tuple types in serializers. ([@skryukov])
+- Handle abstract ActiveRecord classes gracefully during type inference. ([@skryukov])
+
 ## [0.9.0] - 2026-02-26
 
 ### Added
@@ -413,7 +426,9 @@ and this project adheres to [Semantic Versioning].
 [@skryukov]: https://github.com/skryukov
 [@ventsislaf]: https://github.com/ventsislaf
 
-[Unreleased]: https://github.com/skryukov/typelizer/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/skryukov/typelizer/compare/v0.9.2...HEAD
+[0.9.2]: https://github.com/skryukov/typelizer/compare/v0.9.1...v0.9.2
+[0.9.1]: https://github.com/skryukov/typelizer/compare/v0.9.0...v0.9.1
 [0.9.0]: https://github.com/skryukov/typelizer/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/skryukov/typelizer/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/skryukov/typelizer/compare/v0.6.0...v0.7.0

data/lib/typelizer/interface.rb

@@ -177,7 +177,7 @@ module Typelizer
     end
 
     def extract_typescript_types(type)
-      type.split(/[<>\[\],\s|]+/)
+      type.split(/[<>\[\],\s|]+/).reject(&:empty?)
     end
 
     def global_type?(type)

data/lib/typelizer/model_plugins/active_record.rb

@@ -19,7 +19,7 @@ module Typelizer
       end
 
       def comment_for(prop)
-        column = model_class&.columns_hash&.dig(prop.column_name.to_s)
+        column = columns_hash&.dig(prop.column_name.to_s)
         return nil unless column
 
         prop.comment = column.comment
@@ -35,6 +35,20 @@ module Typelizer
 
       private
 
+      def columns_hash
+        return nil unless model_class
+        return nil if model_class.abstract_class?
+
+        model_class.columns_hash
+      end
+
+      def attribute_types
+        return nil unless model_class&.respond_to?(:attribute_types)
+        return nil if model_class.abstract_class?
+
+        model_class.attribute_types
+      end
+
       def infer_types_for_association(prop)
         association = model_class&.reflect_on_association(prop.column_name.to_sym)
         return nil unless association
@@ -42,7 +56,7 @@ module Typelizer
         case association.macro
         when :belongs_to
           foreign_key = association.foreign_key
-          column = model_class&.columns_hash&.dig(foreign_key.to_s)
+          column = columns_hash&.dig(foreign_key.to_s)
           if config.associations_strategy == :database
             prop.nullable = column.null if column
           elsif config.associations_strategy == :active_record
@@ -64,7 +78,7 @@ module Typelizer
       end
 
       def infer_types_for_column(prop)
-        column = model_class&.columns_hash&.dig(prop.column_name.to_s)
+        column = columns_hash&.dig(prop.column_name.to_s)
         return nil unless column
 
         prop.column_type = column.type
@@ -122,9 +136,7 @@ module Typelizer
       end
 
       def infer_types_for_attribute(prop)
-        return nil unless model_class.respond_to?(:attribute_types)
-
-        attribute_type_obj = model_class.attribute_types.fetch(prop.column_name.to_s, nil)
+        attribute_type_obj = attribute_types&.fetch(prop.column_name.to_s, nil)
         return nil unless attribute_type_obj
 
         if attribute_type_obj.instance_of?(::ActiveRecord::Type::Serialized)

data/lib/typelizer/openapi.rb

@@ -89,9 +89,11 @@ module Typelizer
       end
 
       def union_schema(property, openapi_version:)
-        schemas = property.type.map { |part| union_member_schema(part) }
-
-        definition = {anyOf: schemas}
+        definition = if property.type.all? { |part| string_literal?(part) }
+          {type: :string, enum: property.type.map { |part| unquote_string_literal(part) }}
+        else
+          {anyOf: property.type.map { |part| union_member_schema(part) }}
+        end
 
         unless property.multi
           apply_nullable(definition, property, openapi_version: openapi_version)
@@ -154,6 +156,8 @@ module Typelizer
         elsif definition[:type]
           v31?(openapi_version) ? definition[:type] = [definition[:type], :null] : definition[:nullable] = true
         end
+
+        definition[:enum] << nil if definition[:enum].is_a?(Array) && !definition[:enum].include?(nil)
       end
 
       def wrap_multi(definition, property, openapi_version:)
@@ -180,6 +184,8 @@ module Typelizer
           result = COLUMN_TYPE_MAP[property.column_type].dup
           result[:type] = :string if property.enum
           result
+        elsif string_literal?(property.type)
+          {type: :string, enum: [unquote_string_literal(property.type)]}
         elsif (property.type.is_a?(String) || property.type.is_a?(Symbol)) && !OPENAPI_TYPES.include?(property.type.to_sym) && !ts_only_type?(property.type.to_s)
           {"$ref" => "#/components/schemas/#{property.type}"}
         else
@@ -203,7 +209,17 @@ module Typelizer
       end
 
       def ts_only_type?(type_str)
-        type_str.start_with?("{") || type_str.include?("<") || TS_OBJECT_TYPES.include?(type_str)
+        type_str.start_with?("{", "[") || type_str.include?("<") || TS_OBJECT_TYPES.include?(type_str)
+      end
+
+      def string_literal?(type)
+        str = type.to_s
+        str.length > 2 &&
+          ((str.start_with?("'") && str.end_with?("'")) || (str.start_with?('"') && str.end_with?('"')))
+      end
+
+      def unquote_string_literal(type)
+        type.to_s[1..-2]
       end
 
       def validate_version!(openapi_version)

data/lib/typelizer/type_parser.rb

@@ -40,7 +40,11 @@ module Typelizer
       private
 
       def parse_union(type_str, **options)
-        parts = type_str.split(/\s*\|\s*/)
+        parts = UnionTypeSorter.split_union_members(type_str)
+
+        # No top-level | found — the | is nested inside brackets
+        return {type: type_str.to_sym}.merge(options) if parts.size <= 1
+
         options[:nullable] = true if parts.delete("null")
         if parts.size == 1
           parse(parts.first, **options)

data/lib/typelizer/union_type_sorter.rb

@@ -98,10 +98,10 @@ module Typelizer
 
       str.each_char do |char|
         case char
-        when "<", "("
+        when "<", "(", "{", "["
           depth += 1
           current << char
-        when ">", ")"
+        when ">", ")", "}", "]"
           depth -= 1
           current << char
         when "|"
@@ -126,6 +126,8 @@ module Typelizer
     def self.balanced_brackets?(str)
       angle_depth = 0
       paren_depth = 0
+      brace_depth = 0
+      bracket_depth = 0
 
       str.each_char do |char|
         case char
@@ -139,10 +141,20 @@ module Typelizer
         when ")"
           paren_depth -= 1
           return false if paren_depth < 0
+        when "{"
+          brace_depth += 1
+        when "}"
+          brace_depth -= 1
+          return false if brace_depth < 0
+        when "["
+          bracket_depth += 1
+        when "]"
+          bracket_depth -= 1
+          return false if bracket_depth < 0
         end
       end
 
-      angle_depth == 0 && paren_depth == 0
+      angle_depth == 0 && paren_depth == 0 && brace_depth == 0 && bracket_depth == 0
     end
   end
 end

data/lib/typelizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Typelizer
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typelizer
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Svyatoslav Kryukov