@metaobjectsdev/runtime-ts 0.14.1 → 0.15.0-rc.1

package/src/validator-runner.ts

@@ -60,7 +60,8 @@ export function runValidators(
     // DB will fill them in (e.g. timestamps with `@default: CURRENT_TIMESTAMP`,
     // booleans with `@default: false`).
     const required = isRequired(field);
-    const hasDefault = field.ownAttr(FIELD_ATTR_DEFAULT) !== undefined;
+    // ADR-0039: effective attr — @default may be inherited via extends.
+    const hasDefault = field.attr(FIELD_ATTR_DEFAULT) !== undefined;
     if (required && (value === undefined || value === null)) {
       if (opts.partial && !present) continue;
       if (hasDefault) continue;
@@ -80,6 +81,7 @@ export function runValidators(
     // string type-check + length checks must NOT fire — they would reject the
     // very value the column is declared to hold. Required-ness (above) still
     // applies; everything else is unconstrained for the open bag.
+    // ADR-0039: @dbColumnType is the ONE deliberately own-only attr (physical, never inherited).
     if (field.subType === FIELD_SUBTYPE_STRING && field.ownAttr(FIELD_ATTR_DB_COLUMN_TYPE) === DB_COLUMN_TYPE_JSONB) {
       continue;
     }
@@ -119,10 +121,12 @@ export function runValidators(
       }
     }
 
-    for (const child of field.ownChildren()) {
+    // ADR-0039: effective children — a validator may be inherited via extends.
+    for (const child of field.children()) {
       if (child.type !== TYPE_VALIDATOR) continue;
       if (child.subType !== VALIDATOR_SUBTYPE_REGEX) continue;
-      const pattern = child.ownAttr(VALIDATOR_ATTR_PATTERN);
+      // ADR-0039: effective attr — @pattern may be inherited.
+      const pattern = child.attr(VALIDATOR_ATTR_PATTERN);
       if (typeof pattern !== "string") continue;
       if (typeof value !== "string") continue;
       let regex: RegExp;
@@ -153,30 +157,33 @@ export function runValidators(
 }
 
 function isRequired(field: MetaData): boolean {
-  if (field.ownAttr(FIELD_ATTR_REQUIRED) === true) return true;
-  for (const child of field.ownChildren()) {
+  // ADR-0039: effective — @required and a required-validator may be inherited via extends.
+  if (field.attr(FIELD_ATTR_REQUIRED) === true) return true;
+  for (const child of field.children()) {
     if (child.type === TYPE_VALIDATOR && child.subType === VALIDATOR_SUBTYPE_REQUIRED) return true;
   }
   return false;
 }
 
 function resolveMaxLength(field: MetaData): number | undefined {
-  const attr = field.ownAttr(FIELD_ATTR_MAX_LENGTH);
+  // ADR-0039: effective — @maxLength and a length-validator may be inherited via extends.
+  const attr = field.attr(FIELD_ATTR_MAX_LENGTH);
   if (typeof attr === "number") return attr;
-  for (const child of field.ownChildren()) {
+  for (const child of field.children()) {
     if (child.type !== TYPE_VALIDATOR) continue;
     if (child.subType !== VALIDATOR_SUBTYPE_LENGTH) continue;
-    const max = child.ownAttr(VALIDATOR_ATTR_MAX);
+    const max = child.attr(VALIDATOR_ATTR_MAX);
     if (typeof max === "number") return max;
   }
   return undefined;
 }
 
 function resolveMinLength(field: MetaData): number | undefined {
-  for (const child of field.ownChildren()) {
+  // ADR-0039: effective — a length-validator may be inherited via extends.
+  for (const child of field.children()) {
     if (child.type !== TYPE_VALIDATOR) continue;
     if (child.subType !== VALIDATOR_SUBTYPE_LENGTH) continue;
-    const min = child.ownAttr(VALIDATOR_ATTR_MIN);
+    const min = child.attr(VALIDATOR_ATTR_MIN);
     if (typeof min === "number") return min;
   }
   return undefined;

package/src/view.ts

@@ -24,9 +24,10 @@ export interface EntityViewSpec {
 
 export function viewFieldNames(entity: MetaData, viewName: string): string[] {
   const names: string[] = [];
-  for (const field of entity.ownChildren()) {
+  // ADR-0039: effective children — fields and their views may be inherited via extends.
+  for (const field of entity.children()) {
     if (field.type !== TYPE_FIELD) continue;
-    if (field.ownChildren().some((c) => c.type === TYPE_VIEW && c.name === viewName)) {
+    if (field.children().some((c) => c.type === TYPE_VIEW && c.name === viewName)) {
       names.push(field.name);
     }
   }
@@ -34,14 +35,16 @@ export function viewFieldNames(entity: MetaData, viewName: string): string[] {
 }
 
 export function fieldViewSpec(entity: MetaData, fieldName: string, viewName: string): FieldViewSpec | null {
-  const field = entity.ownChildren().find((c) => c.type === TYPE_FIELD && c.name === fieldName);
+  // ADR-0039: effective children — a field and its view may be inherited via extends.
+  const field = entity.children().find((c) => c.type === TYPE_FIELD && c.name === fieldName);
   if (!field) return null;
-  const view = field.ownChildren().find((c) => c.type === TYPE_VIEW && c.name === viewName);
+  const view = field.children().find((c) => c.type === TYPE_VIEW && c.name === viewName);
   if (!view) return null;
 
   const attrs: Record<string, unknown> = {};
-  for (const key of view.ownAttrs().keys()) {
-    attrs[key] = view.ownAttr(key);
+  // ADR-0039: effective attrs — a view's attrs may be inherited via its extends.
+  for (const key of view.attrs().keys()) {
+    attrs[key] = view.attr(key);
   }
 
   const required = isFieldRequired(field);
@@ -59,7 +62,8 @@ export function fieldViewSpec(entity: MetaData, fieldName: string, viewName: str
 
 export function entityViewSpec(entity: MetaData, viewName: string): EntityViewSpec {
   const fields: FieldViewSpec[] = [];
-  for (const field of entity.ownChildren()) {
+  // ADR-0039: effective children — fields may be inherited via extends.
+  for (const field of entity.children()) {
     if (field.type !== TYPE_FIELD) continue;
     const spec = fieldViewSpec(entity, field.name, viewName);
     if (spec !== null) fields.push(spec);
@@ -74,8 +78,9 @@ export function entityViewSpec(entity: MetaData, viewName: string): EntityViewSp
 }
 
 function isFieldRequired(field: MetaData): boolean {
-  if (field.ownAttr(FIELD_ATTR_REQUIRED) === true) return true;
-  for (const child of field.ownChildren()) {
+  // ADR-0039: effective — @required and a required-validator may be inherited via extends.
+  if (field.attr(FIELD_ATTR_REQUIRED) === true) return true;
+  for (const child of field.children()) {
     if (child.type === TYPE_VALIDATOR && child.subType === VALIDATOR_SUBTYPE_REQUIRED) return true;
   }
   return false;