diff --git a/eslint.config.js b/eslint.config.js index d820d087a..028afd341 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -10,19 +10,20 @@ export default antfu( '**/assets/live2d/models/**', 'packages/stage-tamagotchi/out/**', '**/drizzle/**', + '**/.astro/**', ], - // rules: { - // 'import/order': [ - // 'error', - // { - // 'groups': [ - // ['type'], - // ['builtin', 'external'], - // ['parent', 'sibling', 'index'], - // ], - // 'newlines-between': 'always', - // }, - // ], - // }, + rules: { + 'import/order': [ + 'error', + { + 'groups': [ + ['type'], + ['builtin', 'external'], + ['parent', 'sibling', 'index'], + ], + 'newlines-between': 'always', + }, + ], + }, }, ) diff --git a/packages/hfup/src/vite/space-card/index.ts b/packages/hfup/src/vite/space-card/index.ts index 2c25e36e0..e3f4be646 100644 --- a/packages/hfup/src/vite/space-card/index.ts +++ b/packages/hfup/src/vite/space-card/index.ts @@ -1,10 +1,11 @@ import type { Plugin, ResolvedConfig } from 'vite' import type { License, SpaceConfiguration } from './types' + import { readFile } from 'node:fs/promises' import { join } from 'node:path' import { defu } from 'defu' - import grayMatter from 'gray-matter' + import { exists } from '../../utils/fs' import { licenseValues } from './types' diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-format.ts b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-format.ts index b2bdc51b9..28e308b10 100644 --- a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-format.ts +++ b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-format.ts @@ -1,7 +1,7 @@ import type { TZDate } from '@date-fns/tz' import type { Field, StructRow } from 'apache-arrow' - import type { DataType } from './duckdb-types' + import { TZDateMini } from '@date-fns/tz' import { DataType as ArrowDataType, IntervalUnit, Struct, TimeUnit, util } from 'apache-arrow' import { @@ -20,8 +20,8 @@ import { setDay, transpose, } from 'date-fns' - import { trimEnd } from 'es-toolkit' + import { isNullOrUndefined, notNullOrUndefined } from './duckdb-common' import { isBooleanType, diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-types.ts b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-types.ts index 44b9649c6..abfce6e2c 100644 --- a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-types.ts +++ b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-types.ts @@ -1,5 +1,7 @@ import type { Dictionary, Field, Struct, StructRow, Vector } from 'apache-arrow' + import { DataType as ArrowDataType } from 'apache-arrow' + import { isNullOrUndefined } from './duckdb-common' /** Data types used by ArrowJS. */ diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-vite-bundles.ts b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-vite-bundles.ts index ede648a10..beb1c8937 100644 --- a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-vite-bundles.ts +++ b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-vite-bundles.ts @@ -3,10 +3,8 @@ import type { DuckDBBundles } from '@duckdb/duckdb-wasm' import ehMainWorker from '@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js?url' import ehMainModule from '@duckdb/duckdb-wasm/dist/duckdb-eh.wasm?url' - import mvpMainWorker from '@duckdb/duckdb-wasm/dist/duckdb-browser-mvp.worker.js?url' import mvpMainModule from '@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm?url' - import coiMainModule from '@duckdb/duckdb-wasm/dist/duckdb-coi.wasm?url' import coiMainWorker from '@duckdb/duckdb-wasm/dist/duckdb-browser-coi.worker.js?url' import coiPthreadWorker from '@duckdb/duckdb-wasm/dist/duckdb-browser-coi.pthread.worker.js?url' diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb.ts b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb.ts index bdc74f29a..c4067266e 100644 --- a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb.ts +++ b/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb.ts @@ -1,6 +1,8 @@ import type { AsyncDuckDBConnection, DuckDBBundles, Logger } from '@duckdb/duckdb-wasm' + import { AsyncDuckDB, ConsoleLogger, selectBundle, VoidLogger } from '@duckdb/duckdb-wasm' import { defu } from 'defu' + import { getBundles } from './duckdb-default-bundles' export type ConnectOptions = ConnectRequiredOptions & ConnectOptionalOptions diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/driver.ts b/packages/memory-driver-duckdb/src/drizzle-orm/driver.ts index ddc033d22..4352f4b02 100644 --- a/packages/memory-driver-duckdb/src/drizzle-orm/driver.ts +++ b/packages/memory-driver-duckdb/src/drizzle-orm/driver.ts @@ -2,10 +2,11 @@ import type { DuckDBBundles, Logger } from '@duckdb/duckdb-wasm' import type { DrizzleConfig, RelationalSchemaConfig, TablesRelationalConfig } from 'drizzle-orm' import type { DuckDBWasmClient } from './dialect' import type { DuckDBWasmQueryResultHKT } from './session' -import { ConsoleLogger } from '@duckdb/duckdb-wasm' +import { ConsoleLogger } from '@duckdb/duckdb-wasm' import { createTableRelationsHelpers, DefaultLogger, entityKind, extractTablesRelationalConfig, isConfig } from 'drizzle-orm' import { PgDatabase, PgDialect } from 'drizzle-orm/pg-core' + import { connect } from './dialect' import { DuckDBWasmSession } from './session' diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/session.ts b/packages/memory-driver-duckdb/src/drizzle-orm/session.ts index 9f1c81960..3a0265717 100644 --- a/packages/memory-driver-duckdb/src/drizzle-orm/session.ts +++ b/packages/memory-driver-duckdb/src/drizzle-orm/session.ts @@ -5,6 +5,7 @@ import type { DuckDBWasmClient } from './dialect' import { entityKind, fillPlaceholders, NoopLogger } from 'drizzle-orm' import { PgPreparedQuery, PgSession, PgTransaction } from 'drizzle-orm/pg-core' + import { beginTransaction, mapColumnData, withSavepoint } from './dialect' export type Row = Record diff --git a/packages/moonshine-web/src/App.vue b/packages/moonshine-web/src/App.vue index 27118a9f6..10cc67e7c 100644 --- a/packages/moonshine-web/src/App.vue +++ b/packages/moonshine-web/src/App.vue @@ -1,5 +1,6 @@