Skip to content

Extend TraceurLoader to BrowserTraceurLoader and NodeTraceurLoader. #1802

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

Closed
wants to merge 8 commits into from
Closed

Extend TraceurLoader to BrowserTraceurLoader and NodeTraceurLoader. #1802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6ded4f
Add TraceurLoader.createLoader() to simplify the creation of loaders …
johnjbarton Mar 9, 2015
8826995
respond to review
johnjbarton Mar 11, 2015
ece7ed4
Extend TraceurLoader for Browser and Node
johnjbarton Mar 12, 2015
504f768
respond to review
johnjbarton Mar 12, 2015
2f95b43
Move src/runtime/System.js to src/browser/System.js
johnjbarton Mar 22, 2015
7d7bd75
BrowserTraceurLoader and NodeTracerLoader extend TraceurLoader.
johnjbarton Mar 25, 2015
8af413a
self-review
johnjbarton Mar 29, 2015
7716873
Remove extraneous part of LoaderModuleFail test.
johnjbarton Mar 30, 2015
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
4 changes: 2 additions & 2 deletions demo/transcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import {TraceurLoader} from '[email protected]/src/runtime/TraceurLoader.js';
import {BrowserTraceurLoader} from '[email protected]/src/runtime/TraceurLoader.js';
import {ErrorReporter} from '[email protected]/src/util/ErrorReporter.js';
import {
SourceMapGenerator,
Expand All @@ -39,7 +39,7 @@ export function transcode(contents, options, onSuccess, onFailure) {
}
};

var loader = new TraceurLoader(webLoader, url);
var loader = new BrowserTraceurLoader();
var load = options.script ? loader.script : loader.module;
load.call(loader, contents, loadOptions).
then(() => onSuccess(loadOptions.metadata),
Expand Down
5 changes: 2 additions & 3 deletions src/WebPageTranscoder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
// Applies Traceur to all scripts in a Web page.

import {Loader} from './runtime/Loader.js';
import {TraceurLoader} from './runtime/TraceurLoader.js';
import {BrowserTraceurLoader} from './runtime/TraceurLoader.js';
import {ErrorReporter} from './util/ErrorReporter.js';
import {webLoader} from './runtime/webLoader.js';

export const scriptSelector = 'script[type="module"],script[type="text/traceur"]';

Expand Down Expand Up @@ -106,7 +105,7 @@ export class WebPageTranscoder {

get loader() {
if (!this.loader_) {
this.loader_ = new TraceurLoader(webLoader, this.url);
this.loader_ = new BrowserTraceurLoader();
}
return this.loader_;
}
Expand Down
14 changes: 2 additions & 12 deletions src/runtime/System.js → src/browser/System.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import {ErrorReporter} from '../util/ErrorReporter.js';
import {TraceurLoader} from '../runtime/TraceurLoader.js';
import {LoaderCompiler} from './LoaderCompiler.js';
import {webLoader} from './webLoader.js';
import {BrowserTraceurLoader} from '../runtime/TraceurLoader.js';

var url;
var fileLoader;
if (typeof window !== 'undefined' && window.location) {
url = window.location.href;
fileLoader = webLoader;
}

var traceurLoader = new TraceurLoader(fileLoader, url);
let traceurLoader = new BrowserTraceurLoader();

Reflect.global.System = traceurLoader;

Expand Down
1 change: 1 addition & 0 deletions src/node/NodeLoaderCompiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ export class NodeLoaderCompiler extends LoaderCompiler {
// sourcemap=memory mechanism can help us debug.
let result = runInThisContext(content, filename);
codeUnit.metadata.transformedTree = null;
return result;
}
}
9 changes: 1 addition & 8 deletions src/node/System.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,8 @@

var fs = require('fs');
var traceur = require('./traceur.js');
var path = require('path');

var nodeLoader = require('./nodeLoader.js');
var url = (path.resolve('./') + '/').replace(/\\/g, '/');

var NodeLoaderCompiler = traceur.runtime.NodeLoaderCompiler;

var System = new traceur.runtime.TraceurLoader(nodeLoader, url,
new NodeLoaderCompiler());
var System = new traceur.runtime.NodeTraceurLoader();

require('source-map-support').install({
retrieveSourceMap: function(filename) {
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/Loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import {InternalLoader} from './InternalLoader.js';

function throwAbstractMethod() {
export function throwAbstractMethod() {
throw new Error('Unimplemented Loader function, see extended class');
}

Expand Down
2 changes: 1 addition & 1 deletion src/runtime/LoaderCompiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class LoaderCompiler {

// The name used in sourceMaps
var sourceName = codeUnit.metadata.sourceName = codeUnit.address ||
codeUnit.normalizedName || String(++anonymousSourcesSeen);
codeUnit.normalizedName || '(unnamed)#' + String(++anonymousSourcesSeen);
metadata.tree = metadata.compiler.parse(codeUnit.source, sourceName);
}

Expand Down
23 changes: 20 additions & 3 deletions src/runtime/TraceurLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
// limitations under the License.

import {isAbsolute, resolveUrl} from '../util/url.js';
import {Loader} from '../runtime/Loader.js';
import {LoaderCompiler} from '../runtime/LoaderCompiler.js';
import {systemjs} from '../runtime/system-map.js';
import {Loader} from './Loader.js';
import {LoaderCompiler} from './LoaderCompiler.js';
import {NodeLoaderCompiler} from '../node/NodeLoaderCompiler.js';
import {systemjs} from './system-map.js';
import {webLoader} from './webLoader.js';

var version = __moduleName.slice(0, __moduleName.indexOf('/'));
var uniqueNameCount = 0;
Expand Down Expand Up @@ -301,3 +303,18 @@ export class TraceurLoader extends Loader {
}

}

export class BrowserTraceurLoader extends TraceurLoader {
constructor() {
super(webLoader, window.location.href, new LoaderCompiler());
}
}

export class NodeTraceurLoader extends TraceurLoader {
constructor() {
let path = require('path');
let fileloader = require('../node/nodeLoader.js');
let url = (path.resolve('./') + '/').replace(/\\/g, '/');
super(fileloader, url, new NodeLoaderCompiler());
}
}
4 changes: 2 additions & 2 deletions src/traceur.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

export {System} from './runtime/System.js';

// Used by unit tests only
import './util/MutedErrorReporter.js';

Expand Down Expand Up @@ -96,12 +94,14 @@ import {Loader} from './runtime/Loader.js';
import {LoaderCompiler} from './runtime/LoaderCompiler.js';
import {NodeLoaderCompiler} from './node/NodeLoaderCompiler.js';
import {InlineLoaderCompiler} from './runtime/InlineLoaderCompiler.js';
import {NodeTraceurLoader} from './runtime/TraceurLoader.js';
import {TraceurLoader} from './runtime/TraceurLoader.js';

export let runtime = {
InlineLoaderCompiler,
Loader,
LoaderCompiler,
NodeLoaderCompiler,
NodeTraceurLoader,
TraceurLoader
};
2 changes: 1 addition & 1 deletion test/runtime.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
mocha.setup({ui: 'tdd'});

</script>
<script src="unit/runtime/System.js"></script>
<script src="unit/browser/System.js"></script>
<div id="mocha"></div>
<script>

Expand Down
0 test/unit/runtime/System.js → test/unit/browser/System.js
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion test/unit/node/generated-code-dependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@ suite('context test', function() {
name: inputFilename
}];
var cwd = process.cwd();
traceur.System.baseURL = cwd;
recursiveCompile(tempFileName, rootSources, new traceur.util.Options())
.then(function () {
assert.equal(process.cwd(), cwd);
Expand Down
64 changes: 32 additions & 32 deletions test/unit/runtime/Loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
// limitations under the License.

import {suite, test, assert} from '../../unit/unitTestRunner.js';
import {getTestLoader} from '../../modular/getTestLoader.js';

function getTestLoader() {
return new System.constructor();
}

suite('Loader.js', function() {

Expand Down Expand Up @@ -108,9 +111,9 @@ suite('Loader.js', function() {

test('LoaderModule', function(done) {
var code =
'import * as a from "./resources/test_a.js";\n' +
'import * as b from "./resources/test_b.js";\n' +
'import * as c from "./resources/test_c.js";\n' +
'import * as a from "./test/unit/runtime/resources/test_a.js";\n' +
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why can't this be relative any more?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Per our earlier discussion with @guybedford we now use

function getTestLoader() {
  return new System.constructor();
}

The baseurl for this loader will be the node working directory.

'import * as b from "./test/unit/runtime/resources/test_b.js";\n' +
'import * as c from "./test/unit/runtime/resources/test_c.js";\n' +
'\n' +
'export var arr = [\'test\', a.name, b.name, c.name];\n';

Expand All @@ -127,7 +130,7 @@ suite('Loader.js', function() {

test('LoaderModuleWithSubdir', function(done) {
var code =
'import * as d from "./subdir/test_d.js";\n' +
'import * as d from "./test/unit/runtime/subdir/test_d.js";\n' +
'\n' +
'export var arr = [d.name, d.e.name];\n';

Expand All @@ -140,30 +143,19 @@ suite('Loader.js', function() {
});

test('LoaderModuleFail', function(done) {
var code =
'import * as a from "./resources/test_a.js";\n' +
'import * as b from "./resources/test_b.js";\n' +
'import * as c from "./resources/test_c.js";\n' +
'\n' +
'[\'test\', SYNTAX ERROR a.name, b.name, c.name];\n';

var reporter = new MutedErrorReporter();

var result = getTestLoader(reporter).module(code, {}).then(
var code = 'DeliboratelyUndefined; \n';
var result = getTestLoader().module(code, {}).then(
function(value) {
fail('Should not have succeeded');
done();
}, function(error) {
// TODO(jjb): We should probably get some meaningful error here.

//assert.isTrue(reporter.hadError());
assert.isTrue(true);
}, function(ex) {
assert((ex + '').indexOf('DeliboratelyUndefined') !== -1);
done();
}).catch(done);
});

test('LoaderLoad', function(done) {
getTestLoader().loadAsScript('./resources/test_script.js', {}).then(function(result) {
getTestLoader().loadAsScript('./test/unit/runtime/resources/test_script.js', {}).then(function(result) {
assert.equal('A', result[0]);
assert.equal('B', result[1]);
assert.equal('C', result[2]);
Expand All @@ -173,7 +165,7 @@ suite('Loader.js', function() {

test('LoaderLoad.Fail', function(done) {
var reporter = new MutedErrorReporter();
getTestLoader(reporter).loadAsScript('./resources/non_existing.js', {}).then(function(result) {
getTestLoader(reporter).loadAsScript('./test/unit/runtime/resources/non_existing.js', {}).then(function(result) {
fail('should not have succeeded');
done();
}, function(error) {
Expand All @@ -183,7 +175,7 @@ suite('Loader.js', function() {
});

test('Loader.LoadAsScriptAll', function(done) {
var names = ['./resources/test_script.js'];
var names = ['./test/unit/runtime/resources/test_script.js'];
getTestLoader().loadAsScriptAll(names, {}).then(function(results) {
var result = results[0];
assert.equal('A', result[0]);
Expand All @@ -194,7 +186,7 @@ suite('Loader.js', function() {
});

test('LoaderImport', function(done) {
getTestLoader().import('./resources/test_module.js', {}).then(function(mod) {
getTestLoader().import('./test/unit/runtime/resources/test_module.js', {}).then(function(mod) {
assert.equal('test', mod.name);
assert.equal('A', mod.a);
assert.equal('B', mod.b);
Expand All @@ -204,7 +196,7 @@ suite('Loader.js', function() {
});

test('LoaderImportAll', function(done) {
var names = ['./resources/test_module.js'];
var names = ['./test/unit/runtime/resources/test_module.js'];
getTestLoader().importAll(names, {}).then(function(mods) {
var mod = mods[0];
assert.equal('test', mod.name);
Expand Down Expand Up @@ -232,7 +224,7 @@ suite('Loader.js', function() {

test('LoaderImport.Fail', function(done) {
var reporter = new MutedErrorReporter();
getTestLoader(reporter).import('./resources/non_existing.js', {}).then(function(mod) {
getTestLoader(reporter).import('./test/unit/runtime/resources/non_existing.js', {}).then(function(mod) {
fail('should not have succeeded')
done();
}, function(error) {
Expand All @@ -244,7 +236,7 @@ suite('Loader.js', function() {
test('LoaderImport.Fail.deperror', function(done) {
var reporter = new MutedErrorReporter();
var metadata = {traceurOptions: {sourceMaps: 'memory'}};
getTestLoader(reporter).import('loads/main.js', {metadata: metadata}).then(
getTestLoader(reporter).import('test/unit/runtime/loads/main.js', {metadata: metadata}).then(
function(mod) {
fail('should not have succeeded')
done();
Expand All @@ -258,9 +250,9 @@ suite('Loader.js', function() {

test('Loader.define', function(done) {
var name = System.normalize('./test_define.js');
getTestLoader().import('./resources/side-effect.js', {}).then(function(mod) {
getTestLoader().import('./test/unit/runtime/resources/side-effect.js', {}).then(function(mod) {
assert.equal(6, mod.currentSideEffect()); // starting value.
var src = 'export {name as a} from \'./resources/test_a.js\';\n' +
var src = 'export {name as a} from \'./test/unit/runtime/resources/test_a.js\';\n' +
'export var d = 4;\n' + 'this.sideEffect++;';
return getTestLoader().define(name, src, {}).then(function() {
return mod;
Expand All @@ -277,7 +269,7 @@ suite('Loader.js', function() {

test('Loader.define.Fail', function(done) {
var name = System.normalize('./test_define.js');
getTestLoader().import('./resources/side-effect.js', {}).then(function(mod) {
getTestLoader().import('./test/unit/runtime/resources/side-effect.js', {}).then(function(mod) {
var src = 'syntax error';
getTestLoader().define(name, src, {}).then(function() {
fail('should not have succeeded');
Expand All @@ -293,7 +285,7 @@ suite('Loader.js', function() {
var normalizedName = System.normalize('./test_define_with_source_map.js');
var loader = getTestLoader();
var metadata = {traceurOptions: {sourceMaps: true}};
var src = 'export {name as a} from \'./resources/test_a.js\';\nexport var d = 4;\n';
var src = 'export {name as a} from \'./test/unit/runtime/resources/test_a.js\';\nexport var d = 4;\n';
loader.define(normalizedName, src, {metadata: metadata}).then(function() {
var sourceMap = loader.getSourceMap(normalizedName);
assert(sourceMap, normalizedName + ' has a sourceMap');
Expand All @@ -313,7 +305,7 @@ suite('Loader.js', function() {
actualWarning = msg;
};
var metadata = {traceurOptions: {junk: true}};
getTestLoader().import('./resources/test_module.js', {metadata: metadata}).
getTestLoader().import('./test/unit/runtime/resources/test_module.js', {metadata: metadata}).
then(function(mod) {
assert.equal(actualWarning,
'Unknown metadata.traceurOptions ignored: junk');
Expand All @@ -322,4 +314,12 @@ suite('Loader.js', function() {
}).catch(done);
});

test('System.constructor', function() {
let secondaryLoader = new System.constructor();
var path = './test/unit/runtime/resources/test_module.js';
secondaryLoader.import(path).then((module) => {
assert(module.a);
});
});

});
6 changes: 2 additions & 4 deletions test/unit/tools/SourceMapMapping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ import {SourceMapConsumer}
from '../../../src/outputgeneration/SourceMapIntegration.js';
import {OriginalSourceMapMapping} from '../../../demo/SourceMapMapping.js';

import {getTestLoader} from '../../modular/getTestLoader.js';

var path = 'test_a.js';
var input = '../runtime/resources/' + path;
var input = './test/unit/runtime/resources/' + path;
var output = './out/' + path;
// Force sourceMaps on for test.
var importOptions = {
Expand All @@ -32,7 +30,7 @@ var importOptions = {
}
};

var loader = getTestLoader();
var loader = new System.constructor();

var whenSourceMapMapping = loader.import(input, importOptions).
then((imported) => {
Expand Down
2 changes: 1 addition & 1 deletion tval
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ var metadata = {

// The module will evaluate and have process.argv ['node', filename, ...]
System.import(moduleName, {metadata: metadata}).catch(function(err) {
console.error(err.stack || err + '');
console.error('tval fails:', err.stack || err + '');
process.exit(1);
});