@inizioevoke/evosynth 2.1.1 → 2.1.2

package/dist/cli/evosynth.js

@@ -37,14 +37,23 @@ export async function evosynth(cmd, env, props) {
     if (configIndex != -1) {
         const configFile = configFiles[configIndex];
         const tsxUnregister = /^\.m?ts$/.test(extname(configFile.name)) ? register() : undefined;
-        const module = await import(__rewriteRelativeImportExtension(pathToFileURL(join(configFile.dir, configFile.name)).toString()));
-        tsxUnregister && tsxUnregister();
+        let module;
+        try {
+            module = await import(__rewriteRelativeImportExtension(pathToFileURL(join(configFile.dir, configFile.name)).toString()));
+        }
+        catch (err) {
+            console.error(`Failed to load config "${configFile.name}":`, err.message);
+            process.exit(1);
+        }
+        finally {
+            tsxUnregister?.();
+        }
         let config = undefined;
         if (configFile.env) {
-            config = await module.default();
+            config = await module.default?.();
         }
         else {
-            config = await module[env]?.();
+            config = await module[env.toLowerCase()]?.();
         }
         if (config) {
             if (props.profile) {
@@ -54,11 +63,19 @@ export async function evosynth(cmd, env, props) {
                 case 'web-static-serverless':
                     await runWebStaticServerlessApp(cmd, config);
                     break;
+                default:
+                    console.error(`Unsupported evosynth app type: "${config.type}"`);
+                    process.exit(1);
+                    break;
             }
         }
+        else {
+            console.error(`Config environment "${env}" not found`);
+            process.exit(1);
+        }
     }
     else {
         console.error('evosynth config not found!');
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZvc3ludGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2V2b3N5bnRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQzFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDekMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV2QyxPQUFPLEVBQUUseUJBQXlCLEVBQWdDLE1BQU0sNEJBQTRCLENBQUM7QUFtQnJHLE1BQU0sQ0FBQyxLQUFLLFVBQVUsUUFBUSxDQUFDLEdBQWUsRUFBRSxHQUFXLEVBQUUsS0FBb0I7SUFDL0UsTUFBTSxLQUFLLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFFcEUsTUFBTSxXQUFXLEdBQUcsS0FBSztTQUN0QixNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtRQUNqQixJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO1lBQ3BCLE9BQU8sdUNBQXVDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRSxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUMsQ0FBQztTQUNELEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQzNELE9BQU87WUFDTCxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUk7WUFDakIsR0FBRyxFQUFFLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7WUFDNUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxVQUFVO1NBQ3ZCLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVMLElBQUksV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLEdBQUcsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxLQUFLLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3hHLElBQUksV0FBVyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDdkIsV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLFNBQVMsQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFDRCxJQUFJLFdBQVcsSUFBSSxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUM1QyxNQUFNLGFBQWEsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUN6RixNQUFNLE1BQU0sR0FBRyxNQUFNLE1BQU0sa0NBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFDLENBQUM7UUFDN0YsYUFBYSxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQ2pDLElBQUksTUFBTSxHQUFrQyxTQUFTLENBQUM7UUFDdEQsSUFBSSxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDbkIsTUFBTSxHQUFHLE1BQU0sTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2xDLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxHQUFHLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNqQyxDQUFDO1FBRUQsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLElBQUksS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUNsQixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDO1lBQzFDLENBQUM7WUFDRCxRQUFRLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDcEIsS0FBSyx1QkFBdUI7b0JBQzFCLE1BQU0seUJBQXlCLENBQUMsR0FBRyxFQUFFLE1BQXNDLENBQUMsQ0FBQztvQkFDN0UsTUFBTTtZQUNWLENBQUM7UUFDSCxDQUFDO0lBRUgsQ0FBQztTQUFNLENBQUM7UUFDTixPQUFPLENBQUMsS0FBSyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDOUMsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyByZWFkZGlyIH0gZnJvbSAnbm9kZTpmcy9wcm9taXNlcyc7XG5pbXBvcnQgeyBqb2luLCBleHRuYW1lIH0gZnJvbSAnbm9kZTpwYXRoJztcbmltcG9ydCB7IHBhdGhUb0ZpbGVVUkwgfSBmcm9tICdub2RlOnVybCc7XG5pbXBvcnQgeyByZWdpc3RlciB9IGZyb20gJ3RzeC9lc20vYXBpJztcbmltcG9ydCB0eXBlIHsgRXZvc3ludGhUYWdLZXkgfSBmcm9tICcuLi90eXBlcy5qcyc7XG5pbXBvcnQgeyBydW5XZWJTdGF0aWNTZXJ2ZXJsZXNzQXBwLCBXZWJTdGF0aWNTZXJ2ZXJsZXNzQXBwQ29uZmlnIH0gZnJvbSAnLi93ZWItc3RhdGljLXNlcnZlcmxlc3MuanMnO1xuXG5leHBvcnQgeyBXZWJTdGF0aWNTZXJ2ZXJsZXNzQXBwQ29uZmlnIH07XG5cbmV4cG9ydCB0eXBlIEVudmlyb25tZW50VHlwZSA9ICdkZXYnIHwgJ3Rlc3QnIHwgJ3N0YWdlJyB8ICd1YXQnIHwgJ3ByZXByb2QnICB8ICdwcm9kJyB8IChzdHJpbmcgJiB7fSk7XG5leHBvcnQgdHlwZSBDZGtDb21tYW5kID0gJ2RlcGxveScgfCAnZGVzdHJveScgfCAnZGlmZicgfCAnZHJpZnQnIHwgJ3JvbGxiYWNrJyB8ICdzeW50aCc7IC8vICdib290c3RyYXAnIHwgXG5leHBvcnQgdHlwZSBFdm9zeW50aEFwcFR5cGUgPSAnc3RyOHItY2xtJyB8ICd3ZWItc3RhdGljLXNlcnZlcmxlc3MnO1xuXG5leHBvcnQgaW50ZXJmYWNlIEV2b3N5bnRoQXBwQ29uZmlnIHtcbiAgdHlwZTogRXZvc3ludGhBcHBUeXBlO1xuICBlbnZUeXBlPzogRW52aXJvbm1lbnRUeXBlO1xuICBuYW1lOiBzdHJpbmc7XG4gIHJlZ2lvbjogJ3VzLWVhc3QtMScgfCAndXMtZWFzdC0yJyB8ICd1cy13ZXN0LTEnIHwgJ3VzLXdlc3QtMicgfCAoc3RyaW5nICYge30pO1xuICB0YWdzPzogUmVjb3JkPEV2b3N5bnRoVGFnS2V5LCBzdHJpbmc+LFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIEV2b3N5bnRoUHJvcHMge1xuICBwcm9maWxlPzogc3RyaW5nO1xufVxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGV2b3N5bnRoKGNtZDogQ2RrQ29tbWFuZCwgZW52OiBzdHJpbmcsIHByb3BzOiBFdm9zeW50aFByb3BzKSB7XG4gIGNvbnN0IGZpbGVzID0gYXdhaXQgcmVhZGRpcihwcm9jZXNzLmN3ZCgpLCB7IHdpdGhGaWxlVHlwZXM6IHRydWUgfSk7XG5cbiAgY29uc3QgY29uZmlnRmlsZXMgPSBmaWxlc1xuICAgIC5maWx0ZXIoKGRpcmVudCkgPT4ge1xuICAgICAgaWYgKGRpcmVudC5pc0ZpbGUoKSkge1xuICAgICAgICByZXR1cm4gL15cXC5ldm9zeW50aCguKj8pXFwuKD86anN8bWpzfHRzfG10cykkL2kudGVzdChkaXJlbnQubmFtZSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICB9XG4gICAgfSlcbiAgICAubWFwKChkaXJlbnQpID0+IHtcbiAgICAgIGNvbnN0IHBhcnRzID0gZGlyZW50Lm5hbWUuc3BsaXQoJy4nKS5maWx0ZXIocCA9PiBwICE9PSAnJyk7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBuYW1lOiBkaXJlbnQubmFtZSxcbiAgICAgICAgZW52OiBwYXJ0cy5sZW5ndGggPiAyID8gcGFydHNbMV0gOiB1bmRlZmluZWQsXG4gICAgICAgIGRpcjogZGlyZW50LnBhcmVudFBhdGhcbiAgICAgIH1cbiAgICB9KTtcbiAgXG4gIGxldCBjb25maWdJbmRleCA9IGNvbmZpZ0ZpbGVzLmZpbmRJbmRleChjID0+IGMuZW52ICYmIGVudiAmJiBjLmVudi50b0xvd2VyQ2FzZSgpID09PSBlbnYudG9Mb3dlckNhc2UoKSk7XG4gIGlmIChjb25maWdJbmRleCA9PT0gLTEpIHtcbiAgICBjb25maWdJbmRleCA9IGNvbmZpZ0ZpbGVzLmZpbmRJbmRleChjID0+IGMuZW52ID09PSB1bmRlZmluZWQpO1xuICB9XG4gIGlmIChjb25maWdJbmRleCAhPSAtMSkge1xuICAgIGNvbnN0IGNvbmZpZ0ZpbGUgPSBjb25maWdGaWxlc1tjb25maWdJbmRleF07XG4gICAgY29uc3QgdHN4VW5yZWdpc3RlciA9IC9eXFwubT90cyQvLnRlc3QoZXh0bmFtZShjb25maWdGaWxlLm5hbWUpKSA/IHJlZ2lzdGVyKCkgOiB1bmRlZmluZWQ7XG4gICAgY29uc3QgbW9kdWxlID0gYXdhaXQgaW1wb3J0KHBhdGhUb0ZpbGVVUkwoam9pbihjb25maWdGaWxlLmRpciwgY29uZmlnRmlsZS5uYW1lKSkudG9TdHJpbmcoKSk7XG4gICAgdHN4VW5yZWdpc3RlciAmJiB0c3hVbnJlZ2lzdGVyKCk7XG4gICAgbGV0IGNvbmZpZzogRXZvc3ludGhBcHBDb25maWcgfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XG4gICAgaWYgKGNvbmZpZ0ZpbGUuZW52KSB7XG4gICAgICBjb25maWcgPSBhd2FpdCBtb2R1bGUuZGVmYXVsdCgpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25maWcgPSBhd2FpdCBtb2R1bGVbZW52XT8uKCk7XG4gICAgfVxuXG4gICAgaWYgKGNvbmZpZykge1xuICAgICAgaWYgKHByb3BzLnByb2ZpbGUpIHtcbiAgICAgICAgcHJvY2Vzcy5lbnYuQVdTX1BST0ZJTEUgPSBwcm9wcy5wcm9maWxlO1xuICAgICAgfVxuICAgICAgc3dpdGNoIChjb25maWcudHlwZSkge1xuICAgICAgICBjYXNlICd3ZWItc3RhdGljLXNlcnZlcmxlc3MnOlxuICAgICAgICAgIGF3YWl0IHJ1bldlYlN0YXRpY1NlcnZlcmxlc3NBcHAoY21kLCBjb25maWcgYXMgV2ViU3RhdGljU2VydmVybGVzc0FwcENvbmZpZyk7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICB9XG4gICAgfVxuICAgIFxuICB9IGVsc2Uge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2V2b3N5bnRoIGNvbmZpZyBub3QgZm91bmQhJyk7XG4gIH1cbn0iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZvc3ludGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2V2b3N5bnRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQzFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDekMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV2QyxPQUFPLEVBQUUseUJBQXlCLEVBQWdDLE1BQU0sNEJBQTRCLENBQUM7QUFtQnJHLE1BQU0sQ0FBQyxLQUFLLFVBQVUsUUFBUSxDQUFDLEdBQWUsRUFBRSxHQUFXLEVBQUUsS0FBb0I7SUFDL0UsTUFBTSxLQUFLLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFFcEUsTUFBTSxXQUFXLEdBQUcsS0FBSztTQUN0QixNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtRQUNqQixJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO1lBQ3BCLE9BQU8sdUNBQXVDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRSxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUMsQ0FBQztTQUNELEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQzNELE9BQU87WUFDTCxJ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QU0sQ0FBQztRQUNOLE9BQU8sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUM5QyxDQUFDO0FBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlYWRkaXIgfSBmcm9tICdub2RlOmZzL3Byb21pc2VzJztcbmltcG9ydCB7IGpvaW4sIGV4dG5hbWUgfSBmcm9tICdub2RlOnBhdGgnO1xuaW1wb3J0IHsgcGF0aFRvRmlsZVVSTCB9IGZyb20gJ25vZGU6dXJsJztcbmltcG9ydCB7IHJlZ2lzdGVyIH0gZnJvbSAndHN4L2VzbS9hcGknO1xuaW1wb3J0IHR5cGUgeyBFdm9zeW50aFRhZ0tleSB9IGZyb20gJy4uL3R5cGVzLmpzJztcbmltcG9ydCB7IHJ1bldlYlN0YXRpY1NlcnZlcmxlc3NBcHAsIFdlYlN0YXRpY1NlcnZlcmxlc3NBcHBDb25maWcgfSBmcm9tICcuL3dlYi1zdGF0aWMtc2VydmVybGVzcy5qcyc7XG5cbmV4cG9ydCB7IFdlYlN0YXRpY1NlcnZlcmxlc3NBcHBDb25maWcgfTtcblxuZXhwb3J0IHR5cGUgRW52aXJvbm1lbnRUeXBlID0gJ2RldicgfCAndGVzdCcgfCAnc3RhZ2UnIHwgJ3VhdCcgfCAncHJlcHJvZCcgIHwgJ3Byb2QnIHwgKHN0cmluZyAmIHt9KTtcbmV4cG9ydCB0eXBlIENka0NvbW1hbmQgPSAnZGVwbG95JyB8ICdkZXN0cm95JyB8ICdkaWZmJyB8ICdkcmlmdCcgfCAncm9sbGJhY2snIHwgJ3N5bnRoJzsgLy8gJ2Jvb3RzdHJhcCcgfCBcbmV4cG9ydCB0eXBlIEV2b3N5bnRoQXBwVHlwZSA9ICdzdHI4ci1jbG0nIHwgJ3dlYi1zdGF0aWMtc2VydmVybGVzcyc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgRXZvc3ludGhBcHBDb25maWcge1xuICB0eXBlOiBFdm9zeW50aEFwcFR5cGU7XG4gIGVudlR5cGU/OiBFbnZpcm9ubWVudFR5cGU7XG4gIG5hbWU6IHN0cmluZztcbiAgcmVnaW9uOiAndXMtZWFzdC0xJyB8ICd1cy1lYXN0LTInIHwgJ3VzLXdlc3QtMScgfCAndXMtd2VzdC0yJyB8IChzdHJpbmcgJiB7fSk7XG4gIHRhZ3M/OiBSZWNvcmQ8RXZvc3ludGhUYWdLZXksIHN0cmluZz4sXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRXZvc3ludGhQcm9wcyB7XG4gIHByb2ZpbGU/OiBzdHJpbmc7XG59XG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gZXZvc3ludGgoY21kOiBDZGtDb21tYW5kLCBlbnY6IHN0cmluZywgcHJvcHM6IEV2b3N5bnRoUHJvcHMpIHtcbiAgY29uc3QgZmlsZXMgPSBhd2FpdCByZWFkZGlyKHByb2Nlc3MuY3dkKCksIHsgd2l0aEZpbGVUeXBlczogdHJ1ZSB9KTtcblxuICBjb25zdCBjb25maWdGaWxlcyA9IGZpbGVzXG4gICAgLmZpbHRlcigoZGlyZW50KSA9PiB7XG4gICAgICBpZiAoZGlyZW50LmlzRmlsZSgpKSB7XG4gICAgICAgIHJldHVybiAvXlxcLmV2b3N5bnRoKC4qPylcXC4oPzpqc3xtanN8dHN8bXRzKSQvaS50ZXN0KGRpcmVudC5uYW1lKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICAgIH1cbiAgICB9KVxuICAgIC5tYXAoKGRpcmVudCkgPT4ge1xuICAgICAgY29uc3QgcGFydHMgPSBkaXJlbnQubmFtZS5zcGxpdCgnLicpLmZpbHRlcihwID0+IHAgIT09ICcnKTtcbiAgICAgIHJldHVybiB7XG4gICAgICAgIG5hbWU6IGRpcmVudC5uYW1lLFxuICAgICAgICBlbnY6IHBhcnRzLmxlbmd0aCA+IDIgPyBwYXJ0c1sxXSA6IHVuZGVmaW5lZCxcbiAgICAgICAgZGlyOiBkaXJlbnQucGFyZW50UGF0aFxuICAgICAgfVxuICAgIH0pO1xuICBcbiAgbGV0IGNvbmZpZ0luZGV4ID0gY29uZmlnRmlsZXMuZmluZEluZGV4KGMgPT4gYy5lbnYgJiYgZW52ICYmIGMuZW52LnRvTG93ZXJDYXNlKCkgPT09IGVudi50b0xvd2VyQ2FzZSgpKTtcbiAgaWYgKGNvbmZpZ0luZGV4ID09PSAtMSkge1xuICAgIGNvbmZpZ0luZGV4ID0gY29uZmlnRmlsZXMuZmluZEluZGV4KGMgPT4gYy5lbnYgPT09IHVuZGVmaW5lZCk7XG4gIH1cbiAgaWYgKGNvbmZpZ0luZGV4ICE9IC0xKSB7XG4gICAgY29uc3QgY29uZmlnRmlsZSA9IGNvbmZpZ0ZpbGVzW2NvbmZpZ0luZGV4XTtcbiAgICBjb25zdCB0c3hVbnJlZ2lzdGVyID0gL15cXC5tP3RzJC8udGVzdChleHRuYW1lKGNvbmZpZ0ZpbGUubmFtZSkpID8gcmVnaXN0ZXIoKSA6IHVuZGVmaW5lZDtcbiAgICBsZXQgbW9kdWxlOiBhbnk7XG4gICAgdHJ5IHtcbiAgICAgIG1vZHVsZSA9IGF3YWl0IGltcG9ydChwYXRoVG9GaWxlVVJMKGpvaW4oY29uZmlnRmlsZS5kaXIsIGNvbmZpZ0ZpbGUubmFtZSkpLnRvU3RyaW5nKCkpO1xuICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgY29uc29sZS5lcnJvcihgRmFpbGVkIHRvIGxvYWQgY29uZmlnIFwiJHtjb25maWdGaWxlLm5hbWV9XCI6YCwgKGVyciBhcyBFcnJvcikubWVzc2FnZSk7XG4gICAgICBwcm9jZXNzLmV4aXQoMSk7XG4gICAgfSBmaW5hbGx5IHtcbiAgICAgIHRzeFVucmVnaXN0ZXI/LigpO1xuICAgIH1cbiAgICBsZXQgY29uZmlnOiBFdm9zeW50aEFwcENvbmZpZyB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcbiAgICBpZiAoY29uZmlnRmlsZS5lbnYpIHtcbiAgICAgIGNvbmZpZyA9IGF3YWl0IG1vZHVsZS5kZWZhdWx0Py4oKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uZmlnID0gYXdhaXQgbW9kdWxlW2Vudi50b0xvd2VyQ2FzZSgpXT8uKCk7XG4gICAgfVxuXG4gICAgaWYgKGNvbmZpZykge1xuICAgICAgaWYgKHByb3BzLnByb2ZpbGUpIHtcbiAgICAgICAgcHJvY2Vzcy5lbnYuQVdTX1BST0ZJTEUgPSBwcm9wcy5wcm9maWxlO1xuICAgICAgfVxuICAgICAgc3dpdGNoIChjb25maWcudHlwZSkge1xuICAgICAgICBjYXNlICd3ZWItc3RhdGljLXNlcnZlcmxlc3MnOlxuICAgICAgICAgIGF3YWl0IHJ1bldlYlN0YXRpY1NlcnZlcmxlc3NBcHAoY21kLCBjb25maWcgYXMgV2ViU3RhdGljU2VydmVybGVzc0FwcENvbmZpZyk7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICAgIGRlZmF1bHQ6XG4gICAgICAgICAgY29uc29sZS5lcnJvcihgVW5zdXBwb3J0ZWQgZXZvc3ludGggYXBwIHR5cGU6IFwiJHtjb25maWcudHlwZX1cImApO1xuICAgICAgICAgIHByb2Nlc3MuZXhpdCgxKTtcbiAgICAgICAgICBicmVhaztcbiAgICAgIH1cbiAgICB9IGVsc2Uge1xuICAgICAgY29uc29sZS5lcnJvcihgQ29uZmlnIGVudmlyb25tZW50IFwiJHtlbnZ9XCIgbm90IGZvdW5kYCk7XG4gICAgICBwcm9jZXNzLmV4aXQoMSk7XG4gICAgfVxuICAgIFxuICB9IGVsc2Uge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2V2b3N5bnRoIGNvbmZpZyBub3QgZm91bmQhJyk7XG4gIH1cbn0iXX0=

package/dist/cli/web-static-serverless.d.ts

@@ -11,8 +11,11 @@ export interface AppConfigDnsProps {
 export interface AppConfigSecurityProps {
     basicAuth?: string;
     basicAuthParam?: string;
-    webAcl?: string | false;
-    webAclParam?: string;
+    webAcl?: string | boolean;
+    webAclParam?: string | {
+        path: string;
+        version?: number;
+    };
 }
 export interface AppConfigCloudFrontProps {
     responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;
@@ -46,7 +49,7 @@ export interface AppConfigPipelineBuildProps {
 }
 export interface WebStaticServerlessAppConfig extends EvosynthAppConfig {
     type: Extract<EvosynthAppType, 'web-static-serverless'>;
-    description?: string;
+    description: string;
     dns: AppConfigDnsProps;
     security?: AppConfigSecurityProps;
     cloudfront?: AppConfigCloudFrontProps;

package/dist/cli/web-static-serverless.js

@@ -3,8 +3,8 @@ import * as core from 'aws-cdk-lib/core';
 import { Toolkit } from '@aws-cdk/toolkit-lib';
 import { getEnv } from '../index.js';
 import { WebStaticServerlessStage } from '../stages/web-static-serverless-stage.js';
-const cdk = new Toolkit();
 export async function runWebStaticServerlessApp(cmd, config) {
+    const cdk = new Toolkit();
     const cx = await cdk.fromAssemblyBuilder(async (props) => {
         const app = new core.App({
             outdir: join(process.cwd(), '.evosynth'),
@@ -18,7 +18,7 @@ export async function runWebStaticServerlessApp(cmd, config) {
             hostedZone: config.dns.zone,
             domainName: `${config.dns.record}.${config.dns.zone}`,
             basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,
-            webAcl: config.security?.webAclParam ? { path: config.security.webAclParam } : config.security?.webAcl,
+            webAcl: config.security?.webAclParam ? config.security.webAclParam.path ? config.security.webAclParam : { path: config.security.webAclParam } : config.security?.webAcl,
             redirects: config.cloudfront?.redirects,
             responseCspHeaders: config.cloudfront?.cspHeaders,
             responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,
@@ -71,4 +71,4 @@ export async function runWebStaticServerlessApp(cmd, config) {
             break;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"web-static-serverless.js","sourceRoot":"","sources":["../../src/cli/web-static-serverless.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'node:path';\nimport * as core from 'aws-cdk-lib/core';\nimport { Toolkit } from '@aws-cdk/toolkit-lib';\nimport { ResponseHeadersPolicyProps } from 'aws-cdk-lib/aws-cloudfront';\nimport { IBuildImage } from 'aws-cdk-lib/aws-codebuild';\nimport { CloudFrontErrorResponse, CloudFrontFunctionRedirects } from '../constructs/cloudfront.js';\nimport { CodeBuildImageId, EcrBuildImage, CodeBuildSsmParameter, CodeBuildComputeType, CodeBuildNodeJs, EnvironmentVariables } from '../constructs/codebuild.ts';\nimport type { EvosynthAppConfig, CdkCommand, EvosynthAppType } from './evosynth.ts';\nimport type { CloudFrontFunctionEventType, CspHeaders, UUID, AWSManagedResponseHeadersPolicy } from '../types.d.ts';\nimport { getEnv } from '../index.js';\nimport { WebStaticServerlessStage, WebStaticServerlessStageProps } from '../stages/web-static-serverless-stage.js';\n\nconst cdk = new Toolkit();\n\nexport interface AppConfigDnsProps {\n  record: string;\n  zone: string;\n}\n\nexport interface AppConfigSecurityProps {\n  basicAuth?: string;\n  basicAuthParam?: string;\n  webAcl?: string | false;\n  webAclParam?: string;\n}\n\nexport interface AppConfigCloudFrontProps {\n  responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;\n  responseHeadersParam?: string;\n  responseHeadersPolicy?: ResponseHeadersPolicyProps;\n  cspHeaders?: CspHeaders;\n  redirects?: CloudFrontFunctionRedirects;\n  function?: string | {\n    code: string;\n    eventType: CloudFrontFunctionEventType[];\n  },\n  errorResponses?: CloudFrontErrorResponse[]\n}\n\nexport interface AppConfigPipelineSourceProps {\n  codestarConnection?: string;\n  codestarConnectionParam?: string;\n  owner: 'evokegroup' | 'meltmedia' | (string & {});\n  repo: string;\n  branch: string;\n  fullClone?: boolean;\n}\n\nexport interface AppConfigPipelineBuildProps {\n  buildSpec?: string | object;\n  buildImage?: IBuildImage;\n  buildImageEcr?: EcrBuildImage;\n  buildImageNodeJS?: CodeBuildNodeJs;\n  buildImageId?: CodeBuildImageId;\n  computeType?: CodeBuildComputeType;\n  environmentVariables?: EnvironmentVariables;\n  ssmParameters?: CodeBuildSsmParameter[]\n}\n\nexport interface WebStaticServerlessAppConfig extends EvosynthAppConfig {\n  type: Extract<EvosynthAppType, 'web-static-serverless'>,\n  description?: string;\n  dns: AppConfigDnsProps,\n  security?: AppConfigSecurityProps,\n  cloudfront?: AppConfigCloudFrontProps,\n  pipeline?: {\n    source: AppConfigPipelineSourceProps,\n    build?: AppConfigPipelineBuildProps\n  }\n}\n\nexport async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStaticServerlessAppConfig) {\n  const cx = await cdk.fromAssemblyBuilder(async (props) => {\n    const app = new core.App({\n      outdir: join(process.cwd(), '.evosynth'),\n    });\n\n    const stageProps: WebStaticServerlessStageProps & core.StageProps = {\n      env: getEnv(config.region),\n      stageName: `${config.name}${config.envType ? `-${config.envType}` : ''}`,\n      tags: config.tags,\n      envType: config.envType === 'prod' ? 'PROD' : 'NOT_PROD',\n      description: `${config.description}${config.envType ? ` ${config.envType.toUpperCase()}` : ''}`,\n      hostedZone: config.dns.zone,\n      domainName: `${config.dns.record}.${config.dns.zone}`,\n      basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,\n      webAcl: config.security?.webAclParam ? { path: config.security.webAclParam } : config.security?.webAcl,\n      redirects: config.cloudfront?.redirects,\n      responseCspHeaders: config.cloudfront?.cspHeaders,\n      responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,\n      responseHeadersPolicyProps: config.cloudfront?.responseHeadersPolicy,\n      cloudfrontFunction: config.cloudfront?.function && typeof config.cloudfront.function == 'string' ? {\n        code: config.cloudfront.function,\n        eventType: ['VIEWER_REQUEST','VIEWER_RESPONSE'],\n      } : config.cloudfront?.function as any,\n      errorResponses: config.cloudfront?.errorResponses\n    }\n    if (config.pipeline) {\n      stageProps.pipeline = {\n        sourceStage: {\n          codestarConnection: config.pipeline.source.codestarConnectionParam ? { path: config.pipeline.source.codestarConnectionParam } : config.pipeline.source.codestarConnection as string,\n          repoOwner: config.pipeline.source.owner,\n          repo: config.pipeline.source.repo,\n          branch: config.pipeline.source.branch,\n          fullClone: config.pipeline.source.fullClone\n        }\n      }\n      if (config.pipeline.build) {\n        stageProps.pipeline.buildStage = {\n          environmentVariables: config.pipeline.build.environmentVariables\n        };\n        stageProps.pipeline.codeBuildProject = {\n          buildImage: config.pipeline.build.buildImage,\n          buildImageId: config.pipeline.build.buildImageId,\n          buildImageNodeJS: config.pipeline.build.buildImageNodeJS,\n          buildSpec: config.pipeline.build.buildSpec,\n          computeType: config.pipeline.build.computeType,\n          ecrBuildImage: config.pipeline.build.buildImageEcr,\n          ssmParameters: config.pipeline.build.ssmParameters\n        };\n      }\n    }\n\n    new WebStaticServerlessStage(app, config.type, stageProps);\n\n    return app.synth();\n  });\n\n  switch (cmd) {\n    // case 'bootstrap':\n    //   await cdk.bootstrap(BootstrapEnvironments.fromList([`aws://${process.env.CDK_DEFAULT_ACCOUNT}/${config.region}`]));\n    //   break;\n    case 'deploy':\n    case 'destroy':\n    case 'diff':\n    case 'drift':\n    case 'rollback':\n    case 'synth':\n      await cdk[cmd](cx);\n      break;\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"web-static-serverless.js","sourceRoot":"","sources":["../../src/cli/web-static-serverless.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'node:path';\nimport * as core from 'aws-cdk-lib/core';\nimport { Toolkit } from '@aws-cdk/toolkit-lib';\nimport { ResponseHeadersPolicyProps } from 'aws-cdk-lib/aws-cloudfront';\nimport { IBuildImage } from 'aws-cdk-lib/aws-codebuild';\nimport { CloudFrontErrorResponse, CloudFrontFunctionRedirects } from '../constructs/cloudfront.js';\nimport { CodeBuildImageId, EcrBuildImage, CodeBuildSsmParameter, CodeBuildComputeType, CodeBuildNodeJs, EnvironmentVariables } from '../constructs/codebuild.ts';\nimport type { EvosynthAppConfig, CdkCommand, EvosynthAppType } from './evosynth.ts';\nimport type { CloudFrontFunctionEventType, CspHeaders, UUID, AWSManagedResponseHeadersPolicy } from '../types.d.ts';\nimport { getEnv } from '../index.js';\nimport { WebStaticServerlessStage, WebStaticServerlessStageProps } from '../stages/web-static-serverless-stage.js';\n\nexport interface AppConfigDnsProps {\n  record: string;\n  zone: string;\n}\n\nexport interface AppConfigSecurityProps {\n  basicAuth?: string;\n  basicAuthParam?: string;\n  webAcl?: string | boolean;\n  webAclParam?: string | { path: string, version?: number };\n}\n\nexport interface AppConfigCloudFrontProps {\n  responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;\n  responseHeadersParam?: string;\n  responseHeadersPolicy?: ResponseHeadersPolicyProps;\n  cspHeaders?: CspHeaders;\n  redirects?: CloudFrontFunctionRedirects;\n  function?: string | {\n    code: string;\n    eventType: CloudFrontFunctionEventType[];\n  },\n  errorResponses?: CloudFrontErrorResponse[]\n}\n\nexport interface AppConfigPipelineSourceProps {\n  codestarConnection?: string;\n  codestarConnectionParam?: string;\n  owner: 'evokegroup' | 'meltmedia' | (string & {});\n  repo: string;\n  branch: string;\n  fullClone?: boolean;\n}\n\nexport interface AppConfigPipelineBuildProps {\n  buildSpec?: string | object;\n  buildImage?: IBuildImage;\n  buildImageEcr?: EcrBuildImage;\n  buildImageNodeJS?: CodeBuildNodeJs;\n  buildImageId?: CodeBuildImageId;\n  computeType?: CodeBuildComputeType;\n  environmentVariables?: EnvironmentVariables;\n  ssmParameters?: CodeBuildSsmParameter[]\n}\n\nexport interface WebStaticServerlessAppConfig extends EvosynthAppConfig {\n  type: Extract<EvosynthAppType, 'web-static-serverless'>,\n  description: string;\n  dns: AppConfigDnsProps,\n  security?: AppConfigSecurityProps,\n  cloudfront?: AppConfigCloudFrontProps,\n  pipeline?: {\n    source: AppConfigPipelineSourceProps,\n    build?: AppConfigPipelineBuildProps\n  }\n}\n\nexport async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStaticServerlessAppConfig) {\n  const cdk = new Toolkit();\n  const cx = await cdk.fromAssemblyBuilder(async (props) => {\n    const app = new core.App({\n      outdir: join(process.cwd(), '.evosynth'),\n    });\n\n    const stageProps: WebStaticServerlessStageProps & core.StageProps = {\n      env: getEnv(config.region),\n      stageName: `${config.name}${config.envType ? `-${config.envType}` : ''}`,\n      tags: config.tags,\n      envType: config.envType === 'prod' ? 'PROD' : 'NOT_PROD',\n      description: `${config.description}${config.envType ? ` ${config.envType.toUpperCase()}` : ''}`,\n      hostedZone: config.dns.zone,\n      domainName: `${config.dns.record}.${config.dns.zone}`,\n      basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,\n      webAcl: config.security?.webAclParam ? (config.security.webAclParam as any).path ? config.security.webAclParam : { path: config.security.webAclParam as string } : config.security?.webAcl,\n      redirects: config.cloudfront?.redirects,\n      responseCspHeaders: config.cloudfront?.cspHeaders,\n      responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,\n      responseHeadersPolicyProps: config.cloudfront?.responseHeadersPolicy,\n      cloudfrontFunction: config.cloudfront?.function && typeof config.cloudfront.function == 'string' ? {\n        code: config.cloudfront.function,\n        eventType: ['VIEWER_REQUEST','VIEWER_RESPONSE'],\n      } : config.cloudfront?.function as any,\n      errorResponses: config.cloudfront?.errorResponses\n    }\n    if (config.pipeline) {\n      stageProps.pipeline = {\n        sourceStage: {\n          codestarConnection: config.pipeline.source.codestarConnectionParam ? { path: config.pipeline.source.codestarConnectionParam } : config.pipeline.source.codestarConnection as string,\n          repoOwner: config.pipeline.source.owner,\n          repo: config.pipeline.source.repo,\n          branch: config.pipeline.source.branch,\n          fullClone: config.pipeline.source.fullClone\n        }\n      }\n      if (config.pipeline.build) {\n        stageProps.pipeline.buildStage = {\n          environmentVariables: config.pipeline.build.environmentVariables\n        };\n        stageProps.pipeline.codeBuildProject = {\n          buildImage: config.pipeline.build.buildImage,\n          buildImageId: config.pipeline.build.buildImageId,\n          buildImageNodeJS: config.pipeline.build.buildImageNodeJS,\n          buildSpec: config.pipeline.build.buildSpec,\n          computeType: config.pipeline.build.computeType,\n          ecrBuildImage: config.pipeline.build.buildImageEcr,\n          ssmParameters: config.pipeline.build.ssmParameters\n        };\n      }\n    }\n\n    new WebStaticServerlessStage(app, config.type, stageProps);\n\n    return app.synth();\n  });\n\n  switch (cmd) {\n    // case 'bootstrap':\n    //   await cdk.bootstrap(BootstrapEnvironments.fromList([`aws://${process.env.CDK_DEFAULT_ACCOUNT}/${config.region}`]));\n    //   break;\n    case 'deploy':\n    case 'destroy':\n    case 'diff':\n    case 'drift':\n    case 'rollback':\n    case 'synth':\n      await cdk[cmd](cx);\n      break;\n  }\n}\n"]}

package/dist/constructs/cloudfront.d.ts

@@ -2,7 +2,7 @@ import { Construct } from 'constructs';
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
 import { BehaviorOptions, Distribution, ErrorResponse, Function } from 'aws-cdk-lib/aws-cloudfront';
 import type { ResourceProps } from '../types.d.ts';
-export interface CloudFrontErrorResponse extends ErrorResponse {
+export interface CloudFrontErrorResponse {
     httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;
     ttlSeconds?: number;
     responseStatus?: number;

package/dist/constructs/cloudfront.js

@@ -75,11 +75,22 @@ export class CloudFrontFunction extends Construct {
     static createFunction(scope, id, props) {
         const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;
         const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});
-        const hasRedirects = Object.keys(redirectPaths).length > 0;
+        const redirects = {};
+        const redirectsStartsWith = {};
+        const redirectKeys = Object.keys(redirectPaths);
+        for (const key of redirectKeys) {
+            if (key.endsWith('*')) {
+                redirectsStartsWith[key.substring(0, key.length - 1)] = redirectPaths[key];
+            }
+            else {
+                redirects[key] = redirectPaths[key];
+            }
+        }
         props.code = props.code
             .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')
             .replace('__CREDENTIALS__', props.credentials ?? 'Og==')
-            .replace('__REDIRECTS__', hasRedirects ? JSON.stringify(redirectPaths) : 'null')
+            .replace('__REDIRECTS__', Object.keys(redirects).length > 0 ? JSON.stringify(redirects) : 'null')
+            .replace('__REDIRECTS_START_WITH__', Object.keys(redirectsStartsWith).length > 0 ? JSON.stringify(redirectsStartsWith) : 'null')
             .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')
             .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');
         return new CloudFrontFunction(scope, id || 'ViewerRequestResponseFunction', {
@@ -89,4 +100,4 @@ export class CloudFrontFunction extends Construct {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cloudfront.js","sourceRoot":"","sources":["../../src/constructs/cloudfront.ts"],"names":[],"mappings":"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","sourcesContent":["import { resolve } from 'node:path';\nimport { readFileSync } from 'node:fs';\nimport { Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport { Construct } from 'constructs';\nimport { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';\nimport { BehaviorOptions, Distribution, ErrorResponse, Function, FunctionCode, FunctionRuntime, PriceClass } from 'aws-cdk-lib/aws-cloudfront';\nimport { tagResource } from '../lib/tags.js';\nimport { parseCsvRedirects } from '../lib/csv-redirects.js';\nimport type { ResourceProps } from '../types.d.ts';\n\nconst __dirname = import.meta.dirname;\n\nexport interface CloudFrontErrorResponse extends ErrorResponse {\n  httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;\n  ttlSeconds?: number;\n  responseStatus?: number;\n  responsePath?: string;\n}\nexport interface CloudFrontDistributionProps extends ResourceProps {\n  domainName: string;\n  description?: string;\n  defaultBehavior: BehaviorOptions;\n  additionalBehaviors?: Record<string, BehaviorOptions>;\n  priceClass?: 'PRICE_CLASS_ALL' | 'PRICE_CLASS_100' | 'PRICE_CLASS_200' | 'NOT_PROD' | 'PROD';\n  certificate: ICertificate;\n  webAclId?: string;\n  errorResponses?: (CloudFrontErrorResponse | ErrorResponse)[]\n}\nexport class CloudFrontDistribution extends Construct {\n  public readonly distribution: Distribution;\n\n  constructor(scope: Construct, id: string, props: CloudFrontDistributionProps) {\n    super(scope, id);\n\n    let priceClass = PriceClass.PRICE_CLASS_ALL;\n    switch (props.priceClass) {\n      case 'NOT_PROD':\n      case 'PRICE_CLASS_100':\n        priceClass = PriceClass.PRICE_CLASS_100;\n        break;\n      case 'PRICE_CLASS_200':\n        priceClass = PriceClass.PRICE_CLASS_200;\n        break;\n    }\n\n    this.distribution = new Distribution(this, `${id}|CloudFrontDistribution`, {\n      comment: props.description,\n      defaultBehavior: props.defaultBehavior,\n      additionalBehaviors: props.additionalBehaviors,\n      domainNames: [props.domainName],\n      certificate: props.certificate,\n      priceClass,\n      webAclId: props.webAclId,\n      errorResponses: props.errorResponses?.map((r) => {\n        return {\n          httpStatus: r.httpStatus,\n          ttl: (r as CloudFrontErrorResponse).ttlSeconds !== undefined ? Duration.seconds((r as CloudFrontErrorResponse).ttlSeconds!) : (r as ErrorResponse).ttl,\n          responseHttpStatus: (r as CloudFrontErrorResponse).responseStatus ?? (r as ErrorResponse).responseHttpStatus,\n          responsePagePath: (r as CloudFrontErrorResponse).responsePath ?? (r as ErrorResponse).responsePagePath\n        };\n      })\n    });\n    tagResource(this.distribution, props.tags);\n    if (typeof props.destroy == 'boolean') {\n      this.distribution.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n}\n\nexport type HttpRedirectCode = 301 | 302 | 303 | 307 | 308;\nexport type CloudFrontFunctionRedirectPaths = Record<string, string | [string, HttpRedirectCode]>;\n\nexport interface CloudFrontFunctionRedirects {\n  trailingSlash?: boolean;\n  defaultDocument?: string;\n  redirectDefaultDocument?: boolean;\n  paths?: CloudFrontFunctionRedirectPaths;\n  pathsCsvFile?: string;\n}\n\nexport interface ViewerEventFunctionProps extends ResourceProps {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n  credentials?: string;\n  code: string;\n}\n\nexport interface DefaultDocFunctionProps extends ResourceProps, Pick<ViewerEventFunctionProps, 'functionName' | 'defaultDocument' | 'redirects' | 'redirectsCsvPath'> {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n}\n\nexport interface BasicAuthDefaultDocFunctionProps extends DefaultDocFunctionProps {\n  credentials: string;\n}\n\n\nexport interface CloudFrontFunctionProps extends ResourceProps {\n  code: string;\n  functionName?: string;\n  runtime?: 'JS_1_0' | 'JS_2_0';\n}\nexport class CloudFrontFunction extends Construct {\n  public readonly fn: Function;\n\n  constructor(scope: Construct, id: string, props: CloudFrontFunctionProps) {\n    super(scope, id);\n\n    this.fn = new Function(this, 'CloudFrontFunction', {\n      functionName: props.functionName,\n      runtime: FunctionRuntime[props.runtime ?? 'JS_2_0'],\n      code: FunctionCode.fromInline(props.code)\n    });\n    tagResource(this.fn, props.tags);\n\n    if (typeof props.destroy == 'boolean') {\n      this.fn.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n\n  static createDefaultDoc(scope: Construct, props: DefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc.js'), 'utf8');\n\n    return this.createFunction(scope, 'DefaultDocFunction', {\n      ...props,\n      credentials: '',\n      code\n    });\n  }\n\n  static createBasicAuthDefaultDoc(scope: Construct, props: BasicAuthDefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc-basic-auth.js'), 'utf8');\n\n    return this.createFunction(scope, 'BasicAuthDefaultDocFunction', {\n      ...props,\n      code\n    });\n\n  }\n\n  static createFunction(scope: Construct, id: string | null, props: ViewerEventFunctionProps) {\n    const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;\n    const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});\n    const hasRedirects = Object.keys(redirectPaths).length > 0;\n\n    props.code = props.code\n      .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')\n      .replace('__CREDENTIALS__', props.credentials ?? 'Og==')\n      .replace('__REDIRECTS__', hasRedirects ? JSON.stringify(redirectPaths) : 'null')\n      .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')\n      .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');\n\n    return new CloudFrontFunction(scope, id || 'ViewerRequestResponseFunction', {\n      functionName: props.functionName,\n      runtime: 'JS_2_0',\n      code: props.code\n    });\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cloudfront.js","sourceRoot":"","sources":["../../src/constructs/cloudfront.ts"],"names":[],"mappings":"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","sourcesContent":["import { resolve } from 'node:path';\nimport { readFileSync } from 'node:fs';\nimport { Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport { Construct } from 'constructs';\nimport { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';\nimport { BehaviorOptions, Distribution, ErrorResponse, Function, FunctionCode, FunctionRuntime, PriceClass } from 'aws-cdk-lib/aws-cloudfront';\nimport { tagResource } from '../lib/tags.js';\nimport { parseCsvRedirects } from '../lib/csv-redirects.js';\nimport type { ResourceProps } from '../types.d.ts';\n\nconst __dirname = import.meta.dirname;\n\nexport interface CloudFrontErrorResponse {\n  httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;\n  ttlSeconds?: number;\n  responseStatus?: number;\n  responsePath?: string;\n}\nexport interface CloudFrontDistributionProps extends ResourceProps {\n  domainName: string;\n  description?: string;\n  defaultBehavior: BehaviorOptions;\n  additionalBehaviors?: Record<string, BehaviorOptions>;\n  priceClass?: 'PRICE_CLASS_ALL' | 'PRICE_CLASS_100' | 'PRICE_CLASS_200' | 'NOT_PROD' | 'PROD';\n  certificate: ICertificate;\n  webAclId?: string;\n  errorResponses?: (CloudFrontErrorResponse | ErrorResponse)[]\n}\nexport class CloudFrontDistribution extends Construct {\n  public readonly distribution: Distribution;\n\n  constructor(scope: Construct, id: string, props: CloudFrontDistributionProps) {\n    super(scope, id);\n\n    let priceClass = PriceClass.PRICE_CLASS_ALL;\n    switch (props.priceClass) {\n      case 'NOT_PROD':\n      case 'PRICE_CLASS_100':\n        priceClass = PriceClass.PRICE_CLASS_100;\n        break;\n      case 'PRICE_CLASS_200':\n        priceClass = PriceClass.PRICE_CLASS_200;\n        break;\n    }\n\n    this.distribution = new Distribution(this, `${id}|CloudFrontDistribution`, {\n      comment: props.description,\n      defaultBehavior: props.defaultBehavior,\n      additionalBehaviors: props.additionalBehaviors,\n      domainNames: [props.domainName],\n      certificate: props.certificate,\n      priceClass,\n      webAclId: props.webAclId,\n      errorResponses: props.errorResponses?.map((r) => {\n        return {\n          httpStatus: r.httpStatus,\n          ttl: (r as CloudFrontErrorResponse).ttlSeconds !== undefined ? Duration.seconds((r as CloudFrontErrorResponse).ttlSeconds!) : (r as ErrorResponse).ttl,\n          responseHttpStatus: (r as CloudFrontErrorResponse).responseStatus ?? (r as ErrorResponse).responseHttpStatus,\n          responsePagePath: (r as CloudFrontErrorResponse).responsePath ?? (r as ErrorResponse).responsePagePath\n        };\n      })\n    });\n    tagResource(this.distribution, props.tags);\n    if (typeof props.destroy == 'boolean') {\n      this.distribution.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n}\n\nexport type HttpRedirectCode = 301 | 302 | 303 | 307 | 308;\nexport type CloudFrontFunctionRedirectPaths = Record<string, string | [string, HttpRedirectCode]>;\n\nexport interface CloudFrontFunctionRedirects {\n  trailingSlash?: boolean;\n  defaultDocument?: string;\n  redirectDefaultDocument?: boolean;\n  paths?: CloudFrontFunctionRedirectPaths;\n  pathsCsvFile?: string;\n}\n\nexport interface ViewerEventFunctionProps extends ResourceProps {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n  credentials?: string;\n  code: string;\n}\n\nexport interface DefaultDocFunctionProps extends ResourceProps, Pick<ViewerEventFunctionProps, 'functionName' | 'defaultDocument' | 'redirects' | 'redirectsCsvPath'> {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n}\n\nexport interface BasicAuthDefaultDocFunctionProps extends DefaultDocFunctionProps {\n  credentials: string;\n}\n\n\nexport interface CloudFrontFunctionProps extends ResourceProps {\n  code: string;\n  functionName?: string;\n  runtime?: 'JS_1_0' | 'JS_2_0';\n}\nexport class CloudFrontFunction extends Construct {\n  public readonly fn: Function;\n\n  constructor(scope: Construct, id: string, props: CloudFrontFunctionProps) {\n    super(scope, id);\n\n    this.fn = new Function(this, 'CloudFrontFunction', {\n      functionName: props.functionName,\n      runtime: FunctionRuntime[props.runtime ?? 'JS_2_0'],\n      code: FunctionCode.fromInline(props.code)\n    });\n    tagResource(this.fn, props.tags);\n\n    if (typeof props.destroy == 'boolean') {\n      this.fn.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n\n  static createDefaultDoc(scope: Construct, props: DefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc.js'), 'utf8');\n\n    return this.createFunction(scope, 'DefaultDocFunction', {\n      ...props,\n      credentials: '',\n      code\n    });\n  }\n\n  static createBasicAuthDefaultDoc(scope: Construct, props: BasicAuthDefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc-basic-auth.js'), 'utf8');\n\n    return this.createFunction(scope, 'BasicAuthDefaultDocFunction', {\n      ...props,\n      code\n    });\n\n  }\n\n  static createFunction(scope: Construct, id: string | null, props: ViewerEventFunctionProps) {\n    const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;\n    const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});\n\n    const redirects: CloudFrontFunctionRedirectPaths = {};\n    const redirectsStartsWith: CloudFrontFunctionRedirectPaths = {};\n    const redirectKeys = Object.keys(redirectPaths);\n    for (const key of redirectKeys) {\n      if (key.endsWith('*')) {\n        redirectsStartsWith[key.substring(0, key.length - 1)] = redirectPaths[key];\n      } else {\n        redirects[key] = redirectPaths[key];\n      }\n    }\n\n    props.code = props.code\n      .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')\n      .replace('__CREDENTIALS__', props.credentials ?? 'Og==')\n      .replace('__REDIRECTS__', Object.keys(redirects).length > 0 ? JSON.stringify(redirects) : 'null')\n      .replace('__REDIRECTS_START_WITH__', Object.keys(redirectsStartsWith).length > 0 ? JSON.stringify(redirectsStartsWith) : 'null')\n      .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')\n      .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');\n\n    return new CloudFrontFunction(scope, id || 'ViewerRequestResponseFunction', {\n      functionName: props.functionName,\n      runtime: 'JS_2_0',\n      code: props.code\n    });\n  }\n}\n"]}

package/dist/templates/cffn-default-doc-basic-auth.js

@@ -9,7 +9,13 @@ const BASIC_AUTH = ["Basic __CREDENTIALS__"];
 /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
 const redirects = __REDIRECTS__;
 
+/** @type {Record<string, string | [string, 301|302|303|307|308]>} */
+const redirectsStartsWith = __REDIRECTS_START_WITH__;
+
+/** @type {boolean | null} */
 const useTrailingSlash = __TRAILING_SLASH__;
+
+/** @type {boolean | null} */
 const shouldRedirDefDoc = __REDIR_DEF_DOC__;
 
 
@@ -32,7 +38,19 @@ function handleRequest(event) {
     const request = event.request;
     const uri = request.uri;
 
-    const redirect = redirects ? redirects[uri] : null;
+    let redirect = null;
+    if (redirects) {
+      redirect = redirects[uri];
+    }
+    if (!redirect && redirectsStartsWith) {
+      const keys = Object.keys(redirectsStartsWith);
+      for (let i=0; i<keys.length; i++) {
+        if (uri.startsWith(keys[i])) {
+          redirect = redirectsStartsWith[keys[i]];
+          break;
+        }
+      }
+    }
     if (redirect) {
       const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
       return redirectResponse(event, redir[0], redir[1]);

package/dist/templates/cffn-default-doc.js

@@ -8,7 +8,13 @@ const DEFAULT_DOCUMENT = "__DEFAULT_DOCUMENT__";
 /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
 const redirects = __REDIRECTS__;
 
+/** @type {Record<string, string | [string, 301|302|303|307|308]>} */
+const redirectsStartsWith = __REDIRECTS_START_WITH__;
+
+/** @type {boolean | null} */
 const useTrailingSlash = __TRAILING_SLASH__;
+
+/** @type {boolean | null} */
 const shouldRedirDefDoc = __REDIR_DEF_DOC__;
 
 
@@ -30,7 +36,19 @@ function handleRequest(event) {
   const request = event.request;
   const uri = request.uri;
 
-  const redirect = redirects ? redirects[uri] : null;
+  let redirect = null;
+  if (redirects) {
+    redirect = redirects[uri];
+  }
+  if (!redirect && redirectsStartsWith) {
+    const keys = Object.keys(redirectsStartsWith);
+    for (let i=0; i<keys.length; i++) {
+      if (uri.startsWith(keys[i])) {
+        redirect = redirectsStartsWith[keys[i]];
+        break;
+      }
+    }
+  }
   if (redirect) {
     const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
     return redirectResponse(event, redir[0], redir[1]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inizioevoke/evosynth",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "author": "",
   "license": "ISC",
   "description": "",
@@ -10,11 +10,14 @@
     "./constructs/*": "./dist/constructs/*.js",
     "./stacks/*": "./dist/stacks/*.js",
     "./stages/*": "./dist/stages/*.js",
-    "./types/*": "./dist/types.d.ts"
+    "./types": "./dist/types.d.ts"
   },
   "bin": {
     "evosynth": "./dist/cli/cli.js"
   },
+  "engines": {
+    "node": ">=22.0.0"
+  },
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "node ./tasks/clean.js && npx tsc && node ./tasks/dist.js"

package/readme.md

@@ -14,7 +14,7 @@ EvoSynth is an npm package providing reusable AWS CDK stacks for deploying stati
 - Copy the buildspec.yml on your Bitbucket Repo and the build configuration
 - Update/Configure the Stack example below
 
-## Version 2 - evosynth cli (preferred)
+## CLI - evosynth (preferred)
 
 This library includes a cli tool `evosynth` to support a more streamlined configuration approach than the version 1 process, although the version 1 process is still supported.
 
@@ -30,7 +30,7 @@ In your project:
    ```bash
    .evosynth.[ENV].(js|mjs|ts|mts)
    ```
-   It is also possible to use 1 config file for multiple environments.
+   It is also possible to use 1 config file for multiple environments. Named exports should match your environment names.
    ```bash
    .evosynth.(js|mjs|ts|mts)
    ```
@@ -94,80 +94,73 @@ export default async function(): Promise<WebStaticServerlessAppConfig> {
 // .evosynth.dev.ts
 import type { WebStaticServerlessAppConfig } from '@inizioevoke/evosynth';
 
-const name = 'my-project';
-const description = 'My Project';
-const region = 'us-east-1';
-const tags: Record<string, string> = {
-  Account: 'Account Name',
-  Brand: 'Brand Name'
+const config: Omit<WebStaticServerlessAppConfig, 'dns'> = {
+  type: 'web-static-serverless',
+  name: 'my-project',
+  description: 'My Project',
+  region: 'us-east-1',
+  tags: {
+    Account: 'Account Name',
+    Brand: 'Brand Name'
+  },
+  security: {
+    basicAuthParam: '/evosynth/web/security/basicauth',
+    webAclParam: '/evosynth/web/security/webacl'
+  },
+  pipeline: {
+    source: {
+      codestarConnectionParam: '/evosynth/bitbucket/codeconnection',
+      owner: 'evokegroup',
+      repo: 'my-project',
+      branch: ''
+    }
+  }
 };
-const basicAuthParam = '/evosynth/web/security/basicauth';
-const webAclParam = '/evosynth/web/security/webacl';
-const codestarConnectionParam = '/evosynth/bitbucket/codeconnection';
-const owner = 'evokegroup';
-const repo = 'my-project';
 
-export default async function dev(): Promise<WebStaticServerlessAppConfig> {
+// dev environment
+export async function dev(): Promise<WebStaticServerlessAppConfig> {
   return {
-    type: 'web-static-serverless',
+    ...config,
     envType: 'dev',
-    name,
-    description,
-    region,
-    tags,
     dns: {
       record: 'my-project.dev.client',
       zone: 'evodev.net'
     },
-    security: {
-      basicAuthParam,
-      webAclParam
-    },
     pipeline: {
       source: {
-        codestarConnectionParam,
-        owner,
-        repo,
+        ...config.pipeline!.source,
         branch: 'develop'
       }
     }
   }
 }
-export default async function uat(): Promise<WebStaticServerlessAppConfig> {
+
+// uat environment
+export async function uat(): Promise<WebStaticServerlessAppConfig> {
   return {
-    type: 'web-static-serverless',
+    ...config,
     envType: 'uat',
-    name,
-    description,
-    region,
-    tags,
     dns: {
       record: 'my-project.uat.client',
       zone: 'evodev.net'
     },
-    security: {
-      basicAuthParam,
-      webAclParam
-    },
     pipeline: {
       source: {
-        codestarConnectionParam,
-        owner,
-        repo,
-        branch: 'develop'
+        ...config.pipeline!.source,
+        branch: 'uat'
       }
     }
   }
 }
 ```
 
-## Version 1
-
-*Requires [CDK v2.238.x](https://docs.aws.amazon.com/cdk/v2/guide/home.html) installed locally*
+## CDK App
 
+Use evosynth in a traditional CDK app script by instantiating a stage or stack. Use individual constructs for custom apps.
 
+*Requires [CDK v2.238.x](https://docs.aws.amazon.com/cdk/v2/guide/home.html) installed locally*
 
-### Example App (legacy)
+### Example App
 
 ```typescript
 import * as cdk from 'aws-cdk-lib/core';

package/samples/.evosynth.ts

@@ -1,39 +1,76 @@
 import type { WebStaticServerlessAppConfig } from '@inizioevoke/evosynth';
 
+const config: Omit<WebStaticServerlessAppConfig, 'dns'> = {
+  type: 'web-static-serverless',
+  name: 'my-project',
+  description: 'My Project',
+  region: 'us-east-1',
+  tags: {
+    Account: 'Account Name',
+    Brand: 'Brand Name'
+  },
+  cloudfront: {
+    redirects: {
+      paths: {
+        '/old': '/new/',
+        '/hello': ['/world/', 302]
+      }
+    },
+    cspHeaders: {
+      'default-src': [
+        "'self'"
+      ],
+      'script-src': [
+        "'self'"
+      ]
+    }
+  },
+  security: {
+    basicAuthParam: '/evosynth/web/security/basicauth',
+    webAclParam: '/evosynth/web/security/webacl'
+  },
+  pipeline: {
+    source: {
+      codestarConnectionParam: '/evosynth/bitbucket/codeconnection',
+      owner: 'evokegroup',
+      repo: 'my-project',
+      branch: ''
+    }
+  }
+};
+
+// dev environment
 export async function dev(): Promise<WebStaticServerlessAppConfig> {
   return {
-    type: 'web-static-serverless',
+    ...config,
     envType: 'dev',
-    name: 'myproject-v1',
-    description: 'My Project',
-    region: 'us-east-1',
-    tags: {
-      Account: 'Account Name',
-      Brand: 'Brand Name'
-    },
     dns: {
-      record: 'livdelzi-hcp-iva-v2.gilead',
+      record: 'my-project.dev.client',
       zone: 'evodev.net'
     },
-    security: {
-      basicAuthParam: '/evosynth/web/security/basicauth',
-      webAclParam: '/evosynth/web/security/webacl'
-    },
-    // cloudfront: {
-    //   redirects: {
-    //     paths: {
-    //       '/hello': '/world',
-    //       '/redirect': ['/here', 302]
-    //     }
-    //   }
-    // },
     pipeline: {
       source: {
-        codestarConnectionParam: '/evosynth/provider/codeconnection',
-        owner: 'orgname',
-        repo: 'myproject-v1',
+        ...config.pipeline!.source,
         branch: 'develop'
       }
     }
   }
 }
+
+// uat environment
+export async function uat(): Promise<WebStaticServerlessAppConfig> {
+  return {
+    ...config,
+    envType: 'uat',
+    dns: {
+      record: 'my-project.uat.client',
+      zone: 'evodev.net'
+    },
+    pipeline: {
+      source: {
+        ...config.pipeline!.source,
+        branch: 'uat'
+      }
+    }
+  }
+}

package/samples/csp.ts

@@ -3,6 +3,9 @@ import type { CspHeaders } from '@inizioevoke/evosynth/types';
 const cspHeaders: CspHeaders = {
   'default-src': [
     "'self'"
+  ],
+  'script-src': [
+    "'self'"
   ]
 }
 

package/src/cli/evosynth.ts

@@ -49,13 +49,20 @@ export async function evosynth(cmd: CdkCommand, env: string, props: EvosynthProp
   if (configIndex != -1) {
     const configFile = configFiles[configIndex];
     const tsxUnregister = /^\.m?ts$/.test(extname(configFile.name)) ? register() : undefined;
-    const module = await import(pathToFileURL(join(configFile.dir, configFile.name)).toString());
-    tsxUnregister && tsxUnregister();
+    let module: any;
+    try {
+      module = await import(pathToFileURL(join(configFile.dir, configFile.name)).toString());
+    } catch (err) {
+      console.error(`Failed to load config "${configFile.name}":`, (err as Error).message);
+      process.exit(1);
+    } finally {
+      tsxUnregister?.();
+    }
     let config: EvosynthAppConfig | undefined = undefined;
     if (configFile.env) {
-      config = await module.default();
+      config = await module.default?.();
     } else {
-      config = await module[env]?.();
+      config = await module[env.toLowerCase()]?.();
     }
 
     if (config) {
@@ -66,7 +73,14 @@ export async function evosynth(cmd: CdkCommand, env: string, props: EvosynthProp
         case 'web-static-serverless':
           await runWebStaticServerlessApp(cmd, config as WebStaticServerlessAppConfig);
           break;
+        default:
+          console.error(`Unsupported evosynth app type: "${config.type}"`);
+          process.exit(1);
+          break;
       }
+    } else {
+      console.error(`Config environment "${env}" not found`);
+      process.exit(1);
     }
     
   } else {

package/src/cli/web-static-serverless.ts

@@ -10,8 +10,6 @@ import type { CloudFrontFunctionEventType, CspHeaders, UUID, AWSManagedResponseH
 import { getEnv } from '../index.js';
 import { WebStaticServerlessStage, WebStaticServerlessStageProps } from '../stages/web-static-serverless-stage.js';
 
-const cdk = new Toolkit();
-
 export interface AppConfigDnsProps {
   record: string;
   zone: string;
@@ -20,8 +18,8 @@ export interface AppConfigDnsProps {
 export interface AppConfigSecurityProps {
   basicAuth?: string;
   basicAuthParam?: string;
-  webAcl?: string | false;
-  webAclParam?: string;
+  webAcl?: string | boolean;
+  webAclParam?: string | { path: string, version?: number };
 }
 
 export interface AppConfigCloudFrontProps {
@@ -59,7 +57,7 @@ export interface AppConfigPipelineBuildProps {
 
 export interface WebStaticServerlessAppConfig extends EvosynthAppConfig {
   type: Extract<EvosynthAppType, 'web-static-serverless'>,
-  description?: string;
+  description: string;
   dns: AppConfigDnsProps,
   security?: AppConfigSecurityProps,
   cloudfront?: AppConfigCloudFrontProps,
@@ -70,6 +68,7 @@ export interface WebStaticServerlessAppConfig extends EvosynthAppConfig {
 }
 
 export async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStaticServerlessAppConfig) {
+  const cdk = new Toolkit();
   const cx = await cdk.fromAssemblyBuilder(async (props) => {
     const app = new core.App({
       outdir: join(process.cwd(), '.evosynth'),
@@ -84,7 +83,7 @@ export async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStat
       hostedZone: config.dns.zone,
       domainName: `${config.dns.record}.${config.dns.zone}`,
       basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,
-      webAcl: config.security?.webAclParam ? { path: config.security.webAclParam } : config.security?.webAcl,
+      webAcl: config.security?.webAclParam ? (config.security.webAclParam as any).path ? config.security.webAclParam : { path: config.security.webAclParam as string } : config.security?.webAcl,
       redirects: config.cloudfront?.redirects,
       responseCspHeaders: config.cloudfront?.cspHeaders,
       responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,

package/src/constructs/cloudfront.ts

@@ -10,7 +10,7 @@ import type { ResourceProps } from '../types.d.ts';
 
 const __dirname = import.meta.dirname;
 
-export interface CloudFrontErrorResponse extends ErrorResponse {
+export interface CloudFrontErrorResponse {
   httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;
   ttlSeconds?: number;
   responseStatus?: number;
@@ -145,12 +145,23 @@ export class CloudFrontFunction extends Construct {
   static createFunction(scope: Construct, id: string | null, props: ViewerEventFunctionProps) {
     const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;
     const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});
-    const hasRedirects = Object.keys(redirectPaths).length > 0;
+
+    const redirects: CloudFrontFunctionRedirectPaths = {};
+    const redirectsStartsWith: CloudFrontFunctionRedirectPaths = {};
+    const redirectKeys = Object.keys(redirectPaths);
+    for (const key of redirectKeys) {
+      if (key.endsWith('*')) {
+        redirectsStartsWith[key.substring(0, key.length - 1)] = redirectPaths[key];
+      } else {
+        redirects[key] = redirectPaths[key];
+      }
+    }
 
     props.code = props.code
       .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')
       .replace('__CREDENTIALS__', props.credentials ?? 'Og==')
-      .replace('__REDIRECTS__', hasRedirects ? JSON.stringify(redirectPaths) : 'null')
+      .replace('__REDIRECTS__', Object.keys(redirects).length > 0 ? JSON.stringify(redirects) : 'null')
+      .replace('__REDIRECTS_START_WITH__', Object.keys(redirectsStartsWith).length > 0 ? JSON.stringify(redirectsStartsWith) : 'null')
       .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')
       .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');
 

package/src/templates/cffn-default-doc-basic-auth.js

@@ -9,7 +9,13 @@ const BASIC_AUTH = ["Basic __CREDENTIALS__"];
 /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
 const redirects = __REDIRECTS__;
 
+/** @type {Record<string, string | [string, 301|302|303|307|308]>} */
+const redirectsStartsWith = __REDIRECTS_START_WITH__;
+
+/** @type {boolean | null} */
 const useTrailingSlash = __TRAILING_SLASH__;
+
+/** @type {boolean | null} */
 const shouldRedirDefDoc = __REDIR_DEF_DOC__;
 
 
@@ -32,7 +38,19 @@ function handleRequest(event) {
     const request = event.request;
     const uri = request.uri;
 
-    const redirect = redirects ? redirects[uri] : null;
+    let redirect = null;
+    if (redirects) {
+      redirect = redirects[uri];
+    }
+    if (!redirect && redirectsStartsWith) {
+      const keys = Object.keys(redirectsStartsWith);
+      for (let i=0; i<keys.length; i++) {
+        if (uri.startsWith(keys[i])) {
+          redirect = redirectsStartsWith[keys[i]];
+          break;
+        }
+      }
+    }
     if (redirect) {
       const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
       return redirectResponse(event, redir[0], redir[1]);

package/src/templates/cffn-default-doc.js

@@ -8,7 +8,13 @@ const DEFAULT_DOCUMENT = "__DEFAULT_DOCUMENT__";
 /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
 const redirects = __REDIRECTS__;
 
+/** @type {Record<string, string | [string, 301|302|303|307|308]>} */
+const redirectsStartsWith = __REDIRECTS_START_WITH__;
+
+/** @type {boolean | null} */
 const useTrailingSlash = __TRAILING_SLASH__;
+
+/** @type {boolean | null} */
 const shouldRedirDefDoc = __REDIR_DEF_DOC__;
 
 
@@ -30,7 +36,19 @@ function handleRequest(event) {
   const request = event.request;
   const uri = request.uri;
 
-  const redirect = redirects ? redirects[uri] : null;
+  let redirect = null;
+  if (redirects) {
+    redirect = redirects[uri];
+  }
+  if (!redirect && redirectsStartsWith) {
+    const keys = Object.keys(redirectsStartsWith);
+    for (let i=0; i<keys.length; i++) {
+      if (uri.startsWith(keys[i])) {
+        redirect = redirectsStartsWith[keys[i]];
+        break;
+      }
+    }
+  }
   if (redirect) {
     const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
     return redirectResponse(event, redir[0], redir[1]);