fix require inside procedures (#187)

themost-framework · Jan 16, 2025 · 09cc834 · 09cc834
1 parent 7a907b5
commit 09cc834
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/data-context.js b/data-context.js
@@ -7,6 +7,7 @@ var {DataConfigurationStrategy} = require('./data-configuration');
 var cfg = require('./data-configuration');
 var Symbol = require('symbol');
 var nameProperty = Symbol('name');
+var { DataModel } = require('./data-model');
 
 /**
  * @classdesc Represents the default data context of MOST Data Applications.
@@ -171,8 +172,7 @@ DefaultDataContext.prototype.model = function(name) {
     var obj = self.getConfiguration().getStrategy(DataConfigurationStrategy).model(modelName);
     if (_.isNil(obj))
         return null;
-    var DataModel = require('./data-model').DataModel,
-        model = new DataModel(obj);
+    var model = new DataModel(obj);
     //set model context
     model.context = self;
     //return model
@@ -342,7 +342,6 @@ NamedDataContext.prototype.model = function(name) {
     var obj = self.getConfiguration().getStrategy(DataConfigurationStrategy).model(modelName);
     if (_.isNil(obj))
         return null;
-    var DataModel = require('./data-model').DataModel;
     var model = new DataModel(obj);
     //set model context
     model.context = self;

diff --git a/data-listeners.js b/data-listeners.js
@@ -12,6 +12,7 @@ var {TraceUtils} = require('@themost/common');
 var {TextUtils} = require('@themost/common');
 var {DataCacheStrategy} = require('./data-cache');
 var {DataFieldQueryResolver} = require('./data-field-query-resolver');
+var {FunctionContext} = require('./functions');
 
 /**
  * @classdesc Represents an event listener for validating not nullable fields. This listener is automatically  registered in all data models.
@@ -222,8 +223,7 @@ function CalculatedValueListener() {
  */
 CalculatedValueListener.prototype.beforeSave = function(event, callback) {
     //get function context
-    var functions = require('./functions'),
-        functionContext = functions.createContext();
+    var functionContext = new FunctionContext();
     _.assign(functionContext, event);
     functionContext.context = event.model.context;
     //find all attributes that have a default value
@@ -555,7 +555,7 @@ DefaultValueListener.prototype.beforeSave = function(event, callback) {
     }
     else {
         //get function context
-        var functions = require('./functions'), functionContext = functions.createContext();
+        var functionContext = new FunctionContext();
         _.assign(functionContext, event);
         //find all attributes that have a default value
         var attrs = event.model.attributes.filter(function(x) { return (typeof x.value!== 'undefined'); });

diff --git a/data-model.js b/data-model.js
@@ -44,6 +44,8 @@ require('@themost/promise-sequence');
 var DataObjectState = types.DataObjectState;
 var { OnJsonAttribute } = require('./OnJsonAttribute');
 var { isObjectDeep } = require('./is-object');
+var { DataStateValidatorListener } = require('./data-state-validator');
+var resolver = require('./data-expand-resolver');
 /**
  * @this DataModel
  * @param {DataField} field
@@ -616,8 +618,7 @@ function unregisterContextListeners() {
     var DataCachingListener = dataListeners.DataCachingListener;
     var DataModelCreateViewListener = dataListeners.DataModelCreateViewListener;
     var DataModelSeedListener = dataListeners.DataModelSeedListener;
-    var DataStateValidatorListener = require('./data-state-validator').DataStateValidatorListener;
-
+
     //1. State validator listener
     this.on('before.save', DataStateValidatorListener.prototype.beforeSave);
     this.on('before.remove', DataStateValidatorListener.prototype.beforeRemove);
@@ -887,8 +888,6 @@ function filterInternal(params, callback) {
                         });
                     }
                     if (expand) {
-
-                        var resolver = require('./data-expand-resolver');
                         var matches = resolver.testExpandExpression(expand);
                         if (matches && matches.length>0) {
                             q.expand.apply(q, matches);
@@ -1758,8 +1757,7 @@ DataModel.prototype.save = function(obj, callback)
  * @see DataObjectState
  */
 DataModel.prototype.inferState = function(obj, callback) {
-    var self = this,
-        DataStateValidatorListener = require('./data-state-validator').DataStateValidatorListener;
+    var self = this;
     var e = { model:self, target:obj };
     DataStateValidatorListener.prototype.beforeSave(e, function(err) {
         //if error return error