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

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.18",
+  "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.18",
-    "@clarigen/core": "1.0.0-next.18",
-    "@clarigen/native-bin": "1.0.0-next.18",
+    "@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": "597b4b53e6c876336126bf40b4b8850d1385af8f"
-}
+  "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/generate/single.ts

@@ -2,7 +2,6 @@ import { toCamelCase } from '@clarigen/core';
 import type { ConfigFile } from '../config';
 import { getArgName, jsTypeFromAbiType } from './declaration';
 import type { ContractMeta } from '../utils';
-import { resolveConfig, format } from 'prettier';
 import { relative, resolve } from 'path';
 import { readFile } from 'fs/promises';
 import { inspect } from 'util';
@@ -27,7 +26,7 @@ export function generateContractMeta(contract: ContractMeta) {
   const variableLines = contract.variables.map((v) => {
     let varLine = `${toCamelCase(v.name)}: `;
     const type = jsTypeFromAbiType(v.type);
-    const varJSON = inspect(v, false, null, false);
+    const varJSON = serialize(v);
     varLine += `${varJSON} as TypedAbiVariable<${type}>`;
     return varLine;
   });
@@ -79,7 +78,7 @@ export async function generateSingleFile(
   const file = `
 ${types}
 
-export const contracts: Record<string, TypedAbi> = {
+export const contracts = {
   ${contractDefs.join(',\n')}
 } as const;
 
@@ -111,8 +110,14 @@ Uint8Array.prototype[inspect.custom] = function (this: Uint8Array) {
   return `Uint8Array.from([${this.join(',')}])`;
 };
 
-function serialize(obj: any) {
-  return inspect(obj, false, null, false);
+export function serialize(obj: any) {
+  return inspect(obj, {
+    showHidden: false,
+    maxArrayLength: null,
+    maxStringLength: null,
+    depth: null,
+    colors: false,
+  });
 }
 
 function serializeLines(key: string, lines: string[]) {
@@ -122,7 +127,8 @@ function serializeLines(key: string, lines: string[]) {
 }
 
 export async function getSingleTypes() {
-  const typesPath = resolve(__dirname, '../../../core/src/abi-types.ts');
+  // 🤔 weird stuff with tsup shims
+  const typesPath = resolve(__dirname, '../../dist/abi-types.ts.txt');
   const typesFile = await readFile(typesPath, { encoding: 'utf-8' });
   return typesFile;
 }

package/src/utils.ts

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

package/dist/commands/index.d.ts

@@ -1,16 +0,0 @@
-import * as _oclif_parser_lib_flags from '@oclif/parser/lib/flags';
-import { Command } from '@oclif/command';
-
-declare class Generate extends Command {
-    static description: string;
-    static strict: boolean;
-    static hidden: boolean;
-    static flags: {
-        help: _oclif_parser_lib_flags.IBooleanFlag<void>;
-        watch: _oclif_parser_lib_flags.IBooleanFlag<boolean>;
-    };
-    static args: any[];
-    run(): Promise<void>;
-}
-
-export { Generate };

package/dist/commands/index.mjs

@@ -1,92 +0,0 @@
-var lt=Object.defineProperty,pt=Object.defineProperties;var ft=Object.getOwnPropertyDescriptors;var N=Object.getOwnPropertySymbols;var R=Object.prototype.hasOwnProperty,B=Object.prototype.propertyIsEnumerable;var M=(t,r,e)=>r in t?lt(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,C=(t,r)=>{for(var e in r||(r={}))R.call(r,e)&&M(t,e,r[e]);if(N)for(var e of N(r))B.call(r,e)&&M(t,e,r[e]);return t},x=(t,r)=>pt(t,ft(r));var mt=(t=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(t,{get:(r,e)=>(typeof require!="undefined"?require:r)[e]}):t)(function(t){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+t+'" is not supported')});var j=(t,r)=>{var e={};for(var n in t)R.call(t,n)&&r.indexOf(n)<0&&(e[n]=t[n]);if(t!=null&&N)for(var n of N(t))r.indexOf(n)<0&&B.call(t,n)&&(e[n]=t[n]);return e};import{fileURLToPath as ut}from"url";import gt from"path";var Ct=()=>ut(import.meta.url),yt=()=>gt.dirname(Ct()),u=yt();import{Command as be,flags as st}from"@oclif/command";import{hasStdErr as rr}from"@clarigen/native-bin";import{toCamelCase as F}from"@clarigen/core";import{dirname as Bt,join as Jt}from"path";import{run as Qe}from"@oclif/command";import{resolve as H,join as Ft,relative as Tt}from"path";import{readFile as vt,access as Pt}from"fs/promises";import{constants as Nt}from"fs";import{parse as J}from"@ltd/j-toml";import{resolve as U}from"path";import{readFile as W}from"fs/promises";import{generateWallet as dt,getStxAddressFromAccount as $t}from"micro-stacks/wallet-sdk";import{array as bt}from"toposort";import{StacksNetworkVersion as xt}from"micro-stacks/crypto";async function wt(t){let r=U(t,"settings","Devnet.toml"),e=await W(r,{encoding:"utf-8"});return J(e,1,`
-`,!0,{longer:!0})}async function At(t){let r=U(t,"Clarinet.toml"),e=await W(r,{encoding:"utf-8"});return J(e,1,`
-`,!0)}async function z(t,r){let e=await At(t),n=r.deployer.address;return ht(e.contracts).map(a=>({file:e.contracts[a].path.replace(/^contracts\//,""),address:n,name:a}))}function ht(t){let r=[],e=[];return Object.entries(t).forEach(([o,i])=>{e.push(o),i.depends_on.forEach(a=>r.push([o,a]))}),bt(e,r).reverse()}async function K(t){let r=await wt(t),e=await Promise.all(Object.entries(r.accounts).map(async([o,i])=>{let a=await dt(i.mnemonic,"password"),[s]=a.accounts,l=$t(s,xt.testnetP2PKH);return[o,x(C({},i),{address:l})]}));return Object.fromEntries(e)}var q={outputDir:"src/clarigen",clarinet:"."};function jt(t){return H(t,"clarigen.config.json")}async function Et(t){try{return await Pt(t,Nt.R_OK),!0}catch{return!1}}async function It(t){let r=jt(t);if(await Et(r)){let n=await vt(r,{encoding:"utf-8"}),o=JSON.parse(n);return C(C({},q),o)}return q}async function E(t){let r=await It(t),e=H(t,r.clarinet||"."),n=await K(e),o=await z(e,n),i=Tt(process.cwd(),Ft(r.clarinet,"contracts"));return x(C({},r),{contracts:o,contractsDir:i,accounts:n,clarinet:r.clarinet||"."})}import{isClarityAbiBuffer as kt,isClarityAbiList as St,isClarityAbiOptional as Dt,isClarityAbiPrimitive as Vt,isClarityAbiResponse as Q,isClarityAbiStringAscii as Ot,isClarityAbiStringUtf8 as Lt,isClarityAbiTuple as _t}from"micro-stacks/transactions";import{toCamelCase as S}from"@clarigen/core";import{check as Mt}from"reserved-words";var f=(t,r=!1)=>{if(Vt(t)){if(t==="uint128")return r?"number | bigint":"bigint";if(t==="int128")return r?"number | bigint":"bigint";if(t==="bool")return"boolean";if(t==="principal")return"string";if(t==="none")return"null";if(t==="trait_reference")return"string";throw new Error(`Unexpected Clarity ABI type primitive: ${JSON.stringify(t)}`)}else{if(kt(t))return"Uint8Array";if(Q(t)){let e=f(t.response.ok),n=f(t.response.error);return`Response<${e}, ${n}>`}else{if(Dt(t))return`${f(t.optional)} | null`;if(_t(t)){let e=[];return t.tuple.forEach(({name:n,type:o})=>{let i=f(o);e.push(`"${n}": ${i}`)}),`{
-  ${e.join(`;
-  `)}
-    }`}else{if(St(t))return`${f(t.list.type)}[]`;if(Ot(t))return"string";if(Lt(t))return"string";if(t==="trait_reference")return"string";throw new Error(`Unexpected Clarity ABI type: ${JSON.stringify(t)}`)}}}};function D(t){let r=S(t);return`${Mt(r,6)?"_":""}${r}`}var Rt={public:"Public",read_only:"ReadOnly",private:"Private"};function X(t){let r="";return t.functions.forEach((e,n)=>{let o=`${S(e.name)}: `;if(o+=`(${e.args.map(s=>`${D(s.name)}: ${f(s.type,!0)}`).join(", ")}) => `,o+=`ContractCalls.${Rt[e.access]}<`,e.access==="public"){let{type:s}=e.outputs;if(!Q(s))throw new Error("Expected response type for public function");let l=f(s.response.ok),p=f(s.response.error);o+=`${l}, ${p}>;`}else o+=`${f(e.outputs.type)}>;`;r+=`${n===0?"":`
-`}  ${o}`}),t.maps.forEach(e=>{let n=`${S(e.name)}: `,o=f(e.key,!0),i=`key: ${o}`,a=f(e.value);n+=`(${i}) => ContractCalls.Map<${o}, ${a}>;`,r+=`
-  ${n}`}),r}var Y=({contractName:t,abi:r})=>{let e=F(t,!0),s=r,{clarity_version:n}=s,o=j(s,["clarity_version"]),i=JSON.stringify(o,null,2);return`import { ClarityAbi } from '@clarigen/core';
-
-// prettier-ignore
-export const ${e}Interface: ClarityAbi = ${i};
-`},Z=({contractFile:t,contractAddress:r,contractName:e})=>{let n=F(e,!0),o=F(e),i=`${n}Contract`,a=`${n}Interface`;return`import { pureProxy, Contract } from '@clarigen/core';
-import type { ${i} } from './types';
-import { ${a} } from './abi';
-export type { ${i} } from './types';
-
-export function ${o}Contract(contractAddress: string, contractName: string) {
-  return pureProxy<${i}>({
-    abi: ${a},
-    contractAddress,
-    contractName,
-  });
-}
-
-export const ${o}Info: Contract<${i}> = {
-  contract: ${o}Contract,
-  address: '${r}',
-  contractFile: '${t}',
-  name: '${e}',
-  abi: ${a},
-};
-`},G=(t,r)=>{let e=F(r,!0),n=X(t);return`import { Response, ContractCalls } from '@clarigen/core';
-
-// prettier-ignore
-export interface ${e}Contract {
-${n}
-}
-`},tt=t=>{let r=["import type { ContractInstances } from '@clarigen/core';"],e=[],n=[],o="";"accounts"in t&&(o=`
-
-// prettier-ignore
-export const accounts = {
-  ${Object.keys(t.accounts).map(l=>{let p=t.accounts[l];return`"${l}": {
-    mnemonic: "${p.mnemonic}",
-    balance: ${p.balance.toString()}n,
-    address: "${p.address}",
-  },`}).join(`
-  `)}
-};`),t.contracts.forEach(s=>{let l=s.name,p=F(l),b=`${p}Info`,w=`${F(l,!0)}Contract`,g=Bt(s.file),d=`'./${Jt(g||".",l)}'`,c=`import { ${b} } from ${d};`;r.push(c);let m=`export type { ${w} } from ${d};`;e.push(m);let h=`${p}: ${b},`;n.push(h)});let i=`
-export type Contracts = ContractInstances<typeof contracts>;
-`;return`${r.join(`
-`)}
-${e.join(`
-`)}
-${i}
-export const contracts = {
-  ${n.join(`
-  `)}
-};${o}
-`};import{createClarityBin as ue,deployContract as ge}from"@clarigen/native-bin";import{resolve as $,relative as Ce,dirname as ye}from"path";import{mkdir as de}from"fs/promises";import{createContractDocInfo as Ut,generateMarkdown as Wt}from"@clarigen/claridocs";import{mkdir as zt,readFile as Kt,writeFile as et}from"fs/promises";import{relative as qt,resolve as V}from"path";async function rt({contractFile:t,contractName:r,docsPath:e,abi:n,dirName:o}){let i=await Kt(t,{encoding:"utf-8"}),a=Ut({contractSrc:i,abi:n}),s=V(process.cwd(),e,o||"."),l=V(s,`${r}.md`),p=Wt({contract:a,contractFile:qt(s,t),contractName:r,abi:n});await zt(s,{recursive:!0}),await et(l,p)}async function nt(t){if(!t.docs)return;let e=`# Contracts
-
-${t.contracts.map(o=>{let i=o.file.replace(".clar",".md");return`- [\`${o.name}\`](${i})`}).join(`
-`)}
-`,n=V(process.cwd(),t.docs,"README.md");await et(n,e)}import{toCamelCase as v}from"@clarigen/core";import{relative as Ht,resolve as Qt}from"path";import{readFile as Xt}from"fs/promises";import{inspect as O}from"util";function Yt(t){let{abi:r}=t,e=[],d=r,{functions:n,variables:o,maps:i}=d,a=j(d,["functions","variables","maps"]);n.forEach(c=>{let m=`${v(c.name)}: `,P=`[${c.args.map(_=>`${D(_.name)}: ${f(_.type,!0)}`).join(", ")}]`;m+=JSON.stringify(c);let ct=f(c.outputs.type);m+=` as TypedAbiFunction<${P}, ${ct}>`,e.push(m)});let s=t.variables.map(c=>{let m=`${v(c.name)}: `,h=f(c.type);return m+=`${O(c,!1,null,!1)} as TypedAbiVariable<${h}>`,m}),p=t.variables.filter(c=>c.access==="constant").map(c=>`"${v(c.name)}": ${Gt(c.defaultValue)}`),b=i.map(c=>{let m=`${v(c.name)}: `,h=f(c.key),P=f(c.value);return m+=JSON.stringify(c),m+=` as TypedAbiMap<${h}, ${P}>`,m}),w=JSON.stringify(a),g=Ht(process.cwd(),t.contractFile);return`{
-  ${I("functions",e)}
-  ${I("variables",s)}
-  ${I("maps",b)}
-  ${I("constants",p)}
-  ${w.slice(1,-1)},
-  contractName: '${t.contractName}',
-  contractFile: '${g}',
-  }`}async function ot(t,r){let e=r.map(a=>{let s=Yt(a);return`${v(a.contractName)}: ${s}`}),n=await te(),o=Zt(t);return`
-${n}
-
-export const contracts: Record<string, TypedAbi> = {
-  ${e.join(`,
-`)}
-} as const;
-
-${o}
-`}function Zt(t){let r="";return"accounts"in t&&(r=`export const accounts = {
-  ${Object.keys(t.accounts).map(n=>{let o=t.accounts[n];return`"${n}": {
-    mnemonic: "${o.mnemonic}",
-    balance: ${o.balance.toString()}n,
-    address: "${o.address}",
-  },`}).join(`
-  `)}
-} as const;`),r}Uint8Array.prototype[O.custom]=function(){return`Uint8Array.from([${this.join(",")}])`};function Gt(t){return O(t,!1,null,!1)}function I(t,r){return`"${t}": {
-    ${r.join(`,
-    `)}
-  },`}async function te(){let t=Qt(u,"../../../core/src/abi-types.ts");return await Xt(t,{encoding:"utf-8"})}import{writeFile as ee}from"fs/promises";import{basename as re}from"path";import{resolveConfig as ne,format as oe}from"prettier";var ie={printWidth:80,semi:!0,singleQuote:!0,trailingComma:"es5"};async function se(){try{let t=await ne(process.cwd());if(t)return t}catch{}return ie}async function ae(t,r){try{let e=re(r),n=await se();return oe(t,x(C({},n),{filepath:e}))}catch{}return t}async function T(t,r){let e=await ae(r,t);await ee(t,e)}import{cvToValue as ce}from"@clarigen/core";import{evalRaw as le}from"@clarigen/native-bin";import{hexToCV as pe}from"micro-stacks/clarity";async function it({abi:t,contractIdentifier:r,provider:e}){let n=t.variables.map(i=>fe({variable:i,provider:e,contractIdentifier:r}));return await Promise.all(n)}async function fe({contractIdentifier:t,variable:r,provider:e}){let n=me(r),o=await le({contractAddress:t,code:n,provider:e}),i=pe(o.output_serialized),a=ce(i,!0);return x(C({},r),{defaultValue:a})}function me(t){let{access:r}=t;return r==="variable"?`(var-get ${t.name})`:t.name}var $e=async({contractFile:t,outputFolder:r,provider:e,contractAddress:n,dirName:o,contractName:i,docsPath:a})=>{let s=$(process.cwd(),t),l=`${n}.${i}`,p=await ge({contractIdentifier:l,contractFilePath:s,provider:e}),b=await it({abi:p,contractIdentifier:l,provider:e}),w=G(p,i),g=Z({contractFile:Ce(process.cwd(),s),contractAddress:n,contractName:i}),d=Y({contractName:i,abi:p});typeof a<"u"&&await rt({contractFile:s,contractName:i,abi:p,docsPath:a,dirName:o});let c=$(r,o||".",i);return await de(c,{recursive:!0}),await T($(c,"abi.ts"),d),await T($(c,"index.ts"),g),await T($(c,"types.ts"),w),{abi:p,contractFile:s,contractName:i,dirName:o,contractAddress:n,variables:b}},k=async t=>{let r=await E(t),{contractsDir:e,outputDir:n,contracts:o}=r,i=$(t,n),a=await ue(),s=[];for(let g of o){let d=$(t,e,g.file),c=ye(g.file),m=await $e({contractFile:d,outputFolder:i,provider:a,contractAddress:g.address,dirName:c,contractName:g.name,docsPath:r.docs});s.push(m)}let l=tt(r);await nt(r);let p=$(i,"index.ts");await T(p,l);let b=await ot(r,s),w=$(i,"single.ts");await T(w,b)};import{watch as xe}from"chokidar";import{basename as we}from"path";import{red as Ae,green as at}from"chalk";var he=mt("ora"),L=class extends be{async run(){let{flags:r}=this.parse(L),e=process.cwd();if(r.watch){let n=he("Generating files").start(),{contractsDir:o}=await E(e),i=xe([o],{cwd:e});try{await k(e),n.succeed("Finished generating files. Watching for changes.")}catch(a){n.fail(`Error generating files.
-${a.message}`)}i.on("change",async a=>{let s=we(a);n.clear(),n.start(`Change detected for ${at(s)}, generating.`);try{await k(e),n.succeed(`Finished generating files for ${at(s)}. Watching for changes.`)}catch(l){let p=l.message;n.fail(`Error after saving ${Ae(s)}.
-${p}`)}}),process.on("SIGINT",async()=>{await i.close(),process.exit()})}else await k(e)}},A=L;A.description="Generate project files",A.strict=!0,A.hidden=!1,A.flags={help:st.help({char:"h"}),watch:st.boolean({char:"w",description:"Watch for changes to your contracts"})},A.args=[];export{A as Generate};

package/dist/index.d.ts

@@ -1,64 +0,0 @@
-export { run } from '@oclif/command';
-import { ClarityAbiType } from 'micro-stacks/clarity';
-import { ClarityAbi } from '@clarigen/core';
-import { NativeClarityBinProvider } from '@clarigen/native-bin';
-export { Generate } from './commands/index.js';
-import '@oclif/parser/lib/flags';
-
-interface ClarinetConfigAccount {
-    mnemonic: string;
-    balance: bigint;
-}
-interface ClarinetAccount extends ClarinetConfigAccount {
-    address: string;
-}
-interface ClarinetAccounts {
-    deployer: ClarinetAccount;
-    [name: string]: ClarinetAccount;
-}
-
-interface ConfigContract {
-    address: string;
-    file: string;
-    name: string;
-}
-interface ConfigFileContents {
-    outputDir: string;
-    clarinet: string;
-    docs?: string;
-}
-interface ConfigFile extends ConfigFileContents {
-    contractsDir: string;
-    contracts: ConfigContract[];
-    accounts: ClarinetAccounts;
-    clarinet: string;
-}
-declare const defaultConfigFile: ConfigFileContents;
-declare function configFilePath(rootPath: string): string;
-declare function configFileExists(configPath: string): Promise<boolean>;
-declare function getConfigFile(rootPath: string): Promise<ConfigFileContents>;
-declare function getProjectConfig(rootPath: string): Promise<ConfigFile>;
-
-declare const jsTypeFromAbiType: (val: ClarityAbiType, isArgument?: boolean) => string;
-declare function getArgName(name: string): string;
-declare function makePureTypes(abi: ClarityAbi): string;
-
-declare const generateInterface: ({ provider, contractFile, contractAddress, contractName, }: {
-    contractFile: string;
-    provider: NativeClarityBinProvider;
-    contractAddress: string;
-    contractName: string;
-}) => Promise<ClarityAbi>;
-declare const generateInterfaceFile: ({ contractName, abi, }: {
-    contractName: string;
-    abi: ClarityAbi;
-}) => string;
-declare const generateIndexFile: ({ contractFile, contractAddress, contractName, }: {
-    contractFile: string;
-    contractAddress: string;
-    contractName: string;
-}) => string;
-declare const generateTypesFile: (abi: ClarityAbi, contractName: string) => string;
-declare const generateProjectIndexFile: (config: ConfigFile) => string;
-
-export { ConfigContract, ConfigFile, ConfigFileContents, configFileExists, configFilePath, defaultConfigFile, generateIndexFile, generateInterface, generateInterfaceFile, generateProjectIndexFile, generateTypesFile, getArgName, getConfigFile, getProjectConfig, jsTypeFromAbiType, makePureTypes };