prettier 2.0.0.pre.rc3 → 2.1.0

data/dist/utils.js

@@ -3,21 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipAssignIndent = exports.printEmptyCollection = exports.noIndent = exports.makeCall = exports.literallineWithoutBreakParent = exports.literal = exports.inlineEnsureParens = exports.hasAncestor = exports.isEmptyStmts = exports.isEmptyBodyStmt = exports.getTrailingComma = exports.containsAssignment = void 0;
+exports.skipAssignIndent = exports.printEmptyCollection = exports.noIndent = exports.makeCall = exports.literallineWithoutBreakParent = exports.inlineEnsureParens = exports.hasAncestor = exports.getChildNodes = exports.isEmptyStmts = exports.isEmptyParams = exports.isEmptyBodyStmt = exports.getTrailingComma = exports.containsAssignment = void 0;
 var containsAssignment_1 = require("./utils/containsAssignment");
 Object.defineProperty(exports, "containsAssignment", { enumerable: true, get: function () { return __importDefault(containsAssignment_1).default; } });
 var getTrailingComma_1 = require("./utils/getTrailingComma");
 Object.defineProperty(exports, "getTrailingComma", { enumerable: true, get: function () { return __importDefault(getTrailingComma_1).default; } });
 var isEmptyBodyStmt_1 = require("./utils/isEmptyBodyStmt");
 Object.defineProperty(exports, "isEmptyBodyStmt", { enumerable: true, get: function () { return __importDefault(isEmptyBodyStmt_1).default; } });
+var isEmptyParams_1 = require("./utils/isEmptyParams");
+Object.defineProperty(exports, "isEmptyParams", { enumerable: true, get: function () { return __importDefault(isEmptyParams_1).default; } });
 var isEmptyStmts_1 = require("./utils/isEmptyStmts");
 Object.defineProperty(exports, "isEmptyStmts", { enumerable: true, get: function () { return __importDefault(isEmptyStmts_1).default; } });
+var getChildNodes_1 = require("./utils/getChildNodes");
+Object.defineProperty(exports, "getChildNodes", { enumerable: true, get: function () { return __importDefault(getChildNodes_1).default; } });
 var hasAncestor_1 = require("./utils/hasAncestor");
 Object.defineProperty(exports, "hasAncestor", { enumerable: true, get: function () { return __importDefault(hasAncestor_1).default; } });
 var inlineEnsureParens_1 = require("./utils/inlineEnsureParens");
 Object.defineProperty(exports, "inlineEnsureParens", { enumerable: true, get: function () { return __importDefault(inlineEnsureParens_1).default; } });
-var literal_1 = require("./utils/literal");
-Object.defineProperty(exports, "literal", { enumerable: true, get: function () { return __importDefault(literal_1).default; } });
 var literallineWithoutBreakParent_1 = require("./utils/literallineWithoutBreakParent");
 Object.defineProperty(exports, "literallineWithoutBreakParent", { enumerable: true, get: function () { return __importDefault(literallineWithoutBreakParent_1).default; } });
 var makeCall_1 = require("./utils/makeCall");

data/exe/rbprettier

@@ -4,5 +4,4 @@
 $:.unshift(File.expand_path(File.join('..', 'lib'), __dir__))
 require 'prettier'
 
-Prettier.run(ARGV)
-exit($?.exitstatus) if $?.exited?
+exit(Prettier.run(ARGV))

data/lib/prettier.rb

@@ -1,18 +1,50 @@
 # frozen_string_literal: true
 
 require 'json' unless defined?(JSON)
+require 'open3'
 
 module Prettier
   PLUGIN = -File.expand_path('..', __dir__)
   BINARY = -File.join(PLUGIN, 'node_modules', 'prettier', 'bin-prettier.js')
   VERSION = -JSON.parse(File.read(File.join(PLUGIN, 'package.json')))['version']
 
-  class << self
-    def run(args)
-      quoted = args.map { |arg| arg.start_with?('-') ? arg : "\"#{arg}\"" }
-      command = "node #{BINARY} --plugin \"#{PLUGIN}\" #{quoted.join(' ')}"
+  def self.run(args)
+    quoted = args.map { |arg| arg.start_with?('-') ? arg : "\"#{arg}\"" }
+    command = "node #{BINARY} --plugin \"#{PLUGIN}\" #{quoted.join(' ')}"
 
-      system({ 'RBPRETTIER' => '1' }, command)
+    stdout, stderr, status =
+      Open3.capture3({ 'RBPRETTIER' => '1' }, command, stdin_data: STDIN)
+    STDOUT.puts(stdout)
+
+    # If we completed successfully, then just exit out.
+    exitstatus = status.exitstatus
+    return exitstatus if exitstatus == 0
+
+    if stderr.match?(%r{Cannot find module '/.+?/bin-prettier.js'})
+      # If we're missing bin-prettier.js, then it's possible the user installed
+      # the gem through git, which wouldn't have installed the requisite
+      # JavaScript files.
+      STDERR.puts(<<~MSG)
+        Could not find the JavaScript files necessary to run prettier.
+
+        If you installed this dependency through git instead of from rubygems,
+        it does not install the necessary files by default. To fix this you can
+        either install them yourself by cd-ing into the directory where this gem
+        is located (#{File.expand_path('..', __dir__)}) and running:
+          
+          `yarn && yarn prepublishOnly`
+           or
+           `npm install && npm run prepublishOnly`
+           or
+           you can change the source in your Gemfile to point directly to rubygems.
+      MSG
+    else
+      # Otherwise, just print out the same error that prettier emitted, as it's
+      # unknown to us.
+      STDERR.puts(stderr)
     end
+
+    # Make sure we still exit with the same status code the prettier emitted.
+    exitstatus
   end
 end