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

package/dist/context/createApiContext.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createReadConfigFile from './readConfigFile.js';
-async function createApiContext({ buildDirectory , connections , logger , secrets  }) {
+async function createApiContext({ buildDirectory , connections , logger , operators , secrets  }) {
     const readConfigFile = createReadConfigFile({
         buildDirectory
     });
@@ -25,6 +25,7 @@ async function createApiContext({ buildDirectory , connections , logger , secret
         config,
         connections,
         logger,
+        operators,
         readConfigFile,
         secrets
     };

package/dist/context/errors.js

@@ -19,26 +19,26 @@
     }
 };
 let ConfigurationError = class ConfigurationError extends Error {
-    constructor(message1){
-        super(message1);
+    constructor(message){
+        super(message);
         this.name = 'ConfigurationError';
     }
 };
 let RequestError = class RequestError extends Error {
-    constructor(message2){
-        super(message2);
+    constructor(message){
+        super(message);
         this.name = 'RequestError';
     }
 };
 let ServerError = class ServerError extends Error {
-    constructor(message3){
-        super(message3);
+    constructor(message){
+        super(message);
         this.name = 'ServerError';
     }
 };
 let TokenExpiredError = class TokenExpiredError extends Error {
-    constructor(message4){
-        super(message4);
+    constructor(message){
+        super(message);
         this.name = 'TokenExpiredError';
     }
 };

package/dist/index.js

@@ -14,8 +14,8 @@
   limitations under the License.
 */ import callRequest from './routes/request/callRequest.js';
 import createApiContext from './context/createApiContext.js';
-import getHome from './routes/rootConfig/getHome.js';
+import getHomeAndMenus from './routes/rootConfig/getHomeAndMenus.js';
 import getPageConfig from './routes/page/getPageConfig.js';
 import getRootConfig from './routes/rootConfig/getRootConfig.js';
 import { AuthenticationError, ConfigurationError, RequestError, ServerError, TokenExpiredError } from './context/errors.js';
-export { callRequest, createApiContext, getHome, getPageConfig, getRootConfig, AuthenticationError, ConfigurationError, RequestError, ServerError, TokenExpiredError };
+export { AuthenticationError, callRequest, ConfigurationError, createApiContext, getHomeAndMenus, getPageConfig, getRootConfig, RequestError, ServerError, TokenExpiredError };

package/dist/routes/page/getPageConfig.js

@@ -14,7 +14,10 @@
   limitations under the License.
 */ async function getPageConfig({ authorize , readConfigFile  }, { pageId  }) {
     const pageConfig = await readConfigFile(`pages/${pageId}/${pageId}.json`);
-    if (pageConfig && authorize(pageConfig)) return pageConfig;
+    if (pageConfig && authorize(pageConfig)) {
+        delete pageConfig.auth;
+        return pageConfig;
+    }
     return null;
 }
 export default getPageConfig;

package/dist/routes/request/evaluateOperators.js

@@ -12,40 +12,33 @@
   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 { NodeParser } from '@lowdefy/operators';
-// import { RequestError } from '../../context/errors.js';
-// async function evaluateOperators({ secrets, user }, { connectionConfig, payload, requestConfig }) {
-//   const operatorsParser = new NodeParser({
-//     payload,
-//     secrets,
-//     user,
-//   });
-//   await operatorsParser.init();
-//   const { output: connectionProperties, errors: connectionErrors } = operatorsParser.parse({
-//     input: connectionConfig.properties || {},
-//     location: connectionConfig.connectionId,
-//   });
-//   if (connectionErrors.length > 0) {
-//     throw new RequestError(connectionErrors[0]);
-//   }
-//   const { output: requestProperties, errors: requestErrors } = operatorsParser.parse({
-//     input: requestConfig.properties || {},
-//     location: requestConfig.requestId,
-//   });
-//   if (requestErrors.length > 0) {
-//     throw new RequestError(requestErrors[0]);
-//   }
-//   return {
-//     connectionProperties,
-//     requestProperties,
-//   };
-// }
-async function evaluateOperators({ secrets , user  }, { connectionConfig , payload , requestConfig  }) {
+*/ import { NodeParser } from '@lowdefy/operators';
+import { RequestError } from '../../context/errors.js';
+async function evaluateOperators({ operators , secrets , user  }, { connectionConfig , payload , requestConfig  }) {
+    const operatorsParser = new NodeParser({
+        operators,
+        payload,
+        secrets,
+        user
+    });
+    await operatorsParser.init();
+    const { output: connectionProperties , errors: connectionErrors  } = operatorsParser.parse({
+        input: connectionConfig.properties || {},
+        location: connectionConfig.connectionId
+    });
+    if (connectionErrors.length > 0) {
+        throw new RequestError(connectionErrors[0]);
+    }
+    const { output: requestProperties , errors: requestErrors  } = operatorsParser.parse({
+        input: requestConfig.properties || {},
+        location: requestConfig.requestId
+    });
+    if (requestErrors.length > 0) {
+        throw new RequestError(requestErrors[0]);
+    }
     return {
-        connectionProperties: connectionConfig.properties || {
-        },
-        requestProperties: requestConfig.properties || {
-        }
+        connectionProperties,
+        requestProperties
     };
 }
 export default evaluateOperators;

package/dist/routes/rootConfig/{findHome.js → getHomeAndMenus.js}

@@ -13,11 +13,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { get } from '@lowdefy/helpers';
-function findHome({ config  }, { menus  }) {
-    if (get(config, 'homePageId')) {
+import getMenus from './menus/getMenus.js';
+async function getHomeAndMenus(context) {
+    const menus = await getMenus(context);
+    const homePageId = get(context.config, 'homePageId');
+    if (homePageId) {
         return {
-            pageId: config.homePageId,
-            configured: true
+            home: {
+                configured: true,
+                pageId: homePageId
+            },
+            menus
         };
     }
     let defaultMenu = menus.find((menu)=>menu.menuId === 'default'
@@ -41,8 +47,11 @@ function findHome({ config  }, { menus  }) {
         });
     }
     return {
-        pageId,
-        configured: false
+        home: {
+            configured: false,
+            pageId
+        },
+        menus
     };
 }
-export default findHome;
+export default getHomeAndMenus;

package/dist/routes/rootConfig/getLowdefyGlobal.js

@@ -14,7 +14,6 @@
   limitations under the License.
 */ async function getLowdefyGlobal({ readConfigFile  }) {
     const lowdefyGlobal = await readConfigFile('global.json');
-    return lowdefyGlobal || {
-    };
+    return lowdefyGlobal || {};
 }
 export default getLowdefyGlobal;

package/dist/routes/rootConfig/getRootConfig.js

@@ -12,19 +12,16 @@
   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 findHome from './findHome.js';
+*/ import getHomeAndMenus from './getHomeAndMenus.js';
 import getLowdefyGlobal from './getLowdefyGlobal.js';
-import getMenus from './menus/getMenus.js';
 async function getRootConfig(context) {
-    const [lowdefyGlobal, menus] = await Promise.all([
+    const [lowdefyGlobal, { home , menus  }] = await Promise.all([
         getLowdefyGlobal(context),
-        getMenus(context)
+        getHomeAndMenus(context), 
     ]);
     return {
         authenticated: context.authenticated,
-        home: findHome(context, {
-            menus
-        }),
+        home,
         lowdefyGlobal,
         menus
     };

package/dist/routes/rootConfig/menus/filterMenus.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { get } from '@lowdefy/helpers';
-import filterMenuList from './filterMenuList';
+import filterMenuList from './filterMenuList.js';
 function filterMenus(context, { menus  }) {
     return menus.map((menu)=>{
         return {

package/dist/routes/rootConfig/menus/getMenus.js

@@ -12,7 +12,7 @@
   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 filterMenus from './filterMenus';
+*/ import filterMenus from './filterMenus.js';
 async function getMenus(context) {
     const unfilteredMenus = await context.readConfigFile('menus.json');
     return filterMenus(context, {

package/dist/test/testContext.js

@@ -13,21 +13,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import createAuthorize from '../context/createAuthorize.js';
-function testContext({ config ={
-} , connections ={
-} , headers ={
-} , host ='host' , logger ={
-    debug: ()=>{
-    },
-    error: ()=>{
-    },
-    info: ()=>{
-    },
-    warn: ()=>{
-    }
-} , readConfigFile , roles , secrets ={
-} , setHeader , user , protocol ='https' ,  } = {
-}) {
+function testContext({ config ={} , connections ={} , headers ={} , host ='host' , logger ={
+    debug: ()=>{},
+    error: ()=>{},
+    info: ()=>{},
+    warn: ()=>{}
+} , operators ={
+    _test: ()=>'test'
+} , readConfigFile , roles , secrets ={} , setHeader , user , protocol ='https' ,  } = {}) {
     const authenticated = user && !!user.sub;
     return {
         authenticated,
@@ -40,6 +33,7 @@ function testContext({ config ={
         headers,
         host,
         logger,
+        operators,
         protocol,
         readConfigFile,
         secrets,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/api",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.7",
   "licence": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -38,23 +38,25 @@
     "clean": "rm -rf dist",
     "prepare": "yarn build",
     "swc": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
-    "test": "jest --coverage"
+    "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "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/operators": "4.0.0-alpha.1"
+    "@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/operators": "4.0.0-alpha.7"
   },
   "devDependencies": {
-    "@swc/cli": "0.1.52",
-    "@swc/core": "1.2.112",
-    "@swc/jest": "0.2.9",
-    "jest": "27.3.1"
+    "@jest/globals": "27.5.1",
+    "@lowdefy/operators-js": "4.0.0-alpha.7",
+    "@swc/cli": "0.1.55",
+    "@swc/core": "1.2.135",
+    "@swc/jest": "0.2.17",
+    "jest": "27.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c97a8fa6b5a641e7d50df09f5601a9c586eeb65a"
+  "gitHead": "52ec14639d00de910cf9b8ab25bf933ca891cff5"
 }

package/dist/routes/rootConfig/getHome.js

@@ -1,25 +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 findHome from './findHome.js';
-import getMenus from './menus/getMenus.js';
-async function getHome(context) {
-    // TODO: We can optimise here as we don't need to read menus if homepageId is configured
-    // but not sure if it is worth the added complexity
-    const menus = await getMenus(context);
-    return findHome(context, {
-        menus
-    });
-}
-export default getHome;