fix(types): resolve type errors after typescript upgrade

src/__nonpublished_modules__/sql-show-create-ddl/src/generic/recursivelyHeavilyNormalizeViewDdl/normalizations/lowercaseEverythingAfterFirstAs.ts

@@ -3,7 +3,7 @@
  */
 export const lowercaseEverythingAfterFirstAs = ({ ddl }: { ddl: string }) => {
   const casedAsDdlParts = ddl.split(' AS ');
-  const casedDdl = [casedAsDdlParts[0], casedAsDdlParts[1].toLowerCase()].join(
+  const casedDdl = [casedAsDdlParts[0], casedAsDdlParts[1]!.toLowerCase()].join(
     ' AS ',
   );
   return casedDdl;

src/__nonpublished_modules__/sql-show-create-ddl/src/generic/recursivelyHeavilyNormalizeViewDdl/normalizations/removeParenthesisFromWhereConditions.ts

@@ -5,7 +5,7 @@ export const removeParenthesisFromWhereConditions = ({
   flattenedSql,
 }: {
   flattenedSql: string;
-}) => {
+}): string => {
   const whereCasing = !!flattenedSql.match(/\sWHERE\s/) ? 'WHERE' : 'where'; // determine if user is using upper case or lower case "where"
   const sqlSplitOnWhere = flattenedSql.split(whereCasing);
   if (sqlSplitOnWhere.length > 2) {
@@ -16,11 +16,11 @@ export const removeParenthesisFromWhereConditions = ({
   }
   const sqlWithoutParens =
     sqlSplitOnWhere.length === 2
-      ? sqlSplitOnWhere[0] +
+      ? sqlSplitOnWhere[0]! +
         '\n' +
         whereCasing +
         '\n' +
-        sqlSplitOnWhere[1].replace(/[\(\)]/g, '') // tslint:disable-line prefer-template
-      : sqlSplitOnWhere[0]; // if no where clause, then nothing to replace
+        sqlSplitOnWhere[1]!.replace(/[\(\)]/g, '') // tslint:disable-line prefer-template
+      : sqlSplitOnWhere[0]!; // if no where clause, then nothing to replace
   return sqlWithoutParens;
 };

src/__nonpublished_modules__/sql-show-create-ddl/src/generic/recursivelyHeavilyNormalizeViewDdl/normalizations/removeParenthesisSurroundingJoinsInFromClause.ts

@@ -21,7 +21,7 @@ export const removeParenthesisSurroundingJoinsInFromClause = ({
     ); // fail fast
 
   // remove the parens that encapsulate each join
-  const fromClauseWithoutParens = flattenedSqlParts[1]
+  const fromClauseWithoutParens = flattenedSqlParts[1]!
     .replace(/\(/g, '')
     .replace(/\)/g, ''); // note: we replace all parens, since subqueries are taken care of
 

src/__nonpublished_modules__/sql-show-create-ddl/src/postgres/normalizeCreateDdl/function/normalizeCreateFunctionDdl.ts

@@ -20,7 +20,7 @@ export const normalizeCreateFunctionDdl = ({ ddl }: { ddl: string }) => {
   prettierDdl = (() => {
     const partsSplitOnParens = prettierDdl.split(/([\(\)])/g);
     const functionParams = partsSplitOnParens[2];
-    const functionParamsWithNewlines = `\n  ${functionParams
+    const functionParamsWithNewlines = `\n  ${functionParams!
       .replace(/, /g, ',\n  ')
       .trim()}\n`;
     return [

src/__nonpublished_modules__/sql-subquery-tokenizer/breakSqlIntoNestedSqlArraysAtParentheses.test.ts

@@ -12,7 +12,7 @@ describe('breakSqlIntoNestedSqlArraysAtParentheses', () => {
     const sql = "SELECT CONCAT('hel', 'lo');";
     const nestedSqlArray = breakSqlIntoNestedSqlArraysAtParentheses({ sql });
     expect(nestedSqlArray).toHaveLength(3);
-    expect(nestedSqlArray[1][0][0]).toEqual('(');
-    expect(nestedSqlArray[1][0].slice(-1)[0]).toEqual(')');
+    expect(nestedSqlArray[1]![0]![0]).toEqual('(');
+    expect(nestedSqlArray[1]![0]!.slice(-1)[0]).toEqual(')');
   });
 });

src/__nonpublished_modules__/sql-subquery-tokenizer/extractAndTokenizeSubqueryReferencesInArrayOfSqlStrings.test.ts

@@ -34,7 +34,7 @@ FROM ice_cream s
 
     // should have got the reference
     expect(references.length).toEqual(1);
-    expect(references[0].sql).toEqual(sqlParts[1]);
+    expect(references[0]!.sql).toEqual(sqlParts[1]);
 
     // it should have replaced the sql in the referenced sql parts for the subquery
     expect(referencedSqlParts[1]).toMatch(/__SSQ:[\w-]+__/);

src/__nonpublished_modules__/sql-subquery-tokenizer/extractAndTokenizeSubqueryReferencesInArrayOfSqlStrings.ts

@@ -1,5 +1,4 @@
-import uuid from 'uuid';
-
+import { uuid } from '../../deps';
 import { getTokenForSqlSubqueryReference } from './getTokenForSubqueryReference';
 import { SqlSubqueryReference } from './model/SqlSubqueryReference';
 

src/logic/commands/displayPlans/displayPlans.test.ts

@@ -1,8 +1,8 @@
 import Chalk from 'chalk';
 import sha256 from 'simple-sha256';
 import { stdout } from 'stdout-stderr';
-import uuid from 'uuid/v4';
 
+import { uuid } from '../../../deps';
 import {
   ChangeDefinition,
   DefinitionPlan,

src/logic/config/getConfig/readConfig/validateAndHydrateDefinitionsYmlContents/hydrateResourceDefinitionContent/extractResourceTypeAndNameFromDDL.ts

@@ -39,7 +39,7 @@ export const extractResourceTypeAndNameFromDDL = ({ ddl }: { ddl: string }) => {
   const type = regexTypeMatchToTypeEnum[regexTypeMatch];
 
   // extract the name
-  const name = extractionMatches[2];
+  const name = extractionMatches[2]!;
 
   // return type and name
   return {

src/logic/plan/applyPlan/applyPlanForChange.integration.test.ts

@@ -1,7 +1,7 @@
 import sha256 from 'simple-sha256';
-import uuid from 'uuid/v4';
 
 import { promiseConfig } from '../../../__test_assets__/connection.config';
+import { uuid } from '../../../deps';
 import {
   ChangeDefinition,
   DefinitionPlan,

src/logic/plan/getPlanForDefinition.test.ts

@@ -1,6 +1,6 @@
 import sha256 from 'simple-sha256';
-import uuid from 'uuid/v4';
 
+import { uuid } from '../../deps';
 import {
   ChangeDefinition,
   ChangeDefinitionStatus,

src/logic/schema/changeDefinition/getAppliedChangeDefinitionFromDatabase/getAppliedChangeDefinitionFromDatabase.integration.test.ts

@@ -1,7 +1,7 @@
 import sha256 from 'simple-sha256';
-import uuid from 'uuid/v4';
 
 import { promiseConfig } from '../../../../__test_assets__/connection.config';
+import { uuid } from '../../../../deps';
 import {
   ChangeDefinition,
   ControlConfig,

src/logic/schema/changeDefinition/getDifferenceForChangeDefinition/getDifferenceForChangeDefinition.integration.test.ts

@@ -1,7 +1,7 @@
 import sha256 from 'simple-sha256';
-import uuid from 'uuid/v4';
 
 import { promiseConfig } from '../../../../__test_assets__/connection.config';
+import { uuid } from '../../../../deps';
 import {
   DatabaseLanguage,
   DatabaseConnection,

src/logic/schema/changeDefinition/getStatusForChangeDefinition/getStatusForChangeDefinition.integration.test.ts

@@ -1,7 +1,7 @@
 import sha256 from 'simple-sha256';
-import uuid from 'uuid/v4';
 
 import { promiseConfig } from '../../../../__test_assets__/connection.config';
+import { uuid } from '../../../../deps';
 import {
   ChangeDefinition,
   ChangeDefinitionStatus,

src/logic/schema/changeDefinition/syncChangelogWithChangeDefinition/syncChangeLogWithChangeDefinition.integration.test.ts

@@ -1,7 +1,7 @@
 import sha256 from 'simple-sha256';
-import uuid from 'uuid/v4';
 
 import { promiseConfig } from '../../../../__test_assets__/connection.config';
+import { uuid } from '../../../../deps';
 import {
   ChangeDefinition,
   DatabaseConnection,

src/logic/schema/getReferenceIdForDefinition.test.ts

@@ -1,5 +1,6 @@
 import sha256 from 'simple-sha256';
 
+import { uuid } from '../../deps';
 import {
   ChangeDefinition,
   ChangeDefinitionStatus,
@@ -8,8 +9,6 @@ import {
 } from '../../types';
 import { getReferenceIdForDefinition } from './getReferenceIdForDefinition';
 
-import uuid = require('uuid');
-
 describe('getReferenceIdForDefinition', () => {
   it('should accurately define the plan id for a change definition', async () => {
     const definition = new ChangeDefinition({

src/logic/schema/getStatusForDefinition.test.ts

@@ -1,6 +1,6 @@
 import sha256 from 'simple-sha256';
-import uuid from 'uuid/v4';
 
+import { uuid } from '../../deps';
 import {
   ChangeDefinition,
   ResourceDefinition,

src/logic/schema/resourceDefinition/getUncontrolledResources/getUncontrolledResources.test.ts

@@ -51,7 +51,7 @@ describe('getUncontrolledResources', () => {
       controlledResources,
     });
     expect(uncontrolledResources.length).toEqual(1);
-    expect(uncontrolledResources[0].name).toEqual(liveResource.name);
+    expect(uncontrolledResources[0]!.name).toEqual(liveResource.name);
   });
   it('should find that a resource in pullResources that does exist in liveResource is controlled', async () => {
     const liveResource = new ResourceDefinition({
@@ -73,7 +73,7 @@ describe('getUncontrolledResources', () => {
       connection: '__CONNECTION__' as any,
       controlledResources: [] as any,
     });
-    uncontrolledResources.map((uncontrolledResource) =>
+    uncontrolledResources.map(uncontrolledResource =>
       expect(uncontrolledResource.status).toEqual(
         ResourceDefinitionStatus.NOT_CONTROLLED,
       ),
@@ -91,7 +91,7 @@ describe('getUncontrolledResources', () => {
       connection: '__CONNECTION__' as any,
       controlledResources: [] as any,
     });
-    uncontrolledResources.map((uncontrolledResource) =>
+    uncontrolledResources.map(uncontrolledResource =>
       expect(uncontrolledResource.path).toEqual(
         `${liveResource.type.toLowerCase()}:${liveResource.name}`,
       ),

src/types/objects/DefinitionPlan.ts

@@ -1,4 +1,4 @@
-import Joi from 'joi';
+import Joi, { SchemaLikeWithoutArray } from 'joi';
 import SchematicJoiModel from 'schematic-joi-model';
 
 import { RequiredAction } from '../constants';
@@ -10,7 +10,7 @@ const definitionPlanSchema = Joi.object().keys({
   definition: Joi.alternatives().try([
     ChangeDefinition.schema,
     ResourceDefinition.schema,
-  ]),
+  ] as any as SchemaLikeWithoutArray),
   difference: Joi.string().optional(), // a human readable string of the difference
   action: Joi.string().valid(Object.values(RequiredAction)), // a key that catogorizes how to display the definition (e.g., color it, bold it, warn about it, throw an error)
 });