@nuxodin/item 0.6.9 → 0.6.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxodin/item",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "Reactive state library",
   "type": "module",
   "license": "MIT",

package/tools/db/sql.d.ts

@@ -10,6 +10,8 @@ export interface SqlTag {
     id(name: string | { toString(): string } | Promise<string | { toString(): string }>): Sql;
     raw(text: string): Sql;
     join(frags: Sql[], separator?: string): Sql;
+    in(col: string | Sql, values: Iterable<unknown>): Sql;
+    notIn(col: string | Sql, values: Iterable<unknown>): Sql;
 }
 
 export const sql: SqlTag;

package/tools/db/sql.js

@@ -38,6 +38,26 @@ sql.join = (frags, separator = ', ') => {
     return new Sql(parts);
 };
 
+/** A column: a name is quoted per dialect, `a.b` in its parts; anything else is a fragment already. */
+const column = (c) => typeof c === 'string' ? sql.join(c.split('.').map(n => sql.id(n)), '.') : c;
+
+/**
+ * `x IN (…)`, and a plain `false` where there is nothing to be in — `IN ()` is a syntax error, and
+ * an empty subquery cannot be typed for every column (`IN (SELECT NULL WHERE FALSE)` is a type
+ * error in postgres). The column belongs inside for exactly that reason: only there can the empty
+ * case be a boolean instead of a comparison.
+ */
+sql.in = (col, values) => {
+    const list = [...values];
+    return list.length ? sql`${column(col)} IN (${sql.join(list.map(v => sql`${v}`))})` : sql.raw('false');
+};
+
+/** The other way round — and nothing to be in means everything qualifies. */
+sql.notIn = (col, values) => {
+    const list = [...values];
+    return list.length ? sql`${column(col)} NOT IN (${sql.join(list.map(v => sql`${v}`))})` : sql.raw('true');
+};
+
 // Objects with their own toString bind as strings; plain objects/arrays are
 // mistakes (drivers would mangle them, e.g. mysql2's `key`='value' expansion).
 function toParam(v) {

package/tools/schema/db/pg/from-field.js

@@ -37,12 +37,12 @@ export function schemaFromField(row) {
     } else if (type === 'date') {
         prop.type = 'string'
         prop.format = 'date'
-    } else if (type.startsWith('time') || dataType.startsWith('time')) {
-        prop.type = 'string'
-        prop.format = 'time'
     } else if (type.startsWith('timestamp') || dataType.startsWith('timestamp')) {
         prop.type = 'string'
         prop.format = 'date-time'
+    } else if (type.startsWith('time') || dataType.startsWith('time')) {
+        prop.type = 'string'
+        prop.format = 'time'
     } else if (type === 'json' || type === 'jsonb') prop.type = 'object'
     else prop.type = 'string'
 

package/tools/schema/db/pg/to-db.js

@@ -50,7 +50,7 @@ function createIndex(table, name, kind) {
 
 async function tableIndexes(query, table) {
     const primaryRows = await queryRows(query, `
-        SELECT con.conname, array_agg(a.attname ORDER BY u.ord) AS columns
+        SELECT con.conname, json_agg(a.attname ORDER BY u.ord) AS columns
         FROM pg_constraint con
         JOIN pg_class t ON t.oid = con.conrelid
         JOIN pg_namespace n ON n.oid = t.relnamespace