@clarigen/cli 0.2.5 → 0.3.2

package/dist/clarinet-config.js

@@ -8,14 +8,16 @@ const wallet_sdk_1 = require("@stacks/wallet-sdk");
 async function getClarinetDevConfig(folder) {
     const baseConfigPath = path_1.resolve(folder, 'settings', 'Devnet.toml');
     const configContents = await promises_1.readFile(baseConfigPath, { encoding: 'utf-8' });
-    const config = j_toml_1.parse(configContents, 1.0, '\n', false);
+    const config = j_toml_1.parse(configContents, 1.0, '\n', true, {
+        longer: true,
+    });
     return config;
 }
 exports.getClarinetDevConfig = getClarinetDevConfig;
 async function getClarinetConfig(folder) {
     const baseConfigPath = path_1.resolve(folder, 'Clarinet.toml');
     const configContents = await promises_1.readFile(baseConfigPath, { encoding: 'utf-8' });
-    const config = j_toml_1.parse(configContents, 1.0, '\n', false);
+    const config = j_toml_1.parse(configContents, 1.0, '\n', true);
     return config;
 }
 exports.getClarinetConfig = getClarinetConfig;

package/dist/generate/files.js

@@ -17,7 +17,7 @@ const generateInterface = async ({ provider: _provider, contractFile, contractAd
         '--costs',
         '--assets',
     ]);
-    if (receipt.stderr) {
+    if (native_bin_1.hasStdErr(receipt.stderr)) {
         throw new Error(`Error on ${contractFile}:
   ${receipt.stderr}
     `);
@@ -102,8 +102,18 @@ const generateProjectIndexFile = (config) => {
     const contractMap = [];
     let accounts = '';
     if ('accounts' in config) {
+        const accountLines = Object.keys(config.accounts).map((key) => {
+            const account = config.accounts[key];
+            return `"${key}": {
+    mnemonic: "${account.mnemonic}",
+    balance: ${account.balance.toString()}n,
+    address: "${account.address}",
+  },`;
+        });
         accounts = `\n\n// prettier-ignore
-export const accounts = ${JSON.stringify(config.accounts, null, 2)};`;
+export const accounts = {
+  ${accountLines.join('\n  ')}
+};`;
     }
     config.contracts.forEach((contract) => {
         const contractName = core_1.getContractNameFromPath(contract.file);

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.2.5",
+  "version": "0.3.2",
   "license": "MIT",
   "main": "dist/index.js",
   "files": [
@@ -21,7 +21,8 @@
     "build": "rm -rf dist && tsc -b",
     "test": "tsdx test",
     "lint": "tsdx lint",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "prepublishOnly": "yarn build"
   },
   "bin": {
     "clarigen": "./bin/run"
@@ -37,7 +38,6 @@
     "trailingComma": "es5"
   },
   "devDependencies": {
-    "@oclif/config": "^1.17.0",
     "@oclif/dev-cli": "^1.26.0",
     "@oclif/errors": "^1.3.4",
     "@vercel/ncc": "0.27.0",
@@ -45,10 +45,12 @@
     "ts-node": "^9.1.1"
   },
   "dependencies": {
-    "@clarigen/core": "0.2.3",
-    "@clarigen/native-bin": "0.2.3",
+    "@clarigen/core": "0.3.2",
+    "@clarigen/native-bin": "0.3.2",
     "@ltd/j-toml": "1.12.2",
     "@oclif/command": "^1.8.0",
+    "@oclif/config": "^1.17.0",
+    "@oclif/plugin-help": "3.2.3",
     "@stacks/wallet-sdk": "1.0.0-wallet-sdk.4",
     "chalk": "4.1.0",
     "chokidar": "3.5.1",
@@ -57,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "550b08b622ecc3675402efd478d639f135eae9e4"
+  "gitHead": "5625d6c342e16966b58c08103f459aaf322158ab"
 }

package/src/clarinet-config.ts

@@ -24,12 +24,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',
-    false
-  ) as unknown) as ClarinetDevConfig;
+  const config = (parse(configContents, 1.0, '\n', true, {
+    longer: true,
+  }) as unknown) as ClarinetDevConfig;
   return config;
 }
 
@@ -49,7 +46,7 @@ export async function getClarinetConfig(folder: string) {
     configContents,
     1.0,
     '\n',
-    false
+    true
   ) as unknown) as ClarinetConfig;
   return config;
 }

package/src/generate/files.ts

@@ -1,6 +1,7 @@
 import {
   NativeClarityBinProvider,
   createClarityBin,
+  hasStdErr,
 } from '@clarigen/native-bin';
 import {
   ClarityAbi,
@@ -31,7 +32,7 @@ export const generateInterface = async ({
     '--costs',
     '--assets',
   ]);
-  if (receipt.stderr) {
+  if (hasStdErr(receipt.stderr)) {
     throw new Error(`Error on ${contractFile}:
   ${receipt.stderr}
     `);
@@ -133,8 +134,19 @@ export const generateProjectIndexFile = (config: ConfigFile) => {
 
   let accounts = '';
   if ('accounts' in config) {
+    const accountLines = Object.keys(config.accounts).map((key) => {
+      const account = config.accounts[key];
+      return `"${key}": {
+    mnemonic: "${account.mnemonic}",
+    balance: ${account.balance.toString()}n,
+    address: "${account.address}",
+  },`;
+    });
+
     accounts = `\n\n// prettier-ignore
-export const accounts = ${JSON.stringify(config.accounts, null, 2)};`;
+export const accounts = {
+  ${accountLines.join('\n  ')}
+};`;
   }
 
   config.contracts.forEach((contract) => {