remove test runner workaround, fix TS config and reorganise test deps for direct compat with Tape

Author: pospi

src/index.ts

@@ -1,14 +1,16 @@
-import { AppEntryDef, EntryHash } from "@holochain/client";
+type AppEntryDef = import('@holochain/client').AppEntryDef;
+type EntryHash = import('@holochain/client').EntryHash;
+
+import { AppletConfig, AppletConfigInput, ConfigCulturalContext, ConfigMethod, ConfigResourceDef, ConfigThreshold, CreateAppletConfigInput, CulturalContext, Dimension, Method, Range, Threshold } from "@neighbourhoods/client"
+
 import { cleanAllConductors, pause, runScenario } from "@holochain/tryorama";
 //@ts-ignore
-import { AppletConfig, AppletConfigInput, ConfigCulturalContext, ConfigMethod, ConfigResourceDef, ConfigThreshold, CreateAppletConfigInput, CulturalContext, Dimension, Method, Range, Threshold } from "@neighbourhoods/client";
-import pkg from "tape-promise/tape";
+import test from "tape-promise/tape";
 
-import { setUpAliceandBob } from "./neighbourhood";
-const { test } = pkg;
+import { setUpAliceandBob } from "../utils";
 
 const app_entry_def: AppEntryDef = { entry_index: 0, zome_index: 0, visibility: { Public: null } };
-export default () =>
+
     test("test Sensemaker Configuration", async (t) => {
         await runScenario(async (scenario) => {
             const {
@@ -272,4 +274,3 @@ export default () =>
             await cleanAllConductors();
         });
     });
-

src/sensemaker_dna/sensemaker/applet_config.ts renamed to src/sensemaker_dna/applet_config.ts

@@ -1,12 +1,11 @@
 import { DnaSource, Record, ActionHash, EntryHash } from "@holochain/client";
 import { pause, runScenario, cleanAllConductors, createConductor, addAllAgentsToAllConductors } from "@holochain/tryorama";
 import { decode } from '@msgpack/msgpack';
-import pkg from 'tape-promise/tape';
-import { installAgent } from "../../utils";
+import test from "tape-promise/tape";
+import { installAgent } from "../utils";
 import { setUpAliceandBob } from "./neighbourhood";
-const { test } = pkg;
 
-export default () => test("test CA progenitor pattern", async (t) => {
+test("test CA progenitor pattern", async (t) => {
     await runScenario(async scenario => {
         const { alice, bob, alice_happs, bob_happs, alice_agent_key, bob_agent_key, ss_cell_id_alice, ss_cell_id_bob, provider_cell_id_alice, provider_cell_id_bob } = await setUpAliceandBob();
 

src/sensemaker_dna/sensemaker/community_activator.ts renamed to src/sensemaker_dna/community_activator.ts

@@ -10,9 +10,8 @@ import {
 import { decode } from "@msgpack/msgpack";
 import { AppletConfig, Assessment, AssessmentWithDimensionAndResource, CreateAppletConfigInput, CreateAssessmentInput, Method, RangeValueInteger } from "@neighbourhoods/client";
 import { ok } from "assert";
-import pkg from "tape-promise/tape";
-import { installAgent, sampleAppletConfig } from "../../utils";
-const { test } = pkg;
+import test from "tape-promise/tape";
+import { installAgent, sampleAppletConfig } from "../utils";
 
 interface TestPost {
   title: string;
@@ -64,7 +63,6 @@ export const setUpAliceandBob = async (
   };
 };
 
-export default () => {
   test("test fetching dashboard data", async (t) => {
     await runScenario(async (scenario) => {
       const {
@@ -312,5 +310,3 @@ export default () => {
       await cleanAllConductors();
     });
   });
-};
-

src/sensemaker_dna/sensemaker/dashboard.ts renamed to src/sensemaker_dna/dashboard.ts

@@ -1,4 +1,4 @@
-import { DnaSource, Record, ActionHash, EntryHash, EntryHashB64, encodeHashToBase64 } from "@holochain/client";
+import { Record, CellId, EntryHash, EntryHashB64, encodeHashToBase64 } from "@holochain/client";
 import {
   pause,
   runScenario,
@@ -10,56 +10,9 @@ import {
 import { decode } from "@msgpack/msgpack";
 import { Assessment, AssessmentWithDimensionAndResource, CreateAssessmentInput, Method, RangeValueInteger, ResourceEh, GetAssessmentsForResourceInput } from "@neighbourhoods/client";
 import { ok } from "assert";
-import pkg from "tape-promise/tape";
-import { installAgent } from "../../utils";
-const { test } = pkg;
-
-export const setUpAliceandBob = async (
-  with_config: boolean = false,
-  resource_base_type?: any
-) => {
-  const alice = await createConductor();
-  const bob = await createConductor();
-  const {
-    agentsHapps: alice_happs,
-    agent_key: alice_agent_key,
-    ss_cell_id: ss_cell_id_alice,
-    provider_cell_id: provider_cell_id_alice,
-  } = await installAgent(
-    alice,
-    "alice",
-    undefined,
-    with_config,
-    resource_base_type
-  );
-  const {
-    agentsHapps: bob_happs,
-    agent_key: bob_agent_key,
-    ss_cell_id: ss_cell_id_bob,
-    provider_cell_id: provider_cell_id_bob,
-  } = await installAgent(
-    bob,
-    "bob",
-    alice_agent_key,
-    with_config,
-    resource_base_type
-  );
-  await addAllAgentsToAllConductors([alice, bob]);
-  return {
-    alice,
-    bob,
-    alice_happs,
-    bob_happs,
-    alice_agent_key,
-    bob_agent_key,
-    ss_cell_id_alice,
-    ss_cell_id_bob,
-    provider_cell_id_alice,
-    provider_cell_id_bob,
-  };
-};
-
-export default () => {
+import test from "tape-promise/tape";
+import { setUpAliceandBob } from "../utils";
+
   test("SM entry type CRUD tests", async (t) => {
     await runScenario(async (scenario) => {
       const {
@@ -1261,7 +1214,7 @@ export default () => {
           author: alice_agent_key,
           timestamp: runMethodOutput.timestamp,
         };
-        
+
         t.deepEqual(
           objectiveAssessment,
           runMethodOutput
@@ -1276,4 +1229,3 @@ export default () => {
       await cleanAllConductors();
     });
   });
-};

src/sensemaker_dna/sensemaker/neighbourhood.ts renamed to src/sensemaker_dna/neighbourhood.ts

@@ -2,14 +2,13 @@
 import { DnaSource, Record, ActionHash, AppBundleSource, AppEntryDef, EntryHash } from "@holochain/client";
 import { cleanAllConductors, pause, runScenario } from "@holochain/tryorama";
 import { decode } from '@msgpack/msgpack';
-import pkg from 'tape-promise/tape';
-const { test } = pkg;
+import test from "tape-promise/tape";
 
-import { sensemakerDna } from "../../utils";
+import { sensemakerDna } from "../utils";
 import { setUpAliceandBob } from "./neighbourhood";
 
 const app_entry_def: AppEntryDef = { entry_index: 0, zome_index: 0, visibility: { Public: null } };
-export default () => test("range CRUD tests", async (t) => {
+test("range CRUD tests", async (t) => {
   await runScenario(async scenario => {
     const {
       alice,

src/sensemaker_dna/sensemaker/range.ts renamed to src/sensemaker_dna/range.ts

@@ -1,12 +1,11 @@
 import { DnaSource, Record, ActionHash, EntryHash, AppEntryDef, encodeHashToBase64 } from "@holochain/client";
 import { cleanAllConductors, pause, runScenario } from "@holochain/tryorama";
 import { decode } from "@msgpack/msgpack";
-import pkg from "tape-promise/tape";
+import test from "tape-promise/tape";
 import { setUpAliceandBob } from "./neighbourhood";
-const { test } = pkg;
 
 let app_entry_def: AppEntryDef = { entry_index: 0, zome_index: 0, visibility: { Public: null } };
-export default () =>
+
   test("test Sensemaker and Applet Configuration in DNA Property", async (t) => {
     await runScenario(async (scenario) => {
       const {
@@ -221,4 +220,3 @@ test("test updating of sensemaker config", async (t) => {
     await cleanAllConductors();
   });
 });
-

src/sensemaker_dna/sensemaker/sm_config.ts renamed to src/sensemaker_dna/sm_config.ts

@@ -3,12 +3,15 @@ import {
   AppInfo,
   InstallAppRequest,
   encodeHashToBase64,
+  CellId,
   CellInfo,
   ProvisionedCell,
   CellType
 } from "@holochain/client";
 import {
   Conductor,
+  createConductor,
+  addAllAgentsToAllConductors,
 } from "@holochain/tryorama";
 import { AppletConfigInput } from "@neighbourhoods/client";
 import path from "path";
@@ -26,6 +29,51 @@ export const testProviderDna = path.join(
   "../../dnas/test_provider/workdir/test_provider_dna.dna"
 );
 
+export const setUpAliceandBob = async (
+  with_config: boolean = false,
+  resource_base_type?: any
+) => {
+  const alice = await createConductor();
+  const bob = await createConductor();
+  const {
+    agentsHapps: alice_happs,
+    agent_key: alice_agent_key,
+    ss_cell_id: ss_cell_id_alice,
+    provider_cell_id: provider_cell_id_alice,
+  } = await installAgent(
+    alice,
+    "alice",
+    undefined,
+    with_config,
+    resource_base_type
+  );
+  const {
+    agentsHapps: bob_happs,
+    agent_key: bob_agent_key,
+    ss_cell_id: ss_cell_id_bob,
+    provider_cell_id: provider_cell_id_bob,
+  } = await installAgent(
+    bob,
+    "bob",
+    alice_agent_key,
+    with_config,
+    resource_base_type
+  );
+  await addAllAgentsToAllConductors([alice, bob]);
+  return {
+    alice,
+    bob,
+    alice_happs,
+    bob_happs,
+    alice_agent_key: alice_agent_key as Uint8Array,
+    bob_agent_key: bob_agent_key as Uint8Array,
+    ss_cell_id_alice: ss_cell_id_alice as CellId,
+    ss_cell_id_bob: ss_cell_id_bob as CellId,
+    provider_cell_id_alice: provider_cell_id_alice as CellId,
+    provider_cell_id_bob: provider_cell_id_bob as CellId,
+  };
+};
+
 export const installAgent = async (
   conductor: Conductor,
   agentName: string,
@@ -276,4 +324,4 @@ export const sampleAppletConfig = (resource_base_def: AppEntryDef) => {
     ],
   };
   return config;
-};
+};

src/utils.ts

@@ -3,15 +3,26 @@
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     /* Basic Options */
     "outDir": "dist",
-    "target": "ES2017",
-    "module": "ESNext",
+    "target": "ES2018",
+    "module": "esNext",
     "moduleResolution": "node",
+    "lib": ["es2017", "dom"],
+    "sourceMap": true,
     /* Strict Type-Checking Options */
     "strict": true /* Enable all strict type-checking options. */,
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    "allowSyntheticDefaultImports": true,
     "noImplicitAny": false /* Raise error on expressions and declarations with an implied 'any' type. */,
     /* Advanced Options */
     "skipLibCheck": true /* Skip type checking of declaration files. */,
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
-  }
+  },
+  "include": [
+    "src/**/*.ts",
+    "../client/src/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "../node_modules"
+  ]
 }