@internetarchive/search-service - npm Package Compare versions

Comparing version 0.0.1-alpha.16 to 0.0.1-alpha.17

dist/src/search-params.d.ts

@@ -17,3 +17,3 @@ export declare enum SortDirection {
  * parameters to an IA-style query string. ie. it converts the `fields` array
- * to `fl[]=identifier&fl[]=collection` and `sort` to `sort[]=date+desc&sort[]=downloads+asc`
+ * to `fl=identifier,collection` and `sort` to `sort=date+desc,downloads+asc`
  */
@@ -20,0 +20,0 @@ export declare class SearchParams {

dist/src/search-params.js

@@ -21,3 +21,3 @@ export var SortDirection;
  * parameters to an IA-style query string. ie. it converts the `fields` array
- * to `fl[]=identifier&fl[]=collection` and `sort` to `sort[]=date+desc&sort[]=downloads+asc`
+ * to `fl=identifier,collection` and `sort` to `sort=date+desc,downloads+asc`
  */
@@ -40,3 +40,2 @@ export class SearchParams {
     get asUrlSearchParams() {
-        var _a, _b;
         const params = new URLSearchParams();
@@ -51,8 +50,9 @@ params.append('q', this.query);
         }
-        (_a = this.fields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
-            params.append('fl[]', field);
-        });
-        (_b = this.sort) === null || _b === void 0 ? void 0 : _b.forEach(sort => {
-            params.append('sort[]', `${sort.asString}`);
-        });
+        if (this.fields) {
+            params.append('fl', this.fields.join(','));
+        }
+        if (this.sort) {
+            const sortStrings = this.sort.map(sort => sort.asString);
+            params.append('sort', sortStrings.join(','));
+        }
         return params;
@@ -59,0 +59,0 @@ }

dist/test/search-params.test.js

@@ -40,3 +40,3 @@ import { expect } from '@open-wc/testing';
         const queryAsString = urlSearchParam.toString();
-        const expected = 'q=title%3Afoo+AND+collection%3Abar&output=json&fl%5B%5D=identifier&fl%5B%5D=foo&fl%5B%5D=bar';
+        const expected = 'q=title%3Afoo+AND+collection%3Abar&output=json&fl=identifier%2Cfoo%2Cbar';
         expect(queryAsString).to.equal(expected);
@@ -57,6 +57,23 @@ });
         const queryAsString = urlSearchParam.toString();
-        const expected = 'q=title%3Afoo+AND+collection%3Abar&output=json&rows=53&page=27&fl%5B%5D=identifier&fl%5B%5D=foo&fl%5B%5D=bar&sort%5B%5D=downloads+desc';
+        const expected = 'q=title%3Afoo+AND+collection%3Abar&output=json&rows=53&page=27&fl=identifier%2Cfoo%2Cbar&sort=downloads+desc';
         expect(queryAsString).to.equal(expected);
     });
+    it('properly generates a URLSearchParam multiple sort params', async () => {
+        const query = 'title:foo AND collection:bar';
+        const sort = [
+            new SortParam('downloads', SortDirection.Desc),
+            new SortParam('foo', SortDirection.Asc),
+        ];
+        const params = new SearchParams({
+            query,
+            sort,
+            rows: 53,
+            page: 27,
+        });
+        const urlSearchParam = params.asUrlSearchParams;
+        const queryAsString = urlSearchParam.toString();
+        const expected = 'q=title%3Afoo+AND+collection%3Abar&output=json&rows=53&page=27&sort=downloads+desc%2Cfoo+asc';
+        expect(queryAsString).to.equal(expected);
+    });
 });
 //# sourceMappingURL=search-params.test.js.map

package.json

 {
   "name": "@internetarchive/search-service",
-  "version": "0.0.1-alpha.16",
+  "version": "0.0.1-alpha.17",
   "description": "A search service for the Internet Archive",
@@ -5,0 +5,0 @@ "license": "AGPL-3.0-only",

src/search-params.ts

@@ -26,3 +26,3 @@ export enum SortDirection {
  * parameters to an IA-style query string. ie. it converts the `fields` array
- * to `fl[]=identifier&fl[]=collection` and `sort` to `sort[]=date+desc&sort[]=downloads+asc`
+ * to `fl=identifier,collection` and `sort` to `sort=date+desc,downloads+asc`
  */
@@ -69,14 +69,18 @@ export class SearchParams {
     }
+
     if (this.page) {
       params.append('page', String(this.page));
     }
-    this.fields?.forEach(field => {
-      params.append('fl[]', field);
-    });
-    this.sort?.forEach(sort => {
-      params.append('sort[]', `${sort.asString}`);
-    });
 
+    if (this.fields) {
+      params.append('fl', this.fields.join(','));
+    }
+
+    if (this.sort) {
+      const sortStrings = this.sort.map(sort => sort.asString);
+      params.append('sort', sortStrings.join(','));
+    }
+
     return params;
   }
 }

test/search-params.test.ts

@@ -47,3 +47,3 @@ import { expect } from '@open-wc/testing';
     const expected =
-      'q=title%3Afoo+AND+collection%3Abar&output=json&fl%5B%5D=identifier&fl%5B%5D=foo&fl%5B%5D=bar';
+      'q=title%3Afoo+AND+collection%3Abar&output=json&fl=identifier%2Cfoo%2Cbar';
     expect(queryAsString).to.equal(expected);
@@ -66,5 +66,24 @@ });
     const expected =
-      'q=title%3Afoo+AND+collection%3Abar&output=json&rows=53&page=27&fl%5B%5D=identifier&fl%5B%5D=foo&fl%5B%5D=bar&sort%5B%5D=downloads+desc';
+      'q=title%3Afoo+AND+collection%3Abar&output=json&rows=53&page=27&fl=identifier%2Cfoo%2Cbar&sort=downloads+desc';
     expect(queryAsString).to.equal(expected);
   });
+
+  it('properly generates a URLSearchParam multiple sort params', async () => {
+    const query = 'title:foo AND collection:bar';
+    const sort = [
+      new SortParam('downloads', SortDirection.Desc),
+      new SortParam('foo', SortDirection.Asc),
+    ];
+    const params = new SearchParams({
+      query,
+      sort,
+      rows: 53,
+      page: 27,
+    });
+    const urlSearchParam = params.asUrlSearchParams;
+    const queryAsString = urlSearchParam.toString();
+    const expected =
+      'q=title%3Afoo+AND+collection%3Abar&output=json&rows=53&page=27&sort=downloads+desc%2Cfoo+asc';
+    expect(queryAsString).to.equal(expected);
+  });
 });

No alert changes

Improved metrics

Number of medium supply chain risk alerts

1

decreased by-50%

Worsened metrics

Total package byte prevSize

339975

decreased by-2.92%

Number of package files

177

decreased by-7.81%

Lines of code

4470

decreased by-2.42%

No dependency changes