@astrojs/db 0.9.6 → 0.9.8

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

@@ -1853,23 +1853,36 @@ export declare const columnsSchema: z.ZodRecord<z.ZodString, z.ZodDiscriminatedU
         default?: unknown;
     };
 }>]>>;
+type ForeignKeysInput = {
+    columns: MaybeArray<string>;
+    references: () => MaybeArray<Omit<z.input<typeof referenceableColumnSchema>, 'references'>>;
+};
+type ForeignKeysOutput = Omit<ForeignKeysInput, 'references'> & {
+    references: MaybeArray<Omit<z.output<typeof referenceableColumnSchema>, 'references'>>;
+};
+export declare const resolvedIndexSchema: z.ZodObject<{
+    on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
+    unique: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    on: (string | string[]) & (string | string[] | undefined);
+    unique?: boolean | undefined;
+}, {
+    on: (string | string[]) & (string | string[] | undefined);
+    unique?: boolean | undefined;
+}>;
 export declare const indexSchema: z.ZodObject<{
     on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
     unique: z.ZodOptional<z.ZodBoolean>;
+    name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     on: (string | string[]) & (string | string[] | undefined);
     unique?: boolean | undefined;
+    name?: string | undefined;
 }, {
     on: (string | string[]) & (string | string[] | undefined);
     unique?: boolean | undefined;
+    name?: string | undefined;
 }>;
-type ForeignKeysInput = {
-    columns: MaybeArray<string>;
-    references: () => MaybeArray<Omit<z.input<typeof referenceableColumnSchema>, 'references'>>;
-};
-type ForeignKeysOutput = Omit<ForeignKeysInput, 'references'> & {
-    references: MaybeArray<Omit<z.output<typeof referenceableColumnSchema>, 'references'>>;
-};
 export declare const tableSchema: z.ZodObject<{
     columns: z.ZodRecord<z.ZodString, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
         type: z.ZodLiteral<"boolean">;
@@ -2241,7 +2254,19 @@ export declare const tableSchema: z.ZodObject<{
             default?: unknown;
         };
     }>]>>;
-    indexes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+    indexes: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
+        on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
+        unique: z.ZodOptional<z.ZodBoolean>;
+        name: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }, {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }>, "many">, z.ZodRecord<z.ZodString, z.ZodObject<{
         on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
         unique: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
@@ -2250,7 +2275,7 @@ export declare const tableSchema: z.ZodObject<{
     }, {
         on: (string | string[]) & (string | string[] | undefined);
         unique?: boolean | undefined;
-    }>>>;
+    }>>]>>;
     foreignKeys: z.ZodOptional<z.ZodArray<z.ZodType<ForeignKeysOutput, ZodTypeDef, ForeignKeysInput>, "many">>;
     deprecated: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
@@ -2337,7 +2362,11 @@ export declare const tableSchema: z.ZodObject<{
             default?: unknown;
         };
     }>;
-    indexes?: Record<string, {
+    indexes?: {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }[] | Record<string, {
         on: (string | string[]) & (string | string[] | undefined);
         unique?: boolean | undefined;
     }> | undefined;
@@ -2433,7 +2462,11 @@ export declare const tableSchema: z.ZodObject<{
             default?: unknown;
         };
     }>;
-    indexes?: Record<string, {
+    indexes?: {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }[] | Record<string, {
         on: (string | string[]) & (string | string[] | undefined);
         unique?: boolean | undefined;
     }> | undefined;
@@ -2811,7 +2844,19 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
             default?: unknown;
         };
     }>]>>;
-    indexes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+    indexes: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
+        on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
+        unique: z.ZodOptional<z.ZodBoolean>;
+        name: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }, {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }>, "many">, z.ZodRecord<z.ZodString, z.ZodObject<{
         on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
         unique: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
@@ -2820,7 +2865,7 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
     }, {
         on: (string | string[]) & (string | string[] | undefined);
         unique?: boolean | undefined;
-    }>>>;
+    }>>]>>;
     foreignKeys: z.ZodOptional<z.ZodArray<z.ZodType<ForeignKeysOutput, ZodTypeDef, ForeignKeysInput>, "many">>;
     deprecated: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
@@ -2907,7 +2952,11 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
             default?: unknown;
         };
     }>;
-    indexes?: Record<string, {
+    indexes?: {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }[] | Record<string, {
         on: (string | string[]) & (string | string[] | undefined);
         unique?: boolean | undefined;
     }> | undefined;
@@ -3003,7 +3052,11 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
             default?: unknown;
         };
     }>;
-    indexes?: Record<string, {
+    indexes?: {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }[] | Record<string, {
         on: (string | string[]) & (string | string[] | undefined);
         unique?: boolean | undefined;
     }> | undefined;
@@ -3093,13 +3146,17 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
             default?: unknown;
         };
     }>;
-    indexes?: Record<string, {
+    indexes?: {
+        on: (string | string[]) & (string | string[] | undefined);
+        unique?: boolean | undefined;
+        name?: string | undefined;
+    }[] | Record<string, {
         on: (string | string[]) & (string | string[] | undefined);
         unique?: boolean | undefined;
     }> | undefined;
     foreignKeys?: ForeignKeysOutput[] | undefined;
 }>, unknown>;
-export declare const dbConfigSchema: z.ZodObject<{
+export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
     tables: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodObject<{
         columns: z.ZodRecord<z.ZodString, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
             type: z.ZodLiteral<"boolean">;
@@ -3471,7 +3528,19 @@ export declare const dbConfigSchema: z.ZodObject<{
                 default?: unknown;
             };
         }>]>>;
-        indexes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        indexes: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
+            on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
+            unique: z.ZodOptional<z.ZodBoolean>;
+            name: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            on: (string | string[]) & (string | string[] | undefined);
+            unique?: boolean | undefined;
+            name?: string | undefined;
+        }, {
+            on: (string | string[]) & (string | string[] | undefined);
+            unique?: boolean | undefined;
+            name?: string | undefined;
+        }>, "many">, z.ZodRecord<z.ZodString, z.ZodObject<{
             on: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
             unique: z.ZodOptional<z.ZodBoolean>;
         }, "strip", z.ZodTypeAny, {
@@ -3480,7 +3549,7 @@ export declare const dbConfigSchema: z.ZodObject<{
         }, {
             on: (string | string[]) & (string | string[] | undefined);
             unique?: boolean | undefined;
-        }>>>;
+        }>>]>>;
         foreignKeys: z.ZodOptional<z.ZodArray<z.ZodType<ForeignKeysOutput, ZodTypeDef, ForeignKeysInput>, "many">>;
         deprecated: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
@@ -3567,7 +3636,11 @@ export declare const dbConfigSchema: z.ZodObject<{
                 default?: unknown;
             };
         }>;
-        indexes?: Record<string, {
+        indexes?: {
+            on: (string | string[]) & (string | string[] | undefined);
+            unique?: boolean | undefined;
+            name?: string | undefined;
+        }[] | Record<string, {
             on: (string | string[]) & (string | string[] | undefined);
             unique?: boolean | undefined;
         }> | undefined;
@@ -3663,7 +3736,11 @@ export declare const dbConfigSchema: z.ZodObject<{
                 default?: unknown;
             };
         }>;
-        indexes?: Record<string, {
+        indexes?: {
+            on: (string | string[]) & (string | string[] | undefined);
+            unique?: boolean | undefined;
+            name?: string | undefined;
+        }[] | Record<string, {
             on: (string | string[]) & (string | string[] | undefined);
             unique?: boolean | undefined;
         }> | undefined;
@@ -3753,7 +3830,11 @@ export declare const dbConfigSchema: z.ZodObject<{
                 default?: unknown;
             };
         }>;
-        indexes?: Record<string, {
+        indexes?: {
+            on: (string | string[]) & (string | string[] | undefined);
+            unique?: boolean | undefined;
+            name?: string | undefined;
+        }[] | Record<string, {
             on: (string | string[]) & (string | string[] | undefined);
             unique?: boolean | undefined;
         }> | undefined;
@@ -3844,7 +3925,11 @@ export declare const dbConfigSchema: z.ZodObject<{
                 default?: unknown;
             };
         }>;
-        indexes?: Record<string, {
+        indexes?: {
+            on: (string | string[]) & (string | string[] | undefined);
+            unique?: boolean | undefined;
+            name?: string | undefined;
+        }[] | Record<string, {
             on: (string | string[]) & (string | string[] | undefined);
             unique?: boolean | undefined;
         }> | undefined;
@@ -3852,5 +3937,98 @@ export declare const dbConfigSchema: z.ZodObject<{
     }> | undefined;
 }, {
     tables?: unknown;
+}>, {
+    tables: Record<string, {
+        indexes: Record<string, {
+            on: (string | string[]) & (string | string[] | undefined);
+            unique?: boolean | undefined;
+        }>;
+        deprecated: boolean;
+        columns: Record<string, {
+            type: "boolean";
+            schema: {
+                optional: boolean;
+                unique: boolean;
+                deprecated: boolean;
+                name?: string | undefined;
+                label?: string | undefined;
+                collection?: string | undefined;
+                default?: boolean | SerializedSQL | undefined;
+            };
+        } | {
+            type: "number";
+            schema: ({
+                unique: boolean;
+                deprecated: boolean;
+                name?: string | undefined;
+                label?: string | undefined;
+                collection?: string | undefined;
+            } & {
+                optional: boolean;
+                primaryKey: false;
+                default?: number | SerializedSQL | undefined;
+            } & any) | ({
+                unique: boolean;
+                deprecated: boolean;
+                name?: string | undefined;
+                label?: string | undefined;
+                collection?: string | undefined;
+            } & {
+                primaryKey: true;
+                optional?: false | undefined;
+                default?: undefined;
+            } & any);
+        } | {
+            type: "text";
+            schema: ({
+                unique: boolean;
+                deprecated: boolean;
+                name?: string | undefined;
+                label?: string | undefined;
+                collection?: string | undefined;
+                default?: string | SerializedSQL | undefined;
+                multiline?: boolean | undefined;
+            } & {
+                optional: boolean;
+                primaryKey: false;
+            } & any) | ({
+                unique: boolean;
+                deprecated: boolean;
+                name?: string | undefined;
+                label?: string | undefined;
+                collection?: string | undefined;
+                default?: string | SerializedSQL | undefined;
+                multiline?: boolean | undefined;
+            } & {
+                primaryKey: true;
+                optional?: false | undefined;
+            } & any);
+        } | {
+            type: "date";
+            schema: {
+                optional: boolean;
+                unique: boolean;
+                deprecated: boolean;
+                name?: string | undefined;
+                label?: string | undefined;
+                collection?: string | undefined;
+                default?: string | SerializedSQL | undefined;
+            };
+        } | {
+            type: "json";
+            schema: {
+                optional: boolean;
+                unique: boolean;
+                deprecated: boolean;
+                name?: string | undefined;
+                label?: string | undefined;
+                collection?: string | undefined;
+                default?: unknown;
+            };
+        }>;
+        foreignKeys?: ForeignKeysOutput[] | undefined;
+    }>;
+}, {
+    tables?: unknown;
 }>;
 export {};

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

@@ -1,7 +1,7 @@
 import type { AstroIntegration } from 'astro';
 import type { z } from 'zod';
-import type { MaybeArray, booleanColumnSchema, columnSchema, columnsSchema, dateColumnSchema, dbConfigSchema, indexSchema, jsonColumnSchema, numberColumnOptsSchema, numberColumnSchema, referenceableColumnSchema, tableSchema, textColumnOptsSchema, textColumnSchema } from './schemas.js';
-export type Indexes = Record<string, z.infer<typeof indexSchema>>;
+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'];
 export type BooleanColumn = z.infer<typeof booleanColumnSchema>;
 export type BooleanColumnInput = z.input<typeof booleanColumnSchema>;
 export type NumberColumn = z.infer<typeof numberColumnSchema>;
@@ -18,8 +18,10 @@ export type DBColumnInput = DateColumnInput | BooleanColumnInput | NumberColumnI
 export type DBColumns = z.infer<typeof columnsSchema>;
 export type DBTable = z.infer<typeof tableSchema>;
 export type DBTables = Record<string, DBTable>;
+export type ResolvedDBTables = z.output<typeof dbConfigSchema>['tables'];
+export type ResolvedDBTable = z.output<typeof dbConfigSchema>['tables'][string];
 export type DBSnapshot = {
-    schema: Record<string, DBTable>;
+    schema: Record<string, ResolvedDBTable>;
     version: string;
 };
 export type DBConfigInput = z.input<typeof dbConfigSchema>;
@@ -32,14 +34,16 @@ export interface TableConfig<TColumns extends ColumnsConfig = ColumnsConfig> ext
         columns: MaybeArray<Extract<keyof TColumns, string>>;
         references: () => MaybeArray<z.input<typeof referenceableColumnSchema>>;
     }>;
-    indexes?: Record<string, IndexConfig<TColumns>>;
+    indexes?: Array<IndexConfig<TColumns>> | Record<string, LegacyIndexConfig<TColumns>>;
     deprecated?: boolean;
 }
 interface IndexConfig<TColumns extends ColumnsConfig> extends z.input<typeof indexSchema> {
     on: MaybeArray<Extract<keyof TColumns, string>>;
 }
-/** @deprecated Use `TableConfig` instead */
-export type ResolvedCollectionConfig<TColumns extends ColumnsConfig = ColumnsConfig> = TableConfig<TColumns>;
+/** @deprecated */
+interface LegacyIndexConfig<TColumns extends ColumnsConfig> extends z.input<typeof resolvedIndexSchema> {
+    on: MaybeArray<Extract<keyof TColumns, string>>;
+}
 export type NumberColumnOpts = z.input<typeof numberColumnOptsSchema>;
 export type TextColumnOpts = z.input<typeof textColumnOptsSchema>;
 export type AstroDbIntegration = AstroIntegration & {

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

@@ -0,0 +1,20 @@
+import type { AstroConfig, AstroIntegration } from 'astro';
+import type { AstroDbIntegration } from './types.js';
+export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
+export declare function getAstroStudioEnv(envMode?: string): Record<`ASTRO_STUDIO_${string}`, string>;
+export declare function getRemoteDatabaseUrl(): string;
+export declare function getAstroStudioUrl(): string;
+export declare function getDbDirectoryUrl(root: URL | string): URL;
+export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
+export type Result<T> = {
+    success: true;
+    data: T;
+} | {
+    success: false;
+    data: unknown;
+};
+/**
+ * Map an object's values to a new set of values
+ * while preserving types.
+ */
+export declare function mapObject<T, U = T>(item: Record<string, T>, callback: (key: string, value: T) => U): Record<string, U>;

package/dist/core/cli/migration-queries.d.ts

@@ -1,4 +1,4 @@
-import { type DBConfig, type DBSnapshot, type DBTable } from '../types.js';
+import { type DBConfig, type DBSnapshot, type ResolvedDBTable } from '../types.js';
 export declare function getMigrationQueries({ oldSnapshot, newSnapshot, reset, }: {
     oldSnapshot: DBSnapshot;
     newSnapshot: DBSnapshot;
@@ -7,10 +7,10 @@ export declare function getMigrationQueries({ oldSnapshot, newSnapshot, reset, }
     queries: string[];
     confirmations: string[];
 }>;
-export declare function getCollectionChangeQueries({ collectionName, oldCollection, newCollection, }: {
-    collectionName: string;
-    oldCollection: DBTable;
-    newCollection: DBTable;
+export declare function getTableChangeQueries({ tableName, oldTable, newTable, }: {
+    tableName: string;
+    oldTable: ResolvedDBTable;
+    newTable: ResolvedDBTable;
 }): Promise<{
     queries: string[];
     confirmations: string[];