@kubun/graphql 0.3.11 → 0.3.13
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/lib/schema.d.ts +2 -2
- package/lib/schema.d.ts.map +1 -1
- package/lib/schema.js +37 -13
- package/package.json +4 -4
package/lib/schema.d.ts
CHANGED
|
@@ -64,8 +64,8 @@ export declare class SchemaBuilder {
|
|
|
64
64
|
_buildObjectFields(id: string, schema: DocumentModelSchema | ObjectModel, parentName?: string): GraphQLFieldConfigMap<Record<string, unknown>, Context>;
|
|
65
65
|
_buildRelationFields(fields: GraphQLFieldConfigMap<DocumentNode, Context>, fieldName: string, relation: RelationField): void;
|
|
66
66
|
_buildRelationSubscriptions(fields: GraphQLFieldConfigMap<unknown, Context>, modelID: string, fieldName: string, relation: RelationField): void;
|
|
67
|
-
_buildString(schema: StringModel, parentName: string, asInput: boolean): GraphQLEnumType | GraphQLObjectType | GraphQLScalarType;
|
|
68
|
-
_buildCustomString(schema: StringCustomModel, asInput: boolean): GraphQLScalarType<unknown, unknown> | GraphQLObjectType<string, Context> | GraphQLObjectType<AttachmentID, Context>;
|
|
67
|
+
_buildString(id: string, schema: StringModel, parentName: string, asInput: boolean): GraphQLEnumType | GraphQLObjectType | GraphQLScalarType;
|
|
68
|
+
_buildCustomString(id: string, schema: StringCustomModel, asInput: boolean): GraphQLScalarType<unknown, unknown> | GraphQLObjectType<string, Context> | GraphQLObjectType<AttachmentID, Context>;
|
|
69
69
|
_buildEnumString(schema: StringEnumModel, parentName?: string): GraphQLEnumType;
|
|
70
70
|
_buildFormatString(schema: StringFormatModel): GraphQLScalarType<unknown, unknown>;
|
|
71
71
|
}
|
package/lib/schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,eAAe,EAAY,MAAM,WAAW,CAAA;AAC/E,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EAEZ,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,EACZ,WAAW,EACX,qBAAqB,EACrB,WAAW,EAEX,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,WAAW,EAEX,SAAS,EACV,MAAM,iBAAiB,CAAA;AAGxB,OAAO,EAGL,eAAe,EAEf,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAI1B,sBAAsB,EACtB,KAAK,gBAAgB,EAErB,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,aAAa,EAKd,MAAM,SAAS,CAAA;AAkBhB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"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"}
|
package/lib/schema.js
CHANGED
|
@@ -19,6 +19,13 @@ const STRING_TITLES = {
|
|
|
19
19
|
did: GraphQLDID,
|
|
20
20
|
docid: GraphQLDocID
|
|
21
21
|
};
|
|
22
|
+
const EXPANDED_STRING_SCALARS = [
|
|
23
|
+
'attachmentid',
|
|
24
|
+
'did'
|
|
25
|
+
];
|
|
26
|
+
function isExpandedStringScalar(title) {
|
|
27
|
+
return EXPANDED_STRING_SCALARS.includes(title.toLowerCase());
|
|
28
|
+
}
|
|
22
29
|
function getReferenceID(path) {
|
|
23
30
|
return path.slice(REFERENCE_PREFIX.length);
|
|
24
31
|
}
|
|
@@ -977,6 +984,11 @@ export class SchemaBuilder {
|
|
|
977
984
|
}
|
|
978
985
|
}
|
|
979
986
|
_buildScalar(id, schema, parentName = '', asInput = false) {
|
|
987
|
+
// Use input key for expanded string scalars
|
|
988
|
+
const key = asInput && schema.type === 'string' && schema.title != null && isExpandedStringScalar(schema.title) ? `${id}-input` : id;
|
|
989
|
+
if (this._types[key] != null) {
|
|
990
|
+
return this._types[key];
|
|
991
|
+
}
|
|
980
992
|
switch(schema.type){
|
|
981
993
|
case 'boolean':
|
|
982
994
|
this._types[id] = GraphQLBoolean;
|
|
@@ -988,10 +1000,10 @@ export class SchemaBuilder {
|
|
|
988
1000
|
this._types[id] = GraphQLFloat;
|
|
989
1001
|
break;
|
|
990
1002
|
case 'string':
|
|
991
|
-
this.
|
|
1003
|
+
this._buildString(id, schema, parentName, asInput);
|
|
992
1004
|
break;
|
|
993
1005
|
}
|
|
994
|
-
return this._types[
|
|
1006
|
+
return this._types[key];
|
|
995
1007
|
}
|
|
996
1008
|
_buildArray(schema, parentName = '') {
|
|
997
1009
|
const itemRef = schema.items.$ref;
|
|
@@ -1094,35 +1106,47 @@ export class SchemaBuilder {
|
|
|
1094
1106
|
}
|
|
1095
1107
|
};
|
|
1096
1108
|
}
|
|
1097
|
-
_buildString(schema, parentName, asInput) {
|
|
1109
|
+
_buildString(id, schema, parentName, asInput) {
|
|
1098
1110
|
if (schema.const != null) {
|
|
1111
|
+
this._types[id] = GraphQLString;
|
|
1099
1112
|
return GraphQLString;
|
|
1100
1113
|
}
|
|
1101
1114
|
if (schema.enum != null) {
|
|
1102
|
-
|
|
1115
|
+
this._types[id] = this._buildEnumString(schema, parentName);
|
|
1116
|
+
return this._types[id];
|
|
1103
1117
|
}
|
|
1104
1118
|
if (schema.format != null) {
|
|
1105
|
-
|
|
1119
|
+
this._types[id] = this._buildFormatString(schema);
|
|
1120
|
+
return this._types[id];
|
|
1106
1121
|
}
|
|
1107
|
-
return this._buildCustomString(schema, asInput);
|
|
1122
|
+
return this._buildCustomString(id, schema, asInput);
|
|
1108
1123
|
}
|
|
1109
|
-
_buildCustomString(schema, asInput) {
|
|
1124
|
+
_buildCustomString(id, schema, asInput) {
|
|
1110
1125
|
if (schema.title == null) {
|
|
1111
1126
|
// Plain string type
|
|
1127
|
+
this._types[id] = GraphQLString;
|
|
1112
1128
|
return GraphQLString;
|
|
1113
1129
|
}
|
|
1114
1130
|
const definitions = this._getDefinitions();
|
|
1115
1131
|
const title = schema.title.toLowerCase();
|
|
1116
1132
|
if (title === 'attachmentid') {
|
|
1117
|
-
|
|
1133
|
+
if (asInput) {
|
|
1134
|
+
this._types[`${id}-input`] = GraphQLID;
|
|
1135
|
+
return GraphQLID;
|
|
1136
|
+
}
|
|
1137
|
+
this._types[id] = definitions.attachmentObject;
|
|
1138
|
+
return definitions.attachmentObject;
|
|
1118
1139
|
}
|
|
1119
1140
|
if (title === 'did') {
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
|
|
1124
|
-
|
|
1141
|
+
if (asInput) {
|
|
1142
|
+
this._types[`${id}-input`] = GraphQLID;
|
|
1143
|
+
return GraphQLID;
|
|
1144
|
+
}
|
|
1145
|
+
this._types[id] = definitions.accountObject;
|
|
1146
|
+
return definitions.accountObject;
|
|
1125
1147
|
}
|
|
1148
|
+
const scalar = STRING_TITLES[title] ?? GraphQLString;
|
|
1149
|
+
this._types[id] = scalar;
|
|
1126
1150
|
return scalar;
|
|
1127
1151
|
}
|
|
1128
1152
|
_buildEnumString(schema, parentName = '') {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kubun/graphql",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.13",
|
|
4
4
|
"license": "see LICENSE.md",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"type": "module",
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
"graphql": "^16.12.0",
|
|
22
22
|
"graphql-relay": "^0.10.2",
|
|
23
23
|
"graphql-scalars": "^1.25.0",
|
|
24
|
-
"multiformats": "^13.4.
|
|
25
|
-
"@kubun/
|
|
26
|
-
"@kubun/
|
|
24
|
+
"multiformats": "^13.4.2",
|
|
25
|
+
"@kubun/id": "^0.3.1",
|
|
26
|
+
"@kubun/protocol": "^0.3.9"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"json-schema-typed": "^8.0.2",
|