feelin 4.3.1 → 7.0.1

data/lib/feelin.rb

@@ -1,18 +1,30 @@
 require "mini_racer"
+require "json"
 
 module FEELIN
+  # Pre-built single-file IIFE bundle (feelin + its dependencies), produced by
+  # `npm run build` in lib/feelin/js. It exposes the feelin API on the global
+  # `feel`. feelin is distributed as an ES module, so it is bundled ahead of time
+  # rather than assembled at load time.
+  BUNDLE_PATH = File.expand_path("feelin/js/dist/feelin.js", __dir__)
+
   @@functions = Set.new
 
+  # NOTE: the context is serialized to JSON and interpolated into the eval, rather
+  # than passed as a native Ruby object via MiniRacer#call. That was measured to be
+  # ~15-20% FASTER: JSON.generate (C) plus V8's highly-optimized parsing beats
+  # mini_racer's element-by-element Ruby->V8 marshalling, and it lets custom
+  # functions be injected straight into the context (no per-call merge).
   def self.evaluate(expression, context = nil)
     context_json = serialize_context(context)
 
-    @@context.eval("feel.evaluate(#{JSON.generate(expression)}, #{context_json})")
+    unwrap(@@context.eval("feel.evaluate(#{JSON.generate(expression)}, #{context_json})"))
   end
 
   def self.unary_test(expression, value, context = {})
     context_json = serialize_context({ **context, '?' => value })
 
-    @@context.eval("feel.unaryTest(#{JSON.generate(expression)}, #{context_json})")
+    unwrap(@@context.eval("feel.unaryTest(#{JSON.generate(expression)}, #{context_json})"))
   end
 
   def self.add_function(name, proc)
@@ -22,42 +34,31 @@ module FEELIN
 
   private
 
-  def self.serialize_context(context)
-    if @@functions.any?
-      functions_json = @@functions.map do |name|
-        "#{name}(...args){return #{name}(...args)}"
-      end.join(',')
-
-      if context.nil?
-        "{#{functions_json}}"
-      else
-        "#{JSON.generate(context)[0...-1]},#{functions_json}}"
-      end
-    else
-      JSON.generate(context)
-    end
+  # feelin (>= 7) returns an EvaluationResult `{ value, warnings }`; callers expect
+  # the bare value.
+  def self.unwrap(result)
+    result.is_a?(Hash) && result.key?("warnings") ? result["value"] : result
   end
 
-  def self.process_module(source)
-    file_map = {
-      'feelin' => 'dist/index.cjs',
-      'luxon' => 'build/node/luxon.js',
-      'lezer-feel' => 'dist/index.cjs',
-      '@lezer/lr' => 'dist/index.cjs',
-      'min-dash' => 'dist/index.cjs',
-      '@lezer/highlight' => 'dist/index.cjs',
-      '@lezer/common' => 'dist/index.cjs',
-    }
-
-    source.gsub(/require\('(.+?)'\)/) do
-      name = $1
-      data = process_module(File.read("#{File.dirname(__FILE__)}/feelin/js/node_modules/#{name}/#{file_map[name]}"))
-
-      "(function() { const exports = {}; #{data} return exports })()"
-    end
+  # Builds the JS evaluation context. When custom functions are registered they
+  # must be injected into every context as forwarders to their attached globals.
+  # Each function is emitted as a QUOTED key forwarding to globalThis[name] so
+  # that names containing spaces (e.g. "string join") are valid JS; an empty
+  # context is coerced to nil to avoid producing an invalid "{,...}" literal. The
+  # `(...args)` forwarder is deliberate: feelin reads a function's source to learn
+  # its parameters, so a bare reference to the (native) attached global would be
+  # seen as taking no arguments.
+  def self.serialize_context(context)
+    return JSON.generate(context) if @@functions.empty?
+
+    context = nil if context.respond_to?(:empty?) && context.empty?
+    functions_json = @@functions.map do |name|
+      %("#{name}":function(...args){return globalThis["#{name}"](...args)})
+    end.join(",")
+
+    context.nil? ? "{#{functions_json}}" : "#{JSON.generate(context)[0...-1]},#{functions_json}}"
   end
 
-  source = process_module("const feel = require('feelin')")
   @@context = MiniRacer::Context.new
-  @@context.eval(source)
+  @@context.eval(File.read(BUNDLE_PATH))
 end

data/spec/feelin/feelin_spec.rb

@@ -20,6 +20,20 @@ RSpec.describe FEELIN do
         expect(FEELIN.evaluate('every rate in rates() satisfies rate < 10')).to eq false
       end
     end
+
+    context "with a custom function and an empty context" do
+      it "does not build an invalid context literal" do
+        FEELIN.add_function('answer', proc { 42 })
+        expect(FEELIN.evaluate('answer()', {})).to eq 42
+      end
+    end
+
+    context "with a custom function whose name contains spaces" do
+      it "forwards to the attached global" do
+        FEELIN.add_function('string join two', proc { |a, b| "#{a}#{b}" })
+        expect(FEELIN.evaluate('string join two("a", "b")')).to eq 'ab'
+      end
+    end
   end
 
   describe "#unary_test" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feelin
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 7.0.1
 platform: ruby
 authors:
 - Dmitry Arkhipov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 2026-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_racer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,105 +68,8 @@ files:
 - README.md
 - feelin.gemspec
 - lib/feelin.rb
-- lib/feelin/js/node_modules/.package-lock.json
-- lib/feelin/js/node_modules/@lezer/common/LICENSE
-- lib/feelin/js/node_modules/@lezer/common/README.md
-- lib/feelin/js/node_modules/@lezer/common/dist/index.cjs
-- lib/feelin/js/node_modules/@lezer/common/dist/index.d.cts
-- lib/feelin/js/node_modules/@lezer/common/dist/index.d.ts
-- lib/feelin/js/node_modules/@lezer/common/dist/index.js
-- lib/feelin/js/node_modules/@lezer/common/package.json
-- lib/feelin/js/node_modules/@lezer/highlight/LICENSE
-- lib/feelin/js/node_modules/@lezer/highlight/README.md
-- lib/feelin/js/node_modules/@lezer/highlight/dist/index.cjs
-- lib/feelin/js/node_modules/@lezer/highlight/dist/index.d.cts
-- lib/feelin/js/node_modules/@lezer/highlight/dist/index.d.ts
-- lib/feelin/js/node_modules/@lezer/highlight/dist/index.js
-- lib/feelin/js/node_modules/@lezer/highlight/package.json
-- lib/feelin/js/node_modules/@lezer/lr/LICENSE
-- lib/feelin/js/node_modules/@lezer/lr/README.md
-- lib/feelin/js/node_modules/@lezer/lr/dist/constants.d.ts
-- lib/feelin/js/node_modules/@lezer/lr/dist/constants.js
-- lib/feelin/js/node_modules/@lezer/lr/dist/index.cjs
-- lib/feelin/js/node_modules/@lezer/lr/dist/index.d.cts
-- lib/feelin/js/node_modules/@lezer/lr/dist/index.d.ts
-- lib/feelin/js/node_modules/@lezer/lr/dist/index.js
-- lib/feelin/js/node_modules/@lezer/lr/package.json
-- lib/feelin/js/node_modules/feelin/LICENSE
-- lib/feelin/js/node_modules/feelin/README.md
-- lib/feelin/js/node_modules/feelin/dist/builtins.d.ts
-- lib/feelin/js/node_modules/feelin/dist/index.cjs
-- lib/feelin/js/node_modules/feelin/dist/index.cjs.map
-- lib/feelin/js/node_modules/feelin/dist/index.d.ts
-- lib/feelin/js/node_modules/feelin/dist/index.esm.js
-- lib/feelin/js/node_modules/feelin/dist/index.esm.js.map
-- lib/feelin/js/node_modules/feelin/dist/interpreter.d.ts
-- lib/feelin/js/node_modules/feelin/dist/parser.d.ts
-- lib/feelin/js/node_modules/feelin/dist/temporal.d.ts
-- lib/feelin/js/node_modules/feelin/dist/types.d.ts
-- lib/feelin/js/node_modules/feelin/dist/utils.d.ts
-- lib/feelin/js/node_modules/feelin/package.json
-- lib/feelin/js/node_modules/lezer-feel/LICENSE
-- lib/feelin/js/node_modules/lezer-feel/README.md
-- lib/feelin/js/node_modules/lezer-feel/dist/index.cjs
-- lib/feelin/js/node_modules/lezer-feel/dist/index.cjs.map
-- lib/feelin/js/node_modules/lezer-feel/dist/index.d.ts
-- lib/feelin/js/node_modules/lezer-feel/dist/index.js
-- lib/feelin/js/node_modules/lezer-feel/dist/index.js.map
-- lib/feelin/js/node_modules/lezer-feel/package.json
-- lib/feelin/js/node_modules/luxon/LICENSE.md
-- lib/feelin/js/node_modules/luxon/README.md
-- lib/feelin/js/node_modules/luxon/build/amd/luxon.js
-- lib/feelin/js/node_modules/luxon/build/amd/luxon.js.map
-- lib/feelin/js/node_modules/luxon/build/cjs-browser/luxon.js
-- lib/feelin/js/node_modules/luxon/build/cjs-browser/luxon.js.map
-- lib/feelin/js/node_modules/luxon/build/es6/luxon.js
-- lib/feelin/js/node_modules/luxon/build/es6/luxon.js.map
-- lib/feelin/js/node_modules/luxon/build/global/luxon.js
-- lib/feelin/js/node_modules/luxon/build/global/luxon.js.map
-- lib/feelin/js/node_modules/luxon/build/global/luxon.min.js
-- lib/feelin/js/node_modules/luxon/build/global/luxon.min.js.map
-- lib/feelin/js/node_modules/luxon/build/node/luxon.js
-- lib/feelin/js/node_modules/luxon/build/node/luxon.js.map
-- lib/feelin/js/node_modules/luxon/package.json
-- lib/feelin/js/node_modules/luxon/src/datetime.js
-- lib/feelin/js/node_modules/luxon/src/duration.js
-- lib/feelin/js/node_modules/luxon/src/errors.js
-- lib/feelin/js/node_modules/luxon/src/impl/conversions.js
-- lib/feelin/js/node_modules/luxon/src/impl/diff.js
-- lib/feelin/js/node_modules/luxon/src/impl/digits.js
-- lib/feelin/js/node_modules/luxon/src/impl/english.js
-- lib/feelin/js/node_modules/luxon/src/impl/formats.js
-- lib/feelin/js/node_modules/luxon/src/impl/formatter.js
-- lib/feelin/js/node_modules/luxon/src/impl/invalid.js
-- lib/feelin/js/node_modules/luxon/src/impl/locale.js
-- lib/feelin/js/node_modules/luxon/src/impl/regexParser.js
-- lib/feelin/js/node_modules/luxon/src/impl/tokenParser.js
-- lib/feelin/js/node_modules/luxon/src/impl/util.js
-- lib/feelin/js/node_modules/luxon/src/impl/zoneUtil.js
-- lib/feelin/js/node_modules/luxon/src/info.js
-- lib/feelin/js/node_modules/luxon/src/interval.js
-- lib/feelin/js/node_modules/luxon/src/luxon.js
-- lib/feelin/js/node_modules/luxon/src/package.json
-- lib/feelin/js/node_modules/luxon/src/settings.js
-- lib/feelin/js/node_modules/luxon/src/zone.js
-- lib/feelin/js/node_modules/luxon/src/zones/IANAZone.js
-- lib/feelin/js/node_modules/luxon/src/zones/fixedOffsetZone.js
-- lib/feelin/js/node_modules/luxon/src/zones/invalidZone.js
-- lib/feelin/js/node_modules/luxon/src/zones/systemZone.js
-- lib/feelin/js/node_modules/min-dash/LICENSE
-- lib/feelin/js/node_modules/min-dash/README.md
-- lib/feelin/js/node_modules/min-dash/dist/array.d.ts
-- lib/feelin/js/node_modules/min-dash/dist/collection.d.ts
-- lib/feelin/js/node_modules/min-dash/dist/fn.d.ts
-- lib/feelin/js/node_modules/min-dash/dist/index.cjs
-- lib/feelin/js/node_modules/min-dash/dist/index.d.ts
-- lib/feelin/js/node_modules/min-dash/dist/index.esm.js
-- lib/feelin/js/node_modules/min-dash/dist/lang.d.ts
-- lib/feelin/js/node_modules/min-dash/dist/min-dash.js
-- lib/feelin/js/node_modules/min-dash/dist/min-dash.min.js
-- lib/feelin/js/node_modules/min-dash/dist/object.d.ts
-- lib/feelin/js/node_modules/min-dash/package.json
+- lib/feelin/js/dist/feelin.js
+- lib/feelin/js/entry.js
 - lib/feelin/js/package-lock.json
 - lib/feelin/js/package.json
 - lib/feelin/version.rb
@@ -175,7 +78,10 @@ files:
 homepage: https://github.com/ekzo-dev/ruby-feelin
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/ekzo-dev/ruby-feelin
+  source_code_uri: https://github.com/ekzo-dev/ruby-feelin
+  changelog_uri: https://github.com/ekzo-dev/ruby-feelin/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/feelin/js/node_modules/.package-lock.json

@@ -1,67 +0,0 @@
-{
-  "name": "js",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "node_modules/@lezer/common": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
-      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA=="
-    },
-    "node_modules/@lezer/highlight": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
-      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
-      "dependencies": {
-        "@lezer/common": "^1.0.0"
-      }
-    },
-    "node_modules/@lezer/lr": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
-      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
-      "dependencies": {
-        "@lezer/common": "^1.0.0"
-      }
-    },
-    "node_modules/feelin": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/feelin/-/feelin-4.3.0.tgz",
-      "integrity": "sha512-Uv3YNCrmXSXgkCJSfa2jR7SL/acjPhfEHKNsaL///fRJxD7epUvUJyF1WXbh8oh9Myv+z3WVClGb+rIuT7LDow==",
-      "dependencies": {
-        "@lezer/lr": "^1.4.2",
-        "lezer-feel": "^1.6.0",
-        "luxon": "^3.5.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/lezer-feel": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-1.7.0.tgz",
-      "integrity": "sha512-UC8h3Nu4llRPISEUhv+Ne7bNkdxjf4+/DcU4KfO8zKxycWxev8d2BoVnGlG17zbQDtQJBD39ZQvWtjCeTFm69g==",
-      "dependencies": {
-        "@lezer/highlight": "^1.2.1",
-        "@lezer/lr": "^1.4.2",
-        "min-dash": "^4.2.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/luxon": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.0.tgz",
-      "integrity": "sha512-WE7p0p7W1xji9qxkLYsvcIxZyfP48GuFrWIBQZIsbjCyf65dG1rv4n83HcOyEyhvzxJCrUoObCRNFgRNIQ5KNA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/min-dash": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.3.tgz",
-      "integrity": "sha512-VLMYQI5+FcD9Ad24VcB08uA83B07OhueAlZ88jBK6PyupTvEJwllTMUqMy0wPGYs7pZUEtEEMWdHB63m3LtEcg=="
-    }
-  }
-}

data/lib/feelin/js/node_modules/@lezer/common/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (C) 2018 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/lib/feelin/js/node_modules/@lezer/common/README.md

@@ -1,14 +0,0 @@
-# @lezer/common
-
-[ [**WEBSITE**](http://lezer.codemirror.net) | [**ISSUES**](https://github.com/lezer-parser/lezer/issues) | [**FORUM**](https://discuss.codemirror.net/c/lezer) | [**CHANGELOG**](https://github.com/lezer-parser/common/blob/master/CHANGELOG.md) ]
-
-[Lezer](https://lezer.codemirror.net/) is an incremental parser system
-intended for use in an editor or similar system.
-
-@lezer/common provides the syntax tree data structure and parser
-abstractions for Lezer parsers.
-
-Its programming interface is documented on [the
-website](https://lezer.codemirror.net/docs/ref/#common).
-
-This code is licensed under an MIT license.