@awsless/awsless 0.0.7 → 0.0.8

package/dist/bin.cjs

@@ -380,45 +380,69 @@ var SizeSchema = import_zod7.z.custom((value) => {
 }, "Invalid size").transform(toSize);
 
 // src/plugins/function/util/build-worker.ts
-var import_core3 = require("@swc/core");
-var import_crypto = require("crypto");
+var import_worker_threads = require("worker_threads");
+var cjs = typeof require !== "undefined";
+var importESM = `
+import { bundle } from "@awsless/code";
+import { createHash } from "crypto";
+import { parentPort, workerData } from "worker_threads";
+`;
+var importCJS = `
+const { bundle } = require("@awsless/code");
+const { createHash } = require("crypto");
+const { parentPort, workerData } = require("worker_threads");
+`;
+var workerCode = `
+${cjs ? importCJS : importESM}
+
+const build = async (file) => {
+	const { code, map } = await bundle(file, {
+		format: 'esm',
+		sourceMap: true,
+		minimize: true,
+		onwarn: () => {},
+		moduleSideEffects: (id) => file === id,
+		external: (importee) => (
+			importee.startsWith('aws-sdk') ||
+			importee.startsWith('@aws-sdk')
+		),
+	})
+
+	const hash = createHash('sha1').update(code).digest('hex')
+
+    parentPort.postMessage(JSON.stringify({
+		handler: 'index.default',
+		hash,
+		files: [
+			{ name: 'index.js', code, map: map?.toString() }
+		]
+	}))
+}
+
+build(workerData)
+`;
 var defaultBuild = async (file) => {
-  const output = await (0, import_core3.bundle)({
-    entry: {
-      file
-    },
-    mode: "production",
-    target: "node",
-    externalModules: [
-      "@aws-sdk/*",
-      "@aws-sdk",
-      "aws-sdk"
-    ],
-    module: {},
-    options: {
-      minify: true,
-      sourceMaps: true,
-      jsc: {
-        target: "es2022"
+  return new Promise((resolve, reject) => {
+    const worker = new import_worker_threads.Worker(workerCode, { workerData: file, eval: true });
+    const cleanUp2 = () => {
+      worker.removeAllListeners();
+      worker.terminate();
+    };
+    worker.on("message", (data) => {
+      resolve(JSON.parse(data.toString("utf8")));
+      cleanUp2();
+    });
+    worker.on("error", (data) => {
+      reject(data);
+      cleanUp2();
+    });
+    worker.on("exit", (code) => {
+      if (code !== 0) {
+        reject(new Error(`Worker exited with code ${code}`));
+        cleanUp2();
       }
-    },
-    output: {
-      name: "output",
-      path: ""
-    }
+    });
   });
-  const hash = (0, import_crypto.createHash)("sha1").update(output.file.code).digest("hex");
-  return {
-    handler: "index.default",
-    hash,
-    files: [
-      {
-        name: "index.js",
-        code: output.file.code,
-        map: output.file.map?.toString()
-      }
-    ]
-  };
 };
 
 // src/plugins/function/util/build.ts
@@ -445,13 +469,13 @@ var writeBuildHash = async (config2, stack, id, hash) => {
   await (0, import_promises2.writeFile)(versionFile, hash);
 };
 var writeBuildFiles = async (config2, stack, id, files) => {
-  const bundle2 = await zipFiles(files);
+  const bundle = await zipFiles(files);
   const funcPath = (0, import_path3.join)(functionDir, config2.name, stack.artifactId, id);
   const filesPath = (0, import_path3.join)(funcPath, "files");
   const bundleFile = (0, import_path3.join)(funcPath, "bundle.zip");
-  debug("Bundle size of", style.info((0, import_path3.join)(config2.name, stack.artifactId, id)), "is", style.attr((0, import_filesize.filesize)(bundle2.byteLength)));
+  debug("Bundle size of", style.info((0, import_path3.join)(config2.name, stack.artifactId, id)), "is", style.attr((0, import_filesize.filesize)(bundle.byteLength)));
   await (0, import_promises2.mkdir)(filesPath, { recursive: true });
-  await (0, import_promises2.writeFile)(bundleFile, bundle2);
+  await (0, import_promises2.writeFile)(bundleFile, bundle);
   await Promise.all(files.map(async (file) => {
     const fileName = (0, import_path3.join)(filesPath, file.name);
     await (0, import_promises2.mkdir)((0, import_path3.basename)(fileName), { recursive: true });
@@ -463,7 +487,7 @@ var writeBuildFiles = async (config2, stack, id, files) => {
   }));
   return {
     file: bundleFile,
-    size: bundle2.byteLength
+    size: bundle.byteLength
   };
 };
 
@@ -622,12 +646,12 @@ var toFunction = ({ config: config2, stack, stackConfig, assets }, id, fileOrPro
     resourceName: id,
     async build() {
       const result = await defaultBuild(props.file);
-      const bundle2 = await writeBuildFiles(config2, stack, id, result.files);
+      const bundle = await writeBuildFiles(config2, stack, id, result.files);
       await writeBuildHash(config2, stack, id, result.hash);
       const func = lambda.node.defaultChild;
       func.handler = result.handler;
       return {
-        size: formatByteSize(bundle2.size)
+        size: formatByteSize(bundle.size)
       };
     },
     async publish() {
@@ -1244,7 +1268,7 @@ var AppSchema = import_zod23.z.object({
 });
 
 // src/util/import.ts
-var import_core4 = require("@swc/core");
+var import_core3 = require("@swc/core");
 var import_path7 = require("path");
 var import_promises4 = require("fs/promises");
 var resolveFileNameExtension = async (path) => {
@@ -1274,7 +1298,7 @@ var resolveDir = (path) => {
 };
 var importFile = async (path) => {
   const load = async (file) => {
-    let { code: code2 } = await (0, import_core4.transformFile)(file, {
+    let { code: code2 } = await (0, import_core3.transformFile)(file, {
       isModule: true
     });
     const path2 = (0, import_path7.dirname)(file);

package/dist/bin.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import {
+  __require,
   definePlugin
-} from "./chunk-PFTL6L4F.js";
+} from "./chunk-6KILQ5DR.js";
 
 // src/cli/program.ts
 import { Command } from "commander";
@@ -357,45 +358,69 @@ var SizeSchema = z7.custom((value) => {
 }, "Invalid size").transform(toSize);
 
 // src/plugins/function/util/build-worker.ts
-import { bundle } from "@swc/core";
+import { Worker } from "worker_threads";
+var cjs = typeof __require !== "undefined";
+var importESM = `
+import { bundle } from "@awsless/code";
 import { createHash } from "crypto";
+import { parentPort, workerData } from "worker_threads";
+`;
+var importCJS = `
+const { bundle } = require("@awsless/code");
+const { createHash } = require("crypto");
+const { parentPort, workerData } = require("worker_threads");
+`;
+var workerCode = `
+${cjs ? importCJS : importESM}
+
+const build = async (file) => {
+	const { code, map } = await bundle(file, {
+		format: 'esm',
+		sourceMap: true,
+		minimize: true,
+		onwarn: () => {},
+		moduleSideEffects: (id) => file === id,
+		external: (importee) => (
+			importee.startsWith('aws-sdk') ||
+			importee.startsWith('@aws-sdk')
+		),
+	})
+
+	const hash = createHash('sha1').update(code).digest('hex')
+
+    parentPort.postMessage(JSON.stringify({
+		handler: 'index.default',
+		hash,
+		files: [
+			{ name: 'index.js', code, map: map?.toString() }
+		]
+	}))
+}
+
+build(workerData)
+`;
 var defaultBuild = async (file) => {
-  const output = await bundle({
-    entry: {
-      file
-    },
-    mode: "production",
-    target: "node",
-    externalModules: [
-      "@aws-sdk/*",
-      "@aws-sdk",
-      "aws-sdk"
-    ],
-    module: {},
-    options: {
-      minify: true,
-      sourceMaps: true,
-      jsc: {
-        target: "es2022"
+  return new Promise((resolve, reject) => {
+    const worker = new Worker(workerCode, { workerData: file, eval: true });
+    const cleanUp2 = () => {
+      worker.removeAllListeners();
+      worker.terminate();
+    };
+    worker.on("message", (data) => {
+      resolve(JSON.parse(data.toString("utf8")));
+      cleanUp2();
+    });
+    worker.on("error", (data) => {
+      reject(data);
+      cleanUp2();
+    });
+    worker.on("exit", (code) => {
+      if (code !== 0) {
+        reject(new Error(`Worker exited with code ${code}`));
+        cleanUp2();
       }
-    },
-    output: {
-      name: "output",
-      path: ""
-    }
+    });
   });
-  const hash = createHash("sha1").update(output.file.code).digest("hex");
-  return {
-    handler: "index.default",
-    hash,
-    files: [
-      {
-        name: "index.js",
-        code: output.file.code,
-        map: output.file.map?.toString()
-      }
-    ]
-  };
 };
 
 // src/plugins/function/util/build.ts
@@ -422,13 +447,13 @@ var writeBuildHash = async (config2, stack, id, hash) => {
   await writeFile(versionFile, hash);
 };
 var writeBuildFiles = async (config2, stack, id, files) => {
-  const bundle2 = await zipFiles(files);
+  const bundle = await zipFiles(files);
   const funcPath = join2(functionDir, config2.name, stack.artifactId, id);
   const filesPath = join2(funcPath, "files");
   const bundleFile = join2(funcPath, "bundle.zip");
-  debug("Bundle size of", style.info(join2(config2.name, stack.artifactId, id)), "is", style.attr(filesize(bundle2.byteLength)));
+  debug("Bundle size of", style.info(join2(config2.name, stack.artifactId, id)), "is", style.attr(filesize(bundle.byteLength)));
   await mkdir(filesPath, { recursive: true });
-  await writeFile(bundleFile, bundle2);
+  await writeFile(bundleFile, bundle);
   await Promise.all(files.map(async (file) => {
     const fileName = join2(filesPath, file.name);
     await mkdir(basename(fileName), { recursive: true });
@@ -440,7 +465,7 @@ var writeBuildFiles = async (config2, stack, id, files) => {
   }));
   return {
     file: bundleFile,
-    size: bundle2.byteLength
+    size: bundle.byteLength
   };
 };
 
@@ -599,12 +624,12 @@ var toFunction = ({ config: config2, stack, stackConfig, assets }, id, fileOrPro
     resourceName: id,
     async build() {
       const result = await defaultBuild(props.file);
-      const bundle2 = await writeBuildFiles(config2, stack, id, result.files);
+      const bundle = await writeBuildFiles(config2, stack, id, result.files);
       await writeBuildHash(config2, stack, id, result.hash);
       const func = lambda.node.defaultChild;
       func.handler = result.handler;
       return {
-        size: formatByteSize(bundle2.size)
+        size: formatByteSize(bundle.size)
       };
     },
     async publish() {

package/dist/chunk-6KILQ5DR.js

@@ -0,0 +1,15 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw new Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// src/plugin.ts
+var definePlugin = (plugin) => plugin;
+
+export {
+  __require,
+  definePlugin
+};

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   definePlugin
-} from "./chunk-PFTL6L4F.js";
+} from "./chunk-6KILQ5DR.js";
 export {
   definePlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -37,6 +37,7 @@
     "chalk": "^5.3.0",
     "change-case": "^4.1.2",
     "commander": "^9.4.1",
+    "esbuild": "^0.18.15",
     "filesize": "^10.0.7",
     "jszip": "^3.10.1",
     "pretty-hrtime": "^1.0.3",

package/dist/chunk-PFTL6L4F.js

@@ -1,6 +0,0 @@
-// src/plugin.ts
-var definePlugin = (plugin) => plugin;
-
-export {
-  definePlugin
-};