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

package/dist/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */ /*
-  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,10 +12,12 @@
   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 { readFile } from '@lowdefy/node-utils';
+*/ import { mergeObjects } from '@lowdefy/helpers';
+import { readFile } from '@lowdefy/node-utils';
 import createCounter from './utils/createCounter.js';
-import createReadConfigFile from './utils/files/readConfigFile.js';
-import createWriteBuildArtifact from './utils/files/writeBuildArtifact.js';
+import createPluginTypesMap from './utils/createPluginTypesMap.js';
+import createReadConfigFile from './utils/readConfigFile.js';
+import createWriteBuildArtifact from './utils/writeBuildArtifact.js';
 import addDefaultPages from './build/addDefaultPages/addDefaultPages.js';
 import buildAuth from './build/buildAuth/buildAuth.js';
 import buildConnections from './build/buildConnections.js';
@@ -26,11 +28,13 @@ import buildRefs from './build/buildRefs/buildRefs.js';
 import buildStyles from './build/buildStyles.js';
 import buildTypes from './build/buildTypes.js';
 import cleanBuildDirectory from './build/cleanBuildDirectory.js';
+import copyPublicFolder from './build/copyPublicFolder.js';
 import testSchema from './build/testSchema.js';
 import validateApp from './build/validateApp.js';
 import validateConfig from './build/validateConfig.js';
 import updateServerPackageJson from './build/updateServerPackageJson.js';
 import writeApp from './build/writeApp.js';
+import writeActionImports from './build/writePluginImports/writeActionImports.js';
 import writeBlockImports from './build/writePluginImports/writeBlockImports.js';
 import writeConfig from './build/writeConfig.js';
 import writeConnectionImports from './build/writePluginImports/writeConnectionImports.js';
@@ -43,12 +47,15 @@ import writePages from './build/writePages.js';
 import writeRequests from './build/writeRequests.js';
 import writeStyleImports from './build/writePluginImports/writeStyleImports.js';
 import writeTypes from './build/writeTypes.js';
-async function createContext(options) {
-    const { directories , logger , refResolver  } = options;
-    const defaultTypes = JSON.parse(await readFile(new URL('./defaultTypes.json', import.meta.url).pathname));
-    // TODO: resolve custom plugin types
+async function createContext({ customTypesMap , directories , logger , refResolver  }) {
+    const defaultTypesMap = JSON.parse(await readFile(new URL('./defaultTypesMap.json', import.meta.url).pathname));
     const context = {
         directories,
+        logger,
+        readConfigFile: createReadConfigFile({
+            directories
+        }),
+        refResolver,
         typeCounters: {
             actions: createCounter(),
             blocks: createCounter(),
@@ -59,12 +66,10 @@ async function createContext(options) {
                 server: createCounter()
             }
         },
-        logger,
-        readConfigFile: createReadConfigFile({
-            directories
-        }),
-        refResolver,
-        types: defaultTypes,
+        typesMap: mergeObjects([
+            defaultTypesMap,
+            customTypesMap
+        ]),
         writeBuildArtifact: createWriteBuildArtifact({
             directories
         })
@@ -73,117 +78,120 @@ async function createContext(options) {
 }
 async function build(options) {
     const context = await createContext(options);
-    try {
-        const components = await buildRefs({
-            context
-        });
-        await testSchema({
-            components,
-            context
-        });
-        await validateApp({
-            components,
-            context
-        });
-        await validateConfig({
-            components,
-            context
-        });
-        await addDefaultPages({
-            components,
-            context
-        });
-        await buildAuth({
-            components,
-            context
-        });
-        await buildConnections({
-            components,
-            context
-        });
-        await buildPages({
-            components,
-            context
-        });
-        await buildMenu({
-            components,
-            context
-        });
-        await buildTypes({
-            components,
-            context
-        });
-        await buildIcons({
-            components,
-            context
-        });
-        await buildStyles({
-            components,
-            context
-        });
-        await cleanBuildDirectory({
-            context
-        });
-        await writeApp({
-            components,
-            context
-        });
-        await writeConnections({
-            components,
-            context
-        });
-        await writeRequests({
-            components,
-            context
-        });
-        await writePages({
-            components,
-            context
-        });
-        await writeConfig({
-            components,
-            context
-        });
-        await writeGlobal({
-            components,
-            context
-        });
-        await writeMenus({
-            components,
-            context
-        });
-        await writeTypes({
-            components,
-            context
-        });
-        await writeBlockImports({
-            components,
-            context
-        });
-        await writeConnectionImports({
-            components,
-            context
-        });
-        await writeOperatorImports({
-            components,
-            context
-        });
-        await writeStyleImports({
-            components,
-            context
-        });
-        await writeIconImports({
-            components,
-            context
-        });
-        await updateServerPackageJson({
-            components,
-            context
-        });
-    } catch (error) {
-        context.logger.error(error);
-        throw error;
-    }
+    const components = await buildRefs({
+        context
+    });
+    await testSchema({
+        components,
+        context
+    });
+    await validateApp({
+        components,
+        context
+    });
+    await validateConfig({
+        components,
+        context
+    });
+    await addDefaultPages({
+        components,
+        context
+    });
+    await buildAuth({
+        components,
+        context
+    });
+    await buildConnections({
+        components,
+        context
+    });
+    await buildPages({
+        components,
+        context
+    });
+    await buildMenu({
+        components,
+        context
+    });
+    await buildTypes({
+        components,
+        context
+    });
+    await buildIcons({
+        components,
+        context
+    });
+    await buildStyles({
+        components,
+        context
+    });
+    await cleanBuildDirectory({
+        context
+    });
+    await writeActionImports({
+        components,
+        context
+    });
+    await writeApp({
+        components,
+        context
+    });
+    await writeConnections({
+        components,
+        context
+    });
+    await writeRequests({
+        components,
+        context
+    });
+    await writePages({
+        components,
+        context
+    });
+    await writeConfig({
+        components,
+        context
+    });
+    await writeGlobal({
+        components,
+        context
+    });
+    await writeMenus({
+        components,
+        context
+    });
+    await writeTypes({
+        components,
+        context
+    });
+    await writeBlockImports({
+        components,
+        context
+    });
+    await writeConnectionImports({
+        components,
+        context
+    });
+    await writeOperatorImports({
+        components,
+        context
+    });
+    await writeStyleImports({
+        components,
+        context
+    });
+    await writeIconImports({
+        components,
+        context
+    });
+    await updateServerPackageJson({
+        components,
+        context
+    });
+    await copyPublicFolder({
+        components,
+        context
+    });
 }
-export { createContext };
+export { createContext, createPluginTypesMap };
 export default build;

package/dist/lowdefySchema.js

@@ -232,10 +232,10 @@ export default {
                         type: 'Block "layout" should be an object.'
                     }
                 },
-                loading: {
+                skeleton: {
                     type: 'object',
                     errorMessage: {
-                        type: 'Block "loading" should be an object.'
+                        type: 'Block "skeleton" should be an object.'
                     }
                 },
                 style: {
@@ -245,6 +245,7 @@ export default {
                     }
                 },
                 visible: {},
+                loading: {},
                 blocks: {
                     type: 'array',
                     items: {
@@ -536,6 +537,41 @@ export default {
                 }
             }
         },
+        plugin: {
+            type: 'object',
+            additionalProperties: false,
+            required: [
+                'name',
+                'version'
+            ],
+            properties: {
+                name: {
+                    type: 'string',
+                    errorMessage: {
+                        type: 'Plugin "name" should be a string.'
+                    }
+                },
+                version: {
+                    type: 'string',
+                    errorMessage: {
+                        type: 'Plugin "version" should be a string.'
+                    }
+                },
+                typePrefix: {
+                    type: 'string',
+                    errorMessage: {
+                        type: 'Plugin "typePrefix" should be a string.'
+                    }
+                }
+            },
+            errorMessage: {
+                type: 'Plugin should be an object.',
+                required: {
+                    name: 'Plugin should have required property "name".',
+                    version: 'Plugin should have required property "version".'
+                }
+            }
+        },
         request: {
             type: 'object',
             additionalProperties: false,
@@ -628,6 +664,13 @@ export default {
                 auth: {
                     $ref: '#/definitions/authConfig'
                 },
+                basePath: {
+                    type: 'string',
+                    description: 'App base path to apply to all routes. Base path must start with "/".',
+                    errorMessage: {
+                        type: 'App "config.basePath" should be a string.'
+                    }
+                },
                 homePageId: {
                     type: 'string',
                     description: 'Page id to use as homepage. When visiting home route "/", the router will redirect to this page. If not provided, the first page in default or first menu will be used as the homePageId.',
@@ -652,18 +695,13 @@ export default {
                 }
             }
         },
-        types: {
-            type: 'object',
-            patternProperties: {
-                '^.*$': {
-                    url: 'string',
-                    errorMessage: {
-                        enum: 'Type "url" should be a string.'
-                    }
-                }
+        plugins: {
+            type: 'array',
+            items: {
+                $ref: '#/definitions/plugin'
             },
             errorMessage: {
-                type: 'App "types" should be an object.'
+                type: 'App "plugins" should be an array.'
             }
         },
         global: {

package/dist/scripts/generateDefaultTypes.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
-  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,98 +14,59 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
-import { type } from '@lowdefy/helpers';
 import { readFile, writeFile } from '@lowdefy/node-utils';
+import createPluginTypesMap from '../utils/createPluginTypesMap.js';
 const defaultPackages = [
+    '@lowdefy/actions-core',
     '@lowdefy/blocks-antd',
     '@lowdefy/blocks-basic',
-    // '@lowdefy/blocks-color-selectors',
+    '@lowdefy/blocks-color-selectors',
     '@lowdefy/blocks-echarts',
     '@lowdefy/blocks-loaders',
     '@lowdefy/blocks-markdown',
     '@lowdefy/connection-axios-http',
+    '@lowdefy/connection-elasticsearch',
+    '@lowdefy/connection-google-sheets',
+    '@lowdefy/connection-knex',
+    '@lowdefy/connection-mongodb',
     '@lowdefy/connection-redis',
+    '@lowdefy/connection-sendgrid',
+    '@lowdefy/connection-stripe',
     '@lowdefy/operators-change-case',
-    // '@lowdefy/operators-diff',
+    '@lowdefy/operators-diff',
     '@lowdefy/operators-js',
-    // '@lowdefy/operators-mql',
+    '@lowdefy/operators-mql',
     '@lowdefy/operators-nunjucks',
     '@lowdefy/operators-uuid',
     '@lowdefy/operators-yaml', 
 ];
-function createTypeDefinitions({ typeNames , store , packageName , version  }) {
-    if (type.isArray(typeNames)) {
-        typeNames.forEach((typeName)=>{
-            store[typeName] = {
-                package: packageName,
-                version
-            };
-        });
-    }
-}
-async function generateDefaultTypes() {
+async function generateDefaultTypesMap() {
     const packageFile = JSON.parse(await readFile(path.resolve(process.cwd(), './package.json')));
-    const defaultTypes = {
+    const defaultTypesMap = {
         actions: {},
         blocks: {},
         connections: {},
-        requests: {},
+        icons: {},
         operators: {
             client: {},
             server: {}
         },
-        icons: {},
-        styles: {}
+        requests: {},
+        styles: {
+            packages: {},
+            blocks: {}
+        }
     };
     await Promise.all(defaultPackages.map(async (packageName)=>{
         const { default: types  } = await import(`${packageName}/types`);
-        const version = packageFile.devDependencies[packageName];
-        createTypeDefinitions({
-            typeNames: types.actions,
-            store: defaultTypes.actions,
-            packageName,
-            version
-        });
-        createTypeDefinitions({
-            typeNames: types.blocks,
-            store: defaultTypes.blocks,
-            packageName,
-            version
-        });
-        createTypeDefinitions({
-            typeNames: types.connections,
-            store: defaultTypes.connections,
-            packageName,
-            version
-        });
-        createTypeDefinitions({
-            typeNames: types.requests,
-            store: defaultTypes.requests,
-            packageName,
-            version
-        });
-        createTypeDefinitions({
-            typeNames: type.isObject(types.operators) ? types.operators.client : [],
-            store: defaultTypes.operators.client,
-            packageName,
-            version
-        });
-        createTypeDefinitions({
-            typeNames: type.isObject(types.operators) ? types.operators.server : [],
-            store: defaultTypes.operators.server,
+        const version = packageFile.devDependencies[packageName] || packageFile.dependencies[packageName];
+        createPluginTypesMap({
+            packageTypes: types,
+            typesMap: defaultTypesMap,
             packageName,
             version
         });
-        if (type.isObject(types.styles)) {
-            defaultTypes.styles[packageName] = types.styles;
-        }
-        if (type.isObject(types.icons)) {
-            defaultTypes.icons[packageName] = types.icons;
-        }
     }));
-    await writeFile({
-        filePath: path.resolve(process.cwd(), './dist/defaultTypes.json'),
-        content: JSON.stringify(defaultTypes, null, 2)
-    });
+    await writeFile(path.resolve(process.cwd(), './dist/defaultTypesMap.json'), JSON.stringify(defaultTypesMap, null, 2));
 }
-generateDefaultTypes();
+generateDefaultTypesMap();

package/dist/scripts/run.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
-  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,14 +14,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
 import build from '../index.js';
+const argv = yargs(hideBin(process.argv)).argv;
 async function run() {
     await build({
         logger: console,
+        refResolver: argv.refResolver || process.env.LOWDEFY_BUILD_REF_RESOLVER,
         directories: {
-            build: path.resolve(process.env.LOWDEFY_DIRECTORY_BUILD || path.join(process.cwd(), 'build')),
-            config: path.resolve(process.env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()),
-            server: path.resolve(process.env.LOWDEFY_DIRECTORY_SERVER || process.cwd())
+            build: path.resolve(argv.buildDirectory || process.env.LOWDEFY_DIRECTORY_BUILD || path.join(process.cwd(), 'build')),
+            config: path.resolve(argv.configDirectory || process.env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()),
+            server: path.resolve(argv.serverDirectory || process.env.LOWDEFY_DIRECTORY_SERVER || process.cwd())
         }
     });
 }

package/dist/test/buildRefs/testBuildRefsAsyncFunction.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.
@@ -19,4 +19,4 @@ async function asyncFn() {
         async: true
     };
 }
-module.exports = asyncFn;
+export default asyncFn;

package/dist/test/buildRefs/testBuildRefsErrorResolver.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,4 +15,4 @@
 */ function resolver() {
     throw new Error('Test error');
 }
-module.exports = resolver;
+export default resolver;

package/dist/test/buildRefs/testBuildRefsNullResolver.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,4 +16,4 @@
     if (path === 'null') return null;
     return undefined;
 }
-module.exports = resolver;
+export default resolver;

package/dist/test/buildRefs/testBuildRefsParsingResolver.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.
@@ -36,4 +36,4 @@ array:
             return null;
     }
 }
-module.exports = resolver;
+export default resolver;

package/dist/test/buildRefs/testBuildRefsResolver.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.
@@ -20,4 +20,4 @@
         contextId: context.id
     };
 }
-module.exports = resolver;
+export default resolver;

package/dist/test/buildRefs/testBuildRefsTransform.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.
@@ -22,4 +22,4 @@ function transformer(obj, vars) {
         var: vars.var1
     };
 }
-module.exports = transformer;
+export default transformer;

package/dist/test/buildRefs/testBuildRefsTransformIdentity.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.
@@ -18,4 +18,4 @@
         vars
     };
 }
-module.exports = transformer;
+export default transformer;

package/dist/test/testContext.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.