@effortless-aws/cli 0.6.0 → 0.8.0

package/dist/cli/index.js

@@ -4055,7 +4055,14 @@ var extractDepsKeys = (obj) => {
     return false;
   });
   if (!depsProp || depsProp.getKind() !== SyntaxKind.PropertyAssignment) return [];
-  const init = depsProp.getInitializer();
+  let init = depsProp.getInitializer();
+  if (!init) return [];
+  if (init.getKind() === SyntaxKind.ArrowFunction) {
+    const body = init.getBody();
+    if (body.getKind() === SyntaxKind.ParenthesizedExpression) {
+      init = body.getExpression();
+    }
+  }
   if (!init || init.getKind() !== SyntaxKind.ObjectLiteralExpression) return [];
   const depsObj = init;
   return depsObj.getProperties().map((p) => {
@@ -4231,6 +4238,56 @@ var extractHandlerConfigs = (source, type) => {
   });
   return results;
 };
+var generateMiddlewareEntryPoint = (source, runtimeDir2) => {
+  const sourceFile = parseSource(source);
+  const imports = sourceFile.getImportDeclarations().map((d) => d.getText()).join("\n");
+  const defineFn = handlerRegistry.staticSite.defineFn;
+  let middlewareFnText;
+  let exportName;
+  const exportDefault = sourceFile.getExportAssignment((e) => !e.isExportEquals());
+  if (exportDefault) {
+    const expr = exportDefault.getExpression();
+    if (expr.getKind() === SyntaxKind.CallExpression) {
+      const callExpr = expr.asKindOrThrow(SyntaxKind.CallExpression);
+      if (callExpr.getExpression().getText() === defineFn) {
+        const args = callExpr.getArguments();
+        const firstArg = args[0];
+        if (firstArg?.getKind() === SyntaxKind.ObjectLiteralExpression) {
+          middlewareFnText = extractPropertyFromObject(firstArg, "middleware");
+          exportName = "default";
+        }
+      }
+    }
+  }
+  if (!middlewareFnText) {
+    sourceFile.getVariableStatements().forEach((stmt) => {
+      if (middlewareFnText || !stmt.isExported()) return;
+      stmt.getDeclarations().forEach((decl) => {
+        if (middlewareFnText) return;
+        const init = decl.getInitializer();
+        if (!init || init.getKind() !== SyntaxKind.CallExpression) return;
+        const callExpr = init.asKindOrThrow(SyntaxKind.CallExpression);
+        if (callExpr.getExpression().getText() !== defineFn) return;
+        const args = callExpr.getArguments();
+        const firstArg = args[0];
+        if (firstArg?.getKind() === SyntaxKind.ObjectLiteralExpression) {
+          middlewareFnText = extractPropertyFromObject(firstArg, "middleware");
+          exportName = decl.getName();
+        }
+      });
+    });
+  }
+  if (!middlewareFnText || !exportName) {
+    throw new Error("Could not extract middleware function from source");
+  }
+  const wrapperPath = runtimeDir2 ? handlerRegistry.staticSite.wrapperPath.replace("~/runtime", runtimeDir2) : handlerRegistry.staticSite.wrapperPath;
+  const entryPoint = `${imports}
+import { wrapMiddlewareFn } from "${wrapperPath}";
+const __middleware = ${middlewareFnText};
+export const handler = wrapMiddlewareFn(__middleware);
+`;
+  return { entryPoint, exportName };
+};
 var generateEntryPoint = (sourcePath, exportName, type, runtimeDir2) => {
   const { wrapperFn, wrapperPath } = handlerRegistry[type];
   const resolvedWrapperPath = runtimeDir2 ? wrapperPath.replace("~/runtime", runtimeDir2) : wrapperPath;
@@ -4284,6 +4341,36 @@ var bundle = (input) => Effect24.gen(function* () {
   }
   return output.text;
 });
+var bundleMiddleware = (input) => Effect24.gen(function* () {
+  const absFile = path3.isAbsolute(input.file) ? input.file : path3.resolve(input.projectDir, input.file);
+  const source = fsSync2.readFileSync(absFile, "utf-8");
+  const sourceDir = path3.dirname(absFile);
+  const { entryPoint } = generateMiddlewareEntryPoint(source, runtimeDir);
+  const awsExternals = ["@aws-sdk/*", "@smithy/*"];
+  const result = yield* Effect24.tryPromise({
+    try: () => esbuild.build({
+      stdin: {
+        contents: entryPoint,
+        loader: "ts",
+        resolveDir: sourceDir
+      },
+      bundle: true,
+      platform: "node",
+      target: "node22",
+      write: false,
+      minify: false,
+      sourcemap: false,
+      format: "esm",
+      external: awsExternals
+    }),
+    catch: (error) => new Error(`esbuild failed (middleware): ${error}`)
+  });
+  const output = result.outputFiles?.[0];
+  if (!output) {
+    throw new Error("esbuild produced no output for middleware");
+  }
+  return output.text;
+});
 var FIXED_DATE2 = /* @__PURE__ */ new Date(0);
 var zip = (input) => Effect24.async((resume) => {
   const chunks = [];
@@ -5041,7 +5128,7 @@ var submitToGoogleIndexing = (input) => Effect30.gen(function* () {
 
 // src/deploy/deploy-static-site.ts
 var deployMiddlewareLambda = (input) => Effect31.gen(function* () {
-  const { projectDir, project, stage, handlerName, file, exportName, tagCtx } = input;
+  const { projectDir, project, stage, handlerName, file, tagCtx } = input;
   const middlewareName = `${handlerName}-middleware`;
   yield* Effect31.logDebug(`Deploying middleware Lambda@Edge: ${middlewareName}`);
   const roleArn = yield* ensureEdgeRole(
@@ -5050,12 +5137,7 @@ var deployMiddlewareLambda = (input) => Effect31.gen(function* () {
     middlewareName,
     makeTags(tagCtx, "iam-role")
   );
-  const bundled = yield* bundle({
-    projectDir,
-    file,
-    exportName,
-    type: "staticSite"
-  });
+  const bundled = yield* bundleMiddleware({ projectDir, file });
   const code = yield* zip({ content: bundled });
   const { functionArn } = yield* ensureLambda({
     project,
@@ -5190,7 +5272,6 @@ var deployStaticSite = (input) => Effect31.gen(function* () {
       stage,
       handlerName,
       file: input.file,
-      exportName,
       tagCtx
     }).pipe(
       Effect31.provide(clients_exports.makeClients({ iam: { region: "us-east-1" } }))
@@ -7335,6 +7416,83 @@ ${c.bold("Missing parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
 );
 var configCommand = configRootCommand;
 
+// src/cli/update-check.ts
+import { homedir as homedir2 } from "os";
+import { join as join9 } from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
+var PACKAGE_NAME = "@effortless-aws/cli";
+var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
+var CACHE_DIR = join9(homedir2(), ".effortless-aws");
+var CACHE_FILE = join9(CACHE_DIR, "update-check.json");
+function readCache() {
+  try {
+    return JSON.parse(readFileSync5(CACHE_FILE, "utf-8"));
+  } catch {
+    return void 0;
+  }
+}
+function writeCache(data) {
+  try {
+    mkdirSync2(CACHE_DIR, { recursive: true });
+    writeFileSync2(CACHE_FILE, JSON.stringify(data));
+  } catch {
+  }
+}
+async function fetchLatestVersion() {
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 3e3);
+    const res = await fetch(
+      `https://registry.npmjs.org/${PACKAGE_NAME}/latest`,
+      { signal: controller.signal }
+    );
+    clearTimeout(timeout);
+    if (!res.ok) return void 0;
+    const data = await res.json();
+    return data.version;
+  } catch {
+    return void 0;
+  }
+}
+function compareVersions(current, latest) {
+  const parse = (v) => v.split(".").map(Number);
+  const [cMajor, cMinor, cPatch] = parse(current);
+  const [lMajor, lMinor, lPatch] = parse(latest);
+  if (lMajor !== cMajor) return lMajor > cMajor;
+  if (lMinor !== cMinor) return lMinor > cMinor;
+  return lPatch > cPatch;
+}
+async function checkForUpdate(currentVersion) {
+  const cache = readCache();
+  const now = Date.now();
+  let latestVersion;
+  if (cache && now - cache.lastCheck < CHECK_INTERVAL_MS) {
+    latestVersion = cache.latestVersion;
+  } else {
+    latestVersion = await fetchLatestVersion();
+    if (latestVersion) {
+      writeCache({ lastCheck: now, latestVersion });
+    }
+  }
+  if (latestVersion && compareVersions(currentVersion, latestVersion)) {
+    const border = "\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510";
+    const bottom = "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518";
+    const pad = (line, width) => {
+      const visible = line.replace(/\x1b\[[0-9;]*m/g, "");
+      return line + " ".repeat(Math.max(0, width - visible.length));
+    };
+    const W = 39;
+    const line1 = `Update available! ${c.dim(currentVersion)} ${c.dim("\u2192")} ${c.green(latestVersion)}`;
+    const line2 = `Run ${c.cyan(`pnpm i -g ${PACKAGE_NAME}`)} to update`;
+    console.log();
+    console.log(`  ${border}`);
+    console.log(`  \u2502 ${pad(line1, W)} \u2502`);
+    console.log(`  \u2502 ${pad(line2, W)} \u2502`);
+    console.log(`  ${bottom}`);
+    console.log();
+  }
+}
+
 // src/cli/index.ts
 var require2 = createRequire2(import.meta.url);
 var { version } = require2("../../package.json");
@@ -7346,8 +7504,10 @@ var cli = Command7.run(mainCommand, {
   name: "effortless",
   version
 });
+var updateCheck = checkForUpdate(version);
 cli(process.argv).pipe(
   Effect45.provide(NodeContext.layer),
   Effect45.provide(CliConfig.layer({ showBuiltIns: false, showTypes: false })),
+  Effect45.tap(() => Effect45.promise(() => updateCheck)),
   NodeRuntime.runMain
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effortless-aws/cli",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "license": "MIT",
   "type": "module",
   "description": "CLI and deploy tooling for effortless-aws",
@@ -39,7 +39,7 @@
     "esbuild": "^0.25.0",
     "glob": "^13.0.0",
     "ts-morph": "^27.0.2",
-    "effortless-aws": "0.22.0"
+    "effortless-aws": "0.23.1"
   },
   "devDependencies": {
     "@effect-ak/aws-sdk": "1.0.0-rc.3",