Improved toSql function

Author: ankane

src/utils/index.js

@@ -45,13 +45,15 @@ function fromSql(value) {
 }
 
 function toSql(value) {
-  if (Array.isArray(value)) {
+  if (value === null) {
+    return null;
+  } else if (Array.isArray(value)) {
     return vectorToSql(value);
-  }
-  if (value instanceof SparseVector) {
+  } else if (value instanceof SparseVector) {
     return sparsevecToSql(value);
+  } else {
+    throw new Error('expected array or sparse vector');
   }
-  return value;
 }
 
 function typeWithDimensions(name, dimensions) {

tests/sequelize/index.test.mjs

@@ -1,6 +1,7 @@
 import { Sequelize, DataTypes, Model } from 'sequelize';
 import pgvector from 'pgvector/sequelize';
 import { l2Distance, maxInnerProduct, cosineDistance, l1Distance, hammingDistance, jaccardDistance } from 'pgvector/sequelize';
+import { SparseVector } from 'pgvector';
 
 test('example', async () => {
   pgvector.registerType(Sequelize);
@@ -66,7 +67,7 @@ test('example', async () => {
 
   // L2 distance - sparsevec
   items = await Item.findAll({
-    order: l2Distance('sparse_embedding', '{1:1,2:1,3:1}/3', sequelize),
+    order: l2Distance('sparse_embedding', new SparseVector([1, 1, 1]), sequelize),
     limit: 5
   });
   expect(items.map(v => v.id)).toStrictEqual([1, 3, 2]);

tests/utils/index.test.mjs

@@ -5,12 +5,14 @@ test('fromSql', () => {
   expect(pgvector.fromSql('[1,2,3]')).toStrictEqual([1, 2, 3]);
   expect(pgvector.fromSql('{1:1,2:2,3:3}/3').toArray()).toStrictEqual([1, 2, 3]);
   expect(pgvector.fromSql(null)).toBeNull();
+  expect(() => pgvector.fromSql('')).toThrowError('invalid text representation');
 });
 
 test('toSql', () => {
   expect(pgvector.toSql([1, 2, 3])).toEqual('[1,2,3]');
   expect(pgvector.toSql(new SparseVector([1, 2, 3]))).toEqual('{1:1,2:2,3:3}/3');
   expect(pgvector.toSql(null)).toBeNull();
+  expect(() => pgvector.toSql({})).toThrowError('expected array or sparse vector');
 });
 
 test('sqlType', () => {