chore: @functionless/aws, util, aws-util (#540)

BREAKING CHANGE: move fl-exp/interface to @functionless/aws

apps/fl-exp-simple/package.json

@@ -14,12 +14,13 @@
   "devDependencies": {
     "@aws-cdk/aws-appsync-alpha": "2.44.0-alpha.0",
     "@functionless/ast-reflection": "^0.3.1",
+    "@functionless/aws": "*",
     "@functionless/aws-constructs": "*",
     "@functionless/fl-exp": "*",
     "@functionless/language-service": "^0.0.4",
     "@functionless/register": "*",
     "@types/jest": "^29.0.3",
-    "@types/node": "^18.7.18",
+    "@types/node": "^16",
     "@types/uuid": "^8.3.4",
     "aws-cdk-lib": "2.44.0",
     "aws-cdk": "2.44.0",

apps/fl-exp-simple/src/api/_api.ts

@@ -1,3 +1,3 @@
-import { RestApi } from "@functionless/fl-exp";
+import { RestApi } from "@functionless/aws";
 
 export default RestApi();

apps/fl-exp-simple/src/api/todos/[todoId]/delete-todo.ts

@@ -1,4 +1,4 @@
-import { Method, PathParam, LambdaFunction } from "@functionless/fl-exp";
+import { Method, PathParam, LambdaFunction } from "@functionless/aws";
 // BUG: Uncomment this and this line and `putEvents` call bellow
 //      to trigger the function serializer error.
 // import Events from "../event-bus";

apps/fl-exp-simple/src/api/todos/create-todo.ts

@@ -1,4 +1,4 @@
-import { LambdaFunction, Method } from "@functionless/fl-exp";
+import { LambdaFunction, Method } from "@functionless/aws";
 import * as uuid from "uuid";
 import MyDatabase from "../../table";
 

apps/fl-exp-simple/src/api/todos/list-todos.ts

@@ -1,4 +1,4 @@
-import { LambdaFunction, Method } from "@functionless/fl-exp";
+import { LambdaFunction, Method } from "@functionless/aws";
 
 import { MyDatabase } from "../../table";
 

apps/fl-exp-simple/src/table.ts

@@ -1,5 +1,5 @@
 import type { AttributeType, BillingMode } from "aws-cdk-lib/aws-dynamodb";
-import { Table } from "@functionless/fl-exp";
+import { Table } from "@functionless/aws";
 
 interface TableItem<T extends string> {
   pk: T;

apps/fl-exp-simple/src/useless-machine.ts

@@ -1,4 +1,4 @@
-import { StepFunction } from "@functionless/fl-exp";
+import { StepFunction } from "@functionless/aws";
 
 import MyDatabase from "./table";
 

apps/test-app/package.json

@@ -16,7 +16,7 @@
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript-resolvers": "^2.6.1",
     "@graphql-codegen/typescript": "^2.4.8",
-    "@types/node": "^14",
+    "@types/node": "^16",
     "aws-cdk-lib": "^2.44.0",
     "aws-cdk": "^2.44.0",
     "constructs": "10.0.0",

packages/@functionless/aws-constructs/package.json

@@ -36,7 +36,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.0.3",
     "@types/minimatch": "^3.0.5",
-    "@types/node": "^14",
+    "@types/node": "^16",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",

packages/@functionless/aws-util/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "@functionless/aws-util",
+  "version": "0.0.0",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "build": "tsc -b",
+    "typecheck": "tsc --noEmit"
+  },
+  "peerDependencies": {
+    "aws-sdk": "^2"
+  },
+  "devDependencies": {
+    "typescript": "^4.8.3",
+    "aws-sdk": "^2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
+}

packages/@functionless/aws-util/src/index.ts

@@ -0,0 +1 @@
+export * from "./credentials";

packages/@functionless/aws-util/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../../tsconfig-base",
+  "compilerOptions": {
+    "outDir": "lib",
+    "declaration": true,
+    "inlineSourceMap": true,
+    "rootDir": "src"
+  },
+  "include": ["src"],
+  "exclude": ["lib", "node_modules"]
+}

packages/@functionless/aws/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "@functionless/aws",
+  "version": "0.0.0",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "build": "tsc --build",
+    "typecheck": "tsc --noEmit",
+    "dev": "tsc --watch"
+  },
+  "dependencies": {
+    "typesafe-dynamodb": "^0.2.3",
+    "@functionless/aws-constructs": "*",
+    "@functionless/aws-util": "*",
+    "@functionless/util": "*"
+  },
+  "devDependencies": {
+    "typescript": "^4.8.3"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}

packages/@functionless/fl-exp/src/interface/client.ts → packages/@functionless/aws/src/client.ts

@@ -1,7 +1,7 @@
 import STS from "aws-sdk/clients/sts";
 import type { Credentials, CredentialsOptions } from "aws-sdk/lib/credentials";
-import { getClientProps } from "../credentials";
-import { memoize } from "../memoize";
+import { getClientProps } from "@functionless/aws-util";
+import { memoize } from "@functionless/util";
 
 export function createClientFactory<
   ClientClass extends new (props: {

packages/@functionless/fl-exp/src/interface/lambda-function.ts → packages/@functionless/aws/src/lambda-function.ts

@@ -1,7 +1,6 @@
 import type * as functionless from "@functionless/aws-constructs";
-import { memoize } from "../memoize";
 import Lambda from "aws-sdk/clients/lambda";
-import { getEnvironmentVariableName } from "../util";
+import { memoize, getEnvironmentVariableName } from "@functionless/util";
 
 export type FunctionHandler<In = any, Out = any> = (input: In) => Promise<Out>;
 

packages/@functionless/fl-exp/src/interface/step-function.ts → packages/@functionless/aws/src/step-function.ts

@@ -1,6 +1,6 @@
 import StepFunctions from "aws-sdk/clients/stepfunctions";
 import type * as functionless from "@functionless/aws-constructs";
-import { getEnvironmentVariableName } from "../util";
+import { getEnvironmentVariableName } from "@functionless/util";
 import { createClientFactory } from "./client";
 
 const stepFunctionClient = createClientFactory(StepFunctions);

packages/@functionless/fl-exp/src/interface/table.ts → packages/@functionless/aws/src/table.ts

@@ -5,7 +5,7 @@ import { AttributeType } from "./table/attribute-type";
 import { TableAttributesApi, TableDocumentApi } from "./table/runtime";
 import DynamoDB from "aws-sdk/clients/dynamodb";
 import { DocumentClient } from "aws-sdk/clients/dynamodb";
-import { getEnvironmentVariableName } from "../util";
+import { getEnvironmentVariableName } from "@functionless/util";
 import { createClientFactory } from "./client";
 
 export const TableKind = "fl.Table";

packages/@functionless/aws/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig-base.json",
+  "compilerOptions": {
+    "outDir": "lib",
+    "declaration": true,
+    "inlineSourceMap": true,
+    "rootDir": "src"
+  },
+  "include": ["src"],
+  "exclude": ["lib", "test", "node_modules"],
+  "references": [
+    { "path": "../aws-constructs" },
+    { "path": "../aws-util" },
+    { "path": "../util" }
+  ]
+}

packages/@functionless/fl-exp/package.json

@@ -12,6 +12,7 @@
   ],
   "scripts": {
     "build": "tsc --build",
+    "typecheck": "tsc --noEmit",
     "deploy": "cdk deploy",
     "synth": "cdk synth",
     "test": "jest --passWithNoTests",
@@ -23,6 +24,9 @@
     "@babel/plugin-transform-typescript": "^7.19.3",
     "@functionless/ast-reflection": "^0.3.1",
     "@functionless/aws-constructs": "^0.25.0",
+    "@functionless/aws": "*",
+    "@functionless/aws-util": "*",
+    "@functionless/util": "*",
     "@types/aws-lambda": "^8.10.106",
     "commander": "^9.4.0",
     "dependency-tree": "^8.1.2",
@@ -31,16 +35,16 @@
     "toposort": "^2.0.2"
   },
   "devDependencies": {
-    "@aws-cdk/aws-appsync-alpha": "2.44.0-alpha.0",
     "@aws-sdk/client-dynamodb": "*",
+    "@aws-cdk/aws-appsync-alpha": "2.44.0-alpha.0",
     "@functionless/language-service": "^0.0.4",
     "@swc/jest": "^0.2.22",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.0.3",
-    "@types/node": "^18.7.18",
+    "@types/node": "^16",
     "@types/toposort": "^2.0.3",
-    "aws-cdk": "2.44.0",
     "aws-cdk-lib": "2.44.0",
+    "aws-cdk": "2.44.0",
     "aws-sdk": "^2",
     "constructs": "10.0.0",
     "esbuild": "0.15.9",

packages/@functionless/fl-exp/src/commands/resource/api-method.ts

@@ -1,5 +1,5 @@
 import { registerCommand } from "../../command-provider";
-import { MethodKind } from "../../interface/method";
+import { MethodKind } from "@functionless/aws";
 import { invokeLambda } from "./lambda-function";
 import { openConsole } from "./open-console";
 import { invokeExpressStepFunction } from "./express-step-function";

packages/@functionless/fl-exp/src/commands/resource/express-step-function.ts

@@ -1,8 +1,8 @@
 import { StackResourceDetail } from "aws-sdk/clients/cloudformation";
 import StepFunctions from "aws-sdk/clients/stepfunctions";
 import { registerCommand } from "../../command-provider";
-import { getClientProps } from "../../credentials";
-import { ExpressStepFunctionKind } from "../../interface/express-step-function";
+import { getClientProps } from "@functionless/aws-util";
+import { ExpressStepFunctionKind } from "@functionless/aws";
 import { openConsole } from "./open-console";
 
 registerCommand({

packages/@functionless/fl-exp/src/commands/resource/lambda-function.ts

@@ -1,10 +1,10 @@
 import { registerCommand } from "../../command-provider";
 import Lambda from "aws-sdk/clients/lambda";
 import Logs from "aws-sdk/clients/cloudwatchlogs";
-import { LambdaFunctionKind } from "../../interface/lambda-function";
+import { LambdaFunctionKind } from "@functionless/aws";
 import { promisify } from "util";
 import { StackResourceDetail } from "aws-sdk/clients/cloudformation";
-import { getClientProps } from "../../credentials";
+import { getClientProps } from "@functionless/aws-util";
 import { openConsole } from "./open-console";
 
 export async function invokeLambda(

packages/@functionless/fl-exp/src/commands/resource/step-function.ts

@@ -1,8 +1,8 @@
 import { StackResourceDetail } from "aws-sdk/clients/cloudformation";
 import StepFunctions from "aws-sdk/clients/stepfunctions";
 import { registerCommand } from "../../command-provider";
-import { getClientProps } from "../../credentials";
-import { StepFunctionKind } from "../../interface/step-function";
+import { getClientProps } from "@functionless/aws-util";
+import { StepFunctionKind } from "@functionless/aws";
 import { openConsole } from "./open-console";
 
 registerCommand({

packages/@functionless/fl-exp/src/index.ts

@@ -1 +1 @@
-export * from "./interface";
+export * from "./load-project";

packages/@functionless/fl-exp/src/load-project.ts

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs/promises";
-import { isResource } from "./interface";
+import { isResource } from "@functionless/aws";
 import { exists, ls } from "./util";
 import { Folder, FolderProps } from "./tree/folder";
 import { Project } from "./project";

packages/@functionless/fl-exp/src/local-serve-project.ts

@@ -9,7 +9,7 @@ import {
   LambdaFunction,
   Resource,
   StepFunction,
-} from "./interface";
+} from "@functionless/aws";
 import { Project } from "./project";
 import type {
   APIGatewayProxyEventQueryStringParameters,
@@ -25,8 +25,8 @@ import StepFunctions from "aws-sdk/clients/stepfunctions";
 import STS from "aws-sdk/clients/sts";
 import IAM from "aws-sdk/clients/iam";
 import { isStepFunction } from "@functionless/aws-constructs";
-import { getClientProps } from "./credentials";
-import { getEnvironmentVariableName } from "./util";
+import { getClientProps } from "@functionless/aws-util";
+import { getEnvironmentVariableName } from "@functionless/util";
 import { Tree } from "./tree/tree";
 import { isFile } from "./tree/file";
 

packages/@functionless/fl-exp/src/logical-id.ts

@@ -1,6 +1,6 @@
 import CloudFormation from "aws-sdk/clients/cloudformation";
 import crypto from "crypto";
-import { getClientProps } from "./credentials";
+import { getClientProps } from "@functionless/aws-util";
 
 export async function resolveStackDetail(stackName: string, logicalId: string) {
   const cfnClient = new CloudFormation(getClientProps());

packages/@functionless/fl-exp/src/plugin.ts

@@ -3,7 +3,7 @@ import * as babel from "@babel/core";
 import fs from "fs/promises";
 import path from "path";
 import { Project } from "./project";
-import { isResource } from "./interface";
+import { isResource } from "@functionless/aws";
 
 const babel_ts = require("@babel/plugin-transform-typescript");
 

packages/@functionless/fl-exp/src/project.ts

@@ -1,4 +1,4 @@
-import { Resource } from "./interface";
+import { Resource } from "@functionless/aws";
 import { isFile, File } from "./tree/file";
 import { Folder } from "./tree/folder";
 import { Tree } from "./tree/tree";

packages/@functionless/fl-exp/src/synthesize.ts

@@ -22,7 +22,7 @@ import {
   LambdaFunction,
   LambdaFunctionKind,
   StepFunction,
-} from "./interface";
+} from "@functionless/aws";
 import {
   ASL,
   FunctionlessNode,
@@ -35,7 +35,7 @@ import * as functionless from "@functionless/aws-constructs";
 import { forEachChild } from "@functionless/aws-constructs/lib/visit";
 import { logicalIdForPath } from "./logical-id";
 import { bundleLambdaFunction, getBundleOutFolder } from "./bundle-lambda";
-import { getEnvironmentVariableName } from "./util";
+import { getEnvironmentVariableName } from "@functionless/util";
 import { Tree } from "./tree/tree";
 import { isFile, File } from "./tree/file";
 import { isFolder } from "./tree/folder";

packages/@functionless/fl-exp/src/tree/file.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import { Resource } from "../interface";
+import { Resource } from "@functionless/aws";
 import { Project } from "../project";
 import { Folder } from "./folder";
 

packages/@functionless/fl-exp/src/util.ts

@@ -14,7 +14,3 @@ export async function exists(file: string): Promise<boolean> {
 export async function ls(dir: string): Promise<string[]> {
   return (await fs.readdir(dir)).map((file) => path.resolve(dir, file));
 }
-
-export function getEnvironmentVariableName(resourceId: string): string {
-  return resourceId.replaceAll(/[^A-Za-z_0-9]/g, "_");
-}

packages/@functionless/util/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@functionless/util",
+  "version": "0.0.0",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "build": "tsc -b",
+    "typecheck": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@types/node": "^16",
+    "typescript": "^4.8.3"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
+}

packages/@functionless/util/src/environment-variable.ts

@@ -0,0 +1,3 @@
+export function getEnvironmentVariableName(resourceId: string): string {
+  return resourceId.replaceAll(/[^A-Za-z_0-9]/g, "_");
+}

packages/@functionless/util/src/index.ts

@@ -0,0 +1,2 @@
+export * from "./environment-variable";
+export * from "./memoize";

packages/@functionless/util/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../../tsconfig-base",
+  "compilerOptions": {
+    "outDir": "lib",
+    "declaration": true,
+    "inlineSourceMap": true,
+    "rootDir": "src"
+  },
+  "include": ["src"],
+  "exclude": ["lib", "node_modules"]
+}