gts - npm Package Compare versions

Comparing version 0.4.0 to 0.4.1

build/src/clean.js

@@ -53,3 +53,3 @@ "use strict";
  */
-var chalk = require("chalk");
+var chalk_1 = require("chalk");
 var util_1 = require("./util");
@@ -70,7 +70,7 @@ /**
                     if (outDir === '.') {
-                        options.logger.error(chalk.red('ERROR:') + " " + chalk.gray('compilerOptions.outDir') + " " +
+                        options.logger.error(chalk_1.default.red('ERROR:') + " " + chalk_1.default.gray('compilerOptions.outDir') + " " +
                             "cannot use the value '.'.  That would delete all of our sources.");
                         return [2 /*return*/, false];
                     }
-                    message = chalk.red('Removing') + " " + outDir + " ...";
+                    message = chalk_1.default.red('Removing') + " " + outDir + " ...";
                     options.logger.log(message);
@@ -82,4 +82,4 @@ return [4 /*yield*/, util_1.rimrafp(outDir)];
                 case 3:
-                    options.logger.error(chalk.red('ERROR:') + " The " + chalk.gray('clean') + " command" +
-                        (" requires " + chalk.gray('compilerOptions.outDir') + " to be defined in ") +
+                    options.logger.error(chalk_1.default.red('ERROR:') + " The " + chalk_1.default.gray('clean') + " command" +
+                        (" requires " + chalk_1.default.gray('compilerOptions.outDir') + " to be defined in ") +
                         "tsconfig.json.");
@@ -86,0 +86,0 @@ return [2 /*return*/, false];

build/src/cli.js

@@ -53,5 +53,5 @@ #!/usr/bin/env node
     return __awaiter(this, void 0, void 0, function () {
-        var options, lint, format, _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var options, lint, format, _a, passLint, passFormat, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
@@ -67,3 +67,3 @@ options = {
                     return [4 /*yield*/, init_1.init(options)];
-                case 1: return [2 /*return*/, _d.sent()];
+                case 1: return [2 /*return*/, _c.sent()];
                 case 2:
@@ -75,27 +75,25 @@ lint = require('./lint').lint;
                         case 'check': return [3 /*break*/, 3];
-                        case 'fix': return [3 /*break*/, 7];
-                        case 'clean': return [3 /*break*/, 11];
+                        case 'fix': return [3 /*break*/, 6];
+                        case 'clean': return [3 /*break*/, 10];
                     }
-                    return [3 /*break*/, 13];
+                    return [3 /*break*/, 12];
                 case 3: return [4 /*yield*/, lint(options, files)];
                 case 4:
-                    _b = (_d.sent());
-                    if (!_b) return [3 /*break*/, 6];
+                    passLint = _c.sent();
                     return [4 /*yield*/, format(options, files)];
                 case 5:
-                    _b = (_d.sent());
-                    _d.label = 6;
-                case 6: return [2 /*return*/, (_b)];
-                case 7: return [4 /*yield*/, lint(options, files, true)];
+                    passFormat = _c.sent();
+                    return [2 /*return*/, passLint && passFormat];
+                case 6: return [4 /*yield*/, lint(options, files, true)];
+                case 7:
+                    _b = (_c.sent());
+                    if (!_b) return [3 /*break*/, 9];
+                    return [4 /*yield*/, format(options, files, true)];
                 case 8:
-                    _c = (_d.sent());
-                    if (!_c) return [3 /*break*/, 10];
-                    return [4 /*yield*/, format(options, files, true)];
-                case 9:
-                    _c = (_d.sent());
-                    _d.label = 10;
-                case 10: return [2 /*return*/, (_c)];
-                case 11: return [4 /*yield*/, clean_1.clean(options)];
-                case 12: return [2 /*return*/, _d.sent()];
-                case 13:
+                    _b = (_c.sent());
+                    _c.label = 9;
+                case 9: return [2 /*return*/, (_b)];
+                case 10: return [4 /*yield*/, clean_1.clean(options)];
+                case 11: return [2 /*return*/, _c.sent()];
+                case 12:
                     usage("Unknown verb: " + verb);
@@ -102,0 +100,0 @@ return [2 /*return*/, false];

build/src/format.js

 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [0, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -15,9 +50,25 @@ var lint_1 = require("./lint");
     if (fix === void 0) { fix = false; }
-    var program = lint_1.createProgram(options);
-    var srcFiles = files.length > 0 ?
-        files :
-        program.getSourceFiles()
-            .map(function (sourceFile) { return sourceFile.fileName; })
-            .filter(function (f) { return !f.endsWith('.d.ts'); });
-    return fix ? fixFormat(srcFiles) : checkFormat(srcFiles);
+    return __awaiter(this, void 0, void 0, function () {
+        var program, srcFiles, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    program = lint_1.createProgram(options);
+                    srcFiles = files.length > 0 ?
+                        files :
+                        program.getSourceFiles()
+                            .map(function (sourceFile) { return sourceFile.fileName; })
+                            .filter(function (f) { return !f.endsWith('.d.ts'); });
+                    if (!fix) return [3 /*break*/, 1];
+                    return [2 /*return*/, fixFormat(srcFiles)];
+                case 1: return [4 /*yield*/, checkFormat(srcFiles)];
+                case 2:
+                    result = _a.sent();
+                    if (!result) {
+                        options.logger.log('clang-format reported errors... run `gts fix` to address.');
+                    }
+                    return [2 /*return*/, result];
+            }
+        });
+    });
 }
@@ -24,0 +75,0 @@ exports.format = format;

build/src/init.js

@@ -53,3 +53,3 @@ "use strict";
  */
-var chalk = require("chalk");
+var chalk_1 = require("chalk");
 var cp = require("child_process");
@@ -108,4 +108,4 @@ var inquirer = require("inquirer");
                     if (!existing) return [3 /*break*/, 3];
-                    message = "package.json already has a script for " + chalk.bold(script) + ":\n" +
-                        ("-" + chalk.red(existing) + "\n+" + chalk.green(target));
+                    message = "package.json already has a script for " + chalk_1.default.bold(script) + ":\n" +
+                        ("-" + chalk_1.default.red(existing) + "\n+" + chalk_1.default.green(target));
                     return [4 /*yield*/, query(message, 'Replace', false, options)];
@@ -150,4 +150,4 @@ case 2:
                     if (!existing) return [3 /*break*/, 3];
-                    message = "Already have devDependency for " + chalk.bold(dep) + ":\n" +
-                        ("-" + chalk.red(existing) + "\n+" + chalk.green(target));
+                    message = "Already have devDependency for " + chalk_1.default.bold(dep) + ":\n" +
+                        ("-" + chalk_1.default.red(existing) + "\n+" + chalk_1.default.green(target));
                     return [4 /*yield*/, query(message, 'Overwrite', false, options)];
@@ -235,3 +235,3 @@ case 2:
                     if (!existing) return [3 /*break*/, 6];
-                    return [4 /*yield*/, query(chalk.bold('tsconfig.json') + " already exists", 'Overwrite', false, options)];
+                    return [4 /*yield*/, query(chalk_1.default.bold('tsconfig.json') + " already exists", 'Overwrite', false, options)];
                 case 5:
@@ -278,3 +278,3 @@ writeTsConfig = _a.sent();
                     }
-                    return [4 /*yield*/, query(chalk.bold('package.json') + " does not exist.", "Generate", true, options)];
+                    return [4 /*yield*/, query(chalk_1.default.bold('package.json') + " does not exist.", "Generate", true, options)];
                 case 3:
@@ -281,0 +281,0 @@ generate = _a.sent();

package.json

 {
   "name": "gts",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Google TypeScript Style",
@@ -29,3 +29,3 @@ "repository": "google/ts-style",
     "lint": "tslint -c tslint.json  --project . --type-check -t codeFrame",
-    "lint-fix": "tslint -c tslint.json --project .  --type-check -t codeFrame --fix",
+    "lint-fix": "tslint -c tslint.json --project . --type-check -t codeFrame --fix",
     "prepare": "npm run compile",
@@ -42,3 +42,3 @@ "test": "npm run compile && nyc ava build/test/test*.js",
   "dependencies": {
-    "chalk": "^2.0.1",
+    "chalk": "^2.2.0",
     "clang-format": "^1.0.53",
@@ -54,3 +54,2 @@ "inquirer": "^3.2.1",
   "devDependencies": {
-    "@types/chalk": "^0.4.31",
     "@types/glob": "^5.0.30",
@@ -66,4 +65,4 @@ "@types/inquirer": "0.0.35",
     "@types/update-notifier": "^1.0.1",
-    "ava": "^0.22.0",
-    "codecov": "^2.3.0",
+    "ava": "^0.23.0",
+    "codecov": "^3.0.0",
     "make-dir": "^1.0.0",
@@ -70,0 +69,0 @@ "ncp": "^2.0.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

70337

increased by5.01%

Dev dependency count

18

decreased by-5.26%

Lines of code

912

increased by5.68%

Dependency changes

• Updatedchalk@^2.2.0