@atscript/db-mysql 0.1.164 → 0.1.166

package/dist/index.cjs

@@ -391,8 +391,8 @@ function buildInsertMany(table, rows, columns) {
 /**
 * Builds a SELECT statement with optional sort, limit, offset, projection.
 */
-function buildSelect(table, where, controls, lock) {
-	return (0, _atscript_db_sql_tools.buildSelect)(mysqlDialect, table, where, controls, lock);
+function buildSelect(table, where, controls, lock, defaultOrder) {
+	return (0, _atscript_db_sql_tools.buildSelect)(mysqlDialect, table, where, controls, lock, defaultOrder);
 }
 /**
 * Builds an UPDATE ... SET ... WHERE statement with optional [ORDER BY …] LIMIT.
@@ -959,11 +959,16 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	_mapConstraintError(error) {
 		if (error && typeof error === "object" && "errno" in error) {
 			const err = error;
-			if (err.errno === 1062 || err.errno === 1586) throw new _atscript_db.DbError("CONFLICT", [{
-				path: (err.message?.match(/^[\s\S]*for key '(?:[^']*\.)?([^'.]+)'/))?.[1] ?? "",
-				message: err.sqlMessage ?? err.message
-			}]);
-			if (err.errno === 1451 || err.errno === 1452) throw new _atscript_db.DbError("FK_VIOLATION", this._mapFkError(err.message));
+			if (err.errno === 1062 || err.errno === 1586) {
+				const name = (err.message?.match(/^[\s\S]*for key '(?:[^']*\.)?([^'.]+)'/))?.[1];
+				throw (0, _atscript_db.constraintViolation)("CONFLICT", name === "PRIMARY" ? { primaryKey: true } : { name }, err.sqlMessage ?? err.message);
+			}
+			if (err.errno === 1451 || err.errno === 1452) {
+				const message = err.sqlMessage ?? err.message;
+				const referencing = message.match(/fails \((?:`[^`]*`\.)?`([^`]+)`/)?.[1];
+				const columns = (message.match(/FOREIGN KEY \(([^)]+)\)/)?.[1])?.split(",").map((c) => c.trim().replace(/^`|`$/g, ""));
+				throw (0, _atscript_db.constraintViolation)("FK_VIOLATION", err.errno === 1451 ? { referencedBy: referencing } : { columns }, message);
+			}
 			if (err.errno === 1213 || err.errno === 1205 || err.errno === 3572) throw new _atscript_db.DbError(err.errno === 1213 ? "DEADLOCK" : "LOCK_TIMEOUT", [{
 				path: "",
 				message: err.sqlMessage ?? err.message
@@ -971,20 +976,6 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		}
 		throw error;
 	}
-	_mapFkError(message) {
-		const fkMatch = message.match(/FOREIGN KEY \(`(\w+)`\)/);
-		if (fkMatch) {
-			const physicalCol = fkMatch[1];
-			return [{
-				path: this._table.fieldDescriptors.find((f) => f.physicalName === physicalCol)?.path ?? physicalCol,
-				message
-			}];
-		}
-		return [{
-			path: "",
-			message
-		}];
-	}
 	async insertOne(data) {
 		const { sql, params } = buildInsert(this.resolveTableName(), data);
 		this._log(sql, params);
@@ -1389,7 +1380,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 			return (await this._groupInsertedIds(group, result.insertId, step)).map((insertedId) => ({ insertedId }));
 		} catch (error) {
 			if (!(0, _atscript_db.isConflict)(error)) throw error;
-			if (group.generated && error.errors.some((e) => e.path === "PRIMARY")) throw error;
+			if (group.generated && error.hint?.primaryKey === true) throw error;
 			return;
 		}
 	}
@@ -2075,7 +2066,8 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		const indexes = [];
 		const { all: ftAll, def: ftDefault } = this._fulltextIndexes();
 		for (const index of ftAll) indexes.push({
-			name: index.key,
+			name: index.name,
+			aliases: [index.key],
 			description: (0, _atscript_db.describeFulltext)(index, (names) => `FULLTEXT index on ${names}`),
 			type: "text",
 			fields: this._indexLogicalPaths(index),
@@ -2096,7 +2088,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async search(text, query, indexName) {
 		const combinedWhere = this._buildSearchWhere(text, query, indexName);
-		const { sql, params } = buildSelect(this.resolveTableName(), combinedWhere, query.controls);
+		const { sql, params } = buildSelect(this.resolveTableName(), combinedWhere, query.controls, void 0, combinedWhere.rank);
 		this._log(sql, params);
 		return this._exec().all(sql, params);
 	}
@@ -2104,7 +2096,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		const combinedWhere = this._buildSearchWhere(text, query, indexName);
 		const tableName = this.resolveTableName();
 		const selectPromise = (async () => {
-			const { sql, params } = buildSelect(tableName, combinedWhere, query.controls);
+			const { sql, params } = buildSelect(tableName, combinedWhere, query.controls, void 0, combinedWhere.rank);
 			this._log(sql, params);
 			return this._exec().all(sql, params);
 		})();
@@ -2119,16 +2111,32 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 			count
 		};
 	}
+	/**
+	* The search predicate (AND the request filter) and its relevance order
+	* (`rank`, since 0.1.165) — used as the ORDER BY when the read has no
+	* `$sort`: exact-number hits first, then `MATCH … AGAINST` relevance, then
+	* the primary key. Grouped searches use only the predicate.
+	*/
 	_buildSearchWhere(text, query, indexName) {
 		const fulltextIndex = this._getFulltextIndex(indexName);
-		if (!fulltextIndex) throw new Error("No FULLTEXT index found for search");
+		if (!fulltextIndex) throw new Error((0, _atscript_db.searchIndexNotFoundMessage)(indexName));
 		const { text: textFields, integer: integerFields } = (0, _atscript_db.splitFulltextFields)(fulltextIndex);
 		const where = buildWhere(query.filter);
 		const n = integerFields.length > 0 ? (0, _atscript_db.searchTermInteger)(text) : void 0;
 		const matchClause = `MATCH(${textFields.map((f) => qi(f.name)).join(", ")}) AGAINST(? IN NATURAL LANGUAGE MODE)`;
+		const rank = (0, _atscript_db_sql_tools.searchRankOrder)(mysqlDialect, {
+			exactEqualities: n === void 0 ? [] : integerFields.map((f) => `${qi(f.name)} = ?`),
+			n,
+			textRank: textFields.length > 0 ? {
+				sql: `${matchClause} DESC`,
+				params: [text]
+			} : void 0,
+			pkColumns: this._table.primaryKeys.map((key) => this._table.physicalPath(key))
+		});
 		const withWhere = (clause, params) => ({
 			sql: where.sql === "1=1" ? clause : `${where.sql} AND ${clause}`,
-			params: [...where.params, ...params]
+			params: [...where.params, ...params],
+			rank
 		});
 		if (n === void 0) return textFields.length === 0 ? withWhere(_atscript_db_sql_tools.EMPTY_OR.sql, []) : withWhere(matchClause, [text]);
 		const keys = this._table.primaryKeys.map((key) => qi(this._table.physicalPath(key)));
@@ -2152,8 +2160,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	_getFulltextIndex(indexName) {
 		const { all, def } = this._fulltextIndexes();
-		if (!indexName) return def;
-		return all.find((index) => index.key === indexName);
+		return indexName ? (0, _atscript_db.resolveFulltextIndex)(all, indexName) : def;
 	}
 	/** The table's fulltext indexes and the default one, built once per table. */
 	_fulltextIndexes() {

package/dist/index.d.cts

@@ -239,7 +239,6 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _wrapConstraintError;
   /** Rethrows `error` as a structured `DbError` when it is a unique / FK violation or a deadlock / lock wait timeout, else as is. */
   private _mapConstraintError;
-  private _mapFkError;
   insertOne(data: Record<string, unknown>): Promise<TDbInsertResult>;
   insertMany(data: Array<Record<string, unknown>>): Promise<TDbInsertManyResult>;
   /** ONE multi-row INSERT of a homogeneous id group on `exec`; the rows' ids in group order. */
@@ -474,6 +473,12 @@ declare class MysqlAdapter extends BaseDbAdapter {
     data: Array<Record<string, unknown>>;
     count: number;
   }>;
+  /**
+   * The search predicate (AND the request filter) and its relevance order
+   * (`rank`, since 0.1.165) — used as the ORDER BY when the read has no
+   * `$sort`: exact-number hits first, then `MATCH … AGAINST` relevance, then
+   * the primary key. Grouped searches use only the predicate.
+   */
   private _buildSearchWhere;
   private _getFulltextIndex;
   /** The table's fulltext indexes and the default one, built once per table. */

package/dist/index.d.mts

@@ -239,7 +239,6 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _wrapConstraintError;
   /** Rethrows `error` as a structured `DbError` when it is a unique / FK violation or a deadlock / lock wait timeout, else as is. */
   private _mapConstraintError;
-  private _mapFkError;
   insertOne(data: Record<string, unknown>): Promise<TDbInsertResult>;
   insertMany(data: Array<Record<string, unknown>>): Promise<TDbInsertManyResult>;
   /** ONE multi-row INSERT of a homogeneous id group on `exec`; the rows' ids in group order. */
@@ -474,6 +473,12 @@ declare class MysqlAdapter extends BaseDbAdapter {
     data: Array<Record<string, unknown>>;
     count: number;
   }>;
+  /**
+   * The search predicate (AND the request filter) and its relevance order
+   * (`rank`, since 0.1.165) — used as the ORDER BY when the read has no
+   * `$sort`: exact-number hits first, then `MATCH … AGAINST` relevance, then
+   * the primary key. Grouped searches use only the predicate.
+   */
   private _buildSearchWhere;
   private _getFulltextIndex;
   /** The table's fulltext indexes and the default one, built once per table. */

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_ISOLATION_LEVELS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, NoopLogger, bucketTimeZoneUnavailable, containsRelationFilter, defaultFulltextIndex, describeFulltext, fkKey, forEachResolvedRelation, isConflict, searchTermInteger, splitFulltextFields, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_ISOLATION_LEVELS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, NoopLogger, bucketTimeZoneUnavailable, constraintViolation, containsRelationFilter, defaultFulltextIndex, describeFulltext, fkKey, forEachResolvedRelation, isConflict, resolveFulltextIndex, searchIndexNotFoundMessage, searchTermInteger, splitFulltextFields, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { EMPTY_OR, SEARCH_SOURCE_ALIAS, arithOverflowError, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildJsonColumnCopy, buildJsonifyText, buildKeyViolationCount, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, chunkInsertRows, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, foreignKeySql, fromSourceHint, fromSourceSql, geoWindowFromControls, jsonDollarPath, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, orFragment, orderByList, parseRegexString, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, stripPartitionRowNumber, toSqlValue, unquoteSqlStringLiteral, vectorDistanceSource, viewReadSource, writeLimitCount } from "@atscript/db-sql-tools";
+import { EMPTY_OR, SEARCH_SOURCE_ALIAS, arithOverflowError, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildJsonColumnCopy, buildJsonifyText, buildKeyViolationCount, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, chunkInsertRows, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, foreignKeySql, fromSourceHint, fromSourceSql, geoWindowFromControls, jsonDollarPath, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, orFragment, orderByList, parseRegexString, renameGeoDistance, replaceColumnsFor, searchRankOrder, sqlTimeZoneLiteral, stripPartitionRowNumber, toSqlValue, unquoteSqlStringLiteral, vectorDistanceSource, viewReadSource, writeLimitCount } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/sql-builder.ts
 /**
@@ -390,8 +390,8 @@ function buildInsertMany$1(table, rows, columns) {
 /**
 * Builds a SELECT statement with optional sort, limit, offset, projection.
 */
-function buildSelect$1(table, where, controls, lock) {
-	return buildSelect(mysqlDialect, table, where, controls, lock);
+function buildSelect$1(table, where, controls, lock, defaultOrder) {
+	return buildSelect(mysqlDialect, table, where, controls, lock, defaultOrder);
 }
 /**
 * Builds an UPDATE ... SET ... WHERE statement with optional [ORDER BY …] LIMIT.
@@ -958,11 +958,16 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	_mapConstraintError(error) {
 		if (error && typeof error === "object" && "errno" in error) {
 			const err = error;
-			if (err.errno === 1062 || err.errno === 1586) throw new DbError("CONFLICT", [{
-				path: (err.message?.match(/^[\s\S]*for key '(?:[^']*\.)?([^'.]+)'/))?.[1] ?? "",
-				message: err.sqlMessage ?? err.message
-			}]);
-			if (err.errno === 1451 || err.errno === 1452) throw new DbError("FK_VIOLATION", this._mapFkError(err.message));
+			if (err.errno === 1062 || err.errno === 1586) {
+				const name = (err.message?.match(/^[\s\S]*for key '(?:[^']*\.)?([^'.]+)'/))?.[1];
+				throw constraintViolation("CONFLICT", name === "PRIMARY" ? { primaryKey: true } : { name }, err.sqlMessage ?? err.message);
+			}
+			if (err.errno === 1451 || err.errno === 1452) {
+				const message = err.sqlMessage ?? err.message;
+				const referencing = message.match(/fails \((?:`[^`]*`\.)?`([^`]+)`/)?.[1];
+				const columns = (message.match(/FOREIGN KEY \(([^)]+)\)/)?.[1])?.split(",").map((c) => c.trim().replace(/^`|`$/g, ""));
+				throw constraintViolation("FK_VIOLATION", err.errno === 1451 ? { referencedBy: referencing } : { columns }, message);
+			}
 			if (err.errno === 1213 || err.errno === 1205 || err.errno === 3572) throw new DbError(err.errno === 1213 ? "DEADLOCK" : "LOCK_TIMEOUT", [{
 				path: "",
 				message: err.sqlMessage ?? err.message
@@ -970,20 +975,6 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		}
 		throw error;
 	}
-	_mapFkError(message) {
-		const fkMatch = message.match(/FOREIGN KEY \(`(\w+)`\)/);
-		if (fkMatch) {
-			const physicalCol = fkMatch[1];
-			return [{
-				path: this._table.fieldDescriptors.find((f) => f.physicalName === physicalCol)?.path ?? physicalCol,
-				message
-			}];
-		}
-		return [{
-			path: "",
-			message
-		}];
-	}
 	async insertOne(data) {
 		const { sql, params } = buildInsert$1(this.resolveTableName(), data);
 		this._log(sql, params);
@@ -1388,7 +1379,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 			return (await this._groupInsertedIds(group, result.insertId, step)).map((insertedId) => ({ insertedId }));
 		} catch (error) {
 			if (!isConflict(error)) throw error;
-			if (group.generated && error.errors.some((e) => e.path === "PRIMARY")) throw error;
+			if (group.generated && error.hint?.primaryKey === true) throw error;
 			return;
 		}
 	}
@@ -2074,7 +2065,8 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		const indexes = [];
 		const { all: ftAll, def: ftDefault } = this._fulltextIndexes();
 		for (const index of ftAll) indexes.push({
-			name: index.key,
+			name: index.name,
+			aliases: [index.key],
 			description: describeFulltext(index, (names) => `FULLTEXT index on ${names}`),
 			type: "text",
 			fields: this._indexLogicalPaths(index),
@@ -2095,7 +2087,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	}
 	async search(text, query, indexName) {
 		const combinedWhere = this._buildSearchWhere(text, query, indexName);
-		const { sql, params } = buildSelect$1(this.resolveTableName(), combinedWhere, query.controls);
+		const { sql, params } = buildSelect$1(this.resolveTableName(), combinedWhere, query.controls, void 0, combinedWhere.rank);
 		this._log(sql, params);
 		return this._exec().all(sql, params);
 	}
@@ -2103,7 +2095,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		const combinedWhere = this._buildSearchWhere(text, query, indexName);
 		const tableName = this.resolveTableName();
 		const selectPromise = (async () => {
-			const { sql, params } = buildSelect$1(tableName, combinedWhere, query.controls);
+			const { sql, params } = buildSelect$1(tableName, combinedWhere, query.controls, void 0, combinedWhere.rank);
 			this._log(sql, params);
 			return this._exec().all(sql, params);
 		})();
@@ -2118,16 +2110,32 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 			count
 		};
 	}
+	/**
+	* The search predicate (AND the request filter) and its relevance order
+	* (`rank`, since 0.1.165) — used as the ORDER BY when the read has no
+	* `$sort`: exact-number hits first, then `MATCH … AGAINST` relevance, then
+	* the primary key. Grouped searches use only the predicate.
+	*/
 	_buildSearchWhere(text, query, indexName) {
 		const fulltextIndex = this._getFulltextIndex(indexName);
-		if (!fulltextIndex) throw new Error("No FULLTEXT index found for search");
+		if (!fulltextIndex) throw new Error(searchIndexNotFoundMessage(indexName));
 		const { text: textFields, integer: integerFields } = splitFulltextFields(fulltextIndex);
 		const where = buildWhere(query.filter);
 		const n = integerFields.length > 0 ? searchTermInteger(text) : void 0;
 		const matchClause = `MATCH(${textFields.map((f) => qi(f.name)).join(", ")}) AGAINST(? IN NATURAL LANGUAGE MODE)`;
+		const rank = searchRankOrder(mysqlDialect, {
+			exactEqualities: n === void 0 ? [] : integerFields.map((f) => `${qi(f.name)} = ?`),
+			n,
+			textRank: textFields.length > 0 ? {
+				sql: `${matchClause} DESC`,
+				params: [text]
+			} : void 0,
+			pkColumns: this._table.primaryKeys.map((key) => this._table.physicalPath(key))
+		});
 		const withWhere = (clause, params) => ({
 			sql: where.sql === "1=1" ? clause : `${where.sql} AND ${clause}`,
-			params: [...where.params, ...params]
+			params: [...where.params, ...params],
+			rank
 		});
 		if (n === void 0) return textFields.length === 0 ? withWhere(EMPTY_OR.sql, []) : withWhere(matchClause, [text]);
 		const keys = this._table.primaryKeys.map((key) => qi(this._table.physicalPath(key)));
@@ -2151,8 +2159,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	}
 	_getFulltextIndex(indexName) {
 		const { all, def } = this._fulltextIndexes();
-		if (!indexName) return def;
-		return all.find((index) => index.key === indexName);
+		return indexName ? resolveFulltextIndex(all, indexName) : def;
 	}
 	/** The table's fulltext indexes and the default one, built once per table. */
 	_fulltextIndexes() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mysql",
-  "version": "0.1.164",
+  "version": "0.1.166",
   "description": "MySQL adapter for @atscript/db with mysql2 driver support.",
   "keywords": [
     "atscript",
@@ -41,19 +41,19 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.109",
-    "@atscript/typescript": "^0.1.109",
+    "@atscript/core": "^0.2.1",
+    "@atscript/typescript": "^0.2.1",
     "@uniqu/core": "^0.1.15",
     "mysql2": "^3.11.0",
-    "unplugin-atscript": "^0.1.109"
+    "unplugin-atscript": "^0.2.1"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.109",
-    "@atscript/typescript": "^0.1.109",
+    "@atscript/core": "^0.2.1",
+    "@atscript/typescript": "^0.2.1",
     "@uniqu/core": "^0.1.15",
     "mysql2": ">=3.0.0",
-    "@atscript/db": "^0.1.164",
-    "@atscript/db-sql-tools": "^0.1.164"
+    "@atscript/db": "^0.1.166",
+    "@atscript/db-sql-tools": "^0.1.166"
   },
   "peerDependenciesMeta": {
     "mysql2": {