effortless-aws 0.3.0 → 0.4.1

package/dist/cli/index.js

@@ -70597,6 +70597,12 @@ var handlerRegistry = {
     handlerProps: ["onRecord", "onBatch"],
     wrapperFn: "wrapTableStream",
     wrapperPath: "~/runtime/wrap-table-stream"
+  },
+  site: {
+    defineFn: "defineSite",
+    handlerProps: [],
+    wrapperFn: "wrapSite",
+    wrapperPath: "~/runtime/wrap-site"
   }
 };
 var extractHandlerConfigs = (source, type2) => {
@@ -70661,6 +70667,7 @@ export const handler = ${wrapperFn}(${importName});
 // src/build/bundle.ts
 var extractConfigs = (source) => extractHandlerConfigs(source, "http");
 var extractTableConfigs = (source) => extractHandlerConfigs(source, "table");
+var extractSiteConfigs = (source) => extractHandlerConfigs(source, "site");
 var runtimeDir = path5.resolve(path5.dirname(fileURLToPath2(import.meta.url)), "../../dist/runtime");
 var bundle = (input) => Effect_exports.gen(function* () {
   const exportName = input.exportName ?? "default";
@@ -70712,7 +70719,7 @@ var zip12 = (input) => Effect_exports.async((resume2) => {
 var resolveStaticFiles = (globs, projectDir) => {
   const files = [];
   for (const pattern2 of globs) {
-    const matches = globSync(pattern2, { cwd: projectDir });
+    const matches = globSync(pattern2, { cwd: projectDir, nodir: true });
     for (const match18 of matches) {
       const absPath = path5.join(projectDir, match18);
       files.push({
@@ -70734,15 +70741,18 @@ var findHandlerFiles = (patterns, cwd) => {
 var discoverHandlers = (files) => {
   const httpHandlers = [];
   const tableHandlers = [];
+  const siteHandlers = [];
   for (const file6 of files) {
     if (!fsSync2.statSync(file6).isFile()) continue;
     const source = fsSync2.readFileSync(file6, "utf-8");
     const http = extractConfigs(source);
     const table3 = extractTableConfigs(source);
+    const site = extractSiteConfigs(source);
     if (http.length > 0) httpHandlers.push({ file: file6, exports: http });
     if (table3.length > 0) tableHandlers.push({ file: file6, exports: table3 });
+    if (site.length > 0) siteHandlers.push({ file: file6, exports: site });
   }
-  return { httpHandlers, tableHandlers };
+  return { httpHandlers, tableHandlers, siteHandlers };
 };
 
 // src/deploy/shared.ts
@@ -71091,6 +71101,35 @@ var deployAllTables = (input) => Effect_exports.gen(function* () {
   )
 );
 
+// src/deploy/deploy-site.ts
+import { execSync } from "child_process";
+var deploySiteLambda = ({ input, fn: fn2, layerArn, external, depsEnv, depsPermissions }) => Effect_exports.gen(function* () {
+  const { exportName, config: config2 } = fn2;
+  const handlerName = config2.name ?? exportName;
+  if (config2.build) {
+    yield* Effect_exports.logInfo(`Building site: ${config2.build}`);
+    yield* Effect_exports.try({
+      try: () => execSync(config2.build, { cwd: input.projectDir, stdio: "inherit" }),
+      catch: (error4) => new Error(`Site build failed: ${error4}`)
+    });
+  }
+  const staticGlobs = [`${config2.dir}/**/*`];
+  const { functionArn } = yield* deployCoreLambda({
+    input,
+    exportName,
+    handlerName,
+    bundleType: "site",
+    ...config2.memory ? { memory: config2.memory } : {},
+    timeout: config2.timeout ?? 5,
+    ...layerArn ? { layerArn } : {},
+    ...external ? { external } : {},
+    ...depsEnv ? { depsEnv } : {},
+    ...depsPermissions ? { depsPermissions } : {},
+    staticGlobs
+  });
+  return { exportName, functionArn, config: config2, handlerName };
+});
+
 // src/deploy/deploy.ts
 var prepareLayer = (input) => Effect_exports.gen(function* () {
   const layerResult = yield* ensureLayer({
@@ -71295,19 +71334,86 @@ var deployTableHandlers = (ctx) => Effect_exports.gen(function* () {
   }
   return results;
 });
+var deploySiteHandlers = (ctx) => Effect_exports.gen(function* () {
+  const results = [];
+  for (const { file: file6, exports } of ctx.handlers) {
+    yield* Effect_exports.logInfo(`Processing ${path7.basename(file6)} (${exports.length} site handler(s))`);
+    const deployInput = {
+      projectDir: ctx.input.projectDir,
+      file: file6,
+      project: ctx.input.project,
+      region: ctx.input.region
+    };
+    if (ctx.input.stage) deployInput.stage = ctx.input.stage;
+    for (const fn2 of exports) {
+      const withPlatform = {
+        depsEnv: { ...ctx.platformEnv },
+        depsPermissions: [...ctx.platformPermissions]
+      };
+      const { exportName, functionArn, config: config2, handlerName } = yield* deploySiteLambda({
+        input: deployInput,
+        fn: fn2,
+        ...ctx.layerArn ? { layerArn: ctx.layerArn } : {},
+        ...ctx.external.length > 0 ? { external: ctx.external } : {},
+        depsEnv: withPlatform.depsEnv,
+        depsPermissions: withPlatform.depsPermissions
+      }).pipe(
+        Effect_exports.provide(
+          clients_exports.makeClients({
+            lambda: { region: ctx.input.region },
+            iam: { region: ctx.input.region }
+          })
+        )
+      );
+      const basePath = config2.path.replace(/\/+$/, "") || "/";
+      const { apiUrl: rootUrl } = yield* addRouteToApi({
+        apiId: ctx.apiId,
+        region: ctx.input.region,
+        functionArn,
+        method: "GET",
+        path: basePath
+      }).pipe(
+        Effect_exports.provide(
+          clients_exports.makeClients({
+            lambda: { region: ctx.input.region },
+            apigatewayv2: { region: ctx.input.region }
+          })
+        )
+      );
+      yield* addRouteToApi({
+        apiId: ctx.apiId,
+        region: ctx.input.region,
+        functionArn,
+        method: "GET",
+        path: `${basePath}/{file+}`
+      }).pipe(
+        Effect_exports.provide(
+          clients_exports.makeClients({
+            lambda: { region: ctx.input.region },
+            apigatewayv2: { region: ctx.input.region }
+          })
+        )
+      );
+      results.push({ exportName, url: rootUrl, functionArn });
+      yield* Effect_exports.logInfo(`  GET ${basePath} \u2192 ${handlerName} (site)`);
+    }
+  }
+  return results;
+});
 var deployProject = (input) => Effect_exports.gen(function* () {
   const files = findHandlerFiles(input.patterns, input.projectDir);
   if (files.length === 0) {
     return yield* Effect_exports.fail(new Error(`No files match patterns: ${input.patterns.join(", ")}`));
   }
   yield* Effect_exports.logInfo(`Found ${files.length} file(s) matching patterns`);
-  const { httpHandlers, tableHandlers } = discoverHandlers(files);
+  const { httpHandlers, tableHandlers, siteHandlers } = discoverHandlers(files);
   const totalHttpHandlers = httpHandlers.reduce((acc, h) => acc + h.exports.length, 0);
   const totalTableHandlers = tableHandlers.reduce((acc, h) => acc + h.exports.length, 0);
-  if (totalHttpHandlers === 0 && totalTableHandlers === 0) {
+  const totalSiteHandlers = siteHandlers.reduce((acc, h) => acc + h.exports.length, 0);
+  if (totalHttpHandlers === 0 && totalTableHandlers === 0 && totalSiteHandlers === 0) {
     return yield* Effect_exports.fail(new Error("No handlers found in matched files"));
   }
-  yield* Effect_exports.logInfo(`Discovered ${totalHttpHandlers} HTTP handler(s) and ${totalTableHandlers} table handler(s)`);
+  yield* Effect_exports.logInfo(`Discovered ${totalHttpHandlers} HTTP, ${totalTableHandlers} table, ${totalSiteHandlers} site handler(s)`);
   const tableNameMap = buildTableNameMap(tableHandlers, input.project, resolveStage(input.stage));
   const { layerArn, external } = yield* prepareLayer({
     project: input.project,
@@ -71320,7 +71426,7 @@ var deployProject = (input) => Effect_exports.gen(function* () {
   const platformEnv = { EFF_PLATFORM_TABLE: platformTableName };
   let apiId;
   let apiUrl;
-  if (totalHttpHandlers > 0) {
+  if (totalHttpHandlers > 0 || totalSiteHandlers > 0) {
     const tagCtx = {
       project: input.project,
       stage: resolveStage(input.stage),
@@ -71361,10 +71467,19 @@ var deployProject = (input) => Effect_exports.gen(function* () {
     platformEnv,
     platformPermissions: PLATFORM_PERMISSIONS
   });
+  const siteResults = apiId ? yield* deploySiteHandlers({
+    handlers: siteHandlers,
+    apiId,
+    input,
+    layerArn,
+    external,
+    platformEnv,
+    platformPermissions: PLATFORM_PERMISSIONS
+  }) : [];
   if (apiUrl) {
     yield* Effect_exports.logInfo(`Deployment complete! API: ${apiUrl}`);
   }
-  return { apiId, apiUrl, httpResults, tableResults };
+  return { apiId, apiUrl, httpResults, tableResults, siteResults };
 });
 
 // src/cli/config.ts
@@ -71434,6 +71549,7 @@ var getPatternsFromConfig = (config2) => {
   const rawPatterns = Array.isArray(handlersConfig) ? handlersConfig : [handlersConfig];
   return rawPatterns.map((p3) => {
     if (!p3.includes("*") && !p3.includes("?")) {
+      if (/\.tsx?$/.test(p3)) return p3;
       return `${p3.replace(/\/$/, "")}/**/*.ts`;
     }
     return p3;
@@ -71483,7 +71599,7 @@ var deployCommand = Command_exports.make(
           stage: finalStage,
           region: finalRegion
         });
-        const total = results.httpResults.length + results.tableResults.length;
+        const total = results.httpResults.length + results.tableResults.length + results.siteResults.length;
         yield* Console_exports.log(`
 Deployed ${total} handler(s):`);
         for (const r of results.httpResults) {
@@ -71492,6 +71608,9 @@ Deployed ${total} handler(s):`);
         for (const r of results.tableResults) {
           yield* Console_exports.log(`  [table] ${r.exportName}: ${r.tableArn}`);
         }
+        for (const r of results.siteResults) {
+          yield* Console_exports.log(`  [site] ${r.exportName}: ${r.url}`);
+        }
       }),
       onSome: (targetValue) => Effect_exports.gen(function* () {
         if (isFilePath(targetValue)) {
@@ -71544,7 +71663,7 @@ Deployed ${tableResults.length} table handler(s):`);
           const discovered = discoverHandlers(files);
           let foundFile = null;
           let foundExport = null;
-          let isTableHandler = false;
+          let handlerType = "http";
           for (const { file: file6, exports } of discovered.httpHandlers) {
             for (const { exportName, config: handlerConfig } of exports) {
               if (handlerConfig.name === targetValue) {
@@ -71561,7 +71680,20 @@ Deployed ${tableResults.length} table handler(s):`);
                 if (handlerConfig.name === targetValue) {
                   foundFile = file6;
                   foundExport = exportName;
-                  isTableHandler = true;
+                  handlerType = "table";
+                  break;
+                }
+              }
+              if (foundFile) break;
+            }
+          }
+          if (!foundFile) {
+            for (const { file: file6, exports } of discovered.siteHandlers) {
+              for (const { exportName, config: handlerConfig } of exports) {
+                if (handlerConfig.name === targetValue) {
+                  foundFile = file6;
+                  foundExport = exportName;
+                  handlerType = "site";
                   break;
                 }
               }
@@ -71581,6 +71713,11 @@ Deployed ${tableResults.length} table handler(s):`);
                 yield* Console_exports.log(`  [table] ${c.name}`);
               }
             }
+            for (const { exports } of discovered.siteHandlers) {
+              for (const { config: c } of exports) {
+                yield* Console_exports.log(`  [site] ${c.name}`);
+              }
+            }
             return;
           }
           yield* Console_exports.log(`Found handler "${targetValue}" in ${path9.relative(projectDir, foundFile)}`);
@@ -71592,7 +71729,7 @@ Deployed ${tableResults.length} table handler(s):`);
             region: finalRegion,
             exportName: foundExport
           };
-          if (isTableHandler) {
+          if (handlerType === "table") {
             const result = yield* deployTable(input);
             yield* Console_exports.log(`
 Table deployed: ${result.tableArn}`);