Skip to content
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.

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

Add --dynamicArgs option to generate operation arguments dynamically #363

Merged
merged 2 commits into from
May 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions generator/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ exports.defaultConfig = {
namingConvention: "js", // supported option: "js", "asis",
header: undefined,
useIdentifierNumber: false,
fieldOverrides: []
fieldOverrides: [],
dynamicArgs: false
}

exports.getConfig = function getConfig() {
Expand Down Expand Up @@ -58,7 +59,8 @@ exports.mergeConfigs = function mergeConfigs(args, config) {
!!args["--useIdentifierNumber"] || config.useIdentifierNumber,
fieldOverrides: args["--fieldOverrides"]
? parseFieldOverrides(args["--fieldOverrides"])
: config.fieldOverrides
: config.fieldOverrides,
dynamicArgs: !!args["--dynamicArgs"] || config.dynamicArgs
}
}

Expand Down
53 changes: 40 additions & 13 deletions generator/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ function generate(
noReact = false,
namingConvention = "js",
useIdentifierNumber = false,
fieldOverrides = []
fieldOverrides = [],
dynamicArgs = false
) {
const types = schema.types

Expand Down Expand Up @@ -904,21 +905,45 @@ ${enumContent}
}${returnsList ? "[]" : ""}`
}}>`

const formalArgs =
args.length === 0
? ""
: "(" +
args
.map((arg) => `\$${arg.name}: ${printGraphqlType(arg.type)}`)
.join(", ") +
")"
const actualArgs =
args.length === 0
let formalArgs = ""
let actualArgs = ""
// Static args: all args are geerated into formalArgs and actualArgs
if (!dynamicArgs) {
formalArgs = args.length === 0
? ""
: "(" +
args
.map((arg) => `\$${arg.name}: ${printGraphqlType(arg.type)}`)
.join(", ") +
")"

actualArgs =
args.length === 0
? ""
: "(" +
args.map((arg) => `${arg.origName}: \$${arg.name}`).join(", ") +
")"

}
// Dynamic args: only those args are generated, which have a corresponding variable set in variables
else {
formalArgs =
args.length === 0
? ""
: "`+(Object.keys(variables).length !== 0 ? '('+Object.entries({" +
args
.map((arg) => `${arg.name}: '\$${arg.name}: ${printGraphqlType(arg.type)}'`)
.join(", ") +
`}).filter(([k, v]) => (variables as any)[k]).map(([k, v]) => v).join(", ")+')' : '')+\``

actualArgs =
args.length === 0
? ""
: "`+(Object.keys(variables).length !== 0 ? '('+Object.entries({" +
args.map((arg) => `${arg.name}: '${arg.origName}: \$${arg.name}'`).join(", ") +
`}).filter(([k, v]) => (variables as any)[k]).map(([k, v]) => v).join(", ")+')' : '')+\``
}

const tsVariablesType =
format === "ts"
? `: { ${args.map((arg) => `${printTsType(arg)}`).join(", ")} }`
Expand Down Expand Up @@ -1283,7 +1308,8 @@ function scaffold(
modelsOnly: false,
namingConvention: "js",
useIdentifierNumber: false,
fieldOverrides: []
fieldOverrides: [],
dynamicArgs: false,
}
) {
const schema = graphql.buildSchema(definition)
Expand All @@ -1300,7 +1326,8 @@ function scaffold(
options.noReact || false,
options.namingConvention || "js",
options.useIdentifierNumber || false,
options.fieldOverrides || []
options.fieldOverrides || [],
options.dynamicArgs || false
)
}

Expand Down
9 changes: 6 additions & 3 deletions generator/mst-gql-scaffold.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ const definition = {
"--dontRenameModels": Boolean,
"--header": String,
"--useIdentifierNumber": Boolean,
"--fieldOverrides": String
"--fieldOverrides": String,
"--dynamicArgs": Boolean
}

function main() {
Expand Down Expand Up @@ -49,7 +50,8 @@ function main() {
namingConvention,
header,
useIdentifierNumber,
fieldOverrides
fieldOverrides,
dynamicArgs
} = mergeConfigs(args, config)
const separate = !!args["--separate"]

Expand Down Expand Up @@ -114,7 +116,8 @@ function main() {
noReact,
namingConvention,
useIdentifierNumber,
fieldOverrides
fieldOverrides,
dynamicArgs
)
writeFiles(outDir, files, format, forceAll, true, separate)
logUnexpectedFiles(outDir, files)
Expand Down