import from "xx" -> import from "xx.js"

This commit is contained in:
Pavel Murygin 2022-09-20 12:24:20 +03:00
parent 0dc482b479
commit cbf9028c39
32 changed files with 97 additions and 99 deletions

View File

@ -27,7 +27,7 @@ import { Multiaddr } from '@multiformats/multiaddr';
import { Connection } from '@libp2p/interface-connection'; import { Connection } from '@libp2p/interface-connection';
export { Multiaddr } from '@multiformats/multiaddr'; export { Multiaddr } from '@multiformats/multiaddr';
import Buffer from './Buffer'; import Buffer from './Buffer.js';
export const PROTOCOL_NAME = '/fluence/particle/2.0.0'; export const PROTOCOL_NAME = '/fluence/particle/2.0.0';

View File

@ -6,8 +6,8 @@
* Aqua version: 0.7.2-314 * Aqua version: 0.7.2-314
* *
*/ */
import { Fluence, FluencePeer } from '../../index'; import { Fluence, FluencePeer } from '../../index.js';
import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js';
// Services // Services

View File

@ -6,8 +6,8 @@
* Aqua version: 0.7.2-314 * Aqua version: 0.7.2-314
* *
*/ */
import { Fluence, FluencePeer } from '../../index'; import { Fluence, FluencePeer } from '../../index.js';
import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js';
// Services // Services

View File

@ -6,8 +6,8 @@
* Aqua version: 0.7.2-314 * Aqua version: 0.7.2-314
* *
*/ */
import { Fluence, FluencePeer } from '../../index'; import { Fluence, FluencePeer } from '../../index.js';
import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js';
// Services // Services

View File

@ -1,6 +1,6 @@
import { FluencePeer } from '../../index'; import { FluencePeer } from '../../index.js';
import { handleTimeout } from '../../internal/utils'; import { handleTimeout } from '../../internal/utils.js';
import { registerHandlersHelper } from '../util'; import { registerHandlersHelper } from '../util.js';
let peer: FluencePeer; let peer: FluencePeer;

View File

@ -1,8 +1,8 @@
import { Fluence, FluencePeer } from '../../index';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import { call } from '../_aqua/marine-js'; import { Fluence, FluencePeer } from '../../index.js';
import { call_info } from '../_aqua/marine-js-logging'; import { call } from '../_aqua/marine-js.js';
import { call_info } from '../_aqua/marine-js-logging.js';
describe('Marine js tests', () => { describe('Marine js tests', () => {
beforeEach(async () => { beforeEach(async () => {

View File

@ -1,9 +1,9 @@
import { Multiaddr } from '@fluencelabs/connection'; import { Multiaddr } from '@fluencelabs/connection';
import { nodes } from '../connection'; import { nodes } from '../connection.js';
import { FluencePeer } from '../../index'; import { FluencePeer } from '../../index.js';
import { checkConnection, doNothing, handleTimeout } from '../../internal/utils'; import { checkConnection, doNothing, handleTimeout } from '../../internal/utils.js';
import { registerHandlersHelper } from '../util'; import { registerHandlersHelper } from '../util.js';
let peer: FluencePeer; let peer: FluencePeer;

View File

@ -1,6 +1,6 @@
import { Fluence, FluencePeer, KeyPair, setLogLevel } from '../../index'; import { Fluence, FluencePeer, KeyPair, setLogLevel } from '../../index.js';
import { allowServiceFn, Sig } from '../../services'; import { allowServiceFn, Sig } from '../../services.js';
import { registerSig, registerDataProvider, callSig } from '../_aqua/sig-tests'; import { registerSig, registerDataProvider, callSig } from '../_aqua/sig-tests.js';
let peer: FluencePeer; let peer: FluencePeer;

View File

@ -1,4 +1,4 @@
import { Fluence } from '../../index'; import { Fluence } from '../../index.js';
describe('Parse ast tests', () => { describe('Parse ast tests', () => {
beforeAll(async () => { beforeAll(async () => {

View File

@ -1,8 +1,8 @@
import { CallParams, CallServiceData } from '../../internal/commonTypes';
import { builtInServices } from '../../internal/builtins/common';
import { KeyPair } from '@fluencelabs/keypair'; import { KeyPair } from '@fluencelabs/keypair';
import { Sig, defaultSigGuard, allowServiceFn } from '../../internal/builtins/Sig';
import { toUint8Array } from 'js-base64'; 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 = `{ const a10b20 = `{
"a": 10, "a": 10,

View File

@ -1,5 +1,5 @@
import { Fluence, FluencePeer } from '../../..'; import { Fluence, FluencePeer } from '../../../index.js';
import { forTests } from '../../../internal/compilerSupport/v2'; import { forTests } from '../../../internal/compilerSupport/v2.js';
const peer = new FluencePeer(); const peer = new FluencePeer();
const cfg = { ttl: 1000 }; const cfg = { ttl: 1000 };

View File

@ -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; const i32 = { tag: 'scalar', name: 'i32' } as const;

View File

@ -1,7 +1,7 @@
import { KeyPair } from '@fluencelabs/keypair'; import { KeyPair } from '@fluencelabs/keypair';
import { EphemeralNetwork, defaultConfig } from '../../internal/ephemeral'; import { EphemeralNetwork, defaultConfig } from '../../internal/ephemeral.js';
import { FluencePeer } from '../../index'; import { FluencePeer } from '../../index.js';
import { ResultCodes } from '../../internal/commonTypes'; import { ResultCodes } from '../../internal/commonTypes.js';
let en: EphemeralNetwork; let en: EphemeralNetwork;
let peer: FluencePeer; let peer: FluencePeer;

View File

@ -1,6 +1,6 @@
import { FluencePeer } from '../index'; import { FluencePeer } from '../index.js';
import { Particle } from '../internal/Particle'; import { Particle } from '../internal/Particle.js';
import { MakeServiceCall } from '../internal/utils'; import { MakeServiceCall } from '../internal/utils.js';
export const registerHandlersHelper = ( export const registerHandlersHelper = (
peer: FluencePeer, peer: FluencePeer,

View File

@ -16,15 +16,15 @@
import log, { LogLevelDesc } from 'loglevel'; import log, { LogLevelDesc } from 'loglevel';
export { KeyPair } from '@fluencelabs/keypair'; 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'; 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) => { export const setLogLevel = (level: LogLevelDesc) => {
log.setLevel(level); log.setLevel(level);
}; };

View File

@ -16,21 +16,20 @@
import { RelayConnection, Multiaddr } from '@fluencelabs/connection'; import { RelayConnection, Multiaddr } from '@fluencelabs/connection';
import { FluenceConnection } from '@fluencelabs/interfaces'; import { FluenceConnection } from '@fluencelabs/interfaces';
import { KeyPair } from '@fluencelabs/keypair'; import { KeyPair } from '@fluencelabs/keypair';
import { FluenceAppService, loadDefaults, loadWasmFromFileSystem, loadWasmFromServer } from '@fluencelabs/marine-js';
import type { MultiaddrInput } from '@multiformats/multiaddr'; 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 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 { isBrowser, isNode } from 'browser-or-node';
import { deserializeAvmResult, InterpreterResult, JSONValue, LogLevel, serializeAvmArgs } from '@fluencelabs/avm'; 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 * Node of the Fluence network specified as a pair of node's multiaddr and it's peer id

View File

@ -13,15 +13,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import 'buffer';
import { CallResultsArray, LogLevel } from '@fluencelabs/avm'; import { CallResultsArray, LogLevel } from '@fluencelabs/avm';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import { fromByteArray, toByteArray } from 'base64-js'; import { fromByteArray, toByteArray } from 'base64-js';
import log from 'loglevel'; import log from 'loglevel';
import { ParticleContext } from './commonTypes'; import { ParticleContext } from './commonTypes.js';
import { dataToString, jsonify } from './utils'; import { dataToString, jsonify } from './utils.js';
import Buffer from './Buffer'; import Buffer from './Buffer.js';
export class Particle { export class Particle {
// TODO: make it not optional (should be added to the constructor) // TODO: make it not optional (should be added to the constructor)

View File

@ -6,8 +6,8 @@
* Aqua version: 0.7.2-314 * Aqua version: 0.7.2-314
* *
*/ */
import { Fluence, FluencePeer } from '../../index'; import { Fluence, FluencePeer } from '../../index.js';
import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3'; import { CallParams, callFunction, registerService } from '../../internal/compilerSupport/v3.js';
// Services // Services

View File

@ -1,7 +1,8 @@
import { SecurityTetraplet } from '@fluencelabs/avm'; import { SecurityTetraplet } from '@fluencelabs/avm';
import { CallParams, PeerIdB58 } from '../commonTypes';
import { KeyPair } from '@fluencelabs/keypair'; 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 * A predicate of call params for sig service's sign method which determines whether signing operation is allowed or not

View File

@ -18,9 +18,9 @@ import bs58 from 'bs58';
import { sha256 } from 'multiformats/hashes/sha2'; import { sha256 } from 'multiformats/hashes/sha2';
import { CallServiceResult } from '@fluencelabs/avm'; import { CallServiceResult } from '@fluencelabs/avm';
import { GenericCallServiceHandler, ResultCodes } from '../commonTypes'; import { GenericCallServiceHandler, ResultCodes } from '../commonTypes.js';
import { jsonify } from '../utils'; import { jsonify } from '../utils.js';
import Buffer from '../Buffer'; import Buffer from '../Buffer.js';
const success = (result: any): CallServiceResult => { const success = (result: any): CallServiceResult => {
return { return {

View File

@ -16,12 +16,12 @@
import { SecurityTetraplet } from '@fluencelabs/avm'; import { SecurityTetraplet } from '@fluencelabs/avm';
import { match } from 'ts-pattern'; import { match } from 'ts-pattern';
import { CallParams, Fluence, FluencePeer } from '../../index'; import { CallParams, Fluence, FluencePeer } from '../../index.js';
import { CallServiceData, GenericCallServiceHandler, CallServiceResult, ResultCodes } from '../commonTypes'; import type { CallServiceData, CallServiceResult } from '../commonTypes';
import { Particle } from '../Particle'; import { ResultCodes } from '../commonTypes';
export { FluencePeer } from '../FluencePeer'; export { FluencePeer } from '../FluencePeer.js';
export { CallParams } from '../commonTypes'; export { CallParams } from '../commonTypes.js';
/** /**
* Represents the Aqua Option type * Represents the Aqua Option type

View File

@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
export { FluencePeer } from '../FluencePeer'; export { FluencePeer } from '../FluencePeer.js';
export { CallParams } from '../commonTypes'; export { CallParams } from '../commonTypes.js';
export * from './v3impl/interface'; export * from './v3impl/interface.js';
export * from './v3impl/callFunction'; export * from './v3impl/callFunction.js';
export * from './v3impl/registerService'; export * from './v3impl/registerService.js';

View File

@ -1,7 +1,7 @@
import { FnConfig, FunctionCallDef } from './interface'; import { FnConfig, FunctionCallDef } from './interface.js';
import { FluencePeer } from '../../FluencePeer'; import { FluencePeer } from '../../FluencePeer.js';
import { Fluence } from '../../../index'; import { Fluence } from '../../../index.js';
import { Particle } from '../../Particle';
import { import {
injectRelayService, injectRelayService,
argToServiceDef, argToServiceDef,
@ -11,7 +11,7 @@ import {
ServiceDescription, ServiceDescription,
userHandlerService, userHandlerService,
injectValueService, injectValueService,
} from './services'; } from './services.js';
/** /**
* Convenience function to support Aqua `func` generation backend * Convenience function to support Aqua `func` generation backend

View File

@ -1,7 +1,7 @@
import { jsonify } from '../../utils';
import { match } from 'ts-pattern'; import { match } from 'ts-pattern';
import { ArrowType, ArrowWithoutCallbacks, NonArrowType, UnlabeledProductType } from './interface'; import { jsonify } from '../../utils.js';
import { CallServiceData } from 'src/internal/commonTypes'; 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 * Convert value from its representation in aqua language to representation in typescript

View File

@ -1,7 +1,7 @@
import { FluencePeer } from '../../FluencePeer'; import { FluencePeer } from '../../FluencePeer.js';
import { Fluence } from '../../../index'; import { Fluence } from '../../../index.js';
import { ServiceDef } from './interface'; import { ServiceDef } from './interface.js';
import { registerGlobalService, userHandlerService } from './services'; import { registerGlobalService, userHandlerService } from './services.js';
/** /**
* Convenience function to support Aqua `service` generation backend * Convenience function to support Aqua `service` generation backend

View File

@ -1,12 +1,12 @@
import { SecurityTetraplet } from '@fluencelabs/avm'; import { SecurityTetraplet } from '@fluencelabs/avm';
import { match } from 'ts-pattern'; import { match } from 'ts-pattern';
import { Particle } from '../../Particle'; import { Particle } from '../../Particle.js';
import { CallParams, CallServiceData, GenericCallServiceHandler, ResultCodes } from '../../commonTypes'; import { CallParams, CallServiceData, GenericCallServiceHandler, ResultCodes } from '../../commonTypes.js';
import { FluencePeer } from '../../FluencePeer'; import { FluencePeer } from '../../FluencePeer.js';
import { aquaArgs2Ts, responseServiceValue2ts, returnType2Aqua, ts2aqua } from './conversions'; import { aquaArgs2Ts, responseServiceValue2ts, returnType2Aqua, ts2aqua } from './conversions.js';
import { ArrowWithoutCallbacks, FunctionCallConstants, FunctionCallDef, NonArrowType } from './interface'; import { ArrowWithoutCallbacks, FunctionCallConstants, FunctionCallDef, NonArrowType } from './interface.js';
export interface ServiceDescription { export interface ServiceDescription {
serviceId: string; serviceId: string;

View File

@ -1,10 +1,10 @@
import { FluenceConnection, ParticleHandler } from '@fluencelabs/interfaces'; import { FluenceConnection, ParticleHandler } from '@fluencelabs/interfaces';
import { keyPairFromBase64Sk } from '@fluencelabs/keypair'; import { keyPairFromBase64Sk } from '@fluencelabs/keypair';
import { PeerIdB58 } from './commonTypes';
import { FluencePeer } from '../index';
import log from 'loglevel'; import log from 'loglevel';
import { PeerIdB58 } from './commonTypes.js';
import { FluencePeer } from '../index.js';
interface EphemeralConfig { interface EphemeralConfig {
peers: Array<{ peers: Array<{
peerId: PeerIdB58; peerId: PeerIdB58;

View File

@ -19,10 +19,10 @@ import log from 'loglevel';
import platform from 'platform'; import platform from 'platform';
import { LogLevel } from '@fluencelabs/avm'; import { LogLevel } from '@fluencelabs/avm';
import { CallServiceData, CallServiceResult, CallServiceResultType, ResultCodes } from './commonTypes'; import { CallServiceData, CallServiceResult, CallServiceResultType, ResultCodes } from './commonTypes.js';
import { FluencePeer } from './FluencePeer'; import { FluencePeer } from './FluencePeer.js';
import { ParticleExecutionStage } from './Particle'; import { ParticleExecutionStage } from './Particle.js';
import Buffer from './Buffer'; import Buffer from './Buffer.js';
export const MakeServiceCall = export const MakeServiceCall =
(fn: (args: any[]) => CallServiceResultType) => (fn: (args: any[]) => CallServiceResultType) =>

View File

@ -1,2 +1,2 @@
export * from './internal/builtins/Sig'; export * from './internal/builtins/Sig.js';
export { registerSig } from './internal/_aqua/services'; export { registerSig } from './internal/_aqua/services.js';