@kubun/graphql 0.15.0 → 0.17.0

package/lib/schema.d.ts

@@ -108,6 +108,8 @@ export declare class SchemaBuilder {
     _getDefinitions(): SharedDefinitions;
     _getReference(path: string, parentName?: string): GraphQLOutputType;
     _getReferenceSchema(id: string): TypeModel;
+    _getInputObject(key: string): GraphQLInputObjectType;
+    _getType(key: string): GraphQLOutputType;
     _getReferenceInput(path: string, isPartial: boolean, parentName?: string): GraphQLInputType;
     _buildSharedDefinitions(): SharedDefinitions;
     _buildDocument(id: string): GraphQLObjectType<DocumentNode, Context> | GraphQLInterfaceType;

package/lib/schema.js

@@ -434,7 +434,11 @@ export class SchemaBuilder {
             // Extract inverse relations
             for (const [fieldName, meta] of Object.entries(model.fieldsMeta)){
                 if (meta.type === 'document' && meta.model != null) {
-                    const relationRefID = getReferenceID(model.schema.properties[fieldName]?.$ref);
+                    const relationRef = model.schema.properties[fieldName]?.$ref;
+                    if (relationRef == null) {
+                        throw new Error(`Field ${fieldName} not found on model ${modelIDstring}`);
+                    }
+                    const relationRefID = getReferenceID(relationRef);
                     const isList = this._getReferenceSchema(relationRefID).type === 'array';
                     const relationID = getGlobalID(meta.model, modelID).toString();
                     this._relationsTo[relationID] ??= {};
@@ -537,7 +541,7 @@ export class SchemaBuilder {
             this._buildDocument(id);
             const name = this._aliases[id];
             const filterArg = {
-                type: this._inputObjects[`${id}-filter`]
+                type: this._getInputObject(`${id}-filter`)
             };
             queryFields[`all${name}`] = {
                 type: this._types[`${id}-connection`],
@@ -545,7 +549,7 @@ export class SchemaBuilder {
                     ...connectionArgs,
                     filter: filterArg,
                     orderBy: {
-                        type: toList(this._inputObjects[`${id}-order`])
+                        type: toList(this._getInputObject(`${id}-order`))
                     },
                     search: {
                         type: GraphQLString
@@ -563,7 +567,11 @@ export class SchemaBuilder {
         ][0];
         if (firstModelID != null) {
             const someConnectionType = this._types[`${firstModelID}-connection`];
-            const pageInfoType = someConnectionType.getFields().pageInfo.type;
+            const pageInfoField = someConnectionType.getFields().pageInfo;
+            if (pageInfoField == null) {
+                throw new Error('Connection type is missing the pageInfo field');
+            }
+            const pageInfoType = pageInfoField.type;
             const searchResultEdge = new GraphQLObjectType({
                 name: 'SearchResultEdge',
                 fields: ()=>({
@@ -641,6 +649,9 @@ export class SchemaBuilder {
                     const edges = [];
                     for(let j = 0; j < page.length; j++){
                         const r = page[j];
+                        if (r == null) {
+                            continue;
+                        }
                         const node = docMap.get(r.documentID);
                         if (node != null) {
                             // Cursor = hits consumed through this position, so the next page
@@ -658,7 +669,7 @@ export class SchemaBuilder {
                         pageInfo: {
                             hasNextPage,
                             hasPreviousPage: offset > 0,
-                            startCursor: edges.length > 0 ? edges[0].cursor : null,
+                            startCursor: edges.length > 0 ? edges[0]?.cursor ?? null : null,
                             endCursor: page.length > 0 ? encodeSearchCursor(endOffset) : null
                         }
                     };
@@ -1074,6 +1085,20 @@ export class SchemaBuilder {
         }
         return schema;
     }
+    _getInputObject(key) {
+        const input = this._inputObjects[key];
+        if (input == null) {
+            throw new Error(`Could not find input object: ${key}`);
+        }
+        return input;
+    }
+    _getType(key) {
+        const type = this._types[key];
+        if (type == null) {
+            throw new Error(`Could not find type: ${key}`);
+        }
+        return type;
+    }
     _getReferenceInput(path, isPartial, parentName = '') {
         const id = getReferenceID(path);
         const schema = this._getReferenceSchema(id);
@@ -1176,10 +1201,10 @@ export class SchemaBuilder {
                                     args: {
                                         ...connectionArgs,
                                         filter: {
-                                            type: this._inputObjects[`${id}-filter`]
+                                            type: this._getInputObject(`${id}-filter`)
                                         },
                                         orderBy: {
-                                            type: toList(this._inputObjects[`${id}-order`])
+                                            type: toList(this._getInputObject(`${id}-order`))
                                         }
                                     },
                                     resolve: async (owner, args, ctx)=>{
@@ -1341,13 +1366,13 @@ export class SchemaBuilder {
                         type: new GraphQLNonNull(toOuputList(groupedAggregateType)),
                         args: {
                             groupBy: {
-                                type: new GraphQLNonNull(toList(this._inputObjects[`${id}-group-by`]))
+                                type: new GraphQLNonNull(toList(this._getInputObject(`${id}-group-by`)))
                             },
                             having: {
-                                type: this._inputObjects[`${id}-having`]
+                                type: this._getInputObject(`${id}-having`)
                             },
                             orderBy: {
-                                type: toList(this._inputObjects[`${id}-group-order`])
+                                type: toList(this._getInputObject(`${id}-group-order`))
                             },
                             limit: {
                                 type: GraphQLInt
@@ -1396,7 +1421,7 @@ export class SchemaBuilder {
                     name: `Create${name}`,
                     inputFields: ()=>({
                             data: {
-                                type: new GraphQLNonNull(this._inputObjects[id])
+                                type: new GraphQLNonNull(this._getInputObject(id))
                             },
                             transactionID: {
                                 type: GraphQLID
@@ -1405,7 +1430,7 @@ export class SchemaBuilder {
                     outputFields: ()=>({
                             ...definitions.queryFields,
                             document: {
-                                type: this._types[id]
+                                type: this._getType(id)
                             }
                         }),
                     mutateAndGetPayload: async (input, ctx, info)=>{
@@ -1425,7 +1450,7 @@ export class SchemaBuilder {
                     name: `Set${name}`,
                     inputFields: ()=>({
                             data: {
-                                type: new GraphQLNonNull(this._inputObjects[id])
+                                type: new GraphQLNonNull(this._getInputObject(id))
                             },
                             transactionID: {
                                 type: GraphQLID
@@ -1434,7 +1459,7 @@ export class SchemaBuilder {
                     outputFields: ()=>({
                             ...definitions.queryFields,
                             document: {
-                                type: this._types[id]
+                                type: this._getType(id)
                             }
                         }),
                     mutateAndGetPayload: async (input, ctx, info)=>{
@@ -1462,7 +1487,7 @@ export class SchemaBuilder {
                             type: new GraphQLNonNull(toList(PatchOperation))
                         },
                         from: {
-                            type: this._inputObjects[`${id}-update`]
+                            type: this._getInputObject(`${id}-update`)
                         },
                         transactionID: {
                             type: GraphQLID
@@ -1471,7 +1496,7 @@ export class SchemaBuilder {
                 outputFields: ()=>({
                         ...definitions.queryFields,
                         document: {
-                            type: this._types[id]
+                            type: this._getType(id)
                         }
                     }),
                 mutateAndGetPayload: async (input, ctx, info)=>{
@@ -1737,14 +1762,14 @@ export class SchemaBuilder {
         this._types[`${id}-grouped-aggregate`] = groupedAggregateType;
         // Map a scalar to its existing value-filter input by name (IntValueFilter etc.).
         const valueFilterFor = (scalar)=>{
-            return this._inputObjects[`${scalar.name}ValueFilter`];
+            return this._getInputObject(`${scalar.name}ValueFilter`);
         };
         // Having: each op maps its eligible fields to the value filter matching the op's
         // scalar. Sum keeps each numeric field's own scalar; average is always Float;
         // min/max keep each field's own scalar (Int / Float / String).
         const havingFields = {
             count: {
-                type: this._inputObjects.IntValueFilter
+                type: this._getInputObject('IntValueFilter')
             }
         };
         if (sumType != null && avgType != null) {
@@ -1755,7 +1780,7 @@ export class SchemaBuilder {
                     type: valueFilterFor(field.type)
                 };
                 havingAvgFields[key] = {
-                    type: this._inputObjects.FloatValueFilter
+                    type: this._getInputObject('FloatValueFilter')
                 };
             }
             const havingSum = new GraphQLInputObjectType({
@@ -2281,7 +2306,7 @@ export class SchemaBuilder {
         const scalar = this._buildScalar(id, schema, refParentName);
         const knownFilter = VALUE_FILTER_INPUT_TYPES[scalar.name];
         if (knownFilter != null) {
-            return this._inputObjects[knownFilter];
+            return this._getInputObject(knownFilter);
         }
         const filter = isEnumType(scalar) ? createEnumValueFilterInput(scalar) : createScalarValueFilterInput(scalar, {
             stringBacked: true
@@ -2289,7 +2314,7 @@ export class SchemaBuilder {
         if (this._inputObjects[filter.name] == null) {
             this._inputObjects[filter.name] = filter;
         }
-        return this._inputObjects[filter.name];
+        return this._getInputObject(filter.name);
     }
     _buildReferenceOrderByInput(path, parentName = '') {
         const id = getReferenceID(path);
@@ -2312,7 +2337,7 @@ export class SchemaBuilder {
         const name = this._aliases[id] ?? pascalCase(parentName + (schema.title ?? ''));
         const fields = isDocument ? {
             _owner: {
-                type: this._inputObjects.AccountValueFilter
+                type: this._getInputObject('AccountValueFilter')
             }
         } : {};
         for (const [key, value] of Object.entries(schema.properties)){
@@ -2335,13 +2360,13 @@ export class SchemaBuilder {
                         type: objectInput
                     },
                     and: {
-                        type: toList(this._inputObjects[inputID])
+                        type: toList(this._getInputObject(inputID))
                     },
                     or: {
-                        type: toList(this._inputObjects[inputID])
+                        type: toList(this._getInputObject(inputID))
                     },
                     not: {
-                        type: this._inputObjects[inputID]
+                        type: this._getInputObject(inputID)
                     }
                 })
         });
@@ -2387,6 +2412,9 @@ export class SchemaBuilder {
             return existing;
         }
         const model = this._record[id];
+        if (model == null) {
+            throw new Error(`Model ${id} not found`);
+        }
         const name = this._aliases[id];
         this._inputObjects[inputID] = new GraphQLInputObjectType({
             name: `With${relationFieldName}${name}Input`,
@@ -2504,10 +2532,10 @@ export class SchemaBuilder {
             args: {
                 ...connectionArgs,
                 filter: {
-                    type: this._inputObjects[`${relationID}-filter`]
+                    type: this._getInputObject(`${relationID}-filter`)
                 },
                 orderBy: {
-                    type: toList(this._inputObjects[`${relationID}-order`])
+                    type: toList(this._getInputObject(`${relationID}-order`))
                 }
             },
             resolve: (doc, args, ctx)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/graphql",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -15,10 +15,10 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@kubun/hlc": "^0.15.0",
-    "@kubun/id": "^0.15.0",
-    "@kubun/logger": "^0.15.0",
-    "@kubun/protocol": "^0.15.0",
+    "@kubun/hlc": "^0.17.0",
+    "@kubun/id": "^0.17.0",
+    "@kubun/logger": "^0.17.0",
+    "@kubun/protocol": "^0.17.0",
     "@sozai/async": "^0.2.1",
     "@sozai/codec": "^0.4.0",
     "@sozai/event": "^0.1.3",
@@ -32,11 +32,11 @@
   "devDependencies": {
     "@kokuin/capability": "^0.3.0",
     "@kokuin/token": "^0.5.0",
-    "@kubun/db": "^0.15.0",
-    "@kubun/db-better-sqlite": "^0.15.0",
-    "@kubun/scalars": "^0.15.0",
-    "@kubun/store-graph": "^0.15.0",
-    "@kubun/test-utils": "^0.13.0"
+    "@kubun/db": "^0.17.0",
+    "@kubun/db-better-sqlite": "^0.17.0",
+    "@kubun/scalars": "^0.17.0",
+    "@kubun/store-graph": "^0.17.0",
+    "@kubun/test-utils": "^0.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -44,8 +44,8 @@
   "scripts": {
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
     "build:clean": "del lib",
-    "build:js": "swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
-    "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
+    "build:js": "del 'lib/**/*.js' && swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
+    "build:types": "del 'lib/**/*.d.ts' 'lib/**/*.d.ts.map' && tsc --emitDeclarationOnly --skipLibCheck",
     "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
     "test": "pnpm run test:types && pnpm run test:unit",
     "test:types": "tsc --noEmit -p tsconfig.test.json",