@lowdefy/server 4.0.0-alpha.1 → 4.0.0-alpha.7

package/.eslintrc.yaml

@@ -0,0 +1 @@
+extends: 'plugin:@next/next/core-web-vitals'

package/README.md

@@ -1,5 +1,21 @@
 # @lowdefy/server
 
+## Development
+
+To run the server in locally as a development server, run the following:
+
+- Run `yarn && yarn build` at the root of the repository.
+- Add a `lowdefy.yaml` file in the server directory (`packages/server`).
+- run `yarn dev` in the server directory.
+
+To run the server in locally as a development server, with a next production build, run the following:
+
+- Run `yarn && yarn build` at the root of the repository.
+- Add a `lowdefy.yaml` file in the server directory (`packages/server`).
+- run `yarn dev:prod` in the server directory.
+
+> When running a development server, the `package.json` file is updated with the plugins used in the Lowdefy app. Please do not commit the changes made to the `package.json`, `.pnp.cjs` and `yarn.lock` files.
+
 ## Licence
 
-[Apache-2.0](https://github.com/lowdefy/lowdefy/blob/main/LICENSE)
+[Apache-2.0](https://github.com/lowdefy/lowdefy/blob/main/LICENSE)

package/next.config.js

@@ -0,0 +1,36 @@
+const withLess = require('next-with-less');
+const lowdefyConfig = require('./build/config.json');
+
+// TODO: Trance env and args from cli that is required on the server.
+module.exports = withLess({
+  basePath: process.env.LOWDEFY_BASE_PATH || lowdefyConfig.basePath,
+  lessLoaderOptions: {
+    lessOptions: {
+      modifyVars: lowdefyConfig.theme.lessVariables,
+    },
+  },
+  reactStrictMode: true,
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.resolve.fallback = {
+        assert: false,
+        buffer: false,
+        crypto: false,
+        events: false,
+        fs: false,
+        path: false,
+        process: require.resolve('process/browser'),
+        util: false,
+      };
+    }
+    return config;
+  },
+  poweredByHeader: false,
+  // productionBrowserSourceMaps: true
+  // experimental: {
+  //   concurrentFeatures: true,
+  // },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.7",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -26,10 +26,12 @@
     "url": "https://github.com/lowdefy/lowdefy.git"
   },
   "files": [
-    "src/*"
+    "src/*",
+    "public/*",
+    "next.config.js",
+    ".eslintrc.yaml"
   ],
   "scripts": {
-    "build": "yarn build:lowdefy && yarn build:next",
     "build:lowdefy": "lowdefy-build",
     "build:next": "next build",
     "dev": "next dev",
@@ -38,29 +40,29 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/api": "4.0.0-alpha.1",
-    "@lowdefy/block-utils": "4.0.0-alpha.1",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.1",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.1",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.1",
-    "@lowdefy/engine": "4.0.0-alpha.1",
-    "@lowdefy/helpers": "4.0.0-alpha.1",
-    "@lowdefy/layout": "4.0.0-alpha.1",
-    "next": "12.0.3",
-    "next-auth": "4.0.0-beta.6",
-    "react": "18.0.0-alpha-327d5c484-20211106",
-    "react-dom": "18.0.0-alpha-327d5c484-20211106",
+    "@lowdefy/api": "4.0.0-alpha.7",
+    "@lowdefy/block-utils": "4.0.0-alpha.7",
+    "@lowdefy/engine": "4.0.0-alpha.7",
+    "@lowdefy/helpers": "4.0.0-alpha.7",
+    "@lowdefy/layout": "4.0.0-alpha.7",
+    "@lowdefy/node-utils": "4.0.0-alpha.7",
+    "@lowdefy/operators-js": "4.0.0-alpha.7",
+    "next": "12.0.10",
+    "next-auth": "4.1.2",
+    "process": "0.11.10",
+    "react": "18.0.0-rc.0",
+    "react-dom": "18.0.0-rc.0",
     "react-icons": "4.3.1"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-alpha.1",
-    "@next/eslint-plugin-next": "12.0.4",
+    "@lowdefy/build": "4.0.0-alpha.7",
+    "@next/eslint-plugin-next": "12.0.10",
     "less": "4.1.2",
     "less-loader": "10.2.0",
-    "next-with-less": "2.0.2"
+    "next-with-less": "2.0.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c97a8fa6b5a641e7d50df09f5601a9c586eeb65a"
+  "gitHead": "52ec14639d00de910cf9b8ab25bf933ca891cff5"
 }

package/src/components/LowdefyContext.js

@@ -16,32 +16,35 @@
 
 import React from 'react';
 
+import actions from '../../build/plugins/actions.js';
 import callRequest from '../utils/callRequest.js';
-import blockComponents from '../../.lowdefy/build/plugins/blocks.js';
-import components from './components.js';
+import blockComponents from '../../build/plugins/blocks.js';
+import operators from '../../build/plugins/operatorsClient.js';
 
-const LowdefyContext = ({ children }) => {
-  const lowdefy = {
-    _internal: {
+const LowdefyContext = ({ children, lowdefy }) => {
+  if (!lowdefy._internal) {
+    lowdefy._internal = {
+      actions,
       blockComponents,
       callRequest,
-      components,
+      components: {},
       document,
+      operators,
       updaters: {},
       window,
       displayMessage: ({ content }) => {
-        alert(content);
+        console.log(content);
         return () => undefined;
       },
       link: () => undefined,
-    },
-    contexts: {},
-    inputs: {},
-    lowdefyGlobal: {},
-  };
+    };
+    lowdefy.contexts = {};
+    lowdefy.inputs = {};
+    lowdefy.lowdefyGlobal = {};
+  }
   lowdefy._internal.updateBlock = (blockId) =>
     lowdefy._internal.updaters[blockId] && lowdefy._internal.updaters[blockId]();
-  return <>{children(lowdefy)}</>;
+  return <>{children}</>;
 };
 
 export default LowdefyContext;

package/src/components/Page.js

@@ -16,25 +16,29 @@
 
 import React from 'react';
 
+import { urlQuery } from '@lowdefy/helpers';
 import { useRouter } from 'next/router';
 
 import Context from './Context.js';
 import Head from './Head.js';
 import Block from './block/Block.js';
 import setupLink from '../utils/setupLink.js';
+import createComponents from './createComponents.js';
 
 const LoadingBlock = () => <div>Loading...</div>;
 
 const Page = ({ lowdefy, pageConfig, rootConfig }) => {
   const router = useRouter();
-  lowdefy._internal.basePath = router.basePath;
-  lowdefy._internal.pathname = router.pathname;
-  lowdefy._internal.query = router.query;
   lowdefy._internal.router = router;
-  lowdefy._internal.link = setupLink({ lowdefy });
+  lowdefy._internal.link = setupLink(lowdefy);
+  lowdefy._internal.components = createComponents(lowdefy);
+
+  lowdefy.basePath = lowdefy._internal.router.basePath;
   lowdefy.home = rootConfig.home;
   lowdefy.lowdefyGlobal = rootConfig.lowdefyGlobal;
   lowdefy.menus = rootConfig.menus;
+  lowdefy.urlQuery = urlQuery.parse(window.location.search.slice(1));
+
   return (
     <Context config={pageConfig} lowdefy={lowdefy}>
       {(context, loading) => {

package/src/components/block/CategorySwitch.js

@@ -64,12 +64,10 @@ const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
               setValue: block.setValue,
               triggerEvent: block.triggerEvent,
             })}
-            // TODO: React throws a  basePath warning
-            basePath={lowdefy._internal.basePath}
+            basePath={lowdefy.basePath}
             blockId={block.blockId}
             components={lowdefy._internal.components}
             events={block.eval.events}
-            homePageId={lowdefy.homePageId}
             key={block.blockId}
             loading={block.loading}
             menus={lowdefy.menus}
@@ -98,11 +96,10 @@ const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
               registerMethod: block.registerMethod,
               triggerEvent: block.triggerEvent,
             })}
-            basePath={lowdefy._internal.basePath}
+            basePath={lowdefy.basePath}
             blockId={block.blockId}
             components={lowdefy._internal.components}
             events={block.eval.events}
-            homePageId={lowdefy.homePageId}
             key={block.blockId}
             loading={block.loading}
             menus={lowdefy.menus}

package/src/components/block/Container.js

@@ -65,12 +65,11 @@ const Container = ({ block, Blocks, Component, context, lowdefy }) => {
           registerMethod: block.registerMethod,
           triggerEvent: block.triggerEvent,
         })}
-        basePath={lowdefy._internal.basePath}
+        basePath={lowdefy.basePath}
         blockId={block.blockId}
         components={lowdefy._internal.components}
         content={content}
         events={block.eval.events}
-        homePageId={lowdefy.homePageId}
         key={block.blockId}
         loading={block.loading}
         menus={lowdefy.menus}

package/src/components/block/List.js

@@ -72,11 +72,10 @@ const List = ({ block, Blocks, Component, context, lowdefy }) => {
           triggerEvent: block.triggerEvent,
           unshiftItem: block.unshiftItem,
         })}
-        basePath={lowdefy._internal.basePath}
+        basePath={lowdefy.basePath}
         blockId={block.blockId}
         components={lowdefy._internal.components}
         events={block.eval.events}
-        homePageId={lowdefy.homePageId}
         key={block.blockId}
         list={contentList}
         loading={block.loading}

package/src/components/{components.js → createComponents.js}

@@ -14,12 +14,16 @@
   limitations under the License.
 */
 
-import Link from 'next/link';
 import { createIcon } from '@lowdefy/block-utils';
 
-import icons from '../plugins/icons.js';
+import createLinkComponent from './createLinkComponent.js';
+import icons from '../../build/plugins/icons.js';
 
-export default {
-  Link,
-  Icon: createIcon(icons),
+const createComponents = (lowdefy) => {
+  return {
+    Link: createLinkComponent(lowdefy),
+    Icon: createIcon(icons),
+  };
 };
+
+export default createComponents;

package/src/components/createLinkComponent.js

@@ -0,0 +1,97 @@
+import React from 'react';
+import NextLink from 'next/link';
+import { createLink } from '@lowdefy/engine';
+import { type } from '@lowdefy/helpers';
+
+const createLinkComponent = (lowdefy) => {
+  const backLink = ({ ariaLabel, children, className, id, rel }) => (
+    <a
+      id={id}
+      onClick={() => lowdefy._internal.router.back()}
+      className={className}
+      rel={rel}
+      aria-label={ariaLabel || 'back'}
+    >
+      {type.isFunction(children) ? children(id) : children}
+    </a>
+  );
+  const newOriginLink = ({
+    ariaLabel,
+    children,
+    className,
+    id,
+    newTab,
+    pageId,
+    query,
+    rel,
+    url,
+  }) => {
+    return (
+      <a
+        id={id}
+        aria-label={ariaLabel}
+        className={className}
+        href={`${url}${query ? `?${query}` : ''}`}
+        rel={rel || (newTab && 'noopener noreferrer')}
+        target={newTab && '_blank'}
+      >
+        {type.isFunction(children) ? children(pageId || url || id) : children}
+      </a>
+    );
+  };
+  const sameOriginLink = ({
+    ariaLabel,
+    children,
+    className,
+    id,
+    newTab,
+    pageId,
+    pathname,
+    query,
+    rel,
+    replace,
+    scroll,
+    setInput,
+    url,
+  }) => {
+    if (newTab) {
+      return (
+        // eslint-disable-next-line react/jsx-no-target-blank
+        <a
+          id={id}
+          aria-label={ariaLabel}
+          className={className}
+          href={`${window.location.origin}${lowdefy.basePath}${pathname}${
+            query ? `?${query}` : ''
+          }`}
+          rel={rel || 'noopener noreferrer'}
+          target="_blank"
+        >
+          {type.isFunction(children) ? children(pageId || url || id) : children}
+        </a>
+      );
+    }
+    return (
+      <NextLink href={{ pathname, query }} replace={replace} scroll={scroll}>
+        <a id={id} aria-label={ariaLabel} className={className} rel={rel} onClick={setInput}>
+          {type.isFunction(children) ? children(pageId || url || id) : children}
+        </a>
+      </NextLink>
+    );
+  };
+  const noLink = ({ className, children, id }) => (
+    <span id={id} className={className}>
+      {type.isFunction(children) ? children(id) : children}
+    </span>
+  );
+  return createLink({
+    backLink,
+    lowdefy,
+    newOriginLink,
+    sameOriginLink,
+    noLink,
+    disabledLink: noLink,
+  });
+};
+
+export default createLinkComponent;

package/src/{plugins/icons.js → pages/404.js}

@@ -14,22 +14,25 @@
   limitations under the License.
 */
 
-/* eslint-disable import/no-duplicates */
-
-import { AiOutlineFire } from 'react-icons/ai';
-import { AiOutlineRocket } from 'react-icons/ai';
-import { AiOutlineLoading3Quarters } from 'react-icons/ai';
-import { AiOutlineExclamationCircle } from 'react-icons/ai';
-import { AiOutlineExperiment } from 'react-icons/ai';
-import { FcLandscape } from 'react-icons/fc';
-import { MdIcecream } from 'react-icons/md';
-
-export default {
-  AiOutlineLoading3Quarters,
-  AiOutlineExclamationCircle,
-  AiOutlineFire,
-  AiOutlineRocket,
-  AiOutlineExperiment,
-  FcLandscape,
-  MdIcecream,
-};
+import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
+
+import Page from '../components/Page.js';
+
+export async function getStaticProps() {
+  // TODO: get the right api context options
+  const apiContext = await createApiContext({ buildDirectory: './build' });
+
+  const [rootConfig, pageConfig] = await Promise.all([
+    getRootConfig(apiContext),
+    getPageConfig(apiContext, { pageId: '404' }),
+  ]);
+
+  return {
+    props: {
+      pageConfig,
+      rootConfig,
+    },
+  };
+}
+
+export default Page;

package/src/pages/[pageId].js

@@ -20,10 +20,9 @@ import Page from '../components/Page.js';
 
 export async function getServerSideProps(context) {
   const { pageId } = context.params;
-  const apiContext = await createApiContext({ buildDirectory: './.lowdefy/build' });
+  // TODO: get the right api context options
+  const apiContext = await createApiContext({ buildDirectory: './build' });
 
-  // TODO: Maybe we can only get rootConfig once?
-  // We can't do getServerSideProps on _app :(
   const [rootConfig, pageConfig] = await Promise.all([
     getRootConfig(apiContext),
     getPageConfig(apiContext, { pageId }),

package/src/pages/_app.js

@@ -20,14 +20,16 @@ import { ErrorBoundary } from '@lowdefy/block-utils';
 
 import LowdefyContext from '../components/LowdefyContext.js';
 
-import '../plugins/style.less';
+import '../../build/plugins/styles.less';
+
+const lowdefy = {};
 
 function App({ Component, pageProps }) {
   return (
     <ErrorBoundary>
       <Suspense>
-        <LowdefyContext>
-          {(lowdefy) => <Component lowdefy={lowdefy} {...pageProps} />}
+        <LowdefyContext lowdefy={lowdefy}>
+          <Component lowdefy={lowdefy} {...pageProps} />
         </LowdefyContext>
       </Suspense>
     </ErrorBoundary>

package/src/pages/_document.js

@@ -0,0 +1,38 @@
+/*
+  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 React from 'react';
+import Document, { Html, Head, Main, NextScript } from 'next/document';
+
+class LowdefyDocument extends Document {
+  render() {
+    return (
+      <Html>
+        <Head>
+          <link rel="manifest" href="/manifest.webmanifest" />
+          <link rel="icon" type="image/svg+xml" href="/icon.svg" />
+          <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+        </Head>
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    );
+  }
+}
+
+export default LowdefyDocument;

package/src/pages/api/request/[pageId]/[requestId].js

@@ -15,20 +15,23 @@
 */
 
 import { callRequest, createApiContext } from '@lowdefy/api';
-import connections from '../../../../../.lowdefy/build/plugins/connections.js';
+import { getSecretsFromEnv } from '@lowdefy/node-utils';
+import connections from '../../../../../build/plugins/connections.js';
+import operators from '../../../../../build/plugins/operatorsServer.js';
 
 export default async function handler(req, res) {
   try {
     if (req.method !== 'POST') {
       throw new Error('Only POST requests are supported.');
     }
+    // TODO: configure API context
     const apiContext = await createApiContext({
-      buildDirectory: './.lowdefy/build',
+      buildDirectory: './build',
       connections,
-      // TODO
+      // TODO: use a logger like pino
       logger: console,
-      // TODO
-      secrets: {},
+      operators,
+      secrets: getSecretsFromEnv(),
     });
     const { pageId, requestId } = req.query;
     const { payload } = req.body;

package/src/pages/index.js

@@ -14,13 +14,15 @@
   limitations under the License.
 */
 
-import { createApiContext, getHome, getPageConfig, getRootConfig } from '@lowdefy/api';
+import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 
 import Page from '../components/Page.js';
 
 export async function getServerSideProps() {
-  const apiContext = await createApiContext({ buildDirectory: './.lowdefy/build' });
-  const home = await getHome(apiContext);
+  // TODO: is this build directory configurable from the cli?
+  const apiContext = await createApiContext({ buildDirectory: './build' });
+  const rootConfig = await getRootConfig(apiContext);
+  const { home } = rootConfig;
   if (home.configured === false) {
     return {
       redirect: {
@@ -29,12 +31,7 @@ export async function getServerSideProps() {
       },
     };
   }
-
-  const [rootConfig, pageConfig] = await Promise.all([
-    getRootConfig(apiContext),
-    getPageConfig(apiContext, { pageId: home.pageId }),
-  ]);
-
+  const pageConfig = await getPageConfig(apiContext, { pageId: home.pageId });
   if (!pageConfig) {
     return {
       redirect: {
@@ -43,7 +40,6 @@ export async function getServerSideProps() {
       },
     };
   }
-
   return {
     props: {
       pageConfig,

package/src/utils/setupLink.js

@@ -16,29 +16,37 @@
 
 import { createLink } from '@lowdefy/engine';
 
-function setupLink({ lowdefy }) {
+function setupLink(lowdefy) {
   const { router, window } = lowdefy._internal;
-  const sameOriginLink = (path, newTab) => {
+  const backLink = () => router.back();
+  const disabledLink = () => {};
+  const newOriginLink = ({ url, query, newTab }) => {
     if (newTab) {
-      return window.open(`${window.location.origin}${lowdefy.basePath}${path}`, '_blank').focus();
+      return window.open(`${url}${query ? `?${query}` : ''}`, '_blank').focus();
     } else {
-      // Next handles the basePath here.
-      return router.push({
-        pathname: path,
-        // TODO: Do we handle urlQuery as a param here?
-        // query: {},
-      });
+      return window.location.assign(`${url}${query ? `?${query}` : ''}`);
     }
   };
-  const newOriginLink = (path, newTab) => {
+  const sameOriginLink = ({ newTab, pathname, query, setInput }) => {
     if (newTab) {
-      return window.open(path, '_blank').focus();
+      return window
+        .open(
+          `${window.location.origin}${lowdefy.basePath}${pathname}${query ? `?${query}` : ''}`,
+          '_blank'
+        )
+        .focus();
     } else {
-      return (window.location.href = path);
+      setInput();
+      return router.push({
+        pathname,
+        query,
+      });
     }
   };
-  const backLink = () => window.history.back();
-  return createLink({ backLink, lowdefy, newOriginLink, sameOriginLink });
+  const noLink = () => {
+    throw new Error(`Invalid Link.`);
+  };
+  return createLink({ backLink, disabledLink, lowdefy, newOriginLink, noLink, sameOriginLink });
 }
 
 export default setupLink;

package/src/plugins/style.less

@@ -1,3 +0,0 @@
-// ------------- GENERATED AT BUILD -------------
-@import '@lowdefy/blocks-antd/style.less';
-@import '@lowdefy/blocks-antd/blocks/Button/style.less';