nodo 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c0c3cef7af9cd8352a7470125eda15d01a56f795a5ce3fd2b1474b47f77f171
-  data.tar.gz: 759f66869c24cc8511fae1adf0a633fc73dd45d340ff9f16186570c5aefccbab
+  metadata.gz: e7c1002efcf0b7ba146dde5e10af7ddcdfdfeb450824dfaf5cce56c115630303
+  data.tar.gz: 3dc41a17980258b0ef634bb6a05319cc98501495ebb7a4688007cd0546f32fb3
 SHA512:
-  metadata.gz: 010242af2332f9eb6ac1b136ae13ab570ae63212f61fb4b056a20407cc4209d52774dec9bcb87c44c9b9f87d13f3145bc468b0e96bd4b3fd7635815035381288
-  data.tar.gz: 0363c67c93b8015f45028625d3c3e76a5be084f087f5f34286a47fa9bbd5227d27267cbbbfaf133fe46bc325a4e46de4178946cdfe84c9d401950e30e2bc6897
+  metadata.gz: 877eac53f4eb526c8fc8ef7cc7b10437232a9b50effffd894dda29c36129b33c7a2c9e9edb47964ad2b566ce98c25f38d2866ce0cd0fc52062efbe0084105f31
+  data.tar.gz: 5aaf9f8097c8a3b7335e1a67b23dc388a194b2dfe395b8b8e0faeca324b194615d1b946fd3a6bf117b0c0d2567c71cae622b00611d772e95f8f35e1e1f519f4a

data/README.md

@@ -99,6 +99,23 @@ bar = Bar.new
 bar.v4 => "b305f5c4-db9a-4504-b0c3-4e097a5ec8b9"
 ```
 
+`import` is also supported for loading ESM packages:
+
+```ruby
+class Bar < Nodo::Core
+  import :uuid
+
+  function :v4, <<~JS
+    () => {
+      return uuid.v4();
+    }
+  JS
+end
+
+bar = Bar.new
+bar.v4 => "b305f5c4-db9a-4504-b0c3-4e097a5ec8b9"
+```
+
 ### Aliasing requires
 
 If the library name cannot be used as name of the constant, the `const` name

data/lib/nodo/core.rb

@@ -82,7 +82,7 @@ module Nodo
 
       def generate_class_code
         <<~JS
-          (() => {
+          (async () => {
             const __nodo_klass__ = { nodo: global.nodo };
             #{dependencies.map(&:to_js).join}
             #{constants.map(&:to_js).join}
@@ -106,10 +106,13 @@ module Nodo
 
       private
 
-      def require(*mods)
-        deps = mods.last.is_a?(Hash) ? mods.pop : {}
-        mods = mods.map { |m| [m, m] }.to_h
-        self.dependencies = dependencies + mods.merge(deps).map { |name, package| Dependency.new(name, package) }
+      { require: :cjs, import: :esm }.each do |method, type|
+        define_method method do |*mods|
+          deps = mods.last.is_a?(Hash) ? mods.pop : {}
+          mods = mods.map { |m| [m, m] }.to_h
+          self.dependencies = dependencies + mods.merge(deps).map { |name, package| Dependency.new(name, package, type: type) }
+        end
+        private method
       end
 
       def function(name, _code = nil, timeout: Nodo.timeout, code: nil, &block)

data/lib/nodo/dependency.rb

@@ -1,12 +1,22 @@
 module Nodo
   class Dependency
-    attr_reader :name, :package
-    
-    def initialize(name, package)
-      @name, @package = name, package
+    attr_reader :name, :package, :type
+
+    def initialize(name, package, type:)
+      @name, @package, @type = name, package, type
     end
-  
+
     def to_js
+      case type
+      when :cjs then to_cjs
+      when :esm then to_esm
+      else raise "Unknown dependency type: #{type}"
+      end
+    end
+
+    private
+
+    def to_cjs
       <<~JS
         const #{name} = __nodo_klass__.#{name} = (() => {
           try {
@@ -18,5 +28,18 @@ module Nodo
         })();
       JS
     end
+
+    def to_esm
+      <<~JS
+        const #{name} = __nodo_klass__.#{name} = await (async () => {
+          try {
+            return await nodo.import(#{package.to_json});
+          } catch(e) {
+            e.nodo_dependency = #{package.to_json};
+            throw e;
+          }
+        })();
+      JS
+    end
   end
 end

data/lib/nodo/nodo.cjs

@@ -99,8 +99,12 @@ module.exports = (function() {
 
           try {
             if (DEFINE_METHOD == method) {
-              classes[class_name] = vm.runInThisContext(input, class_name);
-              respond_with_data(res, class_name, start);
+              Promise.resolve(vm.runInThisContext(input, class_name)).then((result) => {
+                classes[class_name] = result;
+                respond_with_data(res, class_name, start);
+              }).catch((error) => {
+                respond_with_error(res, 500, error);
+              })
             } else if (EVALUATE_METHOD == method) {
               Promise.resolve(vm.runInNewContext(input, context)).then((result) => {
                 respond_with_data(res, result, start);

data/lib/nodo/version.rb

@@ -1,3 +1,3 @@
 module Nodo
-  VERSION = '1.7.1'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: nodo
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Matthias Grosser
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
-dependencies: []
+date: 2025-02-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  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: Fast Ruby bridge to run JavaScript inside a Node process
 email:
 - mtgrosser@gmx.net
@@ -34,7 +47,6 @@ homepage: https://github.com/mtgrosser/nodo
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -42,15 +54,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Call Node.js from Ruby
 test_files: []