@better-sol/cli 0.1.0-alpha.11 → 0.1.0-alpha.13

package/dist/index.js

@@ -3,11 +3,11 @@ import { createRequire } from "node:module";
 import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
 import { Command } from "commander";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import path, { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
+import path, { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { homedir, tmpdir } from "node:os";
 import { execFile, execSync } from "node:child_process";
 import { generateKeyPairSigner, getAddressDecoder } from "@solana/kit";
-import { access, mkdir, mkdtemp, opendir, readFile, rm, writeFile } from "node:fs/promises";
+import { access, mkdir, mkdtemp, opendir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { parseSync } from "oxc-parser";
 import { promisify } from "node:util";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -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 {
@@ -3500,12 +3532,21 @@ function flattenAccountItems(items) {
 	return result;
 }
 function idlTypeToCode(type) {
-	if (typeof type === "string") return `bs.${type}()`;
-	if ("option" in type && type.option !== void 0) return `bs.optional(${idlTypeToCode(type.option)})`;
-	if ("coption" in type && type.coption !== void 0) return `bs.optional(${idlTypeToCode(type.coption)})`;
-	if ("vec" in type && type.vec !== void 0) return `bs.vector(${idlTypeToCode(type.vec)})`;
-	if ("array" in type && type.array !== void 0) return `bs.array(${idlTypeToCode(type.array[0])}, ${type.array[1]})`;
-	if ("defined" in type) return "bs.pubkey()";
+	if (typeof type === "string") {
+		if (type === "publicKey") return "bs.pubkey()";
+		return `bs.${type}()`;
+	}
+	if (typeof type !== "object" || type === null) return "bs.pubkey()";
+	const record = type;
+	const option = record.option;
+	if (option !== void 0) return `bs.optional(${idlTypeToCode(option)})`;
+	const coption = record.coption;
+	if (coption !== void 0) return `bs.optional(${idlTypeToCode(coption)})`;
+	const vec = record.vec;
+	if (vec !== void 0) return `bs.vector(${idlTypeToCode(vec)})`;
+	const array = record.array;
+	if (Array.isArray(array) && array.length === 2) return `bs.array(${idlTypeToCode(array[0])}, ${array[1]})`;
+	if (record.defined !== void 0) return "bs.pubkey()";
 	return "bs.pubkey()";
 }
 function escapeString(str) {
@@ -3521,18 +3562,35 @@ function getStructFields(typeDef) {
 	if (!Array.isArray(fields)) return [];
 	return fields;
 }
+function getStructFieldsFromAccount(account) {
+	if (typeof account !== "object" || account === null) return [];
+	const accountType = account.type;
+	if (typeof accountType !== "object" || accountType === null) return [];
+	const typeRecord = accountType;
+	if (typeRecord.kind !== "struct") return [];
+	const fields = typeRecord.fields;
+	if (!Array.isArray(fields)) return [];
+	return fields;
+}
+function getIdlName$1(idl) {
+	if (typeof idl.metadata?.name === "string") return idl.metadata.name;
+	const record = idl;
+	return typeof record.name === "string" ? record.name : void 0;
+}
 function generateIdlProgram(idl, sourceLabel) {
 	const w = new CodeWriter();
-	const programName = idl.metadata?.name ?? "unknown";
+	const programName = toCamel(getIdlName$1(idl) ?? "unknown");
 	const programAddress = idl.address ?? "";
 	const typesByName = /* @__PURE__ */ new Map();
 	for (const t of idl.types ?? []) typesByName.set(t.name, t);
 	const accountDefs = idl.accounts ?? [];
 	const resolvedAccounts = /* @__PURE__ */ new Map();
 	for (const acc of accountDefs) {
-		const fields = getStructFields(typesByName.get(acc.name));
+		const fromTypes = getStructFields(typesByName.get(acc.name));
+		const fromAccount = getStructFieldsFromAccount(acc);
+		const fields = fromTypes.length > 0 ? fromTypes : fromAccount;
 		resolvedAccounts.set(acc.name, {
-			name: acc.name,
+			exportName: toPascal(acc.name),
 			fields
 		});
 	}
@@ -3541,11 +3599,11 @@ function generateIdlProgram(idl, sourceLabel) {
 	w.line(`// Generated by better-sol from ${sourceLabel}. Do not edit.`);
 	w.line(`import { bs } from "better-sol/program"`);
 	w.blank();
-	for (const [name, { fields }] of resolvedAccounts) {
+	for (const [, { exportName, fields }] of resolvedAccounts) {
 		if (fields.length === 0) continue;
-		w.line(`const ${name} = bs.account({`);
+		w.line(`const ${exportName} = bs.account({`);
 		w.indent(1);
-		for (const field of fields) w.line(`${field.name}: ${idlTypeToCode(field.type)},`);
+		for (const field of fields) w.line(`${toCamel(field.name)}: ${idlTypeToCode(field.type)},`);
 		w.indent(0);
 		w.line("})");
 		w.blank();
@@ -3558,10 +3616,9 @@ function generateIdlProgram(idl, sourceLabel) {
 	w.line(`address: "${escapeString(programAddress)}",`);
 	if (resolvedAccounts.size > 0) {
 		w.line(`accounts: {`);
-		for (const name of resolvedAccounts.keys()) {
-			const resolved = resolvedAccounts.get(name);
-			if (resolved === void 0 || resolved.fields.length === 0) continue;
-			w.line(`  ${name},`);
+		for (const [, { exportName, fields }] of resolvedAccounts) {
+			if (fields.length === 0) continue;
+			w.line(`  ${exportName},`);
 		}
 		w.line(`},`);
 	}
@@ -3569,7 +3626,7 @@ function generateIdlProgram(idl, sourceLabel) {
 		w.line(`errors: {`);
 		for (const err of errorEntries) {
 			const msg = err.msg ?? err.name;
-			w.line(`  ${err.name}: "${escapeString(msg)}",`);
+			w.line(`  ${toPascal(err.name)}: "${escapeString(msg)}",`);
 		}
 		w.line(`},`);
 	}
@@ -3577,8 +3634,8 @@ function generateIdlProgram(idl, sourceLabel) {
 		w.line(`events: {`);
 		for (const ev of eventEntries) {
 			const fields = getStructFields(typesByName.get(ev.name));
-			w.line(`  ${ev.name}: {`);
-			for (const f of fields) w.line(`    ${f.name}: ${idlTypeToCode(f.type)},`);
+			w.line(`  ${toPascal(ev.name)}: {`);
+			for (const f of fields) w.line(`    ${toCamel(f.name)}: ${idlTypeToCode(f.type)},`);
 			w.line(`  },`);
 		}
 		w.line(`},`);
@@ -3587,21 +3644,22 @@ function generateIdlProgram(idl, sourceLabel) {
 	w.line(`}, ix => ({`);
 	for (const instr of idl.instructions) {
 		const flatAccounts = flattenAccountItems(instr.accounts);
+		const ixName = toCamel(instr.name);
 		w.blank();
-		w.line(`${instr.name}: ix({`);
+		w.line(`${ixName}: ix({`);
 		if (flatAccounts.length > 0) {
 			w.line(`  accounts: {`);
 			for (const acc of flatAccounts) {
 				if (acc.optional === true) continue;
 				const constraint = accountToConstraint(acc, resolvedAccounts);
-				w.line(`    ${acc.name}: ${constraint},`);
+				w.line(`    ${toCamel(acc.name)}: ${constraint},`);
 			}
 			w.line(`  },`);
 		}
 		const args = instr.args ?? [];
 		if (args.length > 0) {
 			w.line(`  args: {`);
-			for (const arg of args) w.line(`    ${arg.name}: ${idlTypeToCode(arg.type)},`);
+			for (const arg of args) w.line(`    ${toCamel(arg.name)}: ${idlTypeToCode(arg.type)},`);
 			w.line(`  },`);
 		}
 		if (instr.returns !== void 0) w.line(`  returns: ${idlTypeToCode(instr.returns)},`);
@@ -3617,15 +3675,22 @@ function generateIdlProgram(idl, sourceLabel) {
 }
 function accountToConstraint(acc, resolvedAccounts) {
 	if (acc.signer === true) return "bs.signer()";
-	const accountRef = resolvedAccounts.has(acc.name) ? acc.name : "bs.account({})";
+	const resolved = resolveAccountDefinition(acc.name, resolvedAccounts);
+	const accountRef = resolved !== void 0 && resolved.fields.length > 0 ? resolved.exportName : "bs.account({})";
 	if (acc.writable === true) return `bs.mut(${accountRef})`;
 	return accountRef;
 }
+function resolveAccountDefinition(accountName, resolvedAccounts) {
+	const exact = resolvedAccounts.get(accountName);
+	if (exact !== void 0) return exact;
+	const pascalName = toPascal(accountName);
+	for (const [idlName, account] of resolvedAccounts) if (idlName === pascalName || account.exportName === pascalName) return account;
+}
 function runParams(accounts, args) {
 	const parts = [];
-	const accountNames = accounts.filter((a) => a.optional !== true).map((a) => a.name);
+	const accountNames = accounts.filter((a) => a.optional !== true).map((a) => toCamel(a.name));
 	if (accountNames.length > 0) parts.push(`{ ${accountNames.join(", ")} }`);
-	const argNames = args.map((a) => a.name);
+	const argNames = args.map((a) => toCamel(a.name));
 	if (argNames.length > 0) parts.push(`{ ${argNames.join(", ")} }`);
 	parts.push("ctx");
 	return parts.join(", ");
@@ -69213,7 +69278,7 @@ async function generateIdl(input, options) {
 		sourceLabel = basename(idlPath);
 		s.stop("IDL loaded");
 	}
-	const programName = options.name ?? idl.metadata?.name ?? "program";
+	const programName = toCamel(options.name ?? getIdlName(idl) ?? "program");
 	const outPath = cwdPath(options.out ?? `generated/${programName}.ts`);
 	s.message("Generating program definition");
 	const code = generateIdlProgram(idl, sourceLabel);
@@ -69221,12 +69286,101 @@ async function generateIdl(input, options) {
 	await writeFile(outPath, code, "utf-8");
 	s.stop("Generated");
 	log.info(`Wrote ${resolve(outPath)}`);
-	const importPath = removeExt(relative(dirname(outPath), outPath));
-	log.step(`Import it in your app:\n\n  import { ${programName} } from "./${importPath}"\n\nThen register it with the client:\n\n  const sol = await betterSol({ programs: { ${programName} } })`);
+	log.step(await buildImportGuide(outPath, programName));
 	outro("Done");
 }
+const IGNORED_DIRECTORIES = new Set([
+	".better-sol",
+	".git",
+	".next",
+	"dist",
+	"build",
+	"node_modules"
+]);
+async function buildImportGuide(outPath, programName) {
+	const usage = await findBetterSolUsage(process.cwd());
+	if (usage !== void 0) return `Import it in ${relativePath(process.cwd(), usage.filePath)}:\n\n  import { ${programName} } from "${moduleSpecifier(dirname(usage.filePath), outPath)}"\n\n${usage.hasProgramsObject ? `Add it to the existing programs object:\n\n  programs: { ..., ${programName} }` : `Register it with the client:\n\n  const sol = await betterSol({ programs: { ${programName} } })`}`;
+	return `Import it in your app:\n\n  import { ${programName} } from "${moduleSpecifier(process.cwd(), outPath)}"\n\nThen register it with the client:\n\n  const sol = await betterSol({ programs: { ${programName} } })`;
+}
+async function findBetterSolUsage(root) {
+	const files = await collectTypeScriptFiles(root);
+	let fallback;
+	for (const filePath of files) {
+		const usage = parseBetterSolUsage(await readFile(filePath, "utf-8"), filePath);
+		if (usage === void 0) continue;
+		if (usage.hasProgramsObject) return usage;
+		fallback ??= usage;
+	}
+	return fallback;
+}
+async function collectTypeScriptFiles(root) {
+	const results = [];
+	await collectTypeScriptFilesInto(root, results);
+	return results.sort();
+}
+async function collectTypeScriptFilesInto(directory, results) {
+	const entries = await readdir(directory, { withFileTypes: true });
+	for (const entry of entries) {
+		const fullPath = join(directory, entry.name);
+		if (entry.isDirectory()) {
+			if (!IGNORED_DIRECTORIES.has(entry.name)) await collectTypeScriptFilesInto(fullPath, results);
+			continue;
+		}
+		if (!entry.isFile()) continue;
+		const extension = extname(entry.name);
+		if (extension === ".ts" || extension === ".tsx") results.push(fullPath);
+	}
+}
+function parseBetterSolUsage(source, filePath) {
+	let program;
+	try {
+		program = parseModule(filePath, source);
+	} catch {
+		return;
+	}
+	let hasCall = false;
+	let hasProgramsObject = false;
+	visitAst(program, (node) => {
+		if (!isBetterSolCall(node)) return;
+		hasCall = true;
+		const firstArg = node.arguments[0];
+		if (!isObjectExpression(firstArg)) return;
+		if (isObjectExpression(getObjectProperty(firstArg, "programs"))) hasProgramsObject = true;
+	});
+	return hasCall ? {
+		filePath,
+		hasProgramsObject
+	} : void 0;
+}
+function isBetterSolCall(node) {
+	return isCallExpression(node) && isIdentifier(node.callee) && node.callee.name === "betterSol";
+}
+function visitAst(node, visit) {
+	if (!isAstNode(node)) return;
+	visit(node);
+	for (const value of Object.values(node)) if (Array.isArray(value)) for (const item of value) visitAst(item, visit);
+	else visitAst(value, visit);
+}
+function isAstNode(value) {
+	if (typeof value !== "object" || value === null) return false;
+	return typeof value.type === "string";
+}
+function moduleSpecifier(fromDirectory, toFile) {
+	const normalized = removeExt(relative(fromDirectory, toFile)).split(sep).join("/");
+	if (normalized.startsWith(".")) return normalized;
+	return `./${normalized}`;
+}
+function relativePath(fromDirectory, toFile) {
+	const value = relative(fromDirectory, toFile).split(sep).join("/");
+	return value.length > 0 ? value : ".";
+}
 function removeExt(path) {
-	return path.replace(/\.ts$/, "");
+	return path.replace(/\.tsx?$/, "");
+}
+function getIdlName(idl) {
+	if (typeof idl.metadata?.name === "string") return idl.metadata.name;
+	const record = idl;
+	return typeof record.name === "string" ? record.name : void 0;
 }
 //#endregion
 //#region src/commands/login.ts
@@ -69328,7 +69482,7 @@ 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.11");
+cli.name("better-sol").description("Write Solana programs in TypeScript. Run with npx @better-sol/cli@alpha").version("0.1.0-alpha.13");
 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)));