diff --git a/express/basic/routes.ts b/express/basic/routes.ts index 63bf96a..4511e7c 100644 --- a/express/basic/routes.ts +++ b/express/basic/routes.ts @@ -1,5 +1,5 @@ import { DateTime } from "ts-luxon"; -import { get, User } from "../framework/hydrators/user"; +import { get, User } from "../diachron/hydrators/user"; import { request } from "../request"; import { html, render } from "../request/util"; import type { Call, Result, Route } from "../types"; diff --git a/express/database.ts b/express/database.ts index c8bf361..24aecf5 100644 --- a/express/database.ts +++ b/express/database.ts @@ -113,7 +113,7 @@ async function raw( // // Migrations directory: express/migrations/ -const FRAMEWORK_MIGRATIONS_DIR = path.join(__dirname, "framework/migrations"); +const FRAMEWORK_MIGRATIONS_DIR = path.join(__dirname, "diachron/migrations"); const APP_MIGRATIONS_DIR = path.join(__dirname, "migrations"); const MIGRATIONS_TABLE = "_migrations"; diff --git a/express/framework/hydrators/hydrator.ts b/express/diachron/hydrators/hydrator.ts similarity index 100% rename from express/framework/hydrators/hydrator.ts rename to express/diachron/hydrators/hydrator.ts diff --git a/express/framework/hydrators/tests/setup.ts b/express/diachron/hydrators/tests/setup.ts similarity index 100% rename from express/framework/hydrators/tests/setup.ts rename to express/diachron/hydrators/tests/setup.ts diff --git a/express/framework/hydrators/tests/user.spec.ts b/express/diachron/hydrators/tests/user.spec.ts similarity index 98% rename from express/framework/hydrators/tests/user.spec.ts rename to express/diachron/hydrators/tests/user.spec.ts index e22cb85..b522f73 100644 --- a/express/framework/hydrators/tests/user.spec.ts +++ b/express/diachron/hydrators/tests/user.spec.ts @@ -1,5 +1,5 @@ // Tests for user hydrator -// Run with: cd express && DB_PORT=5433 DB_USER=diachron_test DB_PASSWORD=diachron_test DB_NAME=diachron_test ../cmd npx tsx --test framework/hydrators/tests/user.test.ts +// Run with: cd express && DB_PORT=5433 DB_USER=diachron_test DB_PASSWORD=diachron_test DB_NAME=diachron_test ../cmd npx tsx --test diachron/hydrators/tests/user.test.ts import assert from "node:assert/strict"; import { after, before, beforeEach, describe, it } from "node:test"; diff --git a/express/framework/migrations/2026-01-01_01-users.sql b/express/diachron/migrations/2026-01-01_01-users.sql similarity index 100% rename from express/framework/migrations/2026-01-01_01-users.sql rename to express/diachron/migrations/2026-01-01_01-users.sql diff --git a/express/framework/migrations/2026-01-01_02-sessions.sql b/express/diachron/migrations/2026-01-01_02-sessions.sql similarity index 100% rename from express/framework/migrations/2026-01-01_02-sessions.sql rename to express/diachron/migrations/2026-01-01_02-sessions.sql diff --git a/express/framework/migrations/2026-01-01_03-user-credentials.sql b/express/diachron/migrations/2026-01-01_03-user-credentials.sql similarity index 100% rename from express/framework/migrations/2026-01-01_03-user-credentials.sql rename to express/diachron/migrations/2026-01-01_03-user-credentials.sql diff --git a/express/framework/migrations/2026-01-24_01-roles-and-groups.sql b/express/diachron/migrations/2026-01-24_01-roles-and-groups.sql similarity index 100% rename from express/framework/migrations/2026-01-24_01-roles-and-groups.sql rename to express/diachron/migrations/2026-01-24_01-roles-and-groups.sql diff --git a/express/framework/migrations/2026-01-24_02-capabilities.sql b/express/diachron/migrations/2026-01-24_02-capabilities.sql similarity index 100% rename from express/framework/migrations/2026-01-24_02-capabilities.sql rename to express/diachron/migrations/2026-01-24_02-capabilities.sql