@smartive/graphql-magic 23.11.0-next.1 → 23.11.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.
- package/CHANGELOG.md +2 -2
- package/dist/bin/gqm.cjs +34 -16
- package/dist/cjs/index.cjs +59 -32
- package/dist/esm/client/mutations.js +30 -4
- package/dist/esm/client/mutations.js.map +1 -1
- package/dist/esm/migrations/generate.js +2 -7
- package/dist/esm/migrations/generate.js.map +1 -1
- package/dist/esm/models/model-definitions.d.ts +2 -0
- package/dist/esm/models/models.d.ts +2 -0
- package/dist/esm/models/models.js.map +1 -1
- package/dist/esm/models/mutation-hook.d.ts +1 -3
- package/dist/esm/resolvers/mutations.d.ts +18 -6
- package/dist/esm/resolvers/mutations.js +22 -14
- package/dist/esm/resolvers/mutations.js.map +1 -1
- package/dist/esm/schema/generate.js +2 -0
- package/dist/esm/schema/generate.js.map +1 -1
- package/package.json +1 -1
- package/src/client/mutations.ts +35 -4
- package/src/migrations/generate.ts +8 -15
- package/src/models/model-definitions.ts +2 -0
- package/src/models/models.ts +2 -0
- package/src/models/mutation-hook.ts +1 -1
- package/src/resolvers/mutations.ts +33 -12
- package/src/schema/generate.ts +2 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
## [23.11.0
|
|
1
|
+
## [23.11.0](https://github.com/smartive/graphql-magic/compare/v23.10.0...v23.11.0) (2026-03-19)
|
|
2
2
|
|
|
3
3
|
### Features
|
|
4
4
|
|
|
5
|
-
* Enable mutation args ([
|
|
5
|
+
* Enable mutation args ([#442](https://github.com/smartive/graphql-magic/issues/442)) ([37a5e6e](https://github.com/smartive/graphql-magic/commit/37a5e6ebff67d7284015d9bb60695f2c107a6c88))
|
package/dist/bin/gqm.cjs
CHANGED
|
@@ -41,47 +41,65 @@ var import_graphql = require("graphql");
|
|
|
41
41
|
// src/client/mutations.ts
|
|
42
42
|
var import_upperCase = __toESM(require("lodash/upperCase"), 1);
|
|
43
43
|
var constantCase = (str) => (0, import_upperCase.default)(str).replace(/ /g, "_");
|
|
44
|
+
var argTypeStr = (field) => {
|
|
45
|
+
const base = field.list ? `[${field.type}!]` : field.type;
|
|
46
|
+
return field.nonNull ? `${base}!` : base;
|
|
47
|
+
};
|
|
48
|
+
var argsToVariables = (args2) => args2.map((a) => `$${a.name}: ${argTypeStr(a)}`).join(", ");
|
|
49
|
+
var argsToMutationArgs = (args2) => args2.map((a) => `${a.name}: $${a.name}`).join(", ");
|
|
44
50
|
var generateMutations = (models) => {
|
|
45
51
|
const parts = [];
|
|
46
52
|
for (const { name: name2, creatable, updatable, deletable } of models.entities.filter(not(isRootModel))) {
|
|
47
53
|
if (creatable) {
|
|
54
|
+
const extraArgs = creatable !== true && creatable.args ? creatable.args : [];
|
|
55
|
+
const variables = extraArgs.length ? `$data: Create${name2}!, ${argsToVariables(extraArgs)}` : `$data: Create${name2}!`;
|
|
56
|
+
const mutationArgs = extraArgs.length ? `data: $data, ${argsToMutationArgs(extraArgs)}` : `data: $data`;
|
|
48
57
|
parts.push(
|
|
49
58
|
`export const CREATE_${constantCase(
|
|
50
59
|
name2
|
|
51
60
|
)} = gql\`
|
|
52
|
-
mutation Create${name2}Mutation($
|
|
53
|
-
create${name2}(
|
|
61
|
+
mutation Create${name2}Mutation(${variables}) {
|
|
62
|
+
create${name2}(${mutationArgs}) { id }
|
|
54
63
|
}
|
|
55
64
|
\`;`
|
|
56
65
|
);
|
|
57
66
|
}
|
|
58
67
|
if (updatable) {
|
|
68
|
+
const extraArgs = updatable !== true && updatable.args ? updatable.args : [];
|
|
69
|
+
const variables = extraArgs.length ? `$id: ID!, $data: Update${name2}!, ${argsToVariables(extraArgs)}` : `$id: ID!, $data: Update${name2}!`;
|
|
70
|
+
const mutationArgs = extraArgs.length ? `where: { id: $id }, data: $data, ${argsToMutationArgs(extraArgs)}` : `where: { id: $id }, data: $data`;
|
|
59
71
|
parts.push(
|
|
60
72
|
`export const UPDATE_${constantCase(
|
|
61
73
|
name2
|
|
62
74
|
)} = gql\`
|
|
63
|
-
mutation Update${name2}Mutation($
|
|
64
|
-
update${name2}(
|
|
75
|
+
mutation Update${name2}Mutation(${variables}) {
|
|
76
|
+
update${name2}(${mutationArgs}) { id }
|
|
65
77
|
}
|
|
66
78
|
\`;`
|
|
67
79
|
);
|
|
68
80
|
}
|
|
69
81
|
if (deletable) {
|
|
82
|
+
const deleteExtraArgs = deletable !== true && deletable.args ? deletable.args : [];
|
|
83
|
+
const deleteVariables = deleteExtraArgs.length ? `$id: ID!, ${argsToVariables(deleteExtraArgs)}` : `$id: ID!`;
|
|
84
|
+
const deleteMutationArgs = deleteExtraArgs.length ? `where: { id: $id }, ${argsToMutationArgs(deleteExtraArgs)}` : `where: { id: $id }`;
|
|
70
85
|
parts.push(
|
|
71
86
|
`export const DELETE_${constantCase(
|
|
72
87
|
name2
|
|
73
88
|
)} = gql\`
|
|
74
|
-
mutation Delete${name2}Mutation($
|
|
75
|
-
delete${name2}(
|
|
89
|
+
mutation Delete${name2}Mutation(${deleteVariables}) {
|
|
90
|
+
delete${name2}(${deleteMutationArgs})
|
|
76
91
|
}
|
|
77
92
|
\`;`
|
|
78
93
|
);
|
|
94
|
+
const restoreExtraArgs = deletable !== true && deletable.restoreArgs ? deletable.restoreArgs : [];
|
|
95
|
+
const restoreVariables = restoreExtraArgs.length ? `$id: ID!, ${argsToVariables(restoreExtraArgs)}` : `$id: ID!`;
|
|
96
|
+
const restoreMutationArgs = restoreExtraArgs.length ? `where: { id: $id }, ${argsToMutationArgs(restoreExtraArgs)}` : `where: { id: $id }`;
|
|
79
97
|
parts.push(
|
|
80
98
|
`export const RESTORE_${constantCase(
|
|
81
99
|
name2
|
|
82
100
|
)} = gql\`
|
|
83
|
-
mutation Restore${name2}Mutation($
|
|
84
|
-
restore${name2}(
|
|
101
|
+
mutation Restore${name2}Mutation(${restoreVariables}) {
|
|
102
|
+
restore${name2}(${restoreMutationArgs})
|
|
85
103
|
}
|
|
86
104
|
\`;`
|
|
87
105
|
);
|
|
@@ -1884,11 +1902,7 @@ var MigrationGenerator = class _MigrationGenerator {
|
|
|
1884
1902
|
}
|
|
1885
1903
|
return -1;
|
|
1886
1904
|
}
|
|
1887
|
-
static TRIGGER_EVENT_ORDER = [
|
|
1888
|
-
"INSERT",
|
|
1889
|
-
"UPDATE",
|
|
1890
|
-
"DELETE"
|
|
1891
|
-
];
|
|
1905
|
+
static TRIGGER_EVENT_ORDER = ["INSERT", "UPDATE", "DELETE"];
|
|
1892
1906
|
static sortTriggerEvents(events) {
|
|
1893
1907
|
return [...events].sort(
|
|
1894
1908
|
(a, b) => _MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(a) - _MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(b)
|
|
@@ -1896,7 +1910,9 @@ var MigrationGenerator = class _MigrationGenerator {
|
|
|
1896
1910
|
}
|
|
1897
1911
|
normalizeTriggerDef(def) {
|
|
1898
1912
|
let s = def.replace(/\s+/g, " ").replace(/\s*\(\s*/g, "(").replace(/\s*\)\s*/g, ")").replace(/\bON\s+[a-zA-Z_][a-zA-Z0-9_]*\./gi, "ON ").trim();
|
|
1899
|
-
const eventsMatch = s.match(
|
|
1913
|
+
const eventsMatch = s.match(
|
|
1914
|
+
/\b(AFTER|BEFORE)\s+((?:INSERT|UPDATE|DELETE)(?:\s+OR\s+(?:INSERT|UPDATE|DELETE))+)\s+ON\b/i
|
|
1915
|
+
);
|
|
1900
1916
|
if (eventsMatch) {
|
|
1901
1917
|
const events = eventsMatch[2].split(/\s+OR\s+/).map((e) => e.toUpperCase());
|
|
1902
1918
|
const sorted = [...events].sort(
|
|
@@ -2843,7 +2859,8 @@ var generateDefinitions = ({
|
|
|
2843
2859
|
{
|
|
2844
2860
|
name: "dryRun",
|
|
2845
2861
|
type: "Boolean"
|
|
2846
|
-
}
|
|
2862
|
+
},
|
|
2863
|
+
...model.deletable && model.deletable !== true && model.deletable.args || []
|
|
2847
2864
|
]
|
|
2848
2865
|
});
|
|
2849
2866
|
mutations2.push({
|
|
@@ -2855,7 +2872,8 @@ var generateDefinitions = ({
|
|
|
2855
2872
|
name: "where",
|
|
2856
2873
|
type: `${model.name}WhereUnique`,
|
|
2857
2874
|
nonNull: true
|
|
2858
|
-
}
|
|
2875
|
+
},
|
|
2876
|
+
...model.deletable && model.deletable !== true && model.deletable.restoreArgs || []
|
|
2859
2877
|
]
|
|
2860
2878
|
});
|
|
2861
2879
|
}
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -307,47 +307,65 @@ var gql = (chunks, ...variables) => {
|
|
|
307
307
|
// src/client/mutations.ts
|
|
308
308
|
var import_upperCase = __toESM(require("lodash/upperCase"), 1);
|
|
309
309
|
var constantCase = (str) => (0, import_upperCase.default)(str).replace(/ /g, "_");
|
|
310
|
+
var argTypeStr = (field) => {
|
|
311
|
+
const base = field.list ? `[${field.type}!]` : field.type;
|
|
312
|
+
return field.nonNull ? `${base}!` : base;
|
|
313
|
+
};
|
|
314
|
+
var argsToVariables = (args2) => args2.map((a) => `$${a.name}: ${argTypeStr(a)}`).join(", ");
|
|
315
|
+
var argsToMutationArgs = (args2) => args2.map((a) => `${a.name}: $${a.name}`).join(", ");
|
|
310
316
|
var generateMutations = (models) => {
|
|
311
317
|
const parts = [];
|
|
312
318
|
for (const { name: name2, creatable, updatable, deletable } of models.entities.filter(not(isRootModel))) {
|
|
313
319
|
if (creatable) {
|
|
320
|
+
const extraArgs = creatable !== true && creatable.args ? creatable.args : [];
|
|
321
|
+
const variables = extraArgs.length ? `$data: Create${name2}!, ${argsToVariables(extraArgs)}` : `$data: Create${name2}!`;
|
|
322
|
+
const mutationArgs = extraArgs.length ? `data: $data, ${argsToMutationArgs(extraArgs)}` : `data: $data`;
|
|
314
323
|
parts.push(
|
|
315
324
|
`export const CREATE_${constantCase(
|
|
316
325
|
name2
|
|
317
326
|
)} = gql\`
|
|
318
|
-
mutation Create${name2}Mutation($
|
|
319
|
-
create${name2}(
|
|
327
|
+
mutation Create${name2}Mutation(${variables}) {
|
|
328
|
+
create${name2}(${mutationArgs}) { id }
|
|
320
329
|
}
|
|
321
330
|
\`;`
|
|
322
331
|
);
|
|
323
332
|
}
|
|
324
333
|
if (updatable) {
|
|
334
|
+
const extraArgs = updatable !== true && updatable.args ? updatable.args : [];
|
|
335
|
+
const variables = extraArgs.length ? `$id: ID!, $data: Update${name2}!, ${argsToVariables(extraArgs)}` : `$id: ID!, $data: Update${name2}!`;
|
|
336
|
+
const mutationArgs = extraArgs.length ? `where: { id: $id }, data: $data, ${argsToMutationArgs(extraArgs)}` : `where: { id: $id }, data: $data`;
|
|
325
337
|
parts.push(
|
|
326
338
|
`export const UPDATE_${constantCase(
|
|
327
339
|
name2
|
|
328
340
|
)} = gql\`
|
|
329
|
-
mutation Update${name2}Mutation($
|
|
330
|
-
update${name2}(
|
|
341
|
+
mutation Update${name2}Mutation(${variables}) {
|
|
342
|
+
update${name2}(${mutationArgs}) { id }
|
|
331
343
|
}
|
|
332
344
|
\`;`
|
|
333
345
|
);
|
|
334
346
|
}
|
|
335
347
|
if (deletable) {
|
|
348
|
+
const deleteExtraArgs = deletable !== true && deletable.args ? deletable.args : [];
|
|
349
|
+
const deleteVariables = deleteExtraArgs.length ? `$id: ID!, ${argsToVariables(deleteExtraArgs)}` : `$id: ID!`;
|
|
350
|
+
const deleteMutationArgs = deleteExtraArgs.length ? `where: { id: $id }, ${argsToMutationArgs(deleteExtraArgs)}` : `where: { id: $id }`;
|
|
336
351
|
parts.push(
|
|
337
352
|
`export const DELETE_${constantCase(
|
|
338
353
|
name2
|
|
339
354
|
)} = gql\`
|
|
340
|
-
mutation Delete${name2}Mutation($
|
|
341
|
-
delete${name2}(
|
|
355
|
+
mutation Delete${name2}Mutation(${deleteVariables}) {
|
|
356
|
+
delete${name2}(${deleteMutationArgs})
|
|
342
357
|
}
|
|
343
358
|
\`;`
|
|
344
359
|
);
|
|
360
|
+
const restoreExtraArgs = deletable !== true && deletable.restoreArgs ? deletable.restoreArgs : [];
|
|
361
|
+
const restoreVariables = restoreExtraArgs.length ? `$id: ID!, ${argsToVariables(restoreExtraArgs)}` : `$id: ID!`;
|
|
362
|
+
const restoreMutationArgs = restoreExtraArgs.length ? `where: { id: $id }, ${argsToMutationArgs(restoreExtraArgs)}` : `where: { id: $id }`;
|
|
345
363
|
parts.push(
|
|
346
364
|
`export const RESTORE_${constantCase(
|
|
347
365
|
name2
|
|
348
366
|
)} = gql\`
|
|
349
|
-
mutation Restore${name2}Mutation($
|
|
350
|
-
restore${name2}(
|
|
367
|
+
mutation Restore${name2}Mutation(${restoreVariables}) {
|
|
368
|
+
restore${name2}(${restoreMutationArgs})
|
|
351
369
|
}
|
|
352
370
|
\`;`
|
|
353
371
|
);
|
|
@@ -2337,30 +2355,31 @@ var mutationResolver = async (_parent, args2, partialCtx, info) => withTransacti
|
|
|
2337
2355
|
const [, mutation, modelName] = it(info.fieldName.match(/^(create|update|delete|restore)(.+)$/));
|
|
2338
2356
|
switch (mutation) {
|
|
2339
2357
|
case "create": {
|
|
2340
|
-
const id = await createEntity(modelName, args2.data, {
|
|
2358
|
+
const id = await createEntity(modelName, args2.data, ctx, { trigger: "mutation", args: args2 });
|
|
2341
2359
|
return await resolve(ctx, id);
|
|
2342
2360
|
}
|
|
2343
2361
|
case "update": {
|
|
2344
2362
|
const id = args2.where.id;
|
|
2345
|
-
await updateEntity(modelName, id, args2.data, {
|
|
2363
|
+
await updateEntity(modelName, id, args2.data, ctx, { trigger: "mutation", args: args2 });
|
|
2346
2364
|
return await resolve(ctx, id);
|
|
2347
2365
|
}
|
|
2348
2366
|
case "delete": {
|
|
2349
2367
|
const id = args2.where.id;
|
|
2350
2368
|
await deleteEntity(modelName, id, ctx, {
|
|
2351
2369
|
dryRun: args2.dryRun,
|
|
2352
|
-
trigger: "mutation"
|
|
2370
|
+
trigger: "mutation",
|
|
2371
|
+
args: args2
|
|
2353
2372
|
});
|
|
2354
2373
|
return id;
|
|
2355
2374
|
}
|
|
2356
2375
|
case "restore": {
|
|
2357
2376
|
const id = args2.where.id;
|
|
2358
|
-
await restoreEntity(modelName, id, ctx, "mutation");
|
|
2377
|
+
await restoreEntity(modelName, id, ctx, { trigger: "mutation", args: args2 });
|
|
2359
2378
|
return id;
|
|
2360
2379
|
}
|
|
2361
2380
|
}
|
|
2362
2381
|
});
|
|
2363
|
-
var createEntity = async (modelName, input2, ctx, trigger = "direct-call") => withTransaction(ctx, async (ctx2) => {
|
|
2382
|
+
var createEntity = async (modelName, input2, ctx, { args: args2, trigger = "direct-call" } = {}) => withTransaction(ctx, async (ctx2) => {
|
|
2364
2383
|
const model = ctx2.models.getModel(modelName, "entity");
|
|
2365
2384
|
const normalizedInput = { ...input2 };
|
|
2366
2385
|
if (!normalizedInput.id) {
|
|
@@ -2384,7 +2403,7 @@ var createEntity = async (modelName, input2, ctx, trigger = "direct-call") => wi
|
|
|
2384
2403
|
trigger,
|
|
2385
2404
|
when: "before",
|
|
2386
2405
|
data: { prev: {}, input: input2, normalizedInput, next: normalizedInput },
|
|
2387
|
-
args:
|
|
2406
|
+
args: args2,
|
|
2388
2407
|
ctx: ctx2
|
|
2389
2408
|
});
|
|
2390
2409
|
if (model.parent) {
|
|
@@ -2417,18 +2436,18 @@ var createEntity = async (modelName, input2, ctx, trigger = "direct-call") => wi
|
|
|
2417
2436
|
trigger,
|
|
2418
2437
|
when: "after",
|
|
2419
2438
|
data: { prev: {}, input: input2, normalizedInput, next: normalizedInput },
|
|
2420
|
-
args:
|
|
2439
|
+
args: args2,
|
|
2421
2440
|
ctx: ctx2
|
|
2422
2441
|
});
|
|
2423
2442
|
return normalizedInput.id;
|
|
2424
2443
|
});
|
|
2425
|
-
var updateEntities = async (modelName, where, updateFields, ctx) => withTransaction(ctx, async (ctx2) => {
|
|
2444
|
+
var updateEntities = async (modelName, where, updateFields, ctx, { args: args2 } = {}) => withTransaction(ctx, async (ctx2) => {
|
|
2426
2445
|
const entities = await ctx2.knex(modelName).where(where).select("id");
|
|
2427
2446
|
for (const entity of entities) {
|
|
2428
|
-
await updateEntity(modelName, entity.id, updateFields, ctx2);
|
|
2447
|
+
await updateEntity(modelName, entity.id, updateFields, ctx2, args2);
|
|
2429
2448
|
}
|
|
2430
2449
|
});
|
|
2431
|
-
var updateEntity = async (modelName, id, input2, ctx, trigger = "direct-call") => withTransaction(ctx, async (ctx2) => {
|
|
2450
|
+
var updateEntity = async (modelName, id, input2, ctx, { args: args2, trigger = "direct-call" } = {}) => withTransaction(ctx, async (ctx2) => {
|
|
2432
2451
|
const model = ctx2.models.getModel(modelName, "entity");
|
|
2433
2452
|
const normalizedInput = { ...input2 };
|
|
2434
2453
|
sanitize(ctx2, model, normalizedInput);
|
|
@@ -2446,7 +2465,7 @@ var updateEntity = async (modelName, id, input2, ctx, trigger = "direct-call") =
|
|
|
2446
2465
|
trigger,
|
|
2447
2466
|
when: "before",
|
|
2448
2467
|
data: { prev: currentEntity, input: input2, normalizedInput, next: { ...currentEntity, ...normalizedInput } },
|
|
2449
|
-
args:
|
|
2468
|
+
args: args2,
|
|
2450
2469
|
ctx: ctx2
|
|
2451
2470
|
});
|
|
2452
2471
|
await doUpdate(model, currentEntity, normalizedInput, ctx2);
|
|
@@ -2456,22 +2475,24 @@ var updateEntity = async (modelName, id, input2, ctx, trigger = "direct-call") =
|
|
|
2456
2475
|
trigger,
|
|
2457
2476
|
when: "after",
|
|
2458
2477
|
data: { prev: currentEntity, input: input2, normalizedInput, next: { ...currentEntity, ...normalizedInput } },
|
|
2459
|
-
args:
|
|
2478
|
+
args: args2,
|
|
2460
2479
|
ctx: ctx2
|
|
2461
2480
|
});
|
|
2462
2481
|
}
|
|
2463
2482
|
});
|
|
2464
|
-
var deleteEntities = async (modelName, where, ctx) => withTransaction(ctx, async (ctx2) => {
|
|
2483
|
+
var deleteEntities = async (modelName, where, ctx, args2) => withTransaction(ctx, async (ctx2) => {
|
|
2465
2484
|
const entities = await ctx2.knex(modelName).where(where).select("id");
|
|
2466
2485
|
for (const entity of entities) {
|
|
2467
2486
|
await deleteEntity(modelName, entity.id, ctx2, {
|
|
2468
|
-
trigger: "direct-call"
|
|
2487
|
+
trigger: "direct-call",
|
|
2488
|
+
args: args2
|
|
2469
2489
|
});
|
|
2470
2490
|
}
|
|
2471
2491
|
});
|
|
2472
2492
|
var deleteEntity = async (modelName, id, ctx, {
|
|
2473
2493
|
dryRun = false,
|
|
2474
|
-
trigger = "direct-call"
|
|
2494
|
+
trigger = "direct-call",
|
|
2495
|
+
args: args2
|
|
2475
2496
|
} = {}) => withTransaction(ctx, async (ctx2) => {
|
|
2476
2497
|
const model = ctx2.models.getModel(modelName, "entity");
|
|
2477
2498
|
const rootModel = model.rootModel;
|
|
@@ -2487,6 +2508,7 @@ var deleteEntity = async (modelName, id, ctx, {
|
|
|
2487
2508
|
const afterHooks = [];
|
|
2488
2509
|
const mutationHook = ctx2.mutationHook;
|
|
2489
2510
|
const deleteCascade = async (currentModel, currentEntity, currentTrigger) => {
|
|
2511
|
+
const isDeleteRoot = currentModel.name === rootModel.name && currentEntity.id === entity.id;
|
|
2490
2512
|
if (!(currentModel.name in toDelete)) {
|
|
2491
2513
|
toDelete[currentModel.name] = {};
|
|
2492
2514
|
}
|
|
@@ -2510,6 +2532,7 @@ var deleteEntity = async (modelName, id, ctx, {
|
|
|
2510
2532
|
trigger: currentTrigger,
|
|
2511
2533
|
when: "before",
|
|
2512
2534
|
data: { prev: currentEntity, input: {}, normalizedInput, next: { ...currentEntity, ...normalizedInput } },
|
|
2535
|
+
...isDeleteRoot ? { args: args2 } : {},
|
|
2513
2536
|
ctx: ctx2
|
|
2514
2537
|
});
|
|
2515
2538
|
});
|
|
@@ -2525,6 +2548,7 @@ var deleteEntity = async (modelName, id, ctx, {
|
|
|
2525
2548
|
trigger: currentTrigger,
|
|
2526
2549
|
when: "after",
|
|
2527
2550
|
data: { prev: currentEntity, input: {}, normalizedInput, next: { ...currentEntity, ...normalizedInput } },
|
|
2551
|
+
...isDeleteRoot ? { args: args2 } : {},
|
|
2528
2552
|
ctx: ctx2
|
|
2529
2553
|
});
|
|
2530
2554
|
});
|
|
@@ -2646,7 +2670,7 @@ var deleteEntity = async (modelName, id, ctx, {
|
|
|
2646
2670
|
});
|
|
2647
2671
|
}
|
|
2648
2672
|
});
|
|
2649
|
-
var restoreEntity = async (modelName, id, ctx, trigger = "direct-call") => withTransaction(ctx, async (ctx2) => {
|
|
2673
|
+
var restoreEntity = async (modelName, id, ctx, { args: args2, trigger = "direct-call" } = {}) => withTransaction(ctx, async (ctx2) => {
|
|
2650
2674
|
const model = ctx2.models.getModel(modelName, "entity");
|
|
2651
2675
|
const rootModel = model.rootModel;
|
|
2652
2676
|
const entity = await getEntityToMutate(ctx2, rootModel, { id }, "RESTORE");
|
|
@@ -2665,6 +2689,7 @@ var restoreEntity = async (modelName, id, ctx, trigger = "direct-call") => withT
|
|
|
2665
2689
|
const mutations = [];
|
|
2666
2690
|
const afterHooks = [];
|
|
2667
2691
|
const restoreCascade = async (currentModel, currentEntity, currentTrigger) => {
|
|
2692
|
+
const isRestoreRoot = currentModel.name === rootModel.name && currentEntity.id === entity.id;
|
|
2668
2693
|
if (entity.deleteRootId || currentEntity.deleteRootId) {
|
|
2669
2694
|
if (!(currentEntity.deleteRootType === model.name && currentEntity.deleteRootId === entity.id)) {
|
|
2670
2695
|
return;
|
|
@@ -2691,6 +2716,7 @@ var restoreEntity = async (modelName, id, ctx, trigger = "direct-call") => withT
|
|
|
2691
2716
|
trigger: currentTrigger,
|
|
2692
2717
|
when: "before",
|
|
2693
2718
|
data: { prev: currentEntity, input: {}, normalizedInput, next: { ...currentEntity, ...normalizedInput } },
|
|
2719
|
+
...isRestoreRoot ? { args: args2 } : {},
|
|
2694
2720
|
ctx: ctx2
|
|
2695
2721
|
});
|
|
2696
2722
|
});
|
|
@@ -2721,6 +2747,7 @@ var restoreEntity = async (modelName, id, ctx, trigger = "direct-call") => withT
|
|
|
2721
2747
|
trigger: currentTrigger,
|
|
2722
2748
|
when: "after",
|
|
2723
2749
|
data: { prev: currentEntity, input: {}, normalizedInput, next: { ...currentEntity, ...normalizedInput } },
|
|
2750
|
+
...isRestoreRoot ? { args: args2 } : {},
|
|
2724
2751
|
ctx: ctx2
|
|
2725
2752
|
});
|
|
2726
2753
|
});
|
|
@@ -3903,11 +3930,7 @@ var MigrationGenerator = class _MigrationGenerator {
|
|
|
3903
3930
|
}
|
|
3904
3931
|
return -1;
|
|
3905
3932
|
}
|
|
3906
|
-
static TRIGGER_EVENT_ORDER = [
|
|
3907
|
-
"INSERT",
|
|
3908
|
-
"UPDATE",
|
|
3909
|
-
"DELETE"
|
|
3910
|
-
];
|
|
3933
|
+
static TRIGGER_EVENT_ORDER = ["INSERT", "UPDATE", "DELETE"];
|
|
3911
3934
|
static sortTriggerEvents(events) {
|
|
3912
3935
|
return [...events].sort(
|
|
3913
3936
|
(a, b) => _MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(a) - _MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(b)
|
|
@@ -3915,7 +3938,9 @@ var MigrationGenerator = class _MigrationGenerator {
|
|
|
3915
3938
|
}
|
|
3916
3939
|
normalizeTriggerDef(def) {
|
|
3917
3940
|
let s = def.replace(/\s+/g, " ").replace(/\s*\(\s*/g, "(").replace(/\s*\)\s*/g, ")").replace(/\bON\s+[a-zA-Z_][a-zA-Z0-9_]*\./gi, "ON ").trim();
|
|
3918
|
-
const eventsMatch = s.match(
|
|
3941
|
+
const eventsMatch = s.match(
|
|
3942
|
+
/\b(AFTER|BEFORE)\s+((?:INSERT|UPDATE|DELETE)(?:\s+OR\s+(?:INSERT|UPDATE|DELETE))+)\s+ON\b/i
|
|
3943
|
+
);
|
|
3919
3944
|
if (eventsMatch) {
|
|
3920
3945
|
const events = eventsMatch[2].split(/\s+OR\s+/).map((e) => e.toUpperCase());
|
|
3921
3946
|
const sorted = [...events].sort(
|
|
@@ -4955,7 +4980,8 @@ var generateDefinitions = ({
|
|
|
4955
4980
|
{
|
|
4956
4981
|
name: "dryRun",
|
|
4957
4982
|
type: "Boolean"
|
|
4958
|
-
}
|
|
4983
|
+
},
|
|
4984
|
+
...model.deletable && model.deletable !== true && model.deletable.args || []
|
|
4959
4985
|
]
|
|
4960
4986
|
});
|
|
4961
4987
|
mutations2.push({
|
|
@@ -4967,7 +4993,8 @@ var generateDefinitions = ({
|
|
|
4967
4993
|
name: "where",
|
|
4968
4994
|
type: `${model.name}WhereUnique`,
|
|
4969
4995
|
nonNull: true
|
|
4970
|
-
}
|
|
4996
|
+
},
|
|
4997
|
+
...model.deletable && model.deletable !== true && model.deletable.restoreArgs || []
|
|
4971
4998
|
]
|
|
4972
4999
|
});
|
|
4973
5000
|
}
|
|
@@ -1,18 +1,44 @@
|
|
|
1
1
|
import upperCase from 'lodash/upperCase';
|
|
2
2
|
import { isRootModel, not } from '..';
|
|
3
3
|
const constantCase = (str) => upperCase(str).replace(/ /g, '_');
|
|
4
|
+
const argTypeStr = (field) => {
|
|
5
|
+
const base = field.list ? `[${field.type}!]` : field.type;
|
|
6
|
+
return field.nonNull ? `${base}!` : base;
|
|
7
|
+
};
|
|
8
|
+
const argsToVariables = (args) => args.map((a) => `$${a.name}: ${argTypeStr(a)}`).join(', ');
|
|
9
|
+
const argsToMutationArgs = (args) => args.map((a) => `${a.name}: $${a.name}`).join(', ');
|
|
4
10
|
export const generateMutations = (models) => {
|
|
5
11
|
const parts = [];
|
|
6
12
|
for (const { name, creatable, updatable, deletable } of models.entities.filter(not(isRootModel))) {
|
|
7
13
|
if (creatable) {
|
|
8
|
-
|
|
14
|
+
const extraArgs = creatable !== true && creatable.args ? creatable.args : [];
|
|
15
|
+
const variables = extraArgs.length ? `$data: Create${name}!, ${argsToVariables(extraArgs)}` : `$data: Create${name}!`;
|
|
16
|
+
const mutationArgs = extraArgs.length ? `data: $data, ${argsToMutationArgs(extraArgs)}` : `data: $data`;
|
|
17
|
+
parts.push(`export const CREATE_${constantCase(name)} = gql\`\n mutation Create${name}Mutation(${variables}) {\n create${name}(${mutationArgs}) { id }\n }\n\`;`);
|
|
9
18
|
}
|
|
10
19
|
if (updatable) {
|
|
11
|
-
|
|
20
|
+
const extraArgs = updatable !== true && updatable.args ? updatable.args : [];
|
|
21
|
+
const variables = extraArgs.length
|
|
22
|
+
? `$id: ID!, $data: Update${name}!, ${argsToVariables(extraArgs)}`
|
|
23
|
+
: `$id: ID!, $data: Update${name}!`;
|
|
24
|
+
const mutationArgs = extraArgs.length
|
|
25
|
+
? `where: { id: $id }, data: $data, ${argsToMutationArgs(extraArgs)}`
|
|
26
|
+
: `where: { id: $id }, data: $data`;
|
|
27
|
+
parts.push(`export const UPDATE_${constantCase(name)} = gql\`\n mutation Update${name}Mutation(${variables}) {\n update${name}(${mutationArgs}) { id }\n }\n\`;`);
|
|
12
28
|
}
|
|
13
29
|
if (deletable) {
|
|
14
|
-
|
|
15
|
-
|
|
30
|
+
const deleteExtraArgs = deletable !== true && deletable.args ? deletable.args : [];
|
|
31
|
+
const deleteVariables = deleteExtraArgs.length ? `$id: ID!, ${argsToVariables(deleteExtraArgs)}` : `$id: ID!`;
|
|
32
|
+
const deleteMutationArgs = deleteExtraArgs.length
|
|
33
|
+
? `where: { id: $id }, ${argsToMutationArgs(deleteExtraArgs)}`
|
|
34
|
+
: `where: { id: $id }`;
|
|
35
|
+
parts.push(`export const DELETE_${constantCase(name)} = gql\`\n mutation Delete${name}Mutation(${deleteVariables}) {\n delete${name}(${deleteMutationArgs})\n }\n\`;`);
|
|
36
|
+
const restoreExtraArgs = deletable !== true && deletable.restoreArgs ? deletable.restoreArgs : [];
|
|
37
|
+
const restoreVariables = restoreExtraArgs.length ? `$id: ID!, ${argsToVariables(restoreExtraArgs)}` : `$id: ID!`;
|
|
38
|
+
const restoreMutationArgs = restoreExtraArgs.length
|
|
39
|
+
? `where: { id: $id }, ${argsToMutationArgs(restoreExtraArgs)}`
|
|
40
|
+
: `where: { id: $id }`;
|
|
41
|
+
parts.push(`export const RESTORE_${constantCase(name)} = gql\`\n mutation Restore${name}Mutation(${restoreVariables}) {\n restore${name}(${restoreMutationArgs})\n }\n\`;`);
|
|
16
42
|
}
|
|
17
43
|
}
|
|
18
44
|
return `import { gql } from "./gql";\n\n${parts.join('\n\n')}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutations.js","sourceRoot":"","sources":["../../../src/client/mutations.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"mutations.js","sourceRoot":"","sources":["../../../src/client/mutations.ts"],"names":[],"mappings":"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"}
|
|
@@ -801,14 +801,9 @@ export class MigrationGenerator {
|
|
|
801
801
|
}
|
|
802
802
|
return -1;
|
|
803
803
|
}
|
|
804
|
-
static TRIGGER_EVENT_ORDER = [
|
|
805
|
-
'INSERT',
|
|
806
|
-
'UPDATE',
|
|
807
|
-
'DELETE',
|
|
808
|
-
];
|
|
804
|
+
static TRIGGER_EVENT_ORDER = ['INSERT', 'UPDATE', 'DELETE'];
|
|
809
805
|
static sortTriggerEvents(events) {
|
|
810
|
-
return [...events].sort((a, b) => MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(a) -
|
|
811
|
-
MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(b));
|
|
806
|
+
return [...events].sort((a, b) => MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(a) - MigrationGenerator.TRIGGER_EVENT_ORDER.indexOf(b));
|
|
812
807
|
}
|
|
813
808
|
normalizeTriggerDef(def) {
|
|
814
809
|
let s = def
|