@memberjunction/sqlserver-dataprovider 3.3.0 → 4.0.0

package/dist/SQLServerDataProvider.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * @fileoverview SQL Server Data Provider for MemberJunction
  *
@@ -11,49 +10,25 @@
  * @version 2.0
  * @since 1.0
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLServerDataProvider = void 0;
 /**************************************************************************************************************
  * The SQLServerDataProvider provides a data provider for the entities framework that uses SQL Server directly
  * In practice - this FILE will NOT exist in the entities library, we need to move to its own separate project
  * so it is only included by the consumer of the entities library if they want to use it.
  **************************************************************************************************************/
-const core_1 = require("@memberjunction/core");
-const queryParameterProcessor_1 = require("./queryParameterProcessor");
-const core_entities_1 = require("@memberjunction/core-entities");
-const aiengine_1 = require("@memberjunction/aiengine");
-const queue_1 = require("@memberjunction/queue");
-const sql = __importStar(require("mssql"));
-const rxjs_1 = require("rxjs");
-const SQLServerTransactionGroup_1 = require("./SQLServerTransactionGroup");
-const SqlLogger_js_1 = require("./SqlLogger.js");
-const actions_1 = require("@memberjunction/actions");
-const encryption_1 = require("@memberjunction/encryption");
-const uuid_1 = require("uuid");
-const global_1 = require("@memberjunction/global");
+import { ApplicationInfo, EntityFieldTSType, ProviderType, UserInfo, AuditLogTypeInfo, AuthorizationInfo, TransactionItem, EntityPermissionType, EntitySaveOptions, LogError, StripStopWords, LogStatus, CompositeKey, EntityDeleteOptions, BaseEntityResult, Metadata, DatabaseProviderBase, QueryCache, InMemoryLocalStorageProvider, } from '@memberjunction/core';
+import { QueryParameterProcessor } from './queryParameterProcessor.js';
+import { NodeFileSystemProvider } from './NodeFileSystemProvider.js';
+import { ViewInfo, } from '@memberjunction/core-entities';
+import { AIEngine } from '@memberjunction/aiengine';
+import { QueueManager } from '@memberjunction/queue';
+import sql from 'mssql';
+import { BehaviorSubject, Subject, concatMap, from, tap, catchError, of } from 'rxjs';
+import { SQLServerTransactionGroup } from './SQLServerTransactionGroup.js';
+import { SqlLoggingSessionImpl } from './SqlLogger.js';
+import { EntityActionEngineServer } from '@memberjunction/actions';
+import { EncryptionEngine } from '@memberjunction/encryption';
+import { v4 as uuidv4 } from 'uuid';
+import { MJGlobal, SQLExpressionValidator } from '@memberjunction/global';
 /**
  * Core SQL execution function - handles the actual database query execution
  * This is outside the class to allow both static and instance methods to use it
@@ -155,24 +130,27 @@ async function executeSQLCore(query, parameters, context, options) {
  * await provider.Config();
  * ```
  */
-class SQLServerDataProvider extends core_1.DatabaseProviderBase {
-    _pool;
-    // Instance transaction properties
-    _transaction;
-    _transactionDepth = 0;
-    _savepointCounter = 0;
-    _savepointStack = [];
-    // Query cache instance
-    queryCache = new core_1.QueryCache();
-    // Removed _transactionRequest - creating new Request objects for each query to avoid concurrency issues
-    _localStorageProvider;
-    _bAllowRefresh = true;
-    _recordDupeDetector;
-    _needsDatetimeOffsetAdjustment = false;
-    _datetimeOffsetTestComplete = false;
-    static _sqlLoggingSessionsKey = 'MJ_SQLServerDataProvider_SqlLoggingSessions';
+export class SQLServerDataProvider extends DatabaseProviderBase {
+    constructor() {
+        super(...arguments);
+        this._transactionDepth = 0;
+        this._savepointCounter = 0;
+        this._savepointStack = [];
+        // Query cache instance
+        this.queryCache = new QueryCache();
+        this._bAllowRefresh = true;
+        this._needsDatetimeOffsetAdjustment = false;
+        this._datetimeOffsetTestComplete = false;
+        // Instance SQL execution queue for serializing transaction queries
+        // Non-transactional queries bypass this queue for maximum parallelism
+        this._sqlQueue$ = new Subject();
+        // Transaction state management
+        this._transactionState$ = new BehaviorSubject(false);
+        this._deferredTasks = [];
+    }
+    static { this._sqlLoggingSessionsKey = 'MJ_SQLServerDataProvider_SqlLoggingSessions'; }
     get _sqlLoggingSessions() {
-        const g = global_1.MJGlobal.Instance.GetGlobalObjectStore();
+        const g = MJGlobal.Instance.GetGlobalObjectStore();
         if (g) {
             if (!g[SQLServerDataProvider._sqlLoggingSessionsKey]) {
                 g[SQLServerDataProvider._sqlLoggingSessionsKey] = new Map();
@@ -183,14 +161,6 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             throw new Error('No global object store available for SQL logging session');
         }
     }
-    // Instance SQL execution queue for serializing transaction queries
-    // Non-transactional queries bypass this queue for maximum parallelism
-    _sqlQueue$ = new rxjs_1.Subject();
-    // Subscription for the queue processor
-    _queueSubscription;
-    // Transaction state management
-    _transactionState$ = new rxjs_1.BehaviorSubject(false);
-    _deferredTasks = [];
     /**
      * Observable that emits the current transaction state (true when active, false when not)
      * External code can subscribe to this to know when transactions start and end
@@ -258,7 +228,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return super.Config(configData, providerToUse); // now parent class can do it's config
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -270,13 +240,13 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         // Each instance gets its own queue processor, but only do this ONCE if we get this method called more than once we don't need to reinit
         // the sub, taht would cause duplicate rprocessing.
         if (!this._queueSubscription) {
-            this._queueSubscription = this._sqlQueue$.pipe((0, rxjs_1.concatMap)(item => (0, rxjs_1.from)(executeSQLCore(item.query, item.parameters, item.context, item.options)).pipe(
+            this._queueSubscription = this._sqlQueue$.pipe(concatMap(item => from(executeSQLCore(item.query, item.parameters, item.context, item.options)).pipe(
             // Handle success
-            (0, rxjs_1.tap)(result => item.resolve(result)), 
+            tap(result => item.resolve(result)), 
             // Handle errors
-            (0, rxjs_1.catchError)(error => {
+            catchError(error => {
                 item.reject(error);
-                return (0, rxjs_1.of)(null); // Continue processing queue even on errors
+                return of(null); // Continue processing queue even on errors
             })))).subscribe();
         }
     }
@@ -348,9 +318,9 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
      * ```
      */
     async CreateSqlLogger(filePath, options) {
-        const sessionId = (0, uuid_1.v4)();
+        const sessionId = uuidv4();
         const mjCoreSchema = this.ConfigData.MJCoreSchemaName;
-        const session = new SqlLogger_js_1.SqlLoggingSessionImpl(sessionId, filePath, {
+        const session = new SqlLoggingSessionImpl(sessionId, filePath, {
             defaultSchemaName: mjCoreSchema,
             ...options // if defaultSchemaName is not provided, it will use the MJCoreSchemaName, otherwise
             // the caller's defaultSchemaName will be used
@@ -504,7 +474,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
      */
     static async LogSQLStatement(query, parameters, description, isMutation = false, simpleSQLFallback, contextUser) {
         // Get the current provider instance
-        const provider = core_1.Metadata.Provider;
+        const provider = Metadata.Provider;
         if (provider && provider._sqlLoggingSessions.size > 0) {
             await provider._logSqlStatement(query, parameters, description, false, isMutation, simpleSQLFallback, contextUser);
         }
@@ -668,7 +638,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             };
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             const errorMessage = e instanceof Error ? e.message : String(e);
             return {
                 Success: false,
@@ -721,7 +691,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         let finalSQL = query.SQL;
         let appliedParameters = {};
         if (query.UsesTemplate) {
-            const processingResult = queryParameterProcessor_1.QueryParameterProcessor.processQueryTemplate(query, parameters);
+            const processingResult = QueryParameterProcessor.processQueryTemplate(query, parameters);
             if (!processingResult.success) {
                 throw new Error(processingResult.error);
             }
@@ -730,7 +700,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         }
         else if (parameters && Object.keys(parameters).length > 0) {
             // Warn if parameters were provided but query doesn't use templates
-            (0, core_1.LogStatus)('Warning: Parameters provided but query does not use templates. Parameters will be ignored.');
+            LogStatus('Warning: Parameters provided but query does not use templates. Parameters will be ignored.');
         }
         return { finalSQL, appliedParameters };
     }
@@ -746,7 +716,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         if (!cachedEntry) {
             return null;
         }
-        (0, core_1.LogStatus)(`Cache hit for query ${query.Name} (${query.ID})`);
+        LogStatus(`Cache hit for query ${query.Name} (${query.ID})`);
         // Apply pagination to cached results
         const { paginatedResult, totalRowCount } = this.applyQueryPagination(cachedEntry.results, params);
         const remainingTTL = (cachedEntry.timestamp + (cachedEntry.ttlMinutes * 60 * 1000)) - Date.now();
@@ -829,7 +799,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         }
         // Cache the full result set (before pagination)
         this.queryCache.set(query.ID, parameters, results, cacheConfig);
-        (0, core_1.LogStatus)(`Cached results for query ${query.Name} (${query.ID})`);
+        LogStatus(`Cached results for query ${query.Name} (${query.ID})`);
     }
     /**
      * Internal implementation of batch query execution.
@@ -951,7 +921,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             };
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             return {
                 success: false,
                 results: [],
@@ -1092,7 +1062,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                             else
                                 stack.push(variable); // add to the stack for circular reference detection
                             // variable values is the view ID of the view that we want to get its WHERE CLAUSE, so we need to get the view entity
-                            const innerViewEntity = await core_entities_1.ViewInfo.GetViewEntity(variableValue, user);
+                            const innerViewEntity = await ViewInfo.GetViewEntity(variableValue, user);
                             if (innerViewEntity) {
                                 // we have the inner view, so now call this function recursively to get the where clause for the inner view
                                 const innerWhere = await this.RenderViewWhereClause(innerViewEntity, user, stack);
@@ -1115,7 +1085,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return sWhere;
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -1126,7 +1096,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         // This is the internal implementation - pre/post processing is handled by ProviderBase.RunView()
         // Log aggregate input for debugging
         if (params?.Aggregates?.length) {
-            (0, core_1.LogStatus)(`[SQLServerDataProvider] InternalRunView received aggregates: entityName=${params.EntityName}, viewID=${params.ViewID}, viewName=${params.ViewName}, aggregateCount=${params.Aggregates.length}, aggregates=${JSON.stringify(params.Aggregates.map(a => ({ expression: a.expression, alias: a.alias })))}`);
+            LogStatus(`[SQLServerDataProvider] InternalRunView received aggregates: entityName=${params.EntityName}, viewID=${params.ViewID}, viewName=${params.ViewName}, aggregateCount=${params.Aggregates.length}, aggregates=${JSON.stringify(params.Aggregates.map(a => ({ expression: a.expression, alias: a.alias })))}`);
         }
         const startTime = new Date();
         try {
@@ -1138,9 +1108,9 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 if (params.ViewEntity)
                     viewEntity = params.ViewEntity;
                 else if (params.ViewID && params.ViewID.length > 0)
-                    viewEntity = await core_entities_1.ViewInfo.GetViewEntity(params.ViewID, contextUser);
+                    viewEntity = await ViewInfo.GetViewEntity(params.ViewID, contextUser);
                 else if (params.ViewName && params.ViewName.length > 0)
-                    viewEntity = await core_entities_1.ViewInfo.GetViewEntityByName(params.ViewName, contextUser);
+                    viewEntity = await ViewInfo.GetViewEntityByName(params.ViewName, contextUser);
                 if (!viewEntity) {
                     // if we don't have viewEntity, that means it is a dynamic view, so we need EntityName at a minimum
                     if (!params.EntityName || params.EntityName.length === 0)
@@ -1244,9 +1214,9 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     }
                 }
                 // NEXT, apply Row Level Security (RLS)
-                if (!entityInfo.UserExemptFromRowLevelSecurity(user, core_1.EntityPermissionType.Read)) {
+                if (!entityInfo.UserExemptFromRowLevelSecurity(user, EntityPermissionType.Read)) {
                     // user is NOT exempt from RLS, so we need to apply it
-                    const rlsWhereClause = entityInfo.GetUserRowLevelSecurityWhereClause(user, core_1.EntityPermissionType.Read, '');
+                    const rlsWhereClause = entityInfo.GetUserRowLevelSecurityWhereClause(user, EntityPermissionType.Read, '');
                     if (rlsWhereClause && rlsWhereClause.length > 0) {
                         if (bHasWhere) {
                             whereSQL += ` AND (${rlsWhereClause})`;
@@ -1330,7 +1300,12 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     resultMap[key] = results[index];
                 });
                 // Process data results
-                const retData = resultMap['data'] || [];
+                let retData = resultMap['data'] || [];
+                // Process rows for datetime conversion and field-level decryption
+                // This is critical for encrypted fields - without this, encrypted data stays encrypted in the UI
+                if (retData.length > 0 && params.ResultType !== 'count_only') {
+                    retData = await this.ProcessEntityRows(retData, entityInfo, contextUser);
+                }
                 // Process count results - also check if we need count based on result length
                 let rowCount = null;
                 if (willNeedCount && resultMap['count']) {
@@ -1422,7 +1397,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         }
         catch (e) {
             const exceptionStopTime = new Date();
-            (0, core_1.LogError)(e);
+            LogError(e);
             return {
                 RowCount: 0,
                 TotalRowCount: 0,
@@ -1561,7 +1536,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             };
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             return {
                 success: false,
                 results: [],
@@ -1644,8 +1619,8 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             }
         }
         // Row Level Security
-        if (!entityInfo.UserExemptFromRowLevelSecurity(user, core_1.EntityPermissionType.Read)) {
-            const rlsWhereClause = entityInfo.GetUserRowLevelSecurityWhereClause(user, core_1.EntityPermissionType.Read, '');
+        if (!entityInfo.UserExemptFromRowLevelSecurity(user, EntityPermissionType.Read)) {
+            const rlsWhereClause = entityInfo.GetUserRowLevelSecurityWhereClause(user, EntityPermissionType.Read, '');
             if (rlsWhereClause && rlsWhereClause.length > 0) {
                 if (bHasWhere) {
                     whereSQL += ` AND (${rlsWhereClause})`;
@@ -1740,7 +1715,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return results.map(r => r.RecordID);
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             return [];
         }
     }
@@ -1777,7 +1752,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return results;
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             return [];
         }
     }
@@ -1824,7 +1799,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             // Validate: if impliedDeletes < 0, there are unexplained rows on the server
             // This could happen with direct SQL inserts that bypassed MJ's tracking
             if (impliedDeletes < 0) {
-                (0, core_1.LogStatus)(`Differential validation failed for ${entityInfo.Name}: impliedDeletes=${impliedDeletes} (negative). ` +
+                LogStatus(`Differential validation failed for ${entityInfo.Name}: impliedDeletes=${impliedDeletes} (negative). ` +
                     `clientRowCount=${clientRowCount}, newInserts=${newInserts}, serverRowCount=${serverRowCount}. ` +
                     `Falling back to full refresh.`);
                 return this.runFullQueryAndReturn(params, viewIndex, contextUser);
@@ -1832,7 +1807,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             // Validate: if impliedDeletes > actualDeletes, there are "hidden" deletes
             // not tracked in RecordChanges (e.g., direct SQL deletes)
             if (impliedDeletes > actualDeletes) {
-                (0, core_1.LogStatus)(`Differential validation failed for ${entityInfo.Name}: hidden deletes detected. ` +
+                LogStatus(`Differential validation failed for ${entityInfo.Name}: hidden deletes detected. ` +
                     `impliedDeletes=${impliedDeletes}, actualDeletes=${actualDeletes}. ` +
                     `clientRowCount=${clientRowCount}, newInserts=${newInserts}, serverRowCount=${serverRowCount}. ` +
                     `Falling back to full refresh.`);
@@ -1855,7 +1830,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             };
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             return {
                 viewIndex,
                 status: 'error',
@@ -1910,7 +1885,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         if (!aggregates || aggregates.length === 0) {
             return { aggregateSQL: null, validationErrors: [] };
         }
-        const validator = global_1.SQLExpressionValidator.Instance;
+        const validator = SQLExpressionValidator.Instance;
         const validationErrors = [];
         const validExpressions = [];
         const fieldNames = entityInfo.Fields.map(f => f.Name);
@@ -2054,7 +2029,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     if (field)
                         fieldList.push(field);
                     else
-                        (0, core_1.LogError)(`Field ${f} not found in entity ${entityInfo.Name}`);
+                        LogError(`Field ${f} not found in entity ${entityInfo.Name}`);
                 });
             }
             else {
@@ -2070,7 +2045,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                                 fieldList.push(c.EntityField);
                             }
                             else {
-                                (0, core_1.LogError)(`View Field ${c.Name} doesn't match an Entity Field in entity ${entityInfo.Name}. This can happen if the view was saved with a field that no longer exists in the entity. It is best to update the view to remove this field.`);
+                                LogError(`View Field ${c.Name} doesn't match an Entity Field in entity ${entityInfo.Name}. This can happen if the view was saved with a field that no longer exists in the entity. It is best to update the view to remove this field.`);
                             }
                         }
                     });
@@ -2083,7 +2058,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
         }
         finally {
             return fieldList;
@@ -2134,7 +2109,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 else {
                     // we have multiple words, so we need to convert the spaces to AND
                     // but first, let's strip the stopwords out of the string
-                    u = (0, core_1.StripStopWords)(userSearchString);
+                    u = StripStopWords(userSearchString);
                     // next, include "AND" between all the words so that we have a full text search on all the words
                     u = u.replace(/ /g, ' AND ');
                 }
@@ -2195,7 +2170,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 throw new Error(`Error saving audit log record`);
         }
         catch (err) {
-            (0, core_1.LogError)(err);
+            LogError(err);
             return null;
         }
     }
@@ -2219,7 +2194,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
     // START ---- IEntityDataProvider
     /**************************************************************************/
     get ProviderType() {
-        return core_1.ProviderType.Database;
+        return ProviderType.Database;
     }
     async GetRecordFavoriteStatus(userId, entityName, CompositeKey, contextUser) {
         const id = await this.GetRecordFavoriteID(userId, entityName, CompositeKey, contextUser);
@@ -2235,7 +2210,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 return null;
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -2268,7 +2243,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -2278,7 +2253,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return this.ExecuteSQL(sSQL, undefined, undefined, contextUser);
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -2298,7 +2273,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             // we do this in SQL by combining the pirmary key name and value for each row using the default separator defined by the CompositeKey class
             // the output of this should be like the following 'Field1|Value1||Field2|Value2||Field3|Value3' where the || is the CompositeKey.DefaultFieldDelimiter and the | is the CompositeKey.DefaultValueDelimiter
             const quotes = entity.FirstPrimaryKey.NeedsQuotes ? "'" : '';
-            const primaryKeySelectString = `CONCAT(${entity.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${core_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
+            const primaryKeySelectString = `CONCAT(${entity.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${CompositeKey.DefaultFieldDelimiter}',`)})`;
             // for this entity, check to see if it has any fields that are soft links, and for each of those, generate the SQL
             entity.Fields.filter((f) => f.EntityIDFieldName && f.EntityIDFieldName.length > 0).forEach((f) => {
                 // each field in f must be processed
@@ -2327,7 +2302,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             const entityInfo = this.Entities.find((e) => e.Name.trim().toLowerCase() === entityDependency.EntityName?.trim().toLowerCase());
             const quotes = entityInfo.FirstPrimaryKey.NeedsQuotes ? "'" : '';
             const relatedEntityInfo = this.Entities.find((e) => e.Name.trim().toLowerCase() === entityDependency.RelatedEntityName?.trim().toLowerCase());
-            const primaryKeySelectString = `CONCAT(${entityInfo.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${core_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
+            const primaryKeySelectString = `CONCAT(${entityInfo.PrimaryKeys.map((pk) => `'${pk.Name}|', CAST(${pk.Name} AS NVARCHAR(MAX))`).join(`,'${CompositeKey.DefaultFieldDelimiter}',`)})`;
             if (sSQL.length > 0)
                 sSQL += ' UNION ALL ';
             sSQL += `SELECT
@@ -2377,13 +2352,13 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 // entityInfo.PrimaryKeys.forEach((pk) => {
                 //     pkeyValues.push({FieldName: pk.Name, Value: r[pk.Name]}) // add all of the primary keys, which often is as simple as just "ID", but this is generic way to do it
                 // })
-                const compositeKey = new core_1.CompositeKey();
+                const compositeKey = new CompositeKey();
                 // the row r will have a PrimaryKeyValue field that is a string that is a concatenation of the primary key field names and values
                 // we need to parse that out so that we can then pass it to the CompositeKey object
                 const pkeys = {};
-                const keyValues = r.PrimaryKeyValue.split(core_1.CompositeKey.DefaultFieldDelimiter);
+                const keyValues = r.PrimaryKeyValue.split(CompositeKey.DefaultFieldDelimiter);
                 keyValues.forEach((kv) => {
-                    const parts = kv.split(core_1.CompositeKey.DefaultValueDelimiter);
+                    const parts = kv.split(CompositeKey.DefaultValueDelimiter);
                     pkeys[parts[0]] = parts[1];
                 });
                 compositeKey.LoadFromEntityInfoAndRecord(entityInfo, pkeys);
@@ -2399,7 +2374,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         }
         catch (e) {
             // log and throw
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -2531,7 +2506,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return result;
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             await this.RollbackTransaction();
             // attempt to persist the status to the DB, although that might fail
             await this.CompleteMergeLogging(mergeRecordLog, result, contextUser);
@@ -2563,7 +2538,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 throw new Error(`Error saving record merge log`);
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -2595,7 +2570,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         }
         catch (e) {
             // do nothing here because we often will get here since some conditions lead to no DB updates possible...
-            (0, core_1.LogError)(e);
+            LogError(e);
             // don't bubble up the error here as we're sometimes already in an exception block in caller
         }
     }
@@ -2648,7 +2623,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             let oldData = null;
             // use SQL Server CONCAT function to combine all of the primary key values and then combine them together
             // using the default field delimiter and default value delimiter as defined in the CompositeKey class
-            const concatPKIDString = `CONCAT(${entity.EntityInfo.PrimaryKeys.map((pk) => `'${pk.CodeName}','${core_1.CompositeKey.DefaultValueDelimiter}',${pk.Name}`).join(`,'${core_1.CompositeKey.DefaultFieldDelimiter}',`)})`;
+            const concatPKIDString = `CONCAT(${entity.EntityInfo.PrimaryKeys.map((pk) => `'${pk.CodeName}','${CompositeKey.DefaultValueDelimiter}',${pk.Name}`).join(`,'${CompositeKey.DefaultFieldDelimiter}',`)})`;
             if (!bNewRecord)
                 oldData = entity.GetAll(true); // get all the OLD values, only do for existing records, for new records, not relevant
             const logRecordChangeSQL = this.GetLogRecordChangeSQL(entity.GetAll(false), oldData, entity.EntityInfo.Name, '@ID', entity.EntityInfo, bNewRecord ? 'Create' : 'Update', user, false);
@@ -2706,7 +2681,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
      * @internal
      */
     GetEntityAIActions(entityInfo, before) {
-        return aiengine_1.AIEngine.Instance.EntityAIActions.filter((a) => a.EntityID === entityInfo.ID && a.TriggerEvent.toLowerCase().trim() === (before ? 'before save' : 'after save'));
+        return AIEngine.Instance.EntityAIActions.filter((a) => a.EntityID === entityInfo.ID && a.TriggerEvent.toLowerCase().trim() === (before ? 'before save' : 'after save'));
     }
     /**
      * Handles entity actions (non-AI) for save, delete, or validate operations
@@ -2721,14 +2696,14 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
     async HandleEntityActions(entity, baseType, before, user) {
         // use the EntityActionEngine for this
         try {
-            const engine = actions_1.EntityActionEngineServer.Instance;
+            const engine = EntityActionEngineServer.Instance;
             await engine.Config(false, user);
             const newRecord = entity.IsSaved ? false : true;
             const baseTypeType = baseType === 'save' ? (newRecord ? 'Create' : 'Update') : 'Delete';
             const invocationType = baseType === 'validate' ? 'Validate' : before ? 'Before' + baseTypeType : 'After' + baseTypeType;
             const invocationTypeEntity = engine.InvocationTypes.find((i) => i.Name === invocationType);
             if (!invocationTypeEntity) {
-                (0, core_1.LogError)(`Invocation Type ${invocationType} not found in metadata`);
+                LogError(`Invocation Type ${invocationType} not found in metadata`);
                 return [];
                 //            throw new Error(`Invocation Type ${invocationType} not found in metadata`);
             }
@@ -2746,7 +2721,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return results;
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             return [];
         }
     }
@@ -2765,10 +2740,10 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             if (baseType === 'delete')
                 return;
             // Make sure AI Metadata is loaded here...
-            await aiengine_1.AIEngine.Instance.Config(false, user);
+            await AIEngine.Instance.Config(false, user);
             const actions = this.GetEntityAIActions(entity.EntityInfo, before); // get the actions we need to do for this entity
             if (actions && actions.length > 0) {
-                const ai = aiengine_1.AIEngine.Instance;
+                const ai = AIEngine.Instance;
                 for (let i = 0; i < actions.length; i++) {
                     const a = actions[i];
                     if ((a.TriggerEvent === 'before save' && before) || (a.TriggerEvent === 'after save' && !before)) {
@@ -2791,11 +2766,11 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                                 }
                                 else {
                                     // No transaction active, add the task immediately
-                                    queue_1.QueueManager.AddTask('Entity AI Action', p, null, user);
+                                    QueueManager.AddTask('Entity AI Action', p, null, user);
                                 }
                             }
                             catch (e) {
-                                (0, core_1.LogError)(e.message);
+                                LogError(e.message);
                             }
                         }
                     }
@@ -2803,16 +2778,16 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
         }
     }
     async Save(entity, user, options) {
-        const entityResult = new core_1.BaseEntityResult();
+        const entityResult = new BaseEntityResult();
         try {
             entity.RegisterTransactionPreprocessing();
             const bNewRecord = !entity.IsSaved;
             if (!options)
-                options = new core_1.EntitySaveOptions();
+                options = new EntitySaveOptions();
             const bReplay = !!options.ReplayOnly;
             if (!bReplay && !bNewRecord && !entity.EntityInfo.AllowUpdateAPI) {
                 // existing record and not allowed to update
@@ -2880,7 +2855,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                         // we are part of a transaction group, so just add our query to the list
                         // and when the transaction is committed, we will send all the queries at once
                         this._bAllowRefresh = false; // stop refreshes of metadata while we're doing work
-                        entity.TransactionGroup.AddTransaction(new core_1.TransactionItem(entity, entityResult.Type === 'create' ? 'Create' : 'Update', sSQL, null, {
+                        entity.TransactionGroup.AddTransaction(new TransactionItem(entity, entityResult.Type === 'create' ? 'Create' : 'Update', sSQL, null, {
                             dataSource: this._pool,
                             simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined,
                             entityName: entity.EntityInfo.Name
@@ -2966,7 +2941,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             this._bAllowRefresh = true; // allow refreshes again if we get a failure here
             entityResult.EndedAt = new Date();
             entityResult.Message = e.message;
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e; // rethrow the error
         }
     }
@@ -3023,7 +2998,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
      */
     async generateSPParams(entity, isUpdate, contextUser) {
         // Generate a unique suffix for variable names to avoid collisions in batch scripts
-        const uniqueSuffix = '_' + (0, uuid_1.v4)().substring(0, 8).replace(/-/g, '');
+        const uniqueSuffix = '_' + uuidv4().substring(0, 8).replace(/-/g, '');
         const declarations = [];
         const setStatements = [];
         const execParams = [];
@@ -3069,7 +3044,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     if (f.Encrypt && f.EncryptionKeyID && value !== null && value !== undefined) {
                         // Lazy-load encryption engine only when needed
                         if (!encryptionEngine) {
-                            encryptionEngine = encryption_1.EncryptionEngine.Instance;
+                            encryptionEngine = EncryptionEngine.Instance;
                             await encryptionEngine.Config(false, contextUser);
                         }
                         // Only encrypt if the value is not already encrypted
@@ -3143,7 +3118,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
     generateSetStatementValue(f, value) {
         let val = value;
         switch (f.TSType) {
-            case core_1.EntityFieldTSType.Boolean:
+            case EntityFieldTSType.Boolean:
                 // check to see if the value is a string and if it is equal to true, if so, set the value to 1
                 if (typeof value === 'string' && value.trim().toLowerCase() === 'true')
                     val = 1;
@@ -3152,7 +3127,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 else
                     val = value ? 1 : 0;
                 return val.toString();
-            case core_1.EntityFieldTSType.String:
+            case EntityFieldTSType.String:
                 // Handle string escaping for SET statements
                 if (typeof val === 'string') {
                     val = val.replace(/'/g, "''");
@@ -3164,7 +3139,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     val = val.replace(/'/g, "''");
                 }
                 return `${f.UnicodePrefix}'${val}'`;
-            case core_1.EntityFieldTSType.Date:
+            case EntityFieldTSType.Date:
                 if (val !== null && val !== undefined) {
                     if (typeof val === 'number') {
                         // we have a timestamp - milliseconds since Unix Epoch
@@ -3177,7 +3152,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     val = val.toISOString(); // convert the date to ISO format for storage in the DB
                 }
                 return `'${val}'`;
-            case core_1.EntityFieldTSType.Number:
+            case EntityFieldTSType.Number:
                 return val.toString();
             default:
                 // For other types, convert to string and quote if needed
@@ -3195,7 +3170,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         let quotes = '';
         let val = value;
         switch (f.TSType) {
-            case core_1.EntityFieldTSType.Boolean:
+            case EntityFieldTSType.Boolean:
                 // check to see if the value is a string and if it is equal to true, if so, set the value to 1
                 if (typeof value === 'string' && value.trim().toLowerCase() === 'true')
                     val = 1;
@@ -3204,10 +3179,10 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 else
                     val = value ? 1 : 0;
                 break;
-            case core_1.EntityFieldTSType.String:
+            case EntityFieldTSType.String:
                 quotes = "'";
                 break;
-            case core_1.EntityFieldTSType.Date:
+            case EntityFieldTSType.Date:
                 quotes = "'";
                 if (val !== null && val !== undefined) {
                     if (typeof val === 'number') {
@@ -3436,14 +3411,14 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     bDiff = false; // this branch of logic ensures that undefined and null are treated the same
                 else {
                     switch (f.TSType) {
-                        case core_1.EntityFieldTSType.String:
+                        case EntityFieldTSType.String:
                             bDiff = oldData[key] !== newData[key];
                             break;
-                        case core_1.EntityFieldTSType.Date:
+                        case EntityFieldTSType.Date:
                             bDiff = new Date(oldData[key]).getTime() !== new Date(newData[key]).getTime();
                             break;
-                        case core_1.EntityFieldTSType.Number:
-                        case core_1.EntityFieldTSType.Boolean:
+                        case EntityFieldTSType.Number:
+                        case EntityFieldTSType.Boolean:
                             bDiff = oldData[key] !== newData[key];
                             break;
                     }
@@ -3497,7 +3472,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             const ret = d[0];
             // we need to post process the retrieval to see if we have any char or nchar fields and we need to remove their trailing spaces
             for (const field of entity.EntityInfo.Fields) {
-                if (field.TSType === core_1.EntityFieldTSType.String &&
+                if (field.TSType === EntityFieldTSType.String &&
                     field.Type.toLowerCase().includes('char') &&
                     !field.Type.toLowerCase().includes('varchar')) {
                     // trim trailing spaces for char and nchar fields
@@ -3536,7 +3511,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                             // Find the related entity info to process datetime fields correctly
                             const relEntityInfo = this.Entities.find((e) => e.Name.trim().toLowerCase() === relInfo.RelatedEntity.trim().toLowerCase());
                             if (relEntityInfo) {
-                                ret[rel] = await this.ProcessEntityRows(rawRelData, relEntityInfo);
+                                ret[rel] = await this.ProcessEntityRows(rawRelData, relEntityInfo, user);
                             }
                             else {
                                 // Fallback if we can't find entity info
@@ -3629,11 +3604,11 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         return { fullSQL: sSQL, simpleSQL: sSimpleSQL };
     }
     async Delete(entity, options, user) {
-        const result = new core_1.BaseEntityResult();
+        const result = new BaseEntityResult();
         try {
             entity.RegisterTransactionPreprocessing();
             if (!options)
-                options = new core_1.EntityDeleteOptions();
+                options = new EntityDeleteOptions();
             const bReplay = options.ReplayOnly;
             if (!entity.IsSaved && !bReplay)
                 // existing record and not allowed to update
@@ -3661,7 +3636,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 entity.RaiseReadyForTransaction();
                 // we are part of a transaction group, so just add our query to the list
                 // and when the transaction is committed, we will send all the queries at once
-                entity.TransactionGroup.AddTransaction(new core_1.TransactionItem(entity, 'Delete', sSQL, null, {
+                entity.TransactionGroup.AddTransaction(new TransactionItem(entity, 'Delete', sSQL, null, {
                     dataSource: this._pool,
                     simpleSQLFallback: entity.EntityInfo.TrackRecordChanges ? sqlDetails.simpleSQL : undefined,
                     entityName: entity.EntityInfo.Name
@@ -3742,7 +3717,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             result.Message = e.message;
             result.Success = false;
             result.EndedAt = new Date();
@@ -3814,7 +3789,15 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 }
                 else {
                     // Process successful query result
-                    const itemData = batchResults[queryIndex] || [];
+                    let itemData = batchResults[queryIndex] || [];
+                    // Process rows for datetime conversion and field-level decryption
+                    // This is critical for datasets that contain encrypted fields
+                    if (itemData.length > 0) {
+                        const entityInfo = useThisProvider.Entities.find(e => e.Name.trim().toLowerCase() === item.Entity.trim().toLowerCase());
+                        if (entityInfo) {
+                            itemData = await useThisProvider.ProcessEntityRows(itemData, entityInfo, contextUser);
+                        }
+                    }
                     const itemUpdatedAt = new Date(item.DatasetItemUpdatedAt);
                     const datasetUpdatedAt = new Date(item.DatasetUpdatedAt);
                     const datasetMaxUpdatedAt = new Date(Math.max(itemUpdatedAt.getTime(), datasetUpdatedAt.getTime()));
@@ -3951,7 +3934,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 // the reason we continue below if we have NOT loaded Entities is that when the system first bootstraps, DATASET gets loaded
                 // FIRST before Entities are loaded to load the entity metadata so this would ALWAYS fail :)
                 // entity not found, return a failed result, shouldn't ever get here  due to the foreign key constraint on the table
-                (0, core_1.LogError)(`Entity not found for dataset item ${item.Code} in dataset ${datasetName}`);
+                LogError(`Entity not found for dataset item ${item.Code} in dataset ${datasetName}`);
                 return null;
             }
             else {
@@ -3965,7 +3948,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                         }
                     });
                     if (invalidColumns.length > 0) {
-                        (0, core_1.LogError)(`Invalid columns specified for dataset item ${item.Code} in dataset ${datasetName}: ${invalidColumns.join(', ')}`);
+                        LogError(`Invalid columns specified for dataset item ${item.Code} in dataset ${datasetName}: ${invalidColumns.join(', ')}`);
                         return null;
                     }
                 }
@@ -4084,7 +4067,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         const appEntities = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwApplicationEntities ORDER BY ApplicationName`, undefined, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < apps.length; i++) {
-            ret.push(new core_1.ApplicationInfo(this, {
+            ret.push(new ApplicationInfo(this, {
                 ...apps[i],
                 ApplicationEntities: appEntities.filter((ae) => ae.ApplicationName.trim().toLowerCase() === apps[i].Name.trim().toLowerCase()),
             }));
@@ -4095,7 +4078,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         const alts = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwAuditLogTypes`, null, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < alts.length; i++) {
-            const alt = new core_1.AuditLogTypeInfo(alts[i]);
+            const alt = new AuditLogTypeInfo(alts[i]);
             ret.push(alt);
         }
         return ret;
@@ -4105,7 +4088,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         const userRoles = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwUserRoles ORDER BY UserID`, undefined, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < users.length; i++) {
-            ret.push(new core_1.UserInfo(this, {
+            ret.push(new UserInfo(this, {
                 ...users[i],
                 UserRoles: userRoles.filter((ur) => ur.UserID === users[i].ID),
             }));
@@ -4117,7 +4100,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         const authRoles = await this.ExecuteSQL(`SELECT * FROM [${this.MJCoreSchemaName}].vwAuthorizationRoles ORDER BY AuthorizationName`, undefined, undefined, contextUser);
         const ret = [];
         for (let i = 0; i < auths.length; i++) {
-            ret.push(new core_1.AuthorizationInfo(this, {
+            ret.push(new AuthorizationInfo(this, {
                 ...auths[i],
                 AuthorizationRoles: authRoles.filter((ar) => ar.AuthorizationName.trim().toLowerCase() === auths[i].Name.trim().toLowerCase()),
             }));
@@ -4148,7 +4131,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             return rows;
         }
         // Find all datetime fields in the entity
-        const datetimeFields = entityInfo.Fields.filter((field) => field.TSType === core_1.EntityFieldTSType.Date);
+        const datetimeFields = entityInfo.Fields.filter((field) => field.TSType === EntityFieldTSType.Date);
         // Find all encrypted fields in the entity
         const encryptedFields = entityInfo.Fields.filter((field) => field.Encrypt && field.EncryptionKeyID);
         // If there are no fields requiring processing, return the rows as-is
@@ -4160,7 +4143,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         // Get encryption engine instance (lazy - only if we have encrypted fields)
         let encryptionEngine = null;
         if (encryptedFields.length > 0) {
-            encryptionEngine = encryption_1.EncryptionEngine.Instance;
+            encryptionEngine = EncryptionEngine.Instance;
             await encryptionEngine.Config(false, contextUser);
         }
         // Process each row - need to use Promise.all for async decryption
@@ -4249,7 +4232,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                             // Log error but don't fail the entire operation
                             // Return the encrypted value so the caller knows something is wrong
                             const message = decryptError instanceof Error ? decryptError.message : String(decryptError);
-                            (0, core_1.LogError)(`Failed to decrypt field "${field.Name}" on entity "${entityInfo.Name}": ${message}. ` +
+                            LogError(`Failed to decrypt field "${field.Name}" on entity "${entityInfo.Name}": ${message}. ` +
                                 'The encrypted value will be returned unchanged.');
                             // Keep the encrypted value in the row - let the caller decide what to do
                         }
@@ -4286,7 +4269,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         // This prevents EREQINPROG errors when multiple queries try to use the same transaction
         return new Promise((resolve, reject) => {
             this._sqlQueue$.next({
-                id: (0, uuid_1.v4)(),
+                id: uuidv4(),
                 query,
                 parameters,
                 context,
@@ -4605,7 +4588,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e;
         }
     }
@@ -4713,7 +4696,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         }
         catch (e) {
             this._transactionDepth--; // Restore depth on error
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e; // force caller to handle
         }
     }
@@ -4744,7 +4727,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             }
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e; // force caller to handle
         }
     }
@@ -4770,7 +4753,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 const deferredCount = this._deferredTasks.length;
                 this._deferredTasks = [];
                 if (deferredCount > 0) {
-                    (0, core_1.LogStatus)(`Cleared ${deferredCount} deferred tasks after transaction rollback`);
+                    LogStatus(`Cleared ${deferredCount} deferred tasks after transaction rollback`);
                 }
             }
             else {
@@ -4796,7 +4779,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                 this._savepointCounter = 0;
                 this._transactionState$.next(false);
             }
-            (0, core_1.LogError)(e);
+            LogError(e);
             throw e; // force caller to handle
         }
     }
@@ -4808,7 +4791,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
     async RefreshIfNeeded() {
         // Skip refresh if a transaction is active
         if (this.isTransactionActive) {
-            (0, core_1.LogStatus)('Skipping metadata refresh - transaction is active');
+            LogStatus('Skipping metadata refresh - transaction is active');
             return false;
         }
         // Call parent implementation if no transaction
@@ -4822,7 +4805,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
     async processDeferredTasks() {
         if (this._deferredTasks.length === 0)
             return;
-        (0, core_1.LogStatus)(`Processing ${this._deferredTasks.length} deferred tasks after transaction commit`);
+        LogStatus(`Processing ${this._deferredTasks.length} deferred tasks after transaction commit`);
         // Copy and clear the deferred tasks array
         const tasksToProcess = [...this._deferredTasks];
         this._deferredTasks = [];
@@ -4831,22 +4814,27 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
             try {
                 if (task.type === 'Entity AI Action') {
                     // Process the AI action now that we're outside the transaction
-                    await queue_1.QueueManager.AddTask('Entity AI Action', task.data, task.options, task.user);
+                    await QueueManager.AddTask('Entity AI Action', task.data, task.options, task.user);
                 }
                 // Add other task types here as needed
             }
             catch (error) {
-                (0, core_1.LogError)(`Failed to process deferred ${task.type} task: ${error}`);
+                LogError(`Failed to process deferred ${task.type} task: ${error}`);
                 // Continue processing other tasks even if one fails
             }
         }
-        (0, core_1.LogStatus)(`Completed processing deferred tasks`);
+        LogStatus(`Completed processing deferred tasks`);
     }
     get LocalStorageProvider() {
         if (!this._localStorageProvider)
-            this._localStorageProvider = new core_1.InMemoryLocalStorageProvider();
+            this._localStorageProvider = new InMemoryLocalStorageProvider();
         return this._localStorageProvider;
     }
+    get FileSystemProvider() {
+        if (!this._fileSystemProvider)
+            this._fileSystemProvider = new NodeFileSystemProvider();
+        return this._fileSystemProvider;
+    }
     async GetEntityRecordNames(info, contextUser) {
         const promises = info.map(async (item) => {
             const r = await this.GetEntityRecordName(item.EntityName, item.CompositeKey, contextUser);
@@ -4870,13 +4858,13 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
                     return data[0][fields[0]]; // return first field
                 }
                 else {
-                    (0, core_1.LogError)(`Entity ${entityName} record ${CompositeKey.ToString()} not found, returning null`);
+                    LogError(`Entity ${entityName} record ${CompositeKey.ToString()} not found, returning null`);
                     return null;
                 }
             }
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            LogError(e);
             return null;
         }
     }
@@ -4887,7 +4875,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         else {
             const f = e.NameField;
             if (!f) {
-                (0, core_1.LogError)(`Entity ${entityName} does not have an IsNameField or a field with the column name of Name, returning null, use recordId`);
+                LogError(`Entity ${entityName} does not have an IsNameField or a field with the column name of Name, returning null, use recordId`);
                 return null;
             }
             else {
@@ -4906,7 +4894,7 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         }
     }
     async CreateTransactionGroup() {
-        return new SQLServerTransactionGroup_1.SQLServerTransactionGroup();
+        return new SQLServerTransactionGroup();
     }
     /**************************************************************************/
     // END ---- IMetadataProvider
@@ -4915,5 +4903,4 @@ class SQLServerDataProvider extends core_1.DatabaseProviderBase {
         return this;
     }
 }
-exports.SQLServerDataProvider = SQLServerDataProvider;
 //# sourceMappingURL=SQLServerDataProvider.js.map