@awsless/awsless 0.0.580 → 0.0.582

package/dist/bin.js

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
-import {
-  shortId
-} from "./chunk-W4ED7XCC.js";
 
 // src/cli/program.ts
 import { Command } from "commander";
@@ -874,6 +871,10 @@ var FileCodeSchema = z14.object({
 });
 var BundleCodeSchema = z14.object({
   bundle: LocalDirectorySchema.describe("The directory that needs to be bundled.")
+  // dir: z.string(),
+  // build: z.string(),
+  // run: z.string(),
+  // cacheKey:
 });
 var CodeSchema = z14.union([
   LocalFileSchema.transform((file) => ({
@@ -993,36 +994,38 @@ var OnLogDefaultSchema = z17.union([
   })
 ]).optional().describe("Define a subscription on all Lambda functions logs.");
 
-// src/feature/pubsub/appsync/schema.ts
+// src/feature/pubsub/schema.ts
 import { z as z18 } from "zod";
 var DomainSchema = ResourceIdSchema.describe("The domain id to link your Pubsub API with.");
 var PubSubDefaultSchema = z18.record(
   ResourceIdSchema,
   z18.object({
-    auth: FunctionSchema.describe("The authentication function for the pubsub API."),
+    auth: FunctionSchema,
     domain: DomainSchema.optional(),
-    subDomain: z18.string().optional(),
-    namespaces: z18.array(z18.string()).optional().describe('The namespaces for the PubSub API. If not set, a single "default" namespace is created.'),
-    logLevel: z18.enum(["none", "info", "error", "debug", "all"]).optional().describe("The logging level for AppSync API. When set, logging is enabled.")
+    subDomain: z18.string().optional()
+    // auth: z.union([
+    // 	ResourceIdSchema,
+    // 	z.object({
+    // 		authorizer: FunctionSchema,
+    // 		// ttl: AuthorizerTtl.default('1 hour'),
+    // 	}),
+    // ]),
+    // policy: z
+    // 	.object({
+    // 		publish: z.array(z.string()).optional(),
+    // 		subscribe: z.array(z.string()).optional(),
+    // 	})
+    // 	.optional(),
   })
-).optional().describe("Define the pubsub API configuration in your stack.");
+).optional().describe("Define the pubsub subscriber in your stack.");
 var PubSubSchema = z18.record(
   ResourceIdSchema,
   z18.object({
-    channels: z18.array(z18.string()).describe("The event channels this subscriber listens to."),
-    filter: z18.object({
-      eventType: z18.string().optional().describe("Filter events by event type.")
-      // Add more filter options as needed
-      // userId: z.string().optional(),
-      // custom: z.record(z.string(), z.any()).optional(),
-    }).optional().describe("Event filtering options."),
-    consumer: FunctionSchema.describe("The consuming lambda function properties."),
-    batchSize: z18.number().int().min(1).max(100).default(1).describe("Number of events to batch before invoking the consumer function."),
-    retryPolicy: z18.object({
-      maxRetries: z18.number().int().min(0).max(3).default(2).describe("Maximum number of retry attempts.")
-    }).optional().describe("Retry policy for failed event processing.")
+    sql: z18.string().describe("The SQL statement used to query the IOT topic."),
+    sqlVersion: z18.enum(["2015-10-08", "2016-03-23", "beta"]).default("2016-03-23").describe("The version of the SQL rules engine to use when evaluating the rule."),
+    consumer: FunctionSchema.describe("The consuming lambda function properties.")
   })
-).optional().describe("Define the pubsub event subscribers in your stack.");
+).optional().describe("Define the pubsub subscriber in your stack.");
 
 // src/feature/queue/schema.ts
 import { days as days2, hours, minutes as minutes2, seconds as seconds2 } from "@awsless/duration";
@@ -3028,6 +3031,7 @@ var bundleTypeScript = async ({
     }
     const code = Buffer.from(item.code, "utf8");
     const map = item.map ? Buffer.from(item.map.toString(), "utf8") : void 0;
+    item.map?.version;
     hash.update(code);
     files.push({
       name: item.fileName,
@@ -3105,6 +3109,12 @@ var listAllFiles = async (list3) => {
   return files;
 };
 
+// src/util/id.ts
+import { createHash as createHash3 } from "crypto";
+var shortId = (ns) => {
+  return createHash3("md5").update(ns).digest("hex").substring(0, 10);
+};
+
 // src/util/temp.ts
 import { mkdir as mkdir3, readdir as readdir2, rm as rm2 } from "fs/promises";
 import { join as join8 } from "path";
@@ -3992,8 +4002,7 @@ var pubsubFeature = defineFeature({
     ctx.addGlobalPermission({
       actions: ["iot:Publish"],
       resources: [
-        //
-        `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/*`,
+        // `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/*`,
         `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/${ctx.app.name}/pubsub/*`
       ]
     });
@@ -5093,7 +5102,7 @@ var execCommand = async ({ cwd, env, command }) => {
 };
 
 // src/feature/site/index.ts
-import { createHash as createHash3 } from "crypto";
+import { createHash as createHash4 } from "crypto";
 import { Future as Future3 } from "@awsless/formation";
 var siteFeature = defineFeature({
   name: "site",
@@ -5398,7 +5407,7 @@ var siteFeature = defineFeature({
         version: new Future3((resolve) => {
           $combine(...versions).then((versions2) => {
             const combined = versions2.filter((v) => !!v).sort().join(",");
-            const version = createHash3("sha1").update(combined).digest("hex");
+            const version = createHash4("sha1").update(combined).digest("hex");
             resolve(version);
           });
         })
@@ -6897,7 +6906,7 @@ import deepmerge4 from "deepmerge";
 import { join as join16 } from "path";
 
 // src/feature/instance/build/executable.ts
-import { createHash as createHash4 } from "crypto";
+import { createHash as createHash5 } from "crypto";
 import { readFile as readFile4 } from "fs/promises";
 import { join as join15 } from "path";
 import { exec as exec2 } from "promisify-child-process";
@@ -6912,7 +6921,7 @@ var buildExecutable = async (input, outputPath, architecture) => {
   }
   const file = await readFile4(filePath);
   return {
-    hash: createHash4("sha1").update(file).update("x86_64").digest("hex"),
+    hash: createHash5("sha1").update(file).update("x86_64").digest("hex"),
     file
   };
 };
@@ -8024,6 +8033,7 @@ var createApp = (props) => {
   };
   return {
     app,
+    appId,
     base,
     zones,
     ready,
@@ -8312,7 +8322,7 @@ import { join as join19 } from "path";
 import wildstring3 from "wildstring";
 
 // src/build/__fingerprint.ts
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash6 } from "crypto";
 import { readdir as readdir4, readFile as readFile5, stat as stat4 } from "fs/promises";
 import { basename as basename4, dirname as dirname10, extname as extname4, join as join17 } from "path";
 import parseStaticImports from "parse-static-imports";
@@ -8323,7 +8333,7 @@ var generateFileHashes = async (file, hashes) => {
   }
   const code = await readModuleFile(file);
   const deps = await findDependencies(file, code);
-  const hash = createHash5("sha1").update(code).digest();
+  const hash = createHash6("sha1").update(code).digest();
   hashes.set(file, hash);
   for (const dep of deps) {
     if (dep.startsWith("/")) {
@@ -8340,7 +8350,7 @@ var fingerprintFromDirectory = async (dir) => {
     }
   }
   const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
-  return createHash5("sha1").update(merge2).digest("hex");
+  return createHash6("sha1").update(merge2).digest("hex");
 };
 var readModuleFile = (file) => {
   if (file.endsWith(".js")) {
@@ -9049,7 +9059,7 @@ var run = (program2) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      const { commands: commands9 } = createApp({ appConfig, stackConfigs, accountId });
+      const { commands: commands9, appId } = createApp({ appConfig, stackConfigs, accountId });
       let command;
       if (selected) {
         command = commands9.find((cmd) => {
@@ -9070,6 +9080,7 @@ var run = (program2) => {
         throw new ExpectedError(`The provided command doesn't exist.`);
       }
       process.env.APP = appConfig.name;
+      process.env.APP_ID = appId;
       process.env.AWS_REGION = region;
       process.env.AWS_ACCOUNT_ID = accountId;
       const module = await tsImport(command.file, {

package/dist/build-json-schema.js

@@ -266,6 +266,10 @@ var FileCodeSchema = z11.object({
 });
 var BundleCodeSchema = z11.object({
   bundle: LocalDirectorySchema.describe("The directory that needs to be bundled.")
+  // dir: z.string(),
+  // build: z.string(),
+  // run: z.string(),
+  // cacheKey:
 });
 var CodeSchema = z11.union([
   LocalFileSchema.transform((file) => ({
@@ -385,36 +389,38 @@ var OnLogDefaultSchema = z14.union([
   })
 ]).optional().describe("Define a subscription on all Lambda functions logs.");
 
-// src/feature/pubsub/appsync/schema.ts
+// src/feature/pubsub/schema.ts
 import { z as z15 } from "zod";
 var DomainSchema = ResourceIdSchema.describe("The domain id to link your Pubsub API with.");
 var PubSubDefaultSchema = z15.record(
   ResourceIdSchema,
   z15.object({
-    auth: FunctionSchema.describe("The authentication function for the pubsub API."),
+    auth: FunctionSchema,
     domain: DomainSchema.optional(),
-    subDomain: z15.string().optional(),
-    namespaces: z15.array(z15.string()).optional().describe('The namespaces for the PubSub API. If not set, a single "default" namespace is created.'),
-    logLevel: z15.enum(["none", "info", "error", "debug", "all"]).optional().describe("The logging level for AppSync API. When set, logging is enabled.")
+    subDomain: z15.string().optional()
+    // auth: z.union([
+    // 	ResourceIdSchema,
+    // 	z.object({
+    // 		authorizer: FunctionSchema,
+    // 		// ttl: AuthorizerTtl.default('1 hour'),
+    // 	}),
+    // ]),
+    // policy: z
+    // 	.object({
+    // 		publish: z.array(z.string()).optional(),
+    // 		subscribe: z.array(z.string()).optional(),
+    // 	})
+    // 	.optional(),
   })
-).optional().describe("Define the pubsub API configuration in your stack.");
+).optional().describe("Define the pubsub subscriber in your stack.");
 var PubSubSchema = z15.record(
   ResourceIdSchema,
   z15.object({
-    channels: z15.array(z15.string()).describe("The event channels this subscriber listens to."),
-    filter: z15.object({
-      eventType: z15.string().optional().describe("Filter events by event type.")
-      // Add more filter options as needed
-      // userId: z.string().optional(),
-      // custom: z.record(z.string(), z.any()).optional(),
-    }).optional().describe("Event filtering options."),
-    consumer: FunctionSchema.describe("The consuming lambda function properties."),
-    batchSize: z15.number().int().min(1).max(100).default(1).describe("Number of events to batch before invoking the consumer function."),
-    retryPolicy: z15.object({
-      maxRetries: z15.number().int().min(0).max(3).default(2).describe("Maximum number of retry attempts.")
-    }).optional().describe("Retry policy for failed event processing.")
+    sql: z15.string().describe("The SQL statement used to query the IOT topic."),
+    sqlVersion: z15.enum(["2015-10-08", "2016-03-23", "beta"]).default("2016-03-23").describe("The version of the SQL rules engine to use when evaluating the rule."),
+    consumer: FunctionSchema.describe("The consuming lambda function properties.")
   })
-).optional().describe("Define the pubsub event subscribers in your stack.");
+).optional().describe("Define the pubsub subscriber in your stack.");
 
 // src/feature/queue/schema.ts
 import { days as days2, hours, minutes as minutes2, seconds as seconds2 } from "@awsless/duration";

package/dist/prebuild/rpc/HASH

@@ -1 +1 @@
-67cc66902e9b4f4a3b10b94784c0f0f88f247ce1
+f5dbbf3d9b5e37eda3a77bbec4453130ace93efd

package/dist/prebuild.js

@@ -118,6 +118,7 @@ var bundleTypeScript = async ({
     }
     const code = Buffer.from(item.code, "utf8");
     const map = item.map ? Buffer.from(item.map.toString(), "utf8") : void 0;
+    item.map?.version;
     hash.update(code);
     files.push({
       name: item.fileName,

package/dist/server.d.ts

@@ -1,6 +1,6 @@
 import { AwsCredentialIdentityProvider } from '@aws-sdk/types';
 import * as vitest from 'vitest';
-import { Duration, DurationFormat } from '@awsless/duration';
+import { Duration } from '@awsless/duration';
 import { QoS } from '@awsless/iot';
 export { QoS } from '@awsless/iot';
 import { IoTCustomAuthorizerResult } from 'aws-lambda';
@@ -87,10 +87,6 @@ interface FunctionResources {
 declare const Function: FunctionResources;
 declare const Fn: FunctionResources;
 
-interface InstanceResources {
-}
-declare const Instance: InstanceResources;
-
 declare const getMetricName: (name: string) => string;
 declare const getMetricNamespace: (stack?: string, app?: string) => string;
 interface MetricResources {
@@ -135,7 +131,7 @@ type RpcAuthorizerResponse = {
     authorized: true;
     context?: unknown;
     lockKey?: string;
-    ttl: DurationFormat;
+    ttl: Duration;
 };
 
 declare const getSearchName: <N extends string, S extends string = "stack">(resourceName: N, stackName?: S) => `app--${S}--search--${N}`;
@@ -146,9 +142,9 @@ interface SearchResources {
 }
 declare const Search: SearchResources;
 
-declare const getSiteBucketName: <N extends string, S extends string = "stack">(resourceName: N, stackName?: S) => `app--${S}--site--${N}--${string}`;
+declare const getSiteBucketName: <N extends string, S extends string = "stack">(resourceName: N, stackName?: S) => `app--${S}--site--${N}--app-id`;
 
-declare const getStoreName: <N extends string, S extends string = "stack">(resourceName: N, stackName?: S) => `app--${S}--store--${N}--${string}`;
+declare const getStoreName: <N extends string, S extends string = "stack">(resourceName: N, stackName?: S) => `app--${S}--store--${N}--app-id`;
 interface StoreResources {
 }
 declare const Store: StoreResources;
@@ -171,4 +167,4 @@ declare const Topic: TopicResources;
 declare const APP: "app";
 declare const STACK: "stack";
 
-export { APP, Alert, type AlertMock, type AlertMockResponse, type AlertResources, Auth, type AuthResources, Cache, type CacheResources, type CommandContext, type CommandHandler, Config, type ConfigResources, Fn, Function, type FunctionMock, type FunctionMockResponse, type FunctionResources, Instance, type InstanceResources, Metric, type MetricResources, PubSub, type PublishOptions, Queue, type QueueMock, type QueueMockResponse, type QueueResources, type RpcAuthorizerResponse, STACK, Search, type SearchResources, Store, type StoreResources, Table, type TableResources, Task, type TaskMock, type TaskMockResponse, type TaskResources, Topic, type TopicMock, type TopicMockResponse, type TopicResources, getAlertName, getAuthProps, getCacheProps, getConfigName, getConfigValue, getFunctionName, getMetricName, getMetricNamespace, getPubSubTopic, getQueueName, getQueueUrl, getSearchName, getSearchProps, getSiteBucketName, getStoreName, getTableName, getTaskName, getTopicName, mockAlert, mockCache, mockFunction, mockMetric, mockPubSub, mockQueue, mockTask, mockTopic, pubsubAuthorizerHandle, pubsubAuthorizerResponse, setConfigValue };
+export { APP, Alert, type AlertMock, type AlertMockResponse, type AlertResources, Auth, type AuthResources, Cache, type CacheResources, type CommandContext, type CommandHandler, Config, type ConfigResources, Fn, Function, type FunctionMock, type FunctionMockResponse, type FunctionResources, Metric, type MetricResources, PubSub, type PublishOptions, Queue, type QueueMock, type QueueMockResponse, type QueueResources, type RpcAuthorizerResponse, STACK, Search, type SearchResources, Store, type StoreResources, Table, type TableResources, Task, type TaskMock, type TaskMockResponse, type TaskResources, Topic, type TopicMock, type TopicMockResponse, type TopicResources, getAlertName, getAuthProps, getCacheProps, getConfigName, getConfigValue, getFunctionName, getMetricName, getMetricNamespace, getPubSubTopic, getQueueName, getQueueUrl, getSearchName, getSearchProps, getSiteBucketName, getStoreName, getTableName, getTaskName, getTopicName, mockAlert, mockCache, mockFunction, mockMetric, mockPubSub, mockQueue, mockTask, mockTopic, pubsubAuthorizerHandle, pubsubAuthorizerResponse, setConfigValue };

package/dist/server.js

@@ -1,6 +1,3 @@
-import {
-  shortId
-} from "./chunk-W4ED7XCC.js";
 import {
   createProxy
 } from "./chunk-2LRBH7VV.js";
@@ -15,6 +12,7 @@ import { publish } from "@awsless/sns";
 // src/lib/server/util.ts
 import { kebabCase } from "change-case";
 var APP = process.env.APP ?? "app";
+var APP_ID = process.env.APP_ID ?? "app-id";
 var STACK = process.env.STACK ?? "stack";
 var IS_TEST = process.env.NODE_ENV === "test";
 var build = (opt) => {
@@ -456,13 +454,6 @@ var Config = /* @__PURE__ */ new Proxy(
   }
 );
 
-// src/lib/server/instance.ts
-var Instance = /* @__PURE__ */ createProxy((stack) => {
-  return createProxy((name) => {
-    return `http://${shortId(`${stack}:${name}`)}.${APP}`;
-  });
-});
-
 // src/lib/server/metric.ts
 import {
   batchPutData,
@@ -627,11 +618,11 @@ var Search = /* @__PURE__ */ createProxy((stack) => {
 });
 
 // src/lib/server/site.ts
-var getSiteBucketName = bindPostfixedLocalResourceName("site", process.env.APP_ID);
+var getSiteBucketName = bindPostfixedLocalResourceName("site", APP_ID);
 
 // src/lib/server/store.ts
 import { deleteObject, getObject, headObject, putObject } from "@awsless/s3";
-var getStoreName = bindPostfixedLocalResourceName("store", process.env.APP_ID);
+var getStoreName = bindPostfixedLocalResourceName("store", APP_ID);
 var Store = /* @__PURE__ */ createProxy((stack) => {
   return createProxy((name) => {
     const bucket = getStoreName(name, stack);
@@ -678,7 +669,6 @@ export {
   Config,
   Fn,
   Function,
-  Instance,
   Metric,
   PubSub,
   QoS,