Galerie und tage

node_modules/esprima/bin/esvalidate.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
-  Copyright JS Foundation and other contributors, https://js.foundation/
+  Copyright (c) jQuery Foundation, Inc. and Contributors, All Rights Reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
@@ -26,7 +26,7 @@
 /*jslint sloppy:true plusplus:true node:true rhino:true */
 /*global phantom:true */
 
-var fs, system, esprima, options, fnames, forceFile, count;
+var fs, system, esprima, options, fnames, count;
 
 if (typeof esprima === 'undefined') {
     // PhantomJS can only require() relative files
@@ -36,11 +36,7 @@ if (typeof esprima === 'undefined') {
         esprima = require('./esprima');
     } else if (typeof require === 'function') {
         fs = require('fs');
-        try {
-            esprima = require('esprima');
-        } catch (e) {
-            esprima = require('../');
-        }
+        esprima = require('esprima');
     } else if (typeof load === 'function') {
         try {
             load('esprima.js');
@@ -55,10 +51,7 @@ if (typeof phantom === 'object') {
     fs.readFileSync = fs.read;
     process = {
         argv: [].slice.call(system.args),
-        exit: phantom.exit,
-        on: function (evt, callback) {
-            callback();
-        }
+        exit: phantom.exit
     };
     process.argv.unshift('phantomjs');
 }
@@ -67,20 +60,14 @@ if (typeof phantom === 'object') {
 if (typeof console === 'undefined' && typeof process === 'undefined') {
     console = { log: print };
     fs = { readFileSync: readFile };
-    process = {
-        argv: arguments,
-        exit: quit,
-        on: function (evt, callback) {
-            callback();
-        }
-    };
+    process = { argv: arguments, exit: quit };
     process.argv.unshift('esvalidate.js');
     process.argv.unshift('rhino');
 }
 
 function showUsage() {
     console.log('Usage:');
-    console.log('   esvalidate [options] [file.js...]');
+    console.log('   esvalidate [options] file.js');
     console.log();
     console.log('Available options:');
     console.log();
@@ -90,6 +77,10 @@ function showUsage() {
     process.exit(1);
 }
 
+if (process.argv.length <= 2) {
+    showUsage();
+}
+
 options = {
     format: 'plain'
 };
@@ -98,9 +89,7 @@ fnames = [];
 
 process.argv.splice(2).forEach(function (entry) {
 
-    if (forceFile || entry === '-' || entry.slice(0, 1) !== '-') {
-        fnames.push(entry);
-    } else if (entry === '-h' || entry === '--help') {
+    if (entry === '-h' || entry === '--help') {
         showUsage();
     } else if (entry === '-v' || entry === '--version') {
         console.log('ECMAScript Validator (using Esprima version', esprima.version, ')');
@@ -112,16 +101,17 @@ process.argv.splice(2).forEach(function (entry) {
             console.log('Error: unknown report format ' + options.format + '.');
             process.exit(1);
         }
-    } else if (entry === '--') {
-        forceFile = true;
-    } else {
+    } else if (entry.slice(0, 2) === '--') {
         console.log('Error: unknown option ' + entry + '.');
         process.exit(1);
+    } else {
+        fnames.push(entry);
     }
 });
 
 if (fnames.length === 0) {
-    fnames.push('');
+    console.log('Error: no input file.');
+    process.exit(1);
 }
 
 if (options.format === 'junit') {
@@ -130,13 +120,10 @@ if (options.format === 'junit') {
 }
 
 count = 0;
-
-function run(fname, content) {
-    var timestamp, syntax, name;
+fnames.forEach(function (fname) {
+    var content, timestamp, syntax, name;
     try {
-        if (typeof content !== 'string') {
-            throw content;
-        }
+        content = fs.readFileSync(fname, 'utf-8');
 
         if (content[0] === '#' && content[1] === '!') {
             content = '//' + content.substr(2, content.length);
@@ -194,43 +181,19 @@ function run(fname, content) {
             console.log(' </testcase>');
             console.log('</testsuite>');
         } else {
-            console.log(fname + ':' + e.lineNumber + ': ' + e.message.replace(/^Line\ [0-9]*\:\ /, ''));
+            console.log('Error: ' + e.message);
         }
     }
+});
+
+if (options.format === 'junit') {
+    console.log('</testsuites>');
 }
 
-fnames.forEach(function (fname) {
-    var content = '';
-    try {
-        if (fname && (fname !== '-' || forceFile)) {
-            content = fs.readFileSync(fname, 'utf-8');
-        } else {
-            fname = '';
-            process.stdin.resume();
-            process.stdin.on('data', function(chunk) {
-                content += chunk;
-            });
-            process.stdin.on('end', function() {
-                run(fname, content);
-            });
-            return;
-        }
-    } catch (e) {
-        content = e;
-    }
-    run(fname, content);
-});
+if (count > 0) {
+    process.exit(1);
+}
 
-process.on('exit', function () {
-    if (options.format === 'junit') {
-        console.log('</testsuites>');
-    }
-
-    if (count > 0) {
-        process.exit(1);
-    }
-
-    if (count === 0 && typeof phantom === 'object') {
-        process.exit(0);
-    }
-});
+if (count === 0 && typeof phantom === 'object') {
+    process.exit(0);
+}