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

package/dist/build/buildIcons.js

@@ -0,0 +1,63 @@
+/*
+  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.
+*/ const iconPackages = {
+    'react-icons/ai': /"(Ai[A-Z0-9]\w*)"/gm,
+    'react-icons/bs': /"(Bs[A-Z0-9]\w*)"/gm,
+    'react-icons/bi': /"(Bi[A-Z0-9]\w*)"/gm,
+    'react-icons/di': /"(Di[A-Z0-9]\w*)"/gm,
+    'react-icons/fi': /"(Fi[A-Z0-9]\w*)"/gm,
+    'react-icons/fc': /"(Fc[A-Z0-9]\w*)"/gm,
+    'react-icons/fa': /"(Fa[A-Z0-9]\w*)"/gm,
+    'react-icons/gi': /"(Gi[A-Z0-9]\w*)"/gm,
+    'react-icons/go': /"(Go[A-Z0-9]\w*)"/gm,
+    'react-icons/gr': /"(Gr[A-Z0-9]\w*)"/gm,
+    'react-icons/hi': /"(Hi[A-Z0-9]\w*)"/gm,
+    'react-icons/im': /"(Im[A-Z0-9]\w*)"/gm,
+    'react-icons/io': /"(IoIos[A-Z0-9]\w*)"/gm,
+    'react-icons/io5': /"(Io[A-Z0-9]\w*)"/gm,
+    'react-icons/md': /"(Md[A-Z0-9]\w*)"/gm,
+    'react-icons/ri': /"(Ri[A-Z0-9]\w*)"/gm,
+    'react-icons/si': /"(Si[A-Z0-9]\w*)"/gm,
+    'react-icons/ti': /"(Ti[A-Z0-9]\w*)"/gm,
+    'react-icons/vsc': /"(Vsc[A-Z0-9]\w*)"/gm,
+    'react-icons/wi': /"(Wi[A-Z0-9]\w*)"/gm,
+    'react-icons/cg': /"(Cg[A-Z0-9]\w*)"/gm
+};
+function buildIcons({ components  }) {
+    components.icons = [];
+    Object.entries(iconPackages).forEach(([iconPackage, regex])=>{
+        const icons = new Set();
+        [
+            ...JSON.stringify(components.global || {
+            }).matchAll(regex)
+        ].map((match)=>icons.add(match[1])
+        );
+        [
+            ...JSON.stringify(components.menus || []).matchAll(regex)
+        ].map((match)=>icons.add(match[1])
+        );
+        [
+            ...JSON.stringify(components.pages || []).matchAll(regex)
+        ].map((match)=>icons.add(match[1])
+        );
+        components.icons.push({
+            icons: [
+                ...icons
+            ],
+            package: iconPackage
+        });
+    });
+}
+export default buildIcons;

package/dist/build/buildStyles.js

@@ -0,0 +1,29 @@
+/*
+  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.
+*/ function buildStyles({ components , context  }) {
+    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.types.styles[block.package][blockName] || []).map((style)=>`${block.package}/${style}`
+        ));
+    });
+    components.styles = [
+        ...styles
+    ].filter((style)=>!!style
+    );
+}
+export default buildStyles;

package/dist/build/buildTypes.js

@@ -67,24 +67,17 @@ function buildTypes({ components , context  }) {
         store: components.types.requests,
         typeClass: 'Request'
     });
-    // buildTypeClass({
-    //   counter: typeCounters.operators.client,
-    //   definitions: context.types.operators.client,
-    //   store: components.types.operators.client,
-    //   typeClass: 'Operator',
-    // });
-    // buildTypeClass({
-    //   counter: typeCounters.operators.server,
-    //   definitions: context.types.operators.server,
-    //   store: components.types.operators.server,
-    //   typeClass: 'Operator',
-    // });
-    // TODO: Handle styles
-    const blocksPackages = new Set();
-    Object.values(components.types.blocks).forEach((typeDef)=>{
-        blocksPackages.add(typeDef.package);
-    });
-    components.styles = context.types.styles.filter((style)=>blocksPackages.has(style.package)
-    );
+// buildTypeClass({
+//   counter: typeCounters.operators.client,
+//   definitions: context.types.operators.client,
+//   store: components.types.operators.client,
+//   typeClass: 'Operator',
+// });
+// buildTypeClass({
+//   counter: typeCounters.operators.server,
+//   definitions: context.types.operators.server,
+//   store: components.types.operators.server,
+//   typeClass: 'Operator',
+// });
 }
 export default buildTypes;

package/dist/build/writePluginImports/writeBlockImports.js

@@ -17,7 +17,7 @@ const template = `{%- for block in blocks -%}
 import { {{ block.type }} } from '{{ block.package }}/blocks';
 {% endfor -%}
 export default {
-  {%- for block in blocks -%}
+  {% for block in blocks -%}
   {{ block.type }},
   {% endfor -%}
 };

package/dist/build/writePluginImports/writeConnectionImports.js

@@ -17,7 +17,7 @@ const template = `{%- for connection in connections -%}
 import { {{ connection.type }} } from '{{ connection.package }}/connections';
 {% endfor -%}
 export default {
-  {%- for connection in connections -%}
+  {% for connection in connections -%}
   {{ connection.type }},
   {% endfor -%}
 };

package/dist/build/writePluginImports/writeIconImports.js

@@ -0,0 +1,37 @@
+/*
+  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 { nunjucksFunction } from '@lowdefy/nunjucks';
+const template = `{%- for package in packages -%}
+{%- for icon in package.icons -%}
+import { {{ icon }} } from '{{ package.package }}';
+{% endfor -%}
+{% endfor -%}
+export default {
+  {% for package in packages -%}
+  {%- for icon in package.icons -%}
+  {{ icon }},
+  {% endfor -%}{%- endfor -%}
+};
+`;
+async function writeIconImports({ components , context  }) {
+    const templateFn = nunjucksFunction(template);
+    await context.writeBuildArtifact({
+        filePath: 'plugins/icons.js',
+        content: templateFn({
+            packages: components.icons
+        })
+    });
+}
+export default writeIconImports;

package/dist/build/writePluginImports/writeStyleImports.js

@@ -0,0 +1,30 @@
+/*
+  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 { nunjucksFunction } from '@lowdefy/nunjucks';
+const template = `@import '@lowdefy/layout/style.less';
+{% for style in styles -%}
+@import '{{ style }}';
+{% endfor -%}
+`;
+async function writeStyleImports({ components , context  }) {
+    const templateFn = nunjucksFunction(template);
+    await context.writeBuildArtifact({
+        filePath: 'plugins/styles.less',
+        content: templateFn({
+            styles: components.styles
+        })
+    });
+}
+export default writeStyleImports;

package/dist/defaultTypes.json

@@ -3,58 +3,64 @@
   "blocks": {
     "Anchor": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     },
     "Box": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     },
     "DangerousHtml": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     },
     "Html": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     },
     "Icon": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     },
     "Img": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     },
     "List": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     },
     "Span": {
       "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     }
   },
   "connections": {
     "AxiosHttp": {
       "package": "@lowdefy/connection-axios-http",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     }
   },
   "requests": {
     "AxiosHttp": {
       "package": "@lowdefy/connection-axios-http",
-      "version": "4.0.0-alpha.1"
+      "version": "4.0.0-alpha.4"
     }
   },
   "operators": {
     "client": {},
     "server": {}
   },
-  "styles": [
-    {
-      "path": "style.less",
-      "package": "@lowdefy/blocks-basic",
-      "version": "4.0.0-alpha.1"
+  "styles": {
+    "@lowdefy/blocks-basic": {
+      "default": [],
+      "Anchor": [],
+      "Box": [],
+      "DangerousHtml": [],
+      "Html": [],
+      "Icon": [],
+      "Img": [],
+      "List": [],
+      "Span": []
     }
-  ]
+  }
 }

package/dist/index.js

@@ -19,9 +19,11 @@ import createWriteBuildArtifact from './utils/files/writeBuildArtifact.js';
 import addDefaultPages from './build/addDefaultPages/addDefaultPages.js';
 import buildAuth from './build/buildAuth/buildAuth.js';
 import buildConnections from './build/buildConnections.js';
+import buildIcons from './build/buildIcons.js';
 import buildMenu from './build/buildMenu.js';
 import buildPages from './build/buildPages/buildPages.js';
 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 testSchema from './build/testSchema.js';
@@ -29,13 +31,15 @@ import validateApp from './build/validateApp.js';
 import validateConfig from './build/validateConfig.js';
 import writeApp from './build/writeApp.js';
 import writeBlockImports from './build/writePluginImports/writeBlockImports.js';
-import writeConnectionImports from './build/writePluginImports/writeConnectionImports.js';
 import writeConfig from './build/writeConfig.js';
+import writeConnectionImports from './build/writePluginImports/writeConnectionImports.js';
 import writeConnections from './build/writeConnections.js';
 import writeGlobal from './build/writeGlobal.js';
+import writeIconImports from './build/writePluginImports/writeIconImports.js';
 import writeMenus from './build/writeMenus.js';
 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 { blocksServerUrl , buildDirectory , cacheDirectory , configDirectory , logger , refResolver  } = options;
@@ -102,6 +106,9 @@ async function build(options) {
             components,
             context
         });
+        await buildIcons({
+            components
+        });
         await buildMenu({
             components,
             context
@@ -110,6 +117,10 @@ async function build(options) {
             components,
             context
         });
+        await buildStyles({
+            components,
+            context
+        });
         await cleanBuildDirectory({
             context
         });
@@ -153,8 +164,14 @@ async function build(options) {
             components,
             context
         });
-    // TODO: write style file
-    // TODO: write icons file
+        await writeStyleImports({
+            components,
+            context
+        });
+        await writeIconImports({
+            components,
+            context
+        });
     // TODO: add plugins to package.json
     } catch (error) {
         context.logger.error(error);

package/dist/scripts/generateDefaultTypes.js

@@ -47,7 +47,8 @@ async function generateDefaultTypes() {
             server: {
             }
         },
-        styles: []
+        styles: {
+        }
     };
     await Promise.all(defaultPackages.map(async (packageName)=>{
         const { default: types  } = await import(`${packageName}/types`);
@@ -88,14 +89,8 @@ async function generateDefaultTypes() {
             packageName,
             version
         });
-        if (type.isArray(types.styles)) {
-            types.styles.forEach((pathName)=>{
-                defaultTypes.styles.push({
-                    path: pathName,
-                    package: packageName,
-                    version: packageFile.devDependencies[packageName]
-                });
-            });
+        if (type.isObject(types.styles)) {
+            defaultTypes.styles[packageName] = types.styles;
         }
     }));
     await writeFile({

package/dist/scripts/run.js

@@ -16,16 +16,10 @@
 */ import path from 'path';
 import build from '../index.js';
 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({
+        logger: console,
+        buildDirectory: path.resolve(process.env.LOWDEFY_BUILD_DIRECTORY || path.join(process.cwd(), 'build')),
+        configDirectory: path.resolve(process.env.LOWDEFY_CONFIG_DIRECTORY || process.cwd())
+    });
 }
 run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/build",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.4",
   "licence": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -41,18 +41,18 @@
     "test": "jest --coverage"
   },
   "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",
+    "@lowdefy/ajv": "4.0.0-alpha.4",
+    "@lowdefy/helpers": "4.0.0-alpha.4",
+    "@lowdefy/node-utils": "4.0.0-alpha.4",
+    "@lowdefy/nunjucks": "4.0.0-alpha.4",
     "ajv": "8.8.2",
     "js-yaml": "4.1.0",
     "json5": "2.2.0",
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@lowdefy/blocks-basic": "4.0.0-alpha.1",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.1",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.4",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.4",
     "@swc/cli": "0.1.52",
     "@swc/core": "1.2.112",
     "@swc/jest": "0.2.9",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c97a8fa6b5a641e7d50df09f5601a9c586eeb65a"
+  "gitHead": "537d166ba3f6e017b8a61c2a7e5c12fd0a48bf67"
 }