fix: Correct typing exports by taking a simpler exporting approach (#29)

webJose · web-flow · commit 526996a7374b · 2025-09-23T21:55:48.000-06:00
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -10,7 +10,7 @@
 			},
 			"problemMatcher": [],
 			"label": "npm: build",
-			"detail": "pwsh -Command \"npx tsc && copy src/workers.d.ts dist/\""
+			"detail": "Build package"
 		}
 	]
 }
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "scripts": {
-    "build": "pwsh -Command \"npx tsc && copy src/workers.d.ts dist/\"",
+    "build": "npx tsc",
     "postbuild": "publint",
     "deploy-pages": "cd ./pages && npm run deploy-pages",
     "test": "npm run test:unit && npm run test:types",
diff --git a/src/cancellation/CancellationSource.ts b/src/cancellation/CancellationSource.ts
@@ -1,7 +1,7 @@
 import { Event } from "../sync/Event.js";
 import { cancellationSourceIdentityData } from "../sync/identifiers.js";
 import { isSignaled } from "../sync/ManualResetEvent.js";
-import type { Token } from "../workers.js";
+import type { Token } from "../types.js";
 import { TaskCancelledError } from "./TaskCancelledError.js";
 
 /**
diff --git a/src/index.ts b/src/index.ts
@@ -12,3 +12,4 @@ export * from './workers/AsyncWorker.js';
 export * from "./workers/workerListener.js";
 export * from './workers/WorkerTerminatedMessage.js';
 export * from "./workers/WorkItem.js";
+export type * from "./types.js";
diff --git a/src/sync/AutoResetEvent.ts b/src/sync/AutoResetEvent.ts
@@ -1,4 +1,4 @@
-import type { Token } from "../workers.js";
+import type { Token } from "../types.js";
 import { Event } from "./Event.js";
 import { autoResetEventIdentityData, checkToken } from "./identifiers.js";
 
diff --git a/src/sync/ManualResetEvent.ts b/src/sync/ManualResetEvent.ts
@@ -1,4 +1,4 @@
-import type { Token } from "../workers.js";
+import type { Token } from "../types.js";
 import { Event } from './Event.js';
 import { checkToken, manualResetEventIdentityData, type IdentifierData } from "./identifiers.js";
 
diff --git a/src/sync/Mutex.ts b/src/sync/Mutex.ts
@@ -1,4 +1,4 @@
-import type { Token } from "../workers.d.ts";
+import type { Token } from "../types.js";
 import { mutexIdentityData } from "./identifiers.js";
 import { acquire, acquireAsync, SemaphoreInternal, type Releaser } from "./Semaphore.js";
 
diff --git a/src/sync/Semaphore.ts b/src/sync/Semaphore.ts
@@ -1,4 +1,4 @@
-import type { Token } from "../workers.js";
+import type { Token } from "../types.js";
 import { checkToken, semaphoreIdentityData, type IdentifierData } from "./identifiers.js";
 import { SyncObject } from "./SyncObject.js";
 
diff --git a/src/sync/SyncObject.ts b/src/sync/SyncObject.ts
@@ -1,4 +1,4 @@
-import type { Token } from "../workers.d.ts";
+import type { Token } from "../types.js";
 
 /**
  * Base class for synchronization objects.
diff --git a/src/sync/identifiers.ts b/src/sync/identifiers.ts
@@ -1,4 +1,4 @@
-import type { Token } from "../workers.d.ts";
+import type { Token } from "../types.js";
 
 export type IdentifierData = [
     number,
diff --git a/src/types.ts b/src/types.ts
diff --git a/src/workers/AsyncWorker.ts b/src/workers/AsyncWorker.ts
@@ -1,6 +1,6 @@
 import { Queue } from "../misc/Queue.js";
 import { nextWorkItemId } from "../misc/nextWorkItemId.js";
-import type { IWorker, QueueingOptions, RejectFn, WorkerTasks, WorkItemData } from "../workers.js";
+import type { IWorker, QueueingOptions, RejectFn, WorkerTasks, WorkItemData } from "../types.js";
 import { InternalSharedWorker } from "./InternalSharedWorker.js";
 import { InternalWorker } from "./InternalWorker.js";
 import { WorkItem } from "./WorkItem.js";
diff --git a/src/workers/InternalSharedWorker.ts b/src/workers/InternalSharedWorker.ts
@@ -1,5 +1,5 @@
 import { CancelledMessage } from "../cancellation/CancelledMessage.js";
-import type { AsyncMessageUntyped, AsyncResponse, DisconnectFn, IWorker, ProcessMessageFn, RejectFn, TaskCancelledMessage } from "../workers.js";
+import type { AsyncMessageUntyped, AsyncResponse, DisconnectFn, IWorker, ProcessMessageFn, RejectFn, TaskCancelledMessage } from "../types.js";
 
 function isTaskCancelledMessage(message: any): message is TaskCancelledMessage {
     return message?.payload?._$cancelled === true && typeof message.workItemId === 'number';
diff --git a/src/workers/InternalWorker.ts b/src/workers/InternalWorker.ts
@@ -1,5 +1,5 @@
 import { CancelledMessage } from "../cancellation/CancelledMessage.js";
-import type { AsyncMessageUntyped, AsyncResponse, DisconnectFn, IWorker, ProcessMessageFn, RejectFn, TaskCancelledMessage } from "../workers.js";
+import type { AsyncMessageUntyped, AsyncResponse, DisconnectFn, IWorker, ProcessMessageFn, RejectFn, TaskCancelledMessage } from "../types.js";
 import { WorkerTerminatedMessage } from "./WorkerTerminatedMessage.js";
 
 function isTaskCancelledMessage(message: any): message is TaskCancelledMessage {
diff --git a/src/workers/WorkItemInternal.ts b/src/workers/WorkItemInternal.ts
@@ -1,6 +1,6 @@
 import { CancellationSource } from "../cancellation/CancellationSource.js";
 import { CancelledMessage } from "../cancellation/CancelledMessage.js";
-import type { AsyncMessageUntyped, DisconnectFn, IWorker, QueueingOptions, WorkItemData } from "../workers.js";
+import type { AsyncMessageUntyped, DisconnectFn, IWorker, QueueingOptions, WorkItemData } from "../types.js";
 import { WorkItemStatus, type WorkItemStatusEnum } from "./AsyncWorker.js";
 import { WorkerTerminatedMessage } from "./WorkerTerminatedMessage.js";
 
diff --git a/src/workers/workerListener.ts b/src/workers/workerListener.ts
@@ -1,5 +1,5 @@
 import { TaskCancelledError } from "../cancellation/TaskCancelledError.js";
-import type { AsyncMessageUntyped, AsyncResponse } from "../workers.d.ts";
+import type { AsyncMessageUntyped, AsyncResponse } from "../types.js";
 
 /**
  * Defines the function provided to worker tasks so workers can communicate back to the calling thread.
diff --git a/tests/typetests/index.test.ts b/tests/typetests/index.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "tstyche";
-import type { Token, WorkerTasks, AsyncMessage, QueueingOptions } from "../../src/workers.js";
+import type { Token, WorkerTasks, AsyncMessage, QueueingOptions } from "../../src/types.js";
 import { CancellationSource } from "../../src/cancellation/CancellationSource.js";
 import { TaskCancelledError } from "../../src/cancellation/TaskCancelledError.js";
 import { Queue } from "../../src/misc/Queue.js";
diff --git a/tests/ut/helpers/helpers.ts b/tests/ut/helpers/helpers.ts
@@ -1,6 +1,6 @@
 import { sinon } from "../../setup.js";
 import Worker from 'web-worker';
-import type { Token } from "../../../src/workers.js";
+import type { Token } from "../../../src/types.js";
 import { SyncObject } from "../../../src/sync/SyncObject.js";
 
 export type StubbedAtomics = {
diff --git a/tests/ut/workers/WorkItem.test.ts b/tests/ut/workers/WorkItem.test.ts
@@ -6,7 +6,7 @@ import { WorkItemInternal } from '../../../src/workers/WorkItemInternal.js';
 import { WorkItemStatus } from '../../../src/workers/AsyncWorker.js';
 import { CancelledMessage } from '../../../src/cancellation/CancelledMessage.js';
 import { CancellationSource } from '../../../src/cancellation/CancellationSource.js';
-import { WorkItemData, IWorker } from '../../../src/workers.js';
+import type { WorkItemData, IWorker } from '../../../src/types.js';
 
 describe('WorkItem', () => {
     let workItem: WorkItem<string>;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`},`
`11`	`11`	`"problemMatcher": [],`
`12`	`12`	`"label": "npm: build",`
`13`		`- "detail": "pwsh -Command \"npx tsc && copy src/workers.d.ts dist/\""`
	`13`	`+ "detail": "Build package"`
`14`	`14`	`}`
`15`	`15`	`]`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { Token } from "../workers.js";`
	`1`	`+import type { Token } from "../types.js";`
`2`	`2`	`import { Event } from "./Event.js";`
`3`	`3`	`import { autoResetEventIdentityData, checkToken } from "./identifiers.js";`
`4`	`4`