ag-common 0.0.458 → 0.0.460

package/dist/api/helpers/index.d.ts

@@ -2,13 +2,13 @@ export * from './api';
 export * from './aws';
 export * from './cloudfront';
 export * from './dynamo';
-export * from './dynamoInfra';
 export * from './enforceDynamoProvisionCap';
 export * from './openApiHelpers';
 export * from './s3';
 export * from './ses';
 export * from './sqs';
 export * from './ssm';
+export * from './ssmInfra';
 export * from './sts';
 export * from './validateOpenApi';
 export * from './validations';

package/dist/api/helpers/index.js

@@ -18,13 +18,13 @@ __exportStar(require("./api"), exports);
 __exportStar(require("./aws"), exports);
 __exportStar(require("./cloudfront"), exports);
 __exportStar(require("./dynamo"), exports);
-__exportStar(require("./dynamoInfra"), exports);
 __exportStar(require("./enforceDynamoProvisionCap"), exports);
 __exportStar(require("./openApiHelpers"), exports);
 __exportStar(require("./s3"), exports);
 __exportStar(require("./ses"), exports);
 __exportStar(require("./sqs"), exports);
 __exportStar(require("./ssm"), exports);
+__exportStar(require("./ssmInfra"), exports);
 __exportStar(require("./sts"), exports);
 __exportStar(require("./validateOpenApi"), exports);
 __exportStar(require("./validations"), exports);

package/dist/api/helpers/openApiHelpers.js

@@ -52,8 +52,8 @@ const setupLambda = ({ lambdaConfig, pathV, verb, seenPermissions, authorizers,
         seenPermissions.default = true;
     }
     //
-    const readTables = (0, array_1.distinctBy)([...(((_a = def === null || def === void 0 ? void 0 : def.dynamo) === null || _a === void 0 ? void 0 : _a.reads) || []), ...(((_b = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _b === void 0 ? void 0 : _b.reads) || [])], (s) => s.shortName);
-    const writeTables = (0, array_1.distinctBy)([...(((_c = def === null || def === void 0 ? void 0 : def.dynamo) === null || _c === void 0 ? void 0 : _c.writes) || []), ...(((_d = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _d === void 0 ? void 0 : _d.writes) || [])], (s) => s.shortName);
+    const readTables = (0, array_1.distinctBy)([...(((_a = def === null || def === void 0 ? void 0 : def.dynamo) === null || _a === void 0 ? void 0 : _a.reads) || []), ...(((_b = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _b === void 0 ? void 0 : _b.reads) || [])], (s) => s.tableName);
+    const writeTables = (0, array_1.distinctBy)([...(((_c = def === null || def === void 0 ? void 0 : def.dynamo) === null || _c === void 0 ? void 0 : _c.writes) || []), ...(((_d = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _d === void 0 ? void 0 : _d.writes) || [])], (s) => s.tableName);
     const policies = [...(def.policies || []), ...((lp === null || lp === void 0 ? void 0 : lp.policies) || [])].filter(array_1.notEmpty);
     const layers = [...(def.layers || []), ...((lp === null || lp === void 0 ? void 0 : lp.layers) || [])].filter(array_1.notEmpty);
     const memory = (lp === null || lp === void 0 ? void 0 : lp.memory) || (def === null || def === void 0 ? void 0 : def.memory) || 128;
@@ -79,11 +79,7 @@ const setupLambda = ({ lambdaConfig, pathV, verb, seenPermissions, authorizers,
         ? undefined
         : authorizers === null || authorizers === void 0 ? void 0 : authorizers[authorizerName];
     const env = Object.assign(Object.assign({}, (def.env || {})), ((lp === null || lp === void 0 ? void 0 : lp.env) || {}));
-    const tables = [...readTables, ...writeTables];
     const environment = env;
-    Object.values(tables).forEach((v) => {
-        environment[v.shortName] = v.table.tableName;
-    });
     return {
         environment,
         readTables,
@@ -145,15 +141,12 @@ const openApiImpl = (p) => {
                 timeout: lc.timeout,
                 description: '(cdk)',
                 entry: entry,
-                bundling: {
-                    externalModules: ['aws-sdk', 'aws-lambda'],
-                },
                 reservedConcurrentExecutions: lc.reservedConcurrentExecutions,
                 logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.FIVE_DAYS,
                 layers: lc.layers,
             });
-            lc.readTables.forEach((t) => t.table.grantReadData(lambdaV));
-            lc.writeTables.forEach((t) => t.table.grantReadWriteData(lambdaV));
+            lc.readTables.forEach((t) => t.grantReadData(lambdaV));
+            lc.writeTables.forEach((t) => t.grantReadWriteData(lambdaV));
             lc.policies.forEach((p1) => lambdaV.addToRolePolicy(p1));
             //
             apiPath.addMethod(verb.toUpperCase(), new aws_cdk_lib_1.aws_apigateway.LambdaIntegration(lambdaV, {}), { authorizer: lc.authorizer });

package/dist/api/helpers/ssm.d.ts

@@ -15,6 +15,12 @@ export declare const loadSsmString: ({ stack, path, }: {
     /** eg `/${NODE_ENV}/${shortStackName}/service/key` */
     path: string;
 }) => string;
+/** load a string from ssm at synth time*/
+export declare const loadSsmStringSynth: ({ stack, path, }: {
+    stack: Stack;
+    /** eg `/${NODE_ENV}/${shortStackName}/service/key` */
+    path: string;
+}) => string;
 /** load a csv from ssm */
 export declare const loadSsmStringList: ({ stack, path, }: {
     stack: Stack;

package/dist/api/helpers/ssm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSsmStringList = exports.loadSsmString = exports.saveToSsm = void 0;
+exports.loadSsmStringList = exports.loadSsmStringSynth = exports.loadSsmString = exports.saveToSsm = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const base64_1 = require("../../common/helpers/string/base64");
 /**
@@ -21,6 +21,9 @@ exports.saveToSsm = saveToSsm;
 /** load a string from ssm */
 const loadSsmString = ({ stack, path, }) => aws_cdk_lib_1.aws_ssm.StringParameter.valueForStringParameter(stack, path);
 exports.loadSsmString = loadSsmString;
+/** load a string from ssm at synth time*/
+const loadSsmStringSynth = ({ stack, path, }) => aws_cdk_lib_1.aws_ssm.StringParameter.valueFromLookup(stack, path);
+exports.loadSsmStringSynth = loadSsmStringSynth;
 /** load a csv from ssm */
 const loadSsmStringList = ({ stack, path, }) => aws_cdk_lib_1.Fn.split(',', (0, exports.loadSsmString)({ stack, path }));
 exports.loadSsmStringList = loadSsmStringList;

package/dist/api/helpers/{dynamoInfra.d.ts → ssmInfra/dynamo.d.ts}

@@ -1,15 +1,13 @@
 import { aws_dynamodb as dynamodb, Stack } from 'aws-cdk-lib';
-import { IGeneratedDynamoData } from '../types';
 export declare const generateTableRef: ({ stack, baseKey, hasStream, hasGSI, }: {
     hasStream: boolean;
     hasGSI: boolean;
     stack: Stack;
     baseKey: string;
-}) => IGeneratedDynamoData;
-export declare const generateSSMParams: ({ stack, table, baseKey, gsi, shortName, }: {
+}) => dynamodb.ITable;
+export declare const generateDynamoSSMParams: ({ stack, table, baseKey, gsi, }: {
     stack: Stack;
     table: dynamodb.ITable;
     baseKey: string;
     gsi?: string[] | undefined;
-    shortName: string;
 }) => void;

package/dist/api/helpers/ssmInfra/dynamo.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateDynamoSSMParams = exports.generateTableRef = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const ssm_1 = require("../ssm");
+const generateTableRef = ({ stack, baseKey, hasStream, hasGSI, }) => {
+    const tableArn = (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/arn` });
+    const ret = aws_cdk_lib_1.aws_dynamodb.Table.fromTableAttributes(stack, baseKey, Object.assign(Object.assign({ tableArn }, (hasStream && {
+        tableStreamArn: (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/streamArn` }),
+    })), (hasGSI && {
+        globalIndexes: (0, ssm_1.loadSsmStringList)({ stack, path: `${baseKey}/gsi` }),
+    })));
+    return ret;
+};
+exports.generateTableRef = generateTableRef;
+const generateDynamoSSMParams = ({ stack, table, baseKey, gsi, }) => {
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/arn`, value: table.tableArn });
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/name`, value: table.tableName });
+    if (table.tableStreamArn) {
+        (0, ssm_1.saveToSsm)({
+            stack,
+            path: `${baseKey}/streamArn`,
+            value: table.tableStreamArn,
+        });
+    }
+    if (gsi && (gsi === null || gsi === void 0 ? void 0 : gsi.length) > 0) {
+        (0, ssm_1.saveToSsm)({
+            stack,
+            path: `${baseKey}/gsi`,
+            value: gsi.join(','),
+        });
+    }
+};
+exports.generateDynamoSSMParams = generateDynamoSSMParams;

package/dist/api/helpers/ssmInfra/index.d.ts

@@ -0,0 +1,3 @@
+export * from './dynamo';
+export * from './s3';
+export * from './sqs';

package/dist/api/helpers/ssmInfra/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./dynamo"), exports);
+__exportStar(require("./s3"), exports);
+__exportStar(require("./sqs"), exports);

package/dist/api/helpers/ssmInfra/s3.d.ts

@@ -0,0 +1,10 @@
+import { aws_s3 as s3, Stack } from 'aws-cdk-lib';
+export declare const generateS3SSMParams: ({ stack, bucket, baseKey, }: {
+    stack: Stack;
+    bucket: s3.IBucket;
+    baseKey: string;
+}) => void;
+export declare const generateBucketRef: ({ stack, baseKey, }: {
+    stack: Stack;
+    baseKey: string;
+}) => s3.IBucket;

package/dist/api/helpers/ssmInfra/s3.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateBucketRef = exports.generateS3SSMParams = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const ssm_1 = require("../ssm");
+const generateS3SSMParams = ({ stack, bucket, baseKey, }) => {
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/arn`, value: bucket.bucketArn });
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/name`, value: bucket.bucketName });
+};
+exports.generateS3SSMParams = generateS3SSMParams;
+const generateBucketRef = ({ stack, baseKey, }) => {
+    const bucketName = (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/name` });
+    return aws_cdk_lib_1.aws_s3.Bucket.fromBucketAttributes(stack, baseKey, {
+        bucketArn: (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/arn` }),
+        bucketName,
+    });
+};
+exports.generateBucketRef = generateBucketRef;

package/dist/api/helpers/ssmInfra/sqs.d.ts

@@ -0,0 +1,10 @@
+import { aws_sqs as sqs, Stack } from 'aws-cdk-lib';
+export declare const generateSqsSSMParams: ({ stack, queue, baseKey, }: {
+    stack: Stack;
+    queue: sqs.IQueue;
+    baseKey: string;
+}) => void;
+export declare const generateQueueRef: ({ stack, baseKey, }: {
+    stack: Stack;
+    baseKey: string;
+}) => sqs.IQueue;

package/dist/api/helpers/ssmInfra/sqs.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateQueueRef = exports.generateSqsSSMParams = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const ssm_1 = require("../ssm");
+const generateSqsSSMParams = ({ stack, queue, baseKey, }) => {
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/arn`, value: queue.queueArn });
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/name`, value: queue.queueName });
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/url`, value: queue.queueUrl });
+};
+exports.generateSqsSSMParams = generateSqsSSMParams;
+const generateQueueRef = ({ stack, baseKey, }) => {
+    const queueArn = (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/arn` });
+    return aws_cdk_lib_1.aws_sqs.Queue.fromQueueAttributes(stack, baseKey, {
+        queueArn,
+        queueName: (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/name` }),
+        queueUrl: (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/url` }),
+    });
+};
+exports.generateQueueRef = generateQueueRef;

package/dist/api/types/index.d.ts

@@ -13,14 +13,10 @@ export interface DYNAMOKEYS {
     PK3?: string;
     PK4?: string;
 }
-export interface IGeneratedDynamoData {
-    table: dynamodb.ITable;
-    shortName: string;
-}
 export interface ILambdaConfig {
     dynamo?: {
-        reads?: IGeneratedDynamoData[];
-        writes?: IGeneratedDynamoData[];
+        reads?: dynamodb.ITable[];
+        writes?: dynamodb.ITable[];
     };
     policies?: iam.PolicyStatement[];
     env?: Record<string, string>;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.458",
+  "version": "0.0.460",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -9,8 +9,8 @@
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "format": "npx eslint --ext .ts,.tsx ./src --fix && npx eslint --ext .ts,.tsx ./stories --fix",
-    "build": "rimraf dist && npm run lint && tsc",
-    "lint": "npx eslint --ext .ts,.tsx ./src",
+    "build": "rimraf dist && tsc -p tsconfig.build.json",
+    "lint": "npx eslint --ext .ts,.tsx .",
     "start": "cross-env BROWSER=none cross-env storybook dev -p 6006",
     "build-storybook": "storybook build -o docs --quiet"
   },

package/dist/api/helpers/dynamoInfra.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSSMParams = exports.generateTableRef = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const ssm_1 = require("./ssm");
-const generateTableRef = ({ stack, baseKey, hasStream, hasGSI, }) => {
-    const tableStreamArn = !hasStream
-        ? undefined
-        : (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/streamArn` });
-    const globalIndexes = !hasGSI
-        ? undefined
-        : (0, ssm_1.loadSsmStringList)({ stack, path: `${baseKey}/gsi` });
-    const shortName = aws_cdk_lib_1.aws_ssm.StringParameter.valueFromLookup(stack, `${baseKey}/shortName`);
-    const table = aws_cdk_lib_1.aws_dynamodb.Table.fromTableAttributes(stack, baseKey, {
-        tableArn: (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/arn` }),
-        tableStreamArn,
-        globalIndexes,
-    });
-    return {
-        shortName,
-        table,
-    };
-};
-exports.generateTableRef = generateTableRef;
-const generateSSMParams = ({ stack, table, baseKey, gsi, shortName, }) => {
-    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/arn`, value: table.tableArn });
-    if (table.tableStreamArn) {
-        (0, ssm_1.saveToSsm)({
-            stack,
-            path: `${baseKey}/streamArn`,
-            value: table.tableStreamArn,
-        });
-    }
-    if (gsi && (gsi === null || gsi === void 0 ? void 0 : gsi.length) > 0) {
-        (0, ssm_1.saveToSsm)({
-            stack,
-            path: `${baseKey}/gsi`,
-            value: gsi.join(','),
-        });
-    }
-    (0, ssm_1.saveToSsm)({
-        stack,
-        path: `${baseKey}/shortName`,
-        value: shortName,
-    });
-};
-exports.generateSSMParams = generateSSMParams;