@awsless/awsless 0.0.377 → 0.0.378

package/dist/bin.js

@@ -7252,6 +7252,9 @@ var directories = {
   get types() {
     return join(this.output, "types");
   },
+  get temp() {
+    return join(this.output, "temp");
+  },
   // get template() {
   // 	return join(this.output, 'template')
   // },
@@ -8961,7 +8964,7 @@ var generateGlobalAppId = (opt) => {
 // src/feature/function/util.ts
 import { Asset, aws as aws2 } from "@awsless/formation";
 import deepmerge from "deepmerge";
-import { dirname as dirname7 } from "path";
+import { basename as basename4, dirname as dirname7 } from "path";
 
 // ../ts-file-cache/dist/index.js
 import { createHash } from "crypto";
@@ -10440,7 +10443,13 @@ import { dirname as dirname6 } from "path";
 import { rollup } from "rollup";
 import natives from "rollup-plugin-natives";
 import { swc, minify as swcMinify } from "rollup-plugin-swc3";
-var bundleTypeScript = async ({ format: format2 = "esm", minify = true, file, external }) => {
+var bundleTypeScript = async ({
+  format: format2 = "esm",
+  minify = true,
+  file,
+  nativeDir,
+  external
+}) => {
   const bundle = await rollup({
     input: file,
     external: (importee) => {
@@ -10457,7 +10466,11 @@ var bundleTypeScript = async ({ format: format2 = "esm", minify = true, file, ex
       commonjs({ sourceMap: true }),
       nodeResolve({ preferBuiltins: true }),
       // @ts-ignore
-      natives({}),
+      nativeDir ? natives({
+        copyTo: nativeDir,
+        targetEsm: format2 === "esm",
+        sourcemap: true
+      }) : void 0,
       swc({
         // minify,
         // module: true,
@@ -10506,11 +10519,16 @@ var bundleTypeScript = async ({ format: format2 = "esm", minify = true, file, ex
 };
 
 // src/feature/function/build/zip.ts
+import { createReadStream } from "fs";
 import JSZip from "jszip";
 var zipFiles = (files) => {
   const zip2 = new JSZip();
   for (const file of files) {
-    zip2.file(file.name, file.code);
+    if ("path" in file) {
+      zip2.file(file.name, createReadStream(file.path));
+    } else {
+      zip2.file(file.name, file.code);
+    }
   }
   return zip2.generateAsync({
     type: "nodebuffer",
@@ -10524,6 +10542,26 @@ var zipFiles = (files) => {
 // src/feature/function/util.ts
 import { hashElement } from "folder-hash";
 
+// src/util/temp.ts
+import { mkdir as mkdir3, readdir, rm as rm2 } from "fs/promises";
+import { join as join8 } from "path";
+var createTempFolder = async (name) => {
+  const path = join8(directories.temp, name);
+  await mkdir3(join8(directories.temp, name), { recursive: true });
+  process.on("SIGTERM", async () => {
+    await rm2(path, { recursive: true });
+  });
+  return {
+    path,
+    async files() {
+      return readdir(path, { recursive: true });
+    },
+    async delete() {
+      await rm2(path, { recursive: true });
+    }
+  };
+};
+
 // src/feature/function/build/container/build.ts
 import { exec } from "promisify-child-process";
 var buildDockerImage = async (opts) => {
@@ -10599,18 +10637,28 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
     ctx.registerBuild("function", name, async (build3, { workspace }) => {
       const version = await generateFileHash(workspace, local2.file);
       return build3(version, async (write) => {
+        const temp = await createTempFolder(`function--${name}`);
         const bundle = await bundleTypeScript({
           file: local2.file,
           external: props.build.external,
-          minify: props.build.minify
+          minify: props.build.minify,
+          nativeDir: temp.path
         });
-        const archive = await zipFiles(bundle.files);
+        const nativeFiles = await temp.files();
+        const archive = await zipFiles([
+          ...bundle.files,
+          ...nativeFiles.map((file) => ({
+            name: basename4(file),
+            path: file
+          }))
+        ]);
         await Promise.all([
           write("HASH", bundle.hash),
           write("bundle.zip", archive),
           ...bundle.files.map((file) => write(`files/${file.name}`, file.code)),
           ...bundle.files.map((file) => file.map && write(`files/${file.name}.map`, file.map))
         ]);
+        await temp.delete();
         return {
           size: formatByteSize(archive.byteLength)
         };
@@ -11919,7 +11967,7 @@ var httpFeature = defineFeature({
 import { days as days4 } from "@awsless/duration";
 import { Asset as Asset3, aws as aws10, combine, Node as Node9, Output as Output2, unwrap } from "@awsless/formation";
 import { hashElement as hashElement2 } from "folder-hash";
-import { mkdir as mkdir3 } from "fs/promises";
+import { mkdir as mkdir4 } from "fs/promises";
 import { dirname as dirname9 } from "path";
 import { zip } from "zip-a-folder";
 var instanceFeature = defineFeature({
@@ -12003,7 +12051,7 @@ var instanceFeature = defineFeature({
           }
         });
         await build3(version.hash, async () => {
-          await mkdir3(dirname9(bundleFile), { recursive: true });
+          await mkdir4(dirname9(bundleFile), { recursive: true });
           await zip(props.code, bundleFile);
         });
       });
@@ -12459,7 +12507,7 @@ var restFeature = defineFeature({
 import { camelCase as camelCase6, constantCase as constantCase9, paramCase as paramCase6 } from "change-case";
 import { aws as aws17, Node as Node16, Output as Output3 } from "@awsless/formation";
 import { mebibytes as mebibytes2 } from "@awsless/size";
-import { dirname as dirname10, join as join8, relative as relative5 } from "path";
+import { dirname as dirname10, join as join9, relative as relative5 } from "path";
 import { fileURLToPath } from "node:url";
 
 // src/feature/function/prebuild.ts
@@ -12655,8 +12703,8 @@ var rpcFeature = defineFeature({
         resourceName: id
       });
       const { lambda } = createPrebuildLambdaFunction(group, ctx, "rpc", id, {
-        bundleFile: join8(__dirname, "/prebuild/rpc/bundle.zip"),
-        bundleHash: join8(__dirname, "/prebuild/rpc/HASH"),
+        bundleFile: join9(__dirname, "/prebuild/rpc/bundle.zip"),
+        bundleHash: join9(__dirname, "/prebuild/rpc/HASH"),
         memorySize: mebibytes2(256),
         warm: 3
       });
@@ -12834,7 +12882,7 @@ var searchFeature = defineFeature({
 import { days as days6, seconds as seconds4 } from "@awsless/duration";
 import { Asset as Asset5, aws as aws19, Node as Node18 } from "@awsless/formation";
 import { glob as glob2 } from "glob";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 
 // src/feature/site/util.ts
 import { lookup, contentType } from "mime-types";
@@ -12943,7 +12991,7 @@ var siteFeature = defineFeature({
           const object = new aws19.s3.BucketObject(group, file, {
             bucket: bucket.name,
             key: file,
-            body: Asset5.fromFile(join9(props.static, file)),
+            body: Asset5.fromFile(join10(props.static, file)),
             cacheControl: getCacheControl(file),
             contentType: getContentType(file)
           });
@@ -14308,13 +14356,13 @@ import { confirm as confirm4, isCancel as isCancel5 } from "@clack/prompts";
 // src/cli/ui/complex/run-tests.ts
 import { log as log8 } from "@clack/prompts";
 import chalk6 from "chalk";
-import { mkdir as mkdir4, readFile as readFile7, writeFile as writeFile3 } from "fs/promises";
-import { join as join12 } from "path";
+import { mkdir as mkdir5, readFile as readFile7, writeFile as writeFile3 } from "fs/promises";
+import { join as join13 } from "path";
 
 // src/build/__fingerprint.ts
 import { createHash as createHash5 } from "crypto";
-import { readdir, readFile as readFile6, stat as stat4 } from "fs/promises";
-import { basename as basename4, dirname as dirname11, extname as extname3, join as join10 } from "path";
+import { readdir as readdir2, readFile as readFile6, stat as stat4 } from "fs/promises";
+import { basename as basename5, dirname as dirname11, extname as extname3, join as join11 } from "path";
 import parseStaticImports from "parse-static-imports";
 var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
 var generateFileHashes = async (file, hashes) => {
@@ -14333,10 +14381,10 @@ var generateFileHashes = async (file, hashes) => {
 };
 var fingerprintFromDirectory = async (dir) => {
   const hashes = /* @__PURE__ */ new Map();
-  const files = await readdir(dir, { recursive: true });
+  const files = await readdir2(dir, { recursive: true });
   for (const file of files) {
     if (extensions.includes(extname3(file).substring(1)) && file.at(0) !== "_") {
-      await generateFileHashes(join10(dir, file), hashes);
+      await generateFileHashes(join11(dir, file), hashes);
     }
   }
   const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
@@ -14346,11 +14394,11 @@ var readModuleFile = (file) => {
   if (file.endsWith(".js")) {
     return readFiles([file, file.substring(0, file.length - 3) + ".ts"]);
   }
-  if (!basename4(file).includes(".")) {
+  if (!basename5(file).includes(".")) {
     return readFiles([
       file,
       ...extensions.map((exp) => `${file}.${exp}`),
-      ...extensions.map((exp) => join10(file, `/index.${exp}`))
+      ...extensions.map((exp) => join11(file, `/index.${exp}`))
     ]);
   }
   return readFile6(file, "utf8");
@@ -14370,7 +14418,7 @@ 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(".") ? join10(dirname11(file), value) : value);
+  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join11(dirname11(file), value) : value);
 };
 
 // src/test/reporter.ts
@@ -14453,7 +14501,7 @@ import { startVitest } from "vitest/node";
 import commonjs3 from "@rollup/plugin-commonjs";
 import nodeResolve3 from "@rollup/plugin-node-resolve";
 import json3 from "@rollup/plugin-json";
-import { dirname as dirname12, join as join11 } from "path";
+import { dirname as dirname12, join as join12 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var startTest = async (props) => {
   const __dirname2 = dirname12(fileURLToPath2(import.meta.url));
@@ -14470,7 +14518,7 @@ var startTest = async (props) => {
       exclude: ["**/_*", "**/_*/**", ...configDefaults.exclude],
       globals: true,
       reporters: props.reporter,
-      globalSetup: join11(__dirname2, "test-global-setup.js")
+      globalSetup: join12(__dirname2, "test-global-setup.js")
       // env: {
       // 	TZ: 'UTC',
       // },
@@ -14562,9 +14610,9 @@ var logTestErrors = (event) => {
   });
 };
 var runTest = async (stack, dir, filters) => {
-  await mkdir4(directories.test, { recursive: true });
+  await mkdir5(directories.test, { recursive: true });
   const fingerprint = await fingerprintFromDirectory(dir);
-  const file = join12(directories.test, `${stack}.json`);
+  const file = join13(directories.test, `${stack}.json`);
   const exists = await fileExist(file);
   if (exists && !process.env.NO_CACHE) {
     const raw = await readFile7(file, { encoding: "utf8" });
@@ -14871,8 +14919,8 @@ var watchConfig = async (options, resolve2, reject) => {
 import { log as log10 } from "@clack/prompts";
 
 // src/type-gen/generate.ts
-import { mkdir as mkdir5, writeFile as writeFile4 } from "fs/promises";
-import { dirname as dirname13, join as join13, relative as relative7 } from "path";
+import { mkdir as mkdir6, writeFile as writeFile4 } from "fs/promises";
+import { dirname as dirname13, join as join14, relative as relative7 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(
@@ -14881,12 +14929,12 @@ var generateTypes = async (props) => {
         ...props,
         async write(file, data, include = false) {
           const code = data?.toString("utf8");
-          const path = join13(directories.types, file);
+          const path = join14(directories.types, file);
           if (code) {
             if (include) {
               files.push(relative7(directories.root, path));
             }
-            await mkdir5(dirname13(path), { recursive: true });
+            await mkdir6(dirname13(path), { recursive: true });
             await writeFile4(path, code);
           }
         }
@@ -14895,7 +14943,7 @@ var generateTypes = async (props) => {
   );
   if (files.length) {
     const code = files.map((file) => `/// <reference path='${file}' />`).join("\n");
-    await writeFile4(join13(directories.root, `awsless.d.ts`), code);
+    await writeFile4(join14(directories.root, `awsless.d.ts`), code);
   }
 };
 

package/dist/build-json-schema.js

@@ -56,6 +56,9 @@ var directories = {
   get types() {
     return join(this.output, "types");
   },
+  get temp() {
+    return join(this.output, "temp");
+  },
   // get template() {
   // 	return join(this.output, 'template')
   // },

package/dist/prebuild.js

@@ -48,7 +48,13 @@ var debugError = (error) => {
 };
 
 // src/feature/function/build/typescript/bundle.ts
-var bundleTypeScript = async ({ format = "esm", minify = true, file, external }) => {
+var bundleTypeScript = async ({
+  format = "esm",
+  minify = true,
+  file,
+  nativeDir,
+  external
+}) => {
   const bundle = await rollup({
     input: file,
     external: (importee) => {
@@ -65,7 +71,11 @@ var bundleTypeScript = async ({ format = "esm", minify = true, file, external })
       commonjs({ sourceMap: true }),
       nodeResolve({ preferBuiltins: true }),
       // @ts-ignore
-      natives({}),
+      nativeDir ? natives({
+        copyTo: nativeDir,
+        targetEsm: format === "esm",
+        sourcemap: true
+      }) : void 0,
       swc({
         // minify,
         // module: true,
@@ -114,11 +124,16 @@ var bundleTypeScript = async ({ format = "esm", minify = true, file, external })
 };
 
 // src/feature/function/build/zip.ts
+import { createReadStream } from "fs";
 import JSZip from "jszip";
 var zipFiles = (files) => {
   const zip = new JSZip();
   for (const file of files) {
-    zip.file(file.name, file.code);
+    if ("path" in file) {
+      zip.file(file.name, createReadStream(file.path));
+    } else {
+      zip.file(file.name, file.code);
+    }
   }
   return zip.generateAsync({
     type: "nodebuffer",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.377",
+  "version": "0.0.378",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,14 +29,14 @@
   },
   "peerDependencies": {
     "@awsless/iot": "^0.0.2",
-    "@awsless/lambda": "^0.0.26",
     "@awsless/open-search": "^0.0.15",
+    "@awsless/s3": "^0.0.18",
     "@awsless/redis": "^0.0.13",
+    "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
+    "@awsless/lambda": "^0.0.26",
     "@awsless/validate": "^0.0.15",
     "@awsless/sns": "^0.0.7",
-    "@awsless/s3": "^0.0.18",
-    "@awsless/sqs": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1",
     "@awsless/mqtt": "^0.0.2"
   },
@@ -120,6 +120,9 @@
     "@awsless/ts-file-cache": "^0.0.10",
     "@awsless/validate": "^0.0.15"
   },
+  "devDependencies": {
+    "@node-rs/bcrypt": "^1.10.5"
+  },
   "scripts": {
     "test": "pnpm code test",
     "term": "zsh -c 'node dist/bin.js ${*} --config-file=./test/_data/app.jsonc' --",