@epic-web/workshop-utils 6.85.4 → 6.85.5

package/dist/cache.server.d.ts

@@ -167,7 +167,7 @@ export declare const playgroundAppCache: C.Cache<{
     instructionsCode?: string | undefined;
     epicVideoEmbeds?: string[] | undefined;
 }>;
-export declare const diffCodeCache: C.Cache<string>;
+export declare const diffPatchCache: C.Cache<string>;
 export declare const diffFilesCache: C.Cache<DiffFile[]>;
 export declare const copyUnignoredFilesCache: {
     name: string;

package/dist/cache.server.js

@@ -168,7 +168,7 @@ export const solutionAppCache = makeSingletonFsCache('SolutionAppCache');
 export const problemAppCache = makeSingletonFsCache('ProblemAppCache');
 export const extraAppCache = makeSingletonFsCache('ExtraAppCache');
 export const playgroundAppCache = makeSingletonFsCache('PlaygroundAppCache');
-export const diffCodeCache = makeSingletonFsCache('DiffCodeCache');
+export const diffPatchCache = makeSingletonFsCache('DiffPatchCache');
 export const diffFilesCache = makeSingletonFsCache('DiffFilesCache');
 export const copyUnignoredFilesCache = makeSingletonCache('CopyUnignoredFilesCache');
 export const compiledMarkdownCache = makeSingletonFsCache('CompiledMarkdownCache');

package/dist/diff.server.d.ts

@@ -9,7 +9,7 @@ export declare function getDiffFiles(app1: App, app2: App, { forceFresh, timings
     path: string;
     line: number;
 }[]>;
-export declare function getDiffCode(app1: App, app2: App, { forceFresh, timings, request, }?: {
+export declare function getDiffPatch(app1: App, app2: App, { forceFresh, timings, request, }?: {
     forceFresh?: boolean;
     timings?: Timings;
     request?: Request;

package/dist/diff.server.js

@@ -1,19 +1,14 @@
-// oxlint-disable-next-line import/order -- this must be first
-import { getEnv } from "./init-env.js";
 import os from 'os';
 import path from 'path';
 import { execa } from 'execa';
 import fsExtra from 'fs-extra';
 import ignore from 'ignore';
 import parseGitDiff from 'parse-git-diff';
-import { bundledLanguagesInfo } from 'shiki/langs';
 import { z } from 'zod';
-import { getForceFreshForDir, getRelativePath, getWorkshopRoot, modifiedTimes, } from "./apps.server.js";
-import { cachified, copyUnignoredFilesCache, diffCodeCache, diffFilesCache, } from "./cache.server.js";
-import { compileMarkdownString } from "./compile-mdx.server.js";
+import { getForceFreshForDir, getWorkshopRoot, modifiedTimes, } from "./apps.server.js";
+import { cachified, copyUnignoredFilesCache, diffFilesCache, diffPatchCache, } from "./cache.server.js";
 import { modifiedMoreRecentlyThan } from "./modified-time.server.js";
 const epicshopTempDir = path.join(os.tmpdir(), 'epicshop');
-const isDeployed = getEnv().EPICSHOP_DEPLOYED;
 const diffTmpDir = path.join(epicshopTempDir, 'diff');
 const DiffStatusSchema = z.enum([
     'renamed',
@@ -65,123 +60,6 @@ function diffPathToRelative(filePath) {
         .slice(3);
     return relativePath.join(path.sep);
 }
-function getLanguage(ext) {
-    return (bundledLanguagesInfo.find((l) => l.id === ext || l.aliases?.includes(ext))
-        ?.id ?? 'text');
-}
-function getFileCodeblocks(file, filePathApp1, filePathApp2, type) {
-    if (!file.chunks.length) {
-        return [
-            `<p className="m-0 p-4 border-b text-muted-foreground">No changes</p>`,
-        ];
-    }
-    const filepath = diffPathToRelative(file.type === 'RenamedFile' ? file.pathAfter : file.path);
-    const extension = path.extname(filepath).slice(1);
-    const lang = getLanguage(extension);
-    const pathToCopy = file.type === 'RenamedFile' ? file.pathBefore : file.path;
-    const relativePath = diffPathToRelative(pathToCopy);
-    const markdownLines = [];
-    for (const chunk of file.chunks) {
-        const removedLineNumbers = [];
-        const addedLineNumbers = [];
-        const lines = [];
-        let toStartLine = 0;
-        let startLine = 1;
-        if (chunk.type === 'BinaryFilesChunk') {
-            lines.push(type === 'AddedFile'
-                ? `Binary file added`
-                : type === 'DeletedFile'
-                    ? 'Binary file deleted'
-                    : 'Binary file changed');
-        }
-        else {
-            startLine =
-                chunk.type === 'Chunk'
-                    ? chunk.fromFileRange.start
-                    : chunk.type === 'CombinedChunk'
-                        ? chunk.fromFileRangeA.start
-                        : 1;
-            toStartLine = chunk.toFileRange.start;
-            for (let lineNumber = 0; lineNumber < chunk.changes.length; lineNumber++) {
-                const change = chunk.changes[lineNumber];
-                if (!change)
-                    continue;
-                lines.push(change.content);
-                switch (change.type) {
-                    case 'AddedLine': {
-                        addedLineNumbers.push(startLine + lineNumber);
-                        break;
-                    }
-                    case 'DeletedLine': {
-                        removedLineNumbers.push(startLine + lineNumber);
-                        break;
-                    }
-                    default: {
-                        break;
-                    }
-                }
-            }
-        }
-        const params = [
-            ['filename', relativePath.replace(/\\/g, '\\\\')],
-            ['start', startLine.toString()],
-            removedLineNumbers.length
-                ? ['remove', removedLineNumbers.join(',')]
-                : null,
-            addedLineNumbers.length ? ['add', addedLineNumbers.join(',')] : null,
-        ]
-            .filter(Boolean)
-            .map(([key, value]) => `${key}=${value}`)
-            .join(' ');
-        const launchEditorClassName = 'border hover:bg-foreground/20 rounded px-2 py-0.5 font-mono text-xs font-semibold';
-        function launchEditor(appNum, line) {
-            line ||= 1; // handle 0
-            if (isDeployed) {
-                if (type === 'DeletedFile' && appNum === 2)
-                    return '';
-                if (type === 'AddedFile' && appNum === 1)
-                    return '';
-            }
-            const label = (type === 'AddedFile' && appNum === 1) ||
-                (type === 'DeletedFile' && appNum === 2)
-                ? `CREATE in APP ${appNum}`
-                : `OPEN in APP ${appNum}`;
-            const file = JSON.stringify(appNum === 1 ? filePathApp1 : filePathApp2);
-            const fixedTitle = getRelativePath(file);
-            return `
-<LaunchEditor file=${file} line={${line}}>
-	<span title="${fixedTitle}" className="${launchEditorClassName}">${label}</span>
-</LaunchEditor>`;
-        }
-        markdownLines.push(`
-<div className="relative">
-
-\`\`\`${lang} ${params}
-${lines.join('\n')}
-\`\`\`
-
-<div className="flex gap-4 absolute top-1 right-3 items-center">
-	${launchEditor(1, startLine)}
-	<div className="display-alt-down flex gap-2">
-		<LaunchEditor file=${JSON.stringify(filePathApp1)} syncTo={{file: ${JSON.stringify(filePathApp2)}}}>
-			<span className="block ${launchEditorClassName}">
-				<Icon name="ArrowLeft" title="Copy app 2 file to app 1" />
-			</span>
-		</LaunchEditor>
-		<LaunchEditor file=${JSON.stringify(filePathApp2)} syncTo={{file: ${JSON.stringify(filePathApp1)}}}>
-			<span className="block ${launchEditorClassName}">
-				<Icon name="ArrowRight" title="Copy app 1 file to app 2" />
-			</span>
-		</LaunchEditor>
-	</div>
-	${launchEditor(2, toStartLine)}
-</div>
-
-</div>
-`);
-    }
-    return markdownLines;
-}
 const DEFAULT_IGNORE_PATTERNS = [
     '**/README.*',
     '**/package-lock.json',
@@ -308,6 +186,51 @@ export async function getDiffFiles(app1, app2, { forceFresh, timings, request, }
 function getAppTestFiles(app) {
     return app.test.type === 'browser' ? app.test.testFiles : [];
 }
+function filterTestFilesFromPatch(patch, testFiles) {
+    if (!patch || testFiles.size === 0) {
+        return patch;
+    }
+    const normalizePath = (value) => value.replace(/^\.\/+/, '');
+    const parseDiffPaths = (line) => {
+        if (!line.startsWith('diff --git '))
+            return null;
+        const rest = line.slice('diff --git '.length);
+        const quotedMatch = rest.match(/^"a\/(.+)" "b\/(.+)"$/);
+        if (quotedMatch?.[1] && quotedMatch?.[2]) {
+            return {
+                a: normalizePath(quotedMatch[1]),
+                b: normalizePath(quotedMatch[2]),
+            };
+        }
+        const match = rest.match(/^a\/(.+) b\/(.+)$/);
+        if (match?.[1] && match?.[2]) {
+            return { a: normalizePath(match[1]), b: normalizePath(match[2]) };
+        }
+        return null;
+    };
+    const lines = patch.split('\n');
+    const filtered = [];
+    let currentBlock = [];
+    let includeBlock = true;
+    const flushBlock = () => {
+        if (currentBlock.length > 0 && includeBlock) {
+            filtered.push(...currentBlock);
+        }
+        currentBlock = [];
+    };
+    for (const line of lines) {
+        if (line.startsWith('diff --git ')) {
+            flushBlock();
+            const paths = parseDiffPaths(line);
+            includeBlock = paths
+                ? !testFiles.has(paths.a) && !testFiles.has(paths.b)
+                : true;
+        }
+        currentBlock.push(line);
+    }
+    flushBlock();
+    return filtered.join('\n');
+}
 async function getDiffFilesImpl(app1, app2) {
     if (app1.name === app2.name) {
         return [];
@@ -344,26 +267,23 @@ async function getDiffFilesImpl(app1, app2) {
     }))
         .filter((file) => !testFiles.includes(file.path));
 }
-export async function getDiffCode(app1, app2, { forceFresh, timings, request, } = {}) {
+export async function getDiffPatch(app1, app2, { forceFresh, timings, request, } = {}) {
     const key = `${app1.relativePath}__vs__${app2.relativePath}`;
-    const cacheEntry = await diffCodeCache.get(key);
+    const cacheEntry = await diffPatchCache.get(key);
     const result = await cachified({
         key,
-        cache: diffCodeCache,
+        cache: diffPatchCache,
         forceFresh: forceFresh || (await getForceFreshForDiff(app1, app2, cacheEntry)),
         timings,
         request,
         checkValue: z.string(),
-        getFreshValue: () => getDiffCodeImpl(app1, app2),
+        getFreshValue: () => getDiffPatchImpl(app1, app2),
     });
     return result;
 }
-async function getDiffCodeImpl(app1, app2) {
-    const markdownLines = [''];
+async function getDiffPatchImpl(app1, app2) {
     if (app1.name === app2.name) {
-        markdownLines.push('<p className="p-4 text-center">You are comparing the same app</p>');
-        const code = await compileMarkdownString(markdownLines.join('\n'));
-        return code;
+        return '';
     }
     const { app1CopyPath, app2CopyPath } = await prepareForDiff(app1, app2);
     const { stdout: diffOutput } = await execa('git', [
@@ -373,83 +293,28 @@ async function getDiffCodeImpl(app1, app2) {
         app2CopyPath,
         '--color=never',
         '--color-moved-ws=allow-indentation-change',
-        '--no-prefix',
         '--ignore-blank-lines',
         '--ignore-space-change',
     ], { cwd: diffTmpDir }).catch((e) => e);
     void fsExtra.remove(app1CopyPath).catch(() => { });
     void fsExtra.remove(app2CopyPath).catch(() => { });
-    const parsed = parseGitDiff(diffOutput);
-    if (!parsed.files.length) {
-        markdownLines.push('<div className="m-5 inline-flex items-center justify-center bg-foreground px-1 py-0.5 font-mono text-sm uppercase text-background">No changes</div>');
-    }
-    const app1TestFiles = getAppTestFiles(app1);
-    const app2TestFiles = getAppTestFiles(app2);
-    for (const file of parsed.files) {
-        const pathToCopy = file.type === 'RenamedFile' ? file.pathBefore : file.path;
-        const relativePath = diffPathToRelative(pathToCopy);
-        if (app1TestFiles.includes(relativePath))
-            continue;
-        const filePathApp1 = path.join(app1.fullPath, relativePath);
-        const pathToApp2 = file.type === 'RenamedFile' ? file.pathAfter : file.path;
-        const relativePathApp2 = diffPathToRelative(pathToApp2);
-        if (app2TestFiles.includes(relativePathApp2))
-            continue;
-        const filePathApp2 = path.join(app2.fullPath, relativePathApp2);
-        switch (file.type) {
-            case 'ChangedFile': {
-                markdownLines.push(`
-
-<Accordion title=${JSON.stringify(relativePath)} variant="changed">
-
-${getFileCodeblocks(file, filePathApp1, filePathApp2, file.type).join('\n')}
-
-</Accordion>
-
-`);
-                break;
-            }
-            case 'DeletedFile': {
-                markdownLines.push(`
-<Accordion title=${JSON.stringify(relativePath)} variant="deleted">
-
-${getFileCodeblocks(file, filePathApp1, filePathApp2, file.type).join('\n')}
-
-</Accordion>
-`);
-                break;
-            }
-            case 'RenamedFile': {
-                const relativeBefore = diffPathToRelative(file.pathBefore);
-                const relativeAfter = diffPathToRelative(file.pathAfter);
-                const title = JSON.stringify(`${relativeBefore} ▶️ ${relativeAfter}`);
-                markdownLines.push(`
-<Accordion title=${title} variant="renamed">
-
-${getFileCodeblocks(file, filePathApp1, filePathApp2, file.type).join('\n')}
-
-</Accordion>
-`);
-                break;
-            }
-            case 'AddedFile': {
-                markdownLines.push(`
-<Accordion title=${JSON.stringify(relativePath)} variant="added">
-
-${getFileCodeblocks(file, filePathApp1, filePathApp2, file.type).join('\n')}
-
-</Accordion>
-`);
-                break;
-            }
-            default: {
-                console.error(file);
-                throw new Error(`Unknown file type: ${file}`);
-            }
-        }
-    }
-    const code = await compileMarkdownString(markdownLines.join('\n'));
-    return code;
+    const normalizedOutput = String(diffOutput ?? '');
+    const app1Relative = app1CopyPath.slice(1);
+    const app2Relative = app2CopyPath.slice(1);
+    const testFiles = new Set([
+        ...getAppTestFiles(app1),
+        ...getAppTestFiles(app2),
+    ]);
+    const filteredOutput = filterTestFilesFromPatch(normalizedOutput
+        .replaceAll(`a${app1CopyPath}`, 'a')
+        .replaceAll(`b${app1CopyPath}`, 'b')
+        .replaceAll(`a${app2CopyPath}`, 'a')
+        .replaceAll(`b${app2CopyPath}`, 'b')
+        .replaceAll(`${app1CopyPath}/`, '')
+        .replaceAll(`${app2CopyPath}/`, '')
+        .replaceAll(`${app1Relative}/`, '')
+        .replaceAll(`${app2Relative}/`, ''), testFiles);
+    return filteredOutput;
 }
 export async function getDiffOutputWithRelativePaths(app1, app2) {
     const { app1CopyPath, app2CopyPath } = await prepareForDiff(app1, app2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-web/workshop-utils",
-  "version": "6.85.4",
+  "version": "6.85.5",
   "publishConfig": {
     "access": "public"
   },
@@ -237,7 +237,6 @@
     "remark-emoji": "^5.0.2",
     "remark-gfm": "^4.0.1",
     "shell-quote": "^1.8.3",
-    "shiki": "^3.22.0",
     "unified": "^11.0.5",
     "unist-util-remove-position": "^5.0.0",
     "unist-util-visit": "^5.1.0",