isomorfeus-puppetmaster 0.8.7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016c90cdca1516240ceedbc87ec0d0e20a0e69e03f45e269a658bb5122cc1352
-  data.tar.gz: 289cedf184ca3dac83b894a6e21ea5ff627b1ad791b9e2915b695ec1dff4ec45
+  metadata.gz: 15e9e4489049aa4200345e6d13ad409cbc2ef7c7972ef2cd5db102b64f3dec1c
+  data.tar.gz: 40fe9fb73dcb739e21c49eb2e9c28c72926d151b1e588b6155bb3f999ff88592
 SHA512:
-  metadata.gz: b9ae0a91cd8419f61577133cf5eb63d9b8a34164bf13e3ccb21250c4e35f16f06d683a3e66ebd49b74f72fa0db798c0a111b499e93302408d82b18bfe1ee8b7d
-  data.tar.gz: '009fc4d978d95cb80b356893f2cac092a1923afe2a67e87854e7890892ce2a5b0f7fef9901ec449ac47515f37b6944598d65eb38b166e4f975018476d2cf50a0'
+  metadata.gz: 323ace6f65009c749f0de5180475c00f29c8637331fff5bd6cf9ac99ffd80582b22830fc8594780a02021bea50014f5bf541adef8bee6b7024a645a0ae4958ab
+  data.tar.gz: '09369cf80cef929cbea6734ef3464ea4df59ad582636fedb3c28354ad0e4eb1452af4434d6746972203cb01763a74f2d2d06559abcc616ea077cb910f00b9f88'

data/lib/isomorfeus/puppeteer/execution_context.rb

@@ -1,7 +1,7 @@
 class Puppeteer::ExecutionContext
-  def eval_ruby(ruby_source = '', &block)
-    ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-    compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
+  def eval_ruby(ruby_source = '', file = nil, _line = nil, &block)
+    ruby_source, file = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+    compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source, file)
     res = evaluate <<~JAVASCRIPT
       function(){
         let fun = function() {
@@ -9,8 +9,20 @@ class Puppeteer::ExecutionContext
           catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }
         }
         let res = fun();
-        if (res && res.$to_n) { res = res.$to_n(); }
-        return ((res === Opal.nil) ? null : res);
+        if (res && res.$to_n) res = res.$to_n();
+        let conv = function(o) {
+          if (o === Opal.nil) o = null;
+          if (o && typeof(o) === 'object') {
+            if (o.constructor && o.constructor.name === 'Map') o = Object.fromEntries(o);
+            if (Array.isArray(o)) {
+              for (let i = 0; i < o.length; i++) o[i] = conv(o[i]);
+            } else {
+              for (let i in o) o[i] = conv(o[i]);
+            }
+          }
+          return o;
+        }
+        return conv(res);
       }
     JAVASCRIPT
     if res.is_a?(Hash) && res.key?('error') && res.key?('message') && res.key?('stack')
@@ -21,9 +33,9 @@ class Puppeteer::ExecutionContext
     res
   end
 
-  def eval_with_opal(ruby_source = '', &block)
-    ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-    compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
+  def eval_with_opal(ruby_source = '', file = nil, _line = nil, &block)
+    ruby_source, file = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+    compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source, file)
     res = evaluate <<~JAVASCRIPT
       function(){
         let fun = function(){
@@ -34,8 +46,20 @@ class Puppeteer::ExecutionContext
           catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }
         }
         let res = fun();
-        if (res && res.$to_n) { res = res.$to_n(); }
-        return (res === Opal.nil) ? null : res;
+        if (res && res.$to_n) res = res.$to_n();
+        let conv = function(o) {
+          if (o === Opal.nil) o = null;
+          if (o && typeof(o) === 'object') {
+            if (o.constructor && o.constructor.name === 'Map') o = Object.fromEntries(o);
+            if (Array.isArray(o)) {
+              for (let i = 0; i < o.length; i++) o[i] = conv(o[i]);
+            } else {
+              for (let i in o) o[i] = conv(o[i]);
+            }
+          }
+          return o;
+        }
+        return conv(res);
       }
     JAVASCRIPT
     if res.is_a?(Hash) && res.key?('error') && res.key?('message') && res.key?('stack')
@@ -46,10 +70,10 @@ class Puppeteer::ExecutionContext
     res
   end
 
-  def await_ruby(ruby_source = '', &block)
-    ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+  def await_ruby(ruby_source = '', file = nil, line = nil, &block)
+    ruby_source, file = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
     ruby_source = "#{ruby_source}.always { |result| $promise_result = result; $promise_resolved = true }"
-    compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
+    compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source, file)
     evaluate <<~JAVASCRIPT
       function(){
         fun = function() {
@@ -76,7 +100,7 @@ class Puppeteer::ExecutionContext
       have_result = evaluate 'function() { return Opal ? Opal.gvars.promise_resolved : null; }'
       sleep 0.1 unless have_result
     end
-    result, exception = evaluate <<~JAVASCRIPT
+    res, exception = evaluate <<~JAVASCRIPT
       function () {
         var res;
         var exception = false;
@@ -91,9 +115,20 @@ class Puppeteer::ExecutionContext
         } else { res = Opal.gvars.promise_result };
         delete Opal.gvars.promise_result;
         delete Opal.gvars.promise_resolved;
-        if (res && res.$to_n) { res = res.$to_n(); }
-        res = ((res === Opal.nil) ? null : res);
-        return [res, exception];
+        if (res && res.$to_n) res = res.$to_n();
+        let conv = function(o) {
+          if (o === Opal.nil) o = null;
+          if (o && typeof(o) === 'object') {
+            if (o.constructor && o.constructor.name === 'Map') o = Object.fromEntries(o);
+            if (Array.isArray(o)) {
+              for (let i = 0; i < o.length; i++) o[i] = conv(o[i]);
+            } else {
+              for (let i in o) o[i] = conv(o[i]);
+            }
+          }
+          return o;
+        }
+        return [conv(res), exception];
       }
     JAVASCRIPT
     if exception
@@ -101,6 +136,6 @@ class Puppeteer::ExecutionContext
       e.set_backtrace(exception['stack'])
       raise e
     end
-    result
+    res
   end
 end

data/lib/isomorfeus/puppeteer/frame.rb

@@ -3,16 +3,16 @@ class Puppeteer::Frame
     self.Sx(x).first
   end
 
-  def eval_ruby(ruby_source = '', &block)
-    @main_world.eval_ruby(ruby_source, &block)
+  def eval_ruby(ruby_source = '', file = nil, line = nil, &block)
+    @main_world.eval_ruby(ruby_source, file, line, &block)
   end
 
-  def eval_with_opal(ruby_source = '', &block)
-    @main_world.eval_with_opal(ruby_source, &block)
+  def eval_with_opal(ruby_source = '', file = nil, line = nil, &block)
+    @main_world.eval_with_opal(ruby_source, file, line, &block)
   end
 
-  def await_ruby(ruby_source = '', &block)
-    @main_world.await_ruby(ruby_source, &block)
+  def await_ruby(ruby_source = '', file = nil, line = nil, &block)
+    @main_world.await_ruby(ruby_source, file, line, &block)
   end
 
   alias_method :find, :query_selector

data/lib/isomorfeus/puppeteer/isolated_world.rb

@@ -1,13 +1,13 @@
 class Puppeteer::IsolaatedWorld
-  def eval_ruby(ruby_source = '', &block)
-    execution_context.eval_ruby(ruby_source, &block)
+  def eval_ruby(ruby_source = '', file = nil, line = nil, &block)
+    execution_context.eval_ruby(ruby_source, file, line, &block)
   end
 
-  def eval_with_opal(ruby_source = '', &block)
-    execution_context.eval_with_opal(ruby_source, &block)
+  def eval_with_opal(ruby_source = '', file = nil, line = nil, &block)
+    execution_context.eval_with_opal(ruby_source, file, line, &block)
   end
 
-  def await_ruby(ruby_source = '', &block)
-    execution_context.await_ruby(ruby_source, &block)
+  def await_ruby(ruby_source = '', file = nil, line = nil, &block)
+    execution_context.await_ruby(ruby_source, file, line, &block)
   end
 end

data/lib/isomorfeus/puppeteer/js_handle.rb

@@ -1,13 +1,13 @@
 class Puppeteer::JSHandle
-  def eval_ruby(ruby_source = '', &block)
-    execution_context.eval_ruby(ruby_source, &block)
+  def eval_ruby(ruby_source = '', file = nil, line = nil, &block)
+    execution_context.eval_ruby(ruby_source, file, line, &block)
   end
 
-  def eval_with_opal(ruby_source = '', &block)
-    execution_context.eval_with_opal(ruby_source, &block)
+  def eval_with_opal(ruby_source = '', file = nil, line = nil, &block)
+    execution_context.eval_with_opal(ruby_source, file, line, &block)
   end
 
-  def await_ruby(ruby_source = '', &block)
-    execution_context.await_ruby(ruby_source, &block)
+  def await_ruby(ruby_source = '', file = nil, line = nil, &block)
+    execution_context.await_ruby(ruby_source, file, line, &block)
   end
 end

data/lib/isomorfeus/puppeteer/page.rb

@@ -43,16 +43,16 @@ class Puppeteer::Page
     click_el(selector, button: button, click_count: 2, delay: delay)
   end
 
-  def eval_ruby(ruby_source = '', &block)
-    main_frame.eval_ruby(ruby_source, &block)
+  def eval_ruby(ruby_source = '', file = nil, line = nil, &block)
+    main_frame.eval_ruby(ruby_source, file, line, &block)
   end
 
-  def eval_with_opal(ruby_source = '', &block)
-    main_frame.eval_with_opal(ruby_source, &block)
+  def eval_with_opal(ruby_source = '', file = nil, line = nil, &block)
+    main_frame.eval_with_opal(ruby_source, file, line, &block)
   end
 
-  def await_ruby(ruby_source = '', &block)
-    main_frame.await_ruby(ruby_source, &block)
+  def await_ruby(ruby_source = '', file = nil, line = nil, &block)
+    main_frame.await_ruby(ruby_source, file, line, &block)
   end
 
   def exec(j, *args)
@@ -102,15 +102,15 @@ class Puppeteer::Page
   alias_method :text, :inner_text
 
   def isomorphic(ruby_source = '', &block)
-    ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-    Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
-    eval_ruby(ruby_source)
+    ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+    Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, file, line)
+    eval_ruby(ruby_source, file, line)
   end
 
   def isomorphic_with_opal(ruby_source = '', &block)
-    ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-    Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
-    eval_with_opal(ruby_source)
+    ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+    Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, file, line)
+    eval_with_opal(ruby_source, file, line)
   end
 
   def path

data/lib/isomorfeus/puppetmaster/dsl.rb

@@ -42,16 +42,16 @@ module Isomorfeus
       end
       alias_method :goto, :visit
 
-      def isomorphic(ruby_source = '', &block)
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        on_server(ruby_source)
-        default_page.eval_ruby(ruby_source)
+      def isomorphic(ruby_source = '', file = nil, line = nil, &block)
+        ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        on_server(ruby_source, file, line)
+        default_page.eval_ruby(ruby_source, file, line)
       end
 
-      def isomorphic_with_opal(ruby_source = '', &block)
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        on_server(ruby_source)
-        default_page.eval_with_opal(ruby_source)
+      def isomorphic_with_opal(ruby_source = '', file = nil, line = nil, &block)
+        ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        on_server(ruby_source, file, line)
+        default_page.eval_with_opal(ruby_source, file, line)
       end
 
       def on_server(ruby_source = '', &block)
@@ -106,10 +106,10 @@ module Isomorfeus
         nil
       end
 
-      def on_server(ruby_source = '', &block)
+      def on_server(ruby_source = '', file = nil, line = nil, &block)
         session # ensure served_app booted
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
+        ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, file, line)
       end
 
       def session(headless: true, devtools: false)

data/lib/isomorfeus/puppetmaster/server/executor_middleware.rb

@@ -27,7 +27,7 @@ module Isomorfeus
                     Isomorfeus.init_store
                     Isomorfeus.store.clear! if Isomorfeus.store.respond_to?(:clear!)
                   end
-                  result = TOPLEVEL_BINDING.eval(request_hash['code']) if request_hash['code']
+                  result = TOPLEVEL_BINDING.eval(request_hash['code'], request_hash['file'], request_hash['line']) if request_hash['code']
                   result = result.value if result.is_a?(Promise)
                   response = Rack::Response.new(Oj.dump({ 'result' => result }, circular: true),
                                                 200,

data/lib/isomorfeus/puppetmaster/server.rb

@@ -75,9 +75,9 @@ module Isomorfeus
         middleware.error
       end
 
-      def on_server(ruby_source = '', &block)
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        request_hash = { 'key' => @request_key, 'code' => ruby_source }
+      def on_server(ruby_source = '', file = nil, line = nil, &block)
+        ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        request_hash = { 'key' => @request_key, 'code' => ruby_source, 'file' => file, 'line' => line }
         response = if using_ssl?
                      http = Net::HTTP.start(@host, @port, { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE })
                      http.post('/__executor__', Oj.dump(request_hash, mode: :strict))

data/lib/isomorfeus/puppetmaster/session.rb

@@ -98,50 +98,24 @@ module Isomorfeus
         r&.json_value
       end
 
-      def eval_ruby(ruby_source = '', &block)
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
-        res = self.evaluate "function(){ try { return #{compiled_ruby} } catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }}"
-        if res.is_a?(Hash) && res.key?('error') && res.key?('message') && res.key?('stack')
-          e = RuntimeError.new("#{res['error']}: #{res['message']}")
-          e.set_backtrace(res['stack'].lines)
-          raise e
-        end
-        res
-      end
-
-      def eval_with_opal(ruby_source = '', &block)
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
-        res = self.evaluate <<~JAVASCRIPT
-          function(){
-            if (typeof Opal === "undefined") {
-              #{Isomorfeus::Puppetmaster.opal_prelude}
-            }
-            try { return #{compiled_ruby} }
-            catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }
-          }
-        JAVASCRIPT
-        if res.is_a?(Hash) && res.key?('error') && res.key?('message') && res.key?('stack')
-          e = RuntimeError.new("#{res['error']}: #{res['message']}")
-          e.set_backtrace(res['stack'].lines)
-          raise e
-        end
-        res
-      rescue Puppeteer::ExecutionContext::EvaluationError => e
-        raise Isomorfeus::Puppetmaster::JavaScriptError.new(e.message)
+      def eval_ruby(ruby_source = '', file = nil, line = nil, &block)
+        @default_page.eval_ruby(ruby_source, file, line, &block)
+      end
+
+      def eval_with_opal(ruby_source = '', file = nil, line = nil, &block)
+        @default_page.eval_with_opal(ruby_source, file, line, &block)
       end
 
-      def isomorphic(ruby_source = '', &block)
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
-        eval_ruby(ruby_source)
+      def isomorphic(ruby_source = '', file = nil, line = nil, &block)
+        ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, file, line)
+        eval_ruby(ruby_source, file, line)
       end
 
-      def isomorphic_with_opal(ruby_source = '', &block)
-        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
-        eval_with_opal(ruby_source)
+      def isomorphic_with_opal(ruby_source = '', file = nil, line = nil, &block)
+        ruby_source, file, line = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, file, line)
+        eval_with_opal(ruby_source, file, line)
       end
 
       private

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.8.7'
+  PUPPETMASTER_VERSION = '0.9.0'
 end

data/lib/isomorfeus/puppetmaster.rb

@@ -14,11 +14,11 @@ module Isomorfeus
            source_block = source_block.children[source_block.children.index { |c| c.respond_to?(:type) && c.type == :block }]
         end
         source_block = source_block.children[2]
-        Unparser.unparse(source_block)
+        [ Unparser.unparse(source_block), block.source_location[0],  block.source_location[1]]
       end
 
-      def compile_ruby_source(source_code)
-        Opal.compile(source_code)
+      def compile_ruby_source(source_code, file)
+        Opal.compile(source_code, { file: file, backtick_javascript: true })
       end
 
       def opal_prelude

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport