@amamo/mdx 0.3.0 → 0.4.0

package/dist/compiler.d.ts

@@ -22,7 +22,11 @@ export interface ICompiler {
 export interface IAdapterCompiler extends ICompiler {
     readonly generatedCollectionModule: string;
     isContentFile(file: string): boolean;
+    scan(): Promise<IBuildResult>;
     startWatch(onGeneratedChange?: (paths: string[]) => Promise<void> | void): () => void;
+    transformSource(file: string, source: string): Promise<ITransformResult>;
 }
 export declare function createCompiler(config: IAmamoMdxConfig): Promise<ICompiler>;
-export declare function createAdapterCompiler(config: IAmamoMdxConfig): Promise<IAdapterCompiler>;
+export declare function createAdapterCompiler(config: IAmamoMdxConfig, options?: {
+    retainModules?: boolean;
+}): Promise<IAdapterCompiler>;

package/dist/compiler.js

@@ -10,19 +10,22 @@ let temporaryFileId = 0;
 const execFileAsync = promisify(execFile);
 class Compiler {
     config;
-    shiki;
+    retainModules;
     generatedCollectionModule;
     buildInFlight;
     disposed = false;
     generatedListener;
     gitModifiedTimes = new Map();
+    modules = new Map();
     records = new Map();
+    sources = new Map();
+    shikiPromise;
     tail = Promise.resolve();
     watcher;
     watcherError;
-    constructor(config, shiki) {
+    constructor(config, retainModules) {
         this.config = config;
-        this.shiki = shiki;
+        this.retainModules = retainModules;
         this.generatedCollectionModule = path.join(config.generatedDirectory, 'collections.mjs');
     }
     build() {
@@ -42,11 +45,19 @@ class Compiler {
     transform(file) {
         return this.enqueue(() => this.transformNow(cleanFileId(file)));
     }
+    transformSource(file, source) {
+        return this.enqueue(() => this.transformNow(cleanFileId(file), source));
+    }
+    scan() {
+        return this.enqueue(() => this.scanNow());
+    }
     remove(file) {
         return this.enqueue(async () => {
             const absolute = cleanFileId(file);
             if (!this.records.delete(absolute))
                 return 0;
+            this.modules.delete(absolute);
+            this.sources.delete(absolute);
             const changed = await this.writeOutputs();
             if (this.config.cache.enabled) {
                 pruneNativeCache(this.config.cache.directory, [...this.records.values()].map((record) => record.cacheKey));
@@ -61,7 +72,8 @@ class Compiler {
         await this.enqueue(async () => {
             this.watcher?.close();
             this.watcher = undefined;
-            this.shiki?.dispose();
+            const shiki = this.shikiPromise ? await this.shikiPromise : undefined;
+            shiki?.dispose();
             this.disposed = true;
         }, false);
     }
@@ -123,9 +135,12 @@ class Compiler {
     async buildNow() {
         const discovered = await this.discover();
         const records = await this.compile(discovered.map((document) => document.input));
-        this.records.clear();
-        for (const record of records)
-            this.records.set(path.resolve(record.file), record);
+        this.replaceRecords(records.map(documentMetadata), discovered.map((document) => document.input));
+        this.modules.clear();
+        if (this.retainModules) {
+            for (const record of records)
+                this.modules.set(path.resolve(record.file), record.module);
+        }
         const changed = await this.writeOutputs();
         if (this.config.cache.enabled) {
             pruneNativeCache(this.config.cache.directory, records.map((record) => record.cacheKey));
@@ -138,7 +153,39 @@ class Compiler {
             outputsWritten: changed.length,
         };
     }
-    async transformNow(file) {
+    async scanNow() {
+        const discovered = await this.discover();
+        const inputs = discovered.map((document) => document.input);
+        const records = prepareNativeBatch(this.config, inputs).takeMetadata();
+        this.replaceRecords(records, inputs);
+        this.modules.clear();
+        const changed = await this.writeOutputs();
+        if (this.config.cache.enabled) {
+            pruneNativeCache(this.config.cache.directory, records.map((record) => record.cacheKey));
+        }
+        await this.notifyGeneratedChange(changed);
+        return {
+            cached: records.filter((record) => record.cached).length,
+            compiled: 0,
+            discovered: discovered.length,
+            outputsWritten: changed.length,
+        };
+    }
+    async transformNow(file, source) {
+        const current = this.records.get(file);
+        const currentModule = this.modules.get(file);
+        if (source !== undefined &&
+            source === this.sources.get(file) &&
+            current &&
+            currentModule !== undefined) {
+            return {
+                cached: true,
+                code: currentModule,
+                map: null,
+                outputsWritten: 0,
+                record: { ...current, cached: true, module: currentModule },
+            };
+        }
         const metadata = this.metadataForFile(file);
         if (!metadata) {
             throw new Error(`AMAMO_FILE_OUTSIDE_COLLECTION: ${file}`);
@@ -150,12 +197,16 @@ class Compiler {
                 throw new Error(`AMAMO_DOCUMENT_DUPLICATE_KEY: ${metadata.collection}/${metadata.key}`);
             }
         }
-        const document = await this.readDocument(metadata);
+        const document = await this.readDocument(metadata, source);
         const records = await this.compile([document.input]);
         const record = records[0];
         if (!record)
             throw new Error(`AMAMO_NATIVE_RESULT_MISSING: ${file}`);
-        this.records.set(file, record);
+        this.records.set(file, documentMetadata(record));
+        if (this.retainModules) {
+            this.modules.set(file, record.module);
+            this.sources.set(file, document.input.source);
+        }
         const changed = await this.writeOutputs();
         if (this.config.cache.enabled) {
             pruneNativeCache(this.config.cache.directory, [...this.records.values()].map((value) => value.cacheKey));
@@ -171,7 +222,11 @@ class Compiler {
     }
     async compile(inputs) {
         const batch = prepareNativeBatch(this.config, inputs);
-        const highlights = this.shiki ? await this.shiki.highlight(batch.codeBlocks) : [];
+        let highlights = [];
+        if (this.config.highlight.enabled && batch.codeBlocks.length > 0) {
+            this.shikiPromise ??= createShikiRenderer(this.config.highlight);
+            highlights = await (await this.shikiPromise).highlight(batch.codeBlocks);
+        }
         return batch.finish(highlights);
     }
     async discover() {
@@ -200,10 +255,10 @@ class Compiler {
         const documents = await Promise.all(documentsMetadata.map((value) => this.readDocument(value)));
         return documents.toSorted((left, right) => left.input.file.localeCompare(right.input.file));
     }
-    async readDocument(metadata) {
+    async readDocument(metadata, providedSource) {
         const [source, stats] = await Promise.all([
-            readFile(metadata.file, 'utf8'),
-            stat(metadata.file),
+            providedSource ?? readFile(metadata.file, 'utf8'),
+            this.config.derived.lastModified ? stat(metadata.file) : undefined,
         ]);
         return {
             input: {
@@ -212,7 +267,7 @@ class Compiler {
                 key: metadata.key,
                 locale: metadata.locale,
                 modifiedAt: this.config.derived.lastModified
-                    ? (this.gitModifiedTimes.get(metadata.file) ?? stats.mtime.toISOString())
+                    ? (this.gitModifiedTimes.get(metadata.file) ?? stats?.mtime.toISOString())
                     : undefined,
                 slug: metadata.slug,
                 source,
@@ -246,9 +301,20 @@ class Compiler {
         }, {
             contents: `${JSON.stringify({
                 cacheDirectory: this.config.cache.directory,
+                config: this.config,
                 configFingerprint: configurationFingerprint(this.config),
-                documents: Object.fromEntries(records.map((record) => [record.file, { cacheKey: record.cacheKey }])),
-                version: 1,
+                documents: Object.fromEntries(records.map((record) => [
+                    record.file,
+                    {
+                        cacheKey: record.cacheKey,
+                        collection: record.collection,
+                        key: record.key,
+                        locale: record.locale,
+                        modifiedAt: record.modifiedAt,
+                        slug: record.slug,
+                    },
+                ])),
+                version: 2,
             }, null, 2)}\n`,
             path: path.join(this.config.generatedDirectory, 'index.json'),
         });
@@ -259,6 +325,16 @@ class Compiler {
         }
         return changed;
     }
+    replaceRecords(records, inputs) {
+        this.records.clear();
+        for (const record of records)
+            this.records.set(path.resolve(record.file), record);
+        this.sources.clear();
+        if (this.retainModules) {
+            for (const input of inputs)
+                this.sources.set(path.resolve(input.file), input.source);
+        }
+    }
     async notifyGeneratedChange(paths) {
         if (paths.length === 0 || !this.generatedListener)
             return;
@@ -268,12 +344,9 @@ class Compiler {
 export async function createCompiler(config) {
     return createAdapterCompiler(config);
 }
-export async function createAdapterCompiler(config) {
+export async function createAdapterCompiler(config, options = {}) {
     const normalized = normalizeConfig(config);
-    const shiki = normalized.highlight.enabled
-        ? await createShikiRenderer(normalized.highlight)
-        : undefined;
-    return new Compiler(normalized, shiki);
+    return new Compiler(normalized, options.retainModules ?? true);
 }
 function deriveMetadata(collection, config, file, extensionless) {
     const segments = extensionless.split(path.sep);
@@ -382,6 +455,24 @@ async function writeIfChanged(file, contents) {
 function compareRecords(left, right) {
     return left.collection.localeCompare(right.collection) || left.key.localeCompare(right.key);
 }
+function documentMetadata(record) {
+    return {
+        cacheKey: record.cacheKey,
+        cached: record.cached,
+        collection: record.collection,
+        dependencies: record.dependencies,
+        derived: record.derived,
+        diagnostics: record.diagnostics,
+        file: record.file,
+        frontmatter: record.frontmatter,
+        hash: record.hash,
+        key: record.key,
+        locale: record.locale,
+        modifiedAt: record.modifiedAt,
+        projections: record.projections,
+        slug: record.slug,
+    };
+}
 function cleanFileId(file) {
     const absolute = path.resolve(file.split('?')[0] ?? file);
     const missing = [];

package/dist/native.d.ts

@@ -37,7 +37,7 @@ export interface IHighlightedCodeBlock {
     documentId: string;
     hast: JsonValue;
 }
-export interface IDocumentRecord {
+export interface IDocumentMetadata {
     cacheKey: string;
     cached: boolean;
     collection: string;
@@ -49,10 +49,13 @@ export interface IDocumentRecord {
     hash: string;
     key: string;
     locale?: string;
-    module: string;
+    modifiedAt?: string;
     projections: Record<string, JsonValue>;
     slug?: string;
 }
+export interface IDocumentRecord extends IDocumentMetadata {
+    module: string;
+}
 export interface IRenderedManifest {
     contents: string;
     path: string;
@@ -60,6 +63,7 @@ export interface IRenderedManifest {
 export interface IPreparedNativeBatch {
     codeBlocks: ICodeBlock[];
     finish(highlights: IHighlightedCodeBlock[]): IDocumentRecord[];
+    takeMetadata(): IDocumentMetadata[];
 }
 export declare class AmamoMdxError extends Error {
     readonly diagnostics: IDiagnostic[];
@@ -68,4 +72,4 @@ export declare class AmamoMdxError extends Error {
 export declare function configurationFingerprint(config: IAmamoMDXConfig): string;
 export declare function prepareNativeBatch(config: IAmamoMDXConfig, inputs: INativeDocumentInput[]): IPreparedNativeBatch;
 export declare function pruneNativeCache(cacheDirectory: string, keepKeys: string[]): number;
-export declare function renderNativeManifests(config: IAmamoMDXConfig, records: IDocumentRecord[]): IRenderedManifest[];
+export declare function renderNativeManifests(config: IAmamoMDXConfig, records: IDocumentMetadata[]): IRenderedManifest[];

package/dist/native.js

@@ -44,6 +44,14 @@ export function prepareNativeBatch(config, inputs) {
                     return mapNativeError(error);
                 }
             },
+            takeMetadata() {
+                try {
+                    return JSON.parse(batch.takeMetadataJson());
+                }
+                catch (error) {
+                    return mapNativeError(error);
+                }
+            },
         };
     }
     catch (error) {
@@ -60,7 +68,11 @@ export function pruneNativeCache(cacheDirectory, keepKeys) {
 }
 export function renderNativeManifests(config, records) {
     try {
-        return JSON.parse(loadBinding().renderManifests(nativeConfigJson(config), JSON.stringify(records)));
+        const manifestRecords = records.map(({ key, projections }) => ({
+            key,
+            projections,
+        }));
+        return JSON.parse(loadBinding().renderManifests(nativeConfigJson(config), JSON.stringify(manifestRecords)));
     }
     catch (error) {
         return mapNativeError(error);

package/dist/next-loader.cjs

@@ -4,30 +4,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
-function nextLoader(_source) {
-    return readCompiledModule(this);
+function nextLoader(source) {
+    return compileModule(this, source);
 }
-async function readCompiledModule(context) {
+async function compileModule(context, source) {
     const options = context.getOptions();
+    context.addDependency(options.indexFile);
+    let config;
+    let input;
     try {
         const index = JSON.parse(await (0, promises_1.readFile)(options.indexFile, 'utf8'));
         const resource = await (0, promises_1.realpath)(node_path_1.default.resolve(context.resourcePath));
-        const cacheKey = index.documents?.[resource]?.cacheKey;
-        if (index.configFingerprint !== options.configFingerprint ||
+        const document = index.documents?.[resource];
+        if (index.version !== 2 ||
+            index.configFingerprint !== options.configFingerprint ||
             typeof index.cacheDirectory !== 'string' ||
-            typeof cacheKey !== 'string' ||
-            !/^[a-f0-9]{64}$/.test(cacheKey)) {
+            typeof index.config !== 'object' ||
+            index.config === null ||
+            index.config.cache.directory !== index.cacheDirectory ||
+            typeof document?.cacheKey !== 'string' ||
+            !/^[a-f0-9]{64}$/.test(document.cacheKey) ||
+            typeof document.collection !== 'string' ||
+            typeof document.key !== 'string') {
             throw new Error('index entry does not match this build');
         }
-        const cacheFile = node_path_1.default.join(index.cacheDirectory, cacheKey.slice(0, 2), `${cacheKey}.json`);
-        const record = JSON.parse(await (0, promises_1.readFile)(cacheFile, 'utf8'));
-        if (record.cacheKey !== cacheKey || typeof record.module !== 'string') {
-            throw new Error('cache record does not match its index entry');
-        }
-        return record.module;
+        config = index.config;
+        input = {
+            collection: document.collection,
+            file: resource,
+            key: document.key,
+            locale: document.locale,
+            modifiedAt: document.modifiedAt,
+            slug: document.slug,
+            source,
+        };
     }
     catch (error) {
         throw new Error(`AMAMO_NEXT_CACHE_MISS: ${context.resourcePath}; rerun the coordinated amamo-mdx build`, { cause: error });
     }
+    const { compileNextDocument } = await import('./next-runtime.js');
+    const record = await compileNextDocument(config, input);
+    for (const dependency of record.dependencies)
+        context.addDependency(dependency);
+    return record.module;
 }
 module.exports = nextLoader;

package/dist/next-runtime.d.ts

@@ -0,0 +1,3 @@
+import type { IAmamoMDXConfig } from './config.js';
+import type { IDocumentRecord, INativeDocumentInput } from './native.js';
+export declare function compileNextDocument(config: IAmamoMDXConfig, input: INativeDocumentInput): Promise<IDocumentRecord>;

package/dist/next-runtime.js

@@ -0,0 +1,20 @@
+import { configurationFingerprint, prepareNativeBatch } from './native.js';
+import { createShikiRenderer } from './shiki.js';
+const renderers = new Map();
+export async function compileNextDocument(config, input) {
+    const batch = prepareNativeBatch(config, [input]);
+    let highlights = [];
+    if (config.highlight.enabled && batch.codeBlocks.length > 0) {
+        const fingerprint = configurationFingerprint(config);
+        let renderer = renderers.get(fingerprint);
+        if (!renderer) {
+            renderer = createShikiRenderer(config.highlight);
+            renderers.set(fingerprint, renderer);
+        }
+        highlights = await (await renderer).highlight(batch.codeBlocks);
+    }
+    const record = batch.finish(highlights)[0];
+    if (!record)
+        throw new Error(`AMAMO_NATIVE_RESULT_MISSING: ${input.file}`);
+    return record;
+}

package/dist/next.js

@@ -13,17 +13,23 @@ export function withAmamoMdx(config) {
     };
     let compilerPromise;
     let buildPromise;
+    let scanPromise;
     let watching = false;
     function compiler() {
-        compilerPromise ??= createAdapterCompiler(config);
+        compilerPromise ??= createAdapterCompiler(config, { retainModules: false });
         return compilerPromise;
     }
     async function prepare(phase) {
         if (phase !== PHASE_DEVELOPMENT_SERVER && phase !== PHASE_PRODUCTION_BUILD)
             return;
-        buildPromise ??= compiler().then((instance) => instance.build());
-        await buildPromise;
-        if (phase === PHASE_DEVELOPMENT_SERVER && !watching) {
+        if (phase === PHASE_PRODUCTION_BUILD) {
+            buildPromise ??= compiler().then((instance) => instance.build());
+            await buildPromise;
+            return;
+        }
+        scanPromise ??= compiler().then((instance) => instance.scan());
+        await scanPromise;
+        if (!watching) {
             const instance = await compiler();
             instance.startWatch();
             watching = true;

package/dist/shiki.js

@@ -59,8 +59,17 @@ export async function createShikiRenderer(config) {
         async highlight(blocks) {
             if (disposed)
                 throw new Error('AMAMO_SHIKI_DISPOSED: Shiki renderer is disposed');
-            const languages = await Promise.all(blocks.map((block) => loadLanguage(block.lang)));
-            return blocks.map((block, index) => {
+            const keys = blocks.map((block) => JSON.stringify([block.lang, block.meta, block.code]));
+            const uniqueBlocks = new Map();
+            for (const [index, block] of blocks.entries()) {
+                const key = keys[index];
+                if (key !== undefined && !uniqueBlocks.has(key))
+                    uniqueBlocks.set(key, block);
+            }
+            const entries = [...uniqueBlocks.entries()];
+            const languages = await Promise.all(entries.map(([, block]) => loadLanguage(block.lang)));
+            const highlighted = new Map();
+            for (const [index, [key, block]] of entries.entries()) {
                 const language = block.lang;
                 const hast = highlighter.codeToHast(block.code, {
                     colorReplacements: config.colorReplacements,
@@ -82,10 +91,18 @@ export async function createShikiRenderer(config) {
                         ]
                         : undefined,
                 });
+                highlighted.set(key, JSON.parse(JSON.stringify(hast)));
+            }
+            return blocks.map((block, index) => {
+                const key = keys[index];
+                const hast = key === undefined ? undefined : highlighted.get(key);
+                if (hast === undefined) {
+                    throw new Error('AMAMO_SHIKI_RESULT_MISSING: Highlighted code block is missing');
+                }
                 return {
                     blockId: block.blockId,
                     documentId: block.documentId,
-                    hast: JSON.parse(JSON.stringify(hast)),
+                    hast,
                 };
             });
         },

package/dist/vite.js

@@ -25,11 +25,11 @@ export function amamoMdx(config) {
         async buildStart() {
             await ensureBuild();
         },
-        async transform(_source, id) {
+        async transform(source, id) {
             const instance = await compiler();
             if (!instance.isContentFile(id))
                 return null;
-            const result = await instance.transform(id);
+            const result = await instance.transformSource(id, source);
             return { code: result.code, map: result.map };
         },
         async configureServer(server) {

package/native.d.ts

@@ -2,6 +2,7 @@
 /* eslint-disable */
 export declare class PreparedBatch {
   get codeBlocksJson(): string
+  takeMetadataJson(): string
   finish(highlightsJson: string): string
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amamo/mdx",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A native MDX content compiler with Vite and Next adapters",
   "homepage": "https://jikkai.github.io/mdx/",
   "license": "MIT",
@@ -56,25 +56,25 @@
   },
   "dependencies": {
     "shiki": "4.4.3",
-    "zod": "4.4.3"
+    "zod": "4.5.4"
   },
   "devDependencies": {
     "@amamo/oxlint-config": "1.1.0",
-    "@amamo/verso": "1.1.0",
+    "@amamo/verso": "1.2.0",
     "@napi-rs/cli": "3.8.6",
-    "@types/node": "26.2.0",
+    "@types/node": "26.4.0",
     "@types/react": "19.2.18",
-    "@types/react-dom": "19.2.4",
-    "lint-staged": "17.3.0",
-    "next": "16.3.1",
-    "oxfmt": "0.63.0",
-    "oxlint": "1.78.0",
+    "@types/react-dom": "19.2.5",
+    "lint-staged": "17.4.1",
+    "next": "16.3.3",
+    "oxfmt": "0.65.0",
+    "oxlint": "1.80.0",
     "react": "19.2.8",
     "react-dom": "19.2.8",
-    "simple-git-hooks": "2.13.1",
+    "simple-git-hooks": "2.14.0",
     "typescript": "7.0.2",
-    "vite": "8.2.1",
-    "vitest": "4.1.10"
+    "vite": "8.2.2",
+    "vitest": "4.1.11"
   },
   "peerDependencies": {
     "next": "^16.0.0",
@@ -117,14 +117,14 @@
   "engines": {
     "node": ">=20.19"
   },
-  "packageManager": "pnpm@11.20.0",
+  "packageManager": "pnpm@12.1.0",
   "optionalDependencies": {
-    "@amamo/mdx-darwin-arm64": "0.3.0",
-    "@amamo/mdx-darwin-x64": "0.3.0",
-    "@amamo/mdx-linux-arm64-gnu": "0.3.0",
-    "@amamo/mdx-linux-x64-gnu": "0.3.0",
-    "@amamo/mdx-linux-arm64-musl": "0.3.0",
-    "@amamo/mdx-linux-x64-musl": "0.3.0",
-    "@amamo/mdx-win32-x64-msvc": "0.3.0"
+    "@amamo/mdx-darwin-arm64": "0.4.0",
+    "@amamo/mdx-darwin-x64": "0.4.0",
+    "@amamo/mdx-linux-arm64-gnu": "0.4.0",
+    "@amamo/mdx-linux-x64-gnu": "0.4.0",
+    "@amamo/mdx-linux-arm64-musl": "0.4.0",
+    "@amamo/mdx-linux-x64-musl": "0.4.0",
+    "@amamo/mdx-win32-x64-msvc": "0.4.0"
   }
 }