@awsless/awsless 0.0.593 → 0.0.595

package/dist/bin.js

@@ -750,6 +750,13 @@ import { basename as basename2, dirname as dirname3, join as join5 } from "path"
 
 // src/cli/debug.ts
 var queue = [];
+var debugError = (error) => {
+  queue.push({
+    date: /* @__PURE__ */ new Date(),
+    type: color.error.dim("error"),
+    message: typeof error === "string" ? error : error instanceof Error ? color.error(error.message || "") : JSON.stringify(error)
+  });
+};
 var debug = (...parts) => {
   queue.push({
     date: /* @__PURE__ */ new Date(),
@@ -2346,8 +2353,8 @@ import { readFile as readFile2 } from "fs/promises";
 import { basename, dirname as dirname2, extname, join as join4 } from "path";
 var readConfig = async (file) => {
   try {
-    const json2 = await readFile2(file, "utf8");
-    const data = Bun.JSON5.parse(json2);
+    const json3 = await readFile2(file, "utf8");
+    const data = Bun.JSON5.parse(json3);
     return data;
   } catch (error) {
     if (error instanceof Error) {
@@ -3140,6 +3147,96 @@ var getGlobalOnFailure = (ctx) => {
   return ctx.shared.get("on-failure", "queue-arn");
 };
 
+// src/feature/function/build/typescript/bundle.ts
+import commonjs from "@rollup/plugin-commonjs";
+import json from "@rollup/plugin-json";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import { createHash } from "crypto";
+import { dirname as dirname5 } from "path";
+import { rollup } from "rollup";
+import natives from "rollup-plugin-natives";
+import { importAsString } from "rollup-plugin-string-import";
+import { swc, minify as swcMinify } from "rollup-plugin-swc3";
+var bundleTypeScript = async ({
+  format: format2 = "esm",
+  minify = true,
+  file,
+  nativeDir,
+  external,
+  importAsString: importAsStringList
+}) => {
+  const bundle = await rollup({
+    input: file,
+    external: (importee) => {
+      return importee.startsWith("@aws-sdk") || importee.startsWith("aws-sdk") || external?.includes(importee);
+    },
+    onwarn: (error) => {
+      debugError(error.message);
+    },
+    treeshake: {
+      preset: "smallest",
+      moduleSideEffects: (id) => file === id
+    },
+    plugins: [
+      commonjs({ sourceMap: true }),
+      nodeResolve({ preferBuiltins: true }),
+      // @ts-ignore
+      nativeDir ? natives({
+        copyTo: nativeDir,
+        targetEsm: format2 === "esm",
+        sourcemap: true
+      }) : void 0,
+      swc({
+        // minify,
+        // module: true,
+        jsc: {
+          baseUrl: dirname5(file),
+          minify: { sourceMap: true }
+        },
+        sourceMaps: true
+      }),
+      minify ? swcMinify({
+        module: format2 === "esm",
+        sourceMap: true,
+        compress: true
+      }) : void 0,
+      json(),
+      importAsStringList ? importAsString({
+        include: importAsStringList
+      }) : void 0
+    ]
+  });
+  const ext = format2 === "esm" ? "mjs" : "js";
+  const result = await bundle.generate({
+    format: format2,
+    sourcemap: "hidden",
+    exports: "auto",
+    manualChunks: {},
+    entryFileNames: `index.${ext}`,
+    chunkFileNames: `[name].${ext}`
+  });
+  const hash = createHash("sha1");
+  const files = [];
+  for (const item of result.output) {
+    if (item.type !== "chunk") {
+      continue;
+    }
+    const code = Buffer.from(item.code, "utf8");
+    const map = item.map ? Buffer.from(item.map.toString(), "utf8") : void 0;
+    item.map?.version;
+    hash.update(code);
+    files.push({
+      name: item.fileName,
+      code,
+      map
+    });
+  }
+  return {
+    hash: hash.digest("hex"),
+    files
+  };
+};
+
 // src/feature/function/build/zip.ts
 import { createReadStream } from "fs";
 import JSZip from "jszip";
@@ -3167,7 +3264,7 @@ import { toMebibytes as toMebibytes2 } from "@awsless/size";
 import { pascalCase } from "change-case";
 
 // src/util/cache.ts
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 import { createReadStream as createReadStream2 } from "node:fs";
 import { lstat as lstat2, readdir } from "node:fs/promises";
 import { join as join7 } from "node:path";
@@ -3177,11 +3274,11 @@ var generateCacheKey = async (directories2) => {
   for (const file of files) {
     hashes[file] = await createHashFromFile(file);
   }
-  return createHash("md5").update(JSON.stringify(hashes)).digest("hex");
+  return createHash2("md5").update(JSON.stringify(hashes)).digest("hex");
 };
 var createHashFromFile = (file) => {
   return new Promise((resolve) => {
-    const hash = createHash("md5");
+    const hash = createHash2("md5");
     const stream = createReadStream2(file);
     stream.on("data", (data) => hash.update(data));
     stream.on("end", () => resolve(hash.digest("hex")));
@@ -3205,9 +3302,9 @@ var listAllFiles = async (list3) => {
 };
 
 // src/util/id.ts
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash3 } from "crypto";
 var shortId = (ns) => {
-  return createHash2("md5").update(ns).digest("hex").substring(0, 10);
+  return createHash3("md5").update(ns).digest("hex").substring(0, 10);
 };
 
 // src/util/temp.ts
@@ -3268,76 +3365,6 @@ var zipBundle = async ({ directory }) => {
   });
 };
 
-// src/feature/function/build/typescript/bun.ts
-import { minify as swcMinify } from "@swc/core";
-import { createHash as createHash3 } from "crypto";
-var bundleTypeScriptWithBun = async ({
-  format: format2 = "esm",
-  minify = true,
-  file,
-  nativeDir,
-  external,
-  importAsString: importAsStringList
-}) => {
-  const build3 = await Bun.build({
-    entrypoints: [file],
-    target: "node",
-    format: format2,
-    sourcemap: "none",
-    // sourcemap: 'external',
-    // minify: false,
-    external: ["@aws-sdk/*", "aws-sdk", ...external ?? []],
-    naming: {
-      entry: `index.js`,
-      chunk: `[name].js`
-    },
-    plugins: [
-      {
-        name: "string-loader",
-        setup(build4) {
-          if (importAsStringList) {
-            build4.onLoad({ filter: new RegExp(importAsStringList.join("|")) }, async (args) => {
-              return {
-                contents: `export default ${JSON.stringify(await Bun.file(args.path).text())};`,
-                loader: "js"
-              };
-            });
-          }
-        }
-      }
-      // nativesPlugin(nativeDir),
-    ]
-  });
-  if (!build3.success) {
-    throw new Error("Bun build error");
-  }
-  const hash = createHash3("sha1");
-  const files = [];
-  for await (const artifact of build3.outputs) {
-    if (artifact.kind === "asset" || artifact.kind === "sourcemap") {
-      continue;
-    }
-    const originalCode = await artifact.text();
-    const { code } = await swcMinify(originalCode, {
-      toplevel: true,
-      module: true,
-      compress: true,
-      mangle: true,
-      sourceMap: false
-    });
-    hash.update(code);
-    files.push({
-      name: artifact.path.split("/").pop(),
-      code: Buffer.from(code)
-      // map: map ? Buffer.from(map) : undefined,
-    });
-  }
-  return {
-    hash: hash.digest("hex"),
-    files
-  };
-};
-
 // src/feature/function/util.ts
 var createLambdaFunction = (parentGroup, ctx, ns, id, local) => {
   let name;
@@ -3373,7 +3400,7 @@ var createLambdaFunction = (parentGroup, ctx, ns, id, local) => {
       const fingerprint = await generateFileHash(workspace, fileCode.file);
       return build3(fingerprint, async (write) => {
         const temp = await createTempFolder(`function--${name}`);
-        const bundle = await bundleTypeScriptWithBun({
+        const bundle = await bundleTypeScript({
           file: fileCode.file,
           external: [
             ...fileCode.external ?? [],
@@ -4542,7 +4569,7 @@ import { camelCase as camelCase5, kebabCase as kebabCase6 } from "change-case";
 import { Group as Group13 } from "@terraforge/core";
 import { aws as aws14 } from "@terraforge/aws";
 import { mebibytes as mebibytes3 } from "@awsless/size";
-import { dirname as dirname5, join as join10, relative as relative5 } from "path";
+import { dirname as dirname6, join as join10, relative as relative5 } from "path";
 import { fileURLToPath } from "node:url";
 
 // src/feature/function/prebuild.ts
@@ -4734,7 +4761,7 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
 
 // src/feature/rpc/index.ts
 import { toSeconds as toSeconds6 } from "@awsless/duration";
-var __dirname = dirname5(fileURLToPath(import.meta.url));
+var __dirname = dirname6(fileURLToPath(import.meta.url));
 var rpcFeature = defineFeature({
   name: "rpc",
   async onTypeGen(ctx) {
@@ -5054,7 +5081,7 @@ var searchFeature = defineFeature({
 import { Group as Group15 } from "@terraforge/core";
 import { aws as aws16 } from "@terraforge/aws";
 import { glob as glob2 } from "glob";
-import { dirname as dirname6, join as join11 } from "path";
+import { dirname as dirname7, join as join11 } from "path";
 
 // src/feature/site/util.ts
 import { contentType, lookup } from "mime-types";
@@ -5114,7 +5141,7 @@ var siteFeature = defineFeature({
           return build3(fingerprint, async (write) => {
             const credentialProvider = await getCredentials(ctx.appConfig.profile);
             const credentials = await credentialProvider();
-            const cwd = join11(directories.root, dirname6(ctx.stackConfig.file));
+            const cwd = join11(directories.root, dirname7(ctx.stackConfig.file));
             const env = {
               // Pass the app config name
               APP: ctx.appConfig.name,
@@ -6141,12 +6168,12 @@ var layerFeature = defineFeature({
 // src/feature/image/index.ts
 import { Group as Group23 } from "@terraforge/core";
 import { aws as aws24 } from "@terraforge/aws";
-import { join as join13, dirname as dirname7 } from "path";
+import { join as join13, dirname as dirname8 } from "path";
 import { mebibytes as mebibytes4 } from "@awsless/size";
 import { seconds as seconds7, toDays as toDays6 } from "@awsless/duration";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { glob as glob4 } from "glob";
-var __dirname2 = dirname7(fileURLToPath2(import.meta.url));
+var __dirname2 = dirname8(fileURLToPath2(import.meta.url));
 var imageFeature = defineFeature({
   name: "image",
   onApp(ctx) {
@@ -6329,12 +6356,12 @@ var imageFeature = defineFeature({
 // src/feature/icon/index.ts
 import { Group as Group24 } from "@terraforge/core";
 import { aws as aws25 } from "@terraforge/aws";
-import { join as join14, dirname as dirname8 } from "path";
+import { join as join14, dirname as dirname9 } from "path";
 import { mebibytes as mebibytes5 } from "@awsless/size";
 import { seconds as seconds8, toDays as toDays7 } from "@awsless/duration";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { glob as glob5 } from "glob";
-var __dirname3 = dirname8(fileURLToPath3(import.meta.url));
+var __dirname3 = dirname9(fileURLToPath3(import.meta.url));
 var iconFeature = defineFeature({
   name: "icon",
   onStack(ctx) {
@@ -8627,7 +8654,7 @@ import wildstring3 from "wildstring";
 // src/build/__fingerprint.ts
 import { createHash as createHash6 } from "crypto";
 import { readdir as readdir4, readFile as readFile5, stat as stat4 } from "fs/promises";
-import { basename as basename4, dirname as dirname9, extname as extname4, join as join17 } from "path";
+import { basename as basename4, dirname as dirname10, extname as extname4, join as join17 } from "path";
 import parseStaticImports from "parse-static-imports";
 var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
 var generateFileHashes = async (file, hashes) => {
@@ -8683,25 +8710,25 @@ var readFiles = async (files) => {
 };
 var findDependencies = async (file, code) => {
   const imports = await parseStaticImports(code);
-  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join17(dirname9(file), value) : value);
+  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join17(dirname10(file), value) : value);
 };
 
 // src/cli/ui/complex/run-tests.ts
 import { parse as parse4, stringify } from "@awsless/json";
 
 // src/test/start.ts
-import commonjs from "@rollup/plugin-commonjs";
-import json from "@rollup/plugin-json";
-import nodeResolve from "@rollup/plugin-node-resolve";
-import { dirname as dirname10, join as join18 } from "path";
-import { swc } from "rollup-plugin-swc3";
+import commonjs2 from "@rollup/plugin-commonjs";
+import json2 from "@rollup/plugin-json";
+import nodeResolve2 from "@rollup/plugin-node-resolve";
+import { dirname as dirname11, join as join18 } from "path";
+import { swc as swc2 } from "rollup-plugin-swc3";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { configDefaults } from "vitest/config";
 import { startVitest } from "vitest/node";
 var NullReporter = class {
 };
 var startTest = async (props) => {
-  const __dirname4 = dirname10(fileURLToPath4(import.meta.url));
+  const __dirname4 = dirname11(fileURLToPath4(import.meta.url));
   const startTime = process.hrtime.bigint();
   process.noDeprecation = true;
   const vitest = await startVitest(
@@ -8748,10 +8775,10 @@ var startTest = async (props) => {
     {
       plugins: [
         // @ts-ignore
-        commonjs({ sourceMap: true }),
+        commonjs2({ sourceMap: true }),
         // @ts-ignore
-        nodeResolve({ preferBuiltins: true }),
-        swc({
+        nodeResolve2({ preferBuiltins: true }),
+        swc2({
           jsc: {
             // baseUrl: dirname(input),
             minify: { sourceMap: true }
@@ -8759,7 +8786,7 @@ var startTest = async (props) => {
           sourceMaps: true
         }),
         // @ts-ignore
-        json()
+        json2()
       ]
     }
   );
@@ -9278,7 +9305,7 @@ import { log as log20 } from "@awsless/clui";
 
 // src/type-gen/generate.ts
 import { mkdir as mkdir5, writeFile as writeFile4 } from "fs/promises";
-import { dirname as dirname11, join as join20, relative as relative7 } from "path";
+import { dirname as dirname12, join as join20, relative as relative7 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(
@@ -9292,7 +9319,7 @@ var generateTypes = async (props) => {
             if (include) {
               files.push(relative7(directories.root, path));
             }
-            await mkdir5(dirname11(path), { recursive: true });
+            await mkdir5(dirname12(path), { recursive: true });
             await writeFile4(path, code);
           }
         }
@@ -9765,28 +9792,28 @@ var formatLog = (level, date, group, message) => {
   );
 };
 var parseJsonLog = (message) => {
-  let json2;
+  let json3;
   try {
-    json2 = JSON.parse(message);
+    json3 = JSON.parse(message);
   } catch (error) {
   }
-  if ("level" in json2 && typeof json2.level === "string" && "timestamp" in json2 && typeof json2.timestamp === "string" && "message" in json2) {
+  if ("level" in json3 && typeof json3.level === "string" && "timestamp" in json3 && typeof json3.timestamp === "string" && "message" in json3) {
     return {
-      level: json2.level,
-      message: typeof json2.message === "string" ? json2.message : JSON.stringify(json2.message, void 0, 2),
-      date: new Date(json2.timestamp)
+      level: json3.level,
+      message: typeof json3.message === "string" ? json3.message : JSON.stringify(json3.message, void 0, 2),
+      date: new Date(json3.timestamp)
     };
   }
-  if ("type" in json2 && typeof json2.type === "string" && json2.type.startsWith("platform") && "time" in json2 && typeof json2.time === "string" && "record" in json2) {
+  if ("type" in json3 && typeof json3.type === "string" && json3.type.startsWith("platform") && "time" in json3 && typeof json3.time === "string" && "record" in json3) {
     return {
       level: "SYSTEM",
-      message: JSON.stringify(json2.record, void 0, 2),
-      date: new Date(json2.time)
+      message: JSON.stringify(json3.record, void 0, 2),
+      date: new Date(json3.time)
     };
   }
   return {
     level: "INFO",
-    message: JSON.stringify(json2, void 0, 2)
+    message: JSON.stringify(json3, void 0, 2)
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.593",
+  "version": "0.0.595",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -35,21 +35,21 @@
   "peerDependencies": {
     "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/clui": "^0.0.8",
     "@awsless/duration": "^0.0.4",
+    "@awsless/iot": "^0.0.3",
     "@awsless/dynamodb": "^0.3.8",
     "@awsless/json": "^0.0.10",
-    "@awsless/clui": "^0.0.8",
-    "@awsless/iot": "^0.0.3",
     "@awsless/lambda": "^0.0.35",
-    "@awsless/s3": "^0.0.21",
     "@awsless/mqtt": "^0.0.2",
+    "@awsless/s3": "^0.0.21",
     "@awsless/redis": "^0.0.14",
+    "@awsless/sqs": "^0.0.16",
     "@awsless/sns": "^0.0.10",
     "@awsless/open-search": "^0.0.21",
     "@awsless/validate": "^0.1.3",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/sqs": "^0.0.16"
+    "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -141,14 +141,14 @@
     "zod-to-json-schema": "^3.24.3",
     "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
-    "@awsless/clui": "^0.0.8",
     "@awsless/duration": "^0.0.4",
-    "@awsless/scheduler": "^0.0.4",
     "@awsless/graphql": "^0.0.9",
     "@awsless/json": "^0.0.10",
-    "@awsless/validate": "^0.1.3",
     "@awsless/size": "^0.0.2",
-    "@awsless/ts-file-cache": "^0.0.12"
+    "@awsless/ts-file-cache": "^0.0.12",
+    "@awsless/scheduler": "^0.0.4",
+    "@awsless/validate": "^0.1.3",
+    "@awsless/clui": "^0.0.8"
   },
   "devDependencies": {
     "@node-rs/bcrypt": "^1.10.5",