@lowdefy/build 4.0.0-alpha.11 → 4.0.0-alpha.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build/addDefaultPages/addDefaultPages.js +2 -3
- package/dist/build/buildAuth/buildAuth.js +4 -1
- package/dist/build/buildAuth/getProtectedPages.js +2 -4
- package/dist/build/buildConnections.js +1 -1
- package/dist/build/buildImports/buildIconImports.js +7 -16
- package/dist/build/buildImports/buildImportsDev.js +4 -4
- package/dist/build/buildImports/buildImportsProd.js +4 -3
- package/dist/build/buildImports/buildStyleImports.js +3 -6
- package/dist/build/buildImports/defaultIconsDev.js +584 -0
- package/dist/build/buildImports/defaultIconsProd.js +21 -0
- package/dist/build/buildMenu.js +9 -13
- package/dist/build/buildPages/buildBlock/buildBlock.js +2 -2
- package/dist/build/buildPages/buildBlock/buildEvents.js +7 -9
- package/dist/build/buildPages/buildBlock/buildSubBlocks.js +2 -7
- package/dist/build/buildPages/buildPage.js +2 -2
- package/dist/build/buildPages/buildPages.js +3 -5
- package/dist/build/buildPages/buildTestPage.js +46 -0
- package/dist/build/buildRefs/evaluateBuildOperators.js +2 -3
- package/dist/build/buildTypes.js +2 -4
- package/dist/build/testSchema.js +4 -5
- package/dist/build/validateApp.js +1 -1
- package/dist/build/validateConfig.js +1 -1
- package/dist/build/writePages.js +1 -2
- package/dist/build/writeRequests.js +1 -2
- package/dist/createContext.js +54 -0
- package/dist/{defaultTypesMap.json → defaultTypesMap.js} +285 -283
- package/dist/index.js +13 -53
- package/dist/lowdefySchema.js +6 -0
- package/dist/scripts/generateDefaultTypes.js +4 -1
- package/dist/test/buildRefs/testBuildRefsResolver.js +1 -1
- package/dist/test/testContext.js +6 -1
- package/package.json +44 -41
|
@@ -35,6 +35,9 @@ function checkAction(action, { blockId , checkDuplicateActionId , eventId , page
|
|
|
35
35
|
function buildEvents(block, pageContext) {
|
|
36
36
|
if (block.events) {
|
|
37
37
|
Object.keys(block.events).map((key)=>{
|
|
38
|
+
if (!type.isArray(block.events[key]) && !type.isObject(block.events[key]) || type.isObject(block.events[key]) && type.isNone(block.events[key].try)) {
|
|
39
|
+
throw new Error(`Actions must be an array at "${block.blockId}" in event "${key}" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
|
|
40
|
+
}
|
|
38
41
|
if (type.isArray(block.events[key])) {
|
|
39
42
|
block.events[key] = {
|
|
40
43
|
try: block.events[key],
|
|
@@ -42,13 +45,10 @@ function buildEvents(block, pageContext) {
|
|
|
42
45
|
};
|
|
43
46
|
}
|
|
44
47
|
if (!type.isArray(block.events[key].try)) {
|
|
45
|
-
throw new Error(`
|
|
46
|
-
}
|
|
47
|
-
if (type.isNone(block.events[key].catch)) {
|
|
48
|
-
block.events[key].catch = [];
|
|
48
|
+
throw new Error(`Try actions must be an array at "${block.blockId}" in event "${key}.try" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
|
|
49
49
|
}
|
|
50
50
|
if (!type.isArray(block.events[key].catch)) {
|
|
51
|
-
throw new Error(`Catch
|
|
51
|
+
throw new Error(`Catch actions must be an array at "${block.blockId}" in event "${key}.catch" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].catch)}`);
|
|
52
52
|
}
|
|
53
53
|
const checkDuplicateActionId = createCheckDuplicateId({
|
|
54
54
|
message: 'Duplicate actionId "{{ id }}" on event "{{ eventId }}" on block "{{ blockId }}" on page "{{ pageId }}".'
|
|
@@ -59,16 +59,14 @@ function buildEvents(block, pageContext) {
|
|
|
59
59
|
typeCounters: pageContext.typeCounters,
|
|
60
60
|
pageId: pageContext.pageId,
|
|
61
61
|
checkDuplicateActionId
|
|
62
|
-
})
|
|
63
|
-
);
|
|
62
|
+
}));
|
|
64
63
|
block.events[key].catch.map((action)=>checkAction(action, {
|
|
65
64
|
eventId: key,
|
|
66
65
|
blockId: block.blockId,
|
|
67
66
|
typeCounters: pageContext.typeCounters,
|
|
68
67
|
pageId: pageContext.pageId,
|
|
69
68
|
checkDuplicateActionId
|
|
70
|
-
})
|
|
71
|
-
);
|
|
69
|
+
}));
|
|
72
70
|
});
|
|
73
71
|
}
|
|
74
72
|
}
|
|
@@ -14,9 +14,8 @@
|
|
|
14
14
|
limitations under the License.
|
|
15
15
|
*/ import { type } from '@lowdefy/helpers';
|
|
16
16
|
import buildBlock from './buildBlock.js';
|
|
17
|
-
|
|
17
|
+
function buildSubBlocks(block, pageContext) {
|
|
18
18
|
if (type.isObject(block.areas)) {
|
|
19
|
-
let promises = [];
|
|
20
19
|
Object.keys(block.areas).forEach((key)=>{
|
|
21
20
|
if (type.isNone(block.areas[key].blocks)) {
|
|
22
21
|
block.areas[key].blocks = [];
|
|
@@ -24,12 +23,8 @@ async function buildSubBlocks(block, pageContext) {
|
|
|
24
23
|
if (!type.isArray(block.areas[key].blocks)) {
|
|
25
24
|
throw new Error(`Expected blocks to be an array at ${block.blockId} in area ${key} on page ${pageContext.pageId}. Received ${JSON.stringify(block.areas[key].blocks)}`);
|
|
26
25
|
}
|
|
27
|
-
|
|
28
|
-
await buildBlock(blk, pageContext);
|
|
29
|
-
});
|
|
30
|
-
promises = promises.concat(blockPromises);
|
|
26
|
+
block.areas[key].blocks.map((blk)=>buildBlock(blk, pageContext));
|
|
31
27
|
});
|
|
32
|
-
await Promise.all(promises);
|
|
33
28
|
}
|
|
34
29
|
}
|
|
35
30
|
export default buildSubBlocks;
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
import buildBlock from './buildBlock/buildBlock.js';
|
|
17
17
|
import createCheckDuplicateId from '../../utils/createCheckDuplicateId.js';
|
|
18
18
|
import createCounter from '../../utils/createCounter.js';
|
|
19
|
-
|
|
19
|
+
function buildPage({ page , index , context , checkDuplicatePageId }) {
|
|
20
20
|
if (type.isUndefined(page.id)) {
|
|
21
21
|
throw new Error(`Page id missing at page ${index}.`);
|
|
22
22
|
}
|
|
@@ -29,7 +29,7 @@ async function buildPage({ page , index , context , checkDuplicatePageId }) {
|
|
|
29
29
|
page.pageId = page.id;
|
|
30
30
|
const requests = [];
|
|
31
31
|
const operators = new Set();
|
|
32
|
-
|
|
32
|
+
buildBlock(page, {
|
|
33
33
|
auth: page.auth,
|
|
34
34
|
blockIdCounter: createCounter(),
|
|
35
35
|
checkDuplicateRequestId: createCheckDuplicateId({
|
|
@@ -15,19 +15,17 @@
|
|
|
15
15
|
*/ import { type } from '@lowdefy/helpers';
|
|
16
16
|
import buildPage from './buildPage.js';
|
|
17
17
|
import createCheckDuplicateId from '../../utils/createCheckDuplicateId.js';
|
|
18
|
-
|
|
18
|
+
function buildPages({ components , context }) {
|
|
19
19
|
const pages = type.isArray(components.pages) ? components.pages : [];
|
|
20
20
|
const checkDuplicatePageId = createCheckDuplicateId({
|
|
21
21
|
message: 'Duplicate pageId "{{ id }}".'
|
|
22
22
|
});
|
|
23
|
-
|
|
23
|
+
pages.map((page, index)=>buildPage({
|
|
24
24
|
page,
|
|
25
25
|
index,
|
|
26
26
|
context,
|
|
27
27
|
checkDuplicatePageId
|
|
28
|
-
})
|
|
29
|
-
);
|
|
30
|
-
await Promise.all(pageBuildPromises);
|
|
28
|
+
}));
|
|
31
29
|
return components;
|
|
32
30
|
}
|
|
33
31
|
export default buildPages;
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Copyright 2020-2022 Lowdefy, Inc
|
|
3
|
+
|
|
4
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
you may not use this file except in compliance with the License.
|
|
6
|
+
You may obtain a copy of the License at
|
|
7
|
+
|
|
8
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
|
|
10
|
+
Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
See the License for the specific language governing permissions and
|
|
14
|
+
limitations under the License.
|
|
15
|
+
*/ // Used in @lowdefy/engine tests
|
|
16
|
+
import buildAuth from '../buildAuth/buildAuth.js';
|
|
17
|
+
import buildPages from './buildPages.js';
|
|
18
|
+
import createContext from '../../createContext.js';
|
|
19
|
+
function buildTestPage({ pageConfig }) {
|
|
20
|
+
const context = createContext({
|
|
21
|
+
customTypesMap: {},
|
|
22
|
+
directories: {},
|
|
23
|
+
logger: {
|
|
24
|
+
debug: ()=>{},
|
|
25
|
+
log: ()=>{},
|
|
26
|
+
warn: ()=>{},
|
|
27
|
+
error: ()=>{}
|
|
28
|
+
},
|
|
29
|
+
stage: 'test'
|
|
30
|
+
});
|
|
31
|
+
const components = {
|
|
32
|
+
pages: [
|
|
33
|
+
pageConfig
|
|
34
|
+
]
|
|
35
|
+
};
|
|
36
|
+
buildAuth({
|
|
37
|
+
components,
|
|
38
|
+
context
|
|
39
|
+
});
|
|
40
|
+
buildPages({
|
|
41
|
+
components,
|
|
42
|
+
context
|
|
43
|
+
});
|
|
44
|
+
return components.pages[0];
|
|
45
|
+
}
|
|
46
|
+
export default buildTestPage;
|
|
@@ -21,13 +21,12 @@ async function evaluateBuildOperators({ context , input , refDef }) {
|
|
|
21
21
|
});
|
|
22
22
|
const { output , errors } = operatorsParser.parse({
|
|
23
23
|
input,
|
|
24
|
-
location: refDef.path,
|
|
24
|
+
location: refDef.path ?? refDef.resolver,
|
|
25
25
|
operatorPrefix: '_build.'
|
|
26
26
|
});
|
|
27
27
|
if (errors.length > 0) {
|
|
28
28
|
await context.logger.warn('Build operator errors.');
|
|
29
|
-
const promises = errors.map((error)=>context.logger.warn(error.message)
|
|
30
|
-
);
|
|
29
|
+
const promises = errors.map((error)=>context.logger.warn(error.message));
|
|
31
30
|
await promises;
|
|
32
31
|
}
|
|
33
32
|
return output;
|
package/dist/build/buildTypes.js
CHANGED
|
@@ -39,10 +39,8 @@ function buildTypes({ components , context }) {
|
|
|
39
39
|
typeCounters.operators.client.increment('_not');
|
|
40
40
|
typeCounters.operators.client.increment('_type');
|
|
41
41
|
// Add loaders and basic
|
|
42
|
-
basicTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block)
|
|
43
|
-
);
|
|
44
|
-
loaderTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block)
|
|
45
|
-
);
|
|
42
|
+
basicTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block));
|
|
43
|
+
loaderTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block));
|
|
46
44
|
typeCounters.blocks.increment('Message'); // Used for DisplayMessage in @lowdefy/client
|
|
47
45
|
components.types = {
|
|
48
46
|
actions: {},
|
package/dist/build/testSchema.js
CHANGED
|
@@ -15,19 +15,18 @@
|
|
|
15
15
|
*/ import { validate } from '@lowdefy/ajv';
|
|
16
16
|
import lowdefySchema from '../lowdefySchema.js';
|
|
17
17
|
import formatErrorMessage from '../utils/formatErrorMessage.js';
|
|
18
|
-
|
|
18
|
+
function testSchema({ components , context }) {
|
|
19
19
|
const { valid , errors } = validate({
|
|
20
20
|
schema: lowdefySchema,
|
|
21
21
|
data: components,
|
|
22
22
|
returnErrors: true
|
|
23
23
|
});
|
|
24
24
|
if (!valid) {
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
context.logger.warn('Schema not valid.');
|
|
26
|
+
errors.map((error)=>context.logger.warn(formatErrorMessage({
|
|
27
27
|
error,
|
|
28
28
|
components
|
|
29
|
-
}))
|
|
30
|
-
));
|
|
29
|
+
})));
|
|
31
30
|
}
|
|
32
31
|
}
|
|
33
32
|
export default testSchema;
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
See the License for the specific language governing permissions and
|
|
14
14
|
limitations under the License.
|
|
15
15
|
*/ import { type } from '@lowdefy/helpers';
|
|
16
|
-
|
|
16
|
+
function validateApp({ components }) {
|
|
17
17
|
if (type.isNone(components.app)) {
|
|
18
18
|
components.app = {};
|
|
19
19
|
}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
See the License for the specific language governing permissions and
|
|
14
14
|
limitations under the License.
|
|
15
15
|
*/ import { type } from '@lowdefy/helpers';
|
|
16
|
-
|
|
16
|
+
function validateConfig({ components }) {
|
|
17
17
|
if (type.isNone(components.config)) {
|
|
18
18
|
components.config = {};
|
|
19
19
|
}
|
package/dist/build/writePages.js
CHANGED
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/* eslint-disable no-console */ /*
|
|
2
|
+
Copyright 2020-2022 Lowdefy, Inc
|
|
3
|
+
|
|
4
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
you may not use this file except in compliance with the License.
|
|
6
|
+
You may obtain a copy of the License at
|
|
7
|
+
|
|
8
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
|
|
10
|
+
Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
See the License for the specific language governing permissions and
|
|
14
|
+
limitations under the License.
|
|
15
|
+
*/ import { mergeObjects } from '@lowdefy/helpers';
|
|
16
|
+
import createCounter from './utils/createCounter.js';
|
|
17
|
+
import createReadConfigFile from './utils/readConfigFile.js';
|
|
18
|
+
import createWriteBuildArtifact from './utils/writeBuildArtifact.js';
|
|
19
|
+
import defaultTypesMap from './defaultTypesMap.js';
|
|
20
|
+
function createContext({ customTypesMap , directories , logger , refResolver , stage ='prod' }) {
|
|
21
|
+
const context = {
|
|
22
|
+
directories,
|
|
23
|
+
logger,
|
|
24
|
+
readConfigFile: createReadConfigFile({
|
|
25
|
+
directories
|
|
26
|
+
}),
|
|
27
|
+
refResolver,
|
|
28
|
+
stage,
|
|
29
|
+
typeCounters: {
|
|
30
|
+
actions: createCounter(),
|
|
31
|
+
auth: {
|
|
32
|
+
callbacks: createCounter(),
|
|
33
|
+
events: createCounter(),
|
|
34
|
+
providers: createCounter()
|
|
35
|
+
},
|
|
36
|
+
blocks: createCounter(),
|
|
37
|
+
connections: createCounter(),
|
|
38
|
+
requests: createCounter(),
|
|
39
|
+
operators: {
|
|
40
|
+
client: createCounter(),
|
|
41
|
+
server: createCounter()
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
typesMap: mergeObjects([
|
|
45
|
+
defaultTypesMap,
|
|
46
|
+
customTypesMap
|
|
47
|
+
]),
|
|
48
|
+
writeBuildArtifact: createWriteBuildArtifact({
|
|
49
|
+
directories
|
|
50
|
+
})
|
|
51
|
+
};
|
|
52
|
+
return context;
|
|
53
|
+
}
|
|
54
|
+
export default createContext;
|