@saws/cli 1.0.2 → 1.0.4

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@saws/cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "bin": {
     "saws": "./dist/bin/saws.js"
   },
+  "files": [
+    "./dist"
+  ],
   "keywords": [],
   "author": "",
   "license": "MIT",
@@ -12,12 +15,12 @@
     "commander": "^12.0.0",
     "esbuild": "^0.20.1",
     "find-package-json": "^1.2.0",
-    "@saws/utils": "^1.0.2",
-    "@saws/secrets": "^1.0.2"
+    "@saws/secrets": "^1.0.4",
+    "@saws/utils": "^1.0.4"
   },
   "devDependencies": {
     "@types/find-package-json": "^1.2.6",
-    "@saws/core": "^1.0.2"
+    "@saws/core": "^1.0.4"
   },
   "peerDependencies": {
     "@saws/core": ">=1.0.0"

package/bin/saws.ts

@@ -1,43 +0,0 @@
-#!/usr/bin/env node
-
-process.on("uncaughtException", (e) => {
-  console.log(e);
-});
-
-import { default as finder } from "find-package-json";
-import { program } from "commander";
-import { getSawsConfig } from "@saws/core";
-
-import { createCommand as createDevCommand } from "../src/commands/dev";
-import { createCommand as createDeployCommand } from "../src/commands/deploy";
-import { createCommand as createExecuteCommand } from "../src/commands/execute";
-import { createCommand as createInitCommand } from '../src/commands/init';
-
-const pkg = finder(__dirname).next().value;
-
-program
-  .name("saws")
-  .description("A tool for building apps quickly")
-  .version(pkg?.version!);
-
-program.addCommand(createDevCommand());
-program.addCommand(createDeployCommand());
-program.addCommand(createExecuteCommand());
-program.addCommand(createInitCommand());
-
-(async () => {
-  try {
-    const service = await getSawsConfig()
-
-    const allServices = [...new Set(service.getAllDependencies().map(service => service.constructor))]
-
-    for (const serviceClass of allServices) {
-      // @ts-expect-error Not all classes will define a getCommands static method
-      serviceClass.getCommands?.()?.forEach(command => program.addCommand(command))
-    }
-  } catch (_err) {
-    // It's possible for there not to be a saws.js file yet and thus this will fail
-  } finally {
-    program.parse(process.argv);
-  }
-})()

package/src/commands/deploy/command.ts

@@ -1,15 +0,0 @@
-import { createCacheDir } from "@saws/utils/create-directories";
-import { getSawsConfig } from "@saws/core";
-
-export const deployCommand = async (path: string, { stage }: { stage: string }) => {
-  if (stage === "local") {
-    console.warn("Can not deploy to local stage");
-    process.exit();
-  }
-
-  await createCacheDir();
-
-  const serviceDefinition = await getSawsConfig(path);
-
-  await serviceDefinition.deploy(stage);
-};

package/src/commands/deploy/index.ts

@@ -1,8 +0,0 @@
-import { Command } from "commander";
-import { deployCommand } from "./command";
-
-export const createCommand = () =>
-  new Command("deploy")
-    .option("--stage <string>", "stage to deploy")
-    .argument("[string]", "path to service definition")
-    .action(deployCommand);

package/src/commands/dev/command.ts

@@ -1,23 +0,0 @@
-import { createCacheDir } from "@saws/utils/create-directories";
-import { onProcessExit } from "@saws/utils/on-exit";
-import { getSawsConfig } from "@saws/core";
-
-export const devCommand = async (path: string) => {
-  process.env.NODE_ENV = "development";
-  process.env.STAGE = "local";
-  process.env.AWS_REGION = 'us-west-2';
-
-  await createCacheDir();
-
-  const serviceDefinition = await getSawsConfig(path);
-
-  onProcessExit(() => {
-    serviceDefinition.exit();
-  });
-
-  await serviceDefinition.dev();
-
-  serviceDefinition.forEachDependency(async (dependency) => {
-    dependency.getStdOut()?.pipe(process.stdout)
-  })
-};

package/src/commands/dev/index.ts

@@ -1,7 +0,0 @@
-import { Command } from "commander";
-import { devCommand } from "./command";
-
-export const createCommand = () =>
-  new Command("dev")
-    .argument("[string]", "path to service definition")
-    .action(devCommand);

package/src/commands/execute/command.ts

@@ -1,43 +0,0 @@
-import { getSawsConfig } from "@saws/core";
-import { BUILD_DIR } from "@saws/utils/constants";
-import { getStageOutputs } from "@saws/utils/stage-outputs";
-import { fork } from "child_process";
-import esbuild from "esbuild";
-import path from "path";
-
-export const executeCommand = async (
-  scriptPath: string,
-  sawsPath: string,
-  { stage = "local" }: { stage: string }
-) => {
-  process.env.STAGE = stage;
-
-  const serviceDefinition = await getSawsConfig(sawsPath);
-
-  const stageOutputs = await getStageOutputs(stage);
-  const services = serviceDefinition.getAllDependencies()
-  let environment: Record<string, string> = {
-    NODE_ENV: stage === "local" ? "development" : "production",
-    STAGE: stage,
-  }
-  for (const service of services) {
-    await service.setOutputs(stageOutputs[service.name], stage)
-    environment = {
-      ...environment,
-      ...await(service.getEnvironmentVariables(stage))
-    }
-  }
-
-  const outFile = path.join(BUILD_DIR, "script.js");
-
-  await esbuild.build({
-    entryPoints: [scriptPath],
-    bundle: true,
-    outfile: outFile,
-    platform: "node",
-  });
-
-  fork(outFile, {
-    env: environment,
-  })
-};

package/src/commands/execute/index.ts

@@ -1,9 +0,0 @@
-import { Command } from "commander";
-import { executeCommand } from "./command";
-
-export const createCommand = () =>
-  new Command("execute")
-    .option("--stage <string>", "Stage")
-    .argument("<string>", "The path to the script to execute")
-    .argument("[string]", "The path to the saws file")
-    .action(executeCommand);

package/src/commands/init/command.ts

@@ -1,18 +0,0 @@
-import path from 'node:path'
-import { installMissingDependencies } from '@saws/utils/dependency-management'
-import { tsconfigJsonTemplate } from './templates/tsconfig-json.template'
-import { sawsJsTemplate } from './templates/saws-js.template'
-import { createFileIfNotExists } from '@saws/utils/create-file-if-not-exists'
-import { gitignoreTemplate } from './templates/gitignore.template'
-
-export const initCommand = async () => {
-  const name = path.parse(path.resolve('.')).name
-
-  // not used for now
-  await installMissingDependencies([])
-  await installMissingDependencies(['@saws/core', 'typescript'], { development: true })
-  
-  createFileIfNotExists('./tsconfig.json', tsconfigJsonTemplate())
-  createFileIfNotExists('./saws.js', sawsJsTemplate({ name }))
-  createFileIfNotExists('./.gitignore', gitignoreTemplate())
-}

package/src/commands/init/index.ts

@@ -1,6 +0,0 @@
-import { Command } from "commander";
-import { initCommand } from "./command";
-
-export const createCommand = () =>
-  new Command("init")
-    .action(initCommand);

package/src/commands/init/templates/gitignore.template.ts

@@ -1,8 +0,0 @@
-export const gitignoreTemplate = () => `node_modules
-.saws/postgres
-.saws/cognito
-.saws/saws-*-local-output.json
-.saws/cache
-.saws/build
-.saws/.secrets
-.DS_Store`

package/src/commands/init/templates/saws-js.template.ts

@@ -1,7 +0,0 @@
-export const sawsJsTemplate = ({ name }: { name: string}) => `const { ServiceDefinition } = require('@saws/core')
-
-module.exports = new ServiceDefinition({
-  name: '${name}',
-  dependencies: []
-})
-`

package/src/commands/init/templates/tsconfig-json.template.ts

@@ -1,20 +0,0 @@
-export const tsconfigJsonTemplate = () => `{
-  "include": ["**/*.ts", "*.ts", "**/*.tsx", "global.d.ts"],
-  "exclude": [".saws", "node_modules"],
-  "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "jsx": "react-jsx",
-    "target": "ES2022",
-    "module": "Node16",
-    "resolveJsonModule": true,
-    "strict": true,
-    "allowJs": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "skipLibCheck": true
-  }
-}
-    
-`

package/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "include": ["bin/**/*", "src/**/*"],
-  "exclude": ["dist", "node_modules"],
-  "compilerOptions": {
-    "rootDir": ".",
-    "outDir": "./dist"
-  },
-  "references": [
-    { "path": "../secrets" },
-    { "path": "../utils" },
-    { "path": "../core" }
-  ]
-}