@awsless/awsless 0.0.370 → 0.0.372

package/dist/bin.js

@@ -1124,27 +1124,27 @@ var require_stringifyString = __commonJS({
       return true;
     }
     function doubleQuotedString(value, ctx) {
-      const json4 = JSON.stringify(value);
+      const json3 = JSON.stringify(value);
       if (ctx.options.doubleQuotedAsJSON)
-        return json4;
+        return json3;
       const { implicitKey } = ctx;
       const minMultiLineLength = ctx.options.doubleQuotedMinMultiLineLength;
       const indent = ctx.indent || (containsDocumentMarker(value) ? "  " : "");
       let str = "";
       let start = 0;
-      for (let i = 0, ch = json4[i]; ch; ch = json4[++i]) {
-        if (ch === " " && json4[i + 1] === "\\" && json4[i + 2] === "n") {
-          str += json4.slice(start, i) + "\\ ";
+      for (let i = 0, ch = json3[i]; ch; ch = json3[++i]) {
+        if (ch === " " && json3[i + 1] === "\\" && json3[i + 2] === "n") {
+          str += json3.slice(start, i) + "\\ ";
           i += 1;
           start = i;
           ch = "\\";
         }
         if (ch === "\\")
-          switch (json4[i + 1]) {
+          switch (json3[i + 1]) {
             case "u":
               {
-                str += json4.slice(start, i);
-                const code = json4.substr(i + 2, 4);
+                str += json3.slice(start, i);
+                const code = json3.substr(i + 2, 4);
                 switch (code) {
                   case "0000":
                     str += "\\0";
@@ -1174,23 +1174,23 @@ var require_stringifyString = __commonJS({
                     if (code.substr(0, 2) === "00")
                       str += "\\x" + code.substr(2);
                     else
-                      str += json4.substr(i, 6);
+                      str += json3.substr(i, 6);
                 }
                 i += 5;
                 start = i + 1;
               }
               break;
             case "n":
-              if (implicitKey || json4[i + 2] === '"' || json4.length < minMultiLineLength) {
+              if (implicitKey || json3[i + 2] === '"' || json3.length < minMultiLineLength) {
                 i += 1;
               } else {
-                str += json4.slice(start, i) + "\n\n";
-                while (json4[i + 2] === "\\" && json4[i + 3] === "n" && json4[i + 4] !== '"') {
+                str += json3.slice(start, i) + "\n\n";
+                while (json3[i + 2] === "\\" && json3[i + 3] === "n" && json3[i + 4] !== '"') {
                   str += "\n";
                   i += 2;
                 }
                 str += indent;
-                if (json4[i + 2] === " ")
+                if (json3[i + 2] === " ")
                   str += "\\";
                 i += 1;
                 start = i + 1;
@@ -1200,7 +1200,7 @@ var require_stringifyString = __commonJS({
               i += 1;
           }
       }
-      str = start ? str + json4.slice(start) : json4;
+      str = start ? str + json3.slice(start) : json3;
       return implicitKey ? str : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_QUOTED, getFoldOptions(ctx, false));
     }
     function singleQuotedString(value, ctx) {
@@ -3556,11 +3556,11 @@ var require_Document = __commonJS({
           throw new Error(`With a null YAML version, the { schema: Schema } option is required`);
       }
       // json & jsonArg are only used from toJSON()
-      toJS({ json: json4, jsonArg, mapAsMap, maxAliasCount, onAnchor, reviver } = {}) {
+      toJS({ json: json3, jsonArg, mapAsMap, maxAliasCount, onAnchor, reviver } = {}) {
         const ctx = {
           anchors: /* @__PURE__ */ new Map(),
           doc: this,
-          keep: !json4,
+          keep: !json3,
           mapAsMap: mapAsMap === true,
           mapKeyWarned: false,
           maxAliasCount: typeof maxAliasCount === "number" ? maxAliasCount : 100
@@ -8731,8 +8731,8 @@ import JSON5 from "json5";
 import { basename, dirname as dirname2, extname, join as join4 } from "path";
 var readConfig = async (file) => {
   try {
-    const json4 = await readFile2(file, "utf8");
-    const data = JSON5.parse(json4);
+    const json3 = await readFile2(file, "utf8");
+    const data = JSON5.parse(json3);
     return data;
   } catch (error) {
     if (error instanceof Error) {
@@ -8961,7 +8961,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 { dirname as dirname6 } from "path";
 
 // ../ts-file-cache/dist/index.js
 import { createHash } from "crypto";
@@ -10432,15 +10432,10 @@ var hasOnFailure = (stacks) => {
 };
 
 // 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 as createHash2 } from "crypto";
-import { dirname as dirname6 } from "path";
-import { rollup } from "rollup";
-import { swc, minify as swcMinify } from "rollup-plugin-swc3";
+import { rolldown } from "rolldown";
 var bundleTypeScript = async ({ format: format2 = "esm", minify = true, file, external }) => {
-  const bundle = await rollup({
+  const bundle = await rolldown({
     input: file,
     external: (importee) => {
       return importee.startsWith("@aws-sdk") || importee.startsWith("aws-sdk") || external?.includes(importee);
@@ -10448,31 +10443,15 @@ var bundleTypeScript = async ({ format: format2 = "esm", minify = true, file, ex
     onwarn: (error) => {
       debugError(error.message);
     },
-    treeshake: {
-      preset: "smallest",
-      moduleSideEffects: (id) => file === id
-    },
+    // treeshake: {
+    // 	// preset: 'smallest',
+    // 	// moduleSideEffects: id => file === id,
+    // },
+    treeshake: true,
     plugins: [
-      // @ts-ignore
-      commonjs({ sourceMap: true }),
-      // @ts-ignore
-      nodeResolve({ preferBuiltins: true }),
-      swc({
-        // minify,
-        // module: true,
-        jsc: {
-          baseUrl: dirname6(file),
-          minify: { sourceMap: true }
-        },
-        sourceMaps: true
-      }),
-      minify ? swcMinify({
-        module: format2 === "esm",
-        sourceMap: true,
-        compress: true
-      }) : void 0,
-      // @ts-ignore
-      json()
+      // commonjs({ sourceMap: true }),
+      // nodeResolve({ preferBuiltins: true }),
+      // json(),
     ]
   });
   const ext = format2 === "esm" ? "mjs" : "js";
@@ -10480,7 +10459,7 @@ var bundleTypeScript = async ({ format: format2 = "esm", minify = true, file, ex
     format: format2,
     sourcemap: "hidden",
     exports: "auto",
-    manualChunks: {},
+    // manualChunks: {},
     entryFileNames: `index.${ext}`,
     chunkFileNames: `[name].${ext}`
   });
@@ -10568,7 +10547,7 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
   let code;
   if (props.runtime === "container") {
     ctx.registerBuild("function", name, async (build3) => {
-      const cwd = dirname7(local2.file);
+      const cwd = dirname6(local2.file);
       const version = await hashElement(cwd, {
         files: {
           exclude: ["stack.json"]
@@ -11411,14 +11390,14 @@ var formatFullDomainName = (config2, id, subDomain) => {
 };
 
 // src/feature/graphql/build/typescript/resolver.ts
-import commonjs2 from "@rollup/plugin-commonjs";
-import json2 from "@rollup/plugin-json";
-import nodeResolve2 from "@rollup/plugin-node-resolve";
-import { dirname as dirname8 } from "path";
-import { rollup as rollup2 } from "rollup";
-import { minify as swcMinify2, swc as swc2 } from "rollup-plugin-swc3";
+import commonjs from "@rollup/plugin-commonjs";
+import json from "@rollup/plugin-json";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import { dirname as dirname7 } from "path";
+import { rollup } from "rollup";
+import { minify as swcMinify, swc } from "rollup-plugin-swc3";
 var buildTypeScriptResolver = async (input, { minify = false } = {}) => {
-  const bundle = await rollup2({
+  const bundle = await rollup({
     input,
     external: (importee) => {
       return importee.startsWith("@aws-sdk") || importee.startsWith("aws-sdk") || importee.startsWith("@aws-appsync/utils");
@@ -11431,25 +11410,25 @@ var buildTypeScriptResolver = async (input, { minify = false } = {}) => {
     },
     plugins: [
       // @ts-ignore
-      commonjs2({ sourceMap: true }),
+      commonjs({ sourceMap: true }),
       // @ts-ignore
-      nodeResolve2({ preferBuiltins: true }),
-      swc2({
+      nodeResolve({ preferBuiltins: true }),
+      swc({
         // minify,
         // module: true,
         jsc: {
-          baseUrl: dirname8(input),
+          baseUrl: dirname7(input),
           minify: { sourceMap: true }
         },
         sourceMaps: true
       }),
-      minify ? swcMinify2({
+      minify ? swcMinify({
         module: true,
         sourceMap: true,
         compress: true
       }) : void 0,
       // @ts-ignore
-      json2()
+      json()
     ]
   });
   const result = await bundle.generate({
@@ -11920,7 +11899,7 @@ 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 { dirname as dirname9 } from "path";
+import { dirname as dirname8 } from "path";
 import { zip } from "zip-a-folder";
 var instanceFeature = defineFeature({
   name: "instance",
@@ -12003,7 +11982,7 @@ var instanceFeature = defineFeature({
           }
         });
         await build3(version.hash, async () => {
-          await mkdir3(dirname9(bundleFile), { recursive: true });
+          await mkdir3(dirname8(bundleFile), { recursive: true });
           await zip(props.code, bundleFile);
         });
       });
@@ -12459,7 +12438,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 dirname9, join as join8, relative as relative5 } from "path";
 import { fileURLToPath } from "node:url";
 
 // src/feature/function/prebuild.ts
@@ -12603,14 +12582,15 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, local2) => {
 
 // src/feature/rpc/index.ts
 import { days as days5, seconds as seconds3 } from "@awsless/duration";
-var __dirname = dirname10(fileURLToPath(import.meta.url));
+var __dirname = dirname9(fileURLToPath(import.meta.url));
 var rpcFeature = defineFeature({
   name: "rpc",
   async onTypeGen(ctx) {
     const types2 = new TypeFile("@awsless/awsless/client");
-    types2.addCode(`type Input<T> = Parameters<T>[0]`);
-    types2.addCode(`type Output<T> = Promise<ReturnType<T>>`);
-    types2.addCode(`type Handle<T> = (input:Input<T>) => Output<T>`);
+    types2.addCode(`type Func = (...args: any[]) => any`);
+    types2.addCode(
+      `type Handle<T extends Func, I = Parameters<T>[0], O = Promise<ReturnType<T>>> = undefined extends I ? (input?: I) => O : (input: I) => O`
+    );
     const schemas = new TypeObject(1);
     for (const id of Object.keys(ctx.appConfig.defaults.rpc ?? {})) {
       const schema = new TypeObject(2);
@@ -12637,7 +12617,7 @@ var rpcFeature = defineFeature({
         const list4 = names[id];
         for (const name of Object.keys(queries ?? {})) {
           if (list4.has(name)) {
-            throw new FileError(stack.file, `Double RPC API function "${id}.${name}"`);
+            throw new FileError(stack.file, `Duplicate RPC API function "${id}.${name}"`);
           } else {
             list4.add(name);
           }
@@ -13383,6 +13363,25 @@ var topicFeature = defineFeature({
     gen.addInterface("TopicMockResponse", mockResponses);
     await ctx.write("topic.d.ts", gen, true);
   },
+  onValidate(ctx) {
+    const unique = [];
+    for (const stack of ctx.stackConfigs) {
+      for (const topic of stack.topics ?? []) {
+        if (unique.includes(topic)) {
+          throw new FileError(stack.file, `Duplicate topic "${topic}"`);
+        } else {
+          unique.push(topic);
+        }
+      }
+    }
+    for (const stack of ctx.stackConfigs) {
+      for (const topic of Object.keys(stack.subscribers ?? {})) {
+        if (!unique.includes(topic)) {
+          throw new FileError(stack.file, `Subscription to a undefined topic "${topic}"`);
+        }
+      }
+    }
+  },
   onApp(ctx) {
     for (const stack of ctx.stackConfigs) {
       for (const id of stack.topics ?? []) {
@@ -14294,7 +14293,7 @@ import { join as join12 } 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 { basename as basename4, dirname as dirname10, extname as extname3, join as join10 } from "path";
 import parseStaticImports from "parse-static-imports";
 var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
 var generateFileHashes = async (file, hashes) => {
@@ -14350,7 +14349,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(".") ? join10(dirname10(file), value) : value);
 };
 
 // src/test/reporter.ts
@@ -14427,16 +14426,16 @@ var CustomReporter = class {
 };
 
 // src/test/start.ts
-import { swc as swc3 } from "rollup-plugin-swc3";
+import { swc as swc2 } from "rollup-plugin-swc3";
 import { configDefaults } from "vitest/config";
 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 commonjs2 from "@rollup/plugin-commonjs";
+import nodeResolve2 from "@rollup/plugin-node-resolve";
+import json2 from "@rollup/plugin-json";
+import { dirname as dirname11, join as join11 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var startTest = async (props) => {
-  const __dirname2 = dirname12(fileURLToPath2(import.meta.url));
+  const __dirname2 = dirname11(fileURLToPath2(import.meta.url));
   const result = await startVitest(
     "test",
     props.filters,
@@ -14469,10 +14468,10 @@ var startTest = async (props) => {
     {
       plugins: [
         // @ts-ignore
-        commonjs3({ sourceMap: true }),
+        commonjs2({ sourceMap: true }),
         // @ts-ignore
-        nodeResolve3({ preferBuiltins: true }),
-        swc3({
+        nodeResolve2({ preferBuiltins: true }),
+        swc2({
           jsc: {
             // baseUrl: dirname(input),
             minify: { sourceMap: true }
@@ -14480,7 +14479,7 @@ var startTest = async (props) => {
           sourceMaps: true
         }),
         // @ts-ignore
-        json3()
+        json2()
       ]
     }
   );
@@ -14852,7 +14851,7 @@ 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 { dirname as dirname12, join as join13, relative as relative7 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(
@@ -14866,7 +14865,7 @@ var generateTypes = async (props) => {
             if (include) {
               files.push(relative7(directories.root, path));
             }
-            await mkdir5(dirname13(path), { recursive: true });
+            await mkdir5(dirname12(path), { recursive: true });
             await writeFile4(path, code);
           }
         }

package/dist/prebuild/rpc/HASH

@@ -1 +1 @@
-34eafe8e5556b34a6841941b5c52a41a598492dc
+1f3a2dc27bf572d149cd26c859b5c24dc19008e3

package/dist/prebuild.js

@@ -1,6 +1,6 @@
 // src/prebuild.ts
 import { mkdir } from "fs/promises";
-import { dirname as dirname2, join as join2 } from "path";
+import { dirname, join as join2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/feature/function/prebuild.ts
@@ -9,13 +9,8 @@ import { writeFile } from "fs/promises";
 import { join } from "path";
 
 // 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 } from "path";
-import { rollup } from "rollup";
-import { swc, minify as swcMinify } from "rollup-plugin-swc3";
+import { rolldown } from "rolldown";
 
 // src/cli/ui/style.ts
 import chalk from "chalk";
@@ -48,7 +43,7 @@ var debugError = (error) => {
 
 // src/feature/function/build/typescript/bundle.ts
 var bundleTypeScript = async ({ format = "esm", minify = true, file, external }) => {
-  const bundle = await rollup({
+  const bundle = await rolldown({
     input: file,
     external: (importee) => {
       return importee.startsWith("@aws-sdk") || importee.startsWith("aws-sdk") || external?.includes(importee);
@@ -56,31 +51,15 @@ var bundleTypeScript = async ({ format = "esm", minify = true, file, external })
     onwarn: (error) => {
       debugError(error.message);
     },
-    treeshake: {
-      preset: "smallest",
-      moduleSideEffects: (id) => file === id
-    },
+    // treeshake: {
+    // 	// preset: 'smallest',
+    // 	// moduleSideEffects: id => file === id,
+    // },
+    treeshake: true,
     plugins: [
-      // @ts-ignore
-      commonjs({ sourceMap: true }),
-      // @ts-ignore
-      nodeResolve({ preferBuiltins: true }),
-      swc({
-        // minify,
-        // module: true,
-        jsc: {
-          baseUrl: dirname(file),
-          minify: { sourceMap: true }
-        },
-        sourceMaps: true
-      }),
-      minify ? swcMinify({
-        module: format === "esm",
-        sourceMap: true,
-        compress: true
-      }) : void 0,
-      // @ts-ignore
-      json()
+      // commonjs({ sourceMap: true }),
+      // nodeResolve({ preferBuiltins: true }),
+      // json(),
     ]
   });
   const ext = format === "esm" ? "mjs" : "js";
@@ -88,7 +67,7 @@ var bundleTypeScript = async ({ format = "esm", minify = true, file, external })
     format,
     sourcemap: "hidden",
     exports: "auto",
-    manualChunks: {},
+    // manualChunks: {},
     entryFileNames: `index.${ext}`,
     chunkFileNames: `[name].${ext}`
   });
@@ -142,7 +121,7 @@ var prebuild = async (file, output) => {
 };
 
 // src/prebuild.ts
-var __dirname = dirname2(fileURLToPath(import.meta.url));
+var __dirname = dirname(fileURLToPath(import.meta.url));
 var builds = {
   rpc: "../src/feature/rpc/server/handle.ts"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.370",
+  "version": "0.0.372",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -30,14 +30,14 @@
   "peerDependencies": {
     "@awsless/lambda": "^0.0.26",
     "@awsless/iot": "^0.0.2",
-    "@awsless/mqtt": "^0.0.2",
     "@awsless/redis": "^0.0.13",
-    "@awsless/validate": "^0.0.15",
     "@awsless/open-search": "^0.0.15",
+    "@awsless/validate": "^0.0.15",
     "@awsless/s3": "^0.0.18",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
+    "@awsless/mqtt": "^0.0.2",
     "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
@@ -97,6 +97,7 @@
     "pretty-hrtime": "^1.0.3",
     "promise-dag": "^1.0.0",
     "promisify-child-process": "^4.1.2",
+    "rolldown": "^0.13.2",
     "rollup": "^4.18.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-swc3": "^0.11.2",
@@ -110,11 +111,11 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/duration": "^0.0.1",
+    "@awsless/code": "^0.0.10",
     "@awsless/size": "^0.0.1",
+    "@awsless/ts-file-cache": "^0.0.10",
     "@awsless/formation": "^0.0.56",
     "@awsless/validate": "^0.0.15",
-    "@awsless/ts-file-cache": "^0.0.10",
-    "@awsless/code": "^0.0.10",
     "@awsless/graphql": "^0.0.9"
   },
   "scripts": {