@lowdefy/build 4.0.0-alpha.6 → 4.0.0-alpha.9

package/dist/build/addDefaultPages/404.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/addDefaultPages/addDefaultPages.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,8 +26,12 @@ async function addDefaultPages({ components  }) {
     if (!type.isArray(components.pages)) {
         throw new Error('lowdefy.pages is not an array.');
     }
-    const pageIds = components.pages.map((page)=>page.id
-    );
+    const pageIds = components.pages.map((page, index)=>{
+        if (!type.isObject(page)) {
+            throw new Error(`pages[${index}] is not an object. Received ${JSON.stringify(page)}`);
+        }
+        return page.id;
+    });
     // deep copy to avoid mutating defaultConfig
     const filteredDefaultPages = defaultPages.filter((defaultPage)=>!pageIds.includes(defaultPage.id)
     );

package/dist/build/buildAuth/buildAuth.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/buildAuth/getPageRoles.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/buildAuth/getProtectedPages.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/buildConnections.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/buildIcons.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -50,8 +50,8 @@ function getConfigIcons({ components , icons , regex  }) {
     );
 }
 function getBlockDefaultIcons({ components , context , icons , regex  }) {
-    Object.entries(components.types.blocks).forEach(([blockName, block])=>{
-        context.types.icons[block.package][blockName].forEach((icon)=>{
+    Object.keys(components.types.blocks).forEach((blockName)=>{
+        (context.typesMap.icons[blockName] || []).forEach((icon)=>{
             [
                 ...JSON.stringify(icon).matchAll(regex)
             ].map((match)=>icons.add(match[1])

package/dist/build/buildMenu.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/buildBlock.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,16 +16,20 @@
 import buildRequests from './buildRequests.js';
 import buildSubBlocks from './buildSubBlocks.js';
 import countBlockOperators from './countBlockOperators.js';
+import countBlockTypes from './countBlockTypes.js';
 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) {
     validateBlock(block, pageContext);
-    countBlockOperators(block, pageContext);
     setBlockId(block, pageContext);
+    countBlockOperators(block, pageContext);
     buildEvents(block, pageContext);
     buildRequests(block, pageContext);
     moveSubBlocksToArea(block, pageContext);
+    moveSkeletonBlocksToArea(block, pageContext);
+    countBlockTypes(block, pageContext);
     await buildSubBlocks(block, pageContext);
 }
 export default buildBlock;

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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -44,7 +44,10 @@ 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)}`);
             }
-            if (!type.isArray(block.events[key].catch) && !type.isNone(block.events[key].catch)) {
+            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)}`);
             }
             const checkDuplicateActionId = createCheckDuplicateId({

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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/countBlockOperators.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,7 +15,7 @@
 */ import countOperators from '../../../utils/countOperators.js';
 function countBlockOperators(block, { typeCounters  }) {
     // eslint-disable-next-line no-unused-vars
-    const { requests , blocks , areas , ...webBlock } = block;
+    const { requests , areas , blocks , ...webBlock } = block;
     countOperators(webBlock, {
         counter: typeCounters.operators.client
     });

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

@@ -0,0 +1,18 @@
+/*
+  Copyright 2020-2022 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.
+*/ function countBlockTypes(block, { typeCounters  }) {
+    typeCounters.blocks.increment(block.type);
+}
+export default countBlockTypes;

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

@@ -0,0 +1,35 @@
+/*
+  Copyright 2020-2022 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 { 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)}`);
+        }
+        set(block1, 'areas.content.blocks', block1.blocks);
+        delete block1.blocks;
+    }
+    Object.keys(block1.areas || {}).forEach((area)=>{
+        block1.areas[area].blocks.forEach((block, i)=>{
+            recMoveSkeletonBlocksToArea(block, `${blockId}.areas.${area}.${i}.blocks`, pageId);
+        });
+    });
+}
+function moveSkeletonBlocksToArea(block, pageContext) {
+    if (type.isObject(block.skeleton)) {
+        recMoveSkeletonBlocksToArea(block.skeleton, `${block.blockId}.skeleton`, pageContext.pageId);
+    }
+}
+export default moveSkeletonBlocksToArea;

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

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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-2021 Lowdefy, Inc
+  Copyright 2020-2022 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-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
-function validateBlock(block, { pageId , typeCounters  }) {
+function validateBlock(block, { pageId  }) {
     if (!type.isObject(block)) {
         throw new Error(`Expected block to be an object on page "${pageId}". Received ${JSON.stringify(block)}.`);
     }
@@ -29,7 +29,6 @@ function validateBlock(block, { pageId , typeCounters  }) {
     if (!type.isString(block.type)) {
         throw new Error(`Block type is not a string at "${block.id}" on page "${pageId}". Received ${JSON.stringify(block.type)}.`);
     }
-    typeCounters.blocks.increment(block.type);
     if (!type.isNone(block.requests)) {
         if (!type.isArray(block.requests)) {
             throw new Error(`Requests is not an array at "${block.id}" on page "${pageId}". Received ${JSON.stringify(block.requests)}`);

package/dist/build/buildPages/buildPage.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/buildPages.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/buildRefs.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,6 +14,7 @@
   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.
 async function buildRefs({ context  }) {
     const components = await recursiveBuild({
         context,

package/dist/build/buildRefs/evaluateBuildOperators.js

@@ -0,0 +1,35 @@
+/*
+  Copyright 2020-2022 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 { NodeParser } from '@lowdefy/operators';
+import operators from '@lowdefy/operators-js/operators/build';
+async function evaluateBuildOperators({ context , input , refDef  }) {
+    const operatorsParser = new NodeParser({
+        env: process.env,
+        operators
+    });
+    const { output , errors  } = operatorsParser.parse({
+        input,
+        location: refDef.path,
+        operatorPrefix: '_build.'
+    });
+    if (errors.length > 0) {
+        await context.logger.warn('Build operator errors.');
+        const promises = errors.map((error)=>context.logger.warn(error.message)
+        );
+        await promises;
+    }
+    return output;
+}
+export default evaluateBuildOperators;

package/dist/build/buildRefs/getConfigFile.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/getRefContent.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import parseRefContent from './parseRefContent.js';
 import runRefResolver from './runRefResolver.js';
 async function getRefContent({ context , refDef , referencedFrom  }) {
     let content;
-    if (refDef.path === 'lowdefy.yaml') {
+    if (refDef.path === 'lowdefy.yaml' || refDef.path === 'lowdefy.yml') {
         content = await getConfigFile({
             context,
             refDef,

package/dist/build/buildRefs/getRefPath.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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-2021 Lowdefy, Inc
+  Copyright 2020-2022 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-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
-import { readFile } from '@lowdefy/node-utils';
 async function getUserJavascriptFunction({ context , filePath  }) {
-    const jsFile = await readFile(path.resolve(context.directories.config, filePath));
-    return eval(jsFile);
+    try {
+        return (await import(path.resolve(context.directories.config, filePath))).default;
+    } catch (error) {
+        context.logger.error(`Error importing ${filePath}.`);
+        throw Error(error);
+    }
 }
 export default getUserJavascriptFunction;

package/dist/build/buildRefs/makeRefDefinition.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/parseNunjucks.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,7 +15,7 @@
 */ import { type } from '@lowdefy/helpers';
 import { getFileExtension, getFileSubExtension } from '@lowdefy/node-utils';
 import JSON5 from 'json5';
-import YAML from 'js-yaml';
+import YAML from 'yaml';
 import parseNunjucks from './parseNunjucks.js';
 function parseRefContent({ content , refDef  }) {
     const { path , vars  } = refDef;
@@ -26,7 +26,7 @@ function parseRefContent({ content , refDef  }) {
             ext = getFileSubExtension(path);
         }
         if (ext === 'yaml' || ext === 'yml') {
-            return YAML.load(content);
+            return YAML.parse(content);
         }
         if (ext === 'json') {
             return JSON5.parse(content);

package/dist/build/buildRefs/populateRefs.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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/recursiveBuild.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,8 @@
   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 getRefContent from './getRefContent.js';
+*/ import evaluateBuildOperators from './evaluateBuildOperators.js';
+import getRefContent from './getRefContent.js';
 import getRefsFromFile from './getRefsFromFile.js';
 import populateRefs from './populateRefs.js';
 import runTransformer from './runTransformer.js';
@@ -46,9 +47,14 @@ async function recursiveParseFile({ context , refDef , count , referencedFrom  }
             count: count + 1,
             referencedFrom: refDef.path
         });
+        const evaluatedOperators = await evaluateBuildOperators({
+            context,
+            input: parsedFile,
+            refDef: parsedRefDef
+        });
         const transformedFile = await runTransformer({
             context,
-            parsedFile,
+            input: evaluatedOperators,
             refDef: parsedRefDef
         });
         parsedFiles[newRefDef.id] = transformedFile;

package/dist/build/buildRefs/runRefResolver.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,14 +13,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import getUserJavascriptFunction from './getUserJavascriptFunction.js';
-async function runTransformer({ context , parsedFile , refDef  }) {
+async function runTransformer({ context , input , refDef  }) {
     if (refDef.transformer) {
         const transformerFn = await getUserJavascriptFunction({
             context,
             filePath: refDef.transformer
         });
-        return transformerFn(parsedFile, refDef.vars);
+        try {
+            return transformerFn(input, refDef.vars);
+        } catch (error) {
+            throw Error(`Error calling transformer "${refDef.transformer}" from "${refDef.path}": ${error.message}`);
+        }
     }
-    return parsedFile;
+    return input;
 }
 export default runTransformer;

package/dist/build/buildStyles.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,9 +16,9 @@
     components.styles = [];
     const styles = new Set();
     Object.entries(components.types.blocks).forEach(([blockName, block])=>{
-        styles.add(...(context.types.styles[block.package].default || []).map((style)=>`${block.package}/${style}`
+        styles.add(...(context.typesMap.styles.packages[block.package] || []).map((style)=>`${block.package}/${style}`
         ));
-        styles.add(...(context.types.styles[block.package][blockName] || []).map((style)=>`${block.package}/${style}`
+        styles.add(...(context.typesMap.styles.blocks[blockName] || []).map((style)=>`${block.package}/${style}`
         ));
     });
     components.styles = [

package/dist/build/buildTypes.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 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,13 +12,20 @@
   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.
-*/ function buildTypeClass({ counter , definitions , store , typeClass  }) {
+*/ import basicTypes from '@lowdefy/blocks-basic/types';
+import loaderTypes from '@lowdefy/blocks-loaders/types';
+function buildTypeClass(context, { counter , definitions , store , typeClass , warnIfMissing =false  }) {
     const counts = counter.getCounts();
     Object.keys(counts).forEach((typeName)=>{
         if (!definitions[typeName]) {
+            if (warnIfMissing) {
+                context.logger.warn(`${typeClass} type "${typeName}" was used but is not defined.`);
+                return;
+            }
             throw new Error(`${typeClass} type "${typeName}" was used but is not defined.`);
         }
         store[typeName] = {
+            originalTypeName: definitions[typeName].originalTypeName,
             package: definitions[typeName].package,
             version: definitions[typeName].version,
             count: counts[typeName]
@@ -27,6 +34,16 @@
 }
 function buildTypes({ components , context  }) {
     const { typeCounters  } = context;
+    // Add Mandatory Types
+    // Add operators used by form validation
+    typeCounters.operators.client.increment('_not');
+    typeCounters.operators.client.increment('_type');
+    // Add loaders and basic
+    basicTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block)
+    );
+    loaderTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block)
+    );
+    typeCounters.blocks.increment('Message'); // Used for DisplayMessage in @lowdefy/client
     components.types = {
         actions: {},
         blocks: {},
@@ -37,41 +54,43 @@ function buildTypes({ components , context  }) {
             server: {}
         }
     };
-    // buildTypeClass({
-    //   counter: typeCounters.actions,
-    //   definitions: context.types.actions,
-    //   store: components.types.actions,
-    //   typeClass: 'Action',
-    // });
-    buildTypeClass({
+    buildTypeClass(context, {
+        counter: typeCounters.actions,
+        definitions: context.typesMap.actions,
+        store: components.types.actions,
+        typeClass: 'Action'
+    });
+    buildTypeClass(context, {
         counter: typeCounters.blocks,
-        definitions: context.types.blocks,
+        definitions: context.typesMap.blocks,
         store: components.types.blocks,
         typeClass: 'Block'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.connections,
-        definitions: context.types.connections,
+        definitions: context.typesMap.connections,
         store: components.types.connections,
         typeClass: 'Connection'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.requests,
-        definitions: context.types.requests,
+        definitions: context.typesMap.requests,
         store: components.types.requests,
         typeClass: 'Request'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.operators.client,
-        definitions: context.types.operators.client,
+        definitions: context.typesMap.operators.client,
         store: components.types.operators.client,
-        typeClass: 'Operator'
+        typeClass: 'Operator',
+        warnIfMissing: true
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.operators.server,
-        definitions: context.types.operators.server,
+        definitions: context.typesMap.operators.server,
         store: components.types.operators.server,
-        typeClass: 'Operator'
+        typeClass: 'Operator',
+        warnIfMissing: true
     });
 }
 export default buildTypes;