@awsless/awsless 0.0.188 → 0.0.190

package/dist/bin.js

@@ -165,6 +165,9 @@ var directories = {
   get cache() {
     return join(this.output, "cache");
   },
+  get state() {
+    return join(this.output, "state");
+  },
   get build() {
     return join(this.output, "build");
   },
@@ -1462,11 +1465,12 @@ import {
   ScalarAttributeType
 } from "@aws-sdk/client-dynamodb";
 import { confirm, log as log6 } from "@clack/prompts";
-var hasStateTable = async (client) => {
+import { CreateBucketCommand, HeadBucketCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
+var hasLockTable = async (client) => {
   try {
     const result = await client.send(
       new DescribeTableCommand({
-        TableName: "awsless-state"
+        TableName: "awsless-locks"
       })
     );
     return !!result.Table;
@@ -1477,10 +1481,26 @@ var hasStateTable = async (client) => {
     throw error;
   }
 };
-var createStateTable = (client) => {
+var hasStateBucket = async (client) => {
+  try {
+    const result = await client.send(
+      new HeadBucketCommand({
+        Bucket: "awsless-state"
+      })
+    );
+    return !!result.BucketRegion;
+  } catch (error) {
+    console.log(error);
+    if (error instanceof S3ServiceException) {
+      return false;
+    }
+    throw error;
+  }
+};
+var createLockTable = (client) => {
   return client.send(
     new CreateTableCommand({
-      TableName: "awsless-state",
+      TableName: "awsless-locks",
       BillingMode: BillingMode.PAY_PER_REQUEST,
       KeySchema: [
         {
@@ -1497,10 +1517,22 @@ var createStateTable = (client) => {
     })
   );
 };
-var bootstrapAwsless = async (opts) => {
-  const client = new DynamoDB(opts);
-  const table2 = await hasStateTable(client);
-  if (!table2) {
+var createStateBucket = (client) => {
+  return client.send(
+    new CreateBucketCommand({
+      Bucket: "awsless-state"
+    })
+  );
+};
+var bootstrapAwsless = async (props) => {
+  const dynamo = new DynamoDB(props);
+  const s3 = new S3Client(props);
+  const [table2, bucket] = await Promise.all([
+    //
+    hasLockTable(dynamo),
+    hasStateBucket(s3)
+  ]);
+  if (!table2 || !bucket) {
     log6.warn(`Your Awsless hasn't been bootstrapped yet.`);
     if (!process.env.SKIP_PROMPT) {
       const confirmed = await confirm({
@@ -1511,7 +1543,12 @@ var bootstrapAwsless = async (opts) => {
       }
     }
     await task("Bootstrapping", async (update) => {
-      await createStateTable(client);
+      if (!table2) {
+        await createLockTable(dynamo);
+      }
+      if (!bucket) {
+        await createStateBucket(s3);
+      }
       update("Done deploying the bootstrap stack");
     });
   } else {
@@ -1991,14 +2028,14 @@ var build = (type, name, builder) => {
 };
 
 // src/feature/function/util.ts
-var createLambdaFunction = (group, ctx, ns, id, local) => {
+var createLambdaFunction = (group, ctx, ns, id, local2) => {
   let name;
   if ("stackConfig" in ctx) {
     name = formatLocalResourceName(ctx.appConfig.name, ctx.stackConfig.name, ns, id);
   } else {
     name = formatGlobalResourceName(ctx.appConfig.name, ns, id);
   }
-  const props = deepmerge(ctx.appConfig.defaults.function, local);
+  const props = deepmerge(ctx.appConfig.defaults.function, local2);
   ctx.registerBuild("function", name, async (build3) => {
     const version = await fingerprintFromFile(props.file);
     return build3(version, async (write) => {
@@ -2073,8 +2110,8 @@ var createLambdaFunction = (group, ctx, ns, id, local) => {
   if (ctx.appConfig.defaults.function.permissions) {
     policy.addStatement(...ctx.appConfig.defaults.function.permissions);
   }
-  if ("permissions" in local && local.permissions) {
-    policy.addStatement(...local.permissions);
+  if ("permissions" in local2 && local2.permissions) {
+    policy.addStatement(...local2.permissions);
   }
   if (props.warm) {
     const rule = new aws2.events.Rule(group, "warm", {
@@ -2640,6 +2677,15 @@ export function response(ctx) {
 	return ctx.result
 }
 `;
+var baseSchema = `
+type Query
+type Mutation
+
+schema {
+	query: Query
+	mutation: Mutation
+}
+`;
 var scalarSchema = `
 scalar AWSDate
 scalar AWSTime
@@ -2799,7 +2845,7 @@ var graphqlFeature = defineFeature({
         const source = await readFile5(props.schema, "utf8");
         const finger = createHash4("sha1").update(source).digest("hex");
         return build3(finger, async (write) => {
-          const defs = mergeTypeDefs([scalarSchema, source]);
+          const defs = mergeTypeDefs([scalarSchema, baseSchema, source]);
           const output = print(defs);
           const schema2 = buildSchema(output);
           for (const [typeName, fields] of Object.entries(props.resolvers ?? {})) {
@@ -3028,8 +3074,8 @@ var queueFeature = defineFeature({
     await ctx.write("queue.d.ts", gen, true);
   },
   onStack(ctx) {
-    for (const [id, local] of Object.entries(ctx.stackConfig.queues || {})) {
-      const props = deepmerge2(ctx.appConfig.defaults.queue, local);
+    for (const [id, local2] of Object.entries(ctx.stackConfig.queues || {})) {
+      const props = deepmerge2(ctx.appConfig.defaults.queue, local2);
       const group = new Node9(ctx.stack, "queue", id);
       const queue2 = new aws9.sqs.Queue(group, "queue", {
         name: formatLocalResourceName(ctx.appConfig.name, ctx.stack.name, "queue", id),
@@ -4153,8 +4199,50 @@ var config = (program2) => {
 
 // src/cli/command/delete.ts
 import { confirm as confirm3 } from "@clack/prompts";
-import { WorkSpace, aws as aws18 } from "@awsless/formation";
+
+// src/util/workspace.ts
+import { WorkSpace, aws as aws18, local } from "@awsless/formation";
 import { minutes as minutes4 } from "@awsless/duration";
+import { dirname as dirname8, join as join9 } from "path";
+import { mkdir as mkdir2, readFile as readFile6, writeFile as writeFile2 } from "fs/promises";
+var createWorkSpace = (props) => {
+  const lockProvider = new aws18.dynamodb.LockProvider({
+    ...props,
+    tableName: "awsless-locks"
+  });
+  const stateProvider = new aws18.s3.StateProvider({
+    ...props,
+    bucket: "awsless-state"
+  });
+  const cloudProviders = aws18.createCloudProviders({
+    ...props,
+    timeout: minutes4(60)
+  });
+  const workspace = new WorkSpace({
+    lockProvider,
+    stateProvider,
+    cloudProviders
+  });
+  return {
+    workspace,
+    lockProvider,
+    stateProvider
+  };
+};
+var pullRemoteState = async (app, stateProvider) => {
+  const file = join9(directories.state, `${app.urn}.json`);
+  const state2 = await stateProvider.get(app.urn);
+  await mkdir2(dirname8(file), { recursive: true });
+  await writeFile2(file, JSON.stringify(state2, void 0, 2));
+};
+var pushRemoteState = async (app, stateProvider) => {
+  const file = join9(directories.state, `${app.urn}.json`);
+  const data = await readFile6(file, "utf8");
+  const state2 = JSON.parse(data);
+  await stateProvider.update(app.urn, state2);
+};
+
+// src/cli/command/delete.ts
 var del2 = (program2) => {
   program2.command("delete").argument("[stacks...]", "Optionally filter stacks to delete").description("Delete your app from AWS").action(async (filters) => {
     await layout("delete", async ({ appConfig, stackConfigs }) => {
@@ -4177,20 +4265,13 @@ var del2 = (program2) => {
           throw new Cancelled();
         }
       }
-      const workspace = new WorkSpace({
-        stateProvider: new aws18.dynamodb.StateProvider({
-          credentials,
-          region,
-          tableName: "awsless-state"
-        }),
-        cloudProviders: aws18.createCloudProviders({
-          credentials,
-          region: appConfig.region,
-          timeout: minutes4(30)
-        })
+      const { workspace, stateProvider } = createWorkSpace({
+        credentials,
+        region
       });
       await task("Deleting the stacks to AWS", async (update) => {
         await workspace.deleteApp(app);
+        await pullRemoteState(app, stateProvider);
         update("Done deleting the stacks to AWS.");
       });
       return "Your app has been deleted!";
@@ -4199,12 +4280,11 @@ var del2 = (program2) => {
 };
 
 // src/cli/command/deploy.ts
-import { WorkSpace as WorkSpace2, aws as aws19 } from "@awsless/formation";
 import { confirm as confirm4 } from "@clack/prompts";
 
 // src/cli/ui/complex/run-tests.ts
-import { join as join9 } from "path";
-import { mkdir as mkdir2, readFile as readFile6, writeFile as writeFile2 } from "fs/promises";
+import { join as join10 } from "path";
+import { mkdir as mkdir3, readFile as readFile7, writeFile as writeFile3 } from "fs/promises";
 
 // src/test/reporter.ts
 import { getSuites, getTests } from "@vitest/runner/utils";
@@ -4388,12 +4468,12 @@ var logTestErrors = (event) => {
   });
 };
 var runTest = async (stack, dir, filters) => {
-  await mkdir2(directories.test, { recursive: true });
+  await mkdir3(directories.test, { recursive: true });
   const fingerprint = await fingerprintFromDirectory(dir);
-  const file = join9(directories.test, `${stack}.json`);
+  const file = join10(directories.test, `${stack}.json`);
   const exists = await fileExist(file);
   if (exists && !process.env.NO_CACHE) {
-    const raw = await readFile6(file, { encoding: "utf8" });
+    const raw = await readFile7(file, { encoding: "utf8" });
     const data = JSON.parse(raw);
     if (data.fingerprint === fingerprint) {
       log8.step(
@@ -4434,7 +4514,7 @@ var runTest = async (stack, dir, filters) => {
   });
   logTestLogs(result);
   logTestErrors(result);
-  await writeFile2(
+  await writeFile3(
     file,
     JSON.stringify({
       ...result,
@@ -4456,7 +4536,6 @@ var runTests = async (tests, filters = []) => {
 };
 
 // src/cli/command/deploy.ts
-import { minutes as minutes5 } from "@awsless/duration";
 var deploy = (program2) => {
   program2.command("deploy").argument("[stacks...]", "Optionally filter stacks to deploy").description("Deploy your app to AWS").action(async (filters) => {
     await layout("deploy", async ({ appConfig, stackConfigs }) => {
@@ -4483,20 +4562,13 @@ var deploy = (program2) => {
         throw new Cancelled();
       }
       await buildAssets(builders);
-      const workspace = new WorkSpace2({
-        stateProvider: new aws19.dynamodb.StateProvider({
-          credentials,
-          region,
-          tableName: "awsless-state"
-        }),
-        cloudProviders: aws19.createCloudProviders({
-          credentials,
-          region: appConfig.region,
-          timeout: minutes5(60)
-        })
+      const { workspace, stateProvider } = createWorkSpace({
+        credentials,
+        region
       });
       await task("Deploying the stacks to AWS", async (update) => {
         await workspace.deployApp(app);
+        await pullRemoteState(app, stateProvider);
         update("Done deploying the stacks to AWS.");
       });
       return "Your app is ready!";
@@ -4505,7 +4577,7 @@ var deploy = (program2) => {
 };
 
 // src/cli/command/diff.ts
-import { WorkSpace as WorkSpace3, aws as aws20 } from "@awsless/formation";
+import { WorkSpace as WorkSpace2, aws as aws19 } from "@awsless/formation";
 import chalk7 from "chalk";
 var diff = (program2) => {
   program2.command("diff").description("Diff your app with AWS").action(async (filters) => {
@@ -4516,13 +4588,13 @@ var diff = (program2) => {
       await bootstrapAwsless({ credentials, region });
       const { app, builders } = createApp({ appConfig, stackConfigs, accountId }, filters);
       await buildAssets(builders);
-      const workspace = new WorkSpace3({
-        stateProvider: new aws20.dynamodb.DynamoDBStateProvider({
+      const workspace = new WorkSpace2({
+        stateProvider: new aws19.dynamodb.DynamoDBStateProvider({
           credentials,
           region,
           tableName: "awsless-state"
         }),
-        cloudProviders: aws20.createCloudProviders({
+        cloudProviders: aws19.createCloudProviders({
           credentials,
           region: appConfig.region
         })
@@ -4577,8 +4649,8 @@ var diff = (program2) => {
 import { log as log9 } from "@clack/prompts";
 
 // src/type-gen/generate.ts
-import { mkdir as mkdir3, writeFile as writeFile3 } from "fs/promises";
-import { dirname as dirname8, join as join10, relative as relative4 } from "path";
+import { mkdir as mkdir4, writeFile as writeFile4 } from "fs/promises";
+import { dirname as dirname9, join as join11, relative as relative4 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(
@@ -4587,13 +4659,13 @@ var generateTypes = async (props) => {
         ...props,
         async write(file, data, include = false) {
           const code = data?.toString("utf8");
-          const path = join10(directories.types, file);
+          const path = join11(directories.types, file);
           if (code) {
             if (include) {
               files.push(relative4(directories.root, path));
             }
-            await mkdir3(dirname8(path), { recursive: true });
-            await writeFile3(path, code);
+            await mkdir4(dirname9(path), { recursive: true });
+            await writeFile4(path, code);
           }
         }
       });
@@ -4601,7 +4673,7 @@ var generateTypes = async (props) => {
   );
   if (files.length) {
     const code = files.map((file) => `/// <reference path='${file}' />`).join("\n");
-    await writeFile3(join10(directories.root, `awsless.d.ts`), code);
+    await writeFile4(join11(directories.root, `awsless.d.ts`), code);
   }
 };
 
@@ -4727,8 +4799,53 @@ var dev = (program2) => {
   });
 };
 
+// src/cli/command/state/pull.ts
+var pull = (program2) => {
+  program2.command("pull").description("Pull the remote state and store it locally").action(async () => {
+    await layout("state pull", async ({ appConfig, stackConfigs }) => {
+      const region = appConfig.region;
+      const credentials = getCredentials(appConfig.profile);
+      const accountId = await getAccountId(credentials, region);
+      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const { stateProvider } = createWorkSpace({ credentials, region });
+      await pullRemoteState(app, stateProvider);
+      return "State pull was successful.";
+    });
+  });
+};
+
+// src/cli/command/state/push.ts
+import { confirm as confirm5 } from "@clack/prompts";
+var push = (program2) => {
+  program2.command("push").description("Push the local state to the remote server").action(async () => {
+    await layout("state pull", async ({ appConfig, stackConfigs }) => {
+      const region = appConfig.region;
+      const credentials = getCredentials(appConfig.profile);
+      const accountId = await getAccountId(credentials, region);
+      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const { stateProvider } = createWorkSpace({ credentials, region });
+      const ok = await confirm5({
+        message: "Pushing up the local state might corrupt your remote state. Are you sure?",
+        initialValue: false
+      });
+      if (!ok) {
+        throw new Cancelled();
+      }
+      await pushRemoteState(app, stateProvider);
+      return "State push was successful.";
+    });
+  });
+};
+
+// src/cli/command/state/index.ts
+var commands3 = [pull, push];
+var state = (program2) => {
+  const command = program2.command("state").description(`Manage app state`);
+  commands3.forEach((cb) => cb(command));
+};
+
 // src/cli/command/index.ts
-var commands3 = [
+var commands4 = [
   bootstrap,
   types,
   build2,
@@ -4737,6 +4854,7 @@ var commands3 = [
   del2,
   dev,
   // bind,
+  state,
   resource,
   config,
   test
@@ -4762,7 +4880,7 @@ program.on("option:skip-prompt", () => {
 program.on("option:no-cache", () => {
   process.env.NO_CACHE = program.opts().noCache ? "1" : void 0;
 });
-commands3.forEach((fn) => fn(program));
+commands4.forEach((fn) => fn(program));
 
 // src/bin.ts
 program.parse(process.argv);

package/dist/build-json-schema.js

@@ -42,6 +42,9 @@ var directories = {
   get cache() {
     return join(this.output, "cache");
   },
+  get state() {
+    return join(this.output, "state");
+  },
   get build() {
     return join(this.output, "build");
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.188",
+  "version": "0.0.190",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -30,8 +30,8 @@
   "peerDependencies": {
     "@awsless/redis": "^0.0.12",
     "@awsless/s3": "^0.0.10",
-    "@awsless/sns": "^0.0.7",
     "@awsless/lambda": "^0.0.18",
+    "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.13",
@@ -97,10 +97,10 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/duration": "^0.0.1",
+    "@awsless/formation": "^0.0.13",
     "@awsless/size": "^0.0.1",
-    "@awsless/formation": "^0.0.12",
-    "@awsless/graphql": "^0.0.9",
     "@awsless/validate": "^0.0.13",
+    "@awsless/graphql": "^0.0.9",
     "@awsless/code": "^0.0.10"
   },
   "scripts": {