@secondlayer/cli 0.3.7 → 0.3.9

package/dist/cli.js

@@ -7539,6 +7539,35 @@ var require_out4 = __commonJS((exports, module) => {
   module.exports = FastGlob;
 });
 
+// src/types/plugin.ts
+function isClarinetContract(c) {
+  return "_clarinetSource" in c && c._clarinetSource === true;
+}
+function isDirectFileContract(c) {
+  return "_directFile" in c && c._directFile === true;
+}
+
+// src/utils/format.ts
+var exports_format = {};
+__export(exports_format, {
+  formatCode: () => formatCode,
+  PRETTIER_OPTIONS: () => PRETTIER_OPTIONS
+});
+import { format } from "prettier";
+async function formatCode(code) {
+  return format(code, PRETTIER_OPTIONS);
+}
+var PRETTIER_OPTIONS;
+var init_format = __esm(() => {
+  PRETTIER_OPTIONS = {
+    parser: "typescript",
+    singleQuote: true,
+    semi: true,
+    printWidth: 100,
+    trailingComma: "es5"
+  };
+});
+
 // src/core/plugin-manager.ts
 import { promises as fs } from "fs";
 import path from "path";
@@ -7603,7 +7632,7 @@ class PluginManager {
   async transformContracts(contracts, _config) {
     const processedContracts = [];
     for (let contract of contracts) {
-      if (contract._clarinetSource && contract.abi) {
+      if (isClarinetContract(contract) && contract.abi) {
         const address = typeof contract.address === "string" ? contract.address : "";
         const [contractAddress, contractName] = address.split(".");
         const processed = {
@@ -7617,7 +7646,7 @@ class PluginManager {
         processedContracts.push(processed);
         continue;
       }
-      if (contract._directFile && contract.abi) {
+      if (isDirectFileContract(contract) && contract.abi) {
         const address = typeof contract.address === "string" ? contract.address : "";
         const [contractAddress, contractName] = address.split(".");
         const processed = {
@@ -7803,14 +7832,8 @@ ${JSON.stringify(content, null, 2)}`;
         return { address, contractName };
       },
       formatCode: async (code) => {
-        const { format } = await import("prettier");
-        return format(code, {
-          parser: "typescript",
-          singleQuote: true,
-          semi: true,
-          printWidth: 100,
-          trailingComma: "es5"
-        });
+        const { formatCode: formatCode2 } = await Promise.resolve().then(() => (init_format(), exports_format));
+        return formatCode2(code);
       },
       resolvePath: (relativePath) => {
         return path.resolve(process.cwd(), relativePath);
@@ -7871,7 +7894,7 @@ async function loadConfig(configPath) {
       const indexPath = path2.resolve(currentModuleDir, "../index");
       replacementPath = pathToFileURL(indexPath).href;
     }
-    const transformedCode = code.replace(/from\s+["']@stacks\/cli["']/g, `from '${replacementPath}'`);
+    const transformedCode = code.replace(/from\s+["']@secondlayer\/cli["']/g, `from '${replacementPath}'`);
     const { transformSync } = await import("esbuild");
     const result = transformSync(transformedCode, {
       format: "esm",
@@ -15561,11 +15584,18 @@ var init_source4 = __esm(() => {
 
 // src/utils/api.ts
 class StacksApiClient {
+  static hasWarnedAboutApiKey = false;
   baseUrl;
   headers;
   constructor(network = "mainnet", apiKey, apiUrl) {
     this.baseUrl = apiUrl || API_URLS[network];
     this.headers = apiKey ? { "x-api-key": apiKey } : {};
+    if (!apiKey && !StacksApiClient.hasWarnedAboutApiKey) {
+      console.warn(`⚠️  No API key provided. You may be rate-limited.
+` + `   Set HIRO_API_KEY env var or use --api-key flag.
+` + "   Get a free key at: https://platform.hiro.so/");
+      StacksApiClient.hasWarnedAboutApiKey = true;
+    }
   }
   async getContractInfo(contractId) {
     const [address, contractName] = contractId.split(".");
@@ -15574,7 +15604,7 @@ class StacksApiClient {
     }
     const url = `${this.baseUrl}/v2/contracts/interface/${address}/${contractName}`;
     try {
-      const response2 = await source_default3(url, {
+      const response2 = await gotWithRetry(url, {
         headers: this.headers,
         responseType: "json"
       });
@@ -15596,20 +15626,35 @@ class StacksApiClient {
     }
     const url = `${this.baseUrl}/v2/contracts/source/${address}/${contractName}`;
     try {
-      const response2 = await source_default3(url, {
+      const response2 = await gotWithRetry(url, {
         headers: this.headers,
         responseType: "json"
       });
       const data = response2.body;
       return data.source;
     } catch (error) {
-      return "";
+      if (error.response?.statusCode === 404) {
+        throw new Error(`Contract source not found: ${contractId}`);
+      }
+      if (error.response?.statusCode === 429) {
+        throw new Error("Rate limited. Please provide an API key in your config.");
+      }
+      throw new Error(`Failed to fetch contract source: ${error.message}`);
     }
   }
 }
-var API_URLS;
+var gotWithRetry, API_URLS;
 var init_api = __esm(() => {
   init_source4();
+  gotWithRetry = source_default3.extend({
+    timeout: { request: 30000 },
+    retry: {
+      limit: 3,
+      methods: ["GET", "POST"],
+      statusCodes: [408, 429, 500, 502, 503, 504],
+      calculateDelay: ({ attemptCount }) => attemptCount * 1000
+    }
+  });
   API_URLS = {
     mainnet: "https://api.hiro.so",
     testnet: "https://api.testnet.hiro.so",
@@ -15637,7 +15682,7 @@ function normalizeType(type) {
     }
   }
   if (typeof type !== "object" || type === null) {
-    return "uint128";
+    throw new Error(`Invalid ABI type: expected object, got ${typeof type}`);
   }
   const typeObj = type;
   if ("buffer" in typeObj) {
@@ -15704,7 +15749,7 @@ function normalizeType(type) {
       }))
     };
   }
-  return "uint128";
+  throw new Error(`Unknown ABI type structure: ${JSON.stringify(type)}`);
 }
 function normalizeFunction(func) {
   const access = normalizeAccess(func.access);
@@ -15773,8 +15818,17 @@ function normalizeAbi(abi) {
 // src/parsers/clarity.ts
 import { promises as fs3 } from "fs";
 async function parseClarityFile(filePath) {
-  const content = await fs3.readFile(filePath, "utf-8");
-  return parseClarityContent(content);
+  try {
+    const content = await fs3.readFile(filePath, "utf-8");
+    const result = parseClarityContent(content);
+    if (result.functions.length === 0) {
+      console.warn(`⚠️  No functions found in ${filePath}. ` + `For complex contracts, deploy first and use the contract address instead.`);
+    }
+    return result;
+  } catch (error) {
+    throw new Error(`Unable to parse ${filePath}. ` + `For complex contracts, deploy first and use the contract address instead.
+` + `Original error: ${error}`);
+  }
 }
 function parseClarityContent(content) {
   const functions = [];
@@ -15887,6 +15941,9 @@ function clarityTypeToTS(type) {
         return "string";
       default: {
         const typeStr = type;
+        if (typeStr === "none") {
+          return "null";
+        }
         if (typeStr.includes("string") || typeStr.includes("ascii") || typeStr.includes("utf8")) {
           return "string";
         }
@@ -15937,7 +15994,6 @@ function getTypeForArg(arg) {
 var init_type_mapping = () => {};
 
 // src/generators/contract.ts
-import { format } from "prettier";
 import {
   toCamelCase as toCamelCase2
 } from "@secondlayer/clarity-types";
@@ -16001,14 +16057,7 @@ ${validationUtils}
 ${networkUtils}
 
 ${contractsCode}`;
-  const formatted = await format(code, {
-    parser: "typescript",
-    singleQuote: true,
-    semi: true,
-    printWidth: 100,
-    trailingComma: "es5"
-  });
-  return formatted;
+  return formatCode(code);
 }
 function generateContract(contract) {
   const { name, address, contractName, abi } = contract;
@@ -16238,34 +16287,41 @@ function generateMapsObject(maps, address, contractName) {
     const keyConversion = generateMapKeyConversion(map.key);
     return `${methodName}: {
       async get(key: ${keyType}, options?: { network?: 'mainnet' | 'testnet' | 'devnet' }): Promise<${valueType} | null> {
-        const { cvToJSON, serializeCV } = await import('@stacks/transactions');
-        const baseUrl = getApiUrl('${address}', options?.network);
-        const mapKey = ${keyConversion};
-        const keyHex = serializeCV(mapKey).toString('hex');
-
-        const response = await fetch(
-          \`\${baseUrl}/v2/map_entry/${address}/${contractName}/${map.name}\`,
-          {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(keyHex)
+        try {
+          const { cvToJSON, serializeCV } = await import('@stacks/transactions');
+          const baseUrl = getApiUrl('${address}', options?.network);
+          const mapKey = ${keyConversion};
+          const keyHex = serializeCV(mapKey).toString('hex');
+
+          const response = await fetch(
+            \`\${baseUrl}/v2/map_entry/${address}/${contractName}/${map.name}\`,
+            {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(keyHex)
+            }
+          );
+
+          if (!response.ok) {
+            throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
           }
-        );
 
-        if (!response.ok) {
-          throw new Error(\`Failed to fetch map entry: \${response.statusText}\`);
-        }
+          const result = await response.json();
+          if (!result.data || result.data === '0x09') {
+            return null; // none value
+          }
 
-        const result = await response.json();
-        if (!result.data || result.data === '0x09') {
-          return null; // none value
+          const { deserializeCV } = await import('@stacks/transactions');
+          const cv = deserializeCV(result.data);
+          const parsed = cvToJSON(cv);
+          // Unwrap the (some ...) wrapper
+          return parsed.value?.value ?? parsed.value ?? null;
+        } catch (error) {
+          if (error instanceof Error) {
+            throw new Error(\`Map access failed for '${map.name}': \${error.message}\`);
+          }
+          throw error;
         }
-
-        const { deserializeCV } = await import('@stacks/transactions');
-        const cv = deserializeCV(result.data);
-        const parsed = cvToJSON(cv);
-        // Unwrap the (some ...) wrapper
-        return parsed.value?.value ?? parsed.value ?? null;
       },
       keyType: ${JSON.stringify(map.key)} as const,
       valueType: ${JSON.stringify(map.value)} as const
@@ -16290,21 +16346,28 @@ function generateVarsObject(variables, address, contractName) {
     const valueType = getTypeForArg({ type: variable.type });
     return `${methodName}: {
       async get(options?: { network?: 'mainnet' | 'testnet' | 'devnet' }): Promise<${valueType}> {
-        const { cvToJSON, deserializeCV } = await import('@stacks/transactions');
-        const baseUrl = getApiUrl('${address}', options?.network);
+        try {
+          const { cvToJSON, deserializeCV } = await import('@stacks/transactions');
+          const baseUrl = getApiUrl('${address}', options?.network);
 
-        const response = await fetch(
-          \`\${baseUrl}/v2/data_var/${address}/${contractName}/${variable.name}?proof=0\`
-        );
+          const response = await fetch(
+            \`\${baseUrl}/v2/data_var/${address}/${contractName}/${variable.name}?proof=0\`
+          );
 
-        if (!response.ok) {
-          throw new Error(\`Failed to fetch data var: \${response.statusText}\`);
-        }
+          if (!response.ok) {
+            throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
+          }
 
-        const result = await response.json();
-        const cv = deserializeCV(result.data);
-        const parsed = cvToJSON(cv);
-        return parsed.value ?? parsed;
+          const result = await response.json();
+          const cv = deserializeCV(result.data);
+          const parsed = cvToJSON(cv);
+          return parsed.value ?? parsed;
+        } catch (error) {
+          if (error instanceof Error) {
+            throw new Error(\`Variable access failed for '${variable.name}': \${error.message}\`);
+          }
+          throw error;
+        }
       },
       type: ${JSON.stringify(variable.type)} as const
     }`;
@@ -16328,21 +16391,28 @@ function generateConstantsObject(variables, address, contractName) {
     const valueType = getTypeForArg({ type: constant.type });
     return `${methodName}: {
       async get(options?: { network?: 'mainnet' | 'testnet' | 'devnet' }): Promise<${valueType}> {
-        const { cvToJSON, deserializeCV } = await import('@stacks/transactions');
-        const baseUrl = getApiUrl('${address}', options?.network);
+        try {
+          const { cvToJSON, deserializeCV } = await import('@stacks/transactions');
+          const baseUrl = getApiUrl('${address}', options?.network);
 
-        const response = await fetch(
-          \`\${baseUrl}/v2/constant_val/${address}/${contractName}/${constant.name}?proof=0\`
-        );
+          const response = await fetch(
+            \`\${baseUrl}/v2/constant_val/${address}/${contractName}/${constant.name}?proof=0\`
+          );
 
-        if (!response.ok) {
-          throw new Error(\`Failed to fetch constant: \${response.statusText}\`);
-        }
+          if (!response.ok) {
+            throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
+          }
 
-        const result = await response.json();
-        const cv = deserializeCV(result.data);
-        const parsed = cvToJSON(cv);
-        return parsed.value ?? parsed;
+          const result = await response.json();
+          const cv = deserializeCV(result.data);
+          const parsed = cvToJSON(cv);
+          return parsed.value ?? parsed;
+        } catch (error) {
+          if (error instanceof Error) {
+            throw new Error(\`Constant access failed for '${constant.name}': \${error.message}\`);
+          }
+          throw error;
+        }
       },
       type: ${JSON.stringify(constant.type)} as const
     }`;
@@ -16365,6 +16435,7 @@ function generateMapKeyConversion(keyType) {
   return generateClarityConversion("key", { type: keyType });
 }
 var init_contract = __esm(() => {
+  init_format();
   init_type_mapping();
 });
 
@@ -27926,6 +27997,7 @@ __export(exports_generate, {
   generate: () => generate
 });
 import path11 from "path";
+import { toCamelCase as toCamelCase3 } from "@secondlayer/clarity-types";
 function isContractAddress(input) {
   const contractIdPattern = /^(SP|ST|SM|SN)[A-Z0-9]{38,}\.[a-zA-Z][a-zA-Z0-9-]*$/;
   return contractIdPattern.test(input);
@@ -27967,17 +28039,20 @@ function deriveContractName(filePath) {
   const basename = path11.basename(filePath, ".clar");
   return basename.replace(/[-_](.)/g, (_2, char) => char.toUpperCase()).replace(/^(.)/, (_2, char) => char.toLowerCase()).replace(/^\d/, "_$&");
 }
-function toCamelCase3(str) {
-  return str.replace(/[-_](.)/g, (_2, char) => char.toUpperCase()).replace(/^(.)/, (_2, char) => char.toLowerCase()).replace(/^\d/, "_$&");
-}
-async function buildConfigFromInputs(parsedInputs, outPath, apiKey) {
+async function buildConfigFromInputs(parsedInputs, outPath, apiKey, defaultAddress) {
   const contracts = [];
+  const deployer = defaultAddress || DEFAULT_DEVNET_ADDRESS;
+  if (parsedInputs.files.length > 0 && !defaultAddress) {
+    console.warn(source_default.yellow(`⚠️  Using placeholder address (${deployer}) for local contracts.
+` + `   Generated contract addresses won't match deployed addresses.
+` + `   Set defaultAddress in config or use deployed contract addresses.`));
+  }
   for (const file of parsedInputs.files) {
     const abi = await parseClarityFile(file);
     const name = deriveContractName(file);
     contracts.push({
       name,
-      address: `ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.${name}`,
+      address: `${deployer}.${name}`,
       abi,
       _directFile: true
     });
@@ -28091,7 +28166,7 @@ async function resolveContract(source, network, apiKey, apiUrl) {
     const filePath = path11.resolve(process.cwd(), source.source);
     const abi = await parseClarityFile(filePath);
     const name = source.name || path11.basename(source.source, ".clar").replace(/-/g, "_").replace(/^\d/, "_$&");
-    const address = typeof source.address === "string" ? source.address : source.address?.[network] || "ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM";
+    const address = typeof source.address === "string" ? source.address : source.address?.[network] || DEFAULT_DEVNET_ADDRESS;
     const [contractAddress, contractName] = address.includes(".") ? address.split(".") : [address, name];
     return {
       name,
@@ -28154,7 +28229,7 @@ async function resolveContracts(source, defaultNetwork, apiKey, apiUrl) {
   }
   throw new Error("Contract must have either address or source");
 }
-var import_fast_glob;
+var import_fast_glob, DEFAULT_DEVNET_ADDRESS = "ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM";
 var init_generate = __esm(() => {
   init_source();
   init_config();
@@ -28234,7 +28309,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "0.3.7",
+  version: "0.3.9",
   description: "CLI for generating type-safe contract interfaces for the Stacks blockchain",
   type: "module",
   bin: {
@@ -28273,7 +28348,7 @@ var package_default = {
   author: "",
   license: "MIT",
   dependencies: {
-    "@secondlayer/clarity-types": "^0.4.1",
+    "@secondlayer/clarity-types": "^0.4.2",
     "@stacks/transactions": "7.0.6",
     esbuild: "^0.19.0",
     prettier: "^3.1.0"
@@ -28310,5 +28385,5 @@ program.command("init").description("Initialize a new stacks.config.ts file").ac
 });
 program.parse();
 
-//# debugId=58D4865FBB414E7B64756E2164756E21
+//# debugId=C3EAA77AEC0BD7A564756E2164756E21
 //# sourceMappingURL=cli.js.map