From 70330d126b6398e0241b73cc212cc515d5cfa72a Mon Sep 17 00:00:00 2001
From: mohamed yahia <mohamedsalem401@yahoo.com>
Date: Fri, 24 Nov 2023 13:55:08 +0200
Subject: [PATCH] Move all the tests into a root test folder #67

---
 src/lib/indexFolder.ts                           | 2 +-
 src/{tests => lib}/markdowndb.spec.ts            | 6 +++---
 src/lib/markdowndb.ts                            | 2 +-
 src/{tests => lib}/process.spec.ts               | 2 +-
 src/lib/process.ts                               | 3 ++-
 src/{tests => lib}/validate.spec.ts              | 2 +-
 src/{lib => utils}/databaseUtils.ts              | 2 +-
 src/{tests => utils}/extractTagsFromBody.spec.ts | 2 +-
 src/{tests => utils}/extractWikiLinks.spec.ts    | 2 +-
 src/utils/index.ts                               | 2 ++
 src/{tests => utils}/parseFile.spec.ts           | 2 +-
 src/{lib => utils}/parseFile.ts                  | 1 -
 src/{tests => utils}/recursiveWalkDir.spec.ts    | 2 +-
 src/{lib => utils}/recursiveWalkDir.ts           | 0
 14 files changed, 16 insertions(+), 14 deletions(-)
 rename src/{tests => lib}/markdowndb.spec.ts (98%)
 rename src/{tests => lib}/process.spec.ts (95%)
 rename src/{tests => lib}/validate.spec.ts (91%)
 rename src/{lib => utils}/databaseUtils.ts (98%)
 rename src/{tests => utils}/extractTagsFromBody.spec.ts (98%)
 rename src/{tests => utils}/extractWikiLinks.spec.ts (99%)
 create mode 100644 src/utils/index.ts
 rename src/{tests => utils}/parseFile.spec.ts (98%)
 rename src/{lib => utils}/parseFile.ts (99%)
 rename src/{tests => utils}/recursiveWalkDir.spec.ts (92%)
 rename src/{lib => utils}/recursiveWalkDir.ts (100%)

diff --git a/src/lib/indexFolder.ts b/src/lib/indexFolder.ts
index 6b28241..069f53c 100644
--- a/src/lib/indexFolder.ts
+++ b/src/lib/indexFolder.ts
@@ -1,5 +1,5 @@
+import { recursiveWalkDir } from "../utils/index.js";
 import { FileInfo, processFile } from "./process.js";
-import { recursiveWalkDir } from "./recursiveWalkDir.js";
 
 export function indexFolder(
   folderPath: string,
diff --git a/src/tests/markdowndb.spec.ts b/src/lib/markdowndb.spec.ts
similarity index 98%
rename from src/tests/markdowndb.spec.ts
rename to src/lib/markdowndb.spec.ts
index cc6375f..585ea47 100644
--- a/src/tests/markdowndb.spec.ts
+++ b/src/lib/markdowndb.spec.ts
@@ -1,7 +1,7 @@
 // import knex from "knex";
-import { MarkdownDB } from "../lib/markdowndb";
-import { recursiveWalkDir } from "../lib/recursiveWalkDir";
-import { File, MddbFile, Table } from "../lib/schema";
+import { MarkdownDB } from "./markdowndb";
+import { File, MddbFile, Table } from "./schema";
+import { recursiveWalkDir } from "../utils";
 
 /**
  * @jest-environment node
diff --git a/src/lib/markdowndb.ts b/src/lib/markdowndb.ts
index 4920a25..67002d7 100644
--- a/src/lib/markdowndb.ts
+++ b/src/lib/markdowndb.ts
@@ -10,7 +10,7 @@ import {
   isLinkToDefined,
   mapFileTagsToInsert,
   getUniqueValues,
-} from "./databaseUtils.js";
+} from "../utils/databaseUtils.js";
 
 const defaultFilePathToUrl = (filePath: string) => {
   let url = filePath
diff --git a/src/tests/process.spec.ts b/src/lib/process.spec.ts
similarity index 95%
rename from src/tests/process.spec.ts
rename to src/lib/process.spec.ts
index 936195f..c59d8d6 100644
--- a/src/tests/process.spec.ts
+++ b/src/lib/process.spec.ts
@@ -1,4 +1,4 @@
-import { processFile } from "../lib/process";
+import { processFile } from "./process";
 import Path from "path";
 
 describe("Can parse a file and get file info", () => {
diff --git a/src/lib/process.ts b/src/lib/process.ts
index 6a8f208..c736f81 100644
--- a/src/lib/process.ts
+++ b/src/lib/process.ts
@@ -2,8 +2,9 @@ import crypto from "crypto";
 import fs from "fs";
 import path from "path";
 
+import { parseFile } from "../utils/index.js";
 import { File } from "./schema.js";
-import { WikiLink, parseFile } from "./parseFile.js";
+import { WikiLink } from "../utils/parseFile.js";
 
 export interface FileInfo extends File {
   tags: string[];
diff --git a/src/tests/validate.spec.ts b/src/lib/validate.spec.ts
similarity index 91%
rename from src/tests/validate.spec.ts
rename to src/lib/validate.spec.ts
index 652ac79..f4d4951 100644
--- a/src/tests/validate.spec.ts
+++ b/src/lib/validate.spec.ts
@@ -1,4 +1,4 @@
-import { areUniqueObjectsByKey } from "../lib/validate";
+import { areUniqueObjectsByKey } from "./validate";
 
 describe("areUniqueObjectsByKey", () => {
   test("should return true if all objects have unique values for the given key", () => {
diff --git a/src/lib/databaseUtils.ts b/src/utils/databaseUtils.ts
similarity index 98%
rename from src/lib/databaseUtils.ts
rename to src/utils/databaseUtils.ts
index 03316f4..2becb7d 100644
--- a/src/lib/databaseUtils.ts
+++ b/src/utils/databaseUtils.ts
@@ -5,7 +5,7 @@ import {
   MddbLink,
   MddbFileTag,
   File,
-} from "./schema.js";
+} from "../lib/schema.js";
 import path from "path";
 import { WikiLink } from "./parseFile.js";
 
diff --git a/src/tests/extractTagsFromBody.spec.ts b/src/utils/extractTagsFromBody.spec.ts
similarity index 98%
rename from src/tests/extractTagsFromBody.spec.ts
rename to src/utils/extractTagsFromBody.spec.ts
index 5844a31..bb1462a 100644
--- a/src/tests/extractTagsFromBody.spec.ts
+++ b/src/utils/extractTagsFromBody.spec.ts
@@ -1,4 +1,4 @@
-import { extractTagsFromBody, processAST } from "../lib/parseFile";
+import { extractTagsFromBody, processAST } from "./parseFile";
 
 const getTagsFromSource = (source: string) => {
   const ast = processAST(source, {});
diff --git a/src/tests/extractWikiLinks.spec.ts b/src/utils/extractWikiLinks.spec.ts
similarity index 99%
rename from src/tests/extractWikiLinks.spec.ts
rename to src/utils/extractWikiLinks.spec.ts
index 7ea439a..903c8e2 100644
--- a/src/tests/extractWikiLinks.spec.ts
+++ b/src/utils/extractWikiLinks.spec.ts
@@ -1,4 +1,4 @@
-import { extractWikiLinks, processAST } from "../lib/parseFile";
+import { extractWikiLinks, processAST } from "./parseFile";
 
 // TODO test for links with headings and aliases ?
 // TODO test pdf embeds
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 0000000..3646927
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,2 @@
+export { recursiveWalkDir } from "./recursiveWalkDir.js";
+export { parseFile } from "./parseFile.js";
diff --git a/src/tests/parseFile.spec.ts b/src/utils/parseFile.spec.ts
similarity index 98%
rename from src/tests/parseFile.spec.ts
rename to src/utils/parseFile.spec.ts
index 482aaa0..041900e 100644
--- a/src/tests/parseFile.spec.ts
+++ b/src/utils/parseFile.spec.ts
@@ -1,4 +1,4 @@
-import { parseFile } from "../lib/parseFile";
+import { parseFile } from "./parseFile";
 
 const source = `---
 title: Hello World
diff --git a/src/lib/parseFile.ts b/src/utils/parseFile.ts
similarity index 99%
rename from src/lib/parseFile.ts
rename to src/utils/parseFile.ts
index 3a26eee..430f359 100644
--- a/src/lib/parseFile.ts
+++ b/src/utils/parseFile.ts
@@ -30,7 +30,6 @@ export function parseFile(source: string, options?: ParsingOptions) {
   };
 }
 
-// Exported for testing
 export function processAST(source: string, options?: ParsingOptions) {
   const userRemarkPlugins: Array<Plugin> = options?.remarkPlugins || [];
 
diff --git a/src/tests/recursiveWalkDir.spec.ts b/src/utils/recursiveWalkDir.spec.ts
similarity index 92%
rename from src/tests/recursiveWalkDir.spec.ts
rename to src/utils/recursiveWalkDir.spec.ts
index eeebf37..bdfb2f7 100644
--- a/src/tests/recursiveWalkDir.spec.ts
+++ b/src/utils/recursiveWalkDir.spec.ts
@@ -1,4 +1,4 @@
-import { recursiveWalkDir } from "../lib/recursiveWalkDir";
+import { recursiveWalkDir } from "./recursiveWalkDir";
 
 describe("recursiveWalkDir", () => {
   const contentFixturePath = "__mocks__/content/blog";
diff --git a/src/lib/recursiveWalkDir.ts b/src/utils/recursiveWalkDir.ts
similarity index 100%
rename from src/lib/recursiveWalkDir.ts
rename to src/utils/recursiveWalkDir.ts