@clarigen/cli 1.0.0-next.20 → 1.0.0-next.21

package/dist/commands/index.js

@@ -1,9 +1,11 @@
+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;
@@ -43,6 +45,7 @@ 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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/commands/index.ts
@@ -54,7 +57,6 @@ module.exports = __toCommonJS(commands_exports);
 var import_command2 = require("@oclif/command");
 
 // src/generate/files.ts
-var import_native_bin = require("@clarigen/native-bin");
 var import_core2 = require("@clarigen/core");
 var import_path3 = require("path");
 
@@ -87,8 +89,7 @@ async function getClarinetConfig(folder) {
   const config = (0, import_j_toml.parse)(configContents, 1, "\n", true);
   return config;
 }
-async function getContractsFromClarinet(folder, accounts) {
-  const clarinetConfig = await getClarinetConfig(folder);
+function getContractsFromClarinet(clarinetConfig, accounts) {
   const deployerAddress = accounts.deployer.address;
   const sortedContracts = sortClarinetContracts(clarinetConfig.contracts);
   const contracts = sortedContracts.map((contractName) => {
@@ -156,16 +157,20 @@ async function getConfigFile(rootPath) {
   return defaultConfigFile;
 }
 async function getProjectConfig(rootPath) {
+  var _a, _b;
   const configFile = await getConfigFile(rootPath);
-  const clarinetPath = (0, import_path2.resolve)(rootPath, configFile.clarinet || ".");
+  const clarinetPath = (0, import_path2.resolve)(rootPath, configFile.clarinet);
+  const clarinet = await getClarinetConfig(clarinetPath);
   const accounts = await getClarinetAccounts(clarinetPath);
-  const contracts = await getContractsFromClarinet(clarinetPath, accounts);
+  const contracts = getContractsFromClarinet(clarinet, accounts);
   const contractsDir = (0, import_path2.relative)(process.cwd(), (0, import_path2.join)(configFile.clarinet, "contracts"));
   return __spreadProps(__spreadValues({}, configFile), {
+    outputDir: ((_a = clarinet.clarigen) == null ? void 0 : _a.output_dir) || configFile.outputDir,
+    docs: ((_b = clarinet.clarigen) == null ? void 0 : _b.docs) || configFile.docs,
     contracts,
     contractsDir,
     accounts,
-    clarinet: configFile.clarinet || "."
+    clarinet: configFile.clarinet
   });
 }
 
@@ -380,7 +385,7 @@ export const contracts = {
 };
 
 // src/utils.ts
-var import_native_bin3 = require("@clarigen/native-bin");
+var import_native_bin2 = require("@clarigen/native-bin");
 var import_path7 = require("path");
 var import_promises6 = require("fs/promises");
 
@@ -572,7 +577,7 @@ async function writeFile2(path, contents) {
 
 // src/generate/vars.ts
 var import_core4 = require("@clarigen/core");
-var import_native_bin2 = require("@clarigen/native-bin");
+var import_native_bin = require("@clarigen/native-bin");
 var import_clarity = require("micro-stacks/clarity");
 async function getVariables({
   abi,
@@ -595,7 +600,7 @@ async function evalVariable({
   provider
 }) {
   const code = getEvalCode(variable);
-  const result = await (0, import_native_bin2.evalRaw)({
+  const result = await (0, import_native_bin.evalRaw)({
     contractAddress: contractIdentifier,
     code,
     provider
@@ -626,7 +631,7 @@ var generateFilesForContract = async ({
 }) => {
   const contractFile = (0, import_path7.resolve)(process.cwd(), _contractFile);
   const contractIdentifier = `${contractAddress}.${contractName}`;
-  const abi = await (0, import_native_bin3.deployContract)({
+  const abi = await (0, import_native_bin2.deployContract)({
     contractIdentifier,
     contractFilePath: contractFile,
     provider
@@ -670,7 +675,7 @@ var generateProject = async (projectPath) => {
   const configFile = await getProjectConfig(projectPath);
   const { contractsDir, outputDir, contracts } = configFile;
   const outputFolder = (0, import_path7.resolve)(projectPath, outputDir);
-  const provider = await (0, import_native_bin3.createClarityBin)();
+  const provider = await (0, import_native_bin2.createClarityBin)();
   const metas = [];
   for (const contract of contracts) {
     const contractFile = (0, import_path7.resolve)(projectPath, contractsDir, contract.file);
@@ -699,13 +704,13 @@ var generateProject = async (projectPath) => {
 var import_chokidar = require("chokidar");
 var import_path8 = require("path");
 var import_chalk = require("chalk");
-var ora = require("ora");
+var import_ora = __toESM(require("ora"));
 var _Generate = class extends import_command2.Command {
   async run() {
     const { flags: flags2 } = this.parse(_Generate);
     const cwd = process.cwd();
     if (flags2.watch) {
-      const spinner = ora("Generating files").start();
+      const spinner = (0, import_ora.default)("Generating files").start();
       const { contractsDir } = await getProjectConfig(cwd);
       const watcher = (0, import_chokidar.watch)([contractsDir], {
         cwd
@@ -715,24 +720,30 @@ var _Generate = class extends import_command2.Command {
         spinner.succeed(`Finished generating files. Watching for changes.`);
       } catch (error) {
         spinner.fail(`Error generating files.
-${error.message}`);
+${String(error.message)}`);
       }
-      watcher.on("change", async (path) => {
-        const file = (0, import_path8.basename)(path);
-        spinner.clear();
-        spinner.start(`Change detected for ${(0, import_chalk.green)(file)}, generating.`);
-        try {
-          await generateProject(cwd);
-          spinner.succeed(`Finished generating files for ${(0, import_chalk.green)(file)}. Watching for changes.`);
-        } catch (error) {
-          const msg = error.message;
-          spinner.fail(`Error after saving ${(0, import_chalk.red)(file)}.
+      watcher.on("change", (path) => {
+        const cb = async () => {
+          const file = (0, import_path8.basename)(path);
+          spinner.clear();
+          spinner.start(`Change detected for ${(0, import_chalk.green)(file)}, generating.`);
+          try {
+            await generateProject(cwd);
+            spinner.succeed(`Finished generating files for ${(0, import_chalk.green)(file)}. Watching for changes.`);
+          } catch (error) {
+            const msg = error.message;
+            spinner.fail(`Error after saving ${(0, import_chalk.red)(file)}.
 ${msg}`);
-        }
+          }
+        };
+        void cb();
       });
-      process.on("SIGINT", async () => {
-        await watcher.close();
-        process.exit();
+      process.on("SIGINT", () => {
+        async function cb() {
+          await watcher.close();
+          process.exit();
+        }
+        void cb();
       });
     } else {
       await generateProject(cwd);

package/dist/index.js

@@ -1,9 +1,11 @@
+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;
@@ -43,6 +45,7 @@ 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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -53,7 +56,6 @@ __export(src_exports, {
   configFilePath: () => configFilePath,
   defaultConfigFile: () => defaultConfigFile,
   generateIndexFile: () => generateIndexFile,
-  generateInterface: () => generateInterface,
   generateInterfaceFile: () => generateInterfaceFile,
   generateProjectIndexFile: () => generateProjectIndexFile,
   generateTypesFile: () => generateTypesFile,
@@ -93,8 +95,7 @@ async function getClarinetConfig(folder) {
   const config = (0, import_j_toml.parse)(configContents, 1, "\n", true);
   return config;
 }
-async function getContractsFromClarinet(folder, accounts) {
-  const clarinetConfig = await getClarinetConfig(folder);
+function getContractsFromClarinet(clarinetConfig, accounts) {
   const deployerAddress = accounts.deployer.address;
   const sortedContracts = sortClarinetContracts(clarinetConfig.contracts);
   const contracts = sortedContracts.map((contractName) => {
@@ -162,16 +163,20 @@ async function getConfigFile(rootPath) {
   return defaultConfigFile;
 }
 async function getProjectConfig(rootPath) {
+  var _a, _b;
   const configFile = await getConfigFile(rootPath);
-  const clarinetPath = (0, import_path2.resolve)(rootPath, configFile.clarinet || ".");
+  const clarinetPath = (0, import_path2.resolve)(rootPath, configFile.clarinet);
+  const clarinet = await getClarinetConfig(clarinetPath);
   const accounts = await getClarinetAccounts(clarinetPath);
-  const contracts = await getContractsFromClarinet(clarinetPath, accounts);
+  const contracts = getContractsFromClarinet(clarinet, accounts);
   const contractsDir = (0, import_path2.relative)(process.cwd(), (0, import_path2.join)(configFile.clarinet, "contracts"));
   return __spreadProps(__spreadValues({}, configFile), {
+    outputDir: ((_a = clarinet.clarigen) == null ? void 0 : _a.output_dir) || configFile.outputDir,
+    docs: ((_b = clarinet.clarigen) == null ? void 0 : _b.docs) || configFile.docs,
     contracts,
     contractsDir,
     accounts,
-    clarinet: configFile.clarinet || "."
+    clarinet: configFile.clarinet
   });
 }
 
@@ -277,53 +282,8 @@ function makePureTypes(abi) {
 }
 
 // src/generate/files.ts
-var import_native_bin = require("@clarigen/native-bin");
 var import_core2 = require("@clarigen/core");
 var import_path3 = require("path");
-var generateInterface = async ({
-  provider,
-  contractFile,
-  contractAddress,
-  contractName
-}) => {
-  const receipt = await provider.runCommand([
-    "launch",
-    `${contractAddress}.${contractName}`,
-    contractFile,
-    provider.dbFilePath,
-    "--output_analysis",
-    "--costs",
-    "--assets"
-  ]);
-  if ((0, import_native_bin.hasStdErr)(receipt.stderr)) {
-    throw new Error(`Error on ${contractFile}:
-  ${receipt.stderr}
-    `);
-  }
-  const output = JSON.parse(receipt.stdout);
-  if (output.error) {
-    const { initialization } = output.error;
-    if (initialization == null ? void 0 : initialization.includes("\nNear:\n")) {
-      const [error, trace] = initialization.split("\nNear:\n");
-      let startLine = "";
-      const matcher = /start_line: (\d+),/;
-      const matches = matcher.exec(trace);
-      if (matches)
-        startLine = matches[1];
-      throw new Error(`Error on ${contractFile}:
-    ${error}
-    ${startLine ? `Near line ${startLine}` : ""}
-    Raw trace:
-    ${trace}
-      `);
-    }
-    throw new Error(`Error on ${contractFile}:
-  ${JSON.stringify(output.error, null, 2)}
-    `);
-  }
-  const abi = output.analysis;
-  return abi;
-};
 var generateInterfaceFile = ({
   contractName,
   abi
@@ -436,7 +396,7 @@ export const contracts = {
 var import_command = require("@oclif/command");
 
 // src/utils.ts
-var import_native_bin3 = require("@clarigen/native-bin");
+var import_native_bin2 = require("@clarigen/native-bin");
 var import_path7 = require("path");
 var import_promises6 = require("fs/promises");
 
@@ -628,7 +588,7 @@ async function writeFile2(path, contents) {
 
 // src/generate/vars.ts
 var import_core4 = require("@clarigen/core");
-var import_native_bin2 = require("@clarigen/native-bin");
+var import_native_bin = require("@clarigen/native-bin");
 var import_clarity = require("micro-stacks/clarity");
 async function getVariables({
   abi,
@@ -651,7 +611,7 @@ async function evalVariable({
   provider
 }) {
   const code = getEvalCode(variable);
-  const result = await (0, import_native_bin2.evalRaw)({
+  const result = await (0, import_native_bin.evalRaw)({
     contractAddress: contractIdentifier,
     code,
     provider
@@ -682,7 +642,7 @@ var generateFilesForContract = async ({
 }) => {
   const contractFile = (0, import_path7.resolve)(process.cwd(), _contractFile);
   const contractIdentifier = `${contractAddress}.${contractName}`;
-  const abi = await (0, import_native_bin3.deployContract)({
+  const abi = await (0, import_native_bin2.deployContract)({
     contractIdentifier,
     contractFilePath: contractFile,
     provider
@@ -726,7 +686,7 @@ var generateProject = async (projectPath) => {
   const configFile = await getProjectConfig(projectPath);
   const { contractsDir, outputDir, contracts } = configFile;
   const outputFolder = (0, import_path7.resolve)(projectPath, outputDir);
-  const provider = await (0, import_native_bin3.createClarityBin)();
+  const provider = await (0, import_native_bin2.createClarityBin)();
   const metas = [];
   for (const contract of contracts) {
     const contractFile = (0, import_path7.resolve)(projectPath, contractsDir, contract.file);
@@ -755,13 +715,13 @@ var generateProject = async (projectPath) => {
 var import_chokidar = require("chokidar");
 var import_path8 = require("path");
 var import_chalk = require("chalk");
-var ora = require("ora");
+var import_ora = __toESM(require("ora"));
 var _Generate = class extends import_command.Command {
   async run() {
     const { flags: flags2 } = this.parse(_Generate);
     const cwd = process.cwd();
     if (flags2.watch) {
-      const spinner = ora("Generating files").start();
+      const spinner = (0, import_ora.default)("Generating files").start();
       const { contractsDir } = await getProjectConfig(cwd);
       const watcher = (0, import_chokidar.watch)([contractsDir], {
         cwd
@@ -771,24 +731,30 @@ var _Generate = class extends import_command.Command {
         spinner.succeed(`Finished generating files. Watching for changes.`);
       } catch (error) {
         spinner.fail(`Error generating files.
-${error.message}`);
+${String(error.message)}`);
       }
-      watcher.on("change", async (path) => {
-        const file = (0, import_path8.basename)(path);
-        spinner.clear();
-        spinner.start(`Change detected for ${(0, import_chalk.green)(file)}, generating.`);
-        try {
-          await generateProject(cwd);
-          spinner.succeed(`Finished generating files for ${(0, import_chalk.green)(file)}. Watching for changes.`);
-        } catch (error) {
-          const msg = error.message;
-          spinner.fail(`Error after saving ${(0, import_chalk.red)(file)}.
+      watcher.on("change", (path) => {
+        const cb = async () => {
+          const file = (0, import_path8.basename)(path);
+          spinner.clear();
+          spinner.start(`Change detected for ${(0, import_chalk.green)(file)}, generating.`);
+          try {
+            await generateProject(cwd);
+            spinner.succeed(`Finished generating files for ${(0, import_chalk.green)(file)}. Watching for changes.`);
+          } catch (error) {
+            const msg = error.message;
+            spinner.fail(`Error after saving ${(0, import_chalk.red)(file)}.
 ${msg}`);
-        }
+          }
+        };
+        void cb();
       });
-      process.on("SIGINT", async () => {
-        await watcher.close();
-        process.exit();
+      process.on("SIGINT", () => {
+        async function cb() {
+          await watcher.close();
+          process.exit();
+        }
+        void cb();
       });
     } else {
       await generateProject(cwd);
@@ -814,7 +780,6 @@ Generate.args = [];
   configFilePath,
   defaultConfigFile,
   generateIndexFile,
-  generateInterface,
   generateInterfaceFile,
   generateProjectIndexFile,
   generateTypesFile,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@clarigen/cli",
   "description": "A CLI for generating a Typescript interface for a Clarity contract.",
   "author": "Hank Stoever",
-  "version": "1.0.0-next.20",
+  "version": "1.0.0-next.21",
   "license": "MIT",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -14,19 +14,6 @@
   "engines": {
     "node": ">=10"
   },
-  "scripts": {
-    "start": "tsup-node --watch",
-    "dev": "tsup-node --watch",
-    "build": "shx rm -rf ./dist && tsup-node src/index.ts src/commands/index.ts --splitting false",
-    "compile": "ncc build src/index.ts --no-source-map-register -e @oclif/command -e @oclif/errors",
-    "build-single-file": "yarn compile && oclif-dev readme",
-    "test": "jest",
-    "lint": "eslint \"src/**/*.{ts,tsx}\" && prettier  --check src/**/*.ts",
-    "typecheck": "tsc --noEmit -p tsconfig-test.json",
-    "prepublishOnly": "yarn build",
-    "demo": "yarn build && node bin/run",
-    "publish:dev": "yalc publish --push"
-  },
   "bin": {
     "clarigen": "./bin/run"
   },
@@ -50,9 +37,9 @@
     "ts-node": "^9.1.1"
   },
   "dependencies": {
-    "@clarigen/claridocs": "1.0.0-next.19",
-    "@clarigen/core": "1.0.0-next.19",
-    "@clarigen/native-bin": "1.0.0-next.19",
+    "@clarigen/core": "1.0.0-next.21",
+    "@clarigen/native-bin": "1.0.0-next.21",
+    "@clarigen/claridocs": "1.0.0-next.21",
     "@ltd/j-toml": "1.12.2",
     "@oclif/command": "^1.8.0",
     "@oclif/config": "^1.17.0",
@@ -62,11 +49,22 @@
     "micro-stacks": "^0.2.0",
     "ora": "5.4.0",
     "prettier": "2.6.2",
-    "reserved-words": "0.1.2",
-    "toposort": "2.0.2"
+    "toposort": "2.0.2",
+    "reserved-words": "0.1.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dad58c8368bb8a539346ca43f5a0d6b6371d2378"
-}
+  "scripts": {
+    "start": "tsup-node --watch",
+    "dev": "tsup-node --watch",
+    "build": "shx rm -rf ./dist && tsup-node",
+    "compile": "ncc build src/index.ts --no-source-map-register -e @oclif/command -e @oclif/errors",
+    "build-single-file": "compile && oclif-dev readme",
+    "test": "jest",
+    "lint": "eslint \"src/**/*.{ts,tsx}\" && prettier  --check src/**/*.ts",
+    "typecheck": "tsc --noEmit -p tsconfig-test.json",
+    "demo": "pnpm build && node bin/run",
+    "publish:dev": "yalc publish --push"
+  }
+}

package/src/clarinet-config.ts

@@ -29,9 +29,9 @@ export async function getClarinetDevConfig(
 ): Promise<ClarinetDevConfig> {
   const baseConfigPath = resolve(folder, 'settings', 'Devnet.toml');
   const configContents = await readFile(baseConfigPath, { encoding: 'utf-8' });
-  const config = (parse(configContents, 1.0, '\n', true, {
+  const config = parse(configContents, 1.0, '\n', true, {
     longer: true,
-  }) as unknown) as ClarinetDevConfig;
+  }) as unknown as ClarinetDevConfig;
   return config;
 }
 
@@ -46,6 +46,10 @@ export interface ClarinetContracts {
 
 export interface ClarinetConfig {
   contracts: ClarinetContracts;
+  clarigen?: {
+    output_dir?: string;
+    docs?: string;
+  };
 }
 
 export const CLARINET_SETTINGS = [
@@ -57,20 +61,19 @@ export const CLARINET_SETTINGS = [
 export async function getClarinetConfig(folder: string) {
   const baseConfigPath = resolve(folder, 'Clarinet.toml');
   const configContents = await readFile(baseConfigPath, { encoding: 'utf-8' });
-  const config = (parse(
+  const config = parse(
     configContents,
     1.0,
     '\n',
     true
-  ) as unknown) as ClarinetConfig;
+  ) as unknown as ClarinetConfig;
   return config;
 }
 
-export async function getContractsFromClarinet(
-  folder: string,
+export function getContractsFromClarinet(
+  clarinetConfig: ClarinetConfig,
   accounts: ClarinetAccounts
-): Promise<ConfigContract[]> {
-  const clarinetConfig = await getClarinetConfig(folder);
+): ConfigContract[] {
   const deployerAddress = accounts.deployer.address;
   const sortedContracts = sortClarinetContracts(clarinetConfig.contracts);
   const contracts: ConfigContract[] = sortedContracts.map((contractName) => {

package/src/commands/index.ts

@@ -4,8 +4,7 @@ import { getProjectConfig } from '../config';
 import { watch } from 'chokidar';
 import { basename } from 'path';
 import { red, green } from 'chalk';
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const ora = require('ora');
+import ora from 'ora';
 
 export class Generate extends Command {
   static description = `Generate project files`;
@@ -36,29 +35,35 @@ export class Generate extends Command {
         await generateProject(cwd);
         spinner.succeed(`Finished generating files. Watching for changes.`);
       } catch (error) {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-        spinner.fail(`Error generating files.\n${(error as any).message}`);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        spinner.fail(`Error generating files.\n${String(error.message)}`);
       }
-      watcher.on('change', async (path) => {
-        const file = basename(path);
-        spinner.clear();
-        spinner.start(`Change detected for ${green(file)}, generating.`);
-        try {
-          await generateProject(cwd);
-          spinner.succeed(
-            `Finished generating files for ${green(
-              file
-            )}. Watching for changes.`
-          );
-        } catch (error) {
-          // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-          const msg = (error as any).message;
-          spinner.fail(`Error after saving ${red(file)}.\n${msg}`);
-        }
+      watcher.on('change', (path) => {
+        const cb = async () => {
+          const file = basename(path);
+          spinner.clear();
+          spinner.start(`Change detected for ${green(file)}, generating.`);
+          try {
+            await generateProject(cwd);
+            spinner.succeed(
+              `Finished generating files for ${green(
+                file
+              )}. Watching for changes.`
+            );
+          } catch (error) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            const msg = error.message as string;
+            spinner.fail(`Error after saving ${red(file)}.\n${msg}`);
+          }
+        };
+        void cb();
       });
-      process.on('SIGINT', async () => {
-        await watcher.close();
-        process.exit();
+      process.on('SIGINT', () => {
+        async function cb() {
+          await watcher.close();
+          process.exit();
+        }
+        void cb();
       });
     } else {
       await generateProject(cwd);

package/src/config.ts

@@ -4,6 +4,7 @@ import { constants } from 'fs';
 import {
   ClarinetAccounts,
   getClarinetAccounts,
+  getClarinetConfig,
   getContractsFromClarinet,
 } from './clarinet-config';
 
@@ -62,18 +63,21 @@ export async function getConfigFile(
 
 export async function getProjectConfig(rootPath: string): Promise<ConfigFile> {
   const configFile = await getConfigFile(rootPath);
-  const clarinetPath = resolve(rootPath, configFile.clarinet || '.');
+  const clarinetPath = resolve(rootPath, configFile.clarinet);
+  const clarinet = await getClarinetConfig(clarinetPath);
   const accounts = await getClarinetAccounts(clarinetPath);
-  const contracts = await getContractsFromClarinet(clarinetPath, accounts);
+  const contracts = getContractsFromClarinet(clarinet, accounts);
   const contractsDir = relative(
     process.cwd(),
     join(configFile.clarinet, 'contracts')
   );
   return {
     ...configFile,
+    outputDir: clarinet.clarigen?.output_dir || configFile.outputDir,
+    docs: clarinet.clarigen?.docs || configFile.docs,
     contracts,
     contractsDir,
     accounts,
-    clarinet: configFile.clarinet || '.',
+    clarinet: configFile.clarinet,
   };
 }

package/src/generate/declaration.ts

@@ -39,8 +39,8 @@ export const jsTypeFromAbiType = (
   } else if (isClarityAbiBuffer(val)) {
     return 'Uint8Array';
   } else if (isClarityAbiResponse(val)) {
-    const ok: any = jsTypeFromAbiType(val.response.ok);
-    const err: any = jsTypeFromAbiType(val.response.error);
+    const ok = jsTypeFromAbiType(val.response.ok);
+    const err = jsTypeFromAbiType(val.response.error);
     return `Response<${ok}, ${err}>`;
   } else if (isClarityAbiOptional(val)) {
     const innerType = jsTypeFromAbiType(val.optional);
@@ -55,7 +55,7 @@ export const jsTypeFromAbiType = (
   ${tupleDefs.join(';\n  ')}
     }`;
   } else if (isClarityAbiList(val)) {
-    const innerType: any = jsTypeFromAbiType(val.list.type);
+    const innerType = jsTypeFromAbiType(val.list.type);
     return `${innerType}[]`;
   } else if (isClarityAbiStringAscii(val)) {
     return 'string';

package/src/generate/files.ts

@@ -4,55 +4,6 @@ import { ConfigContract, ConfigFile } from '../config';
 import { dirname, resolve, join } from 'path';
 import { makePureTypes } from '..';
 
-export const generateInterface = async ({
-  provider,
-  contractFile,
-  contractAddress,
-  contractName,
-}: {
-  contractFile: string;
-  provider: NativeClarityBinProvider;
-  contractAddress: string;
-  contractName: string;
-}): Promise<ClarityAbi> => {
-  const receipt = await provider.runCommand([
-    'launch',
-    `${contractAddress}.${contractName}`,
-    contractFile,
-    provider.dbFilePath,
-    '--output_analysis',
-    '--costs',
-    '--assets',
-  ]);
-  if (hasStdErr(receipt.stderr)) {
-    throw new Error(`Error on ${contractFile}:
-  ${receipt.stderr}
-    `);
-  }
-  const output = JSON.parse(receipt.stdout);
-  if (output.error) {
-    const { initialization } = output.error;
-    if (initialization?.includes('\nNear:\n')) {
-      const [error, trace] = initialization.split('\nNear:\n');
-      let startLine = '';
-      const matcher = /start_line: (\d+),/;
-      const matches = matcher.exec(trace);
-      if (matches) startLine = matches[1];
-      throw new Error(`Error on ${contractFile}:
-    ${error}
-    ${startLine ? `Near line ${startLine}` : ''}
-    Raw trace:
-    ${trace}
-      `);
-    }
-    throw new Error(`Error on ${contractFile}:
-  ${JSON.stringify(output.error, null, 2)}
-    `);
-  }
-  const abi = output.analysis;
-  return abi;
-};
-
 export const generateInterfaceFile = ({
   contractName,
   abi,

package/src/utils.ts

@@ -1,6 +1,5 @@
 import {
   generateIndexFile,
-  generateInterface,
   generateInterfaceFile,
   generateProjectIndexFile,
   generateTypesFile,