@lowdefy/build 4.0.0-alpha.14 → 4.0.0-alpha.17

package/dist/build/buildRefs/buildRefs.js

@@ -14,13 +14,19 @@
   limitations under the License.
 */ import recursiveBuild from './recursiveBuild.js';
 import makeRefDefinition from './makeRefDefinition.js';
-// TODO: build operators aren't evaluated in lowdefy.yaml file. Move recursive call up a layer or something.
+import evaluateBuildOperators from './evaluateBuildOperators.js';
 async function buildRefs({ context  }) {
-    const components = await recursiveBuild({
+    const refDef = makeRefDefinition('lowdefy.yaml');
+    let components = await recursiveBuild({
         context,
-        refDef: makeRefDefinition('lowdefy.yaml'),
+        refDef,
         count: 0
     });
-    return components || {};
+    components = await evaluateBuildOperators({
+        context,
+        input: components,
+        refDef
+    });
+    return components ?? {};
 }
 export default buildRefs;

package/dist/build/buildRefs/recursiveBuild.js

@@ -33,7 +33,6 @@ async function recursiveParseFile({ context , refDef , count , referencedFrom  }
     // the deeper nodes, so we can use those parsed files in references higher in the tree.
     // To do this, since foundRefs is an array of ref definitions that are in order of the
     // deepest nodes first we for loop over over foundRefs one by one, awaiting each result.
-    // eslint-disable-next-line no-restricted-syntax
     for (const newRefDef of foundRefs.values()){
         // Parse vars and path before passing down to parse new file
         const parsedRefDef = populateRefs({
@@ -47,17 +46,18 @@ async function recursiveParseFile({ context , refDef , count , referencedFrom  }
             count: count + 1,
             referencedFrom: refDef.path
         });
-        const evaluatedOperators = await evaluateBuildOperators({
+        const transformedFile = await runTransformer({
             context,
             input: parsedFile,
             refDef: parsedRefDef
         });
-        const transformedFile = await runTransformer({
+        // Evaluated in recursive loop for better error messages
+        const evaluatedOperators = await evaluateBuildOperators({
             context,
-            input: evaluatedOperators,
+            input: transformedFile,
             refDef: parsedRefDef
         });
-        parsedFiles[newRefDef.id] = transformedFile;
+        parsedFiles[newRefDef.id] = evaluatedOperators;
     }
     return populateRefs({
         toPopulate: fileContentBuiltRefs,