klenod-build 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9fd40ba545361854b3552bbcc323e13b07410d830269f5aece663f7c2aeebf
-  data.tar.gz: 2a6d61e67c6014eb3eae74955b55cdf308b1ad2d60fcf2920ce3b7e8140d6a26
+  metadata.gz: 13ffde9084826c2af713cef2b267b547b57ec88b1f23dd7e32bb5da3681d929e
+  data.tar.gz: 46585426c377c8368573a901f7062fc7f862e8fed2dbf4b0b96b1032fd0e36dd
 SHA512:
-  metadata.gz: c72ea0b18ec7f93b578fda06d84182db5c1ae0a9d1514da42bd893f2c7ab0501873cc9d8ef58f6aec90a6a3eb50e51cee0b5040156c588cea25f6c1d607e2929
-  data.tar.gz: a758e9c33ffec2de4ffc591d87ca9e1c2454196125031a1f6beca8ad65926a6b5b3272ef7e25d0480149a5da9ab5cce080bd4474de8d2ca83404550b353184e8
+  metadata.gz: e4abd68c6f308b9fbadd8e099a034e741220a22d72f93207880d97400a7f2987a27dbcb3fd9aaaae2a833dfd4586cc7c23703ba6a5fe0f0691226ad378f4febf
+  data.tar.gz: f8c131821ecdbe4ed750418c0262be97602116f64f6b8a05cce9b099c3072a7bc73e5323c00ac9348cc1a68ce2256a1ad9a80611dea5805ee7f559aa650ee918

data/lib/klenod/build/context.rb

@@ -88,6 +88,10 @@ module Klenod
 
       DEFAULT_PLUGINS = DefaultPlugins.new.freeze
 
+      # `:development` collects, evaluates, and reloads on demand. `:build`
+      # only collects, for writing a bundle; `klenod build` always uses it.
+      MODES = %i[development build].freeze
+
       def self.default_plugins
         [
           Plugins::RubyPlugin.new,
@@ -116,6 +120,12 @@ module Klenod
         namespace: Module.new,
         analysis: false
       )
+        # Plugins compare the mode with `==`, so an unknown one would quietly
+        # behave like neither, e.g. CSS that is not minified.
+        unless MODES.include?(mode)
+          raise ArgumentError, "Unknown mode #{mode.inspect}; expected one of #{MODES.map(&:inspect).join(", ")}"
+        end
+
         @source_dir = source_dir
         plugins = plugins.to_a if plugins.equal?(DEFAULT_PLUGINS)
         @plugins = plugins

data/lib/klenod/build/graph/invalidator.rb

@@ -223,7 +223,11 @@ module Klenod
               :failed
             )
           )
-          mods[module_id] = FailedModule.new(error)
+          # Only an evaluated module needs the placeholder, so demand raises the
+          # error instead of serving stale exports. The failed record already
+          # covers a collected-only module, and a placeholder would make the
+          # next update treat it as evaluated and run its code.
+          mods[module_id] = FailedModule.new(error) if mods.key?(module_id)
         end
 
         def diff_assets(previous_assets, current_assets)

data/lib/klenod/build/plugins/data_plugin.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "date"
 require "json"
 require "toml-rb"
 require "yaml"
@@ -63,9 +64,42 @@ module Klenod
 
           def module_source(data)
             <<~RUBY
-              Default = #{data.inspect}
+              Default = #{ruby_literal(data)}
             RUBY
           end
+
+          # `inspect` is not Ruby source for every parsed value: dates, times,
+          # and non-finite floats need constructor calls instead.
+          def ruby_literal(value)
+            case value
+            when Hash
+              entries = value.map { |key, entry| "#{ruby_literal(key)} => #{ruby_literal(entry)}" }
+              "{#{entries.join(", ")}}"
+            when Array
+              "[#{value.map { ruby_literal(it) }.join(", ")}]"
+            when Float
+              float_literal(value)
+            when Time
+              zone = value.utc? ? "UTC" : value.utc_offset
+              "::Time.at(#{value.to_i}, #{value.nsec}, :nsec, in: #{zone.inspect})"
+            when Date
+              "::Date.new(#{value.year}, #{value.month}, #{value.day})"
+            when nil, true, false, String, Symbol, Integer
+              value.inspect
+            else
+              raise TypeError, "Cannot write #{value.class} as data module source"
+            end
+          end
+
+          def float_literal(value)
+            if value.nan?
+              "::Float::NAN"
+            elsif value.infinite?
+              value.positive? ? "::Float::INFINITY" : "-::Float::INFINITY"
+            else
+              value.inspect
+            end
+          end
         end
       end
 
@@ -155,8 +189,8 @@ module Klenod
         end
 
         class ParseError < Klenod::Build::SourceError
-          # "Failed to parse input on line 2 at offset 9\ninvalid =\n\n         ^"
-          LOCATION = /\AFailed to parse input on line (?<line>\d+) at offset (?<column>\d+)/
+          # "Unexpected \"\\n\" at line 2, column 10: expected a value"
+          LOCATION = / at line (?<line>\d+), column (?<column>\d+)/
 
           def kind
             "TOML parse error"
@@ -165,16 +199,16 @@ module Klenod
           private
 
           def location(error)
+            # Invalid values such as "Invalid date: 1979-13-01" carry no location.
             found = LOCATION.match(error.message)
             return nil unless found
 
-            # toml-rb embeds its own caret diagram in the message; we render our
-            # own from the line and column instead.
+            # One-based. The location is rendered as the title and the caret, so
+            # drop the copy the parser puts in its message.
             Location.new(
               line: found[:line].to_i,
-              # citrus reports a zero-based offset into the line.
-              column: found[:column].to_i + 1,
-              detail: "Could not parse TOML"
+              column: found[:column].to_i,
+              detail: error.message.sub(LOCATION, "")
             )
           end
         end
@@ -186,7 +220,26 @@ module Klenod
           private
 
           def parse(code)
-            TomlRB.parse(code)
+            plain_values(TomlRB.parse(code))
+          end
+
+          # toml-rb returns its own Time subclasses for local values. Exports
+          # and bundles should not depend on toml-rb, so a local date becomes a
+          # Date, as in YAML, and a local datetime or time becomes a UTC Time
+          # with the same clock time. A local time falls on 1970-01-01.
+          def plain_values(value)
+            case value
+            when Hash
+              value.transform_values { plain_values(it) }
+            when Array
+              value.map { plain_values(it) }
+            when TomlRB::LocalDate
+              Date.new(value.year, value.month, value.day)
+            when TomlRB::LocalDateTime, TomlRB::LocalTime
+              Time.at(value, in: "UTC")
+            else
+              value
+            end
           end
         end
       end

data/lib/klenod/build/plugins/haml_plugin/transformer/ruby_builder.rb

@@ -494,6 +494,9 @@ module Klenod
                   kind, prefix, pattern = VARIABLE_TOKEN_KINDS[type]
                   receiver = @variables[kind]
                   next unless receiver
+                  # `:@name` names the variable rather than reading it, as in
+                  # `instance_variable_get(:@name)`.
+                  next if tokens[index - 1]&.fetch(1) == :on_symbeg
 
                   # Parenthesize the receiver so a low-precedence expression
                   # such as `a || b` stays one operand, e.g. in `$*.fetch(:x)`.

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.28"
+    VERSION = "0.0.30"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-build
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: 0.0.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: 0.0.30
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -217,14 +217,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: tsort
   requirement: !ruby/object:Gem::Requirement