@atscript/db 0.1.155 → 0.1.157

package/dist/sync.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_db_error = require("./db-error-JcfJqqpk.cjs");
-const require_column_diff = require("./column-diff-DMkGYAGM.cjs");
-const require_validator = require("./validator-DHwSyBej.cjs");
+const require_column_diff = require("./column-diff-DpeUbhEI.cjs");
+const require_validator = require("./validator-B4YDLUkj.cjs");
 //#region src/schema/json-column-copy.ts
 const NONE = {
 	copies: [],
@@ -946,8 +946,11 @@ async function executeSyncTable(facts, safe, deps, exec) {
 					if (hasFkChanges && fkDiff && adapter.dropForeignKeys) {
 						const keysToDrop = [...fkDiff.removed.map((fk) => require_column_diff.fkKey(fk.fields)), ...fkDiff.changed.map((fk) => require_column_diff.fkKey(require_column_diff.fkColumns(fk.desired).fields))];
 						if (keysToDrop.length > 0) {
-							await adapter.dropForeignKeys(keysToDrop);
-							droppedFks.push(...keysToDrop);
+							const fresh = keysToDrop.filter((key) => !droppedFks.includes(key));
+							if (fresh.length > 0) {
+								await adapter.dropForeignKeys(fresh);
+								droppedFks.push(...fresh);
+							}
 							init.status = "alter";
 						}
 					}
@@ -1000,14 +1003,17 @@ async function executeSyncTable(facts, safe, deps, exec) {
 				}
 			}
 		}
+		if (init.pkChange && facts.populated === true) init.pkChange.populated = true;
 		if (init.status === "error") return new SyncEntry(init);
 		phase = "Index/FK sync";
-		await adapter.syncIndexes();
+		await adapter.syncIndexes(keptIndexes(init));
 		if (adapter.syncForeignKeys && !exec.deferForeignKeysTo) await adapter.syncForeignKeys();
 		if (adapter.afterSyncTable) await adapter.afterSyncTable();
 	} catch (error) {
 		const dropped = droppedFks.length > 0 ? ` Dropped foreign keys before the failure: ${droppedFks.join(", ")} — the ones still in the model are re-added by the next run's syncForeignKeys.` : "";
-		const msg = `${phase} failed on ${name}: ${error.message}${dropped}`;
+		const reason = error.message;
+		const sep = dropped && !/[.!?]$/.test(reason) ? "." : "";
+		const msg = `${phase} failed on ${name}: ${reason}${sep}${dropped}`;
 		deps.logger.error?.(`[schema-sync] ${msg}`);
 		const planned = planTableInit(facts, safe, exec.dependsOn);
 		return new SyncEntry({
@@ -1114,9 +1120,29 @@ function afterJsonCopy(facts) {
 function markSkipped(init, kind) {
 	init.skipped = [...init.skipped ?? [], kind];
 }
-/** Whether nullable/default changes need DDL on this adapter (schema-less ones only update the snapshot). */
+/**
+* Whether nullable/default changes need DDL on this adapter: in-place modify,
+* or a recreate on a live-introspected one (SQLite). Snapshot-based adapters
+* (MongoDB) have no column constraint to change — they only update the
+* snapshot, even with a `recreateTable`.
+*/
 function needsDdlForNullableDefaults(adapter) {
-	return !!adapter.supportsColumnModify && !!adapter.syncColumns || !!adapter.recreateTable;
+	return !!adapter.supportsColumnModify && !!adapter.syncColumns || !!adapter.recreateTable && !!adapter.getExistingColumns;
+}
+/**
+* The indexes `syncIndexes` keeps as they are because safe mode skipped
+* the change they depend on — a skipped key rebuild, the columns of a
+* skipped type-change recreate (see `TSyncIndexesOptions`).
+*/
+function keptIndexes(init) {
+	const skipped = init.skipped ?? [];
+	const keepPrimaryKey = skipped.includes("pk-rebuild");
+	const keepColumns = skipped.includes("recreate") ? (init.typeChanges ?? []).map((tc) => tc.column) : [];
+	if (!keepPrimaryKey && keepColumns.length === 0) return;
+	return {
+		keepPrimaryKey,
+		keepColumns
+	};
 }
 /**
 * The work `run({ safe: true })` skips on this table, in the order the
@@ -1238,7 +1264,7 @@ async function applyColumnDiff(adapter, readable, diff, init, safe, logger, ensu
 		if (!safe && !init.recreated && init.status !== "error") if (adapter.supportsColumnModify && adapter.syncColumns) {
 			needsSyncColumns = true;
 			init.status = "alter";
-		} else if (adapter.recreateTable) await recreateKeepingRenames(adapter, diff, init);
+		} else if (needsDdlForNullableDefaults(adapter)) await recreateKeepingRenames(adapter, diff, init);
 		else init.status = "alter";
 		else if (init.status !== "error") {
 			if (safe && !init.recreated && needsDdlForNullableDefaults(adapter)) {

package/dist/sync.d.cts

@@ -1,5 +1,5 @@
-import { At as TPrimaryKeyChange, It as TTableOptionDiff, U as TDbFieldMeta, et as TDbObjectKind, gt as TEnsureTableOptions, jt as TReferencingForeignKey, mt as TDerivedChangeReason, qn as TGenericLogger, tn as DbSpace, vt as TExistingForeignKey, yt as TExistingTableOption } from "./buckets-DcWm3SLt.cjs";
-import { _ as computeTableSnapshot, a as hasForeignKeyChanges, b as snapshotToExistingTableOptions, c as TFieldSnapshot, d as TViewColumnSnapshot, f as TViewJoinSnapshot, g as computeTableHash, h as computeSchemaHash, i as fkKey, l as TForeignKeySnapshot, m as canonicalizeQueryNode, n as computeForeignKeyDiff, o as computeColumnDiff, p as TViewSnapshot, t as TForeignKeyDiff, u as TTableSnapshot, v as computeViewSnapshot, y as snapshotToExistingColumns } from "./fk-diff-DblOPBLS.cjs";
+import { At as TPrimaryKeyChange, Jn as TGenericLogger, Lt as TTableOptionDiff, U as TDbFieldMeta, et as TDbObjectKind, gt as TEnsureTableOptions, jt as TReferencingForeignKey, mt as TDerivedChangeReason, nn as DbSpace, vt as TExistingForeignKey, yt as TExistingTableOption } from "./buckets-B4T_alUe.cjs";
+import { _ as computeTableSnapshot, a as hasForeignKeyChanges, b as snapshotToExistingTableOptions, c as TFieldSnapshot, d as TViewColumnSnapshot, f as TViewJoinSnapshot, g as computeTableHash, h as computeSchemaHash, i as fkKey, l as TForeignKeySnapshot, m as canonicalizeQueryNode, n as computeForeignKeyDiff, o as computeColumnDiff, p as TViewSnapshot, t as TForeignKeyDiff, u as TTableSnapshot, v as computeViewSnapshot, y as snapshotToExistingColumns } from "./fk-diff-BWdQ7kRZ.cjs";
 import { TAtscriptAnnotatedType } from "@atscript/typescript/utils";
 
 //#region src/schema/sync-entry.d.ts

package/dist/sync.d.mts

@@ -1,5 +1,5 @@
-import { At as TPrimaryKeyChange, It as TTableOptionDiff, U as TDbFieldMeta, et as TDbObjectKind, gt as TEnsureTableOptions, jt as TReferencingForeignKey, mt as TDerivedChangeReason, qn as TGenericLogger, tn as DbSpace, vt as TExistingForeignKey, yt as TExistingTableOption } from "./buckets-goCoky8v.mjs";
-import { _ as computeTableSnapshot, a as hasForeignKeyChanges, b as snapshotToExistingTableOptions, c as TFieldSnapshot, d as TViewColumnSnapshot, f as TViewJoinSnapshot, g as computeTableHash, h as computeSchemaHash, i as fkKey, l as TForeignKeySnapshot, m as canonicalizeQueryNode, n as computeForeignKeyDiff, o as computeColumnDiff, p as TViewSnapshot, t as TForeignKeyDiff, u as TTableSnapshot, v as computeViewSnapshot, y as snapshotToExistingColumns } from "./fk-diff-BYLNWoF9.mjs";
+import { At as TPrimaryKeyChange, Jn as TGenericLogger, Lt as TTableOptionDiff, U as TDbFieldMeta, et as TDbObjectKind, gt as TEnsureTableOptions, jt as TReferencingForeignKey, mt as TDerivedChangeReason, nn as DbSpace, vt as TExistingForeignKey, yt as TExistingTableOption } from "./buckets-8mG67Mtw.mjs";
+import { _ as computeTableSnapshot, a as hasForeignKeyChanges, b as snapshotToExistingTableOptions, c as TFieldSnapshot, d as TViewColumnSnapshot, f as TViewJoinSnapshot, g as computeTableHash, h as computeSchemaHash, i as fkKey, l as TForeignKeySnapshot, m as canonicalizeQueryNode, n as computeForeignKeyDiff, o as computeColumnDiff, p as TViewSnapshot, t as TForeignKeyDiff, u as TTableSnapshot, v as computeViewSnapshot, y as snapshotToExistingColumns } from "./fk-diff-5gX42hBt.mjs";
 import { TAtscriptAnnotatedType } from "@atscript/typescript/utils";
 
 //#region src/schema/sync-entry.d.ts

package/dist/sync.mjs

@@ -1,6 +1,6 @@
 import { r as DbError } from "./db-error-eSsQX7rt.mjs";
-import { a as computeTableHash, c as serializeDefaultValue, d as viewSnapshotSources, f as computeForeignKeyDiff, ft as relationalColumnName, h as hasForeignKeyChanges, i as computeSchemaHash, j as resolveDesignType, l as snapshotToExistingColumns, m as fkKey, o as computeTableSnapshot, p as fkColumns, pt as aliasTargetOf, r as canonicalizeQueryNode, s as computeViewSnapshot, t as computeColumnDiff, u as snapshotToExistingTableOptions, yt as NoopLogger } from "./column-diff-C68V_eYM.mjs";
-import { f as unionValueMembers } from "./validator-BC3nwFi4.mjs";
+import { a as computeTableHash, c as serializeDefaultValue, d as viewSnapshotSources, f as computeForeignKeyDiff, ft as relationalColumnName, h as hasForeignKeyChanges, i as computeSchemaHash, j as resolveDesignType, l as snapshotToExistingColumns, m as fkKey, o as computeTableSnapshot, p as fkColumns, pt as aliasTargetOf, r as canonicalizeQueryNode, s as computeViewSnapshot, t as computeColumnDiff, u as snapshotToExistingTableOptions, yt as NoopLogger } from "./column-diff-DR1glykD.mjs";
+import { f as unionValueMembers } from "./validator-B3fPJjS1.mjs";
 //#region src/schema/json-column-copy.ts
 const NONE = {
 	copies: [],
@@ -945,8 +945,11 @@ async function executeSyncTable(facts, safe, deps, exec) {
 					if (hasFkChanges && fkDiff && adapter.dropForeignKeys) {
 						const keysToDrop = [...fkDiff.removed.map((fk) => fkKey(fk.fields)), ...fkDiff.changed.map((fk) => fkKey(fkColumns(fk.desired).fields))];
 						if (keysToDrop.length > 0) {
-							await adapter.dropForeignKeys(keysToDrop);
-							droppedFks.push(...keysToDrop);
+							const fresh = keysToDrop.filter((key) => !droppedFks.includes(key));
+							if (fresh.length > 0) {
+								await adapter.dropForeignKeys(fresh);
+								droppedFks.push(...fresh);
+							}
 							init.status = "alter";
 						}
 					}
@@ -999,14 +1002,17 @@ async function executeSyncTable(facts, safe, deps, exec) {
 				}
 			}
 		}
+		if (init.pkChange && facts.populated === true) init.pkChange.populated = true;
 		if (init.status === "error") return new SyncEntry(init);
 		phase = "Index/FK sync";
-		await adapter.syncIndexes();
+		await adapter.syncIndexes(keptIndexes(init));
 		if (adapter.syncForeignKeys && !exec.deferForeignKeysTo) await adapter.syncForeignKeys();
 		if (adapter.afterSyncTable) await adapter.afterSyncTable();
 	} catch (error) {
 		const dropped = droppedFks.length > 0 ? ` Dropped foreign keys before the failure: ${droppedFks.join(", ")} — the ones still in the model are re-added by the next run's syncForeignKeys.` : "";
-		const msg = `${phase} failed on ${name}: ${error.message}${dropped}`;
+		const reason = error.message;
+		const sep = dropped && !/[.!?]$/.test(reason) ? "." : "";
+		const msg = `${phase} failed on ${name}: ${reason}${sep}${dropped}`;
 		deps.logger.error?.(`[schema-sync] ${msg}`);
 		const planned = planTableInit(facts, safe, exec.dependsOn);
 		return new SyncEntry({
@@ -1113,9 +1119,29 @@ function afterJsonCopy(facts) {
 function markSkipped(init, kind) {
 	init.skipped = [...init.skipped ?? [], kind];
 }
-/** Whether nullable/default changes need DDL on this adapter (schema-less ones only update the snapshot). */
+/**
+* Whether nullable/default changes need DDL on this adapter: in-place modify,
+* or a recreate on a live-introspected one (SQLite). Snapshot-based adapters
+* (MongoDB) have no column constraint to change — they only update the
+* snapshot, even with a `recreateTable`.
+*/
 function needsDdlForNullableDefaults(adapter) {
-	return !!adapter.supportsColumnModify && !!adapter.syncColumns || !!adapter.recreateTable;
+	return !!adapter.supportsColumnModify && !!adapter.syncColumns || !!adapter.recreateTable && !!adapter.getExistingColumns;
+}
+/**
+* The indexes `syncIndexes` keeps as they are because safe mode skipped
+* the change they depend on — a skipped key rebuild, the columns of a
+* skipped type-change recreate (see `TSyncIndexesOptions`).
+*/
+function keptIndexes(init) {
+	const skipped = init.skipped ?? [];
+	const keepPrimaryKey = skipped.includes("pk-rebuild");
+	const keepColumns = skipped.includes("recreate") ? (init.typeChanges ?? []).map((tc) => tc.column) : [];
+	if (!keepPrimaryKey && keepColumns.length === 0) return;
+	return {
+		keepPrimaryKey,
+		keepColumns
+	};
 }
 /**
 * The work `run({ safe: true })` skips on this table, in the order the
@@ -1237,7 +1263,7 @@ async function applyColumnDiff(adapter, readable, diff, init, safe, logger, ensu
 		if (!safe && !init.recreated && init.status !== "error") if (adapter.supportsColumnModify && adapter.syncColumns) {
 			needsSyncColumns = true;
 			init.status = "alter";
-		} else if (adapter.recreateTable) await recreateKeepingRenames(adapter, diff, init);
+		} else if (needsDdlForNullableDefaults(adapter)) await recreateKeepingRenames(adapter, diff, init);
 		else init.status = "alter";
 		else if (init.status !== "error") {
 			if (safe && !init.recreated && needsDdlForNullableDefaults(adapter)) {

package/dist/{validation-utils-DxHIqa36.mjs → validation-utils-BGjqc2jU.mjs}

@@ -1,4 +1,4 @@
-import { i as DB_ENTITY_ANNOTATIONS, t as searchKindOf } from "./search-fields-DBIZKwyb.mjs";
+import { i as DB_ENTITY_ANNOTATIONS, t as searchKindOf } from "./search-fields-CE8cmj9X.mjs";
 import { AnnotationSpec, isArray, isInterface, isPrimitive, isQueryComparison, isQueryLogical, isRef, isStructure } from "@atscript/core";
 //#region src/shared/annotation-utils.ts
 /** Asserts the field carrying this annotation does not also carry any of `others`. */

package/dist/{validation-utils-_PA7iSLm.cjs → validation-utils-CtLNlBtB.cjs}

@@ -1,4 +1,4 @@
-const require_search_fields = require("./search-fields-DwrsJUC1.cjs");
+const require_search_fields = require("./search-fields-CT_UZ9fg.cjs");
 let _atscript_core = require("@atscript/core");
 //#region src/shared/annotation-utils.ts
 /** Asserts the field carrying this annotation does not also carry any of `others`. */

package/dist/{validator-BC3nwFi4.mjs → validator-B3fPJjS1.mjs}

@@ -259,9 +259,9 @@ function createDbValidatorPlugin() {
 		if (value === void 0 && (dbCtx.mode === "insert" || dbCtx.mode === "replace") && !complexItems.has(def)) {
 			const meta = def.metadata;
 			const baseMeta = columnUnionBase(def)?.metadata;
-			const defaulted = !(belowAmbiguous(dbCtx, ctx.path) || pathBelowAmbiguous(ctx.root, ctx.path));
+			const defaulted = !(belowAmbiguous(dbCtx, ctx.path) || ctx.root !== void 0 && pathBelowAmbiguous(ctx.root, ctx.path));
 			const has = (key) => defaulted && (meta.has(key) || baseMeta?.has(key) === true);
-			const serverManaged = has("db.default") || has("db.default.increment") || has("db.default.uuid") || has("db.default.now") || meta.has("db.column.version") || meta.has("db.column.derived");
+			const serverManaged = has("db.default") || has("db.default.increment") || has("db.default.uuid") || has("db.default.now") || dbCtx.mode === "replace" && has("db.onUpdate.now") || meta.has("db.column.version") || meta.has("db.column.derived");
 			const hasFK = meta.has("db.rel.FK");
 			if (serverManaged || hasFK) {
 				if (dbCtx.mode === "replace" && meta.has("meta.id") && !ctx.path.includes(".")) return;

package/dist/{validator-DHwSyBej.cjs → validator-B4YDLUkj.cjs}

@@ -259,9 +259,9 @@ function createDbValidatorPlugin() {
 		if (value === void 0 && (dbCtx.mode === "insert" || dbCtx.mode === "replace") && !complexItems.has(def)) {
 			const meta = def.metadata;
 			const baseMeta = columnUnionBase(def)?.metadata;
-			const defaulted = !(belowAmbiguous(dbCtx, ctx.path) || pathBelowAmbiguous(ctx.root, ctx.path));
+			const defaulted = !(belowAmbiguous(dbCtx, ctx.path) || ctx.root !== void 0 && pathBelowAmbiguous(ctx.root, ctx.path));
 			const has = (key) => defaulted && (meta.has(key) || baseMeta?.has(key) === true);
-			const serverManaged = has("db.default") || has("db.default.increment") || has("db.default.uuid") || has("db.default.now") || meta.has("db.column.version") || meta.has("db.column.derived");
+			const serverManaged = has("db.default") || has("db.default.increment") || has("db.default.uuid") || has("db.default.now") || dbCtx.mode === "replace" && has("db.onUpdate.now") || meta.has("db.column.version") || meta.has("db.column.derived");
 			const hasFK = meta.has("db.rel.FK");
 			if (serverManaged || hasFK) {
 				if (dbCtx.mode === "replace" && meta.has("meta.id") && !ctx.path.includes(".")) return;

package/dist/validator.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_db_error = require("./db-error-JcfJqqpk.cjs");
-const require_validator = require("./validator-DHwSyBej.cjs");
+const require_validator = require("./validator-B4YDLUkj.cjs");
 const require_object = require("./object-Djg28csK.cjs");
 const require_ops = require("./ops.cjs");
 exports.$cas = require_ops.$cas;

package/dist/validator.mjs

@@ -1,5 +1,5 @@
 import { r as DbError } from "./db-error-eSsQX7rt.mjs";
-import { a as forceNavNonOptional, c as getKeyProps, i as dbPlugin, n as buildPatchPartial, o as isNavRelation, r as buildValidationContext, s as createDbValidatorPlugin, t as buildDbValidator } from "./validator-BC3nwFi4.mjs";
+import { a as forceNavNonOptional, c as getKeyProps, i as dbPlugin, n as buildPatchPartial, o as isNavRelation, r as buildValidationContext, s as createDbValidatorPlugin, t as buildDbValidator } from "./validator-B3fPJjS1.mjs";
 import { a as isPlainObject, i as isEmptyObject } from "./object-TkiJQ-Dp.mjs";
 import { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, isDbFieldOp, reconcileCas, separateCas } from "./ops.mjs";
 export { $cas, $dec, $inc, $insert, $mul, $remove, $replace, $update, $upsert, DbError, buildDbValidator, buildPatchPartial, buildValidationContext, createDbValidatorPlugin, dbPlugin, forceNavNonOptional, getKeyProps, isDbFieldOp, isEmptyObject, isNavRelation, isPlainObject, reconcileCas, separateCas };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db",
-  "version": "0.1.155",
+  "version": "0.1.157",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",
@@ -71,14 +71,14 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.105",
-    "@atscript/typescript": "^0.1.105",
+    "@atscript/core": "^0.1.106",
+    "@atscript/typescript": "^0.1.106",
     "@uniqu/core": "^0.1.15",
-    "unplugin-atscript": "^0.1.105"
+    "unplugin-atscript": "^0.1.106"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.105",
-    "@atscript/typescript": "^0.1.105",
+    "@atscript/core": "^0.1.106",
+    "@atscript/typescript": "^0.1.106",
     "@uniqu/core": "^0.1.15"
   },
   "scripts": {