Resolve Prettier config using Prettier

.github/workflows/pull_request.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 13.x]
+        node-version: [10.x, 12.x, 14.x]
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1

package.json

@@ -2,7 +2,7 @@
   "name": "@manifoldco/swagger-to-ts",
   "description": "Generate TypeScript types from Swagger OpenAPI specs",
   "main": "dist/cjs",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "engines": {
     "node": ">= 10.0.0"
   },

src/index.ts

@@ -1,4 +1,3 @@
-import fs from "fs";
 import path from "path";
 import prettier from "prettier";
 import { swaggerVersion } from "./utils";
@@ -36,21 +35,15 @@ export default function swaggerToTS(
   let prettierOptions: prettier.Options = { parser: "typescript" };
   if (options && options.prettierConfig) {
     try {
+      const userOptions = prettier.resolveConfig.sync(
+        path.resolve(process.cwd(), options.prettierConfig)
+      );
       prettierOptions = {
         ...prettierOptions,
-        ...JSON.parse(
-          fs.readFileSync(
-            path.resolve(process.cwd(), options.prettierConfig),
-            "utf8"
-          )
-        ),
+        ...userOptions,
       };
     } catch (err) {
-      console.error(
-        `❌ Prettier: couldn’t find '${
-          options.prettierConfig
-        }' in '${path.dirname(process.cwd())}'`
-      );
+      console.error(`❌ ${err}`);
     }
   }
   return prettier.format(output, prettierOptions);

src/types/index.ts

@@ -11,7 +11,9 @@ export interface Property {
 }
 
 export interface SwaggerToTSOptions {
+  /** (optional) Path to Prettier config */
   prettierConfig?: string;
+  /** (optional) Function to iterate over every schema object before transforming to TypeScript */
   propertyMapper?: (
     schemaObject: OpenAPI2SchemaObject | OpenAPI3SchemaObject,
     property: Property

tests/bin/cli.test.ts

@@ -6,12 +6,21 @@ import { execSync } from 'child_process'
 // v3/index.test.ts. So this file is mainly for testing other flags.
 
 describe('cli', () => {
-  it('--prettier-config', () => {
+  it('--prettier-config (JSON)', () => {
     execSync(`../../pkg/bin/cli.js specs/petstore.yaml -o generated/petstore.ts --prettier-config .prettierrc`, {
       cwd: path.resolve(__dirname),
     })
     expect(fs.readFileSync(path.resolve(__dirname, 'expected/petstore.ts'), 'utf8')).toBe(
       fs.readFileSync(path.resolve(__dirname, 'generated/petstore.ts'), 'utf8'),
     )
   })
+
+  it('--prettier-config (.js)', () => {
+    execSync(`../../pkg/bin/cli.js specs/petstore.yaml -o generated/petstore.ts --prettier-config prettier.config.js`, {
+      cwd: path.resolve(__dirname),
+    })
+    expect(fs.readFileSync(path.resolve(__dirname, 'expected/petstore.ts'), 'utf8')).toBe(
+      fs.readFileSync(path.resolve(__dirname, 'generated/petstore.ts'), 'utf8'),
+    )
+  })
 })

tests/bin/prettier.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  printWidth: 150,
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'all',
+}