@clarigen/cli 0.3.4 → 0.3.6

package/dist/clarinet-config.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClarinetAccounts = exports.getContractsFromClarinet = exports.getClarinetConfig = exports.getClarinetDevConfig = void 0;
+exports.getClarinetAccounts = exports.sortClarinetContracts = exports.getContractsFromClarinet = exports.getClarinetConfig = exports.getClarinetDevConfig = void 0;
 const j_toml_1 = require("@ltd/j-toml");
 const path_1 = require("path");
 const promises_1 = require("fs/promises");
 const wallet_sdk_1 = require("@stacks/wallet-sdk");
+const toposort_1 = require("toposort");
 async function getClarinetDevConfig(folder) {
     const baseConfigPath = path_1.resolve(folder, 'settings', 'Devnet.toml');
     const configContents = await promises_1.readFile(baseConfigPath, { encoding: 'utf-8' });
@@ -24,7 +25,9 @@ exports.getClarinetConfig = getClarinetConfig;
 async function getContractsFromClarinet(folder, accounts) {
     const clarinetConfig = await getClarinetConfig(folder);
     const deployerAddress = accounts.deployer.address;
-    const contracts = Object.entries(clarinetConfig.contracts).map(([contractName, info]) => {
+    const sortedContracts = sortClarinetContracts(clarinetConfig.contracts);
+    const contracts = sortedContracts.map(contractName => {
+        const info = clarinetConfig.contracts[contractName];
         const file = info.path.replace(/^contracts\//, '');
         return {
             file,
@@ -34,6 +37,17 @@ async function getContractsFromClarinet(folder, accounts) {
     return contracts;
 }
 exports.getContractsFromClarinet = getContractsFromClarinet;
+function sortClarinetContracts(contractsConfig) {
+    const edges = [];
+    const nodes = [];
+    Object.entries(contractsConfig).forEach(([contractName, info]) => {
+        nodes.push(contractName);
+        info.depends_on.forEach((dependency) => edges.push([contractName, dependency]));
+    });
+    const sorted = toposort_1.array(nodes, edges).reverse();
+    return sorted;
+}
+exports.sortClarinetContracts = sortClarinetContracts;
 async function getClarinetAccounts(folder) {
     const devConfig = await getClarinetDevConfig(folder);
     const accountEntries = await Promise.all(Object.entries(devConfig.accounts).map(async ([key, info]) => {

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": "0.3.4",
+  "version": "0.3.6",
   "license": "MIT",
   "main": "dist/index.js",
   "files": [
@@ -40,6 +40,7 @@
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.0",
     "@oclif/errors": "^1.3.4",
+    "@types/toposort": "2.0.3",
     "@vercel/ncc": "0.27.0",
     "oclif": "^1.16.1",
     "ts-node": "^9.1.1"
@@ -54,10 +55,11 @@
     "@stacks/wallet-sdk": "1.0.0-wallet-sdk.4",
     "chalk": "4.1.0",
     "chokidar": "3.5.1",
-    "ora": "5.4.0"
+    "ora": "5.4.0",
+    "toposort": "2.0.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0c085b1ac4b8b2ad6d2d4d321911720c6a656e09"
+  "gitHead": "b438736c231e6d6adf20a8e384f03bf522be6a64"
 }

package/src/clarinet-config.ts

@@ -3,6 +3,7 @@ import { resolve } from 'path';
 import { readFile } from 'fs/promises';
 import { ConfigContract } from './config';
 import { generateWallet, getStxAddress } from '@stacks/wallet-sdk';
+import { array as toposort } from 'toposort';
 
 interface ClarinetConfigAccount {
   mnemonic: string;
@@ -30,13 +31,17 @@ export async function getClarinetDevConfig(
   return config;
 }
 
-interface ClarinetConfig {
-  contracts: {
-    [name: string]: {
-      path: string;
-      dependsOn: string[];
-    };
-  };
+export interface ClarinetContract {
+  path: string;
+  depends_on: string[];
+}
+
+export interface ClarinetContracts {
+  [name: string]: ClarinetContract;
+}
+
+export interface ClarinetConfig {
+  contracts: ClarinetContracts;
 }
 
 export async function getClarinetConfig(folder: string) {
@@ -57,18 +62,31 @@ export async function getContractsFromClarinet(
 ): Promise<ConfigContract[]> {
   const clarinetConfig = await getClarinetConfig(folder);
   const deployerAddress = accounts.deployer.address;
-  const contracts: ConfigContract[] = Object.entries(
-    clarinetConfig.contracts
-  ).map(([contractName, info]) => {
+  const sortedContracts = sortClarinetContracts(clarinetConfig.contracts);
+  const contracts: ConfigContract[] = sortedContracts.map(contractName => {
+    const info = clarinetConfig.contracts[contractName];
     const file = info.path.replace(/^contracts\//, '');
     return {
       file,
       address: deployerAddress,
     };
-  });
+  })
   return contracts;
 }
 
+export function sortClarinetContracts(contractsConfig: ClarinetContracts) {
+  const edges: [string, string][] = [];
+  const nodes: string[] = [];
+  Object.entries(contractsConfig).forEach(([contractName, info]) => {
+    nodes.push(contractName);
+    info.depends_on.forEach((dependency) =>
+      edges.push([contractName, dependency])
+    );
+  });
+  const sorted = toposort(nodes, edges).reverse();
+  return sorted;
+}
+
 export interface ClarinetAccount extends ClarinetConfigAccount {
   address: string;
 }