@happyvertical/smrt-core 0.57.9 → 0.57.11

package/dist/manifest.json

@@ -2,7 +2,7 @@
   "version": "1.0.0",
   "timestamp": 0,
   "packageName": "@happyvertical/smrt-core",
-  "packageVersion": "0.57.9",
+  "packageVersion": "0.57.11",
   "objects": {
     "@happyvertical/smrt-core:SmrtClass": {
       "name": "smrtclass",

package/dist/registry/class-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"class-registration.d.ts","sourceRoot":"","sources":["../../src/registry/class-registration.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAwBH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AAsD7B,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AA0EpB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAS3E;AA4BD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAeT;AAstBD;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CASN;AA+nCD,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAMlB,qBAAqB,EAAE,WAAW,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC,GAC3E,IAAI,CAeN;AA+BD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACpC,kBAAkB,EAAE,eAAe,CAAC,oBAAoB,CAAC,GAAG,SAAS,GACpE,IAAI,CAyCN;AAoHD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,eAAe,EACzB,gBAAgB,CAAC,EAAE;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACA,IAAI,CA4CN;AA0LD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,IAAI,CAUN"}
+{"version":3,"file":"class-registration.d.ts","sourceRoot":"","sources":["../../src/registry/class-registration.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAwBH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AAsD7B,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAiGpB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAS3E;AA4BD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAeT;AAstBD;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CASN;AAioCD,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAMlB,qBAAqB,EAAE,WAAW,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC,GAC3E,IAAI,CAeN;AA+BD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACpC,kBAAkB,EAAE,eAAe,CAAC,oBAAoB,CAAC,GAAG,SAAS,GACpE,IAAI,CAyCN;AAoHD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,eAAe,EACzB,gBAAgB,CAAC,EAAE;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACA,IAAI,CA4CN;AAmMD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,IAAI,CAUN"}

package/dist/registry/class-registration.js

@@ -47,6 +47,19 @@ function pluralizeCollection(className) {
 	return `${lower}s`;
 }
 /**
+* The registry key of the class `ctor` actually extends, when that parent is
+* registered under a qualified name and (if the manifest names a parent) has
+* the manifest's simple name (#4145). Constructor identity is exact: two
+* packages may export a same-named class, and only the prototype says which
+* one this class extends, even when the manifest predates `extendsQualified`.
+*/
+function registeredParentKey(ctor, manifestParent) {
+	const parentKey = getConstructorIndex().get(Object.getPrototypeOf(ctor));
+	if (!parentKey || !isQualifiedName(parentKey)) return void 0;
+	if (manifestParent && manifestParent !== parentKey && parseQualifiedName(parentKey).className !== manifestParent) return;
+	return parentKey;
+}
+/**
 * The collection an STI subtype shares with its STI base, for a class that
 * registers with no manifest `collection` (#3125). The manifest generator
 * gives every STI subtype its base's collection (`findSTIBase`: the oldest
@@ -870,7 +883,7 @@ function registerUntracked(ctor, config = {}) {
 	let validators;
 	if (validationRules === void 0) validators = compileValidators(name, fields);
 	else verboseLog(`[registry] Using ${validationRules.length} pre-computed validation rules for ${name}`);
-	let extendsClass = manifestEntry?.extendsQualified ?? manifestEntry?.extends;
+	let extendsClass = manifestEntry?.extendsQualified ?? registeredParentKey(ctor, manifestEntry?.extends) ?? manifestEntry?.extends;
 	assertRegisteredStiParent(ctor);
 	if (!extendsClass) {
 		const proto = Object.getPrototypeOf(ctor);
@@ -1185,7 +1198,10 @@ function mergeManifestIntoExistingRegistration(existing, objectDef, packageName)
 		existing.qualifiedName = createQualifiedName(packageName, existing.name);
 	} else if (!existing.packageName && objectDef.packageName) existing.packageName = objectDef.packageName;
 	const manifestParent = objectDef.extendsQualified ?? objectDef.extends;
-	if (manifestParent) existing.extends = packageName ? qualifyExtendsName(manifestParent, packageName) : manifestParent;
+	if (manifestParent) {
+		const qualifiedParent = packageName ? qualifyExtendsName(manifestParent, packageName) : manifestParent;
+		if (!(!isQualifiedName(qualifiedParent) && !!existing.extends && isQualifiedName(existing.extends) && parseQualifiedName(existing.extends).className === qualifiedParent)) existing.extends = qualifiedParent;
+	}
 	if (!existing.sourceFilePath && objectDef.filePath) existing.sourceFilePath = objectDef.filePath;
 	if (objectDef.collection) existing.collection = existing.config.collection ?? objectDef.collection;
 	existing.visibility = objectDef.visibility || manifestConfig.visibility || existing.visibility;