@atscript/typescript 0.1.92 → 0.1.94

package/dist/cli.cjs

@@ -349,7 +349,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		this.writeln("static toJsonSchema: () => any");
 		if (!this.opts?.exampleData) this.writeln("/** @deprecated Example Data support is disabled. To enable, set `exampleData: true` in tsPlugin options. */");
 		this.writeln("static toExampleData?: () => any");
-		if (interfaceNode && this.hasDbEntity(interfaceNode)) {
+		if (interfaceNode && (0, _atscript_core.isDbEntityNode)(interfaceNode)) {
 			this.renderFlat(interfaceNode);
 			this.renderOwnProps(interfaceNode);
 			this.renderNavProps(interfaceNode);
@@ -444,15 +444,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		this.popln();
 	}
 	/**
-	* Checks whether an interface is a DB entity (`@db.table` or `@db.view`).
-	*
-	* Only DB entities get `__flat`, `__pk`, `__ownProps`, and `__navProps` static properties.
-	* These exist solely to improve type-safety for filter expressions, `$select`/`$sort`,
-	* and `$with` operations in the DB layer.
-	*/ hasDbEntity(node) {
-		return !!node.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for");
-	}
-	/**
 	* Renders the `static __flat` property — a map of all dot-notation paths
 	* to their TypeScript value types.
 	*
@@ -484,6 +475,8 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	* - **Intermediate paths** (structures, arrays of structures) → `never`
 	* - **`@db.json` fields** → `string` (stored as serialized JSON in DB)
 	* - **Leaf fields** → their original TypeScript type
+	* - **Optional leaf / `@db.json` fields** → `<type> | null` — the DB layer treats
+	*   optional as nullable in filters, so `null` must be assignable to the path's type
 	*/ renderFlatMap(propName, flatMap, opts) {
 		if (flatMap.size === 0) return;
 		if (opts?.leadingNewline) this.writeln();
@@ -493,12 +486,15 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			this.write(`"${escapeQuotes(path)}"`);
 			if (descriptor.optional) this.write("?");
 			this.write(": ");
+			const nullable = descriptor.optional ? " | null" : "";
 			if (descriptor.intermediate) this.writeln("never");
-			else if (descriptor.dbJson) this.writeln("string");
+			else if (descriptor.dbJson) this.writeln(`string${nullable}`);
 			else {
 				const originalDef = descriptor.propNode?.getDefinition();
 				const defToRender = originalDef && !((0, _atscript_core.isGroup)(descriptor.def) && descriptor.def !== originalDef) ? originalDef : descriptor.def;
-				this.renderTypeDefString(defToRender).split("\n").forEach((l) => this.writeln(l));
+				const lines = this.renderTypeDefString(defToRender).split("\n");
+				lines[lines.length - 1] += nullable;
+				lines.forEach((l) => this.writeln(l));
 			}
 		}
 		if (opts?.trailingNewline) this.popln();
@@ -1882,7 +1878,7 @@ var JsRenderer = class extends BaseRenderer {
 	renderDimMeasure(node) {
 		if (!(0, _atscript_core.isInterface)(node)) return;
 		const interfaceNode = node;
-		if (!interfaceNode.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for")) return;
+		if (!(0, _atscript_core.isDbEntityNode)(interfaceNode)) return;
 		let struct;
 		if (interfaceNode.hasExtends) struct = this.doc.resolveInterfaceExtends(interfaceNode);
 		if (!struct) struct = interfaceNode.getDefinition();
@@ -2797,15 +2793,24 @@ async function importGeneratedModules(outputs, rootDir, cwd) {
 	while (i < first.length && parts.every((p) => p[i] === first[i])) i++;
 	return first.slice(0, i).join(path.default.sep) || path.default.sep;
 }
-function isDbModel(value) {
-	return isAnnotatedType(value) && Boolean(value.metadata?.has("db.table") || value.metadata?.has("db.view"));
+/**
+* Runtime side of `DB_ENTITY_ANNOTATIONS` — the same rule as `DbSpace.get()`
+* in `@atscript/db`: a type carrying only `@db.view.for` is a managed view, so
+* it belongs in the inventory too (leaving it out would plan the view as a drop).
+*
+* Lives here rather than in `@atscript/typescript/utils`: `utils` is the
+* runtime entry every generated `.as.js` module imports (browsers included)
+* and carries no `@atscript/core` import, which is externalized in the build.
+*/ function isDbEntityType(value) {
+	if (!isAnnotatedType(value)) return false;
+	return _atscript_core.DB_ENTITY_ANNOTATIONS.some((name) => value.metadata?.has(name));
 }
 /** `seen` deduplicates by identity and guarantees termination on cyclic graphs. */ function walkModels(value, out, seen) {
 	if (!value || typeof value !== "object" && typeof value !== "function") return;
 	if (seen.has(value)) return;
 	seen.add(value);
 	if (isAnnotatedType(value)) {
-		if (isDbModel(value)) out.push(value);
+		if (isDbEntityType(value)) out.push(value);
 		return;
 	}
 	const items = Array.isArray(value) ? value : Object.values(value);
@@ -2863,7 +2868,8 @@ const PLAN_HEADER = [
 	return {
 		destructive: plan.entries.some((e) => e.destructive),
 		hasChanges: plan.entries.some((e) => e.hasChanges),
-		hasErrors: plan.entries.some((e) => e.hasErrors)
+		hasErrors: plan.entries.some((e) => e.hasErrors),
+		refused: plan.entries.some((e) => e.refused)
 	};
 }
 var DbSyncPrinter = class {
@@ -2893,19 +2899,33 @@ var DbSyncPrinter = class {
 		this.printGrouped(result.entries, "result");
 		this.log("");
 	}
-	/** Renders the plan as a JSON document for CI consumption. */ renderJson(plan) {
+	/**
+	* A refused run issued no DDL and left tracking untouched, so its `entries`
+	* are the plan, not an outcome — only the entries that carry the refusal
+	* (or another error) are printed, in plan mode.
+	*/ refused(result) {
+		this.log("");
+		this.log(this.colors.red(this.colors.bold("Schema sync refused — nothing was applied.")));
+		this.log("");
+		this.printGrouped(result.entries.filter((e) => e.hasErrors), "plan");
+		this.log("");
+	}
+	/**
+	* Renders the plan as a JSON document for CI consumption. Every `SyncEntry`
+	* field (`toInit()`) is emitted, plus its derived flags; `columnsToAdd` is
+	* narrowed to the serializable column facts.
+	*/ renderJson(plan) {
 		const doc = {
 			status: plan.status,
 			schemaHash: plan.schemaHash,
 			...planFlags(plan),
 			entries: plan.entries.map((e) => ({
-				name: e.name,
+				...e.toInit(),
 				kind: e.viewType ? "view" : "table",
-				viewType: e.viewType,
-				status: e.status,
 				destructive: e.destructive,
-				syncMethod: e.syncMethod,
-				renamedFrom: e.renamedFrom,
+				hasChanges: e.hasChanges,
+				hasErrors: e.hasErrors,
+				pending: e.pending,
 				columnsToAdd: e.columnsToAdd.map((c) => ({
 					path: c.path,
 					physicalName: c.physicalName,
@@ -2913,27 +2933,17 @@ var DbSyncPrinter = class {
 					optional: c.optional,
 					isPrimaryKey: c.isPrimaryKey,
 					storage: c.storage
-				})),
-				columnsToRename: e.columnsToRename,
-				typeChanges: e.typeChanges,
-				nullableChanges: e.nullableChanges,
-				defaultChanges: e.defaultChanges,
-				columnsToDrop: e.columnsToDrop,
-				optionChanges: e.optionChanges,
-				fkAdded: e.fkAdded,
-				fkRemoved: e.fkRemoved,
-				fkChanged: e.fkChanged,
-				errors: e.errors
+				}))
 			}))
 		};
 		return `${JSON.stringify(doc, void 0, 2)}\n`;
 	}
 	/** Renders the plan as a Markdown document (e.g. for PR comments). */ renderMarkdown(plan) {
-		const { destructive } = planFlags(plan);
+		const { destructive, refused } = planFlags(plan);
 		const lines = [
 			"# Schema Sync Plan",
 			"",
-			`- **Status:** ${plan.status}${destructive ? " (destructive)" : ""}`,
+			`- **Status:** ${plan.status}${destructive ? " (destructive)" : ""}${refused ? " (refused)" : ""}`,
 			`- **Schema hash:** \`${plan.schemaHash}\``,
 			""
 		];
@@ -3008,7 +3018,7 @@ var DbSyncController = class {
 		if (!config.db) this.fail("No \"db\" field in atscript config. Add a db configuration to use schema sync.");
 		const dbTypes = await this.loadTypes(config);
 		if (dbTypes.length === 0) {
-			this.info(`No types with @db.table or @db.view found. Nothing to sync.`);
+			this.info(`No types with @db.table, @db.view or @db.view.for found. Nothing to sync.`);
 			return;
 		}
 		this.printer.typeCount(dbTypes.length);
@@ -3020,7 +3030,7 @@ var DbSyncController = class {
 			force,
 			safe
 		});
-		const { destructive: hasDestructive, hasChanges, hasErrors } = planFlags(plan);
+		const { destructive: hasDestructive, hasChanges, hasErrors, refused } = planFlags(plan);
 		if (format) {
 			const doc = format === "json" ? this.printer.renderJson(plan) : this.printer.renderMarkdown(plan);
 			if (out) {
@@ -3031,7 +3041,7 @@ var DbSyncController = class {
 		if (plan.status === "up-to-date") this.printer.planUpToDate(plan);
 		else {
 			this.printer.plan(plan);
-			if (hasErrors) this.fail("Schema has errors. Fix the issues above before syncing.");
+			if (hasErrors) this.fail(refused ? "Schema sync would be refused — nothing would be applied. Fix the issues above." : "Schema has errors. Fix the issues above before syncing.");
 		}
 		if (check || format) {
 			if (check && hasChanges) {
@@ -3042,10 +3052,7 @@ var DbSyncController = class {
 		}
 		if (plan.status === "up-to-date") return;
 		if (!hasChanges) {
-			if (!dryRun) await sync.run(dbTypes, {
-				force: true,
-				safe
-			});
+			if (!dryRun) await this.runSync(sync, dbTypes, safe);
 			return;
 		}
 		if (dryRun) {
@@ -3060,11 +3067,23 @@ var DbSyncController = class {
 				}
 			}
 		} else this.logger.log(`No destructive changes, proceeding to sync...`);
+		const result = await this.runSync(sync, dbTypes, safe);
+		this.printer.result(result);
+	}
+	/**
+	* Applies the sync. A refused run (`status: 'refused'`) issued no DDL and
+	* left tracking untouched — its refusal entries are printed and the command
+	* exits 1 instead of reporting a successful sync.
+	*/ async runSync(sync, dbTypes, safe) {
 		const result = await sync.run(dbTypes, {
 			force: true,
 			safe
 		});
-		this.printer.result(result);
+		if (result.status === "refused") {
+			this.printer.refused(result);
+			this.fail("Schema sync refused — nothing was applied. Fix the issues above and re-run.");
+		}
+		return result;
 	}
 	/**
 	* Loads the full model inventory or aborts. Diagnostics run first, every

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
-const require_plugin = require('./plugin-BYtucpiS.cjs');
+const require_plugin = require('./plugin-B4kAIw0J.cjs');
 
 exports.default = require_plugin.tsPlugin;
 exports.tsPlugin = require_plugin.tsPlugin;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { t as tsPlugin } from "./plugin-ac7ZXMDN.mjs";
+import { t as tsPlugin } from "./plugin-C7I4ICoT.mjs";
 
 export { tsPlugin as default, tsPlugin };

package/dist/{plugin-BYtucpiS.cjs → plugin-B4kAIw0J.cjs}

@@ -344,7 +344,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		this.writeln("static toJsonSchema: () => any");
 		if (!this.opts?.exampleData) this.writeln("/** @deprecated Example Data support is disabled. To enable, set `exampleData: true` in tsPlugin options. */");
 		this.writeln("static toExampleData?: () => any");
-		if (interfaceNode && this.hasDbEntity(interfaceNode)) {
+		if (interfaceNode && (0, _atscript_core.isDbEntityNode)(interfaceNode)) {
 			this.renderFlat(interfaceNode);
 			this.renderOwnProps(interfaceNode);
 			this.renderNavProps(interfaceNode);
@@ -439,15 +439,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		this.popln();
 	}
 	/**
-	* Checks whether an interface is a DB entity (`@db.table` or `@db.view`).
-	*
-	* Only DB entities get `__flat`, `__pk`, `__ownProps`, and `__navProps` static properties.
-	* These exist solely to improve type-safety for filter expressions, `$select`/`$sort`,
-	* and `$with` operations in the DB layer.
-	*/ hasDbEntity(node) {
-		return !!node.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for");
-	}
-	/**
 	* Renders the `static __flat` property — a map of all dot-notation paths
 	* to their TypeScript value types.
 	*
@@ -479,6 +470,8 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	* - **Intermediate paths** (structures, arrays of structures) → `never`
 	* - **`@db.json` fields** → `string` (stored as serialized JSON in DB)
 	* - **Leaf fields** → their original TypeScript type
+	* - **Optional leaf / `@db.json` fields** → `<type> | null` — the DB layer treats
+	*   optional as nullable in filters, so `null` must be assignable to the path's type
 	*/ renderFlatMap(propName, flatMap, opts) {
 		if (flatMap.size === 0) return;
 		if (opts?.leadingNewline) this.writeln();
@@ -488,12 +481,15 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			this.write(`"${escapeQuotes(path)}"`);
 			if (descriptor.optional) this.write("?");
 			this.write(": ");
+			const nullable = descriptor.optional ? " | null" : "";
 			if (descriptor.intermediate) this.writeln("never");
-			else if (descriptor.dbJson) this.writeln("string");
+			else if (descriptor.dbJson) this.writeln(`string${nullable}`);
 			else {
 				const originalDef = descriptor.propNode?.getDefinition();
 				const defToRender = originalDef && !((0, _atscript_core.isGroup)(descriptor.def) && descriptor.def !== originalDef) ? originalDef : descriptor.def;
-				this.renderTypeDefString(defToRender).split("\n").forEach((l) => this.writeln(l));
+				const lines = this.renderTypeDefString(defToRender).split("\n");
+				lines[lines.length - 1] += nullable;
+				lines.forEach((l) => this.writeln(l));
 			}
 		}
 		if (opts?.trailingNewline) this.popln();
@@ -967,7 +963,7 @@ var JsRenderer = class extends BaseRenderer {
 	renderDimMeasure(node) {
 		if (!(0, _atscript_core.isInterface)(node)) return;
 		const interfaceNode = node;
-		if (!interfaceNode.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for")) return;
+		if (!(0, _atscript_core.isDbEntityNode)(interfaceNode)) return;
 		let struct;
 		if (interfaceNode.hasExtends) struct = this.doc.resolveInterfaceExtends(interfaceNode);
 		if (!struct) struct = interfaceNode.getDefinition();

package/dist/{plugin-ac7ZXMDN.mjs → plugin-C7I4ICoT.mjs}

@@ -1,6 +1,6 @@
 import { l as defineAnnotatedType, t as buildJsonSchema } from "./json-schema-DycaD0Rm.mjs";
 import path from "path";
-import { DEFAULT_FORMAT, flattenInterfaceNode, getRelPath, hasNavPropAnnotation, isArray, isBareId, isBareSpecifier, isConst, isGroup, isInterface, isPrimitive, isProp, isQueryLogical, isRef, isStructure } from "@atscript/core";
+import { DEFAULT_FORMAT, flattenInterfaceNode, getRelPath, hasNavPropAnnotation, isArray, isBareId, isBareSpecifier, isConst, isDbEntityNode, isGroup, isInterface, isPrimitive, isProp, isQueryLogical, isRef, isStructure } from "@atscript/core";
 
 //#region packages/typescript/src/codegen/code-printer.ts
 function _define_property$3(obj, key, value) {
@@ -316,7 +316,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		this.writeln("static toJsonSchema: () => any");
 		if (!this.opts?.exampleData) this.writeln("/** @deprecated Example Data support is disabled. To enable, set `exampleData: true` in tsPlugin options. */");
 		this.writeln("static toExampleData?: () => any");
-		if (interfaceNode && this.hasDbEntity(interfaceNode)) {
+		if (interfaceNode && isDbEntityNode(interfaceNode)) {
 			this.renderFlat(interfaceNode);
 			this.renderOwnProps(interfaceNode);
 			this.renderNavProps(interfaceNode);
@@ -411,15 +411,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		this.popln();
 	}
 	/**
-	* Checks whether an interface is a DB entity (`@db.table` or `@db.view`).
-	*
-	* Only DB entities get `__flat`, `__pk`, `__ownProps`, and `__navProps` static properties.
-	* These exist solely to improve type-safety for filter expressions, `$select`/`$sort`,
-	* and `$with` operations in the DB layer.
-	*/ hasDbEntity(node) {
-		return !!node.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for");
-	}
-	/**
 	* Renders the `static __flat` property — a map of all dot-notation paths
 	* to their TypeScript value types.
 	*
@@ -451,6 +442,8 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	* - **Intermediate paths** (structures, arrays of structures) → `never`
 	* - **`@db.json` fields** → `string` (stored as serialized JSON in DB)
 	* - **Leaf fields** → their original TypeScript type
+	* - **Optional leaf / `@db.json` fields** → `<type> | null` — the DB layer treats
+	*   optional as nullable in filters, so `null` must be assignable to the path's type
 	*/ renderFlatMap(propName, flatMap, opts) {
 		if (flatMap.size === 0) return;
 		if (opts?.leadingNewline) this.writeln();
@@ -460,12 +453,15 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			this.write(`"${escapeQuotes(path)}"`);
 			if (descriptor.optional) this.write("?");
 			this.write(": ");
+			const nullable = descriptor.optional ? " | null" : "";
 			if (descriptor.intermediate) this.writeln("never");
-			else if (descriptor.dbJson) this.writeln("string");
+			else if (descriptor.dbJson) this.writeln(`string${nullable}`);
 			else {
 				const originalDef = descriptor.propNode?.getDefinition();
 				const defToRender = originalDef && !(isGroup(descriptor.def) && descriptor.def !== originalDef) ? originalDef : descriptor.def;
-				this.renderTypeDefString(defToRender).split("\n").forEach((l) => this.writeln(l));
+				const lines = this.renderTypeDefString(defToRender).split("\n");
+				lines[lines.length - 1] += nullable;
+				lines.forEach((l) => this.writeln(l));
 			}
 		}
 		if (opts?.trailingNewline) this.popln();
@@ -939,7 +935,7 @@ var JsRenderer = class extends BaseRenderer {
 	renderDimMeasure(node) {
 		if (!isInterface(node)) return;
 		const interfaceNode = node;
-		if (!interfaceNode.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for")) return;
+		if (!isDbEntityNode(interfaceNode)) return;
 		let struct;
 		if (interfaceNode.hasExtends) struct = this.doc.resolveInterfaceExtends(interfaceNode);
 		if (!struct) struct = interfaceNode.getDefinition();

package/dist/test-utils.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_plugin = require('./plugin-BYtucpiS.cjs');
+const require_plugin = require('./plugin-B4kAIw0J.cjs');
 let path = require("path");
 path = require_plugin.__toESM(path);
 let _atscript_core = require("@atscript/core");

package/dist/test-utils.mjs

@@ -1,4 +1,4 @@
-import { t as tsPlugin } from "./plugin-ac7ZXMDN.mjs";
+import { t as tsPlugin } from "./plugin-C7I4ICoT.mjs";
 import path from "path";
 import { build } from "@atscript/core";
 import { readFileSync, writeFileSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.92",
+  "version": "0.1.94",
   "description": "Atscript: typescript-gen support.",
   "keywords": [
     "annotations",
@@ -67,13 +67,13 @@
     "moost": "^0.6.37"
   },
   "devDependencies": {
-    "@atscript/db": "^0.1.125",
+    "@atscript/db": "^0.1.128",
     "@uniqu/core": "^0.1.7",
     "vitest": "3.2.7"
   },
   "peerDependencies": {
     "@atscript/db": "^0.1.97",
-    "@atscript/core": "^0.1.92"
+    "@atscript/core": "^0.1.94"
   },
   "peerDependenciesMeta": {
     "@atscript/db": {