@atscript/db 0.1.40 → 0.1.41

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://atscript.dev/logo.svg" alt="Atscript" width="120" />
+  <img src="https://db.atscript.dev/logo.svg" alt="Atscript" width="120" />
 </p>
 
 <h1 align="center">@atscript/db</h1>

package/dist/{db-view-BntnAmXO.cjs → db-view-CMI9TOo1.cjs}

@@ -2108,13 +2108,35 @@ function createDbValidatorPlugin() {
 		const isFrom = def.metadata.has("db.rel.from");
 		const isVia = def.metadata.has("db.rel.via");
 		if (isTo || isFrom || isVia) return handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia);
-		if (dbCtx.mode === "patch" && require_ops.isDbFieldOp(value)) return true;
+		if (dbCtx.mode === "patch" && require_ops.isDbFieldOp(value)) {
+			if (dbCtx.flatMap && !isFieldOpAllowed(ctx.path, dbCtx.flatMap)) {
+				ctx.error("Field operations ($inc/$dec/$mul) are not supported inside @db.json fields or nested objects without @db.patch.strategy \"merge\"");
+				return false;
+			}
+			return true;
+		}
 		if (dbCtx.mode === "patch" && def.type.kind === "array" && dbCtx.flatMap) {
 			const flatEntry = dbCtx.flatMap.get(ctx.path);
 			if (flatEntry?.metadata?.has("db.__topLevelArray") && !flatEntry.metadata.has("db.json")) return handleArrayPatch(ctx, def, value);
 		}
 	};
 }
+/**
+* Checks whether a field op is valid at `path` by walking up ancestors
+* in the flatMap. Rejects if any ancestor is @db.json or a nested object
+* without @db.patch.strategy "merge".
+*/
+function isFieldOpAllowed(path, flatMap) {
+	let pos = path.length;
+	while ((pos = path.lastIndexOf(".", pos - 1)) !== -1) {
+		const ancestor = path.slice(0, pos);
+		const entry = flatMap.get(ancestor);
+		if (!entry) continue;
+		if (entry.metadata.has("db.json")) return false;
+		if (entry.type.kind === "object" && entry.metadata.get("db.patch.strategy") !== "merge") return false;
+	}
+	return true;
+}
 function handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia) {
 	const pathParts = ctx.path.split(".");
 	const fieldName = pathParts[pathParts.length - 1] || ctx.path;
@@ -2653,18 +2675,21 @@ var AtscriptDbTable = class extends AtscriptDbReadable {
 				for (const navField of this._meta.navFields) delete data[navField];
 				const filter = this._extractPrimaryKeyFilter(data);
 				for (const pk of this._meta.primaryKeys) delete data[pk];
-				const ops = require_ops.separateFieldOps(data);
-				if (_isEmptyObj(data) && !ops) {
+				if (_isEmptyObj(data)) {
 					matchedCount += 1;
 					modifiedCount += 0;
 					continue;
 				}
 				let result;
 				const translatedFilter = this._fieldMapper.translateFilter(filter, this._meta);
-				const translatedOps = ops ? _translateOpsKeys(ops, this._meta) : void 0;
-				if (this.adapter.supportsNativePatch()) result = await this.adapter.nativePatch(translatedFilter, data, translatedOps);
-				else {
+				if (this.adapter.supportsNativePatch()) {
+					const ops = require_ops.separateFieldOps(data);
+					const translatedOps = ops ? _translateOpsKeys(ops, this._meta) : void 0;
+					result = await this.adapter.nativePatch(translatedFilter, data, translatedOps);
+				} else {
 					const update = decomposePatch(data, this);
+					const ops = require_ops.separateFieldOps(update);
+					const translatedOps = ops ? _translateOpsKeys(ops, this._meta) : void 0;
 					const translatedUpdate = this._fieldMapper.translatePatchKeys(update, this._meta);
 					if (getArrayOpsFields(translatedUpdate).size > 0) {
 						const resolved = resolveArrayOps(translatedUpdate, await this.adapter.findOne({

package/dist/{db-view-ZsoN91-q.mjs → db-view-Esy2fDxw.mjs}

@@ -2108,13 +2108,35 @@ function createDbValidatorPlugin() {
 		const isFrom = def.metadata.has("db.rel.from");
 		const isVia = def.metadata.has("db.rel.via");
 		if (isTo || isFrom || isVia) return handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia);
-		if (dbCtx.mode === "patch" && isDbFieldOp(value)) return true;
+		if (dbCtx.mode === "patch" && isDbFieldOp(value)) {
+			if (dbCtx.flatMap && !isFieldOpAllowed(ctx.path, dbCtx.flatMap)) {
+				ctx.error("Field operations ($inc/$dec/$mul) are not supported inside @db.json fields or nested objects without @db.patch.strategy \"merge\"");
+				return false;
+			}
+			return true;
+		}
 		if (dbCtx.mode === "patch" && def.type.kind === "array" && dbCtx.flatMap) {
 			const flatEntry = dbCtx.flatMap.get(ctx.path);
 			if (flatEntry?.metadata?.has("db.__topLevelArray") && !flatEntry.metadata.has("db.json")) return handleArrayPatch(ctx, def, value);
 		}
 	};
 }
+/**
+* Checks whether a field op is valid at `path` by walking up ancestors
+* in the flatMap. Rejects if any ancestor is @db.json or a nested object
+* without @db.patch.strategy "merge".
+*/
+function isFieldOpAllowed(path, flatMap) {
+	let pos = path.length;
+	while ((pos = path.lastIndexOf(".", pos - 1)) !== -1) {
+		const ancestor = path.slice(0, pos);
+		const entry = flatMap.get(ancestor);
+		if (!entry) continue;
+		if (entry.metadata.has("db.json")) return false;
+		if (entry.type.kind === "object" && entry.metadata.get("db.patch.strategy") !== "merge") return false;
+	}
+	return true;
+}
 function handleNavField(ctx, def, value, dbCtx, isTo, isFrom, isVia) {
 	const pathParts = ctx.path.split(".");
 	const fieldName = pathParts[pathParts.length - 1] || ctx.path;
@@ -2653,18 +2675,21 @@ var AtscriptDbTable = class extends AtscriptDbReadable {
 				for (const navField of this._meta.navFields) delete data[navField];
 				const filter = this._extractPrimaryKeyFilter(data);
 				for (const pk of this._meta.primaryKeys) delete data[pk];
-				const ops = separateFieldOps(data);
-				if (_isEmptyObj(data) && !ops) {
+				if (_isEmptyObj(data)) {
 					matchedCount += 1;
 					modifiedCount += 0;
 					continue;
 				}
 				let result;
 				const translatedFilter = this._fieldMapper.translateFilter(filter, this._meta);
-				const translatedOps = ops ? _translateOpsKeys(ops, this._meta) : void 0;
-				if (this.adapter.supportsNativePatch()) result = await this.adapter.nativePatch(translatedFilter, data, translatedOps);
-				else {
+				if (this.adapter.supportsNativePatch()) {
+					const ops = separateFieldOps(data);
+					const translatedOps = ops ? _translateOpsKeys(ops, this._meta) : void 0;
+					result = await this.adapter.nativePatch(translatedFilter, data, translatedOps);
+				} else {
 					const update = decomposePatch(data, this);
+					const ops = separateFieldOps(update);
+					const translatedOps = ops ? _translateOpsKeys(ops, this._meta) : void 0;
 					const translatedUpdate = this._fieldMapper.translatePatchKeys(update, this._meta);
 					if (getArrayOpsFields(translatedUpdate).size > 0) {
 						const resolved = resolveArrayOps(translatedUpdate, await this.adapter.findOne({

package/dist/index.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_nested_writer = require("./nested-writer-BDXsDMPP.cjs");
-const require_db_view = require("./db-view-BntnAmXO.cjs");
+const require_db_view = require("./db-view-CMI9TOo1.cjs");
 const require_ops = require("./ops.cjs");
 let _uniqu_core = require("@uniqu/core");
 //#region src/table/db-space.ts

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { h as DbError } from "./nested-writer-Dmm1gbZV.mjs";
-import { _ as NoopLogger, a as getKeyProps, c as IntegrityStrategy, d as resolveDesignType, f as RelationalFieldMapper, g as TableMetadata, h as UniquSelect, i as createDbValidatorPlugin, l as NativeIntegrity, m as FieldMappingStrategy, n as AtscriptDbTable, o as ApplicationIntegrity, p as DocumentFieldMapper, r as decomposePatch, s as BaseDbAdapter, t as AtscriptDbView, u as AtscriptDbReadable } from "./db-view-ZsoN91-q.mjs";
+import { _ as NoopLogger, a as getKeyProps, c as IntegrityStrategy, d as resolveDesignType, f as RelationalFieldMapper, g as TableMetadata, h as UniquSelect, i as createDbValidatorPlugin, l as NativeIntegrity, m as FieldMappingStrategy, n as AtscriptDbTable, o as ApplicationIntegrity, p as DocumentFieldMapper, r as decomposePatch, s as BaseDbAdapter, t as AtscriptDbView, u as AtscriptDbReadable } from "./db-view-Esy2fDxw.mjs";
 import { getDbFieldOp, isDbFieldOp, separateFieldOps } from "./ops.mjs";
 import { computeInsights, isPrimitive, walkFilter } from "@uniqu/core";
 //#region src/table/db-space.ts

package/dist/sync.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./nested-writer-BDXsDMPP.cjs");
-const require_db_view = require("./db-view-BntnAmXO.cjs");
+const require_db_view = require("./db-view-CMI9TOo1.cjs");
 //#region src/schema/schema-hash.ts
 /** Extracts sorted field snapshots from a readable's field descriptors. */
 function extractFieldSnapshots(fields, typeMapper) {

package/dist/sync.mjs

@@ -1,4 +1,4 @@
-import { _ as NoopLogger } from "./db-view-ZsoN91-q.mjs";
+import { _ as NoopLogger } from "./db-view-Esy2fDxw.mjs";
 //#region src/schema/schema-hash.ts
 /** Extracts sorted field snapshots from a readable's field descriptors. */
 function extractFieldSnapshots(fields, typeMapper) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",