Use .js for module names

Issue google#1221

Author: arv

build/build-parse-tree-transformer.js

@@ -38,7 +38,7 @@ function printImports(trees) {
   names.forEach(function(name) {
     util.print('  %s,', name);
   });
-  util.print("} from '../syntax/trees/ParseTrees';")
+  util.print("} from '../syntax/trees/ParseTrees.js';")
 }
 
 function printHeader() {

build/build-parse-trees.js

@@ -26,8 +26,8 @@ var print = console.log.bind(console);
 util.printLicense();
 util.printAutoGenerated();
 
-print("import {ParseTree} from './ParseTree';");
-print("import * as ParseTreeType from './ParseTreeType';");
+print("import {ParseTree} from './ParseTree.js';");
+print("import * as ParseTreeType from './ParseTreeType.js';");
 
 // export var ARGUMENT_LIST = 'ARGUMENT_LIST';
 var data = fs.readFileSync(process.argv[2], 'utf-8');

demo/SourceMapMapping.js

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import {SourceMapConsumer, join}
-    from '../src/outputgeneration/SourceMapIntegration';
+    from '../src/outputgeneration/SourceMapIntegration.js';
 
 
 export class SourceMapMapping {

demo/repl-module.js

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {ErrorReporter} from '[email protected]/src/util/ErrorReporter';
+import {ErrorReporter} from '[email protected]/src/util/ErrorReporter.js';
 import {
   GeneratedSourceMapMapping,
   OriginalSourceMapMapping
-} from './SourceMapMapping';
+} from './SourceMapMapping.js';
 import {SourceMapConsumer}
-    from '[email protected]/src/outputgeneration/SourceMapIntegration';
-import {transcode, renderSourceMap} from './transcode';
-import {options as traceurOptions} from '[email protected]/src/Options';
-import {setOptionsFromSource} from './replOptions';
+    from '[email protected]/src/outputgeneration/SourceMapIntegration.js';
+import {transcode, renderSourceMap} from './transcode.js';
+import {options as traceurOptions} from '[email protected]/src/Options.js';
+import {setOptionsFromSource} from './replOptions.js';
 
 var hasError = false;
 var debouncedCompile = debounced(compile, 200, 2000);

demo/replOptions.js

@@ -17,7 +17,7 @@ import {
   CommandOptions,
   versionLockedOptions,
   toDashCase
-} from '[email protected]/src/Options';
+} from '[email protected]/src/Options.js';
 
 
 var optionChangeHandler;

demo/transcode.js

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {TraceurLoader} from '[email protected]/src/runtime/TraceurLoader';
-import {ErrorReporter} from '[email protected]/src/util/ErrorReporter';
+import {TraceurLoader} from '[email protected]/src/runtime/TraceurLoader.js';
+import {ErrorReporter} from '[email protected]/src/util/ErrorReporter.js';
 import {
   SourceMapGenerator,
   SourceMapConsumer
-} from '[email protected]/src/outputgeneration/SourceMapIntegration';
-import {options as traceurOptions} from '[email protected]/src/Options';
-import {webLoader} from '[email protected]/src/runtime/webLoader';
+} from '[email protected]/src/outputgeneration/SourceMapIntegration.js';
+import {options as traceurOptions} from '[email protected]/src/Options.js';
+import {webLoader} from '[email protected]/src/runtime/webLoader.js';
 
 class BatchErrorReporter extends ErrorReporter {
   constructor() {

src/Compiler.js

@@ -14,21 +14,21 @@
 
 import {
   AttachModuleNameTransformer
-} from './codegeneration/module/AttachModuleNameTransformer';
-import {FromOptionsTransformer} from './codegeneration/FromOptionsTransformer';
-import {Parser} from './syntax/Parser';
-import {PureES6Transformer} from './codegeneration/PureES6Transformer';
-import {SourceFile} from './syntax/SourceFile';
-import {CollectingErrorReporter} from './util/CollectingErrorReporter';
+} from './codegeneration/module/AttachModuleNameTransformer.js';
+import {FromOptionsTransformer} from './codegeneration/FromOptionsTransformer.js';
+import {Parser} from './syntax/Parser.js';
+import {PureES6Transformer} from './codegeneration/PureES6Transformer.js';
+import {SourceFile} from './syntax/SourceFile.js';
+import {CollectingErrorReporter} from './util/CollectingErrorReporter.js';
 import {
   Options,
   options as traceurOptions,
   versionLockedOptions
-} from './Options';
+} from './Options.js';
 
-import {ParseTreeMapWriter} from './outputgeneration/ParseTreeMapWriter';
-import {ParseTreeWriter} from './outputgeneration/ParseTreeWriter';
-import {SourceMapGenerator} from './outputgeneration/SourceMapIntegration';
+import {ParseTreeMapWriter} from './outputgeneration/ParseTreeMapWriter.js';
+import {ParseTreeWriter} from './outputgeneration/ParseTreeWriter.js';
+import {SourceMapGenerator} from './outputgeneration/SourceMapIntegration.js';
 
 function merge(...srcs) {
   var dest = Object.create(null);
@@ -139,7 +139,7 @@ export class Compiler {
     var moduleName = this.options_.moduleName;
     if (moduleName) {  // true or non-empty string.
       if (typeof moduleName !== 'string')  // true means resolve filename
-        moduleName = sourceName.replace(/\.js$/, '');
+        moduleName = sourceName;
     }
     tree = this.transform(tree, moduleName);
     return this.write(tree, outputName, sourceRoot);

src/WebPageTranscoder.js

@@ -15,10 +15,10 @@
 
 // Applies Traceur to all scripts in a Web page.
 
-import {Loader} from './runtime/Loader';
-import {TraceurLoader} from './runtime/TraceurLoader';
-import {ErrorReporter} from './util/ErrorReporter';
-import {webLoader} from './runtime/webLoader';
+import {Loader} from './runtime/Loader.js';
+import {TraceurLoader} from './runtime/TraceurLoader.js';
+import {ErrorReporter} from './util/ErrorReporter.js';
+import {webLoader} from './runtime/webLoader.js';
 
 export class WebPageTranscoder {
   constructor(url) {

src/codegeneration/AlphaRenamer.js

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ScopeTransformer } from './ScopeTransformer';
+import { ScopeTransformer } from './ScopeTransformer.js';
 import {
   FunctionDeclaration,
   FunctionExpression
-} from '../syntax/trees/ParseTrees';
+} from '../syntax/trees/ParseTrees.js';
 import {
   THIS
-} from '../syntax/PredefinedName';
+} from '../syntax/PredefinedName.js';
 import {
   createIdentifierExpression
-} from './ParseTreeFactory';
+} from './ParseTreeFactory.js';
 
 /**
  * Replaces one identifier with another identifier (alpha

src/codegeneration/AmdTransformer.js

@@ -12,16 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {ModuleTransformer} from './ModuleTransformer';
-import {createIdentifierExpression} from './ParseTreeFactory';
-import globalThis from './globalThis';
+import {ModuleTransformer} from './ModuleTransformer.js';
+import {
+  createIdentifierExpression,
+  createStringLiteralToken
+} from './ParseTreeFactory.js';
+import globalThis from './globalThis.js';
 import {
   parseExpression,
   parseStatement,
   parseStatements,
   parsePropertyDefinition
-} from './PlaceholderParser';
-import scopeContainsThis from './scopeContainsThis';
+} from './PlaceholderParser.js';
+import scopeContainsThis from './scopeContainsThis.js';
 
 export class AmdTransformer extends ModuleTransformer {
 
@@ -72,7 +75,11 @@ export class AmdTransformer extends ModuleTransformer {
 
   transformModuleSpecifier(tree) {
     var localName = this.getTempIdentifier();
-    this.dependencies.push({path: tree.token, local: localName});
+    // AMD does not allow .js
+    var value = tree.token.processedValue
+    var stringLiteral = createStringLiteralToken(value.replace(/\.js$/, ''));
+
+    this.dependencies.push({path: stringLiteral, local: localName});
     return createIdentifierExpression(localName);
   }
 }

src/codegeneration/AnnotationsTransformer.js

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {ParseTreeTransformer} from './ParseTreeTransformer';
+import {ParseTreeTransformer} from './ParseTreeTransformer.js';
 import {
   CONSTRUCTOR
-} from '../syntax/PredefinedName';
-import {STRING} from '../syntax/TokenType';
+} from '../syntax/PredefinedName.js';
+import {STRING} from '../syntax/TokenType.js';
 import {
   AnonBlock,
   ClassDeclaration,
@@ -27,8 +27,8 @@ import {
   LiteralExpression,
   PropertyMethodAssignment,
   SetAccessor
-} from '../syntax/trees/ParseTrees';
-import {propName} from '../staticsemantics/PropName';
+} from '../syntax/trees/ParseTrees.js';
+import {propName} from '../staticsemantics/PropName.js';
 import {
   createArgumentList,
   createArrayLiteralExpression,
@@ -37,8 +37,8 @@ import {
   createMemberExpression,
   createNewExpression,
   createStringLiteralToken
-} from './ParseTreeFactory';
-import {parseExpression, parseStatement} from './PlaceholderParser';
+} from './ParseTreeFactory.js';
+import {parseExpression, parseStatement} from './PlaceholderParser.js';
 
 class AnnotationsScope {
   constructor() {

src/codegeneration/ArrayComprehensionTransformer.js

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {ComprehensionTransformer} from './ComprehensionTransformer';
-import {createIdentifierExpression} from './ParseTreeFactory';
-import {parseStatement} from './PlaceholderParser';
+import {ComprehensionTransformer} from './ComprehensionTransformer.js';
+import {createIdentifierExpression} from './ParseTreeFactory.js';
+import {parseStatement} from './PlaceholderParser.js';
 
 /**
  * Array Comprehension Transformer:

src/codegeneration/ArrowFunctionTransformer.js

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {FunctionExpression} from '../syntax/trees/ParseTrees';
-import {TempVarTransformer} from './TempVarTransformer';
-import {FUNCTION_BODY} from '../syntax/trees/ParseTreeType';
-import alphaRenameThisAndArguments from './alphaRenameThisAndArguments';
+import {FunctionExpression} from '../syntax/trees/ParseTrees.js';
+import {TempVarTransformer} from './TempVarTransformer.js';
+import {FUNCTION_BODY} from '../syntax/trees/ParseTreeType.js';
+import alphaRenameThisAndArguments from './alphaRenameThisAndArguments.js';
 import {
   createFunctionBody,
   createParenExpression,
   createReturnStatement
-} from './ParseTreeFactory';
+} from './ParseTreeFactory.js';
 
 /**
  * Converts a concise body to a function body.

src/codegeneration/BlockBindingTransformer.js

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {AlphaRenamer} from './AlphaRenamer';
+import {AlphaRenamer} from './AlphaRenamer.js';
 import {
   ANON_BLOCK,
   BINDING_IDENTIFIER,
   VARIABLE_DECLARATION_LIST
-} from '../syntax/trees/ParseTreeType';
+} from '../syntax/trees/ParseTreeType.js';
 import {
   AnonBlock,
   BindingElement,
@@ -39,19 +39,19 @@ import {
   VariableDeclarationList,
   VariableStatement,
   WhileStatement
-} from '../syntax/trees/ParseTrees';
-import {ParseTreeTransformer} from './ParseTreeTransformer';
-import {VAR} from '../syntax/TokenType';
+} from '../syntax/trees/ParseTrees.js';
+import {ParseTreeTransformer} from './ParseTreeTransformer.js';
+import {VAR} from '../syntax/TokenType.js';
 import {
   createBindingIdentifier,
   createIdentifierExpression,
   createIdentifierToken
-} from './ParseTreeFactory';
-import {FindIdentifiers} from './FindIdentifiers';
-import {FindVisitor} from './FindVisitor';
-import {FnExtractAbruptCompletions} from './FnExtractAbruptCompletions';
-import {ScopeChainBuilder} from '../semantics/ScopeChainBuilder';
-import {prependStatements} from './PrependStatements';
+} from './ParseTreeFactory.js';
+import {FindIdentifiers} from './FindIdentifiers.js';
+import {FindVisitor} from './FindVisitor.js';
+import {FnExtractAbruptCompletions} from './FnExtractAbruptCompletions.js';
+import {ScopeChainBuilder} from '../semantics/ScopeChainBuilder.js';
+import {prependStatements} from './PrependStatements.js';
 
 /**
  * Transforms the block bindings from traceur to js.

src/codegeneration/ClassTransformer.js

@@ -12,28 +12,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {AlphaRenamer} from './AlphaRenamer';
+import {AlphaRenamer} from './AlphaRenamer.js';
 import {
   CONSTRUCTOR
-} from '../syntax/PredefinedName';
+} from '../syntax/PredefinedName.js';
 import {
   AnonBlock,
   ExportDeclaration,
   FunctionExpression,
   GetAccessor,
   PropertyMethodAssignment,
   SetAccessor
-} from '../syntax/trees/ParseTrees';
+} from '../syntax/trees/ParseTrees.js';
 import {
   GET_ACCESSOR,
   PROPERTY_METHOD_ASSIGNMENT,
   PROPERTY_VARIABLE_DECLARATION,
   SET_ACCESSOR
-} from '../syntax/trees/ParseTreeType';
-import {SuperTransformer} from './SuperTransformer';
-import {TempVarTransformer} from './TempVarTransformer';
-import {VAR} from '../syntax/TokenType';
-import {MakeStrictTransformer} from './MakeStrictTransformer';
+} from '../syntax/trees/ParseTreeType.js';
+import {SuperTransformer} from './SuperTransformer.js';
+import {TempVarTransformer} from './TempVarTransformer.js';
+import {VAR} from '../syntax/TokenType.js';
+import {MakeStrictTransformer} from './MakeStrictTransformer.js';
 import {
   createEmptyParameterList,
   createExpressionStatement,
@@ -44,14 +44,14 @@ import {
   createParenExpression,
   createThisExpression,
   createVariableStatement
-} from './ParseTreeFactory';
-import {hasUseStrict} from '../semantics/util';
+} from './ParseTreeFactory.js';
+import {hasUseStrict} from '../semantics/util.js';
 import {
   parseExpression,
   parseStatement,
   parseStatements
-} from './PlaceholderParser';
-import {propName} from '../staticsemantics/PropName';
+} from './PlaceholderParser.js';
+import {propName} from '../staticsemantics/PropName.js';
 
 // Interaction between ClassTransformer and SuperTransformer:
 // - The initial call to SuperTransformer will always be a transformBlock on

src/codegeneration/CloneTreeTransformer.js

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {ParseTreeTransformer} from './ParseTreeTransformer';
+import {ParseTreeTransformer} from './ParseTreeTransformer.js';
 
 import {
   BindingIdentifier,
@@ -30,7 +30,7 @@ import {
   TemplateLiteralPortion,
   SuperExpression,
   ThisExpression
-} from '../syntax/trees/ParseTrees';
+} from '../syntax/trees/ParseTrees.js';
 
 /**
  * Duplicates a ParseTree. Simply creates new leaf nodes so the