@tavus/cvi-ui 0.0.1-beta.2 → 0.0.1-beta.3

package/src/templates/tsx/index.ts

@@ -0,0 +1,14 @@
+export { default as "audio-wave" } from './components/audio-wave.json';
+export { default as "controls" } from './components/controls.json';
+export { default as "conversation-01" } from './components/conversation-01.json';
+export { default as "cvi-provider" } from './components/cvi-provider.json';
+export { default as "hair-check-01" } from './components/hair-check-01.json';
+export { default as "cvi-events-hooks" } from './hooks/cvi-events-hooks.json';
+export { default as "use-cvi-call" } from './hooks/use-cvi-call.json';
+export { default as "use-local-camera" } from './hooks/use-local-camera.json';
+export { default as "use-local-microphone" } from './hooks/use-local-microphone.json';
+export { default as "use-local-screenshare" } from './hooks/use-local-screenshare.json';
+export { default as "use-remote-participant-ids" } from './hooks/use-remote-participant-ids.json';
+export { default as "use-replica-ids" } from './hooks/use-replica-ids.json';
+export { default as "use-request-permissions" } from './hooks/use-request-permissions.json';
+export { default as "use-start-haircheck" } from './hooks/use-start-haircheck.json';

package/src/utils/resolve-components-tree.ts

@@ -1,7 +1,57 @@
 import * as templates from '../templates';
+import { removeVersionSuffix, getDefaultVersion } from './version-utils';
 
 type ComponentKey = keyof typeof templates.tsx;
 
+// Helper function to find component template by name (with or without version)
+function findComponentTemplate(name: string) {
+	// First try exact match
+	let component = templates.tsx[name as ComponentKey];
+	
+	if (!component) {
+		// If no exact match, try without version suffix
+		const nameWithoutVersion = removeVersionSuffix(name);
+		const defaultVersion = getDefaultVersion(nameWithoutVersion);
+		component = templates.tsx[defaultVersion as ComponentKey];
+	}
+	
+	return component;
+}
+
+// Helper function to deduplicate components by selecting the latest version
+function deduplicateComponents(components: string[]): string[] {
+	const componentGroups = new Map<string, string[]>();
+	
+	// Group components by their base name (without version)
+	components.forEach(componentName => {
+		const baseName = removeVersionSuffix(componentName);
+		if (!componentGroups.has(baseName)) {
+			componentGroups.set(baseName, []);
+		}
+		componentGroups.get(baseName)!.push(componentName);
+	});
+	
+	// For each group, select the component with the highest version number
+	const deduplicatedComponents: string[] = [];
+	
+	componentGroups.forEach((componentVersions) => {
+		if (componentVersions.length === 1) {
+			// Only one version, use it as is
+			deduplicatedComponents.push(componentVersions[0]);
+		} else {
+			// Multiple versions, select the one with the highest version number
+			const latestVersion = componentVersions.reduce((latest, current) => {
+				const latestVersionNum = parseInt(latest.match(/-(\d+)$/)?.[1] || '0');
+				const currentVersionNum = parseInt(current.match(/-(\d+)$/)?.[1] || '0');
+				return currentVersionNum > latestVersionNum ? current : latest;
+			});
+			deduplicatedComponents.push(latestVersion);
+		}
+	});
+	
+	return deduplicatedComponents;
+}
+
 export function resolveComponentsTree(components: string[]) {
   // npm libraries which should be added to the project
   const dependencies = new Set<string>();
@@ -10,7 +60,7 @@ export function resolveComponentsTree(components: string[]) {
 
   // Process each component and its dependencies recursively
   function processComponent(componentName: string) {
-    const component = templates.tsx[componentName as ComponentKey];
+    const component = findComponentTemplate(componentName);
     if (!component) return;
 
     // Add component's dependencies
@@ -23,8 +73,15 @@ export function resolveComponentsTree(components: string[]) {
     });
   }
 
+  // Deduplicate components before processing
+  const uniqueComponents = deduplicateComponents(components);
+  
+  // Update componentsDependencies with deduplicated list
+  componentsDependencies.clear();
+  uniqueComponents.forEach(component => componentsDependencies.add(component));
+
   // Process all requested components
-  components.forEach((componentName) => {
+  uniqueComponents.forEach((componentName) => {
     processComponent(componentName);
   });
 

package/src/utils/update-files.ts

@@ -8,9 +8,30 @@ import { spinner } from '@/src/components/spinner';
 import prompts from 'prompts';
 import * as templates from '../templates';
 import { components as COMPONENTS } from '../templates/components';
+import { removeVersionSuffix, getDefaultVersion } from './version-utils';
 
 type ComponentKey = keyof typeof templates.tsx;
 
+// Helper function to find component by name (with or without version)
+function findComponentByName(name: string) {
+	// First try exact match
+	let component = COMPONENTS.find((comp) => comp.name === name);
+	
+	if (!component) {
+		// If no exact match, try without version suffix
+		const nameWithoutVersion = removeVersionSuffix(name);
+		component = COMPONENTS.find((comp) => removeVersionSuffix(comp.name) === nameWithoutVersion);
+		
+		if (component) {
+			// If found by versionless name, use the default version
+			const defaultVersion = getDefaultVersion(nameWithoutVersion);
+			component = COMPONENTS.find((comp) => comp.name === defaultVersion) || component;
+		}
+	}
+	
+	return component;
+}
+
 export async function updateFiles(
 	files: string[],
 	config: Config,
@@ -50,31 +71,38 @@ export async function updateFiles(
 	const filesSkipped = [];
 
 	for (const filename of files) {
-		const componentBasePath = COMPONENTS.find((component) => component.name === filename)?.path;
-		if (!componentBasePath) {
+		const component = findComponentByName(filename);
+		if (!component) {
 			logger.warn(`Component ${filename} not found`);
 			continue;
 		}
 
+		// Use the actual component name from the found component
+		const actualComponentName = component.name;
+		const componentBasePath = component.path;
+		
+		// For file creation, use versionless name
+		const fileDisplayName = removeVersionSuffix(actualComponentName);
+
 		let targetPath: string;
 		let targetDir: string;
 
 		// Handle different component types based on path structure
 		if (componentBasePath.startsWith('components/')) {
-			// For components: create folder with filename and index file inside
-			targetDir = path.join(config.resolvedPaths.cwd, componentsPath, componentBasePath);
+			// For components: create folder with versionless filename and index file inside
+			targetDir = path.join(config.resolvedPaths.cwd, componentsPath, 'components', fileDisplayName);
 			targetPath = path.join(targetDir, `index.${config.tsx ? 'tsx' : 'jsx'}`);
 		} else if (componentBasePath.startsWith('hooks/')) {
 			// For hooks: create direct filename.tsx file
 			targetDir = path.join(config.resolvedPaths.cwd, componentsPath, 'hooks');
-			targetPath = path.join(targetDir, `${filename}.${config.tsx ? 'tsx' : 'jsx'}`);
+			targetPath = path.join(targetDir, `${fileDisplayName}.${config.tsx ? 'tsx' : 'jsx'}`);
 		} else {
 			// Fallback to original logic for other cases
 			targetPath = path.join(
 				config.resolvedPaths.cwd,
 				componentsPath,
 				componentBasePath,
-				`${filename}.${config.tsx ? 'tsx' : 'jsx'}`
+				`${fileDisplayName}.${config.tsx ? 'tsx' : 'jsx'}`
 			);
 			targetDir = path.dirname(targetPath);
 		}
@@ -90,7 +118,7 @@ export async function updateFiles(
 				type: 'confirm',
 				name: 'overwrite',
 				message: `The file ${highlighter.info(
-					filename
+					fileDisplayName
 				)} already exists. Would you like to overwrite?`,
 				initial: false,
 			});
@@ -118,7 +146,7 @@ export async function updateFiles(
 			styles?: string;
 			dependencies?: string[];
 			componentsDependencies?: string[];
-		} = templates[config.tsx ? 'tsx' : 'jsx'][filename as ComponentKey];
+		} = templates[config.tsx ? 'tsx' : 'jsx'][actualComponentName as ComponentKey];
 		// Write the content from templates
 		if (template) {
 			let content = template.content;
@@ -134,13 +162,13 @@ export async function updateFiles(
 			await fs.writeFile(targetPath, content);
 			if (template.styles && template.styles.length > 0) {
 				// For components, create CSS file in the same directory as the index file
-				const cssPath = path.join(targetDir, `${filename}.module.css`);
+				const cssPath = path.join(targetDir, `${fileDisplayName}.module.css`);
 				await fs.writeFile(cssPath, template.styles);
 			}
 		} else {
 			// For other components, we'll need to handle them differently
 			// This part needs to be implemented based on how other components are structured
-			logger.warn(`Component ${filename} is not yet implemented`);
+			logger.warn(`Component ${actualComponentName} is not yet implemented`);
 			continue;
 		}
 

package/src/utils/version-utils.ts

@@ -0,0 +1,26 @@
+// Helper function to remove version suffix from component name
+export function removeVersionSuffix(name: string): string {
+	return name.replace(/-\d+$/, '');
+}
+
+// Helper function to get the default version for a component
+export function getDefaultVersion(name: string): string {
+	// Map versionless names to their default versions
+	const versionMap: Record<string, string> = {
+		'conversation': 'conversation-01',
+		'hair-check': 'hair-check-01',
+	};
+	
+	return versionMap[name] || name;
+}
+
+// Helper function to map user input to actual component names
+export function mapUserInputToComponentName(userInput: string): string {
+	// If user input has a version, use it as is
+	if (userInput.match(/-\d+$/)) {
+		return userInput;
+	}
+	
+	// Otherwise, map to default version
+	return getDefaultVersion(userInput);
+}