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

package/dist/commands/index.js

@@ -69,7 +69,7 @@ var import_promises2 = require("fs/promises");
 var import_fs = require("fs");
 
 // src/clarinet-config.ts
-var import_j_toml = require("@ltd/j-toml");
+var import_toml = require("@iarna/toml");
 var import_path = require("path");
 var import_promises = require("fs/promises");
 var import_wallet_sdk = require("micro-stacks/wallet-sdk");
@@ -78,15 +78,13 @@ var import_crypto = require("micro-stacks/crypto");
 async function getClarinetDevConfig(folder) {
   const baseConfigPath = (0, import_path.resolve)(folder, "settings", "Devnet.toml");
   const configContents = await (0, import_promises.readFile)(baseConfigPath, { encoding: "utf-8" });
-  const config = (0, import_j_toml.parse)(configContents, 1, "\n", true, {
-    longer: true
-  });
+  const config = (0, import_toml.parse)(configContents);
   return config;
 }
 async function getClarinetConfig(folder) {
   const baseConfigPath = (0, import_path.resolve)(folder, "Clarinet.toml");
   const configContents = await (0, import_promises.readFile)(baseConfigPath, { encoding: "utf-8" });
-  const config = (0, import_j_toml.parse)(configContents, 1, "\n", true);
+  const config = (0, import_toml.parse)(configContents);
   return config;
 }
 function getContractsFromClarinet(clarinetConfig, accounts) {
@@ -107,8 +105,9 @@ function sortClarinetContracts(contractsConfig) {
   const edges = [];
   const nodes = [];
   Object.entries(contractsConfig).forEach(([contractName, info]) => {
+    var _a;
     nodes.push(contractName);
-    info.depends_on.forEach((dependency) => edges.push([contractName, dependency]));
+    (_a = info.depends_on) == null ? void 0 : _a.forEach((dependency) => edges.push([contractName, dependency]));
   });
   const sorted = (0, import_toposort.array)(nodes, edges).reverse();
   return sorted;
@@ -386,8 +385,8 @@ export const contracts = {
 
 // src/utils.ts
 var import_native_bin2 = require("@clarigen/native-bin");
-var import_path7 = require("path");
-var import_promises6 = require("fs/promises");
+var import_path8 = require("path");
+var import_promises7 = require("fs/promises");
 
 // src/docs.ts
 var import_claridocs = require("@clarigen/claridocs");
@@ -619,6 +618,36 @@ function getEvalCode(variable) {
   return variable.name;
 }
 
+// src/generate/deployment.ts
+var import_js_yaml = require("js-yaml");
+var import_promises6 = require("fs/promises");
+var import_path7 = require("path");
+var import_fs2 = require("fs");
+async function parseDeployment(path) {
+  const contents = await (0, import_promises6.readFile)(path, { encoding: "utf-8" });
+  const parsed = (0, import_js_yaml.load)(contents);
+  return parsed;
+}
+async function generateDeployment(network, config) {
+  const file = `default.${network}-plan.yaml`;
+  const deploymentPath = (0, import_path7.resolve)(process.cwd(), config.clarinet, "deployments", file);
+  if ((0, import_fs2.existsSync)(deploymentPath)) {
+    const plan = await parseDeployment(deploymentPath);
+    const varName = `${network}Deployment`;
+    const contents = `export const ${varName} = ${JSON.stringify(plan)} as const;
+    `;
+    const outputFile = (0, import_path7.resolve)(config.outputDir, "deployments", `${network}.ts`);
+    await writeFile2(outputFile, contents);
+  }
+}
+async function generateDeployments(config) {
+  const networks = ["devnet", "simnet", "testnet", "mainnet"];
+  const folder = (0, import_path7.resolve)(process.cwd(), config.outputDir, "deployments");
+  await (0, import_promises6.mkdir)(folder, { recursive: true });
+  const generates = networks.map((n) => generateDeployment(n, config));
+  await Promise.all(generates);
+}
+
 // src/utils.ts
 var generateFilesForContract = async ({
   contractFile: _contractFile,
@@ -629,7 +658,7 @@ var generateFilesForContract = async ({
   contractName,
   docsPath
 }) => {
-  const contractFile = (0, import_path7.resolve)(process.cwd(), _contractFile);
+  const contractFile = (0, import_path8.resolve)(process.cwd(), _contractFile);
   const contractIdentifier = `${contractAddress}.${contractName}`;
   const abi = await (0, import_native_bin2.deployContract)({
     contractIdentifier,
@@ -643,7 +672,7 @@ var generateFilesForContract = async ({
   });
   const typesFile = generateTypesFile(abi, contractName);
   const indexFile = generateIndexFile({
-    contractFile: (0, import_path7.relative)(process.cwd(), contractFile),
+    contractFile: (0, import_path8.relative)(process.cwd(), contractFile),
     contractAddress,
     contractName
   });
@@ -657,11 +686,11 @@ var generateFilesForContract = async ({
       dirName
     });
   }
-  const outputPath = (0, import_path7.resolve)(outputFolder, dirName || ".", contractName);
-  await (0, import_promises6.mkdir)(outputPath, { recursive: true });
-  await writeFile2((0, import_path7.resolve)(outputPath, "abi.ts"), abiFile);
-  await writeFile2((0, import_path7.resolve)(outputPath, "index.ts"), indexFile);
-  await writeFile2((0, import_path7.resolve)(outputPath, "types.ts"), typesFile);
+  const outputPath = (0, import_path8.resolve)(outputFolder, dirName || ".", contractName);
+  await (0, import_promises7.mkdir)(outputPath, { recursive: true });
+  await writeFile2((0, import_path8.resolve)(outputPath, "abi.ts"), abiFile);
+  await writeFile2((0, import_path8.resolve)(outputPath, "index.ts"), indexFile);
+  await writeFile2((0, import_path8.resolve)(outputPath, "types.ts"), typesFile);
   return {
     abi,
     contractFile,
@@ -674,12 +703,12 @@ var generateFilesForContract = async ({
 var generateProject = async (projectPath) => {
   const configFile = await getProjectConfig(projectPath);
   const { contractsDir, outputDir, contracts } = configFile;
-  const outputFolder = (0, import_path7.resolve)(projectPath, outputDir);
+  const outputFolder = (0, import_path8.resolve)(projectPath, outputDir);
   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);
-    const dirName = (0, import_path7.dirname)(contract.file);
+    const contractFile = (0, import_path8.resolve)(projectPath, contractsDir, contract.file);
+    const dirName = (0, import_path8.dirname)(contract.file);
     const meta = await generateFilesForContract({
       contractFile,
       outputFolder,
@@ -693,16 +722,17 @@ var generateProject = async (projectPath) => {
   }
   const indexFile = generateProjectIndexFile(configFile);
   await generateDocsIndex(configFile);
-  const indexPath = (0, import_path7.resolve)(outputFolder, "index.ts");
+  const indexPath = (0, import_path8.resolve)(outputFolder, "index.ts");
   await writeFile2(indexPath, indexFile);
   const singleFile = await generateSingleFile(configFile, metas);
-  const singlePath = (0, import_path7.resolve)(outputFolder, "single.ts");
+  const singlePath = (0, import_path8.resolve)(outputFolder, "single.ts");
   await writeFile2(singlePath, singleFile);
+  await generateDeployments(configFile);
 };
 
 // src/commands/index.ts
 var import_chokidar = require("chokidar");
-var import_path8 = require("path");
+var import_path9 = require("path");
 var import_chalk = require("chalk");
 var import_ora = __toESM(require("ora"));
 var _Generate = class extends import_command2.Command {
@@ -724,7 +754,7 @@ ${String(error.message)}`);
       }
       watcher.on("change", (path) => {
         const cb = async () => {
-          const file = (0, import_path8.basename)(path);
+          const file = (0, import_path9.basename)(path);
           spinner.clear();
           spinner.start(`Change detected for ${(0, import_chalk.green)(file)}, generating.`);
           try {

package/dist/index.js

@@ -75,7 +75,7 @@ var import_promises2 = require("fs/promises");
 var import_fs = require("fs");
 
 // src/clarinet-config.ts
-var import_j_toml = require("@ltd/j-toml");
+var import_toml = require("@iarna/toml");
 var import_path = require("path");
 var import_promises = require("fs/promises");
 var import_wallet_sdk = require("micro-stacks/wallet-sdk");
@@ -84,15 +84,13 @@ var import_crypto = require("micro-stacks/crypto");
 async function getClarinetDevConfig(folder) {
   const baseConfigPath = (0, import_path.resolve)(folder, "settings", "Devnet.toml");
   const configContents = await (0, import_promises.readFile)(baseConfigPath, { encoding: "utf-8" });
-  const config = (0, import_j_toml.parse)(configContents, 1, "\n", true, {
-    longer: true
-  });
+  const config = (0, import_toml.parse)(configContents);
   return config;
 }
 async function getClarinetConfig(folder) {
   const baseConfigPath = (0, import_path.resolve)(folder, "Clarinet.toml");
   const configContents = await (0, import_promises.readFile)(baseConfigPath, { encoding: "utf-8" });
-  const config = (0, import_j_toml.parse)(configContents, 1, "\n", true);
+  const config = (0, import_toml.parse)(configContents);
   return config;
 }
 function getContractsFromClarinet(clarinetConfig, accounts) {
@@ -113,8 +111,9 @@ function sortClarinetContracts(contractsConfig) {
   const edges = [];
   const nodes = [];
   Object.entries(contractsConfig).forEach(([contractName, info]) => {
+    var _a;
     nodes.push(contractName);
-    info.depends_on.forEach((dependency) => edges.push([contractName, dependency]));
+    (_a = info.depends_on) == null ? void 0 : _a.forEach((dependency) => edges.push([contractName, dependency]));
   });
   const sorted = (0, import_toposort.array)(nodes, edges).reverse();
   return sorted;
@@ -397,8 +396,8 @@ var import_command = require("@oclif/command");
 
 // src/utils.ts
 var import_native_bin2 = require("@clarigen/native-bin");
-var import_path7 = require("path");
-var import_promises6 = require("fs/promises");
+var import_path8 = require("path");
+var import_promises7 = require("fs/promises");
 
 // src/docs.ts
 var import_claridocs = require("@clarigen/claridocs");
@@ -630,6 +629,36 @@ function getEvalCode(variable) {
   return variable.name;
 }
 
+// src/generate/deployment.ts
+var import_js_yaml = require("js-yaml");
+var import_promises6 = require("fs/promises");
+var import_path7 = require("path");
+var import_fs2 = require("fs");
+async function parseDeployment(path) {
+  const contents = await (0, import_promises6.readFile)(path, { encoding: "utf-8" });
+  const parsed = (0, import_js_yaml.load)(contents);
+  return parsed;
+}
+async function generateDeployment(network, config) {
+  const file = `default.${network}-plan.yaml`;
+  const deploymentPath = (0, import_path7.resolve)(process.cwd(), config.clarinet, "deployments", file);
+  if ((0, import_fs2.existsSync)(deploymentPath)) {
+    const plan = await parseDeployment(deploymentPath);
+    const varName = `${network}Deployment`;
+    const contents = `export const ${varName} = ${JSON.stringify(plan)} as const;
+    `;
+    const outputFile = (0, import_path7.resolve)(config.outputDir, "deployments", `${network}.ts`);
+    await writeFile2(outputFile, contents);
+  }
+}
+async function generateDeployments(config) {
+  const networks = ["devnet", "simnet", "testnet", "mainnet"];
+  const folder = (0, import_path7.resolve)(process.cwd(), config.outputDir, "deployments");
+  await (0, import_promises6.mkdir)(folder, { recursive: true });
+  const generates = networks.map((n) => generateDeployment(n, config));
+  await Promise.all(generates);
+}
+
 // src/utils.ts
 var generateFilesForContract = async ({
   contractFile: _contractFile,
@@ -640,7 +669,7 @@ var generateFilesForContract = async ({
   contractName,
   docsPath
 }) => {
-  const contractFile = (0, import_path7.resolve)(process.cwd(), _contractFile);
+  const contractFile = (0, import_path8.resolve)(process.cwd(), _contractFile);
   const contractIdentifier = `${contractAddress}.${contractName}`;
   const abi = await (0, import_native_bin2.deployContract)({
     contractIdentifier,
@@ -654,7 +683,7 @@ var generateFilesForContract = async ({
   });
   const typesFile = generateTypesFile(abi, contractName);
   const indexFile = generateIndexFile({
-    contractFile: (0, import_path7.relative)(process.cwd(), contractFile),
+    contractFile: (0, import_path8.relative)(process.cwd(), contractFile),
     contractAddress,
     contractName
   });
@@ -668,11 +697,11 @@ var generateFilesForContract = async ({
       dirName
     });
   }
-  const outputPath = (0, import_path7.resolve)(outputFolder, dirName || ".", contractName);
-  await (0, import_promises6.mkdir)(outputPath, { recursive: true });
-  await writeFile2((0, import_path7.resolve)(outputPath, "abi.ts"), abiFile);
-  await writeFile2((0, import_path7.resolve)(outputPath, "index.ts"), indexFile);
-  await writeFile2((0, import_path7.resolve)(outputPath, "types.ts"), typesFile);
+  const outputPath = (0, import_path8.resolve)(outputFolder, dirName || ".", contractName);
+  await (0, import_promises7.mkdir)(outputPath, { recursive: true });
+  await writeFile2((0, import_path8.resolve)(outputPath, "abi.ts"), abiFile);
+  await writeFile2((0, import_path8.resolve)(outputPath, "index.ts"), indexFile);
+  await writeFile2((0, import_path8.resolve)(outputPath, "types.ts"), typesFile);
   return {
     abi,
     contractFile,
@@ -685,12 +714,12 @@ var generateFilesForContract = async ({
 var generateProject = async (projectPath) => {
   const configFile = await getProjectConfig(projectPath);
   const { contractsDir, outputDir, contracts } = configFile;
-  const outputFolder = (0, import_path7.resolve)(projectPath, outputDir);
+  const outputFolder = (0, import_path8.resolve)(projectPath, outputDir);
   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);
-    const dirName = (0, import_path7.dirname)(contract.file);
+    const contractFile = (0, import_path8.resolve)(projectPath, contractsDir, contract.file);
+    const dirName = (0, import_path8.dirname)(contract.file);
     const meta = await generateFilesForContract({
       contractFile,
       outputFolder,
@@ -704,16 +733,17 @@ var generateProject = async (projectPath) => {
   }
   const indexFile = generateProjectIndexFile(configFile);
   await generateDocsIndex(configFile);
-  const indexPath = (0, import_path7.resolve)(outputFolder, "index.ts");
+  const indexPath = (0, import_path8.resolve)(outputFolder, "index.ts");
   await writeFile2(indexPath, indexFile);
   const singleFile = await generateSingleFile(configFile, metas);
-  const singlePath = (0, import_path7.resolve)(outputFolder, "single.ts");
+  const singlePath = (0, import_path8.resolve)(outputFolder, "single.ts");
   await writeFile2(singlePath, singleFile);
+  await generateDeployments(configFile);
 };
 
 // src/commands/index.ts
 var import_chokidar = require("chokidar");
-var import_path8 = require("path");
+var import_path9 = require("path");
 var import_chalk = require("chalk");
 var import_ora = __toESM(require("ora"));
 var _Generate = class extends import_command.Command {
@@ -735,7 +765,7 @@ ${String(error.message)}`);
       }
       watcher.on("change", (path) => {
         const cb = async () => {
-          const file = (0, import_path8.basename)(path);
+          const file = (0, import_path9.basename)(path);
           spinner.clear();
           spinner.start(`Change detected for ${(0, import_chalk.green)(file)}, generating.`);
           try {

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.21",
+  "version": "1.0.0-next.22",
   "license": "MIT",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -30,6 +30,7 @@
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.0",
     "@oclif/errors": "^1.3.4",
+    "@types/js-yaml": "^4.0.5",
     "@types/reserved-words": "0.1.0",
     "@types/toposort": "2.0.3",
     "@vercel/ncc": "0.27.0",
@@ -37,20 +38,23 @@
     "ts-node": "^9.1.1"
   },
   "dependencies": {
-    "@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",
+    "@clarigen/claridocs": "1.0.0-next.22",
+    "@clarigen/core": "1.0.0-next.22",
+    "@clarigen/native-bin": "1.0.0-next.22",
+    "@iarna/toml": "^2.2.5",
     "@oclif/command": "^1.8.0",
     "@oclif/config": "^1.17.0",
     "@oclif/plugin-help": "3.2.3",
+    "@scure/bip32": "^1.1.0",
+    "@scure/bip39": "^1.1.0",
     "chalk": "4.1.0",
     "chokidar": "3.5.1",
-    "micro-stacks": "^0.2.0",
+    "js-yaml": "^4.1.0",
+    "micro-stacks": "^0.5.2",
     "ora": "5.4.0",
     "prettier": "2.6.2",
-    "toposort": "2.0.2",
-    "reserved-words": "0.1.2"
+    "reserved-words": "0.1.2",
+    "toposort": "2.0.2"
   },
   "publishConfig": {
     "access": "public"

package/src/clarinet-config.ts

@@ -1,4 +1,4 @@
-import { parse } from '@ltd/j-toml';
+import { parse } from '@iarna/toml';
 import { resolve } from 'path';
 import { readFile } from 'fs/promises';
 import { ConfigContract } from './config';
@@ -29,15 +29,13 @@ 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, {
-    longer: true,
-  }) as unknown as ClarinetDevConfig;
-  return config;
+  const config = parse(configContents);
+  return config as unknown as ClarinetDevConfig;
 }
 
 export interface ClarinetContract {
   path: string;
-  depends_on: string[];
+  depends_on?: string[];
 }
 
 export interface ClarinetContracts {
@@ -61,12 +59,7 @@ 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(
-    configContents,
-    1.0,
-    '\n',
-    true
-  ) as unknown as ClarinetConfig;
+  const config = parse(configContents) as unknown as ClarinetConfig;
   return config;
 }
 
@@ -93,7 +86,7 @@ export function sortClarinetContracts(contractsConfig: ClarinetContracts) {
   const nodes: string[] = [];
   Object.entries(contractsConfig).forEach(([contractName, info]) => {
     nodes.push(contractName);
-    info.depends_on.forEach((dependency) =>
+    info.depends_on?.forEach((dependency) =>
       edges.push([contractName, dependency])
     );
   });

package/src/generate/deployment.ts

@@ -0,0 +1,45 @@
+import { load } from 'js-yaml';
+import { mkdir, readFile } from 'fs/promises';
+import { resolve } from 'path';
+import { existsSync } from 'fs';
+import type { ConfigFile } from '../config';
+import { writeFile } from '../writer';
+import { DeploymentPlan } from '@clarigen/core';
+
+export async function parseDeployment(path: string): Promise<DeploymentPlan> {
+  const contents = await readFile(path, { encoding: 'utf-8' });
+  const parsed = load(contents);
+  return parsed as DeploymentPlan;
+}
+
+export async function generateDeployment(network: string, config: ConfigFile) {
+  const file = `default.${network}-plan.yaml`;
+  const deploymentPath = resolve(
+    process.cwd(),
+    config.clarinet,
+    'deployments',
+    file
+  );
+  if (existsSync(deploymentPath)) {
+    const plan = await parseDeployment(deploymentPath);
+    const varName = `${network}Deployment`;
+    const contents = `export const ${varName} = ${JSON.stringify(
+      plan
+    )} as const;
+    `;
+    const outputFile = resolve(
+      config.outputDir,
+      'deployments',
+      `${network}.ts`
+    );
+    await writeFile(outputFile, contents);
+  }
+}
+
+export async function generateDeployments(config: ConfigFile) {
+  const networks = ['devnet', 'simnet', 'testnet', 'mainnet'];
+  const folder = resolve(process.cwd(), config.outputDir, 'deployments');
+  await mkdir(folder, { recursive: true });
+  const generates = networks.map((n) => generateDeployment(n, config));
+  await Promise.all(generates);
+}

package/src/utils.ts

@@ -18,6 +18,7 @@ import { generateContractMeta, generateSingleFile } from './generate/single';
 import { writeFile } from './writer';
 import { getVariables, TypedAbiVariable } from './generate/vars';
 import { ClarityAbiVariable } from 'micro-stacks/clarity';
+import { generateDeployments } from './generate/deployment';
 
 export interface ContractMeta {
   abi: ClarityAbi;
@@ -125,4 +126,5 @@ export const generateProject = async (projectPath: string) => {
   const singleFile = await generateSingleFile(configFile, metas);
   const singlePath = resolve(outputFolder, 'single.ts');
   await writeFile(singlePath, singleFile);
+  await generateDeployments(configFile);
 };