@secondlayer/cli 0.3.6 → 0.3.8

package/dist/index.js

@@ -344,17 +344,22 @@ function clarityTypeToTS(type) {
       case "principal":
       case "trait_reference":
         return "string";
-      default:
-        if (type.includes("string") || type.includes("ascii") || type.includes("utf8")) {
+      default: {
+        const typeStr = type;
+        if (typeStr === "none") {
+          return "null";
+        }
+        if (typeStr.includes("string") || typeStr.includes("ascii") || typeStr.includes("utf8")) {
           return "string";
         }
-        if (type.includes("buff")) {
+        if (typeStr.includes("buff")) {
           return "Uint8Array | string | { type: 'ascii' | 'utf8' | 'hex'; value: string }";
         }
-        if (type.includes("uint") || type.includes("int")) {
+        if (typeStr.includes("uint") || typeStr.includes("int")) {
           return "bigint";
         }
         return "any";
+      }
     }
   }
   if (isClarityBuffer(type)) {
@@ -424,15 +429,22 @@ function getApiUrl(
   return API_URLS[network];
 }`;
 }
+function generateValidationUtils() {
+  return `/**
+ * Contract name validation regex
+ * Must start with letter, contain only letters, numbers, and hyphens, max 128 chars
+ */
+const CONTRACT_NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9\\-]{0,127}$/;`;
+}
 async function generateContractInterface(contracts) {
-  const imports = `import { Cl, validateStacksAddress } from '@stacks/transactions'
-import { jsToClarity, ClarityConversionError, CONTRACT_NAME_REGEX } from '@secondlayer/clarity-types'`;
+  const imports = `import { Cl, validateStacksAddress } from '@stacks/transactions'`;
   const header = `/**
  * Generated by @secondlayer/cli
  * DO NOT EDIT MANUALLY
  *
  * @requires @stacks/transactions - Install with: npm install @stacks/transactions
  */`;
+  const validationUtils = generateValidationUtils();
   const networkUtils = generateNetworkUtils();
   const contractsCode = contracts.map((contract) => generateContract(contract)).join(`
 
@@ -441,6 +453,8 @@ import { jsToClarity, ClarityConversionError, CONTRACT_NAME_REGEX } from '@secon
 
 ${header}
 
+${validationUtils}
+
 ${networkUtils}
 
 ${contractsCode}`;
@@ -623,11 +637,7 @@ function generateClarityConversion(argName, argType) {
     return `(() => {
       const listValue = ${argName};
       if (listValue.length > ${maxLength}) {
-        throw new ClarityConversionError(
-          \`List length \${listValue.length} exceeds max ${maxLength}\`,
-          ${JSON.stringify(type)},
-          listValue
-        );
+        throw new Error(\`List length \${listValue.length} exceeds max ${maxLength}\`);
       }
       return Cl.list(listValue.map(item => ${innerConversion}));
     })()`;
@@ -646,11 +656,7 @@ function generateClarityConversion(argName, argType) {
       for (const fieldName of requiredFields) {
         const camelName = fieldName.replace(/-([a-z])/g, (_: string, l: string) => l.toUpperCase());
         if (!(fieldName in tupleValue) && !(camelName in tupleValue)) {
-          throw new ClarityConversionError(
-            \`Missing tuple field: \${fieldName}\`,
-            ${JSON.stringify(type)},
-            tupleValue
-          );
+          throw new Error(\`Missing tuple field: \${fieldName}\`);
         }
       }
       return Cl.tuple({ ${fields} });
@@ -673,11 +679,7 @@ function generateClarityConversion(argName, argType) {
       if (hasErr && !hasOk) {
         return Cl.error(${errConversion});
       }
-      throw new ClarityConversionError(
-        "Response must have exactly 'ok' or 'err' property",
-        ${JSON.stringify(type)},
-        responseValue
-      );
+      throw new Error("Response must have exactly 'ok' or 'err' property");
     })()`;
   }
   return `${argName}`;
@@ -1033,11 +1035,7 @@ function generateClarityConversion2(argName, argType) {
     return `(() => {
       const listValue = ${argName};
       if (listValue.length > ${maxLength}) {
-        throw new ClarityConversionError(
-          \`List length \${listValue.length} exceeds max ${maxLength}\`,
-          ${JSON.stringify(type)},
-          listValue
-        );
+        throw new Error(\`List length \${listValue.length} exceeds max ${maxLength}\`);
       }
       return Cl.list(listValue.map(item => ${innerConversion}));
     })()`;
@@ -1056,11 +1054,7 @@ function generateClarityConversion2(argName, argType) {
       for (const fieldName of requiredFields) {
         const camelName = fieldName.replace(/-([a-z])/g, (_: string, l: string) => l.toUpperCase());
         if (!(fieldName in tupleValue) && !(camelName in tupleValue)) {
-          throw new ClarityConversionError(
-            \`Missing tuple field: \${fieldName}\`,
-            ${JSON.stringify(type)},
-            tupleValue
-          );
+          throw new Error(\`Missing tuple field: \${fieldName}\`);
         }
       }
       return Cl.tuple({ ${fields} });
@@ -1083,11 +1077,7 @@ function generateClarityConversion2(argName, argType) {
       if (hasErr && !hasOk) {
         return Cl.error(${errConversion});
       }
-      throw new ClarityConversionError(
-        "Response must have exactly 'ok' or 'err' property",
-        ${JSON.stringify(type)},
-        responseValue
-      );
+      throw new Error("Response must have exactly 'ok' or 'err' property");
     })()`;
   }
   return `${argName}`;
@@ -2937,5 +2927,5 @@ export {
   PluginManager
 };
 
-//# debugId=B5466C394D09A7B464756E2164756E21
+//# debugId=A26E54E30B6FEC5F64756E2164756E21
 //# sourceMappingURL=index.js.map