@nuxodin/item 0.6.7 → 0.6.9

package/package.json

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

package/tools/schema/db/shared/needs-ddl.js

@@ -13,7 +13,12 @@ const capacity = {
     maxLength: (need, have) => have >= need,
 }
 
-const structural = ['format', 'contentEncoding', 'x-index', 'default']
+const structural = ['contentEncoding', 'x-index', 'default']
+
+// Only these three formats become a column type in any dialect. `email`, `uri` and the rest are
+// the application's business — a column cannot carry them, so they can never need DDL.
+const temporal = new Set(['date', 'time', 'date-time'])
+const columnFormat = (prop) => temporal.has(prop.format) ? prop.format : undefined
 
 /** @param dialectStructural properties this dialect renders too, e.g. 'multipleOf' on MySQL. */
 export function fieldNeedsDdl(next, curr, dialectStructural = []) {
@@ -23,6 +28,7 @@ export function fieldNeedsDdl(next, curr, dialectStructural = []) {
         if (need !== undefined && have !== undefined && !holds(need, have)) return true
     }
     if (schemaType(next) !== schemaType(curr)) return true
+    if (columnFormat(next) !== columnFormat(curr)) return true
     if (!!next['x-autoincrement'] !== !!curr['x-autoincrement']) return true
     return [...structural, ...dialectStructural].some(prop => next[prop] !== curr[prop])
 }

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

@@ -15,19 +15,32 @@ const indexName = (table, name) => `idx_${table}_${name}`
 // SQLite: a single integer primary key must be declared inline as
 // `INTEGER PRIMARY KEY [AUTOINCREMENT]`; AUTOINCREMENT is invalid elsewhere.
 // Composite or non-integer keys use a table-level PRIMARY KEY constraint.
+function soloIntPrimary(fields, primaries) {
+    if (primaries.length !== 1) return
+    const prop = fields.find(([n]) => n === primaries[0])?.[1]
+    return prop && ['integer', 'boolean'].includes(schemaType(prop)) ? primaries[0] : undefined
+}
+
+// What SQLite never emits cannot be a difference either: a fulltext index needs an FTS virtual
+// table, and AUTOINCREMENT exists only on the rowid alias.
+function emittable(prop, isSoloPk) {
+    const out = { ...prop }
+    if (out['x-index'] === 'fulltext') delete out['x-index']
+    if (!isSoloPk) delete out['x-autoincrement']
+    return out
+}
+
 function createBody(fields, primaries) {
-    const pkProp = fields.find(([n]) => n === primaries[0])?.[1]
-    const soloInt = primaries.length === 1 && pkProp &&
-        ['integer', 'boolean'].includes(schemaType(pkProp))
+    const solo = soloIntPrimary(fields, primaries)
     const cols = fields.map(([n, f]) => {
-        const isPk = soloInt && n === primaries[0]
+        const isPk = n === solo
         // 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)
         if (isPk) def += f['x-autoincrement'] ? ' PRIMARY KEY AUTOINCREMENT' : ' PRIMARY KEY'
         return '  ' + def
     }).join(',\n')
-    const pk = (!soloInt && primaries.length) ? `,\n  PRIMARY KEY (${primaries.map(quoteId).join(', ')})` : ''
+    const pk = (!solo && primaries.length) ? `,\n  PRIMARY KEY (${primaries.map(quoteId).join(', ')})` : ''
     return `${cols}${pk}`
 }
 
@@ -92,8 +105,9 @@ export async function schemaToDb(schema, query, { force = false, patch = false }
             const currFields = new Map(tableFields(current.properties[table]))
             const nextFieldNames = new Set(fields.map(([n]) => n))
             // A new plain column is an ADD COLUMN; only a new key column needs the rebuild.
+            const solo = soloIntPrimary(fields, primaries)
             const hasChanges = fields.some(([name, prop]) => currFields.has(name)
-                ? fieldNeedsDdl(prop, currFields.get(name))
+                ? fieldNeedsDdl(emittable(prop, name === solo), currFields.get(name))
                 : prop['x-index'] === 'primary' || prop['x-autoincrement'])
             const hasDrops   = !patch && [...currFields.keys()].some(n => !nextFieldNames.has(n))
 

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

@@ -17,9 +17,11 @@ export function toFieldDef(name, prop) {
     else if (t === 'number')              type = 'REAL'
     else if (t === 'object' || t === 'array') type = 'TEXT'  // JSON as text
     else {
-        if      (prop.format === 'date')          type = 'TEXT'
-        else if (prop.format === 'time')          type = 'TEXT'
-        else if (prop.format === 'date-time')     type = 'TEXT'
+        // Same reasoning as BOOLEAN: the declared name is the only carrier of the format, and
+        // schemaFromField reads these back. TEXT would round-trip to a plain string.
+        if      (prop.format === 'date')          type = 'DATE'
+        else if (prop.format === 'time')          type = 'TIME'
+        else if (prop.format === 'date-time')     type = 'DATETIME'
         else if (prop.contentEncoding === 'base64') type = 'BLOB'
         else if (prop.maxLength)                  type = `VARCHAR(${prop.maxLength})`
         else                                      type = 'TEXT'