Fix parsing bug (#106)

sgb-io · web-flow · commit 8e7de8d4fe9f · 2022-06-29T20:50:49.000+01:00
diff --git a/generated/avg-maintainability.svg b/generated/avg-maintainability.svg
@@ -1,5 +1,5 @@
-<svg width="167.7" height="20" viewBox="0 0 1677 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="maintainability (avg): 56.29">
-  <title>maintainability (avg): 56.29</title>
+<svg width="167.7" height="20" viewBox="0 0 1677 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="maintainability (avg): 56.26">
+  <title>maintainability (avg): 56.26</title>
   <linearGradient id="a" x2="0" y2="100%">
     <stop offset="0" stop-opacity=".1" stop-color="#EEE"/>
     <stop offset="1" stop-opacity=".1"/>
@@ -13,8 +13,8 @@
   <g aria-hidden="true" fill="#fff" text-anchor="start" font-family="Verdana,DejaVu Sans,sans-serif" font-size="110">
     <text x="60" y="148" textLength="1157" fill="#000" opacity="0.25">maintainability (avg)</text>
     <text x="50" y="138" textLength="1157">maintainability (avg)</text>
-    <text x="1312" y="148" textLength="320" fill="#000" opacity="0.25">56.29</text>
-    <text x="1302" y="138" textLength="320">56.29</text>
+    <text x="1312" y="148" textLength="320" fill="#000" opacity="0.25">56.26</text>
+    <text x="1302" y="138" textLength="320">56.26</text>
   </g>
   
 </svg>
diff --git a/samples/sweetalert/expected.json b/samples/sweetalert/expected.json
@@ -1037,70 +1037,14 @@
       "filename": "docs",
       "shouldAnalyze": true,
       "type": "dir",
-      "files": [
-        {
-          "fullPath": "/samples/sweetalert/docs/CNAME",
-          "filename": "CNAME",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/docs",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        },
-        {
-          "fullPath": "/samples/sweetalert/docs/index.html",
-          "filename": "index.html",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/docs",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        }
-      ]
+      "files": []
     },
     {
       "fullPath": "/samples/sweetalert/docs-src",
       "filename": "docs-src",
       "shouldAnalyze": true,
       "type": "dir",
-      "files": [
-        {
-          "fullPath": "/samples/sweetalert/docs-src/index.hbs",
-          "filename": "index.hbs",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/docs-src",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        },
-        {
-          "fullPath": "/samples/sweetalert/docs-src/layout-docs.hbs",
-          "filename": "layout-docs.hbs",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/docs-src",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        },
-        {
-          "fullPath": "/samples/sweetalert/docs-src/layout-guides.hbs",
-          "filename": "layout-guides.hbs",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/docs-src",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        },
-        {
-          "fullPath": "/samples/sweetalert/docs-src/layout.hbs",
-          "filename": "layout.hbs",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/docs-src",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        }
-      ]
+      "files": []
     },
     {
       "fullPath": "/samples/sweetalert/src",
@@ -2211,26 +2155,7 @@
       "filename": "typings",
       "shouldAnalyze": true,
       "type": "dir",
-      "files": [
-        {
-          "fullPath": "/samples/sweetalert/typings/core.d.ts",
-          "filename": "core.d.ts",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/typings",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        },
-        {
-          "fullPath": "/samples/sweetalert/typings/sweetalert.d.ts",
-          "filename": "sweetalert.d.ts",
-          "shouldAnalyze": false,
-          "path": "/samples/sweetalert/typings",
-          "type": "file",
-          "complexityReport": null,
-          "timesDependedOn": 0
-        }
-      ]
+      "files": []
     },
     {
       "fullPath": "/samples/sweetalert/expected.json",
diff --git a/src/utils/entities.ts b/src/utils/entities.ts
@@ -11,7 +11,10 @@ const shouldSkipDir = (
   skipDirectories: string[]
 ): boolean => {
   for (let i = 0; i < skipDirectories.length; i += 1) {
-    if (relativeDir.startsWith(skipDirectories[i])) {
+    if (
+      relativeDir.startsWith(skipDirectories[i]) ||
+      `${relativeDir}/`.startsWith(skipDirectories[i])
+    ) {
       return true
     }
   }
@@ -74,6 +77,11 @@ export const shouldSeeEntity = ({
     return false
   }
 
+  // Is it a file in a directory that should be skipped?
+  if (shouldSkipDir(relativeDir, options.skipDirectories)) {
+    return false
+  }
+
   return true
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,10 @@ const shouldSkipDir = (`
`11`	`11`	`skipDirectories: string[]`
`12`	`12`	`): boolean => {`
`13`	`13`	`for (let i = 0; i < skipDirectories.length; i += 1) {`
`14`		`- if (relativeDir.startsWith(skipDirectories[i])) {`
	`14`	`+ if (`
	`15`	`+ relativeDir.startsWith(skipDirectories[i]) \|\|`
	`16`	+ `${relativeDir}/`.startsWith(skipDirectories[i])
	`17`	`+ ) {`
`15`	`18`	`return true`
`16`	`19`	`}`
`17`	`20`	`}`
`@@ -74,6 +77,11 @@ export const shouldSeeEntity = ({`
`74`	`77`	`return false`
`75`	`78`	`}`
`76`	`79`
	`80`	`+ // Is it a file in a directory that should be skipped?`
	`81`	`+ if (shouldSkipDir(relativeDir, options.skipDirectories)) {`
	`82`	`+ return false`
	`83`	`+ }`
	`84`	`+`
`77`	`85`	`return true`
`78`	`86`	`}`
`79`	`87`