fix more typings

Author: josephjclark

packages/project/test/canonical.test.ts

@@ -170,7 +170,7 @@ workflows:
         type: webhook
         enabled: true
         webhook_reply: before_start
-        webhook_response:
+        webhook_response_config:
           success_code: 202
           error_code: 500
         next: fetch

packages/project/test/fixtures/sample-v2-project.ts

@@ -27,6 +27,8 @@ export const json: SerializedProject = {
           name: 'b',
           id: 'b',
           configuration: 'admin@openfn.org|My Credential',
+          // TODO it's unclear why we have a type error here??
+          // @ts-ignore
           openfn: { uuid: 3 },
           expression: 'fn()',
           adaptor: 'common',
@@ -35,6 +37,8 @@ export const json: SerializedProject = {
           id: 'trigger',
           openfn: { uuid: 2 },
           type: 'webhook',
+          // TODO it's unclear why we have a type error here??
+          // @ts-ignore
           next: { b: { openfn: { uuid: 4 } } },
         },
       ],

packages/project/test/gen/generator.test.ts

@@ -176,7 +176,6 @@ test('it should generate a simple workflow with trailing space', (t) => {
 });
 
 test("it should fail if there's a space on an edge", (t) => {
-  const result = gen('a -b');
   t.throws(() => gen('a-'), {
     message: /parsing failed!/i,
   });
@@ -495,7 +494,7 @@ test('it should generate a node with two props', (t) => {
 
 test('it should treat quotes specially', (t) => {
   const result = gen('a(expression="fn()")-b', t);
-  const expected = _.cloneDeep(fixtures.ab);
+  const expected: any = _.cloneDeep(fixtures.ab);
   expected.steps[0].expression = 'fn()';
 
   t.deepEqual(result, expected);

packages/project/test/merge/merge-project.test.ts

@@ -855,7 +855,9 @@ test('options: onlyUpdated with 1 changed, 1 unchanged workflow', (t) => {
   ]);
 
   // Scribble on both workflows
+  // @ts-ignore
   target.workflows[0].jam = 'jar';
+  // @ts-ignore
   target.workflows[1].jam = 'jar';
 
   // change the source

packages/project/test/parse/from-app-state.test.ts

@@ -63,7 +63,7 @@ test('should create a Project from prov state with sandbox stuff', (t) => {
   };
   const project = fromAppState(stateWithSandbox, meta, { format: 'json' });
 
-  t.is(project.sandbox.parentId, 'abc');
+  t.is(project.sandbox!.parentId, 'abc');
   t.is(project.options.env, 'dev');
   t.is(project.options.color, 'red');
 });
@@ -81,14 +81,18 @@ test('should create a Project from prov state with positions', (t) => {
   // the provisioner right now doesn't include positions
   // - but one day it will, and Project needs to be able to sync it
   newState.workflows['my-workflow'].positions = {
-    x: 1,
-    y: 1,
+    step1: {
+      x: 1,
+      y: 1,
+    },
   };
   const project = fromAppState(newState, meta);
 
-  t.deepEqual(project.workflows[0].openfn.positions, {
-    x: 1,
-    y: 1,
+  t.deepEqual(project.workflows[0].openfn!.positions, {
+    step1: {
+      x: 1,
+      y: 1,
+    },
   });
 });
 
@@ -408,7 +412,7 @@ test('mapEdge: map conditions', (t) => {
 // TODO the workflow yaml is not a project yaml
 // so this test doesn't work
 // I'll need to pull the project yaml, with uuids, to get this to work
-test.skip('mapWorkflow: map edge conditions', (t) => {
+test.skip('mapWorkflow: map edge conditions', () => {
   // TODO for yaml like this:
   const yaml = `
 workflows:
@@ -460,12 +464,10 @@ workflows:
           condition_expression: state.ok == 22
 
 `;
-  const project = fromAppState(yaml, meta, {
+  fromAppState(yaml, meta, {
     format: 'yaml',
   });
-  console.log(project.workflows['my-workflow'].steps);
-  const { next } = project.workflows['my-workflow'].steps[1];
-  console.log({ next });
+  // const { next } = project.workflows['my-workflow'].steps[1];
   // make sure that the condition_types get mapped to condition
   // also make sure that custom conditions work (both ways)
 });

packages/project/test/parse/from-fs.test.ts

@@ -18,6 +18,7 @@ function mockFile(path: string, content: string | object) {
     content = JSON.stringify(content);
   }
 
+  // @ts-ignore
   files[path] = content;
   mock(files);
 }
@@ -55,12 +56,12 @@ test.serial('should include multiple workflows (legacy format)', async (t) => {
 
   t.is(project.workflows.length, 2);
 
-  const wf1 = project.getWorkflow('workflow-1');
+  const wf1 = project.getWorkflow('workflow-1')!;
   t.truthy(wf1);
   t.is(wf1.id, 'workflow-1');
   t.is(wf1.name, 'Workflow 1');
 
-  const wf2 = project.getWorkflow('workflow-2');
+  const wf2 = project.getWorkflow('workflow-2')!;
   t.truthy(wf2);
   t.is(wf2.id, 'workflow-2');
   t.is(wf2.name, 'Workflow 2');
@@ -85,7 +86,7 @@ test.serial('should load a workflow expression (legacy format)', async (t) => {
   const project = await parseProject({ root: '/ws' });
   t.is(project.workflows.length, 1);
 
-  const wf = project.getWorkflow('my-workflow');
+  const wf = project.getWorkflow('my-workflow')!;
 
   t.truthy(wf);
 
@@ -136,6 +137,7 @@ test.serial(
     t.is(project.workflows.length, 1);
     const [wf] = project.workflows;
 
+    // @ts-ignore
     t.is(typeof wf.steps[1].next.c, 'object');
   }
 );

packages/project/test/parse/from-project.test.ts

@@ -61,7 +61,7 @@ test('import from a v1 state as JSON', async (t) => {
   // make a few basic assertions about the project
   t.is(proj.id, 'my-workflow');
   t.is(proj.name, 'My Workflow');
-  t.is(proj.openfn.uuid, 'e16c5f09-f0cb-4ba7-a4c2-73fcb2f29d00');
+  t.is(proj.openfn!.uuid, 'e16c5f09-f0cb-4ba7-a4c2-73fcb2f29d00');
   t.is(proj.options.retention_policy, 'retain_all');
 
   t.is(proj.workflows.length, 1);
@@ -73,7 +73,7 @@ test('import from a v1 state as YAML', async (t) => {
   // make a few basic assertions about the project
   t.is(proj.id, 'aaa');
   t.is(proj.name, 'aaa');
-  t.is(proj.openfn.uuid, '1234');
+  t.is(proj.openfn!.uuid, '1234');
   t.is(proj.options.retention_policy, 'retain_all');
 
   t.is(proj.workflows.length, 1);
@@ -94,12 +94,13 @@ test('import a legacy v2 project (cli.version === 2) as JSON', async (t) => {
 });
 
 test('import from a v2 project as JSON', async (t) => {
+  // @ts-ignore
   const proj = await Project.from('project', v2.json, { alias: 'main' });
 
   t.is(proj.id, 'my-project');
   t.is(proj.name, 'My Project');
   t.is(proj.cli.alias, 'main');
-  t.is(proj.sandbox.parentId, 'abcd');
+  t.is(proj.sandbox!.parentId, 'abcd');
   t.is(proj.options.env, 'dev');
   t.is(proj.options.color, 'red');
   t.is(proj.openfn!.uuid, '1234');
@@ -153,6 +154,7 @@ test('import from a v2 project as JSON', async (t) => {
 });
 
 test('import from a v2 project with alias', async (t) => {
+  // @ts-ignore
   const proj = await Project.from('project', v2.json, { alias: 'staging' });
 
   t.is(proj.id, 'my-project');
@@ -167,7 +169,7 @@ test('import from a v2 project as YAML', async (t) => {
   t.is(proj.cli.alias, 'main');
   t.is(proj.openfn!.uuid, '1234');
   t.is(proj.openfn!.endpoint, 'https://app.openfn.org');
-  t.is(proj.sandbox.parentId, 'abcd');
+  t.is(proj.sandbox!.parentId, 'abcd');
   t.is(proj.options.env, 'dev');
   t.is(proj.options.color, 'red');
 

packages/project/test/project.test.ts

@@ -216,10 +216,10 @@ test('should merge two projects', (t) => {
   const result = Project.merge(staging, main);
 
   t.is(result.name, 'a');
-  const mergedStep = result.workflows[0].get('a');
+  const mergedStep: any = result.workflows[0].get('a');
 
   t.is(mergedStep.expression, 'b()');
-  t.is(mergedStep.openfn.uuid, wf_a.get('a').openfn.uuid);
+  t.is(mergedStep.openfn.uuid, wf_a.get('a').openfn!.uuid);
 });
 
 test('should return UUIDs for everything', async (t) => {

packages/project/test/serialize/to-fs.test.ts

@@ -58,6 +58,7 @@ test('extractWorkflow: single simple workflow with an edge', (t) => {
               id: 'step1',
               next: {
                 step2: {
+                  // @ts-ignore
                   condition: true,
                   openfn: {
                     // should be excluded!
@@ -121,6 +122,7 @@ test('extractWorkflow: single simple workflow with random edge property', (t) =>
           steps: [
             {
               ...step,
+              // @ts-ignore
               foo: 'bar',
             },
           ],
@@ -268,10 +270,11 @@ test('extractWorkflow: single simple workflow with custom root', (t) => {
         },
       ],
     },
+    // @ts-ignore
     config
   );
 
-  const { path, content } = extractWorkflow(project, 'my-workflow');
+  const { path } = extractWorkflow(project, 'my-workflow');
 
   t.is(path, 'openfn/wfs/my-workflow/my-workflow.json');
 });

packages/project/test/serialize/to-project.test.ts

@@ -1,11 +1,11 @@
 import * as l from '@openfn/lexicon';
 import test from 'ava';
 import { Project } from '../../src/Project';
-import generateWorkflow, { generateProject } from '../../src/gen/generator';
+import generateWorkflow from '../../src/gen/generator';
 
 import * as v2 from '../fixtures/sample-v2-project';
 
-const createProject = (props: Partial<l.Project> = {}) => {
+const createProject = (props: Partial<l.ProjectState> = {}) => {
   const proj = new Project({
     id: 'my-project',
     name: 'My Project',
@@ -86,7 +86,7 @@ test('should exclude null values in yaml', (t) => {
   });
 
   // force some null values into the workflow structure
-  proj.workflows[0].steps[1].openfn.keychain_credential_id = null;
+  proj.workflows[0].steps[1].openfn!.keychain_credential_id = null;
 
   const yaml = proj.serialize('project', { format: 'yaml' });
   t.deepEqual(yaml, v2.yaml);
@@ -95,7 +95,7 @@ test('should exclude null values in yaml', (t) => {
 test('should include sandboxy metadata', (t) => {
   const proj = createProject({});
 
-  const json = proj.serialize('project', { format: 'json' });
+  const json: any = proj.serialize('project', { format: 'json' });
 
   t.is(json.sandbox.parentId, 'abcd');
   t.is(json.options.env, 'dev');