effortless-aws 0.1.0 → 0.1.1

package/dist/cli/index.js

@@ -70146,7 +70146,6 @@ import * as fs from "fs/promises";
 import * as fsSync from "fs";
 import * as path4 from "path";
 import archiver from "archiver";
-import { nodeFileTrace } from "@vercel/nft";
 var FIXED_DATE = /* @__PURE__ */ new Date(0);
 var getPackageVersion = (pkgPath) => {
   const pkgJsonPath = path4.join(pkgPath, "package.json");
@@ -70163,7 +70162,7 @@ var computeLockfileHash = (projectDir) => Effect_exports.gen(function* () {
   if (prodDeps.length === 0) {
     return yield* Effect_exports.fail(new Error("No production dependencies"));
   }
-  const allPackages = collectTransitiveDeps(projectDir, prodDeps);
+  const { packages: allPackages } = collectTransitiveDeps(projectDir, prodDeps);
   const packageVersions = [];
   for (const pkgName of Array.from(allPackages).sort()) {
     const pkgPath = findInPnpmStore(projectDir, pkgName) ?? getPackageRealPath(projectDir, pkgName);
@@ -70189,20 +70188,6 @@ var readProductionDependencies = (projectDir) => Effect_exports.gen(function* ()
   const pkg = JSON.parse(content);
   return Object.keys(pkg.dependencies ?? {});
 });
-var extractPackageName = (filePath) => {
-  const nodeModulesIndex = filePath.lastIndexOf("node_modules");
-  if (nodeModulesIndex === -1) return null;
-  const afterNodeModules = filePath.slice(nodeModulesIndex + "node_modules/".length);
-  const parts2 = afterNodeModules.split("/");
-  const firstPart = parts2[0];
-  if (!firstPart) return null;
-  if (firstPart.startsWith("@") && parts2.length >= 2) {
-    const secondPart = parts2[1];
-    if (!secondPart) return null;
-    return `${firstPart}/${secondPart}`;
-  }
-  return firstPart;
-};
 var getPackageRealPath = (projectDir, pkgName) => {
   const pkgPath = path4.join(projectDir, "node_modules", pkgName);
   if (!fsSync.existsSync(pkgPath)) return null;
@@ -70212,33 +70197,6 @@ var getPackageRealPath = (projectDir, pkgName) => {
     return null;
   }
 };
-var findPackageEntryPoint = (depPath) => {
-  const pkgJsonPath = path4.join(depPath, "package.json");
-  if (!fsSync.existsSync(pkgJsonPath)) return null;
-  try {
-    const pkgJson = JSON.parse(fsSync.readFileSync(pkgJsonPath, "utf-8"));
-    const candidates = [
-      pkgJson.main,
-      pkgJson.module,
-      pkgJson.exports?.["."]?.require,
-      pkgJson.exports?.["."]?.import,
-      pkgJson.exports?.["."]?.default,
-      typeof pkgJson.exports === "string" ? pkgJson.exports : null,
-      "index.js",
-      "index.cjs",
-      "index.mjs"
-    ].filter(Boolean);
-    for (const candidate of candidates) {
-      const entryPath = path4.join(depPath, candidate);
-      if (fsSync.existsSync(entryPath) && fsSync.statSync(entryPath).isFile()) {
-        return entryPath;
-      }
-    }
-    return null;
-  } catch {
-    return null;
-  }
-};
 var getPackageDeps = (pkgPath) => {
   const pkgJsonPath = path4.join(pkgPath, "package.json");
   if (!fsSync.existsSync(pkgJsonPath)) return [];
@@ -70273,7 +70231,7 @@ var findInPnpmStore = (projectDir, pkgName) => {
   }
   return null;
 };
-var collectTransitiveDeps = (projectDir, rootDeps, searchPath = path4.join(projectDir, "node_modules"), visited = /* @__PURE__ */ new Set()) => {
+var collectTransitiveDeps = (projectDir, rootDeps, searchPath = path4.join(projectDir, "node_modules"), visited = /* @__PURE__ */ new Set(), warnings = []) => {
   const rootNodeModules = path4.join(projectDir, "node_modules");
   for (const dep of rootDeps) {
     if (visited.has(dep)) continue;
@@ -70282,7 +70240,8 @@ var collectTransitiveDeps = (projectDir, rootDeps, searchPath = path4.join(proje
     if (fsSync.existsSync(pkgPath)) {
       try {
         realPath2 = fsSync.realpathSync(pkgPath);
-      } catch {
+      } catch (err) {
+        warnings.push(`realpathSync failed for "${dep}" at ${pkgPath}: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
     if (!realPath2 && searchPath !== rootNodeModules) {
@@ -70290,52 +70249,50 @@ var collectTransitiveDeps = (projectDir, rootDeps, searchPath = path4.join(proje
       if (fsSync.existsSync(pkgPath)) {
         try {
           realPath2 = fsSync.realpathSync(pkgPath);
-        } catch {
+        } catch (err) {
+          warnings.push(`realpathSync failed for "${dep}" at ${pkgPath}: ${err instanceof Error ? err.message : String(err)}`);
         }
       }
     }
     if (!realPath2) {
       realPath2 = findInPnpmStore(projectDir, dep);
     }
-    if (!realPath2) continue;
+    if (!realPath2) {
+      warnings.push(`Package "${dep}" not found (searched: ${searchPath}, root node_modules, pnpm store) \u2014 entire subtree skipped`);
+      continue;
+    }
     visited.add(dep);
     const pkgDeps = getPackageDeps(realPath2);
     if (pkgDeps.length > 0) {
       const isScoped = dep.startsWith("@");
       const pkgNodeModules = isScoped ? path4.dirname(path4.dirname(realPath2)) : path4.dirname(realPath2);
-      collectTransitiveDeps(projectDir, pkgDeps, pkgNodeModules, visited);
+      collectTransitiveDeps(projectDir, pkgDeps, pkgNodeModules, visited, warnings);
     }
   }
-  return visited;
+  return { packages: visited, warnings };
 };
-var collectLayerPackages = async (projectDir, dependencies) => {
-  if (dependencies.length === 0) return [];
-  const packages = collectTransitiveDeps(projectDir, dependencies);
-  const entryPoints = [];
-  for (const dep of dependencies) {
-    const pkgPath = path4.join(projectDir, "node_modules", dep);
-    if (fsSync.existsSync(pkgPath)) {
-      const entryPoint = findPackageEntryPoint(pkgPath);
-      if (entryPoint) {
-        entryPoints.push(entryPoint);
-      }
-    }
-  }
-  if (entryPoints.length > 0) {
-    try {
-      const { fileList } = await nodeFileTrace(entryPoints, {
-        base: projectDir
-      });
-      for (const file6 of fileList) {
-        const pkgName = extractPackageName(path4.join(projectDir, file6));
-        if (pkgName) {
-          packages.add(pkgName);
+var isAwsRuntime = (pkg) => pkg.startsWith("@aws-sdk/") || pkg.startsWith("@smithy/");
+var collectLayerPackages = (projectDir, dependencies) => {
+  if (dependencies.length === 0) return { packages: [], warnings: [] };
+  const { packages, warnings } = collectTransitiveDeps(projectDir, dependencies);
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const pkg of [...packages]) {
+      if (isAwsRuntime(pkg)) continue;
+      const pkgPath = findPackagePath(projectDir, pkg);
+      if (!pkgPath) continue;
+      const pkgDeps = getPackageDeps(pkgPath);
+      for (const dep of pkgDeps) {
+        if (!packages.has(dep) && !isAwsRuntime(dep)) {
+          packages.add(dep);
+          warnings.push(`Auto-added missing transitive dep: "${dep}" (required by "${pkg}")`);
+          changed = true;
         }
       }
-    } catch {
     }
   }
-  return Array.from(packages);
+  return { packages: Array.from(packages), warnings };
 };
 var findPackagePath = (projectDir, pkgName) => {
   const rootPath = getPackageRealPath(projectDir, pkgName);
@@ -70414,7 +70371,10 @@ var ensureLayer = (config2) => Effect_exports.gen(function* () {
     yield* Effect_exports.logInfo(`Layer ${layerName} with hash ${hash2} already exists (version ${existing.version})`);
     return existing;
   }
-  const allPackages = yield* Effect_exports.promise(() => collectLayerPackages(config2.projectDir, dependencies));
+  const { packages: allPackages, warnings: layerWarnings } = yield* Effect_exports.sync(() => collectLayerPackages(config2.projectDir, dependencies));
+  for (const warning of layerWarnings) {
+    yield* Effect_exports.logWarning(`[layer] ${warning}`);
+  }
   yield* Effect_exports.logInfo(`Creating layer ${layerName} with ${allPackages.length} packages (hash: ${hash2})`);
   yield* Effect_exports.logDebug(`Layer packages: ${allPackages.join(", ")}`);
   const { buffer: layerZip, includedPackages, skippedPackages } = yield* createLayerZip(config2.projectDir, allPackages);
@@ -70720,7 +70680,10 @@ var ensureLayerAndExternal = (input) => Effect_exports.gen(function* () {
     projectDir: input.projectDir
   });
   const prodDeps = layerResult ? yield* readProductionDependencies(input.projectDir) : [];
-  const external = prodDeps.length > 0 ? yield* Effect_exports.promise(() => collectLayerPackages(input.projectDir, prodDeps)) : [];
+  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect_exports.sync(() => collectLayerPackages(input.projectDir, prodDeps)) : { packages: [], warnings: [] };
+  for (const warning of layerWarnings) {
+    yield* Effect_exports.logWarning(`[layer] ${warning}`);
+  }
   return {
     layerArn: layerResult?.layerVersionArn,
     external
@@ -71056,7 +71019,10 @@ var prepareLayer = (input) => Effect_exports.gen(function* () {
     )
   );
   const prodDeps = layerResult ? yield* readProductionDependencies(input.projectDir) : [];
-  const external = prodDeps.length > 0 ? yield* Effect_exports.promise(() => collectLayerPackages(input.projectDir, prodDeps)) : [];
+  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect_exports.sync(() => collectLayerPackages(input.projectDir, prodDeps)) : { packages: [], warnings: [] };
+  for (const warning of layerWarnings) {
+    yield* Effect_exports.logWarning(`[layer] ${warning}`);
+  }
   yield* Effect_exports.logDebug(`Layer result: ${layerResult ? "exists" : "null"}, external packages: ${external.length}`);
   if (external.length > 0) {
     yield* Effect_exports.logInfo(`Bundling with ${external.length} external packages from layer`);
@@ -71539,7 +71505,10 @@ var buildCommand = Command_exports.make(
     const prodDeps = yield* readProductionDependencies(projectDir).pipe(
       Effect_exports.catchAll(() => Effect_exports.succeed([]))
     );
-    const external = prodDeps.length > 0 ? yield* Effect_exports.promise(() => collectLayerPackages(projectDir, prodDeps)) : [];
+    const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect_exports.sync(() => collectLayerPackages(projectDir, prodDeps)) : { packages: [], warnings: [] };
+    for (const warning of layerWarnings) {
+      yield* Effect_exports.logWarning(`[layer] ${warning}`);
+    }
     if (external.length > 0) {
       yield* Console_exports.log(`Using ${external.length} external packages (from layer)
 `);
@@ -72055,7 +72024,14 @@ Lockfile hash: ${hash2}`);
     } else {
       yield* Console_exports.log("\nNo lockfile found (package-lock.json, pnpm-lock.yaml, or yarn.lock)");
     }
-    const allPackages = yield* Effect_exports.promise(() => collectLayerPackages(projectDir, prodDeps));
+    const { packages: allPackages, warnings: layerWarnings } = yield* Effect_exports.sync(() => collectLayerPackages(projectDir, prodDeps));
+    if (layerWarnings.length > 0) {
+      yield* Console_exports.log(`
+Warnings (${layerWarnings.length}):`);
+      for (const w of layerWarnings) {
+        yield* Console_exports.log(`  \u26A0 ${w}`);
+      }
+    }
     yield* Console_exports.log(`
 Total packages for layer (${allPackages.length}):`);
     if (verbose) {
@@ -72184,7 +72160,14 @@ var layersBuildCommand = Command_exports.make(
     );
     yield* Console_exports.log(`
 Lockfile hash: ${hash2}`);
-    const allPackages = yield* Effect_exports.promise(() => collectLayerPackages(projectDir, prodDeps));
+    const { packages: allPackages, warnings: layerWarnings } = yield* Effect_exports.sync(() => collectLayerPackages(projectDir, prodDeps));
+    if (layerWarnings.length > 0) {
+      yield* Console_exports.log(`
+Warnings (${layerWarnings.length}):`);
+      for (const w of layerWarnings) {
+        yield* Console_exports.log(`  \u26A0 ${w}`);
+      }
+    }
     yield* Console_exports.log(`
 Collected ${allPackages.length} packages for layer`);
     if (verbose) {