@astrojs/db 0.8.4 → 0.8.6

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

@@ -6,7 +6,9 @@ export declare const RENAME_COLUMN_ERROR: (oldSelector: string, newSelector: str
 export declare const FILE_NOT_FOUND_ERROR: (path: string) => string;
 export declare const SHELL_QUERY_MISSING_ERROR: string;
 export declare const SEED_ERROR: (error: string) => string;
+export declare const EXEC_ERROR: (error: string) => string;
 export declare const SEED_DEFAULT_EXPORT_ERROR: (fileName: string) => string;
+export declare const EXEC_DEFAULT_EXPORT_ERROR: (fileName: string) => string;
 export declare const REFERENCE_DNE_ERROR: (columnName: string) => string;
 export declare const FOREIGN_KEY_DNE_ERROR: (tableName: string) => string;
 export declare const FOREIGN_KEY_REFERENCES_LENGTH_ERROR: (tableName: string) => string;

package/dist/core/cli/commands/execute/index.js

@@ -1,8 +1,11 @@
 import { existsSync } from "node:fs";
+import { LibsqlError } from "@libsql/client";
+import { green } from "kleur/colors";
 import {
+  EXEC_DEFAULT_EXPORT_ERROR,
+  EXEC_ERROR,
   FILE_NOT_FOUND_ERROR,
-  MISSING_EXECUTE_PATH_ERROR,
-  SEED_DEFAULT_EXPORT_ERROR
+  MISSING_EXECUTE_PATH_ERROR
 } from "../../../errors.js";
 import {
   getLocalVirtualModContents,
@@ -44,10 +47,18 @@ async function cmd({
   const { code } = await bundleFile({ virtualModContents, root: astroConfig.root, fileUrl });
   const mod = await importBundledFile({ code, root: astroConfig.root });
   if (typeof mod.default !== "function") {
-    console.error(SEED_DEFAULT_EXPORT_ERROR);
+    console.error(EXEC_DEFAULT_EXPORT_ERROR);
     process.exit(1);
   }
-  await mod.default();
+  try {
+    await mod.default();
+    console.info(`${green("\u2714")} File run successfully.`);
+  } catch (e) {
+    if (e instanceof LibsqlError) {
+      throw new Error(EXEC_ERROR(e.message));
+    }
+    throw e;
+  }
 }
 export {
   cmd

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

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

package/dist/core/errors.d.ts

@@ -6,7 +6,9 @@ export declare const RENAME_COLUMN_ERROR: (oldSelector: string, newSelector: str
 export declare const FILE_NOT_FOUND_ERROR: (path: string) => string;
 export declare const SHELL_QUERY_MISSING_ERROR: string;
 export declare const SEED_ERROR: (error: string) => string;
+export declare const EXEC_ERROR: (error: string) => string;
 export declare const SEED_DEFAULT_EXPORT_ERROR: (fileName: string) => string;
+export declare const EXEC_DEFAULT_EXPORT_ERROR: (fileName: string) => string;
 export declare const REFERENCE_DNE_ERROR: (columnName: string) => string;
 export declare const FOREIGN_KEY_DNE_ERROR: (tableName: string) => string;
 export declare const FOREIGN_KEY_REFERENCES_LENGTH_ERROR: (tableName: string) => string;

package/dist/core/errors.js

@@ -34,10 +34,16 @@ const SEED_ERROR = (error) => {
 
 ${error}`;
 };
-const SEED_DEFAULT_EXPORT_ERROR = (fileName) => {
-  return red("Error while seeding database:") + `
+const EXEC_ERROR = (error) => {
+  return `${red(`Error while executing file:`)}
 
-Missing default function export in ${bold(fileName)}`;
+${error}`;
+};
+const SEED_DEFAULT_EXPORT_ERROR = (fileName) => {
+  return SEED_ERROR(`Missing default function export in ${bold(fileName)}`);
+};
+const EXEC_DEFAULT_EXPORT_ERROR = (fileName) => {
+  return EXEC_ERROR(`Missing default function export in ${bold(fileName)}`);
 };
 const REFERENCE_DNE_ERROR = (columnName) => {
   return `Column ${bold(
@@ -65,6 +71,8 @@ const INTEGRATION_TABLE_CONFLICT_ERROR = (integrationName, tableName, isUserConf
   Another integration already added a table named ${bold(tableName)}`;
 };
 export {
+  EXEC_DEFAULT_EXPORT_ERROR,
+  EXEC_ERROR,
   FILE_NOT_FOUND_ERROR,
   FOREIGN_KEY_DNE_ERROR,
   FOREIGN_KEY_REFERENCES_EMPTY_ERROR,

package/dist/core/integration/index.js

@@ -1,7 +1,7 @@
 import { existsSync } from "fs";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
-import { mkdir, rm, writeFile } from "fs/promises";
+import { mkdir, writeFile } from "fs/promises";
 import { blue, yellow } from "kleur/colors";
 import parseArgs from "yargs-parser";
 import { CONFIG_FILE_NAMES, DB_PATH } from "../consts.js";
@@ -9,7 +9,7 @@ import { resolveDbConfig } from "../load-file.js";
 import { getManagedAppTokenOrExit } from "../tokens.js";
 import { getDbDirectoryUrl } from "../utils.js";
 import { fileURLIntegration } from "./file-url.js";
-import { typegen } from "./typegen.js";
+import { typegenInternal } from "./typegen.js";
 import { vitePluginDb } from "./vite-plugin-db.js";
 import { vitePluginInjectEnvTs } from "./vite-plugin-inject-env-ts.js";
 function astroDBIntegration() {
@@ -76,7 +76,7 @@ function astroDBIntegration() {
           await mkdir(dirname(fileURLToPath(localDbUrl)), { recursive: true });
           await writeFile(localDbUrl, "");
         }
-        await typegen({ tables: tables.get() ?? {}, root: config.root });
+        await typegenInternal({ tables: tables.get() ?? {}, root: config.root });
       },
       "astro:server:start": async ({ logger }) => {
         setTimeout(() => {

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

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

package/dist/core/integration/typegen.js

@@ -1,8 +1,13 @@
 import { existsSync } from "node:fs";
 import { mkdir, writeFile } from "node:fs/promises";
 import { DB_TYPES_FILE, RUNTIME_IMPORT } from "../consts.js";
-async function typegen({ tables, root }) {
-  const content = `// This file is generated by \`studio sync\`
+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 }) {
+  const content = `// This file is generated by Astro DB
 declare module 'astro:db' {
 	export const db: import(${RUNTIME_IMPORT}).SqliteDB;
 	export const dbUrl: string;
@@ -26,5 +31,6 @@ function generateTableType(name, collection) {
   return tableType;
 }
 export {
-  typegen
+  typegen,
+  typegenInternal
 };

package/dist/core/integration/vite-plugin-db.js

@@ -94,7 +94,7 @@ function getStudioVirtualModContents({
   return `
 import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
-export const db = await createRemoteDatabaseClient(${JSON.stringify(
+export const db = await createRemoteDatabaseClient(process.env.ASTRO_STUDIO_APP_TOKEN ?? ${JSON.stringify(
     appToken
     // Respect runtime env for user overrides in SSR
   )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${JSON.stringify(getRemoteDatabaseUrl())});

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

@@ -33,7 +33,7 @@ async function setUpEnvTs({
       typesEnvContents = `${dbTypeReference}
 ${typesEnvContents}`;
       await writeFile(envTsPath, typesEnvContents, "utf-8");
-      logger.info(`${cyan(bold("[astro:db]"))} Added ${bold(envTsPathRelativetoRoot)} types`);
+      logger.info(`Added ${bold(envTsPathRelativetoRoot)} types`);
     }
   }
 }

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

@@ -2,7 +2,7 @@ import type { AstroConfig } from 'astro';
 /**
  * Load a user’s `astro:db` configuration file and additional configuration files provided by integrations.
  */
-export declare function resolveDbConfig({ root, integrations }: AstroConfig): Promise<{
+export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfig, 'root' | 'integrations'>): Promise<{
     /** Resolved `astro:db` config, including tables added by integrations. */
     dbConfig: {
         tables: Record<string, {

package/dist/core/load-file.js

@@ -11,7 +11,10 @@ import { dbConfigSchema } from "./schemas.js";
 import {} from "./types.js";
 import { getDbDirectoryUrl } from "./utils.js";
 const isDbIntegration = (integration) => "astro:db:setup" in integration.hooks;
-async function resolveDbConfig({ root, integrations }) {
+async function resolveDbConfig({
+  root,
+  integrations
+}) {
   const { mod, dependencies } = await loadUserConfigFile(root);
   const userDbConfig = dbConfigSchema.parse(mod?.default ?? {}, { errorMap });
   const dbConfig = { tables: userDbConfig.tables ?? {} };

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export type { ResolvedCollectionConfig, 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,6 +1,8 @@
 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
+  integration as default,
+  typegen
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -80,7 +80,7 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.4",
+    "astro": "4.5.5",
     "astro-scripts": "0.0.14"
   },
   "scripts": {