jade-lang 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e1034e93db617cde9f33aad318dc23a4bf4987f9f0243558434f14ed64feca8
-  data.tar.gz: f1e067ee109d4db4b7ac9a94664d2d69b92e1df10ccdbf31260958c23827e8d8
+  metadata.gz: 38f4067e761c85016ad9baa6c733e6567aa93eea5cc0ffb755c0ac469a6a0002
+  data.tar.gz: 97dd4372b13bcb7e23bdc3ac2dcbe231d067410e9a99634afbbd3bd1a485452e
 SHA512:
-  metadata.gz: 69fb033248f3950561b72732f70b51e2b7ed0e32aeffdab821c86a112a767e3b01dacccfda561467c312958b0f068be132421798d59551c6a0d28f3ddde06f67
-  data.tar.gz: 612d3fa844be6d1fa368679d1af12eb77f59a18175e84a906f29dd47405e7d6ef6002975dde83ffc291973eec3ca1cdad1c061755e89ba158a88eb369e3b8e93
+  metadata.gz: 415bcc6027fbefa912960d30c004d3d442000b37d6b3e6a27485b9ef9a12685bad3dc79855f7ccd99378987ea38fb6810fafe8f371dad5c50ce9b605c464f756
+  data.tar.gz: 8891cbe3dfe48e80cdb2ae73ec96a13b09a3adc8287adf812e7a30639ca4918b417cc02e45148222bacd2f7b1d412b58ce78d15f783dceed0868d0175e194daf

data/CHANGELOG.md

@@ -6,6 +6,21 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.8.0]
+
+### Added
+
+- `Assignable` also derives for structs, naming one column per field in
+  declaration order. A field renamed to dodge a keyword (`type_`) maps back to
+  the column it came from. Generic structs derive at the type they are applied
+  to. Inert unless jade-sql is loaded.
+
+### Changed
+
+- The derived jade-sql interface is now `Sql.Assignable`, was `Sql.SqlMapper`.
+  It is matched by name, so jade-sql must move to the new name in the same
+  release.
+
 ## [0.7.0]
 
 ### Added
@@ -68,6 +83,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   anonymous record. A project that CI-checks committed artifacts will see a
   diff.
 
+
 ## [0.6.0]
 
 ### Fixed

data/lib/jade/frontend/type_checking/constraints/deriving/{sql_mapper.rb → assignable.rb}

@@ -6,11 +6,11 @@ module Jade
           # jade-sql's interface, derived here rather than there: the
           # deriving framework is not extensible, and this stays inert
           # without jade-sql, since nothing else names the interface.
-          module SqlMapper
+          module Assignable
             extend self
             include Helpers
 
-            INTERFACE = 'Sql.SqlMapper'
+            INTERFACE = 'Sql.Assignable'
             ASSIGNMENT = 'Sql.Assignment'
             ASSIGNMENT_FIELDS = %w[col value_sql params].freeze
 
@@ -20,11 +20,11 @@ module Jade
               return failed(constraint, entry_name) unless assignment_matches?(registry)
 
               case constraint.type
-              in Type::Application(constructor: Type::Constructor(name:), args: [])
+              in Type::Application(constructor: Type::Constructor(name:), args:)
                 Symbol
                   .type_ref_from_qualified_name(name)
                   .then { registry.lookup(it) }
-                  .then { derive_for(constraint, it, registry, lookup, entry_name) }
+                  .then { derive_for(constraint, it, args, registry, lookup, entry_name) }
 
               else
                 failed(constraint, entry_name)
@@ -47,11 +47,14 @@ module Jade
                 end
             end
 
-            def derive_for(constraint, symbol, registry, lookup, entry_name)
+            def derive_for(constraint, symbol, args, registry, lookup, entry_name)
               case symbol
-              in Symbol::Union if single_payload?(symbol, registry)
+              in Symbol::Union if args.empty? && single_payload?(symbol, registry)
                 derive_union(constraint, symbol, registry, lookup, entry_name)
 
+              in Symbol::Struct
+                derive_struct(constraint, symbol, args, registry, lookup, entry_name)
+
               else
                 failed(constraint, entry_name)
               end
@@ -74,6 +77,43 @@ module Jade
                 .map { implementation(constraint, union_body(vs), it) }
             end
 
+            def derive_struct(constraint, struct_sym, args, registry, lookup, entry_name)
+              fields = struct_fields(struct_sym, args, registry)
+
+              fields
+                .map { |_, type| Type.constraint('Encode.Encodable', type, nil) }
+                .map { lookup.call(it) }
+                .then { Results.sequence(it) }
+                .map { implementation(constraint, struct_body(fields), it) }
+            end
+
+            def struct_body(fields)
+              fields
+                .each_with_index
+                .map { |(name, _), idx| field_assignment(name, idx) }
+                .then { [:list, it] }
+            end
+
+            def field_assignment(name, idx)
+              [:call,
+                [:struct_constructor, ASSIGNMENT, 3],
+                [
+                  column_name(name),
+                  '?',
+                  [:list,
+                    [[:call, [:impl_arg, idx, 'encoder'], [[:access, [:var, 'f'], name.to_s]]]],
+                  ],
+                ],
+              ]
+            end
+
+            def column_name(field)
+              field
+                .to_s
+                .then { it.end_with?('_') ? it.delete_suffix('_') : it }
+                .then { Lexer::KEYWORDS.include?(it) ? it : field.to_s }
+            end
+
             def encodable_dep(variant, registry)
               variant
                 .args

data/lib/jade/frontend/type_checking/constraints/deriving.rb

@@ -2,7 +2,7 @@ require_relative './deriving/helpers.rb'
 require_relative './deriving/eq.rb'
 require_relative './deriving/decodable.rb'
 require_relative './deriving/encodable.rb'
-require_relative './deriving/sql_mapper.rb'
+require_relative './deriving/assignable.rb'
 require_relative './deriving/show.rb'
 
 module Jade
@@ -12,7 +12,7 @@ module Jade
         module Deriving
           extend self
 
-          DERIVERS = [Eq, Show, Decodable, Encodable, SqlMapper]
+          DERIVERS = [Eq, Show, Decodable, Encodable, Assignable]
 
           def derivable?(interface)
             DERIVERS.any? { it.supports?(interface) }

data/lib/jade/version.rb

@@ -1,3 +1,3 @@
 module Jade
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jade-lang
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Agustin Cornu
@@ -218,12 +218,12 @@ files:
 - lib/jade/frontend/type_checking/canonicalize.rb
 - lib/jade/frontend/type_checking/constraints.rb
 - lib/jade/frontend/type_checking/constraints/deriving.rb
+- lib/jade/frontend/type_checking/constraints/deriving/assignable.rb
 - lib/jade/frontend/type_checking/constraints/deriving/decodable.rb
 - lib/jade/frontend/type_checking/constraints/deriving/encodable.rb
 - lib/jade/frontend/type_checking/constraints/deriving/eq.rb
 - lib/jade/frontend/type_checking/constraints/deriving/helpers.rb
 - lib/jade/frontend/type_checking/constraints/deriving/show.rb
-- lib/jade/frontend/type_checking/constraints/deriving/sql_mapper.rb
 - lib/jade/frontend/type_checking/definition.rb
 - lib/jade/frontend/type_checking/env.rb
 - lib/jade/frontend/type_checking/error.rb