@happyvertical/smrt-core 0.40.63 → 0.40.65

package/dist/vite-plugin/sveltekit-generator.js

@@ -749,14 +749,18 @@ async function generateRegistrationFile(projectRoot, manifest, options) {
 	const registrationFilePath = join(configDir, "smrt-register.ts");
 	const localObjects = [];
 	const packageObjects = /* @__PURE__ */ new Map();
+	const registrationBindings = buildRegistrationBindings(manifest);
 	for (const [className, objectDef] of Object.entries(manifest.objects)) if (isLocalObject(projectRoot, objectDef)) localObjects.push([className, objectDef]);
 	else if (objectDef.packageName) {
 		const packageEntry = packageObjects.get(objectDef.packageName) || {
-			classNames: [],
+			objects: [],
 			hasCollectionImport: false
 		};
 		if (isCollectionManifestClass(manifest, objectDef)) packageEntry.hasCollectionImport = true;
-		else packageEntry.classNames.push(className);
+		else packageEntry.objects.push({
+			simpleName: extractSimpleClassName(className),
+			bindingName: registrationBindings.get(className) || extractSimpleClassName(className)
+		});
 		packageObjects.set(objectDef.packageName, packageEntry);
 	} else localObjects.push([className, objectDef]);
 	const localNamedImports = /* @__PURE__ */ new Map();
@@ -773,54 +777,116 @@ async function generateRegistrationFile(projectRoot, manifest, options) {
 			continue;
 		}
 		const existing = localNamedImports.get(importPath) ?? [];
-		existing.push(simpleClassName);
+		existing.push({
+			simpleName: simpleClassName,
+			bindingName: registrationBindings.get(className) || simpleClassName
+		});
 		localNamedImports.set(importPath, existing);
 	}
-	const localImports = [...Array.from(localNamedImports.entries()).sort(([left], [right]) => left.localeCompare(right)).map(([importPath, simpleNames]) => {
-		return `import { ${simpleNames.sort((a, b) => a.localeCompare(b)).join(", ")} } from '${importPath}';`;
+	const localImports = [...Array.from(localNamedImports.entries()).sort(([left], [right]) => left.localeCompare(right)).map(([importPath, importedObjects]) => {
+		return `import { ${importedObjects.sort((a, b) => a.bindingName.localeCompare(b.bindingName)).map(formatRegistrationImport).join(", ")} } from '${importPath}';`;
 	}), ...Array.from(localSideEffectImports.values()).sort((a, b) => a.localeCompare(b)).map((importPath) => `import '${importPath}';`)].join("\n");
-	const registrationContent = `/**
- * Auto-generated SMRT object registration
- * DO NOT EDIT - changes will be overwritten
- *
- * Importing these modules triggers their @smrt() decorators, which perform
- * the initial registration. The explicit re-registration below is intentional:
- * it upgrades bundled runtimes to deterministic qualified registrations.
- */
-
-import { ObjectRegistry } from '@happyvertical/smrt-core';
-
-${[Array.from(packageObjects.entries()).sort(([left], [right]) => left.localeCompare(right)).flatMap(([packageName, packageEntry]) => {
+	const imports = [Array.from(packageObjects.entries()).sort(([left], [right]) => left.localeCompare(right)).flatMap(([packageName, packageEntry]) => {
 		const imports = [];
 		if (packageEntry.hasCollectionImport) imports.push(`import '${packageName}';`);
-		if (packageEntry.classNames.length > 0) {
-			const simpleNames = packageEntry.classNames.map(extractSimpleClassName).sort((a, b) => a.localeCompare(b));
+		if (packageEntry.objects.length > 0) {
+			const simpleNames = packageEntry.objects.sort((a, b) => a.bindingName.localeCompare(b.bindingName)).map(formatRegistrationImport);
 			imports.push(`import { ${simpleNames.join(", ")} } from '${packageName}';`);
 		}
 		return imports;
-	}).join("\n"), localImports].filter(Boolean).join("\n")}
-
-// Re-register imported objects with explicit package names for bundled runtimes
-${Object.entries(manifest.objects).map(([className, objectDef]) => {
+	}).join("\n"), localImports].filter(Boolean).join("\n");
+	const externalRuntimeDependencies = (manifest.smrtDependencies || []).filter((dependency) => dependency !== "@happyvertical/smrt-core");
+	let consumerRegistrationImport = "";
+	if (externalRuntimeDependencies.length > 0) {
+		const consumerRegistrationPath = relative(configDir, join(projectRoot, ".smrt", "register.js")).replace(/\\/g, "/");
+		consumerRegistrationImport = `import '${consumerRegistrationPath.startsWith(".") ? consumerRegistrationPath : `./${consumerRegistrationPath}`}';`;
+	}
+	const registrationManifests = Object.fromEntries(Object.entries(manifest.objects).flatMap(([className, objectDef]) => {
+		if (isCollectionManifestClass(manifest, objectDef)) return [];
+		const packageName = getRegistrationPackageName(manifest, objectDef, isLocalObject(projectRoot, objectDef));
+		if (!packageName) return [];
+		return [[className, {
+			...manifest,
+			packageName,
+			objects: { [className]: objectDef }
+		}]];
+	}));
+	const registrationManifestLiteral = JSON.stringify(JSON.stringify(registrationManifests));
+	const registrations = Object.entries(manifest.objects).map(([className, objectDef]) => {
 		if (isCollectionManifestClass(manifest, objectDef)) return null;
 		const simpleClassName = extractSimpleClassName(className);
+		const bindingName = registrationBindings.get(className) || simpleClassName;
 		const packageName = getRegistrationPackageName(manifest, objectDef, isLocalObject(projectRoot, objectDef));
 		if (!packageName) return null;
 		const packageNameLiteral = toSingleQuotedStringLiteral(packageName);
-		const singleLineRegistration = `ObjectRegistry.register(${simpleClassName}, { name: '${simpleClassName}', packageName: ${packageNameLiteral} });`;
+		const manifestKeyLiteral = toSingleQuotedStringLiteral(className);
+		const singleLineRegistration = `ObjectRegistry.register(${bindingName}, { name: '${simpleClassName}', packageName: ${packageNameLiteral}, _manifest: smrtRegistrationManifests[${manifestKeyLiteral}], _manifestKey: ${manifestKeyLiteral} });`;
 		if (singleLineRegistration.length <= BIOME_LINE_WIDTH) return singleLineRegistration;
 		return [
-			`ObjectRegistry.register(${simpleClassName}, {`,
+			`ObjectRegistry.register(${bindingName}, {`,
 			`  name: '${simpleClassName}',`,
 			`  packageName: ${packageNameLiteral},`,
+			`  _manifest: smrtRegistrationManifests[${manifestKeyLiteral}],`,
+			`  _manifestKey: ${manifestKeyLiteral},`,
 			`});`
 		].join("\n");
-	}).filter((registration) => registration !== null).join("\n")}
+	}).filter((registration) => registration !== null).join("\n");
+	const registrationContent = `/**
+ * Auto-generated SMRT object registration
+ * DO NOT EDIT - changes will be overwritten
+ *
+ * Importing these modules triggers their @smrt() decorators, which perform
+ * the initial registration. The explicit re-registration below is intentional:
+ * it upgrades bundled runtimes to deterministic qualified registrations.
+ */
+
+import { ObjectRegistry } from '@happyvertical/smrt-core';
+
+${consumerRegistrationImport}
+${imports}
+
+const smrtRegistrationManifests = JSON.parse(${registrationManifestLiteral});
+
+// Re-register imported objects with explicit package names for bundled runtimes
+${registrations}
 `;
 	if (!existsSync(configDir)) mkdirSync(configDir, { recursive: true });
 	writeFileSync(registrationFilePath, registrationContent, "utf-8");
 	console.log(`[smrt] Generated registration file: ${registrationFilePath}`);
 }
+function buildRegistrationBindings(manifest) {
+	const keysBySimpleName = /* @__PURE__ */ new Map();
+	const reservedBindings = /* @__PURE__ */ new Set();
+	for (const [manifestKey, objectDef] of Object.entries(manifest.objects)) {
+		if (isCollectionManifestClass(manifest, objectDef)) continue;
+		const simpleName = extractSimpleClassName(manifestKey);
+		reservedBindings.add(simpleName);
+		const keys = keysBySimpleName.get(simpleName) ?? [];
+		keys.push(manifestKey);
+		keysBySimpleName.set(simpleName, keys);
+	}
+	const bindings = /* @__PURE__ */ new Map();
+	const generatedBindings = /* @__PURE__ */ new Set();
+	for (const [simpleName, keys] of keysBySimpleName) {
+		const sortedKeys = keys.sort((a, b) => a.localeCompare(b));
+		for (const [index, manifestKey] of sortedKeys.entries()) {
+			let bindingName = simpleName;
+			if (sortedKeys.length > 1) {
+				let suffix = index + 1;
+				do {
+					bindingName = `__smrt_${simpleName}_${suffix}`;
+					suffix += 1;
+				} while (reservedBindings.has(bindingName) || generatedBindings.has(bindingName));
+				generatedBindings.add(bindingName);
+			}
+			bindings.set(manifestKey, bindingName);
+		}
+	}
+	return bindings;
+}
+function formatRegistrationImport(importedObject) {
+	return importedObject.simpleName === importedObject.bindingName ? importedObject.simpleName : `${importedObject.simpleName} as ${importedObject.bindingName}`;
+}
 /**
 * Generates centralized SMRT configuration file
 * Only creates if file doesn't exist (preserves user customizations)