@perspective-dev/client 5.5.1 → 5.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +66 -2
- package/dist/cdn/perspective-server.worker.js +1 -1
- package/dist/cdn/perspective-server.worker.js.map +3 -3
- package/dist/cdn/perspective.js +2 -2
- package/dist/cdn/perspective.js.map +4 -4
- package/dist/esm/perspective.js +2 -2
- package/dist/esm/perspective.js.map +4 -4
- package/dist/esm/perspective.node.js +200 -66
- package/dist/esm/perspective.node.js.map +2 -2
- package/dist/esm/ts-rs/Features.d.ts +5 -0
- package/dist/esm/ts-rs/TableInitOptions.d.ts +8 -0
- package/dist/esm/ts-rs/TypedArrayWindow.d.ts +5 -4
- package/dist/esm/ts-rs/ViewWindow.d.ts +5 -4
- package/dist/esm/virtual_servers/clickhouse.js +1 -1
- package/dist/esm/virtual_servers/clickhouse.js.map +3 -3
- package/dist/esm/virtual_servers/duckdb.d.ts +7 -1
- package/dist/esm/virtual_servers/duckdb.js +1 -1
- package/dist/esm/virtual_servers/duckdb.js.map +3 -3
- package/dist/wasm/perspective-js.d.ts +97 -19
- package/dist/wasm/perspective-js.js +172 -45
- package/dist/wasm/perspective-js.wasm +0 -0
- package/dist/wasm/perspective-js.wasm.d.ts +11 -7
- package/package.json +20 -15
- package/src/rust/client.rs +2 -1
- package/src/rust/generic_sql_model.rs +70 -6
- package/src/rust/table.rs +33 -1
- package/src/rust/view.rs +14 -5
- package/src/rust/virtual_server.rs +101 -23
- package/src/ts/ts-rs/Features.ts +6 -1
- package/src/ts/ts-rs/TableInitOptions.ts +7 -1
- package/src/ts/ts-rs/TypedArrayWindow.ts +5 -4
- package/src/ts/ts-rs/ViewWindow.ts +5 -4
- package/src/ts/virtual_servers/clickhouse.ts +99 -4
- package/src/ts/virtual_servers/duckdb.ts +116 -6
- package/src/ts/wasm/engine.ts +26 -35
- package/dist/esm/perspective.inline.js +0 -3
- package/dist/esm/perspective.inline.js.map +0 -7
- package/src/ts/perspective.inline.ts +0 -27
|
@@ -24,6 +24,10 @@
|
|
|
24
24
|
import type * as perspective from "@perspective-dev/client";
|
|
25
25
|
import type { ColumnType } from "@perspective-dev/client/dist/esm/ts-rs/ColumnType.d.ts";
|
|
26
26
|
import type { ViewConfig } from "@perspective-dev/client/dist/esm/ts-rs/ViewConfig.d.ts";
|
|
27
|
+
import type {
|
|
28
|
+
ExpressionError,
|
|
29
|
+
TableDescription,
|
|
30
|
+
} from "@perspective-dev/client";
|
|
27
31
|
import type { ViewConfigUpdate } from "@perspective-dev/client/dist/esm/ts-rs/ViewConfigUpdate.d.ts";
|
|
28
32
|
import type { ViewWindow } from "@perspective-dev/client/dist/esm/ts-rs/ViewWindow.d.ts";
|
|
29
33
|
import type { WindowAggSpec } from "@perspective-dev/client/dist/esm/ts-rs/WindowAggSpec.d.ts";
|
|
@@ -295,6 +299,7 @@ export class DuckDBHandler implements perspective.VirtualServerHandler {
|
|
|
295
299
|
split_by: true,
|
|
296
300
|
sort: true,
|
|
297
301
|
expressions: true,
|
|
302
|
+
view_derivations: true,
|
|
298
303
|
window_aggregates: {
|
|
299
304
|
// `ema` is recursive and has no SQL window translation.
|
|
300
305
|
integer: WINDOW_AGGREGATES,
|
|
@@ -386,15 +391,116 @@ export class DuckDBHandler implements perspective.VirtualServerHandler {
|
|
|
386
391
|
await runQuery(this.db, query);
|
|
387
392
|
}
|
|
388
393
|
|
|
389
|
-
async
|
|
390
|
-
|
|
394
|
+
async tableDescribe(
|
|
395
|
+
tableId: string,
|
|
396
|
+
config: ViewConfig,
|
|
397
|
+
): Promise<TableDescription> {
|
|
398
|
+
let expression_schema = {} as Record<string, ColumnType>;
|
|
399
|
+
const expressions_query = this.sqlBuilder.expressionsDescribe(
|
|
400
|
+
tableId,
|
|
401
|
+
config,
|
|
402
|
+
);
|
|
403
|
+
|
|
404
|
+
if (expressions_query !== undefined) {
|
|
405
|
+
try {
|
|
406
|
+
expression_schema = await this.describeQuery(expressions_query);
|
|
407
|
+
} catch (error) {
|
|
408
|
+
return await this.attributeExpressionErrors(
|
|
409
|
+
tableId,
|
|
410
|
+
config,
|
|
411
|
+
error,
|
|
412
|
+
);
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
const schema = Object.keys(config.windows ?? {}).length
|
|
417
|
+
? await this.tableSchema(tableId)
|
|
418
|
+
: undefined;
|
|
419
|
+
|
|
420
|
+
const view_query = this.sqlBuilder.tableDescribe(
|
|
391
421
|
tableId,
|
|
392
|
-
|
|
422
|
+
config,
|
|
423
|
+
schema,
|
|
393
424
|
);
|
|
425
|
+
|
|
426
|
+
let view_schema = {} as Record<string, ColumnType>;
|
|
427
|
+
if (view_query !== undefined) {
|
|
428
|
+
try {
|
|
429
|
+
view_schema = await this.describeQuery(view_query);
|
|
430
|
+
} catch (error) {
|
|
431
|
+
return { config_error: errorMessage(error) };
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
|
|
435
|
+
return { expression_schema, view_schema };
|
|
436
|
+
}
|
|
437
|
+
|
|
438
|
+
/** The planned result columns of one `DESCRIBE` query. */
|
|
439
|
+
private async describeQuery(query: string) {
|
|
394
440
|
const results = await runQuery(this.db, query);
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
441
|
+
const schema = {} as Record<string, ColumnType>;
|
|
442
|
+
for (const result of results) {
|
|
443
|
+
const res = result.toJSON();
|
|
444
|
+
if (!res.column_name.startsWith("__")) {
|
|
445
|
+
schema[res.column_name] = duckdbTypeToPsp(
|
|
446
|
+
res.column_type,
|
|
447
|
+
) as ColumnType;
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
|
|
451
|
+
return schema;
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
/** Plans each expression on its own to name the ones at fault. */
|
|
455
|
+
private async attributeExpressionErrors(
|
|
456
|
+
tableId: string,
|
|
457
|
+
config: ViewConfig,
|
|
458
|
+
error: unknown,
|
|
459
|
+
): Promise<TableDescription> {
|
|
460
|
+
const expression_schema = {} as Record<string, ColumnType>;
|
|
461
|
+
const expression_errors = {} as Record<string, ExpressionError>;
|
|
462
|
+
for (const [name, expression] of Object.entries(config.expressions)) {
|
|
463
|
+
const query = this.sqlBuilder.expressionDescribe(
|
|
464
|
+
tableId,
|
|
465
|
+
expression!,
|
|
466
|
+
);
|
|
467
|
+
|
|
468
|
+
try {
|
|
469
|
+
const results = await runQuery(this.db, query);
|
|
470
|
+
expression_schema[name] = duckdbTypeToPsp(
|
|
471
|
+
results[0].toJSON()["column_type"],
|
|
472
|
+
) as ColumnType;
|
|
473
|
+
} catch (error) {
|
|
474
|
+
expression_errors[name] = {
|
|
475
|
+
error_message: errorMessage(error),
|
|
476
|
+
line: 0,
|
|
477
|
+
column: 0,
|
|
478
|
+
};
|
|
479
|
+
}
|
|
480
|
+
}
|
|
481
|
+
|
|
482
|
+
if (Object.keys(expression_errors).length === 0) {
|
|
483
|
+
return { config_error: errorMessage(error) };
|
|
484
|
+
}
|
|
485
|
+
|
|
486
|
+
return { expression_schema, expression_errors };
|
|
487
|
+
}
|
|
488
|
+
|
|
489
|
+
async viewMakeTable(
|
|
490
|
+
viewId: string,
|
|
491
|
+
tableId: string,
|
|
492
|
+
config: ViewConfig,
|
|
493
|
+
schema?: Record<string, ColumnType>,
|
|
494
|
+
) {
|
|
495
|
+
const query = this.sqlBuilder.viewMakeTable(
|
|
496
|
+
viewId,
|
|
497
|
+
tableId,
|
|
498
|
+
config,
|
|
499
|
+
await this.tableSchema(viewId),
|
|
500
|
+
schema,
|
|
501
|
+
);
|
|
502
|
+
|
|
503
|
+
await runQuery(this.db, query);
|
|
398
504
|
}
|
|
399
505
|
|
|
400
506
|
async viewDelete(viewId: string) {
|
|
@@ -437,3 +543,7 @@ export class DuckDBHandler implements perspective.VirtualServerHandler {
|
|
|
437
543
|
dataSlice.fromArrowIpc(ipc);
|
|
438
544
|
}
|
|
439
545
|
}
|
|
546
|
+
|
|
547
|
+
function errorMessage(error: unknown): string {
|
|
548
|
+
return error instanceof Error ? error.message : String(error);
|
|
549
|
+
}
|
package/src/ts/wasm/engine.ts
CHANGED
|
@@ -247,7 +247,8 @@ async function convert_typed_array_to_pointer(
|
|
|
247
247
|
*
|
|
248
248
|
* @param callback A callback to which is passed the responses. THe responses
|
|
249
249
|
* must be fully processed or copied before the callback returns, as it
|
|
250
|
-
* references memory on the wasm stack
|
|
250
|
+
* references memory on the wasm stack, which a `callback` that allocates may
|
|
251
|
+
* also detach - hence the message descriptors are read before dispatching.
|
|
251
252
|
*/
|
|
252
253
|
async function decode_api_responses(
|
|
253
254
|
core: MainModule,
|
|
@@ -255,28 +256,32 @@ async function decode_api_responses(
|
|
|
255
256
|
callback: (_: ApiResponse) => Promise<void>,
|
|
256
257
|
) {
|
|
257
258
|
const is_64 = core._psp_is_memory64();
|
|
259
|
+
const response_ptr = is_64 ? Number(ptr) : Number(ptr) >>> 0;
|
|
258
260
|
const response = new DataView(
|
|
259
261
|
core.HEAPU8.buffer,
|
|
260
|
-
|
|
262
|
+
response_ptr,
|
|
261
263
|
is_64 ? 12 : 8,
|
|
262
264
|
);
|
|
263
265
|
|
|
264
266
|
const num_msgs = response.getUint32(0, true);
|
|
265
|
-
const msgs_ptr =
|
|
266
|
-
? response.getBigInt64(4, true)
|
|
267
|
-
|
|
267
|
+
const msgs_ptr = Number(
|
|
268
|
+
is_64 ? response.getBigInt64(4, true) : response.getUint32(4, true),
|
|
269
|
+
);
|
|
268
270
|
|
|
269
271
|
const messages = new DataView(
|
|
270
272
|
core.HEAPU8.buffer,
|
|
271
|
-
|
|
273
|
+
msgs_ptr,
|
|
272
274
|
num_msgs * (is_64 ? 16 : 12),
|
|
273
275
|
);
|
|
274
276
|
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
277
|
+
const free = (x: number) => core._psp_free((is_64 ? BigInt(x) : x) as any);
|
|
278
|
+
|
|
279
|
+
const descriptors: [number, number, number][] = [];
|
|
280
|
+
for (let i = 0; i < num_msgs; i++) {
|
|
281
|
+
descriptors.push(
|
|
282
|
+
is_64
|
|
278
283
|
? [
|
|
279
|
-
messages.getBigInt64(i * 16, true),
|
|
284
|
+
Number(messages.getBigInt64(i * 16, true)),
|
|
280
285
|
messages.getInt32(i * 16 + 8, true),
|
|
281
286
|
messages.getInt32(i * 16 + 12, true),
|
|
282
287
|
]
|
|
@@ -284,35 +289,21 @@ async function decode_api_responses(
|
|
|
284
289
|
messages.getUint32(i * 12, true),
|
|
285
290
|
messages.getUint32(i * 12 + 4, true),
|
|
286
291
|
messages.getInt32(i * 12 + 8, true),
|
|
287
|
-
]
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
core.HEAPU8.buffer,
|
|
291
|
-
Number(data_ptr),
|
|
292
|
-
data_len,
|
|
293
|
-
);
|
|
292
|
+
],
|
|
293
|
+
);
|
|
294
|
+
}
|
|
294
295
|
|
|
295
|
-
|
|
296
|
-
|
|
296
|
+
try {
|
|
297
|
+
for (const [data_ptr, data_len, client_id] of descriptors) {
|
|
298
|
+
const data = new Uint8Array(core.HEAPU8.buffer, data_ptr, data_len);
|
|
299
|
+
await callback({ client_id, data });
|
|
297
300
|
}
|
|
298
301
|
} finally {
|
|
299
|
-
for (
|
|
300
|
-
|
|
301
|
-
? messages.getBigInt64(i * 16, true)
|
|
302
|
-
: messages.getInt32(i * 12, true);
|
|
303
|
-
|
|
304
|
-
core._psp_free(data_ptr as any);
|
|
302
|
+
for (const [data_ptr] of descriptors) {
|
|
303
|
+
free(data_ptr);
|
|
305
304
|
}
|
|
306
305
|
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
? (BigInt(messages.byteOffset) as any as number)
|
|
310
|
-
: (messages.byteOffset as any),
|
|
311
|
-
);
|
|
312
|
-
core._psp_free(
|
|
313
|
-
is_64
|
|
314
|
-
? (BigInt(response.byteOffset) as any as number)
|
|
315
|
-
: (response.byteOffset as any),
|
|
316
|
-
);
|
|
306
|
+
free(msgs_ptr);
|
|
307
|
+
free(response_ptr);
|
|
317
308
|
}
|
|
318
309
|
}
|