diff --git a/.gitignore b/.gitignore index 5d67c4d..b4a76b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ node_modules src/day* +./ligma.config.js +dist + diff --git a/.jest.config.json b/.jest.config.json index 5503c6a..b0d729d 100644 --- a/.jest.config.json +++ b/.jest.config.json @@ -2,7 +2,7 @@ "clearMocks": true, "moduleNameMapper": { "@code/(.*)": [ - "/src/day6/$1" + "/src/day10/$1" ] }, "preset": "ts-jest" diff --git a/package.json b/package.json index 03f78a5..55ad4dc 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,13 @@ "typescript": "^4.7.4" }, "scripts": { - "test": "jest ArrayList" + "test": "jest ArrayList", + "clear": "./scripts/clear", + "generate": "./scripts/generate", + "start": "echo vim /home/mpaulson/personal/kata/src/day9", + "day": "echo /home/mpaulson/personal/kata/src/day10" }, "kata_stats": { - "ArrayList": 4 + "ArrayList": 8 } } \ No newline at end of file diff --git a/scripts/align-configs.js b/scripts/align-configs.js index 99e30e4..26edef8 100644 --- a/scripts/align-configs.js +++ b/scripts/align-configs.js @@ -1,9 +1,10 @@ const fs = require("fs"); const path = require("path"); -module.exports.package_json = function(config) { +module.exports.package_json = function(config, day_path) { const package_json = require("../package.json"); package_json.scripts.test = `jest ${config.dsa.join(" ")}`; + package_json.scripts.day = `echo ${day_path}`; package_json.kata_stats = config.dsa.reduce((acc, ds) => { if (!acc[ds]) { @@ -13,6 +14,7 @@ module.exports.package_json = function(config) { return acc; }, package_json.kata_stats || {}); + fs.writeFileSync( path.join(__dirname, "..", "package.json"), JSON.stringify(package_json, null, 4)); diff --git a/scripts/generate b/scripts/generate index e4c361a..31758da 100755 --- a/scripts/generate +++ b/scripts/generate @@ -55,5 +55,5 @@ config.dsa.forEach(ds => { const align = require("./align-configs"); align.jest(day_name); align.ts_config(day_name); -align.package_json(config, day_name); +align.package_json(config, day_path); diff --git a/src/__tests__/ArrayList.ts b/src/__tests__/ArrayList.ts index 4b64654..480c8a0 100644 --- a/src/__tests__/ArrayList.ts +++ b/src/__tests__/ArrayList.ts @@ -1,4 +1,4 @@ -import ArrayList from "@code/array-list"; +import ArrayList from "@code/ArrayList"; test("array-list", function() { const list = new ArrayList(3); @@ -7,14 +7,15 @@ test("array-list", function() { list.add(7); list.add(9); - expect(list.remove()).toEqual(5); + expect(list.get(2)).toEqual(9); + expect(list.removeAt(1)).toEqual(7); expect(list.length).toEqual(2); list.add(11); - expect(list.remove()).toEqual(7); - expect(list.remove()).toEqual(9); - expect(list.remove()).toEqual(11); - expect(list.remove()).toEqual(undefined); + expect(list.removeAt(1)).toEqual(9); + expect(list.remove(9)).toEqual(undefined); + expect(list.removeAt(0)).toEqual(5); + expect(list.removeAt(0)).toEqual(11); expect(list.length).toEqual(0); list.add(5); @@ -26,7 +27,7 @@ test("array-list", function() { list.add(11); list.add(13); - expect(list.length).toEqual(5); + expect(list.length).toEqual(4); expect(list.capacity).toEqual(6); }); diff --git a/src/__tests__/DoublyLinkedList.ts b/src/__tests__/DoublyLinkedList.ts index 0a64bad..5e66a79 100644 --- a/src/__tests__/DoublyLinkedList.ts +++ b/src/__tests__/DoublyLinkedList.ts @@ -1,4 +1,4 @@ -import LinkedList from "@code/doubly-linked-list"; +import LinkedList from "@code/DoublyLinkedList"; test("linked-list", function() { const list = new LinkedList(); diff --git a/src/__tests__/InsertionSort.ts b/src/__tests__/InsertionSort.ts index 8378202..c4cb104 100644 --- a/src/__tests__/InsertionSort.ts +++ b/src/__tests__/InsertionSort.ts @@ -1,4 +1,4 @@ -import insertion_sort from "@code/insertion-sort"; +import insertion_sort from "@code/InsertionSort"; test("insertion-sort", function() { const arr = [9, 3, 7, 4, 69, 420, 42]; diff --git a/src/__tests__/MergeSort.ts b/src/__tests__/MergeSort.ts index cc689e8..7b76929 100644 --- a/src/__tests__/MergeSort.ts +++ b/src/__tests__/MergeSort.ts @@ -1,4 +1,4 @@ -import merge_sort from "@code/merge-sort"; +import merge_sort from "@code/MergeSort"; test("merge-sort", function() { const arr = [9, 3, 7, 4, 69, 420, 42]; diff --git a/src/__tests__/Queue.ts b/src/__tests__/Queue.ts index a5ce144..6d61ca9 100644 --- a/src/__tests__/Queue.ts +++ b/src/__tests__/Queue.ts @@ -1,4 +1,4 @@ -import Queue from "@code/queue"; +import Queue from "@code/Queue"; test("queue", function() { const list = new Queue(); diff --git a/src/__tests__/SinglyLinkedList.ts b/src/__tests__/SinglyLinkedList.ts index 5190e33..664b45b 100644 --- a/src/__tests__/SinglyLinkedList.ts +++ b/src/__tests__/SinglyLinkedList.ts @@ -1,4 +1,4 @@ -import LinkedList from "@code/single-linked-list"; +import LinkedList from "@code/SingleLinkedList"; test("linked-list", function() { const list = new LinkedList(); diff --git a/src/__tests__/Stack.ts b/src/__tests__/Stack.ts index 586598d..9d30d41 100644 --- a/src/__tests__/Stack.ts +++ b/src/__tests__/Stack.ts @@ -1,4 +1,4 @@ -import Stack from "@code/stack"; +import Stack from "@code/Stack"; test("queue", function() { const list = new Stack(); diff --git a/tsconfig.json b/tsconfig.json index 9e25282..2297191 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,7 @@ "baseUrl": "src", "paths": { "@code/*": [ - "day6/*" + "day10/*" ] } },