From cbf9028c39776d41fc3d68bd7737d28049e2536a Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Tue, 20 Sep 2022 12:24:20 +0300 Subject: [PATCH] import from "xx" -> import from "xx.js" --- .../{.prettierrc.js => .prettierrc.cjs} | 0 packages/fluence-connection/src/index.ts | 2 +- .../{.prettierrc.js => .prettierrc.cjs} | 0 .../src/__test__/_aqua/marine-js-logging.ts | 4 ++-- .../src/__test__/_aqua/marine-js.ts | 4 ++-- .../src/__test__/_aqua/sig-tests.ts | 4 ++-- .../src/__test__/integration/avm.spec.ts | 6 +++--- .../__test__/integration/marine-js.spec.ts | 6 +++--- .../src/__test__/integration/peer.spec.ts | 8 +++---- .../__test__/integration/sigService.spec.ts | 6 +++--- .../fluence-js/src/__test__/unit/ast.spec.ts | 2 +- .../src/__test__/unit/builtInHandler.spec.ts | 6 +++--- .../src/__test__/unit/compiler/v2.spec.ts | 4 ++-- .../src/__test__/unit/compiler/v3.spec.ts | 2 +- .../src/__test__/unit/ephemeral.spec.ts | 6 +++--- packages/fluence-js/src/__test__/util.ts | 6 +++--- packages/fluence-js/src/index.ts | 14 ++++++------- .../fluence-js/src/internal/FluencePeer.ts | 21 +++++++++---------- packages/fluence-js/src/internal/Particle.ts | 8 +++---- .../fluence-js/src/internal/_aqua/services.ts | 4 ++-- .../fluence-js/src/internal/builtins/Sig.ts | 5 +++-- .../src/internal/builtins/common.ts | 6 +++--- .../src/internal/compilerSupport/v2.ts | 10 ++++----- .../src/internal/compilerSupport/v3.ts | 10 ++++----- .../compilerSupport/v3impl/callFunction.ts | 10 ++++----- .../compilerSupport/v3impl/conversions.ts | 6 +++--- .../compilerSupport/v3impl/registerService.ts | 8 +++---- .../compilerSupport/v3impl/services.ts | 10 ++++----- packages/fluence-js/src/internal/ephemeral.ts | 6 +++--- packages/fluence-js/src/internal/utils.ts | 8 +++---- packages/fluence-js/src/services.ts | 4 ++-- .../{.prettierrc.js => .prettierrc.cjs} | 0 32 files changed, 97 insertions(+), 99 deletions(-) rename packages/fluence-connection/{.prettierrc.js => .prettierrc.cjs} (100%) rename packages/fluence-js/{.prettierrc.js => .prettierrc.cjs} (100%) rename packages/fluence-keypair/{.prettierrc.js => .prettierrc.cjs} (100%) diff --git a/packages/fluence-connection/.prettierrc.js b/packages/fluence-connection/.prettierrc.cjs similarity index 100% rename from packages/fluence-connection/.prettierrc.js rename to packages/fluence-connection/.prettierrc.cjs diff --git a/packages/fluence-connection/src/index.ts b/packages/fluence-connection/src/index.ts index 8bf62f9a..c43b9400 100644 --- a/packages/fluence-connection/src/index.ts +++ b/packages/fluence-connection/src/index.ts @@ -27,7 +27,7 @@ import { Multiaddr } from '@multiformats/multiaddr'; import { Connection } from '@libp2p/interface-connection'; export { Multiaddr } from '@multiformats/multiaddr'; -import Buffer from './Buffer'; +import Buffer from './Buffer.js'; export const PROTOCOL_NAME = '/fluence/particle/2.0.0'; diff --git a/packages/fluence-js/.prettierrc.js b/packages/fluence-js/.prettierrc.cjs similarity index 100% rename from packages/fluence-js/.prettierrc.js rename to packages/fluence-js/.prettierrc.cjs diff --git a/packages/fluence-js/src/__test__/_aqua/marine-js-logging.ts b/packages/fluence-js/src/__test__/_aqua/marine-js-logging.ts index 9d4a1a43..8914d6fc 100644 --- a/packages/fluence-js/src/__test__/_aqua/marine-js-logging.ts +++ b/packages/fluence-js/src/__test__/_aqua/marine-js-logging.ts @@ -6,8 +6,8 @@ * Aqua version: 0.7.2-314 * */ -import { Fluence, FluencePeer } from '../../index'; -import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; +import { Fluence, FluencePeer } from '../../index.js'; +import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js'; // Services diff --git a/packages/fluence-js/src/__test__/_aqua/marine-js.ts b/packages/fluence-js/src/__test__/_aqua/marine-js.ts index a92fb0e1..7162ba7c 100644 --- a/packages/fluence-js/src/__test__/_aqua/marine-js.ts +++ b/packages/fluence-js/src/__test__/_aqua/marine-js.ts @@ -6,8 +6,8 @@ * Aqua version: 0.7.2-314 * */ -import { Fluence, FluencePeer } from '../../index'; -import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; +import { Fluence, FluencePeer } from '../../index.js'; +import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js'; // Services diff --git a/packages/fluence-js/src/__test__/_aqua/sig-tests.ts b/packages/fluence-js/src/__test__/_aqua/sig-tests.ts index b03cfa3c..1a5785e3 100644 --- a/packages/fluence-js/src/__test__/_aqua/sig-tests.ts +++ b/packages/fluence-js/src/__test__/_aqua/sig-tests.ts @@ -6,8 +6,8 @@ * Aqua version: 0.7.2-314 * */ -import { Fluence, FluencePeer } from '../../index'; -import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; +import { Fluence, FluencePeer } from '../../index.js'; +import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js'; // Services diff --git a/packages/fluence-js/src/__test__/integration/avm.spec.ts b/packages/fluence-js/src/__test__/integration/avm.spec.ts index bf414f5a..9cd6185d 100644 --- a/packages/fluence-js/src/__test__/integration/avm.spec.ts +++ b/packages/fluence-js/src/__test__/integration/avm.spec.ts @@ -1,6 +1,6 @@ -import { FluencePeer } from '../../index'; -import { handleTimeout } from '../../internal/utils'; -import { registerHandlersHelper } from '../util'; +import { FluencePeer } from '../../index.js'; +import { handleTimeout } from '../../internal/utils.js'; +import { registerHandlersHelper } from '../util.js'; let peer: FluencePeer; diff --git a/packages/fluence-js/src/__test__/integration/marine-js.spec.ts b/packages/fluence-js/src/__test__/integration/marine-js.spec.ts index 39444a6a..840b52c7 100644 --- a/packages/fluence-js/src/__test__/integration/marine-js.spec.ts +++ b/packages/fluence-js/src/__test__/integration/marine-js.spec.ts @@ -1,8 +1,8 @@ -import { Fluence, FluencePeer } from '../../index'; import fs from 'fs'; import path from 'path'; -import { call } from '../_aqua/marine-js'; -import { call_info } from '../_aqua/marine-js-logging'; +import { Fluence, FluencePeer } from '../../index.js'; +import { call } from '../_aqua/marine-js.js'; +import { call_info } from '../_aqua/marine-js-logging.js'; describe('Marine js tests', () => { beforeEach(async () => { diff --git a/packages/fluence-js/src/__test__/integration/peer.spec.ts b/packages/fluence-js/src/__test__/integration/peer.spec.ts index dd3863dc..651b2c46 100644 --- a/packages/fluence-js/src/__test__/integration/peer.spec.ts +++ b/packages/fluence-js/src/__test__/integration/peer.spec.ts @@ -1,9 +1,9 @@ import { Multiaddr } from '@fluencelabs/connection'; -import { nodes } from '../connection'; -import { FluencePeer } from '../../index'; -import { checkConnection, doNothing, handleTimeout } from '../../internal/utils'; -import { registerHandlersHelper } from '../util'; +import { nodes } from '../connection.js'; +import { FluencePeer } from '../../index.js'; +import { checkConnection, doNothing, handleTimeout } from '../../internal/utils.js'; +import { registerHandlersHelper } from '../util.js'; let peer: FluencePeer; diff --git a/packages/fluence-js/src/__test__/integration/sigService.spec.ts b/packages/fluence-js/src/__test__/integration/sigService.spec.ts index 0914d622..468d23be 100644 --- a/packages/fluence-js/src/__test__/integration/sigService.spec.ts +++ b/packages/fluence-js/src/__test__/integration/sigService.spec.ts @@ -1,6 +1,6 @@ -import { Fluence, FluencePeer, KeyPair, setLogLevel } from '../../index'; -import { allowServiceFn, Sig } from '../../services'; -import { registerSig, registerDataProvider, callSig } from '../_aqua/sig-tests'; +import { Fluence, FluencePeer, KeyPair, setLogLevel } from '../../index.js'; +import { allowServiceFn, Sig } from '../../services.js'; +import { registerSig, registerDataProvider, callSig } from '../_aqua/sig-tests.js'; let peer: FluencePeer; diff --git a/packages/fluence-js/src/__test__/unit/ast.spec.ts b/packages/fluence-js/src/__test__/unit/ast.spec.ts index 4a7aa75a..26c27b7c 100644 --- a/packages/fluence-js/src/__test__/unit/ast.spec.ts +++ b/packages/fluence-js/src/__test__/unit/ast.spec.ts @@ -1,4 +1,4 @@ -import { Fluence } from '../../index'; +import { Fluence } from '../../index.js'; describe('Parse ast tests', () => { beforeAll(async () => { diff --git a/packages/fluence-js/src/__test__/unit/builtInHandler.spec.ts b/packages/fluence-js/src/__test__/unit/builtInHandler.spec.ts index 4b4d81cf..10d219dc 100644 --- a/packages/fluence-js/src/__test__/unit/builtInHandler.spec.ts +++ b/packages/fluence-js/src/__test__/unit/builtInHandler.spec.ts @@ -1,8 +1,8 @@ -import { CallParams, CallServiceData } from '../../internal/commonTypes'; -import { builtInServices } from '../../internal/builtins/common'; import { KeyPair } from '@fluencelabs/keypair'; -import { Sig, defaultSigGuard, allowServiceFn } from '../../internal/builtins/Sig'; import { toUint8Array } from 'js-base64'; +import { CallParams, CallServiceData } from '../../internal/commonTypes.js'; +import { builtInServices } from '../../internal/builtins/common.js'; +import { Sig, defaultSigGuard, allowServiceFn } from '../../internal/builtins/Sig.js'; const a10b20 = `{ "a": 10, diff --git a/packages/fluence-js/src/__test__/unit/compiler/v2.spec.ts b/packages/fluence-js/src/__test__/unit/compiler/v2.spec.ts index fffeeb00..da5fd096 100644 --- a/packages/fluence-js/src/__test__/unit/compiler/v2.spec.ts +++ b/packages/fluence-js/src/__test__/unit/compiler/v2.spec.ts @@ -1,5 +1,5 @@ -import { Fluence, FluencePeer } from '../../..'; -import { forTests } from '../../../internal/compilerSupport/v2'; +import { Fluence, FluencePeer } from '../../../index.js'; +import { forTests } from '../../../internal/compilerSupport/v2.js'; const peer = new FluencePeer(); const cfg = { ttl: 1000 }; diff --git a/packages/fluence-js/src/__test__/unit/compiler/v3.spec.ts b/packages/fluence-js/src/__test__/unit/compiler/v3.spec.ts index c38129d3..4d35331b 100644 --- a/packages/fluence-js/src/__test__/unit/compiler/v3.spec.ts +++ b/packages/fluence-js/src/__test__/unit/compiler/v3.spec.ts @@ -1,4 +1,4 @@ -import { aqua2ts, ts2aqua } from '../../../internal/compilerSupport/v3impl/conversions'; +import { aqua2ts, ts2aqua } from '../../../internal/compilerSupport/v3impl/conversions.js'; const i32 = { tag: 'scalar', name: 'i32' } as const; diff --git a/packages/fluence-js/src/__test__/unit/ephemeral.spec.ts b/packages/fluence-js/src/__test__/unit/ephemeral.spec.ts index 89b16ef4..011d9760 100644 --- a/packages/fluence-js/src/__test__/unit/ephemeral.spec.ts +++ b/packages/fluence-js/src/__test__/unit/ephemeral.spec.ts @@ -1,7 +1,7 @@ import { KeyPair } from '@fluencelabs/keypair'; -import { EphemeralNetwork, defaultConfig } from '../../internal/ephemeral'; -import { FluencePeer } from '../../index'; -import { ResultCodes } from '../../internal/commonTypes'; +import { EphemeralNetwork, defaultConfig } from '../../internal/ephemeral.js'; +import { FluencePeer } from '../../index.js'; +import { ResultCodes } from '../../internal/commonTypes.js'; let en: EphemeralNetwork; let peer: FluencePeer; diff --git a/packages/fluence-js/src/__test__/util.ts b/packages/fluence-js/src/__test__/util.ts index 1c22e6b9..4885d1ad 100644 --- a/packages/fluence-js/src/__test__/util.ts +++ b/packages/fluence-js/src/__test__/util.ts @@ -1,6 +1,6 @@ -import { FluencePeer } from '../index'; -import { Particle } from '../internal/Particle'; -import { MakeServiceCall } from '../internal/utils'; +import { FluencePeer } from '../index.js'; +import { Particle } from '../internal/Particle.js'; +import { MakeServiceCall } from '../internal/utils.js'; export const registerHandlersHelper = ( peer: FluencePeer, diff --git a/packages/fluence-js/src/index.ts b/packages/fluence-js/src/index.ts index ee68fe8e..b7d6246f 100644 --- a/packages/fluence-js/src/index.ts +++ b/packages/fluence-js/src/index.ts @@ -16,15 +16,15 @@ import log, { LogLevelDesc } from 'loglevel'; export { KeyPair } from '@fluencelabs/keypair'; - -import { FluencePeer, PeerConfig } from './internal/FluencePeer'; - -export { PeerStatus } from './internal/FluencePeer'; -export { FluencePeer, PeerConfig } from './internal/FluencePeer'; -export { MarineLoglevel as AvmLoglevel } from './internal/utils'; -export { PeerIdB58, CallParams } from './internal/commonTypes'; export { loadWasmFromFileSystem, loadWasmFromNpmPackage, loadWasmFromServer } from '@fluencelabs/marine-js'; +import { FluencePeer, PeerConfig } from './internal/FluencePeer.js'; + +export { PeerStatus } from './internal/FluencePeer.js'; +export { FluencePeer, PeerConfig } from './internal/FluencePeer.js'; +export { MarineLoglevel as AvmLoglevel } from './internal/utils.js'; +export { PeerIdB58, CallParams } from './internal/commonTypes.js'; + export const setLogLevel = (level: LogLevelDesc) => { log.setLevel(level); }; diff --git a/packages/fluence-js/src/internal/FluencePeer.ts b/packages/fluence-js/src/internal/FluencePeer.ts index 965ee319..6e2768b6 100644 --- a/packages/fluence-js/src/internal/FluencePeer.ts +++ b/packages/fluence-js/src/internal/FluencePeer.ts @@ -16,21 +16,20 @@ import { RelayConnection, Multiaddr } from '@fluencelabs/connection'; import { FluenceConnection } from '@fluencelabs/interfaces'; import { KeyPair } from '@fluencelabs/keypair'; -import { FluenceAppService, loadDefaults, loadWasmFromFileSystem, loadWasmFromServer } from '@fluencelabs/marine-js'; import type { MultiaddrInput } from '@multiformats/multiaddr'; -import { CallServiceData, CallServiceResult, GenericCallServiceHandler, ResultCodes } from './commonTypes'; -import { PeerIdB58 } from './commonTypes'; -import { Particle, ParticleExecutionStage, ParticleQueueItem } from './Particle'; -import { throwIfNotSupported, dataToString, jsonify, MarineLoglevel, marineLogLevelToEnvs, isString } from './utils'; -import { concatMap, filter, pipe, Subject, tap } from 'rxjs'; import log from 'loglevel'; -import { builtInServices } from './builtins/common'; -import { defaultSigGuard, Sig } from './builtins/Sig'; -import { registerSig } from './_aqua/services'; -import Buffer from './Buffer'; - import { isBrowser, isNode } from 'browser-or-node'; import { deserializeAvmResult, InterpreterResult, JSONValue, LogLevel, serializeAvmArgs } from '@fluencelabs/avm'; +import { concatMap, filter, pipe, Subject, tap } from 'rxjs'; + +import { FluenceAppService, loadDefaults, loadWasmFromFileSystem, loadWasmFromServer } from '@fluencelabs/marine-js'; +import { PeerIdB58, CallServiceData, CallServiceResult, GenericCallServiceHandler, ResultCodes } from './commonTypes.js'; +import { Particle, ParticleExecutionStage, ParticleQueueItem } from './Particle.js'; +import { throwIfNotSupported, dataToString, jsonify, MarineLoglevel, marineLogLevelToEnvs, isString } from './utils.js'; +import { builtInServices } from './builtins/common.js'; +import { defaultSigGuard, Sig } from './builtins/Sig.js'; +import { registerSig } from './_aqua/services.js'; +import Buffer from './Buffer.js'; /** * Node of the Fluence network specified as a pair of node's multiaddr and it's peer id diff --git a/packages/fluence-js/src/internal/Particle.ts b/packages/fluence-js/src/internal/Particle.ts index f93a8ab6..833ed406 100644 --- a/packages/fluence-js/src/internal/Particle.ts +++ b/packages/fluence-js/src/internal/Particle.ts @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import 'buffer'; - import { CallResultsArray, LogLevel } from '@fluencelabs/avm'; import { v4 as uuidv4 } from 'uuid'; import { fromByteArray, toByteArray } from 'base64-js'; import log from 'loglevel'; -import { ParticleContext } from './commonTypes'; -import { dataToString, jsonify } from './utils'; -import Buffer from './Buffer'; +import { ParticleContext } from './commonTypes.js'; +import { dataToString, jsonify } from './utils.js'; +import Buffer from './Buffer.js'; export class Particle { // TODO: make it not optional (should be added to the constructor) diff --git a/packages/fluence-js/src/internal/_aqua/services.ts b/packages/fluence-js/src/internal/_aqua/services.ts index e2e6487c..db0481b4 100644 --- a/packages/fluence-js/src/internal/_aqua/services.ts +++ b/packages/fluence-js/src/internal/_aqua/services.ts @@ -6,8 +6,8 @@ * Aqua version: 0.7.2-314 * */ -import { Fluence, FluencePeer } from '../../index'; -import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; +import { Fluence, FluencePeer } from '../../index.js'; +import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js'; // Services diff --git a/packages/fluence-js/src/internal/builtins/Sig.ts b/packages/fluence-js/src/internal/builtins/Sig.ts index a97534d3..5b0e19b8 100644 --- a/packages/fluence-js/src/internal/builtins/Sig.ts +++ b/packages/fluence-js/src/internal/builtins/Sig.ts @@ -1,7 +1,8 @@ import { SecurityTetraplet } from '@fluencelabs/avm'; -import { CallParams, PeerIdB58 } from '../commonTypes'; import { KeyPair } from '@fluencelabs/keypair'; -import { SigDef } from '../_aqua/services'; + +import { CallParams, PeerIdB58 } from '../commonTypes.js'; +import { SigDef } from '../_aqua/services.js'; /** * A predicate of call params for sig service's sign method which determines whether signing operation is allowed or not diff --git a/packages/fluence-js/src/internal/builtins/common.ts b/packages/fluence-js/src/internal/builtins/common.ts index c9557909..b1a3aad4 100644 --- a/packages/fluence-js/src/internal/builtins/common.ts +++ b/packages/fluence-js/src/internal/builtins/common.ts @@ -18,9 +18,9 @@ import bs58 from 'bs58'; import { sha256 } from 'multiformats/hashes/sha2'; import { CallServiceResult } from '@fluencelabs/avm'; -import { GenericCallServiceHandler, ResultCodes } from '../commonTypes'; -import { jsonify } from '../utils'; -import Buffer from '../Buffer'; +import { GenericCallServiceHandler, ResultCodes } from '../commonTypes.js'; +import { jsonify } from '../utils.js'; +import Buffer from '../Buffer.js'; const success = (result: any): CallServiceResult => { return { diff --git a/packages/fluence-js/src/internal/compilerSupport/v2.ts b/packages/fluence-js/src/internal/compilerSupport/v2.ts index 26a8b27e..6f28263c 100644 --- a/packages/fluence-js/src/internal/compilerSupport/v2.ts +++ b/packages/fluence-js/src/internal/compilerSupport/v2.ts @@ -16,12 +16,12 @@ import { SecurityTetraplet } from '@fluencelabs/avm'; import { match } from 'ts-pattern'; -import { CallParams, Fluence, FluencePeer } from '../../index'; -import { CallServiceData, GenericCallServiceHandler, CallServiceResult, ResultCodes } from '../commonTypes'; -import { Particle } from '../Particle'; +import { CallParams, Fluence, FluencePeer } from '../../index.js'; +import type { CallServiceData, CallServiceResult } from '../commonTypes'; +import { ResultCodes } from '../commonTypes'; -export { FluencePeer } from '../FluencePeer'; -export { CallParams } from '../commonTypes'; +export { FluencePeer } from '../FluencePeer.js'; +export { CallParams } from '../commonTypes.js'; /** * Represents the Aqua Option type diff --git a/packages/fluence-js/src/internal/compilerSupport/v3.ts b/packages/fluence-js/src/internal/compilerSupport/v3.ts index e743584f..ae573fe7 100644 --- a/packages/fluence-js/src/internal/compilerSupport/v3.ts +++ b/packages/fluence-js/src/internal/compilerSupport/v3.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -export { FluencePeer } from '../FluencePeer'; -export { CallParams } from '../commonTypes'; -export * from './v3impl/interface'; -export * from './v3impl/callFunction'; -export * from './v3impl/registerService'; +export { FluencePeer } from '../FluencePeer.js'; +export { CallParams } from '../commonTypes.js'; +export * from './v3impl/interface.js'; +export * from './v3impl/callFunction.js'; +export * from './v3impl/registerService.js'; diff --git a/packages/fluence-js/src/internal/compilerSupport/v3impl/callFunction.ts b/packages/fluence-js/src/internal/compilerSupport/v3impl/callFunction.ts index 6b9e3f20..f72a343c 100644 --- a/packages/fluence-js/src/internal/compilerSupport/v3impl/callFunction.ts +++ b/packages/fluence-js/src/internal/compilerSupport/v3impl/callFunction.ts @@ -1,7 +1,7 @@ -import { FnConfig, FunctionCallDef } from './interface'; -import { FluencePeer } from '../../FluencePeer'; -import { Fluence } from '../../../index'; -import { Particle } from '../../Particle'; +import { FnConfig, FunctionCallDef } from './interface.js'; +import { FluencePeer } from '../../FluencePeer.js'; +import { Fluence } from '../../../index.js'; + import { injectRelayService, argToServiceDef, @@ -11,7 +11,7 @@ import { ServiceDescription, userHandlerService, injectValueService, -} from './services'; +} from './services.js'; /** * Convenience function to support Aqua `func` generation backend diff --git a/packages/fluence-js/src/internal/compilerSupport/v3impl/conversions.ts b/packages/fluence-js/src/internal/compilerSupport/v3impl/conversions.ts index 578d491b..514c7cc5 100644 --- a/packages/fluence-js/src/internal/compilerSupport/v3impl/conversions.ts +++ b/packages/fluence-js/src/internal/compilerSupport/v3impl/conversions.ts @@ -1,7 +1,7 @@ -import { jsonify } from '../../utils'; import { match } from 'ts-pattern'; -import { ArrowType, ArrowWithoutCallbacks, NonArrowType, UnlabeledProductType } from './interface'; -import { CallServiceData } from 'src/internal/commonTypes'; +import { jsonify } from '../../utils.js'; +import { ArrowType, ArrowWithoutCallbacks, NonArrowType, UnlabeledProductType } from './interface.js'; +import { CallServiceData } from 'src/internal/commonTypes.js'; /** * Convert value from its representation in aqua language to representation in typescript diff --git a/packages/fluence-js/src/internal/compilerSupport/v3impl/registerService.ts b/packages/fluence-js/src/internal/compilerSupport/v3impl/registerService.ts index 39deb88f..ea09f40c 100644 --- a/packages/fluence-js/src/internal/compilerSupport/v3impl/registerService.ts +++ b/packages/fluence-js/src/internal/compilerSupport/v3impl/registerService.ts @@ -1,7 +1,7 @@ -import { FluencePeer } from '../../FluencePeer'; -import { Fluence } from '../../../index'; -import { ServiceDef } from './interface'; -import { registerGlobalService, userHandlerService } from './services'; +import { FluencePeer } from '../../FluencePeer.js'; +import { Fluence } from '../../../index.js'; +import { ServiceDef } from './interface.js'; +import { registerGlobalService, userHandlerService } from './services.js'; /** * Convenience function to support Aqua `service` generation backend diff --git a/packages/fluence-js/src/internal/compilerSupport/v3impl/services.ts b/packages/fluence-js/src/internal/compilerSupport/v3impl/services.ts index b8e5ff40..9a16cfb5 100644 --- a/packages/fluence-js/src/internal/compilerSupport/v3impl/services.ts +++ b/packages/fluence-js/src/internal/compilerSupport/v3impl/services.ts @@ -1,12 +1,12 @@ import { SecurityTetraplet } from '@fluencelabs/avm'; import { match } from 'ts-pattern'; -import { Particle } from '../../Particle'; -import { CallParams, CallServiceData, GenericCallServiceHandler, ResultCodes } from '../../commonTypes'; -import { FluencePeer } from '../../FluencePeer'; +import { Particle } from '../../Particle.js'; +import { CallParams, CallServiceData, GenericCallServiceHandler, ResultCodes } from '../../commonTypes.js'; +import { FluencePeer } from '../../FluencePeer.js'; -import { aquaArgs2Ts, responseServiceValue2ts, returnType2Aqua, ts2aqua } from './conversions'; -import { ArrowWithoutCallbacks, FunctionCallConstants, FunctionCallDef, NonArrowType } from './interface'; +import { aquaArgs2Ts, responseServiceValue2ts, returnType2Aqua, ts2aqua } from './conversions.js'; +import { ArrowWithoutCallbacks, FunctionCallConstants, FunctionCallDef, NonArrowType } from './interface.js'; export interface ServiceDescription { serviceId: string; diff --git a/packages/fluence-js/src/internal/ephemeral.ts b/packages/fluence-js/src/internal/ephemeral.ts index ed6a4d85..c7f605fb 100644 --- a/packages/fluence-js/src/internal/ephemeral.ts +++ b/packages/fluence-js/src/internal/ephemeral.ts @@ -1,10 +1,10 @@ import { FluenceConnection, ParticleHandler } from '@fluencelabs/interfaces'; import { keyPairFromBase64Sk } from '@fluencelabs/keypair'; - -import { PeerIdB58 } from './commonTypes'; -import { FluencePeer } from '../index'; import log from 'loglevel'; +import { PeerIdB58 } from './commonTypes.js'; +import { FluencePeer } from '../index.js'; + interface EphemeralConfig { peers: Array<{ peerId: PeerIdB58; diff --git a/packages/fluence-js/src/internal/utils.ts b/packages/fluence-js/src/internal/utils.ts index 556697b9..2d30e72f 100644 --- a/packages/fluence-js/src/internal/utils.ts +++ b/packages/fluence-js/src/internal/utils.ts @@ -19,10 +19,10 @@ import log from 'loglevel'; import platform from 'platform'; import { LogLevel } from '@fluencelabs/avm'; -import { CallServiceData, CallServiceResult, CallServiceResultType, ResultCodes } from './commonTypes'; -import { FluencePeer } from './FluencePeer'; -import { ParticleExecutionStage } from './Particle'; -import Buffer from './Buffer'; +import { CallServiceData, CallServiceResult, CallServiceResultType, ResultCodes } from './commonTypes.js'; +import { FluencePeer } from './FluencePeer.js'; +import { ParticleExecutionStage } from './Particle.js'; +import Buffer from './Buffer.js'; export const MakeServiceCall = (fn: (args: any[]) => CallServiceResultType) => diff --git a/packages/fluence-js/src/services.ts b/packages/fluence-js/src/services.ts index 74101cd0..ae7ee7eb 100644 --- a/packages/fluence-js/src/services.ts +++ b/packages/fluence-js/src/services.ts @@ -1,2 +1,2 @@ -export * from './internal/builtins/Sig'; -export { registerSig } from './internal/_aqua/services'; +export * from './internal/builtins/Sig.js'; +export { registerSig } from './internal/_aqua/services.js'; diff --git a/packages/fluence-keypair/.prettierrc.js b/packages/fluence-keypair/.prettierrc.cjs similarity index 100% rename from packages/fluence-keypair/.prettierrc.js rename to packages/fluence-keypair/.prettierrc.cjs