Make sure Collectable is loaded for 'for'. Update node version to 8.3.0

bryanjos · bryanjos · commit 83c8ff44f551 · 2017-08-26T15:40:32.000-05:00
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,12 @@
 {
-  "presets": ["env"]
+  "presets": [
+    [
+      "env",
+      {
+        "targets": {
+          "node": "current"
+        }
+      }
+    ]
+  ]
 }
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
 erlang 20.0
 elixir 1.5.0-otp-20
-nodejs 8.2.1
+nodejs 8.3.0
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -165,6 +165,8 @@ defmodule ElixirScript.FindUsedModules do
   end
 
   defp walk({:for, _, generators}, state) do
+    walk(Collectable, state)
+
     Enum.each(generators, fn
       {:<<>>, _, body} ->
         walk(body, state)
diff --git a/lib/elixir_script/passes/translate/forms/for.ex b/lib/elixir_script/passes/translate/forms/for.ex
@@ -2,8 +2,7 @@ defmodule ElixirScript.Translate.Forms.For do
   @moduledoc false
 
   alias ESTree.Tools.Builder, as: JS
-  alias ElixirScript.Translate.Helpers
-  alias ElixirScript.Translate.{Form, Clause}
+  alias ElixirScript.Translate.{Form, Clause, Helpers, Identifier}
   alias ElixirScript.Translate.Forms.Pattern
 
  def compile({:for, _, generators}, state) do
@@ -24,9 +23,11 @@ defmodule ElixirScript.Translate.Forms.For do
       [JS.array_expression(args.patterns), fun, filter]
     )
 
-    collectable = JS.member_expression(
-      JS.identifier("Elixir"),
-      JS.identifier("Collectable")
+    members = ["Elixir", "Collectable" , "__load"]
+
+    collectable = Helpers.call(
+      Identifier.make_namespace_members(members),
+      [JS.identifier("Elixir")]
     )
 
     ast = Helpers.call(
diff --git a/package.json b/package.json
@@ -13,7 +13,8 @@
     "clean": "rm -rf priv/build",
     "test": "nyc ava src/javascript/tests",
     "build:test-app": "MIX_ENV=test mix elixirscript Main -o test/app/build/",
-    "test-app": "yarn build:test-app && NODE_ENV=test ava 'test/app/spec/**/*.spec.js'"
+    "test:test-app": "NODE_ENV=test ava 'test/app/spec/**/*.spec.js'",
+    "test-app": "yarn build && yarn build:test-app && yarn test:test-app"
   },
   "repository": {
     "type": "git",
@@ -23,7 +24,7 @@
   "license": "MIT",
   "dependencies": {
     "erlang-types": "^1.0.1",
-    "tailored": "^2.6.4"
+    "tailored": "^2.7.1"
   },
   "devDependencies": {
     "ava": "^0.21.0",
@@ -41,9 +42,7 @@
     "sinon": "^2.4.1"
   },
   "ava": {
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": {
       "babelrc": true
     }
diff --git a/priv/build/iife/ElixirScript.Core.js b/priv/build/iife/ElixirScript.Core.js

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,12 @@`
`1`	`1`	`{`
`2`		`- "presets": ["env"]`
	`2`	`+ "presets": [`
	`3`	`+ [`
	`4`	`+ "env",`
	`5`	`+ {`
	`6`	`+ "targets": {`
	`7`	`+ "node": "current"`
	`8`	`+ }`
	`9`	`+ }`
	`10`	`+ ]`
	`11`	`+ ]`
`3`	`12`	`}`