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

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 {
@@ -69328,7 +69360,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.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)));