From 3c7b7de7510460a1221581948bb4d332bf99fe53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 9 Mar 2023 12:48:08 +0100 Subject: [PATCH] duckdb-wasm@1.24 depends on arrow11 --- bin/resolve-dependencies.js | 4 ++++ src/arrow.js | 2 +- src/dependencies.js | 1 + src/fileAttachment.js | 6 +++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/resolve-dependencies.js b/bin/resolve-dependencies.js index eb48a01e..e04c7ff7 100644 --- a/bin/resolve-dependencies.js +++ b/bin/resolve-dependencies.js @@ -67,6 +67,10 @@ const mains = ["unpkg", "jsdelivr", "browser", "main"]; const info = await resolve("apache-arrow@9"); console.log(`export const arrow9 = dependency("${info.name}", "${info.version}", "+esm");`); } + { + const info = await resolve("apache-arrow@11"); + console.log(`export const arrow11 = dependency("${info.name}", "${info.version}", "+esm");`); + } { const info = await resolve("arquero"); console.log(`export const arquero = dependency("${info.name}", "${info.version}", "${info.export}");`); diff --git a/src/arrow.js b/src/arrow.js index 34e1fb4f..6dced761 100644 --- a/src/arrow.js +++ b/src/arrow.js @@ -1,4 +1,4 @@ -import {arrow9 as arrow} from "./dependencies.js"; +import {arrow11 as arrow} from "./dependencies.js"; import {cdn} from "./require.js"; // Returns true if the vaue is an Apache Arrow table. This uses a “duck” test diff --git a/src/dependencies.js b/src/dependencies.js index b6552916..809d1f8b 100644 --- a/src/dependencies.js +++ b/src/dependencies.js @@ -15,6 +15,7 @@ export const vegalite = dependency("vega-lite", "5.6.0", "build/vega-lite.min.js export const vegaliteApi = dependency("vega-lite-api", "5.0.0", "build/vega-lite-api.min.js"); export const arrow4 = dependency("apache-arrow", "4.0.1", "Arrow.es2015.min.js"); export const arrow9 = dependency("apache-arrow", "9.0.0", "+esm"); +export const arrow11 = dependency("apache-arrow", "11.0.0", "+esm"); export const arquero = dependency("arquero", "4.8.8", "dist/arquero.min.js"); export const topojson = dependency("topojson-client", "3.1.0", "dist/topojson-client.min.js"); export const exceljs = dependency("exceljs", "4.3.0", "dist/exceljs.min.js"); diff --git a/src/fileAttachment.js b/src/fileAttachment.js index 07c8aeb9..42942d68 100644 --- a/src/fileAttachment.js +++ b/src/fileAttachment.js @@ -1,5 +1,5 @@ import {autoType, csvParse, csvParseRows, tsvParse, tsvParseRows} from "d3-dsv"; -import {arrow4, arrow9, jszip, exceljs} from "./dependencies.js"; +import {arrow4, arrow9, arrow11, jszip, exceljs} from "./dependencies.js"; import {cdn, requireDefault} from "./require.js"; import {SQLiteDatabaseClient} from "./sqlite.js"; import {Workbook} from "./xlsx.js"; @@ -66,6 +66,10 @@ export class AbstractFile { const [Arrow, response] = await Promise.all([import(`${cdn}${arrow9.resolve()}`), remote_fetch(this)]); return Arrow.tableFromIPC(response); } + case 11: { + const [Arrow, response] = await Promise.all([import(`${cdn}${arrow11.resolve()}`), remote_fetch(this)]); + return Arrow.tableFromIPC(response); + } default: throw new Error(`unsupported arrow version: ${version}`); } }