@astrojs/db 0.11.0 → 0.11.2

package/dist/core/cli/migration-queries.js

@@ -55,8 +55,7 @@ async function getMigrationQueries({
   }
   for (const [tableName, newTable] of Object.entries(newSnapshot.schema)) {
     const oldTable = oldSnapshot.schema[tableName];
-    if (!oldTable)
-      continue;
+    if (!oldTable) continue;
     const addedColumns = getAdded(oldTable.columns, newTable.columns);
     const droppedColumns = getDropped(oldTable.columns, newTable.columns);
     const notDeprecatedDroppedColumns = Object.fromEntries(
@@ -161,16 +160,14 @@ function getChangeIndexQueries({
 function getAddedTables(oldTables, newTables) {
   const added = {};
   for (const [key, newTable] of Object.entries(newTables.schema)) {
-    if (!(key in oldTables.schema))
-      added[key] = newTable;
+    if (!(key in oldTables.schema)) added[key] = newTable;
   }
   return added;
 }
 function getDroppedTables(oldTables, newTables) {
   const dropped = {};
   for (const [key, oldTable] of Object.entries(oldTables.schema)) {
-    if (!(key in newTables.schema))
-      dropped[key] = oldTable;
+    if (!(key in newTables.schema)) dropped[key] = oldTable;
   }
   return dropped;
 }
@@ -222,23 +219,16 @@ function isEmpty(obj) {
   return Object.keys(obj).length === 0;
 }
 function canAlterTableAddColumn(column) {
-  if (column.schema.unique)
-    return false;
-  if (hasRuntimeDefault(column))
-    return false;
-  if (!column.schema.optional && !hasDefault(column))
-    return false;
-  if (hasPrimaryKey(column))
-    return false;
-  if (getReferencesConfig(column))
-    return false;
+  if (column.schema.unique) return false;
+  if (hasRuntimeDefault(column)) return false;
+  if (!column.schema.optional && !hasDefault(column)) return false;
+  if (hasPrimaryKey(column)) return false;
+  if (getReferencesConfig(column)) return false;
   return true;
 }
 function canAlterTableDropColumn(column) {
-  if (column.schema.unique)
-    return false;
-  if (hasPrimaryKey(column))
-    return false;
+  if (column.schema.unique) return false;
+  if (hasPrimaryKey(column)) return false;
   return true;
 }
 function canRecreateTableWithoutDataLoss(added, updated) {
@@ -260,16 +250,14 @@ function canRecreateTableWithoutDataLoss(added, updated) {
 function getAdded(oldObj, newObj) {
   const added = {};
   for (const [key, value] of Object.entries(newObj)) {
-    if (!(key in oldObj))
-      added[key] = value;
+    if (!(key in oldObj)) added[key] = value;
   }
   return added;
 }
 function getDropped(oldObj, newObj) {
   const dropped = {};
   for (const [key, value] of Object.entries(oldObj)) {
-    if (!(key in newObj))
-      dropped[key] = value;
+    if (!(key in newObj)) dropped[key] = value;
   }
   return dropped;
 }
@@ -277,10 +265,8 @@ function getUpdated(oldObj, newObj) {
   const updated = {};
   for (const [key, value] of Object.entries(newObj)) {
     const oldValue = oldObj[key];
-    if (!oldValue)
-      continue;
-    if (deepDiff(oldValue, value))
-      updated[key] = value;
+    if (!oldValue) continue;
+    if (deepDiff(oldValue, value)) updated[key] = value;
   }
   return updated;
 }
@@ -288,8 +274,7 @@ function getUpdatedColumns(oldColumns, newColumns) {
   const updated = {};
   for (const [key, newColumn] of Object.entries(newColumns)) {
     let oldColumn = oldColumns[key];
-    if (!oldColumn)
-      continue;
+    if (!oldColumn) continue;
     if (oldColumn.type !== newColumn.type && canChangeTypeWithoutQuery(oldColumn, newColumn)) {
       const asNewColumn = columnSchema.safeParse({
         type: newColumn.type,

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

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

package/dist/core/integration/error-map.js

@@ -52,8 +52,7 @@ const errorMap = (baseError, ctx) => {
   }
 };
 const getTypeOrLiteralMsg = (error) => {
-  if (error.received === "undefined")
-    return "Required";
+  if (error.received === "undefined") return "Required";
   const expectedDeduped = new Set(error.expected);
   switch (error.code) {
     case "invalid_type":
@@ -68,8 +67,7 @@ const getTypeOrLiteralMsg = (error) => {
 };
 const prefix = (key, msg) => key.length ? `**${key}**: ${msg}` : msg;
 const unionExpectedVals = (expectedVals) => [...expectedVals].map((expectedVal, idx) => {
-  if (idx === 0)
-    return JSON.stringify(expectedVal);
+  if (idx === 0) return JSON.stringify(expectedVal);
   const sep = " | ";
   return `${sep}${JSON.stringify(expectedVal)}`;
 }).join("");

package/dist/core/integration/index.js

@@ -55,8 +55,7 @@ function astroDBIntegration() {
         command = _command;
         root = config.root;
         output = config.output;
-        if (command === "preview")
-          return;
+        if (command === "preview") return;
         let dbPlugin = void 0;
         const args = parseArgs(process.argv.slice(3));
         connectToStudio = process.env.ASTRO_INTERNAL_TEST_REMOTE || args["remote"];
@@ -91,8 +90,7 @@ function astroDBIntegration() {
         });
       },
       "astro:config:done": async ({ config }) => {
-        if (command === "preview")
-          return;
+        if (command === "preview") return;
         const { dbConfig, dependencies, integrationSeedPaths } = await resolveDbConfig(config);
         tables.get = () => dbConfig.tables;
         seedFiles.get = () => integrationSeedPaths;
@@ -122,8 +120,7 @@ function astroDBIntegration() {
           logger.info(
             connectToStudio ? "Connected to remote database." : "New local database created."
           );
-          if (connectToStudio)
-            return;
+          if (connectToStudio) return;
           const localSeedPaths = SEED_DEV_FILE_NAME.map(
             (name) => new URL(name, getDbDirectoryUrl(root))
           );

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

@@ -21,16 +21,14 @@ function vitePluginDb(params) {
       command = resolvedConfig.command;
     },
     async resolveId(id) {
-      if (id !== VIRTUAL_MODULE_ID)
-        return;
+      if (id !== VIRTUAL_MODULE_ID) return;
       if (params.seedHandler.inProgress) {
         return resolved.importedFromSeedFile;
       }
       return resolved.module;
     },
     async load(id) {
-      if (id !== resolved.module && id !== resolved.importedFromSeedFile)
-        return;
+      if (id !== resolved.module && id !== resolved.importedFromSeedFile) return;
       if (params.connectToStudio) {
         return getStudioVirtualModContents({
           appToken: params.appToken,

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

@@ -26,8 +26,7 @@ async function setUpEnvTs({
   if (existsSync(envTsPath)) {
     let typesEnvContents = await readFile(envTsPath, "utf-8");
     const dotAstroDir = new URL(".astro/", root);
-    if (!existsSync(dotAstroDir))
-      return;
+    if (!existsSync(dotAstroDir)) return;
     const dbTypeReference = getDBTypeReference({ srcDir, dotAstroDir });
     if (!typesEnvContents.includes(dbTypeReference)) {
       typesEnvContents = `${dbTypeReference}

package/dist/core/load-file.js

@@ -21,8 +21,7 @@ async function resolveDbConfig({
   const integrationDbConfigPaths = [];
   const integrationSeedPaths = [];
   for (const integration of integrations) {
-    if (!isDbIntegration(integration))
-      continue;
+    if (!isDbIntegration(integration)) continue;
     const { name, hooks } = integration;
     if (hooks["astro:db:setup"]) {
       hooks["astro:db:setup"]({

package/dist/core/queries.js

@@ -107,8 +107,7 @@ function getModifiers(columnName, column) {
 }
 function getReferencesConfig(column) {
   const canHaveReferences = column.type === "number" || column.type === "text";
-  if (!canHaveReferences)
-    return void 0;
+  if (!canHaveReferences) return void 0;
   return column.schema.references;
 }
 function hasDefault(column) {

package/dist/runtime/db-client.js

@@ -2,7 +2,7 @@ import { createClient } from "@libsql/client";
 import { drizzle as drizzleLibsql } from "drizzle-orm/libsql";
 import { drizzle as drizzleProxy } from "drizzle-orm/sqlite-proxy";
 import { z } from "zod";
-import { AstroDbError, safeFetch } from "./utils.js";
+import { DetailedLibsqlError, safeFetch } from "./utils.js";
 const isWebContainer = !!process.versions?.webcontainer;
 function applyTransactionNotSupported(db) {
   Object.assign(db, {
@@ -54,10 +54,12 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
         const json = await res.json();
         remoteResult = remoteResultSchema.parse(json);
       } catch (e) {
-        throw new AstroDbError(await getUnexpectedResponseMessage(res));
+        throw new DetailedLibsqlError({
+          message: await getUnexpectedResponseMessage(res),
+          code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
+        });
       }
-      if (method === "run")
-        return remoteResult;
+      if (method === "run") return remoteResult;
       const rowValues = [];
       for (const row of remoteResult.rows) {
         if (row != null && typeof row === "object") {
@@ -90,7 +92,10 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
         const json = await res.json();
         remoteResults = z.array(remoteResultSchema).parse(json);
       } catch (e) {
-        throw new AstroDbError(await getUnexpectedResponseMessage(res));
+        throw new DetailedLibsqlError({
+          message: await getUnexpectedResponseMessage(res),
+          code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
+        });
       }
       let results = [];
       for (const [idx, rawResult] of remoteResults.entries()) {
@@ -126,21 +131,24 @@ const KNOWN_ERROR_CODES = {
   SQL_QUERY_FAILED: "SQL_QUERY_FAILED"
 };
 const getUnexpectedResponseMessage = async (response) => `Unexpected response from remote database:
-(Status ${response.status}) ${await response.text()}`;
+(Status ${response.status}) ${await response.clone().text()}`;
 async function parseRemoteError(response) {
   let error;
   try {
-    error = errorSchema.parse(await response.json()).error;
+    error = errorSchema.parse(await response.clone().json()).error;
   } catch (e) {
-    return new AstroDbError(await getUnexpectedResponseMessage(response));
+    return new DetailedLibsqlError({
+      message: await getUnexpectedResponseMessage(response),
+      code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
+    });
   }
-  let details = error.details?.replace(/.*SQLite error: /, "") ?? `(Code ${error.code}) 
-Error querying remote database.`;
+  let baseDetails = error.details?.replace(/.*SQLite error: /, "") ?? "Error querying remote database.";
+  const details = baseDetails.slice(baseDetails.indexOf(":") + 1).trim();
   let hint = `See the Astro DB guide for query and push instructions: https://docs.astro.build/en/guides/astro-db/#query-your-database`;
   if (error.code === KNOWN_ERROR_CODES.SQL_QUERY_FAILED && details.includes("no such table")) {
     hint = `Did you run \`astro db push\` to push your latest table schemas?`;
   }
-  return new AstroDbError(details, hint);
+  return new DetailedLibsqlError({ message: details, code: error.code, hint });
 }
 export {
   createLocalDatabaseClient,

package/dist/runtime/index.js

@@ -12,6 +12,7 @@ import { createRemoteDatabaseClient, createLocalDatabaseClient } from "./db-clie
 function hasPrimaryKey(column) {
   return "primaryKey" in column.schema && !!column.schema.primaryKey;
 }
+const isISODateString = (str) => /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str);
 const dateType = customType({
   dataType() {
     return "text";
@@ -20,6 +21,9 @@ const dateType = customType({
     return value.toISOString();
   },
   fromDriver(value) {
+    if (!isISODateString(value)) {
+      value += "Z";
+    }
     return new Date(value);
   }
 });
@@ -47,8 +51,7 @@ function asDrizzleTable(name, table) {
     for (const [indexName, indexProps] of Object.entries(table.indexes ?? {})) {
       const onColNames = Array.isArray(indexProps.on) ? indexProps.on : [indexProps.on];
       const onCols = onColNames.map((colName) => ormTable[colName]);
-      if (!atLeastOne(onCols))
-        continue;
+      if (!atLeastOne(onCols)) continue;
       indexes[indexName] = index(indexName).on(...onCols);
     }
     return indexes;
@@ -65,16 +68,14 @@ function columnMapper(columnName, column) {
       c = text(columnName);
       if (column.schema.default !== void 0)
         c = c.default(handleSerializedSQL(column.schema.default));
-      if (column.schema.primaryKey === true)
-        c = c.primaryKey();
+      if (column.schema.primaryKey === true) c = c.primaryKey();
       break;
     }
     case "number": {
       c = integer(columnName);
       if (column.schema.default !== void 0)
         c = c.default(handleSerializedSQL(column.schema.default));
-      if (column.schema.primaryKey === true)
-        c = c.primaryKey();
+      if (column.schema.primaryKey === true) c = c.primaryKey();
       break;
     }
     case "boolean": {
@@ -85,8 +86,7 @@ function columnMapper(columnName, column) {
     }
     case "json":
       c = jsonType(columnName);
-      if (column.schema.default !== void 0)
-        c = c.default(column.schema.default);
+      if (column.schema.default !== void 0) c = c.default(column.schema.default);
       break;
     case "date": {
       c = dateType(columnName);
@@ -97,10 +97,8 @@ function columnMapper(columnName, column) {
       break;
     }
   }
-  if (!column.schema.optional)
-    c = c.notNull();
-  if (column.schema.unique)
-    c = c.unique();
+  if (!column.schema.optional) c = c.notNull();
+  if (column.schema.unique) c = c.unique();
   return c;
 }
 function handleSerializedSQL(def) {

package/dist/runtime/utils.d.ts

@@ -1,3 +1,4 @@
+import { LibsqlError } from '@libsql/client';
 import { AstroError } from 'astro/errors';
 /**
  * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
@@ -6,4 +7,15 @@ export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Pa
 export declare class AstroDbError extends AstroError {
     name: string;
 }
+export declare class DetailedLibsqlError extends LibsqlError {
+    name: string;
+    hint?: string;
+    constructor({ message, code, hint, rawCode, cause, }: {
+        message: string;
+        code: string;
+        hint?: string;
+        rawCode?: number;
+        cause?: Error;
+    });
+}
 export declare function pathToFileURL(path: string): URL;

package/dist/runtime/utils.js

@@ -1,3 +1,4 @@
+import { LibsqlError } from "@libsql/client";
 import { AstroError } from "astro/errors";
 const isWindows = process?.platform === "win32";
 async function safeFetch(url, options = {}, onNotOK = () => {
@@ -12,6 +13,20 @@ async function safeFetch(url, options = {}, onNotOK = () => {
 class AstroDbError extends AstroError {
   name = "Astro DB Error";
 }
+class DetailedLibsqlError extends LibsqlError {
+  name = "Astro DB Error";
+  hint;
+  constructor({
+    message,
+    code,
+    hint,
+    rawCode,
+    cause
+  }) {
+    super(message, code, rawCode, cause);
+    this.hint = hint;
+  }
+}
 function slash(path) {
   const isExtendedLengthPath = path.startsWith("\\\\?\\");
   if (isExtendedLengthPath) {
@@ -31,6 +46,7 @@ function pathToFileURL(path) {
 }
 export {
   AstroDbError,
+  DetailedLibsqlError,
   pathToFileURL,
   safeFetch
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -66,7 +66,7 @@
     "async-listen": "^3.0.1",
     "ci-info": "^4.0.0",
     "deep-diff": "^1.0.2",
-    "drizzle-orm": "^0.30.9",
+    "drizzle-orm": "^0.30.10",
     "github-slugger": "^2.0.0",
     "kleur": "^4.1.5",
     "nanoid": "^5.0.7",
@@ -75,21 +75,21 @@
     "prompts": "^2.4.2",
     "strip-ansi": "^7.1.0",
     "yargs-parser": "^21.1.1",
-    "zod": "^3.23.5"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.14",
+    "@types/chai": "^4.3.16",
     "@types/deep-diff": "^1.0.5",
-    "@types/diff": "^5.2.0",
+    "@types/diff": "^5.2.1",
     "@types/mocha": "^10.0.6",
     "@types/prompts": "^2.4.9",
     "@types/yargs-parser": "^21.0.3",
-    "chai": "^5.1.0",
+    "chai": "^5.1.1",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^10.4.0",
     "typescript": "^5.4.5",
-    "vite": "^5.2.10",
-    "astro": "4.7.1",
+    "vite": "^5.2.11",
+    "astro": "4.8.4",
     "astro-scripts": "0.0.14"
   },
   "scripts": {

package/dist/runtime/drizzle.d.ts

@@ -1 +0,0 @@
-export { sql, eq, gt, gte, lt, lte, ne, isNull, isNotNull, inArray, notInArray, exists, notExists, between, notBetween, like, notIlike, not, asc, desc, and, or, } from 'drizzle-orm';

package/dist/runtime/drizzle.js

@@ -1,48 +0,0 @@
-import {
-  sql,
-  eq,
-  gt,
-  gte,
-  lt,
-  lte,
-  ne,
-  isNull,
-  isNotNull,
-  inArray,
-  notInArray,
-  exists,
-  notExists,
-  between,
-  notBetween,
-  like,
-  notIlike,
-  not,
-  asc,
-  desc,
-  and,
-  or
-} from "drizzle-orm";
-export {
-  and,
-  asc,
-  between,
-  desc,
-  eq,
-  exists,
-  gt,
-  gte,
-  inArray,
-  isNotNull,
-  isNull,
-  like,
-  lt,
-  lte,
-  ne,
-  not,
-  notBetween,
-  notExists,
-  notIlike,
-  notInArray,
-  or,
-  sql
-};