@uwdata/mosaic-duckdb 0.16.1 → 0.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-duckdb",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "A Promise-based DuckDB API and Node.js data server.",
   "keywords": [
     "duckdb",
@@ -25,15 +25,15 @@
     "to-parquet": "./bin/to-parquet.js"
   },
   "scripts": {
+    "prebuild": "rimraf dist && mkdir dist",
     "lint": "eslint src test",
     "server": "node bin/run-server.js",
-    "test": "vitest run",
+    "test": "vitest run && tsc",
     "prepublishOnly": "npm run test && npm run lint"
   },
   "dependencies": {
-    "@uwdata/mosaic-sql": "^0.16.1",
-    "duckdb": "^1.2.1",
+    "@uwdata/mosaic-sql": "^0.17.0",
+    "duckdb": "~1.2.1",
     "ws": "^8.18.2"
-  },
-  "gitHead": "e12af9927b0a35a0e3194850ef569d0d24a022ce"
+  }
 }

package/src/data-server.js

@@ -1,12 +1,9 @@
 import http from 'node:http';
-import path from 'node:path';
 import url from 'node:url';
 import { WebSocketServer } from 'ws';
 import { Cache, cacheKey } from './Cache.js';
-import { createBundle, loadBundle } from './load/bundle.js';
 
 const CACHE_DIR = '.mosaic/cache';
-const BUNDLE_DIR = '.mosaic/bundle';
 
 export function dataServer(db, {
   cache = true,
@@ -121,19 +118,6 @@ export function queryHandler(db, queryCache) {
           // JSON response format
           res.json(await retrieve(query, sql => db.query(sql)));
           break;
-        case 'create-bundle':
-          // Create a named bundle of precomputed resources
-          await createBundle(
-            db, queryCache, query.queries,
-            path.resolve(BUNDLE_DIR, query.name)
-          );
-          res.done();
-          break;
-        case 'load-bundle':
-          // Load a named bundle of precomputed resources
-          await loadBundle(db, queryCache, path.resolve(BUNDLE_DIR, query.name));
-          res.done();
-          break;
         default:
           res.error(`Unrecognized command: ${type}`, 400);
       }

package/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "references": [{ "path": "../sql" }]
+}

package/LICENSE

@@ -1,47 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2023, UW Interactive Data Lab
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-Portions of this software are derived from Observable Plot, which is released
-under the ISC license.
-
-Copyright 2020-2023 Observable, Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright notice
-and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.

package/src/load/bundle.js

@@ -1,75 +0,0 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { cacheKey } from '../Cache.js';
-
-async function retrieve(db, cache, sql, type) {
-  const key = cacheKey(sql, type);
-  const cached = cache.get(key);
-  if (cached) return cached;
-  switch (type) {
-    case 'arrow':
-      return db.arrowBuffer(sql);
-    case 'json':
-      return JSON.stringify(await db.query(sql));
-    default:
-      throw new Error(`Unsupported query type: ${type}`);
-  }
-}
-
-export async function createBundle(db, cache, queries, dir) {
-  const describe_re = /^DESCRIBE /;
-  const pragma_re = /^PRAGMA /;
-  const view_re = /^CREATE( TEMP| TEMPORARY)? VIEW/;
-  const table_re = /^CREATE( TEMP| TEMPORARY)? TABLE( IF NOT EXISTS)? ([^\s]+)/;
-
-  const manifest = { tables: [], queries: [] };
-
-  await fs.mkdir(dir, { recursive: true });
-
-  const querySet = new Set(queries);
-  for (const query of querySet) {
-    const sql = typeof query === 'string' ? query : query.sql;
-    if (query.alias) {
-      const table = query.alias;
-      const file = path.resolve(dir, `${table}.parquet`);
-      await db.exec(`COPY (${sql}) TO '${file}' (FORMAT PARQUET)`);
-      manifest.tables.push(table);
-    } else if (sql.startsWith('CREATE ')) {
-      // table or view
-      if (view_re.test(sql)) continue; // ignore views
-      const table = sql.match(table_re)?.[3];
-      const file = path.resolve(dir, `${table}.parquet`);
-      await db.exec(`${sql}`);
-      await db.exec(`COPY ${table} TO '${file}' (FORMAT PARQUET)`);
-      manifest.tables.push(table);
-    } else if (!pragma_re.test(sql)) {
-      // select query
-      const type = describe_re.test(sql) ? 'json' : 'arrow';
-      const key = cacheKey(sql, type);
-      const result = await retrieve(db, cache, sql, type);
-      await fs.writeFile(path.resolve(dir, key), result);
-      manifest.queries.push(key);
-    }
-  }
-
-  await fs.writeFile(path.resolve(dir, 'bundle.json'), JSON.stringify(manifest, 0, 2));
-  return manifest;
-}
-
-export async function loadBundle(db, cache, dir) {
-  const manifest = JSON.parse(await fs.readFile(path.resolve(dir, 'bundle.json')));
-
-  // load precomputed query results into the cache
-  for (const key of manifest.queries) {
-    const file = path.resolve(dir, key);
-    const json = path.extname(file) === '.json';
-    const data = await fs.readFile(file);
-    cache.set(key, json ? JSON.parse(data) : data);
-  }
-
-  // load precomputed tables into the database
-  for (const table of manifest.tables) {
-    const file = path.resolve(dir, `${table}.parquet`);
-    await db.exec(`CREATE TABLE IF NOT EXISTS ${table} AS SELECT * FROM '${file}'`);
-  }
-}