@duckdb/node-api 1.3.1-alpha.22 → 1.3.2-alpha.24

package/README.md

@@ -18,7 +18,6 @@ available separately as [@duckdb/node-bindings](https://www.npmjs.com/package/@d
 ### Roadmap
 
 Some features are not yet complete:
-* Binding and appending the MAP and UNION data types
 * Appending default values row-by-row
 * User-defined types & functions
 * Profiling info

package/lib/DuckDBAppender.d.ts

@@ -1,7 +1,7 @@
 import duckdb from '@duckdb/node-bindings';
 import { DuckDBDataChunk } from './DuckDBDataChunk';
-import { DuckDBArrayType, DuckDBEnumType, DuckDBListType, DuckDBStructType, DuckDBType } from './DuckDBType';
-import { DuckDBArrayValue, DuckDBBitValue, DuckDBDateValue, DuckDBDecimalValue, DuckDBIntervalValue, DuckDBListValue, DuckDBStructValue, DuckDBTimestampMillisecondsValue, DuckDBTimestampNanosecondsValue, DuckDBTimestampSecondsValue, DuckDBTimestampTZValue, DuckDBTimestampValue, DuckDBTimeTZValue, DuckDBTimeValue, DuckDBUUIDValue, DuckDBValue } from './values';
+import { DuckDBArrayType, DuckDBEnumType, DuckDBListType, DuckDBMapType, DuckDBStructType, DuckDBType, DuckDBUnionType } from './DuckDBType';
+import { DuckDBArrayValue, DuckDBBitValue, DuckDBDateValue, DuckDBDecimalValue, DuckDBIntervalValue, DuckDBListValue, DuckDBMapValue, DuckDBStructValue, DuckDBTimestampMillisecondsValue, DuckDBTimestampNanosecondsValue, DuckDBTimestampSecondsValue, DuckDBTimestampTZValue, DuckDBTimestampValue, DuckDBTimeTZValue, DuckDBTimeValue, DuckDBUnionValue, DuckDBUUIDValue, DuckDBValue } from './values';
 export declare class DuckDBAppender {
     private readonly appender;
     constructor(appender: duckdb.Appender);
@@ -39,7 +39,9 @@ export declare class DuckDBAppender {
     appendEnum(value: string, type: DuckDBEnumType): void;
     appendList(value: DuckDBListValue | readonly DuckDBValue[], type?: DuckDBListType): void;
     appendStruct(value: DuckDBStructValue | Readonly<Record<string, DuckDBValue>>, type?: DuckDBStructType): void;
+    appendMap(value: DuckDBMapValue, type?: DuckDBMapType): void;
     appendArray(value: DuckDBArrayValue | readonly DuckDBValue[], type?: DuckDBArrayType): void;
+    appendUnion(value: DuckDBUnionValue, type?: DuckDBUnionType): void;
     appendUUID(value: DuckDBUUIDValue): void;
     appendBit(value: DuckDBBitValue): void;
     appendVarInt(value: bigint): void;

package/lib/DuckDBAppender.js

@@ -118,11 +118,15 @@ class DuckDBAppender {
     appendStruct(value, type) {
         this.appendValue(value instanceof values_1.DuckDBStructValue ? value : (0, values_1.structValue)(value), type);
     }
-    // TODO: MAP (when DuckDB C API supports creating MAP values)
+    appendMap(value, type) {
+        this.appendValue(value, type);
+    }
     appendArray(value, type) {
         this.appendValue(value instanceof values_1.DuckDBArrayValue ? value : (0, values_1.arrayValue)(value), type);
     }
-    // TODO: UNION (when DuckDB C API supports creating UNION values)
+    appendUnion(value, type) {
+        this.appendValue(value, type);
+    }
     appendUUID(value) {
         this.appendValue(value, DuckDBType_1.UUID);
     }

package/lib/DuckDBConnection.d.ts

@@ -32,5 +32,6 @@ export declare class DuckDBConnection {
     prepare(sql: string): Promise<DuckDBPreparedStatement>;
     private createPrepared;
     extractStatements(sql: string): Promise<DuckDBExtractedStatements>;
+    private runUntilLast;
     createAppender(table: string, schema?: string | null, catalog?: string | null): Promise<DuckDBAppender>;
 }

package/lib/DuckDBConnection.js

@@ -41,7 +41,7 @@ class DuckDBConnection {
     }
     async run(sql, values, types) {
         if (values) {
-            const prepared = await this.createPrepared(sql);
+            const prepared = await this.runUntilLast(sql);
             try {
                 prepared.bind(values, types);
                 const result = await prepared.run();
@@ -69,7 +69,7 @@ class DuckDBConnection {
         return reader;
     }
     async stream(sql, values, types) {
-        const prepared = await this.createPrepared(sql);
+        const prepared = await this.runUntilLast(sql);
         try {
             if (values) {
                 prepared.bind(values, types);
@@ -95,7 +95,7 @@ class DuckDBConnection {
         return reader;
     }
     async start(sql, values, types) {
-        const prepared = await this.createPrepared(sql);
+        const prepared = await this.runUntilLast(sql);
         try {
             if (values) {
                 prepared.bind(values, types);
@@ -107,7 +107,7 @@ class DuckDBConnection {
         }
     }
     async startStream(sql, values, types) {
-        const prepared = await this.createPrepared(sql);
+        const prepared = await this.runUntilLast(sql);
         try {
             if (values) {
                 prepared.bind(values, types);
@@ -133,6 +133,22 @@ class DuckDBConnection {
         }
         return new DuckDBExtractedStatements_1.DuckDBExtractedStatements(this.connection, extracted_statements, statement_count, this.preparedStatements);
     }
+    async runUntilLast(sql) {
+        const extractedStatements = await this.extractStatements(sql);
+        const statementCount = extractedStatements.count;
+        if (statementCount > 1) {
+            for (let i = 0; i < statementCount - 1; i++) {
+                const prepared = await extractedStatements.prepare(i);
+                try {
+                    await prepared.run();
+                }
+                finally {
+                    prepared.destroySync();
+                }
+            }
+        }
+        return extractedStatements.prepare(statementCount - 1);
+    }
     async createAppender(table, schema, catalog) {
         return new DuckDBAppender_1.DuckDBAppender(node_bindings_1.default.appender_create_ext(this.connection, catalog ?? null, schema ?? null, table));
     }

package/lib/DuckDBPreparedStatement.d.ts

@@ -3,10 +3,10 @@ import { DuckDBMaterializedResult } from './DuckDBMaterializedResult';
 import { DuckDBPendingResult } from './DuckDBPendingResult';
 import { DuckDBResult } from './DuckDBResult';
 import { DuckDBResultReader } from './DuckDBResultReader';
-import { DuckDBArrayType, DuckDBEnumType, DuckDBListType, DuckDBStructType, DuckDBType } from './DuckDBType';
+import { DuckDBArrayType, DuckDBEnumType, DuckDBListType, DuckDBMapType, DuckDBStructType, DuckDBType, DuckDBUnionType } from './DuckDBType';
 import { DuckDBTypeId } from './DuckDBTypeId';
 import { StatementType } from './enums';
-import { DuckDBArrayValue, DuckDBBitValue, DuckDBDateValue, DuckDBDecimalValue, DuckDBIntervalValue, DuckDBListValue, DuckDBStructValue, DuckDBTimestampMillisecondsValue, DuckDBTimestampNanosecondsValue, DuckDBTimestampSecondsValue, DuckDBTimestampTZValue, DuckDBTimestampValue, DuckDBTimeTZValue, DuckDBTimeValue, DuckDBUUIDValue, DuckDBValue } from './values';
+import { DuckDBArrayValue, DuckDBBitValue, DuckDBDateValue, DuckDBDecimalValue, DuckDBIntervalValue, DuckDBListValue, DuckDBMapValue, DuckDBStructValue, DuckDBTimestampMillisecondsValue, DuckDBTimestampNanosecondsValue, DuckDBTimestampSecondsValue, DuckDBTimestampTZValue, DuckDBTimestampValue, DuckDBTimeTZValue, DuckDBTimeValue, DuckDBUnionValue, DuckDBUUIDValue, DuckDBValue } from './values';
 export declare class DuckDBPreparedStatement {
     private readonly prepared_statement;
     constructor(prepared_statement: duckdb.PreparedStatement);
@@ -48,6 +48,8 @@ export declare class DuckDBPreparedStatement {
     bindArray(parameterIndex: number, value: DuckDBArrayValue | readonly DuckDBValue[], type?: DuckDBArrayType): void;
     bindList(parameterIndex: number, value: DuckDBListValue | readonly DuckDBValue[], type?: DuckDBListType): void;
     bindStruct(parameterIndex: number, value: DuckDBStructValue | Readonly<Record<string, DuckDBValue>>, type?: DuckDBStructType): void;
+    bindMap(parameterIndex: number, value: DuckDBMapValue, type?: DuckDBMapType): void;
+    bindUnion(parameterIndex: number, value: DuckDBUnionValue, type?: DuckDBUnionType): void;
     bindUUID(parameterIndex: number, value: DuckDBUUIDValue): void;
     bindBit(parameterIndex: number, value: DuckDBBitValue): void;
     bindNull(parameterIndex: number): void;

package/lib/DuckDBPreparedStatement.js

@@ -133,7 +133,12 @@ class DuckDBPreparedStatement {
     bindStruct(parameterIndex, value, type) {
         this.bindValue(parameterIndex, value instanceof values_1.DuckDBStructValue ? value : (0, values_1.structValue)(value), type);
     }
-    // TODO: bind MAP, UNION
+    bindMap(parameterIndex, value, type) {
+        this.bindValue(parameterIndex, value, type);
+    }
+    bindUnion(parameterIndex, value, type) {
+        this.bindValue(parameterIndex, value, type);
+    }
     bindUUID(parameterIndex, value) {
         this.bindValue(parameterIndex, value, DuckDBType_1.UUID);
     }

package/lib/createValue.js

@@ -150,7 +150,16 @@ function createValue(type, input) {
             }
             throw new Error(`input is not a DuckDBStructValue`);
         case DuckDBTypeId_1.DuckDBTypeId.MAP:
-            throw new Error(`not yet implemented for MAP`); // TODO: implement when available
+            if (input instanceof values_1.DuckDBMapValue) {
+                if (type.keyType.typeId === DuckDBTypeId_1.DuckDBTypeId.ANY) {
+                    throw new Error('Cannot create maps with key type of ANY. Specify a specific type.');
+                }
+                if (type.valueType.typeId === DuckDBTypeId_1.DuckDBTypeId.ANY) {
+                    throw new Error('Cannot create maps with value type of ANY. Specify a specific type.');
+                }
+                return node_bindings_1.default.create_map_value(type.toLogicalType().logical_type, input.entries.map((entry) => createValue(type.keyType, entry.key)), input.entries.map((entry) => createValue(type.valueType, entry.value)));
+            }
+            throw new Error(`input is not a DuckDBMapValue`);
         case DuckDBTypeId_1.DuckDBTypeId.ARRAY:
             if (input instanceof values_1.DuckDBArrayValue) {
                 if (type.valueType.typeId === DuckDBTypeId_1.DuckDBTypeId.ANY) {
@@ -165,7 +174,15 @@ function createValue(type, input) {
             }
             throw new Error(`input is not a bigint`);
         case DuckDBTypeId_1.DuckDBTypeId.UNION:
-            throw new Error(`not yet implemented for UNION`); // TODO: implement when available
+            if (input instanceof values_1.DuckDBUnionValue) {
+                const tagIndex = type.memberIndexForTag(input.tag);
+                const memberType = type.memberTypes[tagIndex];
+                if (memberType.typeId === DuckDBTypeId_1.DuckDBTypeId.ANY) {
+                    throw new Error('Cannot create union values with type of ANY.');
+                }
+                return node_bindings_1.default.create_union_value(type.toLogicalType().logical_type, tagIndex, createValue(memberType, input.value));
+            }
+            throw new Error(`input is not a DuckDBUnionValue`);
         case DuckDBTypeId_1.DuckDBTypeId.BIT:
             if (input instanceof values_1.DuckDBBitValue) {
                 return node_bindings_1.default.create_bit(input.data);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@duckdb/node-api",
-  "version": "1.3.1-alpha.22",
+  "version": "1.3.2-alpha.24",
   "license": "MIT",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@duckdb/node-bindings": "1.3.1-alpha.22"
+    "@duckdb/node-bindings": "1.3.2-alpha.24"
   },
   "repository": {
     "type": "git",