@clarigen/cli 1.0.0-next.16 → 1.0.0-next.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/index.js +15 -15
- package/dist/commands/index.mjs +18 -18
- package/dist/index.js +15 -15
- package/dist/index.mjs +18 -18
- package/package.json +5 -5
- package/src/generate/declaration.ts +1 -1
- package/src/generate/files.ts +1 -1
package/dist/commands/index.js
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
var E=Object.defineProperty,ut=Object.defineProperties,mt=Object.getOwnPropertyDescriptor,Ct=Object.getOwnPropertyDescriptors,dt=Object.getOwnPropertyNames,T=Object.getOwnPropertySymbols;var _=Object.prototype.hasOwnProperty,W=Object.prototype.propertyIsEnumerable;var U=(t,r,n)=>r in t?E(t,r,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[r]=n,b=(t,r)=>{for(var n in r||(r={}))_.call(r,n)&&U(t,n,r[n]);if(T)for(var n of T(r))W.call(r,n)&&U(t,n,r[n]);return t},I=(t,r)=>ut(t,Ct(r));var V=(t,r)=>{var n={};for(var e in t)_.call(t,e)&&r.indexOf(e)<0&&(n[e]=t[e]);if(t!=null&&T)for(var e of T(t))r.indexOf(e)<0&&W.call(t,e)&&(n[e]=t[e]);return n};var yt=(t,r)=>{for(var n in r)E(t,n,{get:r[n],enumerable:!0})},$t=(t,r,n,e)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of dt(r))!_.call(t,o)&&o!==n&&E(t,o,{get:()=>r[o],enumerable:!(e=mt(r,o))||e.enumerable});return t};var xt=t=>$t(E({},"__esModule",{value:!0}),t);var Nt={};yt(Nt,{Generate:()=>C});module.exports=xt(Nt);var A=require("@oclif/command");var G=require("@clarigen/native-bin"),$=require("@clarigen/core"),v=require("path");var It=require("@oclif/command");var y=require("path"),k=require("fs/promises"),Y=require("fs");var B=require("@ltd/j-toml"),L=require("path"),R=require("fs/promises"),j=require("micro-stacks/wallet-sdk"),K=require("toposort"),q=require("micro-stacks/crypto");async function wt(t){let r=(0,L.resolve)(t,"settings","Devnet.toml"),n=await(0,R.readFile)(r,{encoding:"utf-8"});return(0,B.parse)(n,1,`
|
|
2
2
|
`,!0,{longer:!0})}async function ht(t){let r=(0,L.resolve)(t,"Clarinet.toml"),n=await(0,R.readFile)(r,{encoding:"utf-8"});return(0,B.parse)(n,1,`
|
|
3
|
-
`,!0)}async function H(t,r){let n=await ht(t),e=r.deployer.address;return bt(n.contracts).map(c=>({file:n.contracts[c].path.replace(/^contracts\//,""),address:e,name:c}))}function bt(t){let r=[],n=[];return Object.entries(t).forEach(([o,i])=>{n.push(o),i.depends_on.forEach(c=>r.push([o,c]))}),(0,K.array)(n,r).reverse()}async function Q(t){let r=await wt(t),n=await Promise.all(Object.entries(r.accounts).map(async([o,i])=>{let c=await(0,j.generateWallet)(i.mnemonic,"password"),[s]=c.accounts,a=(0,j.getStxAddressFromAccount)(s,q.StacksNetworkVersion.testnetP2PKH);return[o,I(b({},i),{address:a})]}));return Object.fromEntries(n)}var X={outputDir:"src/clarigen",clarinet:"."};function Ft(t){return(0,y.resolve)(t,"clarigen.config.json")}async function At(t){try{return await(0,k.access)(t,Y.constants.R_OK),!0}catch{return!1}}async function Pt(t){let r=Ft(t);if(await At(r)){let e=await(0,k.readFile)(r,{encoding:"utf-8"}),o=JSON.parse(e);return b(b({},X),o)}return X}async function N(t){let r=await Pt(t),n=(0,y.resolve)(t,r.clarinet||"."),e=await Q(n),o=await H(n,e),i=(0,y.relative)(process.cwd(),(0,y.join)(r.clarinet,"contracts"));return I(b({},r),{contracts:o,contractsDir:i,accounts:e,clarinet:r.clarinet||"."})}var
|
|
3
|
+
`,!0)}async function H(t,r){let n=await ht(t),e=r.deployer.address;return bt(n.contracts).map(c=>({file:n.contracts[c].path.replace(/^contracts\//,""),address:e,name:c}))}function bt(t){let r=[],n=[];return Object.entries(t).forEach(([o,i])=>{n.push(o),i.depends_on.forEach(c=>r.push([o,c]))}),(0,K.array)(n,r).reverse()}async function Q(t){let r=await wt(t),n=await Promise.all(Object.entries(r.accounts).map(async([o,i])=>{let c=await(0,j.generateWallet)(i.mnemonic,"password"),[s]=c.accounts,a=(0,j.getStxAddressFromAccount)(s,q.StacksNetworkVersion.testnetP2PKH);return[o,I(b({},i),{address:a})]}));return Object.fromEntries(n)}var X={outputDir:"src/clarigen",clarinet:"."};function Ft(t){return(0,y.resolve)(t,"clarigen.config.json")}async function At(t){try{return await(0,k.access)(t,Y.constants.R_OK),!0}catch{return!1}}async function Pt(t){let r=Ft(t);if(await At(r)){let e=await(0,k.readFile)(r,{encoding:"utf-8"}),o=JSON.parse(e);return b(b({},X),o)}return X}async function N(t){let r=await Pt(t),n=(0,y.resolve)(t,r.clarinet||"."),e=await Q(n),o=await H(n,e),i=(0,y.relative)(process.cwd(),(0,y.join)(r.clarinet,"contracts"));return I(b({},r),{contracts:o,contractsDir:i,accounts:e,clarinet:r.clarinet||"."})}var l=require("micro-stacks/transactions"),D=require("@clarigen/core"),Z=require("reserved-words"),g=(t,r=!1)=>{if((0,l.isClarityAbiPrimitive)(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((0,l.isClarityAbiBuffer)(t))return"Uint8Array";if((0,l.isClarityAbiResponse)(t)){let n=g(t.response.ok),e=g(t.response.error);return`Response<${n}, ${e}>`}else{if((0,l.isClarityAbiOptional)(t))return`${g(t.optional)} | null`;if((0,l.isClarityAbiTuple)(t)){let n=[];return t.tuple.forEach(({name:e,type:o})=>{let i=g(o);n.push(`"${e}": ${i}`)}),`{
|
|
4
4
|
${n.join(`;
|
|
5
5
|
`)}
|
|
6
|
-
}`}else{if((0,
|
|
6
|
+
}`}else{if((0,l.isClarityAbiList)(t))return`${g(t.list.type)}[]`;if((0,l.isClarityAbiStringAscii)(t))return"string";if((0,l.isClarityAbiStringUtf8)(t))return"string";if(t==="trait_reference")return"string";throw new Error(`Unexpected Clarity ABI type: ${JSON.stringify(t)}`)}}}};function Tt(t){let r=(0,D.toCamelCase)(t);return`${(0,Z.check)(r,6)?"_":""}${r}`}var Et={public:"Public",read_only:"ReadOnly",private:"Private"};function z(t){let r="";return t.functions.forEach((n,e)=>{let o=`${(0,D.toCamelCase)(n.name)}: `;if(o+=`(${n.args.map(s=>`${Tt(s.name)}: ${g(s.type,!0)}`).join(", ")}) => `,o+=`ContractCalls.${Et[n.access]}<`,n.access==="public"){let{type:s}=n.outputs;if(!(0,l.isClarityAbiResponse)(s))throw new Error("Expected response type for public function");let a=g(s.response.ok),f=g(s.response.error);o+=`${a}, ${f}>;`}else o+=`${g(n.outputs.type)}>;`;r+=`${e===0?"":`
|
|
7
7
|
`} ${o}`}),t.maps.forEach(n=>{let e=`${(0,D.toCamelCase)(n.name)}: `,o=g(n.key,!0),i=`key: ${o}`,c=g(n.value);e+=`(${i}) => ContractCalls.Map<${o}, ${c}>;`,r+=`
|
|
8
8
|
${e}`}),r}var tt=async({provider:t,contractFile:r,contractAddress:n,contractName:e})=>{let o=await t.runCommand(["launch",`${n}.${e}`,r,t.dbFilePath,"--output_analysis","--costs","--assets"]);if((0,G.hasStdErr)(o.stderr))throw new Error(`Error on ${r}:
|
|
9
9
|
${o.stderr}
|
|
10
10
|
`);let i=JSON.parse(o.stdout);if(i.error){let{initialization:s}=i.error;if(s!=null&&s.includes(`
|
|
11
11
|
Near:
|
|
12
|
-
`)){let[a,
|
|
12
|
+
`)){let[a,f]=s.split(`
|
|
13
13
|
Near:
|
|
14
|
-
`),u="",m=/start_line: (\d+),/.exec(
|
|
14
|
+
`),u="",m=/start_line: (\d+),/.exec(f);throw m&&(u=m[1]),new Error(`Error on ${r}:
|
|
15
15
|
${a}
|
|
16
16
|
${u?`Near line ${u}`:""}
|
|
17
17
|
Raw trace:
|
|
18
|
-
${
|
|
18
|
+
${f}
|
|
19
19
|
`)}throw new Error(`Error on ${r}:
|
|
20
20
|
${JSON.stringify(i.error,null,2)}
|
|
21
21
|
`)}return i.analysis},rt=({contractName:t,abi:r})=>{let n=(0,$.toCamelCase)(t,!0),s=r,{clarity_version:e}=s,o=V(s,["clarity_version"]),i=JSON.stringify(o,null,2);return`import { ClarityAbi } from '@clarigen/core';
|
|
@@ -42,7 +42,7 @@ export const ${o}Info: Contract<${i}> = {
|
|
|
42
42
|
name: '${n}',
|
|
43
43
|
abi: ${c},
|
|
44
44
|
};
|
|
45
|
-
`},et=(t,r)=>{let n=(0,$.toCamelCase)(r,!0),e=z(t);return`import {
|
|
45
|
+
`},et=(t,r)=>{let n=(0,$.toCamelCase)(r,!0),e=z(t);return`import { Response, ContractCalls } from '@clarigen/core';
|
|
46
46
|
|
|
47
47
|
// prettier-ignore
|
|
48
48
|
export interface ${n}Contract {
|
|
@@ -52,13 +52,13 @@ ${e}
|
|
|
52
52
|
|
|
53
53
|
// prettier-ignore
|
|
54
54
|
export const accounts = {
|
|
55
|
-
${Object.keys(t.accounts).map(a=>{let
|
|
56
|
-
mnemonic: "${
|
|
57
|
-
balance: ${
|
|
58
|
-
address: "${
|
|
55
|
+
${Object.keys(t.accounts).map(a=>{let f=t.accounts[a];return`"${a}": {
|
|
56
|
+
mnemonic: "${f.mnemonic}",
|
|
57
|
+
balance: ${f.balance.toString()}n,
|
|
58
|
+
address: "${f.address}",
|
|
59
59
|
},`}).join(`
|
|
60
60
|
`)}
|
|
61
|
-
};`),t.contracts.forEach(s=>{let a=s.name,
|
|
61
|
+
};`),t.contracts.forEach(s=>{let a=s.name,f=(0,$.toCamelCase)(a),u=`${f}Info`,h=`${(0,$.toCamelCase)(a,!0)}Contract`,m=(0,v.dirname)(s.file),M=`'./${(0,v.join)(m||".",a)}'`,lt=`import { ${u} } from ${M};`;r.push(lt);let pt=`export type { ${h} } from ${M};`;n.push(pt);let gt=`${f}: ${u},`;e.push(gt)});let i=`
|
|
62
62
|
export type Contracts = ContractInstances<typeof contracts>;
|
|
63
63
|
`;return`${r.join(`
|
|
64
64
|
`)}
|
|
@@ -69,10 +69,10 @@ export const contracts = {
|
|
|
69
69
|
${e.join(`
|
|
70
70
|
`)}
|
|
71
71
|
};${o}
|
|
72
|
-
`};var ct=require("@clarigen/native-bin"),p=require("path"),w=require("fs/promises");var S=require("@clarigen/claridocs"),x=require("fs/promises"),F=require("path");async function it({contractFile:t,contractName:r,docsPath:n,abi:e,dirName:o}){let i=await(0,x.readFile)(t,{encoding:"utf-8"}),c=(0,S.createContractDocInfo)({contractSrc:i,abi:e}),s=(0,F.resolve)(process.cwd(),n,o||"."),a=(0,F.resolve)(s,`${r}.md`),
|
|
72
|
+
`};var ct=require("@clarigen/native-bin"),p=require("path"),w=require("fs/promises");var S=require("@clarigen/claridocs"),x=require("fs/promises"),F=require("path");async function it({contractFile:t,contractName:r,docsPath:n,abi:e,dirName:o}){let i=await(0,x.readFile)(t,{encoding:"utf-8"}),c=(0,S.createContractDocInfo)({contractSrc:i,abi:e}),s=(0,F.resolve)(process.cwd(),n,o||"."),a=(0,F.resolve)(s,`${r}.md`),f=(0,S.generateMarkdown)({contract:c,contractFile:(0,F.relative)(s,t),contractName:r,abi:e});await(0,x.mkdir)(s,{recursive:!0}),await(0,x.writeFile)(a,f)}async function st(t){if(!t.docs)return;let n=`# Contracts
|
|
73
73
|
|
|
74
74
|
${t.contracts.map(o=>{let i=o.file.replace(".clar",".md");return`- [\`${o.name}\`](${i})`}).join(`
|
|
75
75
|
`)}
|
|
76
|
-
`,e=(0,F.resolve)(process.cwd(),t.docs,"README.md");await(0,x.writeFile)(e,n)}var jt=async({contractFile:t,outputFolder:r,provider:n,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=(0,p.resolve)(process.cwd(),t),a=await tt({contractFile:s,provider:n,contractAddress:e,contractName:i}),
|
|
77
|
-
${c.message}`)}i.on("change",async c=>{let s=(0,
|
|
78
|
-
${
|
|
76
|
+
`,e=(0,F.resolve)(process.cwd(),t.docs,"README.md");await(0,x.writeFile)(e,n)}var jt=async({contractFile:t,outputFolder:r,provider:n,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=(0,p.resolve)(process.cwd(),t),a=await tt({contractFile:s,provider:n,contractAddress:e,contractName:i}),f=et(a,i),u=nt({contractFile:(0,p.relative)(process.cwd(),s),contractAddress:e,contractName:i}),h=rt({contractName:i,abi:a});typeof c<"u"&&await it({contractFile:s,contractName:i,abi:a,docsPath:c,dirName:o});let m=(0,p.resolve)(r,o||".",i);await(0,w.mkdir)(m,{recursive:!0}),await(0,w.writeFile)((0,p.resolve)(m,"abi.ts"),h),await(0,w.writeFile)((0,p.resolve)(m,"index.ts"),u),await(0,w.writeFile)((0,p.resolve)(m,"types.ts"),f)},O=async t=>{let r=await N(t),{contractsDir:n,outputDir:e,contracts:o}=r,i=(0,p.resolve)(t,e),c=await(0,ct.createClarityBin)();for(let f of o){let u=(0,p.resolve)(t,n,f.file),h=(0,p.dirname)(f.file);await jt({contractFile:u,outputFolder:i,provider:c,contractAddress:f.address,dirName:h,contractName:f.name,docsPath:r.docs})}let s=ot(r);await st(r);let a=(0,p.resolve)(i,"index.ts");await(0,w.writeFile)(a,s)};var at=require("chokidar"),ft=require("path"),P=require("chalk"),kt=require("ora"),J=class extends A.Command{async run(){let{flags:r}=this.parse(J),n=process.cwd();if(r.watch){let e=kt("Generating files").start(),{contractsDir:o}=await N(n),i=(0,at.watch)([o],{cwd:n});try{await O(n),e.succeed("Finished generating files. Watching for changes.")}catch(c){e.fail(`Error generating files.
|
|
77
|
+
${c.message}`)}i.on("change",async c=>{let s=(0,ft.basename)(c);e.clear(),e.start(`Change detected for ${(0,P.green)(s)}, generating.`);try{await O(n),e.succeed(`Finished generating files for ${(0,P.green)(s)}. Watching for changes.`)}catch(a){let f=a.message;e.fail(`Error after saving ${(0,P.red)(s)}.
|
|
78
|
+
${f}`)}}),process.on("SIGINT",async()=>{await i.close(),process.exit()})}else await O(n)}},C=J;C.description="Generate project files",C.strict=!0,C.hidden=!1,C.flags={help:A.flags.help({char:"h"}),watch:A.flags.boolean({char:"w",description:"Watch for changes to your contracts"})},C.args=[];0&&(module.exports={Generate});
|
package/dist/commands/index.mjs
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
var rt=Object.defineProperty,nt=Object.defineProperties;var et=Object.getOwnPropertyDescriptors;var w=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,N=Object.prototype.propertyIsEnumerable;var j=(t,n,r)=>n in t?rt(t,n,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[n]=r,$=(t,n)=>{for(var r in n||(n={}))k.call(n,r)&&j(t,r,n[r]);if(w)for(var r of w(n))N.call(n,r)&&j(t,r,n[r]);return t},h=(t,n)=>nt(t,et(n));var ot=(t=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(t,{get:(n,r)=>(typeof require!="undefined"?require:n)[r]}):t)(function(t){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+t+'" is not supported')});var D=(t,n)=>{var r={};for(var e in t)k.call(t,e)&&n.indexOf(e)<0&&(r[e]=t[e]);if(t!=null&&w)for(var e of w(t))n.indexOf(e)<0&&N.call(t,e)&&(r[e]=t[e]);return r};import{Command as Wt,flags as Y}from"@oclif/command";import{hasStdErr as kt}from"@clarigen/native-bin";import{toCamelCase as x}from"@clarigen/core";import{dirname as Nt,join as Dt}from"path";import{run as Cr}from"@oclif/command";import{resolve as R,join as gt,relative as ut}from"path";import{readFile as mt,access as Ct}from"fs/promises";import{constants as dt}from"fs";import{parse as v}from"@ltd/j-toml";import{resolve as S}from"path";import{readFile as O}from"fs/promises";import{generateWallet as it,getStxAddressFromAccount as st}from"micro-stacks/wallet-sdk";import{array as ct}from"toposort";import{StacksNetworkVersion as at}from"micro-stacks/crypto";async function
|
|
2
|
-
`,!0,{longer:!0})}async function
|
|
3
|
-
`,!0)}async function _(t,n){let r=await
|
|
1
|
+
var rt=Object.defineProperty,nt=Object.defineProperties;var et=Object.getOwnPropertyDescriptors;var w=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,N=Object.prototype.propertyIsEnumerable;var j=(t,n,r)=>n in t?rt(t,n,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[n]=r,$=(t,n)=>{for(var r in n||(n={}))k.call(n,r)&&j(t,r,n[r]);if(w)for(var r of w(n))N.call(n,r)&&j(t,r,n[r]);return t},h=(t,n)=>nt(t,et(n));var ot=(t=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(t,{get:(n,r)=>(typeof require!="undefined"?require:n)[r]}):t)(function(t){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+t+'" is not supported')});var D=(t,n)=>{var r={};for(var e in t)k.call(t,e)&&n.indexOf(e)<0&&(r[e]=t[e]);if(t!=null&&w)for(var e of w(t))n.indexOf(e)<0&&N.call(t,e)&&(r[e]=t[e]);return r};import{Command as Wt,flags as Y}from"@oclif/command";import{hasStdErr as kt}from"@clarigen/native-bin";import{toCamelCase as x}from"@clarigen/core";import{dirname as Nt,join as Dt}from"path";import{run as Cr}from"@oclif/command";import{resolve as R,join as gt,relative as ut}from"path";import{readFile as mt,access as Ct}from"fs/promises";import{constants as dt}from"fs";import{parse as v}from"@ltd/j-toml";import{resolve as S}from"path";import{readFile as O}from"fs/promises";import{generateWallet as it,getStxAddressFromAccount as st}from"micro-stacks/wallet-sdk";import{array as ct}from"toposort";import{StacksNetworkVersion as at}from"micro-stacks/crypto";async function ft(t){let n=S(t,"settings","Devnet.toml"),r=await O(n,{encoding:"utf-8"});return v(r,1,`
|
|
2
|
+
`,!0,{longer:!0})}async function lt(t){let n=S(t,"Clarinet.toml"),r=await O(n,{encoding:"utf-8"});return v(r,1,`
|
|
3
|
+
`,!0)}async function _(t,n){let r=await lt(t),e=n.deployer.address;return pt(r.contracts).map(c=>({file:r.contracts[c].path.replace(/^contracts\//,""),address:e,name:c}))}function pt(t){let n=[],r=[];return Object.entries(t).forEach(([o,i])=>{r.push(o),i.depends_on.forEach(c=>n.push([o,c]))}),ct(r,n).reverse()}async function B(t){let n=await ft(t),r=await Promise.all(Object.entries(n.accounts).map(async([o,i])=>{let c=await it(i.mnemonic,"password"),[s]=c.accounts,a=st(s,at.testnetP2PKH);return[o,h($({},i),{address:a})]}));return Object.fromEntries(r)}var L={outputDir:"src/clarigen",clarinet:"."};function yt(t){return R(t,"clarigen.config.json")}async function $t(t){try{return await Ct(t,dt.R_OK),!0}catch{return!1}}async function xt(t){let n=yt(t);if(await $t(n)){let e=await mt(n,{encoding:"utf-8"}),o=JSON.parse(e);return $($({},L),o)}return L}async function b(t){let n=await xt(t),r=R(t,n.clarinet||"."),e=await B(r),o=await _(r,e),i=ut(process.cwd(),gt(n.clarinet,"contracts"));return h($({},n),{contracts:o,contractsDir:i,accounts:e,clarinet:n.clarinet||"."})}import{isClarityAbiBuffer as wt,isClarityAbiList as ht,isClarityAbiOptional as bt,isClarityAbiPrimitive as Ft,isClarityAbiResponse as J,isClarityAbiStringAscii as At,isClarityAbiStringUtf8 as Pt,isClarityAbiTuple as Tt}from"micro-stacks/transactions";import{toCamelCase as P}from"@clarigen/core";import{check as Et}from"reserved-words";var l=(t,n=!1)=>{if(Ft(t)){if(t==="uint128")return n?"number | bigint":"bigint";if(t==="int128")return n?"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(wt(t))return"Uint8Array";if(J(t)){let r=l(t.response.ok),e=l(t.response.error);return`Response<${r}, ${e}>`}else{if(bt(t))return`${l(t.optional)} | null`;if(Tt(t)){let r=[];return t.tuple.forEach(({name:e,type:o})=>{let i=l(o);r.push(`"${e}": ${i}`)}),`{
|
|
4
4
|
${r.join(`;
|
|
5
5
|
`)}
|
|
6
|
-
}`}else{if(ht(t))return`${
|
|
7
|
-
`} ${o}`}),t.maps.forEach(r=>{let e=`${P(r.name)}: `,o=
|
|
6
|
+
}`}else{if(ht(t))return`${l(t.list.type)}[]`;if(At(t))return"string";if(Pt(t))return"string";if(t==="trait_reference")return"string";throw new Error(`Unexpected Clarity ABI type: ${JSON.stringify(t)}`)}}}};function It(t){let n=P(t);return`${Et(n,6)?"_":""}${n}`}var jt={public:"Public",read_only:"ReadOnly",private:"Private"};function M(t){let n="";return t.functions.forEach((r,e)=>{let o=`${P(r.name)}: `;if(o+=`(${r.args.map(s=>`${It(s.name)}: ${l(s.type,!0)}`).join(", ")}) => `,o+=`ContractCalls.${jt[r.access]}<`,r.access==="public"){let{type:s}=r.outputs;if(!J(s))throw new Error("Expected response type for public function");let a=l(s.response.ok),f=l(s.response.error);o+=`${a}, ${f}>;`}else o+=`${l(r.outputs.type)}>;`;n+=`${e===0?"":`
|
|
7
|
+
`} ${o}`}),t.maps.forEach(r=>{let e=`${P(r.name)}: `,o=l(r.key,!0),i=`key: ${o}`,c=l(r.value);e+=`(${i}) => ContractCalls.Map<${o}, ${c}>;`,n+=`
|
|
8
8
|
${e}`}),n}var U=async({provider:t,contractFile:n,contractAddress:r,contractName:e})=>{let o=await t.runCommand(["launch",`${r}.${e}`,n,t.dbFilePath,"--output_analysis","--costs","--assets"]);if(kt(o.stderr))throw new Error(`Error on ${n}:
|
|
9
9
|
${o.stderr}
|
|
10
10
|
`);let i=JSON.parse(o.stdout);if(i.error){let{initialization:s}=i.error;if(s!=null&&s.includes(`
|
|
11
11
|
Near:
|
|
12
|
-
`)){let[a,
|
|
12
|
+
`)){let[a,f]=s.split(`
|
|
13
13
|
Near:
|
|
14
|
-
`),p="",g=/start_line: (\d+),/.exec(
|
|
14
|
+
`),p="",g=/start_line: (\d+),/.exec(f);throw g&&(p=g[1]),new Error(`Error on ${n}:
|
|
15
15
|
${a}
|
|
16
16
|
${p?`Near line ${p}`:""}
|
|
17
17
|
Raw trace:
|
|
18
|
-
${
|
|
18
|
+
${f}
|
|
19
19
|
`)}throw new Error(`Error on ${n}:
|
|
20
20
|
${JSON.stringify(i.error,null,2)}
|
|
21
21
|
`)}return i.analysis},W=({contractName:t,abi:n})=>{let r=x(t,!0),s=n,{clarity_version:e}=s,o=D(s,["clarity_version"]),i=JSON.stringify(o,null,2);return`import { ClarityAbi } from '@clarigen/core';
|
|
@@ -42,7 +42,7 @@ export const ${o}Info: Contract<${i}> = {
|
|
|
42
42
|
name: '${r}',
|
|
43
43
|
abi: ${c},
|
|
44
44
|
};
|
|
45
|
-
`},K=(t,n)=>{let r=x(n,!0),e=M(t);return`import {
|
|
45
|
+
`},K=(t,n)=>{let r=x(n,!0),e=M(t);return`import { Response, ContractCalls } from '@clarigen/core';
|
|
46
46
|
|
|
47
47
|
// prettier-ignore
|
|
48
48
|
export interface ${r}Contract {
|
|
@@ -52,13 +52,13 @@ ${e}
|
|
|
52
52
|
|
|
53
53
|
// prettier-ignore
|
|
54
54
|
export const accounts = {
|
|
55
|
-
${Object.keys(t.accounts).map(a=>{let
|
|
56
|
-
mnemonic: "${
|
|
57
|
-
balance: ${
|
|
58
|
-
address: "${
|
|
55
|
+
${Object.keys(t.accounts).map(a=>{let f=t.accounts[a];return`"${a}": {
|
|
56
|
+
mnemonic: "${f.mnemonic}",
|
|
57
|
+
balance: ${f.balance.toString()}n,
|
|
58
|
+
address: "${f.address}",
|
|
59
59
|
},`}).join(`
|
|
60
60
|
`)}
|
|
61
|
-
};`),t.contracts.forEach(s=>{let a=s.name,
|
|
61
|
+
};`),t.contracts.forEach(s=>{let a=s.name,f=x(a),p=`${f}Info`,y=`${x(a,!0)}Contract`,g=Nt(s.file),I=`'./${Dt(g||".",a)}'`,z=`import { ${p} } from ${I};`;n.push(z);let G=`export type { ${y} } from ${I};`;r.push(G);let tt=`${f}: ${p},`;e.push(tt)});let i=`
|
|
62
62
|
export type Contracts = ContractInstances<typeof contracts>;
|
|
63
63
|
`;return`${n.join(`
|
|
64
64
|
`)}
|
|
@@ -69,10 +69,10 @@ export const contracts = {
|
|
|
69
69
|
${e.join(`
|
|
70
70
|
`)}
|
|
71
71
|
};${o}
|
|
72
|
-
`};import{createClarityBin as Lt}from"@clarigen/native-bin";import{resolve as u,relative as Rt,dirname as Jt}from"path";import{mkdir as Mt,writeFile as F}from"fs/promises";import{createContractDocInfo as vt,generateMarkdown as St}from"@clarigen/claridocs";import{mkdir as Ot,readFile as _t,writeFile as H}from"fs/promises";import{relative as Bt,resolve as T}from"path";async function Q({contractFile:t,contractName:n,docsPath:r,abi:e,dirName:o}){let i=await _t(t,{encoding:"utf-8"}),c=vt({contractSrc:i,abi:e}),s=T(process.cwd(),r,o||"."),a=T(s,`${n}.md`),
|
|
72
|
+
`};import{createClarityBin as Lt}from"@clarigen/native-bin";import{resolve as u,relative as Rt,dirname as Jt}from"path";import{mkdir as Mt,writeFile as F}from"fs/promises";import{createContractDocInfo as vt,generateMarkdown as St}from"@clarigen/claridocs";import{mkdir as Ot,readFile as _t,writeFile as H}from"fs/promises";import{relative as Bt,resolve as T}from"path";async function Q({contractFile:t,contractName:n,docsPath:r,abi:e,dirName:o}){let i=await _t(t,{encoding:"utf-8"}),c=vt({contractSrc:i,abi:e}),s=T(process.cwd(),r,o||"."),a=T(s,`${n}.md`),f=St({contract:c,contractFile:Bt(s,t),contractName:n,abi:e});await Ot(s,{recursive:!0}),await H(a,f)}async function X(t){if(!t.docs)return;let r=`# Contracts
|
|
73
73
|
|
|
74
74
|
${t.contracts.map(o=>{let i=o.file.replace(".clar",".md");return`- [\`${o.name}\`](${i})`}).join(`
|
|
75
75
|
`)}
|
|
76
|
-
`,e=T(process.cwd(),t.docs,"README.md");await H(e,r)}var Ut=async({contractFile:t,outputFolder:n,provider:r,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=u(process.cwd(),t),a=await U({contractFile:s,provider:r,contractAddress:e,contractName:i}),
|
|
77
|
-
${c.message}`)}i.on("change",async c=>{let s=Kt(c);e.clear(),e.start(`Change detected for ${Z(s)}, generating.`);try{await A(r),e.succeed(`Finished generating files for ${Z(s)}. Watching for changes.`)}catch(a){let
|
|
78
|
-
${
|
|
76
|
+
`,e=T(process.cwd(),t.docs,"README.md");await H(e,r)}var Ut=async({contractFile:t,outputFolder:n,provider:r,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=u(process.cwd(),t),a=await U({contractFile:s,provider:r,contractAddress:e,contractName:i}),f=K(a,i),p=V({contractFile:Rt(process.cwd(),s),contractAddress:e,contractName:i}),y=W({contractName:i,abi:a});typeof c<"u"&&await Q({contractFile:s,contractName:i,abi:a,docsPath:c,dirName:o});let g=u(n,o||".",i);await Mt(g,{recursive:!0}),await F(u(g,"abi.ts"),y),await F(u(g,"index.ts"),p),await F(u(g,"types.ts"),f)},A=async t=>{let n=await b(t),{contractsDir:r,outputDir:e,contracts:o}=n,i=u(t,e),c=await Lt();for(let f of o){let p=u(t,r,f.file),y=Jt(f.file);await Ut({contractFile:p,outputFolder:i,provider:c,contractAddress:f.address,dirName:y,contractName:f.name,docsPath:n.docs})}let s=q(n);await X(n);let a=u(i,"index.ts");await F(a,s)};import{watch as Vt}from"chokidar";import{basename as Kt}from"path";import{red as qt,green as Z}from"chalk";var Ht=ot("ora"),E=class extends Wt{async run(){let{flags:n}=this.parse(E),r=process.cwd();if(n.watch){let e=Ht("Generating files").start(),{contractsDir:o}=await b(r),i=Vt([o],{cwd:r});try{await A(r),e.succeed("Finished generating files. Watching for changes.")}catch(c){e.fail(`Error generating files.
|
|
77
|
+
${c.message}`)}i.on("change",async c=>{let s=Kt(c);e.clear(),e.start(`Change detected for ${Z(s)}, generating.`);try{await A(r),e.succeed(`Finished generating files for ${Z(s)}. Watching for changes.`)}catch(a){let f=a.message;e.fail(`Error after saving ${qt(s)}.
|
|
78
|
+
${f}`)}}),process.on("SIGINT",async()=>{await i.close(),process.exit()})}else await A(r)}},d=E;d.description="Generate project files",d.strict=!0,d.hidden=!1,d.flags={help:Y.help({char:"h"}),watch:Y.boolean({char:"w",description:"Watch for changes to your contracts"})},d.args=[];export{d as Generate};
|
package/dist/index.js
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
var I=Object.defineProperty,yt=Object.defineProperties,$t=Object.getOwnPropertyDescriptor,xt=Object.getOwnPropertyDescriptors,wt=Object.getOwnPropertyNames,E=Object.getOwnPropertySymbols;var _=Object.prototype.hasOwnProperty,Y=Object.prototype.propertyIsEnumerable;var X=(t,r,n)=>r in t?I(t,r,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[r]=n,b=(t,r)=>{for(var n in r||(r={}))_.call(r,n)&&X(t,n,r[n]);if(E)for(var n of E(r))Y.call(r,n)&&X(t,n,r[n]);return t},j=(t,r)=>yt(t,xt(r));var Z=(t,r)=>{var n={};for(var e in t)_.call(t,e)&&r.indexOf(e)<0&&(n[e]=t[e]);if(t!=null&&E)for(var e of E(t))r.indexOf(e)<0&&Y.call(t,e)&&(n[e]=t[e]);return n};var ht=(t,r)=>{for(var n in r)I(t,n,{get:r[n],enumerable:!0})},bt=(t,r,n,e)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of wt(r))!_.call(t,o)&&o!==n&&I(t,o,{get:()=>r[o],enumerable:!(e=$t(r,o))||e.enumerable});return t};var Ft=t=>bt(I({},"__esModule",{value:!0}),t);var Nt={};ht(Nt,{Generate:()=>C,configFileExists:()=>ot,configFilePath:()=>et,defaultConfigFile:()=>J,generateIndexFile:()=>V,generateInterface:()=>U,generateInterfaceFile:()=>W,generateProjectIndexFile:()=>q,generateTypesFile:()=>K,getConfigFile:()=>it,getProjectConfig:()=>A,jsTypeFromAbiType:()=>g,makePureTypes:()=>M,run:()=>ut.run});module.exports=Ft(Nt);var ut=require("@oclif/command");var y=require("path"),N=require("fs/promises"),nt=require("fs");var B=require("@ltd/j-toml"),L=require("path"),R=require("fs/promises"),k=require("micro-stacks/wallet-sdk"),z=require("toposort"),G=require("micro-stacks/crypto");async function At(t){let r=(0,L.resolve)(t,"settings","Devnet.toml"),n=await(0,R.readFile)(r,{encoding:"utf-8"});return(0,B.parse)(n,1,`
|
|
2
2
|
`,!0,{longer:!0})}async function Pt(t){let r=(0,L.resolve)(t,"Clarinet.toml"),n=await(0,R.readFile)(r,{encoding:"utf-8"});return(0,B.parse)(n,1,`
|
|
3
|
-
`,!0)}async function tt(t,r){let n=await Pt(t),e=r.deployer.address;return Tt(n.contracts).map(c=>({file:n.contracts[c].path.replace(/^contracts\//,""),address:e,name:c}))}function Tt(t){let r=[],n=[];return Object.entries(t).forEach(([o,i])=>{n.push(o),i.depends_on.forEach(c=>r.push([o,c]))}),(0,z.array)(n,r).reverse()}async function rt(t){let r=await At(t),n=await Promise.all(Object.entries(r.accounts).map(async([o,i])=>{let c=await(0,k.generateWallet)(i.mnemonic,"password"),[s]=c.accounts,a=(0,k.getStxAddressFromAccount)(s,G.StacksNetworkVersion.testnetP2PKH);return[o,j(b({},i),{address:a})]}));return Object.fromEntries(n)}var J={outputDir:"src/clarigen",clarinet:"."};function et(t){return(0,y.resolve)(t,"clarigen.config.json")}async function ot(t){try{return await(0,N.access)(t,nt.constants.R_OK),!0}catch{return!1}}async function it(t){let r=et(t);if(await ot(r)){let e=await(0,N.readFile)(r,{encoding:"utf-8"}),o=JSON.parse(e);return b(b({},J),o)}return J}async function A(t){let r=await it(t),n=(0,y.resolve)(t,r.clarinet||"."),e=await rt(n),o=await tt(n,e),i=(0,y.relative)(process.cwd(),(0,y.join)(r.clarinet,"contracts"));return j(b({},r),{contracts:o,contractsDir:i,accounts:e,clarinet:r.clarinet||"."})}var
|
|
3
|
+
`,!0)}async function tt(t,r){let n=await Pt(t),e=r.deployer.address;return Tt(n.contracts).map(c=>({file:n.contracts[c].path.replace(/^contracts\//,""),address:e,name:c}))}function Tt(t){let r=[],n=[];return Object.entries(t).forEach(([o,i])=>{n.push(o),i.depends_on.forEach(c=>r.push([o,c]))}),(0,z.array)(n,r).reverse()}async function rt(t){let r=await At(t),n=await Promise.all(Object.entries(r.accounts).map(async([o,i])=>{let c=await(0,k.generateWallet)(i.mnemonic,"password"),[s]=c.accounts,a=(0,k.getStxAddressFromAccount)(s,G.StacksNetworkVersion.testnetP2PKH);return[o,j(b({},i),{address:a})]}));return Object.fromEntries(n)}var J={outputDir:"src/clarigen",clarinet:"."};function et(t){return(0,y.resolve)(t,"clarigen.config.json")}async function ot(t){try{return await(0,N.access)(t,nt.constants.R_OK),!0}catch{return!1}}async function it(t){let r=et(t);if(await ot(r)){let e=await(0,N.readFile)(r,{encoding:"utf-8"}),o=JSON.parse(e);return b(b({},J),o)}return J}async function A(t){let r=await it(t),n=(0,y.resolve)(t,r.clarinet||"."),e=await rt(n),o=await tt(n,e),i=(0,y.relative)(process.cwd(),(0,y.join)(r.clarinet,"contracts"));return j(b({},r),{contracts:o,contractsDir:i,accounts:e,clarinet:r.clarinet||"."})}var l=require("micro-stacks/transactions"),D=require("@clarigen/core"),st=require("reserved-words"),g=(t,r=!1)=>{if((0,l.isClarityAbiPrimitive)(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((0,l.isClarityAbiBuffer)(t))return"Uint8Array";if((0,l.isClarityAbiResponse)(t)){let n=g(t.response.ok),e=g(t.response.error);return`Response<${n}, ${e}>`}else{if((0,l.isClarityAbiOptional)(t))return`${g(t.optional)} | null`;if((0,l.isClarityAbiTuple)(t)){let n=[];return t.tuple.forEach(({name:e,type:o})=>{let i=g(o);n.push(`"${e}": ${i}`)}),`{
|
|
4
4
|
${n.join(`;
|
|
5
5
|
`)}
|
|
6
|
-
}`}else{if((0,
|
|
6
|
+
}`}else{if((0,l.isClarityAbiList)(t))return`${g(t.list.type)}[]`;if((0,l.isClarityAbiStringAscii)(t))return"string";if((0,l.isClarityAbiStringUtf8)(t))return"string";if(t==="trait_reference")return"string";throw new Error(`Unexpected Clarity ABI type: ${JSON.stringify(t)}`)}}}};function Et(t){let r=(0,D.toCamelCase)(t);return`${(0,st.check)(r,6)?"_":""}${r}`}var It={public:"Public",read_only:"ReadOnly",private:"Private"};function M(t){let r="";return t.functions.forEach((n,e)=>{let o=`${(0,D.toCamelCase)(n.name)}: `;if(o+=`(${n.args.map(s=>`${Et(s.name)}: ${g(s.type,!0)}`).join(", ")}) => `,o+=`ContractCalls.${It[n.access]}<`,n.access==="public"){let{type:s}=n.outputs;if(!(0,l.isClarityAbiResponse)(s))throw new Error("Expected response type for public function");let a=g(s.response.ok),f=g(s.response.error);o+=`${a}, ${f}>;`}else o+=`${g(n.outputs.type)}>;`;r+=`${e===0?"":`
|
|
7
7
|
`} ${o}`}),t.maps.forEach(n=>{let e=`${(0,D.toCamelCase)(n.name)}: `,o=g(n.key,!0),i=`key: ${o}`,c=g(n.value);e+=`(${i}) => ContractCalls.Map<${o}, ${c}>;`,r+=`
|
|
8
8
|
${e}`}),r}var ct=require("@clarigen/native-bin"),$=require("@clarigen/core"),v=require("path");var U=async({provider:t,contractFile:r,contractAddress:n,contractName:e})=>{let o=await t.runCommand(["launch",`${n}.${e}`,r,t.dbFilePath,"--output_analysis","--costs","--assets"]);if((0,ct.hasStdErr)(o.stderr))throw new Error(`Error on ${r}:
|
|
9
9
|
${o.stderr}
|
|
10
10
|
`);let i=JSON.parse(o.stdout);if(i.error){let{initialization:s}=i.error;if(s!=null&&s.includes(`
|
|
11
11
|
Near:
|
|
12
|
-
`)){let[a,
|
|
12
|
+
`)){let[a,f]=s.split(`
|
|
13
13
|
Near:
|
|
14
|
-
`),u="",m=/start_line: (\d+),/.exec(
|
|
14
|
+
`),u="",m=/start_line: (\d+),/.exec(f);throw m&&(u=m[1]),new Error(`Error on ${r}:
|
|
15
15
|
${a}
|
|
16
16
|
${u?`Near line ${u}`:""}
|
|
17
17
|
Raw trace:
|
|
18
|
-
${
|
|
18
|
+
${f}
|
|
19
19
|
`)}throw new Error(`Error on ${r}:
|
|
20
20
|
${JSON.stringify(i.error,null,2)}
|
|
21
21
|
`)}return i.analysis},W=({contractName:t,abi:r})=>{let n=(0,$.toCamelCase)(t,!0),s=r,{clarity_version:e}=s,o=Z(s,["clarity_version"]),i=JSON.stringify(o,null,2);return`import { ClarityAbi } from '@clarigen/core';
|
|
@@ -42,7 +42,7 @@ export const ${o}Info: Contract<${i}> = {
|
|
|
42
42
|
name: '${n}',
|
|
43
43
|
abi: ${c},
|
|
44
44
|
};
|
|
45
|
-
`},K=(t,r)=>{let n=(0,$.toCamelCase)(r,!0),e=M(t);return`import {
|
|
45
|
+
`},K=(t,r)=>{let n=(0,$.toCamelCase)(r,!0),e=M(t);return`import { Response, ContractCalls } from '@clarigen/core';
|
|
46
46
|
|
|
47
47
|
// prettier-ignore
|
|
48
48
|
export interface ${n}Contract {
|
|
@@ -52,13 +52,13 @@ ${e}
|
|
|
52
52
|
|
|
53
53
|
// prettier-ignore
|
|
54
54
|
export const accounts = {
|
|
55
|
-
${Object.keys(t.accounts).map(a=>{let
|
|
56
|
-
mnemonic: "${
|
|
57
|
-
balance: ${
|
|
58
|
-
address: "${
|
|
55
|
+
${Object.keys(t.accounts).map(a=>{let f=t.accounts[a];return`"${a}": {
|
|
56
|
+
mnemonic: "${f.mnemonic}",
|
|
57
|
+
balance: ${f.balance.toString()}n,
|
|
58
|
+
address: "${f.address}",
|
|
59
59
|
},`}).join(`
|
|
60
60
|
`)}
|
|
61
|
-
};`),t.contracts.forEach(s=>{let a=s.name,
|
|
61
|
+
};`),t.contracts.forEach(s=>{let a=s.name,f=(0,$.toCamelCase)(a),u=`${f}Info`,h=`${(0,$.toCamelCase)(a,!0)}Contract`,m=(0,v.dirname)(s.file),Q=`'./${(0,v.join)(m||".",a)}'`,mt=`import { ${u} } from ${Q};`;r.push(mt);let Ct=`export type { ${h} } from ${Q};`;n.push(Ct);let dt=`${f}: ${u},`;e.push(dt)});let i=`
|
|
62
62
|
export type Contracts = ContractInstances<typeof contracts>;
|
|
63
63
|
`;return`${r.join(`
|
|
64
64
|
`)}
|
|
@@ -69,10 +69,10 @@ export const contracts = {
|
|
|
69
69
|
${e.join(`
|
|
70
70
|
`)}
|
|
71
71
|
};${o}
|
|
72
|
-
`};var P=require("@oclif/command");var
|
|
72
|
+
`};var P=require("@oclif/command");var lt=require("@clarigen/native-bin"),p=require("path"),w=require("fs/promises");var S=require("@clarigen/claridocs"),x=require("fs/promises"),F=require("path");async function at({contractFile:t,contractName:r,docsPath:n,abi:e,dirName:o}){let i=await(0,x.readFile)(t,{encoding:"utf-8"}),c=(0,S.createContractDocInfo)({contractSrc:i,abi:e}),s=(0,F.resolve)(process.cwd(),n,o||"."),a=(0,F.resolve)(s,`${r}.md`),f=(0,S.generateMarkdown)({contract:c,contractFile:(0,F.relative)(s,t),contractName:r,abi:e});await(0,x.mkdir)(s,{recursive:!0}),await(0,x.writeFile)(a,f)}async function ft(t){if(!t.docs)return;let n=`# Contracts
|
|
73
73
|
|
|
74
74
|
${t.contracts.map(o=>{let i=o.file.replace(".clar",".md");return`- [\`${o.name}\`](${i})`}).join(`
|
|
75
75
|
`)}
|
|
76
|
-
`,e=(0,F.resolve)(process.cwd(),t.docs,"README.md");await(0,x.writeFile)(e,n)}var jt=async({contractFile:t,outputFolder:r,provider:n,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=(0,p.resolve)(process.cwd(),t),a=await U({contractFile:s,provider:n,contractAddress:e,contractName:i}),
|
|
77
|
-
${c.message}`)}i.on("change",async c=>{let s=(0,gt.basename)(c);e.clear(),e.start(`Change detected for ${(0,T.green)(s)}, generating.`);try{await O(n),e.succeed(`Finished generating files for ${(0,T.green)(s)}. Watching for changes.`)}catch(a){let
|
|
78
|
-
${
|
|
76
|
+
`,e=(0,F.resolve)(process.cwd(),t.docs,"README.md");await(0,x.writeFile)(e,n)}var jt=async({contractFile:t,outputFolder:r,provider:n,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=(0,p.resolve)(process.cwd(),t),a=await U({contractFile:s,provider:n,contractAddress:e,contractName:i}),f=K(a,i),u=V({contractFile:(0,p.relative)(process.cwd(),s),contractAddress:e,contractName:i}),h=W({contractName:i,abi:a});typeof c<"u"&&await at({contractFile:s,contractName:i,abi:a,docsPath:c,dirName:o});let m=(0,p.resolve)(r,o||".",i);await(0,w.mkdir)(m,{recursive:!0}),await(0,w.writeFile)((0,p.resolve)(m,"abi.ts"),h),await(0,w.writeFile)((0,p.resolve)(m,"index.ts"),u),await(0,w.writeFile)((0,p.resolve)(m,"types.ts"),f)},O=async t=>{let r=await A(t),{contractsDir:n,outputDir:e,contracts:o}=r,i=(0,p.resolve)(t,e),c=await(0,lt.createClarityBin)();for(let f of o){let u=(0,p.resolve)(t,n,f.file),h=(0,p.dirname)(f.file);await jt({contractFile:u,outputFolder:i,provider:c,contractAddress:f.address,dirName:h,contractName:f.name,docsPath:r.docs})}let s=q(r);await ft(r);let a=(0,p.resolve)(i,"index.ts");await(0,w.writeFile)(a,s)};var pt=require("chokidar"),gt=require("path"),T=require("chalk"),kt=require("ora"),H=class extends P.Command{async run(){let{flags:r}=this.parse(H),n=process.cwd();if(r.watch){let e=kt("Generating files").start(),{contractsDir:o}=await A(n),i=(0,pt.watch)([o],{cwd:n});try{await O(n),e.succeed("Finished generating files. Watching for changes.")}catch(c){e.fail(`Error generating files.
|
|
77
|
+
${c.message}`)}i.on("change",async c=>{let s=(0,gt.basename)(c);e.clear(),e.start(`Change detected for ${(0,T.green)(s)}, generating.`);try{await O(n),e.succeed(`Finished generating files for ${(0,T.green)(s)}. Watching for changes.`)}catch(a){let f=a.message;e.fail(`Error after saving ${(0,T.red)(s)}.
|
|
78
|
+
${f}`)}}),process.on("SIGINT",async()=>{await i.close(),process.exit()})}else await O(n)}},C=H;C.description="Generate project files",C.strict=!0,C.hidden=!1,C.flags={help:P.flags.help({char:"h"}),watch:P.flags.boolean({char:"w",description:"Watch for changes to your contracts"})},C.args=[];0&&(module.exports={Generate,configFileExists,configFilePath,defaultConfigFile,generateIndexFile,generateInterface,generateInterfaceFile,generateProjectIndexFile,generateTypesFile,getConfigFile,getProjectConfig,jsTypeFromAbiType,makePureTypes,run});
|
package/dist/index.mjs
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
var rt=Object.defineProperty,nt=Object.defineProperties;var et=Object.getOwnPropertyDescriptors;var w=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,N=Object.prototype.propertyIsEnumerable;var j=(t,n,r)=>n in t?rt(t,n,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[n]=r,$=(t,n)=>{for(var r in n||(n={}))k.call(n,r)&&j(t,r,n[r]);if(w)for(var r of w(n))N.call(n,r)&&j(t,r,n[r]);return t},h=(t,n)=>nt(t,et(n));var ot=(t=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(t,{get:(n,r)=>(typeof require!="undefined"?require:n)[r]}):t)(function(t){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+t+'" is not supported')});var D=(t,n)=>{var r={};for(var e in t)k.call(t,e)&&n.indexOf(e)<0&&(r[e]=t[e]);if(t!=null&&w)for(var e of w(t))n.indexOf(e)<0&&N.call(t,e)&&(r[e]=t[e]);return r};import{run as Vr}from"@oclif/command";import{resolve as R,join as gt,relative as ut}from"path";import{readFile as mt,access as Ct}from"fs/promises";import{constants as dt}from"fs";import{parse as v}from"@ltd/j-toml";import{resolve as S}from"path";import{readFile as O}from"fs/promises";import{generateWallet as it,getStxAddressFromAccount as st}from"micro-stacks/wallet-sdk";import{array as ct}from"toposort";import{StacksNetworkVersion as at}from"micro-stacks/crypto";async function
|
|
2
|
-
`,!0,{longer:!0})}async function
|
|
3
|
-
`,!0)}async function _(t,n){let r=await
|
|
1
|
+
var rt=Object.defineProperty,nt=Object.defineProperties;var et=Object.getOwnPropertyDescriptors;var w=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,N=Object.prototype.propertyIsEnumerable;var j=(t,n,r)=>n in t?rt(t,n,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[n]=r,$=(t,n)=>{for(var r in n||(n={}))k.call(n,r)&&j(t,r,n[r]);if(w)for(var r of w(n))N.call(n,r)&&j(t,r,n[r]);return t},h=(t,n)=>nt(t,et(n));var ot=(t=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(t,{get:(n,r)=>(typeof require!="undefined"?require:n)[r]}):t)(function(t){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+t+'" is not supported')});var D=(t,n)=>{var r={};for(var e in t)k.call(t,e)&&n.indexOf(e)<0&&(r[e]=t[e]);if(t!=null&&w)for(var e of w(t))n.indexOf(e)<0&&N.call(t,e)&&(r[e]=t[e]);return r};import{run as Vr}from"@oclif/command";import{resolve as R,join as gt,relative as ut}from"path";import{readFile as mt,access as Ct}from"fs/promises";import{constants as dt}from"fs";import{parse as v}from"@ltd/j-toml";import{resolve as S}from"path";import{readFile as O}from"fs/promises";import{generateWallet as it,getStxAddressFromAccount as st}from"micro-stacks/wallet-sdk";import{array as ct}from"toposort";import{StacksNetworkVersion as at}from"micro-stacks/crypto";async function ft(t){let n=S(t,"settings","Devnet.toml"),r=await O(n,{encoding:"utf-8"});return v(r,1,`
|
|
2
|
+
`,!0,{longer:!0})}async function lt(t){let n=S(t,"Clarinet.toml"),r=await O(n,{encoding:"utf-8"});return v(r,1,`
|
|
3
|
+
`,!0)}async function _(t,n){let r=await lt(t),e=n.deployer.address;return pt(r.contracts).map(c=>({file:r.contracts[c].path.replace(/^contracts\//,""),address:e,name:c}))}function pt(t){let n=[],r=[];return Object.entries(t).forEach(([o,i])=>{r.push(o),i.depends_on.forEach(c=>n.push([o,c]))}),ct(r,n).reverse()}async function B(t){let n=await ft(t),r=await Promise.all(Object.entries(n.accounts).map(async([o,i])=>{let c=await it(i.mnemonic,"password"),[s]=c.accounts,a=st(s,at.testnetP2PKH);return[o,h($({},i),{address:a})]}));return Object.fromEntries(r)}var L={outputDir:"src/clarigen",clarinet:"."};function yt(t){return R(t,"clarigen.config.json")}async function $t(t){try{return await Ct(t,dt.R_OK),!0}catch{return!1}}async function xt(t){let n=yt(t);if(await $t(n)){let e=await mt(n,{encoding:"utf-8"}),o=JSON.parse(e);return $($({},L),o)}return L}async function b(t){let n=await xt(t),r=R(t,n.clarinet||"."),e=await B(r),o=await _(r,e),i=ut(process.cwd(),gt(n.clarinet,"contracts"));return h($({},n),{contracts:o,contractsDir:i,accounts:e,clarinet:n.clarinet||"."})}import{isClarityAbiBuffer as wt,isClarityAbiList as ht,isClarityAbiOptional as bt,isClarityAbiPrimitive as Ft,isClarityAbiResponse as J,isClarityAbiStringAscii as At,isClarityAbiStringUtf8 as Pt,isClarityAbiTuple as Tt}from"micro-stacks/transactions";import{toCamelCase as P}from"@clarigen/core";import{check as Et}from"reserved-words";var l=(t,n=!1)=>{if(Ft(t)){if(t==="uint128")return n?"number | bigint":"bigint";if(t==="int128")return n?"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(wt(t))return"Uint8Array";if(J(t)){let r=l(t.response.ok),e=l(t.response.error);return`Response<${r}, ${e}>`}else{if(bt(t))return`${l(t.optional)} | null`;if(Tt(t)){let r=[];return t.tuple.forEach(({name:e,type:o})=>{let i=l(o);r.push(`"${e}": ${i}`)}),`{
|
|
4
4
|
${r.join(`;
|
|
5
5
|
`)}
|
|
6
|
-
}`}else{if(ht(t))return`${
|
|
7
|
-
`} ${o}`}),t.maps.forEach(r=>{let e=`${P(r.name)}: `,o=
|
|
6
|
+
}`}else{if(ht(t))return`${l(t.list.type)}[]`;if(At(t))return"string";if(Pt(t))return"string";if(t==="trait_reference")return"string";throw new Error(`Unexpected Clarity ABI type: ${JSON.stringify(t)}`)}}}};function It(t){let n=P(t);return`${Et(n,6)?"_":""}${n}`}var jt={public:"Public",read_only:"ReadOnly",private:"Private"};function M(t){let n="";return t.functions.forEach((r,e)=>{let o=`${P(r.name)}: `;if(o+=`(${r.args.map(s=>`${It(s.name)}: ${l(s.type,!0)}`).join(", ")}) => `,o+=`ContractCalls.${jt[r.access]}<`,r.access==="public"){let{type:s}=r.outputs;if(!J(s))throw new Error("Expected response type for public function");let a=l(s.response.ok),f=l(s.response.error);o+=`${a}, ${f}>;`}else o+=`${l(r.outputs.type)}>;`;n+=`${e===0?"":`
|
|
7
|
+
`} ${o}`}),t.maps.forEach(r=>{let e=`${P(r.name)}: `,o=l(r.key,!0),i=`key: ${o}`,c=l(r.value);e+=`(${i}) => ContractCalls.Map<${o}, ${c}>;`,n+=`
|
|
8
8
|
${e}`}),n}import{hasStdErr as kt}from"@clarigen/native-bin";import{toCamelCase as x}from"@clarigen/core";import{dirname as Nt,join as Dt}from"path";var U=async({provider:t,contractFile:n,contractAddress:r,contractName:e})=>{let o=await t.runCommand(["launch",`${r}.${e}`,n,t.dbFilePath,"--output_analysis","--costs","--assets"]);if(kt(o.stderr))throw new Error(`Error on ${n}:
|
|
9
9
|
${o.stderr}
|
|
10
10
|
`);let i=JSON.parse(o.stdout);if(i.error){let{initialization:s}=i.error;if(s!=null&&s.includes(`
|
|
11
11
|
Near:
|
|
12
|
-
`)){let[a,
|
|
12
|
+
`)){let[a,f]=s.split(`
|
|
13
13
|
Near:
|
|
14
|
-
`),p="",g=/start_line: (\d+),/.exec(
|
|
14
|
+
`),p="",g=/start_line: (\d+),/.exec(f);throw g&&(p=g[1]),new Error(`Error on ${n}:
|
|
15
15
|
${a}
|
|
16
16
|
${p?`Near line ${p}`:""}
|
|
17
17
|
Raw trace:
|
|
18
|
-
${
|
|
18
|
+
${f}
|
|
19
19
|
`)}throw new Error(`Error on ${n}:
|
|
20
20
|
${JSON.stringify(i.error,null,2)}
|
|
21
21
|
`)}return i.analysis},W=({contractName:t,abi:n})=>{let r=x(t,!0),s=n,{clarity_version:e}=s,o=D(s,["clarity_version"]),i=JSON.stringify(o,null,2);return`import { ClarityAbi } from '@clarigen/core';
|
|
@@ -42,7 +42,7 @@ export const ${o}Info: Contract<${i}> = {
|
|
|
42
42
|
name: '${r}',
|
|
43
43
|
abi: ${c},
|
|
44
44
|
};
|
|
45
|
-
`},K=(t,n)=>{let r=x(n,!0),e=M(t);return`import {
|
|
45
|
+
`},K=(t,n)=>{let r=x(n,!0),e=M(t);return`import { Response, ContractCalls } from '@clarigen/core';
|
|
46
46
|
|
|
47
47
|
// prettier-ignore
|
|
48
48
|
export interface ${r}Contract {
|
|
@@ -52,13 +52,13 @@ ${e}
|
|
|
52
52
|
|
|
53
53
|
// prettier-ignore
|
|
54
54
|
export const accounts = {
|
|
55
|
-
${Object.keys(t.accounts).map(a=>{let
|
|
56
|
-
mnemonic: "${
|
|
57
|
-
balance: ${
|
|
58
|
-
address: "${
|
|
55
|
+
${Object.keys(t.accounts).map(a=>{let f=t.accounts[a];return`"${a}": {
|
|
56
|
+
mnemonic: "${f.mnemonic}",
|
|
57
|
+
balance: ${f.balance.toString()}n,
|
|
58
|
+
address: "${f.address}",
|
|
59
59
|
},`}).join(`
|
|
60
60
|
`)}
|
|
61
|
-
};`),t.contracts.forEach(s=>{let a=s.name,
|
|
61
|
+
};`),t.contracts.forEach(s=>{let a=s.name,f=x(a),p=`${f}Info`,y=`${x(a,!0)}Contract`,g=Nt(s.file),I=`'./${Dt(g||".",a)}'`,z=`import { ${p} } from ${I};`;n.push(z);let G=`export type { ${y} } from ${I};`;r.push(G);let tt=`${f}: ${p},`;e.push(tt)});let i=`
|
|
62
62
|
export type Contracts = ContractInstances<typeof contracts>;
|
|
63
63
|
`;return`${n.join(`
|
|
64
64
|
`)}
|
|
@@ -69,10 +69,10 @@ export const contracts = {
|
|
|
69
69
|
${e.join(`
|
|
70
70
|
`)}
|
|
71
71
|
};${o}
|
|
72
|
-
`};import{Command as Wt,flags as Y}from"@oclif/command";import{createClarityBin as Lt}from"@clarigen/native-bin";import{resolve as u,relative as Rt,dirname as Jt}from"path";import{mkdir as Mt,writeFile as F}from"fs/promises";import{createContractDocInfo as vt,generateMarkdown as St}from"@clarigen/claridocs";import{mkdir as Ot,readFile as _t,writeFile as H}from"fs/promises";import{relative as Bt,resolve as T}from"path";async function Q({contractFile:t,contractName:n,docsPath:r,abi:e,dirName:o}){let i=await _t(t,{encoding:"utf-8"}),c=vt({contractSrc:i,abi:e}),s=T(process.cwd(),r,o||"."),a=T(s,`${n}.md`),
|
|
72
|
+
`};import{Command as Wt,flags as Y}from"@oclif/command";import{createClarityBin as Lt}from"@clarigen/native-bin";import{resolve as u,relative as Rt,dirname as Jt}from"path";import{mkdir as Mt,writeFile as F}from"fs/promises";import{createContractDocInfo as vt,generateMarkdown as St}from"@clarigen/claridocs";import{mkdir as Ot,readFile as _t,writeFile as H}from"fs/promises";import{relative as Bt,resolve as T}from"path";async function Q({contractFile:t,contractName:n,docsPath:r,abi:e,dirName:o}){let i=await _t(t,{encoding:"utf-8"}),c=vt({contractSrc:i,abi:e}),s=T(process.cwd(),r,o||"."),a=T(s,`${n}.md`),f=St({contract:c,contractFile:Bt(s,t),contractName:n,abi:e});await Ot(s,{recursive:!0}),await H(a,f)}async function X(t){if(!t.docs)return;let r=`# Contracts
|
|
73
73
|
|
|
74
74
|
${t.contracts.map(o=>{let i=o.file.replace(".clar",".md");return`- [\`${o.name}\`](${i})`}).join(`
|
|
75
75
|
`)}
|
|
76
|
-
`,e=T(process.cwd(),t.docs,"README.md");await H(e,r)}var Ut=async({contractFile:t,outputFolder:n,provider:r,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=u(process.cwd(),t),a=await U({contractFile:s,provider:r,contractAddress:e,contractName:i}),
|
|
77
|
-
${c.message}`)}i.on("change",async c=>{let s=Kt(c);e.clear(),e.start(`Change detected for ${Z(s)}, generating.`);try{await A(r),e.succeed(`Finished generating files for ${Z(s)}. Watching for changes.`)}catch(a){let
|
|
78
|
-
${
|
|
76
|
+
`,e=T(process.cwd(),t.docs,"README.md");await H(e,r)}var Ut=async({contractFile:t,outputFolder:n,provider:r,contractAddress:e,dirName:o,contractName:i,docsPath:c})=>{let s=u(process.cwd(),t),a=await U({contractFile:s,provider:r,contractAddress:e,contractName:i}),f=K(a,i),p=V({contractFile:Rt(process.cwd(),s),contractAddress:e,contractName:i}),y=W({contractName:i,abi:a});typeof c<"u"&&await Q({contractFile:s,contractName:i,abi:a,docsPath:c,dirName:o});let g=u(n,o||".",i);await Mt(g,{recursive:!0}),await F(u(g,"abi.ts"),y),await F(u(g,"index.ts"),p),await F(u(g,"types.ts"),f)},A=async t=>{let n=await b(t),{contractsDir:r,outputDir:e,contracts:o}=n,i=u(t,e),c=await Lt();for(let f of o){let p=u(t,r,f.file),y=Jt(f.file);await Ut({contractFile:p,outputFolder:i,provider:c,contractAddress:f.address,dirName:y,contractName:f.name,docsPath:n.docs})}let s=q(n);await X(n);let a=u(i,"index.ts");await F(a,s)};import{watch as Vt}from"chokidar";import{basename as Kt}from"path";import{red as qt,green as Z}from"chalk";var Ht=ot("ora"),E=class extends Wt{async run(){let{flags:n}=this.parse(E),r=process.cwd();if(n.watch){let e=Ht("Generating files").start(),{contractsDir:o}=await b(r),i=Vt([o],{cwd:r});try{await A(r),e.succeed("Finished generating files. Watching for changes.")}catch(c){e.fail(`Error generating files.
|
|
77
|
+
${c.message}`)}i.on("change",async c=>{let s=Kt(c);e.clear(),e.start(`Change detected for ${Z(s)}, generating.`);try{await A(r),e.succeed(`Finished generating files for ${Z(s)}. Watching for changes.`)}catch(a){let f=a.message;e.fail(`Error after saving ${qt(s)}.
|
|
78
|
+
${f}`)}}),process.on("SIGINT",async()=>{await i.close(),process.exit()})}else await A(r)}},d=E;d.description="Generate project files",d.strict=!0,d.hidden=!1,d.flags={help:Y.help({char:"h"}),watch:Y.boolean({char:"w",description:"Watch for changes to your contracts"})},d.args=[];export{d as Generate,$t as configFileExists,yt as configFilePath,L as defaultConfigFile,V as generateIndexFile,U as generateInterface,W as generateInterfaceFile,q as generateProjectIndexFile,K as generateTypesFile,xt as getConfigFile,b as getProjectConfig,l as jsTypeFromAbiType,M as makePureTypes,Vr as run};
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@clarigen/cli",
|
|
3
3
|
"description": "A CLI for generating a Typescript interface for a Clarity contract.",
|
|
4
4
|
"author": "Hank Stoever",
|
|
5
|
-
"version": "1.0.0-next.
|
|
5
|
+
"version": "1.0.0-next.17",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"types": "./dist/index.d.ts",
|
|
8
8
|
"main": "./dist/index.js",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
"ts-node": "^9.1.1"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@clarigen/claridocs": "1.0.0-next.
|
|
53
|
-
"@clarigen/core": "1.0.0-next.
|
|
54
|
-
"@clarigen/native-bin": "1.0.0-next.
|
|
52
|
+
"@clarigen/claridocs": "1.0.0-next.17",
|
|
53
|
+
"@clarigen/core": "1.0.0-next.17",
|
|
54
|
+
"@clarigen/native-bin": "1.0.0-next.17",
|
|
55
55
|
"@ltd/j-toml": "1.12.2",
|
|
56
56
|
"@oclif/command": "^1.8.0",
|
|
57
57
|
"@oclif/config": "^1.17.0",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "6f61daa93601c4f1517dcd83b4e027a688f2fb6c"
|
|
70
70
|
}
|
|
@@ -41,7 +41,7 @@ export const jsTypeFromAbiType = (
|
|
|
41
41
|
} else if (isClarityAbiResponse(val)) {
|
|
42
42
|
const ok: any = jsTypeFromAbiType(val.response.ok);
|
|
43
43
|
const err: any = jsTypeFromAbiType(val.response.error);
|
|
44
|
-
return `
|
|
44
|
+
return `Response<${ok}, ${err}>`;
|
|
45
45
|
} else if (isClarityAbiOptional(val)) {
|
|
46
46
|
const innerType = jsTypeFromAbiType(val.optional);
|
|
47
47
|
return `${innerType} | null`;
|
package/src/generate/files.ts
CHANGED
|
@@ -115,7 +115,7 @@ export const ${varName}Info: Contract<${contractType}> = {
|
|
|
115
115
|
export const generateTypesFile = (abi: ClarityAbi, contractName: string) => {
|
|
116
116
|
const name = toCamelCase(contractName, true);
|
|
117
117
|
const typings = makePureTypes(abi);
|
|
118
|
-
const fileContents = `import {
|
|
118
|
+
const fileContents = `import { Response, ContractCalls } from '@clarigen/core';
|
|
119
119
|
|
|
120
120
|
// prettier-ignore
|
|
121
121
|
export interface ${name}Contract {
|