@formio/appserver 2.11.1 → 2.11.2

package/lib/modules/mongodb/db.d.ts

@@ -1,6 +1,6 @@
 import { Collection, Document, Db, MongoClient, FindOneOptions } from 'mongodb';
 import { Component, Submission } from '@formio/core';
-import { ServerDB, DBConfig, AppServerForm, DatabaseIndexResponse } from '@formio/appserver-core';
+import { ServerDB, DBConfig, AppServerForm, DatabaseIndexResponse, IndexQuery } from '@formio/appserver-core';
 export declare class Database implements ServerDB {
     config: DBConfig;
     db: Db | null;
@@ -61,12 +61,18 @@ export declare class Database implements ServerDB {
      * @returns
      */
     removeIndexes(form: AppServerForm, indexes: string[]): Promise<void>;
+    /**
+     * Get the index query from the url query.
+     * @param urlQuery
+     * @returns
+     */
+    indexQuery(urlQuery: any): IndexQuery;
     /**
      * Fetch a list of submissions from a table/collection.
      * @param {*} table
      * @param {*} query
      */
-    index(form: AppServerForm, urlQuery?: any, collection?: Collection<Document> | null): Promise<DatabaseIndexResponse<Submission>>;
+    index(form: AppServerForm, query: IndexQuery, collection?: Collection<Document> | null): Promise<DatabaseIndexResponse<Submission>>;
     /**
      * Perform a count of the amount of documents within a collection.
      * @param form

package/lib/modules/mongodb/db.js

@@ -427,40 +427,55 @@ class Database {
             }
         });
     }
+    /**
+     * Get the index query from the url query.
+     * @param urlQuery
+     * @returns
+     */
+    indexQuery(urlQuery) {
+        let skip = 0, limit = 10;
+        limit = urlQuery.limit || 10;
+        skip = urlQuery.skip || 0;
+        const sort = urlQuery.sort || { created: -1 };
+        const includeDeleted = urlQuery.includeDeleted || false;
+        let project = {};
+        if (urlQuery.select) {
+            if (typeof urlQuery.select === 'string') {
+                const fields = urlQuery.select.split(',');
+                fields.forEach((field) => {
+                    project[field] = true;
+                });
+            }
+            else {
+                Object.keys(urlQuery.select).forEach((field) => {
+                    project[field] = true;
+                });
+            }
+        }
+        delete urlQuery.limit;
+        delete urlQuery.skip;
+        delete urlQuery.sort;
+        delete urlQuery.select;
+        delete urlQuery.includeDeleted;
+        return {
+            limit,
+            skip,
+            sort,
+            includeDeleted,
+            project,
+            dbQuery: this.dbQuery(urlQuery)
+        };
+    }
     /**
      * Fetch a list of submissions from a table/collection.
      * @param {*} table
      * @param {*} query
      */
-    index(form_1) {
-        return __awaiter(this, arguments, void 0, function* (form, urlQuery = {}, collection = null) {
-            let items = [], skip = 0, limit = 10, count = 0;
+    index(form_1, query_1) {
+        return __awaiter(this, arguments, void 0, function* (form, query, collection = null) {
+            let items = [], count = 0;
+            const { limit, skip, sort, includeDeleted, project, dbQuery } = query;
             try {
-                limit = urlQuery.limit || 10;
-                skip = urlQuery.skip || 0;
-                const sort = urlQuery.sort || { created: -1 };
-                const includeDeleted = urlQuery.includeDeleted || false;
-                let project = {};
-                if (urlQuery.select) {
-                    if (typeof urlQuery.select === 'string') {
-                        const fields = urlQuery.select.split(',');
-                        fields.forEach((field) => {
-                            project[field] = true;
-                        });
-                    }
-                    else {
-                        Object.keys(urlQuery.select).forEach((field) => {
-                            project[field] = true;
-                        });
-                    }
-                }
-                delete urlQuery.limit;
-                delete urlQuery.skip;
-                delete urlQuery.sort;
-                delete urlQuery.select;
-                delete urlQuery.includeDeleted;
-                debug('db.index()', urlQuery);
-                const dbQuery = this.dbQuery(urlQuery);
                 items = (yield this.find(form, dbQuery, limit, skip, sort, project, collection, includeDeleted)) || [];
                 count = yield this.count(form, dbQuery, collection, includeDeleted);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/appserver",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "description": "A highly performant and extensible Application Server for Form.io Multi-Tenant Deployments.",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
@@ -10,7 +10,9 @@
   "scripts": {
     "clean": "rm -rf lib",
     "build": "npm run clean && tsc",
+    "build:lib": "npm run clean && tsc; true",
     "test": "mocha",
+    "dev": "tsc --watch --preserveWatchOutput",
     "prepack": "npm run build"
   },
   "repository": {
@@ -31,7 +33,7 @@
   ],
   "homepage": "https://github.com/formio/appserver#readme",
   "dependencies": {
-    "@formio/appserver-core": "^2.11.1",
+    "@formio/appserver-core": "^2.11.2",
     "@formio/core": "2.5.1-dev.291.6557e4e",
     "async": "^3.2.6",
     "bcryptjs": "^3.0.3",
@@ -50,7 +52,7 @@
     "@types/jsonwebtoken": "^9.0.10",
     "@types/lodash": "^4.17.23",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^25.1.0",
+    "@types/node": "^25.2.3",
     "chai": "^6.2.2",
     "cross-env": "^10.1.0",
     "mocha": "^11.7.5",