@astrojs/db 0.11.7 → 0.13.0

package/dist/_internal/core/types.d.ts

@@ -1,4 +1,3 @@
-import type { AstroIntegration } from 'astro';
 import type { z } from 'zod';
 import type { MaybeArray, booleanColumnSchema, columnSchema, columnsSchema, dateColumnSchema, dbConfigSchema, indexSchema, jsonColumnSchema, numberColumnOptsSchema, numberColumnSchema, referenceableColumnSchema, resolvedIndexSchema, tableSchema, textColumnOptsSchema, textColumnSchema } from './schemas.js';
 export type ResolvedIndexes = z.output<typeof dbConfigSchema>['tables'][string]['indexes'];
@@ -46,14 +45,16 @@ interface LegacyIndexConfig<TColumns extends ColumnsConfig> extends z.input<type
 }
 export type NumberColumnOpts = z.input<typeof numberColumnOptsSchema>;
 export type TextColumnOpts = z.input<typeof textColumnOptsSchema>;
-export type AstroDbIntegration = AstroIntegration & {
-    hooks: {
-        'astro:db:setup'?: (options: {
-            extendDb: (options: {
-                configEntrypoint?: URL | string;
-                seedEntrypoint?: URL | string;
-            }) => void;
-        }) => void | Promise<void>;
-    };
-};
+declare global {
+    namespace Astro {
+        interface IntegrationHooks {
+            'astro:db:setup'?: (options: {
+                extendDb: (options: {
+                    configEntrypoint?: URL | string;
+                    seedEntrypoint?: URL | string;
+                }) => void;
+            }) => void | Promise<void>;
+        }
+    }
+}
 export {};

package/dist/_internal/core/utils.d.ts

@@ -1,10 +1,10 @@
 import type { AstroConfig, AstroIntegration } from 'astro';
-import type { AstroDbIntegration } from './types.js';
+import './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
 export declare function getAstroEnv(envMode?: string): Record<`ASTRO_${string}`, string>;
 export declare function getRemoteDatabaseUrl(): string;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
-export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
+export declare function defineDbIntegration(integration: AstroIntegration): AstroIntegration;
 export type Result<T> = {
     success: true;
     data: T;

package/dist/core/cli/commands/execute/index.d.ts

@@ -1,8 +1,8 @@
 import type { AstroConfig } from 'astro';
-import type { Arguments } from 'yargs-parser';
 import type { DBConfig } from '../../../types.js';
+import type { YargsArguments } from '../../types.js';
 export declare function cmd({ astroConfig, dbConfig, flags, }: {
     astroConfig: AstroConfig;
     dbConfig: DBConfig;
-    flags: Arguments;
+    flags: YargsArguments;
 }): Promise<void>;

package/dist/core/cli/commands/login/index.d.ts

@@ -1,8 +1,8 @@
 import type { AstroConfig } from 'astro';
-import type { Arguments } from 'yargs-parser';
 import type { DBConfig } from '../../../types.js';
+import type { YargsArguments } from '../../types.js';
 export declare function cmd({ flags, }: {
     astroConfig: AstroConfig;
     dbConfig: DBConfig;
-    flags: Arguments;
+    flags: YargsArguments;
 }): Promise<void>;

package/dist/core/cli/commands/push/index.d.ts

@@ -1,8 +1,8 @@
 import type { AstroConfig } from 'astro';
-import type { Arguments } from 'yargs-parser';
 import { type DBConfig } from '../../../types.js';
+import type { YargsArguments } from '../../types.js';
 export declare function cmd({ dbConfig, flags, }: {
     astroConfig: AstroConfig;
     dbConfig: DBConfig;
-    flags: Arguments;
+    flags: YargsArguments;
 }): Promise<void>;

package/dist/core/cli/commands/shell/index.d.ts

@@ -1,8 +1,8 @@
 import type { AstroConfig } from 'astro';
-import type { Arguments } from 'yargs-parser';
 import type { DBConfigInput } from '../../../types.js';
+import type { YargsArguments } from '../../types.js';
 export declare function cmd({ flags, astroConfig, }: {
     dbConfig: DBConfigInput;
     astroConfig: AstroConfig;
-    flags: Arguments;
+    flags: YargsArguments;
 }): Promise<void>;

package/dist/core/cli/commands/verify/index.d.ts

@@ -1,8 +1,8 @@
 import type { AstroConfig } from 'astro';
-import type { Arguments } from 'yargs-parser';
 import type { DBConfig } from '../../../types.js';
+import type { YargsArguments } from '../../types.js';
 export declare function cmd({ dbConfig, flags, }: {
     astroConfig: AstroConfig;
     dbConfig: DBConfig;
-    flags: Arguments;
+    flags: YargsArguments;
 }): Promise<void>;

package/dist/core/cli/index.d.ts

@@ -1,6 +1,6 @@
 import type { AstroConfig } from 'astro';
-import type { Arguments } from 'yargs-parser';
+import type { YargsArguments } from './types.js';
 export declare function cli({ flags, config: astroConfig, }: {
-    flags: Arguments;
+    flags: YargsArguments;
     config: AstroConfig;
 }): Promise<void>;

package/dist/core/cli/print-help.js

@@ -27,7 +27,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"0.11.7"}`
+        `v${"0.13.0"}`
       )} ${headline}`
     );
   }

package/dist/core/cli/types.d.ts

@@ -0,0 +1,5 @@
+export interface YargsArguments {
+    _: Array<string | number>;
+    '--'?: Array<string | number>;
+    [argName: string]: any;
+}

package/dist/core/integration/index.js

@@ -1,4 +1,5 @@
 import { existsSync } from "fs";
+import { parseArgs } from "node:util";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
 import { getManagedAppTokenOrExit } from "@astrojs/studio";
@@ -10,7 +11,6 @@ import {
   loadEnv,
   mergeConfig
 } from "vite";
-import parseArgs from "yargs-parser";
 import { AstroDbError } from "../../runtime/utils.js";
 import { CONFIG_FILE_NAMES, DB_PATH } from "../consts.js";
 import { EXEC_DEFAULT_EXPORT_ERROR, EXEC_ERROR } from "../errors.js";
@@ -18,12 +18,11 @@ import { resolveDbConfig } from "../load-file.js";
 import { SEED_DEV_FILE_NAME } from "../queries.js";
 import { getDbDirectoryUrl } from "../utils.js";
 import { fileURLIntegration } from "./file-url.js";
-import { typegenInternal } from "./typegen.js";
+import { getDtsContent } from "./typegen.js";
 import {
   resolved,
   vitePluginDb
 } from "./vite-plugin-db.js";
-import { vitePluginInjectEnvTs } from "./vite-plugin-inject-env-ts.js";
 function astroDBIntegration() {
   let connectToStudio = false;
   let configFileDependencies = [];
@@ -57,8 +56,8 @@ function astroDBIntegration() {
         output = config.output;
         if (command === "preview") return;
         let dbPlugin = void 0;
-        const args = parseArgs(process.argv.slice(3));
-        connectToStudio = process.env.ASTRO_INTERNAL_TEST_REMOTE || args["remote"];
+        const args = parseArgs({ strict: false });
+        connectToStudio = !!process.env.ASTRO_INTERNAL_TEST_REMOTE || !!args.values.remote;
         if (connectToStudio) {
           appToken = await getManagedAppTokenOrExit();
           dbPlugin = vitePluginDb({
@@ -85,11 +84,11 @@ function astroDBIntegration() {
         updateConfig({
           vite: {
             assetsInclude: [DB_PATH],
-            plugins: [dbPlugin, vitePluginInjectEnvTs(config, logger)]
+            plugins: [dbPlugin]
           }
         });
       },
-      "astro:config:done": async ({ config }) => {
+      "astro:config:done": async ({ config, injectTypes }) => {
         if (command === "preview") return;
         const { dbConfig, dependencies, integrationSeedPaths } = await resolveDbConfig(config);
         tables.get = () => dbConfig.tables;
@@ -100,7 +99,10 @@ function astroDBIntegration() {
           await mkdir(dirname(fileURLToPath(localDbUrl)), { recursive: true });
           await writeFile(localDbUrl, "");
         }
-        await typegenInternal({ tables: tables.get() ?? {}, root: config.root });
+        injectTypes({
+          filename: "db.d.ts",
+          content: getDtsContent(tables.get() ?? {})
+        });
       },
       "astro:server:setup": async ({ server, logger }) => {
         seedHandler.execute = async (fileUrl) => {

package/dist/core/integration/typegen.d.ts

@@ -1,7 +1,2 @@
-import type { AstroConfig } from 'astro';
 import type { DBTables } from '../types.js';
-export declare function typegen(astroConfig: Pick<AstroConfig, 'root' | 'integrations'>): Promise<void>;
-export declare function typegenInternal({ tables, root }: {
-    tables: DBTables;
-    root: URL;
-}): Promise<void>;
+export declare function getDtsContent(tables: DBTables): string;

package/dist/core/integration/typegen.js

@@ -1,22 +1,11 @@
-import { existsSync } from "node:fs";
-import { mkdir, writeFile } from "node:fs/promises";
-import { DB_TYPES_FILE, RUNTIME_IMPORT } from "../consts.js";
-import { resolveDbConfig } from "../load-file.js";
-async function typegen(astroConfig) {
-  const { dbConfig } = await resolveDbConfig(astroConfig);
-  await typegenInternal({ tables: dbConfig.tables, root: astroConfig.root });
-}
-async function typegenInternal({ tables, root }) {
+import { RUNTIME_IMPORT } from "../consts.js";
+function getDtsContent(tables) {
   const content = `// This file is generated by Astro DB
 declare module 'astro:db' {
 ${Object.entries(tables).map(([name, table]) => generateTableType(name, table)).join("\n")}
 }
 `;
-  const dotAstroDir = new URL(".astro/", root);
-  if (!existsSync(dotAstroDir)) {
-    await mkdir(dotAstroDir);
-  }
-  await writeFile(new URL(DB_TYPES_FILE, dotAstroDir), content);
+  return content;
 }
 function generateTableType(name, table) {
   const sanitizedColumnsList = Object.entries(table.columns).filter(([, val]) => !val.schema.deprecated);
@@ -28,6 +17,5 @@ function generateTableType(name, table) {
   return tableType;
 }
 export {
-  typegen,
-  typegenInternal
+  getDtsContent
 };

package/dist/core/load-file.d.ts

@@ -1,4 +1,5 @@
 import type { AstroConfig } from 'astro';
+import './types.js';
 /**
  * Load a user’s `astro:db` configuration file and additional configuration files provided by integrations.
  */

package/dist/core/load-file.js

@@ -8,9 +8,8 @@ import { INTEGRATION_TABLE_CONFLICT_ERROR } from "./errors.js";
 import { errorMap } from "./integration/error-map.js";
 import { getConfigVirtualModContents } from "./integration/vite-plugin-db.js";
 import { dbConfigSchema } from "./schemas.js";
-import {} from "./types.js";
+import "./types.js";
 import { getAstroEnv, getDbDirectoryUrl } from "./utils.js";
-const isDbIntegration = (integration) => "astro:db:setup" in integration.hooks;
 async function resolveDbConfig({
   root,
   integrations
@@ -21,7 +20,6 @@ async function resolveDbConfig({
   const integrationDbConfigPaths = [];
   const integrationSeedPaths = [];
   for (const integration of integrations) {
-    if (!isDbIntegration(integration)) continue;
     const { name, hooks } = integration;
     if (hooks["astro:db:setup"]) {
       hooks["astro:db:setup"]({

package/dist/core/queries.js

@@ -143,7 +143,7 @@ function getDefaultValueSql(columnName, column) {
       let stringified = "";
       try {
         stringified = JSON.stringify(column.schema.default);
-      } catch (e) {
+      } catch {
         console.log(
           `Invalid default value for column ${bold(
             columnName

package/dist/core/types.d.ts

@@ -1,4 +1,3 @@
-import type { AstroIntegration } from 'astro';
 import type { z } from 'zod';
 import type { MaybeArray, booleanColumnSchema, columnSchema, columnsSchema, dateColumnSchema, dbConfigSchema, indexSchema, jsonColumnSchema, numberColumnOptsSchema, numberColumnSchema, referenceableColumnSchema, resolvedIndexSchema, tableSchema, textColumnOptsSchema, textColumnSchema } from './schemas.js';
 export type ResolvedIndexes = z.output<typeof dbConfigSchema>['tables'][string]['indexes'];
@@ -46,14 +45,16 @@ interface LegacyIndexConfig<TColumns extends ColumnsConfig> extends z.input<type
 }
 export type NumberColumnOpts = z.input<typeof numberColumnOptsSchema>;
 export type TextColumnOpts = z.input<typeof textColumnOptsSchema>;
-export type AstroDbIntegration = AstroIntegration & {
-    hooks: {
-        'astro:db:setup'?: (options: {
-            extendDb: (options: {
-                configEntrypoint?: URL | string;
-                seedEntrypoint?: URL | string;
-            }) => void;
-        }) => void | Promise<void>;
-    };
-};
+declare global {
+    namespace Astro {
+        interface IntegrationHooks {
+            'astro:db:setup'?: (options: {
+                extendDb: (options: {
+                    configEntrypoint?: URL | string;
+                    seedEntrypoint?: URL | string;
+                }) => void;
+            }) => void | Promise<void>;
+        }
+    }
+}
 export {};

package/dist/core/utils.d.ts

@@ -1,10 +1,10 @@
 import type { AstroConfig, AstroIntegration } from 'astro';
-import type { AstroDbIntegration } from './types.js';
+import './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
 export declare function getAstroEnv(envMode?: string): Record<`ASTRO_${string}`, string>;
 export declare function getRemoteDatabaseUrl(): string;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
-export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
+export declare function defineDbIntegration(integration: AstroIntegration): AstroIntegration;
 export type Result<T> = {
     success: true;
     data: T;

package/dist/core/utils.js

@@ -1,5 +1,6 @@
 import { getAstroStudioEnv } from "@astrojs/studio";
 import { loadEnv } from "vite";
+import "./types.js";
 function getAstroEnv(envMode = "") {
   const env = loadEnv(envMode, process.cwd(), "ASTRO_");
   return env;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export type { TableConfig } from './core/types.js';
 export { cli } from './core/cli/index.js';
 export { integration as default } from './core/integration/index.js';
-export { typegen } from './core/integration/typegen.js';

package/dist/index.js

@@ -1,8 +1,6 @@
 import { cli } from "./core/cli/index.js";
 import { integration } from "./core/integration/index.js";
-import { typegen } from "./core/integration/typegen.js";
 export {
   cli,
-  integration as default,
-  typegen
+  integration as default
 };

package/dist/runtime/db-client.js

@@ -53,7 +53,7 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
       try {
         const json = await res.json();
         remoteResult = remoteResultSchema.parse(json);
-      } catch (e) {
+      } catch {
         throw new DetailedLibsqlError({
           message: await getUnexpectedResponseMessage(res),
           code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
@@ -103,7 +103,7 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
       try {
         const json = await res.json();
         remoteResults = z.array(remoteResultSchema).parse(json);
-      } catch (e) {
+      } catch {
         throw new DetailedLibsqlError({
           message: await getUnexpectedResponseMessage(res),
           code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
@@ -148,7 +148,7 @@ async function parseRemoteError(response) {
   let error;
   try {
     error = errorSchema.parse(await response.clone().json()).error;
-  } catch (e) {
+  } catch {
     return new DetailedLibsqlError({
       message: await getUnexpectedResponseMessage(response),
       code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.11.7",
+  "version": "0.13.0",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -62,9 +62,8 @@
     "astro-integration"
   ],
   "dependencies": {
-    "@libsql/client": "^0.6.2",
+    "@libsql/client": "^0.9.0",
     "async-listen": "^3.0.1",
-    "ci-info": "^4.0.0",
     "deep-diff": "^1.0.2",
     "drizzle-orm": "^0.31.2",
     "github-slugger": "^2.0.0",
@@ -74,20 +73,16 @@
     "ora": "^8.0.1",
     "prompts": "^2.4.2",
     "strip-ansi": "^7.1.0",
-    "yargs-parser": "^21.1.1",
     "zod": "^3.23.8",
     "@astrojs/studio": "0.1.1"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.16",
     "@types/deep-diff": "^1.0.5",
-    "@types/diff": "^5.2.1",
     "@types/prompts": "^2.4.9",
-    "@types/yargs-parser": "^21.0.3",
-    "cheerio": "1.0.0-rc.12",
-    "typescript": "^5.5.2",
-    "vite": "^5.3.1",
-    "astro": "4.11.2",
+    "cheerio": "1.0.0",
+    "typescript": "^5.5.4",
+    "vite": "^5.4.0",
+    "astro": "4.14.0",
     "astro-scripts": "0.0.14"
   },
   "scripts": {

package/dist/core/integration/vite-plugin-inject-env-ts.d.ts

@@ -1,11 +0,0 @@
-import type { AstroIntegrationLogger } from 'astro';
-import type { VitePlugin } from '../utils.js';
-export declare function vitePluginInjectEnvTs({ srcDir, root }: {
-    srcDir: URL;
-    root: URL;
-}, logger: AstroIntegrationLogger): VitePlugin;
-export declare function setUpEnvTs({ srcDir, root, logger, }: {
-    srcDir: URL;
-    root: URL;
-    logger: AstroIntegrationLogger;
-}): Promise<void>;

package/dist/core/integration/vite-plugin-inject-env-ts.js

@@ -1,52 +0,0 @@
-import { existsSync } from "node:fs";
-import { readFile, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { bold } from "kleur/colors";
-import { normalizePath } from "vite";
-import { DB_TYPES_FILE } from "../consts.js";
-function vitePluginInjectEnvTs({ srcDir, root }, logger) {
-  return {
-    name: "db-inject-env-ts",
-    enforce: "post",
-    async config() {
-      await setUpEnvTs({ srcDir, root, logger });
-    }
-  };
-}
-async function setUpEnvTs({
-  srcDir,
-  root,
-  logger
-}) {
-  const envTsPath = getEnvTsPath({ srcDir });
-  const envTsPathRelativetoRoot = normalizePath(
-    path.relative(fileURLToPath(root), fileURLToPath(envTsPath))
-  );
-  if (existsSync(envTsPath)) {
-    let typesEnvContents = await readFile(envTsPath, "utf-8");
-    const dotAstroDir = new URL(".astro/", root);
-    if (!existsSync(dotAstroDir)) return;
-    const dbTypeReference = getDBTypeReference({ srcDir, dotAstroDir });
-    if (!typesEnvContents.includes(dbTypeReference)) {
-      typesEnvContents = `${dbTypeReference}
-${typesEnvContents}`;
-      await writeFile(envTsPath, typesEnvContents, "utf-8");
-      logger.info(`Added ${bold(envTsPathRelativetoRoot)} types`);
-    }
-  }
-}
-function getDBTypeReference({ srcDir, dotAstroDir }) {
-  const dbTypesFile = new URL(DB_TYPES_FILE, dotAstroDir);
-  const contentTypesRelativeToSrcDir = normalizePath(
-    path.relative(fileURLToPath(srcDir), fileURLToPath(dbTypesFile))
-  );
-  return `/// <reference path=${JSON.stringify(contentTypesRelativeToSrcDir)} />`;
-}
-function getEnvTsPath({ srcDir }) {
-  return new URL("env.d.ts", srcDir);
-}
-export {
-  setUpEnvTs,
-  vitePluginInjectEnvTs
-};