fix(utils): add barrel file

packages/data-ingestion/lib/index.ts

@@ -1,7 +1,6 @@
 import { BigQuery } from '@google-cloud/bigquery';
 import type { BigQuery as BigQueryType } from '@google-cloud/bigquery';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
-import { isCloud } from '@nangohq/utils/dist/environment/detection.js';
+import { getLogger, isCloud } from '@nangohq/utils';
 
 const logger = getLogger('BigQueryClient');
 

packages/jobs/lib/activities.ts

@@ -22,9 +22,8 @@ import {
     getSyncByIdAndName,
     getLastSyncDate
 } from '@nangohq/shared';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger, env } from '@nangohq/utils';
 import { BigQueryClient } from '@nangohq/data-ingestion/dist/index.js';
-import { env } from '@nangohq/utils/dist/environment/detection.js';
 import integrationService from './integration.service.js';
 import type { ContinuousSyncArgs, InitialSyncArgs, ActionArgs, WebhookArgs } from './models/worker';
 

packages/jobs/lib/app.ts

@@ -4,7 +4,7 @@ import { server } from './server.js';
 import { cronAutoIdleDemo } from './crons/autoIdleDemo.js';
 import { deleteOldActivityLogs } from './crons/deleteOldActivities.js';
 import { deleteSyncsData } from './crons/deleteSyncsData.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import { JOBS_PORT } from './constants.js';
 
 const logger = getLogger('Jobs');

packages/jobs/lib/crons/autoIdleDemo.ts

@@ -13,7 +13,7 @@ import {
     findPausableDemoSyncs,
     SpanTypes
 } from '@nangohq/shared';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import tracer from 'dd-trace';
 
 const logger = getLogger('Jobs');

packages/jobs/lib/crons/deleteOldActivities.ts

@@ -1,6 +1,6 @@
 import * as cron from 'node-cron';
 import { deleteLog, deleteLogsMessages, errorManager, ErrorSourceEnum, findOldActivities, MetricTypes, telemetry } from '@nangohq/shared';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import tracer from 'dd-trace';
 import { setTimeout } from 'node:timers/promises';
 

packages/jobs/lib/crons/deleteSyncsData.ts

@@ -10,7 +10,7 @@ import {
     db,
     findRecentlyDeletedSync
 } from '@nangohq/shared';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import tracer from 'dd-trace';
 
 const logger = getLogger('Jobs');

packages/jobs/lib/integration.service.ts

@@ -1,6 +1,6 @@
 import type { Context } from '@temporalio/activity';
 import type { IntegrationServiceInterface, RunScriptOptions, ServiceResponse } from '@nangohq/shared';
-import { integrationFilesAreRemote, isCloud, isProd } from '@nangohq/utils/dist/environment/detection.js';
+import { integrationFilesAreRemote, isCloud, isProd } from '@nangohq/utils';
 import { createActivityLogMessage, localFileService, remoteFileService, NangoError, formatScriptError, isOk } from '@nangohq/shared';
 import type { Runner } from './runner/runner.js';
 import { getOrStartRunner, getRunnerId } from './runner/runner.js';

packages/jobs/lib/runner/local.runner.ts

@@ -3,7 +3,7 @@ import { RunnerType } from './runner.js';
 import type { ChildProcess } from 'child_process';
 import { execSync, spawn } from 'child_process';
 import { getRunnerClient } from '@nangohq/nango-runner';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 const logger = getLogger('Jobs');
 

packages/jobs/lib/runner/remote.runner.ts

@@ -1,4 +1,4 @@
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import type { Runner } from './runner.js';
 import { RunnerType } from './runner.js';
 import { getRunnerClient } from '@nangohq/nango-runner';

packages/jobs/lib/runner/render.runner.ts

@@ -2,7 +2,7 @@ import type { Runner } from './runner.js';
 import { RunnerType } from './runner.js';
 import type { ProxyAppRouter } from '@nangohq/nango-runner';
 import { getRunnerClient } from '@nangohq/nango-runner';
-import { env } from '@nangohq/utils/dist/environment/detection.js';
+import { env } from '@nangohq/utils';
 import { NodeEnv, getPersistAPIUrl } from '@nangohq/shared';
 import { RenderAPI } from './render.api.js';
 import tracer from 'dd-trace';

packages/jobs/lib/runner/runner.ts

@@ -2,10 +2,9 @@ import type { KVStore } from '@nangohq/shared/lib/utils/kvstore/KVStore.js';
 import { LocalRunner } from './local.runner.js';
 import { RenderRunner } from './render.runner.js';
 import { RemoteRunner } from './remote.runner.js';
-import { isEnterprise, env } from '@nangohq/utils/dist/environment/detection.js';
+import { isEnterprise, env, getLogger } from '@nangohq/utils';
 import { getRedisUrl, InMemoryKVStore, RedisKVStore } from '@nangohq/shared';
 import type { ProxyAppRouter } from '@nangohq/nango-runner';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
 
 const logger = getLogger('Runner');
 

packages/jobs/lib/server.ts

@@ -3,7 +3,7 @@ import { createHTTPServer } from '@trpc/server/adapters/standalone';
 import superjson from 'superjson';
 import { z } from 'zod';
 import { suspendRunner } from './runner/runner.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 const logger = getLogger('Jobs');
 

packages/jobs/lib/temporal.ts

@@ -4,8 +4,7 @@ import * as dotenv from 'dotenv';
 import { createRequire } from 'module';
 import * as activities from './activities.js';
 import { SYNC_TASK_QUEUE, WEBHOOK_TASK_QUEUE } from '@nangohq/shared';
-import { isProd, isEnterprise } from '@nangohq/utils/dist/environment/detection.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { isProd, isEnterprise, getLogger } from '@nangohq/utils';
 
 const logger = getLogger('Jobs.Temporal');
 

packages/logs/lib/env.ts

@@ -1,3 +1,3 @@
-import { parseEnvs, ENVS } from '@nangohq/utils/dist/environment/parse.js';
+import { parseEnvs, ENVS } from '@nangohq/utils';
 
 export const envs = parseEnvs(ENVS.required({ NANGO_LOGS_ES_URL: true, NANGO_LOGS_ES_USER: true, NANGO_LOGS_ES_PWD: true }));

packages/logs/lib/utils.ts

@@ -1,5 +1,5 @@
 import { customAlphabet } from 'nanoid';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 export const logger = getLogger('elasticsearch');
 

packages/persist/lib/app.ts

@@ -1,5 +1,5 @@
 import './tracer.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import { server } from './server.js';
 
 const logger = getLogger('Persist');

packages/persist/lib/server.ts

@@ -2,7 +2,7 @@ import express from 'express';
 import type { Request, Response, NextFunction } from 'express';
 import { validateRequest } from 'zod-express';
 import { z } from 'zod';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import persistController from './controllers/persist.controller.js';
 import { logLevelValues } from '@nangohq/shared';
 

packages/runner/lib/app.ts

@@ -1,6 +1,6 @@
 import './tracer.js';
 import { server } from './server.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 const logger = getLogger('Runner');
 

packages/runner/lib/monitor.ts

@@ -3,7 +3,7 @@ import fs from 'fs';
 import { stringifyError, type NangoProps } from '@nangohq/shared';
 import * as superjson from 'superjson';
 import { fetch } from 'undici';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 const MEMORY_WARNING_PERCENTAGE_THRESHOLD = 75;
 const logger = getLogger('Runner');

packages/server/lib/clients/auth.client.ts

@@ -4,7 +4,7 @@ import { BasicStrategy } from 'passport-http';
 import express from 'express';
 import session from 'express-session';
 import path from 'path';
-import { AUTH_ENABLED, isBasicAuthEnabled } from '@nangohq/utils/dist/environment/detection.js';
+import { AUTH_ENABLED, isBasicAuthEnabled } from '@nangohq/utils';
 import { dirname, userService, database } from '@nangohq/shared';
 import crypto from 'crypto';
 import util from 'util';

packages/server/lib/clients/email.client.ts

@@ -1,6 +1,6 @@
 import formData from 'form-data';
 import Mailgun from 'mailgun.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 const logger = getLogger('Server.EmailClient');
 

packages/server/lib/clients/publisher.client.ts

@@ -2,7 +2,7 @@ import type { WebSocket } from 'ws';
 import type { RedisClientType } from 'redis';
 import * as uuid from 'uuid';
 import { createClient } from 'redis';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import type { WSErr } from '../utils/web-socket-error.js';
 import { errorHtml, successHtml } from '../utils/utils.js';
 import { getRedisUrl } from '@nangohq/shared';

packages/server/lib/controllers/access.middleware.ts

@@ -1,6 +1,5 @@
 import type { Request, Response, NextFunction } from 'express';
-import { isCloud, isBasicAuthEnabled } from '@nangohq/utils/dist/environment/detection.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { isCloud, isBasicAuthEnabled, getLogger } from '@nangohq/utils';
 import {
     LogActionEnum,
     ErrorSourceEnum,

packages/server/lib/controllers/account.controller.ts

@@ -1,6 +1,6 @@
 import type { Request, Response, NextFunction } from 'express';
 import type { LogLevel } from '@nangohq/shared';
-import { isCloud } from '@nangohq/utils/dist/environment/detection.js';
+import { isCloud } from '@nangohq/utils';
 import { getEnvironmentAndAccountId, accountService, userService, errorManager, LogActionEnum, createActivityLogAndLogMessage } from '@nangohq/shared';
 import { getUserAccountAndEnvironmentFromSession } from '../utils/utils.js';
 

packages/server/lib/controllers/auth.controller.ts

@@ -6,8 +6,7 @@ import { resetPasswordSecret, getUserAccountAndEnvironmentFromSession } from '..
 import jwt from 'jsonwebtoken';
 import EmailClient from '../clients/email.client.js';
 import type { User, Result } from '@nangohq/shared';
-import { isCloud, baseUrl, basePublicUrl } from '@nangohq/utils/dist/environment/detection.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { isCloud, baseUrl, basePublicUrl, getLogger } from '@nangohq/utils';
 import {
     userService,
     accountService,

packages/server/lib/controllers/config.controller.ts

@@ -8,7 +8,7 @@ import type {
     Integration as ProviderIntegration,
     Config
 } from '@nangohq/shared';
-import { isHosted } from '@nangohq/utils/dist/environment/detection.js';
+import { isHosted } from '@nangohq/utils';
 import {
     flowService,
     getConfigWithEndpointsByProviderConfigKey,

packages/server/lib/controllers/environment.controller.ts

@@ -1,6 +1,6 @@
 import type { Request, Response, NextFunction } from 'express';
 import type { Environment } from '@nangohq/shared';
-import { isCloud, baseUrl } from '@nangohq/utils/dist/environment/detection.js';
+import { isCloud, baseUrl } from '@nangohq/utils';
 import {
     accountService,
     hmacService,

packages/server/lib/controllers/onboarding.controller.ts

@@ -30,7 +30,7 @@ import {
     AnalyticsTypes
 } from '@nangohq/shared';
 import type { CustomerFacingDataRecord, IncomingPreBuiltFlowConfig } from '@nangohq/shared';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import { getUserAccountAndEnvironmentFromSession } from '../utils/utils.js';
 
 const logger = getLogger('Server.Onboarding');

packages/server/lib/controllers/ratelimit.middleware.ts

@@ -3,7 +3,7 @@ import { createClient } from 'redis';
 import type { RateLimiterRes } from 'rate-limiter-flexible';
 import { RateLimiterRedis, RateLimiterMemory } from 'rate-limiter-flexible';
 import { getAccount, getRedisUrl } from '@nangohq/shared';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 const logger = getLogger('RateLimiter');
 

packages/server/lib/controllers/user.controller.ts

@@ -1,7 +1,7 @@
 import { getUserAccountAndEnvironmentFromSession } from '../utils/utils.js';
 import type { Request, Response, NextFunction } from 'express';
 import EmailClient from '../clients/email.client.js';
-import { isCloud, isEnterprise, basePublicUrl } from '@nangohq/utils/dist/environment/detection.js';
+import { isCloud, isEnterprise, basePublicUrl } from '@nangohq/utils';
 import { errorManager, userService } from '@nangohq/shared';
 
 export interface GetUser {

packages/server/lib/jobs/index.ts

@@ -1,4 +1,4 @@
-import { isCloud } from '@nangohq/utils/dist/environment/detection.js';
+import { isCloud } from '@nangohq/utils';
 import { encryptionManager } from '@nangohq/shared';
 
 export async function encryptDataRecords(): Promise<void> {

packages/server/lib/server.ts

@@ -33,8 +33,7 @@ import passport from 'passport';
 import environmentController from './controllers/environment.controller.js';
 import accountController from './controllers/account.controller.js';
 import type { Response, Request } from 'express';
-import { isCloud, isEnterprise, AUTH_ENABLED, MANAGED_AUTH_ENABLED, isBasicAuthEnabled } from '@nangohq/utils/dist/environment/detection.js';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { isCloud, isEnterprise, AUTH_ENABLED, MANAGED_AUTH_ENABLED, isBasicAuthEnabled, getLogger } from '@nangohq/utils';
 import { getGlobalOAuthCallbackUrl, environmentService, getPort, errorManager, getWebsocketsPath, packageJsonFile } from '@nangohq/shared';
 import oAuthSessionService from './services/oauth-session.service.js';
 import migrate from './utils/migrate.js';

packages/server/lib/utils/migrate.ts

@@ -1,4 +1,4 @@
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 
 const logger = getLogger('Server');
 

packages/server/lib/utils/utils.ts

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'url';
 import path from 'path';
 import type { Request } from 'express';
 import type { User, Environment, Account, Template as ProviderTemplate, ServiceResponse } from '@nangohq/shared';
-import { getLogger } from '@nangohq/utils/dist/logger.js';
+import { getLogger } from '@nangohq/utils';
 import type { WSErr } from './web-socket-error.js';
 import { NangoError, userService, environmentService, interpolateString } from '@nangohq/shared';
 

packages/utils/lib/errors.ts

@@ -0,0 +1,15 @@
+import { serializeError } from 'serialize-error';
+
+/**
+ * Transform any Error or primitive to a json object
+ */
+export function errorToObject(err: unknown) {
+    return serializeError(err);
+}
+
+/**
+ * Transform any Error or primitive to a string
+ */
+export function stringifyError(err: unknown) {
+    return JSON.stringify(serializeError(err));
+}

packages/utils/lib/index.ts

@@ -0,0 +1,5 @@
+export * from './environment/constants.js';
+export * from './environment/detection.js';
+export * from './environment/parse.js';
+export * from './errors.js';
+export * from './logger.js';

packages/utils/package.json

@@ -17,6 +17,7 @@
     "license": "SEE LICENSE IN LICENSE FILE IN GIT REPOSITORY",
     "dependencies": {
         "winston": "3.8.2",
+        "serialize-error": "11.0.3",
         "zod": "3.22.4"
     },
     "devDependencies": {