fix: process ref properties after mods are applied

wmfs · May 13, 2022 · 4ebe21a · 4ebe21a
1 parent c3bb393
commit 4ebe21a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/lib/boot/index.js b/lib/boot/index.js
@@ -4,6 +4,7 @@ const booter = require('./boot')
 const refResolver = require('./refs')
 const loadMods = require('./mods/load')
 const applyMods = require('./mods/apply')
+const processRefProperties = require('./load/tymly-loader/process-ref-properties')
 
 const startupMessages = require('./../startup-messages')
 
@@ -38,6 +39,12 @@ async function bootTymly (options, messages) {
 
   applyMods(options, loadedMods, loadedComponents)
 
+  processRefProperties(
+    loadedComponents.blueprintComponents,
+    loadedComponents.blueprintRefProperties,
+    messages
+  )
+
   preBootTymlyRefResolution(
     loadedComponents,
     messages

diff --git a/lib/boot/load/index.js b/lib/boot/load/index.js
@@ -17,7 +17,8 @@ function load (options) {
     pluginComponents: plugins.components,
     blueprintPaths: blueprints.paths,
     blueprintComponents: blueprints.components,
-    blueprintRefs: blueprints.tymlyRefs
+    blueprintRefs: blueprints.tymlyRefs,
+    blueprintRefProperties: blueprints.refProperties
   }
 } // load
 
@@ -49,7 +50,7 @@ function loadBlueprints (plugins, options) {
     options.blueprintPaths
   )
 
-  const { components, tymlyRefs } = tymlyLoader(
+  const { components, tymlyRefs, refProperties } = tymlyLoader(
     {
       sourcePaths: paths,
       messages: options.messages,
@@ -66,7 +67,8 @@ function loadBlueprints (plugins, options) {
   return {
     paths,
     components,
-    tymlyRefs
+    tymlyRefs,
+    refProperties
   }
 } // loadBlueprints
 

diff --git a/lib/boot/load/tymly-loader/index.js b/lib/boot/load/tymly-loader/index.js
@@ -31,16 +31,9 @@ module.exports = function tymlyLoader (options) {
     )
   })
 
-  if (options.refProperties) {
-    processRefProperties(
-      components,
-      options.refProperties,
-      options.messages
-    )
-  }
-
   return {
     components,
-    tymlyRefs
+    tymlyRefs,
+    refProperties: options.refProperties
   }
 } // tymlyLoader