@lowdefy/build 4.0.0-alpha.10 → 4.0.0-alpha.13

package/dist/index.js

@@ -12,20 +12,15 @@
   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 { mergeObjects } from '@lowdefy/helpers';
-import { readFile } from '@lowdefy/node-utils';
-import createCounter from './utils/createCounter.js';
+*/ import createContext from './createContext.js';
 import createPluginTypesMap from './utils/createPluginTypesMap.js';
-import createReadConfigFile from './utils/readConfigFile.js';
-import createWriteBuildArtifact from './utils/writeBuildArtifact.js';
 import addDefaultPages from './build/addDefaultPages/addDefaultPages.js';
 import buildAuth from './build/buildAuth/buildAuth.js';
 import buildConnections from './build/buildConnections.js';
-import buildIcons from './build/buildIcons.js';
+import buildImports from './build/buildImports/buildImports.js';
 import buildMenu from './build/buildMenu.js';
 import buildPages from './build/buildPages/buildPages.js';
 import buildRefs from './build/buildRefs/buildRefs.js';
-import buildStyles from './build/buildStyles.js';
 import buildTypes from './build/buildTypes.js';
 import cleanBuildDirectory from './build/cleanBuildDirectory.js';
 import copyPublicFolder from './build/copyPublicFolder.js';
@@ -34,105 +29,68 @@ import validateApp from './build/validateApp.js';
 import validateConfig from './build/validateConfig.js';
 import updateServerPackageJson from './build/updateServerPackageJson.js';
 import writeApp from './build/writeApp.js';
-import writeActionImports from './build/writePluginImports/writeActionImports.js';
-import writeBlockImports from './build/writePluginImports/writeBlockImports.js';
+import writeAuth from './build/writeAuth.js';
+import writePluginImports from './build/writePluginImports/writePluginImports.js';
 import writeConfig from './build/writeConfig.js';
-import writeConnectionImports from './build/writePluginImports/writeConnectionImports.js';
 import writeConnections from './build/writeConnections.js';
 import writeGlobal from './build/writeGlobal.js';
-import writeIconImports from './build/writePluginImports/writeIconImports.js';
 import writeMenus from './build/writeMenus.js';
-import writeOperatorImports from './build/writePluginImports/writeOperatorImports.js';
 import writePages from './build/writePages.js';
 import writeRequests from './build/writeRequests.js';
-import writeStyleImports from './build/writePluginImports/writeStyleImports.js';
 import writeTypes from './build/writeTypes.js';
-async function createContext({ customTypesMap , directories , logger , refResolver  }) {
-    const defaultTypesMap = JSON.parse(await readFile(new URL('./defaultTypesMap.json', import.meta.url).pathname));
-    const context = {
-        directories,
-        logger,
-        readConfigFile: createReadConfigFile({
-            directories
-        }),
-        refResolver,
-        typeCounters: {
-            actions: createCounter(),
-            blocks: createCounter(),
-            connections: createCounter(),
-            requests: createCounter(),
-            operators: {
-                client: createCounter(),
-                server: createCounter()
-            }
-        },
-        typesMap: mergeObjects([
-            defaultTypesMap,
-            customTypesMap
-        ]),
-        writeBuildArtifact: createWriteBuildArtifact({
-            directories
-        })
-    };
-    return context;
-}
 async function build(options) {
-    const context = await createContext(options);
+    const context = createContext(options);
     const components = await buildRefs({
         context
     });
-    await testSchema({
+    testSchema({
         components,
         context
     });
-    await validateApp({
+    validateApp({
         components,
         context
     });
-    await validateConfig({
+    validateConfig({
         components,
         context
     });
-    await addDefaultPages({
+    addDefaultPages({
         components,
         context
     });
-    await buildAuth({
+    buildAuth({
         components,
         context
     });
-    await buildConnections({
+    buildConnections({
         components,
         context
     });
-    await buildPages({
+    buildPages({
         components,
         context
     });
-    await buildMenu({
+    buildMenu({
         components,
         context
     });
-    await buildTypes({
+    buildTypes({
         components,
         context
     });
-    await buildIcons({
-        components,
-        context
-    });
-    await buildStyles({
+    buildImports({
         components,
         context
     });
     await cleanBuildDirectory({
         context
     });
-    await writeActionImports({
+    await writeApp({
         components,
         context
     });
-    await writeApp({
+    await writeAuth({
         components,
         context
     });
@@ -164,23 +122,7 @@ async function build(options) {
         components,
         context
     });
-    await writeBlockImports({
-        components,
-        context
-    });
-    await writeConnectionImports({
-        components,
-        context
-    });
-    await writeOperatorImports({
-        components,
-        context
-    });
-    await writeStyleImports({
-        components,
-        context
-    });
-    await writeIconImports({
+    await writePluginImports({
         components,
         context
     });
@@ -193,5 +135,5 @@ async function build(options) {
         context
     });
 }
-export { createContext, createPluginTypesMap };
+export { createPluginTypesMap };
 export default build;

package/dist/lowdefySchema.js

@@ -72,36 +72,73 @@ export default {
             type: 'object',
             additionalProperties: false,
             errorMessage: {
-                type: 'App "config.auth" should be an object.'
+                type: 'App "auth" should be an object.'
             },
             properties: {
-                openId: {
-                    type: 'object',
-                    additionalProperties: false,
-                    errorMessage: {
-                        type: 'App "config.auth.openId" should be an object.'
-                    },
-                    properties: {
-                        rolesField: {
-                            type: 'string',
-                            description: '.',
-                            errorMessage: {
-                                type: 'App "config.auth.openId.rolesField" should be a string.'
+                callbacks: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        required: [
+                            'id',
+                            'type'
+                        ],
+                        properties: {
+                            id: {
+                                type: 'string',
+                                errorMessage: {
+                                    type: 'Auth callback "id" should be a string.'
+                                }
+                            },
+                            type: {
+                                type: 'string',
+                                errorMessage: {
+                                    type: 'Auth callback "type" should be a string.'
+                                }
+                            },
+                            properties: {
+                                type: 'object'
                             }
                         },
-                        logoutRedirectUri: {
-                            type: 'string',
-                            description: 'The URI to redirect the user to after logout. Can be a Nunjucks template string with client_id, host, id_token_hint, and openid_domain as template data.',
-                            errorMessage: {
-                                type: 'App "config.auth.openId.logoutRedirectUri" should be a string.'
+                        errorMessage: {
+                            type: 'Auth callback should be an object.',
+                            required: {
+                                id: 'Auth callback should have required property "id".',
+                                type: 'Auth callback should have required property "type".'
+                            }
+                        }
+                    }
+                },
+                events: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        required: [
+                            'id',
+                            'type'
+                        ],
+                        properties: {
+                            id: {
+                                type: 'string',
+                                errorMessage: {
+                                    type: 'Auth event "id" should be a string.'
+                                }
+                            },
+                            type: {
+                                type: 'string',
+                                errorMessage: {
+                                    type: 'Auth event "type" should be a string.'
+                                }
+                            },
+                            properties: {
+                                type: 'object'
                             }
                         },
-                        scope: {
-                            type: 'string',
-                            description: 'The OpenID Connect scope to request.',
-                            default: 'openid profile email',
-                            errorMessage: {
-                                type: 'App "config.auth.openId.scope" should be a string.'
+                        errorMessage: {
+                            type: 'Auth event should be an object.',
+                            required: {
+                                id: 'Auth event should have required property "id".',
+                                type: 'Auth event should have required property "type".'
                             }
                         }
                     }
@@ -119,13 +156,13 @@ export default {
                                 'boolean'
                             ],
                             errorMessage: {
-                                type: 'App "config.auth.pages.protected.$" should be an array of strings.'
+                                type: 'App "auth.pages.protected.$" should be an array of strings.'
                             },
                             items: {
                                 type: 'string',
                                 description: 'Page ids for which authentication is required. When specified, all unspecified pages will be public.',
                                 errorMessage: {
-                                    type: 'App "config.auth.pages.protected.$" should be an array of strings.'
+                                    type: 'App "auth.pages.protected.$" should be an array of strings.'
                                 }
                             }
                         },
@@ -135,13 +172,13 @@ export default {
                                 'boolean'
                             ],
                             errorMessage: {
-                                type: 'App "config.auth.pages.public.$" should be an array of strings.'
+                                type: 'App "auth.pages.public.$" should be an array of strings.'
                             },
                             items: {
                                 type: 'string',
                                 description: 'Page ids for which authentication is not required. When specified, all unspecified pages will be protected.',
                                 errorMessage: {
-                                    type: 'App "config.auth.pages.public.$" should be an array of strings.'
+                                    type: 'App "auth.pages.public.$" should be an array of strings.'
                                 }
                             }
                         },
@@ -154,46 +191,55 @@ export default {
                                         type: 'string'
                                     },
                                     errorMessage: {
-                                        type: 'App "config.auth.pages.roles.[role]" should be an array of strings.'
+                                        type: 'App "auth.pages.roles.[role]" should be an array of strings.'
                                     }
                                 }
                             },
                             errorMessage: {
-                                type: 'App "config.auth.pages.roles" should be an object.'
+                                type: 'App "auth.pages.roles" should be an object.'
                             }
                         }
                     }
                 },
-                jwt: {
-                    type: 'object',
-                    additionalProperties: false,
-                    errorMessage: {
-                        type: 'App "config.auth.jwt" should be an object.'
-                    },
-                    properties: {
-                        expiresIn: {
-                            type: [
-                                'string',
-                                'number'
-                            ],
-                            default: '4h',
-                            description: 'The length of time a user token should be valid. Can be expressed as a number in seconds, or a vercel/ms string (https://github.com/vercel/ms)',
-                            errorMessage: {
-                                type: 'App "config.auth.jwt.expiresIn" should be a string or number.'
+                providers: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        required: [
+                            'id',
+                            'type'
+                        ],
+                        properties: {
+                            id: {
+                                type: 'string',
+                                errorMessage: {
+                                    type: 'Auth provider "id" should be a string.'
+                                }
+                            },
+                            type: {
+                                type: 'string',
+                                errorMessage: {
+                                    type: 'Auth provider "type" should be a string.'
+                                }
+                            },
+                            properties: {
+                                type: 'object'
                             }
                         },
-                        loginStateExpiresIn: {
-                            type: [
-                                'string',
-                                'number'
-                            ],
-                            default: '5min',
-                            description: 'The length of time an authorization request token should be valid. Can be expressed as a number in seconds, or a vercel/ms string (https://github.com/vercel/ms)',
-                            errorMessage: {
-                                type: 'App "config.auth.jwt.loginStateExpiresIn" should be a string or number.'
+                        errorMessage: {
+                            type: 'Auth provider should be an object.',
+                            required: {
+                                id: 'Auth provider should have required property "id".',
+                                type: 'Auth provider should have required property "type".'
                             }
                         }
                     }
+                },
+                session: {
+                    type: 'object'
+                },
+                theme: {
+                    type: 'object'
                 }
             }
         },
@@ -645,9 +691,18 @@ export default {
                 type: 'App "license" should be a string.'
             }
         },
+        version: {
+            type: 'string',
+            errorMessage: {
+                type: 'App "version" should be a string.'
+            }
+        },
         app: {
             $ref: '#/definitions/app'
         },
+        auth: {
+            $ref: '#/definitions/authConfig'
+        },
         cli: {
             type: 'object',
             errorMessage: {
@@ -661,9 +716,6 @@ export default {
             },
             additionalProperties: false,
             properties: {
-                auth: {
-                    $ref: '#/definitions/authConfig'
-                },
                 basePath: {
                     type: 'string',
                     description: 'App base path to apply to all routes. Base path must start with "/".',

package/dist/scripts/generateDefaultTypes.js

@@ -38,12 +38,18 @@ const defaultPackages = [
     '@lowdefy/operators-mql',
     '@lowdefy/operators-nunjucks',
     '@lowdefy/operators-uuid',
-    '@lowdefy/operators-yaml', 
+    '@lowdefy/operators-yaml',
+    '@lowdefy/plugin-next-auth', 
 ];
 async function generateDefaultTypesMap() {
     const packageFile = JSON.parse(await readFile(path.resolve(process.cwd(), './package.json')));
     const defaultTypesMap = {
         actions: {},
+        auth: {
+            callbacks: {},
+            events: {},
+            providers: {}
+        },
         blocks: {},
         connections: {},
         icons: {},
@@ -67,6 +73,9 @@ async function generateDefaultTypesMap() {
             version
         });
     }));
-    await writeFile(path.resolve(process.cwd(), './dist/defaultTypesMap.json'), JSON.stringify(defaultTypesMap, null, 2));
+    await writeFile(path.resolve(process.cwd(), './dist/defaultTypesMap.js'), `const defaultTypesMap = ${JSON.stringify(defaultTypesMap, null, 2)};
+
+export default defaultTypesMap;
+`);
 }
 generateDefaultTypesMap();

package/dist/scripts/run.js

@@ -20,13 +20,14 @@ import build from '../index.js';
 const argv = yargs(hideBin(process.argv)).argv;
 async function run() {
     await build({
-        logger: console,
-        refResolver: argv.refResolver || process.env.LOWDEFY_BUILD_REF_RESOLVER,
         directories: {
             build: path.resolve(argv.buildDirectory || process.env.LOWDEFY_DIRECTORY_BUILD || path.join(process.cwd(), 'build')),
             config: path.resolve(argv.configDirectory || process.env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()),
             server: path.resolve(argv.serverDirectory || process.env.LOWDEFY_DIRECTORY_SERVER || process.cwd())
-        }
+        },
+        logger: console,
+        refResolver: argv.refResolver || process.env.LOWDEFY_BUILD_REF_RESOLVER,
+        stage: argv.stage || process.env.LOWDEFY_BUILD_STAGE || 'prod'
     });
 }
 run();

package/dist/test/buildRefs/testBuildRefsResolver.js

@@ -17,7 +17,7 @@
         resolved: true,
         path,
         vars,
-        contextId: context.id
+        stage: context.stage
     };
 }
 export default resolver;

package/dist/test/testContext.js

@@ -22,12 +22,17 @@ function testContext({ writeBuildArtifact , configDirectory , readConfigFile , l
         succeed: ()=>{}
     };
     const context = {
-        id: 'test',
+        stage: 'test',
         directories: {
             config: configDirectory || ''
         },
         typeCounters: {
             actions: createCounter(),
+            auth: {
+                callbacks: createCounter(),
+                events: createCounter(),
+                providers: createCounter()
+            },
             blocks: createCounter(),
             connections: createCounter(),
             requests: createCounter(),

package/dist/utils/createPluginTypesMap.js

@@ -32,6 +32,27 @@ function createPluginTypesMap({ packageName , packageTypes , typePrefix ='' , ty
         typePrefix,
         version
     });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.auth) ? packageTypes.auth.callbacks : [],
+        store: typesMap.auth.callbacks,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.auth) ? packageTypes.auth.events : [],
+        store: typesMap.auth.events,
+        packageName,
+        typePrefix,
+        version
+    });
+    createTypeDefinitions({
+        typeNames: type.isObject(packageTypes.auth) ? packageTypes.auth.providers : [],
+        store: typesMap.auth.providers,
+        packageName,
+        typePrefix,
+        version
+    });
     createTypeDefinitions({
         typeNames: packageTypes.blocks,
         store: typesMap.blocks,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lowdefy/build",
-  "version": "4.0.0-alpha.10",
-  "licence": "Apache-2.0",
+  "version": "4.0.0-alpha.13",
+  "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
   "keywords": [
@@ -36,7 +36,10 @@
   "bin": {
     "lowdefy-build": "./dist/scripts/run.js"
   },
-  "exports": "./dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./buildTestPage": "./dist/build/buildPages/buildTestPage.js"
+  },
   "files": [
     "dist/*"
   ],
@@ -49,48 +52,49 @@
     "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/ajv": "4.0.0-alpha.10",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.10",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.10",
-    "@lowdefy/helpers": "4.0.0-alpha.10",
-    "@lowdefy/node-utils": "4.0.0-alpha.10",
-    "@lowdefy/nunjucks": "4.0.0-alpha.10",
-    "@lowdefy/operators": "4.0.0-alpha.10",
-    "@lowdefy/operators-js": "4.0.0-alpha.10",
-    "ajv": "8.9.0",
-    "json5": "2.2.0",
+    "@lowdefy/ajv": "4.0.0-alpha.13",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.13",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.13",
+    "@lowdefy/helpers": "4.0.0-alpha.13",
+    "@lowdefy/node-utils": "4.0.0-alpha.13",
+    "@lowdefy/nunjucks": "4.0.0-alpha.13",
+    "@lowdefy/operators": "4.0.0-alpha.13",
+    "@lowdefy/operators-js": "4.0.0-alpha.13",
+    "ajv": "8.11.0",
+    "json5": "2.2.1",
     "uuid": "8.3.2",
-    "yaml": "2.0.0-10",
-    "yargs": "17.3.1"
+    "yaml": "2.1.1",
+    "yargs": "17.5.1"
   },
   "devDependencies": {
-    "@jest/globals": "27.5.1",
-    "@lowdefy/actions-core": "4.0.0-alpha.10",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.10",
-    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.10",
-    "@lowdefy/blocks-echarts": "4.0.0-alpha.10",
-    "@lowdefy/blocks-markdown": "4.0.0-alpha.10",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.10",
-    "@lowdefy/connection-elasticsearch": "4.0.0-alpha.10",
-    "@lowdefy/connection-google-sheets": "4.0.0-alpha.10",
-    "@lowdefy/connection-knex": "4.0.0-alpha.10",
-    "@lowdefy/connection-mongodb": "4.0.0-alpha.10",
-    "@lowdefy/connection-redis": "4.0.0-alpha.10",
-    "@lowdefy/connection-sendgrid": "4.0.0-alpha.10",
-    "@lowdefy/connection-stripe": "4.0.0-alpha.10",
-    "@lowdefy/operators-change-case": "4.0.0-alpha.10",
-    "@lowdefy/operators-diff": "4.0.0-alpha.10",
-    "@lowdefy/operators-mql": "4.0.0-alpha.10",
-    "@lowdefy/operators-nunjucks": "4.0.0-alpha.10",
-    "@lowdefy/operators-uuid": "4.0.0-alpha.10",
-    "@lowdefy/operators-yaml": "4.0.0-alpha.10",
-    "@swc/cli": "0.1.55",
-    "@swc/core": "1.2.135",
-    "@swc/jest": "0.2.17",
-    "jest": "27.5.1"
+    "@jest/globals": "28.1.0",
+    "@lowdefy/actions-core": "4.0.0-alpha.13",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.13",
+    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.13",
+    "@lowdefy/blocks-echarts": "4.0.0-alpha.13",
+    "@lowdefy/blocks-markdown": "4.0.0-alpha.13",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.13",
+    "@lowdefy/connection-elasticsearch": "4.0.0-alpha.13",
+    "@lowdefy/connection-google-sheets": "4.0.0-alpha.13",
+    "@lowdefy/connection-knex": "4.0.0-alpha.13",
+    "@lowdefy/connection-mongodb": "4.0.0-alpha.13",
+    "@lowdefy/connection-redis": "4.0.0-alpha.13",
+    "@lowdefy/connection-sendgrid": "4.0.0-alpha.13",
+    "@lowdefy/connection-stripe": "4.0.0-alpha.13",
+    "@lowdefy/operators-change-case": "4.0.0-alpha.13",
+    "@lowdefy/operators-diff": "4.0.0-alpha.13",
+    "@lowdefy/operators-mql": "4.0.0-alpha.13",
+    "@lowdefy/operators-nunjucks": "4.0.0-alpha.13",
+    "@lowdefy/operators-uuid": "4.0.0-alpha.13",
+    "@lowdefy/operators-yaml": "4.0.0-alpha.13",
+    "@lowdefy/plugin-next-auth": "4.0.0-alpha.13",
+    "@swc/cli": "0.1.57",
+    "@swc/core": "1.2.194",
+    "@swc/jest": "0.2.21",
+    "jest": "28.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d697b4b5f354697d9481a371b90a00ca0944f486"
+  "gitHead": "e99b4b6c1f59804982fc148c0fe39dcf13b35d77"
 }