datacaster 6.0.2 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f66df22c1ea20054ae2b16ea8ccbd778b8aac71e7898bc763036e3c4f9ba50da
-  data.tar.gz: bad95a5182fdbbefe72c5c8f5b724c433f26cc5d676a755dcb0af554e07d95ca
+  metadata.gz: 3e12cb58554769d09ba9635c472f6aeafe7383fe4837a525075973f5c8f6b02b
+  data.tar.gz: a6cdaafccde0affef8c15a25cda41145f8b62ab8d1ef9769a3eb664ac10ce7be
 SHA512:
-  metadata.gz: f6f707de2a1555d6dbc7756b60e8a981de97f137787dc5212b78807060d43877e0c5b18f3ad191262eabb618bed356feb32e9d96d3adf93b14bbbbe73bf2452b
-  data.tar.gz: 8612f9609a9d1c9a8a9de4358ee66c30458158598917a3e59d09fb83582a8cdc68f7c395f577179363407fd63cbd9f72d4864b77ee957f4e4e63f6a2aad746f2
+  metadata.gz: b0b721aa63f9e33cb16a9ad4231a79b418b26c2ac480f57a3f4d2561e0795e4912dd373cf9105731d0909b4987152b28a8e4fef3a436676daf8a4e8eb7374f75
+  data.tar.gz: b1a56fceb24ae23aa2ee05924ca18f9bacb0327cf05f070a9468bef86cce6bb722183cd80800859ecbdc2b0d6d18795265f034eed955308c403a2d8b5bf93cfd

data/datacaster.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'dry-monads', '>= 1.3', '< 1.4'
 
   spec.add_runtime_dependency 'zeitwerk', '>= 2', '< 3'
+  spec.add_runtime_dependency 'js_regex'
 end

data/lib/datacaster/predefined.rb

@@ -1,3 +1,5 @@
+require 'js_regex'
+
 module Datacaster
   module Predefined
     extend self
@@ -159,15 +161,15 @@ module Datacaster
         return (absent | base).json_schema { base.to_json_schema }.json_schema_attributes(required: false)
       end
 
-      caster = cast do |x|
-        if x == Datacaster.absent ||
-          (!on.nil? && x.respond_to?(on) && x.public_send(on))
-          Datacaster.ValidResult(Datacaster.absent)
-        else
-          base.(x)
-        end
+      unless on.is_a?(Symbol)
+        raise RuntimeError, "`on` should be a Symbol"
       end
 
+      caster =
+        absent |
+          (check { |x| x.respond_to?(on) && x.public_send(on) } & transform { Datacaster.absent }) |
+          base
+
       caster
         .json_schema(base.to_json_schema)
         .json_schema_attributes(required: false)
@@ -363,8 +365,12 @@ module Datacaster
     def pattern(regexp, error_key = nil)
       error_keys = ['.pattern', 'datacaster.errors.pattern']
       error_keys.unshift(error_key) if error_key
-      string(error_key) & check { |x| x.match?(regexp) }.i18n_key(*error_keys, reference: regexp.inspect).
-        json_schema(pattern: regexp.inspect)
+
+      ecma_regexp = JsRegex.new(regexp).to_s
+
+      string(error_key) & check { |x| x.match?(regexp) }.
+        i18n_key(*error_keys, reference: ecma_regexp).
+        json_schema(pattern: ecma_regexp)
     end
 
     # 'hash' would be a bad method name, because it would override built in Object#hash
@@ -458,7 +464,9 @@ module Datacaster
     def uuid(error_key = nil)
       error_keys = ['.uuid', 'datacaster.errors.uuid']
       error_keys.unshift(error_key) if error_key
-      pattern(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/, error_key).i18n_key(*error_keys)
+      pattern(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/, error_key).
+        i18n_key(*error_keys).
+        json_schema { { 'type' => 'string', 'format' => 'uuid' } }
     end
 
     # Form request types

data/lib/datacaster/version.rb

@@ -1,3 +1,3 @@
 module Datacaster
-  VERSION = "6.0.2"
+  VERSION = "6.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.4
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-21 00:00:00.000000000 Z
+date: 2026-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -106,7 +106,21 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+- !ruby/object:Gem::Dependency
+  name: js_regex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - eugzol@gmail.com
 executables: []
@@ -181,7 +195,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/EugZol/datacaster
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,8 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.20
+signing_key:
 specification_version: 4
 summary: Run-time type checker and transformer for Ruby
 test_files: []