@kubun/graphql 0.12.0 → 0.13.0

package/lib/schema.js

@@ -105,7 +105,7 @@ function createEnumValueFilterInput(type) {
         }
     });
 }
-function createScalarValueFilterInput(type) {
+function createScalarValueFilterInput(type, options = {}) {
     return new GraphQLInputObjectType({
         name: `${type.name}ValueFilter`,
         isOneOf: true,
@@ -136,6 +136,37 @@ function createScalarValueFilterInput(type) {
             },
             greaterThanOrEqualTo: {
                 type
+            },
+            // Substring match only makes sense against string-backed scalars.
+            ...options.stringBacked ? {
+                contains: {
+                    type: GraphQLString
+                }
+            } : {}
+        }
+    });
+}
+// Opaque identifiers (DID, DocumentID, AttachmentID): equality only, no ordering
+// or substring match — the underlying strings are content-addressed, not text.
+function createExactValueFilterInput(type) {
+    return new GraphQLInputObjectType({
+        name: `${type.name}ValueFilter`,
+        isOneOf: true,
+        fields: {
+            isNull: {
+                type: GraphQLBoolean
+            },
+            equalTo: {
+                type
+            },
+            notEqualTo: {
+                type
+            },
+            in: {
+                type: toList(type)
+            },
+            notIn: {
+                type: toList(type)
             }
         }
     });
@@ -159,6 +190,7 @@ const VALUE_FILTER_INPUTS = {
             }
         }
     }),
+    AttachmentIDValueFilter: createExactValueFilterInput(GraphQLAttachmentID),
     BooleanValueFilter: new GraphQLInputObjectType({
         name: 'BooleanValueFilter',
         isOneOf: true,
@@ -171,16 +203,26 @@ const VALUE_FILTER_INPUTS = {
             }
         }
     }),
+    DIDValueFilter: createExactValueFilterInput(GraphQLDID),
+    DocumentIDValueFilter: createExactValueFilterInput(GraphQLDocID),
     FloatValueFilter: createScalarValueFilterInput(GraphQLFloat),
     IntValueFilter: createScalarValueFilterInput(GraphQLInt),
-    StringValueFilter: createScalarValueFilterInput(GraphQLString)
+    StringValueFilter: createScalarValueFilterInput(GraphQLString, {
+        stringBacked: true
+    })
 };
+// Keyed by `scalar.name` (the GraphQL type name, e.g. "DID"), not the import
+// binding — keying by binding name silently never matched here before, since
+// scalars are looked up by `scalar.name`. `_owner` bypasses this map entirely
+// (hardcoded to AccountValueFilter), so it is not listed here.
 const VALUE_FILTER_INPUT_TYPES = {
-    GraphQLBoolean: 'BooleanValueFilter',
-    GraphQLDID: 'AccountValueFilter',
-    GraphQLFloat: 'FloatValueFilter',
-    GraphQLInt: 'IntValueFilter',
-    GraphQLString: 'StringValueFilter'
+    AttachmentID: 'AttachmentIDValueFilter',
+    Boolean: 'BooleanValueFilter',
+    DID: 'DIDValueFilter',
+    DocumentID: 'DocumentIDValueFilter',
+    Float: 'FloatValueFilter',
+    Int: 'IntValueFilter',
+    String: 'StringValueFilter'
 };
 const PatchSetOperation = new GraphQLInputObjectType({
     name: 'PatchSetOperation',
@@ -247,6 +289,26 @@ const OrderByDirection = new GraphQLEnumType({
         }
     }
 });
+const ArrayPresence = new GraphQLEnumType({
+    name: 'ArrayPresence',
+    values: {
+        NULL: {
+            value: 'null'
+        },
+        NON_NULL: {
+            value: 'nonNull'
+        },
+        EMPTY: {
+            value: 'empty'
+        },
+        NON_EMPTY: {
+            value: 'nonEmpty'
+        },
+        NULL_OR_EMPTY: {
+            value: 'nullOrEmpty'
+        }
+    }
+});
 const AccessRule = new GraphQLObjectType({
     name: 'AccessRule',
     fields: {
@@ -2161,16 +2223,34 @@ export class SchemaBuilder {
         if (schema.type === 'array') {
             const name = this._aliases[id] ?? pascalCase(parentName + schema.title);
             refParentName = name;
-            // const itemType = this._buildReferenceFilterInput(schema.items.$ref, schema.title)
+            const itemID = getReferenceID(schema.items.$ref);
+            const itemSchema = this._getReferenceSchema(itemID);
+            // Membership ops need a scalar item type; array-of-object/array-of-array items
+            // fall back to `isNull`-only filtering (no `_buildScalar` support for them).
+            if (itemSchema.type === 'object' || itemSchema.type === 'array') {
+                return new GraphQLInputObjectType({
+                    name: `${name}Filter`,
+                    isOneOf: true,
+                    fields: {
+                        isNull: {
+                            type: GraphQLBoolean
+                        }
+                    }
+                });
+            }
+            const itemScalar = this._buildScalar(itemID, itemSchema, name);
             return new GraphQLInputObjectType({
                 name: `${name}Filter`,
                 isOneOf: true,
                 fields: {
-                    // DB does not support filtering on array values
-                    // contains: { type: toList(itemType) },
-                    // isEmpty: { type: GraphQLBoolean },
-                    isNull: {
-                        type: GraphQLBoolean
+                    includesAll: {
+                        type: toList(itemScalar)
+                    },
+                    includesAny: {
+                        type: toList(itemScalar)
+                    },
+                    presence: {
+                        type: ArrayPresence
                     }
                 }
             });
@@ -2180,7 +2260,9 @@ export class SchemaBuilder {
         if (knownFilter != null) {
             return this._inputObjects[knownFilter];
         }
-        const filter = isEnumType(scalar) ? createEnumValueFilterInput(scalar) : createScalarValueFilterInput(scalar);
+        const filter = isEnumType(scalar) ? createEnumValueFilterInput(scalar) : createScalarValueFilterInput(scalar, {
+            stringBacked: true
+        });
         if (this._inputObjects[filter.name] == null) {
             this._inputObjects[filter.name] = filter;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/graphql",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -22,20 +22,23 @@
     "change-case": "^5.4.4",
     "graphql": "^16.14.2",
     "graphql-relay": "^0.10.2",
-    "graphql-scalars": "^1.25.0",
+    "graphql-scalars": "^1.26.0",
     "multiformats": "^14.0.5",
-    "@kubun/id": "^0.12.0",
     "@kubun/logger": "^0.12.0",
-    "@kubun/protocol": "^0.12.0",
-    "@kubun/hlc": "^0.12.0"
+    "@kubun/hlc": "^0.12.0",
+    "@kubun/id": "^0.12.0",
+    "@kubun/protocol": "^0.13.0"
   },
   "devDependencies": {
-    "@kokuin/capability": "^0.2.1",
-    "@kokuin/token": "^0.3.0",
-    "@kubun/db": "^0.12.0",
-    "@kubun/store-graph": "^0.12.0",
-    "@kubun/test-utils": "^0.12.0",
-    "@kubun/db-better-sqlite": "^0.12.0"
+    "@kokuin/capability": "^0.2.2",
+    "@kokuin/token": "^0.4.0",
+    "@kubun/store-graph": "^0.13.0",
+    "@kubun/db-better-sqlite": "^0.12.1",
+    "@kubun/db": "^0.12.1",
+    "@kubun/test-utils": "^0.12.0"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",