Skip to content

Commit 724009e

Browse files
authored
unpin parquet-wasm (#1273)
1 parent ca7636a commit 724009e

File tree

6 files changed

+6
-13
lines changed

6 files changed

+6
-13
lines changed

examples/api/docs/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
```js
2-
import "npm:apache-arrow";
3-
import "npm:parquet-wasm/esm/arrow1.js";
42
import {ApiHeatmap} from "./components/apiHeatmap.js";
53
import {ApiHistogram} from "./components/apiHistogram.js";
64
```

src/client/stdlib/fileAttachment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class AbstractFile {
7272
return Arrow.tableFromIPC(response);
7373
}
7474
async parquet() {
75-
const [Arrow, Parquet, buffer] = await Promise.all([import("npm:apache-arrow"), import("npm:parquet-wasm/esm/arrow1.js").then(async (Parquet) => (await Parquet.default(), Parquet)), this.arrayBuffer()]); // prettier-ignore
75+
const [Arrow, Parquet, buffer] = await Promise.all([import("npm:apache-arrow"), import("npm:parquet-wasm").then(async (Parquet) => (await Parquet.default(import.meta.resolve("npm:parquet-wasm/esm/parquet_wasm_bg.wasm")), Parquet)), this.arrayBuffer()]); // prettier-ignore
7676
return Arrow.tableFromIPC(Parquet.readParquet(new Uint8Array(buffer)).intoIPCStream());
7777
}
7878
async sqlite() {

src/libraries.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export function getImplicitFileImports(methods: Iterable<string>): Set<string> {
33
const implicits = new Set<string>();
44
if (set.has("arrow")) implicits.add("npm:apache-arrow");
55
if (set.has("csv") || set.has("tsv")) implicits.add("npm:d3-dsv");
6-
if (set.has("parquet")) implicits.add("npm:apache-arrow").add("npm:parquet-wasm/esm/arrow1.js");
6+
if (set.has("parquet")) implicits.add("npm:apache-arrow").add("npm:parquet-wasm");
77
if (set.has("sqlite")) implicits.add("npm:@observablehq/sqlite");
88
if (set.has("xlsx")) implicits.add("npm:@observablehq/xlsx");
99
if (set.has("zip")) implicits.add("npm:@observablehq/zip");
@@ -140,11 +140,8 @@ export function getImplicitDownloads(imports: Iterable<string>): Set<string> {
140140
implicits.add("npm:katex/dist/fonts/KaTeX_Typewriter-Regular.woff");
141141
implicits.add("npm:katex/dist/fonts/KaTeX_Typewriter-Regular.woff2");
142142
}
143-
if (set.has("npm:parquet-wasm/esm/arrow1.js")) {
144-
implicits.add("npm:parquet-wasm/esm/arrow1_bg.wasm");
145-
}
146-
if (set.has("npm:parquet-wasm/esm/arrow2.js")) {
147-
implicits.add("npm:parquet-wasm/esm/arrow2_bg.wasm");
143+
if (set.has("npm:parquet-wasm")) {
144+
implicits.add("npm:parquet-wasm/esm/parquet_wasm_bg.wasm");
148145
}
149146
return implicits;
150147
}

src/npm.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ export async function resolveNpmImport(root: string, specifier: string): Promise
246246
name,
247247
range = name === "@duckdb/duckdb-wasm"
248248
? "1.28.0" // https://github.com/duckdb/duckdb-wasm/issues/1561
249-
: name === "parquet-wasm"
250-
? "0.5.0" // https://github.com/observablehq/framework/issues/733
251249
: undefined,
252250
path = name === "mermaid"
253251
? "dist/mermaid.esm.min.mjs/+esm"

test/libraries-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ describe("getImplicitFileImports(files)", () => {
77
assert.deepStrictEqual(getImplicitFileImports(["csv"]), new Set(["npm:d3-dsv"]));
88
assert.deepStrictEqual(getImplicitFileImports(["tsv"]), new Set(["npm:d3-dsv"]));
99
assert.deepStrictEqual(getImplicitFileImports(["arrow"]), new Set(["npm:apache-arrow"]));
10-
assert.deepStrictEqual(getImplicitFileImports(["parquet"]), new Set(["npm:apache-arrow", "npm:parquet-wasm/esm/arrow1.js"])); // prettier-ignore
10+
assert.deepStrictEqual(getImplicitFileImports(["parquet"]), new Set(["npm:apache-arrow", "npm:parquet-wasm"]));
1111
assert.deepStrictEqual(getImplicitFileImports(["sqlite"]), new Set(["npm:@observablehq/sqlite"]));
1212
assert.deepStrictEqual(getImplicitFileImports(["xlsx"]), new Set(["npm:@observablehq/xlsx"]));
1313
assert.deepStrictEqual(getImplicitFileImports(["zip"]), new Set(["npm:@observablehq/zip"]));

test/mocks/jsdelivr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const packages: [name: string, {version: string; dependencies?: Record<string, s
2020
["lodash", {version: "4.17.21"}],
2121
["mapbox-gl", {version: "3.1.2"}],
2222
["mermaid", {version: "10.6.1"}],
23-
["parquet-wasm", {version: "0.6.0-beta.1"}],
23+
["parquet-wasm", {version: "0.6.0"}],
2424
["sql.js", {version: "1.9.0"}],
2525
["topojson-client", {version: "3.1.0"}]
2626
];

0 commit comments

Comments
 (0)