@lowdefy/build 4.0.0-alpha.7 → 4.0.0-alpha.8

package/dist/index.js

@@ -12,8 +12,10 @@
   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 createPluginTypesMap from './utils/createPluginTypesMap.js';
 import createReadConfigFile from './utils/readConfigFile.js';
 import createWriteBuildArtifact from './utils/writeBuildArtifact.js';
 import addDefaultPages from './build/addDefaultPages/addDefaultPages.js';
@@ -45,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(),
@@ -61,12 +66,10 @@ async function createContext(options) {
                 server: createCounter()
             }
         },
-        logger,
-        readConfigFile: createReadConfigFile({
-            directories
-        }),
-        refResolver,
-        types: defaultTypes,
+        typesMap: mergeObjects([
+            defaultTypesMap,
+            customTypesMap
+        ]),
         writeBuildArtifact: createWriteBuildArtifact({
             directories
         })
@@ -190,5 +193,5 @@ async function build(options) {
         context
     });
 }
-export { createContext };
+export { createContext, createPluginTypesMap };
 export default build;

package/dist/lowdefySchema.js

@@ -536,6 +536,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,
@@ -659,18 +694,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

@@ -14,8 +14,8 @@
   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',
@@ -40,76 +40,33 @@ const defaultPackages = [
     '@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,
+        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(path.resolve(process.cwd(), './dist/defaultTypes.json'), JSON.stringify(defaultTypes, null, 2));
+    await writeFile(path.resolve(process.cwd(), './dist/defaultTypesMap.json'), JSON.stringify(defaultTypesMap, null, 2));
 }
-generateDefaultTypes();
+generateDefaultTypesMap();

package/dist/utils/createPluginTypesMap.js

@@ -0,0 +1,85 @@
+/*
+  Copyright 2020-2021 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: 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/build",
-  "version": "4.0.0-alpha.7",
+  "version": "4.0.0-alpha.8",
   "licence": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -19,6 +19,10 @@
       "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"
@@ -45,10 +49,12 @@
     "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/ajv": "4.0.0-alpha.7",
-    "@lowdefy/helpers": "4.0.0-alpha.7",
-    "@lowdefy/node-utils": "4.0.0-alpha.7",
-    "@lowdefy/nunjucks": "4.0.0-alpha.7",
+    "@lowdefy/ajv": "4.0.0-alpha.8",
+    "@lowdefy/helpers": "4.0.0-alpha.8",
+    "@lowdefy/node-utils": "4.0.0-alpha.8",
+    "@lowdefy/nunjucks": "4.0.0-alpha.8",
+    "@lowdefy/operators": "4.0.0-alpha.8",
+    "@lowdefy/operators-js": "4.0.0-alpha.8",
     "ajv": "8.9.0",
     "json5": "2.2.0",
     "uuid": "8.3.2",
@@ -57,28 +63,27 @@
   },
   "devDependencies": {
     "@jest/globals": "27.5.1",
-    "@lowdefy/actions-core": "4.0.0-alpha.7",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.7",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.7",
-    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.7",
-    "@lowdefy/blocks-echarts": "4.0.0-alpha.7",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.7",
-    "@lowdefy/blocks-markdown": "4.0.0-alpha.7",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.7",
-    "@lowdefy/connection-elasticsearch": "4.0.0-alpha.7",
-    "@lowdefy/connection-google-sheets": "4.0.0-alpha.7",
-    "@lowdefy/connection-knex": "4.0.0-alpha.7",
-    "@lowdefy/connection-mongodb": "4.0.0-alpha.7",
-    "@lowdefy/connection-redis": "4.0.0-alpha.7",
-    "@lowdefy/connection-sendgrid": "4.0.0-alpha.7",
-    "@lowdefy/connection-stripe": "4.0.0-alpha.7",
-    "@lowdefy/operators-change-case": "4.0.0-alpha.7",
-    "@lowdefy/operators-diff": "4.0.0-alpha.7",
-    "@lowdefy/operators-js": "4.0.0-alpha.7",
-    "@lowdefy/operators-mql": "4.0.0-alpha.7",
-    "@lowdefy/operators-nunjucks": "4.0.0-alpha.7",
-    "@lowdefy/operators-uuid": "4.0.0-alpha.7",
-    "@lowdefy/operators-yaml": "4.0.0-alpha.7",
+    "@lowdefy/actions-core": "4.0.0-alpha.8",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.8",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.8",
+    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.8",
+    "@lowdefy/blocks-echarts": "4.0.0-alpha.8",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.8",
+    "@lowdefy/blocks-markdown": "4.0.0-alpha.8",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.8",
+    "@lowdefy/connection-elasticsearch": "4.0.0-alpha.8",
+    "@lowdefy/connection-google-sheets": "4.0.0-alpha.8",
+    "@lowdefy/connection-knex": "4.0.0-alpha.8",
+    "@lowdefy/connection-mongodb": "4.0.0-alpha.8",
+    "@lowdefy/connection-redis": "4.0.0-alpha.8",
+    "@lowdefy/connection-sendgrid": "4.0.0-alpha.8",
+    "@lowdefy/connection-stripe": "4.0.0-alpha.8",
+    "@lowdefy/operators-change-case": "4.0.0-alpha.8",
+    "@lowdefy/operators-diff": "4.0.0-alpha.8",
+    "@lowdefy/operators-mql": "4.0.0-alpha.8",
+    "@lowdefy/operators-nunjucks": "4.0.0-alpha.8",
+    "@lowdefy/operators-uuid": "4.0.0-alpha.8",
+    "@lowdefy/operators-yaml": "4.0.0-alpha.8",
     "@swc/cli": "0.1.55",
     "@swc/core": "1.2.135",
     "@swc/jest": "0.2.17",
@@ -87,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "52ec14639d00de910cf9b8ab25bf933ca891cff5"
+  "gitHead": "9d56b83cf45e868afe3a1eeba750fe826eb74c8c"
 }