@atscript/db 0.1.163 → 0.1.165

package/dist/{view-validation-BcgDq7M9.mjs → view-validation-KW77xIKn.mjs}

@@ -1,6 +1,6 @@
-import { i as NULL_WHEN_EMPTY_AGGREGATE_FNS, o as SUPPORTED_AGGREGATE_FNS, t as AGG_ANNOTATIONS } from "./aggregate-fns-DsS9UQVB.mjs";
+import { i as NULL_WHEN_EMPTY_AGGREGATE_FNS, o as SUPPORTED_AGGREGATE_FNS, t as AGG_ANNOTATIONS } from "./aggregate-fns-CmtSNIHm.mjs";
 import { i as searchKindOf, l as JSON_LEAF_TYPES, n as ENCRYPTED_SEARCH_FEATURES, r as SEARCH_PROBLEM, s as DB_ENTITY_ANNOTATIONS } from "./search-fields-BPNsxrCk.mjs";
-import { AnnotationSpec, annotationExample, isArray, isInterface, isPrimitive, isProp, isQueryComparison, isQueryLogical, isRef, isStructure } from "@atscript/core";
+import { AnnotationSpec, annotationExample, isArray, isGroup, isInterface, isPrimitive, isProp, isQueryComparison, isQueryLogical, isRef, isStructure } from "@atscript/core";
 //#region src/shared/annotation-utils.ts
 /**
 * Names of a field's effective annotations: its own plus the ones it inherits
@@ -62,17 +62,21 @@ function primitiveBaseType(def) {
 	return typeof ct === "object" ? ct.kind === "final" ? ct.value : ct.kind : ct;
 }
 /**
+* `null` in a type expression: the `null` reference or the `null` primitive
+* (whose `config.type` is `"null"`).
+*/
+function isNullMember(node) {
+	return isRef(node) && !node.hasChain && node.id === "null" || primitiveBaseType(node) === "null";
+}
+/**
 * Whether a definition is a union with a `null` member — `T | null`, or a
 * ref to an alias of one (compile-time mirror of the runtime nullable union,
 * since 0.1.155).
 */
 function isNullableUnion(def, doc, depth = 0) {
 	if (!def || depth > 8) return false;
-	if (isRef(def)) {
-		if (def.id === "null") return true;
-		return isNullableUnion(doc.unwindType(def.id, def.chain)?.def, doc, depth + 1);
-	}
-	if (primitiveBaseType(def) === "null") return true;
+	if (isNullMember(def)) return true;
+	if (isRef(def)) return isNullableUnion(doc.unwindType(def.id, def.chain)?.def, doc, depth + 1);
 	const group = def;
 	if (!group.isGroup || group.op !== "|" || isStructure(def)) return false;
 	return group.unwrap().some((member) => isNullableUnion(member, doc, depth + 1));
@@ -369,6 +373,20 @@ function findViewCycle(owner, doc) {
 	return walk(owner, doc, [start]);
 }
 /**
+* The chain reference (`User.id`) an `@db.rel.FK` field's type names, else
+* `undefined`. `User.id | null` names it too (since 0.1.165) — the same
+* optional foreign key as `field?: User.id`; any other union does not.
+*/
+function fkChainRef(def) {
+	if (def && isRef(def)) return def.hasChain ? def : void 0;
+	if (!def || !isGroup(def) || def.op !== "|") return void 0;
+	const members = def.unwrap();
+	const values = members.filter((m) => !isNullMember(m));
+	if (values.length !== 1 || values.length === members.length) return void 0;
+	const [only] = values;
+	return only && isRef(only) && only.hasChain ? only : void 0;
+}
+/**
 * Find all `@db.rel.FK` fields on a type that reference `targetTypeName`.
 * Resolves `extends` to include inherited fields.
 */
@@ -383,10 +401,8 @@ function findFKFieldsPointingTo(doc, iface, targetTypeName, alias) {
 	if (!struct) return results;
 	for (const [name, prop] of struct.props) {
 		if (prop.countAnnotations("db.rel.FK") === 0) continue;
-		const def = prop.getDefinition();
-		if (!def || !isRef(def)) continue;
-		const ref = def;
-		if (!ref.hasChain) continue;
+		const ref = fkChainRef(prop.getDefinition());
+		if (!ref) continue;
 		const refTypeName = ref.id;
 		const refField = ref.chain.map((c) => c.text).join(".");
 		if (refTypeName !== targetTypeName) continue;
@@ -812,4 +828,4 @@ function validateViewInterface(owner, doc) {
 	return errors;
 }
 //#endregion
-export { getParentTypeName as A, validateSiblingStringField as B, viewJoins as C, getDbTableOwner as D, getAnnotationAlias as E, refActionAnnotation as F, searchFieldVerdict as I, validateExclusiveWith as L, isNullableUnion as M, isViewField as N, getNavTargetTypeName as O, primitiveBaseType as P, validateFieldBaseType as R, validateRefArgument as S, effectiveAnnotationNames as T, hasAnyViewAnnotation as _, findStoredField as a, joinTargets as b, refuseCiphertext as c, viewFieldSeals as d, viewProps as f, forEachFieldRef as g, findViewCycle as h, encryptedTypeSearchProblem as i, integerMemberIndexProblem as j, getParentStruct as k, sealedSearchProblem as l, findFKFieldsPointingTo as m, encryptedAncestorName as n, isNavProp as o, earlierJoinTargets as p, encryptedSearchProblem as r, jsonChainInfo as s, NAV_ANNOTATIONS as t, validateViewInterface as u, isAliasDecl as v, viewScopeTypes as w, validateQueryScope as x, isDbSourceDecl as y, validateIncompatible as z };
+export { getParentStruct as A, validateFieldBaseType as B, validateRefArgument as C, getAnnotationAlias as D, effectiveAnnotationNames as E, isViewField as F, validateSiblingStringField as H, primitiveBaseType as I, refActionAnnotation as L, integerMemberIndexProblem as M, isNullMember as N, getDbTableOwner as O, isNullableUnion as P, searchFieldVerdict as R, validateQueryScope as S, viewScopeTypes as T, validateIncompatible as V, forEachFieldRef as _, findStoredField as a, isDbSourceDecl as b, refuseCiphertext as c, viewFieldSeals as d, viewProps as f, fkChainRef as g, findViewCycle as h, encryptedTypeSearchProblem as i, getParentTypeName as j, getNavTargetTypeName as k, sealedSearchProblem as l, findFKFieldsPointingTo as m, encryptedAncestorName as n, isNavProp as o, earlierJoinTargets as p, encryptedSearchProblem as r, jsonChainInfo as s, NAV_ANNOTATIONS as t, validateViewInterface as u, hasAnyViewAnnotation as v, viewJoins as w, joinTargets as x, isAliasDecl as y, validateExclusiveWith as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db",
-  "version": "0.1.163",
+  "version": "0.1.165",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",
@@ -71,14 +71,14 @@
     "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",
-    "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"
   },
   "scripts": {

package/dist/control-D5cQmzFj.mjs

@@ -1,14 +0,0 @@
-import { defineAnnotatedType, throwFeatureDisabled } from "@atscript/typescript/utils";
-//#region src/schema/control.as
-var AtscriptControl = class {
-	static __is_atscript_annotated_type = true;
-	static type = {};
-	static metadata = /* @__PURE__ */ new Map();
-	static id = "AtscriptControl";
-	static toJsonSchema() {
-		throwFeatureDisabled("JSON Schema", "jsonSchema", "emit.jsonSchema");
-	}
-};
-defineAnnotatedType("object", AtscriptControl).prop("_id", defineAnnotatedType().designType("string").tags("string").annotate("meta.id", true).$type).prop("value", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("lockedBy", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("lockedAt", defineAnnotatedType().designType("number").tags("number").optional().$type).prop("expiresAt", defineAnnotatedType().designType("number").tags("number").optional().$type).annotate("db.table", "__atscript_control");
-//#endregion
-export { AtscriptControl };

package/dist/control-jIVU2hkf.cjs

@@ -1,14 +0,0 @@
-let _atscript_typescript_utils = require("@atscript/typescript/utils");
-//#region src/schema/control.as
-var AtscriptControl = class {
-	static __is_atscript_annotated_type = true;
-	static type = {};
-	static metadata = /* @__PURE__ */ new Map();
-	static id = "AtscriptControl";
-	static toJsonSchema() {
-		(0, _atscript_typescript_utils.throwFeatureDisabled)("JSON Schema", "jsonSchema", "emit.jsonSchema");
-	}
-};
-(0, _atscript_typescript_utils.defineAnnotatedType)("object", AtscriptControl).prop("_id", (0, _atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").annotate("meta.id", true).$type).prop("value", (0, _atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("lockedBy", (0, _atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("lockedAt", (0, _atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("number").optional().$type).prop("expiresAt", (0, _atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("number").optional().$type).annotate("db.table", "__atscript_control");
-//#endregion
-exports.AtscriptControl = AtscriptControl;