Skip to content

[iced3] Use source-map-support for stack trace formatting #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxtaco merged 7 commits into from
Jan 15, 2020
Merged

[iced3] Use source-map-support for stack trace formatting #206

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e80c9e
Add source-map-support, WIP
zapu Dec 3, 2019
46b7e04
Disable cache in s-m-s, use unique (for iced3) "<anonymous>" "file name"
zapu Dec 3, 2019
f98339b
allowAnonymous -> defaultAnonymous
zapu Dec 4, 2019
6d42b9e
Fix browser tests
zapu Dec 11, 2019
edb497e
Use installPrepareStackTrace in test:browser
zapu Dec 12, 2019
5a34b88
Bump version
zapu Dec 12, 2019
568b80a
README about source-map-support
zapu Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ runTests = (CoffeeScript) ->

# End Iced additions
# ----

helpers.extend global, require './test/support/helpers'

# When all the tests have run, collect and print errors.
Expand Down
803 changes: 403 additions & 400 deletions docs/v1/browser-compiler/iced-coffee-script.js
View file
Open in desktop

Large diffs are not rendered by default.

233 changes: 219 additions & 14 deletions docs/v1/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
Copy link
Copy Markdown
Collaborator Author

@zapu zapu Dec 11, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore when reviewing - generated file from documentation/test.html

<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title>CoffeeScript Test Suite</title>
<script src="browser-compiler/coffee-script.js"></script>
<script src="browser-compiler/iced-coffee-script.js"></script>
<script src="https://cdn.jsdelivr.net/underscorejs/1.8.3/underscore-min.js"></script>
<style>
body, pre {
Expand Down Expand Up @@ -37,6 +37,14 @@ <h1>CoffeeScript Test Suite</h1>
<pre id="stdout"></pre>

<script type="text/coffeescript">
@iced = CoffeeScript.require 'iced-runtime-3'

# In browser, use Coffeescripts's custom prepareStackTrace.
# It knows how to handle truly anonymous compilation, where filenames
# reported in call sites are not available at all, not even
# "<anonymous iced3>".
CoffeeScript.installPrepareStackTrace()

@testingBrowser = yes
@global = window
stdout = document.getElementById 'stdout'
Expand All @@ -61,6 +69,17 @@ <h1>CoffeeScript Test Suite</h1>
say exception, 'bad'
console.error exception

@atest = (description, fn) ->
++total
fn.call fn, (ok, obj) ->
if ok
++success
else
say "#{description}:", 'bad'
say fn.toString(), 'subtle' if fn.toString?
say obj, 'bad'
console.error ok, obj

@ok = (good, msg = 'Error') ->
throw Error msg unless good

Expand Down Expand Up @@ -106,6 +125,8 @@ <h1>CoffeeScript Test Suite</h1>
if err
if typeof err is 'function' and e instanceof err # Handle comparing exceptions
ok yes
else if err instanceof RegExp
ok err.test(e.toString())
else if e.toString().indexOf('[stdin]') is 0 # Handle comparing error messages
ok err e
else
Expand Down Expand Up @@ -3515,7 +3536,7 @@ <h1>CoffeeScript Test Suite</h1>
'''


if require?
unless global.testingBrowser
os = require 'os'
fs = require 'fs'
path = require 'path'
Expand All @@ -3525,8 +3546,10 @@ <h1>CoffeeScript Test Suite</h1>
ok err.stack.match /test[\/\\]error_messages\.coffee:\d+:\d+\b/

test "patchStackTrace stack prelude consistent with V8", ->
# This test freezes error stack trace formatting but that
# ultimately depends on 'source-map-support' library.
err = new Error
ok err.stack.match /^Error\n/ # Notice no colon when no message.
ok err.stack.match /^Error: \n/

err = new Error 'error'
ok err.stack.match /^Error: error\n/
Expand Down Expand Up @@ -3584,7 +3607,6 @@ <h1>CoffeeScript Test Suite</h1>
# and not line 6 (the generated JavaScript).
eq /StackTraceLineNumberTestFile.coffee:(\d)/.exec(error.stack.toString())[1], '3'


test "#4418 stack traces for compiled strings reference the correct line number", ->
try
CoffeeScript.run """
Expand All @@ -3600,7 +3622,6 @@ <h1>CoffeeScript Test Suite</h1>
# and not line 6 (the generated JavaScript).
eq /at testCompiledStringStackTraceLineNumber.*:(\d):/.exec(error.stack.toString())[1], '3'


test "#1096: unexpected generated tokens", ->
# Implicit ends
assertErrorFormat 'a:, b', '''
Expand Down Expand Up @@ -6855,6 +6876,15 @@ <h1>CoffeeScript Test Suite</h1>
i = i || 3
setTimeout cb, i

atest "cb scoping", (cb) ->
# Common pattern used in iced programming - ensure
# scoping rules here do not change for any reason.
foo = (cb) ->
await delay defer()
cb false, {} # to be ignored - we should call foo's func cb, not outer func cb
await foo defer()
cb true, {}

atest "nested of/in loop", (cb) ->
counter = 0
bar = () ->
Expand All @@ -6872,7 +6902,7 @@ <h1>CoffeeScript Test Suite</h1>
i++
cb(i is 2, {})

foo = (i, cb) ->
glfoo = (i, cb) ->
await delay(defer(), i)
cb(i)

Expand All @@ -6884,15 +6914,15 @@ <h1>CoffeeScript Test Suite</h1>

atest "basic iced trigger values", (cb) ->
i = 10
await foo(i, defer j)
await glfoo(i, defer j)
cb(i is j, {})

atest "basic iced set structs", (cb) ->
field = "yo"
i = 10
obj = { cat : { dog : 0 } }
await
foo(i, defer obj.cat[field])
glfoo(i, defer obj.cat[field])
field = "bar" # change the field to make sure that we captured "yo"
cb(obj.cat.yo is i, {})

Expand Down Expand Up @@ -7230,6 +7260,17 @@ <h1>CoffeeScript Test Suite</h1>
eq x, 2
cb x, {}

atest 'defer + arguments 3', (cb) ->
x = null
foo = (a,b,c,cb) ->
@x = arguments[1]
await delay defer()
cb null
obj = {}
await foo.call obj, 1, 2, 3, defer()
eq obj.x, 2
cb true, {}

test 'arguments array without await', ->
code = CoffeeScript.compile "fun = -> console.log(arguments)"
eq code.indexOf("_arguments"), -1
Expand Down Expand Up @@ -7369,6 +7410,35 @@ <h1>CoffeeScript Test Suite</h1>
await c.f defer z
cb(c.x is 3 and c.y is 4 and z is 5, {})

atest 'defer + class member assignments 2', (cb) ->
foo = (cb) ->
await delay defer()
cb null, 1, 2, 3
class Bar
b : (cb) ->
await delay defer()
await foo defer err, @x, @y, @z
cb null
c = new Bar()
await c.b defer()
cb c.x is 1 and c.y is 2 and c.z is 3, {}

atest 'defer + class member assignments 3', (cb) ->
foo = (cb) ->
await delay defer()
cb null, 1, 2, 3
class Bar
b : (cb) ->
await delay defer()
bfoo = (cb) =>
await foo defer err, @x, @y, @z
cb null
await bfoo defer()
cb null
c = new Bar()
await c.b defer()
cb c.x is 1 and c.y is 2 and c.z is 3, {}

# tests bug #146 (github.com/maxtaco/coffee-script/issues/146)
atest 'deferral variable with same name as a parameter in outer scope', (cb) ->
val = 0
Expand Down Expand Up @@ -7783,18 +7853,18 @@ <h1>CoffeeScript Test Suite</h1>

atest "overused deferral error message 2", (test_cb) ->
wrap_error test_cb, (msg) ->
msg.indexOf('test/iced.coffee:') != -1 and msg.indexOf('A.b') != -1
msg.indexOf('test/iced.coffee:') != -1 and msg.indexOf('A::b') != -1

class A
b: () ->
b : () ->
foo = (cb) -> cb(); cb()
await foo defer()

new A().b()

atest "overused deferral error message 3", (test_cb) ->
wrap_error test_cb, (msg) ->
msg.indexOf('test/iced.coffee:') != -1 and msg.indexOf('<anon_func>') != -1
msg.indexOf('test/iced.coffee:') != -1 and msg.indexOf('anon_func') != -1

anon_func = ->
foo = (cb) -> cb(); cb()
Expand Down Expand Up @@ -7878,6 +7948,92 @@ <h1>CoffeeScript Test Suite</h1>
obj2 = { version : __builtin_iced_version_x ? "unknown" }
eq obj2.version, "unknown"

atest 'async function and this-binding 1', (cb) ->
a = (cb) ->
await delay defer()
@x = 5
cb null
obj = {}
await a.call(obj, defer())
cb obj.x is 5, {}

atest 'async function and this-binding 2', (cb) ->
obj = {}
a = (cb) ->
b = (cb) =>
await delay defer()
ok @ is obj
cb null
await b defer()
# passing another `this` using `call` should not do anything
# because b is bound.
await b.call {}, defer()
cb null
await a.call(obj, defer())
cb true, {}

atest 'async function and this-binding 3', (cb) ->
obj1 = {}
obj2 = {}
a = (cb) ->
ok @ is obj1
b = (cb) ->
await delay defer()
ok @ is obj2
cb null
ok @ is obj1
await b.call obj2, defer()
ok @ is obj1
cb null
await a.call obj1, defer()
cb true, {}

atest 'this-binding in string interpolations', (cb) ->
class A
constructor : (@name) ->
a : (cb) ->
m = "Hello #{@name}"
await delay defer()
zzz = () -> ok no
cb m
obj = new A("world")
await obj.a defer msg
cb msg is "Hello world", {}

atest 'this-binding in class method', (cb) ->
class A
constructor : () -> @test = 0
foo : (cb) ->
bar = (cb) =>
await delay defer()
@test++
cb null
await bar defer()
await bar.call {}, defer()
cb null
obj = new A()
await obj.foo defer()
cb obj.test is 2, {}

# test "caller name compatibility", () ->
# main_sync = () ->
# foo = () ->
# caller = foo.caller?.name
# eq caller, "main_sync"
# x = foo()
# main_sync()

# atest "(async) caller name compatibility", (cb) ->
# main_async = (cb) ->
# main_async.name2 = 'main_async'
# foo = () ->
# caller = foo.caller?.name2
# eq caller.caller, "main_async"
# x = foo()
# await delay defer()
# cb true, {}
# main_async cb

</script>
<script type="text/x-coffeescript" class="test" id="iced_advanced">
if require?
Expand Down Expand Up @@ -7983,7 +8139,6 @@ <h1>CoffeeScript Test Suite</h1>
ok = false if out[0]
cb(ok, {})


##----------------------------------------------------------------------

atest "stack walk", (cb) ->
Expand Down Expand Up @@ -8011,7 +8166,6 @@ <h1>CoffeeScript Test Suite</h1>
await foo defer()
cb(check, {})


##----------------------------------------------------------------------

atest "multi", (cb) ->
Expand All @@ -8029,8 +8183,59 @@ <h1>CoffeeScript Test Suite</h1>
await rv.wait defer()
cb(true, {})

</script>
<script type="text/x-coffeescript" class="test" id="iced_trace_names">
compileAndGetTraceNames = (src) ->
traces = []
nodes = CoffeeScript.nodes src, { bare : true }
nodes.compile()
nodes.traverseChildren true, (x) -> traces.push n if n = x.icedTraceName
traces.filter((x) -> x)

test "nested functions 1", ->
src = """
foo = ->
y = ->
"""
traces = compileAndGetTraceNames(src)
# TODO: Ideally, instead of 'y' we want 'foo.y' or something similar.
deepEqual traces, ['foo', 'y']

test "class methods", ->
src = """
class B
y : ->
z = ->
"""
traces = compileAndGetTraceNames(src)
deepEqual traces, ['B::y', 'B::#z']


src = """
exports.B = class C
y : ->
z = ->
"""
traces = compileAndGetTraceNames(src)
deepEqual traces, ['C::y', 'C::#z']

test "object method", ->
src = "exports.x = ->"
traces = compileAndGetTraceNames(src)
deepEqual traces, ['exports.x']

src = "exports.x = x = ->"
traces = compileAndGetTraceNames(src)
deepEqual traces, ['x']

test "object methods 2", ->
src = """
zzz =
foo : ->
bar : ->
"""
traces = compileAndGetTraceNames(src)
# TODO: We want `zzz.foo` and `zzz.bar` instead.
deepEqual traces, ['foo', 'bar']

</script>
<script type="text/x-coffeescript" class="test" id="importing">
Expand Down
Loading