@awsless/awsless 0.0.155 → 0.0.157

package/dist/bin.js

@@ -988,7 +988,7 @@ var rollupBundle = ({
       },
       plugins: [
         // @ts-ignore
-        commonjs({ sourceMap: true, ignoreDynamicRequires: true }),
+        commonjs({ sourceMap: true }),
         // @ts-ignore
         nodeResolve({ preferBuiltins: true }),
         swc({
@@ -4430,9 +4430,11 @@ var Bucket = class extends Resource {
         "s3:GetObjectAttributes"
       ],
       resources: [
-        sub("arn:${AWS::Partition}:${service}:::${resourceName}", {
-          service: "s3",
-          resourceName: this.name
+        sub("arn:${AWS::Partition}:s3:::${bucket}", {
+          bucket: this.name
+        }),
+        sub("arn:${AWS::Partition}:s3:::${bucket}/*", {
+          bucket: this.name
         })
       ]
     };

package/dist/index.d.ts

@@ -11133,8 +11133,11 @@ declare const definePlugin: (plugin: Plugin) => Plugin;
 
 declare const APP: "app";
 declare const STACK: "stack";
-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 function getLocalResourceName<N extends string>(name: N): `${typeof APP}-${typeof STACK}-${N}`;
+declare function getLocalResourceName<N extends string, S extends string>(name: N, stack: S): `${typeof APP}-${S}-${N}`;
+declare function getLocalResourceName<N extends string, S extends string, R extends string>(name: N, stack: S, resource: R): `${R}-${typeof APP}-${S}-${N}`;
+declare function getGlobalResourceName<N extends string>(name: N): `${typeof APP}-${N}`;
+declare function getGlobalResourceName<N extends string, R extends string>(name: N, resource: R): `${R}-${typeof APP}-${N}`;
 
 declare const getFunctionName: <S extends string, N extends string>(stack: S, name: N) => `app-${S}-${N}`;
 interface FunctionResources {
@@ -11142,7 +11145,7 @@ interface FunctionResources {
 declare const Function: FunctionResources;
 declare const Fn: FunctionResources;
 
-declare const getAuthName: <N extends string>(name: N) => `app-${N}`;
+declare const getAuthName: typeof getGlobalResourceName;
 interface AuthResources {
 }
 declare const Auth: AuthResources;
@@ -11153,17 +11156,17 @@ declare const getAuthProps: (name: string) => {
     readonly clientSecret: string;
 };
 
-declare const getTableName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getTableName: typeof getLocalResourceName;
 interface TableResources {
 }
 declare const Table: TableResources;
 
-declare const getTopicName: <N extends string>(name: N) => `app-${N}`;
+declare const getTopicName: typeof getGlobalResourceName;
 interface TopicResources {
 }
 declare const Topic: TopicResources;
 
-declare const getQueueName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getQueueName: typeof getLocalResourceName;
 interface QueueResources {
 }
 declare const Queue: QueueResources;
@@ -11176,7 +11179,7 @@ interface CacheResources {
 }
 declare const Cache: CacheResources;
 
-declare const getStoreName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getStoreName: <N extends string, S extends string>(name: N, stack: S) => `store-app-${S}-${N}`;
 interface StoreResources {
 }
 declare const Store: StoreResources;
@@ -11186,7 +11189,7 @@ interface ConfigResources {
 }
 declare const Config: ConfigResources;
 
-declare const getSearchName: <N extends string, S extends string = "stack">(name: N, stack?: S) => `app-${S}-${N}`;
+declare const getSearchName: typeof getLocalResourceName;
 interface SearchResources {
 }
 declare const Search: SearchResources;

package/dist/index.js

@@ -7,12 +7,12 @@ import { paramCase } from "change-case";
 var APP = process.env.APP || "app";
 var STACK = process.env.STACK || "stack";
 var STAGE = process.env.STAGE || "stage";
-var getLocalResourceName = (name, stack = STACK) => {
-  return `${APP}-${paramCase(stack)}-${paramCase(name)}`;
-};
-var getGlobalResourceName = (name) => {
-  return `${APP}-${paramCase(name)}`;
-};
+function getLocalResourceName(name, stack = STACK, resource) {
+  return `${resource ? paramCase(resource) + "-" : ""}${APP}-${paramCase(stack)}-${paramCase(name)}`;
+}
+function getGlobalResourceName(name, resource) {
+  return `${resource ? paramCase(resource) + "-" : ""}${APP}-${paramCase(name)}`;
+}
 
 // src/node/function.ts
 import { invoke } from "@awsless/lambda";
@@ -192,7 +192,9 @@ var Cache = /* @__PURE__ */ createProxy((stack) => {
 
 // src/node/store.ts
 import { putObject, getObject, deleteObject } from "@awsless/s3";
-var getStoreName = getLocalResourceName;
+var getStoreName = (name, stack) => {
+  return getLocalResourceName(name, stack, "store");
+};
 var Store = /* @__PURE__ */ createProxy((stack) => {
   return createProxy((name) => {
     const bucket = getStoreName(name, stack);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.155",
+  "version": "0.0.157",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,9 +28,9 @@
     }
   },
   "peerDependencies": {
-    "@awsless/lambda": "^0.0.15",
-    "@awsless/s3": "^0.0.8",
+    "@awsless/lambda": "^0.0.18",
     "@awsless/redis": "^0.0.10",
+    "@awsless/s3": "^0.0.8",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
@@ -89,7 +89,7 @@
     "wrap-ansi": "^8.1.0",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/graphql": "^0.0.8",
+    "@awsless/graphql": "^0.0.9",
     "@awsless/code": "^0.0.10"
   },
   "scripts": {