Merge pull request #27 from Himenon/fix-some-bugs

fix: some dependency not parsed error

Author: Himenon

.lintstagedrc

@@ -1,5 +1,5 @@
 {
-  "*.{js,jsx,json,yml,yaml,html,md}": ["prettier --write", "git add"],
+  "*.{js,jsx,json,yml,yaml,html}": ["prettier --write", "git add"],
   "*.{ts,tsx}": ["yarn run format", "yarn run lint", "git add"],
   "package.json": ["sort-package-json", "git add"]
-}
+}

CHANGELOG.md

@@ -4,14 +4,11 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 <a name="0.3.2"></a>
+
 ## 0.3.2 (2020-01-07)
 
 **Note:** Version bump only for package code-dependency
 
-
-
-
-
 <a name="0.3.1"></a>
 
 ## [0.3.1](https://github.com/Himenon/code-dependency/compare/v0.3.0...v0.3.1) (2020-01-06)

lerna.json

@@ -11,14 +11,10 @@
     "publish": {
       "access": "public",
       "allowBranch": "master",
-      "ignoreChanges": [
-        "CHANGELOG.md"
-      ]
+      "ignoreChanges": ["CHANGELOG.md"]
     }
   },
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "0.3.2",
   "npmClient": "yarn",
   "registry": "https://registry.npmjs.org/",

package.json

@@ -21,7 +21,6 @@
     "initialize": "run-s bootstrap clean:all setup build:lib",
     "lint": "eslint -c ./.eslintrc.js 'packages/**/*.{ts,tsx}'",
     "lint:fix": "yarn lint --fix",
-    "publish": "lerna publish from-package",
     "test": "lerna run test",
     "version_up": "lerna version --yes"
   },

packages/cli/CHANGELOG.md

@@ -4,14 +4,11 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 <a name="0.3.2"></a>
+
 ## 0.3.2 (2020-01-07)
 
 **Note:** Version bump only for package @code-dependency/cli
 
-
-
-
-
 <a name="0.3.1"></a>
 
 ## [0.3.1](https://github.com/Himenon/code-dependency/packages/cli/compare/v0.3.0...v0.3.1) (2020-01-06)

packages/cli/package.json

@@ -41,7 +41,6 @@
   },
   "dependencies": {
     "@code-dependency/view": "^0.3.2",
-    "chalk": "^3.0.0",
     "commander": "4.0.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
@@ -57,7 +56,7 @@
     "react-router-dom": "^5.1.2",
     "recursive-readdir": "^2.2.2",
     "resolve-pkg": "^2.0.0",
-    "viz.js": "^2.1.2"
+    "tsconfig": "^7.0.0"
   },
   "devDependencies": {
     "@types/compression": "^1.0.1",

packages/cli/src/controller/ApiController.ts

@@ -1,7 +1,8 @@
 import express from "express";
 import * as path from "path";
-import * as Service from "../service";
 import * as Config from "../config";
+import * as Service from "../service";
+import { logger } from "../logger";
 import { Api } from "@code-dependency/view";
 
 export const createApiResponse = <T>(data: T): Api.ApiResponse<T> => {
@@ -18,12 +19,17 @@ export const create = (service: Service.Type, config: Config.Type) => {
 
   router.post("/graph", async (req, res) => {
     const filename = path.join(config.absoluteRootDirPath, req.body.path);
-    const dot = service.dependencyCruiser.getDependenciesDot(filename);
-    const data = createApiResponse<Api.GraphResponseData>({
-      element: dot,
-    });
-    res.json(data);
-    res.end();
+    try {
+      const dot = service.dependencyCruiser.getDependenciesDot(filename);
+      const data = createApiResponse<Api.GraphResponseData>({
+        element: dot,
+      });
+      res.json(data);
+    } catch (error) {
+      res.status(500).send(error.message);
+      logger.error(error);
+      res.end();
+    }
   });
 
   router.use("/paths", async (req, res) => {

packages/cli/src/index.ts

@@ -23,7 +23,7 @@ const main = async () => {
   const server = createServer(service, config);
 
   logger.info(`Start: http://localhost:${args.port}`);
-  server.listen(3000);
+  server.listen(args.port);
 };
 
 main().catch(error => {

packages/cli/src/service/DependencyCruiserService.ts

@@ -8,7 +8,7 @@ export interface Option {
 export const create = (option: Option) => {
   const getDependenciesDot = (source: string): string => {
     logger.info(`cruise: ${source}`);
-    const dependencies = cruise([source], { exclude: "node_modules", maxDepth: 99, combinedDependencies: true }, undefined, option.tsConfig);
+    const dependencies = cruise([source], { tsPreCompilationDeps: true }, undefined, option.tsConfig);
     if (typeof dependencies.output !== "string") {
       return format(dependencies.output, "dot").output.toString();
     }