@awsless/awsless 0.0.34 → 0.0.35

package/dist/bin.cjs

@@ -1022,6 +1022,56 @@ var hasOnFailure = (config) => {
 
 // src/plugins/function.ts
 var import_change_case3 = require("change-case");
+
+// src/util/path.ts
+var import_promises2 = require("fs/promises");
+var import_path2 = require("path");
+var root = process.cwd();
+var directories = {
+  root,
+  get output() {
+    return (0, import_path2.join)(this.root, ".awsless");
+  },
+  get cache() {
+    return (0, import_path2.join)(this.output, "cache");
+  },
+  get asset() {
+    return (0, import_path2.join)(this.output, "asset");
+  },
+  get types() {
+    return (0, import_path2.join)(this.output, "types");
+  },
+  get template() {
+    return (0, import_path2.join)(this.output, "template");
+  }
+};
+var setRoot = (path = root) => {
+  directories.root = path;
+};
+var findRootDir = async (path, configFile, level = 5) => {
+  if (!level) {
+    throw new TypeError("No awsless project found");
+  }
+  const file = (0, import_path2.join)(path, configFile);
+  const exists = await fileExist(file);
+  if (exists) {
+    return path;
+  }
+  return findRootDir((0, import_path2.normalize)((0, import_path2.join)(path, "..")), configFile, level - 1);
+};
+var fileExist = async (file) => {
+  try {
+    const stat = await (0, import_promises2.lstat)(file);
+    if (stat.isFile()) {
+      return true;
+    }
+  } catch (error) {
+  }
+  return false;
+};
+
+// src/plugins/function.ts
+var import_path4 = require("path");
 var MemorySizeSchema = SizeSchema.refine(sizeMin(Size.megaBytes(128)), "Minimum memory size is 128 MB").refine(sizeMax(Size.gigaBytes(10)), "Minimum memory size is 10 GB");
 var TimeoutSchema = DurationSchema.refine(durationMin(Duration.seconds(10)), "Minimum timeout duration is 10 seconds").refine(durationMax(Duration.minutes(15)), "Maximum timeout duration is 15 minutes");
 var EphemeralStorageSizeSchema = SizeSchema.refine(sizeMin(Size.megaBytes(512)), "Minimum ephemeral storage size is 512 MB").refine(sizeMax(Size.gigaBytes(10)), "Minimum ephemeral storage size is 10 GB");
@@ -1166,9 +1216,11 @@ var functionPlugin = definePlugin({
       const functions = [];
       for (const [name, fileOrProps] of Object.entries(stack.functions || {})) {
         const varName = (0, import_change_case3.camelCase)(`${stack.name}-${name}`);
+        const funcName = (0, import_change_case3.paramCase)(`${config.name}-${stack.name}--${name}`);
         const file = typeof fileOrProps === "string" ? fileOrProps : fileOrProps.file;
-        imports.push(`import ${varName} from '${file}'`);
-        functions.push(`			readonly ${(0, import_change_case3.camelCase)(name)}: Invoke<typeof ${varName}>`);
+        const relFile = (0, import_path4.relative)(directories.types, file);
+        imports.push(`import ${varName} from '${relFile}'`);
+        functions.push(`			readonly ${(0, import_change_case3.camelCase)(name)}: Invoke<'${funcName}', typeof ${varName}>`);
       }
       if (functions.length > 0) {
         props.push(`		readonly ${(0, import_change_case3.camelCase)(stack.name)}: {
@@ -1188,8 +1240,9 @@ import { InvokeOptions } from '@awsless/lambda'
 
 type Options = Omit<InvokeOptions, 'name' | 'payload'>
 
-type Invoke<Func extends (...args: any[]) => any> = {
-	(event: Parameters<Func>[0], options?: Options): ReturnType<Func>
+type Invoke<Name extends string, Func extends (...args: any[]) => any> = {
+	name: Name
+	invoke: (event: Parameters<Func>[0], options?: Options) => ReturnType<Func>
 }
 
 declare module '@awsless/awsless' {
@@ -2297,7 +2350,7 @@ var RecordSet = class extends Resource {
 
 // src/formation/resource/appsync/graphql-schema.ts
 var import_graphql = require("graphql");
-var import_promises2 = require("fs/promises");
+var import_promises3 = require("fs/promises");
 var import_merge = require("@graphql-tools/merge");
 var GraphQLSchema = class extends Resource {
   constructor(logicalId, props) {
@@ -2322,7 +2375,7 @@ var Definition = class extends Asset {
   async build({ write }) {
     const files = [this.files].flat();
     const schemas = await Promise.all(files.map((file) => {
-      return (0, import_promises2.readFile)(file, "utf8");
+      return (0, import_promises3.readFile)(file, "utf8");
     }));
     const defs = (0, import_merge.mergeTypeDefs)(schemas);
     const schema2 = (0, import_graphql.print)(defs);
@@ -2342,7 +2395,7 @@ var Definition = class extends Asset {
 };
 
 // src/formation/resource/appsync/code.ts
-var import_promises3 = require("fs/promises");
+var import_promises4 = require("fs/promises");
 var Code2 = class {
   static fromFile(id, file) {
     return new FileCode2(id, file);
@@ -2369,7 +2422,7 @@ var FileCode2 = class extends Asset {
   }
   code;
   async build() {
-    const code = await (0, import_promises3.readFile)(this.file);
+    const code = await (0, import_promises4.readFile)(this.file);
     this.code = code.toString("utf8");
     return {
       size: formatByteSize(code.byteLength)
@@ -4111,7 +4164,7 @@ var toApp = async (config, filters) => {
 };
 
 // src/config.ts
-var import_path5 = require("path");
+var import_path7 = require("path");
 
 // src/util/account.ts
 var import_client_sts = require("@aws-sdk/client-sts");
@@ -4198,57 +4251,8 @@ var AppSchema = import_zod23.z.object({
 var import_rollup3 = require("rollup");
 var import_rollup_plugin_swc32 = require("rollup-plugin-swc3");
 var import_rollup_plugin_replace = __toESM(require("rollup-plugin-replace"), 1);
-var import_path3 = require("path");
+var import_path5 = require("path");
 var import_promises5 = require("fs/promises");
-
-// src/util/path.ts
-var import_promises4 = require("fs/promises");
-var import_path2 = require("path");
-var root = process.cwd();
-var directories = {
-  root,
-  get output() {
-    return (0, import_path2.join)(this.root, ".awsless");
-  },
-  get cache() {
-    return (0, import_path2.join)(this.output, "cache");
-  },
-  get asset() {
-    return (0, import_path2.join)(this.output, "asset");
-  },
-  get types() {
-    return (0, import_path2.join)(this.output, "types");
-  },
-  get template() {
-    return (0, import_path2.join)(this.output, "template");
-  }
-};
-var setRoot = (path = root) => {
-  directories.root = path;
-};
-var findRootDir = async (path, configFile, level = 5) => {
-  if (!level) {
-    throw new TypeError("No awsless project found");
-  }
-  const file = (0, import_path2.join)(path, configFile);
-  const exists = await fileExist(file);
-  if (exists) {
-    return path;
-  }
-  return findRootDir((0, import_path2.normalize)((0, import_path2.join)(path, "..")), configFile, level - 1);
-};
-var fileExist = async (file) => {
-  try {
-    const stat = await (0, import_promises4.lstat)(file);
-    if (stat.isFile()) {
-      return true;
-    }
-  } catch (error) {
-  }
-  return false;
-};
-
-// src/util/import.ts
 var importFile = async (path) => {
   const bundle = await (0, import_rollup3.rollup)({
     input: path,
@@ -4257,17 +4261,17 @@ var importFile = async (path) => {
     },
     plugins: [
       (0, import_rollup_plugin_replace.default)({
-        __dirname: (id) => `'${(0, import_path3.dirname)(id)}'`
+        __dirname: (id) => `'${(0, import_path5.dirname)(id)}'`
       }),
       (0, import_rollup_plugin_swc32.swc)({
         minify: false,
         jsc: {
-          baseUrl: (0, import_path3.dirname)(path)
+          baseUrl: (0, import_path5.dirname)(path)
         }
       })
     ]
   });
-  const outputFile = (0, import_path3.join)(directories.cache, "config.js");
+  const outputFile = (0, import_path5.join)(directories.cache, "config.js");
   const result = await bundle.generate({
     format: "esm",
     exports: "default"
@@ -4288,7 +4292,7 @@ var importConfig = async (options) => {
   setRoot(root2);
   debug("CWD:", style.info(root2));
   debug("Import config file");
-  const fileName = (0, import_path5.join)(root2, configFile);
+  const fileName = (0, import_path7.join)(root2, configFile);
   const module2 = await importFile(fileName);
   const appConfig = typeof module2.default === "function" ? await module2.default(options) : module2.default;
   debug("Validate config file");
@@ -4812,7 +4816,7 @@ var flexLine = (term, left, right, reserveSpace = 0) => {
 };
 
 // src/cli/ui/complex/builder.ts
-var import_path8 = require("path");
+var import_path10 = require("path");
 var assetBuilder = (app) => {
   return async (term) => {
     const assets = [];
@@ -4875,8 +4879,8 @@ var assetBuilder = (app) => {
         try {
           const data = await asset.build({
             async write(file, data2) {
-              const fullpath = (0, import_path8.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-              const basepath = (0, import_path8.dirname)(fullpath);
+              const fullpath = (0, import_path10.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+              const basepath = (0, import_path10.dirname)(fullpath);
               await (0, import_promises6.mkdir)(basepath, { recursive: true });
               await (0, import_promises6.writeFile)(fullpath, data2);
             }
@@ -4923,14 +4927,14 @@ var cleanUp = async () => {
 
 // src/cli/ui/complex/template.ts
 var import_promises8 = require("fs/promises");
-var import_path11 = require("path");
+var import_path13 = require("path");
 var templateBuilder = (app) => {
   return async (term) => {
     const done = term.out.write(loadingDialog("Building stack templates..."));
     await Promise.all(app.stacks.map(async (stack) => {
       const template = stack.toString(true);
-      const path = (0, import_path11.join)(directories.template, app.name);
-      const file = (0, import_path11.join)(path, `${stack.name}.json`);
+      const path = (0, import_path13.join)(directories.template, app.name);
+      const file = (0, import_path13.join)(path, `${stack.name}.json`);
       await (0, import_promises8.mkdir)(path, { recursive: true });
       await (0, import_promises8.writeFile)(file, template);
     }));
@@ -4940,19 +4944,26 @@ var templateBuilder = (app) => {
 
 // src/util/type-gen.ts
 var import_promises9 = require("fs/promises");
-var import_path13 = require("path");
+var import_path15 = require("path");
 var generateResourceTypes = async (config) => {
   const plugins = [
     ...defaultPlugins,
     ...config.plugins || []
   ];
+  const files = [];
   for (const plugin of plugins) {
     const code = plugin.onTypeGen?.({ config });
     if (code) {
+      const file = (0, import_path15.join)(directories.types, `${plugin.name}.d.ts`);
+      files.push((0, import_path15.relative)(directories.root, file));
       await (0, import_promises9.mkdir)(directories.types, { recursive: true });
-      await (0, import_promises9.writeFile)((0, import_path13.join)(directories.types, `${plugin.name}.d.ts`), code);
+      await (0, import_promises9.writeFile)(file, code);
     }
   }
+  if (files.length) {
+    const code = files.map((file) => `import '${file}';`).join("\n");
+    await (0, import_promises9.writeFile)((0, import_path15.join)(directories.root, `awsless.d.ts`), code);
+  }
 };
 
 // src/cli/ui/complex/types.ts
@@ -5468,7 +5479,7 @@ var status = (program2) => {
 
 // src/cli/ui/complex/publisher.ts
 var import_promises10 = require("fs/promises");
-var import_path15 = require("path");
+var import_path17 = require("path");
 var import_client_s32 = require("@aws-sdk/client-s3");
 var assetPublisher = (config, app) => {
   const client = new import_client_s32.S3Client({
@@ -5481,7 +5492,7 @@ var assetPublisher = (config, app) => {
       await Promise.all([...stack.assets].map(async (asset) => {
         await asset.publish?.({
           async read(file) {
-            const path = (0, import_path15.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+            const path = (0, import_path17.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
             const data = await (0, import_promises10.readFile)(path);
             return data;
           },

package/dist/bin.js

@@ -998,7 +998,57 @@ var hasOnFailure = (config) => {
 };
 
 // src/plugins/function.ts
-import { camelCase } from "change-case";
+import { camelCase, paramCase as paramCase3 } from "change-case";
+
+// src/util/path.ts
+import { lstat } from "fs/promises";
+import { join, normalize } from "path";
+var root = process.cwd();
+var directories = {
+  root,
+  get output() {
+    return join(this.root, ".awsless");
+  },
+  get cache() {
+    return join(this.output, "cache");
+  },
+  get asset() {
+    return join(this.output, "asset");
+  },
+  get types() {
+    return join(this.output, "types");
+  },
+  get template() {
+    return join(this.output, "template");
+  }
+};
+var setRoot = (path = root) => {
+  directories.root = path;
+};
+var findRootDir = async (path, configFile, level = 5) => {
+  if (!level) {
+    throw new TypeError("No awsless project found");
+  }
+  const file = join(path, configFile);
+  const exists = await fileExist(file);
+  if (exists) {
+    return path;
+  }
+  return findRootDir(normalize(join(path, "..")), configFile, level - 1);
+};
+var fileExist = async (file) => {
+  try {
+    const stat = await lstat(file);
+    if (stat.isFile()) {
+      return true;
+    }
+  } catch (error) {
+  }
+  return false;
+};
+
+// src/plugins/function.ts
+import { relative } from "path";
 var MemorySizeSchema = SizeSchema.refine(sizeMin(Size.megaBytes(128)), "Minimum memory size is 128 MB").refine(sizeMax(Size.gigaBytes(10)), "Minimum memory size is 10 GB");
 var TimeoutSchema = DurationSchema.refine(durationMin(Duration.seconds(10)), "Minimum timeout duration is 10 seconds").refine(durationMax(Duration.minutes(15)), "Maximum timeout duration is 15 minutes");
 var EphemeralStorageSizeSchema = SizeSchema.refine(sizeMin(Size.megaBytes(512)), "Minimum ephemeral storage size is 512 MB").refine(sizeMax(Size.gigaBytes(10)), "Minimum ephemeral storage size is 10 GB");
@@ -1143,9 +1193,11 @@ var functionPlugin = definePlugin({
       const functions = [];
       for (const [name, fileOrProps] of Object.entries(stack.functions || {})) {
         const varName = camelCase(`${stack.name}-${name}`);
+        const funcName = paramCase3(`${config.name}-${stack.name}--${name}`);
         const file = typeof fileOrProps === "string" ? fileOrProps : fileOrProps.file;
-        imports.push(`import ${varName} from '${file}'`);
-        functions.push(`			readonly ${camelCase(name)}: Invoke<typeof ${varName}>`);
+        const relFile = relative(directories.types, file);
+        imports.push(`import ${varName} from '${relFile}'`);
+        functions.push(`			readonly ${camelCase(name)}: Invoke<'${funcName}', typeof ${varName}>`);
       }
       if (functions.length > 0) {
         props.push(`		readonly ${camelCase(stack.name)}: {
@@ -1165,8 +1217,9 @@ import { InvokeOptions } from '@awsless/lambda'
 
 type Options = Omit<InvokeOptions, 'name' | 'payload'>
 
-type Invoke<Func extends (...args: any[]) => any> = {
-	(event: Parameters<Func>[0], options?: Options): ReturnType<Func>
+type Invoke<Name extends string, Func extends (...args: any[]) => any> = {
+	name: Name
+	invoke: (event: Parameters<Func>[0], options?: Options) => ReturnType<Func>
 }
 
 declare module '@awsless/awsless' {
@@ -2198,7 +2251,7 @@ var toArray = (value) => {
 };
 
 // src/plugins/graphql.ts
-import { paramCase as paramCase3 } from "change-case";
+import { paramCase as paramCase4 } from "change-case";
 
 // src/formation/resource/appsync/graphql-api.ts
 import { constantCase as constantCase3 } from "change-case";
@@ -2631,7 +2684,7 @@ var graphqlPlugin = definePlugin({
       const apiId = bootstrap2.import(`graphql-${id}`);
       for (const [typeAndField, functionProps] of Object.entries(props.resolvers || {})) {
         const [typeName, fieldName] = typeAndField.split(/[\s]+/g);
-        const entryId = paramCase3(`${id}-${typeName}-${fieldName}`);
+        const entryId = paramCase4(`${id}-${typeName}-${fieldName}`);
         const lambda = toLambdaFunction(ctx, `graphql-${entryId}`, functionProps);
         const source = new AppsyncEventSource(entryId, lambda, {
           apiId,
@@ -4177,55 +4230,6 @@ import { swc as swc2 } from "rollup-plugin-swc3";
 import replace from "rollup-plugin-replace";
 import { dirname as dirname2, join as join2 } from "path";
 import { mkdir, writeFile } from "fs/promises";
-
-// src/util/path.ts
-import { lstat } from "fs/promises";
-import { join, normalize } from "path";
-var root = process.cwd();
-var directories = {
-  root,
-  get output() {
-    return join(this.root, ".awsless");
-  },
-  get cache() {
-    return join(this.output, "cache");
-  },
-  get asset() {
-    return join(this.output, "asset");
-  },
-  get types() {
-    return join(this.output, "types");
-  },
-  get template() {
-    return join(this.output, "template");
-  }
-};
-var setRoot = (path = root) => {
-  directories.root = path;
-};
-var findRootDir = async (path, configFile, level = 5) => {
-  if (!level) {
-    throw new TypeError("No awsless project found");
-  }
-  const file = join(path, configFile);
-  const exists = await fileExist(file);
-  if (exists) {
-    return path;
-  }
-  return findRootDir(normalize(join(path, "..")), configFile, level - 1);
-};
-var fileExist = async (file) => {
-  try {
-    const stat = await lstat(file);
-    if (stat.isFile()) {
-      return true;
-    }
-  } catch (error) {
-  }
-  return false;
-};
-
-// src/util/import.ts
 var importFile = async (path) => {
   const bundle = await rollup2({
     input: path,
@@ -4917,19 +4921,26 @@ var templateBuilder = (app) => {
 
 // src/util/type-gen.ts
 import { mkdir as mkdir5, writeFile as writeFile4 } from "fs/promises";
-import { join as join6 } from "path";
+import { join as join6, relative as relative2 } from "path";
 var generateResourceTypes = async (config) => {
   const plugins = [
     ...defaultPlugins,
     ...config.plugins || []
   ];
+  const files = [];
   for (const plugin of plugins) {
     const code = plugin.onTypeGen?.({ config });
     if (code) {
+      const file = join6(directories.types, `${plugin.name}.d.ts`);
+      files.push(relative2(directories.root, file));
       await mkdir5(directories.types, { recursive: true });
-      await writeFile4(join6(directories.types, `${plugin.name}.d.ts`), code);
+      await writeFile4(file, code);
     }
   }
+  if (files.length) {
+    const code = files.map((file) => `import '${file}';`).join("\n");
+    await writeFile4(join6(directories.root, `awsless.d.ts`), code);
+  }
 };
 
 // src/cli/ui/complex/types.ts
@@ -4984,7 +4995,7 @@ var shouldDeployBootstrap = async (client, stack) => {
 // src/formation/client.ts
 import { CloudFormationClient, CreateStackCommand, DeleteStackCommand, DescribeStackEventsCommand, DescribeStacksCommand, GetTemplateCommand, OnFailure, TemplateStage, UpdateStackCommand, ValidateTemplateCommand, waitUntilStackCreateComplete, waitUntilStackDeleteComplete, waitUntilStackUpdateComplete } from "@aws-sdk/client-cloudformation";
 import { S3Client, PutObjectCommand, ObjectCannedACL, StorageClass } from "@aws-sdk/client-s3";
-import { paramCase as paramCase4 } from "change-case";
+import { paramCase as paramCase5 } from "change-case";
 var StackClient = class {
   constructor(app, account, region, credentials) {
     this.app = app;
@@ -5017,7 +5028,7 @@ var StackClient = class {
     };
   }
   stackName(stackName) {
-    return paramCase4(`${this.app.name}-${stackName}`);
+    return paramCase5(`${this.app.name}-${stackName}`);
   }
   tags(stack) {
     const tags = [];

package/dist/index.cjs

@@ -46,10 +46,10 @@ var import_change_case = require("change-case");
 var APP = process.env.APP || "app";
 var STACK = process.env.STACK || "stack";
 var getLocalResourceName = (name, stack = STACK) => {
-  return `${APP}--${(0, import_change_case.paramCase)(stack)}--${(0, import_change_case.paramCase)(name)}`;
+  return `${APP}-${(0, import_change_case.paramCase)(stack)}-${(0, import_change_case.paramCase)(name)}`;
 };
 var getGlobalResourceName = (name) => {
-  return `${APP}--${(0, import_change_case.paramCase)(name)}`;
+  return `${APP}-${(0, import_change_case.paramCase)(name)}`;
 };
 var getSearchName = getLocalResourceName;
 var getStoreName = getLocalResourceName;

package/dist/index.d.ts

@@ -2470,24 +2470,24 @@ type Plugin<S extends AnyZodObject | undefined = undefined> = {
 };
 declare const definePlugin: <S extends AnyZodObject | undefined = undefined>(plugin: Plugin<S>) => Plugin<S>;
 
-declare const getLocalResourceName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app--${S}--${N}`;
-declare const getGlobalResourceName: <N extends string>(name: N) => `app--${N}`;
-declare const getSearchName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app--${S}--${N}`;
-declare const getStoreName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app--${S}--${N}`;
-declare const getQueueName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app--${S}--${N}`;
-declare const getTopicName: <N extends string>(name: N) => `app--${N}`;
+declare const getLocalResourceName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getGlobalResourceName: <N extends string>(name: N) => `app-${N}`;
+declare const getSearchName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getStoreName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getQueueName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getTopicName: <N extends string>(name: N) => `app-${N}`;
 declare const getSecretName: (name: string) => string;
 declare const getCacheProps: (name: string, stack?: "stack") => {
     readonly host: string;
     readonly port: number;
 };
 
-declare const getFunctionName: <S extends string, N extends string>(stack: S, name: N) => `app--${S}--${N}`;
+declare const getFunctionName: <S extends string, N extends string>(stack: S, name: N) => `app-${S}-${N}`;
 interface FunctionResources {
 }
 declare const Function: FunctionResources;
 
-declare const getTableName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app--${S}--${N}`;
+declare const getTableName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
 interface TableResources {
 }
 declare const Table: TableResources;

package/dist/index.js

@@ -7,10 +7,10 @@ import { paramCase } from "change-case";
 var APP = process.env.APP || "app";
 var STACK = process.env.STACK || "stack";
 var getLocalResourceName = (name, stack = STACK) => {
-  return `${APP}--${paramCase(stack)}--${paramCase(name)}`;
+  return `${APP}-${paramCase(stack)}-${paramCase(name)}`;
 };
 var getGlobalResourceName = (name) => {
-  return `${APP}--${paramCase(name)}`;
+  return `${APP}-${paramCase(name)}`;
 };
 var getSearchName = getLocalResourceName;
 var getStoreName = getLocalResourceName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "license": "MIT",
   "type": "module",
   "repository": {