@vanit-co/sql-ts 0.8.0 → 0.9.0

package/dist/index.js

@@ -114,8 +114,26 @@ const alias = transformer(tableWithAlias, (s, c) => [
     ...prefixedColumn(s, c),
     [' as ', identifier(`${c.prefix}_${c.name}`)]
 ]);
+const dropUndefined = (strings, binds) => {
+    const outStrings = [];
+    const outBinds = [];
+    let carry = '';
+    strings.forEach((s, i) => {
+        if (i === strings.length - 1)
+            outStrings.push(carry + s);
+        else if (binds[i] === undefined)
+            carry = carry + s;
+        else {
+            outStrings.push(carry + s);
+            outBinds.push(binds[i]);
+            carry = '';
+        }
+    });
+    return [outStrings, outBinds];
+};
 const buildTag = (fn) => (strings, ...binds) => {
-    const [s, v] = ramda.transpose(zipLongest(strings, binds.map(b => b === undefined ? null : b)).flatMap(fn));
+    const [ss, bs] = dropUndefined(strings, binds);
+    const [s, v] = ramda.transpose(zipLongest(ss, bs).flatMap(fn));
     return result(fragment(s, v ?? []));
 };
 const sql = buildTag(pure);
@@ -124,19 +142,19 @@ const selectAs = buildTag(alias);
 const empty = sql ``;
 const insert = (table, ...colsVals) => {
     const tableName = table[SYM_TABLE].name;
-    const columns = Object.keys(colsVals[0]);
+    const columns = Object.keys(colsVals[0]).filter(c => colsVals[0][c] !== undefined);
     const colStrings = columns.map((_, i) => i === 0 ? ' (' : ' ,');
     const colBinds = columns.map(c => identifier(c));
     const [valStrings, valBinds] = colsVals.reduce(([ss, bs], row, rowIdx) => {
         const rowStrings = columns.map((_, colIdx) => colIdx === 0 ? (rowIdx === 0 ? ') values (' : ') ,(') : ' ,');
-        return [[...ss, ...rowStrings], [...bs, ...columns.map(c => row[c] ?? null)]];
+        return [[...ss, ...rowStrings], [...bs, ...columns.map(c => row[c])]];
     }, [[], []]);
     return result(fragment(['insert into ', ...colStrings, ...valStrings, ')'], [identifier(tableName), ...colBinds, ...valBinds]));
 };
 const update = (table, colsVals) => {
     const tableName = table[SYM_TABLE].name;
-    const entries = Object.entries(colsVals);
-    const [strings, binds] = entries.reduce(([ss, bs], [colName, value], i) => [[...ss, i === 0 ? ' set ' : ' ,', ' = '], [...bs, identifier(colName), value ?? null]], [['update '], [identifier(tableName)]]);
+    const entries = Object.entries(colsVals).filter(([, value]) => value !== undefined);
+    const [strings, binds] = entries.reduce(([ss, bs], [colName, value], i) => [[...ss, i === 0 ? ' set ' : ' ,', ' = '], [...bs, identifier(colName), value]], [['update '], [identifier(tableName)]]);
     return result(fragment([...strings, ''], binds));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanit-co/sql-ts",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "A TypeScript SQL query builder using tagged template literals. Write plain SQL with safe, automatic parameter binding and properly quoted identifiers. No DSL to learn, no magic, no ORM.",
   "type": "commonjs",
   "main": "./dist/index.js",