babl-json 0.2.3 → 0.2.4

data/lib/babl/operators/with.rb

@@ -1,5 +1,4 @@
-require 'babl/nodes/with'
-require 'babl/nodes/internal_value'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/rendering.rb

@@ -0,0 +1,3 @@
+require 'babl/rendering/compiled_template'
+require 'babl/rendering/noop_preloader'
+require 'babl/rendering/context'

data/lib/babl/rendering/compiled_template.rb

@@ -1,6 +1,6 @@
 require 'oj'
-require 'babl/rendering/context'
-require 'babl/utils/value'
+require 'babl/rendering'
+require 'babl/utils'
 
 module Babl
     module Rendering

data/lib/babl/schema.rb

@@ -0,0 +1,7 @@
+require 'babl/schema/any_of'
+require 'babl/schema/anything'
+require 'babl/schema/dyn_array'
+require 'babl/schema/fixed_array'
+require 'babl/schema/object'
+require 'babl/schema/static'
+require 'babl/schema/typed'

data/lib/babl/schema/any_of.rb

@@ -1,7 +1,6 @@
-require 'babl/utils/value'
+require 'babl/utils'
+require 'babl/schema'
 require 'set'
-require 'babl/schema/static'
-require 'babl/schema/object'
 
 module Babl
     module Schema
@@ -22,13 +21,13 @@ module Babl
             # schema.
             def simplify
                 simplify_single ||
+                    simplify_anything ||
                     simplify_boolean ||
                     simplify_typed_and_static ||
-                    simplify_nullability ||
                     simplify_empty_array ||
                     simplify_push_down_dyn_array ||
                     simplify_dyn_and_fixed_array ||
-                    simplify_many_objects_only_one_difference ||
+                    simplify_merge_objects ||
                     self
             end
 
@@ -43,12 +42,9 @@ module Babl
                 choices.size == 1 ? choices.first : nil
             end
 
-            # Anything is nullable, so AnyOf[null, Anything] can be replaced by Anything
-            # (in general, everything can be merged into Anything but I decided not to do it in order
-            # to retain as much information as possible)
-            def simplify_nullability
-                return unless choice_set.include?(Static::NULL) && choice_set.include?(Anything.instance)
-                AnyOf.canonicalized(choice_set - [Static::NULL])
+            # AnyOf[anything, string, number...] always collapse to anything.
+            def simplify_anything
+                choice_set.include?(Anything.instance) ? Anything.instance : nil
             end
 
             # AnyOf[true, false] is just boolean
@@ -102,38 +98,47 @@ module Babl
                 nil
             end
 
-            # If two objects have exactly the same structure, with the exception of only one property
-            # having a different type, then AnyOf can be pushed down to this property.
-            def simplify_many_objects_only_one_difference
+            # Merge all objects together. This is the only lossy simplification, but it will greatly reduce the size
+            # of the generated schema. On top of that, when the JSON-Schema is translated into Typescript, it produces
+            # a much more workable type definition (union of anonymous object types is not practical to use)
+            def simplify_merge_objects
                 choices.each_with_index { |obj1, index1|
                     next unless Object === obj1
 
                     choices.each_with_index { |obj2, index2|
                         break if index2 >= index1
-
-                        next unless Object === obj2 &&
-                                obj1.additional == obj2.additional &&
-                                obj1.properties.map { |p| [p.name, p.required] }.to_set ==
-                                        obj2.properties.map { |p| [p.name, p.required] }.to_set
-
-                        diff1 = obj1.properties - obj2.properties
-                        diff2 = obj2.properties - obj1.properties
-
-                        next unless diff1.size == 1 && diff2.size == 1 && diff1.first.name == diff2.first.name
-
-                        merged = Object.new(
-                            obj1.properties.map { |property|
-                                next property unless property == diff1.first
-                                Object::Property.new(
-                                    property.name,
-                                    AnyOf.canonicalized([diff1.first.value, diff2.first.value]),
-                                    property.required
-                                )
-                            },
-                            obj1.additional
-                        )
-
-                        return AnyOf.canonicalized(choice_set - [obj1, obj2] + [merged])
+                        next unless Object === obj2
+
+                        obj1props = obj1.properties.map { |p| [p.name, p] }.to_h
+                        obj2props = obj2.properties.map { |p| [p.name, p] }.to_h
+
+                        # Do not merge properties unless a keyset is almost a subset of the other
+                        next unless (obj1props.keys.to_set - obj2props.keys).size <= 1 ||
+                                (obj2props.keys.to_set - obj1props.keys).size <= 1
+
+                        # Try to detect a discrimitive property (inspired from Typescript's discriminative union),
+                        # We will abort the merging process unless all the other properties are exactly the same.
+                        discriminator = obj1props.find { |name, p1|
+                            p2 = obj2props[name]
+                            next name if p2 && Static === p2.value && Static === p1.value && p1.value.value != p2.value.value
+                        }&.first
+
+                        new_properties = (obj1props.keys + obj2props.keys).uniq.map { |name|
+                            p1 = obj1props[name]
+                            p2 = obj2props[name]
+
+                            break if discriminator && discriminator != name && p1 != p2
+
+                            Object::Property.new(
+                                name,
+                                AnyOf.canonicalized([p1&.value, p2&.value].compact),
+                                p1&.required && p2&.required || false
+                            )
+                        }
+
+                        next unless new_properties
+                        new_obj = Object.new(new_properties, obj1.additional || obj2.additional)
+                        return AnyOf.canonicalized(choice_set - [obj1, obj2] + [new_obj])
                     }
                 }
 

data/lib/babl/schema/dyn_array.rb

@@ -1,4 +1,4 @@
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Schema

data/lib/babl/schema/fixed_array.rb

@@ -1,4 +1,4 @@
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Schema

data/lib/babl/schema/object.rb

@@ -1,4 +1,4 @@
-require 'babl/utils/value'
+require 'babl/utils'
 require 'set'
 
 module Babl

data/lib/babl/schema/static.rb

@@ -1,4 +1,4 @@
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Schema

data/lib/babl/schema/typed.rb

@@ -1,4 +1,4 @@
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Schema

data/lib/babl/template.rb

@@ -1,26 +1,5 @@
-require 'babl/operators/array'
-require 'babl/operators/call'
-require 'babl/operators/continue'
-require 'babl/operators/default'
-require 'babl/operators/dep'
-require 'babl/operators/each'
-require 'babl/operators/enter'
-require 'babl/operators/extends'
-require 'babl/operators/merge'
-require 'babl/operators/nav'
-require 'babl/operators/null'
-require 'babl/operators/nullable'
-require 'babl/operators/object'
-require 'babl/operators/parent'
-require 'babl/operators/partial'
-require 'babl/operators/pin'
-require 'babl/operators/source'
-require 'babl/operators/static'
-require 'babl/operators/switch'
-require 'babl/operators/typed'
-require 'babl/operators/with'
-
-require 'babl/builder/template_base'
+require 'babl/builder'
+require 'babl/operators'
 
 module Babl
     class Template < Babl::Builder::TemplateBase

data/lib/babl/utils.rb

@@ -0,0 +1,3 @@
+require 'babl/utils/hash'
+require 'babl/utils/ref'
+require 'babl/utils/value'

data/lib/babl/version.rb

@@ -1,3 +1,3 @@
 module Babl
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Frederic Terrazzoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -87,19 +87,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- babl.gemspec
 - lib/babl.rb
+- lib/babl/builder.rb
 - lib/babl/builder/chain_builder.rb
 - lib/babl/builder/template_base.rb
 - lib/babl/errors.rb
+- lib/babl/nodes.rb
 - lib/babl/nodes/create_pin.rb
 - lib/babl/nodes/dep.rb
 - lib/babl/nodes/each.rb
@@ -115,6 +108,7 @@ files:
 - lib/babl/nodes/terminal_value.rb
 - lib/babl/nodes/typed.rb
 - lib/babl/nodes/with.rb
+- lib/babl/operators.rb
 - lib/babl/operators/array.rb
 - lib/babl/operators/call.rb
 - lib/babl/operators/continue.rb
@@ -137,9 +131,11 @@ files:
 - lib/babl/operators/typed.rb
 - lib/babl/operators/with.rb
 - lib/babl/railtie.rb
+- lib/babl/rendering.rb
 - lib/babl/rendering/compiled_template.rb
 - lib/babl/rendering/context.rb
 - lib/babl/rendering/noop_preloader.rb
+- lib/babl/schema.rb
 - lib/babl/schema/any_of.rb
 - lib/babl/schema/anything.rb
 - lib/babl/schema/dyn_array.rb
@@ -148,36 +144,11 @@ files:
 - lib/babl/schema/static.rb
 - lib/babl/schema/typed.rb
 - lib/babl/template.rb
+- lib/babl/utils.rb
 - lib/babl/utils/hash.rb
 - lib/babl/utils/ref.rb
 - lib/babl/utils/value.rb
 - lib/babl/version.rb
-- logo-babl.png
-- spec/operators/array_spec.rb
-- spec/operators/call_spec.rb
-- spec/operators/continue_spec.rb
-- spec/operators/default_spec.rb
-- spec/operators/dep_spec.rb
-- spec/operators/each_spec.rb
-- spec/operators/enter_spec.rb
-- spec/operators/extends_spec.rb
-- spec/operators/merge_spec.rb
-- spec/operators/nav_spec.rb
-- spec/operators/null_spec.rb
-- spec/operators/nullable_spec.rb
-- spec/operators/object_spec.rb
-- spec/operators/parent_spec.rb
-- spec/operators/partial_spec.rb
-- spec/operators/pin_spec.rb
-- spec/operators/source_spec.rb
-- spec/operators/static_spec.rb
-- spec/operators/switch_spec.rb
-- spec/operators/typed_spec.rb
-- spec/operators/with_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper/operator_testing.rb
-- spec/spec_helper/schema_utils.rb
-- spec/utils/value_spec.rb
 homepage: https://github.com/getbannerman/babl
 licenses:
 - MIT
@@ -202,29 +173,4 @@ rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: JSON templating on steroids
-test_files:
-- spec/operators/array_spec.rb
-- spec/operators/call_spec.rb
-- spec/operators/continue_spec.rb
-- spec/operators/default_spec.rb
-- spec/operators/dep_spec.rb
-- spec/operators/each_spec.rb
-- spec/operators/enter_spec.rb
-- spec/operators/extends_spec.rb
-- spec/operators/merge_spec.rb
-- spec/operators/nav_spec.rb
-- spec/operators/null_spec.rb
-- spec/operators/nullable_spec.rb
-- spec/operators/object_spec.rb
-- spec/operators/parent_spec.rb
-- spec/operators/partial_spec.rb
-- spec/operators/pin_spec.rb
-- spec/operators/source_spec.rb
-- spec/operators/static_spec.rb
-- spec/operators/switch_spec.rb
-- spec/operators/typed_spec.rb
-- spec/operators/with_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper/operator_testing.rb
-- spec/spec_helper/schema_utils.rb
-- spec/utils/value_spec.rb
+test_files: []

data/.gitignore

@@ -1,3 +0,0 @@
-.DS_Store
-Gemfile.lock
-*.gem

data/.rubocop.yml

@@ -1,201 +0,0 @@
-AllCops:
-  Include:
-    - Gemfile
-    - '**/*.babl'
-  TargetRubyVersion: 2.3
-
-# Begin -- Keep the following
-CaseIndentation:
-    EnforcedStyle: end
-
-ParameterLists:
-    Max: 5
-    CountKeywordArgs: false
-
-Rails:
-    Enabled: False
-
-Style/AndOr:
-    EnforcedStyle: conditionals
-
-Style/BlockDelimiters:
-    Enabled: False
-
-Style/CollectionMethods:
-    Enabled: True
-
-Style/Documentation:
-    Enabled: False
-
-Style/Lambda:
-    Enabled: False
-
-Style/MultilineIfModifier:
-    Enabled: False
-
-Style/NumericLiterals:
-    Enabled: False
-
-Style/SignalException:
-    EnforcedStyle: only_raise
-
-Layout/AlignParameters:
-    EnforcedStyle: with_fixed_indentation
-
-Layout/ExtraSpacing:
-    Enabled: True
-
-Layout/IndentationWidth:
-    Width: 4
-
-Layout/IndentHash:
-    EnforcedStyle: consistent
-
-Layout/MultilineOperationIndentation:
-    EnforcedStyle: indented
-
-Layout/EmptyLineAfterMagicComment:
-    Enabled: False
-
-Layout/IndentArray:
-    Enabled: False
-
-Layout/IndentHeredoc:
-    Enabled: False
-
-Layout/MultilineMethodCallIndentation:
-    Enabled: False
-
-Lint/AmbiguousBlockAssociation:
-    Enabled: False
-
-Lint/EmptyWhen:
-    Enabled: False
-
-Lint/EndAlignment:
-    Enabled: False
-
-Lint/InheritException:
-    Enabled: False
-
-Lint/NestedMethodDefinition:
-    Enabled: False
-
-Lint/SafeNavigationChain:
-    Enabled: True
-
-Lint/UnneededSplatExpansion:
-    Enabled: False
-
-Lint/UselessAccessModifier:
-    Enabled: False
-
-Metrics/LineLength:
-    Max: 130
-
-Metrics/PerceivedComplexity:
-    Max: 12
-
-Metrics/AbcSize:
-    Enabled: False
-    Max: 30
-
-Metrics/BlockLength:
-    Enabled: False
-    Max: 25
-
-Metrics/ClassLength:
-    Enabled: False
-    Max: 200
-
-Metrics/CyclomaticComplexity:
-    Enabled: False
-    Max: 10
-
-Metrics/MethodLength:
-    Enabled: False
-    Max: 20
-
-Metrics/ModuleLength:
-    Enabled: False
-
-Performance/Casecmp:
-    Enabled: False
-
-Rails/TimeZone:
-    Enabled: False
-
-Security/YAMLLoad:
-    Enabled: False
-
-Style/Alias:
-    Enabled: False
-
-Style/ConditionalAssignment:
-    Enabled: False
-
-Style/ClassVars:
-    Enabled: False
-
-Style/EmptyCaseCondition:
-    Enabled: False
-
-Style/EmptyMethod:
-    Enabled: False
-
-Style/FileName:
-    Enabled: False
-
-Style/FrozenStringLiteralComment:
-    Enabled: False
-
-Style/GuardClause:
-    Enabled: False
-
-Style/MixinGrouping:
-    Enabled: False
-
-Style/MultilineBlockChain:
-    Enabled: False
-
-Style/MultilineMemoization:
-    Enabled: False
-
-Style/MutableConstant:
-    Enabled: False
-
-Style/NestedParenthesizedCalls:
-    Enabled: False
-
-Style/Next:
-    Enabled: False
-
-Style/NumericPredicate:
-    Enabled: False
-
-Style/ParallelAssignment:
-    Enabled: False
-
-Style/RedundantParentheses:
-    Enabled: False
-
-Style/RedundantSelf:
-    Enabled: False
-
-Style/SafeNavigation:
-    Enabled: False
-
-Style/SingleLineBlockParams:
-    Enabled: False
-
-Style/CaseEquality:
-    Enabled: False
-
-Style/StringLiterals:
-    Enabled: False
-
-Style/SymbolArray:
-    Enabled: False
-
-Style/VariableNumber:
-    Enabled: False