@clarigen/cli 2.1.1 → 2.1.3

package/dist/index.js

@@ -1,35 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-
 // src/docs/markdown.ts
 import { getContractName as getContractName2, getTypeString } from "@clarigen/core";
 
@@ -37,12 +5,14 @@ import { getContractName as getContractName2, getTypeString } from "@clarigen/co
 import { pino } from "pino";
 import pinoPretty from "pino-pretty";
 var colorizedClarigen = `\x1B[33m[Clarigen]\x1B[0m`;
-var logger = pino(pinoPretty({
-  colorize: true,
-  ignore: "pid,hostname,time",
-  messageFormat: `${colorizedClarigen} {msg}`,
-  minimumLevel: "debug"
-}));
+var logger = pino(
+  pinoPretty({
+    colorize: true,
+    ignore: "pid,hostname,time",
+    messageFormat: `${colorizedClarigen} {msg}`,
+    minimumLevel: "debug"
+  })
+);
 logger.level = "info";
 var log = logger;
 
@@ -138,8 +108,7 @@ function findItemNameFromLine(line) {
   }
   for (const type of VAR_TYPES) {
     const prefix = `(define-${type} `;
-    if (!line.startsWith(prefix))
-      continue;
+    if (!line.startsWith(prefix)) continue;
     const startString = line.slice(prefix.length);
     const match = clarityNameMatcher(startString);
     if (!match) {
@@ -155,11 +124,9 @@ function findAbiItemByName(abi, name) {
   const fn = abi.functions.find((fn2) => {
     return fn2.name === name;
   });
-  if (fn)
-    return fn;
+  if (fn) return fn;
   const map = abi.maps.find((m) => m.name === name);
-  if (map)
-    return map;
+  if (map) return map;
   const v = abi.variables.find((v2) => v2.name === name);
   return v;
 }
@@ -170,8 +137,7 @@ function getFnName(line) {
   const fnType = FN_TYPES.find((type) => {
     return line.startsWith(`(define-${type}`);
   });
-  if (typeof fnType === "undefined")
-    return;
+  if (typeof fnType === "undefined") return;
   const prefix = `(define-${fnType} (`;
   const startString = line.slice(prefix.length);
   const match = clarityNameMatcher(startString);
@@ -185,10 +151,8 @@ function getFnName(line) {
 function traceParens(line, count) {
   let newCount = count;
   line.split("").forEach((char) => {
-    if (char === "(")
-      newCount++;
-    if (char === ")")
-      newCount--;
+    if (char === "(") newCount++;
+    if (char === ")") newCount--;
   });
   return newCount;
 }
@@ -209,8 +173,7 @@ function parseComments(comments, abi) {
       }
       return;
     }
-    if (!("args" in abi))
-      return;
+    if (!("args" in abi)) return;
     const [_full, name, _separator, rest] = paramMatches;
     const arg = abi.args.find((arg2) => arg2.name === name);
     if (!arg) {
@@ -238,8 +201,7 @@ function parseComments(comments, abi) {
 async function afterDocs(config) {
   var _a;
   const command = (_a = config.docs) == null ? void 0 : _a.after;
-  if (!command)
-    return;
+  if (!command) return;
   logger.debug(`Running after docs command: ${command}`);
   const parts = command.split(" ");
   const [cmd, ...args] = parts;
@@ -267,8 +229,7 @@ import { getContractName, toCamelCase } from "@clarigen/core";
 import { stat, mkdir, writeFile as fsWriteFile } from "fs/promises";
 import { dirname, relative } from "path";
 function encodeVariableName(name) {
-  if (/^[A-Z\-_]*$/.test(name))
-    return name.replaceAll("-", "_");
+  if (/^[A-Z\-_]*$/.test(name)) return name.replaceAll("-", "_");
   return toCamelCase(name);
 }
 async function fileExists(filename) {
@@ -363,7 +324,9 @@ ${fn.source.join("\n")}
 \`\`\`
 </details>
 `;
-  const sig = `(define-${fn.abi.access.replace("_", "-")} (${fn.abi.name} (${paramSigs.join(" ")}) ${returnType})`;
+  const sig = `(define-${fn.abi.access.replace("_", "-")} (${fn.abi.name} (${paramSigs.join(
+    " "
+  )}) ${returnType})`;
   return `### ${fn.abi.name}
 
 ${link}
@@ -377,8 +340,7 @@ ${source}
 ${params}`;
 }
 function mdParams(fn) {
-  if (fn.abi.args.length === 0)
-    return "";
+  if (fn.abi.args.length === 0) return "";
   const hasDescription = Object.values(fn.comments.params).some((p) => p.comments.length > 0);
   const params = Object.values(fn.comments.params).map((p) => markdownParam(p, hasDescription));
   return `**Parameters:**
@@ -390,8 +352,7 @@ ${params.join("\n")}`;
 function markdownParam(param, withDescription) {
   const typeString = getTypeString(param.abi.type);
   const base = `| ${param.abi.name} | ${typeString} |`;
-  if (!withDescription)
-    return base;
+  if (!withDescription) return base;
   return `${base} ${param.comments.join(" ")} |`;
 }
 function markdownMap(map, contractFile) {
@@ -469,8 +430,7 @@ function generateReadme(session, excluded) {
   const contractLines = [];
   sortContracts(session.contracts).forEach((contract) => {
     const name = getContractName2(contract.contract_id, false);
-    if (excluded[name])
-      return;
+    if (excluded[name]) return;
     const fileName = `${name}.md`;
     const line = `- [\`${name}\`](${fileName})`;
     contractLines.push(line);
@@ -518,7 +478,8 @@ var typesSchema = z2.object({
   outputs: z2.array(z2.string()).optional(),
   include_accounts: z2.boolean().optional(),
   after: z2.string().optional(),
-  include_boot_contracts: z2.boolean().optional()
+  include_boot_contracts: z2.boolean().optional(),
+  watch_folders: z2.array(z2.string()).optional()
 }).optional();
 var ConfigFileSchema = z2.object({
   clarinet: z2.string(),
@@ -556,26 +517,25 @@ var Config = class {
     var _a, _b;
     const singlePath = (_a = this.configFile[type]) == null ? void 0 : _a.output;
     const multiPath = ((_b = this.configFile[type]) == null ? void 0 : _b.outputs) || [];
-    if (singlePath !== void 0)
-      return [singlePath];
+    if (singlePath !== void 0) return [singlePath];
     return multiPath;
   }
   outputResolve(type, filePath) {
     const outputs = this.getOutputs(type);
-    if (!this.supports(type))
-      return null;
+    if (!this.supports(type)) return null;
     return outputs.map((path) => {
       return resolve2(this.cwd, path, filePath || "");
     });
   }
   async writeOutput(type, contents, filePath) {
     const paths = this.outputResolve(type, filePath);
-    if (paths === null)
-      return null;
-    await Promise.all(paths.map(async (path) => {
-      await writeFile(path, contents);
-      log.debug(`Generated ${type} file at ${relative2(this.cwd, path)}`);
-    }));
+    if (paths === null) return null;
+    await Promise.all(
+      paths.map(async (path) => {
+        await writeFile(path, contents);
+        log.debug(`Generated ${type} file at ${relative2(this.cwd, path)}`);
+      })
+    );
     return paths;
   }
   supports(type) {
@@ -602,13 +562,12 @@ function configFilePath(cwd) {
   return resolve2(cwd ?? process.cwd(), CONFIG_FILE);
 }
 async function saveConfig(config) {
-  const configToml = stringify(__spreadValues({}, config));
+  const configToml = stringify({ ...config });
   await writeFile(configFilePath(), configToml);
 }
 var sessionConfig;
 async function getConfig(cwd) {
-  if (typeof sessionConfig !== "undefined")
-    return sessionConfig;
+  if (typeof sessionConfig !== "undefined") return sessionConfig;
   const path = configFilePath(cwd);
   if (await fileExists(path)) {
     const toml = await readFile2(path, "utf-8");
@@ -646,42 +605,47 @@ async function generateDocs({
   if (docsPathExt) {
     log.warn(`Docs output path ('${docsBase}') looks like a file - it needs to be a directory.`);
   }
-  const excluded = Object.fromEntries((docs.exclude || []).map((e) => {
-    return [e, true];
-  }));
+  const excluded = Object.fromEntries(
+    (docs.exclude || []).map((e) => {
+      return [e, true];
+    })
+  );
   log.debug(`Generating docs at path \`${docsBase}\``);
   const docsBaseFolder = config.outputResolve("docs" /* Docs */, "./")[0];
-  const paths = await Promise.all(session.contracts.map(async (contract) => {
-    var _a, _b;
-    const name = getContractName3(contract.contract_id, false);
-    if (excluded[name])
-      return null;
-    const docFile = `${name}.md`;
-    const contractPathDef = (_b = (_a = config.clarinet.contracts) == null ? void 0 : _a[name]) == null ? void 0 : _b.path;
-    let contractFile;
-    if (contractPathDef) {
-      const contractPathFull = config.joinFromClarinet(contractPathDef);
-      contractFile = relative3(docsBaseFolder, contractPathFull);
-    } else {
-      log.debug(`Couldn't find contract file from Clarinet.toml for contract ${name}`);
-    }
-    const md = generateMarkdown({ contract, contractFile });
-    const path = await config.writeOutput("docs" /* Docs */, md, docFile);
-    return path[0];
-  }));
+  const paths = await Promise.all(
+    session.contracts.map(async (contract) => {
+      var _a, _b;
+      const name = getContractName3(contract.contract_id, false);
+      if (excluded[name]) return null;
+      const docFile = `${name}.md`;
+      const contractPathDef = (_b = (_a = config.clarinet.contracts) == null ? void 0 : _a[name]) == null ? void 0 : _b.path;
+      let contractFile;
+      if (contractPathDef) {
+        const contractPathFull = config.joinFromClarinet(contractPathDef);
+        contractFile = relative3(docsBaseFolder, contractPathFull);
+      } else {
+        log.debug(`Couldn't find contract file from Clarinet.toml for contract ${name}`);
+      }
+      const md = generateMarkdown({ contract, contractFile });
+      const path = await config.writeOutput("docs" /* Docs */, md, docFile);
+      return path[0];
+    })
+  );
   const readme = generateReadme(session, excluded);
   paths.push((await config.writeOutput("docs" /* Docs */, readme, "README.md"))[0]);
   await afterDocs(config);
 }
 function warnNoDocs() {
-  log.warn(`
+  log.warn(
+    `
 Clarigen config file doesn't include an output directory for docs.
 
 To generate docs, specify 'docs.output' in your config file:
 
 [docs]
 output = "docs/"
-  `.trimEnd());
+  `.trimEnd()
+  );
 }
 
 // src/files/variables.ts
@@ -706,12 +670,10 @@ import { toCamelCase as toCamelCase2 } from "@clarigen/core";
 var jsTypeFromAbiType = (val, isArgument = false) => {
   if (isClarityAbiPrimitive(val)) {
     if (val === "uint128") {
-      if (isArgument)
-        return "number | bigint";
+      if (isArgument) return "number | bigint";
       return "bigint";
     } else if (val === "int128") {
-      if (isArgument)
-        return "number | bigint";
+      if (isArgument) return "number | bigint";
       return "bigint";
     } else if (val === "bool") {
       return "boolean";
@@ -779,7 +741,50 @@ function _hash(...words) {
   }
   return h;
 }
-var RESERVED = _hash("break", "do", "in", "typeof", "case", "else", "instanceof", "var", "catch", "export", "new", "void", "class", "extends", "return", "while", "const", "finally", "super", "with", "continue", "for", "switch", "yield", "debugger", "function", "this", "default", "if", "throw", "delete", "import", "try", "enum", "await", "null", "true", "false");
+var RESERVED = _hash(
+  // Keywords, ES6 11.6.2.1, http://www.ecma-international.org/ecma-262/6.0/index.html#sec-keywords
+  "break",
+  "do",
+  "in",
+  "typeof",
+  "case",
+  "else",
+  "instanceof",
+  "var",
+  "catch",
+  "export",
+  "new",
+  "void",
+  "class",
+  "extends",
+  "return",
+  "while",
+  "const",
+  "finally",
+  "super",
+  "with",
+  "continue",
+  "for",
+  "switch",
+  "yield",
+  "debugger",
+  "function",
+  "this",
+  "default",
+  "if",
+  "throw",
+  "delete",
+  "import",
+  "try",
+  // Future Reserved Words, ES6 11.6.2.2
+  // http://www.ecma-international.org/ecma-262/6.0/index.html#sec-future-reserved-words
+  "enum",
+  "await",
+  // NullLiteral & BooleanLiteral
+  "null",
+  "true",
+  "false"
+);
 
 // src/files/base.ts
 import { toCamelCase as toCamelCase3 } from "@clarigen/core";
@@ -787,10 +792,12 @@ import { toCamelCase as toCamelCase3 } from "@clarigen/core";
 // src/files/accounts.ts
 function generateAccountsCode(accounts) {
   const sortedAccounts = sortAccounts(accounts);
-  const namedAccounts = Object.fromEntries(sortedAccounts.map((a) => {
-    const _a = a, { name } = _a, rest = __objRest(_a, ["name"]);
-    return [name, rest];
-  }));
+  const namedAccounts = Object.fromEntries(
+    sortedAccounts.map((a) => {
+      const { name, ...rest } = a;
+      return [name, rest];
+    })
+  );
   return JSON.stringify(namedAccounts);
 }
 function sortAccounts(accounts) {
@@ -806,10 +813,12 @@ function sortAccounts(accounts) {
 // src/files/identifiers.ts
 import { getContractName as getContractName4 } from "@clarigen/core";
 function generateIdentifiers(session) {
-  const identifiers = Object.fromEntries(sortContracts(session.contracts).map((c) => {
-    const contractName = getContractName4(c.contract_id);
-    return [contractName, c.contract_id];
-  }));
+  const identifiers = Object.fromEntries(
+    sortContracts(session.contracts).map((c) => {
+      const contractName = getContractName4(c.contract_id);
+      return [contractName, c.contract_id];
+    })
+  );
   return identifiers;
 }
 function generateIdentifiersCode(session) {
@@ -822,7 +831,7 @@ import { inspect } from "util";
 function generateContractMeta(contract, constants) {
   const abi = contract.contract_interface;
   const functionLines = [];
-  const _a = abi, { functions, maps, variables, non_fungible_tokens } = _a, rest = __objRest(_a, ["functions", "maps", "variables", "non_fungible_tokens"]);
+  const { functions, maps, variables, non_fungible_tokens, ...rest } = abi;
   functions.forEach((func) => {
     let functionLine = `${toCamelCase3(func.name)}: `;
     const funcDef = JSON.stringify(func);
@@ -857,7 +866,8 @@ function generateContractMeta(contract, constants) {
 }
 var TYPE_IMPORTS = `import type { TypedAbiArg, TypedAbiFunction, TypedAbiMap, TypedAbiVariable, Response } from '@clarigen/core';`;
 function generateBaseFile(session) {
-  const combined = session.contracts.map((c, i) => __spreadProps(__spreadValues({}, c), {
+  const combined = session.contracts.map((c, i) => ({
+    ...c,
     constants: session.variables[i]
   }));
   const contractDefs = sortContracts(combined).map((contract) => {
@@ -900,14 +910,20 @@ Uint8Array.prototype[inspect.custom] = function(depth, options) {
 };
 function serialize(obj) {
   return inspect(obj, {
+    // showHidden: false,
+    // depth: 100,
+    // colors: false,
     showHidden: false,
+    // iterableLimit: 100000,
     compact: false,
+    // trailingComma: true,
     depth: 100,
     colors: false,
     maxArrayLength: Infinity,
     maxStringLength: Infinity,
     breakLength: Infinity,
     numericSeparator: true
+    // strAbbreviateSize: 100000,
   });
 }
 function serializeLines(key, lines) {
@@ -927,7 +943,9 @@ function getVariablesV2(contract, simnet, verbose) {
   const fakeId = `${getContractName5(contract.contract_id)}-vars`;
   logger.debug(`Deploying ${contract.contract_id} for variables.`);
   if (!contract.source) {
-    logger.debug(`Contract ${getContractName5(contract.contract_id)} has no source. Skipping variables.`);
+    logger.debug(
+      `Contract ${getContractName5(contract.contract_id)} has no source. Skipping variables.`
+    );
     return {};
   }
   if (contract.contract_interface.variables.length === 0) {
@@ -951,9 +969,14 @@ function getVariablesV2(contract, simnet, verbose) {
 
 ${varFn}`;
   try {
-    const receipt = simnet.deployContract(fakeId, fullSrc, {
-      clarityVersion: 3
-    }, deployer);
+    const receipt = simnet.deployContract(
+      fakeId,
+      fullSrc,
+      {
+        clarityVersion: 3
+      },
+      deployer
+    );
     const result = receipt.result;
     const varsAbi = {
       tuple: []
@@ -970,10 +993,10 @@ ${varFn}`;
     }
     return cvToValue(result, true);
   } catch (error) {
-    logger.error(`Error getting variables for ${getContractName5(contract.contract_id, false)}`);
-    logger.error(`Source code: ${contract.source} with type ${String(typeof contract.source)}`);
-    logger.error(error);
-    logger.error(fullSrc);
+    logger.warn(
+      { err: error },
+      `Error getting variables for ${getContractName5(contract.contract_id, false)}`
+    );
     return {};
   }
 }
@@ -1002,8 +1025,7 @@ function getContractTxs(batches) {
 function getDeploymentContract(contractName, deployment) {
   const txs = flatBatch(deployment.plan.batches);
   for (const tx of txs) {
-    if (!isContractTx(tx))
-      continue;
+    if (!isContractTx(tx)) continue;
     if ("requirement-publish" in tx) {
       const [_, name] = tx["requirement-publish"]["contract-id"].split(".");
       if (name === contractName) {
@@ -1055,12 +1077,9 @@ function getIdentifier(tx) {
   throw new Error(`Unable to find ID for contract.`);
 }
 function isContractTx(tx) {
-  if ("contract-call" in tx)
-    return false;
-  if ("btc-transfer" in tx)
-    return false;
-  if ("emulated-contract-call" in tx)
-    return false;
+  if ("contract-call" in tx) return false;
+  if ("btc-transfer" in tx) return false;
+  if ("emulated-contract-call" in tx) return false;
   return true;
 }
 
@@ -1074,16 +1093,18 @@ async function parseDeployment(path) {
 }
 var DEPLOYMENT_NETWORKS = ["devnet", "simnet", "testnet", "mainnet"];
 async function getDeployments(config) {
-  const entries = await Promise.all(DEPLOYMENT_NETWORKS.map(async (network) => {
-    const file = `default.${network}-plan.yaml`;
-    const path = join2(dirname3(config.clarinetFile()), "deployments", file);
-    let plan;
-    try {
-      plan = await parseDeployment(path);
-    } catch (_) {
-    }
-    return [network, plan];
-  }));
+  const entries = await Promise.all(
+    DEPLOYMENT_NETWORKS.map(async (network) => {
+      const file = `default.${network}-plan.yaml`;
+      const path = join2(dirname3(config.clarinetFile()), "deployments", file);
+      let plan;
+      try {
+        plan = await parseDeployment(path);
+      } catch (_) {
+      }
+      return [network, plan];
+    })
+  );
   return Object.fromEntries(entries);
 }
 async function generateESMFile({
@@ -1114,24 +1135,28 @@ function insertNetworkId(deployments, identifier, network) {
 }
 function collectContractDeployments(session, deployments, config) {
   var _a;
-  const full = Object.fromEntries(sortContracts(session.contracts).map((contract) => {
-    const contractName = getContractName6(contract.contract_id);
-    const contractDeployments = Object.fromEntries(DEPLOYMENT_NETWORKS.map((network) => {
-      const deployment = deployments[network];
-      if (typeof deployment === "undefined") {
-        return [network, null];
-      }
-      try {
-        const contractName2 = contract.contract_id.split(".")[1];
-        const tx = getDeploymentContract(contractName2, deployment);
-        const id = getIdentifier(tx);
-        return [network, id];
-      } catch (_) {
-        return [network, null];
-      }
-    }));
-    return [contractName, contractDeployments];
-  }));
+  const full = Object.fromEntries(
+    sortContracts(session.contracts).map((contract) => {
+      const contractName = getContractName6(contract.contract_id);
+      const contractDeployments = Object.fromEntries(
+        DEPLOYMENT_NETWORKS.map((network) => {
+          const deployment = deployments[network];
+          if (typeof deployment === "undefined") {
+            return [network, null];
+          }
+          try {
+            const contractName2 = contract.contract_id.split(".")[1];
+            const tx = getDeploymentContract(contractName2, deployment);
+            const id = getIdentifier(tx);
+            return [network, id];
+          } catch (_) {
+            return [network, null];
+          }
+        })
+      );
+      return [contractName, contractDeployments];
+    })
+  );
   const deployer = session.accounts.find((a) => a.name === "deployer");
   (_a = config.clarinet.project.requirements) == null ? void 0 : _a.forEach(({ contract_id }) => {
     insertNetworkId(full, contract_id, "mainnet");
@@ -1148,8 +1173,7 @@ function collectContractDeployments(session, deployments, config) {
   return full;
 }
 function collectDeploymentFiles(deployments, clarinetFolder, cwd) {
-  if (!deployments.simnet)
-    return [];
+  if (!deployments.simnet) return [];
   const simnet = deployments.simnet;
   const txs = getContractTxs(simnet.plan.batches);
   const entries = txs.map((tx) => {
@@ -1164,8 +1188,7 @@ function collectDeploymentFiles(deployments, clarinetFolder, cwd) {
 }
 function generateSimnetCode(config, deployments, _session) {
   var _a;
-  if (!((_a = config.esm) == null ? void 0 : _a.include_accounts))
-    return "";
+  if (!((_a = config.esm) == null ? void 0 : _a.include_accounts)) return "";
   const clarinetFolder = dirname3(config.clarinetFile());
   const files = collectDeploymentFiles(deployments, clarinetFolder, config.cwd);
   return `
@@ -1175,8 +1198,7 @@ export const simnetDeployment = ${JSON.stringify(files)};
 async function afterESM(config) {
   var _a;
   const command = (_a = config.esm) == null ? void 0 : _a.after;
-  if (!command)
-    return;
+  if (!command) return;
   logger.debug(`Running after ESM command: ${command}`);
   const parts = command.split(" ");
   const [cmd, ...args] = parts;