Port remaining tests and fix bugs

Author: daniel-chambers

ndc-lambda-sdk/.mocharc.json

@@ -5,6 +5,7 @@
     "test/**/*.test.ts"
   ],
   "watch-files": [
-    "src"
+    "src",
+    "test"
   ]
 }

ndc-lambda-sdk/package-lock.json

@@ -43,6 +43,8 @@
     "@types/chai": "^4.3.11",
     "@types/mocha": "^10.0.6",
     "chai": "^4.3.7",
-    "mocha": "^10.2.0"
+    "mocha": "^10.2.0",
+    "node-emoji": "^2.1.3",
+    "node-postgres": "^0.6.2"
   }
 }

ndc-lambda-sdk/package.json

@@ -95,7 +95,7 @@ function resolveArgumentValues(args: Record<string, sdk.Argument>, variableValue
   });
 }
 
-function prepareArguments(args: Record<string, unknown>, functionDefinition: schema.FunctionDefinition, objectTypes: schema.ObjectTypeDefinitions): unknown[] {
+export function prepareArguments(args: Record<string, unknown>, functionDefinition: schema.FunctionDefinition, objectTypes: schema.ObjectTypeDefinitions): unknown[] {
   return functionDefinition.arguments.map(argDef => coerceArgumentValue(args[argDef.argumentName], argDef.type, [argDef.argumentName], objectTypes));
 }
 

ndc-lambda-sdk/src/execution.ts

@@ -300,7 +300,7 @@ function deriveSchemaTypeIfNullableType(tsType: ts.Type, typePath: TypePathSegme
 function deriveSchemaTypeIfObjectType(tsType: ts.Type, typePath: TypePathSegment[], context: TypeDerivationContext, recursionDepth: number): Result<DerivedSchemaType, string[]> | undefined {
   const info = getObjectTypeInfo(tsType, typePath, context.typeChecker, context.functionsFilePath);
   if (info) {
-    // Shortcut recursion if the type has already been named
+    // Short-circuit recursion if the type has already been named
     if (context.objectTypeDefinitions[info.generatedTypeName]) {
       return new Ok({ typeDefinition: { type: 'named', name: info.generatedTypeName, kind: "object" }, warnings: [] });
     }
@@ -316,10 +316,14 @@ function deriveSchemaTypeIfObjectType(tsType: ts.Type, typePath: TypePathSegment
         });
     });
 
-    return propertyResults.map(properties => {
-      context.objectTypeDefinitions[info.generatedTypeName] = { properties }
-      return { typeDefinition: { type: 'named', name: info.generatedTypeName, kind: "object" }, warnings }
-    })
+    if (propertyResults instanceof Ok) {
+      context.objectTypeDefinitions[info.generatedTypeName] = { properties: propertyResults.data }
+      return new Ok({ typeDefinition: { type: 'named', name: info.generatedTypeName, kind: "object" }, warnings })
+    } else {
+      // Remove the recursion short-circuit to ensure errors are raised if this type is encountered again
+      delete context.objectTypeDefinitions[info.generatedTypeName];
+      return new Err(propertyResults.error);
+    }
   }
 }