Skip to content

Commit fcc1bce

Browse files
committed
More progress
1 parent 0c86610 commit fcc1bce

File tree

10 files changed

+40
-25
lines changed

10 files changed

+40
-25
lines changed

benchmark/packages/cli/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ const runExercise = async ({ run, language, exercise }: { run: Run; language: La
8181
}
8282

8383
console.log(`Running ${language} / ${exercise}`)
84-
return true
8584

8685
await runTests({
8786
extensionDevelopmentPath,

benchmark/packages/db/src/db.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { drizzle } from "drizzle-orm/libsql"
22

3-
import { schema } from "./schema"
3+
import { schema } from "./schema.js"
44

55
export const db = drizzle({
66
schema,

benchmark/packages/db/src/index.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
export { db } from "./db"
2-
export { type Language, languages } from "./enums"
3-
export { schema } from "./schema"
1+
export { db } from "./db.js"
2+
export { type Language, languages } from "./enums.js"
3+
export { schema } from "./schema.js"
44

55
/**
66
* runs
77
*/
8-
export { type Run, insertRunSchema } from "./schema"
9-
export { findRun, createRun, getRuns } from "./queries/runs"
8+
9+
export { type Run, insertRunSchema } from "./schema.js"
10+
export { findRun, createRun, getRuns } from "./queries/runs.js"
1011

1112
/**
1213
* tasks
1314
*/
14-
export { type Task, insertTaskSchema } from "./schema"
15-
export { findTask, createTask, getTask } from "./queries/tasks"
15+
16+
export { type Task, insertTaskSchema } from "./schema.js"
17+
export { findTask, createTask, getTask } from "./queries/tasks.js"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
export class RecordNotFoundError extends Error {}
2+
3+
export class RecordNotCreatedError extends Error {}

benchmark/packages/db/src/queries/runs.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { desc, eq, sql } from "drizzle-orm"
22

3-
import { db } from "../db"
4-
import { InsertRun, insertRunSchema, runs, tasks } from "../schema"
3+
import { db } from "../db.js"
4+
import { type InsertRun, insertRunSchema, runs, tasks } from "../schema.js"
55

6-
import { RecordNotFoundError } from "./errors"
6+
import { RecordNotFoundError, RecordNotCreatedError } from "./errors.js"
77

88
export const findRun = async (id: number) => {
99
const run = await db.query.runs.findFirst({ where: eq(runs.id, id) })
@@ -24,7 +24,13 @@ export const createRun = async (args: InsertRun) => {
2424
})
2525
.returning()
2626

27-
return result[0]
27+
const run = result[0]
28+
29+
if (!run) {
30+
throw new RecordNotCreatedError()
31+
}
32+
33+
return run
2834
}
2935

3036
export const getRuns = () =>

benchmark/packages/db/src/queries/tasks.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { and, eq } from "drizzle-orm"
22

3-
import { db } from "../db"
4-
import { InsertTask, insertTaskSchema, tasks } from "../schema"
3+
import { db } from "../db.js"
4+
import { type InsertTask, insertTaskSchema, tasks } from "../schema.js"
55

6-
import { RecordNotFoundError } from "./errors"
7-
import { Language } from "../enums"
6+
import { type Language } from "../enums.js"
7+
import { RecordNotFoundError, RecordNotCreatedError } from "./errors.js"
88

99
export const findTask = async (id: number) => {
1010
const run = await db.query.tasks.findFirst({ where: eq(tasks.id, id) })
@@ -25,7 +25,13 @@ export const createTask = async (args: InsertTask) => {
2525
})
2626
.returning()
2727

28-
return result[0]
28+
const task = result[0]
29+
30+
if (!task) {
31+
throw new RecordNotCreatedError()
32+
}
33+
34+
return task
2935
}
3036

3137
export const getTask = async ({ runId, language, exercise }: { runId: number; language: Language; exercise: string }) =>

benchmark/packages/db/src/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as t from "drizzle-orm/sqlite-core"
33
import { createInsertSchema } from "drizzle-zod"
44
import { z } from "zod"
55

6-
import { languages } from "./enums"
6+
import { languages } from "./enums.js"
77

88
/**
99
* runs

benchmark/packages/ipc/src/ipcClient.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ipc from "node-ipc"
22

3-
import { ClientMessage, ClientMessageType, ServerMessageType, serverMessageSchema } from "./schemas"
3+
import { ClientMessage, ClientMessageType, ServerMessageType, serverMessageSchema } from "./types.js"
44

55
export class IpcClient {
66
private readonly _socketPath: string
@@ -15,9 +15,9 @@ export class IpcClient {
1515
ipc.config.silent = true
1616

1717
ipc.connectTo("benchmarkServer", this.socketPath, () => {
18-
ipc.of.benchmarkServer.on("connect", (args) => this.onConnect(args))
19-
ipc.of.benchmarkServer.on("message", (data) => this.onMessage(data))
20-
ipc.of.benchmarkServer.on("disconnect", (args) => this.onDisconnect(args))
18+
ipc.of.benchmarkServer?.on("connect", (args) => this.onConnect(args))
19+
ipc.of.benchmarkServer?.on("message", (data) => this.onMessage(data))
20+
ipc.of.benchmarkServer?.on("disconnect", (args) => this.onDisconnect(args))
2121
})
2222
}
2323

@@ -58,7 +58,7 @@ export class IpcClient {
5858
}
5959

6060
public sendMessage(message: ClientMessage) {
61-
ipc.of.benchmarkServer.emit("message", message)
61+
ipc.of.benchmarkServer?.emit("message", message)
6262
}
6363

6464
public ping() {

benchmark/packages/ipc/src/ipcServer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as os from "node:os"
44
import * as path from "node:path"
55
import * as crypto from "node:crypto"
66

7-
import { ClientMessageType, ServerMessage, ServerMessageType, clientMessageSchema } from "./schemas"
7+
import { ClientMessageType, ServerMessage, ServerMessageType, clientMessageSchema } from "./types.js"
88

99
export class IpcServer {
1010
private _isListening = false

0 commit comments

Comments
 (0)