Merge pull request francescov1#86 from gadielkalleb/fix/json-parser-error

fix string to JSON conversion and update prettier version

Author: francescov1

package-lock.json

@@ -1,7 +1,7 @@
 {
  "name": "mongoose-tsgen",
  "description": "A Typescript interface generator for Mongoose that works out of the box.",
- "version": "9.0.0",
+ "version": "9.0.1",
  "author": "Francesco Virga @francescov1",
  "bin": {
  "mtgen": "./bin/run"
@@ -21,7 +21,7 @@
  "glob": "^7.1.6",
  "lodash": "^4.17.20",
  "mkdirp": "^1.0.4",
- "prettier": "^2.1.2",
+ "prettier": "^2.5.1",
  "strip-json-comments": "^3.1.1",
  "ts-morph": "^9.1.0",
  "ts-node": "^9.1.1",

package.json

@@ -372,15 +372,20 @@ export const registerUserTs = (basePath: string): (() => void) | null => {
 
  // handle path aliases
  const tsConfigString = fs.readFileSync(foundPath, "utf8");
- const tsConfig = JSON.parse(stripJsonComments(tsConfigString));
- if (tsConfig?.compilerOptions?.paths) {
- const cleanup = require("tsconfig-paths").register({
- baseUrl: process.cwd(),
- paths: tsConfig.compilerOptions.paths
- });
-
- return cleanup;
- }
 
- return null;
+ try {
+ const tsConfig = JSON.parse(stripJsonComments(tsConfigString));
+ if (tsConfig?.compilerOptions?.paths) {
+ const cleanup = require("tsconfig-paths").register({
+ baseUrl: process.cwd(),
+ paths: tsConfig.compilerOptions.paths
+ });
+
+ return cleanup;
+ }
+
+ return null;
+ } catch {
+ throw new Error("Error parsing your tsconfig.json file, please ensure the format is valid");
+ }
 };

src/helpers/tsReader.ts

@@ -71,8 +71,8 @@ class MongooseTsgen extends Command {
 
  // we cant set flags as `default` using the official oclif method since the defaults would overwrite flags provided in the config file.
  // instead, well just set "output" and "project" as default manually if theyre still missing after merge with configFile.
- configFileFlags.output = configFileFlags.output ?? "./src/interfaces";
- configFileFlags.project = configFileFlags.project ?? "./";
+ configFileFlags.output = configFileFlags?.output ?? "./src/interfaces";
+ configFileFlags.project = configFileFlags?.project ?? "./";
 
  return {
  flags: {
@@ -136,12 +136,13 @@ class MongooseTsgen extends Command {
  this.log(`Writing interfaces to ${genFilePath}`);
 
  generator.saveFile({ genFilePath, sourceFile });
+
  if (!flags["no-format"]) await formatter.format([genFilePath]);
  this.log("Writing complete 🐒");
  process.exit();
  }
  } catch (error) {
- this.error(error as Error);
+ this.error(error as Error, { exit: 1 });
  }
  }
 }