@lowdefy/build 4.0.0-alpha.1 → 4.0.0-alpha.12

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,93 +14,65 @@
   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/connection-axios-http'
+    '@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-js',
+    '@lowdefy/operators-mql',
+    '@lowdefy/operators-nunjucks',
+    '@lowdefy/operators-uuid',
+    '@lowdefy/operators-yaml',
+    '@lowdefy/plugin-next-auth', 
 ];
-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 = {
-        actions: {
-        },
-        blocks: {
-        },
-        connections: {
-        },
-        requests: {
+    const defaultTypesMap = {
+        actions: {},
+        auth: {
+            callbacks: {},
+            events: {},
+            providers: {}
         },
+        blocks: {},
+        connections: {},
+        icons: {},
         operators: {
-            client: {
-            },
-            server: {
-            }
+            client: {},
+            server: {}
         },
-        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,
+        const version = packageFile.devDependencies[packageName] || packageFile.dependencies[packageName];
+        createPluginTypesMap({
+            packageTypes: types,
+            typesMap: defaultTypesMap,
             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,
-            packageName,
-            version
-        });
-        if (type.isArray(types.styles)) {
-            types.styles.forEach((pathName)=>{
-                defaultTypes.styles.push({
-                    path: pathName,
-                    package: packageName,
-                    version: packageFile.devDependencies[packageName]
-                });
-            });
-        }
     }));
-    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,18 +14,20 @@
   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() {
-    // TODO: resolve build with no config
-    try {
-        await build({
-            logger: console,
-            buildDirectory: path.resolve(process.cwd(), './.lowdefy/build'),
-            cacheDirectory: path.resolve(process.cwd(), './.lowdefy/.cache'),
-            configDirectory: process.cwd()
-        });
-    } catch (e) {
-        console.error(e);
-    }
+    await build({
+        directories: {
+            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())
+        },
+        logger: console,
+        refResolver: argv.refResolver || process.env.LOWDEFY_BUILD_REF_RESOLVER,
+        stage: argv.stage || process.env.LOWDEFY_BUILD_STAGE || 'prod'
+    });
 }
 run();

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.
@@ -12,14 +12,11 @@
   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.
-*/ const wait = (ms)=>{
-    return new Promise((resolve)=>setTimeout(resolve, ms)
-    );
-};
+*/ import { wait } from '@lowdefy/helpers';
 async function asyncFn() {
     await wait(20);
     return {
         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.
@@ -13,24 +13,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createCounter from '../utils/createCounter.js';
-function testContext({ writeBuildArtifact , configDirectory , readConfigFile , logger ={
-}  } = {
-}) {
+function testContext({ writeBuildArtifact , configDirectory , readConfigFile , logger ={}  } = {}) {
     const defaultLogger = {
-        info: ()=>{
-        },
-        log: ()=>{
-        },
-        warn: ()=>{
-        },
-        error: ()=>{
-        },
-        succeed: ()=>{
-        }
+        info: ()=>{},
+        log: ()=>{},
+        warn: ()=>{},
+        error: ()=>{},
+        succeed: ()=>{}
     };
     const context = {
         id: 'test',
-        configDirectory: configDirectory || '',
+        directories: {
+            config: configDirectory || ''
+        },
         typeCounters: {
             actions: createCounter(),
             blocks: createCounter(),
@@ -41,10 +36,8 @@ function testContext({ writeBuildArtifact , configDirectory , readConfigFile , l
                 server: createCounter()
             }
         },
-        writeBuildArtifact: writeBuildArtifact || (()=>{
-        }),
-        readConfigFile: readConfigFile || (()=>{
-        })
+        writeBuildArtifact: writeBuildArtifact || (()=>{}),
+        readConfigFile: readConfigFile || (()=>{})
     };
     context.logger = {
         ...defaultLogger,

package/dist/utils/countOperators.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/utils/createCheckDuplicateId.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/utils/createCounter.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/utils/createPluginTypesMap.js

@@ -0,0 +1,106 @@
+/*
+  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 { type } from '@lowdefy/helpers';
+function createTypeDefinitions({ packageName , store , typeNames , typePrefix , version  }) {
+    if (type.isArray(typeNames)) {
+        typeNames.forEach((typeName)=>{
+            store[`${typePrefix}${typeName}`] = {
+                package: packageName,
+                originalTypeName: typeName,
+                version
+            };
+        });
+    }
+}
+function createPluginTypesMap({ packageName , packageTypes , typePrefix ='' , typesMap , version  }) {
+    createTypeDefinitions({
+        typeNames: packageTypes.actions,
+        store: typesMap.actions,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.auth) ? packageTypes.auth.callbacks : [],
+        store: typesMap.auth.callbacks,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.auth) ? packageTypes.auth.events : [],
+        store: typesMap.auth.events,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.auth) ? packageTypes.auth.providers : [],
+        store: typesMap.auth.providers,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: packageTypes.blocks,
+        store: typesMap.blocks,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: packageTypes.connections,
+        store: typesMap.connections,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.operators) ? packageTypes.operators.client : [],
+        store: typesMap.operators.client,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.operators) ? packageTypes.operators.server : [],
+        store: typesMap.operators.server,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: packageTypes.requests,
+        store: typesMap.requests,
+        packageName,
+        typePrefix,
+        version
+    });
+    if (type.isObject(packageTypes.styles)) {
+        Object.entries(packageTypes.styles).forEach(([blockType, styles])=>{
+            if (blockType === 'default') {
+                typesMap.styles.packages[packageName] = styles;
+            } else {
+                typesMap.styles.blocks[`${typePrefix}${blockType}`] = styles;
+            }
+        });
+    }
+    if (type.isObject(packageTypes.icons)) {
+        Object.entries(packageTypes.icons).forEach(([blockType, icons])=>{
+            typesMap.icons[`${typePrefix}${blockType}`] = icons;
+        });
+    }
+}
+export default createPluginTypesMap;

package/dist/utils/formatErrorMessage.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,7 +14,7 @@
   limitations under the License.
 */ import { get, type } from '@lowdefy/helpers';
 function formatArrayKey({ index , object  }) {
-    if (!type.isNone(object.id) || !type.isNone(object.type)) {
+    if (type.isObject(object) && (!type.isNone(object.id) || !type.isNone(object.type))) {
         const objectId = type.isNone(object.id) ? '_ERROR_MISSING_ID_' : object.id;
         const objectType = type.isNone(object.type) ? '_ERROR_MISSING_TYPE_' : object.type;
         return `[${index}:${objectId}:${objectType}]`;

package/dist/utils/{files/readConfigFile.js → readConfigFile.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,9 +15,9 @@
 */ import path from 'path';
 import { cachedPromises } from '@lowdefy/helpers';
 import { readFile } from '@lowdefy/node-utils';
-function createReadConfigFile({ configDirectory  }) {
+function createReadConfigFile({ directories  }) {
     async function readConfigFile(filePath) {
-        return readFile(path.resolve(configDirectory, filePath));
+        return readFile(path.resolve(directories.config, filePath));
     }
     return cachedPromises(readConfigFile);
 }

package/dist/utils/{files/writeBuildArtifact.js → writeBuildArtifact.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,12 +14,9 @@
   limitations under the License.
 */ import path from 'path';
 import { writeFile } from '@lowdefy/node-utils';
-function createWriteBuildArtifact({ buildDirectory  }) {
-    async function writeBuildArtifact({ filePath , content  }) {
-        return writeFile({
-            filePath: path.resolve(buildDirectory, filePath),
-            content
-        });
+function createWriteBuildArtifact({ directories  }) {
+    async function writeBuildArtifact(filePath, content) {
+        await writeFile(path.join(directories.build, filePath), content);
     }
     return writeBuildArtifact;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/build",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.12",
   "licence": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -18,6 +18,14 @@
     {
       "name": "Gerrie van Wyk",
       "url": "https://github.com/Gervwyk"
+    },
+    {
+      "name": "Johann Möller",
+      "url": "https://github.com/JohannMoller"
+    },
+    {
+      "name": "Sandile Memela",
+      "url": "https://github.com/sah-memela"
     }
   ],
   "repository": {
@@ -38,28 +46,52 @@
     "prepare": "yarn build",
     "start": "node dist/scripts/run.js",
     "swc": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
-    "test": "jest --coverage"
+    "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/ajv": "4.0.0-alpha.1",
-    "@lowdefy/helpers": "4.0.0-alpha.1",
-    "@lowdefy/node-utils": "4.0.0-alpha.1",
-    "@lowdefy/nunjucks": "4.0.0-alpha.1",
-    "ajv": "8.8.2",
-    "js-yaml": "4.1.0",
+    "@lowdefy/ajv": "4.0.0-alpha.12",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.12",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.12",
+    "@lowdefy/helpers": "4.0.0-alpha.12",
+    "@lowdefy/node-utils": "4.0.0-alpha.12",
+    "@lowdefy/nunjucks": "4.0.0-alpha.12",
+    "@lowdefy/operators": "4.0.0-alpha.12",
+    "@lowdefy/operators-js": "4.0.0-alpha.12",
+    "ajv": "8.9.0",
     "json5": "2.2.0",
-    "uuid": "8.3.2"
+    "uuid": "8.3.2",
+    "yaml": "2.0.0-10",
+    "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@lowdefy/blocks-basic": "4.0.0-alpha.1",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.1",
-    "@swc/cli": "0.1.52",
-    "@swc/core": "1.2.112",
-    "@swc/jest": "0.2.9",
-    "jest": "27.3.1"
+    "@jest/globals": "27.5.1",
+    "@lowdefy/actions-core": "4.0.0-alpha.12",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.12",
+    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.12",
+    "@lowdefy/blocks-echarts": "4.0.0-alpha.12",
+    "@lowdefy/blocks-markdown": "4.0.0-alpha.12",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.12",
+    "@lowdefy/connection-elasticsearch": "4.0.0-alpha.12",
+    "@lowdefy/connection-google-sheets": "4.0.0-alpha.12",
+    "@lowdefy/connection-knex": "4.0.0-alpha.12",
+    "@lowdefy/connection-mongodb": "4.0.0-alpha.12",
+    "@lowdefy/connection-redis": "4.0.0-alpha.12",
+    "@lowdefy/connection-sendgrid": "4.0.0-alpha.12",
+    "@lowdefy/connection-stripe": "4.0.0-alpha.12",
+    "@lowdefy/operators-change-case": "4.0.0-alpha.12",
+    "@lowdefy/operators-diff": "4.0.0-alpha.12",
+    "@lowdefy/operators-mql": "4.0.0-alpha.12",
+    "@lowdefy/operators-nunjucks": "4.0.0-alpha.12",
+    "@lowdefy/operators-uuid": "4.0.0-alpha.12",
+    "@lowdefy/operators-yaml": "4.0.0-alpha.12",
+    "@lowdefy/plugin-next-auth": "4.0.0-alpha.12",
+    "@swc/cli": "0.1.55",
+    "@swc/core": "1.2.135",
+    "@swc/jest": "0.2.17",
+    "jest": "27.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c97a8fa6b5a641e7d50df09f5601a9c586eeb65a"
+  "gitHead": "41b6138a81bee7da362dad06345bc9f87b2c2133"
 }