@nuxodin/item 0.6.18 → 0.6.19

package/package.json

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

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

@@ -40,10 +40,7 @@ function secondaryIndexKind(prop) {
 
 function usableIndexKind(table, name, prop) {
   const kind = secondaryIndexKind(prop);
-  const issue = kind && indexIssue(table, name, prop, kind);
-  if (!issue) return kind;
-  console.warn(issue);
-  return null;
+  return kind && !indexIssue(table, name, prop, kind) ? kind : null;
 }
 
 function indexIssue(table, name, prop, kind) {
@@ -109,6 +106,7 @@ export async function schemaToDb(
   }
 
   const stmts = [];
+  const warnings = [];
   const nextTables = Object.keys(schema.properties ?? {});
   const currTables = Object.keys(current.properties ?? {});
 
@@ -117,6 +115,11 @@ export async function schemaToDb(
     const { fields, required } = tableData(schema.properties[table]);
     const primaries = primaryFields(fields);
     for (const p of primaries) required.add(p); // primary key columns are always NOT NULL
+    for (const [n, f] of fields) {
+      const kind = secondaryIndexKind(f);
+      const issue = kind && indexIssue(table, n, f, kind);
+      if (issue) warnings.push(issue); // the index is left out
+    }
 
     if (!currTables.includes(table)) {
       const cols = fields.map(([n, f]) =>
@@ -196,11 +199,8 @@ export async function schemaToDb(
     }
   }
 
-  for (const stmt of stmts) {
-    console.log(stmt);
-    await query(stmt);
-  }
-  return { diffs, executed: stmts };
+  for (const stmt of stmts) await query(stmt);
+  return { diffs, executed: stmts, warnings };
 }
 
 async function indexStatements(query, table, nextFields, currFields, { patch = false } = {}) {

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

@@ -32,13 +32,11 @@ function preserveDefault(prop, currProp) {
         : { ...prop, default: currProp.default }
 }
 
-function secondaryIndexKind(table, name, prop) {
+function secondaryIndexKind(prop) {
     // hnsw needs a fixed length and an operator class; the application builds vector indexes
     if (prop['x-vector']) return null
     if (prop['x-index'] === 'unique') return 'UNIQUE INDEX'
     if (prop['x-index'] === true) return 'INDEX'
-    if (prop['x-index'] === 'fulltext')
-        console.warn(`Skip FULLTEXT INDEX ${table}.${name}: PostgreSQL fulltext requires an expression index`)
     return null
 }
 
@@ -114,6 +112,7 @@ export async function schemaToDb(schema, query, { force = false, patch = false }
     }
 
     const stmts = []
+    const warnings = []
     const nextTables = Object.keys(schema.properties ?? {})
     const currTables = Object.keys(current.properties ?? {})
 
@@ -122,6 +121,10 @@ export async function schemaToDb(schema, query, { force = false, patch = false }
         const { fields, required } = tableData(schema.properties[table])
         const primaries = primaryFields(fields)
         for (const p of primaries) required.add(p)
+        for (const [n, f] of fields) {
+            if (f['x-index'] === 'fulltext' && !f['x-vector'])
+                warnings.push(`Skip FULLTEXT INDEX ${table}.${n}: PostgreSQL fulltext requires an expression index`)
+        }
 
         if (!currTables.includes(table)) {
             const cols = fields.map(([n, f]) =>
@@ -135,7 +138,7 @@ export async function schemaToDb(schema, query, { force = false, patch = false }
             for (const [n, f] of fields) if (f['$comment']) stmts.push(commentStmt(table, n, f['$comment']))
             for (const [n, f] of fields) {
                 if (primarySet.has(n)) continue
-                const kind = secondaryIndexKind(table, n, f)
+                const kind = secondaryIndexKind(f)
                 if (kind) stmts.push(createIndex(table, n, kind))
             }
         } else {
@@ -177,11 +180,8 @@ export async function schemaToDb(schema, query, { force = false, patch = false }
     const vectors = nextTables.some(t => tableData(schema.properties[t]).fields.some(([, f]) => f['x-vector']))
     if (vectors && stmts.length) stmts.unshift('CREATE EXTENSION IF NOT EXISTS vector;')
 
-    for (const stmt of stmts) {
-        console.log(stmt)
-        await query(stmt)
-    }
-    return { diffs, executed: stmts }
+    for (const stmt of stmts) await query(stmt)
+    return { diffs, executed: stmts, warnings }
 }
 
 async function indexStatements(query, table, nextFields, currFields, { patch = false } = {}) {
@@ -198,7 +198,7 @@ async function indexStatements(query, table, nextFields, currFields, { patch = f
 
     for (const [name, prop] of nextFields) {
         if (nextPrimary.has(name)) continue
-        const nextKind = secondaryIndexKind(table, name, prop)
+        const nextKind = secondaryIndexKind(prop)
         const curr = indexes.secondary.find(i => i.column === name)
         const currKind = curr ? curr.unique ? 'UNIQUE INDEX' : 'INDEX' : null
         const changed = curr && currKind !== nextKind
@@ -209,7 +209,7 @@ async function indexStatements(query, table, nextFields, currFields, { patch = f
 
     if (!patch) {
         for (const curr of indexes.secondary) {
-            const wanted = nextFields.find(([name, prop]) => name === curr.column && secondaryIndexKind(table, name, prop))
+            const wanted = nextFields.find(([name, prop]) => name === curr.column && secondaryIndexKind(prop))
             if (!wanted) before.push(`DROP INDEX ${quoteId(curr.key)};`)
         }
     }

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

@@ -34,8 +34,6 @@ function createBody(table, fields, primaries) {
     const solo = soloIntPrimary(fields, primaries)
     const cols = fields.map(([n, f]) => {
         const isPk = n === solo
-        if (f['x-autoincrement'] && !isPk)
-            console.warn(`Skip AUTOINCREMENT ${table}.${n}: SQLite auto-increments only a sole INTEGER PRIMARY KEY — nothing fills this column`)
         // Only `INTEGER PRIMARY KEY` is the rowid alias, and AUTOINCREMENT is legal nowhere else —
         // so a boolean key keeps the integer spelling, which SQLite would otherwise reject.
         let def = toFieldDef(n, isPk ? { ...f, type: 'integer' } : f)
@@ -50,11 +48,17 @@ function indexKind(table, name, prop) {
     if (prop['x-vector']) return null // sqlite-vec scans; a B-tree over vectors helps nothing
     if (prop['x-index'] === 'unique') return 'UNIQUE INDEX'
     if (prop['x-index'] === true) return 'INDEX'
-    if (prop['x-index'] === 'fulltext')
-        console.warn(`Skip FULLTEXT INDEX ${table}.${name}: SQLite fulltext requires a virtual FTS table`)
     return null
 }
 
+/** What the schema asks of a field that SQLite cannot do; the field is created without it. */
+function fieldWarning(table, name, prop, solo) {
+    if (prop['x-autoincrement'] && name !== solo)
+        return `Skip AUTOINCREMENT ${table}.${name}: SQLite auto-increments only a sole INTEGER PRIMARY KEY — nothing fills this column`
+    if (prop['x-index'] === 'fulltext' && !prop['x-vector'])
+        return `Skip FULLTEXT INDEX ${table}.${name}: SQLite fulltext requires a virtual FTS table`
+}
+
 function createIndex(table, name, kind) {
     return `CREATE ${kind} ${quoteId(indexName(table, name))} ON ${quoteId(table)} (${quoteId(name)});`
 }
@@ -94,12 +98,18 @@ export async function schemaToDb(schema, query, { force = false, patch = false }
     }
 
     const stmts      = []
+    const warnings   = []
     const nextTables = Object.keys(schema.properties ?? {})
     const currTables = Object.keys(current.properties ?? {})
 
     for (const table of nextTables) {
         const fields    = tableFields(schema.properties[table])
         const primaries = fields.filter(([, f]) => f['x-index'] === 'primary').map(([n]) => n)
+        const solo      = soloIntPrimary(fields, primaries)
+        for (const [n, f] of fields) {
+            const warning = fieldWarning(table, n, f, solo)
+            if (warning) warnings.push(warning)
+        }
 
         if (!currTables.includes(table)) {
             // Idea: WITHOUT ROWID when the primary key is not a single integer column and all other columns
@@ -144,9 +154,6 @@ export async function schemaToDb(schema, query, { force = false, patch = false }
         }
     }
 
-    for (const stmt of stmts) {
-        console.log(stmt)
-        await query(stmt)
-    }
-    return { diffs, executed: stmts }
+    for (const stmt of stmts) await query(stmt)
+    return { diffs, executed: stmts, warnings }
 }