Merge pull request #10 from beforeyoubid/feature/cleanup

code cleanup
beforeyoubid · Feb 15, 2021 · d460d4a · d460d4a
2 parents 59e7868 + a5c707b
commit d460d4a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beforeyoubid/serverless-step-functions-offline",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Serverlesss plugin to support step function offline",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/__tests__/index.test.ts b/src/__tests__/index.test.ts
@@ -86,8 +86,8 @@ describe('index.js', () => {
   describe('#findState', () => {
     it('should throw err - serverless.yml not exists', () => {
       // stepFunctionsOfflinePlugin.serverless.config = process.cwd() + '/serverless.test.yml';
-      expect(stepFunctionsOfflinePlugin.hooks[global['hooks'].findState]).toThrowError(
-        'Could not find serverless manifest'
+      stepFunctionsOfflinePlugin.hooks[global['hooks'].findState]().catch(e =>
+        expect(e.message).toEqual('Could not find serverless manifest')
       );
     });
 

diff --git a/src/index.ts b/src/index.ts
@@ -203,7 +203,7 @@ export default class StepFunctionsOfflinePlugin implements Plugin {
       });
   }
 
-  getRawConfig(): Promise<any> {
+  async getRawConfig(): Promise<ServerlessWithError['service']> {
     const serverlessPath = this.serverless.config.servicePath;
     if (!serverlessPath) {
       throw new this.serverless.classes.Error('Could not find serverless manifest');
@@ -220,9 +220,15 @@ export default class StepFunctionsOfflinePlugin implements Plugin {
         `Could not find serverless manifest at path ${serverlessPath}. If this path is incorreect you should adjust the 'servicePath' variable`
       );
     }
-
+    let fromFile: ServerlessWithError['service'];
     if (/\.json|\.js$/.test(manifestFilename)) {
-      return import(manifestFilename);
+      try {
+        fromFile = await import(manifestFilename);
+        return fromFile;
+      } catch (err) {
+        console.error(err);
+        throw new Error(`Unable to import manifest at: ${manifestFilename}`);
+      }
     }
 
     return this.serverless.yamlParser.parse(manifestFilename);
@@ -288,7 +294,7 @@ export default class StepFunctionsOfflinePlugin implements Plugin {
     return { handler: handlerName, filePath };
   }
 
-  buildStepWorkFlow(): ReturnType<StepFunctionsOfflinePlugin['process']> {
+  async buildStepWorkFlow(): Promise<ReturnType<StepFunctionsOfflinePlugin['process']>> {
     this.cliLog('Building StepWorkFlow');
     if (!this.stateDefinition) throw new Error('Missing state definition');
     const event = this.loadedEventFile ?? {};
@@ -359,7 +365,7 @@ export default class StepFunctionsOfflinePlugin implements Plugin {
     if (contextObject) {
       if (func instanceof Promise) {
         return func.then(async mod => {
-          if (!mod) return;
+          if (!mod) return contextObject.done(null, {});
           let res;
           let err;
           try {