@lowdefy/build 4.0.0-alpha.9 → 4.0.0-rc.1

package/dist/build/buildMenu.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
 import createCheckDuplicateId from '../utils/createCheckDuplicateId.js';
-async function buildDefaultMenu({ components , context  }) {
+function buildDefaultMenu({ components , context  }) {
     context.logger.warn('No menus found. Building default menu.');
     const pages = type.isArray(components.pages) ? components.pages : [];
     const menus = [
@@ -25,10 +25,8 @@ async function buildDefaultMenu({ components , context  }) {
                     type: 'MenuLink',
                     pageId: page.pageId,
                     auth: page.auth
-                })
-            ).filter((page)=>page.pageId !== '404'
-            )
-        }, 
+                })).filter((page)=>page.pageId !== '404')
+        }
     ];
     return menus;
 }
@@ -37,8 +35,7 @@ function loopItems({ parent , menuId , pages , missingPageWarnings , checkDuplic
         parent.links.forEach((menuItem)=>{
             if (menuItem.type === 'MenuLink') {
                 if (type.isString(menuItem.pageId)) {
-                    const page = pages.find((pg)=>pg.pageId === menuItem.pageId
-                    );
+                    const page = pages.find((pg)=>pg.pageId === menuItem.pageId);
                     if (!page) {
                         missingPageWarnings.push({
                             menuItemId: menuItem.id,
@@ -75,14 +72,13 @@ function loopItems({ parent , menuId , pages , missingPageWarnings , checkDuplic
                 checkDuplicateMenuItemId
             });
         });
-        parent.links = parent.links.filter((item)=>item.remove !== true
-        );
+        parent.links = parent.links.filter((item)=>item.remove !== true);
     }
 }
-async function buildMenu({ components , context  }) {
+function buildMenu({ components , context  }) {
     const pages = type.isArray(components.pages) ? components.pages : [];
     if (type.isUndefined(components.menus) || components.menus.length === 0) {
-        components.menus = await buildDefaultMenu({
+        components.menus = buildDefaultMenu({
             components,
             context
         });
@@ -114,9 +110,9 @@ async function buildMenu({ components , context  }) {
             checkDuplicateMenuItemId
         });
     });
-    await Promise.all(missingPageWarnings.map(async (warning)=>{
-        await context.logger.warn(`Page "${warning.pageId}" referenced in menu link "${warning.menuItemId}" not found.`);
-    }));
+    missingPageWarnings.map(async (warning)=>{
+        context.logger.warn(`Page "${warning.pageId}" referenced in menu link "${warning.menuItemId}" not found.`);
+    });
     return components;
 }
 export default buildMenu;

package/dist/build/buildPages/buildBlock/buildBlock.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import moveSubBlocksToArea from './moveSubBlocksToArea.js';
 import moveSkeletonBlocksToArea from './moveSkeletonBlocksToArea.js';
 import setBlockId from './setBlockId.js';
 import validateBlock from './validateBlock.js';
-async function buildBlock(block, pageContext) {
+function buildBlock(block, pageContext) {
     validateBlock(block, pageContext);
     setBlockId(block, pageContext);
     countBlockOperators(block, pageContext);
@@ -30,6 +30,6 @@ async function buildBlock(block, pageContext) {
     moveSubBlocksToArea(block, pageContext);
     moveSkeletonBlocksToArea(block, pageContext);
     countBlockTypes(block, pageContext);
-    await buildSubBlocks(block, pageContext);
+    buildSubBlocks(block, pageContext);
 }
 export default buildBlock;

package/dist/build/buildPages/buildBlock/buildEvents.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -35,6 +35,9 @@ function checkAction(action, { blockId , checkDuplicateActionId , eventId , page
 function buildEvents(block, pageContext) {
     if (block.events) {
         Object.keys(block.events).map((key)=>{
+            if (!type.isArray(block.events[key]) && !type.isObject(block.events[key]) || type.isObject(block.events[key]) && type.isNone(block.events[key].try)) {
+                throw new Error(`Actions must be an array at "${block.blockId}" in event "${key}" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
+            }
             if (type.isArray(block.events[key])) {
                 block.events[key] = {
                     try: block.events[key],
@@ -42,13 +45,13 @@ function buildEvents(block, pageContext) {
                 };
             }
             if (!type.isArray(block.events[key].try)) {
-                throw new Error(`Events must be an array of actions at "${block.blockId}" in event "${key}" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
+                throw new Error(`Try actions must be an array at "${block.blockId}" in event "${key}.try" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
             }
             if (type.isNone(block.events[key].catch)) {
                 block.events[key].catch = [];
             }
             if (!type.isArray(block.events[key].catch)) {
-                throw new Error(`Catch events must be an array of actions at "${block.blockId}" in event "${key}" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].catch)}`);
+                throw new Error(`Catch actions must be an array at "${block.blockId}" in event "${key}.catch" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].catch)}`);
             }
             const checkDuplicateActionId = createCheckDuplicateId({
                 message: 'Duplicate actionId "{{ id }}" on event "{{ eventId }}" on block "{{ blockId }}" on page "{{ pageId }}".'
@@ -59,16 +62,14 @@ function buildEvents(block, pageContext) {
                     typeCounters: pageContext.typeCounters,
                     pageId: pageContext.pageId,
                     checkDuplicateActionId
-                })
-            );
+                }));
             block.events[key].catch.map((action)=>checkAction(action, {
                     eventId: key,
                     blockId: block.blockId,
                     typeCounters: pageContext.typeCounters,
                     pageId: pageContext.pageId,
                     checkDuplicateActionId
-                })
-            );
+                }));
         });
     }
 }

package/dist/build/buildPages/buildBlock/buildRequests.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildPages/buildBlock/buildSubBlocks.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
 import buildBlock from './buildBlock.js';
-async function buildSubBlocks(block, pageContext) {
+function buildSubBlocks(block, pageContext) {
     if (type.isObject(block.areas)) {
-        let promises = [];
         Object.keys(block.areas).forEach((key)=>{
             if (type.isNone(block.areas[key].blocks)) {
                 block.areas[key].blocks = [];
@@ -24,12 +23,8 @@ async function buildSubBlocks(block, pageContext) {
             if (!type.isArray(block.areas[key].blocks)) {
                 throw new Error(`Expected blocks to be an array at ${block.blockId} in area ${key} on page ${pageContext.pageId}. Received ${JSON.stringify(block.areas[key].blocks)}`);
             }
-            const blockPromises = block.areas[key].blocks.map(async (blk)=>{
-                await buildBlock(blk, pageContext);
-            });
-            promises = promises.concat(blockPromises);
+            block.areas[key].blocks.map((blk)=>buildBlock(blk, pageContext));
         });
-        await Promise.all(promises);
     }
 }
 export default buildSubBlocks;

package/dist/build/buildPages/buildBlock/countBlockOperators.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildPages/buildBlock/countBlockTypes.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildPages/buildBlock/moveSkeletonBlocksToArea.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { set, type } from '@lowdefy/helpers';
-function recMoveSkeletonBlocksToArea(block1, blockId, pageId) {
-    if (!type.isNone(block1.blocks)) {
-        if (!type.isArray(block1.blocks)) {
-            throw new Error(`Skeleton blocks at ${blockId} on page ${pageId} is not an array. Received ${JSON.stringify(block1.blocks)}`);
+function recMoveSkeletonBlocksToArea(block, blockId, pageId) {
+    if (!type.isNone(block.blocks)) {
+        if (!type.isArray(block.blocks)) {
+            throw new Error(`Skeleton blocks at ${blockId} on page ${pageId} is not an array. Received ${JSON.stringify(block.blocks)}`);
         }
-        set(block1, 'areas.content.blocks', block1.blocks);
-        delete block1.blocks;
+        set(block, 'areas.content.blocks', block.blocks);
+        delete block.blocks;
     }
-    Object.keys(block1.areas || {}).forEach((area)=>{
-        block1.areas[area].blocks.forEach((block, i)=>{
+    Object.keys(block.areas || {}).forEach((area)=>{
+        block.areas[area].blocks.forEach((block, i)=>{
             recMoveSkeletonBlocksToArea(block, `${blockId}.areas.${area}.${i}.blocks`, pageId);
         });
     });

package/dist/build/buildPages/buildBlock/moveSubBlocksToArea.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildPages/buildBlock/setBlockId.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildPages/buildBlock/validateBlock.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildPages/buildPage.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 import buildBlock from './buildBlock/buildBlock.js';
 import createCheckDuplicateId from '../../utils/createCheckDuplicateId.js';
 import createCounter from '../../utils/createCounter.js';
-async function buildPage({ page , index , context , checkDuplicatePageId  }) {
+function buildPage({ page , index , context , checkDuplicatePageId  }) {
     if (type.isUndefined(page.id)) {
         throw new Error(`Page id missing at page ${index}.`);
     }
@@ -29,7 +29,7 @@ async function buildPage({ page , index , context , checkDuplicatePageId  }) {
     page.pageId = page.id;
     const requests = [];
     const operators = new Set();
-    await buildBlock(page, {
+    buildBlock(page, {
         auth: page.auth,
         blockIdCounter: createCounter(),
         checkDuplicateRequestId: createCheckDuplicateId({

package/dist/build/buildPages/buildPages.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,19 +15,17 @@
 */ import { type } from '@lowdefy/helpers';
 import buildPage from './buildPage.js';
 import createCheckDuplicateId from '../../utils/createCheckDuplicateId.js';
-async function buildPages({ components , context  }) {
+function buildPages({ components , context  }) {
     const pages = type.isArray(components.pages) ? components.pages : [];
     const checkDuplicatePageId = createCheckDuplicateId({
         message: 'Duplicate pageId "{{ id }}".'
     });
-    const pageBuildPromises = pages.map((page, index)=>buildPage({
+    pages.map((page, index)=>buildPage({
             page,
             index,
             context,
             checkDuplicatePageId
-        })
-    );
-    await Promise.all(pageBuildPromises);
+        }));
     return components;
 }
 export default buildPages;

package/dist/build/buildPages/buildTestPage.js

@@ -0,0 +1,46 @@
+/*
+  Copyright 2020-2023 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ // Used in @lowdefy/engine tests
+import buildAuth from '../buildAuth/buildAuth.js';
+import buildPages from './buildPages.js';
+import createContext from '../../createContext.js';
+function buildTestPage({ pageConfig  }) {
+    const context = createContext({
+        customTypesMap: {},
+        directories: {},
+        logger: {
+            debug: ()=>{},
+            log: ()=>{},
+            warn: ()=>{},
+            error: ()=>{}
+        },
+        stage: 'test'
+    });
+    const components = {
+        pages: [
+            pageConfig
+        ]
+    };
+    buildAuth({
+        components,
+        context
+    });
+    buildPages({
+        components,
+        context
+    });
+    return components.pages[0];
+}
+export default buildTestPage;

package/dist/build/buildRefs/buildRefs.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -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/evaluateBuildOperators.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,13 +21,12 @@ async function evaluateBuildOperators({ context , input , refDef  }) {
     });
     const { output , errors  } = operatorsParser.parse({
         input,
-        location: refDef.path,
+        location: refDef.path ?? refDef.resolver,
         operatorPrefix: '_build.'
     });
     if (errors.length > 0) {
         await context.logger.warn('Build operator errors.');
-        const promises = errors.map((error)=>context.logger.warn(error.message)
-        );
+        const promises = errors.map((error)=>context.logger.warn(error.message));
         await promises;
     }
     return output;

package/dist/build/buildRefs/getConfigFile.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ async function getConfigFile({ context , refDef , referencedFrom  }) {
             _ref: refDef.original
         })} in file ${referencedFrom}`);
     }
-    const content = context.readConfigFile(refDef.path);
+    const content = await context.readConfigFile(refDef.path);
     if (content === null) {
         throw new Error(`Tried to reference file "${refDef.path}" from "${referencedFrom}", but file does not exist.`);
     }

package/dist/build/buildRefs/getKey.js

@@ -0,0 +1,24 @@
+/*
+  Copyright 2020-2023 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ import { get } from '@lowdefy/helpers';
+function getKey({ input , refDef  }) {
+    if (refDef.key) {
+        return get(input, refDef.key, {
+            default: null
+        });
+    }
+    return input;
+}
+export default getKey;

package/dist/build/buildRefs/getRefContent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildRefs/getRefPath.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildRefs/getRefsFromFile.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildRefs/getUserJavascriptFunction.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,9 +13,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
+import { pathToFileURL } from 'url';
 async function getUserJavascriptFunction({ context , filePath  }) {
     try {
-        return (await import(path.resolve(context.directories.config, filePath))).default;
+        return (await import(pathToFileURL(path.join(context.directories.config, filePath)))).default;
     } catch (error) {
         context.logger.error(`Error importing ${filePath}.`);
         throw Error(error);

package/dist/build/buildRefs/makeRefDefinition.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ function makeRefDefinition(refDefinition) {
         id: uuid(),
         original: refDefinition,
         path: getRefPath(refDefinition),
+        key: get(refDefinition, 'key'),
         resolver: get(refDefinition, 'resolver'),
         transformer: get(refDefinition, 'transformer'),
         vars: get(refDefinition, 'vars', {

package/dist/build/buildRefs/parseNunjucks.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildRefs/parseRefContent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ import { type } from '@lowdefy/helpers';
+*/ /* eslint-disable no-param-reassign */ import { type } from '@lowdefy/helpers';
 import { getFileExtension, getFileSubExtension } from '@lowdefy/node-utils';
 import JSON5 from 'json5';
 import YAML from 'yaml';
@@ -26,10 +26,10 @@ function parseRefContent({ content , refDef  }) {
             ext = getFileSubExtension(path);
         }
         if (ext === 'yaml' || ext === 'yml') {
-            return YAML.parse(content);
+            content = YAML.parse(content);
         }
         if (ext === 'json') {
-            return JSON5.parse(content);
+            content = JSON5.parse(content);
         }
     }
     return content;

package/dist/build/buildRefs/populateRefs.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -24,12 +24,12 @@ function refReviver(key, value) {
                     default: null
                 })));
             }
-            if (type.isObject(value._var) && type.isString(value._var.name)) {
-                return JSON.parse(JSON.stringify(get(this.vars, value._var.name, {
+            if (type.isObject(value._var) && type.isString(value._var.key)) {
+                return JSON.parse(JSON.stringify(get(this.vars, value._var.key, {
                     default: type.isNone(value._var.default) ? null : value._var.default
                 })));
             }
-            throw new Error(`"_var" operator takes a string or object with name field as arguments. Received "${JSON.stringify(value)}"`);
+            throw new Error(`"_var" operator takes a string or object with "key" field as arguments. Received "${JSON.stringify(value)}"`);
         }
     }
     return value;

package/dist/build/buildRefs/recursiveBuild.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import evaluateBuildOperators from './evaluateBuildOperators.js';
+import getKey from './getKey.js';
 import getRefContent from './getRefContent.js';
 import getRefsFromFile from './getRefsFromFile.js';
 import populateRefs from './populateRefs.js';
@@ -33,7 +34,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 +47,21 @@ 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: transformedFile,
+            refDef: parsedRefDef
+        });
+        parsedFiles[newRefDef.id] = getKey({
             input: evaluatedOperators,
             refDef: parsedRefDef
         });
-        parsedFiles[newRefDef.id] = transformedFile;
     }
     return populateRefs({
         toPopulate: fileContentBuiltRefs,

package/dist/build/buildRefs/runRefResolver.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/build/buildRefs/runTransformer.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.