@lowdefy/client 4.0.0-rc.6 → 4.0.0-rc.8

package/dist/Client.js

@@ -20,15 +20,16 @@ import DisplayMessage from './DisplayMessage.js';
 import Head from './Head.js';
 import ProgressBarController from './ProgressBarController.js';
 import initLowdefyContext from './initLowdefyContext.js';
-const Client = ({ auth , Components , config: rawConfig , resetContext ={
+const Client = ({ auth , Components , config: rawConfig , lowdefy , resetContext ={
     reset: false,
     setReset: ()=>undefined
 } , router , stage , types , window  })=>{
     const config = serializer.deserialize(rawConfig);
-    const lowdefy = initLowdefyContext({
+    initLowdefyContext({
         auth,
         Components,
         config,
+        lowdefy,
         router,
         stage,
         types,

package/dist/auth/createAuthMethods.js

@@ -34,14 +34,14 @@ function getCallbackUrl({ lowdefy , callbackUrl ={}  }) {
     }
     return undefined;
 }
-function createAuthMethods({ lowdefy , auth  }) {
+function createAuthMethods(lowdefy, auth) {
     // login and logout are Lowdefy function that handle action params
     // signIn and signOut are the next-auth methods
     function login({ authUrl , callbackUrl , providerId , ...rest } = {}) {
         if (type.isNone(providerId) && auth.authConfig.providers.length === 1) {
             providerId = auth.authConfig.providers[0].id;
         }
-        auth.signIn(providerId, {
+        return auth.signIn(providerId, {
             ...rest,
             callbackUrl: getCallbackUrl({
                 lowdefy,
@@ -50,7 +50,7 @@ function createAuthMethods({ lowdefy , auth  }) {
         }, authUrl?.urlQuery);
     }
     function logout({ callbackUrl , redirect  } = {}) {
-        auth.signOut({
+        return auth.signOut({
             callbackUrl: getCallbackUrl({
                 lowdefy,
                 callbackUrl
@@ -58,9 +58,14 @@ function createAuthMethods({ lowdefy , auth  }) {
             redirect
         });
     }
+    async function updateSession() {
+        const session = await auth.getSession();
+        lowdefy.user = session?.user ?? null;
+    }
     return {
         login,
-        logout
+        logout,
+        updateSession
     };
 }
 export default createAuthMethods;

package/dist/{callRequest.js → createCallRequest.js}

@@ -13,13 +13,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import request from './request.js';
-function callRequest({ pageId , payload , requestId  }) {
-    return request({
-        url: `/api/request/${pageId}/${requestId}`,
-        method: 'POST',
-        body: {
-            payload
-        }
-    });
+function createCallRequest({ basePath  }) {
+    function callRequest({ pageId , payload , requestId  }) {
+        return request({
+            url: `${basePath}/api/request/${pageId}/${requestId}`,
+            method: 'POST',
+            body: {
+                payload
+            }
+        });
+    }
+    return callRequest;
 }
-export default callRequest;
+export default createCallRequest;

package/dist/createLinkComponent.js

@@ -34,7 +34,7 @@ const createLinkComponent = (lowdefy, Link)=>{
                 id: id,
                 "aria-label": ariaLabel,
                 className: className,
-                href: `${window.location.origin}${lowdefy._internal.router.basePath}${pathname}${query ? `?${query}` : ''}`,
+                href: `${window.location.origin}${lowdefy.basePath}${pathname}${query ? `?${query}` : ''}`,
                 rel: rel || 'noopener noreferrer',
                 target: "_blank",
                 onClick: async (...params)=>{

package/dist/initLowdefyContext.js

@@ -12,60 +12,57 @@
   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 callRequest from './callRequest.js';
+*/ import createAuthMethods from './auth/createAuthMethods.js';
+import createCallRequest from './createCallRequest.js';
 import createIcon from './createIcon.js';
-import createAuthMethods from './auth/createAuthMethods.js';
 import createLinkComponent from './createLinkComponent.js';
 import setupLink from './setupLink.js';
-const lowdefy = {
-    _internal: {
-        callRequest,
-        components: {},
-        updaters: {},
-        displayMessage: ({ content  })=>{
-            console.log(content);
-            return ()=>undefined;
-        },
-        link: ()=>undefined,
-        progress: {
-            state: {
-                progress: 0
+function initLowdefyContext({ auth , Components , config , lowdefy , router , stage , types , window  }) {
+    if (!lowdefy._internal?.initialised) {
+        lowdefy._internal = {
+            actions: types.actions,
+            blockComponents: types.blocks,
+            components: {
+                Icon: createIcon(types.icons)
             },
-            dispatch: ()=>undefined
+            displayMessage: ({ content  })=>{
+                console.log(content);
+                return ()=>undefined;
+            },
+            globals: {
+                document: window.document,
+                fetch: window.fetch,
+                window
+            },
+            initialised: true,
+            link: ()=>undefined,
+            operators: types.operators,
+            progress: {
+                state: {
+                    progress: 0
+                },
+                dispatch: ()=>undefined
+            },
+            router,
+            updaters: {}
+        };
+        lowdefy.basePath = router.basePath;
+        lowdefy.contexts = {};
+        lowdefy.inputs = {};
+        lowdefy.lowdefyGlobal = config.rootConfig.lowdefyGlobal;
+        lowdefy._internal.auth = createAuthMethods(lowdefy, auth);
+        lowdefy._internal.callRequest = createCallRequest(lowdefy);
+        lowdefy._internal.components.Link = createLinkComponent(lowdefy, Components.Link);
+        lowdefy._internal.link = setupLink(lowdefy);
+        lowdefy._internal.updateBlock = (blockId)=>lowdefy._internal.updaters[blockId] && lowdefy._internal.updaters[blockId]();
+        if (stage === 'dev') {
+            window.lowdefy = lowdefy;
         }
-    },
-    contexts: {},
-    inputs: {},
-    lowdefyGlobal: {}
-};
-function initLowdefyContext({ auth , Components , config , router , stage , types , window  }) {
-    if (stage === 'dev') {
-        window.lowdefy = lowdefy;
     }
-    lowdefy.basePath = router.basePath;
     lowdefy.home = config.rootConfig.home || {};
-    lowdefy.lowdefyGlobal = config.rootConfig.lowdefyGlobal;
     lowdefy.menus = config.rootConfig.menus;
     lowdefy.pageId = config.pageConfig.pageId;
     lowdefy.user = auth?.session?.user ?? null;
-    lowdefy._internal.globals = {
-        document: window.document,
-        fetch: window.fetch,
-        window
-    };
-    lowdefy._internal.router = router;
-    lowdefy._internal.link = setupLink(lowdefy);
-    lowdefy._internal.updateBlock = (blockId)=>lowdefy._internal.updaters[blockId] && lowdefy._internal.updaters[blockId]();
-    lowdefy._internal.components.Link = createLinkComponent(lowdefy, Components.Link);
-    lowdefy._internal.components.Icon = createIcon(types.icons);
-    lowdefy._internal.actions = types.actions;
-    lowdefy._internal.blockComponents = types.blocks;
-    lowdefy._internal.operators = types.operators;
-    // TODO: discuss not using object arguments
-    lowdefy._internal.auth = createAuthMethods({
-        lowdefy,
-        auth
-    });
     return lowdefy;
 }
 export default initLowdefyContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/client",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.8",
   "license": "Apache-2.0",
   "description": "Lowdefy Client",
   "homepage": "https://lowdefy.com",
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "@ant-design/icons": "4.8.0",
-    "@lowdefy/block-utils": "4.0.0-rc.6",
-    "@lowdefy/engine": "4.0.0-rc.6",
-    "@lowdefy/helpers": "4.0.0-rc.6",
-    "@lowdefy/layout": "4.0.0-rc.6",
+    "@lowdefy/block-utils": "4.0.0-rc.8",
+    "@lowdefy/engine": "4.0.0-rc.8",
+    "@lowdefy/helpers": "4.0.0-rc.8",
+    "@lowdefy/layout": "4.0.0-rc.8",
     "classnames": "2.3.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"
@@ -52,7 +52,7 @@
   "devDependencies": {
     "@emotion/jest": "11.10.5",
     "@jest/globals": "28.1.0",
-    "@lowdefy/jest-yaml-transform": "4.0.0-rc.6",
+    "@lowdefy/jest-yaml-transform": "4.0.0-rc.8",
     "@swc/cli": "0.1.59",
     "@swc/core": "1.3.24",
     "@swc/jest": "0.2.24",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8238145a9eb26c6f3dc48661ab6eca6e3aca4f83"
+  "gitHead": "db883daef0443647439b6fe2db845b846ffb6d4e"
 }