Skip to content

feat: typescript codegen - export imported method arg interfaces #1444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dOrgJelli merged 2 commits into from
Dec 13, 2022
Merged

feat: typescript codegen - export imported method arg interfaces #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2ba46c
feat: typescript codegen - export imported method arg interfaces
dOrgJelli Dec 13, 2022
9d83797
added "// @ts-ignore" to module.ts in plugin codegen env test cases t…
krisbitney Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/schema/bind/src/bindings/typescript/app/templates/types-ts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export type {{#detectKeyword}}{{type}}{{/detectKeyword}} = {{type}}Enum | {{type
{{#methods}}

/* URI: "{{parent.uri}}" */
interface {{parent.type}}_Args_{{name}} {
export interface {{parent.type}}_Args_{{name}} {
{{#arguments}}
{{name}}{{^required}}?{{/required}}: {{#toTypescript}}{{toGraphQLType}}{{/toTypescript}};
{{/arguments}}
Expand Down
2 changes: 2 additions & 0 deletions packages/schema/bind/src/bindings/typescript/plugin/templates/module-ts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/// NOTE: This is an auto-generated file.
/// All modifications will be overwritten.

// @ts-ignore
import * as Types from "./types";

// @ts-ignore
import { CoreClient, MaybeAsync } from "@polywrap/core-js";
import { PluginModule } from "@polywrap/plugin-js";
{{#moduleType}}
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/bind/src/bindings/typescript/plugin/templates/types-ts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export type {{#detectKeyword}}{{type}}{{/detectKeyword}} = {{type}}Enum | {{type
{{#importedModuleTypes}}
{{#methods}}
/* URI: "{{parent.uri}}" */
interface {{parent.type}}_Args_{{name}} {
export interface {{parent.type}}_Args_{{name}} {
{{#arguments}}
{{name}}{{^required}}?{{/required}}: {{#toTypescript}}{{toGraphQLType}}{{/toTypescript}};
{{/arguments}}
Expand Down
6 changes: 3 additions & 3 deletions packages/test-cases/cases/bind/sanity/output/app-ts/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export type TestImport_Enum_Return = TestImport_Enum_ReturnEnum | TestImport_Enu
/// Imported Modules START ///

/* URI: "testimport.uri.eth" */
interface TestImport_Module_Args_importedMethod {
export interface TestImport_Module_Args_importedMethod {
str: Types.String;
optStr?: Types.String | null;
u: Types.UInt;
Expand All @@ -172,12 +172,12 @@ interface TestImport_Module_Args_importedMethod {
}

/* URI: "testimport.uri.eth" */
interface TestImport_Module_Args_anotherMethod {
export interface TestImport_Module_Args_anotherMethod {
arg: Array<Types.String>;
}

/* URI: "testimport.uri.eth" */
interface TestImport_Module_Args_returnsArrayOfEnums {
export interface TestImport_Module_Args_returnsArrayOfEnums {
arg: Types.String;
}

Expand Down
2 changes: 2 additions & 0 deletions packages/test-cases/cases/bind/sanity/output/plugin-ts/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/// NOTE: This is an auto-generated file.
/// All modifications will be overwritten.

// @ts-ignore
import * as Types from "./types";

// @ts-ignore
import { CoreClient, MaybeAsync } from "@polywrap/core-js";
import { PluginModule } from "@polywrap/plugin-js";

Expand Down
6 changes: 3 additions & 3 deletions packages/test-cases/cases/bind/sanity/output/plugin-ts/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export type TestImport_Enum_Return = TestImport_Enum_ReturnEnum | TestImport_Enu
/// Imported Modules START ///

/* URI: "testimport.uri.eth" */
interface TestImport_Module_Args_importedMethod {
export interface TestImport_Module_Args_importedMethod {
str: Types.String;
optStr?: Types.String | null;
u: Types.UInt;
Expand All @@ -186,12 +186,12 @@ interface TestImport_Module_Args_importedMethod {
}

/* URI: "testimport.uri.eth" */
interface TestImport_Module_Args_anotherMethod {
export interface TestImport_Module_Args_anotherMethod {
arg: Array<Types.String>;
}

/* URI: "testimport.uri.eth" */
interface TestImport_Module_Args_returnsArrayOfEnums {
export interface TestImport_Module_Args_returnsArrayOfEnums {
arg: Types.String;
}

Expand Down
2 changes: 2 additions & 0 deletions packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/// NOTE: This is an auto-generated file.
/// All modifications will be overwritten.

// @ts-ignore
import * as Types from "./types";

// @ts-ignore
import { CoreClient, MaybeAsync } from "@polywrap/core-js";
import { PluginModule } from "@polywrap/plugin-js";

Expand Down
58 changes: 29 additions & 29 deletions packages/test-cases/cases/cli/plugin/codegen/001-sanity/expected/wrap/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ export interface Ethereum_Access {
/// Imported Modules START ///

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_callContractView {
export interface Ethereum_Module_Args_callContractView {
address: Types.String;
method: Types.String;
args?: Array<Types.String> | null;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_callContractStatic {
export interface Ethereum_Module_Args_callContractStatic {
address: Types.String;
method: Types.String;
args?: Array<Types.String> | null;
Expand All @@ -176,72 +176,72 @@ interface Ethereum_Module_Args_callContractStatic {
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_getBalance {
export interface Ethereum_Module_Args_getBalance {
address: Types.String;
blockTag?: Types.BigInt | null;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_encodeParams {
export interface Ethereum_Module_Args_encodeParams {
types: Array<Types.String>;
values: Array<Types.String>;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_encodeFunction {
export interface Ethereum_Module_Args_encodeFunction {
method: Types.String;
args?: Array<Types.String> | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_solidityPack {
export interface Ethereum_Module_Args_solidityPack {
types: Array<Types.String>;
values: Array<Types.String>;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_solidityKeccak256 {
export interface Ethereum_Module_Args_solidityKeccak256 {
types: Array<Types.String>;
values: Array<Types.String>;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_soliditySha256 {
export interface Ethereum_Module_Args_soliditySha256 {
types: Array<Types.String>;
values: Array<Types.String>;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_getSignerAddress {
export interface Ethereum_Module_Args_getSignerAddress {
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_getSignerBalance {
export interface Ethereum_Module_Args_getSignerBalance {
blockTag?: Types.BigInt | null;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_getSignerTransactionCount {
export interface Ethereum_Module_Args_getSignerTransactionCount {
blockTag?: Types.BigInt | null;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_getGasPrice {
export interface Ethereum_Module_Args_getGasPrice {
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_estimateTransactionGas {
export interface Ethereum_Module_Args_estimateTransactionGas {
tx: Types.Ethereum_TxRequest;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_estimateContractCallGas {
export interface Ethereum_Module_Args_estimateContractCallGas {
address: Types.String;
method: Types.String;
args?: Array<Types.String> | null;
Expand All @@ -250,30 +250,30 @@ interface Ethereum_Module_Args_estimateContractCallGas {
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_checkAddress {
export interface Ethereum_Module_Args_checkAddress {
address: Types.String;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_toWei {
export interface Ethereum_Module_Args_toWei {
eth: Types.String;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_toEth {
export interface Ethereum_Module_Args_toEth {
wei: Types.BigInt;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_awaitTransaction {
export interface Ethereum_Module_Args_awaitTransaction {
txHash: Types.String;
confirmations: Types.UInt32;
timeout: Types.UInt32;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_waitForEvent {
export interface Ethereum_Module_Args_waitForEvent {
address: Types.String;
event: Types.String;
args?: Array<Types.String> | null;
Expand All @@ -282,17 +282,17 @@ interface Ethereum_Module_Args_waitForEvent {
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_getNetwork {
export interface Ethereum_Module_Args_getNetwork {
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_requestAccounts {
export interface Ethereum_Module_Args_requestAccounts {
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_callContractMethod {
export interface Ethereum_Module_Args_callContractMethod {
address: Types.String;
method: Types.String;
args?: Array<Types.String> | null;
Expand All @@ -301,7 +301,7 @@ interface Ethereum_Module_Args_callContractMethod {
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_callContractMethodAndWait {
export interface Ethereum_Module_Args_callContractMethodAndWait {
address: Types.String;
method: Types.String;
args?: Array<Types.String> | null;
Expand All @@ -310,39 +310,39 @@ interface Ethereum_Module_Args_callContractMethodAndWait {
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_sendTransaction {
export interface Ethereum_Module_Args_sendTransaction {
tx: Types.Ethereum_TxRequest;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_sendTransactionAndWait {
export interface Ethereum_Module_Args_sendTransactionAndWait {
tx: Types.Ethereum_TxRequest;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_deployContract {
export interface Ethereum_Module_Args_deployContract {
abi: Types.String;
bytecode: Types.String;
args?: Array<Types.String> | null;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_signMessage {
export interface Ethereum_Module_Args_signMessage {
message: Types.String;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_signMessageBytes {
export interface Ethereum_Module_Args_signMessageBytes {
bytes: Types.Bytes;
connection?: Types.Ethereum_Connection | null;
}

/* URI: "ens/ethereum.polywrap.eth" */
interface Ethereum_Module_Args_sendRPC {
export interface Ethereum_Module_Args_sendRPC {
method: Types.String;
params: Array<Types.String>;
connection?: Types.Ethereum_Connection | null;
Expand Down
2 changes: 2 additions & 0 deletions packages/test-cases/cases/cli/plugin/codegen/002-single-module/expected/wrap/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/// NOTE: This is an auto-generated file.
/// All modifications will be overwritten.

// @ts-ignore
import * as Types from "./types";

// @ts-ignore
import { CoreClient, MaybeAsync } from "@polywrap/core-js";
import { PluginModule } from "@polywrap/plugin-js";

Expand Down
Loading