((data) => data instanceof Object && !Array.isArray(data))
- .optional()
.default(ASTRO_CONFIG_DEFAULTS.markdown.remarkRehype),
gfm: z.boolean().default(ASTRO_CONFIG_DEFAULTS.markdown.gfm),
smartypants: z.boolean().default(ASTRO_CONFIG_DEFAULTS.markdown.smartypants),
@@ -384,7 +405,7 @@ export const AstroConfigSchema = z.object({
.optional()
.superRefine((i18n, ctx) => {
if (i18n) {
- const { defaultLocale, locales: _locales, fallback, domains, routing } = i18n;
+ const { defaultLocale, locales: _locales, fallback, domains } = i18n;
const locales = _locales.map((locale) => {
if (typeof locale === 'string') {
return locale;
diff --git a/packages/astro/src/core/redirects/render.ts b/packages/astro/src/core/redirects/render.ts
index 120fab26e4c8..24361fde471f 100644
--- a/packages/astro/src/core/redirects/render.ts
+++ b/packages/astro/src/core/redirects/render.ts
@@ -8,7 +8,7 @@ export async function renderRedirect(renderContext: RenderContext) {
const { redirect, redirectRoute } = routeData;
const status =
redirectRoute && typeof redirect === 'object' ? redirect.status : method === 'GET' ? 301 : 308;
- const headers = { location: redirectRouteGenerate(renderContext) };
+ const headers = { location: encodeURI(redirectRouteGenerate(renderContext)) };
return new Response(null, { status, headers });
}
diff --git a/packages/astro/src/runtime/client/dev-toolbar/apps/xray.ts b/packages/astro/src/runtime/client/dev-toolbar/apps/xray.ts
index ae1910502d1d..893f6f6b46fb 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/apps/xray.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/apps/xray.ts
@@ -1,3 +1,4 @@
+import { escape as escapeHTML } from 'html-escaper';
import type { DevToolbarApp, DevToolbarMetadata } from '../../../../@types/astro.js';
import type { DevToolbarHighlight } from '../ui-library/highlight.js';
import {
@@ -137,13 +138,14 @@ export default {
(prop: any) => !prop[0].startsWith('data-astro-cid-')
);
if (islandPropsEntries.length > 0) {
+ const stringifiedProps = JSON.stringify(
+ Object.fromEntries(islandPropsEntries.map((prop: any) => [prop[0], prop[1][1]])),
+ undefined,
+ 2
+ );
tooltip.sections.push({
title: 'Props',
- content: `${JSON.stringify(
- Object.fromEntries(islandPropsEntries.map((prop: any) => [prop[0], prop[1][1]])),
- undefined,
- 2
- )}
`,
+ content: `${escapeHTML(stringifiedProps)}
`,
});
}
diff --git a/packages/astro/src/runtime/server/jsx.ts b/packages/astro/src/runtime/server/jsx.ts
index 8dc01a35c019..8304597ee992 100644
--- a/packages/astro/src/runtime/server/jsx.ts
+++ b/packages/astro/src/runtime/server/jsx.ts
@@ -37,6 +37,7 @@ let originalConsoleError: any;
let consoleFilterRefs = 0;
export async function renderJSX(result: SSRResult, vnode: any): Promise {
+ // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
switch (true) {
case vnode instanceof HTMLString:
if (vnode.toString().trim() === '') {
@@ -72,6 +73,7 @@ export async function renderJSX(result: SSRResult, vnode: any): Promise {
async function renderJSXVNode(result: SSRResult, vnode: AstroVNode, skip: Skip): Promise {
if (isVNode(vnode)) {
+ // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
switch (true) {
case !vnode.type: {
throw new Error(`Unable to render ${result.pathname} because it contains an undefined Component!
diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
index 9efb3a4577e2..69f4e717c351 100644
--- a/packages/astro/src/transitions/router.ts
+++ b/packages/astro/src/transitions/router.ts
@@ -716,8 +716,8 @@ async function prepareForClientOnlyComponents(newDocument: Document, toLocation:
// return a promise that resolves when all astro-islands are hydrated
async function hydrationDone(loadingPage: HTMLIFrameElement) {
- await new Promise(
- (r) => loadingPage.contentWindow?.addEventListener('load', r, { once: true })
+ await new Promise((r) =>
+ loadingPage.contentWindow?.addEventListener('load', r, { once: true })
);
return new Promise(async (r) => {
diff --git a/packages/astro/test/astro-markdown-plugins.test.js b/packages/astro/test/astro-markdown-plugins.test.js
index 09cb76d2decc..1ea2afd8ef88 100644
--- a/packages/astro/test/astro-markdown-plugins.test.js
+++ b/packages/astro/test/astro-markdown-plugins.test.js
@@ -60,7 +60,7 @@ describe('Astro Markdown plugins', () => {
const smartypantsHtml = await fixture.readFile('/with-smartypants/index.html');
const $2 = cheerio.load(smartypantsHtml);
- assert.equal($2('p').html(), '“Smartypants” is — awesome');
+ assert.equal($2('p').html(), '”Smartypants” is — awesome');
testRemark(gfmHtml);
testRehype(gfmHtml, '#github-flavored-markdown-test');
@@ -82,7 +82,7 @@ describe('Astro Markdown plugins', () => {
const $ = cheerio.load(html);
// test 1: smartypants applied correctly
- assert.equal($('p').html(), '“Smartypants” is — awesome');
+ assert.equal($('p').html(), '”Smartypants” is — awesome');
testRemark(html);
testRehype(html, '#smartypants-test');
diff --git a/packages/astro/test/redirects.test.js b/packages/astro/test/redirects.test.js
index ab3a3eb37ed9..4e722379ca27 100644
--- a/packages/astro/test/redirects.test.js
+++ b/packages/astro/test/redirects.test.js
@@ -98,6 +98,16 @@ describe('Astro.redirect', () => {
const response = await app.render(request);
assert.equal(response.headers.get('Location'), '/not-verbatim/target3/x/y/z');
});
+
+ it('Forwards params to the target path - special characters', async () => {
+ const app = await fixture.loadTestAdapterApp();
+ const request = new Request('http://example.com/source/Las Vegas’');
+ const response = await app.render(request);
+ assert.equal(
+ response.headers.get('Location'),
+ '/not-verbatim/target1/Las%20Vegas%E2%80%99'
+ );
+ });
});
});
@@ -232,9 +242,17 @@ describe('Astro.redirect', () => {
it('performs dynamic redirects', async () => {
const response = await fixture.fetch('/more/old/hello', { redirect: 'manual' });
+ assert.equal(response.status, 301);
assert.equal(response.headers.get('Location'), '/more/hello');
});
+ it('performs dynamic redirects with special characters', async () => {
+ // encodeURI("/more/old/’")
+ const response = await fixture.fetch('/more/old/%E2%80%99', { redirect: 'manual' });
+ assert.equal(response.status, 301);
+ assert.equal(response.headers.get('Location'), '/more/%E2%80%99');
+ });
+
it('performs dynamic redirects with multiple params', async () => {
const response = await fixture.fetch('/more/old/hello/world', { redirect: 'manual' });
assert.equal(response.headers.get('Location'), '/more/hello/world');
diff --git a/packages/db/CHANGELOG.md b/packages/db/CHANGELOG.md
index 8c257069ce68..020135a19a67 100644
--- a/packages/db/CHANGELOG.md
+++ b/packages/db/CHANGELOG.md
@@ -1,5 +1,45 @@
# @astrojs/db
+## 0.8.1
+
+### Patch Changes
+
+- [#10401](https://github.com/withastro/astro/pull/10401) [`a084d8cec66e4fb1952bd0dfe293712401f2f463`](https://github.com/withastro/astro/commit/a084d8cec66e4fb1952bd0dfe293712401f2f463) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix astro:db configuration types returning `any`
+
+## 0.8.0
+
+### Minor Changes
+
+- [#10395](https://github.com/withastro/astro/pull/10395) [`a49892349ecee2b5d3184e59ac0ab54368481672`](https://github.com/withastro/astro/commit/a49892349ecee2b5d3184e59ac0ab54368481672) Thanks [@matthewp](https://github.com/matthewp)! - Sets new Astro Studio production URL
+
+### Patch Changes
+
+- [#10396](https://github.com/withastro/astro/pull/10396) [`41ca94e5136a80a58d000f3eb87029442599a4a3`](https://github.com/withastro/astro/commit/41ca94e5136a80a58d000f3eb87029442599a4a3) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Remove risk of data loss when pushing an out-of-date table schema.
+
+- [#10374](https://github.com/withastro/astro/pull/10374) [`f76dcb769f6869acb96b2a77898926f109f54a33`](https://github.com/withastro/astro/commit/f76dcb769f6869acb96b2a77898926f109f54a33) Thanks [@itsMapleLeaf](https://github.com/itsMapleLeaf)! - Expose DB utility types from @astrojs/db/types
+
+## 0.7.2
+
+### Patch Changes
+
+- [#10391](https://github.com/withastro/astro/pull/10391) [`9667ee990ca2a02a146e442f2494981df4c88b52`](https://github.com/withastro/astro/commit/9667ee990ca2a02a146e442f2494981df4c88b52) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Remove @astrojs/runtime/config suggestion for astro:db configuration helpers.
+
+- [#10385](https://github.com/withastro/astro/pull/10385) [`38abae47b57af481a8dcdf2393317de6df46920a`](https://github.com/withastro/astro/commit/38abae47b57af481a8dcdf2393317de6df46920a) Thanks [@delucis](https://github.com/delucis)! - Fixes support for integrations configuring `astro:db` and for projects that use `astro:db` but do not include a seed file.
+
+- [#10381](https://github.com/withastro/astro/pull/10381) [`8cceab587d681d90842184904182833117687750`](https://github.com/withastro/astro/commit/8cceab587d681d90842184904182833117687750) Thanks [@delucis](https://github.com/delucis)! - Fixes builds for projects using integration seed files
+
+- [#10384](https://github.com/withastro/astro/pull/10384) [`cd5e8d4b9309e43f5bf884a0014b8a5769d816e0`](https://github.com/withastro/astro/commit/cd5e8d4b9309e43f5bf884a0014b8a5769d816e0) Thanks [@matthewp](https://github.com/matthewp)! - Upgrades the `@libsql/client` dependency to fix the use of `db.batch` in StackBlitz
+
+- [#10387](https://github.com/withastro/astro/pull/10387) [`8a23ee530cd1d7d7b4e93e9e72f4e06d1fc3d845`](https://github.com/withastro/astro/commit/8a23ee530cd1d7d7b4e93e9e72f4e06d1fc3d845) Thanks [@FredKSchott](https://github.com/FredKSchott)! - handle success=false response on api endpoints
+
+- [#10390](https://github.com/withastro/astro/pull/10390) [`236cdbb611587692d3c781850cb949604677ef82`](https://github.com/withastro/astro/commit/236cdbb611587692d3c781850cb949604677ef82) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Adds `--help` reference for new db and studio CLI commands
+
+## 0.7.1
+
+### Patch Changes
+
+- [#10378](https://github.com/withastro/astro/pull/10378) [`41dca1e413c2f1e38f0326bd6241ccbf9b8ee0e4`](https://github.com/withastro/astro/commit/41dca1e413c2f1e38f0326bd6241ccbf9b8ee0e4) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Handle new schema API response format
+
## 0.7.0
### Minor Changes
diff --git a/packages/db/package.json b/packages/db/package.json
index 1b2fcd9001d4..69de3628cf52 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -1,6 +1,6 @@
{
"name": "@astrojs/db",
- "version": "0.7.0",
+ "version": "0.8.1",
"description": "",
"license": "MIT",
"type": "module",
@@ -20,10 +20,13 @@
"types": "./dist/runtime/index.d.ts",
"import": "./dist/runtime/index.js"
},
- "./runtime/config": {
- "types": "./dist/runtime/config.d.ts",
+ "./dist/runtime/config.js": {
"import": "./dist/runtime/config.js"
},
+ "./types": {
+ "types": "./dist/core/types.d.ts",
+ "import": "./dist/core/types.js"
+ },
"./package.json": "./package.json"
},
"typesVersions": {
@@ -31,14 +34,14 @@
".": [
"./index.d.ts"
],
+ "types": [
+ "./dist/types.d.ts"
+ ],
"utils": [
"./dist/utils.d.ts"
],
"runtime": [
"./dist/runtime/index.d.ts"
- ],
- "runtime/config": [
- "./dist/runtime/config.d.ts"
]
}
},
@@ -52,14 +55,15 @@
"astro-integration"
],
"scripts": {
- "build": "astro-scripts build \"src/**/*.ts\" && tsc",
+ "types:config": "tsc -p ./tsconfig.config-types.json",
+ "build": "astro-scripts build \"src/**/*.ts\" && tsc && pnpm types:config",
"build:ci": "astro-scripts build \"src/**/*.ts\"",
"dev": "astro-scripts dev \"src/**/*.ts\"",
"test": "mocha --exit --timeout 20000 \"test/*.js\" \"test/unit/**/*.js\"",
"test:match": "mocha --timeout 20000 \"test/*.js\" \"test/unit/*.js\" -g"
},
"dependencies": {
- "@libsql/client": "^0.4.3",
+ "@libsql/client": "^0.5.5",
"async-listen": "^3.0.1",
"deep-diff": "^1.0.2",
"drizzle-orm": "^0.29.5",
diff --git a/packages/db/src/core/cli/commands/link/index.ts b/packages/db/src/core/cli/commands/link/index.ts
index f92a1818ca41..905d2095efd8 100644
--- a/packages/db/src/core/cli/commands/link/index.ts
+++ b/packages/db/src/core/cli/commands/link/index.ts
@@ -7,7 +7,7 @@ import ora from 'ora';
import prompts from 'prompts';
import { MISSING_SESSION_ID_ERROR } from '../../../errors.js';
import { PROJECT_ID_FILE, getSessionIdFromFile } from '../../../tokens.js';
-import { getAstroStudioUrl } from '../../../utils.js';
+import { type Result, getAstroStudioUrl, safeFetch } from '../../../utils.js';
export async function cmd() {
const sessionToken = await getSessionIdFromFile();
@@ -51,29 +51,31 @@ async function linkProject(id: string) {
async function getWorkspaceId(): Promise {
const linkUrl = new URL(getAstroStudioUrl() + '/api/cli/workspaces.list');
- const response = await fetch(linkUrl, {
- method: 'POST',
- headers: {
- Authorization: `Bearer ${await getSessionIdFromFile()}`,
- 'Content-Type': 'application/json',
+ const response = await safeFetch(
+ linkUrl,
+ {
+ method: 'POST',
+ headers: {
+ Authorization: `Bearer ${await getSessionIdFromFile()}`,
+ 'Content-Type': 'application/json',
+ },
},
- });
- if (!response.ok) {
- // Unauthorized
- if (response.status === 401) {
- console.error(
- `${bgRed('Unauthorized')}\n\n Are you logged in?\n Run ${cyan(
- 'astro db login'
- )} to authenticate and then try linking again.\n\n`
- );
+ (res) => {
+ // Unauthorized
+ if (res.status === 401) {
+ console.error(
+ `${bgRed('Unauthorized')}\n\n Are you logged in?\n Run ${cyan(
+ 'astro db login'
+ )} to authenticate and then try linking again.\n\n`
+ );
+ process.exit(1);
+ }
+ console.error(`Failed to fetch user workspace: ${res.status} ${res.statusText}`);
process.exit(1);
}
- console.error(`Failed to fetch user workspace: ${response.status} ${response.statusText}`);
- process.exit(1);
- }
- const { data, success } = (await response.json()) as
- | { success: false; data: unknown }
- | { success: true; data: { id: string }[] };
+ );
+
+ const { data, success } = (await response.json()) as Result<{ id: string }[]>;
if (!success) {
console.error(`Failed to fetch user's workspace.`);
process.exit(1);
@@ -91,30 +93,32 @@ export async function createNewProject({
region: string;
}) {
const linkUrl = new URL(getAstroStudioUrl() + '/api/cli/projects.create');
- const response = await fetch(linkUrl, {
- method: 'POST',
- headers: {
- Authorization: `Bearer ${await getSessionIdFromFile()}`,
- 'Content-Type': 'application/json',
+ const response = await safeFetch(
+ linkUrl,
+ {
+ method: 'POST',
+ headers: {
+ Authorization: `Bearer ${await getSessionIdFromFile()}`,
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({ workspaceId, name, region }),
},
- body: JSON.stringify({ workspaceId, name, region }),
- });
- if (!response.ok) {
- // Unauthorized
- if (response.status === 401) {
- console.error(
- `${bgRed('Unauthorized')}\n\n Are you logged in?\n Run ${cyan(
- 'astro db login'
- )} to authenticate and then try linking again.\n\n`
- );
+ (res) => {
+ // Unauthorized
+ if (res.status === 401) {
+ console.error(
+ `${bgRed('Unauthorized')}\n\n Are you logged in?\n Run ${cyan(
+ 'astro db login'
+ )} to authenticate and then try linking again.\n\n`
+ );
+ process.exit(1);
+ }
+ console.error(`Failed to create project: ${res.status} ${res.statusText}`);
process.exit(1);
}
- console.error(`Failed to create project: ${response.status} ${response.statusText}`);
- process.exit(1);
- }
- const { data, success } = (await response.json()) as
- | { success: false; data: unknown }
- | { success: true; data: { id: string; idName: string } };
+ );
+
+ const { data, success } = (await response.json()) as Result<{ id: string; idName: string }>;
if (!success) {
console.error(`Failed to create project.`);
process.exit(1);
@@ -124,30 +128,31 @@ export async function createNewProject({
export async function promptExistingProjectName({ workspaceId }: { workspaceId: string }) {
const linkUrl = new URL(getAstroStudioUrl() + '/api/cli/projects.list');
- const response = await fetch(linkUrl, {
- method: 'POST',
- headers: {
- Authorization: `Bearer ${await getSessionIdFromFile()}`,
- 'Content-Type': 'application/json',
+ const response = await safeFetch(
+ linkUrl,
+ {
+ method: 'POST',
+ headers: {
+ Authorization: `Bearer ${await getSessionIdFromFile()}`,
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({ workspaceId }),
},
- body: JSON.stringify({ workspaceId }),
- });
- if (!response.ok) {
- // Unauthorized
- if (response.status === 401) {
- console.error(
- `${bgRed('Unauthorized')}\n\n Are you logged in?\n Run ${cyan(
- 'astro db login'
- )} to authenticate and then try linking again.\n\n`
- );
+ (res) => {
+ if (res.status === 401) {
+ console.error(
+ `${bgRed('Unauthorized')}\n\n Are you logged in?\n Run ${cyan(
+ 'astro db login'
+ )} to authenticate and then try linking again.\n\n`
+ );
+ process.exit(1);
+ }
+ console.error(`Failed to fetch projects: ${res.status} ${res.statusText}`);
process.exit(1);
}
- console.error(`Failed to fetch projects: ${response.status} ${response.statusText}`);
- process.exit(1);
- }
- const { data, success } = (await response.json()) as
- | { success: false; data: unknown }
- | { success: true; data: { id: string; idName: string }[] };
+ );
+
+ const { data, success } = (await response.json()) as Result<{ id: string; idName: string }[]>;
if (!success) {
console.error(`Failed to fetch projects.`);
process.exit(1);
diff --git a/packages/db/src/core/cli/commands/push/index.ts b/packages/db/src/core/cli/commands/push/index.ts
index c847bc1eba2b..760ec7986e16 100644
--- a/packages/db/src/core/cli/commands/push/index.ts
+++ b/packages/db/src/core/cli/commands/push/index.ts
@@ -3,7 +3,7 @@ import type { Arguments } from 'yargs-parser';
import { MIGRATION_VERSION } from '../../../consts.js';
import { getManagedAppTokenOrExit } from '../../../tokens.js';
import { type DBConfig, type DBSnapshot } from '../../../types.js';
-import { getRemoteDatabaseUrl } from '../../../utils.js';
+import { type Result, getRemoteDatabaseUrl, safeFetch } from '../../../utils.js';
import {
createCurrentSnapshot,
createEmptySnapshot,
@@ -25,7 +25,7 @@ export async function cmd({
const appToken = await getManagedAppTokenOrExit(flags.token);
const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
const currentSnapshot = createCurrentSnapshot(dbConfig);
- const isFromScratch = isForceReset || JSON.stringify(productionSnapshot) === '{}';
+ const isFromScratch = isForceReset || !productionSnapshot;
const { queries: migrationQueries, confirmations } = await getMigrationQueries({
oldSnapshot: isFromScratch ? createEmptySnapshot() : productionSnapshot,
newSnapshot: currentSnapshot,
@@ -82,11 +82,26 @@ async function pushSchema({
return new Response(null, { status: 200 });
}
const url = new URL('/db/push', getRemoteDatabaseUrl());
- return await fetch(url, {
- method: 'POST',
- headers: new Headers({
- Authorization: `Bearer ${appToken}`,
- }),
- body: JSON.stringify(requestBody),
- });
+ const response = await safeFetch(
+ url,
+ {
+ method: 'POST',
+ headers: new Headers({
+ Authorization: `Bearer ${appToken}`,
+ }),
+ body: JSON.stringify(requestBody),
+ },
+ async (res) => {
+ console.error(`${url.toString()} failed: ${res.status} ${res.statusText}`);
+ console.error(await res.text());
+ throw new Error(`/db/push fetch failed: ${res.status} ${res.statusText}`);
+ }
+ );
+
+ const result = (await response.json()) as Result;
+ if (!result.success) {
+ console.error(`${url.toString()} unsuccessful`);
+ console.error(await response.text());
+ throw new Error(`/db/push fetch unsuccessful`);
+ }
}
diff --git a/packages/db/src/core/cli/commands/verify/index.ts b/packages/db/src/core/cli/commands/verify/index.ts
index a83194599fe4..8c480344da86 100644
--- a/packages/db/src/core/cli/commands/verify/index.ts
+++ b/packages/db/src/core/cli/commands/verify/index.ts
@@ -23,8 +23,7 @@ export async function cmd({
const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
const currentSnapshot = createCurrentSnapshot(dbConfig);
const { queries: migrationQueries, confirmations } = await getMigrationQueries({
- oldSnapshot:
- JSON.stringify(productionSnapshot) !== '{}' ? productionSnapshot : createEmptySnapshot(),
+ oldSnapshot: productionSnapshot || createEmptySnapshot(),
newSnapshot: currentSnapshot,
});
diff --git a/packages/db/src/core/cli/index.ts b/packages/db/src/core/cli/index.ts
index 0e9d5636fd6e..531b016a6b77 100644
--- a/packages/db/src/core/cli/index.ts
+++ b/packages/db/src/core/cli/index.ts
@@ -1,6 +1,7 @@
import type { AstroConfig } from 'astro';
import type { Arguments } from 'yargs-parser';
import { resolveDbConfig } from '../load-file.js';
+import { printHelp } from './print-help.js';
export async function cli({
flags,
@@ -53,30 +54,29 @@ export async function cli({
return await cmd();
}
default: {
- if (command == null) {
- console.error(`No command provided.
-
-${showHelp()}`);
- } else {
- console.error(`Unknown command: ${command}
-
-${showHelp()}`);
+ if (command != null) {
+ console.error(`Unknown command: ${command}`);
}
+ printHelp({
+ commandName: 'astro db',
+ usage: '[command] [...flags]',
+ headline: ' ',
+ tables: {
+ Commands: [
+ ['push', 'Push table schema updates to Astro Studio.'],
+ ['verify', 'Test schema updates /w Astro Studio (good for CI).'],
+ [
+ 'astro db execute ',
+ 'Execute a ts/js file using astro:db. Use --remote to connect to Studio.',
+ ],
+ [
+ 'astro db shell --query ',
+ 'Execute a SQL string. Use --remote to connect to Studio.',
+ ],
+ ],
+ },
+ });
return;
}
}
-
- function showHelp() {
- return `astro db
-
-Usage:
-
-astro login Authenticate your machine with Astro Studio
-astro logout End your authenticated session with Astro Studio
-astro link Link this directory to an Astro Studio project
-
-astro db gen Creates snapshot based on your schema
-astro db push Pushes schema updates to Astro Studio
-astro db verify Tests schema updates /w Astro Studio (good for CI)`;
- }
}
diff --git a/packages/db/src/core/cli/migration-queries.ts b/packages/db/src/core/cli/migration-queries.ts
index 425e81b02106..d8b27db0dc29 100644
--- a/packages/db/src/core/cli/migration-queries.ts
+++ b/packages/db/src/core/cli/migration-queries.ts
@@ -16,6 +16,7 @@ import {
import { isSerializedSQL } from '../../runtime/types.js';
import { MIGRATION_VERSION } from '../consts.js';
import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from '../errors.js';
+import { columnSchema } from '../schemas.js';
import {
type BooleanColumn,
type ColumnType,
@@ -30,9 +31,8 @@ import {
type JsonColumn,
type NumberColumn,
type TextColumn,
- columnSchema,
} from '../types.js';
-import { getRemoteDatabaseUrl } from '../utils.js';
+import { type Result, getRemoteDatabaseUrl, safeFetch } from '../utils.js';
const sqlite = new SQLiteAsyncDialect();
const genTempTableName = customAlphabet('abcdefghijklmnopqrstuvwxyz', 10);
@@ -61,7 +61,6 @@ export async function getMigrationQueries({
}
for (const [collectionName, collection] of Object.entries(addedCollections)) {
- queries.push(getDropTableIfExistsQuery(collectionName));
queries.push(getCreateTableQuery(collectionName, collection));
queries.push(...getCreateIndexQueries(collectionName, collection));
}
@@ -423,16 +422,30 @@ export async function getProductionCurrentSnapshot({
appToken,
}: {
appToken: string;
-}): Promise {
+}): Promise {
const url = new URL('/db/schema', getRemoteDatabaseUrl());
- const response = await fetch(url, {
- method: 'POST',
- headers: new Headers({
- Authorization: `Bearer ${appToken}`,
- }),
- });
- const result = await response.json();
+ const response = await safeFetch(
+ url,
+ {
+ method: 'POST',
+ headers: new Headers({
+ Authorization: `Bearer ${appToken}`,
+ }),
+ },
+ async (res) => {
+ console.error(`${url.toString()} failed: ${res.status} ${res.statusText}`);
+ console.error(await res.text());
+ throw new Error(`/db/schema fetch failed: ${res.status} ${res.statusText}`);
+ }
+ );
+
+ const result = (await response.json()) as Result;
+ if (!result.success) {
+ console.error(`${url.toString()} unsuccessful`);
+ console.error(await response.text());
+ throw new Error(`/db/schema fetch unsuccessful`);
+ }
return result.data;
}
diff --git a/packages/db/src/core/cli/print-help.ts b/packages/db/src/core/cli/print-help.ts
new file mode 100644
index 000000000000..8700301dd2d0
--- /dev/null
+++ b/packages/db/src/core/cli/print-help.ts
@@ -0,0 +1,69 @@
+import { bgGreen, bgWhite, black, bold, dim, green } from 'kleur/colors';
+
+/**
+ * Uses implementation from Astro core
+ * @see https://github.com/withastro/astro/blob/main/packages/astro/src/core/messages.ts#L303
+ */
+export function printHelp({
+ commandName,
+ headline,
+ usage,
+ tables,
+ description,
+}: {
+ commandName: string;
+ headline?: string;
+ usage?: string;
+ tables?: Record;
+ description?: string;
+}) {
+ const linebreak = () => '';
+ const title = (label: string) => ` ${bgWhite(black(` ${label} `))}`;
+ const table = (rows: [string, string][], { padding }: { padding: number }) => {
+ const split = process.stdout.columns < 60;
+ let raw = '';
+
+ for (const row of rows) {
+ if (split) {
+ raw += ` ${row[0]}\n `;
+ } else {
+ raw += `${`${row[0]}`.padStart(padding)}`;
+ }
+ raw += ' ' + dim(row[1]) + '\n';
+ }
+
+ return raw.slice(0, -1); // remove latest \n
+ };
+
+ let message = [];
+
+ if (headline) {
+ message.push(
+ linebreak(),
+ ` ${bgGreen(black(` ${commandName} `))} ${green(
+ `v${process.env.PACKAGE_VERSION ?? ''}`
+ )} ${headline}`
+ );
+ }
+
+ if (usage) {
+ message.push(linebreak(), ` ${green(commandName)} ${bold(usage)}`);
+ }
+
+ if (tables) {
+ function calculateTablePadding(rows: [string, string][]) {
+ return rows.reduce((val, [first]) => Math.max(val, first.length), 0) + 2;
+ }
+ const tableEntries = Object.entries(tables);
+ const padding = Math.max(...tableEntries.map(([, rows]) => calculateTablePadding(rows)));
+ for (const [tableTitle, tableRows] of tableEntries) {
+ message.push(linebreak(), title(tableTitle), table(tableRows, { padding }));
+ }
+ }
+
+ if (description) {
+ message.push(linebreak(), `${description}`);
+ }
+
+ console.log(message.join('\n') + '\n');
+}
diff --git a/packages/db/src/core/consts.ts b/packages/db/src/core/consts.ts
index 9d86c5e207a1..3ba7b43d74ae 100644
--- a/packages/db/src/core/consts.ts
+++ b/packages/db/src/core/consts.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto';
import { readFileSync } from 'node:fs';
export const PACKAGE_NAME = JSON.parse(
@@ -6,15 +5,14 @@ export const PACKAGE_NAME = JSON.parse(
).name;
export const RUNTIME_IMPORT = JSON.stringify(`${PACKAGE_NAME}/runtime`);
-export const RUNTIME_CONFIG_IMPORT = JSON.stringify(`${PACKAGE_NAME}/runtime/config`);
+
+export const RUNTIME_CONFIG_IMPORT = JSON.stringify(`${PACKAGE_NAME}/dist/runtime/config.js`);
export const DB_TYPES_FILE = 'db-types.d.ts';
export const VIRTUAL_MODULE_ID = 'astro:db';
-export const DB_PATH = `.astro/${
- process.env.ASTRO_TEST_RANDOM_DB_ID ? randomUUID() : 'content.db'
-}`;
+export const DB_PATH = '.astro/content.db';
export const CONFIG_FILE_NAMES = ['config.ts', 'config.js', 'config.mts', 'config.mjs'];
diff --git a/packages/db/src/core/integration/index.ts b/packages/db/src/core/integration/index.ts
index 557490213b76..78a1fab6d498 100644
--- a/packages/db/src/core/integration/index.ts
+++ b/packages/db/src/core/integration/index.ts
@@ -82,13 +82,10 @@ function astroDBIntegration(): AstroIntegration {
seedFiles.get = () => integrationSeedPaths;
configFileDependencies = dependencies;
- if (!connectToStudio) {
- const dbUrl = new URL(DB_PATH, config.root);
- if (existsSync(dbUrl)) {
- await rm(dbUrl);
- }
- await mkdir(dirname(fileURLToPath(dbUrl)), { recursive: true });
- await writeFile(dbUrl, '');
+ const localDbUrl = new URL(DB_PATH, config.root);
+ if (!connectToStudio && !existsSync(localDbUrl)) {
+ await mkdir(dirname(fileURLToPath(localDbUrl)), { recursive: true });
+ await writeFile(localDbUrl, '');
}
await typegen({ tables: tables.get() ?? {}, root: config.root });
diff --git a/packages/db/src/core/integration/typegen.ts b/packages/db/src/core/integration/typegen.ts
index 7c046dbfd3ad..9133c5dd4054 100644
--- a/packages/db/src/core/integration/typegen.ts
+++ b/packages/db/src/core/integration/typegen.ts
@@ -1,6 +1,6 @@
import { existsSync } from 'node:fs';
import { mkdir, writeFile } from 'node:fs/promises';
-import { DB_TYPES_FILE, RUNTIME_CONFIG_IMPORT, RUNTIME_IMPORT } from '../consts.js';
+import { DB_TYPES_FILE, RUNTIME_IMPORT } from '../consts.js';
import type { DBTable, DBTables } from '../types.js';
export async function typegen({ tables, root }: { tables: DBTables; root: URL }) {
@@ -8,7 +8,6 @@ export async function typegen({ tables, root }: { tables: DBTables; root: URL })
declare module 'astro:db' {
export const db: import(${RUNTIME_IMPORT}).SqliteDB;
export const dbUrl: string;
- export * from ${RUNTIME_CONFIG_IMPORT};
${Object.entries(tables)
.map(([name, collection]) => generateTableType(name, collection))
diff --git a/packages/db/src/core/integration/vite-plugin-db.ts b/packages/db/src/core/integration/vite-plugin-db.ts
index af62c2aacf70..aae9094cac49 100644
--- a/packages/db/src/core/integration/vite-plugin-db.ts
+++ b/packages/db/src/core/integration/vite-plugin-db.ts
@@ -1,15 +1,6 @@
-import { resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
-import { type SQL, sql } from 'drizzle-orm';
-import { SQLiteAsyncDialect } from 'drizzle-orm/sqlite-core';
import { normalizePath } from 'vite';
-import { createLocalDatabaseClient } from '../../runtime/db-client.js';
-import type { SqliteDB } from '../../runtime/index.js';
-import {
- SEED_DEV_FILE_NAME,
- getCreateIndexQueries,
- getCreateTableQuery,
-} from '../../runtime/queries.js';
+import { SEED_DEV_FILE_NAME } from '../../runtime/queries.js';
import { DB_PATH, RUNTIME_CONFIG_IMPORT, RUNTIME_IMPORT, VIRTUAL_MODULE_ID } from '../consts.js';
import type { DBTables } from '../types.js';
import { type VitePlugin, getDbDirectoryUrl, getRemoteDatabaseUrl } from '../utils.js';
@@ -46,9 +37,6 @@ type VitePluginDBParams =
export function vitePluginDb(params: VitePluginDBParams): VitePlugin {
const srcDirPath = normalizePath(fileURLToPath(params.srcDir));
- const seedFilePaths = SEED_DEV_FILE_NAME.map((name) =>
- normalizePath(fileURLToPath(new URL(name, getDbDirectoryUrl(params.root))))
- );
return {
name: 'astro:db',
enforce: 'pre',
@@ -67,14 +55,6 @@ export function vitePluginDb(params: VitePluginDBParams): VitePlugin {
return resolved.virtual;
},
async load(id) {
- // Recreate tables whenever a seed file is loaded.
- if (seedFilePaths.some((f) => id === f)) {
- await recreateTables({
- db: createLocalDatabaseClient({ dbUrl: new URL(DB_PATH, params.root).href }),
- tables: params.tables.get(),
- });
- }
-
if (id !== resolved.virtual && id !== resolved.seedVirtual) return;
if (params.connectToStudio) {
@@ -113,18 +93,25 @@ export function getLocalVirtualModContents({
// for Vite import.meta.glob
(name) => new URL(name, getDbDirectoryUrl('file:///')).pathname
);
- const resolveId = (id: string) => (id.startsWith('.') ? resolve(fileURLToPath(root), id) : id);
- const integrationSeedFilePaths = seedFiles.map((pathOrUrl) =>
- typeof pathOrUrl === 'string' ? resolveId(pathOrUrl) : pathOrUrl.pathname
- );
- const integrationSeedImports = integrationSeedFilePaths.map(
- (filePath) => `() => import(${JSON.stringify(filePath)})`
- );
+ const resolveId = (id: string) =>
+ id.startsWith('.') ? normalizePath(fileURLToPath(new URL(id, root))) : id;
+ // Use top-level imports to correctly resolve `astro:db` within seed files.
+ // Dynamic imports cause a silent build failure,
+ // potentially because of circular module references.
+ const integrationSeedImportStatements: string[] = [];
+ const integrationSeedImportNames: string[] = [];
+ seedFiles.forEach((pathOrUrl, index) => {
+ const path = typeof pathOrUrl === 'string' ? resolveId(pathOrUrl) : pathOrUrl.pathname;
+ const importName = 'integration_seed_' + index;
+ integrationSeedImportStatements.push(`import ${importName} from ${JSON.stringify(path)};`);
+ integrationSeedImportNames.push(importName);
+ });
const dbUrl = new URL(DB_PATH, root);
return `
import { asDrizzleTable, createLocalDatabaseClient } from ${RUNTIME_IMPORT};
${shouldSeed ? `import { seedLocal } from ${RUNTIME_IMPORT};` : ''}
+${shouldSeed ? integrationSeedImportStatements.join('\n') : ''}
const dbUrl = ${JSON.stringify(dbUrl)};
export const db = createLocalDatabaseClient({ dbUrl });
@@ -132,8 +119,10 @@ export const db = createLocalDatabaseClient({ dbUrl });
${
shouldSeed
? `await seedLocal({
+ db,
+ tables: ${JSON.stringify(tables)},
userSeedGlob: import.meta.glob(${JSON.stringify(userSeedFilePaths)}, { eager: true }),
- integrationSeedImports: [${integrationSeedImports.join(',')}],
+ integrationSeedFunctions: [${integrationSeedImportNames.join(',')}],
});`
: ''
}
@@ -174,19 +163,3 @@ function getStringifiedCollectionExports(tables: DBTables) {
)
.join('\n');
}
-
-const sqlite = new SQLiteAsyncDialect();
-
-async function recreateTables({ db, tables }: { db: SqliteDB; tables: DBTables }) {
- const setupQueries: SQL[] = [];
- for (const [name, table] of Object.entries(tables)) {
- const dropQuery = sql.raw(`DROP TABLE IF EXISTS ${sqlite.escapeName(name)}`);
- const createQuery = sql.raw(getCreateTableQuery(name, table));
- const indexQueries = getCreateIndexQueries(name, table);
- setupQueries.push(dropQuery, createQuery, ...indexQueries.map((s) => sql.raw(s)));
- }
- await db.batch([
- db.run(sql`pragma defer_foreign_keys=true;`),
- ...setupQueries.map((q) => db.run(q)),
- ]);
-}
diff --git a/packages/db/src/core/load-file.ts b/packages/db/src/core/load-file.ts
index 66a5e27c7527..e4da7688ec8a 100644
--- a/packages/db/src/core/load-file.ts
+++ b/packages/db/src/core/load-file.ts
@@ -8,7 +8,8 @@ import { CONFIG_FILE_NAMES, VIRTUAL_MODULE_ID } from './consts.js';
import { INTEGRATION_TABLE_CONFLICT_ERROR } from './errors.js';
import { errorMap } from './integration/error-map.js';
import { getConfigVirtualModContents } from './integration/vite-plugin-db.js';
-import { type AstroDbIntegration, dbConfigSchema } from './types.js';
+import { dbConfigSchema } from './schemas.js';
+import { type AstroDbIntegration } from './types.js';
import { getDbDirectoryUrl } from './utils.js';
const isDbIntegration = (integration: AstroIntegration): integration is AstroDbIntegration =>
diff --git a/packages/db/src/core/schemas.ts b/packages/db/src/core/schemas.ts
new file mode 100644
index 000000000000..c0622bf84adb
--- /dev/null
+++ b/packages/db/src/core/schemas.ts
@@ -0,0 +1,206 @@
+import { SQL } from 'drizzle-orm';
+import { SQLiteAsyncDialect } from 'drizzle-orm/sqlite-core';
+import { type ZodTypeDef, z } from 'zod';
+import { SERIALIZED_SQL_KEY, type SerializedSQL } from '../runtime/types.js';
+import { errorMap } from './integration/error-map.js';
+import type { NumberColumn, TextColumn } from './types.js';
+
+export type MaybeArray = T | T[];
+
+// Transform to serializable object for migration files
+const sqlite = new SQLiteAsyncDialect();
+
+const sqlSchema = z.instanceof(SQL).transform(
+ (sqlObj): SerializedSQL => ({
+ [SERIALIZED_SQL_KEY]: true,
+ sql: sqlite.sqlToQuery(sqlObj).sql,
+ })
+);
+
+const baseColumnSchema = z.object({
+ label: z.string().optional(),
+ optional: z.boolean().optional().default(false),
+ unique: z.boolean().optional().default(false),
+ deprecated: z.boolean().optional().default(false),
+
+ // Defined when `defineReadableTable()` is called
+ name: z.string().optional(),
+ // TODO: rename to `tableName`. Breaking schema change
+ collection: z.string().optional(),
+});
+
+export const booleanColumnSchema = z.object({
+ type: z.literal('boolean'),
+ schema: baseColumnSchema.extend({
+ default: z.union([z.boolean(), sqlSchema]).optional(),
+ }),
+});
+
+const numberColumnBaseSchema = baseColumnSchema.omit({ optional: true }).and(
+ z.union([
+ z.object({
+ primaryKey: z.literal(false).optional().default(false),
+ optional: baseColumnSchema.shape.optional,
+ default: z.union([z.number(), sqlSchema]).optional(),
+ }),
+ z.object({
+ // `integer primary key` uses ROWID as the default value.
+ // `optional` and `default` do not have an effect,
+ // so disable these config options for primary keys.
+ primaryKey: z.literal(true),
+ optional: z.literal(false).optional(),
+ default: z.literal(undefined).optional(),
+ }),
+ ])
+);
+
+export const numberColumnOptsSchema: z.ZodType<
+ z.infer & {
+ // ReferenceableColumn creates a circular type. Define ZodType to resolve.
+ references?: NumberColumn;
+ },
+ ZodTypeDef,
+ z.input & {
+ references?: () => z.input;
+ }
+> = numberColumnBaseSchema.and(
+ z.object({
+ references: z
+ .function()
+ .returns(z.lazy(() => numberColumnSchema))
+ .optional()
+ .transform((fn) => fn?.()),
+ })
+);
+
+export const numberColumnSchema = z.object({
+ type: z.literal('number'),
+ schema: numberColumnOptsSchema,
+});
+
+const textColumnBaseSchema = baseColumnSchema
+ .omit({ optional: true })
+ .extend({
+ default: z.union([z.string(), sqlSchema]).optional(),
+ multiline: z.boolean().optional(),
+ })
+ .and(
+ z.union([
+ z.object({
+ primaryKey: z.literal(false).optional().default(false),
+ optional: baseColumnSchema.shape.optional,
+ }),
+ z.object({
+ // text primary key allows NULL values.
+ // NULL values bypass unique checks, which could
+ // lead to duplicate URLs per record in Astro Studio.
+ // disable `optional` for primary keys.
+ primaryKey: z.literal(true),
+ optional: z.literal(false).optional(),
+ }),
+ ])
+ );
+
+export const textColumnOptsSchema: z.ZodType<
+ z.infer & {
+ // ReferenceableColumn creates a circular type. Define ZodType to resolve.
+ references?: TextColumn;
+ },
+ ZodTypeDef,
+ z.input & {
+ references?: () => z.input;
+ }
+> = textColumnBaseSchema.and(
+ z.object({
+ references: z
+ .function()
+ .returns(z.lazy(() => textColumnSchema))
+ .optional()
+ .transform((fn) => fn?.()),
+ })
+);
+
+export const textColumnSchema = z.object({
+ type: z.literal('text'),
+ schema: textColumnOptsSchema,
+});
+
+export const dateColumnSchema = z.object({
+ type: z.literal('date'),
+ schema: baseColumnSchema.extend({
+ default: z
+ .union([
+ sqlSchema,
+ // transform to ISO string for serialization
+ z.date().transform((d) => d.toISOString()),
+ ])
+ .optional(),
+ }),
+});
+
+export const jsonColumnSchema = z.object({
+ type: z.literal('json'),
+ schema: baseColumnSchema.extend({
+ default: z.unknown().optional(),
+ }),
+});
+
+export const columnSchema = z.discriminatedUnion('type', [
+ booleanColumnSchema,
+ numberColumnSchema,
+ textColumnSchema,
+ dateColumnSchema,
+ jsonColumnSchema,
+]);
+export const referenceableColumnSchema = z.union([textColumnSchema, numberColumnSchema]);
+
+export const columnsSchema = z.record(columnSchema);
+
+export const indexSchema = z.object({
+ on: z.string().or(z.array(z.string())),
+ unique: z.boolean().optional(),
+});
+
+type ForeignKeysInput = {
+ columns: MaybeArray;
+ references: () => MaybeArray, 'references'>>;
+};
+
+type ForeignKeysOutput = Omit & {
+ // reference fn called in `transform`. Ensures output is JSON serializable.
+ references: MaybeArray, 'references'>>;
+};
+
+const foreignKeysSchema: z.ZodType = z.object({
+ columns: z.string().or(z.array(z.string())),
+ references: z
+ .function()
+ .returns(z.lazy(() => referenceableColumnSchema.or(z.array(referenceableColumnSchema))))
+ .transform((fn) => fn()),
+});
+
+export const tableSchema = z.object({
+ columns: columnsSchema,
+ indexes: z.record(indexSchema).optional(),
+ foreignKeys: z.array(foreignKeysSchema).optional(),
+ deprecated: z.boolean().optional().default(false),
+});
+
+export const tablesSchema = z.preprocess((rawTables) => {
+ // Use `z.any()` to avoid breaking object references
+ const tables = z.record(z.any()).parse(rawTables, { errorMap });
+ for (const [tableName, table] of Object.entries(tables)) {
+ // Append table and column names to columns.
+ // Used to track table info for references.
+ const { columns } = z.object({ columns: z.record(z.any()) }).parse(table, { errorMap });
+ for (const [columnName, column] of Object.entries(columns)) {
+ column.schema.name = columnName;
+ column.schema.collection = tableName;
+ }
+ }
+ return rawTables;
+}, z.record(tableSchema));
+
+export const dbConfigSchema = z.object({
+ tables: tablesSchema.optional(),
+});
diff --git a/packages/db/src/core/tokens.ts b/packages/db/src/core/tokens.ts
index d8be850a0c4f..e7f9c630ff0e 100644
--- a/packages/db/src/core/tokens.ts
+++ b/packages/db/src/core/tokens.ts
@@ -3,7 +3,7 @@ import { homedir } from 'node:os';
import { join } from 'node:path';
import { pathToFileURL } from 'node:url';
import { MISSING_PROJECT_ID_ERROR, MISSING_SESSION_ID_ERROR } from './errors.js';
-import { getAstroStudioEnv, getAstroStudioUrl } from './utils.js';
+import { getAstroStudioEnv, getAstroStudioUrl, safeFetch } from './utils.js';
export const SESSION_LOGIN_FILE = pathToFileURL(join(homedir(), '.astro', 'session-token'));
export const PROJECT_ID_FILE = pathToFileURL(join(process.cwd(), '.astro', 'link'));
@@ -31,13 +31,20 @@ class ManagedRemoteAppToken implements ManagedAppToken {
renewTimer: NodeJS.Timeout | undefined;
static async create(sessionToken: string, projectId: string) {
- const response = await fetch(new URL(`${getAstroStudioUrl()}/auth/cli/token-create`), {
- method: 'POST',
- headers: new Headers({
- Authorization: `Bearer ${sessionToken}`,
- }),
- body: JSON.stringify({ projectId }),
- });
+ const response = await safeFetch(
+ new URL(`${getAstroStudioUrl()}/auth/cli/token-create`),
+ {
+ method: 'POST',
+ headers: new Headers({
+ Authorization: `Bearer ${sessionToken}`,
+ }),
+ body: JSON.stringify({ projectId }),
+ },
+ (res) => {
+ throw new Error(`Failed to create token: ${res.status} ${res.statusText}`);
+ }
+ );
+
const { token: shortLivedAppToken, ttl } = await response.json();
return new ManagedRemoteAppToken({
token: shortLivedAppToken,
@@ -56,14 +63,20 @@ class ManagedRemoteAppToken implements ManagedAppToken {
}
private async fetch(url: string, body: unknown) {
- return fetch(`${getAstroStudioUrl()}${url}`, {
- method: 'POST',
- headers: {
- Authorization: `Bearer ${this.session}`,
- 'Content-Type': 'application/json',
+ return safeFetch(
+ `${getAstroStudioUrl()}${url}`,
+ {
+ method: 'POST',
+ headers: {
+ Authorization: `Bearer ${this.session}`,
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(body),
},
- body: JSON.stringify(body),
- });
+ () => {
+ throw new Error(`Failed to fetch ${url}.`);
+ }
+ );
}
async renew() {
diff --git a/packages/db/src/core/types.ts b/packages/db/src/core/types.ts
index cff08c4a52a5..1eeabc7b1bb4 100644
--- a/packages/db/src/core/types.ts
+++ b/packages/db/src/core/types.ts
@@ -1,209 +1,24 @@
import type { AstroIntegration } from 'astro';
-import { SQL } from 'drizzle-orm';
-import { SQLiteAsyncDialect } from 'drizzle-orm/sqlite-core';
-import { type ZodTypeDef, z } from 'zod';
-import { SERIALIZED_SQL_KEY, type SerializedSQL } from '../runtime/types.js';
-import { errorMap } from './integration/error-map.js';
-
-export type MaybePromise = T | Promise;
-export type MaybeArray = T | T[];
-
-// Transform to serializable object for migration files
-const sqlite = new SQLiteAsyncDialect();
-
-const sqlSchema = z.instanceof(SQL).transform(
- (sqlObj): SerializedSQL => ({
- [SERIALIZED_SQL_KEY]: true,
- sql: sqlite.sqlToQuery(sqlObj).sql,
- })
-);
-
-const baseColumnSchema = z.object({
- label: z.string().optional(),
- optional: z.boolean().optional().default(false),
- unique: z.boolean().optional().default(false),
- deprecated: z.boolean().optional().default(false),
-
- // Defined when `defineReadableTable()` is called
- name: z.string().optional(),
- // TODO: rename to `tableName`. Breaking schema change
- collection: z.string().optional(),
-});
-
-const booleanColumnSchema = z.object({
- type: z.literal('boolean'),
- schema: baseColumnSchema.extend({
- default: z.union([z.boolean(), sqlSchema]).optional(),
- }),
-});
-
-const numberColumnBaseSchema = baseColumnSchema.omit({ optional: true }).and(
- z.union([
- z.object({
- primaryKey: z.literal(false).optional().default(false),
- optional: baseColumnSchema.shape.optional,
- default: z.union([z.number(), sqlSchema]).optional(),
- }),
- z.object({
- // `integer primary key` uses ROWID as the default value.
- // `optional` and `default` do not have an effect,
- // so disable these config options for primary keys.
- primaryKey: z.literal(true),
- optional: z.literal(false).optional(),
- default: z.literal(undefined).optional(),
- }),
- ])
-);
-
-const numberColumnOptsSchema: z.ZodType<
- z.infer & {
- // ReferenceableColumn creates a circular type. Define ZodType to resolve.
- references?: NumberColumn;
- },
- ZodTypeDef,
- z.input & {
- references?: () => z.input;
- }
-> = numberColumnBaseSchema.and(
- z.object({
- references: z
- .function()
- .returns(z.lazy(() => numberColumnSchema))
- .optional()
- .transform((fn) => fn?.()),
- })
-);
-
-const numberColumnSchema = z.object({
- type: z.literal('number'),
- schema: numberColumnOptsSchema,
-});
-
-const textColumnBaseSchema = baseColumnSchema
- .omit({ optional: true })
- .extend({
- default: z.union([z.string(), sqlSchema]).optional(),
- multiline: z.boolean().optional(),
- })
- .and(
- z.union([
- z.object({
- primaryKey: z.literal(false).optional().default(false),
- optional: baseColumnSchema.shape.optional,
- }),
- z.object({
- // text primary key allows NULL values.
- // NULL values bypass unique checks, which could
- // lead to duplicate URLs per record in Astro Studio.
- // disable `optional` for primary keys.
- primaryKey: z.literal(true),
- optional: z.literal(false).optional(),
- }),
- ])
- );
-
-const textColumnOptsSchema: z.ZodType<
- z.infer & {
- // ReferenceableColumn creates a circular type. Define ZodType to resolve.
- references?: TextColumn;
- },
- ZodTypeDef,
- z.input & {
- references?: () => z.input;
- }
-> = textColumnBaseSchema.and(
- z.object({
- references: z
- .function()
- .returns(z.lazy(() => textColumnSchema))
- .optional()
- .transform((fn) => fn?.()),
- })
-);
-
-const textColumnSchema = z.object({
- type: z.literal('text'),
- schema: textColumnOptsSchema,
-});
-
-const dateColumnSchema = z.object({
- type: z.literal('date'),
- schema: baseColumnSchema.extend({
- default: z
- .union([
- sqlSchema,
- // transform to ISO string for serialization
- z.date().transform((d) => d.toISOString()),
- ])
- .optional(),
- }),
-});
-
-const jsonColumnSchema = z.object({
- type: z.literal('json'),
- schema: baseColumnSchema.extend({
- default: z.unknown().optional(),
- }),
-});
-
-export const columnSchema = z.union([
+import type { z } from 'zod';
+import type {
+ MaybeArray,
booleanColumnSchema,
- numberColumnSchema,
- textColumnSchema,
+ columnSchema,
+ columnsSchema,
dateColumnSchema,
+ dbConfigSchema,
+ indexSchema,
jsonColumnSchema,
-]);
-export const referenceableColumnSchema = z.union([textColumnSchema, numberColumnSchema]);
-
-const columnsSchema = z.record(columnSchema);
-
-export const indexSchema = z.object({
- on: z.string().or(z.array(z.string())),
- unique: z.boolean().optional(),
-});
-
-type ForeignKeysInput = {
- columns: MaybeArray;
- references: () => MaybeArray, 'references'>>;
-};
-
-type ForeignKeysOutput = Omit & {
- // reference fn called in `transform`. Ensures output is JSON serializable.
- references: MaybeArray, 'references'>>;
-};
-
-const foreignKeysSchema: z.ZodType = z.object({
- columns: z.string().or(z.array(z.string())),
- references: z
- .function()
- .returns(z.lazy(() => referenceableColumnSchema.or(z.array(referenceableColumnSchema))))
- .transform((fn) => fn()),
-});
+ numberColumnOptsSchema,
+ numberColumnSchema,
+ referenceableColumnSchema,
+ tableSchema,
+ textColumnOptsSchema,
+ textColumnSchema,
+} from './schemas.js';
export type Indexes = Record>;
-export const tableSchema = z.object({
- columns: columnsSchema,
- indexes: z.record(indexSchema).optional(),
- foreignKeys: z.array(foreignKeysSchema).optional(),
- deprecated: z.boolean().optional().default(false),
-});
-
-export const tablesSchema = z.preprocess((rawTables) => {
- // Use `z.any()` to avoid breaking object references
- const tables = z.record(z.any()).parse(rawTables, { errorMap });
- for (const [tableName, table] of Object.entries(tables)) {
- // Append table and column names to columns.
- // Used to track table info for references.
- const { columns } = z.object({ columns: z.record(z.any()) }).parse(table, { errorMap });
- for (const [columnName, column] of Object.entries(columns)) {
- column.schema.name = columnName;
- column.schema.collection = tableName;
- }
- }
- return rawTables;
-}, z.record(tableSchema));
-
export type BooleanColumn = z.infer;
export type BooleanColumnInput = z.input;
export type NumberColumn = z.infer;
@@ -237,10 +52,6 @@ export type DBSnapshot = {
version: string;
};
-export const dbConfigSchema = z.object({
- tables: tablesSchema.optional(),
-});
-
export type DBConfigInput = z.input;
export type DBConfig = z.infer;
diff --git a/packages/db/src/core/utils.ts b/packages/db/src/core/utils.ts
index 2fe5af2829f8..549a8c6540ef 100644
--- a/packages/db/src/core/utils.ts
+++ b/packages/db/src/core/utils.ts
@@ -16,7 +16,7 @@ export function getRemoteDatabaseUrl(): string {
export function getAstroStudioUrl(): string {
const env = getAstroStudioEnv();
- return env.ASTRO_STUDIO_URL || 'https://stardate.astro.build';
+ return env.ASTRO_STUDIO_URL || 'https://studio.astro.build';
}
export function getDbDirectoryUrl(root: URL | string) {
@@ -26,3 +26,24 @@ export function getDbDirectoryUrl(root: URL | string) {
export function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration {
return integration;
}
+
+/**
+ * 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.
+ */
+export async function safeFetch(
+ url: Parameters[0],
+ options: Parameters[1] = {},
+ onNotOK: (response: Response) => void | Promise = () => {
+ throw new Error(`Request to ${url} returned a non-OK status code.`);
+ }
+): Promise {
+ const response = await fetch(url, options);
+
+ if (!response.ok) {
+ await onNotOK(response);
+ }
+
+ return response;
+}
+
+export type Result = { success: true; data: T } | { success: false; data: unknown };
diff --git a/packages/db/src/runtime/db-client.ts b/packages/db/src/runtime/db-client.ts
index db8535e15ed4..6695779a17cf 100644
--- a/packages/db/src/runtime/db-client.ts
+++ b/packages/db/src/runtime/db-client.ts
@@ -4,6 +4,7 @@ import type { LibSQLDatabase } from 'drizzle-orm/libsql';
import { drizzle as drizzleLibsql } from 'drizzle-orm/libsql';
import { drizzle as drizzleProxy } from 'drizzle-orm/sqlite-proxy';
import { z } from 'zod';
+import { safeFetch } from '../core/utils.js';
const isWebContainer = !!process.versions?.webcontainer;
@@ -29,19 +30,22 @@ export function createRemoteDatabaseClient(appToken: string, remoteDbURL: string
const db = drizzleProxy(
async (sql, parameters, method) => {
const requestBody: InStatement = { sql, args: parameters };
- const res = await fetch(url, {
- method: 'POST',
- headers: {
- Authorization: `Bearer ${appToken}`,
- 'Content-Type': 'application/json',
+ const res = await safeFetch(
+ url,
+ {
+ method: 'POST',
+ headers: {
+ Authorization: `Bearer ${appToken}`,
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(requestBody),
},
- body: JSON.stringify(requestBody),
- });
- if (!res.ok) {
- throw new Error(
- `Failed to execute query.\nQuery: ${sql}\nFull error: ${res.status} ${await res.text()}}`
- );
- }
+ (response) => {
+ throw new Error(
+ `Failed to execute query.\nQuery: ${sql}\nFull error: ${response.status} ${response.statusText}`
+ );
+ }
+ );
let remoteResult: z.infer;
try {
@@ -74,19 +78,22 @@ export function createRemoteDatabaseClient(appToken: string, remoteDbURL: string
},
async (queries) => {
const stmts: InStatement[] = queries.map(({ sql, params }) => ({ sql, args: params }));
- const res = await fetch(url, {
- method: 'POST',
- headers: {
- Authorization: `Bearer ${appToken}`,
- 'Content-Type': 'application/json',
+ const res = await safeFetch(
+ url,
+ {
+ method: 'POST',
+ headers: {
+ Authorization: `Bearer ${appToken}`,
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(stmts),
},
- body: JSON.stringify(stmts),
- });
- if (!res.ok) {
- throw new Error(
- `Failed to execute batch queries.\nFull error: ${res.status} ${await res.text()}}`
- );
- }
+ (response) => {
+ throw new Error(
+ `Failed to execute batch queries.\nFull error: ${response.status} ${response.statusText}}`
+ );
+ }
+ );
let remoteResults: z.infer[];
try {
diff --git a/packages/db/src/runtime/index.ts b/packages/db/src/runtime/index.ts
index 45b46df752f0..6463f5f0e07c 100644
--- a/packages/db/src/runtime/index.ts
+++ b/packages/db/src/runtime/index.ts
@@ -1,4 +1,3 @@
-import { LibsqlError } from '@libsql/client';
import { type ColumnBuilderBaseConfig, type ColumnDataType, sql } from 'drizzle-orm';
import type { LibSQLDatabase } from 'drizzle-orm/libsql';
import {
@@ -10,7 +9,6 @@ import {
sqliteTable,
text,
} from 'drizzle-orm/sqlite-core';
-import { SEED_DEFAULT_EXPORT_ERROR, SEED_ERROR } from '../core/errors.js';
import { type DBColumn, type DBTable } from '../core/types.js';
import { type SerializedSQL, isSerializedSQL } from './types.js';
@@ -18,41 +16,7 @@ export { sql };
export type SqliteDB = LibSQLDatabase;
export type { Table } from './types.js';
export { createRemoteDatabaseClient, createLocalDatabaseClient } from './db-client.js';
-
-export async function seedLocal({
- // Glob all potential seed files to catch renames and deletions.
- userSeedGlob,
- integrationSeedImports,
-}: {
- userSeedGlob: Record Promise }>;
- integrationSeedImports: Array<() => Promise<{ default: () => Promise }>>;
-}) {
- const seedFilePath = Object.keys(userSeedGlob)[0];
- if (seedFilePath) {
- const mod = userSeedGlob[seedFilePath];
-
- if (!mod.default) {
- throw new Error(SEED_DEFAULT_EXPORT_ERROR(seedFilePath));
- }
- try {
- await mod.default();
- } catch (e) {
- if (e instanceof LibsqlError) {
- throw new Error(SEED_ERROR(e.message));
- }
- throw e;
- }
- }
- for (const importModule of integrationSeedImports) {
- const mod = await importModule();
- await mod.default().catch((e) => {
- if (e instanceof LibsqlError) {
- throw new Error(SEED_ERROR(e.message));
- }
- throw e;
- });
- }
-}
+export { seedLocal } from './seed-local.js';
export function hasPrimaryKey(column: DBColumn) {
return 'primaryKey' in column.schema && !!column.schema.primaryKey;
diff --git a/packages/db/src/runtime/seed-local.ts b/packages/db/src/runtime/seed-local.ts
new file mode 100644
index 000000000000..f00e44ea0bc2
--- /dev/null
+++ b/packages/db/src/runtime/seed-local.ts
@@ -0,0 +1,58 @@
+import { LibsqlError } from '@libsql/client';
+import { type SQL, sql } from 'drizzle-orm';
+import type { LibSQLDatabase } from 'drizzle-orm/libsql';
+import { SQLiteAsyncDialect } from 'drizzle-orm/sqlite-core';
+import { SEED_DEFAULT_EXPORT_ERROR, SEED_ERROR } from '../core/errors.js';
+import { type DBTables } from '../core/types.js';
+import { getCreateIndexQueries, getCreateTableQuery } from './queries.js';
+
+const sqlite = new SQLiteAsyncDialect();
+
+export async function seedLocal({
+ db,
+ tables,
+ // Glob all potential seed files to catch renames and deletions.
+ userSeedGlob,
+ integrationSeedFunctions,
+}: {
+ db: LibSQLDatabase;
+ tables: DBTables;
+ userSeedGlob: Record Promise }>;
+ integrationSeedFunctions: Array<() => Promise>;
+}) {
+ await recreateTables({ db, tables });
+ const seedFunctions: Array<() => Promise> = [];
+ const seedFilePath = Object.keys(userSeedGlob)[0];
+ if (seedFilePath) {
+ const mod = userSeedGlob[seedFilePath];
+ if (!mod.default) throw new Error(SEED_DEFAULT_EXPORT_ERROR(seedFilePath));
+ seedFunctions.push(mod.default);
+ }
+ for (const seedFn of integrationSeedFunctions) {
+ seedFunctions.push(seedFn);
+ }
+ for (const seed of seedFunctions) {
+ try {
+ await seed();
+ } catch (e) {
+ if (e instanceof LibsqlError) {
+ throw new Error(SEED_ERROR(e.message));
+ }
+ throw e;
+ }
+ }
+}
+
+async function recreateTables({ db, tables }: { db: LibSQLDatabase; tables: DBTables }) {
+ const setupQueries: SQL[] = [];
+ for (const [name, table] of Object.entries(tables)) {
+ const dropQuery = sql.raw(`DROP TABLE IF EXISTS ${sqlite.escapeName(name)}`);
+ const createQuery = sql.raw(getCreateTableQuery(name, table));
+ const indexQueries = getCreateIndexQueries(name, table);
+ setupQueries.push(dropQuery, createQuery, ...indexQueries.map((s) => sql.raw(s)));
+ }
+ await db.batch([
+ db.run(sql`pragma defer_foreign_keys=true;`),
+ ...setupQueries.map((q) => db.run(q)),
+ ]);
+}
diff --git a/packages/db/test/basics.test.js b/packages/db/test/basics.test.js
index 55a5f0ec6e61..d92c15046b1c 100644
--- a/packages/db/test/basics.test.js
+++ b/packages/db/test/basics.test.js
@@ -13,10 +13,6 @@ describe('astro:db', () => {
});
});
- // Note (@bholmesdev) generate a random database id on startup.
- // Ensures database connections don't conflict
- // when multiple dev servers are run in parallel on the same project.
- process.env.ASTRO_TEST_RANDOM_DB_ID = 'true';
describe('development', () => {
let devServer;
@@ -26,7 +22,6 @@ describe('astro:db', () => {
after(async () => {
await devServer.stop();
- process.env.ASTRO_TEST_RANDOM_DB_ID = undefined;
});
it('Prints the list of authors', async () => {
@@ -69,5 +64,13 @@ describe('astro:db', () => {
const themeDark = $($('.themes-list .theme-dark')[0]).text();
expect(themeDark).to.equal('dark mode');
});
+
+ it('text fields an be used as references', async () => {
+ const html = await fixture.fetch('/login').then((res) => res.text());
+ const $ = cheerioLoad(html);
+
+ expect($('.session-id').text()).to.equal('12345');
+ expect($('.username').text()).to.equal('Mario');
+ });
});
});
diff --git a/packages/db/test/fixtures/basics/astro.config.ts b/packages/db/test/fixtures/basics/astro.config.ts
index 5ff1200e2418..983a6947d115 100644
--- a/packages/db/test/fixtures/basics/astro.config.ts
+++ b/packages/db/test/fixtures/basics/astro.config.ts
@@ -4,4 +4,7 @@ import { defineConfig } from 'astro/config';
// https://astro.build/config
export default defineConfig({
integrations: [db()],
+ devToolbar: {
+ enabled: false,
+ },
});
diff --git a/packages/db/test/fixtures/basics/db/config.ts b/packages/db/test/fixtures/basics/db/config.ts
index 137fd2650a2b..d8c476db19d3 100644
--- a/packages/db/test/fixtures/basics/db/config.ts
+++ b/packages/db/test/fixtures/basics/db/config.ts
@@ -8,6 +8,22 @@ const Author = defineTable({
},
});
+const User = defineTable({
+ columns: {
+ id: column.text({ primaryKey: true, optional: false }),
+ username: column.text({ optional: false, unique: true }),
+ password: column.text({ optional: false }),
+ },
+});
+
+const Session = defineTable({
+ columns: {
+ id: column.text({ primaryKey: true, optional: false }),
+ expiresAt: column.number({ optional: false, name: 'expires_at' }),
+ userId: column.text({ optional: false, references: () => User.columns.id, name: 'user_id' }),
+ },
+});
+
export default defineDb({
- tables: { Author, Themes },
+ tables: { Author, Themes, User, Session },
});
diff --git a/packages/db/test/fixtures/basics/db/seed.ts b/packages/db/test/fixtures/basics/db/seed.ts
index a1502dc2b478..ec5ab2e0c274 100644
--- a/packages/db/test/fixtures/basics/db/seed.ts
+++ b/packages/db/test/fixtures/basics/db/seed.ts
@@ -1,6 +1,6 @@
import { asDrizzleTable } from '@astrojs/db/utils';
import { Themes as ThemesConfig } from './theme';
-import { Author, db } from 'astro:db';
+import { Author, Session, User, db } from 'astro:db';
const Themes = asDrizzleTable('Themes', ThemesConfig);
export default async function () {
@@ -18,5 +18,7 @@ export default async function () {
{ name: 'Bjorn' },
{ name: 'Sarah' },
]),
+ db.insert(User).values([{ id: 'mario', username: 'Mario', password: 'itsame' }]),
+ db.insert(Session).values([{ id: '12345', expiresAt: new Date().valueOf(), userId: 'mario' }]),
]);
}
diff --git a/packages/db/test/fixtures/basics/src/pages/login.astro b/packages/db/test/fixtures/basics/src/pages/login.astro
new file mode 100644
index 000000000000..41b86ab149ea
--- /dev/null
+++ b/packages/db/test/fixtures/basics/src/pages/login.astro
@@ -0,0 +1,18 @@
+---
+import { db, Session, User, eq } from 'astro:db';
+
+const users = await db.select().from(User);
+const sessions = await db.select().from(Session).innerJoin(User, eq(Session.userId, User.id));
+---
+
+Sessions
+
+ {
+ sessions.map(({ Session, User }) => (
+ -
+
{Session.id}
+ {User.username}
+
+ ))
+ }
+
diff --git a/packages/db/test/fixtures/integration-only/astro.config.mjs b/packages/db/test/fixtures/integration-only/astro.config.mjs
new file mode 100644
index 000000000000..23f52739e531
--- /dev/null
+++ b/packages/db/test/fixtures/integration-only/astro.config.mjs
@@ -0,0 +1,8 @@
+import db from '@astrojs/db';
+import { defineConfig } from 'astro/config';
+import testIntegration from './integration';
+
+// https://astro.build/config
+export default defineConfig({
+ integrations: [db(), testIntegration()],
+});
diff --git a/packages/db/test/fixtures/integration-only/integration/config.ts b/packages/db/test/fixtures/integration-only/integration/config.ts
new file mode 100644
index 000000000000..d1f1aac26398
--- /dev/null
+++ b/packages/db/test/fixtures/integration-only/integration/config.ts
@@ -0,0 +1,8 @@
+import { menu } from './shared';
+import { defineDb } from 'astro:db';
+
+export default defineDb({
+ tables: {
+ menu,
+ },
+});
diff --git a/packages/db/test/fixtures/integration-only/integration/index.ts b/packages/db/test/fixtures/integration-only/integration/index.ts
new file mode 100644
index 000000000000..b249cc253853
--- /dev/null
+++ b/packages/db/test/fixtures/integration-only/integration/index.ts
@@ -0,0 +1,15 @@
+import { defineDbIntegration } from '@astrojs/db/utils';
+
+export default function testIntegration() {
+ return defineDbIntegration({
+ name: 'db-test-integration',
+ hooks: {
+ 'astro:db:setup'({ extendDb }) {
+ extendDb({
+ configEntrypoint: './integration/config.ts',
+ seedEntrypoint: './integration/seed.ts',
+ });
+ },
+ },
+ });
+}
diff --git a/packages/db/test/fixtures/integration-only/integration/seed.ts b/packages/db/test/fixtures/integration-only/integration/seed.ts
new file mode 100644
index 000000000000..d46b05e1c1fa
--- /dev/null
+++ b/packages/db/test/fixtures/integration-only/integration/seed.ts
@@ -0,0 +1,14 @@
+import { asDrizzleTable } from '@astrojs/db/utils';
+import { menu } from './shared';
+import { db } from 'astro:db';
+
+export default async function () {
+ const table = asDrizzleTable('menu', menu);
+
+ await db.insert(table).values([
+ { name: 'Pancakes', price: 9.5, type: 'Breakfast' },
+ { name: 'French Toast', price: 11.25, type: 'Breakfast' },
+ { name: 'Coffee', price: 3, type: 'Beverages' },
+ { name: 'Cappuccino', price: 4.5, type: 'Beverages' },
+ ]);
+}
diff --git a/packages/db/test/fixtures/integration-only/integration/shared.ts b/packages/db/test/fixtures/integration-only/integration/shared.ts
new file mode 100644
index 000000000000..d46ae65a6536
--- /dev/null
+++ b/packages/db/test/fixtures/integration-only/integration/shared.ts
@@ -0,0 +1,9 @@
+import { column, defineTable } from 'astro:db';
+
+export const menu = defineTable({
+ columns: {
+ name: column.text(),
+ type: column.text(),
+ price: column.number(),
+ },
+});
diff --git a/packages/db/test/fixtures/integration-only/package.json b/packages/db/test/fixtures/integration-only/package.json
new file mode 100644
index 000000000000..4229f710ae96
--- /dev/null
+++ b/packages/db/test/fixtures/integration-only/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "@test/db-integration-only",
+ "version": "0.0.0",
+ "private": true,
+ "scripts": {
+ "dev": "astro dev",
+ "build": "astro build",
+ "preview": "astro preview"
+ },
+ "dependencies": {
+ "@astrojs/db": "workspace:*",
+ "astro": "workspace:*"
+ }
+}
diff --git a/packages/db/test/fixtures/integration-only/src/pages/index.astro b/packages/db/test/fixtures/integration-only/src/pages/index.astro
new file mode 100644
index 000000000000..7b204e124f13
--- /dev/null
+++ b/packages/db/test/fixtures/integration-only/src/pages/index.astro
@@ -0,0 +1,11 @@
+---
+///
+import { db, menu } from 'astro:db';
+
+const menuItems = await db.select().from(menu);
+---
+
+Menu
+
diff --git a/packages/db/test/fixtures/no-seed/astro.config.ts b/packages/db/test/fixtures/no-seed/astro.config.ts
new file mode 100644
index 000000000000..5ff1200e2418
--- /dev/null
+++ b/packages/db/test/fixtures/no-seed/astro.config.ts
@@ -0,0 +1,7 @@
+import db from '@astrojs/db';
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({
+ integrations: [db()],
+});
diff --git a/packages/db/test/fixtures/no-seed/db/config.ts b/packages/db/test/fixtures/no-seed/db/config.ts
new file mode 100644
index 000000000000..b8110406ab69
--- /dev/null
+++ b/packages/db/test/fixtures/no-seed/db/config.ts
@@ -0,0 +1,12 @@
+import { column, defineDb, defineTable } from 'astro:db';
+
+const Author = defineTable({
+ columns: {
+ name: column.text(),
+ age2: column.number({ optional: true }),
+ },
+});
+
+export default defineDb({
+ tables: { Author },
+});
diff --git a/packages/db/test/fixtures/no-seed/package.json b/packages/db/test/fixtures/no-seed/package.json
new file mode 100644
index 000000000000..66a192697826
--- /dev/null
+++ b/packages/db/test/fixtures/no-seed/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "@test/db-no-seed",
+ "version": "0.0.0",
+ "private": true,
+ "scripts": {
+ "dev": "astro dev",
+ "build": "astro build",
+ "preview": "astro preview"
+ },
+ "dependencies": {
+ "@astrojs/db": "workspace:*",
+ "astro": "workspace:*"
+ }
+}
diff --git a/packages/db/test/fixtures/no-seed/src/pages/index.astro b/packages/db/test/fixtures/no-seed/src/pages/index.astro
new file mode 100644
index 000000000000..bacd873e1332
--- /dev/null
+++ b/packages/db/test/fixtures/no-seed/src/pages/index.astro
@@ -0,0 +1,21 @@
+---
+///
+import { Author, db } from 'astro:db';
+
+await db
+ .insert(Author)
+ .values([
+ { name: 'Ben' },
+ { name: 'Nate' },
+ { name: 'Erika' },
+ { name: 'Bjorn' },
+ { name: 'Sarah' },
+ ]);
+
+const authors = await db.select().from(Author);
+---
+
+Authors
+
+ {authors.map((author) => - {author.name}
)}
+
diff --git a/packages/db/test/integration-only.test.js b/packages/db/test/integration-only.test.js
new file mode 100644
index 000000000000..dd5222f2d68c
--- /dev/null
+++ b/packages/db/test/integration-only.test.js
@@ -0,0 +1,47 @@
+import { expect } from 'chai';
+import { load as cheerioLoad } from 'cheerio';
+import { loadFixture } from '../../astro/test/test-utils.js';
+
+describe('astro:db with only integrations, no user db config', () => {
+ let fixture;
+ before(async () => {
+ fixture = await loadFixture({
+ root: new URL('./fixtures/integration-only/', import.meta.url),
+ });
+ });
+
+ describe('development', () => {
+ let devServer;
+ before(async () => {
+ devServer = await fixture.startDevServer();
+ });
+
+ after(async () => {
+ await devServer.stop();
+ });
+
+ it('Prints the list of menu items from integration-defined table', async () => {
+ const html = await fixture.fetch('/').then((res) => res.text());
+ const $ = cheerioLoad(html);
+
+ const ul = $('ul.menu');
+ expect(ul.children()).to.have.a.lengthOf(4);
+ expect(ul.children().eq(0).text()).to.equal('Pancakes');
+ });
+ });
+
+ describe('build', () => {
+ before(async () => {
+ await fixture.build();
+ });
+
+ it('Prints the list of menu items from integration-defined table', async () => {
+ const html = await fixture.readFile('/index.html');
+ const $ = cheerioLoad(html);
+
+ const ul = $('ul.menu');
+ expect(ul.children()).to.have.a.lengthOf(4);
+ expect(ul.children().eq(0).text()).to.equal('Pancakes');
+ });
+ });
+});
diff --git a/packages/db/test/integrations.test.js b/packages/db/test/integrations.test.js
index c2f12109c0c4..167292ba391a 100644
--- a/packages/db/test/integrations.test.js
+++ b/packages/db/test/integrations.test.js
@@ -10,10 +10,6 @@ describe('astro:db with integrations', () => {
});
});
- // Note(bholmesdev): Use in-memory db to avoid
- // Multiple dev servers trying to unlink and remount
- // the same database file.
- process.env.TEST_IN_MEMORY_DB = 'true';
describe('development', () => {
let devServer;
@@ -24,7 +20,6 @@ describe('astro:db with integrations', () => {
after(async () => {
await devServer.stop();
- process.env.TEST_IN_MEMORY_DB = undefined;
});
it('Prints the list of authors from user-defined table', async () => {
@@ -45,4 +40,28 @@ describe('astro:db with integrations', () => {
expect(ul.children().eq(0).text()).to.equal('Pancakes');
});
});
+
+ describe('build', () => {
+ before(async () => {
+ await fixture.build();
+ });
+
+ it('Prints the list of authors from user-defined table', async () => {
+ const html = await fixture.readFile('/index.html');
+ const $ = cheerioLoad(html);
+
+ const ul = $('.authors-list');
+ expect(ul.children()).to.have.a.lengthOf(5);
+ expect(ul.children().eq(0).text()).to.equal('Ben');
+ });
+
+ it('Prints the list of menu items from integration-defined table', async () => {
+ const html = await fixture.readFile('/index.html');
+ const $ = cheerioLoad(html);
+
+ const ul = $('ul.menu');
+ expect(ul.children()).to.have.a.lengthOf(4);
+ expect(ul.children().eq(0).text()).to.equal('Pancakes');
+ });
+ });
});
diff --git a/packages/db/test/no-seed.test.js b/packages/db/test/no-seed.test.js
new file mode 100644
index 000000000000..82e14d38984c
--- /dev/null
+++ b/packages/db/test/no-seed.test.js
@@ -0,0 +1,47 @@
+import { expect } from 'chai';
+import { load as cheerioLoad } from 'cheerio';
+import { loadFixture } from '../../astro/test/test-utils.js';
+
+describe('astro:db with no seed file', () => {
+ let fixture;
+ before(async () => {
+ fixture = await loadFixture({
+ root: new URL('./fixtures/no-seed/', import.meta.url),
+ });
+ });
+
+ describe('development', () => {
+ let devServer;
+ before(async () => {
+ devServer = await fixture.startDevServer();
+ });
+
+ after(async () => {
+ await devServer.stop();
+ });
+
+ it('Prints the list of authors', async () => {
+ const html = await fixture.fetch('/').then((res) => res.text());
+ const $ = cheerioLoad(html);
+
+ const ul = $('.authors-list');
+ expect(ul.children()).to.have.a.lengthOf(5);
+ expect(ul.children().eq(0).text()).to.equal('Ben');
+ });
+ });
+
+ describe('build', () => {
+ before(async () => {
+ await fixture.build();
+ });
+
+ it('Prints the list of authors', async () => {
+ const html = await fixture.readFile('/index.html');
+ const $ = cheerioLoad(html);
+
+ const ul = $('.authors-list');
+ expect(ul.children()).to.have.a.lengthOf(5);
+ expect(ul.children().eq(0).text()).to.equal('Ben');
+ });
+ });
+});
diff --git a/packages/db/test/unit/column-queries.test.js b/packages/db/test/unit/column-queries.test.js
index 8ba6552f830f..d7f65dff2735 100644
--- a/packages/db/test/unit/column-queries.test.js
+++ b/packages/db/test/unit/column-queries.test.js
@@ -5,7 +5,7 @@ import {
getMigrationQueries,
} from '../../dist/core/cli/migration-queries.js';
import { MIGRATION_VERSION } from '../../dist/core/consts.js';
-import { tableSchema } from '../../dist/core/types.js';
+import { tableSchema } from '../../dist/core/schemas.js';
import { column, defineTable } from '../../dist/runtime/config.js';
import { NOW } from '../../dist/runtime/index.js';
@@ -53,7 +53,6 @@ describe('column queries', () => {
const newCollections = { [TABLE_NAME]: userInitial };
const { queries } = await configChangeQueries(oldCollections, newCollections);
expect(queries).to.deep.equal([
- `DROP TABLE IF EXISTS "${TABLE_NAME}"`,
`CREATE TABLE "${TABLE_NAME}" (_id INTEGER PRIMARY KEY, "name" text NOT NULL, "age" integer NOT NULL, "email" text NOT NULL UNIQUE, "mi" text)`,
]);
});
diff --git a/packages/db/test/unit/index-queries.test.js b/packages/db/test/unit/index-queries.test.js
index ad588959d173..f5bde70e8e21 100644
--- a/packages/db/test/unit/index-queries.test.js
+++ b/packages/db/test/unit/index-queries.test.js
@@ -1,7 +1,7 @@
import { expect } from 'chai';
import { describe, it } from 'mocha';
import { getCollectionChangeQueries } from '../../dist/core/cli/migration-queries.js';
-import { tableSchema } from '../../dist/core/types.js';
+import { tableSchema } from '../../dist/core/schemas.js';
import { column } from '../../dist/runtime/config.js';
const userInitial = tableSchema.parse({
diff --git a/packages/db/test/unit/reference-queries.test.js b/packages/db/test/unit/reference-queries.test.js
index a4b0bdd2d923..49d816f739f4 100644
--- a/packages/db/test/unit/reference-queries.test.js
+++ b/packages/db/test/unit/reference-queries.test.js
@@ -1,7 +1,7 @@
import { expect } from 'chai';
import { describe, it } from 'mocha';
import { getCollectionChangeQueries } from '../../dist/core/cli/migration-queries.js';
-import { tablesSchema } from '../../dist/core/types.js';
+import { tablesSchema } from '../../dist/core/schemas.js';
import { column, defineTable } from '../../dist/runtime/config.js';
const BaseUser = defineTable({
diff --git a/packages/db/tsconfig.config-types.json b/packages/db/tsconfig.config-types.json
new file mode 100644
index 000000000000..f21f8445d573
--- /dev/null
+++ b/packages/db/tsconfig.config-types.json
@@ -0,0 +1,12 @@
+{
+ // We want to avoid defineTable() and defineDb() import hints
+ // from the runtime config export instead of astro:db.
+ // We exclude runtime/config from the base types,
+ // and generate to a separate _internal/ directory
+ // for our virtual module (virtual.d.ts) to reference.
+ "extends": "../../tsconfig.base.json",
+ "files": ["./src/runtime/config.ts"],
+ "compilerOptions": {
+ "outDir": "./dist/_internal"
+ }
+}
diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json
index 18443cddf207..96407d1d114a 100644
--- a/packages/db/tsconfig.json
+++ b/packages/db/tsconfig.json
@@ -1,6 +1,7 @@
{
"extends": "../../tsconfig.base.json",
"include": ["src"],
+ "exclude": ["src/runtime/config.ts"],
"compilerOptions": {
"outDir": "./dist"
}
diff --git a/packages/db/virtual.d.ts b/packages/db/virtual.d.ts
index 8538812e201d..b97d2a19f2f5 100644
--- a/packages/db/virtual.d.ts
+++ b/packages/db/virtual.d.ts
@@ -1,9 +1,33 @@
declare module 'astro:db' {
- export const sql: typeof import('./dist/runtime/config.js').sql;
- export const NOW: typeof import('./dist/runtime/config.js').NOW;
- export const TRUE: typeof import('./dist/runtime/config.js').TRUE;
- export const FALSE: typeof import('./dist/runtime/config.js').FALSE;
- export const column: typeof import('./dist/runtime/config.js').column;
- export const defineDb: typeof import('./dist/runtime/config.js').defineDb;
- export const defineTable: typeof import('./dist/runtime/config.js').defineTable;
+ type RuntimeConfig = typeof import('./dist/_internal/runtime/config.js');
+
+ export const sql: RuntimeConfig['sql'];
+ export const NOW: RuntimeConfig['NOW'];
+ export const TRUE: RuntimeConfig['TRUE'];
+ export const FALSE: RuntimeConfig['FALSE'];
+ export const column: RuntimeConfig['column'];
+ export const defineDb: RuntimeConfig['defineDb'];
+ export const defineTable: RuntimeConfig['defineTable'];
+
+ export const eq: RuntimeConfig['eq'];
+ export const gt: RuntimeConfig['gt'];
+ export const gte: RuntimeConfig['gte'];
+ export const lt: RuntimeConfig['lt'];
+ export const lte: RuntimeConfig['lte'];
+ export const ne: RuntimeConfig['ne'];
+ export const isNull: RuntimeConfig['isNull'];
+ export const isNotNull: RuntimeConfig['isNotNull'];
+ export const inArray: RuntimeConfig['inArray'];
+ export const notInArray: RuntimeConfig['notInArray'];
+ export const exists: RuntimeConfig['exists'];
+ export const notExists: RuntimeConfig['notExists'];
+ export const between: RuntimeConfig['between'];
+ export const notBetween: RuntimeConfig['notBetween'];
+ export const like: RuntimeConfig['like'];
+ export const notIlike: RuntimeConfig['notIlike'];
+ export const not: RuntimeConfig['not'];
+ export const asc: RuntimeConfig['asc'];
+ export const desc: RuntimeConfig['desc'];
+ export const and: RuntimeConfig['and'];
+ export const or: RuntimeConfig['or'];
}
diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md
index fcfb941e8976..a3451ebd6bbe 100644
--- a/packages/integrations/markdoc/CHANGELOG.md
+++ b/packages/integrations/markdoc/CHANGELOG.md
@@ -1,5 +1,12 @@
# @astrojs/markdoc
+## 0.9.2
+
+### Patch Changes
+
+- Updated dependencies [[`1ea0a25b94125e4f6f2ac82b42f638e22d7bdffd`](https://github.com/withastro/astro/commit/1ea0a25b94125e4f6f2ac82b42f638e22d7bdffd)]:
+ - @astrojs/internal-helpers@0.3.0
+
## 0.9.1
### Patch Changes
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index 0d0917b58631..2c91ef77ff4d 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/markdoc",
"description": "Add support for Markdoc in your Astro site",
- "version": "0.9.1",
+ "version": "0.9.2",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index f1da065f650f..1a99e487d70c 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -1,5 +1,23 @@
# @astrojs/mdx
+## 2.2.0
+
+### Minor Changes
+
+- [#10104](https://github.com/withastro/astro/pull/10104) [`a31bbd7ff8f3ec62ee507f72d1d25140b82ffc18`](https://github.com/withastro/astro/commit/a31bbd7ff8f3ec62ee507f72d1d25140b82ffc18) Thanks [@remcohaszing](https://github.com/remcohaszing)! - Changes Astro's internal syntax highlighting to use rehype plugins instead of remark plugins. This provides better interoperability with other [rehype plugins](https://github.com/rehypejs/rehype/blob/main/doc/plugins.md#list-of-plugins) that deal with code blocks, in particular with third party syntax highlighting plugins and [`rehype-mermaid`](https://github.com/remcohaszing/rehype-mermaid).
+
+ This may be a breaking change if you are currently using:
+
+ - a remark plugin that relies on nodes of type `html`
+ - a rehype plugin that depends on nodes of type `raw`.
+
+ Please review your rendered code samples carefully, and if necessary, consider using a rehype plugin that deals with the generated `element` nodes instead. You can transform the AST of raw HTML strings, or alternatively use [`hast-util-to-html`](https://github.com/syntax-tree/hast-util-to-html) to get a string from a `raw` node.
+
+### Patch Changes
+
+- Updated dependencies [[`c081adf998d30419fed97d8fccc11340cdc512e0`](https://github.com/withastro/astro/commit/c081adf998d30419fed97d8fccc11340cdc512e0), [`5a9528741fa98d017b269c7e4f013058028bdc5d`](https://github.com/withastro/astro/commit/5a9528741fa98d017b269c7e4f013058028bdc5d), [`a31bbd7ff8f3ec62ee507f72d1d25140b82ffc18`](https://github.com/withastro/astro/commit/a31bbd7ff8f3ec62ee507f72d1d25140b82ffc18)]:
+ - @astrojs/markdown-remark@4.3.0
+
## 2.1.1
### Patch Changes
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index 26491a071fec..0433e6bbcb28 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/mdx",
"description": "Add support for MDX pages in your Astro site",
- "version": "2.1.1",
+ "version": "2.2.0",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
diff --git a/packages/integrations/mdx/test/mdx-plugins.test.js b/packages/integrations/mdx/test/mdx-plugins.test.js
index 1791acc5249e..6b15884fb712 100644
--- a/packages/integrations/mdx/test/mdx-plugins.test.js
+++ b/packages/integrations/mdx/test/mdx-plugins.test.js
@@ -47,7 +47,7 @@ describe('MDX plugins', () => {
const quote = selectSmartypantsQuote(document);
assert.notEqual(quote, null);
- assert.equal(quote.textContent.includes('“Smartypants” is — awesome'), true);
+ assert.equal(quote.textContent.includes('”Smartypants” is — awesome'), true);
});
it('supports custom rehype plugins', async () => {
@@ -174,7 +174,7 @@ describe('MDX plugins', () => {
);
} else {
assert.equal(
- quote.textContent.includes('“Smartypants” is — awesome'),
+ quote.textContent.includes('”Smartypants” is — awesome'),
true,
'Respects `markdown.smartypants` unexpectedly.'
);
diff --git a/packages/integrations/mdx/test/mdx-vite-env-vars.test.js b/packages/integrations/mdx/test/mdx-vite-env-vars.test.js
index 1270fe5e60a5..4e32d12cba81 100644
--- a/packages/integrations/mdx/test/mdx-vite-env-vars.test.js
+++ b/packages/integrations/mdx/test/mdx-vite-env-vars.test.js
@@ -46,7 +46,7 @@ describe('MDX - Vite env vars', () => {
assert.equal(
document
.querySelector('[data-env-variable-exports-unknown]')
- ?.innerHTML.includes('exports: ””'), // NOTE: these double quotes are special unicode quotes emitted in the HTML file
+ ?.innerHTML.includes('exports: ""'),
true
);
});
diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md
index 599ea231dd94..eb1d9f7235ca 100644
--- a/packages/integrations/react/CHANGELOG.md
+++ b/packages/integrations/react/CHANGELOG.md
@@ -1,5 +1,31 @@
# @astrojs/react
+## 3.1.0
+
+### Minor Changes
+
+- [#10136](https://github.com/withastro/astro/pull/10136) [`9cd84bd19b92fb43ae48809f575ee12ebd43ea8f`](https://github.com/withastro/astro/commit/9cd84bd19b92fb43ae48809f575ee12ebd43ea8f) Thanks [@matthewp](https://github.com/matthewp)! - Changes the default behavior of `transition:persist` to update the props of persisted islands upon navigation. Also adds a new view transitions option `transition:persist-props` (default: `false`) to prevent props from updating as needed.
+
+ Islands which have the `transition:persist` property to keep their state when using the `` router will now have their props updated upon navigation. This is useful in cases where the component relies on page-specific props, such as the current page title, which should update upon navigation.
+
+ For example, the component below is set to persist across navigation. This component receives a `products` props and might have some internal state, such as which filters are applied:
+
+ ```astro
+
+ ```
+
+ Upon navigation, this component persists, but the desired `products` might change, for example if you are visiting a category of products, or you are performing a search.
+
+ Previously the props would not change on navigation, and your island would have to handle updating them externally, such as with API calls.
+
+ With this change the props are now updated, while still preserving state.
+
+ You can override this new default behavior on a per-component basis using `transition:persist-props=true` to persist both props and state during navigation:
+
+ ```astro
+
+ ```
+
## 3.0.10
### Patch Changes
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index da59c319773b..6d89ff7f5592 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/react",
"description": "Use React components within Astro",
- "version": "3.0.10",
+ "version": "3.1.0",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 1cace44fad11..8bcca58cb1e2 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,12 @@
# @astrojs/vercel
+## 7.3.6
+
+### Patch Changes
+
+- Updated dependencies [[`1ea0a25b94125e4f6f2ac82b42f638e22d7bdffd`](https://github.com/withastro/astro/commit/1ea0a25b94125e4f6f2ac82b42f638e22d7bdffd)]:
+ - @astrojs/internal-helpers@0.3.0
+
## 7.3.5
### Patch Changes
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 61af57e2c991..f2ab0f818afa 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/vercel",
"description": "Deploy your site to Vercel",
- "version": "7.3.5",
+ "version": "7.3.6",
"type": "module",
"author": "withastro",
"license": "MIT",
diff --git a/packages/internal-helpers/CHANGELOG.md b/packages/internal-helpers/CHANGELOG.md
index 0bcb50284360..8169ed1f84de 100644
--- a/packages/internal-helpers/CHANGELOG.md
+++ b/packages/internal-helpers/CHANGELOG.md
@@ -1,5 +1,31 @@
# @astrojs/internal-helpers
+## 0.3.0
+
+### Minor Changes
+
+- [#10189](https://github.com/withastro/astro/pull/10189) [`1ea0a25b94125e4f6f2ac82b42f638e22d7bdffd`](https://github.com/withastro/astro/commit/1ea0a25b94125e4f6f2ac82b42f638e22d7bdffd) Thanks [@peng](https://github.com/peng)! - Adds the option to pass an object to `build.assetsPrefix`. This allows for the use of multiple CDN prefixes based on the target file type.
+
+ When passing an object to `build.assetsPrefix`, you must also specify a `fallback` domain to be used for all other file types not specified.
+
+ Specify a file extension as the key (e.g. 'js', 'png') and the URL serving your assets of that file type as the value:
+
+ ```js
+ // astro.config.mjs
+ import { defineConfig } from 'astro/config';
+
+ export default defineConfig({
+ build: {
+ assetsPrefix: {
+ js: 'https://js.cdn.example.com',
+ mjs: 'https://js.cdn.example.com', // if you have .mjs files, you must add a new entry like this
+ png: 'https://images.cdn.example.com',
+ fallback: 'https://generic.cdn.example.com',
+ },
+ },
+ });
+ ```
+
## 0.2.1
### Patch Changes
diff --git a/packages/internal-helpers/package.json b/packages/internal-helpers/package.json
index 650665bfe5fc..9d69e0cd9754 100644
--- a/packages/internal-helpers/package.json
+++ b/packages/internal-helpers/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/internal-helpers",
"description": "Internal helpers used by core Astro packages.",
- "version": "0.2.1",
+ "version": "0.3.0",
"type": "module",
"author": "withastro",
"license": "MIT",
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index 550830e081ce..a005bb4abf99 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -1,5 +1,22 @@
# @astrojs/markdown-remark
+## 4.3.0
+
+### Minor Changes
+
+- [#9960](https://github.com/withastro/astro/pull/9960) [`c081adf998d30419fed97d8fccc11340cdc512e0`](https://github.com/withastro/astro/commit/c081adf998d30419fed97d8fccc11340cdc512e0) Thanks [@StandardGage](https://github.com/StandardGage)! - Allows passing any props to the `