Skip to content

Seperate top/bottom code into prefix/suffix and place use strict on top always #86

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

Open
hefox wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Seperate top/bottom code into prefix/suffix and place use strict on top always #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 26 additions & 4 deletions lib/ember-migrator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ EmberMigrator.prototype.splitFile = function(filePath) {
var astBody = ast.program.body;
// Cache of ast nodes that are not directly exported so need to be appended
// at the end of the splitting process
var nonExportNodes = [];
var nonExportNodesPrefix = [];
var nonExportNodesSuffix = [];
// Keep track of exports we have split this file into
var typedExports = [];
// For some reason the first nodes leading comments are separated from the node
Expand Down Expand Up @@ -331,13 +332,25 @@ EmberMigrator.prototype.splitFile = function(filePath) {
// Any other code that is not a global class assignment on root app will
// be remembered and at the end of splitting we will append these to the
// first typedExport or create a new typed export if none was created
nonExportNodes.push(node);
if (typedExports.length === 0) {
nonExportNodesPrefix.push(node);
} else {
nonExportNodesSuffix.push(node);
}
}
}, this);


// Append any remaining non-export nodes to either first export or new export
nonExportNodes.forEach(function (node) {
// Append any nonExportNodes[Suffix/Prefix] non-export nodes to either first export or new export.
nonExportNodesPrefix.reverse().forEach(function (node) {
if (typedExports.length === 0) {
var newFilePath = helper.dasherizePath(filePath);
addTypedNode(node, newFilePath);
} else {
typedExports[0].astNodes.unshift(node);
}
});
nonExportNodesSuffix.forEach(function (node) {
if (typedExports.length === 0) {
var newFilePath = string.dasherize(filePath);
addTypedNode(node, newFilePath);
Expand Down Expand Up @@ -387,7 +400,16 @@ EmberMigrator.prototype.convertFile = function(typedExport){
code = code.replace(/\n;\n/, '\n');

code = code.replace(new RegExp(this.rootAppName + "\\.", 'g'), '');

// Ensure 'use strict' is on top of file.
code = code.replace(/Em\./g, 'Ember.');
var isStrictRegularExpression = /\n'use strict';\n/g;
var hasIsStrict = code.match(isStrictRegularExpression, '');
if (hasIsStrict) {
code = code.replace(isStrictRegularExpression, '\n');
code = '\'use strict\';\n\n' + code;
}

// For any module imported that used to be a window global
Object.keys(this.classesFilepathMap).forEach(function(name) {
var module = this.classesFilepathMap[name];
Expand Down