A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: better virtual file matching (#7094)
Myles Scolnick3c24f73f5fbb
diff --git a/frontend/src/core/static/__tests__/virtual-file-tracker.test.ts b/frontend/src/core/static/__tests__/virtual-file-tracker.test.tsindex b34082edc7..5d74cb0d48 100644--- a/frontend/src/core/static/__tests__/virtual-file-tracker.test.ts+++ b/frontend/src/core/static/__tests__/virtual-file-tracker.test.ts@@ -56,6 +56,48 @@ describe("findVirtualFiles", () => {const result = findVirtualFiles(input);expect(result).toEqual(expected);});++ it("should match virtual files with HTML entity endings", () => {+ const input = '"/@file/938947-3587525-4XcHZISt.csv""';+ const expected = new Set(["/@file/938947-3587525-4XcHZISt.csv"]);+ const result = findVirtualFiles(input);+ expect(result).toEqual(expected);+ });++ it("should not match virtual files with mismatched quotes", () => {+ const input = "'/@file/938947-3587525-4XcHZISt.csv\"'";+ const expected = new Set(["/@file/938947-3587525-4XcHZISt.csv"]);+ const result = findVirtualFiles(input);+ expect(result).toEqual(expected);+ });++ it("should match virtual files followed by quotes", () => {+ const input = '/@file/test-file.csv"';+ const expected = new Set(["/@file/test-file.csv"]);+ const result = findVirtualFiles(input);+ expect(result).toEqual(expected);+ });++ it("should match valid virtual files even when surrounded by proper quotes", () => {+ const input = '"/@file/test-file.csv"';+ const expected = new Set(["/@file/test-file.csv"]);+ const result = findVirtualFiles(input);+ expect(result).toEqual(expected);+ });++ it("should extremely long greedy matching", () => {+ const input = `/@file/test-file.csv","format":{"type":"csv"}},"mark":{"type":"circle","size":4},"encoding":{"color":{"field":"digit","type":"nominal"},"x":{"field":"x","scale":{"domain":[-2.5,2.5]},"type":"quantitative"},"y":{"field":"y","scale":{"domain":[-2.5,2.5. Error: [Errno 63] File name too long: '/3587525-4XcHZISt.csv","format":{"type":"csv"}},"mark":{"type":"circle","size":4},"encoding":{"color":{"field":"digit","type":"nominal"},"x":{"field":"x","scale":{"domain":[-2.5,2.5]},"type":"quantitative"},"y":{"field":"y","scale":{"domain":[-2.5,2.5'`;+ const expected = new Set(["/@file/test-file.csv"]);+ const result = findVirtualFiles(input);+ expect(result).toEqual(expected);+ });++ it("should not match virtual files with quotes in the filename", () => {+ const input = '/@file/file".csv';+ const expected = new Set();+ const result = findVirtualFiles(input);+ expect(result).toEqual(expected);+ });});describe("VirtualFileTracker", () => {diff --git a/frontend/src/core/static/virtual-file-tracker.ts b/frontend/src/core/static/virtual-file-tracker.tsindex 32ffeede53..8b53ed0b9a 100644--- a/frontend/src/core/static/virtual-file-tracker.ts+++ b/frontend/src/core/static/virtual-file-tracker.ts@@ -4,7 +4,7 @@ import type { CellId } from "../cells/ids";import type { CellMessage } from "../kernel/messages";// Virtual files are of the form /@file/<file-name>.<extension>-const VIRTUAL_FILE_REGEX = /\/@file\/([^\s/]+)\.([\dA-Za-z]+)/g;+const VIRTUAL_FILE_REGEX = /\/@file\/([^\s/"'&]+)\.([\dA-Za-z]+)/g;/*** Tracks virtual files that are present on the page.