@typemove/move 1.0.0-rc.13 → 1.0.0-rc.14

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 (10) hide show
  1. package/dist/abstract-codegen.d.ts +1 -1
  2. package/dist/abstract-codegen.d.ts.map +1 -1
  3. package/dist/abstract-codegen.js +13 -30
  4. package/dist/abstract-codegen.js.map +1 -1
  5. package/dist/internal-models.d.ts +1 -0
  6. package/dist/internal-models.d.ts.map +1 -1
  7. package/dist/internal-models.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/abstract-codegen.ts +38 -115
  10. package/src/internal-models.ts +1 -0
package/dist/abstract-codegen.d.ts CHANGED
@@ -27,7 +27,7 @@ export declare abstract class AbstractCodegen<ModuleTypes, StructType> {
27
27
  readModulesFile(fullPath: string): any;
28
28
  generate(srcDir: string, outputDir: string, builtin?: boolean): Promise<number>;
29
29
  protected generateModuleExtra(module: InternalMoveModule, allEventStructs: Map<string, InternalMoveStruct>): string;
30
- protected generateBuilder(module: InternalMoveModule): string;
30
+ protected generateExtra(module: InternalMoveModule): string;
31
31
  generateModule(module: InternalMoveModule, allEventStructs: Map<string, InternalMoveStruct>): string;
32
32
  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>, typeOnly?: boolean): string;
33
33
  generateFunctionTypeParameters(func: InternalMoveFunction): string;
package/dist/abstract-codegen.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-codegen.d.ts","sourceRoot":"","sources":["../src/abstract-codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAEpB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,sBAAsB,CAAA;AAG7B,OAAO,EAA4B,eAAe,EAAE,MAAM,cAAc,CAAA;AAYxE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,UAAU,UAAU;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,MAAM;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAElB;AAGD,8BAAsB,eAAe,CAAC,WAAW,EAAE,UAAU;IAG3D,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,MAAM,CAAS;IAClC,eAAe,UAAQ;IACvB,iBAAiB,UAAO;IACxB,gBAAgB,UAAQ;IACxB,cAAc,cAAiC;IAC/C,GAAG,UAAO;IAEV,YAAY,EAAE,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAEnD,SAAS,aAAa,YAAY,EAAE,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC;IAIlE,cAAc;IAIrB,eAAe,CAAC,QAAQ,EAAE,MAAM;IAI1B,QAAQ,CACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EAEjB,OAAO,UAAQ;IAuHjB,SAAS,CAAC,mBAAmB,CAC3B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAMlD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,kBAAkB;IAIpD,cAAc,CACZ,MAAM,EAAE,kBAAkB,EAC1B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAwDlD,eAAe,CACb,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EACnB,QAAQ,UAAQ;IA6DlB,8BAA8B,CAAC,IAAI,EAAE,oBAAoB;IAazD,4BAA4B,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,UAAQ;IA4BvE,uBAAuB,CACrB,MAAM,EAAE,kBAAkB,EAC1B,IAAI,EAAE,oBAAoB;IA2B5B,uBAAuB,CACrB,MAAM,EAAE,kBAAkB,EAC1B,IAAI,EAAE,oBAAoB;IAyC5B,iBAAiB,CACf,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,kBAAkB,GACzB,MAAM;IAIT,yBAAyB,CACvB,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,MAAM,GACrB,MAAM;IAyET,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM;IAgBhE,eAAe;CAWhB;AAED,qBAAa,cAAc,CAAC,UAAU,EAAE,UAAU;IAChD,OAAO,EAAE,kBAAkB,EAAE,CAAA;IAC7B,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,UAAU,EAAE,CAAA;IACjB,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;gBAGhD,SAAS,EAAE,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,EAClD,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,UAAU,EAAE,EACjB,OAAO,EAAE,kBAAkB,EAAE,EAC7B,MAAM,EAAE,MAAM;IAUhB,QAAQ,IAAI,UAAU,EAAE;CAuFzB"}
1
+ {"version":3,"file":"abstract-codegen.d.ts","sourceRoot":"","sources":["../src/abstract-codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAEpB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,sBAAsB,CAAA;AAG7B,OAAO,EAA4B,eAAe,EAAE,MAAM,cAAc,CAAA;AAIxE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,UAAU,UAAU;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,MAAM;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAElB;AAGD,8BAAsB,eAAe,CAAC,WAAW,EAAE,UAAU;IAG3D,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,MAAM,CAAS;IAClC,eAAe,UAAQ;IACvB,iBAAiB,UAAO;IACxB,gBAAgB,UAAQ;IACxB,cAAc,cAAiC;IAC/C,GAAG,UAAO;IAEV,YAAY,EAAE,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAEnD,SAAS,aAAa,YAAY,EAAE,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC;IAIlE,cAAc;IAIrB,eAAe,CAAC,QAAQ,EAAE,MAAM;IAI1B,QAAQ,CACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EAEjB,OAAO,UAAQ;IAwGjB,SAAS,CAAC,mBAAmB,CAC3B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAMlD,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,kBAAkB;IAIlD,cAAc,CACZ,MAAM,EAAE,kBAAkB,EAC1B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAkDlD,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,UAAQ;IA4D7G,8BAA8B,CAAC,IAAI,EAAE,oBAAoB;IAazD,4BAA4B,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,UAAQ;IA4BvE,uBAAuB,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,oBAAoB;IAqB9E,uBAAuB,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,oBAAoB;IAkC9E,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,kBAAkB,GAAG,MAAM;IAIjF,yBAAyB,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM;IA4D/E,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM;IAgBhE,eAAe;CAWhB;AAED,qBAAa,cAAc,CAAC,UAAU,EAAE,UAAU;IAChD,OAAO,EAAE,kBAAkB,EAAE,CAAA;IAC7B,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,UAAU,EAAE,CAAA;IACjB,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;gBAGhD,SAAS,EAAE,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,EAClD,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,UAAU,EAAE,EACjB,OAAO,EAAE,kBAAkB,EAAE,EAC7B,MAAM,EAAE,MAAM;IAUhB,QAAQ,IAAI,UAAU,EAAE;CAgFzB"}
package/dist/abstract-codegen.js CHANGED
@@ -4,7 +4,7 @@ import fs from 'fs';
4
4
  import { AccountModulesImportInfo, AccountRegister } from './account.js';
5
5
  import chalk from 'chalk';
6
6
  import { format } from 'prettier';
7
- import { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER, upperFirst, VECTOR_STR, camel, } from './utils.js';
7
+ import { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER, upperFirst, VECTOR_STR, camel } from './utils.js';
8
8
  // TODO be able to generate cjs
9
9
  export class AbstractCodegen {
10
10
  // TEST_NET: NetworkType
@@ -117,7 +117,7 @@ export class AbstractCodegen {
117
117
  ) {
118
118
  return '';
119
119
  }
120
- generateBuilder(module) {
120
+ generateExtra(module) {
121
121
  return '';
122
122
  }
123
123
  generateModule(module, allEventStructs
@@ -130,9 +130,7 @@ export class AbstractCodegen {
130
130
  // .filter((s) => s !== '')
131
131
  // : []
132
132
  const clientFunctions = this.GENERATE_CLIENT
133
- ? module.exposedFunctions
134
- .map((f) => this.generateClientFunctions(module, f))
135
- .filter((s) => s !== '')
133
+ ? module.exposedFunctions.map((f) => this.generateClientFunctions(module, f)).filter((s) => s !== '')
136
134
  : [];
137
135
  const eventStructs = new Map();
138
136
  for (const [type, struct] of allEventStructs.entries()) {
@@ -163,7 +161,7 @@ export class AbstractCodegen {
163
161
  ${structs.join('\n')}
164
162
 
165
163
  ${client}
166
- ${this.generateBuilder(module)}
164
+ ${this.generateExtra(module)}
167
165
  }
168
166
  `;
169
167
  }
@@ -261,11 +259,8 @@ export class AbstractCodegen {
261
259
  if (!func.isEntry) {
262
260
  return;
263
261
  }
264
- const fields = this.chainAdapter
265
- .getMeaningfulFunctionParams(func.params)
266
- .map((param) => {
267
- return (this.generateTypeForDescriptor(param, module.address) +
268
- (this.PAYLOAD_OPTIONAL ? ' | undefined' : ''));
262
+ const fields = this.chainAdapter.getMeaningfulFunctionParams(func.params).map((param) => {
263
+ return this.generateTypeForDescriptor(param, module.address) + (this.PAYLOAD_OPTIONAL ? ' | undefined' : '');
269
264
  });
270
265
  const camelFuncName = upperFirst(camel(func.name));
271
266
  const genericString = this.generateFunctionTypeParameters(func);
@@ -286,9 +281,7 @@ export class AbstractCodegen {
286
281
  }
287
282
  // const moduleName = normalizeToJSName(module.name)
288
283
  const funcName = camel(func.name);
289
- const fields = this.chainAdapter
290
- .getMeaningfulFunctionParams(func.params)
291
- .map((param) => {
284
+ const fields = this.chainAdapter.getMeaningfulFunctionParams(func.params).map((param) => {
292
285
  return this.generateTypeForDescriptor(param, module.address);
293
286
  });
294
287
  const genericString = this.generateFunctionTypeParameters(func);
@@ -348,28 +341,21 @@ export class AbstractCodegen {
348
341
  // only for aptos
349
342
  return 'string';
350
343
  }
351
- if (elementTypeQname.startsWith('T') &&
352
- !elementTypeQname.includes(SPLITTER)) {
344
+ if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {
353
345
  return `${elementTypeQname}[] | string`;
354
346
  }
355
- return (this.generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]');
347
+ return this.generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]';
356
348
  }
357
349
  const simpleName = this.generateSimpleType(type.qname, currentAddress);
358
350
  if (simpleName.length === 0) {
359
351
  console.error('unexpected error');
360
352
  }
361
- if (simpleName.toLowerCase() === VECTOR_STR ||
362
- simpleName.toLowerCase().startsWith(VECTOR_STR + SPLITTER)) {
353
+ if (simpleName.toLowerCase() === VECTOR_STR || simpleName.toLowerCase().startsWith(VECTOR_STR + SPLITTER)) {
363
354
  console.error('unexpected vector type error');
364
355
  }
365
356
  if (type.typeArgs.length > 0) {
366
357
  // return simpleName
367
- return (simpleName +
368
- '<' +
369
- type.typeArgs
370
- .map((t) => this.generateTypeForDescriptor(t, currentAddress))
371
- .join(',') +
372
- '>');
358
+ return (simpleName + '<' + type.typeArgs.map((t) => this.generateTypeForDescriptor(t, currentAddress)).join(',') + '>');
373
359
  }
374
360
  return simpleName;
375
361
  }
@@ -428,8 +414,7 @@ export class AccountCodegen {
428
414
  if (info) {
429
415
  for (const [account] of info.imports.entries()) {
430
416
  // Remap to user's filename if possible, TODO codepath not well tested
431
- const tsAccountModule = './' +
432
- (this.loader.accountImports.get(account)?.moduleName || account);
417
+ const tsAccountModule = './' + (this.loader.accountImports.get(account)?.moduleName || account);
433
418
  if (isFrameworkAccount(account) && !isFrameworkAccount(address)) {
434
419
  // Decide where to find runtime library
435
420
  moduleImports.push(`import { _${account} } from "@typemove/${this.moduleGen.PREFIX.toLowerCase()}/builtin"`
@@ -460,9 +445,7 @@ export class AccountCodegen {
460
445
 
461
446
  ${moduleImports.join('\n')}
462
447
 
463
- ${this.modules
464
- .map((m) => this.moduleGen.generateModule(m, eventsMap))
465
- .join('\n')}
448
+ ${this.modules.map((m) => this.moduleGen.generateModule(m, eventsMap)).join('\n')}
466
449
 
467
450
  const MODULES = JSON.parse('${JSON.stringify(this.abi)}')
468
451
 
package/dist/abstract-codegen.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-codegen.js","sourceRoot":"","sources":["../src/abstract-codegen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract-codegen.js","sourceRoot":"","sources":["../src/abstract-codegen.ts"],"names":[],"mappings":"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"}
package/dist/internal-models.d.ts CHANGED
@@ -9,6 +9,7 @@ export interface InternalMoveFunction {
9
9
  name: string;
10
10
  visibility: InternalMoveFunctionVisibility;
11
11
  isEntry: boolean;
12
+ isView?: boolean;
12
13
  typeParams: InternalMoveTypeParam[];
13
14
  params: TypeDescriptor[];
14
15
  return: TypeDescriptor[];
package/dist/internal-models.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"internal-models.d.ts","sourceRoot":"","sources":["../src/internal-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,gBAAgB,EAAE,oBAAoB,EAAE,CAAA;IACxC,OAAO,EAAE,kBAAkB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,8BAA8B,CAAA;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,qBAAqB,EAAE,CAAA;IACnC,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,EAAE,cAAc,EAAE,CAAA;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,UAAU,EAAE,qBAAqB,EAAE,CAAA;IACnC,MAAM,EAAE,uBAAuB,EAAE,CAAA;CAClC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,oBAAY,8BAA8B;IACxC,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA"}
1
+ {"version":3,"file":"internal-models.d.ts","sourceRoot":"","sources":["../src/internal-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,gBAAgB,EAAE,oBAAoB,EAAE,CAAA;IACxC,OAAO,EAAE,kBAAkB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,8BAA8B,CAAA;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,qBAAqB,EAAE,CAAA;IACnC,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,EAAE,cAAc,EAAE,CAAA;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,UAAU,EAAE,qBAAqB,EAAE,CAAA;IACnC,MAAM,EAAE,uBAAuB,EAAE,CAAA;CAClC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,oBAAY,8BAA8B;IACxC,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA"}
package/dist/internal-models.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"internal-models.js","sourceRoot":"","sources":["../src/internal-models.ts"],"names":[],"mappings":"AA+BA,MAAM,CAAN,IAAY,8BAIX;AAJD,WAAY,8BAA8B;IACxC,qDAAmB,CAAA;IACnB,mDAAiB,CAAA;IACjB,mDAAiB,CAAA;AACnB,CAAC,EAJW,8BAA8B,KAA9B,8BAA8B,QAIzC"}
1
+ {"version":3,"file":"internal-models.js","sourceRoot":"","sources":["../src/internal-models.ts"],"names":[],"mappings":"AAgCA,MAAM,CAAN,IAAY,8BAIX;AAJD,WAAY,8BAA8B;IACxC,qDAAmB,CAAA;IACnB,mDAAiB,CAAA;IACjB,mDAAiB,CAAA;AACnB,CAAC,EAJW,8BAA8B,KAA9B,8BAA8B,QAIzC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@typemove/move",
3
- "version": "1.0.0-rc.13",
3
+ "version": "1.0.0-rc.14",
4
4
  "license": "Apache-2.0",
5
5
  "type": "module",
6
6
  "exports": {
package/src/abstract-codegen.ts CHANGED
@@ -9,15 +9,7 @@ import fs from 'fs'
9
9
  import { AccountModulesImportInfo, AccountRegister } from './account.js'
10
10
  import chalk from 'chalk'
11
11
  import { format } from 'prettier'
12
- import {
13
- isFrameworkAccount,
14
- moduleQname,
15
- normalizeToJSName,
16
- SPLITTER,
17
- upperFirst,
18
- VECTOR_STR,
19
- camel,
20
- } from './utils.js'
12
+ import { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER, upperFirst, VECTOR_STR, camel } from './utils.js'
21
13
  import { TypeDescriptor } from './types.js'
22
14
  import { ChainAdapter } from './chain-adapter.js'
23
15
 
@@ -81,10 +73,7 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
81
73
 
82
74
  // when generating user code, don't need to generate framework account
83
75
  for (const sysModule of this.SYSTEM_MODULES) {
84
- loader.accountImports.set(
85
- sysModule,
86
- new AccountModulesImportInfo(sysModule, sysModule)
87
- )
76
+ loader.accountImports.set(sysModule, new AccountModulesImportInfo(sysModule, sysModule))
88
77
  }
89
78
  // const client = getRpcClient(network)
90
79
 
@@ -110,9 +99,7 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
110
99
 
111
100
  while (loader.pendingAccounts.size > 0) {
112
101
  for (const account of loader.pendingAccounts) {
113
- console.log(
114
- `download dependent module for account ${account} at ${this.chainAdapter.endpoint}`
115
- )
102
+ console.log(`download dependent module for account ${account} at ${this.chainAdapter.endpoint}`)
116
103
 
117
104
  try {
118
105
  const rawModules = await this.chainAdapter.fetchModules(
@@ -121,24 +108,15 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
121
108
  )
122
109
  const modules = this.chainAdapter.toInternalModules(rawModules)
123
110
 
124
- fs.writeFileSync(
125
- path.resolve(srcDir, account + '.json'),
126
- JSON.stringify(rawModules, null, '\t')
127
- )
111
+ fs.writeFileSync(path.resolve(srcDir, account + '.json'), JSON.stringify(rawModules, null, '\t'))
128
112
  for (const module of modules) {
129
113
  loader.register(module, account)
130
114
  }
131
- const codeGen = new AccountCodegen(
132
- this,
133
- loader,
134
- rawModules,
135
- modules,
136
- {
137
- fileName: account,
138
- outputDir: outputDir,
139
- // network,
140
- }
141
- )
115
+ const codeGen = new AccountCodegen(this, loader, rawModules, modules, {
116
+ fileName: account,
117
+ outputDir: outputDir,
118
+ // network,
119
+ })
142
120
 
143
121
  outputs.push(...codeGen.generate())
144
122
  } catch (e) {
@@ -166,10 +144,9 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
166
144
  `
167
145
  for (const output of outputs) {
168
146
  const parsed = path.parse(output.fileName)
169
- rootFileContent += `export * as _${parsed.name.replaceAll(
170
- '-',
171
- '_'
172
- )} from './${parsed.name}${this.maybeEsmPrefix()}'\n`
147
+ rootFileContent += `export * as _${parsed.name.replaceAll('-', '_')} from './${
148
+ parsed.name
149
+ }${this.maybeEsmPrefix()}'\n`
173
150
  }
174
151
  fs.writeFileSync(rootFile, rootFileContent)
175
152
 
@@ -192,7 +169,7 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
192
169
  return ''
193
170
  }
194
171
 
195
- protected generateBuilder(module: InternalMoveModule) {
172
+ protected generateExtra(module: InternalMoveModule) {
196
173
  return ''
197
174
  }
198
175
 
@@ -208,9 +185,7 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
208
185
  // .filter((s) => s !== '')
209
186
  // : []
210
187
  const clientFunctions = this.GENERATE_CLIENT
211
- ? module.exposedFunctions
212
- .map((f) => this.generateClientFunctions(module, f))
213
- .filter((s) => s !== '')
188
+ ? module.exposedFunctions.map((f) => this.generateClientFunctions(module, f)).filter((s) => s !== '')
214
189
  : []
215
190
  const eventStructs = new Map<string, InternalMoveStruct>()
216
191
  for (const [type, struct] of allEventStructs.entries()) {
@@ -223,12 +198,8 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
223
198
  const events = Array.from(eventStructs.values())
224
199
  .map((e) => this.generateForEvents(module, e))
225
200
  .filter((s) => s !== '')
226
- const structs = module.structs.map((s) =>
227
- this.generateStructs(module, s, eventTypes)
228
- )
229
- const callArgs = module.exposedFunctions.map((f) =>
230
- this.generateCallArgsStructs(module, f)
231
- )
201
+ const structs = module.structs.map((s) => this.generateStructs(module, s, eventTypes))
202
+ const callArgs = module.exposedFunctions.map((f) => this.generateCallArgsStructs(module, f))
232
203
 
233
204
  const moduleName = normalizeToJSName(module.name)
234
205
  let client = ''
@@ -249,17 +220,12 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
249
220
  ${structs.join('\n')}
250
221
 
251
222
  ${client}
252
- ${this.generateBuilder(module)}
223
+ ${this.generateExtra(module)}
253
224
  }
254
225
  `
255
226
  }
256
227
 
257
- generateStructs(
258
- module: InternalMoveModule,
259
- struct: InternalMoveStruct,
260
- events: Set<string>,
261
- typeOnly = false
262
- ) {
228
+ generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>, typeOnly = false) {
263
229
  const typeParams = struct.typeParams || []
264
230
  const genericString = this.generateStructTypeParameters(struct)
265
231
  const genericStringAny = this.generateStructTypeParameters(struct, true)
@@ -360,22 +326,14 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
360
326
  // return genericString
361
327
  // }
362
328
 
363
- generateCallArgsStructs(
364
- module: InternalMoveModule,
365
- func: InternalMoveFunction
366
- ) {
329
+ generateCallArgsStructs(module: InternalMoveModule, func: InternalMoveFunction) {
367
330
  if (!func.isEntry) {
368
331
  return
369
332
  }
370
333
 
371
- const fields = this.chainAdapter
372
- .getMeaningfulFunctionParams(func.params)
373
- .map((param) => {
374
- return (
375
- this.generateTypeForDescriptor(param, module.address) +
376
- (this.PAYLOAD_OPTIONAL ? ' | undefined' : '')
377
- )
378
- })
334
+ const fields = this.chainAdapter.getMeaningfulFunctionParams(func.params).map((param) => {
335
+ return this.generateTypeForDescriptor(param, module.address) + (this.PAYLOAD_OPTIONAL ? ' | undefined' : '')
336
+ })
379
337
 
380
338
  const camelFuncName = upperFirst(camel(func.name))
381
339
 
@@ -389,10 +347,7 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
389
347
  `
390
348
  }
391
349
 
392
- generateClientFunctions(
393
- module: InternalMoveModule,
394
- func: InternalMoveFunction
395
- ) {
350
+ generateClientFunctions(module: InternalMoveModule, func: InternalMoveFunction) {
396
351
  if (func.visibility === InternalMoveFunctionVisibility.PRIVATE) {
397
352
  return ''
398
353
  }
@@ -401,11 +356,9 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
401
356
  }
402
357
  // const moduleName = normalizeToJSName(module.name)
403
358
  const funcName = camel(func.name)
404
- const fields = this.chainAdapter
405
- .getMeaningfulFunctionParams(func.params)
406
- .map((param) => {
407
- return this.generateTypeForDescriptor(param, module.address)
408
- })
359
+ const fields = this.chainAdapter.getMeaningfulFunctionParams(func.params).map((param) => {
360
+ return this.generateTypeForDescriptor(param, module.address)
361
+ })
409
362
  const genericString = this.generateFunctionTypeParameters(func)
410
363
 
411
364
  const returns = func.return.map((param) => {
@@ -415,12 +368,8 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
415
368
  const source = `
416
369
  ${funcName}${genericString}(type_arguments: [${func.typeParams
417
370
  .map((_) => 'string')
418
- .join(', ')}], args: [${fields.join(
419
- ','
420
- )}], version?: bigint): Promise<[${returns.join(',')}]> {
421
- return this.viewDecoded('${module.address}::${module.name}::${
422
- func.name
423
- }', type_arguments, args, version) as any
371
+ .join(', ')}], args: [${fields.join(',')}], version?: bigint): Promise<[${returns.join(',')}]> {
372
+ return this.viewDecoded('${module.address}::${module.name}::${func.name}', type_arguments, args, version) as any
424
373
  }`
425
374
  return source
426
375
  }
@@ -432,17 +381,11 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
432
381
  // return ''
433
382
  // }
434
383
 
435
- generateForEvents(
436
- module: InternalMoveModule,
437
- struct: InternalMoveStruct
438
- ): string {
384
+ generateForEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {
439
385
  return ''
440
386
  }
441
387
 
442
- generateTypeForDescriptor(
443
- type: TypeDescriptor,
444
- currentAddress: string
445
- ): string {
388
+ generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string): string {
446
389
  if (type.reference) {
447
390
  return this.REFERENCE_TYPE
448
391
  }
@@ -480,36 +423,23 @@ export abstract class AbstractCodegen<ModuleTypes, StructType> {
480
423
  // only for aptos
481
424
  return 'string'
482
425
  }
483
- if (
484
- elementTypeQname.startsWith('T') &&
485
- !elementTypeQname.includes(SPLITTER)
486
- ) {
426
+ if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {
487
427
  return `${elementTypeQname}[] | string`
488
428
  }
489
- return (
490
- this.generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]'
491
- )
429
+ return this.generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]'
492
430
  }
493
431
 
494
432
  const simpleName = this.generateSimpleType(type.qname, currentAddress)
495
433
  if (simpleName.length === 0) {
496
434
  console.error('unexpected error')
497
435
  }
498
- if (
499
- simpleName.toLowerCase() === VECTOR_STR ||
500
- simpleName.toLowerCase().startsWith(VECTOR_STR + SPLITTER)
501
- ) {
436
+ if (simpleName.toLowerCase() === VECTOR_STR || simpleName.toLowerCase().startsWith(VECTOR_STR + SPLITTER)) {
502
437
  console.error('unexpected vector type error')
503
438
  }
504
439
  if (type.typeArgs.length > 0) {
505
440
  // return simpleName
506
441
  return (
507
- simpleName +
508
- '<' +
509
- type.typeArgs
510
- .map((t) => this.generateTypeForDescriptor(t, currentAddress))
511
- .join(',') +
512
- '>'
442
+ simpleName + '<' + type.typeArgs.map((t) => this.generateTypeForDescriptor(t, currentAddress)).join(',') + '>'
513
443
  )
514
444
  }
515
445
  return simpleName
@@ -589,9 +519,7 @@ export class AccountCodegen<ModuleType, StructType> {
589
519
  if (info) {
590
520
  for (const [account] of info.imports.entries()) {
591
521
  // Remap to user's filename if possible, TODO codepath not well tested
592
- const tsAccountModule =
593
- './' +
594
- (this.loader.accountImports.get(account)?.moduleName || account)
522
+ const tsAccountModule = './' + (this.loader.accountImports.get(account)?.moduleName || account)
595
523
  if (isFrameworkAccount(account) && !isFrameworkAccount(address)) {
596
524
  // Decide where to find runtime library
597
525
  moduleImports.push(
@@ -599,9 +527,7 @@ export class AccountCodegen<ModuleType, StructType> {
599
527
  // `import _${account} = builtin._${account} `
600
528
  )
601
529
  } else {
602
- moduleImports.push(
603
- `import * as _${account} from "${tsAccountModule}${this.moduleGen.maybeEsmPrefix()}"`
604
- )
530
+ moduleImports.push(`import * as _${account} from "${tsAccountModule}${this.moduleGen.maybeEsmPrefix()}"`)
605
531
  }
606
532
 
607
533
  dependedAccounts.push(account)
@@ -616,8 +542,7 @@ export class AccountCodegen<ModuleType, StructType> {
616
542
  `
617
543
  }
618
544
 
619
- const eventsMap: Map<string, InternalMoveStruct> =
620
- this.moduleGen.chainAdapter.getAllEventStructs(this.modules)
545
+ const eventsMap: Map<string, InternalMoveStruct> = this.moduleGen.chainAdapter.getAllEventStructs(this.modules)
621
546
 
622
547
  const source = `
623
548
  /* Autogenerated file. Do not edit manually. */
@@ -630,9 +555,7 @@ export class AccountCodegen<ModuleType, StructType> {
630
555
 
631
556
  ${moduleImports.join('\n')}
632
557
 
633
- ${this.modules
634
- .map((m) => this.moduleGen.generateModule(m, eventsMap))
635
- .join('\n')}
558
+ ${this.modules.map((m) => this.moduleGen.generateModule(m, eventsMap)).join('\n')}
636
559
 
637
560
  const MODULES = JSON.parse('${JSON.stringify(this.abi)}')
638
561
 
package/src/internal-models.ts CHANGED
@@ -11,6 +11,7 @@ export interface InternalMoveFunction {
11
11
  name: string
12
12
  visibility: InternalMoveFunctionVisibility
13
13
  isEntry: boolean
14
+ isView?: boolean
14
15
  typeParams: InternalMoveTypeParam[]
15
16
  params: TypeDescriptor[]
16
17
  return: TypeDescriptor[]