fix timers primitives (#624)

packages/primitives/src/primitives/load.js

@@ -97,16 +97,16 @@ export function load(scopedContext = {}) {
   })
   assign(context, { console: consoleImpl.console })
 
-  /** @type {import('../../type-definitions/timer')} */
-  const timeoutImpl = requireWithFakeGlobalScope({
+  /** @type {import('../../type-definitions/timers')} */
+  const timersImpl = requireWithFakeGlobalScope({
     context,
-    id: 'timeout.js',
-    sourceCode: injectSourceCode('./timer.js'),
+    id: 'timers.js',
+    sourceCode: injectSourceCode('./timers.js'),
     scopedContext,
   })
   assign(context, {
-    setTimeout: timeoutImpl.setTimeout,
-    setInterval: timeoutImpl.setInterval,
+    setTimeout: timersImpl.setTimeout,
+    setInterval: timersImpl.setInterval,
   })
 
   /** @type {import('../../type-definitions/events')} */

packages/primitives/src/primitives/timers.js

@@ -0,0 +1,18 @@
+const setTimeoutProxy = new Proxy(setTimeout, {
+  apply: (target, thisArg, args) => {
+    const timeout = Reflect.apply(target, thisArg, args)
+    // Returns integer value of timeout ID
+    return timeout[Symbol.toPrimitive]()
+  },
+})
+
+const setIntervalProxy = new Proxy(setInterval, {
+  apply: (target, thisArg, args) => {
+    const timeout = Reflect.apply(target, thisArg, args)
+    // Returns integer value of timeout ID
+    return timeout[Symbol.toPrimitive]()
+  },
+})
+
+export { setTimeoutProxy as setTimeout }
+export { setIntervalProxy as setInterval }

packages/primitives/type-definitions/index.d.ts

@@ -9,4 +9,4 @@ export * from './streams'
 export * from './text-encoding-streams'
 export * from './structured-clone'
 export * from './url'
-export * from './timer'
+export * from './timers'

packages/vm/tests/edge-runtime.test.ts

@@ -628,15 +628,14 @@ describe('`Timers`', () => {
     '%s function should return integer',
     async (f) => {
       const runtime = new EdgeVM()
-      expect(() => {
-        runtime.evaluate(`
+      runtime.evaluate(`
+        this.funcName = ${f}.name;
         const timer = ${f}(() => {}, 1000);
-        timer.unref();
+        this.isNumber = (typeof timer === 'number');
+        clearTimeout(timer);
       `)
-      }).toThrow({
-        name: 'Error',
-        message: `timer.unref is not a function`,
-      })
+      expect(runtime.context.funcName).toBe(f)
+      expect(runtime.context.isNumber).toBe(true)
     },
   )
 })