fix: nodenext moduleResolution for js peer (#271)

Author: DieMyst

packages/client/js-client.web.standalone/package.json

@@ -27,7 +27,7 @@
     "@types/jest": "28.1.0",
     "jest": "28.1.0",
     "ts-jest": "28.0.2",
-    "js-base64": "3.7.2",
+    "js-base64": "3.7.5",
     "@rollup/plugin-inject": "5.0.3",
     "vite-plugin-replace": "0.1.1",
     "vite": "4.0.4",

packages/core/js-peer/jest.config.cjs

@@ -1,16 +1,17 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
     extensionsToTreatAsEsm: ['.ts'],
-    moduleNameMapper: {
-        '^(\\.{1,2}/.*)\\.js$': '$1',
+    "preset": "ts-jest/presets/default-esm",
+    "moduleNameMapper": {
+        "^(\\.{1,2}/.*)\\.js$": "$1"
     },
-    testPathIgnorePatterns: ['dist'],
-    transform: {
-        '^.+\\.tsx?$': [
-            'ts-jest',
+    "transform": {
+        "^.+\\.tsx?$": [
+            "ts-jest",
             {
-                useESM: true,
-            },
-        ],
-    },
+                "useESM": true
+            }
+        ]
+    }
+    
 };

packages/core/js-peer/package.json

@@ -38,7 +38,7 @@
     "@libp2p/peer-id-factory": "2.0.1",
     "@libp2p/interface-peer-id": "2.0.1",
     "@libp2p/interface-keys": "1.0.7",
-    "js-base64": "3.7.2",
+    "js-base64": "3.7.5",
     "it-length-prefixed": "8.0.4",
     "it-pipe": "2.0.5",
     "it-map": "2.0.0",
@@ -60,6 +60,6 @@
     "@types/uuid": "8.3.2",
     "@types/jest": "29.4.0",
     "jest": "29.4.1",
-    "ts-jest": "29.0.5"
+    "ts-jest": "next"
   }
 }

packages/core/js-peer/src/interfaces/index.ts

@@ -17,6 +17,7 @@
 import type { PeerIdB58 } from '@fluencelabs/interfaces';
 import type { JSONArray, JSONObject, LogLevel } from '@fluencelabs/marine-js/dist/types';
 import type { RunParameters, CallResultsArray, InterpreterResult } from '@fluencelabs/avm';
+// @ts-ignore
 import type { WorkerImplementation } from 'threads/dist/types/master';
 
 export type ParticleHandler = (particle: string) => void;

packages/core/js-peer/src/js-peer/__test__/unit/builtInHandler.spec.ts

@@ -1,10 +1,10 @@
 import { CallParams } from '@fluencelabs/interfaces';
 import { toUint8Array } from 'js-base64';
 import { CallServiceData } from '../../../interfaces/commonTypes.js';
-import { builtInServices } from '../../builtins/common.js';
 import { KeyPair } from '../../../keypair/index.js';
 import { Sig, defaultSigGuard } from '../../builtins/Sig.js';
 import { allowServiceFn } from '../../builtins/securityGuard.js';
+import { builtInServices } from '../../builtins/common.js';
 
 const a10b20 = `{
     "a": 10,

packages/core/js-peer/src/js-peer/ephemeral.ts

@@ -3,9 +3,9 @@ import { FluenceConnection, ParticleHandler } from '../interfaces/index.js';
 import { fromBase64Sk } from '../keypair/index.js';
 import { FluencePeer } from './FluencePeer.js';
 import { MarineBackgroundRunner } from '../marine/worker/index.js';
-import { avmModuleLoader, controlModuleLoader } from './utilsForNode';
-import { marineLogFunction } from './utils';
-import { MarineBasedAvmRunner } from './avm';
+import { avmModuleLoader, controlModuleLoader } from './utilsForNode.js';
+import { marineLogFunction } from './utils.js';
+import { MarineBasedAvmRunner } from './avm.js';
 
 import log from 'loglevel';
 import { WorkerLoaderFromFs } from '../marine/deps-loader/node.js';

packages/core/js-peer/src/marine/deps-loader/common.ts

@@ -1,5 +1,7 @@
+// @ts-ignore
 import { BlobWorker } from 'threads';
 import { fromBase64, toUint8Array } from 'js-base64';
+// @ts-ignore
 import type { WorkerImplementation } from 'threads/dist/types/master';
 import { LazyLoader } from '../../interfaces/index.js';
 import { Buffer } from 'buffer';

packages/core/js-peer/src/marine/deps-loader/node.ts

@@ -1,7 +1,9 @@
 import { createRequire } from 'module';
 import { LazyLoader } from '../../interfaces/index.js';
 
+// @ts-ignore
 import type { WorkerImplementation } from 'threads/dist/types/master';
+// @ts-ignore
 import { Worker } from 'threads';
 import { Buffer } from 'buffer';
 import * as fs from 'fs';

packages/core/js-peer/src/marine/worker-script/index.ts

@@ -17,7 +17,9 @@
 import { MarineService } from '@fluencelabs/marine-js/dist/MarineService';
 import type { Env, MarineServiceConfig } from '@fluencelabs/marine-js/dist/config';
 import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/dist/types';
+// @ts-ignore
 import { Observable, Subject } from 'threads/observable';
+// @ts-ignore
 import { expose } from 'threads/worker';
 
 let marineServices = new Map<string, MarineService>();

packages/core/js-peer/src/marine/worker-script/workerLoader.ts

@@ -1,6 +1,8 @@
 import { LazyLoader } from '../../interfaces/index.js';
 
+// @ts-ignore
 import type { WorkerImplementation } from 'threads/dist/types/master';
+// @ts-ignore
 import { Worker } from 'threads';
 
 export class WorkerLoader extends LazyLoader<WorkerImplementation> {