mumuki-javascript-runner 1.3.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbae54f53eb61d8c168cb7205b79695911762fbd0a6152aa1f5970ab42048e6
-  data.tar.gz: a3b1720e6d08c52c58cd5e85ea3595f40c993f4f8d9143ffc3d73b12dc155554
+  metadata.gz: cb2c3425cccd2c1dd04911c424109da786ab4cd9a6969904f168db188f625045
+  data.tar.gz: e849e9592b35944b138969f9596004471574bfea4eae1612fbaf53bd3f0a8a2e
 SHA512:
-  metadata.gz: e026121fce5a338302324fff1b67c69a7fd61698e70b715dc03e27e90f5741f40410995885ab16870879ad669655b1873fba0fbf03a569f4ee57c785388d5ee1
-  data.tar.gz: 6ad1cf24cdbcb8ceb1477cc33fae853f8f9eb3502712064a26c5191308ef6b25e34dab0162fe22b1accbaa95a56996abf8dff0e78a6e66f7ff5c775bc3cce84f
+  metadata.gz: 875f71c53f6566579d4efe71dfe4e2522e3286f538d80957d5bfadf4875a8d003a536db763a20e3fa283af80bea54a351d6a5a3f27693549e610e8fe9ff050f5
+  data.tar.gz: 162afef619eaff6248339f5c8d9703816434174bb65de82b25e7fed7de6572b1663c7f6ec447b1f929cd407e5d32bc8d9756365d9ff2f60b3d8eb448b46fabac

data/lib/javascript_runner.rb

@@ -13,3 +13,4 @@ require_relative './validation_hook'
 require_relative './test_hook'
 require_relative './expectations_hook'
 require_relative './query_hook'
+require_relative './try_hook'

data/lib/query_hook.rb

@@ -1,18 +1,27 @@
 class JavascriptQueryHook < Mumukit::Templates::FileHook
+  with_error_patterns
   isolated true
 
+  VAR_REGEXP = /^ *(?:var|let) +([a-zA-Z_$][a-zA-Z_$0-9]*)/
+  VAR_ASSIGN_REGEXP = /^ *(?:var|let) +([a-zA-Z_$][a-zA-Z_$0-9]*) *=/
+  CONST_ASSIGN_REGEXP = /^ *const +([a-zA-Z_$][a-zA-Z_$0-9]*) *=/
+
   def tempfile_extension
     '.js'
   end
 
-
   def compile_file_content(r)
+    "#{compile_file_header(r)}\n#{compile_query(r.query)}"
+  end
+
+  def compile_file_header(r)
 <<javascript
 'use strict';
 
 function mumukiConsolePrettyPrint(e) {
     if (e instanceof Function) return '<function>';
-    return JSON.stringify(e);
+    const json = JSON.stringify(e);
+    return json && json.replace(/"(\\w+)"\s*:/g, '$1:');
  }
 
 #{r.extra}
@@ -20,25 +29,77 @@ function mumukiConsolePrettyPrint(e) {
 #{r.content}
 
 #{compile_cookie(r.cookie)}
-
-#{compile_query(r.query)}
 javascript
   end
 
-  def compile_query(query)
-    if query.start_with?('var ') || query.start_with?('let ')
-      "#{query}\nconsole.log('=> undefined')"
+  def compile_query(query, output_prefix = "=> ", output_var = "__mumuki_query_result__")
+    if ['var', 'let', 'const'].any? { |type| query.start_with? "#{type} " }
+      "#{query}\nconsole.log('#{output_prefix}undefined')"
     else
-      "var __mumuki_query_result__ = #{query};\nconsole.log('=> ' + mumukiConsolePrettyPrint(__mumuki_query_result__))"
+      "var #{output_var} = #{query};\nconsole.log('#{output_prefix}' + mumukiConsolePrettyPrint(#{output_var}))"
     end
   end
 
   def compile_cookie(cookie)
     return if cookie.blank?
-    cookie.map { |query| "try { #{query} } catch (e) {}" }.join("\n")
+
+    compile_statements(cookie).join "\n"
   end
 
   def command_line(filename)
     "node #{filename}"
   end
+
+  private
+
+  def compile_statements(cookie)
+    reject_duplicated_statements wrap_statements(cookie)
+  end
+
+  def wrap_statements(cookie)
+    cookie.map do |query|
+      case query
+      when CONST_ASSIGN_REGEXP
+        declaration_with_assignment 'const', CONST_ASSIGN_REGEXP, $1, query
+      when VAR_ASSIGN_REGEXP
+        declaration_with_assignment 'var', VAR_ASSIGN_REGEXP, $1, query
+      when VAR_REGEXP
+        "var #{$1}"
+      else
+        "try { #{query} } catch (e) {}"
+      end
+    end
+  end
+
+  def reject_duplicated_statements(sentences)
+    sentences.select.with_index do |line, index|
+      next line if !line.match(VAR_ASSIGN_REGEXP) && !line.match(VAR_REGEXP) && !line.match(CONST_ASSIGN_REGEXP)
+      name = $1
+      sentences.slice(0, index).none? { |previous_line| declaration? previous_line, name }
+    end
+  end
+
+  def declaration_with_assignment(type, type_pattern, name, expression)
+    "#{type} #{name} = (function() { try { return #{expression.gsub(type_pattern, '')} } catch(e) { return undefined } })()"
+  end
+
+  def declaration?(line, name)
+    declaration_of_type?(VAR_REGEXP, line, name) ||
+      declaration_of_type?(VAR_ASSIGN_REGEXP, line, name) ||
+      declaration_of_type?(CONST_ASSIGN_REGEXP, line, name)
+  end
+
+  def declaration_of_type?(type_pattern, line, name)
+    line.match(type_pattern) && $1 == name
+  end
+
+  def error_patterns
+    [
+      Mumukit::ErrorPattern::Errored.new(syntax_error_regexp)
+    ]
+  end
+
+  def syntax_error_regexp
+    /(?=\X*SyntaxError)(solution.*\n)|SyntaxError.*\n\K    at \X*/
+  end
 end

data/lib/try_hook.rb

@@ -0,0 +1,48 @@
+class JavascriptTryHook < Mumukit::Templates::TryHook
+  isolated true
+  attr_reader :query_hook
+
+  def initialize(config = nil)
+    super config
+    @query_hook = JavascriptQueryHook.new
+  end
+
+  def compile_file_content(r)
+    <<js
+#{@query_hook.compile_file_header(r)}
+console.log("#{query_separator}");
+#{@query_hook.compile_query(r.query, '')}
+console.log("#{goal_separator}");
+#{@query_hook.compile_query(r.goal.with_indifferent_access[:query] || 'null', '', '__mumuki_goal_query_result__')}
+js
+  end
+
+  delegate :tempfile_extension, to: :query_hook
+  delegate :command_line, to: :query_hook
+
+  def query_separator
+    '!!!MUMUKI-QUERY-START!!!'
+  end
+
+  def goal_separator
+    '!!!MUMUKI-GOAL-START!!!'
+  end
+
+  def to_structured_results(_file, result, status)
+    /#{query_separator}
+?(.*)
+#{goal_separator}
+?(.*)
+/m =~ result
+
+    {
+        query: to_query_result($1, status),
+        goal: $2,
+        status: status
+    }
+  end
+
+  def to_query_result(result, status)
+    { result: result, status: status }
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JavascriptVersionHook
-  VERSION = '1.3.4'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-javascript-runner
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.30'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,7 @@ files:
 - lib/metadata_hook.rb
 - lib/query_hook.rb
 - lib/test_hook.rb
+- lib/try_hook.rb
 - lib/validation_hook.rb
 - lib/version.rb
 homepage: http://github.com/mumuki/mumuki-javascript-server
@@ -127,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Javascript Runner for Mumuki