refactor: Move condition classes to separate folder

src/http/Operation.ts

@@ -1,4 +1,4 @@
-import type { Conditions } from '../storage/Conditions';
+import type { Conditions } from '../storage/conditions/Conditions';
 import type { Representation } from './representation/Representation';
 import type { RepresentationPreferences } from './representation/RepresentationPreferences';
 import type { ResourceIdentifier } from './representation/ResourceIdentifier';

src/http/input/conditions/BasicConditionsParser.ts

@@ -1,8 +1,8 @@
 import { getLoggerFor } from '../../../logging/LogUtil';
 import type { HttpRequest } from '../../../server/HttpRequest';
-import type { BasicConditionsOptions } from '../../../storage/BasicConditions';
-import { BasicConditions } from '../../../storage/BasicConditions';
-import type { Conditions } from '../../../storage/Conditions';
+import type { BasicConditionsOptions } from '../../../storage/conditions/BasicConditions';
+import { BasicConditions } from '../../../storage/conditions/BasicConditions';
+import type { Conditions } from '../../../storage/conditions/Conditions';
 import { splitCommaSeparated } from '../../../util/StringUtil';
 import { ConditionsParser } from './ConditionsParser';
 

src/http/input/conditions/ConditionsParser.ts

@@ -1,5 +1,5 @@
 import type { HttpRequest } from '../../../server/HttpRequest';
-import type { Conditions } from '../../../storage/Conditions';
+import type { Conditions } from '../../../storage/conditions/Conditions';
 import { AsyncHandler } from '../../../util/handlers/AsyncHandler';
 
 /**

src/http/ldp/GetOperationHandler.ts

@@ -1,4 +1,4 @@
-import { getETag } from '../../storage/Conditions';
+import { getETag } from '../../storage/conditions/Conditions';
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
 import { assertReadConditions } from '../../util/ResourceUtil';

src/http/ldp/HeadOperationHandler.ts

@@ -1,4 +1,4 @@
-import { getETag } from '../../storage/Conditions';
+import { getETag } from '../../storage/conditions/Conditions';
 import type { ResourceStore } from '../../storage/ResourceStore';
 import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError';
 import { assertReadConditions } from '../../util/ResourceUtil';

src/index.ts

@@ -372,6 +372,10 @@ export * from './storage/accessors/PassthroughDataAccessor';
 export * from './storage/accessors/SparqlDataAccessor';
 export * from './storage/accessors/ValidatingDataAccessor';
 
+// Storage/Conditions
+export * from './storage/conditions/BasicConditions';
+export * from './storage/conditions/Conditions';
+
 // Storage/Conversion
 export * from './storage/conversion/BaseTypedRepresentationConverter';
 export * from './storage/conversion/ChainedConverter';
@@ -442,9 +446,7 @@ export * from './storage/validators/QuotaValidator';
 // Storage
 export * from './storage/AtomicResourceStore';
 export * from './storage/BaseResourceStore';
-export * from './storage/BasicConditions';
 export * from './storage/CachedResourceSet';
-export * from './storage/Conditions';
 export * from './storage/DataAccessorBasedStore';
 export * from './storage/IndexRepresentationStore';
 export * from './storage/LockingResourceStore';

src/server/notifications/ComposedNotificationHandler.ts

@@ -1,4 +1,4 @@
-import { sameResourceState } from '../../storage/Conditions';
+import { sameResourceState } from '../../storage/conditions/Conditions';
 import type { NotificationGenerator } from './generate/NotificationGenerator';
 import type { NotificationEmitter } from './NotificationEmitter';
 import type { NotificationHandlerInput } from './NotificationHandler';

src/server/notifications/generate/ActivityNotificationGenerator.ts

@@ -1,4 +1,4 @@
-import { getETag } from '../../../storage/Conditions';
+import { getETag } from '../../../storage/conditions/Conditions';
 import type { ResourceStore } from '../../../storage/ResourceStore';
 import { NotImplementedHttpError } from '../../../util/errors/NotImplementedHttpError';
 import { AS } from '../../../util/Vocabularies';

src/server/notifications/generate/AddRemoveNotificationGenerator.ts

@@ -1,4 +1,4 @@
-import { getETag } from '../../../storage/Conditions';
+import { getETag } from '../../../storage/conditions/Conditions';
 import type { ResourceStore } from '../../../storage/ResourceStore';
 import { InternalServerError } from '../../../util/errors/InternalServerError';
 import { NotImplementedHttpError } from '../../../util/errors/NotImplementedHttpError';

src/storage/BaseResourceStore.ts

@@ -3,7 +3,7 @@ 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 { Conditions } from './conditions/Conditions';
 import type { ResourceStore, ChangeMap } from './ResourceStore';
 
 /**

src/storage/DataAccessorBasedStore.ts

@@ -44,7 +44,7 @@ import {
   AS,
 } from '../util/Vocabularies';
 import type { DataAccessor } from './accessors/DataAccessor';
-import type { Conditions } from './Conditions';
+import type { Conditions } from './conditions/Conditions';
 import type { ResourceStore, ChangeMap } from './ResourceStore';
 import namedNode = DataFactory.namedNode;
 

src/storage/IndexRepresentationStore.ts

@@ -5,7 +5,7 @@ import type { ResourceIdentifier } from '../http/representation/ResourceIdentifi
 import { NotFoundHttpError } from '../util/errors/NotFoundHttpError';
 import { isContainerIdentifier } from '../util/PathUtil';
 import { isValidFileName } from '../util/StringUtil';
-import type { Conditions } from './Conditions';
+import type { Conditions } from './conditions/Conditions';
 import { cleanPreferences, matchesMediaType } from './conversion/ConversionUtil';
 import { PassthroughStore } from './PassthroughStore';
 import type { ResourceStore } from './ResourceStore';

src/storage/LockingResourceStore.ts

@@ -9,7 +9,7 @@ import { getLoggerFor } from '../logging/LogUtil';
 import type { ExpiringReadWriteLocker } from '../util/locking/ExpiringReadWriteLocker';
 import { endOfStream } from '../util/StreamUtil';
 import type { AtomicResourceStore } from './AtomicResourceStore';
-import type { Conditions } from './Conditions';
+import type { Conditions } from './conditions/Conditions';
 import type { ResourceStore, ChangeMap } from './ResourceStore';
 
 /**

src/storage/MonitoringStore.ts

@@ -5,7 +5,7 @@ import type { RepresentationPreferences } from '../http/representation/Represent
 import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { BaseActivityEmitter } from '../server/notifications/ActivityEmitter';
 import { AS, SOLID_AS } from '../util/Vocabularies';
-import type { Conditions } from './Conditions';
+import type { Conditions } from './conditions/Conditions';
 import type { ResourceStore, ChangeMap } from './ResourceStore';
 
 // The ActivityStream terms for which we emit an event

src/storage/PassthroughStore.ts

@@ -2,7 +2,7 @@ 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 { Conditions } from './conditions/Conditions';
 import type { ResourceStore, ChangeMap } from './ResourceStore';
 
 /**

src/storage/PatchingStore.ts

@@ -1,7 +1,7 @@
 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 type { Conditions } from './conditions/Conditions';
 import { PassthroughStore } from './PassthroughStore';
 import type { PatchHandler } from './patch/PatchHandler';
 import type { ResourceStore, ChangeMap } from './ResourceStore';

src/storage/ReadOnlyStore.ts

@@ -2,7 +2,7 @@ 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 type { Conditions } from './conditions/Conditions';
 import { PassthroughStore } from './PassthroughStore';
 import type { ResourceStore, ChangeMap } from './ResourceStore';
 

src/storage/RepresentationConvertingStore.ts

@@ -4,7 +4,7 @@ import type { RepresentationPreferences } from '../http/representation/Represent
 import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { getLoggerFor } from '../logging/LogUtil';
 import { INTERNAL_QUADS } from '../util/ContentTypes';
-import type { Conditions } from './Conditions';
+import type { Conditions } from './conditions/Conditions';
 import { PassthroughConverter } from './conversion/PassthroughConverter';
 import type { RepresentationConverter } from './conversion/RepresentationConverter';
 import { PassthroughStore } from './PassthroughStore';

src/storage/ResourceStore.ts

@@ -4,7 +4,7 @@ import type { RepresentationMetadata } from '../http/representation/Representati
 import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences';
 import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import type { IdentifierMap } from '../util/map/IdentifierMap';
-import type { Conditions } from './Conditions';
+import type { Conditions } from './conditions/Conditions';
 import type { ResourceSet } from './ResourceSet';
 
 /**

src/storage/RoutingResourceStore.ts

@@ -4,7 +4,7 @@ import type { RepresentationPreferences } from '../http/representation/Represent
 import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier';
 import { NotFoundHttpError } from '../util/errors/NotFoundHttpError';
 import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError';
-import type { Conditions } from './Conditions';
+import type { Conditions } from './conditions/Conditions';
 import type { ResourceStore, ChangeMap } from './ResourceStore';
 import type { RouterRule } from './routing/RouterRule';
 

src/storage/conditions/BasicConditions.ts

@@ -1,5 +1,5 @@
-import type { RepresentationMetadata } from '../http/representation/RepresentationMetadata';
-import { DC } from '../util/Vocabularies';
+import type { RepresentationMetadata } from '../../http/representation/RepresentationMetadata';
+import { DC } from '../../util/Vocabularies';
 import { getETag, sameResourceState } from './Conditions';
 import type { Conditions } from './Conditions';
 

src/storage/conditions/Conditions.ts

@@ -1,5 +1,5 @@
-import type { RepresentationMetadata } from '../http/representation/RepresentationMetadata';
-import { DC } from '../util/Vocabularies';
+import type { RepresentationMetadata } from '../../http/representation/RepresentationMetadata';
+import { DC } from '../../util/Vocabularies';
 
 /**
  * The conditions of an HTTP conditional request.

src/util/ResourceUtil.ts

@@ -3,7 +3,7 @@ import { DataFactory } from 'n3';
 import { BasicRepresentation } from '../http/representation/BasicRepresentation';
 import type { Representation } from '../http/representation/Representation';
 import { RepresentationMetadata } from '../http/representation/RepresentationMetadata';
-import type { Conditions } from '../storage/Conditions';
+import type { Conditions } from '../storage/conditions/Conditions';
 import { NotModifiedHttpError } from './errors/NotModifiedHttpError';
 import { guardedStreamFrom } from './StreamUtil';
 import { toLiteral } from './TermUtil';

test/integration/RequestParser.test.ts

@@ -9,7 +9,7 @@ import { ContentTypeParser } from '../../src/http/input/metadata/ContentTypePars
 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 { BasicConditions } from '../../src/storage/conditions/BasicConditions';
 import { guardedStreamFrom } from '../../src/util/StreamUtil';
 
 describe('A BasicRequestParser with simple input parsers', (): void => {

test/unit/http/ldp/DeleteOperationHandler.test.ts

@@ -1,7 +1,7 @@
 import { DeleteOperationHandler } from '../../../../src/http/ldp/DeleteOperationHandler';
 import type { Operation } from '../../../../src/http/Operation';
 import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation';
-import { BasicConditions } from '../../../../src/storage/BasicConditions';
+import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';
 

test/unit/http/ldp/GetOperationHandler.test.ts

@@ -4,8 +4,8 @@ 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 { BasicConditions } from '../../../../src/storage/BasicConditions';
-import { getETag } from '../../../../src/storage/Conditions';
+import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions';
+import { getETag } from '../../../../src/storage/conditions/Conditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';
 import { NotModifiedHttpError } from '../../../../src/util/errors/NotModifiedHttpError';

test/unit/http/ldp/HeadOperationHandler.test.ts

@@ -4,8 +4,8 @@ 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 { BasicConditions } from '../../../../src/storage/BasicConditions';
-import { getETag } from '../../../../src/storage/Conditions';
+import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions';
+import { getETag } from '../../../../src/storage/conditions/Conditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';
 import { NotModifiedHttpError } from '../../../../src/util/errors/NotModifiedHttpError';

test/unit/http/ldp/PatchOperationHandler.test.ts

@@ -2,7 +2,7 @@ import { PatchOperationHandler } from '../../../../src/http/ldp/PatchOperationHa
 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 { BasicConditions } from '../../../../src/storage/conditions/BasicConditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError';
 import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';

test/unit/http/ldp/PostOperationHandler.test.ts

@@ -3,7 +3,7 @@ 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 { BasicConditions } from '../../../../src/storage/BasicConditions';
+import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError';
 import { InternalServerError } from '../../../../src/util/errors/InternalServerError';

test/unit/http/ldp/PutOperationHandler.test.ts

@@ -2,7 +2,7 @@ import { PutOperationHandler } from '../../../../src/http/ldp/PutOperationHandle
 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 { BasicConditions } from '../../../../src/storage/conditions/BasicConditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError';
 import { MethodNotAllowedHttpError } from '../../../../src/util/errors/MethodNotAllowedHttpError';

test/unit/storage/DataAccessorBasedStore.test.ts

@@ -9,7 +9,7 @@ import type { Representation } from '../../../src/http/representation/Representa
 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 { BasicConditions } from '../../../src/storage/conditions/BasicConditions';
 import { DataAccessorBasedStore } from '../../../src/storage/DataAccessorBasedStore';
 import { INTERNAL_QUADS } from '../../../src/util/ContentTypes';
 import { BadRequestHttpError } from '../../../src/util/errors/BadRequestHttpError';

test/unit/storage/conditions/BasicConditions.test.ts

@@ -1,7 +1,7 @@
-import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata';
-import { BasicConditions } from '../../../src/storage/BasicConditions';
-import { getETag } from '../../../src/storage/Conditions';
-import { CONTENT_TYPE, DC } from '../../../src/util/Vocabularies';
+import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata';
+import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions';
+import { getETag } from '../../../../src/storage/conditions/Conditions';
+import { CONTENT_TYPE, DC } from '../../../../src/util/Vocabularies';
 
 function getMetadata(modified: Date, type = 'application/ld+json'): RepresentationMetadata {
   return new RepresentationMetadata({

test/unit/storage/conditions/Conditions.test.ts

@@ -1,6 +1,6 @@
-import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata';
-import { getETag, sameResourceState } from '../../../src/storage/Conditions';
-import { CONTENT_TYPE, DC } from '../../../src/util/Vocabularies';
+import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata';
+import { getETag, sameResourceState } from '../../../../src/storage/conditions/Conditions';
+import { CONTENT_TYPE, DC } from '../../../../src/util/Vocabularies';
 
 describe('Conditions', (): void => {
   describe('#getETag', (): void => {

test/unit/util/ResourceUtil.test.ts

@@ -4,7 +4,7 @@ import type { NamedNode, Literal } from 'n3';
 import { BasicRepresentation } from '../../../src/http/representation/BasicRepresentation';
 import type { Representation } from '../../../src/http/representation/Representation';
 import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata';
-import type { Conditions } from '../../../src/storage/Conditions';
+import type { Conditions } from '../../../src/storage/conditions/Conditions';
 import { NotModifiedHttpError } from '../../../src/util/errors/NotModifiedHttpError';
 import type { Guarded } from '../../../src/util/GuardedStream';
 import {