Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit 393c2b3

Browse files
author
Olivier Chafik
committed
Add --modules=node support
- Force import order in all sdk files + simplify module builders - Stub a node_test.sh with hello world + DeltaBlue (to be expanded to language tests in a followup change) - Use global_ from dart:_runtime in html lib - Better export for symbols that node chokes upon: throw, const, void, implements, export... (define as throw_ locally, with proper local resolution, then export as throw). - Cleanup node module builder BUG= [email protected] Review URL: https://codereview.chromium.org/1633003002 .
1 parent 32a410b commit 393c2b3

33 files changed

+2710
-248
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ before_install:
1414
- export DISPLAY=:99.0
1515
- sh -e /etc/init.d/xvfb start
1616
before_script:
17+
- nvm install 5.5.0
1718
- npm install
1819
script:
1920
- ./tool/presubmit.sh && ./tool/coverage.sh

lib/runtime/dart/_debugger.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ dart_library.library('dart/_debugger', null, /* Imports */[
1313
},
1414
set _devtoolsFormatter(_) {}
1515
});
16-
function typeof$(object) {
16+
function _typeof(object) {
1717
return typeof object;
1818
}
19-
dart.fn(typeof$, core.String, [dart.dynamic]);
20-
function instanceof$(object, clazz) {
19+
dart.fn(_typeof, core.String, [dart.dynamic]);
20+
function _instanceof(object, clazz) {
2121
return object instanceof clazz;
2222
}
23-
dart.fn(instanceof$, core.bool, [dart.dynamic, dart.dynamic]);
23+
dart.fn(_instanceof, core.bool, [dart.dynamic, dart.dynamic]);
2424
function getOwnPropertyNames(object) {
2525
return dart.as(dart.list(Object.getOwnPropertyNames(object), core.String), core.List$(core.String));
2626
}
@@ -45,14 +45,14 @@ dart_library.library('dart/_debugger', null, /* Imports */[
4545
names: ['getProperty', 'setProperty']
4646
});
4747
function isRegularDartObject(object) {
48-
if (typeof$(object) == 'function') return false;
49-
return instanceof$(object, core.Object);
48+
if (_typeof(object) == 'function') return false;
49+
return _instanceof(object, core.Object);
5050
}
5151
dart.fn(isRegularDartObject, core.bool, [dart.dynamic]);
5252
function getObjectTypeName(object) {
5353
let realRuntimeType = dart.realRuntimeType(object);
5454
if (realRuntimeType == null) {
55-
if (typeof$(object) == 'function') {
55+
if (_typeof(object) == 'function') {
5656
return '[[Raw JavaScript Function]]';
5757
}
5858
return '<Error getting type name>';
@@ -217,7 +217,7 @@ dart_library.library('dart/_debugger', null, /* Imports */[
217217
let nameSpan = new JsonMLElement('span');
218218
nameSpan.createTextChild(child.name != null ? dart.notNull(child.name) + ': ' : '');
219219
nameSpan.setStyle('color: rgb(136, 19, 145);');
220-
if (typeof$(child.value) == 'object' || typeof$(child.value) == 'function') {
220+
if (_typeof(child.value) == 'object' || _typeof(child.value) == 'function') {
221221
nameSpan.addStyle("padding-left: 13px;");
222222
li.appendChild(nameSpan);
223223
let objectTag = li.createObjectTag(child.value);
@@ -354,7 +354,7 @@ dart_library.library('dart/_debugger', null, /* Imports */[
354354
});
355355
class FunctionFormatter extends Formatter {
356356
accept(object) {
357-
if (typeof$(object) != 'function') return false;
357+
if (_typeof(object) != 'function') return false;
358358
return dart.realRuntimeType(object) != null;
359359
}
360360
hasChildren(object) {
@@ -537,8 +537,6 @@ dart_library.library('dart/_debugger', null, /* Imports */[
537537
dart.fn(registerDevtoolsFormatter);
538538
// Exports:
539539
exports.skipDartConfig = skipDartConfig;
540-
exports.typeof = typeof$;
541-
exports.instanceof = instanceof$;
542540
exports.getOwnPropertyNames = getOwnPropertyNames;
543541
exports.getOwnPropertySymbols = getOwnPropertySymbols;
544542
exports.JSNative = JSNative;

lib/runtime/dart/_js_mirrors.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dart_library.library('dart/_js_mirrors', null, /* Imports */[
2929
}
3030
dart.fn(reflectType, mirrors.TypeMirror, [core.Type]);
3131
const _dart = dart;
32-
const _metadata = _dart.metadata;
3332
function _dload(obj, name) {
3433
return _dart.dload(obj, name);
3534
}
@@ -96,23 +95,23 @@ dart_library.library('dart/_js_mirrors', null, /* Imports */[
9695
[_toJsMap]: [dart.dynamic, [core.Map$(core.Symbol, dart.dynamic)]]
9796
})
9897
});
99-
const _metadata$ = Symbol('_metadata');
98+
const _metadata = Symbol('_metadata');
10099
const _declarations = Symbol('_declarations');
101100
const _cls = Symbol('_cls');
102101
class JsClassMirror extends core.Object {
103102
get metadata() {
104-
return this[_metadata$];
103+
return this[_metadata];
105104
}
106105
get declarations() {
107106
return this[_declarations];
108107
}
109108
_(cls) {
110109
this[_cls] = cls;
111110
this.simpleName = core.Symbol.new(cls.name);
112-
this[_metadata$] = null;
111+
this[_metadata] = null;
113112
this[_declarations] = null;
114113
let fn = this[_cls][dart.metadata];
115-
this[_metadata$] = fn == null ? dart.list([], mirrors.InstanceMirror) : core.List$(mirrors.InstanceMirror).from(dart.as(dart.dsend(dart.dcall(fn), 'map', dart.fn(i => new JsInstanceMirror._(i), JsInstanceMirror, [dart.dynamic])), core.Iterable));
114+
this[_metadata] = fn == null ? dart.list([], mirrors.InstanceMirror) : core.List$(mirrors.InstanceMirror).from(dart.as(dart.dsend(dart.dcall(fn), 'map', dart.fn(i => new JsInstanceMirror._(i), JsInstanceMirror, [dart.dynamic])), core.Iterable));
116115
this[_declarations] = core.Map$(core.Symbol, mirrors.MethodMirror).new();
117116
this[_declarations].set(this.simpleName, new JsMethodMirror._(this, this[_cls]));
118117
}

0 commit comments

Comments
 (0)