Changed code to upload schema onto lambda, made resolver template take in schema file as separate file instead of input, made template static by not accepting any input except the timestamp

Author: flora-jin

doc/todoExample.md

@@ -21,7 +21,7 @@ Let's now run this schema through the utility and create the GraphQL API in AWS
 
 `neptune-for-graphql --input-schema-file ./samples/todo.schema.graphql --create-update-aws-pipeline --create-update-aws-pipeline-name TodoExample --create-update-aws-pipeline-neptune-endpoint` <*your-neptune-database-endpoint:port*> ` --output-resolver-query-https`
 
-Te utility created a new file in the *output* folder called *TodoExample.source.graphql*, and the GraphQL API in AppSync. As you can see below, the utility inferenced:
+The utility created a new file in the *output* folder called *TodoExample.source.graphql*, and the GraphQL API in AppSync. As you can see below, the utility inferenced:
 
 - In the type *Todo* it added *@relationship* for a new type *CommentEdge*. This is instructing the resolver to connect *Todo* to *Comment* using a graph database edge called *CommentEdge*.
 - A new input called *TodoInput* was added to help the queries and the mutations.

src/main.js

@@ -519,11 +519,21 @@ async function main() {
         // Validate schema
         schemaModel = validatedSchemaModel(schemaModel, quiet);
 
+        // Generate schema for resolver
+        const queryDataModelJSON = JSON.stringify(schemaModel, null, 2);
+        let resolverSchemaFile = `${outputFolderPath}/resolver.schema.graphql`
+        try {
+            writeFileSync(resolverSchemaFile, queryDataModelJSON);
+            loggerInfo('Wrote schema for resolver to file: ' + yellow(resolverSchemaFile), {toConsole: true});
+        } catch (err) {
+            loggerError('Error writing schema for resolver to file: ' + yellow(resolverSchemaFile), err);
+        }
+
         // Generate AWS Lambda resolver for AppSync and Amazon Neptune        
-        outputLambdaResolver = resolverJS(schemaModel, queryLanguage, queryClient, __dirname);
+        outputLambdaResolver = resolverJS(queryLanguage, queryClient, __dirname);
 
         // Generate generic Javascript resolver
-        outputJSResolver = resolverJS(schemaModel, queryLanguage, queryClient, __dirname);
+        outputJSResolver = resolverJS(queryLanguage, queryClient, __dirname);
     }
 
     // ****************************************************************************

src/resolverJS.js

@@ -13,15 +13,13 @@ permissions and limitations under the License.
 import { readFileSync} from 'fs';
 import { loggerError } from "./logger.js";
 
-function resolverJS (schemaModel, queryLanguage, queryClient, __dirname) {
+function resolverJS (queryLanguage, queryClient, __dirname) {
     let code = '';
-    const queryDataModelJSON = JSON.stringify(schemaModel, null, 2);
 
     if (queryLanguage == 'opencypher') {
         try {
             code = readFileSync(__dirname + '/../templates/JSResolverOCHTTPSTemplate.js');
             code = code.toString().replace('TIMESTAMP HERE', (new Date()).toISOString());
-            code = code.toString().replace('INSERT SCHEMA DATA MODEL HERE', queryDataModelJSON);
         } catch (err) {
             loggerError('No resolver template found.', err);
         }

src/zipPackage.js

@@ -50,6 +50,11 @@ export async function createLambdaDeploymentPackage({outputZipFilePath, template
             source: path.join(getModulePath(), '/../templates/queryHttpNeptune.mjs')
         })
     }
+
+    filePaths.push({
+        source: path.join(getModulePath(), '/../output/resolver.schema.graphql')
+    })
+
     await createZip({
         targetZipFilePath: outputZipFilePath,
         includePaths: filePaths
@@ -81,7 +86,9 @@ export async function createApolloDeploymentPackage({zipFilePath, resolverFilePa
         includePaths: [
             {source: path.join(modulePath, '/../templates/ApolloServer')},
             {source: resolverFilePath, target: 'output.resolver.graphql.js'},
+            {source: resolverFilePath, target: 'resolver.schema.graphql'},
             {source: schemaFilePath, target: 'output.schema.graphql'},
+
             // querying neptune using SDK not yet supported
             {source: path.join(modulePath, '/../templates/queryHttpNeptune.mjs')}
         ],

templates/JSResolverOCHTTPSTemplate.js

@@ -12,13 +12,14 @@ permissions and limitations under the License.
 
 import { astFromValue, buildASTSchema, typeFromAST, GraphQLID, GraphQLInputObjectType } from 'graphql';
 import { gql } from 'graphql-tag'; // GraphQL library to parse the GraphQL query
+import {readFileSync} from "fs";
 
 const useCallSubquery = false;
 
 // TIMESTAMP HERE
 
-const schemaDataModelJSON = `INSERT SCHEMA DATA MODEL HERE`;
-    
+let schemaDataModelJSON = readFileSync('resolver.schema.graphql', 'utf-8');
+
 const schemaDataModel = JSON.parse(schemaDataModelJSON);
 
 const schema = buildASTSchema(schemaDataModel, { assumeValidSDL: true });