}} */
+ let manifest = undefined;
+
+ before(async () => {
+ fixture = await loadFixture({ root: './fixtures/content-intellisense/' });
+ await fixture.build();
+
+ collectionsDir = await fixture.readdir('../.astro/collections');
+ manifest = JSON.parse(await fixture.readFile('../.astro/collections/collections.json'));
+ });
+
+ it('generate JSON schemas for content collections', async () => {
+ assert.deepEqual(collectionsDir.includes('blog-cc.schema.json'), true);
+ });
+
+ it('generate JSON schemas for content layer', async () => {
+ assert.deepEqual(collectionsDir.includes('blog-cl.schema.json'), true);
+ });
+
+ it('manifest exists', async () => {
+ assert.notEqual(manifest, undefined);
+ });
+
+ it('manifest has content collections', async () => {
+ const manifestCollections = manifest.collections.map((collection) => collection.name);
+ assert.equal(
+ manifestCollections.includes('blog-cc'),
+ true,
+ "Expected 'blog-cc' collection in manifest",
+ );
+ });
+
+ it('manifest has content layer', async () => {
+ const manifestCollections = manifest.collections.map((collection) => collection.name);
+ assert.equal(
+ manifestCollections.includes('blog-cl'),
+ true,
+ "Expected 'blog-cl' collection in manifest",
+ );
+ });
+
+ it('has entries for content collections', async () => {
+ const collectionEntries = Object.entries(manifest.entries).filter((entry) =>
+ entry[0].includes(
+ '/astro/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/',
+ ),
+ );
+ assert.equal(collectionEntries.length, 3, "Expected 3 entries for 'blog-cc' collection");
+ assert.equal(
+ collectionEntries.every((entry) => entry[1] === 'blog-cc'),
+ true,
+ "Expected 3 entries for 'blog-cc' collection to have 'blog-cc' as collection",
+ );
+ });
+
+ it('has entries for content layer', async () => {
+ const collectionEntries = Object.entries(manifest.entries).filter((entry) =>
+ entry[0].includes('/astro/packages/astro/test/fixtures/content-intellisense/src/blog-cl/'),
+ );
+
+ assert.equal(collectionEntries.length, 3, "Expected 3 entries for 'blog-cl' collection");
+ assert.equal(
+ collectionEntries.every((entry) => entry[1] === 'blog-cl'),
+ true,
+ "Expected 3 entries for 'blog-cl' collection to have 'blog-cl' as collection name",
+ );
+ });
+});
diff --git a/packages/astro/test/content-layer-markdoc.test.js b/packages/astro/test/content-layer-markdoc.test.js
new file mode 100644
index 000000000000..c5279b9e7522
--- /dev/null
+++ b/packages/astro/test/content-layer-markdoc.test.js
@@ -0,0 +1,88 @@
+import assert from 'node:assert/strict';
+import { after, before, describe, it } from 'node:test';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('Content layer markdoc', () => {
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/content-layer-markdoc/',
+ });
+ });
+
+ describe('dev', () => {
+ let devServer;
+
+ before(async () => {
+ devServer = await fixture.startDevServer();
+ });
+
+ after(async () => {
+ await devServer.stop();
+ });
+
+ it('renders content - with components', async () => {
+ const res = await fixture.fetch('/');
+ const html = await res.text();
+
+ renderComponentsChecks(html);
+ });
+
+ it('renders content - with components inside partials', async () => {
+ const res = await fixture.fetch('/');
+ const html = await res.text();
+
+ renderComponentsInsidePartialsChecks(html);
+ });
+ });
+
+ describe('build', () => {
+ before(async () => {
+ await fixture.build();
+ });
+
+ it('renders content - with components', async () => {
+ const html = await fixture.readFile('/index.html');
+
+ renderComponentsChecks(html);
+ });
+
+ it('renders content - with components inside partials', async () => {
+ const html = await fixture.readFile('/index.html');
+
+ renderComponentsInsidePartialsChecks(html);
+ });
+ });
+});
+
+/** @param {string} html */
+function renderComponentsChecks(html) {
+ const $ = cheerio.load(html);
+ const h2 = $('h2');
+ assert.equal(h2.text(), 'Post with components');
+
+ // Renders custom shortcode component
+ const marquee = $('marquee');
+ assert.notEqual(marquee, null);
+ assert.equal(marquee.attr('data-custom-marquee'), '');
+
+ // Renders Astro Code component
+ const pre = $('pre');
+ assert.notEqual(pre, null);
+ assert.ok(pre.hasClass('github-dark'));
+ assert.ok(pre.hasClass('astro-code'));
+}
+
+/** @param {string} html */
+function renderComponentsInsidePartialsChecks(html) {
+ const $ = cheerio.load(html);
+ // renders Counter.tsx
+ const button = $('#counter');
+ assert.equal(button.text(), '1');
+
+ // renders DeeplyNested.astro
+ const deeplyNested = $('#deeply-nested');
+ assert.equal(deeplyNested.text(), 'Deeply nested partial');
+}
diff --git a/packages/astro/test/content-layer-render.test.js b/packages/astro/test/content-layer-render.test.js
new file mode 100644
index 000000000000..fa743e719ca4
--- /dev/null
+++ b/packages/astro/test/content-layer-render.test.js
@@ -0,0 +1,45 @@
+import assert from 'node:assert/strict';
+import { after, before, describe, it } from 'node:test';
+import { loadFixture } from './test-utils.js';
+
+describe('Content Layer MDX rendering dev', () => {
+ /** @type {import("./test-utils.js").Fixture} */
+ let fixture;
+
+ let devServer;
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/content-layer-rendering/',
+ });
+ devServer = await fixture.startDevServer();
+ });
+
+ after(async () => {
+ devServer?.stop();
+ });
+
+ it('Render an MDX file', async () => {
+ const html = await fixture.fetch('/reptiles/iguana').then((r) => r.text());
+
+ assert.match(html, /Iguana/);
+ assert.match(html, /This is a rendered entry/);
+ });
+});
+
+describe('Content Layer MDX rendering build', () => {
+ /** @type {import("./test-utils.js").Fixture} */
+ let fixture;
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/content-layer-rendering/',
+ });
+ await fixture.build();
+ });
+
+ it('Render an MDX file', async () => {
+ const html = await fixture.readFile('/reptiles/iguana/index.html');
+
+ assert.match(html, /Iguana/);
+ assert.match(html, /This is a rendered entry/);
+ });
+});
diff --git a/packages/astro/test/content-layer.test.js b/packages/astro/test/content-layer.test.js
new file mode 100644
index 000000000000..41c05206bad2
--- /dev/null
+++ b/packages/astro/test/content-layer.test.js
@@ -0,0 +1,279 @@
+import assert from 'node:assert/strict';
+import { promises as fs } from 'node:fs';
+import { sep } from 'node:path';
+import { sep as posixSep } from 'node:path/posix';
+import { after, before, describe, it } from 'node:test';
+import * as devalue from 'devalue';
+
+import { loadFixture } from './test-utils.js';
+describe('Content Layer', () => {
+ /** @type {import("./test-utils.js").Fixture} */
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({ root: './fixtures/content-layer/' });
+ });
+
+ describe('Build', () => {
+ let json;
+ before(async () => {
+ fixture = await loadFixture({ root: './fixtures/content-layer/' });
+ await fs
+ .unlink(new URL('./node_modules/.astro/data-store.json', fixture.config.root))
+ .catch(() => {});
+ await fixture.build();
+ const rawJson = await fixture.readFile('/collections.json');
+ json = devalue.parse(rawJson);
+ });
+
+ it('Returns custom loader collection', async () => {
+ assert.ok(json.hasOwnProperty('customLoader'));
+ assert.ok(Array.isArray(json.customLoader));
+
+ const item = json.customLoader[0];
+ assert.deepEqual(item, {
+ id: '1',
+ collection: 'blog',
+ data: {
+ userId: 1,
+ id: 1,
+ title: 'sunt aut facere repellat provident occaecati excepturi optio reprehenderit',
+ body: 'quia et suscipit\nsuscipit recusandae consequuntur expedita et cum\nreprehenderit molestiae ut ut quas totam\nnostrum rerum est autem sunt rem eveniet architecto',
+ },
+ });
+ });
+
+ it('filters collection items', async () => {
+ assert.ok(json.hasOwnProperty('customLoader'));
+ assert.ok(Array.isArray(json.customLoader));
+ assert.equal(json.customLoader.length, 5);
+ });
+
+ it('Returns `file()` loader collection', async () => {
+ assert.ok(json.hasOwnProperty('fileLoader'));
+ assert.ok(Array.isArray(json.fileLoader));
+
+ const ids = json.fileLoader.map((item) => item.data.id);
+ assert.deepEqual(ids, [
+ 'labrador-retriever',
+ 'german-shepherd',
+ 'golden-retriever',
+ 'french-bulldog',
+ 'bulldog',
+ 'beagle',
+ 'poodle',
+ 'rottweiler',
+ 'german-shorthaired-pointer',
+ 'yorkshire-terrier',
+ 'boxer',
+ 'dachshund',
+ 'siberian-husky',
+ 'great-dane',
+ 'doberman-pinscher',
+ 'australian-shepherd',
+ 'miniature-schnauzer',
+ 'cavalier-king-charles-spaniel',
+ 'shih-tzu',
+ 'boston-terrier',
+ 'bernese-mountain-dog',
+ 'pomeranian',
+ 'havanese',
+ 'english-springer-spaniel',
+ 'shetland-sheepdog',
+ ]);
+ });
+
+ it('Returns data entry by id', async () => {
+ assert.ok(json.hasOwnProperty('dataEntry'));
+ assert.equal(json.dataEntry.filePath?.split(sep).join(posixSep), 'src/data/dogs.json');
+ delete json.dataEntry.filePath;
+ assert.deepEqual(json.dataEntry, {
+ id: 'beagle',
+ collection: 'dogs',
+ data: {
+ breed: 'Beagle',
+ id: 'beagle',
+ size: 'Small to Medium',
+ origin: 'England',
+ lifespan: '12-15 years',
+ temperament: ['Friendly', 'Curious', 'Merry'],
+ },
+ });
+ });
+
+ it('returns collection from a simple loader', async () => {
+ assert.ok(json.hasOwnProperty('simpleLoader'));
+ assert.ok(Array.isArray(json.simpleLoader));
+
+ const item = json.simpleLoader[0];
+ assert.deepEqual(item, {
+ id: 'siamese',
+ collection: 'cats',
+ data: {
+ breed: 'Siamese',
+ id: 'siamese',
+ size: 'Medium',
+ origin: 'Thailand',
+ lifespan: '15 years',
+ temperament: ['Active', 'Affectionate', 'Social', 'Playful'],
+ },
+ });
+ });
+
+ it('transforms a reference id to a reference object', async () => {
+ assert.ok(json.hasOwnProperty('entryWithReference'));
+ assert.deepEqual(json.entryWithReference.data.cat, { collection: 'cats', id: 'tabby' });
+ });
+
+ it('can store Date objects', async () => {
+ assert.ok(json.entryWithReference.data.publishedDate instanceof Date);
+ });
+
+ it('returns a referenced entry', async () => {
+ assert.ok(json.hasOwnProperty('referencedEntry'));
+ assert.deepEqual(json.referencedEntry, {
+ collection: 'cats',
+ data: {
+ breed: 'Tabby',
+ id: 'tabby',
+ size: 'Medium',
+ origin: 'Egypt',
+ lifespan: '15 years',
+ temperament: ['Curious', 'Playful', 'Independent'],
+ },
+ id: 'tabby',
+ });
+ });
+
+ it('updates the store on new builds', async () => {
+ assert.equal(json.increment.data.lastValue, 1);
+ await fixture.build();
+ const newJson = devalue.parse(await fixture.readFile('/collections.json'));
+ assert.equal(newJson.increment.data.lastValue, 2);
+ });
+
+ it('clears the store on new build with force flag', async () => {
+ let newJson = devalue.parse(await fixture.readFile('/collections.json'));
+ assert.equal(newJson.increment.data.lastValue, 2);
+ await fixture.build({ force: true }, {});
+ newJson = devalue.parse(await fixture.readFile('/collections.json'));
+ assert.equal(newJson.increment.data.lastValue, 1);
+ });
+
+ it('clears the store on new build if the config has changed', async () => {
+ let newJson = devalue.parse(await fixture.readFile('/collections.json'));
+ assert.equal(newJson.increment.data.lastValue, 1);
+ await fixture.editFile('src/content/config.ts', (prev) => {
+ return `${prev}\nexport const foo = 'bar';`;
+ });
+ await fixture.build();
+ newJson = devalue.parse(await fixture.readFile('/collections.json'));
+ assert.equal(newJson.increment.data.lastValue, 1);
+ await fixture.resetAllFiles();
+ });
+ });
+
+ describe('Dev', () => {
+ let devServer;
+ let json;
+ before(async () => {
+ devServer = await fixture.startDevServer();
+ const rawJsonResponse = await fixture.fetch('/collections.json');
+ const rawJson = await rawJsonResponse.text();
+ json = devalue.parse(rawJson);
+ });
+
+ after(async () => {
+ devServer?.stop();
+ });
+
+ it('Returns custom loader collection', async () => {
+ assert.ok(json.hasOwnProperty('customLoader'));
+ assert.ok(Array.isArray(json.customLoader));
+
+ const item = json.customLoader[0];
+ assert.deepEqual(item, {
+ id: '1',
+ collection: 'blog',
+ data: {
+ userId: 1,
+ id: 1,
+ title: 'sunt aut facere repellat provident occaecati excepturi optio reprehenderit',
+ body: 'quia et suscipit\nsuscipit recusandae consequuntur expedita et cum\nreprehenderit molestiae ut ut quas totam\nnostrum rerum est autem sunt rem eveniet architecto',
+ },
+ });
+ });
+
+ it('Returns `file()` loader collection', async () => {
+ assert.ok(json.hasOwnProperty('fileLoader'));
+ assert.ok(Array.isArray(json.fileLoader));
+
+ const ids = json.fileLoader.map((item) => item.data.id);
+ assert.deepEqual(ids, [
+ 'labrador-retriever',
+ 'german-shepherd',
+ 'golden-retriever',
+ 'french-bulldog',
+ 'bulldog',
+ 'beagle',
+ 'poodle',
+ 'rottweiler',
+ 'german-shorthaired-pointer',
+ 'yorkshire-terrier',
+ 'boxer',
+ 'dachshund',
+ 'siberian-husky',
+ 'great-dane',
+ 'doberman-pinscher',
+ 'australian-shepherd',
+ 'miniature-schnauzer',
+ 'cavalier-king-charles-spaniel',
+ 'shih-tzu',
+ 'boston-terrier',
+ 'bernese-mountain-dog',
+ 'pomeranian',
+ 'havanese',
+ 'english-springer-spaniel',
+ 'shetland-sheepdog',
+ ]);
+ });
+
+ it('Returns data entry by id', async () => {
+ assert.ok(json.hasOwnProperty('dataEntry'));
+ assert.equal(json.dataEntry.filePath?.split(sep).join(posixSep), 'src/data/dogs.json');
+ delete json.dataEntry.filePath;
+ assert.deepEqual(json.dataEntry, {
+ id: 'beagle',
+ collection: 'dogs',
+ data: {
+ breed: 'Beagle',
+ id: 'beagle',
+ size: 'Small to Medium',
+ origin: 'England',
+ lifespan: '12-15 years',
+ temperament: ['Friendly', 'Curious', 'Merry'],
+ },
+ });
+ });
+
+ it('updates collection when data file is changed', async () => {
+ const rawJsonResponse = await fixture.fetch('/collections.json');
+ const initialJson = devalue.parse(await rawJsonResponse.text());
+ assert.equal(initialJson.fileLoader[0].data.temperament.includes('Bouncy'), false);
+
+ await fixture.editFile('/src/data/dogs.json', (prev) => {
+ const data = JSON.parse(prev);
+ data[0].temperament.push('Bouncy');
+ return JSON.stringify(data, null, 2);
+ });
+
+ // Writes are debounced to 500ms
+ await new Promise((r) => setTimeout(r, 700));
+
+ const updatedJsonResponse = await fixture.fetch('/collections.json');
+ const updated = devalue.parse(await updatedJsonResponse.text());
+ assert.ok(updated.fileLoader[0].data.temperament.includes('Bouncy'));
+ await fixture.resetAllFiles();
+ });
+ });
+});
diff --git a/packages/astro/test/fixtures/content-collections/astro.config.mjs b/packages/astro/test/fixtures/content-collections/astro.config.mjs
index aa89463ab72b..911cb3a99881 100644
--- a/packages/astro/test/fixtures/content-collections/astro.config.mjs
+++ b/packages/astro/test/fixtures/content-collections/astro.config.mjs
@@ -4,4 +4,7 @@ import { defineConfig } from 'astro/config';
// https://astro.build/config
export default defineConfig({
integrations: [mdx()],
+ experimental: {
+ contentIntellisense: true
+ }
});
diff --git a/packages/astro/test/fixtures/content-intellisense/astro.config.mjs b/packages/astro/test/fixtures/content-intellisense/astro.config.mjs
new file mode 100644
index 000000000000..f6358a896fab
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/astro.config.mjs
@@ -0,0 +1,12 @@
+import markdoc from "@astrojs/markdoc";
+import mdx from '@astrojs/mdx';
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({
+ integrations: [mdx(), markdoc()],
+ experimental: {
+ contentLayer: true,
+ contentIntellisense: true
+ }
+});
diff --git a/packages/astro/test/fixtures/content-intellisense/package.json b/packages/astro/test/fixtures/content-intellisense/package.json
new file mode 100644
index 000000000000..1e22bf9946f6
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "@test/content-intellisense",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "astro": "workspace:*",
+ "@astrojs/mdx": "workspace:*",
+ "@astrojs/markdoc": "workspace:*"
+ }
+}
diff --git a/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry.md b/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry.md
new file mode 100644
index 000000000000..caaa4ebeff82
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry.md
@@ -0,0 +1,3 @@
+---
+title: "Markdown"
+---
diff --git a/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry2.mdx b/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry2.mdx
new file mode 100644
index 000000000000..0872819c8cf1
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry2.mdx
@@ -0,0 +1,3 @@
+---
+title: "MDX"
+---
diff --git a/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry3.mdoc b/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry3.mdoc
new file mode 100644
index 000000000000..e13eaa2f6ac8
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/blog-cl/entry3.mdoc
@@ -0,0 +1,3 @@
+---
+title: "Markdoc"
+---
diff --git a/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry.md b/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry.md
new file mode 100644
index 000000000000..caaa4ebeff82
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry.md
@@ -0,0 +1,3 @@
+---
+title: "Markdown"
+---
diff --git a/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry2.mdx b/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry2.mdx
new file mode 100644
index 000000000000..0872819c8cf1
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry2.mdx
@@ -0,0 +1,3 @@
+---
+title: "MDX"
+---
diff --git a/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry3.mdoc b/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry3.mdoc
new file mode 100644
index 000000000000..e13eaa2f6ac8
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/content/blog-cc/entry3.mdoc
@@ -0,0 +1,3 @@
+---
+title: "Markdoc"
+---
diff --git a/packages/astro/test/fixtures/content-intellisense/src/content/config.ts b/packages/astro/test/fixtures/content-intellisense/src/content/config.ts
new file mode 100644
index 000000000000..64120adabe20
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/content/config.ts
@@ -0,0 +1,24 @@
+import { glob } from 'astro/loaders';
+import { defineCollection, z } from 'astro:content';
+
+const blogCC = defineCollection({
+ type: 'content',
+ schema: z.object({
+ title: z.string(),
+ description: z.string().optional(),
+ }),
+});
+
+const blogCL = defineCollection({
+ // By default the ID is a slug, generated from the path of the file relative to `base`
+ loader: glob({ pattern: "**/*", base: "./src/blog-cl" }),
+ schema: z.object({
+ title: z.string(),
+ description: z.string().optional(),
+ }),
+});
+
+export const collections = {
+ "blog-cc": blogCC,
+ "blog-cl": blogCL,
+};
diff --git a/packages/astro/test/fixtures/content-intellisense/src/utils.js b/packages/astro/test/fixtures/content-intellisense/src/utils.js
new file mode 100644
index 000000000000..3a6244327862
--- /dev/null
+++ b/packages/astro/test/fixtures/content-intellisense/src/utils.js
@@ -0,0 +1,8 @@
+export function stripRenderFn(entryWithRender) {
+ const { render, ...entry } = entryWithRender;
+ return entry;
+}
+
+export function stripAllRenderFn(collection = []) {
+ return collection.map(stripRenderFn);
+}
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/astro.config.mjs b/packages/astro/test/fixtures/content-layer-markdoc/astro.config.mjs
new file mode 100644
index 000000000000..bbb19ad302db
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/astro.config.mjs
@@ -0,0 +1,9 @@
+import markdoc from '@astrojs/markdoc';
+import preact from '@astrojs/preact';
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({
+ integrations: [markdoc(), preact()],
+ experimental: { contentLayer: true }
+});
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/content/_nested.mdoc b/packages/astro/test/fixtures/content-layer-markdoc/content/_nested.mdoc
new file mode 100644
index 000000000000..68f529280124
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/content/_nested.mdoc
@@ -0,0 +1,3 @@
+Render components from a deeply nested partial:
+
+{% deeply-nested /%}
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/content/blog/_counter.mdoc b/packages/astro/test/fixtures/content-layer-markdoc/content/blog/_counter.mdoc
new file mode 100644
index 000000000000..4a015695c68e
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/content/blog/_counter.mdoc
@@ -0,0 +1,7 @@
+# Hello from a partial!
+
+Render a component from a partial:
+
+{% counter /%}
+
+{% partial file="../_nested.mdoc" /%}
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/content/blog/with-components.mdoc b/packages/astro/test/fixtures/content-layer-markdoc/content/blog/with-components.mdoc
new file mode 100644
index 000000000000..eb7d20426e59
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/content/blog/with-components.mdoc
@@ -0,0 +1,19 @@
+---
+title: Post with components
+---
+
+## Post with components
+
+This uses a custom marquee component with a shortcode:
+
+{% marquee-element direction="right" %}
+I'm a marquee too!
+{% /marquee-element %}
+
+{% partial file="_counter.mdoc" /%}
+
+And a code component for code blocks:
+
+```js
+const isRenderedWithShiki = true;
+```
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/markdoc.config.ts b/packages/astro/test/fixtures/content-layer-markdoc/markdoc.config.ts
new file mode 100644
index 000000000000..6093ec5938a5
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/markdoc.config.ts
@@ -0,0 +1,32 @@
+import { Markdoc, component, defineMarkdocConfig } from '@astrojs/markdoc/config';
+
+export default defineMarkdocConfig({
+ nodes: {
+ fence: {
+ render: component('./src/components/Code.astro'),
+ attributes: {
+ language: { type: String },
+ content: { type: String },
+ },
+ },
+ },
+ tags: {
+ 'marquee-element': {
+ render: component('./src/components/CustomMarquee.astro'),
+ attributes: {
+ direction: {
+ type: String,
+ default: 'left',
+ matches: ['left', 'right', 'up', 'down'],
+ errorLevel: 'critical',
+ },
+ },
+ },
+ counter: {
+ render: component('./src/components/CounterWrapper.astro'),
+ },
+ 'deeply-nested': {
+ render: component('./src/components/DeeplyNested.astro'),
+ },
+ },
+});
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/package.json b/packages/astro/test/fixtures/content-layer-markdoc/package.json
new file mode 100644
index 000000000000..91ca2f8c9c00
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/package.json
@@ -0,0 +1,11 @@
+{
+ "name": "@test/content-layer-markdoc",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "@astrojs/markdoc": "workspace:*",
+ "@astrojs/preact": "workspace:*",
+ "astro": "workspace:*",
+ "preact": "^10.23.1"
+ }
+}
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/src/components/Code.astro b/packages/astro/test/fixtures/content-layer-markdoc/src/components/Code.astro
new file mode 100644
index 000000000000..18bf1399f22e
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/src/components/Code.astro
@@ -0,0 +1,12 @@
+---
+import { Code } from 'astro/components';
+
+type Props = {
+ content: string;
+ language: string;
+}
+
+const { content, language } = Astro.props as Props;
+---
+
+ setCount(count + 1)}>
+ {count}
+
+ );
+}
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/src/components/CounterWrapper.astro b/packages/astro/test/fixtures/content-layer-markdoc/src/components/CounterWrapper.astro
new file mode 100644
index 000000000000..e45ac6438152
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/src/components/CounterWrapper.astro
@@ -0,0 +1,5 @@
+---
+import Counter from './Counter';
+---
+
+Deeply nested partial
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/src/content/config.ts b/packages/astro/test/fixtures/content-layer-markdoc/src/content/config.ts
new file mode 100644
index 000000000000..18ead9aa161f
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/src/content/config.ts
@@ -0,0 +1,11 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+ loader: glob({
+ pattern: '*.mdoc',
+ base: 'content/blog',
+ }),
+});
+
+export const collections = { blog };
diff --git a/packages/astro/test/fixtures/content-layer-markdoc/src/pages/index.astro b/packages/astro/test/fixtures/content-layer-markdoc/src/pages/index.astro
new file mode 100644
index 000000000000..5c7747eef923
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-markdoc/src/pages/index.astro
@@ -0,0 +1,19 @@
+---
+import { getEntry, render } from "astro:content";
+
+const post = await getEntry('blog', 'with-components');
+const { Content } = await render(post);
+---
+
+
+
+
+ Content
+
+
+ Iguana
+
+### Iguana
+
+This is a rendered entry
+
+
diff --git a/packages/astro/test/fixtures/content-layer-rendering/content-outside-src-mdx/shuttle.jpg b/packages/astro/test/fixtures/content-layer-rendering/content-outside-src-mdx/shuttle.jpg
new file mode 100644
index 000000000000..80b8ea67b8e4
Binary files /dev/null and b/packages/astro/test/fixtures/content-layer-rendering/content-outside-src-mdx/shuttle.jpg differ
diff --git a/packages/astro/test/fixtures/content-layer-rendering/images/atlantis.avif b/packages/astro/test/fixtures/content-layer-rendering/images/atlantis.avif
new file mode 100644
index 000000000000..6b9f6d5a5913
Binary files /dev/null and b/packages/astro/test/fixtures/content-layer-rendering/images/atlantis.avif differ
diff --git a/packages/astro/test/fixtures/content-layer-rendering/images/launch.webp b/packages/astro/test/fixtures/content-layer-rendering/images/launch.webp
new file mode 100644
index 000000000000..144ded978ad2
Binary files /dev/null and b/packages/astro/test/fixtures/content-layer-rendering/images/launch.webp differ
diff --git a/packages/astro/test/fixtures/content-layer-rendering/images/shuttle.jpg b/packages/astro/test/fixtures/content-layer-rendering/images/shuttle.jpg
new file mode 100644
index 000000000000..80b8ea67b8e4
Binary files /dev/null and b/packages/astro/test/fixtures/content-layer-rendering/images/shuttle.jpg differ
diff --git a/packages/astro/test/fixtures/content-layer-rendering/package.json b/packages/astro/test/fixtures/content-layer-rendering/package.json
new file mode 100644
index 000000000000..6679b8d6ecfb
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-rendering/package.json
@@ -0,0 +1,9 @@
+{
+ "name": "@test/content-layer-rendering",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "astro": "workspace:*",
+ "@astrojs/mdx": "workspace:*"
+ }
+}
diff --git a/packages/astro/test/fixtures/content-layer-rendering/src/components/H2.astro b/packages/astro/test/fixtures/content-layer-rendering/src/components/H2.astro
new file mode 100644
index 000000000000..d1ad359c2ee1
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-rendering/src/components/H2.astro
@@ -0,0 +1,4 @@
+---
+---
+
+With Layout Prop
+
+
+ {title}
+ H3 inserted in the layout
+
+
+
+ Hoisted script didn't update me :(
+
+Inline script didn't update me :(
+
+
+
+
diff --git a/packages/astro/test/fixtures/content-layer-rendering/src/content/config.ts b/packages/astro/test/fixtures/content-layer-rendering/src/content/config.ts
new file mode 100644
index 000000000000..eb175fa99bd8
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-rendering/src/content/config.ts
@@ -0,0 +1,18 @@
+import { defineCollection, z, reference } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const reptiles = defineCollection({
+ loader: glob({
+ pattern: '*.mdx',
+ base: new URL('../../content-outside-src-mdx', import.meta.url),
+ }),
+ schema: () =>
+ z.object({
+ title: z.string(),
+ description: z.string(),
+ publishedDate: z.coerce.date(),
+ tags: z.array(z.string()),
+ }),
+});
+
+export const collections = { reptiles };
diff --git a/packages/astro/test/fixtures/content-layer-rendering/src/pages/reptiles/[slug].astro b/packages/astro/test/fixtures/content-layer-rendering/src/pages/reptiles/[slug].astro
new file mode 100644
index 000000000000..526805e09947
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer-rendering/src/pages/reptiles/[slug].astro
@@ -0,0 +1,25 @@
+---
+import type { GetStaticPaths } from "astro";
+import { getCollection, render } from "astro:content"
+import { Image } from "astro:assets"
+
+export const getStaticPaths = (async () => {
+ const collection = await getCollection("reptiles");
+ if(!collection) return []
+ return collection.map((reptile) => ({
+ params: {
+ slug: `${reptile.id}`
+ },
+ props: {
+ reptile
+ }
+ }));
+}) satisfies GetStaticPaths;
+
+const { reptile } = Astro.props as any
+const { Content } = await render(reptile)
+
+---
+{reptile.data.title}
+With Layout Prop
+
+
+ {title}
+ H3 inserted in the layout
+
+
+
+ Hoisted script didn't update me :(
+
+Inline script didn't update me :(
+
+
+
+
diff --git a/packages/astro/test/fixtures/content-layer/src/content/config.ts b/packages/astro/test/fixtures/content-layer/src/content/config.ts
new file mode 100644
index 000000000000..1689a56b1c28
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/content/config.ts
@@ -0,0 +1,111 @@
+import { defineCollection, z, reference } from 'astro:content';
+import { file, glob } from 'astro/loaders';
+import { loader } from '../loaders/post-loader.js';
+
+const blog = defineCollection({
+ loader: loader({ url: 'https://jsonplaceholder.typicode.com/posts' }),
+});
+
+const dogs = defineCollection({
+ loader: file('src/data/dogs.json'),
+ schema: z.object({
+ breed: z.string(),
+ id: z.string(),
+ size: z.string(),
+ origin: z.string(),
+ lifespan: z.string(),
+ temperament: z.array(z.string()),
+ }),
+});
+
+const cats = defineCollection({
+ loader: async function () {
+ return [
+ {
+ breed: 'Siamese',
+ id: 'siamese',
+ size: 'Medium',
+ origin: 'Thailand',
+ lifespan: '15 years',
+ temperament: ['Active', 'Affectionate', 'Social', 'Playful'],
+ },
+ {
+ breed: 'Persian',
+ id: 'persian',
+ size: 'Medium',
+ origin: 'Iran',
+ lifespan: '15 years',
+ temperament: ['Calm', 'Affectionate', 'Social'],
+ },
+ {
+ breed: 'Tabby',
+ id: 'tabby',
+ size: 'Medium',
+ origin: 'Egypt',
+ lifespan: '15 years',
+ temperament: ['Curious', 'Playful', 'Independent'],
+ },
+ {
+ breed: 'Ragdoll',
+ id: 'ragdoll',
+ size: 'Medium',
+ origin: 'United States',
+ lifespan: '15 years',
+ temperament: ['Calm', 'Affectionate', 'Social'],
+ },
+ ];
+ },
+ schema: z.object({
+ breed: z.string(),
+ id: z.string(),
+ size: z.string(),
+ origin: z.string(),
+ lifespan: z.string(),
+ temperament: z.array(z.string()),
+ }),
+});
+
+// Absolute paths should also work
+const absoluteRoot = new URL('../../content-outside-src', import.meta.url);
+
+const spacecraft = defineCollection({
+ loader: glob({ pattern: '*.md', base: absoluteRoot }),
+ schema: ({ image }) =>
+ z.object({
+ title: z.string(),
+ description: z.string(),
+ publishedDate: z.coerce.date(),
+ tags: z.array(z.string()),
+ heroImage: image().optional(),
+ cat: reference('cats').optional(),
+ }),
+});
+
+const numbers = defineCollection({
+ loader: glob({ pattern: 'src/data/glob-data/*', base: '.' }),
+});
+
+const increment = defineCollection({
+ loader: {
+ name: 'increment-loader',
+ load: async ({ store }) => {
+ const entry = store.get<{lastValue: number}>('value');
+ const lastValue = entry?.data.lastValue ?? 0;
+ store.set({
+ id: 'value',
+ data: {
+ lastValue: lastValue + 1,
+ lastUpdated: new Date(),
+ },
+ });
+ },
+ // Example of a loader that returns an async schema function
+ schema: async () => z.object({
+ lastValue: z.number(),
+ lastUpdated: z.date(),
+ }),
+ },
+
+});
+
+export const collections = { blog, dogs, cats, numbers, spacecraft, increment };
diff --git a/packages/astro/test/fixtures/content-layer/src/data/dogs.json b/packages/astro/test/fixtures/content-layer/src/data/dogs.json
new file mode 100644
index 000000000000..66e6320c65e1
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/data/dogs.json
@@ -0,0 +1,302 @@
+[
+ {
+ "breed": "Labrador Retriever",
+ "id": "labrador-retriever",
+ "size": "Large",
+ "origin": "Canada",
+ "lifespan": "10-12 years",
+ "temperament": [
+ "Friendly",
+ "Active",
+ "Outgoing"
+ ]
+ },
+ {
+ "breed": "German Shepherd",
+ "id": "german-shepherd",
+ "size": "Large",
+ "origin": "Germany",
+ "lifespan": "9-13 years",
+ "temperament": [
+ "Loyal",
+ "Intelligent",
+ "Confident"
+ ]
+ },
+ {
+ "breed": "Golden Retriever",
+ "id": "golden-retriever",
+ "size": "Large",
+ "origin": "Scotland",
+ "lifespan": "10-12 years",
+ "temperament": [
+ "Intelligent",
+ "Friendly",
+ "Devoted"
+ ]
+ },
+ {
+ "breed": "French Bulldog",
+ "id": "french-bulldog",
+ "size": "Small",
+ "origin": "France",
+ "lifespan": "10-12 years",
+ "temperament": [
+ "Playful",
+ "Adaptable",
+ "Sociable"
+ ]
+ },
+ {
+ "breed": "Bulldog",
+ "id": "bulldog",
+ "size": "Medium",
+ "origin": "England",
+ "lifespan": "8-10 years",
+ "temperament": [
+ "Docile",
+ "Willful",
+ "Friendly"
+ ]
+ },
+ {
+ "breed": "Beagle",
+ "id": "beagle",
+ "size": "Small to Medium",
+ "origin": "England",
+ "lifespan": "12-15 years",
+ "temperament": [
+ "Friendly",
+ "Curious",
+ "Merry"
+ ]
+ },
+ {
+ "breed": "Poodle",
+ "id": "poodle",
+ "size": "Toy, Miniature, or Standard",
+ "origin": "Germany",
+ "lifespan": "12-15 years",
+ "temperament": [
+ "Intelligent",
+ "Active",
+ "Alert"
+ ]
+ },
+ {
+ "breed": "Rottweiler",
+ "id": "rottweiler",
+ "size": "Large",
+ "origin": "Germany",
+ "lifespan": "8-10 years",
+ "temperament": [
+ "Loyal",
+ "Confident",
+ "Courageous"
+ ]
+ },
+ {
+ "breed": "German Shorthaired Pointer",
+ "id": "german-shorthaired-pointer",
+ "size": "Medium to Large",
+ "origin": "Germany",
+ "lifespan": "10-12 years",
+ "temperament": [
+ "Friendly",
+ "Intelligent",
+ "Willing to Please"
+ ]
+ },
+ {
+ "breed": "Yorkshire Terrier",
+ "id": "yorkshire-terrier",
+ "size": "Toy",
+ "origin": "England",
+ "lifespan": "13-16 years",
+ "temperament": [
+ "Affectionate",
+ "Sprightly",
+ "Tomboyish"
+ ]
+ },
+ {
+ "breed": "Boxer",
+ "id": "boxer",
+ "size": "Medium to Large",
+ "origin": "Germany",
+ "lifespan": "10-12 years",
+ "temperament": [
+ "Playful",
+ "Energetic",
+ "Loyal"
+ ]
+ },
+ {
+ "breed": "Dachshund",
+ "id": "dachshund",
+ "size": "Small",
+ "origin": "Germany",
+ "lifespan": "12-16 years",
+ "temperament": [
+ "Clever",
+ "Stubborn",
+ "Devoted"
+ ]
+ },
+ {
+ "breed": "Siberian Husky",
+ "id": "siberian-husky",
+ "size": "Medium",
+ "origin": "Siberia",
+ "lifespan": "12-14 years",
+ "temperament": [
+ "Outgoing",
+ "Mischievous",
+ "Loyal"
+ ]
+ },
+ {
+ "breed": "Great Dane",
+ "id": "great-dane",
+ "size": "Large",
+ "origin": "Germany",
+ "lifespan": "7-10 years",
+ "temperament": [
+ "Friendly",
+ "Patient",
+ "Dependable"
+ ]
+ },
+ {
+ "breed": "Doberman Pinscher",
+ "id": "doberman-pinscher",
+ "size": "Large",
+ "origin": "Germany",
+ "lifespan": "10-12 years",
+ "temperament": [
+ "Loyal",
+ "Fearless",
+ "Alert"
+ ]
+ },
+ {
+ "breed": "Australian Shepherd",
+ "id": "australian-shepherd",
+ "size": "Medium",
+ "origin": "United States",
+ "lifespan": "12-15 years",
+ "temperament": [
+ "Intelligent",
+ "Work-oriented",
+ "Exuberant"
+ ]
+ },
+ {
+ "breed": "Miniature Schnauzer",
+ "id": "miniature-schnauzer",
+ "size": "Small",
+ "origin": "Germany",
+ "lifespan": "12-15 years",
+ "temperament": [
+ "Friendly",
+ "Smart",
+ "Obedient"
+ ]
+ },
+ {
+ "breed": "Cavalier King Charles Spaniel",
+ "id": "cavalier-king-charles-spaniel",
+ "size": "Small",
+ "origin": "United Kingdom",
+ "lifespan": "9-14 years",
+ "temperament": [
+ "Affectionate",
+ "Gentle",
+ "Graceful"
+ ]
+ },
+ {
+ "breed": "Shih Tzu",
+ "id": "shih-tzu",
+ "size": "Small",
+ "origin": "China",
+ "lifespan": "10-18 years",
+ "temperament": [
+ "Affectionate",
+ "Playful",
+ "Outgoing"
+ ]
+ },
+ {
+ "breed": "Boston Terrier",
+ "id": "boston-terrier",
+ "size": "Small",
+ "origin": "United States",
+ "lifespan": "11-13 years",
+ "temperament": [
+ "Friendly",
+ "Lively",
+ "Intelligent"
+ ]
+ },
+ {
+ "breed": "Bernese Mountain Dog",
+ "id": "bernese-mountain-dog",
+ "size": "Large",
+ "origin": "Switzerland",
+ "lifespan": "7-10 years",
+ "temperament": [
+ "Good-natured",
+ "Calm",
+ "Strong"
+ ]
+ },
+ {
+ "breed": "Pomeranian",
+ "id": "pomeranian",
+ "size": "Toy",
+ "origin": "Germany",
+ "lifespan": "12-16 years",
+ "temperament": [
+ "Lively",
+ "Bold",
+ "Inquisitive"
+ ]
+ },
+ {
+ "breed": "Havanese",
+ "id": "havanese",
+ "size": "Small",
+ "origin": "Cuba",
+ "lifespan": "14-16 years",
+ "temperament": [
+ "Playful",
+ "Intelligent",
+ "Outgoing"
+ ]
+ },
+ {
+ "breed": "English Springer Spaniel",
+ "id": "english-springer-spaniel",
+ "size": "Medium",
+ "origin": "England",
+ "lifespan": "12-14 years",
+ "temperament": [
+ "Friendly",
+ "Playful",
+ "Obedient"
+ ]
+ },
+ {
+ "breed": "Shetland Sheepdog",
+ "id": "shetland-sheepdog",
+ "size": "Small",
+ "origin": "Scotland",
+ "lifespan": "12-14 years",
+ "temperament": [
+ "Playful",
+ "Energetic",
+ "Intelligent"
+ ]
+ }
+]
diff --git a/packages/astro/test/fixtures/content-layer/src/data/glob-data/index.json b/packages/astro/test/fixtures/content-layer/src/data/glob-data/index.json
new file mode 100644
index 000000000000..efc60137d68e
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/data/glob-data/index.json
@@ -0,0 +1,3 @@
+{
+ "title": "One"
+}
diff --git a/packages/astro/test/fixtures/content-layer/src/data/glob-data/one.json b/packages/astro/test/fixtures/content-layer/src/data/glob-data/one.json
new file mode 100644
index 000000000000..efc60137d68e
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/data/glob-data/one.json
@@ -0,0 +1,3 @@
+{
+ "title": "One"
+}
diff --git a/packages/astro/test/fixtures/content-layer/src/data/glob-data/three.json b/packages/astro/test/fixtures/content-layer/src/data/glob-data/three.json
new file mode 100644
index 000000000000..7d028e937a71
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/data/glob-data/three.json
@@ -0,0 +1,3 @@
+{
+ "title": "Three"
+}
diff --git a/packages/astro/test/fixtures/content-layer/src/data/glob-data/two.json b/packages/astro/test/fixtures/content-layer/src/data/glob-data/two.json
new file mode 100644
index 000000000000..1a8215509b0a
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/data/glob-data/two.json
@@ -0,0 +1,3 @@
+{
+ "title": "Two"
+}
diff --git a/packages/astro/test/fixtures/content-layer/src/loaders/post-loader.ts b/packages/astro/test/fixtures/content-layer/src/loaders/post-loader.ts
new file mode 100644
index 000000000000..b03c1442227e
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/loaders/post-loader.ts
@@ -0,0 +1,45 @@
+import { z } from 'astro:content';
+import type { Loader } from "astro/loaders"
+
+export interface PostLoaderConfig {
+ url: string;
+}
+
+export function loader(config:PostLoaderConfig): Loader {
+ return {
+ name: "post-loader",
+ load: async ({
+ store, meta, logger
+ }) => {
+ logger.info('Loading posts');
+
+ const lastSynced = meta.get('lastSynced');
+
+ // Don't sync more than once a minute
+ if (lastSynced && (Date.now() - Number(lastSynced) < 1000 * 60)) {
+ logger.info('Skipping sync');
+ return;
+ }
+
+ const posts = await fetch(config.url)
+ .then((res) => res.json());
+
+ store.clear();
+
+ for (const data of posts) {
+ store.set({id: data.id, data});
+ }
+ meta.set('lastSynced', String(Date.now()));
+ },
+ schema: async () => {
+ // Simulate a delay
+ await new Promise((resolve) => setTimeout(resolve, 1000));
+ return z.object({
+ title: z.string(),
+ body: z.string(),
+ userId: z.number(),
+ id: z.number(),
+ });
+ }
+ };
+}
diff --git a/packages/astro/test/fixtures/content-layer/src/pages/blog/[id].astro b/packages/astro/test/fixtures/content-layer/src/pages/blog/[id].astro
new file mode 100644
index 000000000000..850833907ba7
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/pages/blog/[id].astro
@@ -0,0 +1,29 @@
+---
+import type { GetStaticPaths } from "astro";
+import { getCollection } from "astro:content"
+export const getStaticPaths = (async () => {
+ const collection = await getCollection("blog");
+ if(!collection) return []
+ return collection.map((post) => ({
+ params: {
+ id: post.id
+ },
+ props: {
+ post: post.data
+ }
+ }));
+}) satisfies GetStaticPaths;
+
+interface Props {
+ post: {
+ title: string;
+ body: string;
+ }
+}
+
+const { post } = Astro.props
+
+---
+
+{post.title}
+{post.body}
diff --git a/packages/astro/test/fixtures/content-layer/src/pages/collections.json.js b/packages/astro/test/fixtures/content-layer/src/pages/collections.json.js
new file mode 100644
index 000000000000..f637bf80d02f
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/pages/collections.json.js
@@ -0,0 +1,30 @@
+import { getCollection, getEntry } from 'astro:content';
+import * as devalue from 'devalue';
+
+export async function GET() {
+ const customLoader = await getCollection('blog', (entry) => {
+ return entry.data.id < 6;
+ });
+ const fileLoader = await getCollection('dogs');
+
+ const dataEntry = await getEntry('dogs', 'beagle');
+
+ const simpleLoader = await getCollection('cats');
+
+ const entryWithReference = await getEntry('spacecraft', 'columbia-copy');
+ const referencedEntry = await getEntry(entryWithReference.data.cat);
+
+ const increment = await getEntry('increment', 'value');
+
+ return new Response(
+ devalue.stringify({
+ customLoader,
+ fileLoader,
+ dataEntry,
+ simpleLoader,
+ entryWithReference,
+ referencedEntry,
+ increment,
+ })
+ );
+}
diff --git a/packages/astro/test/fixtures/content-layer/src/pages/dogs/[slug].astro b/packages/astro/test/fixtures/content-layer/src/pages/dogs/[slug].astro
new file mode 100644
index 000000000000..977ae6efa167
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/pages/dogs/[slug].astro
@@ -0,0 +1,40 @@
+---
+import type { GetStaticPaths } from "astro";
+import { getCollection } from "astro:content"
+export const getStaticPaths = (async () => {
+ const collection = await getCollection("dogs");
+ if(!collection) return []
+ return collection.map((dog) => ({
+ params: {
+ slug: dog.id
+ },
+ props: {
+ dog: dog.data
+ }
+ }));
+}) satisfies GetStaticPaths;
+
+
+interface Props {
+ dog: {
+ breed: string;
+ id: string;
+ size: string;
+ origin: string;
+ lifespan: string;
+ temperament: string[];
+ }
+}
+
+const { dog } = Astro.props
+
+
+---
+
+{dog.breed}
+
+Size: {dog.size}
+Origin: {dog.origin}
+Lifespan: {dog.lifespan}
+Temperament: {dog.temperament.join(", ")}
+
diff --git a/packages/astro/test/fixtures/content-layer/src/pages/index.astro b/packages/astro/test/fixtures/content-layer/src/pages/index.astro
new file mode 100644
index 000000000000..dbd18118a045
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/pages/index.astro
@@ -0,0 +1,33 @@
+---
+import { getCollection, getEntry } from 'astro:content';
+
+const blog = await getCollection('blog');
+const first = await getEntry('blog', 1);
+const dogs = await getCollection('dogs');
+const increment = await getEntry('increment', 'value');
+---
+
+
+ Index
+
+
+ Last updated: {increment.data.lastUpdated.toLocaleTimeString()}
+
+ Dogs
+
+ Blog Posts
+
+ {first.data.title}
+
+
+
+
+
diff --git a/packages/astro/test/fixtures/content-layer/src/pages/spacecraft/[slug].astro b/packages/astro/test/fixtures/content-layer/src/pages/spacecraft/[slug].astro
new file mode 100644
index 000000000000..80314606f96f
--- /dev/null
+++ b/packages/astro/test/fixtures/content-layer/src/pages/spacecraft/[slug].astro
@@ -0,0 +1,35 @@
+---
+import type { GetStaticPaths } from "astro";
+import { getCollection, getEntry, render } from "astro:content"
+import { Image } from "astro:assets"
+
+export const getStaticPaths = (async () => {
+ const collection = await getCollection("spacecraft");
+ if(!collection) return []
+ return collection.map((craft) => ({
+ params: {
+ slug: `/${craft.id}`
+ },
+ props: {
+ craft
+ }
+ }));
+}) satisfies GetStaticPaths;
+
+
+
+
+const { craft } = Astro.props as any
+
+let cat = craft.data.cat ? await getEntry(craft.data.cat) : undefined
+const { Content, headings } = await render(craft)
+
+---
+{craft.data.title}
+
+{cat? 🐈: {cat.data.breed}
: undefined}
+{craft.data.heroImage ? } pathExists
* @property {(url: string, opts: Parameters[1]) => Promise} fetch
* @property {(path: string) => Promise} readFile
- * @property {(path: string, updater: (content: string) => string) => Promise} writeFile
+ * @property {(path: string, updater: (content: string) => string) => Promise} editFile
* @property {(path: string) => Promise} readdir
* @property {(pattern: string) => Promise} glob
* @property {typeof dev} startDevServer
@@ -47,6 +50,7 @@ process.env.ASTRO_TELEMETRY_DISABLED = true;
* @property {() => Promise} onNextChange
* @property {typeof check} check
* @property {typeof sync} sync
+ * @property {AstroConfig} config
*
* This function returns an instance of the Check
*
@@ -157,15 +161,22 @@ export async function loadFixture(inlineConfig) {
let devServer;
return {
- build: async (extraInlineConfig = {}) => {
+ build: async (extraInlineConfig = {}, options = {}) => {
+ globalContentLayer.dispose();
+ globalContentConfigObserver.set({ status: 'init' });
process.env.NODE_ENV = 'production';
- return build(mergeConfig(inlineConfig, extraInlineConfig), { teardownCompiler: false });
+ return build(mergeConfig(inlineConfig, extraInlineConfig), {
+ teardownCompiler: false,
+ ...options,
+ });
},
sync,
check: async (opts) => {
return await check(opts);
},
startDevServer: async (extraInlineConfig = {}) => {
+ globalContentLayer.dispose();
+ globalContentConfigObserver.set({ status: 'init' });
process.env.NODE_ENV = 'development';
devServer = await dev(mergeConfig(inlineConfig, extraInlineConfig));
config.server.host = parseAddressToHost(devServer.address.address); // update host
@@ -275,7 +286,7 @@ export async function loadFixture(inlineConfig) {
typeof newContentsOrCallback === 'function'
? newContentsOrCallback(contents)
: newContentsOrCallback;
- const nextChange = onNextChange();
+ const nextChange = devServer ? onNextChange() : Promise.resolve();
await fs.promises.writeFile(fileUrl, newContents);
await nextChange;
return reset;
diff --git a/packages/astro/test/units/dev/collections-mixed-content-errors.test.js b/packages/astro/test/units/dev/collections-mixed-content-errors.test.js
index 73ce15377f34..3417650fc963 100644
--- a/packages/astro/test/units/dev/collections-mixed-content-errors.test.js
+++ b/packages/astro/test/units/dev/collections-mixed-content-errors.test.js
@@ -8,13 +8,15 @@ const root = new URL('../../fixtures/content-mixed-errors/', import.meta.url);
async function sync({ fs }) {
try {
- await _sync({
- inlineConfig: {
+ await _sync(
+ {
root: fileURLToPath(root),
logLevel: 'silent',
},
- fs,
- });
+ {
+ fs,
+ },
+ );
return 0;
} catch (_) {
return 1;
@@ -121,11 +123,7 @@ title: Post
root,
);
- try {
- const res = await sync({ fs });
- assert.equal(res, 0);
- } catch (e) {
- assert.fail(`Did not expect sync to throw: ${e.message}`);
- }
+ const res = await sync({ fs });
+ assert.equal(res, 0);
});
});
diff --git a/packages/astro/test/units/dev/restart.test.js b/packages/astro/test/units/dev/restart.test.js
index a09bfce98c6f..339b95fc1acb 100644
--- a/packages/astro/test/units/dev/restart.test.js
+++ b/packages/astro/test/units/dev/restart.test.js
@@ -194,4 +194,31 @@ describe('dev container restarts', () => {
await restart.container.close();
}
});
+
+ it('Is able to restart project on .astro/settings.json changes', async () => {
+ const fs = createFs(
+ {
+ '/src/pages/index.astro': ``,
+ '/.astro/settings.json': `{}`,
+ },
+ root,
+ );
+
+ const restart = await createContainerWithAutomaticRestart({
+ fs,
+ inlineConfig: { root: fileURLToPath(root), logLevel: 'silent' },
+ });
+ await startContainer(restart.container);
+ assert.equal(isStarted(restart.container), true);
+
+ try {
+ let restartComplete = restart.restarted();
+ fs.mkdirSync('/.astro/', { recursive: true });
+ fs.writeFileSync('/.astro/settings.json', `{ }`);
+ triggerFSEvent(restart.container, fs, '/.astro/settings.json', 'change');
+ await restartComplete;
+ } finally {
+ await restart.container.close();
+ }
+ });
});
diff --git a/packages/astro/test/units/integrations/api.test.js b/packages/astro/test/units/integrations/api.test.js
index 960e003fc3f1..6122ba6408f6 100644
--- a/packages/astro/test/units/integrations/api.test.js
+++ b/packages/astro/test/units/integrations/api.test.js
@@ -1,7 +1,11 @@
import * as assert from 'node:assert/strict';
import { describe, it } from 'node:test';
import { validateSupportedFeatures } from '../../../dist/integrations/features-validation.js';
-import { runHookBuildSetup, runHookConfigSetup } from '../../../dist/integrations/hooks.js';
+import {
+ normalizeInjectedTypeFilename,
+ runHookBuildSetup,
+ runHookConfigSetup,
+} from '../../../dist/integrations/hooks.js';
import { defaultLogger } from '../test-utils.js';
describe('Integration API', () => {
@@ -311,3 +315,20 @@ describe('Astro feature map', function () {
});
});
});
+
+describe('normalizeInjectedTypeFilename', () => {
+ // invalid filename
+ assert.throws(() => normalizeInjectedTypeFilename('types', 'integration'));
+ // valid filename
+ assert.doesNotThrow(() => normalizeInjectedTypeFilename('types.d.ts', 'integration'));
+ // filename normalization
+ assert.equal(
+ normalizeInjectedTypeFilename('aA1-*/_"~.d.ts', 'integration'),
+ './integrations/integration/aA1-_____.d.ts',
+ );
+ // integration name normalization
+ assert.equal(
+ normalizeInjectedTypeFilename('types.d.ts', 'aA1-*/_"~.'),
+ './integrations/aA1-_____./types.d.ts',
+ );
+});
diff --git a/packages/astro/types/content.d.ts b/packages/astro/types/content.d.ts
index 18ddf2c8ca5e..1715a30a42e3 100644
--- a/packages/astro/types/content.d.ts
+++ b/packages/astro/types/content.d.ts
@@ -20,6 +20,31 @@ declare module 'astro:content' {
>;
}>;
+ export interface DataEntry {
+ id: string;
+ data: Record;
+ filePath?: string;
+ body?: string;
+ }
+
+ export interface DataStore {
+ get: (key: string) => DataEntry;
+ entries: () => Array<[id: string, DataEntry]>;
+ set: (key: string, data: Record, body?: string, filePath?: string) => void;
+ values: () => Array;
+ keys: () => Array;
+ delete: (key: string) => void;
+ clear: () => void;
+ has: (key: string) => boolean;
+ }
+
+ export interface MetaStore {
+ get: (key: string) => string | undefined;
+ set: (key: string, value: string) => void;
+ delete: (key: string) => void;
+ has: (key: string) => boolean;
+ }
+
type BaseSchemaWithoutEffects =
| import('astro/zod').AnyZodObject
| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
@@ -32,6 +57,12 @@ declare module 'astro:content' {
export type SchemaContext = { image: ImageFunction };
+ type ContentLayerConfig = {
+ type?: 'content_layer';
+ schema?: S | ((context: SchemaContext) => S);
+ loader: import('astro/loaders').Loader | (() => Array | Promise>);
+ };
+
type DataCollectionConfig = {
type: 'data';
schema?: S | ((context: SchemaContext) => S);
@@ -40,11 +71,13 @@ declare module 'astro:content' {
type ContentCollectionConfig = {
type?: 'content';
schema?: S | ((context: SchemaContext) => S);
+ loader?: never;
};
export type CollectionConfig =
| ContentCollectionConfig
- | DataCollectionConfig;
+ | DataCollectionConfig
+ | ContentLayerConfig;
export function defineCollection(
input: CollectionConfig,
diff --git a/packages/db/src/core/integration/index.ts b/packages/db/src/core/integration/index.ts
index 6573c838af13..68439cfb9541 100644
--- a/packages/db/src/core/integration/index.ts
+++ b/packages/db/src/core/integration/index.ts
@@ -22,7 +22,7 @@ import { resolveDbConfig } from '../load-file.js';
import { SEED_DEV_FILE_NAME } from '../queries.js';
import { type VitePlugin, getDbDirectoryUrl } from '../utils.js';
import { fileURLIntegration } from './file-url.js';
-import { typegenInternal } from './typegen.js';
+import { getDtsContent } from './typegen.js';
import {
type LateSeedFiles,
type LateTables,
@@ -30,7 +30,6 @@ import {
resolved,
vitePluginDb,
} from './vite-plugin-db.js';
-import { vitePluginInjectEnvTs } from './vite-plugin-inject-env-ts.js';
function astroDBIntegration(): AstroIntegration {
let connectToStudio = false;
@@ -102,11 +101,11 @@ function astroDBIntegration(): AstroIntegration {
updateConfig({
vite: {
assetsInclude: [DB_PATH],
- plugins: [dbPlugin, vitePluginInjectEnvTs(config, logger)],
+ plugins: [dbPlugin],
},
});
},
- 'astro:config:done': async ({ config }) => {
+ 'astro:config:done': async ({ config, injectTypes }) => {
if (command === 'preview') return;
// TODO: refine where we load tables
@@ -122,7 +121,10 @@ function astroDBIntegration(): AstroIntegration {
await writeFile(localDbUrl, '');
}
- await typegenInternal({ tables: tables.get() ?? {}, root: config.root });
+ injectTypes({
+ filename: 'db.d.ts',
+ content: getDtsContent(tables.get() ?? {}),
+ });
},
'astro:server:setup': async ({ server, logger }) => {
seedHandler.execute = async (fileUrl) => {
diff --git a/packages/db/src/core/integration/typegen.ts b/packages/db/src/core/integration/typegen.ts
index 725738fc5a51..91364b3c3dc1 100644
--- a/packages/db/src/core/integration/typegen.ts
+++ b/packages/db/src/core/integration/typegen.ts
@@ -1,18 +1,7 @@
-import { existsSync } from 'node:fs';
-import { mkdir, writeFile } from 'node:fs/promises';
-import type { AstroConfig } from 'astro';
-import { DB_TYPES_FILE, RUNTIME_IMPORT } from '../consts.js';
-import { resolveDbConfig } from '../load-file.js';
+import { RUNTIME_IMPORT } from '../consts.js';
import type { DBTable, DBTables } from '../types.js';
-// Exported for use in Astro core CLI
-export async function typegen(astroConfig: Pick) {
- const { dbConfig } = await resolveDbConfig(astroConfig);
-
- await typegenInternal({ tables: dbConfig.tables, root: astroConfig.root });
-}
-
-export async function typegenInternal({ tables, root }: { tables: DBTables; root: URL }) {
+export function getDtsContent(tables: DBTables) {
const content = `// This file is generated by Astro DB
declare module 'astro:db' {
${Object.entries(tables)
@@ -20,14 +9,7 @@ ${Object.entries(tables)
.join('\n')}
}
`;
-
- const dotAstroDir = new URL('.astro/', root);
-
- if (!existsSync(dotAstroDir)) {
- await mkdir(dotAstroDir);
- }
-
- await writeFile(new URL(DB_TYPES_FILE, dotAstroDir), content);
+ return content;
}
function generateTableType(name: string, table: DBTable): string {
diff --git a/packages/db/src/core/integration/vite-plugin-inject-env-ts.ts b/packages/db/src/core/integration/vite-plugin-inject-env-ts.ts
deleted file mode 100644
index 14257d480fef..000000000000
--- a/packages/db/src/core/integration/vite-plugin-inject-env-ts.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { existsSync } from 'node:fs';
-import { readFile, writeFile } from 'node:fs/promises';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import type { AstroIntegrationLogger } from 'astro';
-import { bold } from 'kleur/colors';
-import { normalizePath } from 'vite';
-import { DB_TYPES_FILE } from '../consts.js';
-import type { VitePlugin } from '../utils.js';
-
-export function vitePluginInjectEnvTs(
- { srcDir, root }: { srcDir: URL; root: URL },
- logger: AstroIntegrationLogger,
-): VitePlugin {
- return {
- name: 'db-inject-env-ts',
- enforce: 'post',
- async config() {
- await setUpEnvTs({ srcDir, root, logger });
- },
- };
-}
-
-export async function setUpEnvTs({
- srcDir,
- root,
- logger,
-}: {
- srcDir: URL;
- root: URL;
- logger: AstroIntegrationLogger;
-}) {
- const envTsPath = getEnvTsPath({ srcDir });
- const envTsPathRelativetoRoot = normalizePath(
- path.relative(fileURLToPath(root), fileURLToPath(envTsPath)),
- );
-
- if (existsSync(envTsPath)) {
- let typesEnvContents = await readFile(envTsPath, 'utf-8');
- const dotAstroDir = new URL('.astro/', root);
-
- if (!existsSync(dotAstroDir)) return;
-
- const dbTypeReference = getDBTypeReference({ srcDir, dotAstroDir });
-
- if (!typesEnvContents.includes(dbTypeReference)) {
- typesEnvContents = `${dbTypeReference}\n${typesEnvContents}`;
- await writeFile(envTsPath, typesEnvContents, 'utf-8');
- logger.info(`Added ${bold(envTsPathRelativetoRoot)} types`);
- }
- }
-}
-
-function getDBTypeReference({ srcDir, dotAstroDir }: { srcDir: URL; dotAstroDir: URL }) {
- const dbTypesFile = new URL(DB_TYPES_FILE, dotAstroDir);
- const contentTypesRelativeToSrcDir = normalizePath(
- path.relative(fileURLToPath(srcDir), fileURLToPath(dbTypesFile)),
- );
-
- return `///