@better-sol/cli 0.1.0-alpha.10 → 0.1.0-alpha.12

package/README.md

@@ -48,7 +48,7 @@ Compile and deploy to Solana.
 npx @better-sol/cli@alpha deploy
 ```
 
-Parses your TypeScript, generates Anchor Rust, compiles it via the cloud API, and deploys the binary. On devnet and testnet, automatically funds your payer if the balance is low.
+Parses your TypeScript, compiles it via the cloud API, and deploys the binary. On devnet and testnet, automatically funds your payer if the balance is low. Compiled binaries are cached locally in `.better-sol/cache/` for testing.
 
 | Flag | Default | Description |
 |---|---|---|
@@ -56,9 +56,9 @@ Parses your TypeScript, generates Anchor Rust, compiles it via the cloud API, an
 | `--program <name>` | all programs | Target a specific program |
 | `--payer <path>` | `keypair.json` | Payer keypair path |
 | `--cluster <cluster>` | `devnet` | `devnet`, `testnet`, `mainnet`, `localnet` |
-| `--dry-run` | `false` | Generate Rust without compiling or deploying |
-| `--verify` | `false` | Write Rust for verified builds |
-| `--output <dir>` | `generated` | Output directory for Rust files |
+| `--dry-run` | `false` | Validate without compiling or deploying |
+| `--verify` | `false` | Write Rust for OtterSec verified builds |
+| `--output <dir>` | `generated` | Rust output directory (only used with `--verify`) |
 
 ### `generate idl`
 

package/dist/index.js

@@ -388,13 +388,11 @@ function collectAccounts(source, program, rawStructZCs) {
 		const firstArg = call.arguments[0];
 		if (firstArg === void 0 || !isObjectExpression(firstArg)) continue;
 		const fields = parseFields(source, firstArg);
-		const chainText = nodeTextOf(source, decl.init);
-		if (chainText.includes(".pda(")) throw new Error(".pda() was renamed to .derive(). Use .derive((seed) => ['literal', seed.fieldName]).");
-		if (chainText.includes(".seeds(")) throw new Error(".seeds() was removed. Use .derive((seed) => ['literal', seed.fieldName]).");
-		const zeroCopy = chainText.includes(".zeroCopy");
+		const zeroCopy = hasChainMethod(source, decl.init, "zeroCopy");
 		if (zeroCopy) validateZeroCopyFields(name, fields, rawStructZCs);
-		const seeds = parseSeeds(chainText);
-		const hasOneFields = parseHasOneFields(chainText);
+		const deriveCall = findChainCall(source, decl.init, "derive");
+		const seeds = deriveCall !== void 0 ? parseSeedsFromAst(source, deriveCall) : [];
+		const hasOneFields = parseHasOneFieldsFromAst(source, decl.init);
 		accounts.push({
 			name,
 			fields,
@@ -578,6 +576,17 @@ function resolveConstraint(source, prop, accountName, rawAccounts) {
 			};
 		}
 		case "remaining": {
+			const argNode = init.arguments[0];
+			if (argNode !== void 0 && isIdentifier(argNode)) {
+				if (argNode.name === "tokenAccount" || argNode.name.includes("TokenAccount") || argNode.name.includes("tokenAccount")) return {
+					kind: "remaining",
+					itemType: "tokenAccount"
+				};
+				if (argNode.name === "signer" || argNode.name.includes("Signer")) return {
+					kind: "remaining",
+					itemType: "signer"
+				};
+			}
 			const argText = getCallArgText(source, init, 0) ?? "";
 			if (argText.includes("tokenAccount")) return {
 				kind: "remaining",
@@ -704,50 +713,73 @@ function tryResolvePrimitive(name) {
 		"bytes"
 	].includes(name) ? name : void 0;
 }
-function parseSeeds(chainText) {
-	const args = extractPdaArgs(chainText);
-	if (args === void 0) return [];
+function hasChainMethod(source, node, methodName) {
+	return findChainCall(source, node, methodName) !== void 0;
+}
+function findChainCall(source, node, methodName) {
+	let current = node;
+	while (current !== void 0) {
+		if (!isCallExpression(current)) break;
+		if (isMemberExpression(current.callee)) {
+			if (getMemberPropertyName(source, current.callee) === methodName) return current;
+			current = current.callee.object;
+		} else break;
+	}
+}
+function parseSeedsFromAst(source, deriveCall) {
+	const firstArg = deriveCall.arguments[0];
+	if (firstArg === void 0 || !isArrowFunctionExpression(firstArg)) return [];
+	const body = unwrapParenthesized(firstArg.body);
+	if (!isArrayExpression(body)) return [];
 	const seeds = [];
-	const regex = /\b[A-Za-z_$][\w$]*\.([A-Za-z_$][\w$]*)|'([^']*)'|"([^"]*)"/g;
-	let match;
-	while ((match = regex.exec(args)) !== null) {
-		const field = match[1];
-		const singleQuotedLiteral = match[2];
-		const doubleQuotedLiteral = match[3];
-		if (field !== void 0) seeds.push({
-			kind: "field",
-			fieldName: field
-		});
-		else if (singleQuotedLiteral !== void 0 && singleQuotedLiteral !== "") seeds.push(parseLiteralSeed(singleQuotedLiteral));
-		else if (doubleQuotedLiteral !== void 0 && doubleQuotedLiteral !== "") seeds.push(parseLiteralSeed(doubleQuotedLiteral));
+	for (const element of body.elements) {
+		if (element === void 0 || element === null || isSpreadElement(element)) continue;
+		const seed = parseSingleSeed(source, element);
+		if (seed !== void 0) seeds.push(seed);
 	}
 	return seeds;
 }
+function parseSingleSeed(source, node) {
+	if (isStringLiteral(node)) return parseLiteralSeed(node.value);
+	if (isTemplateLiteral(node) && node.quasis.length === 1) {
+		const quasi = node.quasis[0];
+		if (quasi !== void 0) return parseLiteralSeed(quasi.value.cooked ?? quasi.value.raw);
+	}
+	if (isMemberExpression(node)) {
+		const property = getMemberPropertyName(source, node);
+		if (property !== void 0) return {
+			kind: "field",
+			fieldName: property
+		};
+	}
+	if (isCallExpression(node) && isMemberExpression(node.callee)) {
+		const property = getMemberPropertyName(source, node.callee);
+		if (property !== void 0) return {
+			kind: "field",
+			fieldName: property
+		};
+	}
+}
 function parseLiteralSeed(value) {
-	if (/^\{[A-Za-z_$][\w$]*\}$/.test(value)) throw new Error(`Dynamic PDA seed template '${value}' is not supported. Store the value as an account field and reference it with seed.${value.slice(1, -1)}.`);
 	return {
 		kind: "literal",
 		value
 	};
 }
-function parseHasOneFields(chainText) {
+function parseHasOneFieldsFromAst(source, node) {
 	const fields = [];
-	const regex = /\.hasOne\(["']([^"']+)["']\)/g;
-	let match;
-	while ((match = regex.exec(chainText)) !== null) fields.push(match[1]);
-	return fields;
-}
-function extractPdaArgs(chainText) {
-	const start = chainText.indexOf(".derive(");
-	if (start === -1) return void 0;
-	const argsStart = start + 8;
-	let depth = 1;
-	for (let index = argsStart; index < chainText.length; index += 1) {
-		const char = chainText[index];
-		if (char === "(") depth += 1;
-		else if (char === ")") depth -= 1;
-		if (depth === 0) return chainText.slice(argsStart, index);
+	let current = node;
+	while (current !== void 0) {
+		if (!isCallExpression(current)) break;
+		if (isMemberExpression(current.callee)) {
+			if (getMemberPropertyName(source, current.callee) === "hasOne") {
+				const arg = current.arguments[0];
+				if (isStringLiteral(arg)) fields.push(arg.value);
+			}
+			current = current.callee.object;
+		} else break;
 	}
+	return fields;
 }
 function validateZeroCopyFields(accountName, fields, structs) {
 	for (const field of fields) try {
@@ -933,7 +965,7 @@ async function discoverProgramsWithSpinner(src) {
 const PAYER_KEYPAIR_PATH = "keypair.json";
 const GITIGNORE_ENTRIES = [
 	".better-sol/",
-	"generated/**/*.so",
+	"generated/",
 	"keypair.json",
 	"node_modules/"
 ];
@@ -3134,21 +3166,18 @@ const DEFAULT_PAYER_PATH = "keypair.json";
 const AIRDROP_LAMPORTS = 2000000000n;
 const AIRDROP_RETRIES = 3;
 const MIN_DEPLOY_BALANCE = 1500000000n;
+const CACHE_DIR = `${BETTER_SOL_DIR}/cache`;
 async function deploy(options) {
 	intro("better-sol deploy");
 	const apiKey = await getStoredApiKey();
 	const config = await loadConfig();
 	const cluster = parseCluster(options.cluster, config.cluster);
 	const src = options.src ?? config.programs;
-	const out = options.output ?? config.out;
-	const outDir = cwdPath(out);
 	const payerPath = resolvePayerPath(options.payer, config.payer);
 	const payer = await readKeypair(payerPath);
 	const rpcUrl = clusterUrl(cluster);
-	const writesRust = options.verify || options.dryRun || options.output !== void 0;
 	log.step(`Cluster: ${cluster}`);
 	log.step(`Source:  ${src}`);
-	if (writesRust) log.step(`Output:  ${out}`);
 	await ensureFunded(payer.publicKey, cluster, rpcUrl);
 	const programs = await discoverProgramsWithSpinner(src);
 	const matched = options.program !== void 0 ? programs.filter((p) => p.name === options.program) : programs;
@@ -3157,26 +3186,12 @@ async function deploy(options) {
 		throw new Error(`No program named '${options.program}' found in ${src}.\nAvailable programs:\n${available}`);
 	}
 	const projects = matched.map((program) => generateAnchorProject(program));
-	await Promise.all(projects.map((project) => removeGeneratedSoFile(outDir, project.program.name)));
-	if (writesRust) {
-		const writeSpinner = spinner();
-		writeSpinner.start("Writing generated Anchor projects");
-		await ensureDirectory(outDir);
-		await Promise.all(projects.map(async (project) => {
-			const dir = join(outDir, project.program.name);
-			await ensureDirectory(join(dir, "src"));
-			writeFileSync(join(dir, "Cargo.toml"), project.cargoToml);
-			writeFileSync(join(dir, "src", "lib.rs"), project.libRs);
-		}));
-		writeSpinner.stop("Generated Anchor projects written");
-	}
 	if (options.dryRun) {
-		for (const project of projects) printProgramSummary(project.program, cluster, outDir, true);
-		outro(`Dry run complete — Rust written to ${out}/. No compilation or deployment performed.`);
+		outro("Dry run complete. No compilation or deployment performed.");
 		return;
 	}
 	const compileSpinner = spinner();
-	compileSpinner.start(`Compiling ${matched.length === 1 ? matched[0]?.name : matched.length + " programs"} with Better Sol compiler`);
+	compileSpinner.start(`Compiling ${matched.length === 1 ? matched[0]?.name : matched.length + " programs"}`);
 	let compileResults;
 	try {
 		compileResults = await Promise.all(projects.map((project) => compileProgram({
@@ -3201,6 +3216,8 @@ async function deploy(options) {
 			throw new Error(`Compilation failed for ${project.program.name}.${logs}`);
 		}
 		log.step(`Compiled: ${compileTime}`);
+		if (result.bytecodeSha256) log.step(`Binary:   sha256:${result.bytecodeSha256.slice(0, 16)}...`);
+		writeBytecode(project.program.name, result.bytecode);
 		const programKeypairPath = cwdJoin(BETTER_SOL_DIR, `${project.program.name}.json`);
 		const solanaPath = ensureSolanaCli();
 		const deploySpinner = spinner();
@@ -3223,14 +3240,27 @@ async function deploy(options) {
 		}
 	}
 	if (options.verify) {
+		const verifyDir = cwdPath(options.output ?? config.out);
+		await writeRustForVerify(projects, verifyDir);
 		log.info("To verify this build on-chain:");
-		log.step(`1. Commit and push the ${out}/ directory to a public repository`);
+		log.step(`1. Commit and push the ${verifyDir}/ directory to a public repository`);
 		log.step(`2. Run \`${CLI_COMMAND$1} verify ${matched[0]?.address ?? "<program-id>"}\``);
 	}
 	outro("Deploy complete.");
 }
-async function removeGeneratedSoFile(outDir, programName) {
-	await rm(join(outDir, programName, "target", "deploy", `${programName}.so`), { force: true });
+function writeBytecode(programName, bytecode) {
+	const cachePath = cwdPath(CACHE_DIR);
+	ensureDirectory(cachePath);
+	writeFileSync(join(cachePath, `${programName}.so`), Buffer.from(bytecode, "base64"));
+}
+async function writeRustForVerify(projects, outDir) {
+	await ensureDirectory(outDir);
+	await Promise.all(projects.map(async (project) => {
+		const dir = join(outDir, project.program.name);
+		await ensureDirectory(join(dir, "src"));
+		writeFileSync(join(dir, "Cargo.toml"), project.cargoToml);
+		writeFileSync(join(dir, "src", "lib.rs"), project.libRs);
+	}));
 }
 async function deployCompiledProgram(params) {
 	const deployDir = await mkdtemp(join(tmpdir(), "better-sol-deploy-"));
@@ -3307,12 +3337,6 @@ async function ensureFunded(address, cluster, rpcUrl) {
 	s.stop("Airdrop failed");
 	throw new Error(`Failed to airdrop SOL on ${cluster}. Fund ${address} manually or try again.`);
 }
-function printProgramSummary(program, cluster, out, wroteRust) {
-	log.info(`Program: ${program.name}`);
-	log.step(`Address:  ${program.address}`);
-	log.step(`Cluster:  ${cluster}`);
-	if (wroteRust) log.step(`Rust:     ${out}/${program.name}/`);
-}
 //#endregion
 //#region src/generator/db.ts
 function isDbDialect(value) {
@@ -69336,11 +69360,11 @@ async function gitCommit() {
 //#endregion
 //#region src/index.ts
 const cli = new Command();
-cli.name("better-sol").description("Write Solana programs in TypeScript. Run with npx @better-sol/cli@alpha").version("0.1.0-alpha.10");
+cli.name("better-sol").description("Write Solana programs in TypeScript. Run with npx @better-sol/cli@alpha").version("0.1.0-alpha.12");
 cli.command("init").description("Initialize a better-sol project").option("--force", "overwrite existing files", false).option("--skip-install", "skip installing dependencies", false).action((options) => run(() => init(options)));
 cli.command("create").description("Create a new better-sol program").argument("[name]", "program name").option("--dir <dir>", "program directory", "programs").option("--force", "overwrite existing files", false).action((name, options) => run(() => create(name, options)));
 cli.command("login").description("Save your compiler API key").argument("[apiKey]", "compiler API key").action((apiKey) => run(() => login(apiKey)));
-cli.command("deploy").description("Generate Rust, compile, and deploy programs").option("--src <glob>", "program source glob").option("--program <name>", "target a specific program by name").option("--payer <path>", "payer keypair path").option("--cluster <cluster>", "devnet, testnet, mainnet, or localnet").option("--verify", "write generated Rust for verified builds", false).option("--dry-run", "generate and validate without compiling or deploying", false).option("--output <dir>", "generated Rust output directory").action((options) => run(() => deploy(options)));
+cli.command("deploy").description("Compile and deploy programs").option("--src <glob>", "program source glob").option("--program <name>", "target a specific program by name").option("--payer <path>", "payer keypair path").option("--cluster <cluster>", "devnet, testnet, mainnet, or localnet").option("--verify", "write generated Rust for verified builds", false).option("--dry-run", "generate and validate without compiling or deploying", false).option("--output <dir>", "output directory for verified build Rust", "generated").action((options) => run(() => deploy(options)));
 const generate = cli.command("generate").description("Generate derived artifacts");
 generate.command("db").description("Generate a database schema from account definitions").option("--dialect <dialect>", "postgres, mysql, or sqlite", "postgres").option("--out <path>", "output file", "src/db/better-sol.ts").option("--src <glob>", "program source glob").action((options) => run(() => generateDb(options)));
 generate.command("idl").description("Generate a typed Better Sol program from an IDL file or on-chain program address").argument("<source>", "path to IDL JSON file or on-chain program address").option("--out <path>", "output TypeScript file (default: generated/<name>.ts)").option("--name <name>", "program name override (default: derived from IDL)").option("--cluster <cluster>", "cluster for on-chain IDL fetch (mainnet, devnet, testnet, localnet)", "mainnet").action((source, options) => run(() => generateIdl(source, options)));