@unito/integration-sdk 5.1.1 → 5.2.1

package/dist/src/index.cjs

@@ -927,14 +927,24 @@ function extractFilters(req, res, next) {
     res.locals.filters = [];
     if (typeof rawFilters === 'string') {
         for (const rawFilter of rawFilters.split(',')) {
+            // Find the operator that appears earliest in the string.
+            // When two operators start at the same index (e.g. ">=" and ">" both at position 5),
+            // the longer one wins because ORDERED_OPERATORS is sorted longest-first.
+            let bestIdx = -1;
+            let bestOperator;
             for (const operator of ORDERED_OPERATORS) {
-                if (rawFilter.includes(operator)) {
-                    const [field, valuesRaw] = rawFilter.split(operator, 2);
-                    const values = valuesRaw ? valuesRaw.split('|').map(decodeURIComponent) : [];
-                    res.locals.filters.push({ field: field, operator, values });
-                    break;
+                const idx = rawFilter.indexOf(operator);
+                if (idx !== -1 && (bestIdx === -1 || idx < bestIdx)) {
+                    bestIdx = idx;
+                    bestOperator = operator;
                 }
             }
+            if (bestIdx !== -1 && bestOperator) {
+                const field = rawFilter.slice(0, bestIdx);
+                const valuesRaw = rawFilter.slice(bestIdx + bestOperator.length);
+                const values = valuesRaw ? valuesRaw.split('|').map(decodeURIComponent) : [];
+                res.locals.filters.push({ field, operator: bestOperator, values });
+            }
         }
     }
     next();

package/dist/src/middlewares/filters.js

@@ -10,14 +10,24 @@ function extractFilters(req, res, next) {
     res.locals.filters = [];
     if (typeof rawFilters === 'string') {
         for (const rawFilter of rawFilters.split(',')) {
+            // Find the operator that appears earliest in the string.
+            // When two operators start at the same index (e.g. ">=" and ">" both at position 5),
+            // the longer one wins because ORDERED_OPERATORS is sorted longest-first.
+            let bestIdx = -1;
+            let bestOperator;
             for (const operator of ORDERED_OPERATORS) {
-                if (rawFilter.includes(operator)) {
-                    const [field, valuesRaw] = rawFilter.split(operator, 2);
-                    const values = valuesRaw ? valuesRaw.split('|').map(decodeURIComponent) : [];
-                    res.locals.filters.push({ field: field, operator, values });
-                    break;
+                const idx = rawFilter.indexOf(operator);
+                if (idx !== -1 && (bestIdx === -1 || idx < bestIdx)) {
+                    bestIdx = idx;
+                    bestOperator = operator;
                 }
             }
+            if (bestIdx !== -1 && bestOperator) {
+                const field = rawFilter.slice(0, bestIdx);
+                const valuesRaw = rawFilter.slice(bestIdx + bestOperator.length);
+                const values = valuesRaw ? valuesRaw.split('|').map(decodeURIComponent) : [];
+                res.locals.filters.push({ field, operator: bestOperator, values });
+            }
         }
     }
     next();

package/dist/test/middlewares/filters.test.js

@@ -31,6 +31,56 @@ describe('filters middleware', () => {
             filters: [{ field: 'status', operator: OperatorTypes.EQUAL, values: ['foo,bar!!,?baz=!>qux'] }],
         });
     });
+    it('parses multi-value filters separated by pipe', () => {
+        const request = {
+            query: { filter: 'status=/statuses/Done|/statuses/InProgress' },
+        };
+        const response = { locals: {} };
+        extractFilters(request, response, () => { });
+        assert.deepEqual(response.locals, {
+            filters: [{ field: 'status', operator: OperatorTypes.EQUAL, values: ['/statuses/Done', '/statuses/InProgress'] }],
+        });
+    });
+    it('preserves base64 padding (=) in filter values and does not lose subsequent pipe-separated values', () => {
+        // Base64 values end with == which contains the = operator character.
+        // split('=', 2) incorrectly truncates after the second = in the string,
+        // discarding the | separator and subsequent values.
+        const request = {
+            query: {
+                filter: 'category=/choices/QnVzaW5lc3MgU3lzdGVtOi06QnVzaW5lc3MgU3lzdGVt|/choices/QXBwbGljYXRpb246LTpBcHBsaWNhdGlvbg==,' +
+                    'subcategory=/choices/U0FQOi06QnVzaW5lc3MgU3lzdGVtX1NBUA==|/choices/UmVkd29vZCBSTUo6LTpyZWR3b29kIHJtag==',
+            },
+        };
+        const response = { locals: {} };
+        extractFilters(request, response, () => { });
+        assert.deepEqual(response.locals, {
+            filters: [
+                {
+                    field: 'category',
+                    operator: OperatorTypes.EQUAL,
+                    values: [
+                        '/choices/QnVzaW5lc3MgU3lzdGVtOi06QnVzaW5lc3MgU3lzdGVt',
+                        '/choices/QXBwbGljYXRpb246LTpBcHBsaWNhdGlvbg==',
+                    ],
+                },
+                {
+                    field: 'subcategory',
+                    operator: OperatorTypes.EQUAL,
+                    values: ['/choices/U0FQOi06QnVzaW5lc3MgU3lzdGVtX1NBUA==', '/choices/UmVkd29vZCBSTUo6LTpyZWR3b29kIHJtag=='],
+                },
+            ],
+        });
+    });
+    it('matches the earliest operator even when operator characters appear in the value', () => {
+        const request = {
+            query: { filter: 'description=contains>=text' },
+        };
+        const response = { locals: {} };
+        extractFilters(request, response, () => { });
+        assert.deepEqual(response.locals, {
+            filters: [{ field: 'description', operator: OperatorTypes.EQUAL, values: ['contains>=text'] }],
+        });
+    });
     it('no data', () => {
         const request = { query: {} };
         const response = { locals: {} };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-sdk",
-  "version": "5.1.1",
+  "version": "5.2.1",
   "description": "Integration SDK",
   "type": "module",
   "types": "dist/src/index.d.ts",

package/src/middlewares/filters.ts

@@ -41,15 +41,26 @@ function extractFilters(req: Request, res: Response, next: NextFunction) {
 
   if (typeof rawFilters === 'string') {
     for (const rawFilter of rawFilters.split(',')) {
+      // Find the operator that appears earliest in the string.
+      // When two operators start at the same index (e.g. ">=" and ">" both at position 5),
+      // the longer one wins because ORDERED_OPERATORS is sorted longest-first.
+      let bestIdx = -1;
+      let bestOperator: OperatorType | undefined;
+
       for (const operator of ORDERED_OPERATORS) {
-        if (rawFilter.includes(operator)) {
-          const [field, valuesRaw] = rawFilter.split(operator, 2);
-          const values = valuesRaw ? valuesRaw.split('|').map(decodeURIComponent) : [];
+        const idx = rawFilter.indexOf(operator);
+        if (idx !== -1 && (bestIdx === -1 || idx < bestIdx)) {
+          bestIdx = idx;
+          bestOperator = operator;
+        }
+      }
 
-          res.locals.filters.push({ field: field!, operator, values });
+      if (bestIdx !== -1 && bestOperator) {
+        const field = rawFilter.slice(0, bestIdx);
+        const valuesRaw = rawFilter.slice(bestIdx + bestOperator.length);
+        const values = valuesRaw ? valuesRaw.split('|').map(decodeURIComponent) : [];
 
-          break;
-        }
+        res.locals.filters.push({ field, operator: bestOperator, values });
       }
     }
   }

package/test/middlewares/filters.test.ts

@@ -62,6 +62,84 @@ describe('filters middleware', () => {
     });
   });
 
+  it('parses multi-value filters separated by pipe', () => {
+    const request = {
+      query: { filter: 'status=/statuses/Done|/statuses/InProgress' },
+    } as express.Request<
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      any,
+      object,
+      object,
+      { filter: string }
+    >;
+    const response = { locals: {} } as express.Response;
+
+    extractFilters(request, response, () => {});
+
+    assert.deepEqual(response.locals, {
+      filters: [{ field: 'status', operator: OperatorTypes.EQUAL, values: ['/statuses/Done', '/statuses/InProgress'] }],
+    });
+  });
+
+  it('preserves base64 padding (=) in filter values and does not lose subsequent pipe-separated values', () => {
+    // Base64 values end with == which contains the = operator character.
+    // split('=', 2) incorrectly truncates after the second = in the string,
+    // discarding the | separator and subsequent values.
+    const request = {
+      query: {
+        filter:
+          'category=/choices/QnVzaW5lc3MgU3lzdGVtOi06QnVzaW5lc3MgU3lzdGVt|/choices/QXBwbGljYXRpb246LTpBcHBsaWNhdGlvbg==,' +
+          'subcategory=/choices/U0FQOi06QnVzaW5lc3MgU3lzdGVtX1NBUA==|/choices/UmVkd29vZCBSTUo6LTpyZWR3b29kIHJtag==',
+      },
+    } as express.Request<
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      any,
+      object,
+      object,
+      { filter: string }
+    >;
+    const response = { locals: {} } as express.Response;
+
+    extractFilters(request, response, () => {});
+
+    assert.deepEqual(response.locals, {
+      filters: [
+        {
+          field: 'category',
+          operator: OperatorTypes.EQUAL,
+          values: [
+            '/choices/QnVzaW5lc3MgU3lzdGVtOi06QnVzaW5lc3MgU3lzdGVt',
+            '/choices/QXBwbGljYXRpb246LTpBcHBsaWNhdGlvbg==',
+          ],
+        },
+        {
+          field: 'subcategory',
+          operator: OperatorTypes.EQUAL,
+          values: ['/choices/U0FQOi06QnVzaW5lc3MgU3lzdGVtX1NBUA==', '/choices/UmVkd29vZCBSTUo6LTpyZWR3b29kIHJtag=='],
+        },
+      ],
+    });
+  });
+
+  it('matches the earliest operator even when operator characters appear in the value', () => {
+    const request = {
+      query: { filter: 'description=contains>=text' },
+    } as express.Request<
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      any,
+      object,
+      object,
+      { filter: string }
+    >;
+    const response = { locals: {} } as express.Response;
+
+    extractFilters(request, response, () => {});
+
+    assert.deepEqual(response.locals, {
+      filters: [{ field: 'description', operator: OperatorTypes.EQUAL, values: ['contains>=text'] }],
+    });
+  });
+
   it('no data', () => {
     const request = { query: {} } as express.Request;
     const response = { locals: {} } as express.Response;