Merge 29cc4e6 into 012d9e0

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';

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

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 {
   /**

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.

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.

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.

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.

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 {
   /**

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.

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<string, keyof AclPermission> = {
   [ACL.Read]: AccessMode.read,

src/authorization/access-checkers/AgentGroupAccessChecker.ts → 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';

src/ldp/permissions/MethodModesExtractor.ts → 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';
 

src/ldp/permissions/ModesExtractor.ts → 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<Operation, Set<AccessMode>> {}

src/ldp/permissions/SparqlPatchModesExtractor.ts → 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';
 

src/ldp/operations/Operation.ts → 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.

src/ldp/http/BasicRequestParser.ts → 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}.

src/ldp/http/RequestParser.ts → 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.

src/ldp/http/BodyParser.ts → 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 {
   /**

src/ldp/http/RawBodyParser.ts → 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';
 

src/ldp/http/SparqlUpdateBodyParser.ts → 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}.

src/ldp/http/OriginalUrlExtractor.ts → 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';
 
 /**

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> {}

src/ldp/http/AcceptPreferenceParser.ts → 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: {

src/ldp/http/PreferenceParser.ts → 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}.

src/ldp/operations/DeleteOperationHandler.ts → 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';
 

src/ldp/operations/GetOperationHandler.ts → 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';
 

src/ldp/operations/HeadOperationHandler.ts → 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';
 

src/ldp/operations/OperationHandler.ts → 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;

src/ldp/operations/PatchOperationHandler.ts → 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';