@atscript/db-sqlite 0.1.140 → 0.1.142

package/dist/index.cjs

@@ -163,6 +163,19 @@ function sqliteCalendarBucket(quotedCol, b) {
 }
 //#endregion
 //#region src/sql-builder.ts
+/**
+* The generated-column clause of a `@db.column.derived` field (since 0.1.141):
+* `GENERATED ALWAYS AS (<json extraction>) VIRTUAL` — computed per read,
+* never stored, nullable (a missing or off-type leaf is NULL), no DEFAULT;
+* `COLLATE` may follow it. Shared by CREATE TABLE and ADD COLUMN.
+*/
+function sqliteDerivedClause(field) {
+	return ` GENERATED ALWAYS AS (${(0, _atscript_db_sql_tools.derivedColumnExpr)(sqliteDialect, field)}) VIRTUAL${sqliteCollateClause(field)}`;
+}
+/** The `COLLATE` clause of a `@db.column.collate` field (SQLite's built-in names) — `""` without one. */
+function sqliteCollateClause(field) {
+	return field.collate ? ` COLLATE ${field.collate.toUpperCase()}` : "";
+}
 function esc(name) {
 	return name.replace(/"/g, "\"\"");
 }
@@ -407,13 +420,17 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 		if (field.ignored) continue;
 		const sqlType = options?.typeMapper?.(field) ?? (field.isPrimaryKey && (field.designType === "number" || field.designType === "integer") ? "INTEGER" : sqliteTypeFromDesignType(field.designType));
 		let def = `"${esc(field.physicalName)}" ${sqlType}`;
+		if (field.derived) {
+			colDefs.push(def + sqliteDerivedClause(field));
+			continue;
+		}
 		if (field.isPrimaryKey && primaryKeys.length === 1) {
 			def += " PRIMARY KEY";
 			if (field.defaultValue?.kind === "fn" && field.defaultValue.fn === "increment" && (field.designType === "number" || field.designType === "integer")) def += " AUTOINCREMENT";
 		}
 		if (!field.optional && !field.isPrimaryKey) def += " NOT NULL";
 		if (field.defaultValue?.kind === "value") def += ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueToSqlLiteral)(field.designType, field.defaultValue.value)}`;
-		if (field.collate) def += ` COLLATE ${field.collate.toUpperCase()}`;
+		def += sqliteCollateClause(field);
 		colDefs.push(def);
 	}
 	if (primaryKeys.length > 1) {
@@ -940,7 +957,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	async updateOne(filter, data, ops, expectedVersion) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate(tableName, data, {
 			sql: `rowid = (SELECT rowid FROM "${esc(tableName)}" WHERE ${where.sql} LIMIT 1)`,
 			params: where.params
@@ -954,7 +971,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async updateMany(filter, data, ops) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate(this.resolveTableName(), data, where, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
@@ -966,7 +983,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	async replaceOne(filter, data, expectedVersion) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate(tableName, (0, _atscript_db_sql_tools.fillReplacePayload)(data, (0, _atscript_db_sql_tools.replaceColumnsFor)(this._table.fieldDescriptors, this.nativeDefaultFns()), versionColumn), {
 			sql: `rowid = (SELECT rowid FROM "${esc(tableName)}" WHERE ${where.sql} LIMIT 1)`,
 			params: where.params
@@ -980,7 +997,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async replaceMany(filter, data) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate(this.resolveTableName(), data, where, void 0, versionColumn);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
@@ -1057,10 +1074,13 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 			for (const field of diff.added) {
 				const sqlType = this.typeMapper(field);
 				let ddl = `ALTER TABLE "${esc(tableName)}" ADD COLUMN "${esc(field.physicalName)}" ${sqlType}`;
-				if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
-				if (field.defaultValue?.kind === "value") ddl += ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueToSqlLiteral)(field.designType, field.defaultValue.value)}`;
-				else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueForType)(field.designType)}`;
-				if (field.collate) ddl += ` COLLATE ${field.collate.toUpperCase()}`;
+				if (field.derived) ddl += sqliteDerivedClause(field);
+				else {
+					if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
+					if (field.defaultValue?.kind === "value") ddl += ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueToSqlLiteral)(field.designType, field.defaultValue.value)}`;
+					else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueForType)(field.designType)}`;
+					ddl += sqliteCollateClause(field);
+				}
 				this._log(ddl);
 				this.driver.exec(ddl);
 				added.push(field.physicalName);
@@ -1085,7 +1105,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 					this._log(createSql);
 					this.driver.exec(createSql);
 					const oldCols = (await this.getExistingColumns()).map((c) => c.name);
-					const newCols = this._table.fieldDescriptors.filter((f) => !f.ignored).map((f) => f.physicalName);
+					const newCols = this._table.storedDescriptors.map((f) => f.physicalName);
 					const oldColSet = new Set(oldCols);
 					const commonCols = newCols.filter((c) => oldColSet.has(c));
 					if (commonCols.length > 0) {
@@ -1247,15 +1267,25 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		if (field.isPrimaryKey && (field.designType === "number" || field.designType === "integer")) return "INTEGER";
 		return sqliteTypeFromDesignType(field.designType);
 	}
+	/**
+	* `PRAGMA table_xinfo` (since 0.1.141; `table_info` before): it lists
+	* generated columns too (`hidden` 2 = VIRTUAL, 3 = STORED — `table_info`
+	* omits them, so a `@db.column.derived` column would be re-added on every
+	* sync). A virtual table's hidden columns (`hidden` 1) are skipped.
+	*/
 	async getExistingColumnsForTable(tableName) {
 		return this._stmt(() => {
-			return this.driver.all(`PRAGMA table_info("${esc(tableName)}")`).map((r) => ({
-				name: r.name,
-				type: r.type,
-				notnull: r.notnull === 1,
-				pk: r.pk > 0,
-				dflt_value: normalizeSqliteDefault(r.dflt_value)
-			}));
+			return this.driver.all(`PRAGMA table_xinfo("${esc(tableName)}")`).filter((r) => r.hidden !== 1).map((r) => {
+				const column = {
+					name: r.name,
+					type: r.type,
+					notnull: r.notnull === 1,
+					pk: r.pk > 0,
+					dflt_value: normalizeSqliteDefault(r.dflt_value)
+				};
+				if (r.hidden === 2 || r.hidden === 3) column.generated = true;
+				return column;
+			});
 		});
 	}
 	async syncIndexes() {

package/dist/index.d.cts

@@ -380,6 +380,12 @@ declare class SqliteAdapter extends BaseDbAdapter {
   getObjectKind(name: string): Promise<TDbObjectKind | undefined>;
   renameTable(oldName: string): Promise<void>;
   typeMapper(field: TDbFieldMeta): string;
+  /**
+   * `PRAGMA table_xinfo` (since 0.1.141; `table_info` before): it lists
+   * generated columns too (`hidden` 2 = VIRTUAL, 3 = STORED — `table_info`
+   * omits them, so a `@db.column.derived` column would be re-added on every
+   * sync). A virtual table's hidden columns (`hidden` 1) are skipped.
+   */
   getExistingColumnsForTable(tableName: string): Promise<TExistingColumn[]>;
   syncIndexes(): Promise<void>;
   getSearchIndexes(): TSearchIndexInfo[];

package/dist/index.d.mts

@@ -380,6 +380,12 @@ declare class SqliteAdapter extends BaseDbAdapter {
   getObjectKind(name: string): Promise<TDbObjectKind | undefined>;
   renameTable(oldName: string): Promise<void>;
   typeMapper(field: TDbFieldMeta): string;
+  /**
+   * `PRAGMA table_xinfo` (since 0.1.141; `table_info` before): it lists
+   * generated columns too (`hidden` 2 = VIRTUAL, 3 = STORED — `table_info`
+   * omits them, so a `@db.column.derived` column would be re-added on every
+   * sync). A virtual table's hidden columns (`hidden` 1) are skipped.
+   */
   getExistingColumnsForTable(tableName: string): Promise<TExistingColumn[]>;
   syncIndexes(): Promise<void>;
   getSearchIndexes(): TSearchIndexInfo[];

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { EMPTY_AND, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, geoWindowFromControls, jsonDollarPath, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, toSqlValue } from "@atscript/db-sql-tools";
+import { EMPTY_AND, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, geoWindowFromControls, jsonDollarPath, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, toSqlValue } from "@atscript/db-sql-tools";
 import { bucketer } from "@uniqu/core";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/better-sqlite3-driver.ts
@@ -162,6 +162,19 @@ function sqliteCalendarBucket(quotedCol, b) {
 }
 //#endregion
 //#region src/sql-builder.ts
+/**
+* The generated-column clause of a `@db.column.derived` field (since 0.1.141):
+* `GENERATED ALWAYS AS (<json extraction>) VIRTUAL` — computed per read,
+* never stored, nullable (a missing or off-type leaf is NULL), no DEFAULT;
+* `COLLATE` may follow it. Shared by CREATE TABLE and ADD COLUMN.
+*/
+function sqliteDerivedClause(field) {
+	return ` GENERATED ALWAYS AS (${derivedColumnExpr(sqliteDialect, field)}) VIRTUAL${sqliteCollateClause(field)}`;
+}
+/** The `COLLATE` clause of a `@db.column.collate` field (SQLite's built-in names) — `""` without one. */
+function sqliteCollateClause(field) {
+	return field.collate ? ` COLLATE ${field.collate.toUpperCase()}` : "";
+}
 function esc(name) {
 	return name.replace(/"/g, "\"\"");
 }
@@ -406,13 +419,17 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 		if (field.ignored) continue;
 		const sqlType = options?.typeMapper?.(field) ?? (field.isPrimaryKey && (field.designType === "number" || field.designType === "integer") ? "INTEGER" : sqliteTypeFromDesignType(field.designType));
 		let def = `"${esc(field.physicalName)}" ${sqlType}`;
+		if (field.derived) {
+			colDefs.push(def + sqliteDerivedClause(field));
+			continue;
+		}
 		if (field.isPrimaryKey && primaryKeys.length === 1) {
 			def += " PRIMARY KEY";
 			if (field.defaultValue?.kind === "fn" && field.defaultValue.fn === "increment" && (field.designType === "number" || field.designType === "integer")) def += " AUTOINCREMENT";
 		}
 		if (!field.optional && !field.isPrimaryKey) def += " NOT NULL";
 		if (field.defaultValue?.kind === "value") def += ` DEFAULT ${defaultValueToSqlLiteral(field.designType, field.defaultValue.value)}`;
-		if (field.collate) def += ` COLLATE ${field.collate.toUpperCase()}`;
+		def += sqliteCollateClause(field);
 		colDefs.push(def);
 	}
 	if (primaryKeys.length > 1) {
@@ -939,7 +956,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	async updateOne(filter, data, ops, expectedVersion) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate$1(tableName, data, {
 			sql: `rowid = (SELECT rowid FROM "${esc(tableName)}" WHERE ${where.sql} LIMIT 1)`,
 			params: where.params
@@ -953,7 +970,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	}
 	async updateMany(filter, data, ops) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate$1(this.resolveTableName(), data, where, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
@@ -965,7 +982,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	async replaceOne(filter, data, expectedVersion) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate$1(tableName, fillReplacePayload(data, replaceColumnsFor(this._table.fieldDescriptors, this.nativeDefaultFns()), versionColumn), {
 			sql: `rowid = (SELECT rowid FROM "${esc(tableName)}" WHERE ${where.sql} LIMIT 1)`,
 			params: where.params
@@ -979,7 +996,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	}
 	async replaceMany(filter, data) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate$1(this.resolveTableName(), data, where, void 0, versionColumn);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
@@ -1056,10 +1073,13 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 			for (const field of diff.added) {
 				const sqlType = this.typeMapper(field);
 				let ddl = `ALTER TABLE "${esc(tableName)}" ADD COLUMN "${esc(field.physicalName)}" ${sqlType}`;
-				if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
-				if (field.defaultValue?.kind === "value") ddl += ` DEFAULT ${defaultValueToSqlLiteral(field.designType, field.defaultValue.value)}`;
-				else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${defaultValueForType(field.designType)}`;
-				if (field.collate) ddl += ` COLLATE ${field.collate.toUpperCase()}`;
+				if (field.derived) ddl += sqliteDerivedClause(field);
+				else {
+					if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
+					if (field.defaultValue?.kind === "value") ddl += ` DEFAULT ${defaultValueToSqlLiteral(field.designType, field.defaultValue.value)}`;
+					else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${defaultValueForType(field.designType)}`;
+					ddl += sqliteCollateClause(field);
+				}
 				this._log(ddl);
 				this.driver.exec(ddl);
 				added.push(field.physicalName);
@@ -1084,7 +1104,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 					this._log(createSql);
 					this.driver.exec(createSql);
 					const oldCols = (await this.getExistingColumns()).map((c) => c.name);
-					const newCols = this._table.fieldDescriptors.filter((f) => !f.ignored).map((f) => f.physicalName);
+					const newCols = this._table.storedDescriptors.map((f) => f.physicalName);
 					const oldColSet = new Set(oldCols);
 					const commonCols = newCols.filter((c) => oldColSet.has(c));
 					if (commonCols.length > 0) {
@@ -1246,15 +1266,25 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		if (field.isPrimaryKey && (field.designType === "number" || field.designType === "integer")) return "INTEGER";
 		return sqliteTypeFromDesignType(field.designType);
 	}
+	/**
+	* `PRAGMA table_xinfo` (since 0.1.141; `table_info` before): it lists
+	* generated columns too (`hidden` 2 = VIRTUAL, 3 = STORED — `table_info`
+	* omits them, so a `@db.column.derived` column would be re-added on every
+	* sync). A virtual table's hidden columns (`hidden` 1) are skipped.
+	*/
 	async getExistingColumnsForTable(tableName) {
 		return this._stmt(() => {
-			return this.driver.all(`PRAGMA table_info("${esc(tableName)}")`).map((r) => ({
-				name: r.name,
-				type: r.type,
-				notnull: r.notnull === 1,
-				pk: r.pk > 0,
-				dflt_value: normalizeSqliteDefault(r.dflt_value)
-			}));
+			return this.driver.all(`PRAGMA table_xinfo("${esc(tableName)}")`).filter((r) => r.hidden !== 1).map((r) => {
+				const column = {
+					name: r.name,
+					type: r.type,
+					notnull: r.notnull === 1,
+					pk: r.pk > 0,
+					dflt_value: normalizeSqliteDefault(r.dflt_value)
+				};
+				if (r.hidden === 2 || r.hidden === 3) column.generated = true;
+				return column;
+			});
 		});
 	}
 	async syncIndexes() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-sqlite",
-  "version": "0.1.140",
+  "version": "0.1.142",
   "description": "SQLite adapter for @atscript/db with swappable driver support.",
   "keywords": [
     "atscript",
@@ -36,21 +36,21 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.92",
-    "@atscript/typescript": "^0.1.92",
+    "@atscript/core": "^0.1.95",
+    "@atscript/typescript": "^0.1.95",
     "@types/better-sqlite3": "^7.6.13",
     "@uniqu/core": "^0.1.11",
     "better-sqlite3": "^12.6.2",
     "sqlite-vec": "^0.1.9",
-    "unplugin-atscript": "^0.1.92"
+    "unplugin-atscript": "^0.1.95"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.92",
-    "@atscript/typescript": "^0.1.92",
+    "@atscript/core": "^0.1.95",
+    "@atscript/typescript": "^0.1.95",
     "@uniqu/core": "^0.1.11",
     "better-sqlite3": ">=11.0.0",
-    "@atscript/db": "^0.1.140",
-    "@atscript/db-sql-tools": "^0.1.140"
+    "@atscript/db": "^0.1.142",
+    "@atscript/db-sql-tools": "^0.1.142"
   },
   "peerDependenciesMeta": {
     "better-sqlite3": {