@fluid-experimental/property-properties 0.55.1 → 0.56.0-49831

package/lib/propertyFactory.js

@@ -12,7 +12,7 @@ const fastestJSONCopy = require('fastest-json-copy');
 const deepCopy = fastestJSONCopy.copy;
 const { Collection, ConsoleUtils, EventEmitter, SortedCollection, constants, GuidUtils } = require('@fluid-experimental/property-common');
 const { MSG } = constants;
-const { TypeIdHelper, TemplateValidator, PathHelper } = require('@fluid-experimental/property-changeset');
+const { TypeIdHelper, TemplateValidator, PathHelper, ChangeSet } = require('@fluid-experimental/property-changeset');
 const { PropertyTemplate } = require('./propertyTemplate');
 const { PropertyTemplateWrapper } = require('./propertyTemplateWrapper');
 // Include the property classes
@@ -283,6 +283,15 @@ class PropertyFactory {
         this._inheritanceCache = {};
         /** Cache of constructor function that are auto-generated for typeids */
         this._typedPropertyConstructorCache = {};
+        /** A cache of functions that create the properties */
+        this._cachedCreationFunctions = new Map();
+        /** Usually we will  use the precompiled creation functions, but those all share the same constant properties.
+         *  Since it is allowed to overwrite constants via default values, we have to explicitly instantiate new
+         *  property instances for constants. Since the constants themselves may contain nested property instances,
+         *  we use this flag to indicate that for all nested properties, we do not want to use the precompiled
+         *  instantiation functions.
+         */
+        this._forceInstantion = false;
         this._init();
     }
     ;
@@ -793,13 +802,10 @@ class PropertyFactory {
      *                               Accepted values are "single" (default), "array", "map" and "set".
      * @param {object|undefined} in_initialProperties A set of initial values for the PropertySet being created
      * @param {string|undefined} in_scope - The scope in which the property typeid is defined
-     * @param {boolean|undefined} in_optimizeConstants - set true if constant optimization should occur
-     * @throws if the property does not have a unique id.
-     * @throws if the property has a typeid that is not registered.
      * @return {property-properties.BaseProperty|undefined} the property instance
      * @private
      */
-    _createProperty(in_typeid, in_context, in_initialProperties, in_scope, in_optimizeConstants) {
+    _createProperty(in_typeid, in_context, in_initialProperties, in_scope) {
         const ifNotSingleOrUndefined = (in_context || 'single') !== 'single';
         ConsoleUtils.assert(ifNotSingleOrUndefined || _.isString(in_typeid), MSG.UNKNOWN_TYPEID_SPECIFIED + in_typeid);
         let context = in_context;
@@ -811,33 +817,366 @@ class PropertyFactory {
                 context = splitTypeId.context;
             }
         }
-        let property;
-        if (in_optimizeConstants) {
-            var templateOrProperty = this._getWrapper(in_typeid, undefined, in_scope);
-            var isProperty = templateOrProperty instanceof PropertyTemplateWrapper;
-            var evaluateConstants = isProperty ? !templateOrProperty.hasConstantTree() : false;
-            property = this._createFromPropertyDeclaration({
+        let propertyCreationFunction = undefined;
+        if (!this._forceInstantion) {
+            // Check, whether we already have a property creation function for this property
+            // in the cache
+            const scopeFunctionEntry = this._cachedCreationFunctions.get(in_typeid);
+            const contextFunctionEntry = scopeFunctionEntry && scopeFunctionEntry.get(in_scope);
+            propertyCreationFunction = contextFunctionEntry && contextFunctionEntry.get(context);
+        }
+        // If we don't have a cached function or are requested to explicitly instantiate the property
+        // we have to first create a property definition by recursively traversing all templates
+        let propertyDef;
+        if (!propertyCreationFunction) {
+            propertyDef = {};
+            this._createDefFromPropertyDeclaration({
                 typeid: in_typeid,
                 context: context || 'single'
-            }, undefined, in_scope, evaluateConstants);
-            if (isProperty) {
-                templateOrProperty.loadConstants(property);
+            }, in_scope, propertyDef);
+        }
+        let property;
+        if (!this._forceInstantion) {
+            // If we don't yet have a creation function, we will create one here
+            propertyCreationFunction = propertyCreationFunction ||
+                this._definePropertyCreationFunction(propertyDef, in_typeid, in_scope, context);
+            // Create the property by invoking the precompiled creation function
+            property = propertyCreationFunction();
+            // If initial properties have been provided, we will assign them to the
+            // default initialized property
+            if (in_initialProperties !== undefined) {
+                this._setInitialValue(property, {
+                    value: in_initialProperties
+                }, false);
             }
         }
         else {
-            property = this._createFromPropertyDeclaration({
-                typeid: in_typeid,
-                context: context || 'single'
-            }, undefined, in_scope, true);
-        }
-        if (in_initialProperties !== undefined) {
-            this._setInitialValue(property, {
+            // Directly instantiate the property from the definition (without using) a precompield function
+            property = this._instantiatePropertyDef(propertyDef, in_scope, in_initialProperties && {
                 value: in_initialProperties
             });
         }
         return property;
     }
     ;
+    /**
+     * Creates an instance of the property described in the property definition.
+     *
+     * Note: this function won't create any constant children, it is only used to
+     *       instantiate nested constant properties and those will be set to constant
+     *       after their instantiation.
+     *
+     * @param {Object} propertyDef - The property defintion for the property to create
+     * @param {String} in_scope - The scope for the property to create
+     * @param {String} in_initialProperties - The initial values for the property
+     *
+     * @returns {BaseProperty} An instance of the property
+     */
+    _instantiatePropertyDef(propertyDef, in_scope, in_initialProperties) {
+        let rootProperty = undefined;
+        // This stack is used to recursively iterate over the property definition
+        const creationStack = [{
+                id: undefined,
+                entry: propertyDef,
+                parent: undefined
+            }];
+        while (creationStack.length > 0) {
+            const currentEntry = creationStack.pop();
+            // We have an entry on the stack that is just waiting for its children to finish, but has already
+            // been created
+            if (currentEntry.signalChildrenFinished) {
+                currentEntry.property._signalAllStaticMembersHaveBeenAdded(in_scope);
+                if (currentEntry.initialValue) {
+                    this._setInitialValue(currentEntry.property, currentEntry.initialValue, true);
+                }
+                continue;
+            }
+            // Create the property instance
+            let property = new (currentEntry.entry.constructorFunction)(currentEntry.entry.entry);
+            // Insert / append the property to the parent
+            if (currentEntry.parent) {
+                if (currentEntry.entry.optional) {
+                    currentEntry.parent._insert(property.getId(), property, true);
+                }
+                else {
+                    currentEntry.parent._append(property, currentEntry.entry.allowChildMerges);
+                }
+            }
+            else {
+                // If we are at the root, we store the property object to return it later
+                rootProperty = property;
+            }
+            // For named properties we have to assign a GUID (note: all constant properties in
+            // a template will share this GUID)
+            if (currentEntry.setGuid) {
+                property.value = GuidUtils.generateGUID();
+            }
+            // Assign optional children
+            if (currentEntry.entry.optionalChildren) {
+                for (let [id, typeid] of Object.entries(currentEntry.entry.optionalChildren)) {
+                    property._addOptionalChild(id, typeid);
+                }
+            }
+            // Recursively process all children of this entry
+            if (currentEntry.entry.children) {
+                // Create an entry on the stack, which is later needed,
+                // to signal that all child properties have been added
+                const parentStackEntry = {
+                    signalChildrenFinished: true,
+                    initialValue: currentEntry.entry.initialValue,
+                    property
+                };
+                creationStack.push(parentStackEntry);
+                for (let [id, child] of currentEntry.entry.children) {
+                    creationStack.push({
+                        parent: property,
+                        id: id,
+                        entry: child,
+                        setGuid: currentEntry.entry.assignGuid && id ===
+                            'guid'
+                    });
+                }
+            }
+            else {
+                // If there are no children, we directly assign the initial value and
+                // signal that the property has completely been initialized
+                if (currentEntry.entry.initialValue) {
+                    this._setInitialValue(property, currentEntry.entry.initialValue, true);
+                }
+                if (currentEntry.entry.signal) {
+                    property._signalAllStaticMembersHaveBeenAdded(in_scope);
+                }
+            }
+        }
+        if (in_initialProperties !== undefined) {
+            this._setInitialValue(rootProperty, in_initialProperties, true);
+        }
+        return rootProperty;
+    }
+    /**
+     * Creates a javascript function that instantiates the requested property
+     *
+     * @param {Object} propertyDef - The property defintion for the property for which the function is created
+     * @param {String} in_typeid - The typeid for the property for which the function is created
+     * @param {String} in_scope - The scope for the property for which the function is created
+     * @param {String} in_context - The context for the property for which the function is created
+     *
+     * @returns {Function} A function that creates an instance of the property
+     */
+    _definePropertyCreationFunction(propertyDef, in_typeid, in_scope, in_context) {
+        // This stack is used to recursively iterate over the property definition
+        const creationStack = [{
+                id: null,
+                def: propertyDef,
+                parent: undefined
+            }];
+        let creationFunctionSource = "";
+        let currentParameterIndex = 0;
+        let parameters = [];
+        let currentPropertyNumber = 0;
+        let currentPropertyVarName = "";
+        let resultVarName;
+        while (creationStack.length > 0) {
+            const currentEntry = creationStack.pop();
+            // We have an entry on the stack that is just waiting for its children to finish, but has already
+            // been created
+            if (currentEntry.signalChildrenFinished) {
+                // Add the signalling function
+                creationFunctionSource +=
+                    `${currentEntry.propertyVarname}._signalAllStaticMembersHaveBeenAdded(${JSON.stringify(in_scope)});\n`;
+                continue;
+            }
+            // Determine the initial value for this property
+            let initialValue = currentEntry.def.initialValue !== undefined ?
+                currentEntry.def.initialValue :
+                undefined;
+            if (currentEntry.def.entry.id) {
+                let parentEntry = currentEntry.parentStackEntry;
+                let path = [currentEntry.def.entry.id];
+                // We have to walk the whole parent chain and extract for
+                // each parent the initial values. Entries further up in the
+                // chain can overwrite entries further down
+                while (parentEntry) {
+                    if (parentEntry.initialValue) {
+                        // Extract changes to be applied to this property
+                        let filteredChangeSet = parentEntry.initialValue.value;
+                        for (let i = 0; i < path.length; i++) {
+                            filteredChangeSet = filteredChangeSet && filteredChangeSet[path[i]];
+                        }
+                        // Update the initial value with the extract changeset
+                        if (_.isObject(filteredChangeSet)) {
+                            if (initialValue === undefined) {
+                                initialValue = {
+                                    typed: false,
+                                    value: filteredChangeSet
+                                };
+                            }
+                            else if (_.isObject(initialValue)) {
+                                Object.assign(initialValue.value, filteredChangeSet);
+                            }
+                            else {
+                                throw new Error('Invalid default values specified');
+                            }
+                        }
+                        else if (filteredChangeSet !== undefined) {
+                            if (initialValue === undefined) {
+                                initialValue = {
+                                    value: undefined,
+                                    typed: false
+                                };
+                            }
+                            initialValue.value = filteredChangeSet;
+                        }
+                    }
+                    if (parentEntry.id !== null) {
+                        path.unshift(parentEntry.id);
+                    }
+                    parentEntry = parentEntry.parentStackEntry;
+                }
+            }
+            if (currentEntry.def.constant) {
+                // If we have a constant property, we create a concrete property object instance and share it
+                // among all instances of the parent property
+                let instantiatedChild;
+                try {
+                    // Usually we would use the precompiled creation functions, but those all share
+                    // the same constant properties. Since it is allowed to overwrite constants via
+                    // default values, we have to explicitly instantiate new property instances for
+                    // constants. Since the constants themselves may contain nested property instances,
+                    // we use this flag to indicate that for all nested properties, we do not want to use
+                    // the precompiled instantiation functions.
+                    this._forceInstantion = true;
+                    instantiatedChild =
+                        this._instantiatePropertyDef(currentEntry.def, in_scope, currentEntry.def.initialValue);
+                }
+                finally {
+                    this._forceInstantion = false;
+                }
+                instantiatedChild._setAsConstant();
+                // Add a reference to the newly instantiate constant property to the parameters and add
+                // a command to add it into the tree
+                parameters.push(instantiatedChild);
+                creationFunctionSource += `${currentEntry.parentVarName}._append(
+                    parameters[${currentParameterIndex}], ${currentEntry.def.allowChildMerges}
+                );\n`;
+                currentParameterIndex += 1;
+            }
+            else {
+                // Put the constructor function and the description of the property into the
+                // parameters array
+                parameters.push(currentEntry.def.constructorFunction);
+                parameters.push(currentEntry.def.entry);
+                // and add the instantiation call to the generated function
+                currentPropertyNumber++;
+                currentPropertyVarName = `property${currentPropertyNumber}`;
+                creationFunctionSource +=
+                    `const ${currentPropertyVarName} =
+                    new parameters[${currentParameterIndex}](parameters[${currentParameterIndex + 1}]);\n`;
+                currentParameterIndex += 2;
+                // Insert / append the property to the parent
+                if (currentEntry.parentVarName !== undefined) {
+                    if (currentEntry.def.optional) {
+                        creationFunctionSource += `${currentEntry.parentVarName}._insert(
+                            ${JSON.stringify(currentEntry.def.entry.id)}, ${currentPropertyVarName}, true
+                        );\n`;
+                    }
+                    else {
+                        creationFunctionSource += `${currentEntry.parentVarName}._append(
+                            ${currentPropertyVarName}, ${currentEntry.def.allowChildMerges}
+                        );\n`;
+                    }
+                }
+                else {
+                    resultVarName = currentPropertyVarName;
+                }
+                // For named properties we have to add a calll to assign a GUID to the function
+                if (currentEntry.setGuid) {
+                    creationFunctionSource += `${currentPropertyVarName}.value = GuidUtils.generateGUID();\n`;
+                }
+                // And if there are any optional children, we add them here (should this be further optimized? I
+                // propbably would not have to be done on every instantiation, those could be stored in the prototype)
+                if (currentEntry.def.optionalChildren) {
+                    for (let [id, typeid] of Object.entries(currentEntry.def.optionalChildren)) {
+                        creationFunctionSource += `${currentPropertyVarName}._addOptionalChild(
+                            ${JSON.stringify(id)},
+                            ${JSON.stringify(typeid)}
+                        );\n`;
+                    }
+                }
+                // Recursively process all children of this entry
+                if (currentEntry.def.children) {
+                    // Create an entry on the stack, which is later needed,
+                    // to signal that all child properties have been added
+                    const parentStackEntry = {
+                        signalChildrenFinished: true,
+                        initialValue: currentEntry.def.initialValue,
+                        propertyVarname: currentPropertyVarName,
+                        parentStackEntry: currentEntry.parentStackEntry,
+                        id: currentEntry.id,
+                    };
+                    creationStack.push(parentStackEntry);
+                    // Recursively add all children to the stack
+                    for (let [id, child] of currentEntry.def.children) {
+                        creationStack.push({
+                            parentVarName: currentPropertyVarName,
+                            id: id,
+                            def: child,
+                            signalParent: false,
+                            setGuid: currentEntry.def.assignGuid && id === 'guid',
+                            parentStackEntry
+                        });
+                    }
+                }
+                else {
+                    // This is a leaf property, so if there is a default value
+                    // we directly assign it here
+                    if (initialValue !== undefined) {
+                        if (!_.isObject(initialValue.value)) {
+                            // We have a primitive property and thus direclty invoke the setValue function
+                            creationFunctionSource +=
+                                `${currentPropertyVarName}.setValue(${JSON.stringify(initialValue.value)});\n`;
+                        }
+                        else {
+                            // For non primitive properties, we currently use the member on the property factory,
+                            // probably we could further optimize this to directly call the correct function on the
+                            // property
+                            creationFunctionSource +=
+                                `this._setInitialValue(${currentPropertyVarName},
+                                                        ${JSON.stringify(initialValue)},
+                                                        false);\n`;
+                        }
+                    }
+                    // If this property is constant, we assign the constant flag
+                    if (currentEntry.def.constant) {
+                        creationFunctionSource += `${currentPropertyVarName}._setAsConstant();\n`;
+                    }
+                    // If necessary, signal that the propert has been fully initialized (is this ever needed?)
+                    if (currentEntry.def.signal) {
+                        creationFunctionSource += `${currentPropertyVarName}._signalAllStaticMembersHaveBeenAdded(
+                            ${JSON.stringify(in_scope)}
+                        );\n`;
+                    }
+                }
+            }
+        }
+        // Add the return statement at the end of the function
+        creationFunctionSource += ` return ${resultVarName};`;
+        // Finally, create the actual JS function with the source we compiled above
+        let creationFunction = new Function('parameters', ' GuidUtils', creationFunctionSource).bind(this, parameters, GuidUtils);
+        // Add the created function to the cache
+        let scopesFunction = this._cachedCreationFunctions.get(in_typeid);
+        if (!scopesFunction) {
+            scopesFunction = new Map();
+            this._cachedCreationFunctions.set(in_typeid, scopesFunction);
+        }
+        let contextsFunction = scopesFunction.get(in_scope);
+        if (!contextsFunction) {
+            contextsFunction = new Map();
+            scopesFunction.set(in_scope, contextsFunction);
+        }
+        contextsFunction.set(in_context, creationFunction);
+        return creationFunction;
+    }
     /**
      * Sets a value to a property
      * The value can be passed through a default, initial or constant.
@@ -848,8 +1187,10 @@ class PropertyFactory {
      * @param {boolean} typed - Whether the value has a different type than the property (polymorphic).
      * @param {string} typeid - THe typeid of the property.
      */
-    _setInitialValue(property, valueParsed) {
-        property._unsetAsConstant();
+    _setInitialValue(property, valueParsed, unsetConstant) {
+        if (unsetConstant) {
+            property._unsetAsConstant();
+        }
         if (property instanceof ValueProperty || property instanceof StringProperty) {
             property.setValue(valueParsed.value);
         }
@@ -876,14 +1217,11 @@ class PropertyFactory {
      *                               Accepted values are "single" (default), "array", "map" and "set".
      * @param {object=} in_initialProperties A set of initial values for the PropertySet being created
      * @param {object=} in_options Additional options
-     * @param {property-properties.Workspace} [in_options.workspace] A checked out workspace to check against. If supplied,
-     *  the function will check against the schemas that have been registered within the workspace
-     * @throws if the property does not have a unique id.
-     * @throws if the property has a typeid that is not registered.
+     *
      * @return {property-properties.BaseProperty|undefined} the property instance
      */
     create(in_typeid, in_context, in_initialProperties) {
-        return this._createProperty(in_typeid, in_context, in_initialProperties, null, true);
+        return this._createProperty(in_typeid, in_context, in_initialProperties, null);
     }
     ;
     /**
@@ -931,13 +1269,11 @@ class PropertyFactory {
     }
     ;
     /**
-     * Creates a property object that serves as parent for the template with the given typeid, when none has yet
-     * been created,
+     * Creates a property definition for a non-collection property with the entry and constructor function assigned
+     * Children will be added later by parseTemplate.
      *
      * @param {string}                               in_typeid - The type unique identifier
      * @param {string}                               in_id     - The id of the property to create
-     * @param {property-properties.BaseProperty} in_parent - The parent property object. If
-     *                                                           it exists it will be returned
      * @param {property-properties.PropertyTemplate|object|property-properties.BaseProperty} in_templateOrConstructor -
      *        the Template/Property for this in_typeid
      * @param {string|undefined} in_scope - The scope in which the property typeid is defined
@@ -945,11 +1281,7 @@ class PropertyFactory {
      * @return {property-properties.BaseProperty} The property that serves as parent for the properties in the template
      * @private
      */
-    _ensurePropertyParentExists(in_typeid, in_id, in_parent, in_templateOrConstructor, in_scope) {
-        // If we already have a parent, we just return it
-        if (in_parent) {
-            return in_parent;
-        }
+    _createNonCollectionPropertyDef(in_typeid, in_id, in_templateOrConstructor, in_scope, propertyDef) {
         let ConstructorFunction;
         const params = {
             typeid: in_typeid,
@@ -967,15 +1299,22 @@ class PropertyFactory {
                 break;
             case 'NodeProperty':
                 ConstructorFunction = NodeProperty;
+                params.typeid = params.typeid || 'NodeProperty';
                 break;
             case 'NamedProperty':
                 ConstructorFunction = NamedProperty;
+                params.typeid = params.typeid || 'NamedProperty';
                 break;
             default:
                 ConstructorFunction = ContainerProperty;
+                params.typeid = params.typeid || 'ContainerProperty';
         }
         ConstructorFunction = this._getConstructorFunctionForTypeidAndID('single', in_typeid, ConstructorFunction, in_id, in_scope);
-        return new ConstructorFunction(params);
+        propertyDef.constructorFunction = ConstructorFunction;
+        propertyDef.signal = true;
+        propertyDef.entry = params;
+        propertyDef.context = 'single';
+        propertyDef.typeid = in_typeid;
     }
     ;
     /**
@@ -1030,14 +1369,12 @@ class PropertyFactory {
      * @param {string=}                     [in_propertiesEntry.context]    - Context in which the property is created
      * @param {Object=}                     [in_propertiesEntry.properties] - Context in which the property is created
      * @param {number}                      [in_propertiesEntry.length]     - The length of an array property
-     * @param {property-properties.BaseProperty}  in_parent                      - The parent property which will be used as
-     *                                                                        the root to construct the property template
      * @param {string} in_scope - The scope in which the property typeid is defined
      * @param {string} context - The context of the property
      *
      * @return {string} The typeid.
      */
-    _computeTypeid(in_propertiesEntry, in_parent, in_scope, context) {
+    _computeTypeid(in_propertiesEntry, in_scope, context) {
         var typeid = in_propertiesEntry.typeid;
         if (context === 'single') {
             var valueParsed = this._parseTypedValue(in_propertiesEntry, in_scope, context);
@@ -1057,7 +1394,7 @@ class PropertyFactory {
     }
     ;
     /**
-     * Create an instance of the given property from an entry in the properties list.
+     * Creates a propertyDef for the given properties entry
      *
      * @param {Object}                       in_propertiesEntry             - Describes the property object to create
      * @param {string=}                     [in_propertiesEntry.id]         - The name of the property
@@ -1065,19 +1402,15 @@ class PropertyFactory {
      * @param {string=}                     [in_propertiesEntry.context]    - Context in which the property is created
      * @param {Object=}                     [in_propertiesEntry.properties] - Context in which the property is created
      * @param {number}                      [in_propertiesEntry.length]     - The length of an array property
-     * @param {property-properties.BaseProperty}  in_parent                      - The parent property which will be used as
-     *                                                                        the root to construct the property template
-     * @param {string} [in_scope] - The scope in which the property typeid is defined
-     * @param {boolean} [in_evaluateConstants] - If constants need to be traversed and created
-     *
-     * @return {property-properties.BaseProperty|undefined} the property instance
+     * @param {string}                       in_scope                       - The scope in which the property
+     *                                                                        typeid is defined
+     * @param {Object}                       out_propertyDef                - The created property definition
      */
-    _createFromPropertyDeclaration(in_propertiesEntry, in_parent, in_scope, in_evaluateConstants) {
+    _createDefFromPropertyDeclaration(in_propertiesEntry, in_scope, out_propertyDef) {
         var context = in_propertiesEntry.context !== undefined ? in_propertiesEntry.context : 'single';
-        var typeid = this._computeTypeid(in_propertiesEntry, in_parent, in_scope, context);
+        var typeid = this._computeTypeid(in_propertiesEntry, in_scope, context);
         var referenceTarget = typeid === 'Reference' ?
             TypeIdHelper.extractReferenceTargetTypeIdFromReference(in_propertiesEntry.typeid) : undefined;
-        var parent = undefined;
         if (typeid) {
             if (this._isRegisteredTypeid(typeid, in_scope) &&
                 (!referenceTarget || this._hasCorrespondingRegisteredTypeid(referenceTarget, in_scope))) {
@@ -1088,6 +1421,11 @@ class PropertyFactory {
                     if (TypeIdHelper.isReferenceTypeId(typeid) || in_propertiesEntry.id !== undefined) {
                         templateOrConstructor = this._getConstructorFunctionForTypeidAndID(in_propertiesEntry.context, in_propertiesEntry.typeid, templateOrConstructor, in_propertiesEntry.id, in_scope);
                     }
+                    out_propertyDef.constructorFunction = templateOrConstructor;
+                    out_propertyDef.signal = false;
+                    out_propertyDef.entry = in_propertiesEntry;
+                    out_propertyDef.context = in_propertiesEntry.context;
+                    out_propertyDef.typeid = in_propertiesEntry.typeid;
                     // If this is a primitive type, we create it via the registered constructor
                     var result = new templateOrConstructor(in_propertiesEntry); // eslint-disable-line new-cap
                     return result;
@@ -1098,23 +1436,24 @@ class PropertyFactory {
                     if (context === 'single') {
                         // If we have a template in a single context, we create it directly here
                         // Create the base object
-                        parent = this._ensurePropertyParentExists(typeid, in_propertiesEntry.id, in_parent, templateOrConstructor, in_scope);
-                        this._parseTemplate(templateOrConstructor, parent, in_scope, !!(templateOrConstructor.inherits), in_evaluateConstants);
+                        this._createNonCollectionPropertyDef(typeid, in_propertiesEntry.id, templateOrConstructor, in_scope, out_propertyDef);
+                        this._parseTemplate(templateOrConstructor, in_scope, !!(templateOrConstructor.inherits), out_propertyDef);
                     }
                     else {
                         // If we have other contexts, we have to create the corresponding property object for that context
                         // check if a specialized collection is needed
                         var isEnum = this.inheritsFrom(typeid, 'Enum', { scope: in_scope });
-                        var result;
+                        var constructorFunction;
                         switch (context) {
                             case 'array':
                                 if (isEnum) {
                                     var enumPropertyEntry = deepCopy(in_propertiesEntry);
                                     enumPropertyEntry._enumDictionary = templateOrConstructor._enumDictionary;
-                                    result = new EnumArrayProperty(enumPropertyEntry);
+                                    in_propertiesEntry = enumPropertyEntry;
+                                    constructorFunction = EnumArrayProperty;
                                 }
                                 else {
-                                    result = new ArrayProperty(in_propertiesEntry, in_scope);
+                                    constructorFunction = ArrayProperty;
                                 }
                                 break;
                             case 'set':
@@ -1123,15 +1462,19 @@ class PropertyFactory {
                                 if (!this.inheritsFrom(typeid, 'NamedProperty', { scope: in_scope })) {
                                     throw new Error(MSG.SET_ONLY_NAMED_PROPS + typeid);
                                 }
-                                result = new SetProperty(in_propertiesEntry, in_scope);
+                                constructorFunction = SetProperty;
                                 break;
                             case 'map':
-                                result = new MapProperty(in_propertiesEntry, in_scope);
+                                constructorFunction = MapProperty;
                                 break;
                             default:
                                 throw new Error(MSG.UNKNOWN_CONTEXT_SPECIFIED + context);
                         }
-                        return result;
+                        out_propertyDef.constructorFunction = constructorFunction;
+                        out_propertyDef.signal = false;
+                        out_propertyDef.entry = in_propertiesEntry;
+                        out_propertyDef.typeid = typeid;
+                        out_propertyDef.context = context;
                     }
                 }
             }
@@ -1147,18 +1490,20 @@ class PropertyFactory {
             if (!in_propertiesEntry.properties) {
                 in_propertiesEntry.properties = [];
             }
-            if (!parent) {
-                // If this is a declaration which contains a properties list, we have to create a new base property for it
-                parent = new ContainerProperty(in_propertiesEntry);
-            }
+            // If this is a declaration which contains a properties list, we have to create a new container property for it
+            let copiedPropertyEntry = Object.assign({ typeid: 'ContainerProperty' }, in_propertiesEntry);
+            out_propertyDef.constructorFunction = ContainerProperty;
+            out_propertyDef.entry = copiedPropertyEntry;
+            out_propertyDef.signal = false;
+            out_propertyDef.typeid = copiedPropertyEntry.typeid;
+            out_propertyDef.context = 'single';
             // And then parse the entry like a template
-            this._parseTemplate(in_propertiesEntry, parent, in_scope, false, in_evaluateConstants);
+            this._parseTemplate(in_propertiesEntry, in_scope, false, out_propertyDef);
         }
         // If this property inherits from NamedProperty we assign a random GUID
         if (typeid && this.inheritsFrom(typeid, 'NamedProperty', { scope: in_scope })) {
-            parent.get('guid', { referenceResolutionMode: BaseProperty.REFERENCE_RESOLUTION.NEVER }).value = GuidUtils.generateGUID();
+            out_propertyDef.assignGuid = true;
         }
-        return parent;
     }
     ;
     /**
@@ -1216,17 +1561,16 @@ class PropertyFactory {
     }
     ;
     /**
-     * Parse a given property template appending its property and constant objects to the given property parent object
+     * Parse a given property template appending its property and constant objects to the given propertyDef
      *
      * @param {property-properties.PropertyTemplate} in_template - template for the property
-     * @param {property-properties.BaseProperty}     in_parent   - the parent
      * @param {string} in_scope - The scope in which in_template is defined in
      * @param {boolean} in_allowChildMerges - Whether merging of children (nested properties) is allowed.
      *                                        This is used for extending inherited properties.
-     * @param {boolean} [in_evaluateConstants] - If constants need to be traversed and created
+     * @param {Object} out_propertyDef - The created property definition
      * @private
      */
-    _parseTemplate(in_template, in_parent, in_scope, in_allowChildMerges, in_evaluateConstants) {
+    _parseTemplate(in_template, in_scope, in_allowChildMerges, propertyDef) {
         // Check if there are nested property arrays
         if (!(in_template.inherits && in_template.inherits.indexOf('Enum') !== -1)) {
             if (in_template.properties) {
@@ -1238,35 +1582,45 @@ class PropertyFactory {
                     const optional = properties[i].optional || false;
                     const valueParsed = this._parseTypedValue(properties[i], in_scope, context);
                     if (optional) {
-                        in_parent._addOptionalChild(id, typeid);
+                        propertyDef.optionalChildren = propertyDef.optionalChildren || {};
+                        propertyDef.entry.optionalChildren = true;
+                        propertyDef.optionalChildren[id] = typeid;
                     }
                     if (valueParsed.value) {
-                        const property = this._createFromPropertyDeclaration(properties[i], undefined, in_scope, false);
-                        this._setInitialValue(property, valueParsed);
-                        if (optional) {
-                            in_parent._insert(property.getId(), property, true);
-                        }
-                        else {
-                            in_parent._append(property, in_allowChildMerges);
-                        }
+                        const newChildEntry = {
+                            initialValue: valueParsed,
+                            optional,
+                            allowChildMerges: in_allowChildMerges
+                        };
+                        propertyDef.children = propertyDef.children || [];
+                        propertyDef.children.unshift([properties[i].id, newChildEntry]);
+                        this._createDefFromPropertyDeclaration(properties[i], in_scope, newChildEntry);
                     }
                     else if (!optional) {
-                        const property = this._createFromPropertyDeclaration(properties[i], undefined, in_scope, false);
-                        in_parent._append(property, in_allowChildMerges);
+                        const newChildEntry = {
+                            initialValue: undefined
+                        };
+                        propertyDef.children = propertyDef.children || [];
+                        propertyDef.children.unshift([properties[i].id, newChildEntry]);
+                        this._createDefFromPropertyDeclaration(properties[i], in_scope, newChildEntry);
                     }
                 }
             }
-            if (in_evaluateConstants && in_template.constants) {
+            if (in_template.constants) {
                 const constants = in_template.constants;
                 for (let i = 0; i < constants.length; i++) {
                     const context = constants[i].context || 'single';
                     const valueParsed = this._parseTypedValue(constants[i], in_scope, context);
-                    const constant = this._createFromPropertyDeclaration(constants[i], undefined, in_scope, true);
+                    const newChildEntry = {
+                        initialValue: undefined,
+                        constant: true
+                    };
+                    propertyDef.children = propertyDef.children || [];
+                    propertyDef.children.unshift([constants[i].id, newChildEntry]);
+                    this._createDefFromPropertyDeclaration(constants[i], in_scope, newChildEntry);
                     if (valueParsed.value) {
-                        this._setInitialValue(constant, valueParsed);
+                        newChildEntry.initialValue = valueParsed;
                     }
-                    constant._setAsConstant();
-                    in_parent._append(constant, false);
                 }
             }
         }
@@ -1433,6 +1787,8 @@ class PropertyFactory {
                 delete this._typedPropertyConstructorCache[registeredConstructors[i]];
             }
         }
+        // Remove from typeid creation cache
+        this._cachedCreationFunctions.delete(typeid);
         // And repeat the registration
         registerLocal.call(this, in_template);
     }