@leonardovida-md/drizzle-neo-duckdb 2.1.2 → 2.2.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/dist/helpers.d.ts CHANGED
@@ -1 +1 @@
1
- export { duckDbList, duckDbArray, duckDbMap, duckDbStruct, duckDbJson, duckDbBlob, duckDbInet, duckDbInterval, duckDbTimestamp, duckDbDate, duckDbTime, duckDbArrayContains, duckDbArrayContained, duckDbArrayOverlaps, } from './columns.ts';
1
+ export { duckDbList, duckDbArray, duckDbMap, duckDbStruct, duckDbUnion, duckDbJson, duckDbBlob, duckDbInet, duckDbInterval, duckDbTimestamp, duckDbDate, duckDbTime, duckDbArrayContains, duckDbArrayContained, duckDbArrayOverlaps, } from './columns.ts';
package/dist/helpers.mjs CHANGED
@@ -184,9 +184,22 @@ function timestampStringFromMicros(micros, withTimezone) {
184
184
  seconds -= 1n;
185
185
  fraction += 1000000n;
186
186
  }
187
- const base = new Date(Number(seconds) * 1000).toISOString().replace(/\.\d+Z$/, "").replace("T", " ");
187
+ const date = new Date(Number(seconds) * 1000);
188
+ const time = date.toISOString().slice(11, 19);
188
189
  const digits = fraction === 0n ? "" : `.${pad(fraction, 6).replace(/0+$/, "")}`;
189
- return `${base}${digits}${withTimezone ? "+00" : ""}`;
190
+ const [day, era] = splitEra(dateStringFromDate(date));
191
+ return `${day}${era} ${time}${digits}${withTimezone ? "+00" : ""}`;
192
+ }
193
+ function splitEra(text) {
194
+ return text.endsWith(" (BC)") ? [text.slice(0, -5), " (BC)"] : [text, ""];
195
+ }
196
+ function dateStringFromDate(value) {
197
+ const year = value.getUTCFullYear();
198
+ const bc = year <= 0;
199
+ const month = String(value.getUTCMonth() + 1).padStart(2, "0");
200
+ const day = String(value.getUTCDate()).padStart(2, "0");
201
+ const text = `${String(bc ? 1 - year : year).padStart(4, "0")}-${month}-${day}`;
202
+ return bc ? `${text} (BC)` : text;
190
203
  }
191
204
  function pluralUnit(value, unit) {
192
205
  return `${value} ${unit}${Math.abs(value) === 1 ? "" : "s"}`;
@@ -262,6 +275,15 @@ function parseStructSchema(typeHint) {
262
275
  }
263
276
  return fields;
264
277
  }
278
+ function parseMapType(typeHint) {
279
+ const match = /^MAP\s*\((.*)\)$/is.exec(typeHint?.trim() ?? "");
280
+ if (!match)
281
+ return;
282
+ const parts = splitTopLevel(match[1], ",");
283
+ if (parts.length !== 2)
284
+ return;
285
+ return { keyType: parts[0].trim(), valueType: parts[1].trim() };
286
+ }
265
287
  function arrayElementType(typeHint) {
266
288
  if (!typeHint)
267
289
  return;
@@ -295,7 +317,7 @@ function formatLiteral(value, typeHint) {
295
317
  return blobLiteral(value);
296
318
  }
297
319
  if (typeof value === "number") {
298
- return Number.isFinite(value) ? value.toString() : `'${value}'::DOUBLE`;
320
+ return Number.isFinite(value) && !Object.is(value, -0) ? value.toString() : `'${Object.is(value, -0) ? "-0" : value}'::DOUBLE`;
299
321
  }
300
322
  if (typeof value === "bigint") {
301
323
  return value.toString();
@@ -315,7 +337,8 @@ function buildListLiteral(values, elementType) {
315
337
  return elementType ? sql.raw(`[]::${elementType}[]`) : sql`[]`;
316
338
  }
317
339
  const chunks = values.map((v) => valueToSqlLiteral(v, elementType));
318
- return sql`list_value(${sql.join(chunks, sql.raw(", "))})`;
340
+ const list = sql`list_value(${sql.join(chunks, sql.raw(", "))})`;
341
+ return elementType ? sql`${list}::${sql.raw(elementType)}[]` : list;
319
342
  }
320
343
  function normalizeArrayPredicateValue(values, elementType) {
321
344
  return Array.isArray(values) ? buildListLiteral(values, elementType) : values;
@@ -331,7 +354,8 @@ function valueToSqlLiteral(value, typeHint) {
331
354
  return sql`${value}`;
332
355
  }
333
356
  if (isRecord(value)) {
334
- return buildStructLiteral(value, parseStructSchema(typeHint));
357
+ const mapType = parseMapType(typeHint);
358
+ return mapType ? buildMapLiteral(value, mapType.valueType, mapType.keyType) : buildStructLiteral(value, parseStructSchema(typeHint));
335
359
  }
336
360
  return sql.raw(formatLiteral(value, typeHint));
337
361
  }
@@ -343,10 +367,10 @@ function buildStructLiteral(value, schema) {
343
367
  });
344
368
  return sql`struct_pack(${sql.join(parts, sql.raw(", "))})`;
345
369
  }
346
- function buildMapLiteral(value, valueType) {
370
+ function buildMapLiteral(value, valueType, keyType = "TEXT") {
347
371
  const keys = Object.keys(value);
348
372
  const vals = Object.values(value);
349
- const keyList = buildListLiteral(keys, "TEXT");
373
+ const keyList = buildListLiteral(keys, keyType);
350
374
  const valList = buildListLiteral(vals, valueType);
351
375
  return sql`map(${keyList}, ${valList})`;
352
376
  }
@@ -390,20 +414,26 @@ var duckDbMap = (name, valueType, options = {}) => customType({
390
414
  },
391
415
  toDriver(value) {
392
416
  if (Object.keys(value).length === 0 || Object.values(value).some(needsLiteral)) {
393
- return buildMapLiteral(value, valueType);
417
+ return buildMapLiteral(value, valueType, options.keyType);
394
418
  }
395
419
  return wrapMap(value, valueType);
396
420
  },
397
421
  fromDriver(value) {
398
422
  if (options.mode === "object" && Array.isArray(value)) {
399
423
  return Object.fromEntries(value.map((entry) => [
400
- String(entry.key),
424
+ mapKeyString(entry.key, options.keyType),
401
425
  entry.value
402
426
  ]));
403
427
  }
404
428
  return value;
405
429
  }
406
430
  })(name);
431
+ function mapKeyString(key, keyType) {
432
+ if (key instanceof Date) {
433
+ return /^DATE$/i.test(keyType?.trim() ?? "") ? dateStringFromDate(key) : timestampStringFromMicros(BigInt(key.getTime()) * 1000n, false);
434
+ }
435
+ return String(key);
436
+ }
407
437
  var duckDbStruct = (name, schema) => customType({
408
438
  dataType() {
409
439
  const fields = Object.entries(schema).map(([key, type]) => `"${key.replace(/"/g, '""')}" ${type}`);
@@ -423,6 +453,23 @@ var duckDbStruct = (name, schema) => customType({
423
453
  return value;
424
454
  }
425
455
  })(name);
456
+ var duckDbUnion = (name, members) => customType({
457
+ dataType() {
458
+ const fields = Object.entries(members).map(([tag, type]) => `"${tag.replace(/"/g, '""')}" ${type}`);
459
+ return `UNION (${fields.join(", ")})`;
460
+ },
461
+ toDriver(value) {
462
+ const memberType = Object.hasOwn(members, value.tag) ? members[value.tag] : undefined;
463
+ if (memberType === undefined) {
464
+ throw new Error(`UNION column "${name}" has no member "${String(value.tag)}". Members: ${Object.keys(members).join(", ")}`);
465
+ }
466
+ const tag = sql.raw(`"${value.tag.replace(/"/g, '""')}"`);
467
+ return sql`union_value(${tag} := CAST(${valueToSqlLiteral(value.value, memberType)} AS ${sql.raw(memberType)}))`;
468
+ },
469
+ fromDriver(value) {
470
+ return value;
471
+ }
472
+ })(name);
426
473
  var duckDbJson = (name) => customType({
427
474
  dataType() {
428
475
  return "JSON";
@@ -431,8 +478,8 @@ var duckDbJson = (name) => customType({
431
478
  if (typeof value === "string") {
432
479
  return value;
433
480
  }
434
- if (value !== null && typeof value === "object" && "queryChunks" in value) {
435
- return value;
481
+ if (isSQLWrapper(value)) {
482
+ return sql`${value}`;
436
483
  }
437
484
  return wrapJson(value);
438
485
  },
@@ -609,6 +656,9 @@ var duckDbTimestamp = (name, options = {}) => customType({
609
656
  if (value instanceof Date) {
610
657
  return value;
611
658
  }
659
+ if (value === "infinity" || value === "-infinity") {
660
+ return value;
661
+ }
612
662
  const stringValue = typeof value === "string" ? value : value.toString();
613
663
  return new Date(timestampStringToDateInput(stringValue));
614
664
  }
@@ -621,8 +671,7 @@ var duckDbDate = (name) => customType({
621
671
  return value;
622
672
  },
623
673
  fromDriver(value) {
624
- const str = value instanceof Date ? value.toISOString().slice(0, 10) : value;
625
- return str;
674
+ return value instanceof Date ? dateStringFromDate(value) : value;
626
675
  }
627
676
  })(name);
628
677
  var duckDbTime = (name, options = {}) => customType({
@@ -652,6 +701,7 @@ function duckDbArrayOverlaps(column, values) {
652
701
  return sql`array_has_any(${column}, ${rhs})`;
653
702
  }
654
703
  export {
704
+ duckDbUnion,
655
705
  duckDbTimestamp,
656
706
  duckDbTime,
657
707
  duckDbStruct,