@q2devel/q2-core 1.0.101 → 1.0.102

package/dist/api/getTerms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAIpC,KAAK,aAAa,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IACzD,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,QAAQ,GACjB,KAAK,WAAW,EAChB,8DAaG,aAAa,KACjB,OAAO,CAAC,IAAI,EAAE,CAoGhB,CAAA"}
+{"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAIpC,KAAK,aAAa,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC,CAAA;IACzD,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,QAAQ,GACjB,KAAK,WAAW,EAChB,8DAaG,aAAa,KACjB,OAAO,CAAC,IAAI,EAAE,CAiHhB,CAAA"}

package/dist/api/getTerms.js

@@ -1,4 +1,3 @@
-// api/getTerms.ts
 import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
 import mapIncludedResources from '../utils/mapIncludedResources';
 export const getTerms = async (ctx, { categoryId, include = [
@@ -20,47 +19,59 @@ export const getTerms = async (ctx, { categoryId, include = [
     const baseUrl = ctx.locale === ctx.defaultLocale
         ? `/jsonapi/taxonomy_term/produktykategorie`
         : `/${ctx.locale}/jsonapi/taxonomy_term/produktykategorie`;
-    const params = new DrupalJsonApiParams()
-        .addInclude(include)
-        .addFilter('langcode', ctx.locale)
-        .addPageLimit(pageLimit);
-    // Custom sort
-    if (sort && sort.length > 0) {
-        sort.forEach(({ field, direction = 'DESC' }) => {
-            params.addSort(field, direction);
-        });
-    }
-    else if (sortField) {
-        // Deprecated: support old sortField for backward compatibility
-        params.addSort(sortField);
-    }
-    // Custom filters
-    if (filter && filter.length > 0) {
-        filter.forEach(({ field, value }) => {
-            params.addFilter(field, String(value));
-        });
-    }
-    if (categoryId) {
-        params.addFilter('drupal_internal__tid', categoryId, 'IN');
-    }
+    // Build params for a given offset. Each page builds fresh params so we
+    // never carry over Drupal's `next` link cursor (which would explode the
+    // URL with all already-seen drupal_internal__tid values and cause
+    // 414/431 once the term count grows).
+    const buildParams = (offset) => {
+        const params = new DrupalJsonApiParams()
+            .addInclude(include)
+            .addFilter('langcode', ctx.locale)
+            .addPageLimit(pageLimit)
+            .addPageOffset(offset);
+        if (sort && sort.length > 0) {
+            sort.forEach(({ field, direction = 'DESC' }) => {
+                params.addSort(field, direction);
+            });
+        }
+        else if (sortField) {
+            // Deprecated: support old sortField for backward compatibility
+            params.addSort(sortField);
+        }
+        if (filter && filter.length > 0) {
+            filter.forEach(({ field, value }) => {
+                params.addFilter(field, String(value));
+            });
+        }
+        if (categoryId) {
+            params.addFilter('drupal_internal__tid', categoryId, 'IN');
+        }
+        return params;
+    };
     // Pole pro akumulaci všech stránek dat
     const allData = [];
     const allIncluded = [];
-    let nextUrl = `${baseUrl}?${params.getQueryString()}`;
+    let offset = 0;
     let pageCounter = 0;
-    while (nextUrl && pageCounter < 50) {
-        const response = await ctx.axios.get(nextUrl);
+    while (pageCounter < 50) {
+        const params = buildParams(offset);
+        const url = `${baseUrl}?${params.getQueryString()}`;
+        const response = await ctx.axios.get(url);
         const data = response.data;
         if (Array.isArray(data.data)) {
             allData.push(...data.data);
         }
-        else {
+        else if (data.data) {
             allData.push(data.data);
         }
         if (Array.isArray(data.included)) {
             allIncluded.push(...data.included);
         }
-        nextUrl = data.links?.next?.href || null;
+        // Drupal still tells us whether more pages exist via links.next —
+        // we just don't follow its href, we compute our own offset URL.
+        if (!data.links?.next?.href)
+            break;
+        offset += pageLimit;
         pageCounter++;
     }
     const combinedResponse = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@q2devel/q2-core",
-    "version": "1.0.101",
+    "version": "1.0.102",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "exports": {