@vanit-co/sql-ts 0.6.0 → 0.8.0

package/dist/index.js

@@ -26,7 +26,7 @@ const stringfyIdentifierAndRaw = (quote = '') => (s) => {
             return [strings, binds, [...merge, ss, bs.content]];
         }
         else if (bs && bs[SYM_IDENTIFIER]) {
-            return [strings, binds, [...merge, ss, (quote + bs.content + quote)]];
+            return [strings, binds, [...merge, ss, (quote + bs.content.replaceAll(quote, quote + quote) + quote)]];
         }
         else if (bs !== undefined) {
             return [[...strings, merge.join('') + ss], [...binds, bs], []];
@@ -115,7 +115,7 @@ const alias = transformer(tableWithAlias, (s, c) => [
     [' as ', identifier(`${c.prefix}_${c.name}`)]
 ]);
 const buildTag = (fn) => (strings, ...binds) => {
-    const [s, v] = ramda.transpose(zipLongest(strings, binds).flatMap(fn));
+    const [s, v] = ramda.transpose(zipLongest(strings, binds.map(b => b === undefined ? null : b)).flatMap(fn));
     return result(fragment(s, v ?? []));
 };
 const sql = buildTag(pure);
@@ -129,14 +129,14 @@ const insert = (table, ...colsVals) => {
     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])]];
+        return [[...ss, ...rowStrings], [...bs, ...columns.map(c => row[c] ?? null)]];
     }, [[], []]);
     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]], [['update '], [identifier(tableName)]]);
+    const [strings, binds] = entries.reduce(([ss, bs], [colName, value], i) => [[...ss, i === 0 ? ' set ' : ' ,', ' = '], [...bs, identifier(colName), value ?? null]], [['update '], [identifier(tableName)]]);
     return result(fragment([...strings, ''], binds));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanit-co/sql-ts",
-  "version": "0.6.0",
+  "version": "0.8.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",