@happyvertical/smrt-core 0.57.9 → 0.57.11

package/dist/registry/inheritance-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inheritance-resolver.d.ts","sourceRoot":"","sources":["../../src/registry/inheritance-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D,OAAO,KAAK,EAAmB,eAAe,EAAE,MAAM,YAAS,CAAC;AAIhE;;;;;;;;;GASG;AACH,KAAK,wBAAwB,GAAG,eAAe,CAAC;AAEhD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,UAAU,GAAG,MAAM,EAAE,CAyBvE;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAgG/D;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAkGvC;AA4BD,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,wBAAwB,EACrC,UAAU,EAAE,wBAAwB,EACpC,SAAS,EAAE,MAAM,GAChB,wBAAwB,CAgF1B;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAiDxC"}
+{"version":3,"file":"inheritance-resolver.d.ts","sourceRoot":"","sources":["../../src/registry/inheritance-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D,OAAO,KAAK,EAAmB,eAAe,EAAE,MAAM,YAAS,CAAC;AAIhE;;;;;;;;;GASG;AACH,KAAK,wBAAwB,GAAG,eAAe,CAAC;AAEhD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,UAAU,GAAG,MAAM,EAAE,CAyBvE;AAoCD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAgG/D;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAkGvC;AA4BD,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,wBAAwB,EACrC,UAAU,EAAE,wBAAwB,EACpC,SAAS,EAAE,MAAM,GAChB,wBAAwB,CAgF1B;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAiDxC"}

package/dist/registry/inheritance-resolver.js

@@ -30,6 +30,24 @@ function buildInheritanceChain(ctor) {
 	}
 	return chain;
 }
+/**
+* {@link findClassStrict} for a registered class's parent. An ambiguous
+* simple `extends` is rethrown naming the subclass and its package, so the
+* error points at the class whose manifest needs a qualified parent (#4145).
+*/
+function findParentClassStrict(child, parentName) {
+	try {
+		return findClassStrict(parentName, child.packageName);
+	} catch (error) {
+		if (!(error instanceof ConfigurationError) || error.code !== "CONFIG_AMBIGUOUS_CLASS") throw error;
+		const subclass = child.qualifiedName ?? child.name;
+		throw new ConfigurationError(`${error.message} Subclass ${subclass} declares \`extends ${parentName}\` without a package; regenerate ${child.packageName ?? "its"} manifest so the parent is qualified from its import (extendsQualified).`, "CONFIG_AMBIGUOUS_CLASS", {
+			...error.details ?? {},
+			subclass,
+			subclassPackage: child.packageName
+		}, error);
+	}
+}
 function getInheritanceChain(className) {
 	const cache = getInheritanceCache();
 	const cached = cache.get(className);
@@ -56,7 +74,7 @@ function getInheritanceChain(className) {
 		chain.unshift(current.qualifiedName ?? current.name);
 		if (!current.extends) break;
 		if (current.extends === "SmrtObject" || current.extends === "SmrtClass" || current.extends === "SmrtCollection") break;
-		const parent = findClassStrict(current.extends, current.packageName);
+		const parent = findParentClassStrict(current, current.extends);
 		if (!parent) verboseLog(`[ObjectRegistry] Parent class '${current.extends}' not found while building inheritance chain. Ensure the parent package is installed and loadAllManifests() was called at startup.`);
 		current = parent;
 	}

package/dist/registry/inheritance-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"inheritance-resolver.js","names":[],"sources":["../../src/registry/inheritance-resolver.ts"],"sourcesContent":["/**\n * Inheritance resolution module for the SMRT ObjectRegistry.\n *\n * Extracted from registry.ts as part of issue #1006.\n */\n\nimport { createLogger } from '@happyvertical/logger';\nimport { ConfigurationError } from '../errors';\nimport type { SmrtObject } from '../object';\nimport { ObjectRegistry } from '../registry';\nimport type { MethodDefinition } from '../scanner/types.js';\nimport { prependSmrtSystemFields } from '../system-fields';\nimport { findClass, findClassStrict } from './name-resolver';\nimport {\n  getInheritanceCache,\n  getInheritanceConfig,\n  verboseLog,\n} from './shared-state';\nimport type { RegisteredClass, RegisteredField } from './types';\n\nconst logger = createLogger({ level: 'info' });\n\n/**\n * Runtime field shape merged across an inheritance chain.\n *\n * This is the canonical {@link RegisteredField} shape (a `FieldDefinition`\n * superset that carries the root-level `__tenancy` marker mirrored from the\n * `@tenantId` decorator alongside the canonical `_meta.__tenancy`, a runtime\n * `value`, and an open index signature for forward-compatible keys). Aliasing\n * it keeps merged fields assignable back into the\n * `Map<string, RegisteredField>` on each registered class.\n */\ntype InheritedFieldDefinition = RegisteredField;\n\n/**\n * Build inheritance chain by walking prototype chain\n *\n * Walks from child → parent → ... → SmrtObject, building array from base to child.\n * Stops at SmrtObject (the framework base class).\n */\nexport function buildInheritanceChain(ctor: typeof SmrtObject): string[] {\n  const chain: string[] = [];\n  const visited = new Set<Function>();\n  let current: Function | null = ctor;\n\n  // Walk up the prototype chain\n  while (current?.name) {\n    if (current.name === 'SmrtObject') {\n      break;\n    }\n\n    if (visited.has(current)) {\n      throw ConfigurationError.circularInheritance(\n        current.name,\n        Array.from(chain),\n      );\n    }\n\n    visited.add(current);\n    chain.unshift(current.name);\n\n    current = Object.getPrototypeOf(current);\n  }\n\n  return chain;\n}\n\nexport function getInheritanceChain(className: string): string[] {\n  const cache = getInheritanceCache();\n\n  // Check cache first\n  const cached = cache.get(className);\n  if (cached) {\n    return cached;\n  }\n\n  // Get registered class\n  const registered = findClass(className);\n  if (!registered) {\n    return [];\n  }\n\n  // Check if already computed and stored\n  if (registered.inheritanceChain) {\n    cache.set(className, registered.inheritanceChain);\n    return registered.inheritanceChain;\n  }\n\n  // Build chain from `extends` field (works for manifest-loaded classes)\n  // This is critical because manifest-loaded classes have stub constructors\n  // that only extend SmrtObject, not their actual parent class.\n  // The `extends` field IS stored correctly during registerFromManifest().\n  const chain: string[] = [];\n  const visited = new Set<RegisteredClass>(); // Cycle detection using object identity\n  let current: RegisteredClass | undefined = registered;\n  let circularDetected = false;\n  while (current) {\n    // Cycle detection: use object identity to handle cases where distinct\n    // classes share the same name (e.g., histrio:Performer vs smrt-video:Performer)\n    if (visited.has(current)) {\n      // Self-referential (chain length 1) is expected when a child package\n      // extends a parent with the same className and only one is installed.\n      // Longer cycles indicate misconfigured manifests.\n      if (chain.length > 1) {\n        logger.warn(\n          `[ObjectRegistry] Circular inheritance detected in chain: ${chain.join(' -> ')} -> ${current.name}. ` +\n            `Check that '${current.extends ?? current.name}' resolves to the correct package class.`,\n        );\n        circularDetected = true;\n      }\n      break;\n    }\n    visited.add(current);\n\n    // R5-canon: emit qualified names when available, matching the\n    // public `ObjectRegistry.getInheritanceChain` contract. Falls back\n    // to simple name for classes registered without a package context.\n    chain.unshift(current.qualifiedName ?? current.name); // [ancestor, ..., descendant]\n    if (!current.extends) break;\n\n    // Skip framework base classes that are never registered\n    if (\n      current.extends === 'SmrtObject' ||\n      current.extends === 'SmrtClass' ||\n      current.extends === 'SmrtCollection'\n    ) {\n      break;\n    }\n\n    // Try to find the parent class\n    // Issue #1004/#1005: Use findClassStrict with package context for\n    // unambiguous resolution. If extends is already qualified (from\n    // qualifyExtendsName), this is an O(1) direct lookup.\n    // If ambiguous, let the ConfigurationError propagate — callers\n    // should fix their manifests rather than silently get wrong results.\n    const parent = findClassStrict(current.extends, current.packageName);\n\n    // Issue #1007: Parent not found — the class is not registered.\n    // After loadAllManifests() completes at startup, all classes are\n    // pre-registered so this path is only hit when a package is not\n    // installed or the manifest is stale. We gracefully end the chain\n    // here instead of mutating registry state during a read operation.\n    if (!parent) {\n      verboseLog(\n        `[ObjectRegistry] Parent class '${current.extends}' not found ` +\n          `while building inheritance chain. Ensure the parent package ` +\n          `is installed and loadAllManifests() was called at startup.`,\n      );\n    }\n\n    current = parent;\n  }\n\n  // Only cache complete, non-circular chains.\n  // Caching a broken chain from a circular detection would cause all future\n  // lookups to return incorrect inheritance data (e.g., [\"VideoShot\",\"VideoShot\"]\n  // instead of [\"Content\",\"VideoShot\"]), breaking STI table resolution.\n  if (!circularDetected) {\n    registered.inheritanceChain = chain;\n    cache.set(className, chain);\n  }\n\n  return chain;\n}\n\nexport async function getAllFields(\n  className: string,\n): Promise<Map<string, RegisteredField>> {\n  let registered = findClass(className);\n  if (!registered) {\n    const loaded = await ObjectRegistry.tryLoadFromExternalPackage(className);\n    if (!loaded) {\n      return new Map();\n    }\n\n    registered = findClass(className);\n  }\n\n  if (!registered) {\n    return new Map();\n  }\n\n  // Ensure manifest is loaded (handles external packages)\n  await ObjectRegistry.ensureManifestLoaded(className);\n\n  // Check if class has inheritedFields cache (set during manifest loading)\n  if (registered.inheritedFields) {\n    return prependSmrtSystemFields(new Map(registered.inheritedFields));\n  }\n\n  // Get config for error handling behavior\n  const { onMissingAncestor } = getInheritanceConfig();\n\n  // For local classes (not from manifests), merge fields from inheritance chain\n  const allFields = new Map<string, InheritedFieldDefinition>();\n  const chain = getInheritanceChain(className);\n\n  // Walk chain from base to child (parent fields first)\n  for (const ancestorName of chain) {\n    // Skip framework base classes\n    if (\n      ancestorName === 'SmrtObject' ||\n      ancestorName === 'SmrtClass' ||\n      ancestorName === 'SmrtCollection'\n    ) {\n      continue;\n    }\n\n    try {\n      await ObjectRegistry.ensureManifestLoaded(ancestorName);\n    } catch {\n      // Local classes and pure test fixtures may not have manifests. Continue\n      // with whatever runtime metadata is already available.\n    }\n\n    const ancestor = findClass(ancestorName);\n    if (!ancestor) {\n      // Handle missing ancestors according to config\n      const message = `Missing ancestor class \"${ancestorName}\" in inheritance chain for \"${className}\"`;\n\n      if (onMissingAncestor === 'error') {\n        throw new Error(\n          `${message}\\n\\n` +\n            `This usually means:\\n` +\n            `  1. The parent class is not registered with @smrt()\\n` +\n            `  2. The parent class file is not imported\\n` +\n            `  3. The manifest does not include the parent class\\n\\n` +\n            `To fix:\\n` +\n            `  - Ensure all parent classes use @smrt() decorator\\n` +\n            `  - Import all parent class files before child classes\\n` +\n            `  - Rebuild to regenerate manifest\\n` +\n            `  - Or set smrt.inheritance.onMissingAncestor='warn' in config`,\n        );\n      } else if (onMissingAncestor === 'warn') {\n        logger.warn(`[ObjectRegistry] ${message}`);\n      }\n\n      continue;\n    }\n\n    // Merge fields from this ancestor\n    for (const [fieldName, field] of ancestor.fields) {\n      const normalizedField = normalizeFrameworkInheritedField(\n        ancestorName,\n        fieldName,\n        field,\n        className,\n      );\n      const existingField = allFields.get(fieldName);\n      if (!existingField) {\n        // New field from parent\n        allFields.set(fieldName, normalizedField);\n      } else {\n        // Field exists - merge configs\n        allFields.set(\n          fieldName,\n          mergeFieldConfigs(existingField, normalizedField, fieldName),\n        );\n      }\n    }\n  }\n\n  registered.inheritedFields = new Map(allFields);\n\n  return prependSmrtSystemFields(new Map<string, RegisteredField>(allFields));\n}\n\nfunction normalizeFrameworkInheritedField(\n  ancestorName: string,\n  fieldName: string,\n  field: InheritedFieldDefinition,\n  childClassName: string,\n): InheritedFieldDefinition {\n  const simpleAncestorName = ancestorName.includes(':')\n    ? ancestorName.split(':').pop()\n    : ancestorName;\n\n  if (simpleAncestorName === 'SmrtHierarchical' && fieldName === 'parentId') {\n    return {\n      ...field,\n      type: 'foreignKey',\n      related: childClassName,\n      required: false,\n      _meta: {\n        ...(field._meta || {}),\n        nullable: true,\n      },\n    };\n  }\n\n  return field;\n}\n\nexport function mergeFieldConfigs(\n  parentField: InheritedFieldDefinition,\n  childField: InheritedFieldDefinition,\n  fieldName: string,\n): InheritedFieldDefinition {\n  // Start with parent field as base\n  const merged: InheritedFieldDefinition = { ...parentField };\n\n  // Type: Child wins (warn if different)\n  if (childField.type && childField.type !== parentField.type) {\n    // Don't warn for tenantId field - expected type conflict between decorator and AST\n    // The @tenantId decorator registers as 'foreignKey' but AST sees 'text' from type annotation\n    // __tenancy can be at root level (from @tenantId decorator) or under _meta (from @smrt({ tenantScoped: true }))\n    const isTenantField =\n      parentField.__tenancy?.isTenantIdField ||\n      parentField._meta?.__tenancy?.isTenantIdField;\n    if (!(isTenantField && fieldName === 'tenantId')) {\n      logger.warn(\n        `Field type mismatch: \"${fieldName}\" is ${parentField.type} in parent but ${childField.type} in child. Using child type.`,\n      );\n    }\n    merged.type = childField.type;\n  }\n\n  // _meta: Merge with child precedence\n  if (childField._meta || parentField._meta) {\n    merged._meta = {\n      ...(parentField._meta || {}),\n      ...(childField._meta || {}),\n    };\n\n    // Special handling for numeric constraints (take strictest)\n    if (\n      parentField._meta?.min !== undefined &&\n      childField._meta?.min !== undefined\n    ) {\n      // Take the larger min (strictest lower bound)\n      merged._meta.min = Math.max(parentField._meta.min, childField._meta.min);\n    }\n    if (\n      parentField._meta?.max !== undefined &&\n      childField._meta?.max !== undefined\n    ) {\n      // Take the smaller max (strictest upper bound)\n      merged._meta.max = Math.min(parentField._meta.max, childField._meta.max);\n    }\n\n    // Validators: Combine (both must pass)\n    if (parentField._meta?.validate && childField._meta?.validate) {\n      // `_meta.validate` is carried through the open `FieldMeta` index\n      // signature as `unknown`; both sides are field-validator callbacks.\n      type FieldValidator = (value: unknown) => boolean | Promise<boolean>;\n      const parentValidator = parentField._meta.validate as FieldValidator;\n      const childValidator = childField._meta.validate as FieldValidator;\n      merged._meta.validate = async (value: unknown) => {\n        const parentResult = await parentValidator(value);\n        const childResult = await childValidator(value);\n        return parentResult && childResult;\n      };\n    }\n\n    // Unique: Take OR (unique if either says unique)\n    if (parentField._meta?.unique || childField._meta?.unique) {\n      merged._meta.unique = true;\n    }\n  }\n\n  // __tenancy: Preserve from parent (decorator takes precedence)\n  // This ensures @tenantId decorator metadata survives type conflicts (Issue #841)\n  // The decorator registers __tenancy metadata, but AST scanner may override the type.\n  // We need to preserve __tenancy so the interceptor can identify tenant fields.\n  if (parentField.__tenancy || childField.__tenancy) {\n    merged.__tenancy = {\n      ...(childField.__tenancy || {}),\n      ...(parentField.__tenancy || {}), // Parent (decorator) wins\n    };\n  }\n\n  // Value: Child wins\n  if (childField.value !== undefined) {\n    merged.value = childField.value;\n  }\n\n  return merged;\n}\n\nexport async function getAllMethods(\n  className: string,\n): Promise<Map<string, MethodDefinition>> {\n  const registered = findClass(className);\n  if (!registered) {\n    return new Map();\n  }\n\n  // Check cache first\n  if (registered.inheritedMethods) {\n    return new Map(registered.inheritedMethods);\n  }\n\n  // Build merged methods from inheritance chain\n  const allMethods = new Map<string, MethodDefinition>();\n  const chain = getInheritanceChain(className);\n\n  // Walk chain from base to child (parent methods first)\n  for (const ancestorName of chain) {\n    // Skip framework base classes (check BEFORE looking up in registry)\n    if (\n      ancestorName === 'SmrtObject' ||\n      ancestorName === 'SmrtClass' ||\n      ancestorName === 'SmrtCollection'\n    ) {\n      continue;\n    }\n\n    // Load manifest for ancestor class (handles external packages)\n    // This ensures inherited methods from external packages are available\n    try {\n      await ObjectRegistry.ensureManifestLoaded(ancestorName);\n    } catch (error) {\n      // Manifest loading failed - this is expected for classes not in manifest\n      // Continue to next ancestor\n    }\n\n    const ancestor = findClass(ancestorName);\n    if (!ancestor) continue;\n\n    // Merge parent methods into result\n    for (const [methodName, method] of ancestor.methods) {\n      // Child methods override parent methods (no merging)\n      allMethods.set(methodName, method);\n    }\n  }\n\n  // Cache the merged result\n  registered.inheritedMethods = allMethods;\n\n  return new Map(allMethods);\n}\n"],"mappings":"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"}
+{"version":3,"file":"inheritance-resolver.js","names":[],"sources":["../../src/registry/inheritance-resolver.ts"],"sourcesContent":["/**\n * Inheritance resolution module for the SMRT ObjectRegistry.\n *\n * Extracted from registry.ts as part of issue #1006.\n */\n\nimport { createLogger } from '@happyvertical/logger';\nimport { ConfigurationError } from '../errors';\nimport type { SmrtObject } from '../object';\nimport { ObjectRegistry } from '../registry';\nimport type { MethodDefinition } from '../scanner/types.js';\nimport { prependSmrtSystemFields } from '../system-fields';\nimport { findClass, findClassStrict } from './name-resolver';\nimport {\n  getInheritanceCache,\n  getInheritanceConfig,\n  verboseLog,\n} from './shared-state';\nimport type { RegisteredClass, RegisteredField } from './types';\n\nconst logger = createLogger({ level: 'info' });\n\n/**\n * Runtime field shape merged across an inheritance chain.\n *\n * This is the canonical {@link RegisteredField} shape (a `FieldDefinition`\n * superset that carries the root-level `__tenancy` marker mirrored from the\n * `@tenantId` decorator alongside the canonical `_meta.__tenancy`, a runtime\n * `value`, and an open index signature for forward-compatible keys). Aliasing\n * it keeps merged fields assignable back into the\n * `Map<string, RegisteredField>` on each registered class.\n */\ntype InheritedFieldDefinition = RegisteredField;\n\n/**\n * Build inheritance chain by walking prototype chain\n *\n * Walks from child → parent → ... → SmrtObject, building array from base to child.\n * Stops at SmrtObject (the framework base class).\n */\nexport function buildInheritanceChain(ctor: typeof SmrtObject): string[] {\n  const chain: string[] = [];\n  const visited = new Set<Function>();\n  let current: Function | null = ctor;\n\n  // Walk up the prototype chain\n  while (current?.name) {\n    if (current.name === 'SmrtObject') {\n      break;\n    }\n\n    if (visited.has(current)) {\n      throw ConfigurationError.circularInheritance(\n        current.name,\n        Array.from(chain),\n      );\n    }\n\n    visited.add(current);\n    chain.unshift(current.name);\n\n    current = Object.getPrototypeOf(current);\n  }\n\n  return chain;\n}\n\n/**\n * {@link findClassStrict} for a registered class's parent. An ambiguous\n * simple `extends` is rethrown naming the subclass and its package, so the\n * error points at the class whose manifest needs a qualified parent (#4145).\n */\nfunction findParentClassStrict(\n  child: RegisteredClass,\n  parentName: string,\n): RegisteredClass | undefined {\n  try {\n    return findClassStrict(parentName, child.packageName);\n  } catch (error) {\n    if (\n      !(error instanceof ConfigurationError) ||\n      error.code !== 'CONFIG_AMBIGUOUS_CLASS'\n    ) {\n      throw error;\n    }\n    const subclass = child.qualifiedName ?? child.name;\n    throw new ConfigurationError(\n      `${error.message} Subclass ${subclass} declares \\`extends ${parentName}\\` ` +\n        `without a package; regenerate ${child.packageName ?? 'its'} manifest ` +\n        `so the parent is qualified from its import (extendsQualified).`,\n      'CONFIG_AMBIGUOUS_CLASS',\n      {\n        ...(error.details ?? {}),\n        subclass,\n        subclassPackage: child.packageName,\n      },\n      error,\n    );\n  }\n}\n\nexport function getInheritanceChain(className: string): string[] {\n  const cache = getInheritanceCache();\n\n  // Check cache first\n  const cached = cache.get(className);\n  if (cached) {\n    return cached;\n  }\n\n  // Get registered class\n  const registered = findClass(className);\n  if (!registered) {\n    return [];\n  }\n\n  // Check if already computed and stored\n  if (registered.inheritanceChain) {\n    cache.set(className, registered.inheritanceChain);\n    return registered.inheritanceChain;\n  }\n\n  // Build chain from `extends` field (works for manifest-loaded classes)\n  // This is critical because manifest-loaded classes have stub constructors\n  // that only extend SmrtObject, not their actual parent class.\n  // The `extends` field IS stored correctly during registerFromManifest().\n  const chain: string[] = [];\n  const visited = new Set<RegisteredClass>(); // Cycle detection using object identity\n  let current: RegisteredClass | undefined = registered;\n  let circularDetected = false;\n  while (current) {\n    // Cycle detection: use object identity to handle cases where distinct\n    // classes share the same name (e.g., histrio:Performer vs smrt-video:Performer)\n    if (visited.has(current)) {\n      // Self-referential (chain length 1) is expected when a child package\n      // extends a parent with the same className and only one is installed.\n      // Longer cycles indicate misconfigured manifests.\n      if (chain.length > 1) {\n        logger.warn(\n          `[ObjectRegistry] Circular inheritance detected in chain: ${chain.join(' -> ')} -> ${current.name}. ` +\n            `Check that '${current.extends ?? current.name}' resolves to the correct package class.`,\n        );\n        circularDetected = true;\n      }\n      break;\n    }\n    visited.add(current);\n\n    // R5-canon: emit qualified names when available, matching the\n    // public `ObjectRegistry.getInheritanceChain` contract. Falls back\n    // to simple name for classes registered without a package context.\n    chain.unshift(current.qualifiedName ?? current.name); // [ancestor, ..., descendant]\n    if (!current.extends) break;\n\n    // Skip framework base classes that are never registered\n    if (\n      current.extends === 'SmrtObject' ||\n      current.extends === 'SmrtClass' ||\n      current.extends === 'SmrtCollection'\n    ) {\n      break;\n    }\n\n    // Try to find the parent class\n    // Issue #1004/#1005: Use findClassStrict with package context for\n    // unambiguous resolution. If extends is already qualified (from\n    // qualifyExtendsName), this is an O(1) direct lookup.\n    // If ambiguous, let the ConfigurationError propagate — callers\n    // should fix their manifests rather than silently get wrong results.\n    const parent = findParentClassStrict(current, current.extends);\n\n    // Issue #1007: Parent not found — the class is not registered.\n    // After loadAllManifests() completes at startup, all classes are\n    // pre-registered so this path is only hit when a package is not\n    // installed or the manifest is stale. We gracefully end the chain\n    // here instead of mutating registry state during a read operation.\n    if (!parent) {\n      verboseLog(\n        `[ObjectRegistry] Parent class '${current.extends}' not found ` +\n          `while building inheritance chain. Ensure the parent package ` +\n          `is installed and loadAllManifests() was called at startup.`,\n      );\n    }\n\n    current = parent;\n  }\n\n  // Only cache complete, non-circular chains.\n  // Caching a broken chain from a circular detection would cause all future\n  // lookups to return incorrect inheritance data (e.g., [\"VideoShot\",\"VideoShot\"]\n  // instead of [\"Content\",\"VideoShot\"]), breaking STI table resolution.\n  if (!circularDetected) {\n    registered.inheritanceChain = chain;\n    cache.set(className, chain);\n  }\n\n  return chain;\n}\n\nexport async function getAllFields(\n  className: string,\n): Promise<Map<string, RegisteredField>> {\n  let registered = findClass(className);\n  if (!registered) {\n    const loaded = await ObjectRegistry.tryLoadFromExternalPackage(className);\n    if (!loaded) {\n      return new Map();\n    }\n\n    registered = findClass(className);\n  }\n\n  if (!registered) {\n    return new Map();\n  }\n\n  // Ensure manifest is loaded (handles external packages)\n  await ObjectRegistry.ensureManifestLoaded(className);\n\n  // Check if class has inheritedFields cache (set during manifest loading)\n  if (registered.inheritedFields) {\n    return prependSmrtSystemFields(new Map(registered.inheritedFields));\n  }\n\n  // Get config for error handling behavior\n  const { onMissingAncestor } = getInheritanceConfig();\n\n  // For local classes (not from manifests), merge fields from inheritance chain\n  const allFields = new Map<string, InheritedFieldDefinition>();\n  const chain = getInheritanceChain(className);\n\n  // Walk chain from base to child (parent fields first)\n  for (const ancestorName of chain) {\n    // Skip framework base classes\n    if (\n      ancestorName === 'SmrtObject' ||\n      ancestorName === 'SmrtClass' ||\n      ancestorName === 'SmrtCollection'\n    ) {\n      continue;\n    }\n\n    try {\n      await ObjectRegistry.ensureManifestLoaded(ancestorName);\n    } catch {\n      // Local classes and pure test fixtures may not have manifests. Continue\n      // with whatever runtime metadata is already available.\n    }\n\n    const ancestor = findClass(ancestorName);\n    if (!ancestor) {\n      // Handle missing ancestors according to config\n      const message = `Missing ancestor class \"${ancestorName}\" in inheritance chain for \"${className}\"`;\n\n      if (onMissingAncestor === 'error') {\n        throw new Error(\n          `${message}\\n\\n` +\n            `This usually means:\\n` +\n            `  1. The parent class is not registered with @smrt()\\n` +\n            `  2. The parent class file is not imported\\n` +\n            `  3. The manifest does not include the parent class\\n\\n` +\n            `To fix:\\n` +\n            `  - Ensure all parent classes use @smrt() decorator\\n` +\n            `  - Import all parent class files before child classes\\n` +\n            `  - Rebuild to regenerate manifest\\n` +\n            `  - Or set smrt.inheritance.onMissingAncestor='warn' in config`,\n        );\n      } else if (onMissingAncestor === 'warn') {\n        logger.warn(`[ObjectRegistry] ${message}`);\n      }\n\n      continue;\n    }\n\n    // Merge fields from this ancestor\n    for (const [fieldName, field] of ancestor.fields) {\n      const normalizedField = normalizeFrameworkInheritedField(\n        ancestorName,\n        fieldName,\n        field,\n        className,\n      );\n      const existingField = allFields.get(fieldName);\n      if (!existingField) {\n        // New field from parent\n        allFields.set(fieldName, normalizedField);\n      } else {\n        // Field exists - merge configs\n        allFields.set(\n          fieldName,\n          mergeFieldConfigs(existingField, normalizedField, fieldName),\n        );\n      }\n    }\n  }\n\n  registered.inheritedFields = new Map(allFields);\n\n  return prependSmrtSystemFields(new Map<string, RegisteredField>(allFields));\n}\n\nfunction normalizeFrameworkInheritedField(\n  ancestorName: string,\n  fieldName: string,\n  field: InheritedFieldDefinition,\n  childClassName: string,\n): InheritedFieldDefinition {\n  const simpleAncestorName = ancestorName.includes(':')\n    ? ancestorName.split(':').pop()\n    : ancestorName;\n\n  if (simpleAncestorName === 'SmrtHierarchical' && fieldName === 'parentId') {\n    return {\n      ...field,\n      type: 'foreignKey',\n      related: childClassName,\n      required: false,\n      _meta: {\n        ...(field._meta || {}),\n        nullable: true,\n      },\n    };\n  }\n\n  return field;\n}\n\nexport function mergeFieldConfigs(\n  parentField: InheritedFieldDefinition,\n  childField: InheritedFieldDefinition,\n  fieldName: string,\n): InheritedFieldDefinition {\n  // Start with parent field as base\n  const merged: InheritedFieldDefinition = { ...parentField };\n\n  // Type: Child wins (warn if different)\n  if (childField.type && childField.type !== parentField.type) {\n    // Don't warn for tenantId field - expected type conflict between decorator and AST\n    // The @tenantId decorator registers as 'foreignKey' but AST sees 'text' from type annotation\n    // __tenancy can be at root level (from @tenantId decorator) or under _meta (from @smrt({ tenantScoped: true }))\n    const isTenantField =\n      parentField.__tenancy?.isTenantIdField ||\n      parentField._meta?.__tenancy?.isTenantIdField;\n    if (!(isTenantField && fieldName === 'tenantId')) {\n      logger.warn(\n        `Field type mismatch: \"${fieldName}\" is ${parentField.type} in parent but ${childField.type} in child. Using child type.`,\n      );\n    }\n    merged.type = childField.type;\n  }\n\n  // _meta: Merge with child precedence\n  if (childField._meta || parentField._meta) {\n    merged._meta = {\n      ...(parentField._meta || {}),\n      ...(childField._meta || {}),\n    };\n\n    // Special handling for numeric constraints (take strictest)\n    if (\n      parentField._meta?.min !== undefined &&\n      childField._meta?.min !== undefined\n    ) {\n      // Take the larger min (strictest lower bound)\n      merged._meta.min = Math.max(parentField._meta.min, childField._meta.min);\n    }\n    if (\n      parentField._meta?.max !== undefined &&\n      childField._meta?.max !== undefined\n    ) {\n      // Take the smaller max (strictest upper bound)\n      merged._meta.max = Math.min(parentField._meta.max, childField._meta.max);\n    }\n\n    // Validators: Combine (both must pass)\n    if (parentField._meta?.validate && childField._meta?.validate) {\n      // `_meta.validate` is carried through the open `FieldMeta` index\n      // signature as `unknown`; both sides are field-validator callbacks.\n      type FieldValidator = (value: unknown) => boolean | Promise<boolean>;\n      const parentValidator = parentField._meta.validate as FieldValidator;\n      const childValidator = childField._meta.validate as FieldValidator;\n      merged._meta.validate = async (value: unknown) => {\n        const parentResult = await parentValidator(value);\n        const childResult = await childValidator(value);\n        return parentResult && childResult;\n      };\n    }\n\n    // Unique: Take OR (unique if either says unique)\n    if (parentField._meta?.unique || childField._meta?.unique) {\n      merged._meta.unique = true;\n    }\n  }\n\n  // __tenancy: Preserve from parent (decorator takes precedence)\n  // This ensures @tenantId decorator metadata survives type conflicts (Issue #841)\n  // The decorator registers __tenancy metadata, but AST scanner may override the type.\n  // We need to preserve __tenancy so the interceptor can identify tenant fields.\n  if (parentField.__tenancy || childField.__tenancy) {\n    merged.__tenancy = {\n      ...(childField.__tenancy || {}),\n      ...(parentField.__tenancy || {}), // Parent (decorator) wins\n    };\n  }\n\n  // Value: Child wins\n  if (childField.value !== undefined) {\n    merged.value = childField.value;\n  }\n\n  return merged;\n}\n\nexport async function getAllMethods(\n  className: string,\n): Promise<Map<string, MethodDefinition>> {\n  const registered = findClass(className);\n  if (!registered) {\n    return new Map();\n  }\n\n  // Check cache first\n  if (registered.inheritedMethods) {\n    return new Map(registered.inheritedMethods);\n  }\n\n  // Build merged methods from inheritance chain\n  const allMethods = new Map<string, MethodDefinition>();\n  const chain = getInheritanceChain(className);\n\n  // Walk chain from base to child (parent methods first)\n  for (const ancestorName of chain) {\n    // Skip framework base classes (check BEFORE looking up in registry)\n    if (\n      ancestorName === 'SmrtObject' ||\n      ancestorName === 'SmrtClass' ||\n      ancestorName === 'SmrtCollection'\n    ) {\n      continue;\n    }\n\n    // Load manifest for ancestor class (handles external packages)\n    // This ensures inherited methods from external packages are available\n    try {\n      await ObjectRegistry.ensureManifestLoaded(ancestorName);\n    } catch (error) {\n      // Manifest loading failed - this is expected for classes not in manifest\n      // Continue to next ancestor\n    }\n\n    const ancestor = findClass(ancestorName);\n    if (!ancestor) continue;\n\n    // Merge parent methods into result\n    for (const [methodName, method] of ancestor.methods) {\n      // Child methods override parent methods (no merging)\n      allMethods.set(methodName, method);\n    }\n  }\n\n  // Cache the merged result\n  registered.inheritedMethods = allMethods;\n\n  return new Map(allMethods);\n}\n"],"mappings":"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"}

package/dist/scanner/manifest-generator.d.ts

@@ -47,6 +47,31 @@ export declare class ManifestGenerator {
         packageName?: string;
         packageJson?: PackageJsonLike;
     }): void;
+    /**
+     * Drop an `extendsQualified` naming ANOTHER package unless that package's
+     * manifest declares the class under exactly that qualified name (#4145).
+     *
+     * The scanner qualifies a parent from the import it is bound to, but a
+     * module can re-export another package's class, and an alias-like specifier
+     * (`@app/models`) can look like a package. Neither may become a parent the
+     * registry cannot find, so an unconfirmed qualification falls back to the
+     * simple `extends` and today's resolution. Same-package qualifications are
+     * left alone: they name this manifest's own classes.
+     */
+    verifyImportedParents(manifest: SmartObjectManifest): void;
+    /**
+     * The name to resolve an object's parent by: the import-derived qualified
+     * name when the scanner traced one (#4145), else the simple `extends`.
+     */
+    private parentRef;
+    /**
+     * Resolve a parent reference from {@link parentRef}. A qualified reference
+     * matches only that package's class (this manifest's, else the dependency's
+     * manifest), never a same-named class of another package; a simple one
+     * keeps the established local-then-dependency lookup. `child` is skipped so
+     * a local class named like its imported parent never resolves to itself.
+     */
+    private resolveParentDefinition;
     /**
      * Stamp `importPath` (via {@link determineImportPath}) on every object
      * that does not already have one. Safe to call unconditionally: objects
@@ -169,6 +194,11 @@ export declare class ManifestGenerator {
     private refreshManifestSchemaDDL;
     private computeManifestSchemaVersion;
     private findDescendantsInManifest;
+    /**
+     * Whether `obj`'s import-qualified parent rules out `baseClassName` (a
+     * qualified name of another class with the same simple name).
+     */
+    private qualifiedParentExcludes;
     private applySqlTypeOverrides;
     private getReferenceKind;
     /**

package/dist/scanner/manifest-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-generator.d.ts","sourceRoot":"","sources":["../../src/scanner/manifest-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manifest-generator.d.ts","sourceRoot":"","sources":["../../src/scanner/manifest-generator.ts"],"names":[],"mappings":"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"}

package/dist/scanner/manifest-generator.js

@@ -2,7 +2,7 @@ import { ConfigurationError } from "../errors.js";
 import { defaultConflictColumns, resolveOwnershipTenantColumn, resolveTenantColumn } from "../schema/conflict-target.js";
 import { resolveForeignKeyDeleteAction, resolveForeignKeyUpdateAction } from "../schema/foreign-key-policy.js";
 import { classnameToTablename, toSnakeCase } from "../utils/naming.js";
-import { assertScopedPackageName, createQualifiedName, isQualifiedNameAliasFormat, readPreviousQualifiedNames } from "../utils/qualified-names.js";
+import { assertScopedPackageName, createQualifiedName, isQualifiedName, isQualifiedNameAliasFormat, parseQualifiedName, readPreviousQualifiedNames } from "../utils/qualified-names.js";
 import { isSmrtCollectionExtendsName } from "../registry/collection-resolution.js";
 import "./types.js";
 import { loadExternalManifestSync, lookupInManifest } from "../manifest/manifest-loader.js";
@@ -227,6 +227,7 @@ var ManifestGenerator = class {
 			if (!Object.hasOwn(objectDef, "abstractDeclaredApi")) objectDef.abstractDeclaredApi = objectDef.decoratorConfig.api ?? null;
 		}
 		this.assertQualifiedNameAliases(manifest);
+		this.verifyImportedParents(manifest);
 		this.normalizeReportTenantScope(manifest);
 		this.injectTenantScopedFields(manifest);
 		this.applyReportSurfaceDefaults(manifest);
@@ -289,6 +290,49 @@ var ManifestGenerator = class {
 		this.resolveImportPaths(manifest, options?.packageName, options?.packageJson);
 	}
 	/**
+	* Drop an `extendsQualified` naming ANOTHER package unless that package's
+	* manifest declares the class under exactly that qualified name (#4145).
+	*
+	* The scanner qualifies a parent from the import it is bound to, but a
+	* module can re-export another package's class, and an alias-like specifier
+	* (`@app/models`) can look like a package. Neither may become a parent the
+	* registry cannot find, so an unconfirmed qualification falls back to the
+	* simple `extends` and today's resolution. Same-package qualifications are
+	* left alone: they name this manifest's own classes.
+	*/
+	verifyImportedParents(manifest) {
+		for (const obj of Object.values(manifest.objects)) {
+			const parent = obj.extendsQualified;
+			if (!parent || !isQualifiedName(parent)) continue;
+			const { packageName } = parseQualifiedName(parent);
+			if (packageName === (obj.packageName ?? manifest.packageName)) continue;
+			const parentManifest = loadExternalManifestSync(packageName, { warn: false });
+			if (parentManifest && lookupInManifest(parentManifest, parent)) continue;
+			logger.debug(`[manifest-generator] ${obj.className}: ${packageName} does not declare ${parent}; keeping the unqualified parent "${obj.extends}"`);
+			delete obj.extendsQualified;
+		}
+	}
+	/**
+	* The name to resolve an object's parent by: the import-derived qualified
+	* name when the scanner traced one (#4145), else the simple `extends`.
+	*/
+	parentRef(obj) {
+		return obj.extendsQualified || obj.extends;
+	}
+	/**
+	* Resolve a parent reference from {@link parentRef}. A qualified reference
+	* matches only that package's class (this manifest's, else the dependency's
+	* manifest), never a same-named class of another package; a simple one
+	* keeps the established local-then-dependency lookup. `child` is skipped so
+	* a local class named like its imported parent never resolves to itself.
+	*/
+	resolveParentDefinition(ref, child, manifest, objectsByName) {
+		let parent = isQualifiedName(ref) ? manifest.objects[ref] : objectsByName.get(ref);
+		if (parent === child) parent = void 0;
+		if (!parent && manifest.smrtDependencies?.length) parent = this.loadParentFromExternalPackage(ref, manifest.smrtDependencies, objectsByName);
+		return parent === child ? void 0 : parent;
+	}
+	/**
 	* Stamp `importPath` (via {@link determineImportPath}) on every object
 	* that does not already have one. Safe to call unconditionally: objects
 	* that went through `generateManifest()`'s own inline assignment already
@@ -886,13 +930,20 @@ var ManifestGenerator = class {
 			const classNameLower = this.simpleClassName(obj.className).toLowerCase();
 			const extendsLower = obj.extends ? this.simpleClassName(obj.extends).toLowerCase() : void 0;
 			if (classNameLower === baseClassLower && extendsLower === baseClassLower) continue;
-			if (extendsLower === baseClassLower) {
+			if (extendsLower === baseClassLower && !this.qualifiedParentExcludes(obj, baseClassName)) {
 				descendants.push(name);
 				descendants.push(...this.findDescendantsInManifest(name, manifest, visited));
 			}
 		}
 		return descendants;
 	}
+	/**
+	* Whether `obj`'s import-qualified parent rules out `baseClassName` (a
+	* qualified name of another class with the same simple name).
+	*/
+	qualifiedParentExcludes(obj, baseClassName) {
+		return !!obj.extendsQualified && isQualifiedName(baseClassName) && obj.extendsQualified !== baseClassName;
+	}
 	applySqlTypeOverrides(obj) {
 		if (!obj.schema?.columns) return;
 		for (const [fieldName, field] of Object.entries(obj.fields || {})) {
@@ -951,16 +1002,15 @@ var ManifestGenerator = class {
 			objectsByName.set(objDef.className, objDef);
 			objectsByName.set(objDef.className.toLowerCase(), objDef);
 		}
-		let currentClass = obj.extends;
+		let currentClass = this.parentRef(obj);
 		const visited = /* @__PURE__ */ new Set();
 		while (currentClass) {
 			if (visited.has(currentClass)) break;
 			visited.add(currentClass);
-			let parentObj = objectsByName.get(currentClass);
-			if (!parentObj && manifest.smrtDependencies && manifest.smrtDependencies.length > 0) parentObj = this.loadParentFromExternalPackage(currentClass, manifest.smrtDependencies, objectsByName);
+			const parentObj = this.resolveParentDefinition(currentClass, obj, manifest, objectsByName);
 			if (!parentObj) break;
 			if (parentObj.decoratorConfig?.tableStrategy === "sti") return true;
-			currentClass = parentObj.extends;
+			currentClass = this.parentRef(parentObj);
 		}
 		return false;
 	}
@@ -990,13 +1040,12 @@ var ManifestGenerator = class {
 			objectsByName.set(objDef.className.toLowerCase(), objDef);
 		}
 		let stiBaseInfo;
-		let currentClass = obj.extends;
+		let currentClass = this.parentRef(obj);
 		const visited = /* @__PURE__ */ new Set();
 		while (currentClass) {
 			if (visited.has(currentClass)) break;
 			visited.add(currentClass);
-			let parentObj = objectsByName.get(currentClass);
-			if (!parentObj && manifest.smrtDependencies && manifest.smrtDependencies.length > 0) parentObj = this.loadParentFromExternalPackage(currentClass, manifest.smrtDependencies, objectsByName);
+			const parentObj = this.resolveParentDefinition(currentClass, obj, manifest, objectsByName);
 			if (!parentObj) break;
 			if (parentObj.decoratorConfig?.tableStrategy === "sti") {
 				const tableName = parentObj.decoratorConfig?.tableName || parentObj.schema?.tableName || this.classNameToTableName(parentObj.className);
@@ -1005,7 +1054,7 @@ var ManifestGenerator = class {
 					tableName
 				};
 			}
-			currentClass = parentObj.extends;
+			currentClass = this.parentRef(parentObj);
 		}
 		return stiBaseInfo;
 	}
@@ -1060,7 +1109,8 @@ var ManifestGenerator = class {
 			const usesSTI = this.isSTIClass(obj, objectsByName, manifest);
 			logger.debug(`[manifest-generator] Merging inherited fields for ${obj.className} from ${obj.extends}`);
 			const inheritanceChain = [];
-			let currentClass = obj.extends;
+			const ancestorDefs = [];
+			let currentClass = this.parentRef(obj);
 			const visited = /* @__PURE__ */ new Set();
 			while (currentClass) {
 				if (visited.has(currentClass)) {
@@ -1068,19 +1118,19 @@ var ManifestGenerator = class {
 					break;
 				}
 				visited.add(currentClass);
-				inheritanceChain.unshift(currentClass);
-				let parentObj = objectsByName.get(currentClass);
-				if (parentObj === obj) parentObj = void 0;
-				if (!parentObj && manifest.smrtDependencies && manifest.smrtDependencies.length > 0) parentObj = this.loadParentFromExternalPackage(currentClass, manifest.smrtDependencies, objectsByName);
+				const parentObj = this.resolveParentDefinition(currentClass, obj, manifest, objectsByName);
+				const ancestorName = this.simpleClassName(currentClass);
+				inheritanceChain.unshift(ancestorName);
+				ancestorDefs.unshift(parentObj);
 				if (!parentObj) break;
-				currentClass = parentObj.extends;
+				currentClass = this.parentRef(parentObj);
 			}
 			logger.debug(`[manifest-generator] Inheritance chain for ${obj.className}: ${inheritanceChain.join(" -> ")}`);
 			const mergedFields = {};
 			const mergedFieldOwners = /* @__PURE__ */ new Map();
 			const mergedMethods = {};
-			for (const ancestorName of inheritanceChain) {
-				const ancestor = objectsByName.get(ancestorName);
+			for (const [index, ancestorName] of inheritanceChain.entries()) {
+				const ancestor = ancestorDefs[index];
 				if (!ancestor) continue;
 				const ancestorIsFrameworkBase = FRAMEWORK_ABSTRACT_BASE_NAMES.has(ancestorName);
 				if (usesSTI || ancestorIsFrameworkBase) for (const [fieldName, fieldDef] of Object.entries(ancestor.fields)) {
@@ -1365,17 +1415,15 @@ var ManifestGenerator = class {
 	*/
 	isSTIClass(obj, objectsByName, manifest) {
 		if (obj.decoratorConfig?.tableStrategy === "sti") return true;
-		let currentClass = obj.extends;
+		let currentClass = this.parentRef(obj);
 		const visited = /* @__PURE__ */ new Set();
 		while (currentClass) {
 			if (visited.has(currentClass)) break;
 			visited.add(currentClass);
-			let parentDef = objectsByName.get(currentClass);
-			if (parentDef === obj) parentDef = void 0;
-			if (!parentDef && manifest.smrtDependencies && manifest.smrtDependencies.length > 0) parentDef = this.loadParentFromExternalPackage(currentClass, manifest.smrtDependencies, objectsByName);
+			const parentDef = this.resolveParentDefinition(currentClass, obj, manifest, objectsByName);
 			if (!parentDef) break;
 			if (parentDef.decoratorConfig?.tableStrategy === "sti") return true;
-			currentClass = parentDef.extends;
+			currentClass = this.parentRef(parentDef);
 		}
 		return false;
 	}
@@ -1393,17 +1441,15 @@ var ManifestGenerator = class {
 	findSTIBase(obj, objectsByName, manifest) {
 		let stiBase;
 		if (obj.decoratorConfig?.tableStrategy === "sti") stiBase = obj;
-		let currentClass = obj.extends;
+		let currentClass = this.parentRef(obj);
 		const visited = /* @__PURE__ */ new Set();
 		while (currentClass) {
 			if (visited.has(currentClass)) break;
 			visited.add(currentClass);
-			let parentDef = objectsByName.get(currentClass);
-			if (parentDef === obj) parentDef = void 0;
-			if (!parentDef && manifest.smrtDependencies && manifest.smrtDependencies.length > 0) parentDef = this.loadParentFromExternalPackage(currentClass, manifest.smrtDependencies, objectsByName);
+			const parentDef = this.resolveParentDefinition(currentClass, obj, manifest, objectsByName);
 			if (!parentDef) break;
 			if (parentDef.decoratorConfig?.tableStrategy === "sti") stiBase = parentDef;
-			currentClass = parentDef.extends;
+			currentClass = this.parentRef(parentDef);
 		}
 		return stiBase;
 	}
@@ -1425,8 +1471,8 @@ var ManifestGenerator = class {
 			if (!externalManifest) continue;
 			const parentObj = lookupInManifest(externalManifest, parentClassName);
 			if (parentObj) {
-				objectsByName.set(parentObj.className, parentObj);
-				objectsByName.set(parentObj.className.toLowerCase(), parentObj);
+				if (!objectsByName.has(parentObj.className)) objectsByName.set(parentObj.className, parentObj);
+				if (!objectsByName.has(parentObj.className.toLowerCase())) objectsByName.set(parentObj.className.toLowerCase(), parentObj);
 				return parentObj;
 			}
 		}