Skip to content

Commit fb6566c

Browse files
authored
resolve relative paths in sql front-matter table definitions (#1797)
closes #1796
1 parent 30e043c commit fb6566c

23 files changed

+70
-2
lines changed

src/resolvers.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import type {LoaderResolver} from "./loader.js";
1414
import type {MarkdownPage} from "./markdown.js";
1515
import {extractNodeSpecifier, resolveNodeImport, resolveNodeImports} from "./node.js";
1616
import {extractNpmSpecifier, populateNpmCache, resolveNpmImport, resolveNpmImports} from "./npm.js";
17-
import {isAssetPath, isPathImport, parseRelativeUrl, relativePath, resolveLocalPath, resolvePath} from "./path.js";
17+
import {isAssetPath, isPathImport, parseRelativeUrl} from "./path.js";
18+
import {relativePath, resolveLocalPath, resolvePath, resolveRelativePath} from "./path.js";
1819

1920
export interface Resolvers {
2021
path: string;
@@ -133,7 +134,7 @@ export async function getResolvers(page: MarkdownPage, config: ResolversConfig):
133134
for (const value of Object.values(page.data.sql)) {
134135
const source = String(value);
135136
if (isAssetPath(source)) {
136-
files.add(source);
137+
files.add(resolveRelativePath(path, source));
137138
}
138139
}
139140
}

test/input/build/sql/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
sql:
3+
table: /table.csv
4+
---
5+
6+
```sql echo
7+
FROM table
8+
```

test/input/build/sql/table.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
a,b
2+
1,2
3+
3,4

test/output/build/sql/_duckdb/json-e3b0c442/v1.1.1/wasm_eh/json.duckdb_extension.wasm

Whitespace-only changes.

test/output/build/sql/_duckdb/json-e3b0c442/v1.1.1/wasm_mvp/json.duckdb_extension.wasm

Whitespace-only changes.

test/output/build/sql/_duckdb/parquet-e3b0c442/v1.1.1/wasm_eh/parquet.duckdb_extension.wasm

Whitespace-only changes.

test/output/build/sql/_duckdb/parquet-e3b0c442/v1.1.1/wasm_mvp/parquet.duckdb_extension.wasm

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
a,b
2+
1,2
3+
3,4

test/output/build/sql/_npm/@duckdb/[email protected]/cd372fb8.js

Whitespace-only changes.

test/output/build/sql/_npm/@duckdb/[email protected]/dist/duckdb-browser-eh.worker.cd372fb8.js

Whitespace-only changes.

0 commit comments

Comments
 (0)