Skip to content
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

Jump to bottom

[TIMOB-13879] Reworked how source maps are specified #191

Merged
merged 2 commits into from
May 17, 2013
Merged

[TIMOB-13879] Reworked how source maps are specified #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e3776a
[TIMOB-13879] Reworked how source maps are specified
nebrius May 16, 2013
06bdab9
[TIMOB_13879] Manual merge of 1_0_X
nebrius May 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 15 additions & 37 deletions commands/analyze.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ exports.config = function (logger, config) {
return conf;
};

function run(sourceInformation, options, plugins, logger, cli) {
cli.fireHook('codeprocessor.pre.run', function () {
options.outputFormat = cli.argv.output;
setTimeout(function () {
CodeProcessor.run(sourceInformation, options, plugins, logger, function () {});
}, 0);
});
}

function runFromConfigFile(logger, config, cli) {

var argv = cli.argv,
Expand Down Expand Up @@ -264,12 +273,7 @@ function runFromConfigFile(logger, config, cli) {
process.exit(1);
}

cli.fireHook('codeprocessor.pre.run', function () {
configFile.options.outputFormat = argv.output;
setTimeout(function () {
CodeProcessor.run(configFile.sourceInformation, configFile.options, configFile.plugins, logger, function () {});
}, 0);
});
run(configFile.sourceInformation, configFile.options, configFile.plugins, logger, cli);
}

function runFromCLIParameters(logger, config, cli) {
Expand Down Expand Up @@ -380,11 +384,6 @@ function runFromCLIParameters(logger, config, cli) {
pluginList = argv.plugins,
plugins = [],
plugin,
sourceMapDir,
sourceMapsFiles,
sourceMaps,
sourceMap,
sourceMapRegex = /\.map$/,
ti,
sdkPath;

Expand Down Expand Up @@ -506,33 +505,12 @@ function runFromCLIParameters(logger, config, cli) {
}

// Check if this is an alloy app
cli.fireHook('codeprocessor.pre.run', function () {
if (existsSync(path.join(projectRoot, 'app'))) {
sourceMapDir = path.join(projectRoot, 'build', 'map', 'Resources');
sourceInformation.originalSourceDir = path.join(projectRoot, 'app');
if (!existsSync(sourceMapDir)) {
console.error('Alloy projects must be compiled to analyze with the Titanium Code Processor');
process.exit(1);
}

// Load the source maps
sourceMapsFiles = wrench.readdirSyncRecursive(sourceMapDir);
sourceMaps = {};
for (i = 0, len = sourceMapsFiles.length; i < len; i++) {
sourceMap = path.join(sourceMapDir, sourceMapsFiles[i]);
if (sourceMapRegex.test(sourceMap)) {
sourceMaps[sourceMapsFiles[i].replace(sourceMapRegex, '')] = sourceMap;
}
}
sourceInformation.sourceMaps = sourceMaps;
}

options.outputFormat = argv.output;
setTimeout(function () {
CodeProcessor.run(sourceInformation, options, plugins, logger, function () {});
}, 0);
});
if (existsSync(path.join(projectRoot, 'app'))) {
sourceInformation.sourceMapDir = path.join(projectRoot, 'build', 'map', 'Resources');
sourceInformation.originalSourceDir = path.join(projectRoot, 'app');
}

run(sourceInformation, options, plugins, logger, cli);
});
}
});
Expand Down
35 changes: 24 additions & 11 deletions lib/CodeProcessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ function init(sourceInformation, options, plugins, ast) {
changed,
dependencies,
numPlugins = plugins.length,
sourceMap;
sourceMapDir,
sourceMapsFiles,
sourceMaps = {},
sourceMap,
sourceMapRegex = /\.map$/;

// Parse the invoke methods option
if (options.hasOwnProperty('invokeMethods')) {
Expand Down Expand Up @@ -405,16 +409,25 @@ function init(sourceInformation, options, plugins, ast) {
}

// Load the source maps
if (sourceInformation && sourceInformation.sourceMaps) {
for (i in sourceInformation.sourceMaps) {
sourceMap = sourceInformation.sourceMaps[i];
try {
sourceInformation.sourceMaps[i] = new sourcemap.SourceMapConsumer(JSON.parse(fs.readFileSync(sourceMap).toString()));
} catch(e) {
Runtime.log('error', 'Could not parse source map file "' + sourceMap + '": ' + e.message);
process.exit(1);
if (sourceInformation && sourceInformation.sourceMapDir) {
sourceMapDir = sourceInformation.sourceMapDir;
if (!existsSync(sourceMapDir)) {
console.error('Source map directory "' + sourceMapDir + '" does not exist');
process.exit(1);
}
sourceMapsFiles = wrench.readdirSyncRecursive(sourceMapDir);
for (i = 0, ilen = sourceMapsFiles.length; i < ilen; i++) {
sourceMap = path.join(sourceMapDir, sourceMapsFiles[i]);
if (sourceMapRegex.test(sourceMap)) {
try {
sourceMaps[sourceMapsFiles[i].replace(sourceMapRegex, '')] = new sourcemap.SourceMapConsumer(JSON.parse(fs.readFileSync(sourceMap).toString()));
} catch (e) {
console.error('Could not parse source map file "' + sourceMap + '": ' + e.message);
process.exit(1);
}
}
}
sourceInformation.sourceMaps = sourceMaps;
}

// Initialize the runtime
Expand All @@ -430,7 +443,7 @@ function init(sourceInformation, options, plugins, ast) {
Runtime.log('debug', 'Loading code processor plugin ' + pkg.name);
pluginDefinitions[i] = pkg;
} catch(e) {
Runtime.log('error', 'Could not parse "' + path.join(plugins[i].path, 'package.json') + '": ' + e);
console.error('Could not parse "' + path.join(plugins[i].path, 'package.json') + '": ' + e);
process.exit(1);
}
}
Expand Down Expand Up @@ -460,7 +473,7 @@ function init(sourceInformation, options, plugins, ast) {
}
}
if (!changed) {
Runtime.log('error', 'Circular or missing plugin dependency detected, cannot load plugins');
console.error('Circular or missing plugin dependency detected, cannot load plugins');
process.exit(1);
}
}
Expand Down