@clarigen/cli 2.1.0 → 2.1.2

package/dist/index.cjs

@@ -1,38 +1,10 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -45,7 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -112,12 +91,14 @@ var import_core2 = require("@clarigen/core");
 var import_pino = require("pino");
 var import_pino_pretty = __toESM(require("pino-pretty"), 1);
 var colorizedClarigen = `\x1B[33m[Clarigen]\x1B[0m`;
-var logger = (0, import_pino.pino)((0, import_pino_pretty.default)({
-  colorize: true,
-  ignore: "pid,hostname,time",
-  messageFormat: `${colorizedClarigen} {msg}`,
-  minimumLevel: "debug"
-}));
+var logger = (0, import_pino.pino)(
+  (0, import_pino_pretty.default)({
+    colorize: true,
+    ignore: "pid,hostname,time",
+    messageFormat: `${colorizedClarigen} {msg}`,
+    minimumLevel: "debug"
+  })
+);
 logger.level = "info";
 var log = logger;
 
@@ -213,8 +194,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) {
@@ -230,11 +210,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;
 }
@@ -245,8 +223,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);
@@ -260,10 +237,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;
 }
@@ -284,8 +259,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) {
@@ -313,8 +287,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;
@@ -342,8 +315,7 @@ var import_core = require("@clarigen/core");
 var import_promises = require("fs/promises");
 var import_path = require("path");
 function encodeVariableName(name) {
-  if (/^[A-Z\-_]*$/.test(name))
-    return name.replaceAll("-", "_");
+  if (/^[A-Z\-_]*$/.test(name)) return name.replaceAll("-", "_");
   return (0, import_core.toCamelCase)(name);
 }
 async function fileExists(filename) {
@@ -438,7 +410,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}
@@ -452,8 +426,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:**
@@ -465,8 +438,7 @@ ${params.join("\n")}`;
 function markdownParam(param, withDescription) {
   const typeString = (0, import_core2.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) {
@@ -544,8 +516,7 @@ function generateReadme(session, excluded) {
   const contractLines = [];
   sortContracts(session.contracts).forEach((contract) => {
     const name = (0, import_core2.getContractName)(contract.contract_id, false);
-    if (excluded[name])
-      return;
+    if (excluded[name]) return;
     const fileName = `${name}.md`;
     const line = `- [\`${name}\`](${fileName})`;
     contractLines.push(line);
@@ -631,26 +602,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 (0, import_path3.resolve)(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 ${(0, import_path3.relative)(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 ${(0, import_path3.relative)(this.cwd, path)}`);
+      })
+    );
     return paths;
   }
   supports(type) {
@@ -677,13 +647,12 @@ function configFilePath(cwd) {
   return (0, import_path3.resolve)(cwd ?? process.cwd(), CONFIG_FILE);
 }
 async function saveConfig(config) {
-  const configToml = (0, import_toml2.stringify)(__spreadValues({}, config));
+  const configToml = (0, import_toml2.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 (0, import_promises3.readFile)(path, "utf-8");
@@ -721,42 +690,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 = (0, import_core3.getContractName)(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 = (0, import_path4.relative)(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 = (0, import_core3.getContractName)(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 = (0, import_path4.relative)(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
@@ -768,12 +742,10 @@ var import_core5 = require("@clarigen/core");
 var jsTypeFromAbiType = (val, isArgument = false) => {
   if ((0, import_core4.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";
@@ -841,7 +813,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
 var import_core7 = require("@clarigen/core");
@@ -849,10 +864,12 @@ var import_core7 = require("@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) {
@@ -868,10 +885,12 @@ function sortAccounts(accounts) {
 // src/files/identifiers.ts
 var import_core6 = require("@clarigen/core");
 function generateIdentifiers(session) {
-  const identifiers = Object.fromEntries(sortContracts(session.contracts).map((c) => {
-    const contractName = (0, import_core6.getContractName)(c.contract_id);
-    return [contractName, c.contract_id];
-  }));
+  const identifiers = Object.fromEntries(
+    sortContracts(session.contracts).map((c) => {
+      const contractName = (0, import_core6.getContractName)(c.contract_id);
+      return [contractName, c.contract_id];
+    })
+  );
   return identifiers;
 }
 function generateIdentifiersCode(session) {
@@ -884,7 +903,7 @@ var import_util = require("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 = `${(0, import_core7.toCamelCase)(func.name)}: `;
     const funcDef = JSON.stringify(func);
@@ -919,7 +938,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) => {
@@ -962,14 +982,20 @@ Uint8Array.prototype[import_util.inspect.custom] = function(depth, options) {
 };
 function serialize(obj) {
   return (0, import_util.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) {
@@ -989,7 +1015,9 @@ function getVariablesV2(contract, simnet, verbose) {
   const fakeId = `${(0, import_core8.getContractName)(contract.contract_id)}-vars`;
   logger.debug(`Deploying ${contract.contract_id} for variables.`);
   if (!contract.source) {
-    logger.debug(`Contract ${(0, import_core8.getContractName)(contract.contract_id)} has no source. Skipping variables.`);
+    logger.debug(
+      `Contract ${(0, import_core8.getContractName)(contract.contract_id)} has no source. Skipping variables.`
+    );
     return {};
   }
   if (contract.contract_interface.variables.length === 0) {
@@ -1013,9 +1041,14 @@ function getVariablesV2(contract, simnet, verbose) {
 
 ${varFn}`;
   try {
-    const receipt = simnet.deployContract(fakeId, fullSrc, {
-      clarityVersion: 2
-    }, deployer);
+    const receipt = simnet.deployContract(
+      fakeId,
+      fullSrc,
+      {
+        clarityVersion: 3
+      },
+      deployer
+    );
     const result = receipt.result;
     const varsAbi = {
       tuple: []
@@ -1064,8 +1097,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) {
@@ -1117,12 +1149,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;
 }
 
@@ -1136,16 +1165,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 = (0, import_path5.join)((0, import_path5.dirname)(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 = (0, import_path5.join)((0, import_path5.dirname)(config.clarinetFile()), "deployments", file);
+      let plan;
+      try {
+        plan = await parseDeployment(path);
+      } catch (_) {
+      }
+      return [network, plan];
+    })
+  );
   return Object.fromEntries(entries);
 }
 async function generateESMFile({
@@ -1176,24 +1207,28 @@ function insertNetworkId(deployments, identifier, network) {
 }
 function collectContractDeployments(session, deployments, config) {
   var _a;
-  const full = Object.fromEntries(sortContracts(session.contracts).map((contract) => {
-    const contractName = (0, import_core9.getContractName)(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 = (0, import_core9.getContractName)(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");
@@ -1210,8 +1245,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) => {
@@ -1226,8 +1260,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 = (0, import_path5.dirname)(config.clarinetFile());
   const files = collectDeploymentFiles(deployments, clarinetFolder, config.cwd);
   return `
@@ -1237,8 +1270,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;