Skip to content

Commit e9d9da8

Browse files
martines3000martines3000
committed
fix: resolve issues with import type 
1 parent 8101bef commit e9d9da8

23 files changed

+96
-104
lines changed

‎apps/issuer/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { SupportedCredential } from '@blockchain-lab-um/oidc-types';
1+
import { SupportedCredential } from '@blockchain-lab-um/oidc-types';
22

33
/**
44
* This file is used to store environment variables that are used in the app.

‎apps/issuer/src/app.controller.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {
1+
import {
22
CredentialOfferRequest,
33
CredentialRequest,
44
CredentialResponse,
@@ -18,10 +18,10 @@ import {
1818
Query,
1919
Response,
2020
} from '@nestjs/common';
21-
import type { FastifyReply } from 'fastify';
21+
import { FastifyReply } from 'fastify';
2222
import qs from 'qs';
2323

24-
import type { AppService } from './app.service.js';
24+
import { AppService } from './app.service.js';
2525

2626
@Controller()
2727
export class AppController {

‎apps/issuer/src/app.module.spec.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import {
2-
type CredentialOffer,
3-
type CredentialOfferRequest,
4-
type CredentialRequest,
5-
type SupportedCredential,
2+
CredentialOffer,
3+
CredentialOfferRequest,
4+
CredentialRequest,
5+
SupportedCredential,
66
TOKEN_ERRORS,
7-
type TokenRequest,
8-
type TokenResponse,
7+
TokenRequest,
8+
TokenResponse,
99
} from '@blockchain-lab-um/oidc-types';
1010
import { qsCustomDecoder } from '@blockchain-lab-um/utils';
1111
import {
1212
FastifyAdapter,
13-
type NestFastifyApplication,
13+
NestFastifyApplication,
1414
} from '@nestjs/platform-fastify';
15-
import { Test, type TestingModule } from '@nestjs/testing';
16-
import type { RawServerDefault } from 'fastify';
15+
import { Test, TestingModule } from '@nestjs/testing';
16+
import { RawServerDefault } from 'fastify';
1717
import qs from 'qs';
1818
import request from 'supertest';
1919

‎apps/issuer/src/app.service.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import {
44
isValidAuthorizationHeader,
55
} from '@blockchain-lab-um/oidc-rp-plugin';
66
import {
7-
type CredentialOfferRequest,
8-
type CredentialRequest,
9-
type CredentialResponse,
10-
type IssuerServerMetadata,
7+
CredentialOfferRequest,
8+
CredentialRequest,
9+
CredentialResponse,
10+
IssuerServerMetadata,
1111
TOKEN_ERRORS,
12-
type TokenRequest,
13-
type TokenResponse,
12+
TokenRequest,
13+
TokenResponse,
1414
} from '@blockchain-lab-um/oidc-types';
1515
import { Injectable } from '@nestjs/common';
16-
import type { ConfigService } from '@nestjs/config';
16+
import { ConfigService } from '@nestjs/config';
1717

18-
import type { IConfig } from './config/configuration.js';
19-
import type { AgentService } from './modules/agent/agent.service.js';
20-
import type { DatastoreService } from './modules/datastore/datastore.service.js';
18+
import { IConfig } from './config/configuration.js';
19+
import { AgentService } from './modules/agent/agent.service.js';
20+
import { DatastoreService } from './modules/datastore/datastore.service.js';
2121

2222
@Injectable()
2323
export class AppService {

‎apps/issuer/src/config/configuration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { SupportedCredential } from '@blockchain-lab-um/oidc-types';
1+
import { SupportedCredential } from '@blockchain-lab-um/oidc-types';
22
import { ConfigModule } from '@nestjs/config';
33
import Joi from 'joi';
44

‎apps/issuer/src/filters/all-exceptions.filter.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { DetailedError } from '@blockchain-lab-um/oidc-rp-plugin';
22
import {
3-
type ArgumentsHost,
3+
ArgumentsHost,
44
Catch,
5-
type ExceptionFilter,
5+
ExceptionFilter,
66
HttpException,
77
HttpStatus,
88
} from '@nestjs/common';
9-
import type { FastifyReply } from 'fastify';
9+
import { FastifyReply } from 'fastify';
1010

1111
@Catch()
1212
export class AllExceptionsFilter implements ExceptionFilter {

‎apps/issuer/src/modules/agent/agent.service.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ import {
33
getDidKeyResolver,
44
} from '@blockchain-lab-um/did-provider-key';
55
import {
6-
type IOIDCRPPlugin,
6+
IOIDCRPPlugin,
77
OIDCRPPlugin,
88
isError,
99
privateKeyToDid,
1010
} from '@blockchain-lab-um/oidc-rp-plugin';
1111
import { Injectable } from '@nestjs/common';
12-
import type { ConfigService } from '@nestjs/config';
12+
import { ConfigService } from '@nestjs/config';
1313
import {
14-
type ICredentialPlugin,
15-
type IDIDManager,
16-
type IKeyManager,
17-
type IResolver,
18-
type MinimalImportableKey,
19-
type TAgent,
14+
ICredentialPlugin,
15+
IDIDManager,
16+
IKeyManager,
17+
IResolver,
18+
MinimalImportableKey,
19+
TAgent,
2020
createAgent,
2121
} from '@veramo/core';
2222
import { CredentialPlugin } from '@veramo/credential-w3c';
@@ -37,7 +37,7 @@ import { getResolver as getEthrResolver } from 'ethr-did-resolver';
3737
import { DataSource } from 'typeorm';
3838

3939
import {
40-
type IConfig,
40+
IConfig,
4141
loadSupportedCredentials,
4242
} from '../../config/configuration.js';
4343

‎apps/issuer/src/modules/datastore/datastore.interface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Credentials } from '@blockchain-lab-um/oidc-types';
1+
import { Credentials } from '@blockchain-lab-um/oidc-types';
22

33
export interface DataStoreObject<T> {
44
data: T;

‎apps/issuer/src/modules/datastore/datastore.service.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { ConfigService } from '@nestjs/config';
1+
import { ConfigService } from '@nestjs/config';
22
import { Cron, CronExpression } from '@nestjs/schedule';
33

4-
import type { IConfig } from '../../config/configuration.js';
5-
import type { UserSession, UserSessionStore } from './datastore.interface.js';
4+
import { IConfig } from '../../config/configuration.js';
5+
import { UserSession, UserSessionStore } from './datastore.interface.js';
66

77
export class DatastoreService {
88
private userSessionStore: UserSessionStore;

‎apps/issuer/tests/testAgent.ts

+6-9
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ import {
22
KeyDIDProvider,
33
getDidKeyResolver,
44
} from '@blockchain-lab-um/did-provider-key';
5+
import { IOIDCRPPlugin, OIDCRPPlugin } from '@blockchain-lab-um/oidc-rp-plugin';
56
import {
6-
type IOIDCRPPlugin,
7-
OIDCRPPlugin,
8-
} from '@blockchain-lab-um/oidc-rp-plugin';
9-
import {
10-
type ICredentialPlugin,
11-
type IDIDManager,
12-
type IKeyManager,
13-
type IResolver,
14-
type TAgent,
7+
ICredentialPlugin,
8+
IDIDManager,
9+
IKeyManager,
10+
IResolver,
11+
TAgent,
1512
createAgent,
1613
} from '@veramo/core';
1714
import { CredentialPlugin } from '@veramo/credential-w3c';

‎apps/issuer/tests/utils.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import {
33
isError,
44
privateKeyToDid,
55
} from '@blockchain-lab-um/oidc-rp-plugin';
6-
import type { MinimalImportableKey } from '@veramo/core';
6+
import { MinimalImportableKey } from '@veramo/core';
77
import { bytesToBase64url, encodeBase64url } from '@veramo/utils';
88
import elliptic from 'elliptic';
99
import { sha256 } from 'ethereum-cryptography/sha256.js';
10-
import type { JWTPayload } from 'jose';
10+
import { JWTPayload } from 'jose';
1111
import { v4 as uuidv4 } from 'uuid';
1212

13-
import type { Agent } from './testAgent.js';
13+
import { Agent } from './testAgent.js';
1414

1515
const { ec: EC } = elliptic;
1616

‎apps/verifier/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { PresentationDefinition } from '@blockchain-lab-um/oidc-types';
1+
import { PresentationDefinition } from '@blockchain-lab-um/oidc-types';
22

33
/**
44
* This file is used to store environment variables that are used in the app.

‎apps/verifier/src/app.controller.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AuthorizationResponse } from '@blockchain-lab-um/oidc-types';
1+
import { AuthorizationResponse } from '@blockchain-lab-um/oidc-types';
22
import {
33
BadRequestException,
44
Body,
@@ -10,9 +10,9 @@ import {
1010
Query,
1111
} from '@nestjs/common';
1212

13-
import type { AuthorizationRequest } from './app.interface.js';
14-
import type { AppService } from './app.service.js';
15-
import type { VerificationResults } from './modules/datastore/datastore.interface.js';
13+
import { AuthorizationRequest } from './app.interface.js';
14+
import { AppService } from './app.service.js';
15+
import { VerificationResults } from './modules/datastore/datastore.interface.js';
1616

1717
@Controller()
1818
export class AppController {

‎apps/verifier/src/app.interface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AuthorizationResponse } from '@blockchain-lab-um/oidc-types';
1+
import { AuthorizationResponse } from '@blockchain-lab-um/oidc-types';
22

33
export interface AuthorizationRequest {
44
credentialType: string;

‎apps/verifier/src/app.module.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { randomUUID } from 'node:crypto';
2-
import type { PresentationDefinition } from '@blockchain-lab-um/oidc-types';
2+
import { PresentationDefinition } from '@blockchain-lab-um/oidc-types';
33
import {
44
FastifyAdapter,
5-
type NestFastifyApplication,
5+
NestFastifyApplication,
66
} from '@nestjs/platform-fastify';
7-
import { Test, type TestingModule } from '@nestjs/testing';
7+
import { Test, TestingModule } from '@nestjs/testing';
88
import { PEX } from '@sphereon/pex';
9-
import type { RawServerDefault } from 'fastify';
9+
import { RawServerDefault } from 'fastify';
1010
import * as qs from 'qs';
1111
import request from 'supertest';
1212

‎apps/verifier/src/app.service.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { DetailedError, isError } from '@blockchain-lab-um/oidc-rp-plugin';
2-
import type {
2+
import {
33
AuthorizationResponse,
44
PresentationDefinition,
55
} from '@blockchain-lab-um/oidc-types';
66
import { Injectable } from '@nestjs/common';
7-
import type { ConfigService } from '@nestjs/config';
7+
import { ConfigService } from '@nestjs/config';
88

9-
import type { AuthorizationRequest } from './app.interface.js';
10-
import type { IConfig } from './config/configuration.js';
11-
import type { AgentService } from './modules/agent/agent.service.js';
12-
import type { VerificationResults } from './modules/datastore/datastore.interface.js';
13-
import type { DatastoreService } from './modules/datastore/datastore.service.js';
9+
import { AuthorizationRequest } from './app.interface.js';
10+
import { IConfig } from './config/configuration.js';
11+
import { AgentService } from './modules/agent/agent.service.js';
12+
import { VerificationResults } from './modules/datastore/datastore.interface.js';
13+
import { DatastoreService } from './modules/datastore/datastore.service.js';
1414

1515
@Injectable()
1616
export class AppService {

‎apps/verifier/src/config/configuration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { PresentationDefinition } from '@blockchain-lab-um/oidc-types';
1+
import { PresentationDefinition } from '@blockchain-lab-um/oidc-types';
22
import { ConfigModule } from '@nestjs/config';
33
import Joi from 'joi';
44

‎apps/verifier/src/filters/all-exceptions.filter.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { DetailedError } from '@blockchain-lab-um/oidc-rp-plugin';
22
import {
3-
type ArgumentsHost,
3+
ArgumentsHost,
44
Catch,
5-
type ExceptionFilter,
5+
ExceptionFilter,
66
HttpException,
77
HttpStatus,
88
} from '@nestjs/common';
9-
import type { FastifyReply } from 'fastify';
9+
import { FastifyReply } from 'fastify';
1010

1111
@Catch()
1212
export class AllExceptionsFilter implements ExceptionFilter {

‎apps/verifier/src/modules/agent/agent.service.ts

+10-13
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
import {
2-
type IOIDCRPPlugin,
3-
OIDCRPPlugin,
4-
} from '@blockchain-lab-um/oidc-rp-plugin';
1+
import { IOIDCRPPlugin, OIDCRPPlugin } from '@blockchain-lab-um/oidc-rp-plugin';
52
import { Injectable } from '@nestjs/common';
6-
import type { ConfigService } from '@nestjs/config';
3+
import { ConfigService } from '@nestjs/config';
74
import {
8-
type ICredentialPlugin,
9-
type IDIDManager,
10-
type IKeyManager,
11-
type IResolver,
12-
type TAgent,
5+
ICredentialPlugin,
6+
IDIDManager,
7+
IKeyManager,
8+
IResolver,
9+
TAgent,
1310
createAgent,
1411
} from '@veramo/core';
1512
import {
1613
CredentialIssuerEIP712,
17-
type ICredentialIssuerEIP712,
14+
ICredentialIssuerEIP712,
1815
} from '@veramo/credential-eip712';
1916
import {
2017
CredentialIssuerLD,
21-
type ICredentialIssuerLD,
18+
ICredentialIssuerLD,
2219
LdDefaultContexts,
2320
VeramoEcdsaSecp256k1RecoverySignature2020,
2421
VeramoEd25519Signature2018,
@@ -41,7 +38,7 @@ import { Resolver } from 'did-resolver';
4138
import { getResolver as getEthrResolver } from 'ethr-did-resolver';
4239
import { DataSource } from 'typeorm';
4340

44-
import type { IConfig } from '../../config/configuration.js';
41+
import { IConfig } from '../../config/configuration.js';
4542

4643
@Injectable()
4744
export class AgentService {

‎apps/verifier/src/modules/datastore/datastore.service.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { ConfigService } from '@nestjs/config';
1+
import { ConfigService } from '@nestjs/config';
22
import { Cron, CronExpression } from '@nestjs/schedule';
33

4-
import type { IConfig } from '../../config/configuration.js';
5-
import type {
4+
import { IConfig } from '../../config/configuration.js';
5+
import {
66
UserSession,
77
UserSessionStore,
88
VerificationResults,

‎apps/verifier/tests/testAgent.ts

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1+
import { IOIDCRPPlugin, OIDCRPPlugin } from '@blockchain-lab-um/oidc-rp-plugin';
12
import {
2-
type IOIDCRPPlugin,
3-
OIDCRPPlugin,
4-
} from '@blockchain-lab-um/oidc-rp-plugin';
5-
import {
6-
type ICredentialPlugin,
7-
type IDIDManager,
8-
type IKeyManager,
9-
type IResolver,
10-
type TAgent,
3+
ICredentialPlugin,
4+
IDIDManager,
5+
IKeyManager,
6+
IResolver,
7+
TAgent,
118
createAgent,
129
} from '@veramo/core';
1310
import {
1411
CredentialIssuerEIP712,
15-
type ICredentialIssuerEIP712,
12+
ICredentialIssuerEIP712,
1613
} from '@veramo/credential-eip712';
1714
import {
1815
CredentialIssuerLD,
19-
type ICredentialIssuerLD,
16+
ICredentialIssuerLD,
2017
LdDefaultContexts,
2118
VeramoEcdsaSecp256k1RecoverySignature2020,
2219
VeramoEd25519Signature2018,

‎apps/verifier/tests/utils.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { isError, privateKeyToDid } from '@blockchain-lab-um/oidc-rp-plugin';
2-
import type { IIdentifier, MinimalImportableKey } from '@veramo/core';
2+
import { IIdentifier, MinimalImportableKey } from '@veramo/core';
33
import { bytesToBase64url, encodeBase64url } from '@veramo/utils';
44
import elliptic from 'elliptic';
55
import { sha256 } from 'ethereum-cryptography/sha256.js';
6-
import type { JWTPayload } from 'jose';
6+
import { JWTPayload } from 'jose';
77
import { v4 as uuidv4 } from 'uuid';
88

9-
import type { Agent } from './testAgent.js';
9+
import { Agent } from './testAgent.js';
1010

1111
const { ec: EC } = elliptic;
1212

0 commit comments

Comments
 (0)