@dotcom-tool-kit/prettier 1.2.2 → 1.4.1

package/lib/tasks/prettier.d.ts

@@ -4,5 +4,6 @@ export default class Prettier extends Task<typeof PrettierSchema> {
     static description: string;
     static defaultOptions: PrettierOptions;
     run(files?: string[]): Promise<void>;
+    formatFile: (filepath: string, options: PrettierOptions) => Promise<void>;
 }
 //# sourceMappingURL=prettier.d.ts.map

package/lib/tasks/prettier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prettier.d.ts","sourceRoot":"","sources":["../../src/tasks/prettier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAA;AAG5F,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAG7C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,IAAI,CAAC,OAAO,cAAc,CAAC;IAC/D,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,cAAc,EAAE,eAAe,CASrC;IAEK,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB3C"}
+{"version":3,"file":"prettier.d.ts","sourceRoot":"","sources":["../../src/tasks/prettier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAA;AAI5F,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAG7C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,IAAI,CAAC,OAAO,cAAc,CAAC;IAC/D,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,cAAc,EAAE,eAAe,CASrC;IAEK,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB1C,UAAU,aAAoB,MAAM,WAAW,eAAe,KAAG,QAAQ,IAAI,CAAC,CAgC7E;CACF"}

package/lib/tasks/prettier.js

@@ -4,16 +4,47 @@ const tslib_1 = require("tslib");
 const prettier_1 = (0, tslib_1.__importDefault)(require("prettier"));
 const fs_1 = require("fs");
 const fast_glob_1 = (0, tslib_1.__importDefault)(require("fast-glob"));
+const logger_1 = require("@dotcom-tool-kit/logger");
 const types_1 = require("@dotcom-tool-kit/types");
 const error_1 = require("@dotcom-tool-kit/error");
 class Prettier extends types_1.Task {
+    constructor() {
+        super(...arguments);
+        this.formatFile = async (filepath, options) => {
+            const fileContent = await fs_1.promises.readFile(filepath, 'utf8');
+            let prettierConfig;
+            try {
+                prettierConfig = await prettier_1.default.resolveConfig(filepath, { config: options.configFile });
+            }
+            catch (err) {
+                if (err.code !== 'ENOENT') {
+                    const error = new error_1.ToolKitError('there was an error when resolving the prettier config');
+                    if (err instanceof Error) {
+                        error.details = err.message;
+                    }
+                    throw error;
+                }
+            }
+            if (!prettierConfig && options.configOptions) {
+                this.logger.warn(`prettier could not find the specified configFile${options.configFile ? ` (${logger_1.styles.filepath(options.configFile)})` : ''}), using ${logger_1.styles.option('configOptions')} instead`);
+                prettierConfig = options.configOptions;
+            }
+            const unhook = (0, logger_1.hookConsole)(this.logger, 'prettier');
+            try {
+                await fs_1.promises.writeFile(filepath, prettier_1.default.format(fileContent, { ...prettierConfig, filepath }));
+            }
+            finally {
+                unhook();
+            }
+        };
+    }
     async run(files) {
         try {
             const filepaths = await (0, fast_glob_1.default)(files !== null && files !== void 0 ? files : this.options.files);
             for (const filepath of filepaths) {
                 const { ignored } = await prettier_1.default.getFileInfo(filepath);
                 if (!ignored) {
-                    await formatFile(filepath, this.options);
+                    await this.formatFile(filepath, this.options);
                 }
             }
         }
@@ -38,20 +69,3 @@ Prettier.defaultOptions = {
         trailingComma: 'none'
     }
 };
-const formatFile = async (filepath, options) => {
-    const fileContent = await fs_1.promises.readFile(filepath, 'utf8');
-    let prettierConfig;
-    try {
-        prettierConfig = await prettier_1.default.resolveConfig(filepath, { config: options.configFile });
-    }
-    catch (err) {
-        if (err.code !== 'ENOENT') {
-            throw err;
-        }
-    }
-    if (!prettierConfig && options.configOptions) {
-        console.log(`prettier could not find the specified configFile (${options.configFile}), using configOptions instead`);
-        prettierConfig = options.configOptions;
-    }
-    await fs_1.promises.writeFile(filepath, prettier_1.default.format(fileContent, { ...prettierConfig, filepath }));
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/prettier",
-  "version": "1.2.2",
+  "version": "1.4.1",
   "description": "",
   "main": "lib",
   "scripts": {
@@ -10,10 +10,12 @@
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "ISC",
   "dependencies": {
-    "@dotcom-tool-kit/error": "^1.2.2",
-    "@dotcom-tool-kit/package-json-hook": "^1.2.2",
-    "@dotcom-tool-kit/types": "^1.2.2",
+    "@dotcom-tool-kit/error": "^1.4.1",
+    "@dotcom-tool-kit/logger": "^1.4.1",
+    "@dotcom-tool-kit/package-json-hook": "^1.4.1",
+    "@dotcom-tool-kit/types": "^1.4.1",
     "fast-glob": "^3.2.7",
+    "hook-std": "^2.0.0",
     "prettier": "^2.2.1"
   },
   "repository": {
@@ -28,9 +30,10 @@
     ".toolkitrc.yml"
   ],
   "devDependencies": {
-    "@jest/globals": "^26.6.2",
-    "jest": "^26.6.3",
-    "ts-jest": "^26.5.6"
+    "@jest/globals": "^27.4.6",
+    "jest": "^27.4.7",
+    "ts-jest": "^27.1.3",
+    "winston": "^3.4.0"
   },
   "volta": {
     "extends": "../../package.json"