@lowdefy/server-dev 4.0.0-alpha.7 → 4.0.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-alpha.7",
+  "version": "4.0.0-alpha.8",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -32,45 +32,42 @@
     ".eslintrc.yaml"
   ],
   "scripts": {
-    "build:lowdefy": "lowdefy-build",
-    "build:next": "next build",
-    "dev": "next dev",
-    "start": "node src/manager/run.mjs",
+    "start": "node manager/run.mjs",
     "lint": "next lint",
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/api": "4.0.0-alpha.7",
-    "@lowdefy/block-utils": "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/build": "4.0.0-alpha.7",
-    "@lowdefy/connection-axios-http": "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-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/api": "4.0.0-alpha.8",
+    "@lowdefy/block-utils": "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/build": "4.0.0-alpha.8",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.8",
+    "@lowdefy/engine": "4.0.0-alpha.8",
+    "@lowdefy/helpers": "4.0.0-alpha.8",
+    "@lowdefy/layout": "4.0.0-alpha.8",
+    "@lowdefy/node-utils": "4.0.0-alpha.8",
+    "@lowdefy/operators-change-case": "4.0.0-alpha.8",
+    "@lowdefy/operators-diff": "4.0.0-alpha.8",
+    "@lowdefy/operators-js": "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",
     "chokidar": "3.5.3",
     "dotenv": "15.0.0",
-    "js-yaml": "4.1.0",
     "next": "12.0.10",
     "next-auth": "4.1.2",
     "opener": "1.5.2",
-    "react": "18.0.0-rc.0",
-    "react-dom": "18.0.0-rc.0",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "react-icons": "4.3.1",
     "swr": "1.1.2",
+    "yaml": "2.0.0-10",
     "yargs": "17.3.1"
   },
   "devDependencies": {
@@ -82,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "52ec14639d00de910cf9b8ab25bf933ca891cff5"
+  "gitHead": "9d56b83cf45e868afe3a1eeba750fe826eb74c8c"
 }

package/src/components/App.js

@@ -1,57 +0,0 @@
-/*
-  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 { urlQuery } from '@lowdefy/helpers';
-import { useRouter } from 'next/router';
-
-import Page from './Page.js';
-import Reload from './Reload.js';
-import setPageId from '../utils/setPageId.js';
-import setupLink from '../utils/setupLink.js';
-import useRootConfig from '../utils/useRootConfig.js';
-import createComponents from './createComponents.js';
-
-const App = ({ lowdefy }) => {
-  const router = useRouter();
-  const { data: rootConfig } = useRootConfig(router.basePath);
-
-  window.lowdefy = lowdefy;
-
-  lowdefy._internal.router = router;
-  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));
-
-  const redirect = setPageId(lowdefy);
-  if (redirect) {
-    lowdefy._internal.router.push(`/${lowdefy.pageId}`);
-  }
-
-  return (
-    <Reload lowdefy={lowdefy}>
-      <Page lowdefy={lowdefy} />
-    </Reload>
-  );
-};
-
-export default App;

package/src/components/Context.js

@@ -1,62 +0,0 @@
-/*
-  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, { useEffect, useState } from 'react';
-import getContext from '@lowdefy/engine';
-
-import MountEvents from './block/MountEvents.js';
-
-const Context = ({ children, lowdefy, config }) => {
-  const [context, setContext] = useState({});
-
-  useEffect(() => {
-    let mounted = true;
-    const mount = async () => {
-      const ctx = await getContext({
-        config,
-        lowdefy,
-        development: true,
-      });
-      if (mounted) {
-        setContext(ctx);
-      }
-    };
-    mount();
-    return () => {
-      mounted = false;
-    };
-  }, [config, lowdefy]);
-  const loadingPage = context.id !== config.id;
-
-  if (loadingPage) {
-    return children(context, loadingPage, 'pager');
-  }
-
-  return (
-    <MountEvents
-      asyncEventName="onEnterAsync"
-      context={context}
-      eventName="onEnter"
-      triggerEvent={({ name, context }) =>
-        context._internal.RootBlocks.areas.root.blocks[0].triggerEvent({ name })
-      }
-    >
-      {(loading) => children(context, loading, 'mounter')}
-    </MountEvents>
-  );
-};
-
-export default Context;

package/src/components/Head.js

@@ -1,28 +0,0 @@
-/*
-  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 Head from 'next/head';
-
-const BindHead = ({ properties }) => {
-  return (
-    <Head>
-      <title>{properties.title}</title>
-    </Head>
-  );
-};
-
-export default BindHead;

package/src/components/LowdefyContext.js

@@ -1,50 +0,0 @@
-/*
-  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 actions from '../../build/plugins/actions.js';
-import callRequest from '../utils/callRequest.js';
-import blockComponents from '../../build/plugins/blocks.js';
-import operators from '../../build/plugins/operatorsClient.js';
-
-const LowdefyContext = ({ children, lowdefy }) => {
-  if (!lowdefy._internal) {
-    lowdefy._internal = {
-      actions,
-      blockComponents,
-      callRequest,
-      components: {},
-      document,
-      operators,
-      updaters: {},
-      window,
-      displayMessage: ({ content }) => {
-        console.log(content);
-        return () => undefined;
-      },
-      link: () => undefined,
-    };
-    lowdefy.contexts = {};
-    lowdefy.inputs = {};
-    lowdefy.lowdefyGlobal = {};
-  }
-  lowdefy._internal.updateBlock = (blockId) =>
-    lowdefy._internal.updaters[blockId] && lowdefy._internal.updaters[blockId]();
-  return <>{children}</>;
-};
-
-export default LowdefyContext;

package/src/components/Page.js

@@ -1,54 +0,0 @@
-/*
-  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 Block from './block/Block.js';
-import Context from './Context.js';
-import Head from './Head.js';
-import usePageConfig from '../utils/usePageConfig.js';
-
-const LoadingBlock = () => <div>Loading...</div>;
-
-const Page = ({ lowdefy }) => {
-  const { data: pageConfig } = usePageConfig(lowdefy.pageId, lowdefy.basePath);
-  if (!pageConfig) {
-    lowdefy._internal.router.replace(`/404`);
-    return <LoadingBlock />;
-  }
-  return (
-    <Context config={pageConfig} lowdefy={lowdefy}>
-      {(context, loading) => {
-        if (loading) {
-          return <LoadingBlock />;
-        }
-        return (
-          <>
-            <Head properties={context._internal.RootBlocks.map[pageConfig.id].eval.properties} />
-            <Block
-              block={context._internal.RootBlocks.map[pageConfig.id]}
-              Blocks={context._internal.RootBlocks}
-              context={context}
-              lowdefy={lowdefy}
-            />
-          </>
-        );
-      }}
-    </Context>
-  );
-};
-
-export default Page;

package/src/components/Reload.js

@@ -1,43 +0,0 @@
-/*
-  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, { useEffect } from 'react';
-
-import useMutateCache from '../utils/useMutateCache.js';
-import waitForRestartedServer from '../utils/waitForRestartedServer.js';
-
-const Reload = ({ children, lowdefy }) => {
-  const mutateCache = useMutateCache(lowdefy.basePath);
-  useEffect(() => {
-    const sse = new EventSource(`${lowdefy.basePath}/api/reload`);
-
-    sse.addEventListener('reload', () => {
-      mutateCache();
-      console.log('Reloaded config.');
-    });
-
-    sse.onerror = () => {
-      sse.close();
-      waitForRestartedServer(lowdefy);
-    };
-    return () => {
-      sse.close();
-    };
-  }, []);
-  return <>{children}</>;
-};
-
-export default Reload;

package/src/components/block/Block.js

@@ -1,57 +0,0 @@
-/*
-  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, { Suspense, useState } from 'react';
-
-import { ErrorBoundary } from '@lowdefy/block-utils';
-
-import CategorySwitch from './CategorySwitch.js';
-import LoadingBlock from './LoadingBlock.js';
-import MountEvents from './MountEvents.js';
-
-const Block = ({ block, Blocks, context, isRoot, lowdefy }) => {
-  const [updates, setUpdate] = useState(0);
-  lowdefy._internal.updaters[block.id] = () => setUpdate(updates + 1);
-  return (
-    <ErrorBoundary>
-      <Suspense fallback={<LoadingBlock block={block} lowdefy={lowdefy} />}>
-        <MountEvents
-          asyncEventName="onMountAsync"
-          context={context}
-          eventName="onMount"
-          triggerEvent={block.triggerEvent}
-        >
-          {(loading) =>
-            loading ? (
-              <LoadingBlock block={block} lowdefy={lowdefy} />
-            ) : (
-              <CategorySwitch
-                block={block}
-                Blocks={Blocks}
-                context={context}
-                isRoot={isRoot}
-                lowdefy={lowdefy}
-                updates={updates}
-              />
-            )
-          }
-        </MountEvents>
-      </Suspense>
-    </ErrorBoundary>
-  );
-};
-
-export default Block;

package/src/components/block/CategorySwitch.js

@@ -1,117 +0,0 @@
-/*
-  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 { BlockLayout } from '@lowdefy/layout';
-import { makeCssClass } from '@lowdefy/block-utils';
-
-import Container from './Container.js';
-import List from './List.js';
-
-const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
-  if (!block.eval) return null; // Renderer updates before eval is executed for the first time on lists. See #520
-  if (block.eval.visible === false)
-    return <div id={`vs-${block.blockId}`} style={{ display: 'none' }} />;
-  const Component = lowdefy._internal.blockComponents[block.type];
-  switch (Component.meta.category) {
-    case 'list':
-      return (
-        <List
-          block={block}
-          Blocks={Blocks}
-          Component={Component}
-          context={context}
-          lowdefy={lowdefy}
-        />
-      );
-    case 'container':
-      return (
-        <Container
-          block={block}
-          Blocks={Blocks}
-          Component={Component}
-          context={context}
-          lowdefy={lowdefy}
-        />
-      );
-    case 'input':
-      return (
-        <BlockLayout
-          id={`bl-${block.blockId}`}
-          blockStyle={block.eval.style}
-          highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
-          layout={block.eval.layout || {}}
-          makeCssClass={makeCssClass}
-        >
-          <Component
-            methods={Object.assign(block.methods, {
-              makeCssClass,
-              registerEvent: block.registerEvent,
-              registerMethod: block.registerMethod,
-              setValue: block.setValue,
-              triggerEvent: block.triggerEvent,
-            })}
-            basePath={lowdefy.basePath}
-            blockId={block.blockId}
-            components={lowdefy._internal.components}
-            events={block.eval.events}
-            key={block.blockId}
-            loading={block.loading}
-            menus={lowdefy.menus}
-            pageId={lowdefy.pageId}
-            properties={block.eval.properties}
-            required={block.eval.required}
-            user={lowdefy.user}
-            validation={block.eval.validation}
-            value={block.value}
-          />
-        </BlockLayout>
-      );
-    default:
-      return (
-        <BlockLayout
-          id={`bl-${block.blockId}`}
-          blockStyle={block.eval.style}
-          highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
-          layout={block.eval.layout || {}}
-          makeCssClass={makeCssClass}
-        >
-          <Component
-            methods={Object.assign(block.methods, {
-              makeCssClass,
-              registerEvent: block.registerEvent,
-              registerMethod: block.registerMethod,
-              triggerEvent: block.triggerEvent,
-            })}
-            basePath={lowdefy.basePath}
-            blockId={block.blockId}
-            components={lowdefy._internal.components}
-            events={block.eval.events}
-            key={block.blockId}
-            loading={block.loading}
-            menus={lowdefy.menus}
-            pageId={lowdefy.pageId}
-            properties={block.eval.properties}
-            required={block.eval.required}
-            user={lowdefy.user}
-            validation={block.eval.validation}
-          />
-        </BlockLayout>
-      );
-  }
-};
-
-export default CategorySwitch;

package/src/components/block/Container.js

@@ -1,86 +0,0 @@
-/*
-  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 { Area, BlockLayout, layoutParamsToArea } from '@lowdefy/layout';
-import { makeCssClass } from '@lowdefy/block-utils';
-
-import Block from './Block.js';
-
-const Container = ({ block, Blocks, Component, context, lowdefy }) => {
-  const content = {};
-  // eslint-disable-next-line prefer-destructuring
-  const areas = Blocks.subBlocks[block.id][0].areas;
-  Object.keys(areas).forEach((areaKey) => {
-    content[areaKey] = (areaStyle) => (
-      <Area
-        id={`ar-${block.blockId}-${areaKey}`}
-        key={`ar-${block.blockId}-${areaKey}`}
-        area={layoutParamsToArea({
-          area: block.eval.areas[areaKey] || {},
-          areaKey,
-          layout: block.eval.layout || {},
-        })}
-        areaStyle={[areaStyle, block.eval.areas[areaKey] && block.eval.areas[areaKey].style]}
-        highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
-        makeCssClass={makeCssClass}
-      >
-        {areas[areaKey].blocks.map((bl) => (
-          <Block
-            key={`co-${bl.blockId}`}
-            Blocks={Blocks.subBlocks[block.id][0]}
-            block={bl}
-            context={context}
-            lowdefy={lowdefy}
-          />
-        ))}
-      </Area>
-    );
-  });
-  return (
-    <BlockLayout
-      id={`bl-${block.blockId}`}
-      blockStyle={block.eval.style}
-      highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
-      layout={block.eval.layout || {}}
-      makeCssClass={makeCssClass}
-    >
-      <Component
-        methods={Object.assign(block.methods, {
-          makeCssClass,
-          registerEvent: block.registerEvent,
-          registerMethod: block.registerMethod,
-          triggerEvent: block.triggerEvent,
-        })}
-        basePath={lowdefy.basePath}
-        blockId={block.blockId}
-        components={lowdefy._internal.components}
-        content={content}
-        events={block.eval.events}
-        key={block.blockId}
-        loading={block.loading}
-        menus={lowdefy.menus}
-        pageId={lowdefy.pageId}
-        properties={block.eval.properties}
-        required={block.eval.required}
-        user={lowdefy.user}
-        validation={block.eval.validation}
-      />
-    </BlockLayout>
-  );
-};
-
-export default Container;