@neurodevs/node-lsl 11.4.2 → 12.0.1

package/build/types.d.ts

@@ -1,8 +1,8 @@
 import { FuncObj, FieldType } from 'ffi-rs';
-import { CHANNEL_FORMATS } from './consts';
-import { LslInlet } from './modules/LslStreamInlet';
-import { LslOutlet } from './modules/LslStreamOutlet';
-export type StreamFixuture = LslOutlet | LslInlet;
+import { CHANNEL_FORMATS } from './consts.js';
+import { StreamInlet } from './impl/LslStreamInlet.js';
+import { StreamOutlet } from './impl/LslStreamOutlet.js';
+export type StreamFixuture = StreamOutlet | StreamInlet;
 export type ChannelFormat = (typeof CHANNEL_FORMATS)[number];
 export interface DurationMarker {
     name: string;
@@ -16,6 +16,7 @@ export interface Liblsl {
     pushSampleStringTimestamp(options: PushSampleStringTimestampOptions): void;
     destroyOutlet(options: DestroyOutletOptions): void;
     createInlet(options: CreateInletOptions): BoundInlet;
+    flushInlet(options: FlushInletOptions): void;
     destroyInlet(options: DestroyInletOptions): void;
     localClock(): number;
 }
@@ -62,6 +63,9 @@ export interface CreateInletOptions {
     chunkSize: number;
     maxBuffered: number;
 }
+export interface FlushInletOptions {
+    inlet: BoundInlet;
+}
 export interface DestroyInletOptions {
 }
 export interface LiblslBindings {
@@ -71,6 +75,7 @@ export interface LiblslBindings {
     lsl_push_sample_strt(args: [BoundOutlet, LslSample, number]): void;
     lsl_destroy_outlet(args: [BoundOutlet]): void;
     lsl_create_inlet(args: any): BoundInlet;
+    lsl_flush_inlet(args: [BoundInlet]): void;
     lsl_destroy_inlet(args: any): void;
     lsl_local_clock(args: []): number;
     lsl_get_desc(args: [BoundStreamInfo]): BoundDescription;

package/build/types.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/build/validations.js

@@ -1,20 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStringInArray = isStringInArray;
-exports.isGreaterThanOrEqualToZero = isGreaterThanOrEqualToZero;
-exports.isPositiveInteger = isPositiveInteger;
-exports.isPositiveIntegerOrZero = isPositiveIntegerOrZero;
-function isStringInArray(value, array) {
+export function isStringInArray(value, array) {
     return array.indexOf(value) !== -1;
 }
-function isGreaterThanOrEqualToZero(value) {
+export function isGreaterThanOrEqualToZero(value) {
     return value >= 0;
 }
-function isPositiveInteger(value) {
+export function isPositiveInteger(value) {
     //@ts-ignore
     return Number.isInteger(value) && value > 0;
 }
-function isPositiveIntegerOrZero(value) {
+export function isPositiveIntegerOrZero(value) {
     //@ts-ignore
     return Number.isInteger(value) && value >= 0;
 }

package/build/validations.js.map

@@ -1 +1 @@
-{"version":3,"file":"validations.js","sourceRoot":"","sources":["../src/validations.ts"],"names":[],"mappings":";;AAAA,0CAEC;AAED,gEAEC;AAED,8CAGC;AAED,0DAGC;AAhBD,SAAgB,eAAe,CAAC,KAAa,EAAE,KAAwB;IACnE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;AACtC,CAAC;AAED,SAAgB,0BAA0B,CAAC,KAAa;IACpD,OAAO,KAAK,IAAI,CAAC,CAAA;AACrB,CAAC;AAED,SAAgB,iBAAiB,CAAC,KAAa;IAC3C,YAAY;IACZ,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAA;AAC/C,CAAC;AAED,SAAgB,uBAAuB,CAAC,KAAa;IACjD,YAAY;IACZ,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;AAChD,CAAC"}
+{"version":3,"file":"validations.js","sourceRoot":"","sources":["../src/validations.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,KAAwB;IACnE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,KAAa;IACpD,OAAO,KAAK,IAAI,CAAC,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC3C,YAAY;IACZ,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAa;IACjD,YAAY;IACZ,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;AAChD,CAAC"}

package/package.json

@@ -1,12 +1,24 @@
 {
   "name": "@neurodevs/node-lsl",
-  "version": "11.4.2",
+  "version": "12.0.1",
   "description": "Lab Streaming Layer (LSL) bindings for Node",
-  "main": "build/index.js",
+  "type": "module",
+  "keywords": [
+    "nodejs",
+    "typescript",
+    "tdd"
+  ],
+  "license": "MIT",
+  "author": "Eric Yates <hello@ericthecurious.com>",
+  "homepage": "https://github.com/neurodevs/node-lsl",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/neurodevs/node-lsl.git"
   },
+  "bugs": {
+    "url": "https://github.com/neurodevs/node-lsl/issues"
+  },
+  "main": "build/index.js",
   "scripts": {
     "build.ci": "yarn run build.tsc && yarn run build.resolve-paths && yarn run lint",
     "build.dev": "yarn run build.tsc --sourceMap ; yarn run resolve-paths.lint",
@@ -38,10 +50,8 @@
     "ref-napi": "^3.0.3"
   },
   "devDependencies": {
-    "@sprucelabs/jest-json-reporter": "^8.0.542",
-    "@sprucelabs/resolve-path-aliases": "^2.0.516",
-    "@sprucelabs/test": "^9.0.59",
-    "@sprucelabs/test-utils": "^5.1.502",
+    "@neurodevs/generate-id": "^1.0.8",
+    "@neurodevs/node-tdd": "^0.1.2",
     "@types/ffi-napi": "^4.0.10",
     "@types/node": "^22.9.0",
     "chokidar-cli": "^3.0.0",
@@ -55,12 +65,6 @@
     "tsc-watch": "^6.2.1",
     "typescript": "^5.6.3"
   },
-  "skill": {
-    "namespace": "node-lsl",
-    "upgradeIgnoreList": [
-      "@sprucelabs/spruce-test-fixtures"
-    ]
-  },
   "jest": {
     "testRunner": "jest-circus/runner",
     "maxWorkers": 4,
@@ -78,5 +82,11 @@
     "moduleNameMapper": {
       "^#spruce/(.*)$": "<rootDir>/build/.spruce/$1"
     }
+  },
+  "skill": {
+    "namespace": "node-lsl",
+    "upgradeIgnoreList": [
+      "@sprucelabs/spruce-test-fixtures"
+    ]
   }
 }

package/src/__tests__/AbstractPackageTest.ts

@@ -0,0 +1,65 @@
+import generateId from '@neurodevs/generate-id'
+import AbstractModuleTest from '@neurodevs/node-tdd'
+
+import LiblslAdapter from '../impl/LiblslAdapter.js'
+import LslEventMarkerOutlet from '../impl/LslEventMarkerOutlet.js'
+import LslStreamInfo from '../impl/LslStreamInfo.js'
+import LslStreamInlet from '../impl/LslStreamInlet.js'
+
+import LslStreamOutlet from '../impl/LslStreamOutlet.js'
+import SpyEventMarkerOutlet from '../testDoubles/EventMarkerOutlet/SpyEventMarkerOutlet.js'
+import FakeLiblsl from '../testDoubles/Liblsl/FakeLiblsl.js'
+import FakeStreamInfo from '../testDoubles/StreamInfo/FakeStreamInfo.js'
+import SpyStreamInfo from '../testDoubles/StreamInfo/SpyStreamInfo.js'
+import { SpyStreamInlet } from '../testDoubles/StreamInlet/SpyStreamInlet.js'
+import FakeStreamOutlet from '../testDoubles/StreamOutlet/FakeStreamOutlet.js'
+
+export default class AbstractPackageTest extends AbstractModuleTest {
+    protected static fakeLiblsl: FakeLiblsl
+
+    protected static async beforeEach() {
+        await super.beforeEach()
+
+        this.setFakeLiblsl()
+    }
+
+    protected static setFakeLiblsl() {
+        this.fakeLiblsl = new FakeLiblsl()
+        LiblslAdapter.setInstance(this.fakeLiblsl)
+    }
+
+    protected static setSpyStreamInfo() {
+        LslStreamInfo.Class = SpyStreamInfo
+    }
+
+    protected static setFakeStreamInfo() {
+        LslStreamInfo.Class = FakeStreamInfo
+        FakeStreamInfo.resetTestDouble()
+    }
+
+    protected static setSpyStreamInlet() {
+        LslStreamInlet.Class = SpyStreamInlet
+    }
+
+    protected static setFakeStreamOutlet() {
+        LslStreamOutlet.Class = FakeStreamOutlet
+        FakeStreamOutlet.resetTestDouble()
+    }
+
+    protected static setSpyEventMarkerOutlet() {
+        LslEventMarkerOutlet.Class = SpyEventMarkerOutlet
+    }
+
+    protected static generateId() {
+        return generateId()
+    }
+
+    protected static readonly name_ = generateId()
+    protected static readonly type = generateId()
+    protected static readonly sourceId = generateId()
+    protected static readonly units = generateId()
+    protected static readonly channelNames = [generateId(), generateId()]
+    protected static readonly chunkSize = Math.floor(Math.random() * 100)
+    protected static readonly maxBuffered = Math.floor(Math.random() * 100)
+    protected static readonly sampleRate = Math.floor(Math.random() * 100)
+}

package/src/__tests__/{modules → impl}/LiblslAdapter.test.ts

@@ -1,8 +1,10 @@
 import { randomInt } from 'crypto'
-import { test, assert, generateId } from '@sprucelabs/test-utils'
+import generateId from '@neurodevs/generate-id'
+import { test, assert } from '@neurodevs/node-tdd'
 import { DataType, OpenParams } from 'ffi-rs'
-import LiblslAdapter from '../../modules/LiblslAdapter'
-import FakeLiblsl from '../../testDoubles/Liblsl/FakeLiblsl'
+
+import LiblslAdapter from '../../impl/LiblslAdapter.js'
+import FakeLiblsl from '../../testDoubles/Liblsl/FakeLiblsl.js'
 import {
     BoundChild,
     BoundDescription,
@@ -13,17 +15,17 @@ import {
     Liblsl,
     LiblslBindings,
     LslChannel,
-} from '../../types'
-import AbstractLslTest from '../AbstractLslTest'
+} from '../../types.js'
+import AbstractPackageTest from '../AbstractPackageTest.js'
 
-export default class LiblslAdapterTest extends AbstractLslTest {
-    private static lsl: Liblsl
+export default class LiblslAdapterTest extends AbstractPackageTest {
+    private static instance: Liblsl
     private static libraryPath?: string
     private static libraryOptions?: Record<string, any>
     private static fakeBindings: LiblslBindings
     private static fakeStreamInfo: BoundStreamInfo
     private static fakeOutlet: BoundOutlet
-    private static fakeInlet: BoundInlet
+    private static fakeInlet: BoundInlet = {}
     private static fakeDesc: BoundDescription
     private static fakeChildNamedChannels: BoundChild
     private static createStreamInfoParams?: any[]
@@ -31,6 +33,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
     private static createOutletParams?: any[]
     private static destroyOutletParams?: any[]
     private static createInletParams?: any[]
+    private static flushInletParams?: any[]
     private static destroyInletParams?: any[]
     private static localClockParams?: any[]
     private static pushSampleFloatTimestampParams?: any[]
@@ -85,7 +88,12 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         }
 
         LiblslAdapter.resetInstance()
-        this.lsl = LiblslAdapter.getInstance()
+        this.instance = LiblslAdapter.getInstance()
+    }
+
+    @test()
+    protected static async createsInstance() {
+        assert.isTruthy(this.instance, 'Failed to create instance!')
     }
 
     @test()
@@ -95,8 +103,6 @@ export default class LiblslAdapterTest extends AbstractLslTest {
 
         const err = assert.doesThrow(() => LiblslAdapter.getInstance())
 
-        debugger
-
         assert.isTrue(
             err.message.includes(this.generateFailedMessage()),
             'Did not receive the expected error!'
@@ -150,26 +156,6 @@ export default class LiblslAdapterTest extends AbstractLslTest {
                 retType: DataType.External,
                 paramsType: [DataType.External, DataType.I32, DataType.I32],
             },
-            lsl_destroy_outlet: {
-                library: 'lsl',
-                retType: DataType.Void,
-                paramsType: [DataType.External],
-            },
-            lsl_create_inlet: {
-                library: 'lsl',
-                retType: DataType.External,
-                paramsType: [DataType.External, DataType.I32, DataType.I32],
-            },
-            lsl_destroy_inlet: {
-                library: 'lsl',
-                retType: DataType.Void,
-                paramsType: [DataType.External],
-            },
-            lsl_local_clock: {
-                library: 'lsl',
-                retType: DataType.Double,
-                paramsType: [],
-            },
             lsl_push_sample_ft: {
                 library: 'lsl',
                 retType: DataType.Void,
@@ -188,6 +174,26 @@ export default class LiblslAdapterTest extends AbstractLslTest {
                     DataType.Double,
                 ],
             },
+            lsl_destroy_outlet: {
+                library: 'lsl',
+                retType: DataType.Void,
+                paramsType: [DataType.External],
+            },
+            lsl_create_inlet: {
+                library: 'lsl',
+                retType: DataType.External,
+                paramsType: [DataType.External, DataType.I32, DataType.I32],
+            },
+            lsl_flush_inlet: {
+                library: 'lsl',
+                retType: DataType.I32,
+                paramsType: [DataType.External],
+            },
+            lsl_destroy_inlet: {
+                library: 'lsl',
+                retType: DataType.Void,
+                paramsType: [DataType.External],
+            },
             lsl_get_desc: {
                 library: 'lsl',
                 retType: DataType.External,
@@ -207,13 +213,18 @@ export default class LiblslAdapterTest extends AbstractLslTest {
                     DataType.String,
                 ],
             },
+            lsl_local_clock: {
+                library: 'lsl',
+                retType: DataType.Double,
+                paramsType: [],
+            },
         })
     }
 
     @test()
     protected static async canCreateStreamInfoWithRequiredParams() {
         const options = this.generateRandomCreateStreamInfoOptions()
-        const actual = this.lsl.createStreamInfo(options)
+        const actual = this.instance.createStreamInfo(options)
 
         assert.isEqual(actual, this.fakeStreamInfo)
         assert.isEqualDeep(this.createStreamInfoParams, Object.values(options))
@@ -235,7 +246,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
             sample: expected,
             timestamp,
         }
-        this.lsl.pushSampleFloatTimestamp(options)
+        this.instance.pushSampleFloatTimestamp(options)
 
         assert.isEqualDeep(this.pushSampleFloatTimestampParams, [
             this.fakeOutlet,
@@ -253,7 +264,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
             sample: expected,
             timestamp,
         }
-        this.lsl.pushSampleStringTimestamp(options)
+        this.instance.pushSampleStringTimestamp(options)
         assert.isEqual(
             this.pushSampleStringTimestampParams?.[0],
             this.fakeOutlet
@@ -267,7 +278,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         const info = this.createRandomStreamInfo()
         const channel: LslChannel = this.generateRandomChannelValues()
 
-        this.lsl.appendChannelsToStreamInfo({
+        this.instance.appendChannelsToStreamInfo({
             info,
             channels: [channel],
         })
@@ -304,7 +315,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         const channel1 = this.generateRandomChannelValues()
         const channel2 = this.generateRandomChannelValues()
 
-        this.lsl.appendChannelsToStreamInfo({
+        this.instance.appendChannelsToStreamInfo({
             info,
             channels: [channel1, channel2],
         })
@@ -324,23 +335,23 @@ export default class LiblslAdapterTest extends AbstractLslTest {
     protected static async canDestroyOutlet() {
         const outlet = this.createRandomOutlet()
         const options = { outlet }
-        this.lsl.destroyOutlet(options)
+        this.instance.destroyOutlet(options)
 
         assert.isEqualDeep(this.destroyOutletParams, Object.values(options))
     }
 
     @test()
     protected static async callingLocalClockTwiceReturnsDifferentTimestamps() {
-        const t1 = this.lsl.localClock()
+        const t1 = this.instance.localClock()
         await this.wait(10)
-        const t2 = this.lsl.localClock()
+        const t2 = this.instance.localClock()
         assert.isNotEqual(t1, t2)
     }
 
     @test()
     protected static async localClockBindingReceivesEmptyArray() {
         delete this.localClockParams
-        this.lsl.localClock()
+        this.instance.localClock()
         assert.isEqualDeep(this.localClockParams, [])
     }
 
@@ -349,7 +360,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         delete process.env.LIBLSL_PATH
 
         LiblslAdapter.resetInstance()
-        this.lsl = LiblslAdapter.getInstance()
+        this.instance = LiblslAdapter.getInstance()
 
         assert.isEqual(
             this.ffiRsOpenOptions?.path,
@@ -364,21 +375,33 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         assert.isEqual(inlet, this.fakeInlet)
     }
 
+    @test()
+    protected static async flushInletCallsBinding() {
+        const { inlet } = this.createRandomInlet()
+        this.instance.flushInlet({ inlet })
+
+        assert.isEqualDeep(
+            this.flushInletParams,
+            [inlet],
+            'Should have called flushInlet with expected params!'
+        )
+    }
+
     private static createRandomStreamInfo() {
-        return this.lsl.createStreamInfo(
+        return this.instance.createStreamInfo(
             this.generateRandomCreateStreamInfoOptions()
         )
     }
 
     private static createRandomOutlet() {
         const options = this.createRandomOptions()
-        const outlet = this.lsl.createOutlet(options)
+        const outlet = this.instance.createOutlet(options)
         return { options, outlet }
     }
 
     private static createRandomInlet() {
         const options = this.createRandomOptions()
-        const inlet = this.lsl.createInlet(options)
+        const inlet = this.instance.createInlet(options)
         return { options, inlet }
     }
 
@@ -438,6 +461,10 @@ export default class LiblslAdapterTest extends AbstractLslTest {
                 this.createInletParams = params
                 return this.fakeInlet
             },
+            lsl_flush_inlet: (params: any[]) => {
+                this.flushInletParams = params
+                return 0
+            },
             lsl_destroy_inlet: (params: any[]) => {
                 this.destroyInletParams = params
             },

package/src/__tests__/{modules/EventMarkerOutlet.test.ts → impl/LslEventMarkerOutlet.test.ts}

@@ -1,28 +1,35 @@
 import { randomInt } from 'crypto'
-import { assert, generateId, test } from '@sprucelabs/test-utils'
-import EventMarkerOutlet from '../../modules/EventMarkerOutlet'
-import { LslOutletOptions } from '../../modules/LslStreamOutlet'
-import generateRandomOutletOptions from '../../testDoubles/generateRandomOutletOptions'
-import FakeLslOutlet from '../../testDoubles/LslOutlet/FakeLslOutlet'
-import SpyMarkerOutlet from '../../testDoubles/MarkerOutlet/SpyMarkerOutlet'
-import AbstractLslTest from '../AbstractLslTest'
+import generateId from '@neurodevs/generate-id'
+import { assert, test } from '@neurodevs/node-tdd'
 
-export default class EventMarkerOutletTest extends AbstractLslTest {
-    private static instance: SpyMarkerOutlet
+import LslEventMarkerOutlet from '../../impl/LslEventMarkerOutlet.js'
+import { StreamOutletOptions } from '../../impl/LslStreamOutlet.js'
+import SpyEventMarkerOutlet from '../../testDoubles/EventMarkerOutlet/SpyEventMarkerOutlet.js'
+import generateRandomOutletOptions from '../../testDoubles/generateRandomOutletOptions.js'
+import FakeStreamOutlet from '../../testDoubles/StreamOutlet/FakeStreamOutlet.js'
+import AbstractPackageTest from '../AbstractPackageTest.js'
+
+export default class EventMarkerOutletTest extends AbstractPackageTest {
+    private static instance: SpyEventMarkerOutlet
 
     protected static async beforeEach() {
         await super.beforeEach()
 
         this.setFakeLiblsl()
-        this.setFakeLslOutlet()
-        this.setSpyMarkerOutlet()
+        this.setFakeStreamOutlet()
+        this.setSpyEventMarkerOutlet()
 
-        this.instance = await this.EventMarkerOutlet()
+        this.instance = await this.LslEventMarkerOutlet()
+    }
+
+    @test()
+    protected static async createsInstance() {
+        assert.isTruthy(this.instance, 'Failed to create instance!')
     }
 
     @test()
     protected static async loadsWithEventMarkerSpecificOptions() {
-        assert.isEqualDeep(FakeLslOutlet.callsToConstructor[0].options, {
+        assert.isEqualDeep(FakeStreamOutlet.callsToConstructor[0].options, {
             name: 'Event markers',
             type: 'Markers',
             channelNames: ['Markers'],
@@ -39,9 +46,12 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
     @test()
     protected static async canOverrideDefaultOptions() {
         const options = generateRandomOutletOptions()
-        await this.EventMarkerOutlet(options)
+        await this.LslEventMarkerOutlet(options)
 
-        assert.isEqualDeep(FakeLslOutlet.callsToConstructor[1].options, options)
+        assert.isEqualDeep(
+            FakeStreamOutlet.callsToConstructor[1].options,
+            options
+        )
     }
 
     @test()
@@ -52,7 +62,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         const marker = markers[0]
 
         assert.isEqual(
-            FakeLslOutlet.callsToPushSample[0][0],
+            FakeStreamOutlet.callsToPushSample[0][0],
             marker.name,
             'Pushed the wrong marker!'
         )
@@ -64,7 +74,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
     protected static async pushingTwoMarkersIncrementsHitCountAndWaitTimeTwice() {
         const markers = await this.pushTotalMarkers(2)
 
-        assert.isEqual(FakeLslOutlet.callsToPushSample.length, 2)
+        assert.isEqual(FakeStreamOutlet.callsToPushSample.length, 2)
 
         assert.isEqual(
             this.instance.totalWaitTimeMs,
@@ -78,7 +88,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
     protected static async canStopEventMarkersMidPush(bailIdx: number) {
         let hitCount = 0
 
-        const outlet = this.instance.getLslOutlet()
+        const outlet = this.instance.getStreamOutlet()
 
         outlet.pushSample = () => {
             hitCount += 1
@@ -98,7 +108,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
 
         let hitCount = 0
 
-        const outlet = this.instance.getLslOutlet()
+        const outlet = this.instance.getStreamOutlet()
 
         outlet.pushSample = () => {
             hitCount++
@@ -127,7 +137,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         void this.pushTotalMarkers(2, 100)
         this.instance.stop()
 
-        this.lslOutlet.pushSample = () =>
+        this.streamOutlet.pushSample = () =>
             assert.fail('Should not have been called')
     }
 
@@ -136,16 +146,16 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         const markerName = generateId()
         this.instance.pushMarker(markerName)
 
-        assert.isEqual(FakeLslOutlet.callsToPushSample[0][0], markerName)
+        assert.isEqual(FakeStreamOutlet.callsToPushSample[0][0], markerName)
     }
 
-    private static get lslOutlet() {
-        return this.instance.getLslOutlet()
+    private static get streamOutlet() {
+        return this.instance.getStreamOutlet()
     }
 
     private static async setupOutlet() {
-        EventMarkerOutlet.Class = EventMarkerOutlet as any
-        this.instance = await this.EventMarkerOutlet()
+        LslEventMarkerOutlet.Class = LslEventMarkerOutlet as any
+        this.instance = await this.LslEventMarkerOutlet()
     }
 
     private static async pushTotalMarkers(total: number, durationMs?: number) {
@@ -165,9 +175,11 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         }
     }
 
-    private static async EventMarkerOutlet(
-        options?: Partial<LslOutletOptions>
+    private static async LslEventMarkerOutlet(
+        options?: Partial<StreamOutletOptions>
     ) {
-        return (await EventMarkerOutlet.Create(options)) as SpyMarkerOutlet
+        return (await LslEventMarkerOutlet.Create(
+            options
+        )) as SpyEventMarkerOutlet
     }
 }

package/src/__tests__/{modules → impl}/LslStreamInfo.test.ts

@@ -1,10 +1,12 @@
-import { test, assert, generateId } from '@sprucelabs/test-utils'
-import { CHANNEL_FORMATS } from '../../consts'
-import LslStreamInfo, { StreamInfoOptions } from '../../modules/LslStreamInfo'
-import SpyStreamInfo from '../../testDoubles/StreamInfo/SpyStreamInfo'
-import AbstractLslTest from '../AbstractLslTest'
+import generateId from '@neurodevs/generate-id'
+import { test, assert } from '@neurodevs/node-tdd'
 
-export default class LslStreamInfoTest extends AbstractLslTest {
+import { CHANNEL_FORMATS } from '../../consts.js'
+import LslStreamInfo, { StreamInfoOptions } from '../../impl/LslStreamInfo.js'
+import SpyStreamInfo from '../../testDoubles/StreamInfo/SpyStreamInfo.js'
+import AbstractPackageTest from '../AbstractPackageTest.js'
+
+export default class LslStreamInfoTest extends AbstractPackageTest {
     private static instance: SpyStreamInfo
 
     protected static async beforeEach() {
@@ -16,8 +18,8 @@ export default class LslStreamInfoTest extends AbstractLslTest {
     }
 
     @test()
-    protected static async canCreateLslStreamInfo() {
-        assert.isTruthy(this.instance, 'Instance should be created!')
+    protected static async createsInstance() {
+        assert.isTruthy(this.instance, 'Failed to create instance!')
     }
 
     @test()