Fix tsquery due to typescript upgrade

Author: tsangste

tools/workspace-plugin/src/generators/handler/generator.spec.ts

@@ -31,8 +31,8 @@ describe('handler generator', () => {
     const serverlessConfig = tree.read(`stacks/${options.project}/serverless.ts`);
     const contents = serverlessConfig.toString()
 
-    const nodes = tsquery.query(contents, `Identifier[name=${options.name}] ~ ObjectLiteralExpression`)
-    expect(nodes).toHaveLength(1)
+    const nodes = tsquery.query(contents, `PropertyAssignment:has(Identifier[name=functions]) StringLiteral`)
+    expect(nodes).toHaveLength(2)
 
     expect(tree.exists(`stacks/${options.project}/src/${options.name}.handler.ts`)).toBeTruthy()
     expect(tree.exists(`stacks/${options.project}/src/${options.name}.handler.spec.ts`)).toBeTruthy()

tools/workspace-plugin/src/generators/handler/generator.ts

@@ -19,7 +19,7 @@ export async function handlerGenerator(
   generateFiles(tree, join(__dirname, '../shared-files/handle'), projectRoot, { ...options, fileName });
 
   const serverlessConfig = join(projectRoot, 'serverless.ts');
-  const newContent = tsquery.replace(tree.read(serverlessConfig).toString(), 'Identifier[name=functions] ~ ObjectLiteralExpression', node => {
+  const newContent = tsquery.replace(tree.read(serverlessConfig).toString(), 'PropertyAssignment:has(Identifier[name=functions]) ObjectLiteralExpression', node => {
     const propAst = factory.createPropertyAssignment(
       factory.createStringLiteral(options.name),
       factory.createObjectLiteralExpression(
@@ -39,7 +39,8 @@ export async function handlerGenerator(
     // Kinda hacky as we move into stringy stuff, but it works for what we need
     const content = node.getChildren()[1];
 
-    return `{${content.getFullText()}${print(propAst)}}`;
+    const fullText = content.getFullText()
+    return fullText.includes('{') ? `{${fullText}${print(propAst)}}` : node.getFullText();
   });
   tree.write(serverlessConfig, newContent);
 

tools/workspace-plugin/src/generators/stack/generator.spec.ts

@@ -32,7 +32,7 @@ describe('stack generator', () => {
     const serverlessConfig = tree.read(`stacks/${options.stack}/serverless.ts`);
     const contents = serverlessConfig.toString()
 
-    const nodes = tsquery.query(contents, `Identifier[name=${options.handler}] ~ ObjectLiteralExpression`)
+    const nodes = tsquery.query(contents, `PropertyAssignment:has(Identifier[name=${options.handler}]) StringLiteral`)
     expect(nodes).toHaveLength(1)
   });
 });