@layerzerolabs/ton-sdk-tools 3.0.76 → 3.0.77

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @layerzerolabs/ton-sdk-tools
 
+## 3.0.77
+
+### Patch Changes
+
+- 44857e2: Clean up TON SDK Generation code
+- 11c7cb5: Make Ton SDK Take extra arguments
+
 ## 3.0.76
 
 ### Patch Changes

package/dist/index.cjs

@@ -1247,16 +1247,16 @@ function generateAllViewFunctions(rootDir, nameWhitelist, blacklist) {
     });
   }
   findContractDirs(rootDir);
-  contractDirs.forEach((dir) => {
+  for (const dir of contractDirs) {
     const files = fs__namespace.readdirSync(dir).filter((file) => file.endsWith(".fc") || file.endsWith(".func"));
-    files.forEach((file) => {
+    for (const file of files) {
       const filePath = path__namespace.join(dir, file);
       const contractName = snakeToCamelCase(path__namespace.basename(path__namespace.dirname(dir)) + "_" + path__namespace.basename(dir));
       const content = fs__namespace.readFileSync(filePath, "utf-8");
-      const functionRegex = /(\((?:[^()]+,\s*)*[^()]+\)|[\w:]+)\s+(\w+(?:::\w+)*)\s*\(([\w\s,$·]*)\)\s*·?\s*(impure)?\s*(inline\s*)?method_id\s*\{([^}]*)\}/g;
+      const functionRegex = /(^\((?:[^()]+,\s*)*[^()]+\)|[\w:]+)\s+(\w+(?:::\w+)*)\s*\(([\w\s,$·]*)\)\s*·?\s*(impure)?\s*(inline\s*)?method_id\s*\{/gm;
       let match;
       while ((match = functionRegex.exec(content)) !== null) {
-        const [, returnType, name, argsString, , _body] = match;
+        const [, returnType, name, argsString] = match;
         if (name.includes("::New")) {
           continue;
         }
@@ -1275,48 +1275,63 @@ function generateAllViewFunctions(rootDir, nameWhitelist, blacklist) {
         if (!(contractName in viewFunctions)) {
           viewFunctions[contractName] = [];
         }
+        const functionArgs = [
+          "contract: ExtendedContract<TonContractWrapper>",
+          ...Object.entries(tsArgs).map(function([argName, argType]) {
+            return `${argName}: ${argType}`;
+          })
+        ];
         const fnName = snakeToCamelCase("get_" + name);
-        const code = `
-                static async ${fnName}(
-                    contract: ExtendedContract<TonContractWrapper>, 
-                    ${Object.entries(tsArgs).map(([argName, argType]) => `${argName}: ${argType}`).join(", ")}
-                ): Promise<[${tsReturnTypes.join(", ")}]> {
-                    const args: TupleItem[] = [
-                        ${Object.entries(tonArgs).map(
-          ([argName, argType]) => `{ type: '${tonTypeToTupleType(argType)}', ${tonTypeToTupleValueName(argType)}: ${tonTypeToTupleValue(Object.keys(tonArgs).length > 0 ? argName : argName, argType)} }`
-        ).join(",\n    ")}
-                    ]
-                    const stack = await contract.getViewFunction('${name}', args)
-                    return [
-                        ${tonReturnTypes.map((_, index) => `stack.${tonTypeToReadTupleFunction(tonReturnTypes[index])}`).join(",\n")}
-                    ]
-                }
-                `;
+        const code = [
+          `static async ${fnName}(`,
+          indent(functionArgs.join(",\n")),
+          `): Promise<[${tsReturnTypes.join(", ")}]> {`
+        ];
+        const hasArgs = Object.keys(tonArgs).length > 0;
+        if (hasArgs) {
+          code.push(indent(`const args: TupleItem[] = [`));
+          const innerArgs = Object.entries(tonArgs).map(function([argName, argType]) {
+            return `{ type: '${tonTypeToTupleType(argType)}', ${tonTypeToTupleValueName(argType)}: ${tonTypeToTupleValue(argName, argType)} }`;
+          });
+          code.push(indent(innerArgs.join(",\n"), 2));
+          code.push(indent(`]`));
+        }
+        code.push(indent(`const stack = await contract.getViewFunction('${name}', ${hasArgs ? "args" : "[]"})`));
+        const returnCalls = tonReturnTypes.map(function(_, index) {
+          return `stack.${tonTypeToReadTupleFunction(tonReturnTypes[index])}`;
+        });
+        code.push(indent(`return [ ${returnCalls.join(", ")} ]`));
+        code.push("}");
         viewFunctions[contractName].push({
           name: fnName,
           args: tonArgs,
           returnType: tonReturnTypes,
-          code
+          code: code.join("\n")
         });
       }
-    });
-  });
+    }
+  }
   return viewFunctions;
 }
+function indent(input, count = 1) {
+  return input.split("\n").map(function(line) {
+    return `${"	".repeat(count)}${line}`;
+  }).join("\n");
+}
 function saveViewFunctions(viewFunctions, directory, filename) {
-  const generatedFunctions = Object.entries(viewFunctions).map(
-    ([contractName, functions]) => `export class ${contractName} {
-            ${functions.map((fn) => fn.code).join("\n\n")}
-        }`
-  ).join("\n\n");
-  const savedCode = `${file_signature_header}
-import { Address, Cell, Tuple, TupleItem, beginCell } from '@ton/core'
-
-import { ExtendedContract, TonContractWrapper } from '../wrappers'
-
-${generatedFunctions}
-`;
-  fs__namespace.writeFileSync(path__namespace.join(directory, filename), savedCode);
+  const generated = [
+    file_signature_header,
+    `import { Address, Cell, Tuple, TupleItem, beginCell } from '@ton/core'`,
+    `import { ExtendedContract, TonContractWrapper } from '../wrappers'`,
+    ""
+  ];
+  for (const [contractName, functions] of Object.entries(viewFunctions)) {
+    generated.push(`export class ${contractName} {`);
+    generated.push(functions.map((fn) => indent(fn.code)).join("\n\n"));
+    generated.push(`}`);
+    generated.push("");
+  }
+  fs__namespace.writeFileSync(path__namespace.join(directory, filename), generated.join("\n"));
 }
 var BaseWrapper = class {
   constructor(address, init) {
@@ -1357,7 +1372,18 @@ var BaseWrapper = class {
     return core.beginCell().storeUint(opcode, 32).storeUint(queryId ?? randomQueryId, 64);
   }
 };
-function generateCommonTestUtils(directory, filename) {
+function getSharedOptions(input) {
+  const ret = {
+    relativeSrcPath: "../../src",
+    ...input
+  };
+  if (ret.relativeSrcPath.endsWith("/")) {
+    throw new Error("relativeSrcPath should not end with a /");
+  }
+  return ret;
+}
+function generateCommonTestUtils(directory, filename, optionsInput) {
+  const options = getSharedOptions(optionsInput);
   const savedCode = `import fs from 'fs'
 
 import {
@@ -1416,7 +1442,7 @@ import {
     TonObjectUnwrapper,
     deconstructorMap,
     keyMap,
-} from '../../src'
+} from '${options.relativeSrcPath}'
 
 const RECURSIVE_DECODE = false
 
@@ -2901,7 +2927,7 @@ export async function txDecoder(
 }
 
 export async function runtimeDecoder(contract: SandboxContract<TonContractWrapper>, obj: Cell): Promise<void> {
-    const { tonObjects } = require('../../src/offchain-helpers/allObjects') as { [key: string]: { [key: string]: any } }
+    const { tonObjects } = require('${options.relativeSrcPath}/offchain-helpers/allObjects') as { [key: string]: { [key: string]: any } }
 
     const typeName = await TonObjectUnwrapper.getTypeOf(contract, obj)
 
@@ -2962,7 +2988,8 @@ export async function runtimeDecoder(contract: SandboxContract<TonContractWrappe
 `;
   fs__namespace.default.writeFileSync(path__namespace.default.join(directory, filename), savedCode);
 }
-function generateSmlTestUtils(directory, filename) {
+function generateSmlTestUtils(directory, filename, optionsInput) {
+  const options = getSharedOptions(optionsInput);
   const savedCode = `import { Cell, toNano } from '@ton/core'
 import { Blockchain, SandboxContract, SendMessageResult, TreasuryContract } from '@ton/sandbox'
 import '@ton/test-utils'
@@ -2983,7 +3010,7 @@ import {
     setDefaultEndpointConfig,
     wireChannels,
 } from './auto-utils-common'
-import { LzEventHandler, OPCODES, TonContractWrapper } from '../../src'
+import { LzEventHandler, OPCODES, TonContractWrapper } from '${options.relativeSrcPath}'
 
 const SML_MANAGER_DEFAULT_VERSION = BigInt(1)
 const SML_MANAGER_CUSTOM_VERSION = BigInt(2)
@@ -3324,7 +3351,8 @@ export async function wireFixturesTogetherWithSML(
 `;
   fs__namespace.default.writeFileSync(path__namespace.default.join(directory, filename), savedCode);
 }
-function generateUlnTestUtils(directory, filename) {
+function generateUlnTestUtils(directory, filename, optionsInput) {
+  const options = getSharedOptions(optionsInput);
   const savedCode = `import { Address, Cell, TupleItemCell, beginCell, toNano } from '@ton/core'
 import { Blockchain, SandboxContract, SendMessageResult, TreasuryContract } from '@ton/sandbox'
 import { FlatTransactionComparable } from '@ton/test-utils'
@@ -3371,7 +3399,7 @@ import {
     OPCODES,
     TonContractWrapper,
     TonObjectUnwrapper,
-} from '../../src'
+} from '${options.relativeSrcPath}'
 
 const ULN_MANAGER_DEFAULT_VERSION = BigInt(1)