@lde/search-api-graphql 0.12.3 → 0.14.0

package/dist/build-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-schema.d.ts","sourceRoot":"","sources":["../src/build-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,aAAa,EAQd,MAAM,SAAS,CAAC;AACjB,OAAO,EAIL,KAAK,YAAY,EAEjB,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAWrB,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,eAAe,CAAC;AAGvB,8EAA8E;AAC9E,MAAM,WAAW,aAAa;IAC5B;;sDAEkD;IAClD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,mFAAmF;IACnF,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACjE;AAED;2EAC2E;AAC3E,MAAM,WAAW,iBAAiB;IAChC;yCACqC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;uBACmB;IACnB,QAAQ,CAAC,aAAa,CAAC,EAAE,CACvB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,aAAa,KACnB,WAAW,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC;;kEAE8D;IAC9D,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAC7D,+EAA+E;IAC/E,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACvC;;gDAE4C;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAkBD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE,yBAA8B,GACtC,aAAa,CAoXf;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE,yBAA8B,GACtC,MAAM,CAER"}
+{"version":3,"file":"build-schema.d.ts","sourceRoot":"","sources":["../src/build-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,aAAa,EAQd,MAAM,SAAS,CAAC;AACjB,OAAO,EAIL,KAAK,YAAY,EAEjB,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAYrB,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,eAAe,CAAC;AAGvB,8EAA8E;AAC9E,MAAM,WAAW,aAAa;IAC5B;;sDAEkD;IAClD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,mFAAmF;IACnF,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACjE;AAED;2EAC2E;AAC3E,MAAM,WAAW,iBAAiB;IAChC;yCACqC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;uBACmB;IACnB,QAAQ,CAAC,aAAa,CAAC,EAAE,CACvB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,aAAa,KACnB,WAAW,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC;;kEAE8D;IAC9D,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAC7D,+EAA+E;IAC/E,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACvC;;gDAE4C;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAkBD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE,yBAA8B,GACtC,aAAa,CA6Xf;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE,yBAA8B,GACtC,MAAM,CAER"}

package/dist/build-schema.js

@@ -1,5 +1,5 @@
 import { GraphQLBoolean, GraphQLEnumType, GraphQLFloat, GraphQLInputObjectType, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString, printSchema, } from 'graphql';
-import { facetableFields, filterableFields, filterOperatorFor, isRangeFacet, outputFields, pageForOffset, sortableFields, unixSecondsToIso, } from '@lde/search/adapter';
+import { facetableFields, filterableFields, filterOperatorFor, ID_FIELD, isRangeFacet, outputFields, pageForOffset, sortableFields, unixSecondsToIso, } from '@lde/search/adapter';
 import { defaultLanguageOrder, toLanguageStrings, } from './language.js';
 import { createFacetLoader } from './facet-batch.js';
 const nonNullListOf = (type) => new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(type)));
@@ -63,6 +63,16 @@ export function buildGraphQLSchema(schema, options = {}) {
             count: { type: new GraphQLNonNull(GraphQLInt) },
         },
     });
+    // The pagination actually applied (after queryDefaults), shared across every
+    // ‹Type›SearchResult so one client pager fragment serves all root types.
+    const paginationType = new GraphQLObjectType({
+        name: 'Pagination',
+        fields: {
+            total: { type: new GraphQLNonNull(GraphQLInt) },
+            page: { type: new GraphQLNonNull(GraphQLInt) },
+            perPage: { type: new GraphQLNonNull(GraphQLInt) },
+        },
+    });
     const sortDirection = new GraphQLEnumType({
         name: 'SortDirection',
         values: { ASC: { value: 'asc' }, DESC: { value: 'desc' } },
@@ -196,22 +206,22 @@ export function buildGraphQLSchema(schema, options = {}) {
                 return fields;
             },
         });
-        // A GraphQL input object must have at least one field, so a type with no
-        // filterable fields gets no `where` arg at all rather than an invalid
-        // empty input.
+        // Every type is filterable on `id`, so the input always has at least one
+        // field and always exists – no type is unaddressable by IRI, whatever it
+        // declares.
         const filterable = filterableFields(searchType);
-        const whereInput = filterable.length === 0
-            ? undefined
-            : new GraphQLInputObjectType({
-                name: `${typeName}Where`,
-                fields: () => {
-                    const fields = {};
-                    for (const field of filterable) {
-                        fields[field.name] = { type: whereFieldType(field) };
-                    }
-                    return fields;
-                },
-            });
+        const whereInput = new GraphQLInputObjectType({
+            name: `${typeName}Where`,
+            fields: () => {
+                const fields = {
+                    [ID_FIELD]: { type: stringFilter },
+                };
+                for (const field of filterable) {
+                    fields[field.name] = { type: whereFieldType(field) };
+                }
+                return fields;
+            },
+        });
         const sortValues = {
             RELEVANCE: { value: 'relevance' },
         };
@@ -245,9 +255,7 @@ export function buildGraphQLSchema(schema, options = {}) {
             name: `${typeName}SearchResult`,
             fields: {
                 items: { type: nonNullListOf(outputType) },
-                total: { type: new GraphQLNonNull(GraphQLInt) },
-                page: { type: new GraphQLNonNull(GraphQLInt) },
-                perPage: { type: new GraphQLNonNull(GraphQLInt) },
+                pagination: { type: new GraphQLNonNull(paginationType) },
                 // Resolved lazily, per selected key (skip-own-filter); the result object
                 // (which carries the per-request facet loader) is the facets source.
                 ...(facetsType && {
@@ -262,7 +270,7 @@ export function buildGraphQLSchema(schema, options = {}) {
             type: new GraphQLNonNull(resultType),
             args: {
                 query: { type: GraphQLString },
-                ...(whereInput && { where: { type: whereInput } }),
+                where: { type: whereInput },
                 orderBy: { type: orderByInput },
                 page: { type: GraphQLInt, defaultValue: 1 },
                 perPage: { type: GraphQLInt, defaultValue: 20 },
@@ -279,9 +287,11 @@ export function buildGraphQLSchema(schema, options = {}) {
                 });
                 return {
                     items: result.hits.map((hit) => ({ id: hit.id, ...hit.document })),
-                    total: result.total,
-                    page: pageForOffset(finalQuery.offset, finalQuery.limit),
-                    perPage: finalQuery.limit,
+                    pagination: {
+                        total: result.total,
+                        page: pageForOffset(finalQuery.offset, finalQuery.limit),
+                        perPage: finalQuery.limit,
+                    },
                     // Carried for the facet field resolvers (see facet-batch.ts).
                     loadFacet: createFacetLoader(context.engine, searchType, finalQuery, context.onFacetError),
                 };
@@ -362,6 +372,11 @@ function whereToFilters(where, searchType) {
         return [];
     }
     const filters = [];
+    // `id` first: it is declared by no type, so the field loop below never sees it.
+    const id = where[ID_FIELD];
+    if (id !== undefined && id !== null) {
+        filters.push({ field: ID_FIELD, in: id.in ?? [] });
+    }
     for (const field of filterableFields(searchType)) {
         const value = where[field.name];
         if (value === undefined || value === null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/search-api-graphql",
-  "version": "0.12.3",
+  "version": "0.14.0",
   "description": "Engine- and domain-agnostic GraphQL surface for @lde/search: builds an executable GraphQLSchema from a whole SearchSchema at runtime (no codegen) – one root query field per SearchType – served by generic resolvers over any SearchEngine – and serves it as a framework-agnostic fetch handler with a self-contained playground, SDL endpoint, CORS and depth/cost limits. You supply the schema and per-type typeNames; it names neither your domain nor your engine.",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
@@ -28,7 +28,7 @@
     "@escape.tech/graphql-armor-cost-limit": "^2.4.3",
     "@escape.tech/graphql-armor-max-depth": "^2.4.2",
     "@graphql-yoga/render-graphiql": "^5.21.2",
-    "@lde/search": "^0.12.3",
+    "@lde/search": "^0.13.0",
     "dataloader": "^2.2.3",
     "graphql": "^16.0.0",
     "graphql-yoga": "^5.21.2",