mumuki-javascript-runner 1.3.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbae54f53eb61d8c168cb7205b79695911762fbd0a6152aa1f5970ab42048e6
-  data.tar.gz: a3b1720e6d08c52c58cd5e85ea3595f40c993f4f8d9143ffc3d73b12dc155554
+  metadata.gz: 5584ae96f5cefe3bebfffc73f112b1e449ce5c32e3d4ff0494223c9e0b0f18e4
+  data.tar.gz: 92d98ddd5222726ece6dfec3a41d41c7350163d906649595db11bb8542843c7e
 SHA512:
-  metadata.gz: e026121fce5a338302324fff1b67c69a7fd61698e70b715dc03e27e90f5741f40410995885ab16870879ad669655b1873fba0fbf03a569f4ee57c785388d5ee1
-  data.tar.gz: 6ad1cf24cdbcb8ceb1477cc33fae853f8f9eb3502712064a26c5191308ef6b25e34dab0162fe22b1accbaa95a56996abf8dff0e78a6e66f7ff5c775bc3cce84f
+  metadata.gz: 5e2d6882f17a35dd4eadac042c1f34c6785900c09b37a90e2056a8bf72247869bd9a02a95137c8edb99654e9a09df168205aeecae93013ff41682182e3476739
+  data.tar.gz: 5a49c40554275ed469945d858f7c27aacfc7cc83e39083580959702b12d320e5d49a2c540738a1911bea9eba38a3cb0e122bd6c7b7524425531af3424c728368

data/lib/feedback_hook.rb

@@ -0,0 +1,25 @@
+class JavascriptFeedbackHook < Mumukit::Hook
+  def run!(request, results)
+    content = request.content
+    test_results = test_failure_messages results
+
+    JavascriptExplainer.new.explain(content, test_results)
+  end
+
+  def test_failure_messages(results)
+    structured_test_results = results.test_results[0]
+    if structured_test_results.is_a? Array
+      structured_test_results.select { |it| it[1].failed? }.map { |it| it[2] }.join("\n")
+    else
+      ''
+    end
+  end
+
+  class JavascriptExplainer < Mumukit::Explainer
+    def explain_is_not_defined(_, test_results)
+      (/([a-zA-Z0-9_]+) is not defined/.match test_results).try do |it|
+        {identifier: it[1]}
+      end
+    end
+  end
+end

data/lib/javascript_runner.rb

@@ -1,10 +1,13 @@
 require 'mumukit'
 
+I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
+
 Mumukit.runner_name = 'javascript'
 Mumukit.configure do |config|
   config.docker_image = 'mumuki/mumuki-mocha-worker'
   config.structured = true
   config.stateful = true
+  config.content_type = 'markdown'
 end
 
 require_relative './version'
@@ -12,4 +15,6 @@ require_relative './metadata_hook'
 require_relative './validation_hook'
 require_relative './test_hook'
 require_relative './expectations_hook'
+require_relative './feedback_hook'
 require_relative './query_hook'
+require_relative './try_hook'

data/lib/locales/en.yml

@@ -0,0 +1,2 @@
+en:
+  is_not_defined: "it looks like you are using `%{identifier}` but it is not defined. Perhaps you have misspelled it or you need to define it"

data/lib/locales/es.yml

@@ -0,0 +1,2 @@
+es:
+  is_not_defined: "parece que estás usando `%{identifier}` pero no está definido. ¿Puede que hayas escrito mal su nombre o tengas que definirlo?"

data/lib/locales/pt.yml

@@ -0,0 +1,2 @@
+pt:
+  is_not_defined: "Parece que você usa %{identifier} mas não está indefinido. Você digitou o nome errado ou precisa defini-lo"

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,81 @@ 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(error_regexp)
+    ]
+  end
+
+  def error_types
+    '(Reference|Syntax|Type)Error'
+  end
+
+  def error_regexp
+    /(?=\X*#{error_types})(solution.*\n|var __mumuki_query_result__ = )|#{error_types}.*\n\K\X*/
+  end
 end

data/lib/test_hook.rb

@@ -1,13 +1,12 @@
 class JavascriptTestHook < Mumukit::Templates::FileHook
   isolated true
   structured true, separator: '!!!JAVASCRIPT-MUMUKI-OUTPUT!!!'
+  line_number_offset 3, include_extra: true
 
   def compile_file_content(request)
 <<javascript
 'use strict';
-
-var assert = require('assert');
-
+let assert = require('assert');
 #{request.extra}
 #{request.content}
 describe('', function() {
@@ -32,11 +31,19 @@ javascript
     transform(super['tests'])
   end
 
+  def post_process_unstructured_result(file, result, status)
+    if status.errored?
+      [content_type.code(result.gsub(/(SyntaxError: .*\n)(.|\n)*/) { $1 }), status]
+    else
+      super
+    end
+  end
+
   def transform(examples)
     examples.map { |e| [e['fullTitle'], e['err'].present? ? :failed : :passed, parse_out(e['err'])] }
   end
 
   def parse_out(exception)
-    exception.present? ? exception['message'] : ''
+    exception.present? ? content_type.code(exception['message']) : ''
   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/validation_hook.rb

@@ -1,7 +1,7 @@
 class JavascriptValidationHook < Mumukit::Hook
   def validate!(request)
     matches = request_matches?(request) do |it|
-      it =~ /(^|\W+)(require|process|os|fs|eval|cluster|v8|vm|tty|tls|root|global|crypto|stream|events)(\W+|$)/
+      it =~ /(^|[^_[[:alnum:]]]+)(require|process|os|fs|eval|cluster|v8|vm|tty|tls|root|global|crypto|stream|events)([^_[[:alnum:]]]+|$)/
     end
     raise Mumukit::RequestValidationError, "You can not use #{$2} here" if matches
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JavascriptVersionHook
-  VERSION = '1.3.4'
+  VERSION = '1.7.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.7.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.40'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,10 +102,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/expectations_hook.rb
+- lib/feedback_hook.rb
 - lib/javascript_runner.rb
+- lib/locales/en.yml
+- lib/locales/es.yml
+- lib/locales/pt.yml
 - 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 +132,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.3
 signing_key: 
 specification_version: 4
 summary: Javascript Runner for Mumuki