@xaidenlabs/uso 1.1.33 → 1.1.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.33",
+  "version": "1.1.34",
   "description": "Universal Solana Orchestrator - A one-command setup tool for Solana and Anchor development environments on Windows, macOS, and Linux.",
   "bin": {
     "uso": "bin/index.js"

package/src/commands/create.js

@@ -7,11 +7,6 @@ const { log, spinner } = require('../utils/logger');
 
 const create = async (projectName, options) => {
     // 1. Validation
-    if (!shell.which('anchor')) {
-        log.error("❌ 'anchor' is not found in PATH.");
-        log.warn("👉 Run 'uso init' to install the Solana toolchain.");
-        return;
-    }
     if (!projectName) {
         log.error("❌ Please specify a project name.");
         log.warn("👉 Usage: uso create <project-name>");
@@ -25,72 +20,150 @@ const create = async (projectName, options) => {
 
     log.header(`🏗️  Scaffolding new Solana project: ${projectName}...`);
 
-    // 2. Ensure Wallet Keypair Exists
-    const keypairPath = path.join(os.homedir(), '.config', 'solana', 'id.json');
-    if (!fs.existsSync(keypairPath)) {
-        log.info("🔑 No default wallet found. Generating one for you...");
-        const keyDir = path.dirname(keypairPath);
-        if (!fs.existsSync(keyDir)) shell.mkdir('-p', keyDir);
+    // 2. Locate Template
+    // We expect templates/default relative to this file
+    // src/commands/create.js -> templates/default is two levels up -> templates/default
+    const templatePath = path.resolve(__dirname, '../../templates/default');
+    if (!fs.existsSync(templatePath)) {
+        log.error(`❌ Template not found at: ${templatePath}`);
+        log.error("This installation of uso might be corrupted.");
+        return;
+    }
+
+    // 3. Create Project Directory & Copy Files
+    const projectPath = path.join(process.cwd(), projectName);
+    shell.mkdir('-p', projectPath);
+
+    const copySpin = spinner(`Copying template files...`).start();
+    // Use recursive copy
+    shell.cp('-R', `${templatePath}/*`, projectPath);
+    // Copy hidden files like .gitignore separately if needed, or check if cp -R includes them
+    shell.cp('-R', `${templatePath}/.gitignore`, projectPath);
+    shell.cp('-R', `${templatePath}/.prettierignore`, projectPath);
+    copySpin.succeed("Template files copied.");
 
-        if (shell.exec('solana-keygen new --no-bip39-passphrase --outfile "' + keypairPath + '"').code !== 0) {
-            log.error("❌ Failed to generate wallet keypair.");
-            return;
+    shell.cd(projectPath);
+
+    // 4. Customization: Rename Project & Generate Program ID
+    const configSpin = spinner(`Configuring project...`).start();
+
+    // 4a. Program Keypair & ID
+    // Create 'target/deploy' folder where keypair usually lives
+    const deployDir = path.join(projectPath, 'target', 'deploy');
+    shell.mkdir('-p', deployDir);
+
+    // Check if user has solana-keygen
+    let programId = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"; // Default fallback
+    if (shell.which('solana-keygen')) {
+        const keypairFile = path.join(deployDir, `${projectName}-keypair.json`);
+        // Generate new keypair
+        const result = shell.exec(`solana-keygen new --no-bip39-passphrase --outfile "${keypairFile}"`, { silent: true });
+        if (result.code === 0) {
+            // Extract pubkey
+            const pubkey = shell.exec(`solana-keygen pubkey "${keypairFile}"`, { silent: true }).stdout.trim();
+            if (pubkey) programId = pubkey;
         }
-        log.success(`✅ Wallet created at: ${keypairPath}`);
     }
 
-    // 3. Run Anchor Init
-    const initSpin = spinner(`Initializing Anchor project '${projectName}'...`).start();
-    // --javascript flag used to be common, but now TypeScript is default.
-    // We just run init.
-    if (shell.exec(`anchor init ${projectName}`).code !== 0) {
-        initSpin.fail("Failed to initialize Anchor project.");
-        return;
+    // 4b. Rename Program Directory
+    // Default template has programs/my-project
+    const oldProgramDir = path.join(projectPath, 'programs', 'my-project');
+    const newProgramDir = path.join(projectPath, 'programs', projectName);
+
+    // Rust crate names usually use underscores instead of dashes
+    // e.g. project-name -> project_name
+    const crateName = projectName.replace(/-/g, '_');
+    const newProgramDirCrate = path.join(projectPath, 'programs', crateName);
+
+    if (fs.existsSync(oldProgramDir)) {
+        shell.mv(oldProgramDir, newProgramDirCrate);
     }
-    initSpin.succeed("Anchor project initialized.");
 
-    const projectPath = path.join(process.cwd(), projectName);
-    shell.cd(projectPath);
+    // 4c. Update Cargo.toml (root and program)
+    // Root Cargo.toml
+    const rootCargoPath = path.join(projectPath, 'Cargo.toml');
+    if (fs.existsSync(rootCargoPath)) {
+        let content = fs.readFileSync(rootCargoPath, 'utf8');
+        content = content.replace(/programs\/my-project/g, `programs/${crateName}`);
+        fs.writeFileSync(rootCargoPath, content);
+    }
 
-    // 4. Inject Frontend Template
-    // We'll use the official Solana dApp Scaffold (Next.js + Tailwind)
-    const templateRepo = "https://github.com/solana-developers/dapp-scaffold-4"; // A popular one, or we can use a simpler one.
-    // Let's use a reliable Next.js starter.
-    // "solana-lab/dapp-scaffold" is deprecated/archived.
-    // "solana-developers/solana-dapp-next" is good.
-    const frontendRepo = "https://github.com/solana-developers/solana-dapp-next.git";
+    // Program Cargo.toml
+    const programCargoPath = path.join(newProgramDirCrate, 'Cargo.toml');
+    if (fs.existsSync(programCargoPath)) {
+        let content = fs.readFileSync(programCargoPath, 'utf8');
+        content = content.replace(/name = "my-project"/g, `name = "${crateName}"`);
+        content = content.replace(/name = "my_project"/g, `name = "${crateName}"`);
+        fs.writeFileSync(programCargoPath, content);
+    }
 
-    log.info("🧬 Injecting Next.js frontend (Solana Adapter + Tailwind)...");
+    // 4d. Update Anchor.toml
+    const anchorTomlPath = path.join(projectPath, 'Anchor.toml');
+    if (fs.existsSync(anchorTomlPath)) {
+        let content = fs.readFileSync(anchorTomlPath, 'utf8');
+        // Replace Program ID
+        content = content.replace(/my_project = ".*"/g, `${crateName} = "${programId}"`);
+        // Replace scripts if needed (template might have default)
+        fs.writeFileSync(anchorTomlPath, content);
+    }
+
+    // 4e. Update lib.rs with new Program ID
+    const libRsPath = path.join(newProgramDirCrate, 'src', 'lib.rs');
+    if (fs.existsSync(libRsPath)) {
+        let content = fs.readFileSync(libRsPath, 'utf8');
+        // declare_id!("...")
+        content = content.replace(/declare_id!\(".*"\);/g, `declare_id!("${programId}");`);
+        fs.writeFileSync(libRsPath, content);
+    }
+
+    // 4f. Update Tests
+    // tests/my-project.ts -> tests/<projectName>.ts
+    const oldTestFile = path.join(projectPath, 'tests', 'my-project.ts');
+    const newTestFile = path.join(projectPath, 'tests', `${projectName}.ts`);
+    if (fs.existsSync(oldTestFile)) {
+        shell.mv(oldTestFile, newTestFile);
+        // Build needs to reference this? No, anchor test runs all .ts files usually.
+        // Update content of test file
+        let content = fs.readFileSync(newTestFile, 'utf8');
+        content = content.replace(/anchor\.workspace\.MyProject/g, `anchor.workspace.${toPascalCase(crateName)}`);
+        fs.writeFileSync(newTestFile, content);
+    }
+
+    configSpin.succeed("Project configured.");
 
-    // Remove existing app folder if anchor created it (usually it doesn't)
-    if (fs.existsSync('app')) {
-        shell.rm('-rf', 'app');
+    // 5. Initialize Git
+    if (shell.which('git')) {
+        shell.exec('git init', { silent: true });
+        shell.exec('git add .', { silent: true });
+        shell.exec('git commit -m "Initial commit by uso"', { silent: true });
     }
 
+    // 6. Inject Frontend Template
+    const frontendRepo = "https://github.com/solana-developers/solana-dapp-next.git";
+    log.info("🧬 Injecting Next.js frontend (Solana Adapter + Tailwind)...");
+
     const cloneSpin = spinner("Cloning frontend template...").start();
     if (shell.exec(`git clone ${frontendRepo} app`).code !== 0) {
         cloneSpin.fail("Failed to clone frontend template.");
-        log.warn("⚠️  Proceeding with backend only.");
+        log.warn("⚠️  Proceeding without frontend.");
     } else {
         cloneSpin.succeed("Frontend template injected into ./app");
-        // Remove .git from the frontend so it's part of the main repo
         shell.rm('-rf', path.join('app', '.git'));
-
-        // Installing dependencies for frontend is slow, maybe skip or ask user?
-        // Let's print instructions instead to be fast.
     }
 
-    // 5. Configure Anchor.toml for Local Development
-    // (Optional: depending on what 'anchor init' generates, we might want to ensure seeds=false or similar)
-    // For now, standard init is usually fine.
+    // 7. Install Dependencies (Optional but nice)
+    // Skipping to keep it fast, user can run npm install
 
-    // 6. Final Success Message
+    // 8. Final Success Message
     console.log("");
     log.header(`✅ Project '${projectName}' is ready! 🚀`);
+    log.info(`   Program ID: ${programId}`);
 
     log.subHeader("Quick Start:");
     console.log(chalk.yellow(`  cd ${projectName}`));
     console.log(chalk.yellow(`  uso val     `) + chalk.gray(" # Start local validator (in new terminal)"));
+    // We should probably run npm install for them?
+    console.log(chalk.yellow(`  npm install `) + chalk.gray(" # Install dependencies"));
     console.log(chalk.yellow(`  uso test    `) + chalk.gray(" # Build & run tests"));
     console.log("");
 
@@ -101,4 +174,10 @@ const create = async (projectName, options) => {
     console.log("");
 };
 
+// Helper: snake_case to PascalCase
+function toPascalCase(str) {
+    return str.replace(/(\w)(\w*)/g,
+        function (g0, g1, g2) { return g1.toUpperCase() + g2.toLowerCase(); }).replace(/_/g, '');
+}
+
 module.exports = { create };