@metaplex-foundation/kinobi 0.7.0-alpha.5 → 0.7.0

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.
Files changed (17) hide show
  1. package/dist/cjs/Kinobi.js +1 -1
  2. package/dist/cjs/Kinobi.js.map +1 -1
  3. package/dist/cjs/renderers/js/templates/instructionsPageResolvedInputs.njk +10 -10
  4. package/dist/cjs/shared/AccountSeed.js +4 -1
  5. package/dist/cjs/shared/AccountSeed.js.map +1 -1
  6. package/dist/cjs/visitors/aggregators/GetResolvedInstructionInputsVisitor.js +1 -1
  7. package/dist/cjs/visitors/aggregators/GetResolvedInstructionInputsVisitor.js.map +1 -1
  8. package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js +18 -8
  9. package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js.map +1 -1
  10. package/dist/types/shared/AccountSeed.d.ts +1 -0
  11. package/dist/types/visitors/transformers/UpdateInstructionsVisitor.d.ts +4 -2
  12. package/package.json +1 -1
  13. package/src/Kinobi.ts +1 -1
  14. package/src/renderers/js/templates/instructionsPageResolvedInputs.njk +10 -10
  15. package/src/shared/AccountSeed.ts +6 -1
  16. package/src/visitors/aggregators/GetResolvedInstructionInputsVisitor.ts +1 -1
  17. package/src/visitors/transformers/UpdateInstructionsVisitor.ts +22 -8
package/dist/cjs/Kinobi.js CHANGED
@@ -34,7 +34,7 @@ function createFromIdls(idls) {
34
34
  }
35
35
  exports.createFromIdls = createFromIdls;
36
36
  function createFromJson(json) {
37
- return createFromRoot(JSON.parse(json));
37
+ return createFromRoot(JSON.parse(json), false);
38
38
  }
39
39
  exports.createFromJson = createFromJson;
40
40
  //# sourceMappingURL=Kinobi.js.map
package/dist/cjs/Kinobi.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Kinobi.js","sourceRoot":"","sources":["../../src/Kinobi.ts"],"names":[],"mappings":";;;AAAA,mCAOiB;AACjB,yCAA4D;AAU5D,SAAgB,cAAc,CAC5B,IAAc,EACd,iBAAiB,GAAG,IAAI;IAExB,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,iBAAiB,EAAE;QACrB,WAAW,GAAG,IAAA,gBAAK,EAAC,WAAW,EAAE,IAAI,yBAAc,EAAE,CAAC,CAAC;KACxD;IACD,OAAO;QACL,OAAO;YACL,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,OAAO;YACL,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,CAAI,OAAmB;YAC3B,OAAO,IAAA,gBAAK,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,CAAC,OAA6B;YAClC,MAAM,OAAO,GAAG,IAAA,gBAAK,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;YACxB,WAAW,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,KAAK;YACH,OAAO,cAAc,CAAC,IAAA,gBAAQ,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxD,CAAC;KACF,CAAC;AACJ,CAAC;AA3BD,wCA2BC;AAED,SAAgB,cAAc,CAAC,IAAe;IAC5C,OAAO,cAAc,CAAC,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC,CAAC;AAChD,CAAC;AAFD,wCAEC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC,CAAC;AACtD,CAAC;AAFD,wCAEC"}
1
+ {"version":3,"file":"Kinobi.js","sourceRoot":"","sources":["../../src/Kinobi.ts"],"names":[],"mappings":";;;AAAA,mCAOiB;AACjB,yCAA4D;AAU5D,SAAgB,cAAc,CAC5B,IAAc,EACd,iBAAiB,GAAG,IAAI;IAExB,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,iBAAiB,EAAE;QACrB,WAAW,GAAG,IAAA,gBAAK,EAAC,WAAW,EAAE,IAAI,yBAAc,EAAE,CAAC,CAAC;KACxD;IACD,OAAO;QACL,OAAO;YACL,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,OAAO;YACL,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,CAAI,OAAmB;YAC3B,OAAO,IAAA,gBAAK,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,CAAC,OAA6B;YAClC,MAAM,OAAO,GAAG,IAAA,gBAAK,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;YACxB,WAAW,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,KAAK;YACH,OAAO,cAAc,CAAC,IAAA,gBAAQ,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxD,CAAC;KACF,CAAC;AACJ,CAAC;AA3BD,wCA2BC;AAED,SAAgB,cAAc,CAAC,IAAe;IAC5C,OAAO,cAAc,CAAC,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC,CAAC;AAChD,CAAC;AAFD,wCAEC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,EAAE,KAAK,CAAC,CAAC;AAC7D,CAAC;AAFD,wCAEC"}
package/dist/cjs/renderers/js/templates/instructionsPageResolvedInputs.njk CHANGED
@@ -1,10 +1,10 @@
1
1
  {% set hasResolvedAccounts = accounts.length > 0 or hasResolvers %}
2
2
  {% set hasResolvedArgs = hasDataArgs or hasArgDefaults or hasResolvers %}
3
- {% macro getAccountObject(name, accountsObj) -%}
4
- {{ 'resolvingAccounts' if accountsWithDefaults.includes(name) else accountsObj }}
3
+ {% macro getAccountVar(name, accountsObj) -%}
4
+ {{ 'resolvingAccounts' if accountsWithDefaults.includes(name) else accountsObj }}.{{ name | camelCase }}
5
5
  {%- endmacro %}
6
- {% macro getArgObject(name, argsObj) -%}
7
- {{ 'resolvingArgs' if argsWithDefaults.includes(name) else argsObj }}
6
+ {% macro getArgVar(name, argsObj) -%}
7
+ {{ 'resolvingArgs' if argsWithDefaults.includes(name) else argsObj }}.{{ name | camelCase }}
8
8
  {%- endmacro %}
9
9
 
10
10
  {% if resolvedInputs.length > 0 or hasResolvedAccounts or hasResolvedArgs %}
@@ -19,7 +19,7 @@
19
19
  {% if input.kind === 'account' %}
20
20
  {% set accountPrefix %}resolvingAccounts, '{{ input.name | camelCase }}', {{ accountsObj }}.{{ input.name | camelCase }} ??{% endset %}
21
21
  {% if input.defaultsTo.kind === 'account' %}
22
- addObjectProperty({{ accountPrefix }} {{ getAccountObject(input.defaultsTo.name, accountsObj) }}.{{ input.defaultsTo.name | camelCase }});
22
+ addObjectProperty({{ accountPrefix }} {{ getAccountVar(input.defaultsTo.name, accountsObj) }});
23
23
  {% elif input.defaultsTo.kind === 'pda' %}
24
24
  addObjectProperty({{ accountPrefix }} find{{ input.defaultsTo.pdaAccount | pascalCase }}Pda(context,
25
25
  {%- if (input.defaultsTo.seeds | length) > 0 -%}
@@ -28,9 +28,9 @@
28
28
  {%- if seedValue.kind === 'value' -%}
29
29
  {{ seedKey }}: {{ seedValue.render }},
30
30
  {%- elif seedValue.kind === 'account' -%}
31
- {{ seedKey }}: publicKey({{ getAccountObject(seedValue.name, accountsObj) }}.{{ seedValue.name | camelCase }}),
31
+ {{ seedKey }}: publicKey({{ getAccountVar(seedValue.name, accountsObj) }}),
32
32
  {%- else -%}
33
- {{ seedKey }}: {{ getArgObject(seedValue.name, accountsObj) }}.{{ seedValue.name | camelCase }},
33
+ {{ seedKey }}: {{ getArgVar(seedValue.name, argsObj) }},
34
34
  {%- endif -%}
35
35
  {%- endfor -%}
36
36
  }
@@ -56,11 +56,11 @@
56
56
  {% elif input.kind === 'arg' %}
57
57
  {% set argPrefix %}resolvingArgs, '{{ input.name | camelCase }}', {{ argsObj }}.{{ input.name | camelCase }} ??{% endset %}
58
58
  {% if input.defaultsTo.kind === 'arg' %}
59
- addObjectProperty({{ argPrefix }} {{ getArgObject(input.defaultsTo.name, argsObj) }}.{{ input.defaultsTo.name | camelCase }});
59
+ addObjectProperty({{ argPrefix }} {{ getArgVar(input.defaultsTo.name, argsObj) }});
60
60
  {% elif input.defaultsTo.kind === 'account' %}
61
- addObjectProperty({{ argPrefix }} {{ getAccountObject(input.defaultsTo.name, accountsObj) }}.{{ input.defaultsTo.name | camelCase }});
61
+ addObjectProperty({{ argPrefix }} {{ getAccountVar(input.defaultsTo.name, accountsObj) }});
62
62
  {% elif input.defaultsTo.kind === 'accountBump' %}
63
- addObjectProperty({{ argPrefix }} {{ getAccountObject(input.defaultsTo.name, accountsObj) }}.{{ input.defaultsTo.name | camelCase }}.bump);
63
+ addObjectProperty({{ argPrefix }} {{ getAccountVar(input.defaultsTo.name, accountsObj) }}.bump);
64
64
  {% elif input.defaultsTo.kind === 'value' %}
65
65
  addObjectProperty({{ argPrefix }} {{ input.defaultsTo.render }});
66
66
  {% elif input.defaultsTo.kind === 'resolver' %}
package/dist/cjs/shared/AccountSeed.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.variableSeed = exports.literalSeed = exports.programSeed = void 0;
3
+ exports.publicKeySeed = exports.variableSeed = exports.literalSeed = exports.programSeed = void 0;
4
+ const nodes_1 = require("../nodes");
4
5
  const utils_1 = require("./utils");
5
6
  const programSeed = () => ({ kind: 'programId' });
6
7
  exports.programSeed = programSeed;
@@ -16,4 +17,6 @@ const variableSeed = (name, type, docs = []) => ({
16
17
  docs: Array.isArray(docs) ? docs : [docs],
17
18
  });
18
19
  exports.variableSeed = variableSeed;
20
+ const publicKeySeed = (name, docs = []) => (0, exports.variableSeed)(name, (0, nodes_1.publicKeyTypeNode)(), docs);
21
+ exports.publicKeySeed = publicKeySeed;
19
22
  //# sourceMappingURL=AccountSeed.js.map
package/dist/cjs/shared/AccountSeed.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AccountSeed.js","sourceRoot":"","sources":["../../../src/shared/AccountSeed.ts"],"names":[],"mappings":";;;AACA,mCAAmC;AAO5B,MAAM,WAAW,GAAG,GAAgB,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;AAAzD,QAAA,WAAW,eAA8C;AAE/D,MAAM,WAAW,GAAG,CAAC,KAAa,EAAe,EAAE,CAAC,CAAC;IAC1D,IAAI,EAAE,SAAS;IACf,KAAK;CACN,CAAC,CAAC;AAHU,QAAA,WAAW,eAGrB;AAEI,MAAM,YAAY,GAAG,CAC1B,IAAY,EACZ,IAAc,EACd,OAA0B,EAAE,EACf,EAAE,CAAC,CAAC;IACjB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC;IACpB,IAAI;IACJ,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;CAC1C,CAAC,CAAC;AATU,QAAA,YAAY,gBAStB"}
1
+ {"version":3,"file":"AccountSeed.js","sourceRoot":"","sources":["../../../src/shared/AccountSeed.ts"],"names":[],"mappings":";;;AAAA,oCAAuD;AACvD,mCAAmC;AAO5B,MAAM,WAAW,GAAG,GAAgB,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;AAAzD,QAAA,WAAW,eAA8C;AAE/D,MAAM,WAAW,GAAG,CAAC,KAAa,EAAe,EAAE,CAAC,CAAC;IAC1D,IAAI,EAAE,SAAS;IACf,KAAK;CACN,CAAC,CAAC;AAHU,QAAA,WAAW,eAGrB;AAEI,MAAM,YAAY,GAAG,CAC1B,IAAY,EACZ,IAAc,EACd,OAA0B,EAAE,EACf,EAAE,CAAC,CAAC;IACjB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC;IACpB,IAAI;IACJ,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;CAC1C,CAAC,CAAC;AATU,QAAA,YAAY,gBAStB;AAEI,MAAM,aAAa,GAAG,CAC3B,IAAY,EACZ,OAA0B,EAAE,EACf,EAAE,CAAC,IAAA,oBAAY,EAAC,IAAI,EAAE,IAAA,yBAAiB,GAAE,EAAE,IAAI,CAAC,CAAC;AAHnD,QAAA,aAAa,iBAGsC"}
package/dist/cjs/visitors/aggregators/GetResolvedInstructionInputsVisitor.js CHANGED
@@ -143,7 +143,7 @@ class GetResolvedInstructionInputsVisitor extends BaseThrowVisitor_1.BaseThrowVi
143
143
  break;
144
144
  case 'resolver':
145
145
  resolved.resolvedIsOptional =
146
- (_e = resolved.defaultsTo.resolvedIsOptional) !== null && _e !== void 0 ? _e : resolved.resolvedIsOptional;
146
+ (_e = resolved.defaultsTo.resolvedIsOptional) !== null && _e !== void 0 ? _e : false;
147
147
  resolved.resolvedIsSigner =
148
148
  (_f = resolved.defaultsTo.resolvedIsSigner) !== null && _f !== void 0 ? _f : resolved.resolvedIsSigner;
149
149
  break;
package/dist/cjs/visitors/aggregators/GetResolvedInstructionInputsVisitor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GetResolvedInstructionInputsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetResolvedInstructionInputsVisitor.ts"],"names":[],"mappings":";;;AAEA,0DAAuD;AA0BvD,MAAa,mCAAoC,SAAQ,mCAExD;IAFD;;QAGY,UAAK,GAA2B,EAAE,CAAC;QAEnC,aAAQ,GAA+B,EAAE,CAAC;QAE1C,oBAAe,GAAG,IAAI,GAAG,EAAsC,CAAC;QAEhE,gBAAW,GAAG,IAAI,GAAG,EAAkC,CAAC;QAExD,UAAK,GAAkB,IAAI,CAAC;IA2OxC,CAAC;IAzOC,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,gBAAgB,CACd,WAAkC;QAElC,6CAA6C;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAE7B,MAAM,MAAM,GAA2B;YACrC,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACxC,GAAG,OAAO;gBACV,IAAI,EAAE,SAAkB;aACzB,CAAC,CAAC;YACH,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,GAAG,CAC5C,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC1B,IAAI,EAAE,KAAc;gBACpB,IAAI,EAAE,OAAO;gBACb,UAAU,EAAE,UAAU;aACvB,CAAC,CACH;SACF,CAAC;QAEF,kCAAkC;QAClC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,uBAAuB,CACrB,WAAkC,EAClC,KAA2B;QAE3B,8CAA8C;QAC9C,IACE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAC1D;YACA,OAAO;SACR;QAED,8CAA8C;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAChC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,IAAI,IAAI,KAAK,KAAK,CAAC,IAAI,CAC/D,CAAC;QACF,IAAI,UAAU,EAAE;YACd,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CACpE,MAAM,CACP,CAAC;YACF,IAAI,CAAC,KAAK;gBACR,2DAA2D;oBAC3D,QAAQ,WAAW,CAAC,IAAI,iBAAiB;oBACzC,uCAAuC,KAAK,GAAG,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC7B;QAED,6CAA6C;QAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,MAAM,QAAQ,GACZ,KAAK,CAAC,IAAI,KAAK,SAAS;YACtB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,KAAK,CAAC;YACpD,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAEjB,4BAA4B;QAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7B,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;YAC/B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAChD;aAAM;YACL,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAC5C;IACH,CAAC;IAED,yBAAyB,CACvB,WAAkC,EAClC,OAA2B;;QAE3B,4BAA4B;QAC5B,MAAM,SAAS,GAA4B,EAAE,CAAC;QAC9C,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,SAAS,EAAE;YAC1C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;SACpE;aAAM,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,KAAK,EAAE;YAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;YACnC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC3B,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACzB;qBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;oBAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACrB;YACH,CAAC,CAAC,CAAC;YACH,SAAS,CAAC,IAAI,CACZ,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,EACpE,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CACjE,CAAC;SACH;aAAM,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,UAAU,EAAE;YAClD,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SACjD;QAED,oCAAoC;QACpC,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAErE,MAAM,QAAQ,GAA+B;YAC3C,GAAG,OAAO;YACV,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,IAAI,CAChD,CAAC,UAAU,EAAE,EAAE,CACb,UAAU,CAAC,IAAI,KAAK,aAAa,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CACxE;YACD,SAAS;YACT,gBAAgB,EAAE,OAAO,CAAC,QAAQ;YAClC,kBAAkB,EAAE,OAAO,CAAC,UAAU;SACvC,CAAC;QAEF,QAAQ,MAAA,QAAQ,CAAC,UAAU,0CAAE,IAAI,EAAE;YACjC,KAAK,SAAS;gBACZ,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAC7C,QAAQ,CAAC,UAAU,CAAC,IAAI,CACxB,CAAC;gBACH,MAAM,mBAAmB,GACvB,OAAO,CAAC,QAAQ,KAAK,KAAK,IAAI,cAAc,CAAC,QAAQ,KAAK,KAAK,CAAC;gBAClE,MAAM,gBAAgB,GACpB,OAAO,CAAC,QAAQ,KAAK,IAAI,IAAI,cAAc,CAAC,QAAQ,KAAK,IAAI,CAAC;gBAChE,MAAM,wBAAwB,GAC5B,CAAC,mBAAmB,IAAI,CAAC,gBAAgB,CAAC;gBAC5C,QAAQ,CAAC,gBAAgB,GAAG,wBAAwB;oBAClD,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,gBAAgB,CAAC;gBACrB,QAAQ,CAAC,kBAAkB,GAAG,cAAc,CAAC,UAAU,CAAC;gBACxD,MAAM;YACR,KAAK,WAAW,CAAC;YACjB,KAAK,SAAS,CAAC;YACf,KAAK,WAAW;gBACd,QAAQ,CAAC,gBAAgB;oBACvB,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAChD,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACpC,MAAM;YACR,KAAK,KAAK;gBACR,QAAQ,CAAC,gBAAgB;oBACvB,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAChD,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACpC,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC;gBACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBACrC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;wBAAE,OAAO;oBACpC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;oBACxD,IAAI,UAAU,CAAC,kBAAkB,EAAE;wBACjC,IAAI,CAAC,KAAK;4BACR,gCAAgC,IAAI,CAAC,IAAI,aAAa,OAAO,aAAa;gCAC1E,YAAY,OAAO,CAAC,IAAI,qBAAqB,WAAW,CAAC,IAAI,gBAAgB,CAAC;wBAChF,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBAC7B;gBACH,CAAC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,UAAU,CAAC;YAChB,KAAK,OAAO;gBACV,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACpC,MAAM;YACR,KAAK,UAAU;gBACb,QAAQ,CAAC,kBAAkB;oBACzB,MAAA,QAAQ,CAAC,UAAU,CAAC,kBAAkB,mCAAI,QAAQ,CAAC,kBAAkB,CAAC;gBACxE,QAAQ,CAAC,gBAAgB;oBACvB,MAAA,QAAQ,CAAC,UAAU,CAAC,gBAAgB,mCAAI,QAAQ,CAAC,gBAAgB,CAAC;gBACpE,MAAM;YACR;gBACE,MAAM;SACT;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,qBAAqB,CACnB,WAAkC,EAClC,GAAqC;QAErC,4BAA4B;QAC5B,MAAM,SAAS,GAA4B,EAAE,CAAC;QAC9C,IACE,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS;YACjC,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,aAAa,EACrC;YACA,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;SAChE;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE;YACxC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;SAC5D;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE;YAC7C,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SAC7C;QAED,oCAAoC;QACpC,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAEjE,OAAO,EAAE,GAAG,GAAG,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAED,8BAA8B,CAC5B,WAAkC,EAClC,MAA4B,EAC5B,YAAqC;QAErC,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;;YAClC,IAAI,KAAK,GAAgC,IAAI,CAAC;YAC9C,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;gBACjC,MAAM,iBAAiB,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CACjD,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CACvC,CAAC;gBACF,IAAI,CAAC,iBAAiB,EAAE;oBACtB,IAAI,CAAC,KAAK;wBACR,YAAY,UAAU,CAAC,IAAI,kCAAkC,MAAM,CAAC,IAAI,GAAG;4BAC3E,IAAI,MAAM,CAAC,IAAI,aAAa,WAAW,CAAC,IAAI,gBAAgB,CAAC;oBAC/D,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC7B;gBACD,KAAK,GAAG,EAAE,GAAG,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;aACnD;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE;gBACpC,MAAM,aAAa,GAAG,MAAA,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,mCAAI,IAAI,CAAC;gBACvE,IAAI,aAAa,EAAE;oBACjB,KAAK,GAAG;wBACN,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,UAAU,CAAC,IAAI;wBACrB,UAAU,EAAE,aAAa;qBAC1B,CAAC;iBACH;aACF;YACD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;aAClD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAtPD,kFAsPC"}
1
+ {"version":3,"file":"GetResolvedInstructionInputsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetResolvedInstructionInputsVisitor.ts"],"names":[],"mappings":"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"}
package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js CHANGED
@@ -69,24 +69,34 @@ class UpdateInstructionsVisitor extends TransformNodesVisitor_1.TransformNodesVi
69
69
  return super.visitRoot(root);
70
70
  }
71
71
  handleInstructionAccount(account, accountUpdates) {
72
- var _a;
73
72
  const accountUpdate = accountUpdates === null || accountUpdates === void 0 ? void 0 : accountUpdates[account.name];
74
- if (((_a = accountUpdate === null || accountUpdate === void 0 ? void 0 : accountUpdate.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'pda') {
75
- const pdaAccount = (0, shared_1.mainCase)(accountUpdate.defaultsTo.pdaAccount);
73
+ if (!accountUpdate)
74
+ return account;
75
+ const { defaultsTo, ...acountWithoutDefault } = {
76
+ ...account,
77
+ ...accountUpdate,
78
+ };
79
+ if (defaultsTo === null) {
80
+ return nodes.instructionAccountNode(acountWithoutDefault);
81
+ }
82
+ if ((defaultsTo === null || defaultsTo === void 0 ? void 0 : defaultsTo.kind) === 'pda') {
83
+ const pdaAccount = (0, shared_1.mainCase)(defaultsTo.pdaAccount);
76
84
  const foundAccount = this.allAccounts.get(pdaAccount);
77
85
  return {
78
- ...account,
79
- ...accountUpdate,
86
+ ...acountWithoutDefault,
80
87
  defaultsTo: {
81
- ...accountUpdate.defaultsTo,
88
+ ...defaultsTo,
82
89
  seeds: {
83
90
  ...(foundAccount ? (0, shared_1.getDefaultSeedsFromAccount)(foundAccount) : {}),
84
- ...accountUpdate.defaultsTo.seeds,
91
+ ...defaultsTo.seeds,
85
92
  },
86
93
  },
87
94
  };
88
95
  }
89
- return accountUpdate ? { ...account, ...accountUpdate } : account;
96
+ return nodes.instructionAccountNode({
97
+ ...acountWithoutDefault,
98
+ defaultsTo,
99
+ });
90
100
  }
91
101
  handleInstructionArgs(instruction, newInstructionName, argUpdates) {
92
102
  const usedArgs = new Set();
package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateInstructionsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/UpdateInstructionsVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UpdateInstructionsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/UpdateInstructionsVisitor.ts"],"names":[],"mappings":"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"}
package/dist/types/shared/AccountSeed.d.ts CHANGED
@@ -13,3 +13,4 @@ export type AccountSeed = {
13
13
  export declare const programSeed: () => AccountSeed;
14
14
  export declare const literalSeed: (value: string) => AccountSeed;
15
15
  export declare const variableSeed: (name: string, type: TypeNode, docs?: string | string[]) => AccountSeed;
16
+ export declare const publicKeySeed: (name: string, docs?: string | string[]) => AccountSeed;
package/dist/types/visitors/transformers/UpdateInstructionsVisitor.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as nodes from '../../nodes';
2
- import { InstructionArgDefault } from '../../shared';
2
+ import { InstructionAccountDefault, InstructionArgDefault } from '../../shared';
3
3
  import { NodeTransformer, TransformNodesVisitor } from './TransformNodesVisitor';
4
4
  export type InstructionUpdates = NodeTransformer<nodes.InstructionNode> | {
5
5
  delete: true;
@@ -8,7 +8,9 @@ export type InstructionUpdates = NodeTransformer<nodes.InstructionNode> | {
8
8
  args?: InstructionArgUpdates;
9
9
  });
10
10
  export type InstructionMetadataUpdates = Partial<Omit<nodes.InstructionNodeInput, 'accounts' | 'dataArgs' | 'extraArgs' | 'subInstructions' | 'argDefaults'>>;
11
- export type InstructionAccountUpdates = Record<string, Partial<nodes.InstructionAccountNodeInput>>;
11
+ export type InstructionAccountUpdates = Record<string, Partial<Omit<nodes.InstructionAccountNodeInput, 'defaultsTo'>> & {
12
+ defaultsTo?: InstructionAccountDefault | null;
13
+ }>;
12
14
  export type InstructionArgUpdates = Record<string, {
13
15
  name?: string;
14
16
  docs?: string[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@metaplex-foundation/kinobi",
3
- "version": "0.7.0-alpha.5",
3
+ "version": "0.7.0",
4
4
  "description": "Generate powerful clients for your Solana programs",
5
5
  "main": "dist/cjs/index.js",
6
6
  "types": "dist/types/index.d.ts",
package/src/Kinobi.ts CHANGED
@@ -50,5 +50,5 @@ export function createFromIdls(idls: IdlInputs): Kinobi {
50
50
  }
51
51
 
52
52
  export function createFromJson(json: string): Kinobi {
53
- return createFromRoot(JSON.parse(json) as RootNode);
53
+ return createFromRoot(JSON.parse(json) as RootNode, false);
54
54
  }
package/src/renderers/js/templates/instructionsPageResolvedInputs.njk CHANGED
@@ -1,10 +1,10 @@
1
1
  {% set hasResolvedAccounts = accounts.length > 0 or hasResolvers %}
2
2
  {% set hasResolvedArgs = hasDataArgs or hasArgDefaults or hasResolvers %}
3
- {% macro getAccountObject(name, accountsObj) -%}
4
- {{ 'resolvingAccounts' if accountsWithDefaults.includes(name) else accountsObj }}
3
+ {% macro getAccountVar(name, accountsObj) -%}
4
+ {{ 'resolvingAccounts' if accountsWithDefaults.includes(name) else accountsObj }}.{{ name | camelCase }}
5
5
  {%- endmacro %}
6
- {% macro getArgObject(name, argsObj) -%}
7
- {{ 'resolvingArgs' if argsWithDefaults.includes(name) else argsObj }}
6
+ {% macro getArgVar(name, argsObj) -%}
7
+ {{ 'resolvingArgs' if argsWithDefaults.includes(name) else argsObj }}.{{ name | camelCase }}
8
8
  {%- endmacro %}
9
9
 
10
10
  {% if resolvedInputs.length > 0 or hasResolvedAccounts or hasResolvedArgs %}
@@ -19,7 +19,7 @@
19
19
  {% if input.kind === 'account' %}
20
20
  {% set accountPrefix %}resolvingAccounts, '{{ input.name | camelCase }}', {{ accountsObj }}.{{ input.name | camelCase }} ??{% endset %}
21
21
  {% if input.defaultsTo.kind === 'account' %}
22
- addObjectProperty({{ accountPrefix }} {{ getAccountObject(input.defaultsTo.name, accountsObj) }}.{{ input.defaultsTo.name | camelCase }});
22
+ addObjectProperty({{ accountPrefix }} {{ getAccountVar(input.defaultsTo.name, accountsObj) }});
23
23
  {% elif input.defaultsTo.kind === 'pda' %}
24
24
  addObjectProperty({{ accountPrefix }} find{{ input.defaultsTo.pdaAccount | pascalCase }}Pda(context,
25
25
  {%- if (input.defaultsTo.seeds | length) > 0 -%}
@@ -28,9 +28,9 @@
28
28
  {%- if seedValue.kind === 'value' -%}
29
29
  {{ seedKey }}: {{ seedValue.render }},
30
30
  {%- elif seedValue.kind === 'account' -%}
31
- {{ seedKey }}: publicKey({{ getAccountObject(seedValue.name, accountsObj) }}.{{ seedValue.name | camelCase }}),
31
+ {{ seedKey }}: publicKey({{ getAccountVar(seedValue.name, accountsObj) }}),
32
32
  {%- else -%}
33
- {{ seedKey }}: {{ getArgObject(seedValue.name, accountsObj) }}.{{ seedValue.name | camelCase }},
33
+ {{ seedKey }}: {{ getArgVar(seedValue.name, argsObj) }},
34
34
  {%- endif -%}
35
35
  {%- endfor -%}
36
36
  }
@@ -56,11 +56,11 @@
56
56
  {% elif input.kind === 'arg' %}
57
57
  {% set argPrefix %}resolvingArgs, '{{ input.name | camelCase }}', {{ argsObj }}.{{ input.name | camelCase }} ??{% endset %}
58
58
  {% if input.defaultsTo.kind === 'arg' %}
59
- addObjectProperty({{ argPrefix }} {{ getArgObject(input.defaultsTo.name, argsObj) }}.{{ input.defaultsTo.name | camelCase }});
59
+ addObjectProperty({{ argPrefix }} {{ getArgVar(input.defaultsTo.name, argsObj) }});
60
60
  {% elif input.defaultsTo.kind === 'account' %}
61
- addObjectProperty({{ argPrefix }} {{ getAccountObject(input.defaultsTo.name, accountsObj) }}.{{ input.defaultsTo.name | camelCase }});
61
+ addObjectProperty({{ argPrefix }} {{ getAccountVar(input.defaultsTo.name, accountsObj) }});
62
62
  {% elif input.defaultsTo.kind === 'accountBump' %}
63
- addObjectProperty({{ argPrefix }} {{ getAccountObject(input.defaultsTo.name, accountsObj) }}.{{ input.defaultsTo.name | camelCase }}.bump);
63
+ addObjectProperty({{ argPrefix }} {{ getAccountVar(input.defaultsTo.name, accountsObj) }}.bump);
64
64
  {% elif input.defaultsTo.kind === 'value' %}
65
65
  addObjectProperty({{ argPrefix }} {{ input.defaultsTo.render }});
66
66
  {% elif input.defaultsTo.kind === 'resolver' %}
package/src/shared/AccountSeed.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { TypeNode } from '../nodes';
1
+ import { TypeNode, publicKeyTypeNode } from '../nodes';
2
2
  import { mainCase } from './utils';
3
3
 
4
4
  export type AccountSeed =
@@ -23,3 +23,8 @@ export const variableSeed = (
23
23
  type,
24
24
  docs: Array.isArray(docs) ? docs : [docs],
25
25
  });
26
+
27
+ export const publicKeySeed = (
28
+ name: string,
29
+ docs: string | string[] = []
30
+ ): AccountSeed => variableSeed(name, publicKeyTypeNode(), docs);
package/src/visitors/aggregators/GetResolvedInstructionInputsVisitor.ts CHANGED
@@ -205,7 +205,7 @@ export class GetResolvedInstructionInputsVisitor extends BaseThrowVisitor<
205
205
  break;
206
206
  case 'resolver':
207
207
  resolved.resolvedIsOptional =
208
- resolved.defaultsTo.resolvedIsOptional ?? resolved.resolvedIsOptional;
208
+ resolved.defaultsTo.resolvedIsOptional ?? false;
209
209
  resolved.resolvedIsSigner =
210
210
  resolved.defaultsTo.resolvedIsSigner ?? resolved.resolvedIsSigner;
211
211
  break;
package/src/visitors/transformers/UpdateInstructionsVisitor.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import * as nodes from '../../nodes';
2
2
  import {
3
+ InstructionAccountDefault,
3
4
  InstructionArgDefault,
4
5
  getDefaultSeedsFromAccount,
5
6
  mainCase,
@@ -27,7 +28,9 @@ export type InstructionMetadataUpdates = Partial<
27
28
 
28
29
  export type InstructionAccountUpdates = Record<
29
30
  string,
30
- Partial<nodes.InstructionAccountNodeInput>
31
+ Partial<Omit<nodes.InstructionAccountNodeInput, 'defaultsTo'>> & {
32
+ defaultsTo?: InstructionAccountDefault | null;
33
+ }
31
34
  >;
32
35
 
33
36
  export type InstructionArgUpdates = Record<
@@ -99,24 +102,35 @@ export class UpdateInstructionsVisitor extends TransformNodesVisitor {
99
102
  accountUpdates: InstructionAccountUpdates
100
103
  ): nodes.InstructionAccountNode {
101
104
  const accountUpdate = accountUpdates?.[account.name];
105
+ if (!accountUpdate) return account;
106
+ const { defaultsTo, ...acountWithoutDefault } = {
107
+ ...account,
108
+ ...accountUpdate,
109
+ };
110
+
111
+ if (defaultsTo === null) {
112
+ return nodes.instructionAccountNode(acountWithoutDefault);
113
+ }
102
114
 
103
- if (accountUpdate?.defaultsTo?.kind === 'pda') {
104
- const pdaAccount = mainCase(accountUpdate.defaultsTo.pdaAccount);
115
+ if (defaultsTo?.kind === 'pda') {
116
+ const pdaAccount = mainCase(defaultsTo.pdaAccount);
105
117
  const foundAccount = this.allAccounts.get(pdaAccount);
106
118
  return {
107
- ...account,
108
- ...accountUpdate,
119
+ ...acountWithoutDefault,
109
120
  defaultsTo: {
110
- ...accountUpdate.defaultsTo,
121
+ ...defaultsTo,
111
122
  seeds: {
112
123
  ...(foundAccount ? getDefaultSeedsFromAccount(foundAccount) : {}),
113
- ...accountUpdate.defaultsTo.seeds,
124
+ ...defaultsTo.seeds,
114
125
  },
115
126
  },
116
127
  };
117
128
  }
118
129
 
119
- return accountUpdate ? { ...account, ...accountUpdate } : account;
130
+ return nodes.instructionAccountNode({
131
+ ...acountWithoutDefault,
132
+ defaultsTo,
133
+ });
120
134
  }
121
135
 
122
136
  handleInstructionArgs(