mirror/lowdefy
2
0
Fork 0
mirror of https://github.com/lowdefy/lowdefy.git synced 2025-03-31 15:20:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): Handle try catch options in actions schema.

Browse Source
This commit is contained in:
Gervwyk 2021-06-03 14:38:31 +02:00
parent 305b3aa3f9
commit 7e05b0eb75
3 changed files with 218 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/build/src/build/buildPages/buildBlock.js
View File

@ -30,6 +30,7 @@ async function buildBlock(block, blockContext) {
block.blockId = block.id;
block.id = `block:${blockContext.pageId}:${block.id}`;
await setBlockMeta(block, blockContext.metaLoader, blockContext.pageId);
let newBlockContext = blockContext;
if (block.meta.category === 'context') {
newBlockContext = {
@ -44,6 +45,32 @@ async function buildBlock(block, blockContext) {
if (block.meta.category === 'context') {
block.requests = newBlockContext.requests;
}
if (block.events) {
Object.keys(block.events).map((key) => {
if (type.isArray(block.events[key])) {
block.events[key] = {
try: block.events[key],
catch: [],
};
}
if (!type.isArray(block.events[key].try)) {
throw new Error(
`Events must be an array of actions at ${block.blockId} in events ${key} on page ${
newBlockContext.pageId
}. Received ${JSON.stringify(block.events[key].try)}`
);
}
if (!type.isArray(block.events[key].catch) && !type.isNone(block.events[key].catch)) {
throw new Error(
`Catch events must be an array of actions at ${block.blockId} in events ${key} on page ${
newBlockContext.pageId
}. Received ${JSON.stringify(block.events[key].catch)}`
);
}
});
}
if (!type.isNone(block.blocks)) {
if (!type.isArray(block.blocks)) {
throw new Error(

164
packages/build/src/build/buildPages/buildPages.test.js
View File

@ -1760,3 +1760,167 @@ describe('web operators', () => {
]);
});
});
test('block events actions array should map to try catch', async () => {
const components = {
pages: [
{
id: 'page_1',
type: 'Context',
auth,
blocks: [
{
id: 'block_1',
type: 'Input',
events: {
onClick: [
{
id: 'action_1',
type: 'Reset',
},
],
},
},
],
},
],
};
const res = await buildPages({ components, context });
expect(get(res, 'pages.0.areas.content.blocks.0.events.onClick.try')).toEqual([
{
id: 'action_1',
type: 'Reset',
},
]);
expect(get(res, 'pages.0.areas.content.blocks.0.events.onClick.catch')).toEqual([]);
});
test('block events actions as try catch arrays', async () => {
const components = {
pages: [
{
id: 'page_1',
type: 'Context',
auth,
blocks: [
{
id: 'block_1',
type: 'Input',
events: {
onClick: {
try: [
{
id: 'action_1',
type: 'Reset',
},
],
catch: [
{
id: 'action_1',
type: 'Retry',
},
],
},
},
},
],
},
],
};
const res = await buildPages({ components, context });
expect(get(res, 'pages.0.areas.content.blocks.0.events.onClick.try')).toEqual([
{
id: 'action_1',
type: 'Reset',
},
]);
expect(get(res, 'pages.0.areas.content.blocks.0.events.onClick.catch')).toEqual([
{
id: 'action_1',
type: 'Retry',
},
]);
});
test('block events actions try not an array', async () => {
const components = {
pages: [
{
id: 'page_1',
type: 'Context',
auth,
blocks: [
{
id: 'block_1',
type: 'Input',
events: {
onClick: {
try: {
id: 'action_1',
type: 'Reset',
},
},
},
},
],
},
],
};
await expect(buildPages({ components, context })).rejects.toThrow(
'Events must be an array of actions at block_1 in events onClick on page page_1. Received {"id":"action_1","type":"Reset"}'
);
});
test('block events actions not an array', async () => {
const components = {
pages: [
{
id: 'page_1',
type: 'Context',
auth,
blocks: [
{
id: 'block_1',
type: 'Input',
events: {
onClick: {},
},
},
],
},
],
};
await expect(buildPages({ components, context })).rejects.toThrow(
'Events must be an array of actions at block_1 in events onClick on page page_1. Received undefined'
);
});
test('block events actions catch not an array', async () => {
const components = {
pages: [
{
id: 'page_1',
type: 'Context',
auth,
blocks: [
{
id: 'block_1',
type: 'Input',
events: {
onClick: {
try: [],
catch: {
id: 'action_1',
type: 'Reset',
},
},
},
},
],
},
],
};
await expect(buildPages({ components, context })).rejects.toThrow(
'Catch events must be an array of actions at block_1 in events onClick on page page_1. Received {"id":"action_1","type":"Reset"}'
);
});

32
packages/build/src/lowdefySchema.json
View File

@ -248,10 +248,32 @@
"type": "object",
"patternProperties": {
"^.*$": {
"type": "array",
"items": {
"$ref": "#/definitions/action"
}
"anyOf": [
{
"type": "array",
"items": {
"$ref": "#/definitions/action"
}
},
{
"type": "object",
"additionalProperties": false,
"properties": {
"try": {
"type": "array",
"items": {
"$ref": "#/definitions/action"
}
},
"catch": {
"type": "array",
"items": {
"$ref": "#/definitions/action"
}
}
}
}
]
}
},
"errorMessage": {
@ -400,7 +422,7 @@
}
},
"menuItem": {
"$anyOf": [
"anyOf": [
{
"$ref": "#/definitions/menuGroup"
},