@smartive/graphql-magic 16.3.6 → 16.3.8
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/.github/workflows/testing.yml +1 -1
- package/CHANGELOG.md +2 -2
- package/dist/bin/gqm.cjs +37 -35
- package/dist/cjs/index.cjs +51 -48
- package/dist/esm/api/execute.d.ts +1 -5
- package/dist/esm/api/execute.js.map +1 -1
- package/dist/esm/client/queries.d.ts +4 -4
- package/dist/esm/client/queries.js.map +1 -1
- package/dist/esm/db/generate.js +2 -0
- package/dist/esm/db/generate.js.map +1 -1
- package/dist/esm/migrations/generate.js +1 -1
- package/dist/esm/migrations/generate.js.map +1 -1
- package/dist/esm/models/models.d.ts +1 -1
- package/dist/esm/models/models.js.map +1 -1
- package/dist/esm/models/utils.d.ts +8 -12
- package/dist/esm/models/utils.js +3 -5
- package/dist/esm/models/utils.js.map +1 -1
- package/dist/esm/permissions/check.js +0 -15
- package/dist/esm/permissions/check.js.map +1 -1
- package/dist/esm/permissions/generate.d.ts +5 -19
- package/dist/esm/permissions/generate.js.map +1 -1
- package/dist/esm/resolvers/arguments.js.map +1 -1
- package/dist/esm/resolvers/filters.js +0 -2
- package/dist/esm/resolvers/filters.js.map +1 -1
- package/dist/esm/resolvers/mutations.js +5 -4
- package/dist/esm/resolvers/mutations.js.map +1 -1
- package/dist/esm/resolvers/node.js.map +1 -1
- package/dist/esm/resolvers/resolver.d.ts +2 -2
- package/dist/esm/resolvers/resolver.js +1 -1
- package/dist/esm/resolvers/resolver.js.map +1 -1
- package/dist/esm/resolvers/selects.js.map +1 -1
- package/dist/esm/resolvers/utils.d.ts +2 -6
- package/dist/esm/resolvers/utils.js +4 -2
- package/dist/esm/resolvers/utils.js.map +1 -1
- package/dist/esm/schema/utils.d.ts +4 -4
- package/dist/esm/schema/utils.js +31 -30
- package/dist/esm/schema/utils.js.map +1 -1
- package/dist/esm/utils/dates.d.ts +2 -4
- package/dist/esm/utils/dates.js +1 -3
- package/dist/esm/utils/dates.js.map +1 -1
- package/docs/docs/1-tutorial.md +1 -1
- package/docs/package-lock.json +1675 -893
- package/docs/package.json +4 -4
- package/eslint.config.mjs +42 -0
- package/migrations/20230912185644_setup.ts +3 -3
- package/package.json +8 -13
- package/src/api/execute.ts +1 -0
- package/src/bin/gqm/codegen.ts +1 -1
- package/src/client/gql.ts +1 -1
- package/src/client/mutations.ts +8 -8
- package/src/client/queries.ts +15 -14
- package/src/db/generate.ts +8 -5
- package/src/migrations/generate.ts +26 -22
- package/src/models/models.ts +24 -9
- package/src/models/mutation-hook.ts +1 -1
- package/src/models/utils.ts +8 -7
- package/src/permissions/check.ts +22 -30
- package/src/permissions/generate.ts +8 -25
- package/src/resolvers/arguments.ts +7 -2
- package/src/resolvers/filters.ts +8 -10
- package/src/resolvers/mutations.ts +19 -16
- package/src/resolvers/node.ts +3 -2
- package/src/resolvers/resolver.ts +11 -10
- package/src/resolvers/selects.ts +4 -3
- package/src/resolvers/utils.ts +15 -10
- package/src/schema/generate.ts +11 -11
- package/src/schema/utils.ts +84 -82
- package/src/utils/dates.ts +3 -3
- package/tests/generated/api/index.ts +2 -2
- package/tests/generated/client/index.ts +1 -193
- package/tests/generated/db/index.ts +4 -4
- package/tests/generated/models.json +2 -1
- package/tests/generated/schema.graphql +1 -1
- package/tests/utils/graphql-client.ts +49 -0
- package/tests/utils/models.ts +1 -0
- package/tests/utils/server.ts +4 -5
- package/tsconfig.eslint.json +18 -3
- package/tsconfig.json +11 -2
- package/.eslintrc +0 -13
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
## [16.3.
|
|
1
|
+
## [16.3.8](https://github.com/smartive/graphql-magic/compare/v16.3.7...v16.3.8) (2025-02-26)
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
### Bug Fixes
|
|
5
5
|
|
|
6
|
-
*
|
|
6
|
+
* **deps:** update dependency graphql to v16 ([#10](https://github.com/smartive/graphql-magic/issues/10)) ([e7ce67a](https://github.com/smartive/graphql-magic/commit/e7ce67a39271d1619370738db9fe36396661bae4))
|
package/dist/bin/gqm.cjs
CHANGED
|
@@ -503,14 +503,14 @@ var typeToField = (type) => type.substr(0, 1).toLowerCase() + type.substr(1);
|
|
|
503
503
|
var getLabel = (s) => (0, import_lodash3.startCase)((0, import_lodash3.camelCase)(s));
|
|
504
504
|
var and = (...predicates) => (field) => predicates.every((predicate) => predicate(field));
|
|
505
505
|
var not = (predicate) => (field) => !predicate(field);
|
|
506
|
-
var isRootModel = (model) => model.root;
|
|
506
|
+
var isRootModel = (model) => !!model.root;
|
|
507
507
|
var isCreatableModel = (model) => model.creatable && model.fields.some(isCreatableField);
|
|
508
508
|
var isUpdatableModel = (model) => model.updatable && model.fields.some(isUpdatableField);
|
|
509
509
|
var isCreatableField = (field) => !field.inherited && !!field.creatable;
|
|
510
510
|
var isUpdatableField = (field) => !field.inherited && !!field.updatable;
|
|
511
511
|
var modelNeedsTable = (model) => model.fields.some((field) => !field.inherited);
|
|
512
512
|
var isRelation = (field) => field.kind === "relation";
|
|
513
|
-
var isInherited = (field) => field.inherited;
|
|
513
|
+
var isInherited = (field) => !!field.inherited;
|
|
514
514
|
var isInTable = (field) => field.name === "id" || !field.inherited;
|
|
515
515
|
var isQueriableField = ({ queriable }) => queriable !== false;
|
|
516
516
|
var isCustomField = (field) => field.kind === "custom";
|
|
@@ -677,6 +677,7 @@ var MigrationGenerator = class {
|
|
|
677
677
|
this.models = models;
|
|
678
678
|
this.schema = (0, import_knex_schema_inspector.SchemaInspector)(knex2);
|
|
679
679
|
}
|
|
680
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
680
681
|
writer = new import_code_block_writer2.default["default"]({
|
|
681
682
|
useSingleQuote: true,
|
|
682
683
|
indentNumberOfSpaces: 2
|
|
@@ -1228,42 +1229,43 @@ var import_cloneDeep = __toESM(require("lodash/cloneDeep"), 1);
|
|
|
1228
1229
|
var import_flatMap = __toESM(require("lodash/flatMap"), 1);
|
|
1229
1230
|
|
|
1230
1231
|
// src/schema/generate.ts
|
|
1231
|
-
var
|
|
1232
|
+
var import_graphql6 = require("graphql");
|
|
1232
1233
|
|
|
1233
1234
|
// src/schema/utils.ts
|
|
1234
1235
|
var import_dayjs2 = require("dayjs");
|
|
1236
|
+
var import_graphql5 = require("graphql");
|
|
1235
1237
|
var import_luxon2 = require("luxon");
|
|
1236
1238
|
var document = (definitions) => ({
|
|
1237
|
-
kind:
|
|
1239
|
+
kind: import_graphql5.Kind.DOCUMENT,
|
|
1238
1240
|
definitions
|
|
1239
1241
|
});
|
|
1240
1242
|
var scalar = (nme) => ({
|
|
1241
1243
|
name: name(nme),
|
|
1242
|
-
kind:
|
|
1244
|
+
kind: import_graphql5.Kind.SCALAR_TYPE_DEFINITION
|
|
1243
1245
|
});
|
|
1244
1246
|
var input = (nme, fields2, dvs) => ({
|
|
1245
1247
|
name: name(nme),
|
|
1246
1248
|
fields: inputValues(fields2),
|
|
1247
|
-
kind:
|
|
1249
|
+
kind: import_graphql5.Kind.INPUT_OBJECT_TYPE_DEFINITION,
|
|
1248
1250
|
directives: directives(dvs)
|
|
1249
1251
|
});
|
|
1250
1252
|
var object = (nme, fds, interfaces, dvs) => ({
|
|
1251
1253
|
name: name(nme),
|
|
1252
1254
|
fields: fields(fds),
|
|
1253
|
-
kind:
|
|
1254
|
-
interfaces: interfaces
|
|
1255
|
+
kind: import_graphql5.Kind.OBJECT_TYPE_DEFINITION,
|
|
1256
|
+
interfaces: interfaces?.map((i) => namedType(i)),
|
|
1255
1257
|
directives: directives(dvs)
|
|
1256
1258
|
});
|
|
1257
1259
|
var iface = (nme, fds, interfaces, dvs) => ({
|
|
1258
1260
|
name: name(nme),
|
|
1259
1261
|
fields: fields(fds),
|
|
1260
|
-
kind:
|
|
1261
|
-
interfaces: interfaces
|
|
1262
|
+
kind: import_graphql5.Kind.INTERFACE_TYPE_DEFINITION,
|
|
1263
|
+
interfaces: interfaces?.map((i) => namedType(i)),
|
|
1262
1264
|
directives: directives(dvs)
|
|
1263
1265
|
});
|
|
1264
1266
|
var inputValues = (fields2) => fields2.map(
|
|
1265
1267
|
(field) => ({
|
|
1266
|
-
kind:
|
|
1268
|
+
kind: import_graphql5.Kind.INPUT_VALUE_DEFINITION,
|
|
1267
1269
|
name: name(field.name),
|
|
1268
1270
|
type: fieldType(field),
|
|
1269
1271
|
defaultValue: field.defaultValue === void 0 ? void 0 : value(field.defaultValue),
|
|
@@ -1272,11 +1274,11 @@ var inputValues = (fields2) => fields2.map(
|
|
|
1272
1274
|
);
|
|
1273
1275
|
var fields = (fields2) => fields2.map(
|
|
1274
1276
|
(field) => ({
|
|
1275
|
-
kind:
|
|
1277
|
+
kind: import_graphql5.Kind.FIELD_DEFINITION,
|
|
1276
1278
|
name: name(field.name),
|
|
1277
1279
|
type: fieldType(field),
|
|
1278
1280
|
arguments: field.args?.map((arg) => ({
|
|
1279
|
-
kind:
|
|
1281
|
+
kind: import_graphql5.Kind.INPUT_VALUE_DEFINITION,
|
|
1280
1282
|
name: name(arg.name),
|
|
1281
1283
|
type: fieldType(arg),
|
|
1282
1284
|
defaultValue: arg.defaultValue === void 0 ? void 0 : value(arg.defaultValue)
|
|
@@ -1286,42 +1288,42 @@ var fields = (fields2) => fields2.map(
|
|
|
1286
1288
|
);
|
|
1287
1289
|
var directives = (directives2) => directives2?.map(
|
|
1288
1290
|
(directive) => ({
|
|
1289
|
-
kind:
|
|
1291
|
+
kind: import_graphql5.Kind.DIRECTIVE,
|
|
1290
1292
|
name: name(directive.name),
|
|
1291
1293
|
arguments: args(directive.values)
|
|
1292
1294
|
})
|
|
1293
1295
|
);
|
|
1294
1296
|
var args = (ags) => ags?.map(
|
|
1295
1297
|
(argument) => ({
|
|
1296
|
-
kind:
|
|
1298
|
+
kind: import_graphql5.Kind.ARGUMENT,
|
|
1297
1299
|
name: name(argument.name),
|
|
1298
1300
|
value: value(argument.values)
|
|
1299
1301
|
})
|
|
1300
1302
|
);
|
|
1301
1303
|
var enm = (nme, values) => ({
|
|
1302
1304
|
name: name(nme),
|
|
1303
|
-
kind:
|
|
1305
|
+
kind: import_graphql5.Kind.ENUM_TYPE_DEFINITION,
|
|
1304
1306
|
values: values.map(
|
|
1305
1307
|
(v) => ({
|
|
1306
|
-
kind:
|
|
1308
|
+
kind: import_graphql5.Kind.ENUM_VALUE_DEFINITION,
|
|
1307
1309
|
name: name(v)
|
|
1308
1310
|
})
|
|
1309
1311
|
)
|
|
1310
1312
|
});
|
|
1311
1313
|
var nonNull = (type) => ({
|
|
1312
1314
|
type,
|
|
1313
|
-
kind:
|
|
1315
|
+
kind: import_graphql5.Kind.NON_NULL_TYPE
|
|
1314
1316
|
});
|
|
1315
1317
|
var namedType = (nme) => ({
|
|
1316
|
-
kind:
|
|
1318
|
+
kind: import_graphql5.Kind.NAMED_TYPE,
|
|
1317
1319
|
name: name(nme)
|
|
1318
1320
|
});
|
|
1319
1321
|
var list = (type) => ({
|
|
1320
1322
|
type,
|
|
1321
|
-
kind:
|
|
1323
|
+
kind: import_graphql5.Kind.LIST_TYPE
|
|
1322
1324
|
});
|
|
1323
1325
|
var name = (name2) => ({
|
|
1324
|
-
kind:
|
|
1326
|
+
kind: import_graphql5.Kind.NAME,
|
|
1325
1327
|
value: name2
|
|
1326
1328
|
});
|
|
1327
1329
|
var fieldType = (field) => {
|
|
@@ -1335,33 +1337,33 @@ var fieldType = (field) => {
|
|
|
1335
1337
|
return type;
|
|
1336
1338
|
};
|
|
1337
1339
|
var value = (val = null) => val === null ? {
|
|
1338
|
-
kind:
|
|
1340
|
+
kind: import_graphql5.Kind.NULL
|
|
1339
1341
|
} : typeof val === "boolean" ? {
|
|
1340
|
-
kind:
|
|
1342
|
+
kind: import_graphql5.Kind.BOOLEAN,
|
|
1341
1343
|
value: val
|
|
1342
1344
|
} : typeof val === "number" ? {
|
|
1343
|
-
kind:
|
|
1345
|
+
kind: import_graphql5.Kind.INT,
|
|
1344
1346
|
value: `${val}`
|
|
1345
1347
|
} : typeof val === "string" ? {
|
|
1346
|
-
kind:
|
|
1348
|
+
kind: import_graphql5.Kind.STRING,
|
|
1347
1349
|
value: val
|
|
1348
1350
|
} : val instanceof Symbol ? {
|
|
1349
|
-
kind:
|
|
1351
|
+
kind: import_graphql5.Kind.ENUM,
|
|
1350
1352
|
value: val.description
|
|
1351
1353
|
} : Array.isArray(val) ? {
|
|
1352
|
-
kind:
|
|
1354
|
+
kind: import_graphql5.Kind.LIST,
|
|
1353
1355
|
values: val.map(value)
|
|
1354
1356
|
} : val instanceof import_luxon2.DateTime ? {
|
|
1355
|
-
kind:
|
|
1357
|
+
kind: import_graphql5.Kind.STRING,
|
|
1356
1358
|
value: val.toString()
|
|
1357
1359
|
} : val instanceof import_dayjs2.Dayjs ? {
|
|
1358
|
-
kind:
|
|
1360
|
+
kind: import_graphql5.Kind.STRING,
|
|
1359
1361
|
value: val.toISOString()
|
|
1360
1362
|
} : typeof val === "object" ? {
|
|
1361
|
-
kind:
|
|
1363
|
+
kind: import_graphql5.Kind.OBJECT,
|
|
1362
1364
|
fields: Object.keys(val).map(
|
|
1363
1365
|
(nme) => ({
|
|
1364
|
-
kind:
|
|
1366
|
+
kind: import_graphql5.Kind.OBJECT_FIELD,
|
|
1365
1367
|
name: name(nme),
|
|
1366
1368
|
value: value(val[nme])
|
|
1367
1369
|
})
|
|
@@ -1620,11 +1622,11 @@ var generateDefinitions = ({
|
|
|
1620
1622
|
};
|
|
1621
1623
|
var generate = (models) => document(generateDefinitions(models));
|
|
1622
1624
|
var printSchema = (schema) => [
|
|
1623
|
-
...schema.getDirectives().map((d) => d.astNode && (0,
|
|
1624
|
-
...Object.values(schema.getTypeMap()).filter((t) => !t.name.match(/^__/)).sort((a, b) => a.name > b.name ? 1 : -1).map((t) => t.astNode && (0,
|
|
1625
|
+
...schema.getDirectives().map((d) => d.astNode && (0, import_graphql6.print)(d.astNode)),
|
|
1626
|
+
...Object.values(schema.getTypeMap()).filter((t) => !t.name.match(/^__/)).sort((a, b) => a.name > b.name ? 1 : -1).map((t) => t.astNode && (0, import_graphql6.print)(t.astNode))
|
|
1625
1627
|
].filter(Boolean).map((s) => `${s}
|
|
1626
1628
|
`).join("\n");
|
|
1627
|
-
var printSchemaFromModels = (models) => printSchema((0,
|
|
1629
|
+
var printSchemaFromModels = (models) => printSchema((0, import_graphql6.buildASTSchema)(generate(models)));
|
|
1628
1630
|
|
|
1629
1631
|
// src/bin/gqm/codegen.ts
|
|
1630
1632
|
var import_cli = require("@graphql-codegen/cli");
|
|
@@ -1938,7 +1940,7 @@ var generateGraphqlClientTypes = async () => {
|
|
|
1938
1940
|
documents: [graphqlQueriesPath, `${generatedFolderPath}/client/mutations.ts`],
|
|
1939
1941
|
generates: {
|
|
1940
1942
|
[`${generatedFolderPath}/client/index.ts`]: {
|
|
1941
|
-
plugins: ["typescript", "typescript-operations"
|
|
1943
|
+
plugins: ["typescript", "typescript-operations"]
|
|
1942
1944
|
}
|
|
1943
1945
|
},
|
|
1944
1946
|
config: {
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -695,7 +695,7 @@ var getLabel = (s) => (0, import_lodash3.startCase)((0, import_lodash3.camelCase
|
|
|
695
695
|
var or = (...predicates) => (field) => predicates.some((predicate) => predicate(field));
|
|
696
696
|
var and = (...predicates) => (field) => predicates.every((predicate) => predicate(field));
|
|
697
697
|
var not = (predicate) => (field) => !predicate(field);
|
|
698
|
-
var isRootModel = (model) => model.root;
|
|
698
|
+
var isRootModel = (model) => !!model.root;
|
|
699
699
|
var isEntityModel = (model) => model instanceof EntityModel;
|
|
700
700
|
var isEnumModel = (model) => model instanceof EnumModel;
|
|
701
701
|
var isRawEnumModel = (model) => model instanceof RawEnumModel;
|
|
@@ -712,7 +712,7 @@ var hasName = (name2) => (field) => field.name == name2;
|
|
|
712
712
|
var isPrimitive = (field) => field.kind === void 0 || field.kind === "primitive";
|
|
713
713
|
var isEnum = (field) => field.kind === "enum";
|
|
714
714
|
var isRelation = (field) => field.kind === "relation";
|
|
715
|
-
var isInherited = (field) => field.inherited;
|
|
715
|
+
var isInherited = (field) => !!field.inherited;
|
|
716
716
|
var isInTable = (field) => field.name === "id" || !field.inherited;
|
|
717
717
|
var isToOneRelation = (field) => isRelation(field) && !!field.toOne;
|
|
718
718
|
var isQueriableField = ({ queriable }) => queriable !== false;
|
|
@@ -767,9 +767,8 @@ var retry = async (cb, condition) => {
|
|
|
767
767
|
} catch (e) {
|
|
768
768
|
if (condition(e)) {
|
|
769
769
|
return await cb();
|
|
770
|
-
} else {
|
|
771
|
-
throw e;
|
|
772
770
|
}
|
|
771
|
+
throw e;
|
|
773
772
|
}
|
|
774
773
|
};
|
|
775
774
|
var as = (value2, type) => {
|
|
@@ -930,9 +929,8 @@ var anyDateToLuxon = (date, zone, fallbackToNow = false) => {
|
|
|
930
929
|
if (!date) {
|
|
931
930
|
if (fallbackToNow) {
|
|
932
931
|
return import_luxon.DateTime.local({ zone });
|
|
933
|
-
} else {
|
|
934
|
-
return void 0;
|
|
935
932
|
}
|
|
933
|
+
return void 0;
|
|
936
934
|
}
|
|
937
935
|
if (import_luxon.DateTime.isDateTime(date)) {
|
|
938
936
|
return date.setZone(zone);
|
|
@@ -1068,6 +1066,7 @@ var MigrationGenerator = class {
|
|
|
1068
1066
|
this.models = models;
|
|
1069
1067
|
this.schema = (0, import_knex_schema_inspector.SchemaInspector)(knex);
|
|
1070
1068
|
}
|
|
1069
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
1071
1070
|
writer = new import_code_block_writer2.default["default"]({
|
|
1072
1071
|
useSingleQuote: true,
|
|
1073
1072
|
indentNumberOfSpaces: 2
|
|
@@ -1639,8 +1638,10 @@ var getTypeName = (t) => {
|
|
|
1639
1638
|
case "ListType":
|
|
1640
1639
|
case "NonNullType":
|
|
1641
1640
|
return getTypeName(t.type);
|
|
1642
|
-
|
|
1641
|
+
case "NamedType":
|
|
1643
1642
|
return t.name.value;
|
|
1643
|
+
default:
|
|
1644
|
+
throw new Error(`Unknown type node kind: ${t.kind}`);
|
|
1644
1645
|
}
|
|
1645
1646
|
};
|
|
1646
1647
|
var isListType = (type) => {
|
|
@@ -1702,7 +1703,7 @@ var ors = (query, [first, ...rest]) => {
|
|
|
1702
1703
|
};
|
|
1703
1704
|
var getNameOrAlias = (node) => {
|
|
1704
1705
|
const name2 = node.alias ? node.alias.value : node.name.value;
|
|
1705
|
-
if ([ID_ALIAS].
|
|
1706
|
+
if ([ID_ALIAS].includes(name2)) {
|
|
1706
1707
|
throw new UserInputError(`"${name2}" can not be used as alias since it's a reserved word`);
|
|
1707
1708
|
}
|
|
1708
1709
|
return name2;
|
|
@@ -2482,7 +2483,7 @@ var resolve = async (ctx, id) => {
|
|
|
2482
2483
|
});
|
|
2483
2484
|
const { query, verifiedPermissionStacks } = await buildQuery(node);
|
|
2484
2485
|
if (ctx.info.fieldName === "me") {
|
|
2485
|
-
if (!node.ctx.user
|
|
2486
|
+
if (!node.ctx.user?.id) {
|
|
2486
2487
|
return void 0;
|
|
2487
2488
|
}
|
|
2488
2489
|
void query.where({ [getColumn(node, "id")]: node.ctx.user.id });
|
|
@@ -2717,18 +2718,19 @@ var del = async (model, { where, dryRun }, ctx) => {
|
|
|
2717
2718
|
if (!dryRun) {
|
|
2718
2719
|
const normalizedInput = { deleted: true, deletedAt: ctx.now, deletedById: ctx.user?.id };
|
|
2719
2720
|
const data = { prev: entity2, input: {}, normalizedInput, next: { ...entity2, ...normalizedInput } };
|
|
2720
|
-
|
|
2721
|
+
const mutationHook = ctx.mutationHook;
|
|
2722
|
+
if (mutationHook) {
|
|
2721
2723
|
beforeHooks.push(async () => {
|
|
2722
|
-
await
|
|
2724
|
+
await mutationHook(currentModel, "delete", "before", data, ctx);
|
|
2723
2725
|
});
|
|
2724
2726
|
}
|
|
2725
2727
|
mutations.push(async () => {
|
|
2726
2728
|
await ctx.knex(currentModel.name).where({ id: entity2.id }).update(normalizedInput);
|
|
2727
2729
|
await createRevision(currentModel, { ...entity2, deleted: true }, ctx);
|
|
2728
2730
|
});
|
|
2729
|
-
if (
|
|
2731
|
+
if (mutationHook) {
|
|
2730
2732
|
afterHooks.push(async () => {
|
|
2731
|
-
await
|
|
2733
|
+
await mutationHook(currentModel, "delete", "after", data, ctx);
|
|
2732
2734
|
});
|
|
2733
2735
|
}
|
|
2734
2736
|
}
|
|
@@ -2936,49 +2938,50 @@ var getResolvers = (models) => {
|
|
|
2936
2938
|
};
|
|
2937
2939
|
|
|
2938
2940
|
// src/schema/generate.ts
|
|
2939
|
-
var
|
|
2941
|
+
var import_graphql6 = require("graphql");
|
|
2940
2942
|
|
|
2941
2943
|
// src/schema/utils.ts
|
|
2942
2944
|
var import_dayjs2 = require("dayjs");
|
|
2945
|
+
var import_graphql5 = require("graphql");
|
|
2943
2946
|
var import_luxon2 = require("luxon");
|
|
2944
2947
|
var document = (definitions) => ({
|
|
2945
|
-
kind:
|
|
2948
|
+
kind: import_graphql5.Kind.DOCUMENT,
|
|
2946
2949
|
definitions
|
|
2947
2950
|
});
|
|
2948
2951
|
var directive = (nme, locations, fields2) => ({
|
|
2949
2952
|
name: name(nme),
|
|
2950
2953
|
repeatable: false,
|
|
2951
|
-
kind:
|
|
2954
|
+
kind: import_graphql5.Kind.DIRECTIVE_DEFINITION,
|
|
2952
2955
|
arguments: fields2 && inputValues(fields2),
|
|
2953
2956
|
locations: locations.map(name)
|
|
2954
2957
|
});
|
|
2955
2958
|
var scalar = (nme) => ({
|
|
2956
2959
|
name: name(nme),
|
|
2957
|
-
kind:
|
|
2960
|
+
kind: import_graphql5.Kind.SCALAR_TYPE_DEFINITION
|
|
2958
2961
|
});
|
|
2959
2962
|
var input = (nme, fields2, dvs) => ({
|
|
2960
2963
|
name: name(nme),
|
|
2961
2964
|
fields: inputValues(fields2),
|
|
2962
|
-
kind:
|
|
2965
|
+
kind: import_graphql5.Kind.INPUT_OBJECT_TYPE_DEFINITION,
|
|
2963
2966
|
directives: directives(dvs)
|
|
2964
2967
|
});
|
|
2965
2968
|
var object = (nme, fds, interfaces, dvs) => ({
|
|
2966
2969
|
name: name(nme),
|
|
2967
2970
|
fields: fields(fds),
|
|
2968
|
-
kind:
|
|
2969
|
-
interfaces: interfaces
|
|
2971
|
+
kind: import_graphql5.Kind.OBJECT_TYPE_DEFINITION,
|
|
2972
|
+
interfaces: interfaces?.map((i) => namedType(i)),
|
|
2970
2973
|
directives: directives(dvs)
|
|
2971
2974
|
});
|
|
2972
2975
|
var iface = (nme, fds, interfaces, dvs) => ({
|
|
2973
2976
|
name: name(nme),
|
|
2974
2977
|
fields: fields(fds),
|
|
2975
|
-
kind:
|
|
2976
|
-
interfaces: interfaces
|
|
2978
|
+
kind: import_graphql5.Kind.INTERFACE_TYPE_DEFINITION,
|
|
2979
|
+
interfaces: interfaces?.map((i) => namedType(i)),
|
|
2977
2980
|
directives: directives(dvs)
|
|
2978
2981
|
});
|
|
2979
2982
|
var inputValues = (fields2) => fields2.map(
|
|
2980
2983
|
(field) => ({
|
|
2981
|
-
kind:
|
|
2984
|
+
kind: import_graphql5.Kind.INPUT_VALUE_DEFINITION,
|
|
2982
2985
|
name: name(field.name),
|
|
2983
2986
|
type: fieldType(field),
|
|
2984
2987
|
defaultValue: field.defaultValue === void 0 ? void 0 : value(field.defaultValue),
|
|
@@ -2987,11 +2990,11 @@ var inputValues = (fields2) => fields2.map(
|
|
|
2987
2990
|
);
|
|
2988
2991
|
var fields = (fields2) => fields2.map(
|
|
2989
2992
|
(field) => ({
|
|
2990
|
-
kind:
|
|
2993
|
+
kind: import_graphql5.Kind.FIELD_DEFINITION,
|
|
2991
2994
|
name: name(field.name),
|
|
2992
2995
|
type: fieldType(field),
|
|
2993
2996
|
arguments: field.args?.map((arg) => ({
|
|
2994
|
-
kind:
|
|
2997
|
+
kind: import_graphql5.Kind.INPUT_VALUE_DEFINITION,
|
|
2995
2998
|
name: name(arg.name),
|
|
2996
2999
|
type: fieldType(arg),
|
|
2997
3000
|
defaultValue: arg.defaultValue === void 0 ? void 0 : value(arg.defaultValue)
|
|
@@ -3002,49 +3005,49 @@ var fields = (fields2) => fields2.map(
|
|
|
3002
3005
|
var inputValue = (nme, type, dvs, description, defaultValue) => ({
|
|
3003
3006
|
name: name(nme),
|
|
3004
3007
|
type,
|
|
3005
|
-
kind:
|
|
3008
|
+
kind: import_graphql5.Kind.INPUT_VALUE_DEFINITION,
|
|
3006
3009
|
directives: directives(dvs),
|
|
3007
3010
|
defaultValue: defaultValue ? value(defaultValue) : void 0,
|
|
3008
3011
|
description: description ? value(description) : void 0
|
|
3009
3012
|
});
|
|
3010
3013
|
var directives = (directives2) => directives2?.map(
|
|
3011
3014
|
(directive2) => ({
|
|
3012
|
-
kind:
|
|
3015
|
+
kind: import_graphql5.Kind.DIRECTIVE,
|
|
3013
3016
|
name: name(directive2.name),
|
|
3014
3017
|
arguments: args(directive2.values)
|
|
3015
3018
|
})
|
|
3016
3019
|
);
|
|
3017
3020
|
var args = (ags) => ags?.map(
|
|
3018
3021
|
(argument) => ({
|
|
3019
|
-
kind:
|
|
3022
|
+
kind: import_graphql5.Kind.ARGUMENT,
|
|
3020
3023
|
name: name(argument.name),
|
|
3021
3024
|
value: value(argument.values)
|
|
3022
3025
|
})
|
|
3023
3026
|
);
|
|
3024
3027
|
var enm = (nme, values) => ({
|
|
3025
3028
|
name: name(nme),
|
|
3026
|
-
kind:
|
|
3029
|
+
kind: import_graphql5.Kind.ENUM_TYPE_DEFINITION,
|
|
3027
3030
|
values: values.map(
|
|
3028
3031
|
(v) => ({
|
|
3029
|
-
kind:
|
|
3032
|
+
kind: import_graphql5.Kind.ENUM_VALUE_DEFINITION,
|
|
3030
3033
|
name: name(v)
|
|
3031
3034
|
})
|
|
3032
3035
|
)
|
|
3033
3036
|
});
|
|
3034
3037
|
var nonNull = (type) => ({
|
|
3035
3038
|
type,
|
|
3036
|
-
kind:
|
|
3039
|
+
kind: import_graphql5.Kind.NON_NULL_TYPE
|
|
3037
3040
|
});
|
|
3038
3041
|
var namedType = (nme) => ({
|
|
3039
|
-
kind:
|
|
3042
|
+
kind: import_graphql5.Kind.NAMED_TYPE,
|
|
3040
3043
|
name: name(nme)
|
|
3041
3044
|
});
|
|
3042
3045
|
var list = (type) => ({
|
|
3043
3046
|
type,
|
|
3044
|
-
kind:
|
|
3047
|
+
kind: import_graphql5.Kind.LIST_TYPE
|
|
3045
3048
|
});
|
|
3046
3049
|
var name = (name2) => ({
|
|
3047
|
-
kind:
|
|
3050
|
+
kind: import_graphql5.Kind.NAME,
|
|
3048
3051
|
value: name2
|
|
3049
3052
|
});
|
|
3050
3053
|
var fieldType = (field) => {
|
|
@@ -3058,33 +3061,33 @@ var fieldType = (field) => {
|
|
|
3058
3061
|
return type;
|
|
3059
3062
|
};
|
|
3060
3063
|
var value = (val = null) => val === null ? {
|
|
3061
|
-
kind:
|
|
3064
|
+
kind: import_graphql5.Kind.NULL
|
|
3062
3065
|
} : typeof val === "boolean" ? {
|
|
3063
|
-
kind:
|
|
3066
|
+
kind: import_graphql5.Kind.BOOLEAN,
|
|
3064
3067
|
value: val
|
|
3065
3068
|
} : typeof val === "number" ? {
|
|
3066
|
-
kind:
|
|
3069
|
+
kind: import_graphql5.Kind.INT,
|
|
3067
3070
|
value: `${val}`
|
|
3068
3071
|
} : typeof val === "string" ? {
|
|
3069
|
-
kind:
|
|
3072
|
+
kind: import_graphql5.Kind.STRING,
|
|
3070
3073
|
value: val
|
|
3071
3074
|
} : val instanceof Symbol ? {
|
|
3072
|
-
kind:
|
|
3075
|
+
kind: import_graphql5.Kind.ENUM,
|
|
3073
3076
|
value: val.description
|
|
3074
3077
|
} : Array.isArray(val) ? {
|
|
3075
|
-
kind:
|
|
3078
|
+
kind: import_graphql5.Kind.LIST,
|
|
3076
3079
|
values: val.map(value)
|
|
3077
3080
|
} : val instanceof import_luxon2.DateTime ? {
|
|
3078
|
-
kind:
|
|
3081
|
+
kind: import_graphql5.Kind.STRING,
|
|
3079
3082
|
value: val.toString()
|
|
3080
3083
|
} : val instanceof import_dayjs2.Dayjs ? {
|
|
3081
|
-
kind:
|
|
3084
|
+
kind: import_graphql5.Kind.STRING,
|
|
3082
3085
|
value: val.toISOString()
|
|
3083
3086
|
} : typeof val === "object" ? {
|
|
3084
|
-
kind:
|
|
3087
|
+
kind: import_graphql5.Kind.OBJECT,
|
|
3085
3088
|
fields: Object.keys(val).map(
|
|
3086
3089
|
(nme) => ({
|
|
3087
|
-
kind:
|
|
3090
|
+
kind: import_graphql5.Kind.OBJECT_FIELD,
|
|
3088
3091
|
name: name(nme),
|
|
3089
3092
|
value: value(val[nme])
|
|
3090
3093
|
})
|
|
@@ -3343,12 +3346,12 @@ var generateDefinitions = ({
|
|
|
3343
3346
|
};
|
|
3344
3347
|
var generate = (models) => document(generateDefinitions(models));
|
|
3345
3348
|
var printSchema = (schema) => [
|
|
3346
|
-
...schema.getDirectives().map((d) => d.astNode && (0,
|
|
3347
|
-
...Object.values(schema.getTypeMap()).filter((t) => !t.name.match(/^__/)).sort((a, b) => a.name > b.name ? 1 : -1).map((t) => t.astNode && (0,
|
|
3349
|
+
...schema.getDirectives().map((d) => d.astNode && (0, import_graphql6.print)(d.astNode)),
|
|
3350
|
+
...Object.values(schema.getTypeMap()).filter((t) => !t.name.match(/^__/)).sort((a, b) => a.name > b.name ? 1 : -1).map((t) => t.astNode && (0, import_graphql6.print)(t.astNode))
|
|
3348
3351
|
].filter(Boolean).map((s) => `${s}
|
|
3349
3352
|
`).join("\n");
|
|
3350
|
-
var printSchemaFromDocument = (document2) => printSchema((0,
|
|
3351
|
-
var printSchemaFromModels = (models) => printSchema((0,
|
|
3353
|
+
var printSchemaFromDocument = (document2) => printSchema((0, import_graphql6.buildASTSchema)(document2));
|
|
3354
|
+
var printSchemaFromModels = (models) => printSchema((0, import_graphql6.buildASTSchema)(generate(models)));
|
|
3352
3355
|
// Annotate the CommonJS export names for ESM import in node:
|
|
3353
3356
|
0 && (module.exports = {
|
|
3354
3357
|
AliasGenerator,
|
|
@@ -3,8 +3,4 @@ import { Context } from '..';
|
|
|
3
3
|
export declare const execute: ({ additionalResolvers, body, ...ctx }: {
|
|
4
4
|
additionalResolvers?: IResolvers<any, any>;
|
|
5
5
|
body: any;
|
|
6
|
-
} & Omit<Context, "document">) => Promise<import("graphql").ExecutionResult<
|
|
7
|
-
[key: string]: any;
|
|
8
|
-
}, {
|
|
9
|
-
[key: string]: any;
|
|
10
|
-
}>>;
|
|
6
|
+
} & Omit<Context, "document">) => Promise<import("graphql").ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/api/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAsB,MAAM,EAAE,OAAO,IAAI,cAAc,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAW,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAE1D,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,mBAAmB,EACnB,IAAI,EACJ,GAAG,GAAG,EAIqB,EAAE,EAAE;IAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,KAAK,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;KAC1D,CAAC,CAAC;IAEH,MAAM,YAAY,GAAY;QAC5B,QAAQ;QACR,GAAG,GAAG;KACP,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;QAClC,MAAM;QACN,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC1D,YAAY;QACZ,cAAc,EAAE,IAAI,CAAC,SAAS;QAC9B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAwB,EAAE,EAAE;YAC/D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/api/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAsB,MAAM,EAAE,OAAO,IAAI,cAAc,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAW,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAE1D,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,mBAAmB,EACnB,IAAI,EACJ,GAAG,GAAG,EAIqB,EAAE,EAAE;IAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,KAAK,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;KAC1D,CAAC,CAAC;IAEH,MAAM,YAAY,GAAY;QAC5B,QAAQ;QACR,GAAG,GAAG;KACP,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;QAClC,MAAM;QACN,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC1D,YAAY;QACZ,cAAc,EAAE,IAAI,CAAC,SAAS;QAC9B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAwB,EAAE,EAAE;YAC/D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAEzB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ManyToManyRelation, ReverseRelation } from '..';
|
|
2
2
|
import { EntityModel, Model, Models, Relation } from '../models/models';
|
|
3
|
-
export declare const getUpdateEntityQuery: (model: EntityModel, role: string, fields?: string[]
|
|
3
|
+
export declare const getUpdateEntityQuery: (model: EntityModel, role: string, fields?: string[], additionalFields?: string) => string;
|
|
4
4
|
export type RelationConstraints = Record<string, (source: any) => any>;
|
|
5
|
-
export declare const fieldIsSearchable: (model: EntityModel, fieldName: string) => boolean;
|
|
6
|
-
export declare const getSelectEntityRelationsQuery: (model: EntityModel, relationNames: string[]) => string;
|
|
7
|
-
export declare const getManyToManyRelationsQuery: (model: Model, action: "create" | "update", manyToManyRelations: ManyToManyRelation[]) => string;
|
|
5
|
+
export declare const fieldIsSearchable: (model: EntityModel, fieldName: string) => boolean | undefined;
|
|
6
|
+
export declare const getSelectEntityRelationsQuery: (model: EntityModel, relationNames: string[]) => string | false;
|
|
7
|
+
export declare const getManyToManyRelationsQuery: (model: Model, action: "create" | "update", manyToManyRelations: ManyToManyRelation[]) => string | false;
|
|
8
8
|
export type MutationQuery = {
|
|
9
9
|
mutated: {
|
|
10
10
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/client/queries.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,GAAG,EACH,sBAAsB,EACtB,aAAa,EACb,UAAU,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACb,GAAG,EACH,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAkB,EAClB,IAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/client/queries.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/db/generate.js
CHANGED
|
@@ -11,6 +11,7 @@ const PRIMITIVE_TYPES = {
|
|
|
11
11
|
};
|
|
12
12
|
const OPTIONAL_SEED_FIELDS = ['createdAt', 'createdById', 'updatedAt', 'updatedById', 'deletedAt', 'deletedById'];
|
|
13
13
|
export const generateDBModels = (models, dateLibrary) => {
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
14
15
|
const writer = new CodeBlockWriter['default']({
|
|
15
16
|
useSingleQuote: true,
|
|
16
17
|
indentNumberOfSpaces: 2,
|
|
@@ -104,6 +105,7 @@ const getFieldType = (field, dateLibrary, input) => {
|
|
|
104
105
|
}
|
|
105
106
|
};
|
|
106
107
|
export const generateKnexTables = (models) => {
|
|
108
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
107
109
|
const writer = new CodeBlockWriter['default']({
|
|
108
110
|
useSingleQuote: true,
|
|
109
111
|
indentNumberOfSpaces: 2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/db/generate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/db/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import lowerFirst from 'lodash/lowerFirst';
|
|
|
4
4
|
import { and, get, isCreatableModel, isInherited, isUpdatableField, isUpdatableModel, modelNeedsTable, not, summonByName, typeToField, } from '../models/utils';
|
|
5
5
|
export class MigrationGenerator {
|
|
6
6
|
models;
|
|
7
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
7
8
|
writer = new CodeBlockWriter['default']({
|
|
8
9
|
useSingleQuote: true,
|
|
9
10
|
indentNumberOfSpaces: 2,
|
|
@@ -235,7 +236,6 @@ export class MigrationGenerator {
|
|
|
235
236
|
}
|
|
236
237
|
});
|
|
237
238
|
for (const field of fields) {
|
|
238
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
239
239
|
summonByName(this.columns[model.name], field.kind === 'relation' ? `${field.oldName}Id` : field.oldName).name =
|
|
240
240
|
field.kind === 'relation' ? `${field.name}Id` : field.name;
|
|
241
241
|
}
|