@loomcore/api 0.0.1 → 0.0.3

package/dist/__tests__/test-express-app.js

@@ -6,7 +6,7 @@ import { MongoMemoryServer } from 'mongodb-memory-server';
 import { MongoClient } from 'mongodb';
 import { initializeTypeBox } from '@loomcore/common/validation';
 import testUtils from './common-test.utils.js';
-import { setApiCommonConfig } from '../config/api-common-config.js';
+import { setBaseApiConfig } from '../config/base-api-config.js';
 import { errorHandler } from '../middleware/error-handler.js';
 import { ensureUserContext } from '../middleware/ensure-user-context.js';
 export class TestExpressApp {
@@ -15,11 +15,19 @@ export class TestExpressApp {
     static client;
     static db;
     static async init() {
-        setApiCommonConfig({
+        setBaseApiConfig({
             env: 'test',
             hostName: 'localhost',
             appName: 'test-app',
             clientSecret: 'test-secret',
+            mongoDbUrl: '',
+            databaseName: '',
+            externalPort: 4000,
+            internalPort: 8083,
+            corsAllowedOrigins: ['*'],
+            saltWorkFactor: 10,
+            jobTypes: '',
+            deployedBranch: '',
             debug: {
                 showErrors: false
             },

package/dist/config/base-api-config.d.ts

@@ -0,0 +1,3 @@
+import { IBaseApiConfig } from '../models/index.js';
+export declare let config: IBaseApiConfig;
+export declare function setBaseApiConfig(baseApiConfig: IBaseApiConfig): void;

package/dist/config/base-api-config.js

@@ -0,0 +1,11 @@
+export let config;
+let isConfigSet = false;
+export function setBaseApiConfig(baseApiConfig) {
+    if (!isConfigSet) {
+        config = baseApiConfig;
+        isConfigSet = true;
+    }
+    else if (config.env !== 'test') {
+        console.warn('BaseApiConfig data has already been set. Ignoring subsequent calls to setBaseApiConfig.');
+    }
+}

package/dist/config/index.d.ts

@@ -1 +1 @@
-export * from './api-common-config.js';
+export * from './base-api-config.js';

package/dist/config/index.js

@@ -1 +1 @@
-export * from './api-common-config.js';
+export * from './base-api-config.js';

package/dist/middleware/error-handler.js

@@ -1,6 +1,6 @@
 import { CustomError } from '@loomcore/common/errors';
 import { apiUtils } from '../utils/index.js';
-import { config } from '../config/api-common-config.js';
+import { config } from '../config/base-api-config.js';
 export const errorHandler = (err, req, res, next) => {
     if (config.debug?.showErrors || config.env !== 'test') {
         console.error('API Error:', {

package/dist/models/base-api-config.interface.d.ts

@@ -1,5 +1,8 @@
-import { IApiCommonConfig } from './api-common-config.interface.js';
 export interface IBaseApiConfig {
+    appName: string;
+    env: string;
+    hostName: string;
+    clientSecret: string;
     mongoDbUrl?: string;
     databaseName?: string;
     externalPort?: number;
@@ -8,5 +11,20 @@ export interface IBaseApiConfig {
     saltWorkFactor?: number;
     jobTypes?: string;
     deployedBranch?: string;
-    api: IApiCommonConfig;
+    debug?: {
+        showErrors?: boolean;
+    };
+    app: {
+        multiTenant: boolean;
+    };
+    auth: {
+        jwtExpirationInSeconds: number;
+        refreshTokenExpirationInDays: number;
+        deviceIdCookieMaxAgeInDays: number;
+        passwordResetTokenExpirationInMinutes: number;
+    };
+    email: {
+        sendGridApiKey?: string;
+        fromAddress?: string;
+    };
 }

package/dist/models/index.d.ts

@@ -1,3 +1,2 @@
-export * from './api-common-config.interface.js';
 export * from './base-api-config.interface.js';
 export * from './types/index.js';

package/dist/models/index.js

@@ -1,3 +1,2 @@
-export * from './api-common-config.interface.js';
 export * from './base-api-config.interface.js';
 export * from './types/index.js';

package/dist/utils/db.utils.js

@@ -160,6 +160,19 @@ function buildMongoMatchFromQueryOptions(queryOptions) {
                     match[key] = value.eq;
                 }
             }
+            else if (value.in !== undefined && Array.isArray(value.in)) {
+                if (key.endsWith('Id') && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)) {
+                    const objectIds = value.in
+                        .filter(val => typeof val === 'string' && entityUtils.isValidObjectId(val))
+                        .map(val => new ObjectId(val));
+                    if (objectIds.length > 0) {
+                        match[key] = { $in: objectIds };
+                    }
+                }
+                else {
+                    match[key] = { $in: value.in };
+                }
+            }
             else if (value.gte !== undefined) {
                 match[key] = { $gte: value.gte };
             }
@@ -199,6 +212,11 @@ function addKeyValueToWhereClause(whereClause, key, value, tableAlias = '') {
             formattedValue = formatValue(value.eq);
             operator = '=';
         }
+        else if (value.in !== undefined && Array.isArray(value.in)) {
+            const formattedValues = value.in.map(val => formatValue(val)).join(', ');
+            formattedValue = `(${formattedValues})`;
+            operator = 'IN';
+        }
         else if (value.gte !== undefined) {
             formattedValue = formatValue(value.gte);
             operator = '>=';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
   "scripts": {
@@ -16,7 +16,6 @@
     "update-lib-versions": "npx --yes npm-check-updates -u -f @loomcore/models",
     "install-updated-libs": "npm i @loomcore/models",
     "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
-    
     "typecheck": "tsc",
     "test": "cross-env NODE_ENV=test vitest run",
     "test:ci": "cross-env NODE_ENV=test vitest run --reporter=json --outputFile=test-results.json",
@@ -45,7 +44,7 @@
     "jsonwebtoken": "^9.0.2"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.6",
+    "@loomcore/common": "^0.0.7",
     "@sinclair/typebox": "^0.34.31",
     "cookie-parser": "^1.4.6",
     "express": "^5.1.0",

package/dist/config/api-common-config.d.ts

@@ -1,3 +0,0 @@
-import { IApiCommonConfig } from '../models/index.js';
-export declare let config: IApiCommonConfig;
-export declare function setApiCommonConfig(apiCommonConfig: IApiCommonConfig): void;

package/dist/config/api-common-config.js

@@ -1,11 +0,0 @@
-export let config;
-let isConfigSet = false;
-export function setApiCommonConfig(apiCommonConfig) {
-    if (!isConfigSet) {
-        config = apiCommonConfig;
-        isConfigSet = true;
-    }
-    else if (config.env !== 'test') {
-        console.warn('ApiCommonConfig data has already been set. Ignoring subsequent calls to setApiCommonConfig.');
-    }
-}

package/dist/models/api-common-config.interface.d.ts

@@ -1,22 +0,0 @@
-export interface IApiCommonConfig {
-    env: string;
-    hostName: string;
-    appName: string;
-    clientSecret: string;
-    debug?: {
-        showErrors?: boolean;
-    };
-    app: {
-        multiTenant: boolean;
-    };
-    auth: {
-        jwtExpirationInSeconds: number;
-        refreshTokenExpirationInDays: number;
-        deviceIdCookieMaxAgeInDays: number;
-        passwordResetTokenExpirationInMinutes: number;
-    };
-    email: {
-        sendGridApiKey?: string;
-        fromAddress?: string;
-    };
-}

package/dist/models/api-common-config.interface.js

@@ -1 +0,0 @@
-export {};