diff options
21 files changed, 57 insertions, 57 deletions
diff --git a/packages/db/src/core/cli/commands/execute/index.ts b/packages/db/src/core/cli/commands/execute/index.ts index a81696702..1863691e7 100644 --- a/packages/db/src/core/cli/commands/execute/index.ts +++ b/packages/db/src/core/cli/commands/execute/index.ts @@ -1,11 +1,11 @@ +import { existsSync } from 'node:fs'; import type { AstroConfig } from 'astro'; import type { Arguments } from 'yargs-parser'; -import { MISSING_EXECUTE_PATH_ERROR, FILE_NOT_FOUND_ERROR } from '../../../errors.js'; -import { existsSync } from 'node:fs'; +import { FILE_NOT_FOUND_ERROR, MISSING_EXECUTE_PATH_ERROR } from '../../../errors.js'; +import { getStudioVirtualModContents } from '../../../integration/vite-plugin-db.js'; +import { bundleFile, importBundledFile } from '../../../load-file.js'; import { getManagedAppTokenOrExit } from '../../../tokens.js'; import { type DBConfig } from '../../../types.js'; -import { bundleFile, importBundledFile } from '../../../load-file.js'; -import { getStudioVirtualModContents } from '../../../integration/vite-plugin-db.js'; export async function cmd({ astroConfig, diff --git a/packages/db/src/core/cli/commands/gen/index.ts b/packages/db/src/core/cli/commands/gen/index.ts index c28f697d8..be157d4a5 100644 --- a/packages/db/src/core/cli/commands/gen/index.ts +++ b/packages/db/src/core/cli/commands/gen/index.ts @@ -1,8 +1,11 @@ -import { fileURLToPath } from 'node:url'; import { writeFile } from 'node:fs/promises'; +import { relative } from 'node:path'; +import { fileURLToPath } from 'node:url'; import type { AstroConfig } from 'astro'; -import { bold, bgRed, red, reset } from 'kleur/colors'; +import { bgRed, bold, red, reset } from 'kleur/colors'; import type { Arguments } from 'yargs-parser'; +import type { DBConfig } from '../../../types.js'; +import { getMigrationsDirectoryUrl } from '../../../utils.js'; import { getMigrationQueries } from '../../migration-queries.js'; import { MIGRATIONS_CREATED, @@ -10,9 +13,6 @@ import { getMigrationStatus, initializeMigrationsDirectory, } from '../../migrations.js'; -import { getMigrationsDirectoryUrl } from '../../../utils.js'; -import type { DBConfig } from '../../../types.js'; -import { relative } from 'node:path'; export async function cmd({ astroConfig, diff --git a/packages/db/src/core/cli/commands/push/index.ts b/packages/db/src/core/cli/commands/push/index.ts index b6bd773e2..81d232cb2 100644 --- a/packages/db/src/core/cli/commands/push/index.ts +++ b/packages/db/src/core/cli/commands/push/index.ts @@ -2,22 +2,22 @@ import type { AstroConfig } from 'astro'; import { red } from 'kleur/colors'; import prompts from 'prompts'; import type { Arguments } from 'yargs-parser'; +import { MISSING_SESSION_ID_ERROR } from '../../../errors.js'; import { getManagedAppTokenOrExit } from '../../../tokens.js'; import { type DBConfig, type DBSnapshot } from '../../../types.js'; import { getMigrationsDirectoryUrl, getRemoteDatabaseUrl } from '../../../utils.js'; import { getMigrationQueries } from '../../migration-queries.js'; import { + INITIAL_SNAPSHOT, + MIGRATIONS_NOT_INITIALIZED, + MIGRATIONS_UP_TO_DATE, + MIGRATION_NEEDED, createEmptySnapshot, - getMigrations, getMigrationStatus, - INITIAL_SNAPSHOT, + getMigrations, loadInitialSnapshot, loadMigration, - MIGRATION_NEEDED, - MIGRATIONS_NOT_INITIALIZED, - MIGRATIONS_UP_TO_DATE, } from '../../migrations.js'; -import { MISSING_SESSION_ID_ERROR } from '../../../errors.js'; export async function cmd({ astroConfig, diff --git a/packages/db/src/core/cli/commands/shell/index.ts b/packages/db/src/core/cli/commands/shell/index.ts index 7d8f13437..ef54b6b70 100644 --- a/packages/db/src/core/cli/commands/shell/index.ts +++ b/packages/db/src/core/cli/commands/shell/index.ts @@ -3,8 +3,8 @@ import { sql } from 'drizzle-orm'; import type { Arguments } from 'yargs-parser'; import { createRemoteDatabaseClient } from '../../../../runtime/db-client.js'; import { getManagedAppTokenOrExit } from '../../../tokens.js'; -import { getRemoteDatabaseUrl } from '../../../utils.js'; import type { DBConfigInput } from '../../../types.js'; +import { getRemoteDatabaseUrl } from '../../../utils.js'; export async function cmd({ flags, diff --git a/packages/db/src/core/cli/commands/verify/index.ts b/packages/db/src/core/cli/commands/verify/index.ts index ff182fc53..3b95835f7 100644 --- a/packages/db/src/core/cli/commands/verify/index.ts +++ b/packages/db/src/core/cli/commands/verify/index.ts @@ -1,5 +1,6 @@ import type { AstroConfig } from 'astro'; import type { Arguments } from 'yargs-parser'; +import type { DBConfig } from '../../../types.js'; import { getMigrationQueries } from '../../migration-queries.js'; import { MIGRATIONS_NOT_INITIALIZED, @@ -7,7 +8,6 @@ import { MIGRATION_NEEDED, getMigrationStatus, } from '../../migrations.js'; -import type { DBConfig } from '../../../types.js'; export async function cmd({ astroConfig, diff --git a/packages/db/src/core/cli/migration-queries.ts b/packages/db/src/core/cli/migration-queries.ts index aa9d7e316..4265f36e4 100644 --- a/packages/db/src/core/cli/migration-queries.ts +++ b/packages/db/src/core/cli/migration-queries.ts @@ -4,7 +4,6 @@ import * as color from 'kleur/colors'; import { customAlphabet } from 'nanoid'; import prompts from 'prompts'; import { hasPrimaryKey } from '../../runtime/index.js'; -import { isSerializedSQL } from '../../runtime/types.js'; import { getCreateIndexQueries, getCreateTableQuery, @@ -13,6 +12,7 @@ import { hasDefault, schemaTypeToSqlType, } from '../../runtime/queries.js'; +import { isSerializedSQL } from '../../runtime/types.js'; import { type BooleanColumn, type ColumnType, diff --git a/packages/db/src/core/cli/migrations.ts b/packages/db/src/core/cli/migrations.ts index 455ebc984..514d4e798 100644 --- a/packages/db/src/core/cli/migrations.ts +++ b/packages/db/src/core/cli/migrations.ts @@ -1,7 +1,7 @@ import deepDiff from 'deep-diff'; import { mkdir, readFile, readdir, writeFile } from 'fs/promises'; -import { type DBSnapshot, type DBConfig } from '../types.js'; import { cyan, green, yellow } from 'kleur/colors'; +import { type DBConfig, type DBSnapshot } from '../types.js'; import { getMigrationsDirectoryUrl } from '../utils.js'; const { applyChange, diff: generateDiff } = deepDiff; diff --git a/packages/db/src/core/integration/index.ts b/packages/db/src/core/integration/index.ts index 2b476a4d3..4361ddfe7 100644 --- a/packages/db/src/core/integration/index.ts +++ b/packages/db/src/core/integration/index.ts @@ -1,18 +1,18 @@ import { existsSync } from 'fs'; -import { CONFIG_FILE_NAMES, DB_PATH } from '../consts.js'; -import { dbConfigSchema, type DBConfig } from '../types.js'; -import { getDbDirectoryUrl, type VitePlugin } from '../utils.js'; -import { errorMap } from './error-map.js'; import { dirname } from 'path'; import { fileURLToPath } from 'url'; import type { AstroIntegration } from 'astro'; import { mkdir, rm, writeFile } from 'fs/promises'; import { blue, yellow } from 'kleur/colors'; -import { fileURLIntegration } from './file-url.js'; -import { getManagedAppTokenOrExit, type ManagedAppToken } from '../tokens.js'; +import { CONFIG_FILE_NAMES, DB_PATH } from '../consts.js'; import { loadDbConfigFile } from '../load-file.js'; -import { vitePluginDb, type LateTables } from './vite-plugin-db.js'; +import { type ManagedAppToken, getManagedAppTokenOrExit } from '../tokens.js'; +import { type DBConfig, dbConfigSchema } from '../types.js'; +import { type VitePlugin, getDbDirectoryUrl } from '../utils.js'; +import { errorMap } from './error-map.js'; +import { fileURLIntegration } from './file-url.js'; import { typegen } from './typegen.js'; +import { type LateTables, vitePluginDb } from './vite-plugin-db.js'; import { vitePluginInjectEnvTs } from './vite-plugin-inject-env-ts.js'; function astroDBIntegration(): AstroIntegration { diff --git a/packages/db/src/core/integration/vite-plugin-db.ts b/packages/db/src/core/integration/vite-plugin-db.ts index ff97d2b21..65a9fa6a0 100644 --- a/packages/db/src/core/integration/vite-plugin-db.ts +++ b/packages/db/src/core/integration/vite-plugin-db.ts @@ -1,4 +1,5 @@ import { fileURLToPath } from 'node:url'; +import { normalizePath } from 'vite'; import { SEED_DEV_FILE_NAME } from '../../runtime/queries.js'; import { DB_PATH, @@ -8,8 +9,7 @@ import { VIRTUAL_MODULE_ID, } from '../consts.js'; import type { DBTables } from '../types.js'; -import { getDbDirectoryUrl, getRemoteDatabaseUrl, type VitePlugin } from '../utils.js'; -import { normalizePath } from 'vite'; +import { type VitePlugin, getDbDirectoryUrl, getRemoteDatabaseUrl } from '../utils.js'; const LOCAL_DB_VIRTUAL_MODULE_ID = 'astro:local'; diff --git a/packages/db/src/core/load-file.ts b/packages/db/src/core/load-file.ts index 591ffa390..cc1b23c01 100644 --- a/packages/db/src/core/load-file.ts +++ b/packages/db/src/core/load-file.ts @@ -1,9 +1,9 @@ +import { existsSync } from 'node:fs'; +import { unlink, writeFile } from 'node:fs/promises'; +import { fileURLToPath } from 'node:url'; import { build as esbuild } from 'esbuild'; import { CONFIG_FILE_NAMES, VIRTUAL_MODULE_ID } from './consts.js'; -import { fileURLToPath } from 'node:url'; import { getConfigVirtualModContents } from './integration/vite-plugin-db.js'; -import { writeFile, unlink } from 'node:fs/promises'; -import { existsSync } from 'node:fs'; import { getDbDirectoryUrl } from './utils.js'; export async function loadDbConfigFile( diff --git a/packages/db/src/runtime/index.ts b/packages/db/src/runtime/index.ts index d68521f43..501ae7a22 100644 --- a/packages/db/src/runtime/index.ts +++ b/packages/db/src/runtime/index.ts @@ -1,5 +1,5 @@ -import type { LibSQLDatabase } from 'drizzle-orm/libsql'; import { type ColumnBuilderBaseConfig, type ColumnDataType, sql } from 'drizzle-orm'; +import type { LibSQLDatabase } from 'drizzle-orm/libsql'; import { type IndexBuilder, type SQLiteColumnBuilderBase, diff --git a/packages/db/src/runtime/queries.ts b/packages/db/src/runtime/queries.ts index b81b06edb..4341fd123 100644 --- a/packages/db/src/runtime/queries.ts +++ b/packages/db/src/runtime/queries.ts @@ -1,27 +1,27 @@ +import { LibsqlError } from '@libsql/client'; +import { type SQL, sql } from 'drizzle-orm'; +import { SQLiteAsyncDialect } from 'drizzle-orm/sqlite-core'; +import { bold } from 'kleur/colors'; +import { + FOREIGN_KEY_DNE_ERROR, + FOREIGN_KEY_REFERENCES_EMPTY_ERROR, + FOREIGN_KEY_REFERENCES_LENGTH_ERROR, + REFERENCE_DNE_ERROR, + SEED_ERROR, +} from '../core/errors.js'; import type { BooleanColumn, + ColumnType, + DBColumn, DBTable, DBTables, - DBColumn, DateColumn, - ColumnType, JsonColumn, NumberColumn, TextColumn, } from '../core/types.js'; -import { bold } from 'kleur/colors'; -import { type SQL, sql } from 'drizzle-orm'; -import { SQLiteAsyncDialect } from 'drizzle-orm/sqlite-core'; -import { hasPrimaryKey, type SqliteDB } from './index.js'; +import { type SqliteDB, hasPrimaryKey } from './index.js'; import { isSerializedSQL } from './types.js'; -import { - FOREIGN_KEY_REFERENCES_LENGTH_ERROR, - FOREIGN_KEY_REFERENCES_EMPTY_ERROR, - REFERENCE_DNE_ERROR, - FOREIGN_KEY_DNE_ERROR, - SEED_ERROR, -} from '../core/errors.js'; -import { LibsqlError } from '@libsql/client'; const sqlite = new SQLiteAsyncDialect(); diff --git a/packages/db/test/fixtures/basics/db/config.ts b/packages/db/test/fixtures/basics/db/config.ts index b2ed2066f..f216caab6 100644 --- a/packages/db/test/fixtures/basics/db/config.ts +++ b/packages/db/test/fixtures/basics/db/config.ts @@ -1,5 +1,5 @@ -import { defineDB, defineTable, column } from 'astro:db'; import { Themes } from './theme'; +import { column, defineDB, defineTable } from 'astro:db'; const Author = defineTable({ columns: { diff --git a/packages/db/test/fixtures/basics/db/seed.ts b/packages/db/test/fixtures/basics/db/seed.ts index c1b61e099..33d82d523 100644 --- a/packages/db/test/fixtures/basics/db/seed.ts +++ b/packages/db/test/fixtures/basics/db/seed.ts @@ -1,6 +1,6 @@ -import { db, Author } from 'astro:db'; -import { Themes as ThemesConfig } from './theme'; import { asDrizzleTable } from '@astrojs/db/utils'; +import { Themes as ThemesConfig } from './theme'; +import { Author, db } from 'astro:db'; const Themes = asDrizzleTable('Themes', ThemesConfig); diff --git a/packages/db/test/fixtures/basics/db/theme.ts b/packages/db/test/fixtures/basics/db/theme.ts index d3b89b68c..aecc67f7d 100644 --- a/packages/db/test/fixtures/basics/db/theme.ts +++ b/packages/db/test/fixtures/basics/db/theme.ts @@ -1,4 +1,4 @@ -import { defineTable, column, NOW, sql } from 'astro:db'; +import { NOW, column, defineTable, sql } from 'astro:db'; export const Themes = defineTable({ columns: { diff --git a/packages/db/test/fixtures/recipes/db/config.ts b/packages/db/test/fixtures/recipes/db/config.ts index 1cbcaa96e..6334ba8ed 100644 --- a/packages/db/test/fixtures/recipes/db/config.ts +++ b/packages/db/test/fixtures/recipes/db/config.ts @@ -1,4 +1,4 @@ -import { defineTable, defineDB, column } from 'astro:db'; +import { column, defineDB, defineTable } from 'astro:db'; const Recipe = defineTable({ columns: { diff --git a/packages/db/test/fixtures/recipes/db/seed.ts b/packages/db/test/fixtures/recipes/db/seed.ts index b30c708fa..7a4892376 100644 --- a/packages/db/test/fixtures/recipes/db/seed.ts +++ b/packages/db/test/fixtures/recipes/db/seed.ts @@ -1,4 +1,4 @@ -import { db, Recipe, Ingredient } from 'astro:db'; +import { Ingredient, Recipe, db } from 'astro:db'; const pancakes = await db .insert(Recipe) diff --git a/packages/db/test/fixtures/ticketing-example/db/config.ts b/packages/db/test/fixtures/ticketing-example/db/config.ts index 28a50b769..f8148eaed 100644 --- a/packages/db/test/fixtures/ticketing-example/db/config.ts +++ b/packages/db/test/fixtures/ticketing-example/db/config.ts @@ -1,4 +1,4 @@ -import { defineDB, defineTable, column } from 'astro:db'; +import { column, defineDB, defineTable } from 'astro:db'; const Event = defineTable({ columns: { diff --git a/packages/db/test/unit/column-queries.test.js b/packages/db/test/unit/column-queries.test.js index 96c9c687a..c4d60d5c6 100644 --- a/packages/db/test/unit/column-queries.test.js +++ b/packages/db/test/unit/column-queries.test.js @@ -4,10 +4,10 @@ import { getCollectionChangeQueries, getMigrationQueries, } from '../../dist/core/cli/migration-queries.js'; -import { getCreateTableQuery } from '../../dist/runtime/queries.js'; -import { column, defineTable } from '../../dist/runtime/config.js'; import { tableSchema } from '../../dist/core/types.js'; +import { column, defineTable } from '../../dist/runtime/config.js'; import { NOW } from '../../dist/runtime/index.js'; +import { getCreateTableQuery } from '../../dist/runtime/queries.js'; const TABLE_NAME = 'Users'; diff --git a/packages/db/test/unit/index-queries.test.js b/packages/db/test/unit/index-queries.test.js index 5e9b2130d..ad588959d 100644 --- a/packages/db/test/unit/index-queries.test.js +++ b/packages/db/test/unit/index-queries.test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; import { getCollectionChangeQueries } from '../../dist/core/cli/migration-queries.js'; -import { column } from '../../dist/runtime/config.js'; import { tableSchema } from '../../dist/core/types.js'; +import { column } from '../../dist/runtime/config.js'; const userInitial = tableSchema.parse({ columns: { diff --git a/packages/db/test/unit/reference-queries.test.js b/packages/db/test/unit/reference-queries.test.js index 561879f43..a4b0bdd2d 100644 --- a/packages/db/test/unit/reference-queries.test.js +++ b/packages/db/test/unit/reference-queries.test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; import { getCollectionChangeQueries } from '../../dist/core/cli/migration-queries.js'; -import { column, defineTable } from '../../dist/runtime/config.js'; import { tablesSchema } from '../../dist/core/types.js'; +import { column, defineTable } from '../../dist/runtime/config.js'; const BaseUser = defineTable({ columns: { |