diff --git a/src/authentication/DPoPWebIdExtractor.ts b/src/authentication/DPoPWebIdExtractor.ts index 9af571ca0..9d73ae6a1 100644 --- a/src/authentication/DPoPWebIdExtractor.ts +++ b/src/authentication/DPoPWebIdExtractor.ts @@ -1,6 +1,6 @@ import type { RequestMethod } from '@solid/access-token-verifier'; import { createSolidTokenVerifier } from '@solid/access-token-verifier'; -import type { TargetExtractor } from '../ldp/http/TargetExtractor'; +import type { TargetExtractor } from '../http/input/identifier/TargetExtractor'; import { getLoggerFor } from '../logging/LogUtil'; import type { HttpRequest } from '../server/HttpRequest'; import { BadRequestHttpError } from '../util/errors/BadRequestHttpError'; diff --git a/src/authorization/AllStaticReader.ts b/src/authorization/AllStaticReader.ts index a520aaa76..9b9822624 100644 --- a/src/authorization/AllStaticReader.ts +++ b/src/authorization/AllStaticReader.ts @@ -1,7 +1,7 @@ import type { CredentialGroup } from '../authentication/Credentials'; -import type { Permission, PermissionSet } from '../ldp/permissions/Permissions'; import type { PermissionReaderInput } from './PermissionReader'; import { PermissionReader } from './PermissionReader'; +import type { Permission, PermissionSet } from './permissions/Permissions'; /** * PermissionReader which sets all permissions to true or false diff --git a/src/authorization/Authorizer.ts b/src/authorization/Authorizer.ts index d47389795..eeb5c4f04 100644 --- a/src/authorization/Authorizer.ts +++ b/src/authorization/Authorizer.ts @@ -1,7 +1,7 @@ import type { CredentialSet } from '../authentication/Credentials'; -import type { AccessMode, PermissionSet } from '../ldp/permissions/Permissions'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { AsyncHandler } from '../util/handlers/AsyncHandler'; +import type { AccessMode, PermissionSet } from './permissions/Permissions'; export interface AuthorizerInput { /** diff --git a/src/authorization/AuxiliaryReader.ts b/src/authorization/AuxiliaryReader.ts index 19e45dd25..092a24bc5 100644 --- a/src/authorization/AuxiliaryReader.ts +++ b/src/authorization/AuxiliaryReader.ts @@ -1,10 +1,9 @@ -import type { AuxiliaryStrategy } from '../ldp/auxiliary/AuxiliaryStrategy'; -import type { PermissionSet } from '../ldp/permissions/Permissions'; +import type { AuxiliaryStrategy } from '../http/auxiliary/AuxiliaryStrategy'; import { getLoggerFor } from '../logging/LogUtil'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; - import type { PermissionReaderInput } from './PermissionReader'; import { PermissionReader } from './PermissionReader'; +import type { PermissionSet } from './permissions/Permissions'; /** * A PermissionReader for auxiliary resources such as acl or shape resources. diff --git a/src/authorization/OwnerPermissionReader.ts b/src/authorization/OwnerPermissionReader.ts index f0b3b7549..c752cd1c4 100644 --- a/src/authorization/OwnerPermissionReader.ts +++ b/src/authorization/OwnerPermissionReader.ts @@ -1,13 +1,13 @@ import { CredentialGroup } from '../authentication/Credentials'; +import type { AuxiliaryIdentifierStrategy } from '../http/auxiliary/AuxiliaryIdentifierStrategy'; import type { AccountSettings, AccountStore } from '../identity/interaction/email-password/storage/AccountStore'; -import type { AuxiliaryIdentifierStrategy } from '../ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import type { AclPermission } from '../ldp/permissions/AclPermission'; -import type { PermissionSet } from '../ldp/permissions/Permissions'; import { getLoggerFor } from '../logging/LogUtil'; import { createErrorMessage } from '../util/errors/ErrorUtil'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; import type { PermissionReaderInput } from './PermissionReader'; import { PermissionReader } from './PermissionReader'; +import type { AclPermission } from './permissions/AclPermission'; +import type { PermissionSet } from './permissions/Permissions'; /** * Allows control access if the request is being made by the owner of the pod containing the resource. diff --git a/src/authorization/PathBasedReader.ts b/src/authorization/PathBasedReader.ts index 5dfe92cb1..7e8ea1e2b 100644 --- a/src/authorization/PathBasedReader.ts +++ b/src/authorization/PathBasedReader.ts @@ -1,9 +1,9 @@ -import type { PermissionSet } from '../ldp/permissions/Permissions'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; import { ensureTrailingSlash, trimTrailingSlashes } from '../util/PathUtil'; import type { PermissionReaderInput } from './PermissionReader'; import { PermissionReader } from './PermissionReader'; +import type { PermissionSet } from './permissions/Permissions'; /** * Redirects requests to specific PermissionReaders based on their identifier. diff --git a/src/authorization/PermissionBasedAuthorizer.ts b/src/authorization/PermissionBasedAuthorizer.ts index e1adfd832..a8153d903 100644 --- a/src/authorization/PermissionBasedAuthorizer.ts +++ b/src/authorization/PermissionBasedAuthorizer.ts @@ -1,10 +1,10 @@ import type { CredentialSet } from '../authentication/Credentials'; -import type { AccessMode, PermissionSet } from '../ldp/permissions/Permissions'; import { getLoggerFor } from '../logging/LogUtil'; import { ForbiddenHttpError } from '../util/errors/ForbiddenHttpError'; import { UnauthorizedHttpError } from '../util/errors/UnauthorizedHttpError'; import type { AuthorizerInput } from './Authorizer'; import { Authorizer } from './Authorizer'; +import type { AccessMode, PermissionSet } from './permissions/Permissions'; /** * Authorizer that bases its decision on the output it gets from its PermissionReader. diff --git a/src/authorization/PermissionReader.ts b/src/authorization/PermissionReader.ts index 3c90ba5d6..7ec777c53 100644 --- a/src/authorization/PermissionReader.ts +++ b/src/authorization/PermissionReader.ts @@ -1,7 +1,7 @@ import type { CredentialSet } from '../authentication/Credentials'; -import type { PermissionSet } from '../ldp/permissions/Permissions'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { AsyncHandler } from '../util/handlers/AsyncHandler'; +import type { PermissionSet } from './permissions/Permissions'; export interface PermissionReaderInput { /** diff --git a/src/authorization/UnionPermissionReader.ts b/src/authorization/UnionPermissionReader.ts index 71c4e87fa..34bd41743 100644 --- a/src/authorization/UnionPermissionReader.ts +++ b/src/authorization/UnionPermissionReader.ts @@ -1,7 +1,7 @@ import type { CredentialGroup } from '../authentication/Credentials'; -import type { Permission, PermissionSet } from '../ldp/permissions/Permissions'; import { UnionHandler } from '../util/handlers/UnionHandler'; import type { PermissionReader } from './PermissionReader'; +import type { Permission, PermissionSet } from './permissions/Permissions'; /** * Combines the results of multiple PermissionReaders. diff --git a/src/authorization/WebAclReader.ts b/src/authorization/WebAclReader.ts index 0da182072..abdd1aa24 100644 --- a/src/authorization/WebAclReader.ts +++ b/src/authorization/WebAclReader.ts @@ -2,13 +2,9 @@ import type { Quad, Term } from 'n3'; import { Store } from 'n3'; import { CredentialGroup } from '../authentication/Credentials'; import type { Credential, CredentialSet } from '../authentication/Credentials'; -import type { AuxiliaryIdentifierStrategy } from '../ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import { AclMode } from '../ldp/permissions/AclPermission'; -import type { AclPermission } from '../ldp/permissions/AclPermission'; -import type { PermissionSet } from '../ldp/permissions/Permissions'; -import { AccessMode } from '../ldp/permissions/Permissions'; -import type { Representation } from '../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { AuxiliaryIdentifierStrategy } from '../http/auxiliary/AuxiliaryIdentifierStrategy'; +import type { Representation } from '../http/representation/Representation'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import type { ResourceStore } from '../storage/ResourceStore'; import { INTERNAL_QUADS } from '../util/ContentTypes'; @@ -19,9 +15,13 @@ import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; import type { IdentifierStrategy } from '../util/identifiers/IdentifierStrategy'; import { readableToQuads } from '../util/StreamUtil'; import { ACL, RDF } from '../util/Vocabularies'; -import type { AccessChecker } from './access-checkers/AccessChecker'; +import type { AccessChecker } from './access/AccessChecker'; import type { PermissionReaderInput } from './PermissionReader'; import { PermissionReader } from './PermissionReader'; +import type { AclPermission } from './permissions/AclPermission'; +import { AclMode } from './permissions/AclPermission'; +import { AccessMode } from './permissions/Permissions'; +import type { PermissionSet } from './permissions/Permissions'; const modesMap: Record = { [ACL.Read]: AccessMode.read, diff --git a/src/authorization/access-checkers/AccessChecker.ts b/src/authorization/access/AccessChecker.ts similarity index 100% rename from src/authorization/access-checkers/AccessChecker.ts rename to src/authorization/access/AccessChecker.ts diff --git a/src/authorization/access-checkers/AgentAccessChecker.ts b/src/authorization/access/AgentAccessChecker.ts similarity index 100% rename from src/authorization/access-checkers/AgentAccessChecker.ts rename to src/authorization/access/AgentAccessChecker.ts diff --git a/src/authorization/access-checkers/AgentClassAccessChecker.ts b/src/authorization/access/AgentClassAccessChecker.ts similarity index 100% rename from src/authorization/access-checkers/AgentClassAccessChecker.ts rename to src/authorization/access/AgentClassAccessChecker.ts diff --git a/src/authorization/access-checkers/AgentGroupAccessChecker.ts b/src/authorization/access/AgentGroupAccessChecker.ts similarity index 97% rename from src/authorization/access-checkers/AgentGroupAccessChecker.ts rename to src/authorization/access/AgentGroupAccessChecker.ts index 47baae7dc..b56cc537d 100644 --- a/src/authorization/access-checkers/AgentGroupAccessChecker.ts +++ b/src/authorization/access/AgentGroupAccessChecker.ts @@ -1,6 +1,5 @@ import type { Store, Term } from 'n3'; - -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { RepresentationConverter } from '../../storage/conversion/RepresentationConverter'; import type { ExpiringStorage } from '../../storage/keyvalue/ExpiringStorage'; import { fetchDataset } from '../../util/FetchUtil'; diff --git a/src/ldp/permissions/AclPermission.ts b/src/authorization/permissions/AclPermission.ts similarity index 100% rename from src/ldp/permissions/AclPermission.ts rename to src/authorization/permissions/AclPermission.ts diff --git a/src/ldp/permissions/MethodModesExtractor.ts b/src/authorization/permissions/MethodModesExtractor.ts similarity index 95% rename from src/ldp/permissions/MethodModesExtractor.ts rename to src/authorization/permissions/MethodModesExtractor.ts index 3904ecde1..2692a9956 100644 --- a/src/ldp/permissions/MethodModesExtractor.ts +++ b/src/authorization/permissions/MethodModesExtractor.ts @@ -1,5 +1,5 @@ +import type { Operation } from '../../http/Operation'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import type { Operation } from '../operations/Operation'; import { ModesExtractor } from './ModesExtractor'; import { AccessMode } from './Permissions'; diff --git a/src/ldp/permissions/ModesExtractor.ts b/src/authorization/permissions/ModesExtractor.ts similarity index 77% rename from src/ldp/permissions/ModesExtractor.ts rename to src/authorization/permissions/ModesExtractor.ts index f1a9d8517..a62691834 100644 --- a/src/ldp/permissions/ModesExtractor.ts +++ b/src/authorization/permissions/ModesExtractor.ts @@ -1,5 +1,5 @@ +import type { Operation } from '../../http/Operation'; import { AsyncHandler } from '../../util/handlers/AsyncHandler'; -import type { Operation } from '../operations/Operation'; import type { AccessMode } from './Permissions'; export abstract class ModesExtractor extends AsyncHandler> {} diff --git a/src/ldp/permissions/Permissions.ts b/src/authorization/permissions/Permissions.ts similarity index 100% rename from src/ldp/permissions/Permissions.ts rename to src/authorization/permissions/Permissions.ts diff --git a/src/ldp/permissions/SparqlPatchModesExtractor.ts b/src/authorization/permissions/SparqlPatchModesExtractor.ts similarity index 92% rename from src/ldp/permissions/SparqlPatchModesExtractor.ts rename to src/authorization/permissions/SparqlPatchModesExtractor.ts index b65eae333..1d14b46b4 100644 --- a/src/ldp/permissions/SparqlPatchModesExtractor.ts +++ b/src/authorization/permissions/SparqlPatchModesExtractor.ts @@ -1,8 +1,8 @@ import { Algebra } from 'sparqlalgebrajs'; +import type { Operation } from '../../http/Operation'; +import type { Representation } from '../../http/representation/Representation'; +import type { SparqlUpdatePatch } from '../../http/representation/SparqlUpdatePatch'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import type { SparqlUpdatePatch } from '../http/SparqlUpdatePatch'; -import type { Operation } from '../operations/Operation'; -import type { Representation } from '../representation/Representation'; import { ModesExtractor } from './ModesExtractor'; import { AccessMode } from './Permissions'; diff --git a/src/ldp/operations/Operation.ts b/src/http/Operation.ts similarity index 63% rename from src/ldp/operations/Operation.ts rename to src/http/Operation.ts index 613a91372..4fe768afe 100644 --- a/src/ldp/operations/Operation.ts +++ b/src/http/Operation.ts @@ -1,8 +1,8 @@ -import type { Conditions } from '../../storage/Conditions'; -import type { PermissionSet } from '../permissions/Permissions'; -import type { Representation } from '../representation/Representation'; -import type { RepresentationPreferences } from '../representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../representation/ResourceIdentifier'; +import type { PermissionSet } from '../authorization/permissions/Permissions'; +import type { Conditions } from '../storage/Conditions'; +import type { Representation } from './representation/Representation'; +import type { RepresentationPreferences } from './representation/RepresentationPreferences'; +import type { ResourceIdentifier } from './representation/ResourceIdentifier'; /** * A single REST operation. diff --git a/src/ldp/UnsecureWebSocketsProtocol.ts b/src/http/UnsecureWebSocketsProtocol.ts similarity index 100% rename from src/ldp/UnsecureWebSocketsProtocol.ts rename to src/http/UnsecureWebSocketsProtocol.ts diff --git a/src/ldp/auxiliary/AuxiliaryIdentifierStrategy.ts b/src/http/auxiliary/AuxiliaryIdentifierStrategy.ts similarity index 100% rename from src/ldp/auxiliary/AuxiliaryIdentifierStrategy.ts rename to src/http/auxiliary/AuxiliaryIdentifierStrategy.ts diff --git a/src/ldp/auxiliary/AuxiliaryStrategy.ts b/src/http/auxiliary/AuxiliaryStrategy.ts similarity index 100% rename from src/ldp/auxiliary/AuxiliaryStrategy.ts rename to src/http/auxiliary/AuxiliaryStrategy.ts diff --git a/src/ldp/auxiliary/ComposedAuxiliaryStrategy.ts b/src/http/auxiliary/ComposedAuxiliaryStrategy.ts similarity index 100% rename from src/ldp/auxiliary/ComposedAuxiliaryStrategy.ts rename to src/http/auxiliary/ComposedAuxiliaryStrategy.ts diff --git a/src/ldp/auxiliary/LinkMetadataGenerator.ts b/src/http/auxiliary/LinkMetadataGenerator.ts similarity index 100% rename from src/ldp/auxiliary/LinkMetadataGenerator.ts rename to src/http/auxiliary/LinkMetadataGenerator.ts diff --git a/src/ldp/auxiliary/MetadataGenerator.ts b/src/http/auxiliary/MetadataGenerator.ts similarity index 100% rename from src/ldp/auxiliary/MetadataGenerator.ts rename to src/http/auxiliary/MetadataGenerator.ts diff --git a/src/ldp/auxiliary/RdfValidator.ts b/src/http/auxiliary/RdfValidator.ts similarity index 100% rename from src/ldp/auxiliary/RdfValidator.ts rename to src/http/auxiliary/RdfValidator.ts diff --git a/src/ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy.ts b/src/http/auxiliary/RoutingAuxiliaryIdentifierStrategy.ts similarity index 100% rename from src/ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy.ts rename to src/http/auxiliary/RoutingAuxiliaryIdentifierStrategy.ts diff --git a/src/ldp/auxiliary/RoutingAuxiliaryStrategy.ts b/src/http/auxiliary/RoutingAuxiliaryStrategy.ts similarity index 100% rename from src/ldp/auxiliary/RoutingAuxiliaryStrategy.ts rename to src/http/auxiliary/RoutingAuxiliaryStrategy.ts diff --git a/src/ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy.ts b/src/http/auxiliary/SuffixAuxiliaryIdentifierStrategy.ts similarity index 100% rename from src/ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy.ts rename to src/http/auxiliary/SuffixAuxiliaryIdentifierStrategy.ts diff --git a/src/ldp/auxiliary/Validator.ts b/src/http/auxiliary/Validator.ts similarity index 100% rename from src/ldp/auxiliary/Validator.ts rename to src/http/auxiliary/Validator.ts diff --git a/src/ldp/http/BasicRequestParser.ts b/src/http/input/BasicRequestParser.ts similarity index 89% rename from src/ldp/http/BasicRequestParser.ts rename to src/http/input/BasicRequestParser.ts index ca31f1b66..5698057cb 100644 --- a/src/ldp/http/BasicRequestParser.ts +++ b/src/http/input/BasicRequestParser.ts @@ -1,13 +1,13 @@ import type { HttpRequest } from '../../server/HttpRequest'; import { InternalServerError } from '../../util/errors/InternalServerError'; -import type { Operation } from '../operations/Operation'; +import type { Operation } from '../Operation'; import { RepresentationMetadata } from '../representation/RepresentationMetadata'; -import type { BodyParser } from './BodyParser'; +import type { BodyParser } from './body/BodyParser'; import type { ConditionsParser } from './conditions/ConditionsParser'; +import type { TargetExtractor } from './identifier/TargetExtractor'; import type { MetadataParser } from './metadata/MetadataParser'; -import type { PreferenceParser } from './PreferenceParser'; +import type { PreferenceParser } from './preferences/PreferenceParser'; import { RequestParser } from './RequestParser'; -import type { TargetExtractor } from './TargetExtractor'; /** * Input parsers required for a {@link BasicRequestParser}. diff --git a/src/ldp/http/RequestParser.ts b/src/http/input/RequestParser.ts similarity index 82% rename from src/ldp/http/RequestParser.ts rename to src/http/input/RequestParser.ts index 281793dc4..06f2d3797 100644 --- a/src/ldp/http/RequestParser.ts +++ b/src/http/input/RequestParser.ts @@ -1,6 +1,6 @@ import type { HttpRequest } from '../../server/HttpRequest'; import { AsyncHandler } from '../../util/handlers/AsyncHandler'; -import type { Operation } from '../operations/Operation'; +import type { Operation } from '../Operation'; /** * Converts an incoming HttpRequest to an Operation. diff --git a/src/ldp/http/BodyParser.ts b/src/http/input/body/BodyParser.ts similarity index 62% rename from src/ldp/http/BodyParser.ts rename to src/http/input/body/BodyParser.ts index 0e36aff2b..1f20f2dcf 100644 --- a/src/ldp/http/BodyParser.ts +++ b/src/http/input/body/BodyParser.ts @@ -1,7 +1,7 @@ -import type { HttpRequest } from '../../server/HttpRequest'; -import { AsyncHandler } from '../../util/handlers/AsyncHandler'; -import type { Representation } from '../representation/Representation'; -import type { RepresentationMetadata } from '../representation/RepresentationMetadata'; +import type { HttpRequest } from '../../../server/HttpRequest'; +import { AsyncHandler } from '../../../util/handlers/AsyncHandler'; +import type { Representation } from '../../representation/Representation'; +import type { RepresentationMetadata } from '../../representation/RepresentationMetadata'; export interface BodyParserArgs { /** diff --git a/src/ldp/http/RawBodyParser.ts b/src/http/input/body/RawBodyParser.ts similarity index 85% rename from src/ldp/http/RawBodyParser.ts rename to src/http/input/body/RawBodyParser.ts index b3864e63a..08f09bded 100644 --- a/src/ldp/http/RawBodyParser.ts +++ b/src/http/input/body/RawBodyParser.ts @@ -1,7 +1,7 @@ -import { getLoggerFor } from '../../logging/LogUtil'; -import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; -import { BasicRepresentation } from '../representation/BasicRepresentation'; -import type { Representation } from '../representation/Representation'; +import { getLoggerFor } from '../../../logging/LogUtil'; +import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError'; +import { BasicRepresentation } from '../../representation/BasicRepresentation'; +import type { Representation } from '../../representation/Representation'; import type { BodyParserArgs } from './BodyParser'; import { BodyParser } from './BodyParser'; diff --git a/src/ldp/http/SparqlUpdateBodyParser.ts b/src/http/input/body/SparqlUpdateBodyParser.ts similarity index 71% rename from src/ldp/http/SparqlUpdateBodyParser.ts rename to src/http/input/body/SparqlUpdateBodyParser.ts index f0da06913..2e5333f01 100644 --- a/src/ldp/http/SparqlUpdateBodyParser.ts +++ b/src/http/input/body/SparqlUpdateBodyParser.ts @@ -1,14 +1,14 @@ import type { Algebra } from 'sparqlalgebrajs'; import { translate } from 'sparqlalgebrajs'; -import { getLoggerFor } from '../../logging/LogUtil'; -import { APPLICATION_SPARQL_UPDATE } from '../../util/ContentTypes'; -import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; -import { createErrorMessage } from '../../util/errors/ErrorUtil'; -import { UnsupportedMediaTypeHttpError } from '../../util/errors/UnsupportedMediaTypeHttpError'; -import { guardedStreamFrom, readableToString } from '../../util/StreamUtil'; +import { getLoggerFor } from '../../../logging/LogUtil'; +import { APPLICATION_SPARQL_UPDATE } from '../../../util/ContentTypes'; +import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError'; +import { createErrorMessage } from '../../../util/errors/ErrorUtil'; +import { UnsupportedMediaTypeHttpError } from '../../../util/errors/UnsupportedMediaTypeHttpError'; +import { guardedStreamFrom, readableToString } from '../../../util/StreamUtil'; +import type { SparqlUpdatePatch } from '../../representation/SparqlUpdatePatch'; import type { BodyParserArgs } from './BodyParser'; import { BodyParser } from './BodyParser'; -import type { SparqlUpdatePatch } from './SparqlUpdatePatch'; /** * {@link BodyParser} that supports `application/sparql-update` content. * Will convert the incoming update string to algebra in a {@link SparqlUpdatePatch}. diff --git a/src/ldp/http/conditions/BasicConditionsParser.ts b/src/http/input/conditions/BasicConditionsParser.ts similarity index 100% rename from src/ldp/http/conditions/BasicConditionsParser.ts rename to src/http/input/conditions/BasicConditionsParser.ts diff --git a/src/ldp/http/conditions/ConditionsParser.ts b/src/http/input/conditions/ConditionsParser.ts similarity index 100% rename from src/ldp/http/conditions/ConditionsParser.ts rename to src/http/input/conditions/ConditionsParser.ts diff --git a/src/ldp/http/OriginalUrlExtractor.ts b/src/http/input/identifier/OriginalUrlExtractor.ts similarity index 79% rename from src/ldp/http/OriginalUrlExtractor.ts rename to src/http/input/identifier/OriginalUrlExtractor.ts index 5e689daf3..7ae929294 100644 --- a/src/ldp/http/OriginalUrlExtractor.ts +++ b/src/http/input/identifier/OriginalUrlExtractor.ts @@ -1,10 +1,10 @@ import type { TLSSocket } from 'tls'; -import type { HttpRequest } from '../../server/HttpRequest'; -import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; -import { InternalServerError } from '../../util/errors/InternalServerError'; -import { parseForwarded } from '../../util/HeaderUtil'; -import { toCanonicalUriPath } from '../../util/PathUtil'; -import type { ResourceIdentifier } from '../representation/ResourceIdentifier'; +import type { HttpRequest } from '../../../server/HttpRequest'; +import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError'; +import { InternalServerError } from '../../../util/errors/InternalServerError'; +import { parseForwarded } from '../../../util/HeaderUtil'; +import { toCanonicalUriPath } from '../../../util/PathUtil'; +import type { ResourceIdentifier } from '../../representation/ResourceIdentifier'; import { TargetExtractor } from './TargetExtractor'; /** diff --git a/src/http/input/identifier/TargetExtractor.ts b/src/http/input/identifier/TargetExtractor.ts new file mode 100644 index 000000000..0a630b144 --- /dev/null +++ b/src/http/input/identifier/TargetExtractor.ts @@ -0,0 +1,8 @@ +import type { HttpRequest } from '../../../server/HttpRequest'; +import { AsyncHandler } from '../../../util/handlers/AsyncHandler'; +import type { ResourceIdentifier } from '../../representation/ResourceIdentifier'; + +/** + * Extracts a {@link ResourceIdentifier} from an incoming {@link HttpRequest}. + */ +export abstract class TargetExtractor extends AsyncHandler<{ request: HttpRequest }, ResourceIdentifier> {} diff --git a/src/ldp/http/metadata/ContentTypeParser.ts b/src/http/input/metadata/ContentTypeParser.ts similarity index 100% rename from src/ldp/http/metadata/ContentTypeParser.ts rename to src/http/input/metadata/ContentTypeParser.ts diff --git a/src/ldp/http/metadata/LinkRelParser.ts b/src/http/input/metadata/LinkRelParser.ts similarity index 100% rename from src/ldp/http/metadata/LinkRelParser.ts rename to src/http/input/metadata/LinkRelParser.ts diff --git a/src/ldp/http/metadata/MetadataParser.ts b/src/http/input/metadata/MetadataParser.ts similarity index 100% rename from src/ldp/http/metadata/MetadataParser.ts rename to src/http/input/metadata/MetadataParser.ts diff --git a/src/ldp/http/metadata/SlugParser.ts b/src/http/input/metadata/SlugParser.ts similarity index 100% rename from src/ldp/http/metadata/SlugParser.ts rename to src/http/input/metadata/SlugParser.ts diff --git a/src/ldp/http/AcceptPreferenceParser.ts b/src/http/input/preferences/AcceptPreferenceParser.ts similarity index 86% rename from src/ldp/http/AcceptPreferenceParser.ts rename to src/http/input/preferences/AcceptPreferenceParser.ts index df0bd16b0..90fcd8ee9 100644 --- a/src/ldp/http/AcceptPreferenceParser.ts +++ b/src/http/input/preferences/AcceptPreferenceParser.ts @@ -1,13 +1,13 @@ -import type { HttpRequest } from '../../server/HttpRequest'; -import type { AcceptHeader } from '../../util/HeaderUtil'; +import type { HttpRequest } from '../../../server/HttpRequest'; +import type { AcceptHeader } from '../../../util/HeaderUtil'; import { parseAccept, parseAcceptCharset, parseAcceptEncoding, parseAcceptLanguage, parseAcceptDateTime, -} from '../../util/HeaderUtil'; -import type { RepresentationPreferences } from '../representation/RepresentationPreferences'; +} from '../../../util/HeaderUtil'; +import type { RepresentationPreferences } from '../../representation/RepresentationPreferences'; import { PreferenceParser } from './PreferenceParser'; const parsers: { diff --git a/src/ldp/http/PreferenceParser.ts b/src/http/input/preferences/PreferenceParser.ts similarity index 50% rename from src/ldp/http/PreferenceParser.ts rename to src/http/input/preferences/PreferenceParser.ts index f0000881a..d2dfd8c67 100644 --- a/src/ldp/http/PreferenceParser.ts +++ b/src/http/input/preferences/PreferenceParser.ts @@ -1,6 +1,6 @@ -import type { HttpRequest } from '../../server/HttpRequest'; -import { AsyncHandler } from '../../util/handlers/AsyncHandler'; -import type { RepresentationPreferences } from '../representation/RepresentationPreferences'; +import type { HttpRequest } from '../../../server/HttpRequest'; +import { AsyncHandler } from '../../../util/handlers/AsyncHandler'; +import type { RepresentationPreferences } from '../../representation/RepresentationPreferences'; /** * Creates {@link RepresentationPreferences} based on the incoming HTTP headers in a {@link HttpRequest}. diff --git a/src/ldp/operations/DeleteOperationHandler.ts b/src/http/ldp/DeleteOperationHandler.ts similarity index 85% rename from src/ldp/operations/DeleteOperationHandler.ts rename to src/http/ldp/DeleteOperationHandler.ts index 8f73fdef8..843a7d0ee 100644 --- a/src/ldp/operations/DeleteOperationHandler.ts +++ b/src/http/ldp/DeleteOperationHandler.ts @@ -1,7 +1,7 @@ import type { ResourceStore } from '../../storage/ResourceStore'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import { ResetResponseDescription } from '../http/response/ResetResponseDescription'; -import type { ResponseDescription } from '../http/response/ResponseDescription'; +import { ResetResponseDescription } from '../output/response/ResetResponseDescription'; +import type { ResponseDescription } from '../output/response/ResponseDescription'; import type { OperationHandlerInput } from './OperationHandler'; import { OperationHandler } from './OperationHandler'; diff --git a/src/ldp/operations/GetOperationHandler.ts b/src/http/ldp/GetOperationHandler.ts similarity index 86% rename from src/ldp/operations/GetOperationHandler.ts rename to src/http/ldp/GetOperationHandler.ts index d561aba73..6525016d1 100644 --- a/src/ldp/operations/GetOperationHandler.ts +++ b/src/http/ldp/GetOperationHandler.ts @@ -1,7 +1,7 @@ import type { ResourceStore } from '../../storage/ResourceStore'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import { OkResponseDescription } from '../http/response/OkResponseDescription'; -import type { ResponseDescription } from '../http/response/ResponseDescription'; +import { OkResponseDescription } from '../output/response/OkResponseDescription'; +import type { ResponseDescription } from '../output/response/ResponseDescription'; import type { OperationHandlerInput } from './OperationHandler'; import { OperationHandler } from './OperationHandler'; diff --git a/src/ldp/operations/HeadOperationHandler.ts b/src/http/ldp/HeadOperationHandler.ts similarity index 87% rename from src/ldp/operations/HeadOperationHandler.ts rename to src/http/ldp/HeadOperationHandler.ts index 9234a5189..6bb7676da 100644 --- a/src/ldp/operations/HeadOperationHandler.ts +++ b/src/http/ldp/HeadOperationHandler.ts @@ -1,7 +1,7 @@ import type { ResourceStore } from '../../storage/ResourceStore'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import { OkResponseDescription } from '../http/response/OkResponseDescription'; -import type { ResponseDescription } from '../http/response/ResponseDescription'; +import { OkResponseDescription } from '../output/response/OkResponseDescription'; +import type { ResponseDescription } from '../output/response/ResponseDescription'; import type { OperationHandlerInput } from './OperationHandler'; import { OperationHandler } from './OperationHandler'; diff --git a/src/ldp/operations/OperationHandler.ts b/src/http/ldp/OperationHandler.ts similarity index 69% rename from src/ldp/operations/OperationHandler.ts rename to src/http/ldp/OperationHandler.ts index 7758e7571..d3564fdc0 100644 --- a/src/ldp/operations/OperationHandler.ts +++ b/src/http/ldp/OperationHandler.ts @@ -1,6 +1,6 @@ import { AsyncHandler } from '../../util/handlers/AsyncHandler'; -import type { ResponseDescription } from '../http/response/ResponseDescription'; -import type { Operation } from './Operation'; +import type { Operation } from '../Operation'; +import type { ResponseDescription } from '../output/response/ResponseDescription'; export interface OperationHandlerInput { operation: Operation; diff --git a/src/ldp/operations/PatchOperationHandler.ts b/src/http/ldp/PatchOperationHandler.ts similarity index 88% rename from src/ldp/operations/PatchOperationHandler.ts rename to src/http/ldp/PatchOperationHandler.ts index d5ef4eab5..428824474 100644 --- a/src/ldp/operations/PatchOperationHandler.ts +++ b/src/http/ldp/PatchOperationHandler.ts @@ -2,9 +2,9 @@ import { getLoggerFor } from '../../logging/LogUtil'; import type { ResourceStore } from '../../storage/ResourceStore'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import type { Patch } from '../http/Patch'; -import { ResetResponseDescription } from '../http/response/ResetResponseDescription'; -import type { ResponseDescription } from '../http/response/ResponseDescription'; +import { ResetResponseDescription } from '../output/response/ResetResponseDescription'; +import type { ResponseDescription } from '../output/response/ResponseDescription'; +import type { Patch } from '../representation/Patch'; import type { OperationHandlerInput } from './OperationHandler'; import { OperationHandler } from './OperationHandler'; diff --git a/src/ldp/operations/PostOperationHandler.ts b/src/http/ldp/PostOperationHandler.ts similarity index 90% rename from src/ldp/operations/PostOperationHandler.ts rename to src/http/ldp/PostOperationHandler.ts index e77df7d54..b9e9e2425 100644 --- a/src/ldp/operations/PostOperationHandler.ts +++ b/src/http/ldp/PostOperationHandler.ts @@ -2,8 +2,8 @@ import { getLoggerFor } from '../../logging/LogUtil'; import type { ResourceStore } from '../../storage/ResourceStore'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import { CreatedResponseDescription } from '../http/response/CreatedResponseDescription'; -import type { ResponseDescription } from '../http/response/ResponseDescription'; +import { CreatedResponseDescription } from '../output/response/CreatedResponseDescription'; +import type { ResponseDescription } from '../output/response/ResponseDescription'; import type { OperationHandlerInput } from './OperationHandler'; import { OperationHandler } from './OperationHandler'; diff --git a/src/ldp/operations/PutOperationHandler.ts b/src/http/ldp/PutOperationHandler.ts similarity index 90% rename from src/ldp/operations/PutOperationHandler.ts rename to src/http/ldp/PutOperationHandler.ts index a2ca7e8e3..b256021c4 100644 --- a/src/ldp/operations/PutOperationHandler.ts +++ b/src/http/ldp/PutOperationHandler.ts @@ -2,8 +2,8 @@ import { getLoggerFor } from '../../logging/LogUtil'; import type { ResourceStore } from '../../storage/ResourceStore'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; -import { ResetResponseDescription } from '../http/response/ResetResponseDescription'; -import type { ResponseDescription } from '../http/response/ResponseDescription'; +import { ResetResponseDescription } from '../output/response/ResetResponseDescription'; +import type { ResponseDescription } from '../output/response/ResponseDescription'; import type { OperationHandlerInput } from './OperationHandler'; import { OperationHandler } from './OperationHandler'; diff --git a/src/ldp/operations/metadata/OperationMetadataCollector.ts b/src/http/ldp/metadata/OperationMetadataCollector.ts similarity index 92% rename from src/ldp/operations/metadata/OperationMetadataCollector.ts rename to src/http/ldp/metadata/OperationMetadataCollector.ts index fc9efd0f1..ba8645780 100644 --- a/src/ldp/operations/metadata/OperationMetadataCollector.ts +++ b/src/http/ldp/metadata/OperationMetadataCollector.ts @@ -1,6 +1,6 @@ import { AsyncHandler } from '../../../util/handlers/AsyncHandler'; +import type { Operation } from '../../Operation'; import type { RepresentationMetadata } from '../../representation/RepresentationMetadata'; -import type { Operation } from '../Operation'; export interface OperationMetadataCollectorInput { /** diff --git a/src/ldp/operations/metadata/WebAclMetadataCollector.ts b/src/http/ldp/metadata/WebAclMetadataCollector.ts similarity index 86% rename from src/ldp/operations/metadata/WebAclMetadataCollector.ts rename to src/http/ldp/metadata/WebAclMetadataCollector.ts index b9baf99b3..ccf6753da 100644 --- a/src/ldp/operations/metadata/WebAclMetadataCollector.ts +++ b/src/http/ldp/metadata/WebAclMetadataCollector.ts @@ -1,7 +1,7 @@ +import { AclMode } from '../../../authorization/permissions/AclPermission'; +import type { AclPermission } from '../../../authorization/permissions/AclPermission'; +import { AccessMode } from '../../../authorization/permissions/Permissions'; import { ACL, AUTH } from '../../../util/Vocabularies'; -import { AclMode } from '../../permissions/AclPermission'; -import type { AclPermission } from '../../permissions/AclPermission'; -import { AccessMode } from '../../permissions/Permissions'; import type { OperationMetadataCollectorInput } from './OperationMetadataCollector'; import { OperationMetadataCollector } from './OperationMetadataCollector'; diff --git a/src/ldp/http/BasicResponseWriter.ts b/src/http/output/BasicResponseWriter.ts similarity index 100% rename from src/ldp/http/BasicResponseWriter.ts rename to src/http/output/BasicResponseWriter.ts diff --git a/src/ldp/http/ResponseWriter.ts b/src/http/output/ResponseWriter.ts similarity index 100% rename from src/ldp/http/ResponseWriter.ts rename to src/http/output/ResponseWriter.ts diff --git a/src/ldp/http/ConvertingErrorHandler.ts b/src/http/output/error/ConvertingErrorHandler.ts similarity index 82% rename from src/ldp/http/ConvertingErrorHandler.ts rename to src/http/output/error/ConvertingErrorHandler.ts index 35d9ef50d..278c7e45b 100644 --- a/src/ldp/http/ConvertingErrorHandler.ts +++ b/src/http/output/error/ConvertingErrorHandler.ts @@ -1,17 +1,17 @@ import type { RepresentationConverter, RepresentationConverterArgs, -} from '../../storage/conversion/RepresentationConverter'; -import { INTERNAL_ERROR } from '../../util/ContentTypes'; -import { getStatusCode } from '../../util/errors/ErrorUtil'; -import { toLiteral } from '../../util/TermUtil'; -import { HTTP, XSD } from '../../util/Vocabularies'; -import { BasicRepresentation } from '../representation/BasicRepresentation'; -import type { Representation } from '../representation/Representation'; -import { RepresentationMetadata } from '../representation/RepresentationMetadata'; +} from '../../../storage/conversion/RepresentationConverter'; +import { INTERNAL_ERROR } from '../../../util/ContentTypes'; +import { getStatusCode } from '../../../util/errors/ErrorUtil'; +import { toLiteral } from '../../../util/TermUtil'; +import { HTTP, XSD } from '../../../util/Vocabularies'; +import { BasicRepresentation } from '../../representation/BasicRepresentation'; +import type { Representation } from '../../representation/Representation'; +import { RepresentationMetadata } from '../../representation/RepresentationMetadata'; +import type { ResponseDescription } from '../response/ResponseDescription'; import type { ErrorHandlerArgs } from './ErrorHandler'; import { ErrorHandler } from './ErrorHandler'; -import type { ResponseDescription } from './response/ResponseDescription'; // Used by internal helper function type PreparedArguments = { diff --git a/src/ldp/http/ErrorHandler.ts b/src/http/output/error/ErrorHandler.ts similarity index 54% rename from src/ldp/http/ErrorHandler.ts rename to src/http/output/error/ErrorHandler.ts index fa3dcc79b..9f10127b4 100644 --- a/src/ldp/http/ErrorHandler.ts +++ b/src/http/output/error/ErrorHandler.ts @@ -1,6 +1,6 @@ -import { AsyncHandler } from '../../util/handlers/AsyncHandler'; -import type { RepresentationPreferences } from '../representation/RepresentationPreferences'; -import type { ResponseDescription } from './response/ResponseDescription'; +import { AsyncHandler } from '../../../util/handlers/AsyncHandler'; +import type { RepresentationPreferences } from '../../representation/RepresentationPreferences'; +import type { ResponseDescription } from '../response/ResponseDescription'; export interface ErrorHandlerArgs { error: Error; diff --git a/src/ldp/http/SafeErrorHandler.ts b/src/http/output/error/SafeErrorHandler.ts similarity index 74% rename from src/ldp/http/SafeErrorHandler.ts rename to src/http/output/error/SafeErrorHandler.ts index a49fee1cb..7071c773d 100644 --- a/src/ldp/http/SafeErrorHandler.ts +++ b/src/http/output/error/SafeErrorHandler.ts @@ -1,12 +1,12 @@ -import { getLoggerFor } from '../../logging/LogUtil'; -import { createErrorMessage, getStatusCode } from '../../util/errors/ErrorUtil'; -import { guardedStreamFrom } from '../../util/StreamUtil'; -import { toLiteral } from '../../util/TermUtil'; -import { HTTP, XSD } from '../../util/Vocabularies'; -import { RepresentationMetadata } from '../representation/RepresentationMetadata'; +import { getLoggerFor } from '../../../logging/LogUtil'; +import { createErrorMessage, getStatusCode } from '../../../util/errors/ErrorUtil'; +import { guardedStreamFrom } from '../../../util/StreamUtil'; +import { toLiteral } from '../../../util/TermUtil'; +import { HTTP, XSD } from '../../../util/Vocabularies'; +import { RepresentationMetadata } from '../../representation/RepresentationMetadata'; +import type { ResponseDescription } from '../response/ResponseDescription'; import type { ErrorHandlerArgs } from './ErrorHandler'; import { ErrorHandler } from './ErrorHandler'; -import type { ResponseDescription } from './response/ResponseDescription'; /** * Returns a simple text description of an error. diff --git a/src/ldp/http/metadata/ConstantMetadataWriter.ts b/src/http/output/metadata/ConstantMetadataWriter.ts similarity index 100% rename from src/ldp/http/metadata/ConstantMetadataWriter.ts rename to src/http/output/metadata/ConstantMetadataWriter.ts diff --git a/src/ldp/http/metadata/LinkRelMetadataWriter.ts b/src/http/output/metadata/LinkRelMetadataWriter.ts similarity index 100% rename from src/ldp/http/metadata/LinkRelMetadataWriter.ts rename to src/http/output/metadata/LinkRelMetadataWriter.ts diff --git a/src/ldp/http/metadata/MappedMetadataWriter.ts b/src/http/output/metadata/MappedMetadataWriter.ts similarity index 100% rename from src/ldp/http/metadata/MappedMetadataWriter.ts rename to src/http/output/metadata/MappedMetadataWriter.ts diff --git a/src/ldp/http/metadata/MetadataWriter.ts b/src/http/output/metadata/MetadataWriter.ts similarity index 100% rename from src/ldp/http/metadata/MetadataWriter.ts rename to src/http/output/metadata/MetadataWriter.ts diff --git a/src/ldp/http/metadata/ModifiedMetadataWriter.ts b/src/http/output/metadata/ModifiedMetadataWriter.ts similarity index 100% rename from src/ldp/http/metadata/ModifiedMetadataWriter.ts rename to src/http/output/metadata/ModifiedMetadataWriter.ts diff --git a/src/ldp/http/metadata/WacAllowMetadataWriter.ts b/src/http/output/metadata/WacAllowMetadataWriter.ts similarity index 100% rename from src/ldp/http/metadata/WacAllowMetadataWriter.ts rename to src/http/output/metadata/WacAllowMetadataWriter.ts diff --git a/src/ldp/http/metadata/WwwAuthMetadataWriter.ts b/src/http/output/metadata/WwwAuthMetadataWriter.ts similarity index 100% rename from src/ldp/http/metadata/WwwAuthMetadataWriter.ts rename to src/http/output/metadata/WwwAuthMetadataWriter.ts diff --git a/src/ldp/http/response/CreatedResponseDescription.ts b/src/http/output/response/CreatedResponseDescription.ts similarity index 100% rename from src/ldp/http/response/CreatedResponseDescription.ts rename to src/http/output/response/CreatedResponseDescription.ts diff --git a/src/ldp/http/response/OkResponseDescription.ts b/src/http/output/response/OkResponseDescription.ts similarity index 100% rename from src/ldp/http/response/OkResponseDescription.ts rename to src/http/output/response/OkResponseDescription.ts diff --git a/src/ldp/http/response/RedirectResponseDescription.ts b/src/http/output/response/RedirectResponseDescription.ts similarity index 100% rename from src/ldp/http/response/RedirectResponseDescription.ts rename to src/http/output/response/RedirectResponseDescription.ts diff --git a/src/ldp/http/response/ResetResponseDescription.ts b/src/http/output/response/ResetResponseDescription.ts similarity index 100% rename from src/ldp/http/response/ResetResponseDescription.ts rename to src/http/output/response/ResetResponseDescription.ts diff --git a/src/ldp/http/response/ResponseDescription.ts b/src/http/output/response/ResponseDescription.ts similarity index 100% rename from src/ldp/http/response/ResponseDescription.ts rename to src/http/output/response/ResponseDescription.ts diff --git a/src/ldp/representation/BasicRepresentation.ts b/src/http/representation/BasicRepresentation.ts similarity index 100% rename from src/ldp/representation/BasicRepresentation.ts rename to src/http/representation/BasicRepresentation.ts diff --git a/src/ldp/http/Patch.ts b/src/http/representation/Patch.ts similarity index 61% rename from src/ldp/http/Patch.ts rename to src/http/representation/Patch.ts index 4f2013502..9d595c951 100644 --- a/src/ldp/http/Patch.ts +++ b/src/http/representation/Patch.ts @@ -1,4 +1,4 @@ -import type { Representation } from '../representation/Representation'; +import type { Representation } from './Representation'; /** * Represents the changes needed for a PATCH request. diff --git a/src/ldp/representation/Representation.ts b/src/http/representation/Representation.ts similarity index 100% rename from src/ldp/representation/Representation.ts rename to src/http/representation/Representation.ts diff --git a/src/ldp/representation/RepresentationMetadata.ts b/src/http/representation/RepresentationMetadata.ts similarity index 100% rename from src/ldp/representation/RepresentationMetadata.ts rename to src/http/representation/RepresentationMetadata.ts diff --git a/src/ldp/representation/RepresentationPreferences.ts b/src/http/representation/RepresentationPreferences.ts similarity index 100% rename from src/ldp/representation/RepresentationPreferences.ts rename to src/http/representation/RepresentationPreferences.ts diff --git a/src/ldp/representation/ResourceIdentifier.ts b/src/http/representation/ResourceIdentifier.ts similarity index 100% rename from src/ldp/representation/ResourceIdentifier.ts rename to src/http/representation/ResourceIdentifier.ts diff --git a/src/ldp/http/SparqlUpdatePatch.ts b/src/http/representation/SparqlUpdatePatch.ts similarity index 100% rename from src/ldp/http/SparqlUpdatePatch.ts rename to src/http/representation/SparqlUpdatePatch.ts diff --git a/src/identity/IdentityProviderHttpHandler.ts b/src/identity/IdentityProviderHttpHandler.ts index 3fc521c01..b07b6a981 100644 --- a/src/identity/IdentityProviderHttpHandler.ts +++ b/src/identity/IdentityProviderHttpHandler.ts @@ -1,9 +1,9 @@ -import type { ErrorHandler } from '../ldp/http/ErrorHandler'; -import { RedirectResponseDescription } from '../ldp/http/response/RedirectResponseDescription'; -import { ResponseDescription } from '../ldp/http/response/ResponseDescription'; -import type { Operation } from '../ldp/operations/Operation'; -import { BasicRepresentation } from '../ldp/representation/BasicRepresentation'; -import type { Representation } from '../ldp/representation/Representation'; +import type { Operation } from '../http/Operation'; +import type { ErrorHandler } from '../http/output/error/ErrorHandler'; +import { RedirectResponseDescription } from '../http/output/response/RedirectResponseDescription'; +import { ResponseDescription } from '../http/output/response/ResponseDescription'; +import { BasicRepresentation } from '../http/representation/BasicRepresentation'; +import type { Representation } from '../http/representation/Representation'; import { getLoggerFor } from '../logging/LogUtil'; import type { HttpRequest } from '../server/HttpRequest'; import type { OperationHttpHandlerInput } from '../server/OperationHttpHandler'; diff --git a/src/identity/configuration/IdentityProviderFactory.ts b/src/identity/configuration/IdentityProviderFactory.ts index 96d1aa7a3..5ef2ff3e1 100644 --- a/src/identity/configuration/IdentityProviderFactory.ts +++ b/src/identity/configuration/IdentityProviderFactory.ts @@ -10,10 +10,11 @@ import type { AnyObject, KoaContextWithOIDC, Configuration, Account, - ErrorOut, Adapter } from 'oidc-provider'; + ErrorOut, + Adapter } from 'oidc-provider'; import { Provider } from 'oidc-provider'; -import type { ErrorHandler } from '../../ldp/http/ErrorHandler'; -import type { ResponseWriter } from '../../ldp/http/ResponseWriter'; +import type { ErrorHandler } from '../../http/output/error/ErrorHandler'; +import type { ResponseWriter } from '../../http/output/ResponseWriter'; import type { KeyValueStorage } from '../../storage/keyvalue/KeyValueStorage'; import { ensureTrailingSlash, joinUrl } from '../../util/PathUtil'; import type { AdapterFactory } from '../storage/AdapterFactory'; diff --git a/src/identity/interaction/email-password/handler/InteractionHandler.ts b/src/identity/interaction/email-password/handler/InteractionHandler.ts index c0d9a9305..d9654e0c4 100644 --- a/src/identity/interaction/email-password/handler/InteractionHandler.ts +++ b/src/identity/interaction/email-password/handler/InteractionHandler.ts @@ -1,5 +1,5 @@ import type { KoaContextWithOIDC } from 'oidc-provider'; -import type { Operation } from '../../../../ldp/operations/Operation'; +import type { Operation } from '../../../../http/Operation'; import { APPLICATION_JSON } from '../../../../util/ContentTypes'; import { NotImplementedHttpError } from '../../../../util/errors/NotImplementedHttpError'; import { AsyncHandler } from '../../../../util/handlers/AsyncHandler'; diff --git a/src/identity/interaction/email-password/handler/LoginHandler.ts b/src/identity/interaction/email-password/handler/LoginHandler.ts index 288d6b07a..f85faab66 100644 --- a/src/identity/interaction/email-password/handler/LoginHandler.ts +++ b/src/identity/interaction/email-password/handler/LoginHandler.ts @@ -1,5 +1,5 @@ import assert from 'assert'; -import type { Operation } from '../../../../ldp/operations/Operation'; +import type { Operation } from '../../../../http/Operation'; import { getLoggerFor } from '../../../../logging/LogUtil'; import { BadRequestHttpError } from '../../../../util/errors/BadRequestHttpError'; import { readJsonStream } from '../../../../util/StreamUtil'; diff --git a/src/identity/interaction/email-password/util/RegistrationManager.ts b/src/identity/interaction/email-password/util/RegistrationManager.ts index 59b05bf9d..88fb9587f 100644 --- a/src/identity/interaction/email-password/util/RegistrationManager.ts +++ b/src/identity/interaction/email-password/util/RegistrationManager.ts @@ -1,5 +1,5 @@ import assert from 'assert'; -import type { ResourceIdentifier } from '../../../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../../../logging/LogUtil'; import type { IdentifierGenerator } from '../../../../pods/generate/IdentifierGenerator'; import type { PodManager } from '../../../../pods/PodManager'; diff --git a/src/identity/interaction/routing/BasicInteractionRoute.ts b/src/identity/interaction/routing/BasicInteractionRoute.ts index 53f06e30d..e0a555321 100644 --- a/src/identity/interaction/routing/BasicInteractionRoute.ts +++ b/src/identity/interaction/routing/BasicInteractionRoute.ts @@ -1,4 +1,4 @@ -import type { Operation } from '../../../ldp/operations/Operation'; +import type { Operation } from '../../../http/Operation'; import { BadRequestHttpError } from '../../../util/errors/BadRequestHttpError'; import { createErrorMessage, isError } from '../../../util/errors/ErrorUtil'; import { InternalServerError } from '../../../util/errors/InternalServerError'; diff --git a/src/identity/interaction/routing/InteractionRoute.ts b/src/identity/interaction/routing/InteractionRoute.ts index 5f415744e..92e34bce7 100644 --- a/src/identity/interaction/routing/InteractionRoute.ts +++ b/src/identity/interaction/routing/InteractionRoute.ts @@ -1,4 +1,4 @@ -import type { Operation } from '../../../ldp/operations/Operation'; +import type { Operation } from '../../../http/Operation'; import type { Interaction, InteractionHandlerResult } from '../email-password/handler/InteractionHandler'; export type TemplatedInteractionResult = T & { diff --git a/src/index.ts b/src/index.ts index 2bf20b9bd..9b2617990 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,11 +8,17 @@ export * from './authentication/UnionCredentialsExtractor'; export * from './authentication/UnsecureConstantCredentialsExtractor'; export * from './authentication/UnsecureWebIdExtractor'; -// Authorization/Access-Checkers -export * from './authorization/access-checkers/AccessChecker'; -export * from './authorization/access-checkers/AgentAccessChecker'; -export * from './authorization/access-checkers/AgentClassAccessChecker'; -export * from './authorization/access-checkers/AgentGroupAccessChecker'; +// Authorization/Access +export * from './authorization/access/AccessChecker'; +export * from './authorization/access/AgentAccessChecker'; +export * from './authorization/access/AgentClassAccessChecker'; +export * from './authorization/access/AgentGroupAccessChecker'; + +// Authorization/Permissions +export * from './authorization/permissions/Permissions'; +export * from './authorization/permissions/ModesExtractor'; +export * from './authorization/permissions/MethodModesExtractor'; +export * from './authorization/permissions/SparqlPatchModesExtractor'; // Authorization export * from './authorization/OwnerPermissionReader'; @@ -25,6 +31,95 @@ export * from './authorization/PermissionReader'; export * from './authorization/UnionPermissionReader'; export * from './authorization/WebAclReader'; +// HTTP/Auxiliary +export * from './http/auxiliary/AuxiliaryIdentifierStrategy'; +export * from './http/auxiliary/AuxiliaryStrategy'; +export * from './http/auxiliary/ComposedAuxiliaryStrategy'; +export * from './http/auxiliary/LinkMetadataGenerator'; +export * from './http/auxiliary/MetadataGenerator'; +export * from './http/auxiliary/RdfValidator'; +export * from './http/auxiliary/RoutingAuxiliaryIdentifierStrategy'; +export * from './http/auxiliary/RoutingAuxiliaryStrategy'; +export * from './http/auxiliary/SuffixAuxiliaryIdentifierStrategy'; +export * from './http/auxiliary/Validator'; + +// HTTP/Input/Body +export * from './http/input/body/BodyParser'; +export * from './http/input/body/RawBodyParser'; +export * from './http/input/body/SparqlUpdateBodyParser'; + +// HTTP/Input/Conditions +export * from './http/input/conditions/BasicConditionsParser'; +export * from './http/input/conditions/ConditionsParser'; + +// HTTP/Input/Identifier +export * from './http/input/identifier/OriginalUrlExtractor'; +export * from './http/input/identifier/TargetExtractor'; + +// HTTP/Input/Metadata +export * from './http/input/metadata/ContentTypeParser'; +export * from './http/input/metadata/LinkRelParser'; +export * from './http/input/metadata/MetadataParser'; +export * from './http/input/metadata/SlugParser'; + +// HTTP/Input/Preferences +export * from './http/input/preferences/AcceptPreferenceParser'; +export * from './http/input/preferences/PreferenceParser'; + +// HTTP/Input +export * from './http/input/BasicRequestParser'; +export * from './http/input/RequestParser'; + +// HTTP/LDP/Metadata +export * from './http/ldp/metadata/OperationMetadataCollector'; +export * from './http/ldp/metadata/WebAclMetadataCollector'; + +// HTTP/LDP +export * from './http/ldp/DeleteOperationHandler'; +export * from './http/ldp/GetOperationHandler'; +export * from './http/ldp/HeadOperationHandler'; +export * from './http/ldp/OperationHandler'; +export * from './http/ldp/PatchOperationHandler'; +export * from './http/ldp/PostOperationHandler'; +export * from './http/ldp/PutOperationHandler'; + +// HTTP/Output/Error +export * from './http/output/error/ConvertingErrorHandler'; +export * from './http/output/error/ErrorHandler'; +export * from './http/output/error/SafeErrorHandler'; + +// HTTP/Output/Metadata +export * from './http/output/metadata/ConstantMetadataWriter'; +export * from './http/output/metadata/LinkRelMetadataWriter'; +export * from './http/output/metadata/MappedMetadataWriter'; +export * from './http/output/metadata/MetadataWriter'; +export * from './http/output/metadata/ModifiedMetadataWriter'; +export * from './http/output/metadata/WacAllowMetadataWriter'; +export * from './http/output/metadata/WwwAuthMetadataWriter'; + +// HTTP/Output/Response +export * from './http/output/response/CreatedResponseDescription'; +export * from './http/output/response/OkResponseDescription'; +export * from './http/output/response/ResetResponseDescription'; +export * from './http/output/response/ResponseDescription'; + +// HTTP/Output +export * from './http/output/BasicResponseWriter'; +export * from './http/output/ResponseWriter'; + +// HTTP/Representation +export * from './http/representation/BasicRepresentation'; +export * from './http/representation/Patch'; +export * from './http/representation/Representation'; +export * from './http/representation/RepresentationMetadata'; +export * from './http/representation/RepresentationPreferences'; +export * from './http/representation/ResourceIdentifier'; +export * from './http/representation/SparqlUpdatePatch'; + +// HTTP +export * from './http/Operation'; +export * from './http/UnsecureWebSocketsProtocol'; + // Identity/Configuration export * from './identity/configuration/IdentityProviderFactory'; export * from './identity/configuration/ProviderFactory'; @@ -87,89 +182,6 @@ export * from './init/Initializer'; export * from './init/LoggerInitializer'; export * from './init/ServerInitializer'; -// LDP/Authorization -export * from './ldp/auxiliary/AuxiliaryIdentifierStrategy'; -export * from './ldp/auxiliary/AuxiliaryStrategy'; -export * from './ldp/auxiliary/ComposedAuxiliaryStrategy'; -export * from './ldp/auxiliary/LinkMetadataGenerator'; -export * from './ldp/auxiliary/MetadataGenerator'; -export * from './ldp/auxiliary/RdfValidator'; -export * from './ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy'; -export * from './ldp/auxiliary/RoutingAuxiliaryStrategy'; -export * from './ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy'; -export * from './ldp/auxiliary/Validator'; - -// LDP/HTTP/Conditions -export * from './ldp/http/conditions/BasicConditionsParser'; -export * from './ldp/http/conditions/ConditionsParser'; - -// LDP/HTTP/Metadata -export * from './ldp/http/metadata/ConstantMetadataWriter'; -export * from './ldp/http/metadata/ContentTypeParser'; -export * from './ldp/http/metadata/LinkRelMetadataWriter'; -export * from './ldp/http/metadata/LinkRelParser'; -export * from './ldp/http/metadata/MappedMetadataWriter'; -export * from './ldp/http/metadata/MetadataParser'; -export * from './ldp/http/metadata/MetadataWriter'; -export * from './ldp/http/metadata/ModifiedMetadataWriter'; -export * from './ldp/http/metadata/SlugParser'; -export * from './ldp/http/metadata/WacAllowMetadataWriter'; -export * from './ldp/http/metadata/WwwAuthMetadataWriter'; - -// LDP/HTTP/Response -export * from './ldp/http/response/CreatedResponseDescription'; -export * from './ldp/http/response/OkResponseDescription'; -export * from './ldp/http/response/ResetResponseDescription'; -export * from './ldp/http/response/ResponseDescription'; - -// LDP/HTTP -export * from './ldp/http/AcceptPreferenceParser'; -export * from './ldp/http/BasicRequestParser'; -export * from './ldp/http/BasicResponseWriter'; -export * from './ldp/http/BodyParser'; -export * from './ldp/http/ConvertingErrorHandler'; -export * from './ldp/http/ErrorHandler'; -export * from './ldp/http/OriginalUrlExtractor'; -export * from './ldp/http/Patch'; -export * from './ldp/http/PreferenceParser'; -export * from './ldp/http/RawBodyParser'; -export * from './ldp/http/RequestParser'; -export * from './ldp/http/ResponseWriter'; -export * from './ldp/http/SafeErrorHandler'; -export * from './ldp/http/SparqlUpdateBodyParser'; -export * from './ldp/http/SparqlUpdatePatch'; -export * from './ldp/http/TargetExtractor'; - -// LDP/Operations/Metadata -export * from './ldp/operations/metadata/OperationMetadataCollector'; -export * from './ldp/operations/metadata/WebAclMetadataCollector'; - -// LDP/Operations -export * from './ldp/operations/DeleteOperationHandler'; -export * from './ldp/operations/GetOperationHandler'; -export * from './ldp/operations/HeadOperationHandler'; -export * from './ldp/operations/Operation'; -export * from './ldp/operations/OperationHandler'; -export * from './ldp/operations/PatchOperationHandler'; -export * from './ldp/operations/PostOperationHandler'; -export * from './ldp/operations/PutOperationHandler'; - -// LDP/Permissions -export * from './ldp/permissions/Permissions'; -export * from './ldp/permissions/ModesExtractor'; -export * from './ldp/permissions/MethodModesExtractor'; -export * from './ldp/permissions/SparqlPatchModesExtractor'; - -// LDP/Representation -export * from './ldp/representation/BasicRepresentation'; -export * from './ldp/representation/Representation'; -export * from './ldp/representation/RepresentationMetadata'; -export * from './ldp/representation/RepresentationPreferences'; -export * from './ldp/representation/ResourceIdentifier'; - -// LDP -export * from './ldp/UnsecureWebSocketsProtocol'; - // Logging export * from './logging/LazyLogger'; export * from './logging/LazyLoggerFactory'; diff --git a/src/init/ContainerInitializer.ts b/src/init/ContainerInitializer.ts index 57dd38702..088a93911 100644 --- a/src/init/ContainerInitializer.ts +++ b/src/init/ContainerInitializer.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import type { ResourcesGenerator } from '../pods/generate/ResourcesGenerator'; import type { KeyValueStorage } from '../storage/keyvalue/KeyValueStorage'; diff --git a/src/init/setup/SetupHttpHandler.ts b/src/init/setup/SetupHttpHandler.ts index 20c6f6fae..b8ace31e3 100644 --- a/src/init/setup/SetupHttpHandler.ts +++ b/src/init/setup/SetupHttpHandler.ts @@ -1,9 +1,9 @@ +import type { Operation } from '../../http/Operation'; +import type { ErrorHandler } from '../../http/output/error/ErrorHandler'; +import { ResponseDescription } from '../../http/output/response/ResponseDescription'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; import type { RegistrationParams, RegistrationManager } from '../../identity/interaction/email-password/util/RegistrationManager'; -import type { ErrorHandler } from '../../ldp/http/ErrorHandler'; -import { ResponseDescription } from '../../ldp/http/response/ResponseDescription'; -import type { Operation } from '../../ldp/operations/Operation'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; import { getLoggerFor } from '../../logging/LogUtil'; import type { OperationHttpHandlerInput } from '../../server/OperationHttpHandler'; import { OperationHttpHandler } from '../../server/OperationHttpHandler'; diff --git a/src/ldp/http/TargetExtractor.ts b/src/ldp/http/TargetExtractor.ts deleted file mode 100644 index 1ce24fe0d..000000000 --- a/src/ldp/http/TargetExtractor.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { HttpRequest } from '../../server/HttpRequest'; -import { AsyncHandler } from '../../util/handlers/AsyncHandler'; -import type { ResourceIdentifier } from '../representation/ResourceIdentifier'; - -/** - * Extracts a {@link ResourceIdentifier} from an incoming {@link HttpRequest}. - */ -export abstract class TargetExtractor extends AsyncHandler<{ request: HttpRequest }, ResourceIdentifier> {} diff --git a/src/pods/ConfigPodManager.ts b/src/pods/ConfigPodManager.ts index 9f10fa948..7c667eadd 100644 --- a/src/pods/ConfigPodManager.ts +++ b/src/pods/ConfigPodManager.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import type { KeyValueStorage } from '../storage/keyvalue/KeyValueStorage'; import type { ResourceStore } from '../storage/ResourceStore'; diff --git a/src/pods/GeneratedPodManager.ts b/src/pods/GeneratedPodManager.ts index af282c986..076ab75d0 100644 --- a/src/pods/GeneratedPodManager.ts +++ b/src/pods/GeneratedPodManager.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import type { ResourceStore } from '../storage/ResourceStore'; import { ConflictHttpError } from '../util/errors/ConflictHttpError'; diff --git a/src/pods/PodManager.ts b/src/pods/PodManager.ts index f992a84b4..c61544225 100644 --- a/src/pods/PodManager.ts +++ b/src/pods/PodManager.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import type { PodSettings } from './settings/PodSettings'; /** diff --git a/src/pods/generate/GenerateUtil.ts b/src/pods/generate/GenerateUtil.ts index d330bd912..14e477c61 100644 --- a/src/pods/generate/GenerateUtil.ts +++ b/src/pods/generate/GenerateUtil.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { ResourceStore } from '../../storage/ResourceStore'; import type { ResourcesGenerator } from './ResourcesGenerator'; diff --git a/src/pods/generate/IdentifierGenerator.ts b/src/pods/generate/IdentifierGenerator.ts index 6b8804dba..be6fa6208 100644 --- a/src/pods/generate/IdentifierGenerator.ts +++ b/src/pods/generate/IdentifierGenerator.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; /** * Utility class for generating container identifiers. diff --git a/src/pods/generate/PodGenerator.ts b/src/pods/generate/PodGenerator.ts index 761738cb8..68757dd5a 100644 --- a/src/pods/generate/PodGenerator.ts +++ b/src/pods/generate/PodGenerator.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { ResourceStore } from '../../storage/ResourceStore'; import type { PodSettings } from '../settings/PodSettings'; diff --git a/src/pods/generate/ResourcesGenerator.ts b/src/pods/generate/ResourcesGenerator.ts index 8f5f5e025..fcd44e40f 100644 --- a/src/pods/generate/ResourcesGenerator.ts +++ b/src/pods/generate/ResourcesGenerator.ts @@ -1,5 +1,5 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import Dict = NodeJS.Dict; export interface Resource { diff --git a/src/pods/generate/SubdomainIdentifierGenerator.ts b/src/pods/generate/SubdomainIdentifierGenerator.ts index 545ade072..6564fdaea 100644 --- a/src/pods/generate/SubdomainIdentifierGenerator.ts +++ b/src/pods/generate/SubdomainIdentifierGenerator.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { ensureTrailingSlash, extractScheme } from '../../util/PathUtil'; import type { IdentifierGenerator } from './IdentifierGenerator'; diff --git a/src/pods/generate/SuffixIdentifierGenerator.ts b/src/pods/generate/SuffixIdentifierGenerator.ts index 7c0b63d79..54b1ec2cf 100644 --- a/src/pods/generate/SuffixIdentifierGenerator.ts +++ b/src/pods/generate/SuffixIdentifierGenerator.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { ensureTrailingSlash } from '../../util/PathUtil'; import type { IdentifierGenerator } from './IdentifierGenerator'; diff --git a/src/pods/generate/TemplatedPodGenerator.ts b/src/pods/generate/TemplatedPodGenerator.ts index 04187febc..734f8f318 100644 --- a/src/pods/generate/TemplatedPodGenerator.ts +++ b/src/pods/generate/TemplatedPodGenerator.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import type { KeyValueStorage } from '../../storage/keyvalue/KeyValueStorage'; import type { ResourceStore } from '../../storage/ResourceStore'; diff --git a/src/pods/generate/TemplatedResourcesGenerator.ts b/src/pods/generate/TemplatedResourcesGenerator.ts index 0ad5ebdd4..4399c4825 100644 --- a/src/pods/generate/TemplatedResourcesGenerator.ts +++ b/src/pods/generate/TemplatedResourcesGenerator.ts @@ -1,9 +1,9 @@ import { createReadStream, promises as fsPromises } from 'fs'; import type { Readable } from 'stream'; import { Parser } from 'n3'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { FileIdentifierMapper, FileIdentifierMapperFactory, diff --git a/src/pods/generate/variables/BaseUrlHandler.ts b/src/pods/generate/variables/BaseUrlHandler.ts index 06d8bd9c5..32375fc77 100644 --- a/src/pods/generate/variables/BaseUrlHandler.ts +++ b/src/pods/generate/variables/BaseUrlHandler.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../http/representation/ResourceIdentifier'; import type { PodSettings } from '../../settings/PodSettings'; import { VariableHandler } from './VariableHandler'; import { TEMPLATE_VARIABLE } from './Variables'; diff --git a/src/pods/generate/variables/RootFilePathHandler.ts b/src/pods/generate/variables/RootFilePathHandler.ts index fd6344fa5..942cff64e 100644 --- a/src/pods/generate/variables/RootFilePathHandler.ts +++ b/src/pods/generate/variables/RootFilePathHandler.ts @@ -1,5 +1,5 @@ import { promises as fsPromises } from 'fs'; -import type { ResourceIdentifier } from '../../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../http/representation/ResourceIdentifier'; import type { FileIdentifierMapper } from '../../../storage/mapping/FileIdentifierMapper'; import { ConflictHttpError } from '../../../util/errors/ConflictHttpError'; import { isSystemError } from '../../../util/errors/SystemError'; diff --git a/src/pods/generate/variables/VariableHandler.ts b/src/pods/generate/variables/VariableHandler.ts index 9e13d929d..73608efc2 100644 --- a/src/pods/generate/variables/VariableHandler.ts +++ b/src/pods/generate/variables/VariableHandler.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../http/representation/ResourceIdentifier'; import { AsyncHandler } from '../../../util/handlers/AsyncHandler'; import type { PodSettings } from '../../settings/PodSettings'; diff --git a/src/server/AuthorizingHttpHandler.ts b/src/server/AuthorizingHttpHandler.ts index f0b1a2d72..450d0026a 100644 --- a/src/server/AuthorizingHttpHandler.ts +++ b/src/server/AuthorizingHttpHandler.ts @@ -2,8 +2,8 @@ import type { CredentialSet } from '../authentication/Credentials'; import type { CredentialsExtractor } from '../authentication/CredentialsExtractor'; import type { Authorizer } from '../authorization/Authorizer'; import type { PermissionReader } from '../authorization/PermissionReader'; -import type { ResponseDescription } from '../ldp/http/response/ResponseDescription'; -import type { ModesExtractor } from '../ldp/permissions/ModesExtractor'; +import type { ModesExtractor } from '../authorization/permissions/ModesExtractor'; +import type { ResponseDescription } from '../http/output/response/ResponseDescription'; import { getLoggerFor } from '../logging/LogUtil'; import type { OperationHttpHandlerInput } from './OperationHttpHandler'; import { OperationHttpHandler } from './OperationHttpHandler'; diff --git a/src/server/OperationHttpHandler.ts b/src/server/OperationHttpHandler.ts index 71d05665e..8f685be35 100644 --- a/src/server/OperationHttpHandler.ts +++ b/src/server/OperationHttpHandler.ts @@ -1,5 +1,5 @@ -import type { ResponseDescription } from '../ldp/http/response/ResponseDescription'; -import type { Operation } from '../ldp/operations/Operation'; +import type { Operation } from '../http/Operation'; +import type { ResponseDescription } from '../http/output/response/ResponseDescription'; import { AsyncHandler } from '../util/handlers/AsyncHandler'; import type { HttpHandlerInput } from './HttpHandler'; diff --git a/src/server/ParsingHttpHandler.ts b/src/server/ParsingHttpHandler.ts index 2b1910c5e..570d854f0 100644 --- a/src/server/ParsingHttpHandler.ts +++ b/src/server/ParsingHttpHandler.ts @@ -1,9 +1,9 @@ -import type { ErrorHandler } from '../ldp/http/ErrorHandler'; -import type { RequestParser } from '../ldp/http/RequestParser'; -import type { ResponseDescription } from '../ldp/http/response/ResponseDescription'; -import type { ResponseWriter } from '../ldp/http/ResponseWriter'; -import type { OperationMetadataCollector } from '../ldp/operations/metadata/OperationMetadataCollector'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; +import type { RequestParser } from '../http/input/RequestParser'; +import type { OperationMetadataCollector } from '../http/ldp/metadata/OperationMetadataCollector'; +import type { ErrorHandler } from '../http/output/error/ErrorHandler'; +import type { ResponseDescription } from '../http/output/response/ResponseDescription'; +import type { ResponseWriter } from '../http/output/ResponseWriter'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; import { getLoggerFor } from '../logging/LogUtil'; import { assertError } from '../util/errors/ErrorUtil'; import type { HttpHandlerInput } from './HttpHandler'; diff --git a/src/server/util/RedirectAllHttpHandler.ts b/src/server/util/RedirectAllHttpHandler.ts index f515185a6..612eb2522 100644 --- a/src/server/util/RedirectAllHttpHandler.ts +++ b/src/server/util/RedirectAllHttpHandler.ts @@ -1,6 +1,6 @@ -import { RedirectResponseDescription } from '../../ldp/http/response/RedirectResponseDescription'; -import type { ResponseWriter } from '../../ldp/http/ResponseWriter'; -import type { TargetExtractor } from '../../ldp/http/TargetExtractor'; +import type { TargetExtractor } from '../../http/input/identifier/TargetExtractor'; +import { RedirectResponseDescription } from '../../http/output/response/RedirectResponseDescription'; +import type { ResponseWriter } from '../../http/output/ResponseWriter'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { getRelativeUrl, joinUrl } from '../../util/PathUtil'; import type { HttpHandlerInput } from '../HttpHandler'; diff --git a/src/server/util/RouterHandler.ts b/src/server/util/RouterHandler.ts index dd23626b8..b48393c58 100644 --- a/src/server/util/RouterHandler.ts +++ b/src/server/util/RouterHandler.ts @@ -1,4 +1,4 @@ -import type { TargetExtractor } from '../../ldp/http/TargetExtractor'; +import type { TargetExtractor } from '../../http/input/identifier/TargetExtractor'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { MethodNotAllowedHttpError } from '../../util/errors/MethodNotAllowedHttpError'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; diff --git a/src/storage/BaseResourceStore.ts b/src/storage/BaseResourceStore.ts index b61c733ac..a6fea6663 100644 --- a/src/storage/BaseResourceStore.ts +++ b/src/storage/BaseResourceStore.ts @@ -1,7 +1,7 @@ -import type { Patch } from '../ldp/http/Patch'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; import type { Conditions } from './Conditions'; import type { ResourceStore } from './ResourceStore'; diff --git a/src/storage/BasicConditions.ts b/src/storage/BasicConditions.ts index 6bf186f85..e87acaf99 100644 --- a/src/storage/BasicConditions.ts +++ b/src/storage/BasicConditions.ts @@ -1,4 +1,4 @@ -import type { RepresentationMetadata } from '../ldp/representation/RepresentationMetadata'; +import type { RepresentationMetadata } from '../http/representation/RepresentationMetadata'; import { DC } from '../util/Vocabularies'; import { getETag } from './Conditions'; import type { Conditions } from './Conditions'; diff --git a/src/storage/Conditions.ts b/src/storage/Conditions.ts index 6a1721568..c31f8d247 100644 --- a/src/storage/Conditions.ts +++ b/src/storage/Conditions.ts @@ -1,4 +1,4 @@ -import type { RepresentationMetadata } from '../ldp/representation/RepresentationMetadata'; +import type { RepresentationMetadata } from '../http/representation/RepresentationMetadata'; import { DC } from '../util/Vocabularies'; /** diff --git a/src/storage/DataAccessorBasedStore.ts b/src/storage/DataAccessorBasedStore.ts index e777edd80..decf053eb 100644 --- a/src/storage/DataAccessorBasedStore.ts +++ b/src/storage/DataAccessorBasedStore.ts @@ -2,12 +2,12 @@ import arrayifyStream from 'arrayify-stream'; import { DataFactory } from 'n3'; import type { NamedNode, Quad, Term } from 'rdf-js'; import { v4 as uuid } from 'uuid'; -import type { AuxiliaryStrategy } from '../ldp/auxiliary/AuxiliaryStrategy'; -import type { Patch } from '../ldp/http/Patch'; -import { BasicRepresentation } from '../ldp/representation/BasicRepresentation'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationMetadata } from '../ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { AuxiliaryStrategy } from '../http/auxiliary/AuxiliaryStrategy'; +import { BasicRepresentation } from '../http/representation/BasicRepresentation'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationMetadata } from '../http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import { INTERNAL_QUADS } from '../util/ContentTypes'; import { BadRequestHttpError } from '../util/errors/BadRequestHttpError'; diff --git a/src/storage/IndexRepresentationStore.ts b/src/storage/IndexRepresentationStore.ts index a6d1606b0..ffee59699 100644 --- a/src/storage/IndexRepresentationStore.ts +++ b/src/storage/IndexRepresentationStore.ts @@ -1,7 +1,7 @@ import assert from 'assert'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; import { isContainerIdentifier } from '../util/PathUtil'; import type { Conditions } from './Conditions'; diff --git a/src/storage/LockingResourceStore.ts b/src/storage/LockingResourceStore.ts index f0ebe7055..a8740534c 100644 --- a/src/storage/LockingResourceStore.ts +++ b/src/storage/LockingResourceStore.ts @@ -1,10 +1,10 @@ import type { Readable } from 'stream'; -import type { AuxiliaryIdentifierStrategy } from '../ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import type { Patch } from '../ldp/http/Patch'; -import { BasicRepresentation } from '../ldp/representation/BasicRepresentation'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { AuxiliaryIdentifierStrategy } from '../http/auxiliary/AuxiliaryIdentifierStrategy'; +import { BasicRepresentation } from '../http/representation/BasicRepresentation'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import type { ExpiringReadWriteLocker } from '../util/locking/ExpiringReadWriteLocker'; import { endOfStream } from '../util/StreamUtil'; diff --git a/src/storage/MonitoringStore.ts b/src/storage/MonitoringStore.ts index 1c60ccde3..307cc2d6d 100644 --- a/src/storage/MonitoringStore.ts +++ b/src/storage/MonitoringStore.ts @@ -1,8 +1,8 @@ import { EventEmitter } from 'events'; -import type { Patch } from '../ldp/http/Patch'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import type { Conditions } from './Conditions'; import type { ResourceStore } from './ResourceStore'; diff --git a/src/storage/PassthroughStore.ts b/src/storage/PassthroughStore.ts index 720b4d74c..60254b1ad 100644 --- a/src/storage/PassthroughStore.ts +++ b/src/storage/PassthroughStore.ts @@ -1,7 +1,7 @@ -import type { Patch } from '../ldp/http/Patch'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import type { Conditions } from './Conditions'; import type { ResourceStore } from './ResourceStore'; diff --git a/src/storage/PatchingStore.ts b/src/storage/PatchingStore.ts index 06e5d07c7..bb13246f6 100644 --- a/src/storage/PatchingStore.ts +++ b/src/storage/PatchingStore.ts @@ -1,5 +1,5 @@ -import type { Patch } from '../ldp/http/Patch'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../http/representation/Patch'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; import type { Conditions } from './Conditions'; import { PassthroughStore } from './PassthroughStore'; diff --git a/src/storage/ReadOnlyStore.ts b/src/storage/ReadOnlyStore.ts index 7204197ff..8bc18e006 100644 --- a/src/storage/ReadOnlyStore.ts +++ b/src/storage/ReadOnlyStore.ts @@ -1,6 +1,6 @@ -import type { Patch } from '../ldp/http/Patch'; -import type { Representation } from '../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { ForbiddenHttpError } from '../util/errors/ForbiddenHttpError'; import type { Conditions } from './Conditions'; import { PassthroughStore } from './PassthroughStore'; diff --git a/src/storage/RepresentationConvertingStore.ts b/src/storage/RepresentationConvertingStore.ts index 7f3d006a8..5249122ab 100644 --- a/src/storage/RepresentationConvertingStore.ts +++ b/src/storage/RepresentationConvertingStore.ts @@ -1,6 +1,6 @@ -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import type { Conditions } from './Conditions'; import { PassthroughConverter } from './conversion/PassthroughConverter'; diff --git a/src/storage/ResourceStore.ts b/src/storage/ResourceStore.ts index dcff429c2..581cfd203 100644 --- a/src/storage/ResourceStore.ts +++ b/src/storage/ResourceStore.ts @@ -1,7 +1,7 @@ -import type { Patch } from '../ldp/http/Patch'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import type { Conditions } from './Conditions'; /** diff --git a/src/storage/RoutingResourceStore.ts b/src/storage/RoutingResourceStore.ts index 65866e85a..c09899c6a 100644 --- a/src/storage/RoutingResourceStore.ts +++ b/src/storage/RoutingResourceStore.ts @@ -1,7 +1,7 @@ -import type { Patch } from '../ldp/http/Patch'; -import type { Representation } from '../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../http/representation/Patch'; +import type { Representation } from '../http/representation/Representation'; +import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; import type { Conditions } from './Conditions'; diff --git a/src/storage/accessors/DataAccessor.ts b/src/storage/accessors/DataAccessor.ts index a197a5c1d..e87ca0e9c 100644 --- a/src/storage/accessors/DataAccessor.ts +++ b/src/storage/accessors/DataAccessor.ts @@ -1,7 +1,7 @@ import type { Readable } from 'stream'; -import type { Representation } from '../../ldp/representation/Representation'; -import type { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { Guarded } from '../../util/GuardedStream'; /** diff --git a/src/storage/accessors/FileDataAccessor.ts b/src/storage/accessors/FileDataAccessor.ts index 02bf7d4a4..98e986779 100644 --- a/src/storage/accessors/FileDataAccessor.ts +++ b/src/storage/accessors/FileDataAccessor.ts @@ -2,9 +2,9 @@ import type { Stats } from 'fs'; import { createWriteStream, createReadStream, promises as fsPromises } from 'fs'; import type { Readable } from 'stream'; import type { Quad } from 'rdf-js'; -import type { Representation } from '../../ldp/representation/Representation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; import { isSystemError } from '../../util/errors/SystemError'; import { UnsupportedMediaTypeHttpError } from '../../util/errors/UnsupportedMediaTypeHttpError'; diff --git a/src/storage/accessors/InMemoryDataAccessor.ts b/src/storage/accessors/InMemoryDataAccessor.ts index 98371b5cd..c5937f2de 100644 --- a/src/storage/accessors/InMemoryDataAccessor.ts +++ b/src/storage/accessors/InMemoryDataAccessor.ts @@ -1,7 +1,7 @@ import type { Readable } from 'stream'; import arrayifyStream from 'arrayify-stream'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { InternalServerError } from '../../util/errors/InternalServerError'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; import type { Guarded } from '../../util/GuardedStream'; diff --git a/src/storage/accessors/SparqlDataAccessor.ts b/src/storage/accessors/SparqlDataAccessor.ts index 9ef5f7302..c9de337fa 100644 --- a/src/storage/accessors/SparqlDataAccessor.ts +++ b/src/storage/accessors/SparqlDataAccessor.ts @@ -13,9 +13,9 @@ import type { UpdateOperation, } from 'sparqljs'; import { Generator } from 'sparqljs'; -import type { Representation } from '../../ldp/representation/Representation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { INTERNAL_QUADS } from '../../util/ContentTypes'; import { ConflictHttpError } from '../../util/errors/ConflictHttpError'; diff --git a/src/storage/conversion/ChainedConverter.ts b/src/storage/conversion/ChainedConverter.ts index defa8dc21..f1c765d24 100644 --- a/src/storage/conversion/ChainedConverter.ts +++ b/src/storage/conversion/ChainedConverter.ts @@ -1,5 +1,5 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { ValuePreference, ValuePreferences } from '../../ldp/representation/RepresentationPreferences'; +import type { Representation } from '../../http/representation/Representation'; +import type { ValuePreference, ValuePreferences } from '../../http/representation/RepresentationPreferences'; import { getLoggerFor } from '../../logging/LogUtil'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; diff --git a/src/storage/conversion/ConstantConverter.ts b/src/storage/conversion/ConstantConverter.ts index 37c8042ef..e1c095b68 100644 --- a/src/storage/conversion/ConstantConverter.ts +++ b/src/storage/conversion/ConstantConverter.ts @@ -1,6 +1,6 @@ import { createReadStream } from 'fs'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { isContainerIdentifier } from '../../util/PathUtil'; import { matchesMediaType, getTypeWeight, cleanPreferences } from './ConversionUtil'; diff --git a/src/storage/conversion/ContainerToTemplateConverter.ts b/src/storage/conversion/ContainerToTemplateConverter.ts index 8351a4290..d4e0f01e7 100644 --- a/src/storage/conversion/ContainerToTemplateConverter.ts +++ b/src/storage/conversion/ContainerToTemplateConverter.ts @@ -1,9 +1,9 @@ import type { Readable } from 'stream'; import orderBy from 'lodash.orderby'; import type { Quad } from 'rdf-js'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { INTERNAL_QUADS } from '../../util/ContentTypes'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import type { IdentifierStrategy } from '../../util/identifiers/IdentifierStrategy'; diff --git a/src/storage/conversion/ContentTypeReplacer.ts b/src/storage/conversion/ContentTypeReplacer.ts index 49bb62551..1e82f4b0c 100644 --- a/src/storage/conversion/ContentTypeReplacer.ts +++ b/src/storage/conversion/ContentTypeReplacer.ts @@ -1,6 +1,6 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; -import type { ValuePreferences } from '../../ldp/representation/RepresentationPreferences'; +import type { Representation } from '../../http/representation/Representation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { ValuePreferences } from '../../http/representation/RepresentationPreferences'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { matchesMediaType, getConversionTarget } from './ConversionUtil'; import type { RepresentationConverterArgs } from './RepresentationConverter'; diff --git a/src/storage/conversion/ConversionUtil.ts b/src/storage/conversion/ConversionUtil.ts index 2f8738b6b..1ed97dc9f 100644 --- a/src/storage/conversion/ConversionUtil.ts +++ b/src/storage/conversion/ConversionUtil.ts @@ -1,4 +1,4 @@ -import type { ValuePreference, ValuePreferences } from '../../ldp/representation/RepresentationPreferences'; +import type { ValuePreference, ValuePreferences } from '../../http/representation/RepresentationPreferences'; import { INTERNAL_ALL } from '../../util/ContentTypes'; import { InternalServerError } from '../../util/errors/InternalServerError'; diff --git a/src/storage/conversion/DynamicJsonToTemplateConverter.ts b/src/storage/conversion/DynamicJsonToTemplateConverter.ts index ee231c50a..975c34106 100644 --- a/src/storage/conversion/DynamicJsonToTemplateConverter.ts +++ b/src/storage/conversion/DynamicJsonToTemplateConverter.ts @@ -1,9 +1,9 @@ import type { Term, NamedNode } from 'rdf-js'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; -import type { ValuePreferences } from '../../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { ValuePreferences } from '../../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { APPLICATION_JSON } from '../../util/ContentTypes'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { readableToString } from '../../util/StreamUtil'; diff --git a/src/storage/conversion/ErrorToJsonConverter.ts b/src/storage/conversion/ErrorToJsonConverter.ts index c40b3aa83..a2f7c9c7f 100644 --- a/src/storage/conversion/ErrorToJsonConverter.ts +++ b/src/storage/conversion/ErrorToJsonConverter.ts @@ -1,5 +1,5 @@ -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; import { APPLICATION_JSON, INTERNAL_ERROR } from '../../util/ContentTypes'; import { HttpError } from '../../util/errors/HttpError'; import { getSingleItem } from '../../util/StreamUtil'; diff --git a/src/storage/conversion/ErrorToQuadConverter.ts b/src/storage/conversion/ErrorToQuadConverter.ts index 8b146db47..aace74b99 100644 --- a/src/storage/conversion/ErrorToQuadConverter.ts +++ b/src/storage/conversion/ErrorToQuadConverter.ts @@ -1,6 +1,6 @@ -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; import { INTERNAL_ERROR, INTERNAL_QUADS } from '../../util/ContentTypes'; import { getSingleItem } from '../../util/StreamUtil'; import { DC, SOLID_ERROR } from '../../util/Vocabularies'; diff --git a/src/storage/conversion/ErrorToTemplateConverter.ts b/src/storage/conversion/ErrorToTemplateConverter.ts index e9ee5e19d..a72ec4456 100644 --- a/src/storage/conversion/ErrorToTemplateConverter.ts +++ b/src/storage/conversion/ErrorToTemplateConverter.ts @@ -1,6 +1,6 @@ import assert from 'assert'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; import { INTERNAL_ERROR } from '../../util/ContentTypes'; import { HttpError } from '../../util/errors/HttpError'; import { modulePathPlaceholder } from '../../util/PathUtil'; diff --git a/src/storage/conversion/FormToJsonConverter.ts b/src/storage/conversion/FormToJsonConverter.ts index 87d9e7410..a964d5cc9 100644 --- a/src/storage/conversion/FormToJsonConverter.ts +++ b/src/storage/conversion/FormToJsonConverter.ts @@ -1,7 +1,7 @@ import { parse } from 'querystring'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; import { APPLICATION_JSON, APPLICATION_X_WWW_FORM_URLENCODED } from '../../util/ContentTypes'; import { readableToString } from '../../util/StreamUtil'; import { CONTENT_TYPE } from '../../util/Vocabularies'; diff --git a/src/storage/conversion/IfNeededConverter.ts b/src/storage/conversion/IfNeededConverter.ts index 9ff5e90ee..547cfa67b 100644 --- a/src/storage/conversion/IfNeededConverter.ts +++ b/src/storage/conversion/IfNeededConverter.ts @@ -1,4 +1,4 @@ -import type { Representation } from '../../ldp/representation/Representation'; +import type { Representation } from '../../http/representation/Representation'; import { getLoggerFor } from '../../logging/LogUtil'; import { InternalServerError } from '../../util/errors/InternalServerError'; import { UnsupportedAsyncHandler } from '../../util/handlers/UnsupportedAsyncHandler'; diff --git a/src/storage/conversion/MarkdownToHtmlConverter.ts b/src/storage/conversion/MarkdownToHtmlConverter.ts index a690f81bc..1bbae4d2c 100644 --- a/src/storage/conversion/MarkdownToHtmlConverter.ts +++ b/src/storage/conversion/MarkdownToHtmlConverter.ts @@ -1,6 +1,6 @@ import marked from 'marked'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; import { TEXT_HTML, TEXT_MARKDOWN } from '../../util/ContentTypes'; import { readableToString } from '../../util/StreamUtil'; import type { TemplateEngine } from '../../util/templates/TemplateEngine'; diff --git a/src/storage/conversion/PassthroughConverter.ts b/src/storage/conversion/PassthroughConverter.ts index 0dbaca78b..f04b3c97c 100644 --- a/src/storage/conversion/PassthroughConverter.ts +++ b/src/storage/conversion/PassthroughConverter.ts @@ -1,4 +1,4 @@ -import type { Representation } from '../../ldp/representation/Representation'; +import type { Representation } from '../../http/representation/Representation'; import { RepresentationConverter } from './RepresentationConverter'; import type { RepresentationConverterArgs } from './RepresentationConverter'; diff --git a/src/storage/conversion/QuadToRdfConverter.ts b/src/storage/conversion/QuadToRdfConverter.ts index 00e770361..512832b44 100644 --- a/src/storage/conversion/QuadToRdfConverter.ts +++ b/src/storage/conversion/QuadToRdfConverter.ts @@ -1,9 +1,9 @@ import type { Readable } from 'stream'; import { StreamWriter } from 'n3'; import rdfSerializer from 'rdf-serialize'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; -import type { ValuePreferences } from '../../ldp/representation/RepresentationPreferences'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; +import type { ValuePreferences } from '../../http/representation/RepresentationPreferences'; import { INTERNAL_QUADS } from '../../util/ContentTypes'; import { pipeSafely } from '../../util/StreamUtil'; import { PREFERRED_PREFIX_TERM } from '../../util/Vocabularies'; diff --git a/src/storage/conversion/RdfToQuadConverter.ts b/src/storage/conversion/RdfToQuadConverter.ts index ee6b2183c..521cd4865 100644 --- a/src/storage/conversion/RdfToQuadConverter.ts +++ b/src/storage/conversion/RdfToQuadConverter.ts @@ -1,7 +1,7 @@ import { PassThrough } from 'stream'; import rdfParser from 'rdf-parse'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; import { INTERNAL_QUADS } from '../../util/ContentTypes'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { pipeSafely } from '../../util/StreamUtil'; diff --git a/src/storage/conversion/RepresentationConverter.ts b/src/storage/conversion/RepresentationConverter.ts index a9bc02d94..e0017547e 100644 --- a/src/storage/conversion/RepresentationConverter.ts +++ b/src/storage/conversion/RepresentationConverter.ts @@ -1,6 +1,6 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { RepresentationPreferences } from '../../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { AsyncHandler } from '../../util/handlers/AsyncHandler'; export interface RepresentationConverterArgs { diff --git a/src/storage/conversion/TypedRepresentationConverter.ts b/src/storage/conversion/TypedRepresentationConverter.ts index 82b6e7e00..75eb7e00f 100644 --- a/src/storage/conversion/TypedRepresentationConverter.ts +++ b/src/storage/conversion/TypedRepresentationConverter.ts @@ -1,4 +1,4 @@ -import type { ValuePreferences } from '../../ldp/representation/RepresentationPreferences'; +import type { ValuePreferences } from '../../http/representation/RepresentationPreferences'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { getConversionTarget, getTypeWeight } from './ConversionUtil'; import { RepresentationConverter } from './RepresentationConverter'; diff --git a/src/storage/keyvalue/JsonFileStorage.ts b/src/storage/keyvalue/JsonFileStorage.ts index a6c3580db..fff543f83 100644 --- a/src/storage/keyvalue/JsonFileStorage.ts +++ b/src/storage/keyvalue/JsonFileStorage.ts @@ -1,5 +1,5 @@ import { promises as fsPromises } from 'fs'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { isSystemError } from '../../util/errors/SystemError'; import type { ReadWriteLocker } from '../../util/locking/ReadWriteLocker'; import type { KeyValueStorage } from './KeyValueStorage'; diff --git a/src/storage/keyvalue/JsonResourceStorage.ts b/src/storage/keyvalue/JsonResourceStorage.ts index 2042b80d7..794df82e4 100644 --- a/src/storage/keyvalue/JsonResourceStorage.ts +++ b/src/storage/keyvalue/JsonResourceStorage.ts @@ -1,7 +1,7 @@ import { URL } from 'url'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; import { ensureTrailingSlash } from '../../util/PathUtil'; import { readableToString } from '../../util/StreamUtil'; diff --git a/src/storage/mapping/BaseFileIdentifierMapper.ts b/src/storage/mapping/BaseFileIdentifierMapper.ts index 15ea24be0..a48dfe570 100644 --- a/src/storage/mapping/BaseFileIdentifierMapper.ts +++ b/src/storage/mapping/BaseFileIdentifierMapper.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { APPLICATION_OCTET_STREAM } from '../../util/ContentTypes'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; diff --git a/src/storage/mapping/ExtensionBasedMapper.ts b/src/storage/mapping/ExtensionBasedMapper.ts index e775ca640..6b3747a44 100644 --- a/src/storage/mapping/ExtensionBasedMapper.ts +++ b/src/storage/mapping/ExtensionBasedMapper.ts @@ -1,6 +1,6 @@ import { promises as fsPromises } from 'fs'; import * as mime from 'mime-types'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { DEFAULT_CUSTOM_TYPES } from '../../util/ContentTypes'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { joinFilePath, getExtension } from '../../util/PathUtil'; diff --git a/src/storage/mapping/FileIdentifierMapper.ts b/src/storage/mapping/FileIdentifierMapper.ts index c261da954..f56fad618 100644 --- a/src/storage/mapping/FileIdentifierMapper.ts +++ b/src/storage/mapping/FileIdentifierMapper.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; export interface ResourceLink { /** diff --git a/src/storage/mapping/FixedContentTypeMapper.ts b/src/storage/mapping/FixedContentTypeMapper.ts index 223336d02..3ca5556a7 100644 --- a/src/storage/mapping/FixedContentTypeMapper.ts +++ b/src/storage/mapping/FixedContentTypeMapper.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { BaseFileIdentifierMapper } from './BaseFileIdentifierMapper'; diff --git a/src/storage/mapping/SubdomainExtensionBasedMapper.ts b/src/storage/mapping/SubdomainExtensionBasedMapper.ts index 3dab81ef6..19265f21c 100644 --- a/src/storage/mapping/SubdomainExtensionBasedMapper.ts +++ b/src/storage/mapping/SubdomainExtensionBasedMapper.ts @@ -1,5 +1,5 @@ import { toASCII, toUnicode } from 'punycode/'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { ForbiddenHttpError } from '../../util/errors/ForbiddenHttpError'; import { InternalServerError } from '../../util/errors/InternalServerError'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; diff --git a/src/storage/patch/ContainerPatcher.ts b/src/storage/patch/ContainerPatcher.ts index 073efffbd..ddc5c2cfa 100644 --- a/src/storage/patch/ContainerPatcher.ts +++ b/src/storage/patch/ContainerPatcher.ts @@ -1,5 +1,5 @@ -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; import { INTERNAL_QUADS } from '../../util/ContentTypes'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { isContainerIdentifier } from '../../util/PathUtil'; diff --git a/src/storage/patch/ConvertingPatcher.ts b/src/storage/patch/ConvertingPatcher.ts index bc3fbad04..ff60d0690 100644 --- a/src/storage/patch/ConvertingPatcher.ts +++ b/src/storage/patch/ConvertingPatcher.ts @@ -1,5 +1,5 @@ -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Representation } from '../../http/representation/Representation'; import { getLoggerFor } from '../../logging/LogUtil'; import type { RepresentationConverter } from '../conversion/RepresentationConverter'; import type { RepresentationPatcherInput } from './RepresentationPatcher'; diff --git a/src/storage/patch/PatchHandler.ts b/src/storage/patch/PatchHandler.ts index b56edb449..309786d53 100644 --- a/src/storage/patch/PatchHandler.ts +++ b/src/storage/patch/PatchHandler.ts @@ -1,5 +1,5 @@ -import type { Patch } from '../../ldp/http/Patch'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../../http/representation/Patch'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { AsyncHandler } from '../../util/handlers/AsyncHandler'; import type { ResourceStore } from '../ResourceStore'; diff --git a/src/storage/patch/RepresentationPatchHandler.ts b/src/storage/patch/RepresentationPatchHandler.ts index 703d86468..7768f055c 100644 --- a/src/storage/patch/RepresentationPatchHandler.ts +++ b/src/storage/patch/RepresentationPatchHandler.ts @@ -1,5 +1,5 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; import type { PatchHandlerInput } from './PatchHandler'; diff --git a/src/storage/patch/RepresentationPatcher.ts b/src/storage/patch/RepresentationPatcher.ts index 3c9b4b093..03f8c3a70 100644 --- a/src/storage/patch/RepresentationPatcher.ts +++ b/src/storage/patch/RepresentationPatcher.ts @@ -1,6 +1,6 @@ -import type { Patch } from '../../ldp/http/Patch'; -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Patch } from '../../http/representation/Patch'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { AsyncHandler } from '../../util/handlers/AsyncHandler'; export interface RepresentationPatcherInput { diff --git a/src/storage/patch/SparqlUpdatePatcher.ts b/src/storage/patch/SparqlUpdatePatcher.ts index d77749644..92d707b28 100644 --- a/src/storage/patch/SparqlUpdatePatcher.ts +++ b/src/storage/patch/SparqlUpdatePatcher.ts @@ -6,11 +6,11 @@ import { defaultGraph } from '@rdfjs/data-model'; import { Store } from 'n3'; import type { BaseQuad } from 'rdf-js'; import { Algebra } from 'sparqlalgebrajs'; -import type { Patch } from '../../ldp/http/Patch'; -import type { SparqlUpdatePatch } from '../../ldp/http/SparqlUpdatePatch'; -import { BasicRepresentation } from '../../ldp/representation/BasicRepresentation'; -import type { Representation } from '../../ldp/representation/Representation'; -import { RepresentationMetadata } from '../../ldp/representation/RepresentationMetadata'; +import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; +import type { Patch } from '../../http/representation/Patch'; +import type { Representation } from '../../http/representation/Representation'; +import { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import type { SparqlUpdatePatch } from '../../http/representation/SparqlUpdatePatch'; import { getLoggerFor } from '../../logging/LogUtil'; import { INTERNAL_QUADS } from '../../util/ContentTypes'; import { InternalServerError } from '../../util/errors/InternalServerError'; diff --git a/src/storage/routing/BaseUrlRouterRule.ts b/src/storage/routing/BaseUrlRouterRule.ts index 9579efe50..fd59ba515 100644 --- a/src/storage/routing/BaseUrlRouterRule.ts +++ b/src/storage/routing/BaseUrlRouterRule.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; import type { KeyValueStorage } from '../keyvalue/KeyValueStorage'; import type { ResourceStore } from '../ResourceStore'; diff --git a/src/storage/routing/ConvertingRouterRule.ts b/src/storage/routing/ConvertingRouterRule.ts index 28a5045b4..d9b37a752 100644 --- a/src/storage/routing/ConvertingRouterRule.ts +++ b/src/storage/routing/ConvertingRouterRule.ts @@ -1,5 +1,5 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { ResourceStore } from '../ResourceStore'; import type { PreferenceSupport } from './PreferenceSupport'; import { RouterRule } from './RouterRule'; diff --git a/src/storage/routing/PreferenceSupport.ts b/src/storage/routing/PreferenceSupport.ts index 4aa1d6ca1..886b59460 100644 --- a/src/storage/routing/PreferenceSupport.ts +++ b/src/storage/routing/PreferenceSupport.ts @@ -1,6 +1,6 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { RepresentationPreferences } from '../../ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { RepresentationPreferences } from '../../http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { RepresentationConverter } from '../conversion/RepresentationConverter'; /** diff --git a/src/storage/routing/RegexRouterRule.ts b/src/storage/routing/RegexRouterRule.ts index bd2499b34..4f8a58a8f 100644 --- a/src/storage/routing/RegexRouterRule.ts +++ b/src/storage/routing/RegexRouterRule.ts @@ -1,5 +1,5 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { trimTrailingSlashes } from '../../util/PathUtil'; diff --git a/src/storage/routing/RouterRule.ts b/src/storage/routing/RouterRule.ts index 409cd610f..d5fb70761 100644 --- a/src/storage/routing/RouterRule.ts +++ b/src/storage/routing/RouterRule.ts @@ -1,5 +1,5 @@ -import type { Representation } from '../../ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../http/representation/Representation'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { AsyncHandler } from '../../util/handlers/AsyncHandler'; import type { ResourceStore } from '../ResourceStore'; diff --git a/src/util/FetchUtil.ts b/src/util/FetchUtil.ts index 76d675054..8d8a409db 100644 --- a/src/util/FetchUtil.ts +++ b/src/util/FetchUtil.ts @@ -1,7 +1,7 @@ import type { Response } from 'cross-fetch'; import { fetch } from 'cross-fetch'; -import { BasicRepresentation } from '../ldp/representation/BasicRepresentation'; -import type { Representation } from '../ldp/representation/Representation'; +import { BasicRepresentation } from '../http/representation/BasicRepresentation'; +import type { Representation } from '../http/representation/Representation'; import { getLoggerFor } from '../logging/LogUtil'; import type { RepresentationConverter } from '../storage/conversion/RepresentationConverter'; import { INTERNAL_QUADS } from './ContentTypes'; diff --git a/src/util/PathUtil.ts b/src/util/PathUtil.ts index 87e95d248..c5078e4eb 100644 --- a/src/util/PathUtil.ts +++ b/src/util/PathUtil.ts @@ -1,7 +1,7 @@ import { posix, win32 } from 'path'; import urljoin from 'url-join'; -import type { TargetExtractor } from '../ldp/http/TargetExtractor'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; +import type { TargetExtractor } from '../http/input/identifier/TargetExtractor'; +import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import type { HttpRequest } from '../server/HttpRequest'; import { BadRequestHttpError } from './errors/BadRequestHttpError'; diff --git a/src/util/ResourceUtil.ts b/src/util/ResourceUtil.ts index 735dc7fa8..f06e593e1 100644 --- a/src/util/ResourceUtil.ts +++ b/src/util/ResourceUtil.ts @@ -1,8 +1,8 @@ import arrayifyStream from 'arrayify-stream'; import { DataFactory } from 'n3'; -import { BasicRepresentation } from '../ldp/representation/BasicRepresentation'; -import type { Representation } from '../ldp/representation/Representation'; -import { RepresentationMetadata } from '../ldp/representation/RepresentationMetadata'; +import { BasicRepresentation } from '../http/representation/BasicRepresentation'; +import type { Representation } from '../http/representation/Representation'; +import { RepresentationMetadata } from '../http/representation/RepresentationMetadata'; import { guardedStreamFrom } from './StreamUtil'; import { toLiteral } from './TermUtil'; import { CONTENT_TYPE_TERM, DC, LDP, RDF, SOLID_META, XSD } from './Vocabularies'; diff --git a/src/util/identifiers/BaseIdentifierStrategy.ts b/src/util/identifiers/BaseIdentifierStrategy.ts index 93bb3b7bb..9d71543a7 100644 --- a/src/util/identifiers/BaseIdentifierStrategy.ts +++ b/src/util/identifiers/BaseIdentifierStrategy.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { InternalServerError } from '../errors/InternalServerError'; import { ensureTrailingSlash } from '../PathUtil'; import type { IdentifierStrategy } from './IdentifierStrategy'; diff --git a/src/util/identifiers/IdentifierStrategy.ts b/src/util/identifiers/IdentifierStrategy.ts index 43f6caca3..c0907194a 100644 --- a/src/util/identifiers/IdentifierStrategy.ts +++ b/src/util/identifiers/IdentifierStrategy.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; /** * Captures the behavior of container identifiers in a certain storage configuration. diff --git a/src/util/identifiers/SingleRootIdentifierStrategy.ts b/src/util/identifiers/SingleRootIdentifierStrategy.ts index da4b01458..ee1e9013e 100644 --- a/src/util/identifiers/SingleRootIdentifierStrategy.ts +++ b/src/util/identifiers/SingleRootIdentifierStrategy.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { ensureTrailingSlash } from '../PathUtil'; import { BaseIdentifierStrategy } from './BaseIdentifierStrategy'; diff --git a/src/util/identifiers/SubdomainIdentifierStrategy.ts b/src/util/identifiers/SubdomainIdentifierStrategy.ts index 11d9a7944..b14c18138 100644 --- a/src/util/identifiers/SubdomainIdentifierStrategy.ts +++ b/src/util/identifiers/SubdomainIdentifierStrategy.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { ensureTrailingSlash, createSubdomainRegexp } from '../PathUtil'; import { BaseIdentifierStrategy } from './BaseIdentifierStrategy'; diff --git a/src/util/locking/EqualReadWriteLocker.ts b/src/util/locking/EqualReadWriteLocker.ts index 33b216063..d57b554c7 100644 --- a/src/util/locking/EqualReadWriteLocker.ts +++ b/src/util/locking/EqualReadWriteLocker.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { ReadWriteLocker } from './ReadWriteLocker'; import type { ResourceLocker } from './ResourceLocker'; diff --git a/src/util/locking/ExpiringReadWriteLocker.ts b/src/util/locking/ExpiringReadWriteLocker.ts index 562d32120..249dc8de0 100644 --- a/src/util/locking/ExpiringReadWriteLocker.ts +++ b/src/util/locking/ExpiringReadWriteLocker.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { ReadWriteLocker } from './ReadWriteLocker'; /** diff --git a/src/util/locking/GreedyReadWriteLocker.ts b/src/util/locking/GreedyReadWriteLocker.ts index 972bcfaed..86abfd0d5 100644 --- a/src/util/locking/GreedyReadWriteLocker.ts +++ b/src/util/locking/GreedyReadWriteLocker.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { KeyValueStorage } from '../../storage/keyvalue/KeyValueStorage'; import { ForbiddenHttpError } from '../errors/ForbiddenHttpError'; import { InternalServerError } from '../errors/InternalServerError'; diff --git a/src/util/locking/ReadWriteLocker.ts b/src/util/locking/ReadWriteLocker.ts index 327dadac3..eee10b3e3 100644 --- a/src/util/locking/ReadWriteLocker.ts +++ b/src/util/locking/ReadWriteLocker.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; /** * Allows the locking of resources which is needed for non-atomic {@link ResourceStore}s. diff --git a/src/util/locking/RedisResourceLocker.ts b/src/util/locking/RedisResourceLocker.ts index cb91e1ef6..421e2fe57 100644 --- a/src/util/locking/RedisResourceLocker.ts +++ b/src/util/locking/RedisResourceLocker.ts @@ -3,8 +3,8 @@ import type { RedisClient } from 'redis'; import { createClient } from 'redis'; import type { Lock } from 'redlock'; import Redlock from 'redlock'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import type { Finalizable } from '../../init/final/Finalizable'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { InternalServerError } from '../errors/InternalServerError'; import type { ResourceLocker } from './ResourceLocker'; diff --git a/src/util/locking/ResourceLocker.ts b/src/util/locking/ResourceLocker.ts index dba45794b..eb2fd8325 100644 --- a/src/util/locking/ResourceLocker.ts +++ b/src/util/locking/ResourceLocker.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; /** * An interface for classes that only have 1 way to lock interfaces. diff --git a/src/util/locking/SingleThreadedResourceLocker.ts b/src/util/locking/SingleThreadedResourceLocker.ts index 2049cc297..5b5c41b27 100644 --- a/src/util/locking/SingleThreadedResourceLocker.ts +++ b/src/util/locking/SingleThreadedResourceLocker.ts @@ -1,5 +1,5 @@ import AsyncLock from 'async-lock'; -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { InternalServerError } from '../errors/InternalServerError'; import type { ResourceLocker } from './ResourceLocker'; diff --git a/src/util/locking/WrappedExpiringReadWriteLocker.ts b/src/util/locking/WrappedExpiringReadWriteLocker.ts index 92d6b85dc..6bac5c8be 100644 --- a/src/util/locking/WrappedExpiringReadWriteLocker.ts +++ b/src/util/locking/WrappedExpiringReadWriteLocker.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../../logging/LogUtil'; import { InternalServerError } from '../errors/InternalServerError'; import type { ExpiringReadWriteLocker } from './ExpiringReadWriteLocker'; diff --git a/test/integration/LockingResourceStore.test.ts b/test/integration/LockingResourceStore.test.ts index 52ee49d3e..80b8cbf94 100644 --- a/test/integration/LockingResourceStore.test.ts +++ b/test/integration/LockingResourceStore.test.ts @@ -1,7 +1,7 @@ -import { RoutingAuxiliaryStrategy } from '../../src/ldp/auxiliary/RoutingAuxiliaryStrategy'; -import { BasicRepresentation } from '../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../src/ldp/representation/RepresentationMetadata'; +import { RoutingAuxiliaryStrategy } from '../../src/http/auxiliary/RoutingAuxiliaryStrategy'; +import { BasicRepresentation } from '../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../src/http/representation/RepresentationMetadata'; import { InMemoryDataAccessor } from '../../src/storage/accessors/InMemoryDataAccessor'; import { DataAccessorBasedStore } from '../../src/storage/DataAccessorBasedStore'; import { LockingResourceStore } from '../../src/storage/LockingResourceStore'; diff --git a/test/integration/RepresentationConverter.test.ts b/test/integration/RepresentationConverter.test.ts index ae2dfa8f7..86c6c7413 100644 --- a/test/integration/RepresentationConverter.test.ts +++ b/test/integration/RepresentationConverter.test.ts @@ -1,4 +1,4 @@ -import { BasicRepresentation } from '../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../src/http/representation/BasicRepresentation'; import { ChainedConverter } from '../../src/storage/conversion/ChainedConverter'; import { QuadToRdfConverter } from '../../src/storage/conversion/QuadToRdfConverter'; import { RdfToQuadConverter } from '../../src/storage/conversion/RdfToQuadConverter'; diff --git a/test/integration/RequestParser.test.ts b/test/integration/RequestParser.test.ts index bf68904a3..495231e07 100644 --- a/test/integration/RequestParser.test.ts +++ b/test/integration/RequestParser.test.ts @@ -1,12 +1,12 @@ import { Readable } from 'stream'; import arrayifyStream from 'arrayify-stream'; -import { AcceptPreferenceParser } from '../../src/ldp/http/AcceptPreferenceParser'; -import { BasicRequestParser } from '../../src/ldp/http/BasicRequestParser'; -import { BasicConditionsParser } from '../../src/ldp/http/conditions/BasicConditionsParser'; -import { ContentTypeParser } from '../../src/ldp/http/metadata/ContentTypeParser'; -import { OriginalUrlExtractor } from '../../src/ldp/http/OriginalUrlExtractor'; -import { RawBodyParser } from '../../src/ldp/http/RawBodyParser'; -import { RepresentationMetadata } from '../../src/ldp/representation/RepresentationMetadata'; +import { BasicRequestParser } from '../../src/http/input/BasicRequestParser'; +import { RawBodyParser } from '../../src/http/input/body/RawBodyParser'; +import { BasicConditionsParser } from '../../src/http/input/conditions/BasicConditionsParser'; +import { OriginalUrlExtractor } from '../../src/http/input/identifier/OriginalUrlExtractor'; +import { ContentTypeParser } from '../../src/http/input/metadata/ContentTypeParser'; +import { AcceptPreferenceParser } from '../../src/http/input/preferences/AcceptPreferenceParser'; +import { RepresentationMetadata } from '../../src/http/representation/RepresentationMetadata'; import type { HttpRequest } from '../../src/server/HttpRequest'; import { BasicConditions } from '../../src/storage/BasicConditions'; import { guardedStreamFrom } from '../../src/util/StreamUtil'; diff --git a/test/unit/authorization/AllStaticReader.test.ts b/test/unit/authorization/AllStaticReader.test.ts index 797f3fa1a..0630b37c5 100644 --- a/test/unit/authorization/AllStaticReader.test.ts +++ b/test/unit/authorization/AllStaticReader.test.ts @@ -1,6 +1,6 @@ import { CredentialGroup } from '../../../src/authentication/Credentials'; import { AllStaticReader } from '../../../src/authorization/AllStaticReader'; -import type { Permission } from '../../../src/ldp/permissions/Permissions'; +import type { Permission } from '../../../src/authorization/permissions/Permissions'; function getPermissions(allow: boolean): Permission { return { diff --git a/test/unit/authorization/AuxiliaryReader.test.ts b/test/unit/authorization/AuxiliaryReader.test.ts index 555ec7817..422b25402 100644 --- a/test/unit/authorization/AuxiliaryReader.test.ts +++ b/test/unit/authorization/AuxiliaryReader.test.ts @@ -1,9 +1,9 @@ import { CredentialGroup } from '../../../src/authentication/Credentials'; import { AuxiliaryReader } from '../../../src/authorization/AuxiliaryReader'; import type { PermissionReader } from '../../../src/authorization/PermissionReader'; -import type { AuxiliaryStrategy } from '../../../src/ldp/auxiliary/AuxiliaryStrategy'; -import type { PermissionSet } from '../../../src/ldp/permissions/Permissions'; -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; +import type { PermissionSet } from '../../../src/authorization/permissions/Permissions'; +import type { AuxiliaryStrategy } from '../../../src/http/auxiliary/AuxiliaryStrategy'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import { NotImplementedHttpError } from '../../../src/util/errors/NotImplementedHttpError'; describe('An AuxiliaryReader', (): void => { diff --git a/test/unit/authorization/OwnerPermissionReader.test.ts b/test/unit/authorization/OwnerPermissionReader.test.ts index 903614fc1..b8b4dc3a2 100644 --- a/test/unit/authorization/OwnerPermissionReader.test.ts +++ b/test/unit/authorization/OwnerPermissionReader.test.ts @@ -1,12 +1,12 @@ import type { CredentialSet } from '../../../src/authentication/Credentials'; import { CredentialGroup } from '../../../src/authentication/Credentials'; import { OwnerPermissionReader } from '../../../src/authorization/OwnerPermissionReader'; +import type { AuxiliaryIdentifierStrategy } from '../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import type { AccountSettings, AccountStore, } from '../../../src/identity/interaction/email-password/storage/AccountStore'; -import type { AuxiliaryIdentifierStrategy } from '../../../src/ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; describe('An OwnerPermissionReader', (): void => { const owner = 'http://test.com/alice/profile/card#me'; diff --git a/test/unit/authorization/PathBasedReader.test.ts b/test/unit/authorization/PathBasedReader.test.ts index f21853f99..6b72d5047 100644 --- a/test/unit/authorization/PathBasedReader.test.ts +++ b/test/unit/authorization/PathBasedReader.test.ts @@ -1,7 +1,7 @@ import { CredentialGroup } from '../../../src/authentication/Credentials'; import { PathBasedReader } from '../../../src/authorization/PathBasedReader'; import type { PermissionReader, PermissionReaderInput } from '../../../src/authorization/PermissionReader'; -import type { PermissionSet } from '../../../src/ldp/permissions/Permissions'; +import type { PermissionSet } from '../../../src/authorization/permissions/Permissions'; import { NotImplementedHttpError } from '../../../src/util/errors/NotImplementedHttpError'; describe('A PathBasedReader', (): void => { diff --git a/test/unit/authorization/PermissionBasedAuthorizer.test.ts b/test/unit/authorization/PermissionBasedAuthorizer.test.ts index 66671e0ce..b29aad212 100644 --- a/test/unit/authorization/PermissionBasedAuthorizer.test.ts +++ b/test/unit/authorization/PermissionBasedAuthorizer.test.ts @@ -1,7 +1,7 @@ import { CredentialGroup } from '../../../src/authentication/Credentials'; import type { AuthorizerInput } from '../../../src/authorization/Authorizer'; import { PermissionBasedAuthorizer } from '../../../src/authorization/PermissionBasedAuthorizer'; -import { AccessMode } from '../../../src/ldp/permissions/Permissions'; +import { AccessMode } from '../../../src/authorization/permissions/Permissions'; import { ForbiddenHttpError } from '../../../src/util/errors/ForbiddenHttpError'; import { UnauthorizedHttpError } from '../../../src/util/errors/UnauthorizedHttpError'; diff --git a/test/unit/authorization/WebAclReader.test.ts b/test/unit/authorization/WebAclReader.test.ts index 959304385..841738ed4 100644 --- a/test/unit/authorization/WebAclReader.test.ts +++ b/test/unit/authorization/WebAclReader.test.ts @@ -1,12 +1,12 @@ import { namedNode, quad } from '@rdfjs/data-model'; import { CredentialGroup } from '../../../src/authentication/Credentials'; import type { CredentialSet } from '../../../src/authentication/Credentials'; -import type { AccessChecker } from '../../../src/authorization/access-checkers/AccessChecker'; +import type { AccessChecker } from '../../../src/authorization/access/AccessChecker'; import { WebAclReader } from '../../../src/authorization/WebAclReader'; -import type { AuxiliaryIdentifierStrategy } from '../../../src/ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import { BasicRepresentation } from '../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../src/ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; +import type { AuxiliaryIdentifierStrategy } from '../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; +import { BasicRepresentation } from '../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../src/http/representation/Representation'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; import { INTERNAL_QUADS } from '../../../src/util/ContentTypes'; import { ForbiddenHttpError } from '../../../src/util/errors/ForbiddenHttpError'; diff --git a/test/unit/authorization/access-checkers/AgentAccessChecker.test.ts b/test/unit/authorization/access/AgentAccessChecker.test.ts similarity index 95% rename from test/unit/authorization/access-checkers/AgentAccessChecker.test.ts rename to test/unit/authorization/access/AgentAccessChecker.test.ts index 08a028e60..a64bd2e1f 100644 --- a/test/unit/authorization/access-checkers/AgentAccessChecker.test.ts +++ b/test/unit/authorization/access/AgentAccessChecker.test.ts @@ -1,6 +1,6 @@ import { DataFactory, Store } from 'n3'; -import type { AccessCheckerArgs } from '../../../../src/authorization/access-checkers/AccessChecker'; -import { AgentAccessChecker } from '../../../../src/authorization/access-checkers/AgentAccessChecker'; +import type { AccessCheckerArgs } from '../../../../src/authorization/access/AccessChecker'; +import { AgentAccessChecker } from '../../../../src/authorization/access/AgentAccessChecker'; import { ACL } from '../../../../src/util/Vocabularies'; import namedNode = DataFactory.namedNode; diff --git a/test/unit/authorization/access-checkers/AgentClassAccessChecker.test.ts b/test/unit/authorization/access/AgentClassAccessChecker.test.ts similarity index 95% rename from test/unit/authorization/access-checkers/AgentClassAccessChecker.test.ts rename to test/unit/authorization/access/AgentClassAccessChecker.test.ts index 2323de911..9e505c896 100644 --- a/test/unit/authorization/access-checkers/AgentClassAccessChecker.test.ts +++ b/test/unit/authorization/access/AgentClassAccessChecker.test.ts @@ -1,6 +1,6 @@ import { DataFactory, Store } from 'n3'; -import type { AccessCheckerArgs } from '../../../../src/authorization/access-checkers/AccessChecker'; -import { AgentClassAccessChecker } from '../../../../src/authorization/access-checkers/AgentClassAccessChecker'; +import type { AccessCheckerArgs } from '../../../../src/authorization/access/AccessChecker'; +import { AgentClassAccessChecker } from '../../../../src/authorization/access/AgentClassAccessChecker'; import { ACL, FOAF } from '../../../../src/util/Vocabularies'; import namedNode = DataFactory.namedNode; diff --git a/test/unit/authorization/access-checkers/AgentGroupAccessChecker.test.ts b/test/unit/authorization/access/AgentGroupAccessChecker.test.ts similarity index 91% rename from test/unit/authorization/access-checkers/AgentGroupAccessChecker.test.ts rename to test/unit/authorization/access/AgentGroupAccessChecker.test.ts index 40f711053..ae86a9356 100644 --- a/test/unit/authorization/access-checkers/AgentGroupAccessChecker.test.ts +++ b/test/unit/authorization/access/AgentGroupAccessChecker.test.ts @@ -1,8 +1,8 @@ import { DataFactory, Store } from 'n3'; -import type { AccessCheckerArgs } from '../../../../src/authorization/access-checkers/AccessChecker'; -import { AgentGroupAccessChecker } from '../../../../src/authorization/access-checkers/AgentGroupAccessChecker'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; +import type { AccessCheckerArgs } from '../../../../src/authorization/access/AccessChecker'; +import { AgentGroupAccessChecker } from '../../../../src/authorization/access/AgentGroupAccessChecker'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; import type { RepresentationConverter } from '../../../../src/storage/conversion/RepresentationConverter'; import type { ExpiringStorage } from '../../../../src/storage/keyvalue/ExpiringStorage'; import { INTERNAL_QUADS } from '../../../../src/util/ContentTypes'; diff --git a/test/unit/ldp/permissions/MethodModesExtractor.test.ts b/test/unit/authorization/permissions/MethodModesExtractor.test.ts similarity index 88% rename from test/unit/ldp/permissions/MethodModesExtractor.test.ts rename to test/unit/authorization/permissions/MethodModesExtractor.test.ts index 1c2a5bf11..9170bac9f 100644 --- a/test/unit/ldp/permissions/MethodModesExtractor.test.ts +++ b/test/unit/authorization/permissions/MethodModesExtractor.test.ts @@ -1,6 +1,6 @@ -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import { MethodModesExtractor } from '../../../../src/ldp/permissions/MethodModesExtractor'; -import { AccessMode } from '../../../../src/ldp/permissions/Permissions'; +import { MethodModesExtractor } from '../../../../src/authorization/permissions/MethodModesExtractor'; +import { AccessMode } from '../../../../src/authorization/permissions/Permissions'; +import type { Operation } from '../../../../src/http/Operation'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; describe('A MethodModesExtractor', (): void => { diff --git a/test/unit/ldp/permissions/SparqlPatchModesExtractor.test.ts b/test/unit/authorization/permissions/SparqlPatchModesExtractor.test.ts similarity index 92% rename from test/unit/ldp/permissions/SparqlPatchModesExtractor.test.ts rename to test/unit/authorization/permissions/SparqlPatchModesExtractor.test.ts index 52c744e6c..64bf1176f 100644 --- a/test/unit/ldp/permissions/SparqlPatchModesExtractor.test.ts +++ b/test/unit/authorization/permissions/SparqlPatchModesExtractor.test.ts @@ -1,8 +1,8 @@ import { Factory } from 'sparqlalgebrajs'; -import type { SparqlUpdatePatch } from '../../../../src/ldp/http/SparqlUpdatePatch'; -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import { AccessMode } from '../../../../src/ldp/permissions/Permissions'; -import { SparqlPatchModesExtractor } from '../../../../src/ldp/permissions/SparqlPatchModesExtractor'; +import { AccessMode } from '../../../../src/authorization/permissions/Permissions'; +import { SparqlPatchModesExtractor } from '../../../../src/authorization/permissions/SparqlPatchModesExtractor'; +import type { Operation } from '../../../../src/http/Operation'; +import type { SparqlUpdatePatch } from '../../../../src/http/representation/SparqlUpdatePatch'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; describe('A SparqlPatchModesExtractor', (): void => { diff --git a/test/unit/ldp/UnsecureWebSocketsProtocol.test.ts b/test/unit/http/UnsecureWebSocketsProtocol.test.ts similarity index 98% rename from test/unit/ldp/UnsecureWebSocketsProtocol.test.ts rename to test/unit/http/UnsecureWebSocketsProtocol.test.ts index 8f241203a..0d95c421e 100644 --- a/test/unit/ldp/UnsecureWebSocketsProtocol.test.ts +++ b/test/unit/http/UnsecureWebSocketsProtocol.test.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import { UnsecureWebSocketsProtocol } from '../../../src/ldp/UnsecureWebSocketsProtocol'; +import { UnsecureWebSocketsProtocol } from '../../../src/http/UnsecureWebSocketsProtocol'; import type { HttpRequest } from '../../../src/server/HttpRequest'; class DummySocket extends EventEmitter { diff --git a/test/unit/ldp/auxiliary/ComposedAuxiliaryStrategy.test.ts b/test/unit/http/auxiliary/ComposedAuxiliaryStrategy.test.ts similarity index 89% rename from test/unit/ldp/auxiliary/ComposedAuxiliaryStrategy.test.ts rename to test/unit/http/auxiliary/ComposedAuxiliaryStrategy.test.ts index 3d301ad1b..4e07aca1c 100644 --- a/test/unit/ldp/auxiliary/ComposedAuxiliaryStrategy.test.ts +++ b/test/unit/http/auxiliary/ComposedAuxiliaryStrategy.test.ts @@ -1,8 +1,8 @@ -import type { AuxiliaryIdentifierStrategy } from '../../../../src/ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import { ComposedAuxiliaryStrategy } from '../../../../src/ldp/auxiliary/ComposedAuxiliaryStrategy'; -import type { MetadataGenerator } from '../../../../src/ldp/auxiliary/MetadataGenerator'; -import type { Validator } from '../../../../src/ldp/auxiliary/Validator'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import type { AuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; +import { ComposedAuxiliaryStrategy } from '../../../../src/http/auxiliary/ComposedAuxiliaryStrategy'; +import type { MetadataGenerator } from '../../../../src/http/auxiliary/MetadataGenerator'; +import type { Validator } from '../../../../src/http/auxiliary/Validator'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; describe('A ComposedAuxiliaryStrategy', (): void => { const identifier = { path: 'http://test.com/foo' }; diff --git a/test/unit/ldp/auxiliary/LinkMetadataGenerator.test.ts b/test/unit/http/auxiliary/LinkMetadataGenerator.test.ts similarity index 84% rename from test/unit/ldp/auxiliary/LinkMetadataGenerator.test.ts rename to test/unit/http/auxiliary/LinkMetadataGenerator.test.ts index da97acbf0..1c5b3e140 100644 --- a/test/unit/ldp/auxiliary/LinkMetadataGenerator.test.ts +++ b/test/unit/http/auxiliary/LinkMetadataGenerator.test.ts @@ -1,7 +1,7 @@ -import type { AuxiliaryIdentifierStrategy } from '../../../../src/ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import { LinkMetadataGenerator } from '../../../../src/ldp/auxiliary/LinkMetadataGenerator'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { AuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; +import { LinkMetadataGenerator } from '../../../../src/http/auxiliary/LinkMetadataGenerator'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { SOLID_META } from '../../../../src/util/Vocabularies'; describe('A LinkMetadataGenerator', (): void => { diff --git a/test/unit/ldp/auxiliary/RdfValidator.test.ts b/test/unit/http/auxiliary/RdfValidator.test.ts similarity index 92% rename from test/unit/ldp/auxiliary/RdfValidator.test.ts rename to test/unit/http/auxiliary/RdfValidator.test.ts index 8745d1c8a..71b5b48a0 100644 --- a/test/unit/ldp/auxiliary/RdfValidator.test.ts +++ b/test/unit/http/auxiliary/RdfValidator.test.ts @@ -1,5 +1,5 @@ -import { RdfValidator } from '../../../../src/ldp/auxiliary/RdfValidator'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { RdfValidator } from '../../../../src/http/auxiliary/RdfValidator'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import type { RepresentationConverter } from '../../../../src/storage/conversion/RepresentationConverter'; import { readableToString } from '../../../../src/util/StreamUtil'; import { StaticAsyncHandler } from '../../../util/StaticAsyncHandler'; diff --git a/test/unit/ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy.test.ts b/test/unit/http/auxiliary/RoutingAuxiliaryIdentifierStrategy.test.ts similarity index 93% rename from test/unit/ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy.test.ts rename to test/unit/http/auxiliary/RoutingAuxiliaryIdentifierStrategy.test.ts index 41d8f1948..c0bc67031 100644 --- a/test/unit/ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy.test.ts +++ b/test/unit/http/auxiliary/RoutingAuxiliaryIdentifierStrategy.test.ts @@ -1,6 +1,6 @@ -import type { AuxiliaryIdentifierStrategy } from '../../../../src/ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import { RoutingAuxiliaryIdentifierStrategy } from '../../../../src/ldp/auxiliary/RoutingAuxiliaryIdentifierStrategy'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { AuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; +import { RoutingAuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/RoutingAuxiliaryIdentifierStrategy'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { InternalServerError } from '../../../../src/util/errors/InternalServerError'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/ldp/auxiliary/RoutingAuxiliaryStrategy.test.ts b/test/unit/http/auxiliary/RoutingAuxiliaryStrategy.test.ts similarity index 92% rename from test/unit/ldp/auxiliary/RoutingAuxiliaryStrategy.test.ts rename to test/unit/http/auxiliary/RoutingAuxiliaryStrategy.test.ts index d4279d588..3d3050cb7 100644 --- a/test/unit/ldp/auxiliary/RoutingAuxiliaryStrategy.test.ts +++ b/test/unit/http/auxiliary/RoutingAuxiliaryStrategy.test.ts @@ -1,7 +1,7 @@ -import type { AuxiliaryStrategy } from '../../../../src/ldp/auxiliary/AuxiliaryStrategy'; -import { RoutingAuxiliaryStrategy } from '../../../../src/ldp/auxiliary/RoutingAuxiliaryStrategy'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { AuxiliaryStrategy } from '../../../../src/http/auxiliary/AuxiliaryStrategy'; +import { RoutingAuxiliaryStrategy } from '../../../../src/http/auxiliary/RoutingAuxiliaryStrategy'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; class SimpleSuffixStrategy implements AuxiliaryStrategy { diff --git a/test/unit/ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy.test.ts b/test/unit/http/auxiliary/SuffixAuxiliaryIdentifierStrategy.test.ts similarity index 91% rename from test/unit/ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy.test.ts rename to test/unit/http/auxiliary/SuffixAuxiliaryIdentifierStrategy.test.ts index 073dab45e..c76e99c10 100644 --- a/test/unit/ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy.test.ts +++ b/test/unit/http/auxiliary/SuffixAuxiliaryIdentifierStrategy.test.ts @@ -1,5 +1,5 @@ -import { SuffixAuxiliaryIdentifierStrategy } from '../../../../src/ldp/auxiliary/SuffixAuxiliaryIdentifierStrategy'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { SuffixAuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/SuffixAuxiliaryIdentifierStrategy'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { InternalServerError } from '../../../../src/util/errors/InternalServerError'; import 'jest-rdf'; diff --git a/test/unit/ldp/http/BasicRequestParser.test.ts b/test/unit/http/input/BasicRequestParser.test.ts similarity index 72% rename from test/unit/ldp/http/BasicRequestParser.test.ts rename to test/unit/http/input/BasicRequestParser.test.ts index 8066165d6..2d385a1f5 100644 --- a/test/unit/ldp/http/BasicRequestParser.test.ts +++ b/test/unit/http/input/BasicRequestParser.test.ts @@ -1,10 +1,10 @@ -import { BasicRequestParser } from '../../../../src/ldp/http/BasicRequestParser'; -import type { BodyParser } from '../../../../src/ldp/http/BodyParser'; -import type { ConditionsParser } from '../../../../src/ldp/http/conditions/ConditionsParser'; -import type { MetadataParser } from '../../../../src/ldp/http/metadata/MetadataParser'; -import type { PreferenceParser } from '../../../../src/ldp/http/PreferenceParser'; -import type { TargetExtractor } from '../../../../src/ldp/http/TargetExtractor'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { BasicRequestParser } from '../../../../src/http/input/BasicRequestParser'; +import type { BodyParser } from '../../../../src/http/input/body/BodyParser'; +import type { ConditionsParser } from '../../../../src/http/input/conditions/ConditionsParser'; +import type { TargetExtractor } from '../../../../src/http/input/identifier/TargetExtractor'; +import type { MetadataParser } from '../../../../src/http/input/metadata/MetadataParser'; +import type { PreferenceParser } from '../../../../src/http/input/preferences/PreferenceParser'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import { StaticAsyncHandler } from '../../../util/StaticAsyncHandler'; describe('A BasicRequestParser', (): void => { diff --git a/test/unit/ldp/http/RawBodyParser.test.ts b/test/unit/http/input/body/RawBodyParser.test.ts similarity index 87% rename from test/unit/ldp/http/RawBodyParser.test.ts rename to test/unit/http/input/body/RawBodyParser.test.ts index ee9723325..1ec76b30c 100644 --- a/test/unit/ldp/http/RawBodyParser.test.ts +++ b/test/unit/http/input/body/RawBodyParser.test.ts @@ -1,10 +1,10 @@ -import arrayifyStream from 'arrayify-stream'; -import type { BodyParserArgs } from '../../../../src/ldp/http/BodyParser'; -import { RawBodyParser } from '../../../../src/ldp/http/RawBodyParser'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; import 'jest-rdf'; -import type { HttpRequest } from '../../../../src/server/HttpRequest'; -import { guardedStreamFrom } from '../../../../src/util/StreamUtil'; +import arrayifyStream from 'arrayify-stream'; +import type { BodyParserArgs } from '../../../../../src/http/input/body/BodyParser'; +import { RawBodyParser } from '../../../../../src/http/input/body/RawBodyParser'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; +import type { HttpRequest } from '../../../../../src/server/HttpRequest'; +import { guardedStreamFrom } from '../../../../../src/util/StreamUtil'; describe('A RawBodyparser', (): void => { const bodyParser = new RawBodyParser(); diff --git a/test/unit/ldp/http/SparqlUpdateBodyParser.test.ts b/test/unit/http/input/body/SparqlUpdateBodyParser.test.ts similarity index 85% rename from test/unit/ldp/http/SparqlUpdateBodyParser.test.ts rename to test/unit/http/input/body/SparqlUpdateBodyParser.test.ts index 2e535e8f4..b205c1813 100644 --- a/test/unit/ldp/http/SparqlUpdateBodyParser.test.ts +++ b/test/unit/http/input/body/SparqlUpdateBodyParser.test.ts @@ -3,13 +3,13 @@ import { namedNode, quad } from '@rdfjs/data-model'; import arrayifyStream from 'arrayify-stream'; import { Algebra } from 'sparqlalgebrajs'; import * as algebra from 'sparqlalgebrajs'; -import type { BodyParserArgs } from '../../../../src/ldp/http/BodyParser'; -import { SparqlUpdateBodyParser } from '../../../../src/ldp/http/SparqlUpdateBodyParser'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { HttpRequest } from '../../../../src/server/HttpRequest'; -import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; -import { UnsupportedMediaTypeHttpError } from '../../../../src/util/errors/UnsupportedMediaTypeHttpError'; -import { guardedStreamFrom } from '../../../../src/util/StreamUtil'; +import type { BodyParserArgs } from '../../../../../src/http/input/body/BodyParser'; +import { SparqlUpdateBodyParser } from '../../../../../src/http/input/body/SparqlUpdateBodyParser'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; +import type { HttpRequest } from '../../../../../src/server/HttpRequest'; +import { BadRequestHttpError } from '../../../../../src/util/errors/BadRequestHttpError'; +import { UnsupportedMediaTypeHttpError } from '../../../../../src/util/errors/UnsupportedMediaTypeHttpError'; +import { guardedStreamFrom } from '../../../../../src/util/StreamUtil'; describe('A SparqlUpdateBodyParser', (): void => { const bodyParser = new SparqlUpdateBodyParser(); diff --git a/test/unit/ldp/http/conditions/BasicConditionsParser.test.ts b/test/unit/http/input/conditions/BasicConditionsParser.test.ts similarity index 96% rename from test/unit/ldp/http/conditions/BasicConditionsParser.test.ts rename to test/unit/http/input/conditions/BasicConditionsParser.test.ts index aa6e120ce..b8f1f63b6 100644 --- a/test/unit/ldp/http/conditions/BasicConditionsParser.test.ts +++ b/test/unit/http/input/conditions/BasicConditionsParser.test.ts @@ -1,4 +1,4 @@ -import { BasicConditionsParser } from '../../../../../src/ldp/http/conditions/BasicConditionsParser'; +import { BasicConditionsParser } from '../../../../../src/http/input/conditions/BasicConditionsParser'; import type { HttpRequest } from '../../../../../src/server/HttpRequest'; describe('A BasicConditionsParser', (): void => { diff --git a/test/unit/ldp/http/OriginalUrlExtractor.test.ts b/test/unit/http/input/identifier/OriginalUrlExtractor.test.ts similarity index 98% rename from test/unit/ldp/http/OriginalUrlExtractor.test.ts rename to test/unit/http/input/identifier/OriginalUrlExtractor.test.ts index c1c6061ba..c60668130 100644 --- a/test/unit/ldp/http/OriginalUrlExtractor.test.ts +++ b/test/unit/http/input/identifier/OriginalUrlExtractor.test.ts @@ -1,4 +1,4 @@ -import { OriginalUrlExtractor } from '../../../../src/ldp/http/OriginalUrlExtractor'; +import { OriginalUrlExtractor } from '../../../../../src/http/input/identifier/OriginalUrlExtractor'; describe('A OriginalUrlExtractor', (): void => { const extractor = new OriginalUrlExtractor(); diff --git a/test/unit/ldp/http/metadata/ContentTypeParser.test.ts b/test/unit/http/input/metadata/ContentTypeParser.test.ts similarity index 82% rename from test/unit/ldp/http/metadata/ContentTypeParser.test.ts rename to test/unit/http/input/metadata/ContentTypeParser.test.ts index 119772eb9..86c465822 100644 --- a/test/unit/ldp/http/metadata/ContentTypeParser.test.ts +++ b/test/unit/http/input/metadata/ContentTypeParser.test.ts @@ -1,5 +1,5 @@ -import { ContentTypeParser } from '../../../../../src/ldp/http/metadata/ContentTypeParser'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { ContentTypeParser } from '../../../../../src/http/input/metadata/ContentTypeParser'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpRequest } from '../../../../../src/server/HttpRequest'; describe('A ContentTypeParser', (): void => { diff --git a/test/unit/ldp/http/metadata/LinkParser.test.ts b/test/unit/http/input/metadata/LinkParser.test.ts similarity index 92% rename from test/unit/ldp/http/metadata/LinkParser.test.ts rename to test/unit/http/input/metadata/LinkParser.test.ts index 0c0192433..76bdd4301 100644 --- a/test/unit/ldp/http/metadata/LinkParser.test.ts +++ b/test/unit/http/input/metadata/LinkParser.test.ts @@ -1,5 +1,5 @@ -import { LinkRelParser } from '../../../../../src/ldp/http/metadata/LinkRelParser'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { LinkRelParser } from '../../../../../src/http/input/metadata/LinkRelParser'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpRequest } from '../../../../../src/server/HttpRequest'; import { RDF } from '../../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/http/metadata/SlugParser.test.ts b/test/unit/http/input/metadata/SlugParser.test.ts similarity index 88% rename from test/unit/ldp/http/metadata/SlugParser.test.ts rename to test/unit/http/input/metadata/SlugParser.test.ts index 3c415fef3..94ce68cb3 100644 --- a/test/unit/ldp/http/metadata/SlugParser.test.ts +++ b/test/unit/http/input/metadata/SlugParser.test.ts @@ -1,5 +1,5 @@ -import { SlugParser } from '../../../../../src/ldp/http/metadata/SlugParser'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { SlugParser } from '../../../../../src/http/input/metadata/SlugParser'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpRequest } from '../../../../../src/server/HttpRequest'; import { BadRequestHttpError } from '../../../../../src/util/errors/BadRequestHttpError'; import { SOLID_HTTP } from '../../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/http/AcceptPreferenceParser.test.ts b/test/unit/http/input/preferences/AcceptPreferenceParser.test.ts similarity index 92% rename from test/unit/ldp/http/AcceptPreferenceParser.test.ts rename to test/unit/http/input/preferences/AcceptPreferenceParser.test.ts index b852e1c82..b2f40706b 100644 --- a/test/unit/ldp/http/AcceptPreferenceParser.test.ts +++ b/test/unit/http/input/preferences/AcceptPreferenceParser.test.ts @@ -1,5 +1,5 @@ -import { AcceptPreferenceParser } from '../../../../src/ldp/http/AcceptPreferenceParser'; -import type { HttpRequest } from '../../../../src/server/HttpRequest'; +import { AcceptPreferenceParser } from '../../../../../src/http/input/preferences/AcceptPreferenceParser'; +import type { HttpRequest } from '../../../../../src/server/HttpRequest'; describe('An AcceptPreferenceParser', (): void => { const preferenceParser = new AcceptPreferenceParser(); diff --git a/test/unit/ldp/operations/DeleteOperationHandler.test.ts b/test/unit/http/ldp/DeleteOperationHandler.test.ts similarity index 89% rename from test/unit/ldp/operations/DeleteOperationHandler.test.ts rename to test/unit/http/ldp/DeleteOperationHandler.test.ts index 7ee99fe1c..27512a9c8 100644 --- a/test/unit/ldp/operations/DeleteOperationHandler.test.ts +++ b/test/unit/http/ldp/DeleteOperationHandler.test.ts @@ -1,5 +1,5 @@ -import { DeleteOperationHandler } from '../../../../src/ldp/operations/DeleteOperationHandler'; -import type { Operation } from '../../../../src/ldp/operations/Operation'; +import { DeleteOperationHandler } from '../../../../src/http/ldp/DeleteOperationHandler'; +import type { Operation } from '../../../../src/http/Operation'; import { BasicConditions } from '../../../../src/storage/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/ldp/operations/GetOperationHandler.test.ts b/test/unit/http/ldp/GetOperationHandler.test.ts similarity index 86% rename from test/unit/ldp/operations/GetOperationHandler.test.ts rename to test/unit/http/ldp/GetOperationHandler.test.ts index b5c7a6074..b0ac4b5d0 100644 --- a/test/unit/ldp/operations/GetOperationHandler.test.ts +++ b/test/unit/http/ldp/GetOperationHandler.test.ts @@ -1,6 +1,6 @@ -import { GetOperationHandler } from '../../../../src/ldp/operations/GetOperationHandler'; -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; +import { GetOperationHandler } from '../../../../src/http/ldp/GetOperationHandler'; +import type { Operation } from '../../../../src/http/Operation'; +import type { Representation } from '../../../../src/http/representation/Representation'; import { BasicConditions } from '../../../../src/storage/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/ldp/operations/HeadOperationHandler.test.ts b/test/unit/http/ldp/HeadOperationHandler.test.ts similarity index 87% rename from test/unit/ldp/operations/HeadOperationHandler.test.ts rename to test/unit/http/ldp/HeadOperationHandler.test.ts index e30620560..4a345e93f 100644 --- a/test/unit/ldp/operations/HeadOperationHandler.test.ts +++ b/test/unit/http/ldp/HeadOperationHandler.test.ts @@ -1,7 +1,7 @@ import type { Readable } from 'stream'; -import { HeadOperationHandler } from '../../../../src/ldp/operations/HeadOperationHandler'; -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; +import { HeadOperationHandler } from '../../../../src/http/ldp/HeadOperationHandler'; +import type { Operation } from '../../../../src/http/Operation'; +import type { Representation } from '../../../../src/http/representation/Representation'; import { BasicConditions } from '../../../../src/storage/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/ldp/operations/PatchOperationHandler.test.ts b/test/unit/http/ldp/PatchOperationHandler.test.ts similarity index 84% rename from test/unit/ldp/operations/PatchOperationHandler.test.ts rename to test/unit/http/ldp/PatchOperationHandler.test.ts index a7601f8c0..6f029fc3e 100644 --- a/test/unit/ldp/operations/PatchOperationHandler.test.ts +++ b/test/unit/http/ldp/PatchOperationHandler.test.ts @@ -1,7 +1,7 @@ -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import { PatchOperationHandler } from '../../../../src/ldp/operations/PatchOperationHandler'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; +import { PatchOperationHandler } from '../../../../src/http/ldp/PatchOperationHandler'; +import type { Operation } from '../../../../src/http/Operation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; import { BasicConditions } from '../../../../src/storage/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; diff --git a/test/unit/ldp/operations/PostOperationHandler.test.ts b/test/unit/http/ldp/PostOperationHandler.test.ts similarity index 80% rename from test/unit/ldp/operations/PostOperationHandler.test.ts rename to test/unit/http/ldp/PostOperationHandler.test.ts index c7e2a41c7..5ecf165d4 100644 --- a/test/unit/ldp/operations/PostOperationHandler.test.ts +++ b/test/unit/http/ldp/PostOperationHandler.test.ts @@ -1,9 +1,9 @@ -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import { PostOperationHandler } from '../../../../src/ldp/operations/PostOperationHandler'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { PostOperationHandler } from '../../../../src/http/ldp/PostOperationHandler'; +import type { Operation } from '../../../../src/http/Operation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { BasicConditions } from '../../../../src/storage/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; diff --git a/test/unit/ldp/operations/PutOperationHandler.test.ts b/test/unit/http/ldp/PutOperationHandler.test.ts similarity index 85% rename from test/unit/ldp/operations/PutOperationHandler.test.ts rename to test/unit/http/ldp/PutOperationHandler.test.ts index 4f1293bc4..74d327b5f 100644 --- a/test/unit/ldp/operations/PutOperationHandler.test.ts +++ b/test/unit/http/ldp/PutOperationHandler.test.ts @@ -1,7 +1,7 @@ -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import { PutOperationHandler } from '../../../../src/ldp/operations/PutOperationHandler'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; +import { PutOperationHandler } from '../../../../src/http/ldp/PutOperationHandler'; +import type { Operation } from '../../../../src/http/Operation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; import { BasicConditions } from '../../../../src/storage/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; diff --git a/test/unit/ldp/operations/metadata/WebAclMetadataCollector.test.ts b/test/unit/http/ldp/metadata/WebAclMetadataCollector.test.ts similarity index 86% rename from test/unit/ldp/operations/metadata/WebAclMetadataCollector.test.ts rename to test/unit/http/ldp/metadata/WebAclMetadataCollector.test.ts index dfc53dda7..053c6133f 100644 --- a/test/unit/ldp/operations/metadata/WebAclMetadataCollector.test.ts +++ b/test/unit/http/ldp/metadata/WebAclMetadataCollector.test.ts @@ -1,9 +1,9 @@ import 'jest-rdf'; import { CredentialGroup } from '../../../../../src/authentication/Credentials'; -import { WebAclMetadataCollector } from '../../../../../src/ldp/operations/metadata/WebAclMetadataCollector'; -import type { Operation } from '../../../../../src/ldp/operations/Operation'; -import type { AclPermission } from '../../../../../src/ldp/permissions/AclPermission'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import type { AclPermission } from '../../../../../src/authorization/permissions/AclPermission'; +import { WebAclMetadataCollector } from '../../../../../src/http/ldp/metadata/WebAclMetadataCollector'; +import type { Operation } from '../../../../../src/http/Operation'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import { ACL, AUTH } from '../../../../../src/util/Vocabularies'; describe('A WebAclMetadataCollector', (): void => { diff --git a/test/unit/ldp/http/BasicResponseWriter.test.ts b/test/unit/http/output/BasicResponseWriter.test.ts similarity index 90% rename from test/unit/ldp/http/BasicResponseWriter.test.ts rename to test/unit/http/output/BasicResponseWriter.test.ts index 91c07106b..ec52da1b4 100644 --- a/test/unit/ldp/http/BasicResponseWriter.test.ts +++ b/test/unit/http/output/BasicResponseWriter.test.ts @@ -2,10 +2,10 @@ import { EventEmitter } from 'events'; import { PassThrough } from 'stream'; import type { MockResponse } from 'node-mocks-http'; import { createResponse } from 'node-mocks-http'; -import { BasicResponseWriter } from '../../../../src/ldp/http/BasicResponseWriter'; -import type { MetadataWriter } from '../../../../src/ldp/http/metadata/MetadataWriter'; -import type { ResponseDescription } from '../../../../src/ldp/http/response/ResponseDescription'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { BasicResponseWriter } from '../../../../src/http/output/BasicResponseWriter'; +import type { MetadataWriter } from '../../../../src/http/output/metadata/MetadataWriter'; +import type { ResponseDescription } from '../../../../src/http/output/response/ResponseDescription'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import { INTERNAL_QUADS } from '../../../../src/util/ContentTypes'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; import { guardedStreamFrom } from '../../../../src/util/StreamUtil'; diff --git a/test/unit/ldp/http/ConvertingErrorHandler.test.ts b/test/unit/http/output/error/ConvertingErrorHandler.test.ts similarity index 86% rename from test/unit/ldp/http/ConvertingErrorHandler.test.ts rename to test/unit/http/output/error/ConvertingErrorHandler.test.ts index dd209244f..6a359beed 100644 --- a/test/unit/ldp/http/ConvertingErrorHandler.test.ts +++ b/test/unit/http/output/error/ConvertingErrorHandler.test.ts @@ -1,16 +1,16 @@ import 'jest-rdf'; import arrayifyStream from 'arrayify-stream'; import { DataFactory } from 'n3'; -import { ConvertingErrorHandler } from '../../../../src/ldp/http/ConvertingErrorHandler'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import type { RepresentationPreferences } from '../../../../src/ldp/representation/RepresentationPreferences'; +import { ConvertingErrorHandler } from '../../../../../src/http/output/error/ConvertingErrorHandler'; +import { BasicRepresentation } from '../../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../../src/http/representation/Representation'; +import type { RepresentationPreferences } from '../../../../../src/http/representation/RepresentationPreferences'; import type { RepresentationConverter, RepresentationConverterArgs, -} from '../../../../src/storage/conversion/RepresentationConverter'; -import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError'; -import { HTTP, XSD } from '../../../../src/util/Vocabularies'; +} from '../../../../../src/storage/conversion/RepresentationConverter'; +import { NotFoundHttpError } from '../../../../../src/util/errors/NotFoundHttpError'; +import { HTTP, XSD } from '../../../../../src/util/Vocabularies'; import literal = DataFactory.literal; const preferences: RepresentationPreferences = { type: { 'text/turtle': 1 }}; diff --git a/test/unit/ldp/http/SafeErrorHandler.test.ts b/test/unit/http/output/error/SafeErrorHandler.test.ts similarity index 85% rename from test/unit/ldp/http/SafeErrorHandler.test.ts rename to test/unit/http/output/error/SafeErrorHandler.test.ts index 6b92a6a19..6ce3e34d9 100644 --- a/test/unit/ldp/http/SafeErrorHandler.test.ts +++ b/test/unit/http/output/error/SafeErrorHandler.test.ts @@ -1,11 +1,11 @@ import 'jest-rdf'; import { DataFactory } from 'n3'; -import type { ErrorHandler } from '../../../../src/ldp/http/ErrorHandler'; -import { SafeErrorHandler } from '../../../../src/ldp/http/SafeErrorHandler'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError'; -import { readableToString } from '../../../../src/util/StreamUtil'; -import { HTTP, XSD } from '../../../../src/util/Vocabularies'; +import type { ErrorHandler } from '../../../../../src/http/output/error/ErrorHandler'; +import { SafeErrorHandler } from '../../../../../src/http/output/error/SafeErrorHandler'; +import { BasicRepresentation } from '../../../../../src/http/representation/BasicRepresentation'; +import { NotFoundHttpError } from '../../../../../src/util/errors/NotFoundHttpError'; +import { readableToString } from '../../../../../src/util/StreamUtil'; +import { HTTP, XSD } from '../../../../../src/util/Vocabularies'; import literal = DataFactory.literal; describe('A SafeErrorHandler', (): void => { diff --git a/test/unit/ldp/http/metadata/ConstantMetadataWriter.test.ts b/test/unit/http/output/metadata/ConstantMetadataWriter.test.ts similarity index 89% rename from test/unit/ldp/http/metadata/ConstantMetadataWriter.test.ts rename to test/unit/http/output/metadata/ConstantMetadataWriter.test.ts index 699e43326..8c2762fb9 100644 --- a/test/unit/ldp/http/metadata/ConstantMetadataWriter.test.ts +++ b/test/unit/http/output/metadata/ConstantMetadataWriter.test.ts @@ -1,5 +1,5 @@ import { createResponse } from 'node-mocks-http'; -import { ConstantMetadataWriter } from '../../../../../src/ldp/http/metadata/ConstantMetadataWriter'; +import { ConstantMetadataWriter } from '../../../../../src/http/output/metadata/ConstantMetadataWriter'; import type { HttpResponse } from '../../../../../src/server/HttpResponse'; describe('A ConstantMetadataWriter', (): void => { diff --git a/test/unit/ldp/http/metadata/LinkRelMetadataWriter.test.ts b/test/unit/http/output/metadata/LinkRelMetadataWriter.test.ts similarity index 77% rename from test/unit/ldp/http/metadata/LinkRelMetadataWriter.test.ts rename to test/unit/http/output/metadata/LinkRelMetadataWriter.test.ts index 08c1f64b0..4b3ca4cce 100644 --- a/test/unit/ldp/http/metadata/LinkRelMetadataWriter.test.ts +++ b/test/unit/http/output/metadata/LinkRelMetadataWriter.test.ts @@ -1,6 +1,6 @@ import { createResponse } from 'node-mocks-http'; -import { LinkRelMetadataWriter } from '../../../../../src/ldp/http/metadata/LinkRelMetadataWriter'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { LinkRelMetadataWriter } from '../../../../../src/http/output/metadata/LinkRelMetadataWriter'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpResponse } from '../../../../../src/server/HttpResponse'; import { LDP, RDF } from '../../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/http/metadata/MappedMetadataWriter.test.ts b/test/unit/http/output/metadata/MappedMetadataWriter.test.ts similarity index 78% rename from test/unit/ldp/http/metadata/MappedMetadataWriter.test.ts rename to test/unit/http/output/metadata/MappedMetadataWriter.test.ts index 4f6e4ce9d..a5a72ab04 100644 --- a/test/unit/ldp/http/metadata/MappedMetadataWriter.test.ts +++ b/test/unit/http/output/metadata/MappedMetadataWriter.test.ts @@ -1,6 +1,6 @@ import { createResponse } from 'node-mocks-http'; -import { MappedMetadataWriter } from '../../../../../src/ldp/http/metadata/MappedMetadataWriter'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { MappedMetadataWriter } from '../../../../../src/http/output/metadata/MappedMetadataWriter'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpResponse } from '../../../../../src/server/HttpResponse'; import { CONTENT_TYPE } from '../../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/http/metadata/ModifiedMetadataWriter.test.ts b/test/unit/http/output/metadata/ModifiedMetadataWriter.test.ts similarity index 85% rename from test/unit/ldp/http/metadata/ModifiedMetadataWriter.test.ts rename to test/unit/http/output/metadata/ModifiedMetadataWriter.test.ts index b383dd162..824fd2b1f 100644 --- a/test/unit/ldp/http/metadata/ModifiedMetadataWriter.test.ts +++ b/test/unit/http/output/metadata/ModifiedMetadataWriter.test.ts @@ -1,6 +1,6 @@ import { createResponse } from 'node-mocks-http'; -import { ModifiedMetadataWriter } from '../../../../../src/ldp/http/metadata/ModifiedMetadataWriter'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { ModifiedMetadataWriter } from '../../../../../src/http/output/metadata/ModifiedMetadataWriter'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpResponse } from '../../../../../src/server/HttpResponse'; import { updateModifiedDate } from '../../../../../src/util/ResourceUtil'; import { DC } from '../../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/http/metadata/WacAllowMetadataWriter.test.ts b/test/unit/http/output/metadata/WacAllowMetadataWriter.test.ts similarity index 90% rename from test/unit/ldp/http/metadata/WacAllowMetadataWriter.test.ts rename to test/unit/http/output/metadata/WacAllowMetadataWriter.test.ts index e8ab30a61..243868899 100644 --- a/test/unit/ldp/http/metadata/WacAllowMetadataWriter.test.ts +++ b/test/unit/http/output/metadata/WacAllowMetadataWriter.test.ts @@ -1,6 +1,6 @@ import { createResponse } from 'node-mocks-http'; -import { WacAllowMetadataWriter } from '../../../../../src/ldp/http/metadata/WacAllowMetadataWriter'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { WacAllowMetadataWriter } from '../../../../../src/http/output/metadata/WacAllowMetadataWriter'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpResponse } from '../../../../../src/server/HttpResponse'; import { ACL, AUTH } from '../../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/http/metadata/WwwAuthMetadataWriter.test.ts b/test/unit/http/output/metadata/WwwAuthMetadataWriter.test.ts similarity index 87% rename from test/unit/ldp/http/metadata/WwwAuthMetadataWriter.test.ts rename to test/unit/http/output/metadata/WwwAuthMetadataWriter.test.ts index 573647d31..6d6542487 100644 --- a/test/unit/ldp/http/metadata/WwwAuthMetadataWriter.test.ts +++ b/test/unit/http/output/metadata/WwwAuthMetadataWriter.test.ts @@ -1,6 +1,6 @@ import { createResponse } from 'node-mocks-http'; -import { WwwAuthMetadataWriter } from '../../../../../src/ldp/http/metadata/WwwAuthMetadataWriter'; -import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata'; +import { WwwAuthMetadataWriter } from '../../../../../src/http/output/metadata/WwwAuthMetadataWriter'; +import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata'; import type { HttpResponse } from '../../../../../src/server/HttpResponse'; import { HTTP } from '../../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/http/response/RedirectResponseDescription.test.ts b/test/unit/http/output/response/RedirectResponseDescription.test.ts similarity index 94% rename from test/unit/ldp/http/response/RedirectResponseDescription.test.ts rename to test/unit/http/output/response/RedirectResponseDescription.test.ts index caddb874a..7bbac99fc 100644 --- a/test/unit/ldp/http/response/RedirectResponseDescription.test.ts +++ b/test/unit/http/output/response/RedirectResponseDescription.test.ts @@ -1,4 +1,4 @@ -import { RedirectResponseDescription } from '../../../../../src/ldp/http/response/RedirectResponseDescription'; +import { RedirectResponseDescription } from '../../../../../src/http/output/response/RedirectResponseDescription'; import { SOLID_HTTP } from '../../../../../src/util/Vocabularies'; describe('A RedirectResponseDescription', (): void => { diff --git a/test/unit/ldp/representation/BasicRepresentation.test.ts b/test/unit/http/representation/BasicRepresentation.test.ts similarity index 96% rename from test/unit/ldp/representation/BasicRepresentation.test.ts rename to test/unit/http/representation/BasicRepresentation.test.ts index 5778cb71a..8f1f39e63 100644 --- a/test/unit/ldp/representation/BasicRepresentation.test.ts +++ b/test/unit/http/representation/BasicRepresentation.test.ts @@ -2,8 +2,8 @@ import 'jest-rdf'; import { Readable } from 'stream'; import { namedNode } from '@rdfjs/data-model'; import arrayifyStream from 'arrayify-stream'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import { INTERNAL_QUADS } from '../../../../src/util/ContentTypes'; import { guardedStreamFrom } from '../../../../src/util/StreamUtil'; import { CONTENT_TYPE } from '../../../../src/util/Vocabularies'; diff --git a/test/unit/ldp/representation/RepresentationMetadata.test.ts b/test/unit/http/representation/RepresentationMetadata.test.ts similarity index 99% rename from test/unit/ldp/representation/RepresentationMetadata.test.ts rename to test/unit/http/representation/RepresentationMetadata.test.ts index 15221dc4a..9ecd27603 100644 --- a/test/unit/ldp/representation/RepresentationMetadata.test.ts +++ b/test/unit/http/representation/RepresentationMetadata.test.ts @@ -1,7 +1,7 @@ import 'jest-rdf'; import { defaultGraph, literal, namedNode, quad } from '@rdfjs/data-model'; import type { NamedNode, Quad } from 'rdf-js'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import { CONTENT_TYPE } from '../../../../src/util/Vocabularies'; // Helper functions to filter quads diff --git a/test/unit/identity/IdentityProviderHttpHandler.test.ts b/test/unit/identity/IdentityProviderHttpHandler.test.ts index dc1ff4590..7007a71ec 100644 --- a/test/unit/identity/IdentityProviderHttpHandler.test.ts +++ b/test/unit/identity/IdentityProviderHttpHandler.test.ts @@ -1,15 +1,15 @@ import type { Provider } from 'oidc-provider'; +import type { Operation } from '../../../src/http/Operation'; +import type { ErrorHandler, ErrorHandlerArgs } from '../../../src/http/output/error/ErrorHandler'; +import type { ResponseDescription } from '../../../src/http/output/response/ResponseDescription'; +import { BasicRepresentation } from '../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; import type { ProviderFactory } from '../../../src/identity/configuration/ProviderFactory'; import type { IdentityProviderHttpHandlerArgs } from '../../../src/identity/IdentityProviderHttpHandler'; import { IdentityProviderHttpHandler } from '../../../src/identity/IdentityProviderHttpHandler'; import type { InteractionRoute } from '../../../src/identity/interaction/routing/InteractionRoute'; import type { InteractionCompleter } from '../../../src/identity/interaction/util/InteractionCompleter'; -import type { ErrorHandler, ErrorHandlerArgs } from '../../../src/ldp/http/ErrorHandler'; -import type { ResponseDescription } from '../../../src/ldp/http/response/ResponseDescription'; -import type { Operation } from '../../../src/ldp/operations/Operation'; -import { BasicRepresentation } from '../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata'; import type { HttpRequest } from '../../../src/server/HttpRequest'; import type { HttpResponse } from '../../../src/server/HttpResponse'; import { getBestPreference } from '../../../src/storage/conversion/ConversionUtil'; diff --git a/test/unit/identity/configuration/IdentityProviderFactory.test.ts b/test/unit/identity/configuration/IdentityProviderFactory.test.ts index d1446194a..3c8a0bcb0 100644 --- a/test/unit/identity/configuration/IdentityProviderFactory.test.ts +++ b/test/unit/identity/configuration/IdentityProviderFactory.test.ts @@ -1,8 +1,8 @@ import type { Configuration } from 'oidc-provider'; +import type { ErrorHandler } from '../../../../src/http/output/error/ErrorHandler'; +import type { ResponseWriter } from '../../../../src/http/output/ResponseWriter'; import { IdentityProviderFactory } from '../../../../src/identity/configuration/IdentityProviderFactory'; import type { AdapterFactory } from '../../../../src/identity/storage/AdapterFactory'; -import type { ErrorHandler } from '../../../../src/ldp/http/ErrorHandler'; -import type { ResponseWriter } from '../../../../src/ldp/http/ResponseWriter'; import type { HttpResponse } from '../../../../src/server/HttpResponse'; import type { KeyValueStorage } from '../../../../src/storage/keyvalue/KeyValueStorage'; diff --git a/test/unit/identity/interaction/email-password/handler/ForgotPasswordHandler.test.ts b/test/unit/identity/interaction/email-password/handler/ForgotPasswordHandler.test.ts index ec2565ef8..4a7470571 100644 --- a/test/unit/identity/interaction/email-password/handler/ForgotPasswordHandler.test.ts +++ b/test/unit/identity/interaction/email-password/handler/ForgotPasswordHandler.test.ts @@ -1,9 +1,9 @@ +import type { Operation } from '../../../../../../src/http/Operation'; import { ForgotPasswordHandler, } from '../../../../../../src/identity/interaction/email-password/handler/ForgotPasswordHandler'; import type { AccountStore } from '../../../../../../src/identity/interaction/email-password/storage/AccountStore'; import type { EmailSender } from '../../../../../../src/identity/interaction/util/EmailSender'; -import type { Operation } from '../../../../../../src/ldp/operations/Operation'; import type { TemplateEngine } from '../../../../../../src/util/templates/TemplateEngine'; import { createPostJsonOperation } from './Util'; diff --git a/test/unit/identity/interaction/email-password/handler/InteractionHandler.test.ts b/test/unit/identity/interaction/email-password/handler/InteractionHandler.test.ts index dfff08d8e..4cb14f924 100644 --- a/test/unit/identity/interaction/email-password/handler/InteractionHandler.test.ts +++ b/test/unit/identity/interaction/email-password/handler/InteractionHandler.test.ts @@ -1,10 +1,10 @@ +import { BasicRepresentation } from '../../../../../../src/http/representation/BasicRepresentation'; import type { InteractionResponseResult, } from '../../../../../../src/identity/interaction/email-password/handler/InteractionHandler'; import { InteractionHandler, } from '../../../../../../src/identity/interaction/email-password/handler/InteractionHandler'; -import { BasicRepresentation } from '../../../../../../src/ldp/representation/BasicRepresentation'; import { NotImplementedHttpError } from '../../../../../../src/util/errors/NotImplementedHttpError'; class SimpleInteractionHandler extends InteractionHandler { diff --git a/test/unit/identity/interaction/email-password/handler/RegistrationHandler.test.ts b/test/unit/identity/interaction/email-password/handler/RegistrationHandler.test.ts index 10382bb39..1a08ea2cd 100644 --- a/test/unit/identity/interaction/email-password/handler/RegistrationHandler.test.ts +++ b/test/unit/identity/interaction/email-password/handler/RegistrationHandler.test.ts @@ -1,10 +1,10 @@ +import type { Operation } from '../../../../../../src/http/Operation'; import { RegistrationHandler, } from '../../../../../../src/identity/interaction/email-password/handler/RegistrationHandler'; import type { RegistrationManager, RegistrationParams, RegistrationResponse, } from '../../../../../../src/identity/interaction/email-password/util/RegistrationManager'; -import type { Operation } from '../../../../../../src/ldp/operations/Operation'; import { createPostJsonOperation } from './Util'; describe('A RegistrationHandler', (): void => { diff --git a/test/unit/identity/interaction/email-password/handler/ResetPasswordHandler.test.ts b/test/unit/identity/interaction/email-password/handler/ResetPasswordHandler.test.ts index 543d9990b..37f4c2176 100644 --- a/test/unit/identity/interaction/email-password/handler/ResetPasswordHandler.test.ts +++ b/test/unit/identity/interaction/email-password/handler/ResetPasswordHandler.test.ts @@ -1,8 +1,8 @@ +import type { Operation } from '../../../../../../src/http/Operation'; import { ResetPasswordHandler, } from '../../../../../../src/identity/interaction/email-password/handler/ResetPasswordHandler'; import type { AccountStore } from '../../../../../../src/identity/interaction/email-password/storage/AccountStore'; -import type { Operation } from '../../../../../../src/ldp/operations/Operation'; import { createPostJsonOperation } from './Util'; describe('A ResetPasswordHandler', (): void => { diff --git a/test/unit/identity/interaction/email-password/handler/Util.ts b/test/unit/identity/interaction/email-password/handler/Util.ts index de1793b9d..69ecd4880 100644 --- a/test/unit/identity/interaction/email-password/handler/Util.ts +++ b/test/unit/identity/interaction/email-password/handler/Util.ts @@ -1,5 +1,5 @@ -import type { Operation } from '../../../../../../src/ldp/operations/Operation'; -import { BasicRepresentation } from '../../../../../../src/ldp/representation/BasicRepresentation'; +import type { Operation } from '../../../../../../src/http/Operation'; +import { BasicRepresentation } from '../../../../../../src/http/representation/BasicRepresentation'; /** * Creates a mock HttpRequest which is a stream of an object encoded as application/json diff --git a/test/unit/identity/interaction/email-password/util/RegistrationManager.test.ts b/test/unit/identity/interaction/email-password/util/RegistrationManager.test.ts index c1208e439..5a3643ec5 100644 --- a/test/unit/identity/interaction/email-password/util/RegistrationManager.test.ts +++ b/test/unit/identity/interaction/email-password/util/RegistrationManager.test.ts @@ -1,9 +1,9 @@ +import type { ResourceIdentifier } from '../../../../../../src/http/representation/ResourceIdentifier'; import type { AccountStore } from '../../../../../../src/identity/interaction/email-password/storage/AccountStore'; import { RegistrationManager, } from '../../../../../../src/identity/interaction/email-password/util/RegistrationManager'; import type { OwnershipValidator } from '../../../../../../src/identity/ownership/OwnershipValidator'; -import type { ResourceIdentifier } from '../../../../../../src/ldp/representation/ResourceIdentifier'; import type { IdentifierGenerator } from '../../../../../../src/pods/generate/IdentifierGenerator'; import type { PodManager } from '../../../../../../src/pods/PodManager'; import type { PodSettings } from '../../../../../../src/pods/settings/PodSettings'; diff --git a/test/unit/init/setup/SetupHttpHandler.test.ts b/test/unit/init/setup/SetupHttpHandler.test.ts index 0ef6ffd58..ae6ba9fdc 100644 --- a/test/unit/init/setup/SetupHttpHandler.test.ts +++ b/test/unit/init/setup/SetupHttpHandler.test.ts @@ -1,14 +1,14 @@ +import type { Operation } from '../../../../src/http/Operation'; +import type { ErrorHandler, ErrorHandlerArgs } from '../../../../src/http/output/error/ErrorHandler'; +import type { ResponseDescription } from '../../../../src/http/output/response/ResponseDescription'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import type { RegistrationManager, RegistrationResponse } from '../../../../src/identity/interaction/email-password/util/RegistrationManager'; import type { Initializer } from '../../../../src/init/Initializer'; import type { SetupInput } from '../../../../src/init/setup/SetupHttpHandler'; import { SetupHttpHandler } from '../../../../src/init/setup/SetupHttpHandler'; -import type { ErrorHandlerArgs, ErrorHandler } from '../../../../src/ldp/http/ErrorHandler'; -import type { ResponseDescription } from '../../../../src/ldp/http/response/ResponseDescription'; -import type { Operation } from '../../../../src/ldp/operations/Operation'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; import type { HttpRequest } from '../../../../src/server/HttpRequest'; import type { HttpResponse } from '../../../../src/server/HttpResponse'; import { getBestPreference } from '../../../../src/storage/conversion/ConversionUtil'; diff --git a/test/unit/pods/ConfigPodManager.test.ts b/test/unit/pods/ConfigPodManager.test.ts index d22ad5777..187bf2329 100644 --- a/test/unit/pods/ConfigPodManager.test.ts +++ b/test/unit/pods/ConfigPodManager.test.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import { ConfigPodManager } from '../../../src/pods/ConfigPodManager'; import type { PodGenerator } from '../../../src/pods/generate/PodGenerator'; import type { Resource, ResourcesGenerator } from '../../../src/pods/generate/ResourcesGenerator'; diff --git a/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts b/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts index 12db6797a..aa97e0961 100644 --- a/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts +++ b/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { TemplatedResourcesGenerator } from '../../../../src/pods/generate/TemplatedResourcesGenerator'; import type { FileIdentifierMapper, diff --git a/test/unit/server/AuthorizingHttpHandler.test.ts b/test/unit/server/AuthorizingHttpHandler.test.ts index 5db56cb79..e2c0f5696 100644 --- a/test/unit/server/AuthorizingHttpHandler.test.ts +++ b/test/unit/server/AuthorizingHttpHandler.test.ts @@ -2,9 +2,9 @@ import { CredentialGroup } from '../../../src/authentication/Credentials'; import type { CredentialsExtractor } from '../../../src/authentication/CredentialsExtractor'; import type { Authorizer } from '../../../src/authorization/Authorizer'; import type { PermissionReader } from '../../../src/authorization/PermissionReader'; -import type { Operation } from '../../../src/ldp/operations/Operation'; -import type { ModesExtractor } from '../../../src/ldp/permissions/ModesExtractor'; -import { AccessMode } from '../../../src/ldp/permissions/Permissions'; +import type { ModesExtractor } from '../../../src/authorization/permissions/ModesExtractor'; +import { AccessMode } from '../../../src/authorization/permissions/Permissions'; +import type { Operation } from '../../../src/http/Operation'; import { AuthorizingHttpHandler } from '../../../src/server/AuthorizingHttpHandler'; import type { HttpRequest } from '../../../src/server/HttpRequest'; import type { HttpResponse } from '../../../src/server/HttpResponse'; diff --git a/test/unit/server/ParsingHttpHandler.test.ts b/test/unit/server/ParsingHttpHandler.test.ts index 1f5a3c344..cc94be1ba 100644 --- a/test/unit/server/ParsingHttpHandler.test.ts +++ b/test/unit/server/ParsingHttpHandler.test.ts @@ -1,11 +1,11 @@ -import type { ErrorHandler } from '../../../src/ldp/http/ErrorHandler'; -import type { RequestParser } from '../../../src/ldp/http/RequestParser'; -import { OkResponseDescription } from '../../../src/ldp/http/response/OkResponseDescription'; -import { ResponseDescription } from '../../../src/ldp/http/response/ResponseDescription'; -import type { ResponseWriter } from '../../../src/ldp/http/ResponseWriter'; -import type { OperationMetadataCollector } from '../../../src/ldp/operations/metadata/OperationMetadataCollector'; -import type { Operation } from '../../../src/ldp/operations/Operation'; -import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata'; +import type { RequestParser } from '../../../src/http/input/RequestParser'; +import type { OperationMetadataCollector } from '../../../src/http/ldp/metadata/OperationMetadataCollector'; +import type { Operation } from '../../../src/http/Operation'; +import type { ErrorHandler } from '../../../src/http/output/error/ErrorHandler'; +import { OkResponseDescription } from '../../../src/http/output/response/OkResponseDescription'; +import { ResponseDescription } from '../../../src/http/output/response/ResponseDescription'; +import type { ResponseWriter } from '../../../src/http/output/ResponseWriter'; +import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; import type { HttpRequest } from '../../../src/server/HttpRequest'; import type { HttpResponse } from '../../../src/server/HttpResponse'; import type { OperationHttpHandler } from '../../../src/server/OperationHttpHandler'; diff --git a/test/unit/server/util/RedirectAllHttpHandler.test.ts b/test/unit/server/util/RedirectAllHttpHandler.test.ts index 23e4da039..d908c3a63 100644 --- a/test/unit/server/util/RedirectAllHttpHandler.test.ts +++ b/test/unit/server/util/RedirectAllHttpHandler.test.ts @@ -1,6 +1,6 @@ -import type { ResponseWriter } from '../../../../src/ldp/http/ResponseWriter'; -import type { TargetExtractor } from '../../../../src/ldp/http/TargetExtractor'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { TargetExtractor } from '../../../../src/http/input/identifier/TargetExtractor'; +import type { ResponseWriter } from '../../../../src/http/output/ResponseWriter'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import type { HttpRequest } from '../../../../src/server/HttpRequest'; import type { HttpResponse } from '../../../../src/server/HttpResponse'; import { RedirectAllHttpHandler } from '../../../../src/server/util/RedirectAllHttpHandler'; diff --git a/test/unit/storage/BasicConditions.test.ts b/test/unit/storage/BasicConditions.test.ts index 91c1e1ee5..27bca8710 100644 --- a/test/unit/storage/BasicConditions.test.ts +++ b/test/unit/storage/BasicConditions.test.ts @@ -1,4 +1,4 @@ -import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata'; +import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; import { BasicConditions } from '../../../src/storage/BasicConditions'; import { getETag } from '../../../src/storage/Conditions'; import { DC } from '../../../src/util/Vocabularies'; diff --git a/test/unit/storage/Conditions.test.ts b/test/unit/storage/Conditions.test.ts index 67d3e426f..98a44e589 100644 --- a/test/unit/storage/Conditions.test.ts +++ b/test/unit/storage/Conditions.test.ts @@ -1,4 +1,4 @@ -import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata'; +import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; import { getETag } from '../../../src/storage/Conditions'; import { DC } from '../../../src/util/Vocabularies'; diff --git a/test/unit/storage/DataAccessorBasedStore.test.ts b/test/unit/storage/DataAccessorBasedStore.test.ts index cf23a3ecb..355e2fbdd 100644 --- a/test/unit/storage/DataAccessorBasedStore.test.ts +++ b/test/unit/storage/DataAccessorBasedStore.test.ts @@ -3,11 +3,11 @@ import type { Readable } from 'stream'; import arrayifyStream from 'arrayify-stream'; import type { Quad } from 'n3'; import { DataFactory } from 'n3'; -import type { AuxiliaryStrategy } from '../../../src/ldp/auxiliary/AuxiliaryStrategy'; -import { BasicRepresentation } from '../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; +import type { AuxiliaryStrategy } from '../../../src/http/auxiliary/AuxiliaryStrategy'; +import { BasicRepresentation } from '../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import type { DataAccessor } from '../../../src/storage/accessors/DataAccessor'; import { BasicConditions } from '../../../src/storage/BasicConditions'; import { DataAccessorBasedStore } from '../../../src/storage/DataAccessorBasedStore'; diff --git a/test/unit/storage/IndexRepresentationstore.test.ts b/test/unit/storage/IndexRepresentationstore.test.ts index 44f8335ae..c1437204b 100644 --- a/test/unit/storage/IndexRepresentationstore.test.ts +++ b/test/unit/storage/IndexRepresentationstore.test.ts @@ -1,5 +1,5 @@ -import { BasicRepresentation } from '../../../src/ldp/representation/BasicRepresentation'; -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../../src/http/representation/BasicRepresentation'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import { IndexRepresentationStore } from '../../../src/storage/IndexRepresentationStore'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; import { ConflictHttpError } from '../../../src/util/errors/ConflictHttpError'; diff --git a/test/unit/storage/LockingResourceStore.test.ts b/test/unit/storage/LockingResourceStore.test.ts index 0c6b171be..5182e09c2 100644 --- a/test/unit/storage/LockingResourceStore.test.ts +++ b/test/unit/storage/LockingResourceStore.test.ts @@ -1,8 +1,8 @@ import { EventEmitter } from 'events'; -import type { AuxiliaryIdentifierStrategy } from '../../../src/ldp/auxiliary/AuxiliaryIdentifierStrategy'; -import type { Patch } from '../../../src/ldp/http/Patch'; -import type { Representation } from '../../../src/ldp/representation/Representation'; -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; +import type { AuxiliaryIdentifierStrategy } from '../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; +import type { Patch } from '../../../src/http/representation/Patch'; +import type { Representation } from '../../../src/http/representation/Representation'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import { LockingResourceStore } from '../../../src/storage/LockingResourceStore'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; import type { ExpiringReadWriteLocker } from '../../../src/util/locking/ExpiringReadWriteLocker'; diff --git a/test/unit/storage/MonitoringStore.test.ts b/test/unit/storage/MonitoringStore.test.ts index 7872ee4fa..2d22f1a72 100644 --- a/test/unit/storage/MonitoringStore.test.ts +++ b/test/unit/storage/MonitoringStore.test.ts @@ -1,5 +1,5 @@ -import type { Patch } from '../../../src/ldp/http/Patch'; -import type { Representation } from '../../../src/ldp/representation/Representation'; +import type { Patch } from '../../../src/http/representation/Patch'; +import type { Representation } from '../../../src/http/representation/Representation'; import { MonitoringStore } from '../../../src/storage/MonitoringStore'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; diff --git a/test/unit/storage/PassthroughStore.test.ts b/test/unit/storage/PassthroughStore.test.ts index 65f412dee..4b12ad6b4 100644 --- a/test/unit/storage/PassthroughStore.test.ts +++ b/test/unit/storage/PassthroughStore.test.ts @@ -1,5 +1,5 @@ -import type { Patch } from '../../../src/ldp/http/Patch'; -import type { Representation } from '../../../src/ldp/representation/Representation'; +import type { Patch } from '../../../src/http/representation/Patch'; +import type { Representation } from '../../../src/http/representation/Representation'; import { PassthroughStore } from '../../../src/storage/PassthroughStore'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; diff --git a/test/unit/storage/PatchingStore.test.ts b/test/unit/storage/PatchingStore.test.ts index 6857975ad..487218e60 100644 --- a/test/unit/storage/PatchingStore.test.ts +++ b/test/unit/storage/PatchingStore.test.ts @@ -1,4 +1,4 @@ -import type { Patch } from '../../../src/ldp/http/Patch'; +import type { Patch } from '../../../src/http/representation/Patch'; import type { PatchHandler } from '../../../src/storage/patch/PatchHandler'; import { PatchingStore } from '../../../src/storage/PatchingStore'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; diff --git a/test/unit/storage/ReadOnlyStore.test.ts b/test/unit/storage/ReadOnlyStore.test.ts index 03fc794af..4067c82b7 100644 --- a/test/unit/storage/ReadOnlyStore.test.ts +++ b/test/unit/storage/ReadOnlyStore.test.ts @@ -1,5 +1,5 @@ -import type { Patch } from '../../../src/ldp/http/Patch'; -import type { Representation } from '../../../src/ldp/representation/Representation'; +import type { Patch } from '../../../src/http/representation/Patch'; +import type { Representation } from '../../../src/http/representation/Representation'; import { ReadOnlyStore } from '../../../src/storage/ReadOnlyStore'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; import { ForbiddenHttpError } from '../../../src/util/errors/ForbiddenHttpError'; diff --git a/test/unit/storage/RepresentationConvertingStore.test.ts b/test/unit/storage/RepresentationConvertingStore.test.ts index e3174a9ee..38aa7675d 100644 --- a/test/unit/storage/RepresentationConvertingStore.test.ts +++ b/test/unit/storage/RepresentationConvertingStore.test.ts @@ -1,4 +1,4 @@ -import type { Representation } from '../../../src/ldp/representation/Representation'; +import type { Representation } from '../../../src/http/representation/Representation'; import type { RepresentationConverter } from '../../../src/storage/conversion/RepresentationConverter'; import { RepresentationConvertingStore } from '../../../src/storage/RepresentationConvertingStore'; import type { ResourceStore } from '../../../src/storage/ResourceStore'; diff --git a/test/unit/storage/accessors/FileDataAccessor.test.ts b/test/unit/storage/accessors/FileDataAccessor.test.ts index 35d4a857e..016b8d0e0 100644 --- a/test/unit/storage/accessors/FileDataAccessor.test.ts +++ b/test/unit/storage/accessors/FileDataAccessor.test.ts @@ -1,8 +1,8 @@ import 'jest-rdf'; import type { Readable } from 'stream'; import { namedNode } from '@rdfjs/data-model'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import { FileDataAccessor } from '../../../../src/storage/accessors/FileDataAccessor'; import { ExtensionBasedMapper } from '../../../../src/storage/mapping/ExtensionBasedMapper'; import { APPLICATION_OCTET_STREAM } from '../../../../src/util/ContentTypes'; diff --git a/test/unit/storage/accessors/InMemoryDataAccessor.test.ts b/test/unit/storage/accessors/InMemoryDataAccessor.test.ts index f7e360210..c10ff7e32 100644 --- a/test/unit/storage/accessors/InMemoryDataAccessor.test.ts +++ b/test/unit/storage/accessors/InMemoryDataAccessor.test.ts @@ -1,7 +1,7 @@ import 'jest-rdf'; import type { Readable } from 'stream'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { InMemoryDataAccessor } from '../../../../src/storage/accessors/InMemoryDataAccessor'; import { APPLICATION_OCTET_STREAM } from '../../../../src/util/ContentTypes'; import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError'; diff --git a/test/unit/storage/accessors/SparqlDataAccessor.test.ts b/test/unit/storage/accessors/SparqlDataAccessor.test.ts index 0a134e899..bed9fc766 100644 --- a/test/unit/storage/accessors/SparqlDataAccessor.test.ts +++ b/test/unit/storage/accessors/SparqlDataAccessor.test.ts @@ -4,7 +4,7 @@ import arrayifyStream from 'arrayify-stream'; import { SparqlEndpointFetcher } from 'fetch-sparql-endpoint'; import { DataFactory } from 'n3'; import type { Quad } from 'rdf-js'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import { SparqlDataAccessor } from '../../../../src/storage/accessors/SparqlDataAccessor'; import { INTERNAL_QUADS } from '../../../../src/util/ContentTypes'; import { ConflictHttpError } from '../../../../src/util/errors/ConflictHttpError'; diff --git a/test/unit/storage/conversion/ChainedConverter.test.ts b/test/unit/storage/conversion/ChainedConverter.test.ts index 6afc73b33..fa7d35c04 100644 --- a/test/unit/storage/conversion/ChainedConverter.test.ts +++ b/test/unit/storage/conversion/ChainedConverter.test.ts @@ -1,9 +1,9 @@ -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import type { RepresentationPreferences, ValuePreferences, -} from '../../../../src/ldp/representation/RepresentationPreferences'; +} from '../../../../src/http/representation/RepresentationPreferences'; import { ChainedConverter } from '../../../../src/storage/conversion/ChainedConverter'; import { matchesMediaType } from '../../../../src/storage/conversion/ConversionUtil'; import type { RepresentationConverterArgs } from '../../../../src/storage/conversion/RepresentationConverter'; diff --git a/test/unit/storage/conversion/ConstantConverter.test.ts b/test/unit/storage/conversion/ConstantConverter.test.ts index 964dc359d..dd48dfeab 100644 --- a/test/unit/storage/conversion/ConstantConverter.test.ts +++ b/test/unit/storage/conversion/ConstantConverter.test.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import arrayifyStream from 'arrayify-stream'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import type { ConstantConverterOptions } from '../../../../src/storage/conversion/ConstantConverter'; import { ConstantConverter } from '../../../../src/storage/conversion/ConstantConverter'; import { CONTENT_TYPE } from '../../../../src/util/Vocabularies'; diff --git a/test/unit/storage/conversion/ContainerToTemplateConverter.test.ts b/test/unit/storage/conversion/ContainerToTemplateConverter.test.ts index dcec42253..397b46cc9 100644 --- a/test/unit/storage/conversion/ContainerToTemplateConverter.test.ts +++ b/test/unit/storage/conversion/ContainerToTemplateConverter.test.ts @@ -1,5 +1,5 @@ import { namedNode as nn, quad } from '@rdfjs/data-model'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import { ContainerToTemplateConverter } from '../../../../src/storage/conversion/ContainerToTemplateConverter'; import { SingleRootIdentifierStrategy } from '../../../../src/util/identifiers/SingleRootIdentifierStrategy'; import { readableToString } from '../../../../src/util/StreamUtil'; diff --git a/test/unit/storage/conversion/ContentTypeReplacer.test.ts b/test/unit/storage/conversion/ContentTypeReplacer.test.ts index be702d384..782d5b53b 100644 --- a/test/unit/storage/conversion/ContentTypeReplacer.test.ts +++ b/test/unit/storage/conversion/ContentTypeReplacer.test.ts @@ -1,5 +1,5 @@ import 'jest-rdf'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import { ContentTypeReplacer } from '../../../../src/storage/conversion/ContentTypeReplacer'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/storage/conversion/ConversionUtil.test.ts b/test/unit/storage/conversion/ConversionUtil.test.ts index 1e66ce351..bba2123f5 100644 --- a/test/unit/storage/conversion/ConversionUtil.test.ts +++ b/test/unit/storage/conversion/ConversionUtil.test.ts @@ -1,4 +1,4 @@ -import type { ValuePreferences } from '../../../../src/ldp/representation/RepresentationPreferences'; +import type { ValuePreferences } from '../../../../src/http/representation/RepresentationPreferences'; import { cleanPreferences, getBestPreference, diff --git a/test/unit/storage/conversion/DynamicJsonToTemplateConverter.test.ts b/test/unit/storage/conversion/DynamicJsonToTemplateConverter.test.ts index ab8ec6cc3..e63ce6a9e 100644 --- a/test/unit/storage/conversion/DynamicJsonToTemplateConverter.test.ts +++ b/test/unit/storage/conversion/DynamicJsonToTemplateConverter.test.ts @@ -1,7 +1,7 @@ import { DataFactory } from 'n3'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import type { RepresentationPreferences } from '../../../../src/ldp/representation/RepresentationPreferences'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import type { RepresentationPreferences } from '../../../../src/http/representation/RepresentationPreferences'; import { DynamicJsonToTemplateConverter } from '../../../../src/storage/conversion/DynamicJsonToTemplateConverter'; import type { RepresentationConverterArgs } from '../../../../src/storage/conversion/RepresentationConverter'; import { readableToString } from '../../../../src/util/StreamUtil'; diff --git a/test/unit/storage/conversion/ErrorToJsonConverter.test.ts b/test/unit/storage/conversion/ErrorToJsonConverter.test.ts index f0c97c44e..a7c0fc4f8 100644 --- a/test/unit/storage/conversion/ErrorToJsonConverter.test.ts +++ b/test/unit/storage/conversion/ErrorToJsonConverter.test.ts @@ -1,4 +1,4 @@ -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import { ErrorToJsonConverter } from '../../../../src/storage/conversion/ErrorToJsonConverter'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; import { readJsonStream } from '../../../../src/util/StreamUtil'; diff --git a/test/unit/storage/conversion/ErrorToQuadConverter.test.ts b/test/unit/storage/conversion/ErrorToQuadConverter.test.ts index 82c17423f..3def938e0 100644 --- a/test/unit/storage/conversion/ErrorToQuadConverter.test.ts +++ b/test/unit/storage/conversion/ErrorToQuadConverter.test.ts @@ -1,7 +1,7 @@ import 'jest-rdf'; import arrayifyStream from 'arrayify-stream'; import { DataFactory } from 'n3'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import { ErrorToQuadConverter } from '../../../../src/storage/conversion/ErrorToQuadConverter'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; import { DC, SOLID_ERROR } from '../../../../src/util/Vocabularies'; diff --git a/test/unit/storage/conversion/ErrorToTemplateConverter.test.ts b/test/unit/storage/conversion/ErrorToTemplateConverter.test.ts index 0cbaf589c..ecc3fe861 100644 --- a/test/unit/storage/conversion/ErrorToTemplateConverter.test.ts +++ b/test/unit/storage/conversion/ErrorToTemplateConverter.test.ts @@ -1,4 +1,4 @@ -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import { ErrorToTemplateConverter } from '../../../../src/storage/conversion/ErrorToTemplateConverter'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; import { readableToString } from '../../../../src/util/StreamUtil'; diff --git a/test/unit/storage/conversion/FormToJsonConverter.test.ts b/test/unit/storage/conversion/FormToJsonConverter.test.ts index 4e3ac5fde..11fbb5e4b 100644 --- a/test/unit/storage/conversion/FormToJsonConverter.test.ts +++ b/test/unit/storage/conversion/FormToJsonConverter.test.ts @@ -1,5 +1,5 @@ import { stringify } from 'querystring'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import { FormToJsonConverter } from '../../../../src/storage/conversion/FormToJsonConverter'; import { readableToString } from '../../../../src/util/StreamUtil'; diff --git a/test/unit/storage/conversion/IfNeededConverter.test.ts b/test/unit/storage/conversion/IfNeededConverter.test.ts index 1004cecce..af5642d79 100644 --- a/test/unit/storage/conversion/IfNeededConverter.test.ts +++ b/test/unit/storage/conversion/IfNeededConverter.test.ts @@ -1,4 +1,4 @@ -import type { Representation } from '../../../../src/ldp/representation/Representation'; +import type { Representation } from '../../../../src/http/representation/Representation'; import { IfNeededConverter } from '../../../../src/storage/conversion/IfNeededConverter'; import type { RepresentationConverter, diff --git a/test/unit/storage/conversion/MarkdownToHtmlConverter.test.ts b/test/unit/storage/conversion/MarkdownToHtmlConverter.test.ts index 14ab9f1cd..733142b1f 100644 --- a/test/unit/storage/conversion/MarkdownToHtmlConverter.test.ts +++ b/test/unit/storage/conversion/MarkdownToHtmlConverter.test.ts @@ -1,4 +1,4 @@ -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import { MarkdownToHtmlConverter } from '../../../../src/storage/conversion/MarkdownToHtmlConverter'; import { readableToString } from '../../../../src/util/StreamUtil'; import type { TemplateEngine } from '../../../../src/util/templates/TemplateEngine'; diff --git a/test/unit/storage/conversion/QuadToRdfConverter.test.ts b/test/unit/storage/conversion/QuadToRdfConverter.test.ts index 19759c127..6b83c0ccb 100644 --- a/test/unit/storage/conversion/QuadToRdfConverter.test.ts +++ b/test/unit/storage/conversion/QuadToRdfConverter.test.ts @@ -1,10 +1,10 @@ import { namedNode, triple } from '@rdfjs/data-model'; import rdfSerializer from 'rdf-serialize'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { RepresentationPreferences } from '../../../../src/ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { RepresentationPreferences } from '../../../../src/http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { QuadToRdfConverter } from '../../../../src/storage/conversion/QuadToRdfConverter'; import { INTERNAL_QUADS } from '../../../../src/util/ContentTypes'; import { readableToString } from '../../../../src/util/StreamUtil'; diff --git a/test/unit/storage/conversion/RdfToQuadConverter.test.ts b/test/unit/storage/conversion/RdfToQuadConverter.test.ts index fdb886e9f..a197eba98 100644 --- a/test/unit/storage/conversion/RdfToQuadConverter.test.ts +++ b/test/unit/storage/conversion/RdfToQuadConverter.test.ts @@ -3,11 +3,11 @@ import { Readable } from 'stream'; import { namedNode, triple } from '@rdfjs/data-model'; import arrayifyStream from 'arrayify-stream'; import rdfParser from 'rdf-parse'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { RepresentationPreferences } from '../../../../src/ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { RepresentationPreferences } from '../../../../src/http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { RdfToQuadConverter } from '../../../../src/storage/conversion/RdfToQuadConverter'; import { INTERNAL_QUADS } from '../../../../src/util/ContentTypes'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; diff --git a/test/unit/storage/keyvalue/JsonFileStorage.test.ts b/test/unit/storage/keyvalue/JsonFileStorage.test.ts index 9cce448b5..48e944700 100644 --- a/test/unit/storage/keyvalue/JsonFileStorage.test.ts +++ b/test/unit/storage/keyvalue/JsonFileStorage.test.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { JsonFileStorage } from '../../../../src/storage/keyvalue/JsonFileStorage'; import type { ReadWriteLocker } from '../../../../src/util/locking/ReadWriteLocker'; import { mockFs } from '../../../util/Util'; diff --git a/test/unit/storage/keyvalue/JsonResourceStorage.test.ts b/test/unit/storage/keyvalue/JsonResourceStorage.test.ts index fe67d250a..ffc0a6ad4 100644 --- a/test/unit/storage/keyvalue/JsonResourceStorage.test.ts +++ b/test/unit/storage/keyvalue/JsonResourceStorage.test.ts @@ -1,7 +1,7 @@ -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { JsonResourceStorage } from '../../../../src/storage/keyvalue/JsonResourceStorage'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError'; diff --git a/test/unit/storage/patch/ContainerPatcher.test.ts b/test/unit/storage/patch/ContainerPatcher.test.ts index 9012c2a72..674bac534 100644 --- a/test/unit/storage/patch/ContainerPatcher.test.ts +++ b/test/unit/storage/patch/ContainerPatcher.test.ts @@ -1,10 +1,10 @@ import arrayifyStream from 'arrayify-stream'; import { DataFactory } from 'n3'; -import type { Patch } from '../../../../src/ldp/http/Patch'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Patch } from '../../../../src/http/representation/Patch'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { ContainerPatcher } from '../../../../src/storage/patch/ContainerPatcher'; import type { RepresentationPatcherInput, diff --git a/test/unit/storage/patch/ConvertingPatcher.test.ts b/test/unit/storage/patch/ConvertingPatcher.test.ts index 3d6704424..58ced0057 100644 --- a/test/unit/storage/patch/ConvertingPatcher.test.ts +++ b/test/unit/storage/patch/ConvertingPatcher.test.ts @@ -1,6 +1,6 @@ -import type { Patch } from '../../../../src/ldp/http/Patch'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Patch } from '../../../../src/http/representation/Patch'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import type { RepresentationConverter, RepresentationConverterArgs, diff --git a/test/unit/storage/patch/RepresentationPatchHandler.test.ts b/test/unit/storage/patch/RepresentationPatchHandler.test.ts index e6d562e16..91b302b69 100644 --- a/test/unit/storage/patch/RepresentationPatchHandler.test.ts +++ b/test/unit/storage/patch/RepresentationPatchHandler.test.ts @@ -1,5 +1,5 @@ -import type { Patch } from '../../../../src/ldp/http/Patch'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Patch } from '../../../../src/http/representation/Patch'; import type { PatchHandlerInput } from '../../../../src/storage/patch/PatchHandler'; import type { RepresentationPatcher } from '../../../../src/storage/patch/RepresentationPatcher'; import { RepresentationPatchHandler } from '../../../../src/storage/patch/RepresentationPatchHandler'; diff --git a/test/unit/storage/patch/SparqlUpdatePatcher.test.ts b/test/unit/storage/patch/SparqlUpdatePatcher.test.ts index 3e0b457a2..3b1a18bce 100644 --- a/test/unit/storage/patch/SparqlUpdatePatcher.test.ts +++ b/test/unit/storage/patch/SparqlUpdatePatcher.test.ts @@ -3,10 +3,10 @@ import { namedNode, quad } from '@rdfjs/data-model'; import arrayifyStream from 'arrayify-stream'; import type { Quad } from 'rdf-js'; import { translate } from 'sparqlalgebrajs'; -import type { SparqlUpdatePatch } from '../../../../src/ldp/http/SparqlUpdatePatch'; -import { BasicRepresentation } from '../../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import type { SparqlUpdatePatch } from '../../../../src/http/representation/SparqlUpdatePatch'; import type { RepresentationPatcherInput } from '../../../../src/storage/patch/RepresentationPatcher'; import { SparqlUpdatePatcher } from '../../../../src/storage/patch/SparqlUpdatePatcher'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/storage/routing/ConvertingRouterRule.test.ts b/test/unit/storage/routing/ConvertingRouterRule.test.ts index d8c86bbd5..17b0c2af4 100644 --- a/test/unit/storage/routing/ConvertingRouterRule.test.ts +++ b/test/unit/storage/routing/ConvertingRouterRule.test.ts @@ -1,5 +1,5 @@ -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { ConvertingRouterRule } from '../../../../src/storage/routing/ConvertingRouterRule'; import type { PreferenceSupport } from '../../../../src/storage/routing/PreferenceSupport'; diff --git a/test/unit/storage/routing/PreferenceSupport.test.ts b/test/unit/storage/routing/PreferenceSupport.test.ts index e4e38147b..8ecfe32d0 100644 --- a/test/unit/storage/routing/PreferenceSupport.test.ts +++ b/test/unit/storage/routing/PreferenceSupport.test.ts @@ -1,6 +1,6 @@ -import type { Representation } from '../../../../src/ldp/representation/Representation'; -import type { RepresentationPreferences } from '../../../../src/ldp/representation/RepresentationPreferences'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { Representation } from '../../../../src/http/representation/Representation'; +import type { RepresentationPreferences } from '../../../../src/http/representation/RepresentationPreferences'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import type { RepresentationConverter } from '../../../../src/storage/conversion/RepresentationConverter'; import { PreferenceSupport } from '../../../../src/storage/routing/PreferenceSupport'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; diff --git a/test/unit/util/PathUtil.test.ts b/test/unit/util/PathUtil.test.ts index 8ed4e1197..bf14e79f0 100644 --- a/test/unit/util/PathUtil.test.ts +++ b/test/unit/util/PathUtil.test.ts @@ -1,6 +1,6 @@ import { existsSync } from 'fs'; -import type { TargetExtractor } from '../../../src/ldp/http/TargetExtractor'; -import type { ResourceIdentifier } from '../../../src/ldp/representation/ResourceIdentifier'; +import type { TargetExtractor } from '../../../src/http/input/identifier/TargetExtractor'; +import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import type { HttpRequest } from '../../../src/server/HttpRequest'; import { absoluteFilePath, diff --git a/test/unit/util/ResourceUtil.test.ts b/test/unit/util/ResourceUtil.test.ts index 16d889b0c..a78377c6f 100644 --- a/test/unit/util/ResourceUtil.test.ts +++ b/test/unit/util/ResourceUtil.test.ts @@ -1,8 +1,8 @@ import 'jest-rdf'; import type { NamedNode, Literal } from 'n3'; -import { BasicRepresentation } from '../../../src/ldp/representation/BasicRepresentation'; -import type { Representation } from '../../../src/ldp/representation/Representation'; -import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata'; +import { BasicRepresentation } from '../../../src/http/representation/BasicRepresentation'; +import type { Representation } from '../../../src/http/representation/Representation'; +import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; import { addTemplateMetadata, cloneRepresentation, updateModifiedDate } from '../../../src/util/ResourceUtil'; import { CONTENT_TYPE_TERM, DC, SOLID_META, XSD } from '../../../src/util/Vocabularies'; diff --git a/test/unit/util/identifiers/BaseIdentifierStrategy.test.ts b/test/unit/util/identifiers/BaseIdentifierStrategy.test.ts index fee4b9cc9..ccb5a1ca4 100644 --- a/test/unit/util/identifiers/BaseIdentifierStrategy.test.ts +++ b/test/unit/util/identifiers/BaseIdentifierStrategy.test.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import { BaseIdentifierStrategy } from '../../../../src/util/identifiers/BaseIdentifierStrategy'; class DummyStrategy extends BaseIdentifierStrategy { diff --git a/test/unit/util/locking/GreedyReadWriteLocker.test.ts b/test/unit/util/locking/GreedyReadWriteLocker.test.ts index 8833f475e..f39087b59 100644 --- a/test/unit/util/locking/GreedyReadWriteLocker.test.ts +++ b/test/unit/util/locking/GreedyReadWriteLocker.test.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import type { KeyValueStorage } from '../../../../src/storage/keyvalue/KeyValueStorage'; import { ForbiddenHttpError } from '../../../../src/util/errors/ForbiddenHttpError'; import { InternalServerError } from '../../../../src/util/errors/InternalServerError'; diff --git a/test/unit/util/locking/WrappedExpiringReadWriteLocker.test.ts b/test/unit/util/locking/WrappedExpiringReadWriteLocker.test.ts index d9b101711..05602e425 100644 --- a/test/unit/util/locking/WrappedExpiringReadWriteLocker.test.ts +++ b/test/unit/util/locking/WrappedExpiringReadWriteLocker.test.ts @@ -1,4 +1,4 @@ -import type { ResourceIdentifier } from '../../../../src/ldp/representation/ResourceIdentifier'; +import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier'; import type { ReadWriteLocker } from '../../../../src/util/locking/ReadWriteLocker'; import { WrappedExpiringReadWriteLocker } from '../../../../src/util/locking/WrappedExpiringReadWriteLocker'; diff --git a/test/util/AclHelper.ts b/test/util/AclHelper.ts index f00d9ced2..28771f552 100644 --- a/test/util/AclHelper.ts +++ b/test/util/AclHelper.ts @@ -1,6 +1,6 @@ import type { ResourceStore } from '../../src/'; import { BasicRepresentation } from '../../src/'; -import type { AclPermission } from '../../src/ldp/permissions/AclPermission'; +import type { AclPermission } from '../../src/authorization/permissions/AclPermission'; export class AclHelper { public readonly store: ResourceStore;