Skip to content

Commit 6992e7e

Browse files
weaponsforgeweaponsforge
committed
chore: use aoc file fxn, #44 
1 parent acbf30d commit 6992e7e

File tree

10 files changed

+27
-38
lines changed

10 files changed

+27
-38
lines changed

‎src/2024/2024-12-06/main.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import path from 'path'
2-
import { readAOCInputFile, AOC_OUTPUT_TYPE } from '@/aoc/file/aocfile.js'
3-
import { directory } from '@/aoc/file/utils.js'
1+
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
2+
import { file } from '@/aoc/file/utils.js'
43

54
import { guardController } from './lib/guardController.js'
65
import { findObstructionPositions } from './lib/guardControllerLoop.js'
76

8-
const file = readAOCInputFile({
9-
filePath: path.join(directory(import.meta.url), 'input.txt'),
7+
const input = readAOCInputFile({
8+
filePath: file(import.meta.url, 'input.txt'),
109
type: AOC_OUTPUT_TYPE.STRING_ARRAY_2D
1110
}) as string [][]
1211

@@ -15,7 +14,7 @@ const file = readAOCInputFile({
1514
* Counts the number of distinct guard positions in a grid
1615
*/
1716
export const quiz20241206_01 = () => {
18-
const grid = guardController(file, true)
17+
const grid = guardController(input, true)
1918

2019
console.log('Distinct guard positions:', grid.positionCount)
2120
return grid.positionCount
@@ -27,7 +26,7 @@ export const quiz20241206_01 = () => {
2726
* obstacle will cause the Guard to walk in an infinite loop
2827
*/
2928
export const quiz20241206_02 = () => {
30-
const infinitePositions = findObstructionPositions(file)
29+
const infinitePositions = findObstructionPositions(input)
3130

3231
console.log('Obstruction positions for infinite walk:', infinitePositions)
3332
return infinitePositions

‎src/2024/2024-12-06/sample.test.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
import path from 'path'
21
import { test, expect } from 'vitest'
32

4-
import { readAOCInputFile, AOC_OUTPUT_TYPE } from '@/aoc/file/aocfile.js'
5-
import { directory } from '@/aoc/file/utils.js'
3+
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
4+
import { file } from '@/aoc/file/utils.js'
65

76
import { guardController } from './lib/guardController.js'
87
import { findObstructionPositions } from './lib/guardControllerLoop.js'
98

10-
const file = readAOCInputFile({
11-
filePath: path.join(directory(import.meta.url), 'input.txt'),
9+
const input = readAOCInputFile({
10+
filePath: file(import.meta.url, 'input.txt'),
1211
type: AOC_OUTPUT_TYPE.STRING_ARRAY_2D
1312
}) as string [][]
1413

1514
test('Count distinct guard positions', () => {
16-
expect(guardController(file).positionCount).toBe(26)
15+
expect(guardController(input).positionCount).toBe(26)
1716
})
1817

1918
test('Count obstacle positions', () => {
20-
expect(findObstructionPositions(file)).toBe(2)
19+
expect(findObstructionPositions(input)).toBe(2)
2120
})

‎src/2024/2024-12-07/main.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import path from 'path'
21
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
3-
import { directory } from '@/aoc/file/utils.js'
2+
import { file } from '@/aoc/file/utils.js'
43

54
import { totalCalibrationResult } from './lib/totalCalibration.js'
65
import { totalCalibrationConcat } from './lib/totalCalibrationConcat.js'
76

87
// Read and process the input file
98
const input = (readAOCInputFile({
10-
filePath: path.join(directory(import.meta.url), 'input.txt'),
9+
filePath: file(import.meta.url, 'input.txt'),
1110
type: AOC_OUTPUT_TYPE.STRING
1211
}) as string)
1312
.split('\n')

‎src/2024/2024-12-07/sample.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import path from 'path'
21
import { test, expect } from 'vitest'
32

4-
import { readAOCInputFile, AOC_OUTPUT_TYPE } from '@/aoc/file/aocfile.js'
5-
import { directory } from '@/aoc/file/utils.js'
3+
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
4+
import { file } from '@/aoc/file/utils.js'
65

76
import { totalCalibrationResult } from './lib/totalCalibration.js'
87
import { totalCalibrationConcat } from './lib/totalCalibrationConcat.js'
98

109
// Read and process the input file
1110
const input = (readAOCInputFile({
12-
filePath: path.join(directory(import.meta.url), 'input.txt'),
11+
filePath: file(import.meta.url, 'input.txt'),
1312
type: AOC_OUTPUT_TYPE.STRING
1413
}) as string)
1514
.split('\n')

‎src/2024/2024-12-08/main.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import path from 'path'
21
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
3-
import { directory } from '@/aoc/file/utils.js'
2+
import { file } from '@/aoc/file/utils.js'
43

54
import { countAntinodes } from './lib/uniqueAntinodes.js'
65
import { countAllAntinodes } from './lib/allAntinodes.js'
76

87
const input = readAOCInputFile({
9-
filePath: path.join(directory(import.meta.url), 'input.txt'),
8+
filePath: file(import.meta.url, 'input.txt'),
109
type: AOC_OUTPUT_TYPE.STRING_ARRAY_2D
1110
}) as string[][]
1211

‎src/2024/2024-12-08/sample.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import path from 'path'
21
import { test, expect } from 'vitest'
32

43
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
5-
import { directory } from '@/aoc/file/utils.js'
4+
import { file } from '@/aoc/file/utils.js'
65

76
import { countAntinodes } from './lib/uniqueAntinodes.js'
87
import { countAllAntinodes } from './lib/allAntinodes.js'
98

109
const input = readAOCInputFile({
11-
filePath: path.join(directory(import.meta.url), 'input.txt'),
10+
filePath: file(import.meta.url, 'input.txt'),
1211
type: AOC_OUTPUT_TYPE.STRING_ARRAY_2D
1312
}) as string[][]
1413

‎src/2024/2024-12-09/main.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import path from 'path'
2-
31
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
4-
import { directory } from '@/aoc/file/utils.js'
2+
import { file } from '@/aoc/file/utils.js'
53

64
import { CompactDisk } from './lib/compact.js'
75
import { WholeDisk } from './lib/whole.js'
86

97
const input = readAOCInputFile({
10-
filePath: path.join(directory(import.meta.url), 'input.txt'),
8+
filePath: file(import.meta.url, 'input.txt'),
119
type: AOC_OUTPUT_TYPE.STRING
1210
}) as string
1311

‎src/2024/2024-12-09/sample.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import path from 'path'
21
import { test, expect } from 'vitest'
32

43
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
5-
import { directory } from '@/aoc/file/utils.js'
4+
import { file } from '@/aoc/file/utils.js'
65

76
import { CompactDisk } from './lib/compact.js'
87
import { WholeDisk } from './lib/whole.js'
98

109
const input = readAOCInputFile({
11-
filePath: path.join(directory(import.meta.url), 'input.txt'),
10+
filePath: file(import.meta.url, 'input.txt'),
1211
type: AOC_OUTPUT_TYPE.STRING
1312
}) as string
1413

‎src/2024/2024-12-10/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import { readAOCInputFile, AOC_OUTPUT_TYPE } from '@/aoc/file/aocfile.js'
2+
import { AOC_OUTPUT_TYPE, readAOCInputFile } from '@/aoc/file/aocfile.js'
33
import { file } from '@/aoc/file/utils.js'
44

55
import { countTrailScores } from './lib/scoresRatings.js'

‎src/2024/2024-12-12/sample.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { test, expect } from 'vitest'
2-
import { AOC_OUTPUT_TYPE } from '@/aoc/file/aocfile.js'
2+
import { AOC_OUTPUT_TYPE, readAOCInputFileAsync } from '@/aoc/file/aocfile.js'
33
import { file } from '@/aoc/file/utils.js'
44

5-
import { readAOCInputFileAsync } from '@/aoc/file/aocfile.js'
6-
75
import { Garden } from './lib/garden.js'
86
import { WholesaleGarden } from './lib/wholesale.js'
97

0 commit comments

Comments
 (0)