@clarigen/cli 0.2.4 → 0.3.1

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/commands/index.ts

@@ -1,5 +1,67 @@
-import { Generate as InnerGenerate } from './generate';
+import { Command, flags } from '@oclif/command';
+import { generateProject } from '../utils';
+import { getConfigFile } 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');
 
-export class Generate extends InnerGenerate {
+export class Generate extends Command {
+  static description = `Generate project files`;
+  static strict = true;
   static hidden = false;
+
+  static flags = {
+    help: flags.help({ char: 'h' }),
+    watch: flags.boolean({
+      char: 'w',
+      description: 'Watch for changes to your contracts',
+    }),
+  };
+
+  static args = [];
+
+  async run() {
+    const { flags } = this.parse(Generate);
+    const cwd = process.cwd();
+
+    if (flags.watch) {
+      const spinner = ora('Generating files').start();
+      const { contractsDir } = await getConfigFile(cwd);
+      const watcher = watch([contractsDir], {
+        cwd,
+      });
+      try {
+        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}`);
+      }
+      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}`);
+        }
+      });
+      process.on('SIGINT', async () => {
+        await watcher.close();
+        process.exit();
+      });
+    } else {
+      await generateProject(cwd);
+    }
+  }
 }

package/src/generate/files.ts

@@ -8,7 +8,7 @@ import {
   getContractNameFromPath,
 } from '@clarigen/core';
 import { makeTypes } from './declaration';
-import { ConfigContract, ConfigFile } from 'src/config';
+import { ConfigContract, ConfigFile } from '../config';
 import { dirname, resolve, join } from 'path';
 
 export const generateInterface = async ({
@@ -31,7 +31,10 @@ export const generateInterface = async ({
     '--costs',
     '--assets',
   ]);
-  if (receipt.stderr) {
+  if (
+    receipt.stderr &&
+    !receipt.stderr.includes('Used unimplemented cost function')
+  ) {
     throw new Error(`Error on ${contractFile}:
   ${receipt.stderr}
     `);
@@ -133,8 +136,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) => {

package/src/index.ts

@@ -2,3 +2,4 @@ export { run } from '@oclif/command';
 export * from './config';
 export * from './generate/declaration';
 export * from './generate/files';
+export * from './commands';

package/dist/clarinet-config.d.ts

@@ -1,34 +0,0 @@
-import { ConfigContract } from './config';
-interface ClarinetConfigAccount {
-    mnemonic: string;
-    balance: bigint;
-}
-interface ClarinetDevConfig {
-    network: {
-        name: string;
-    };
-    accounts: {
-        deployer: ClarinetConfigAccount;
-        [key: string]: ClarinetConfigAccount;
-    };
-}
-export declare function getClarinetDevConfig(folder: string): Promise<ClarinetDevConfig>;
-interface ClarinetConfig {
-    contracts: {
-        [name: string]: {
-            path: string;
-            dependsOn: string[];
-        };
-    };
-}
-export declare function getClarinetConfig(folder: string): Promise<ClarinetConfig>;
-export declare function getContractsFromClarinet(folder: string, accounts: ClarinetAccounts): Promise<ConfigContract[]>;
-export interface ClarinetAccount extends ClarinetConfigAccount {
-    address: string;
-}
-export interface ClarinetAccounts {
-    deployer: ClarinetAccount;
-    [name: string]: ClarinetAccount;
-}
-export declare function getClarinetAccounts(folder: string): Promise<ClarinetAccounts>;
-export {};