From f8124bd34a39df84c3bc813baedbede2224e58cf Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Sat, 22 Jan 2022 13:24:12 +0300
Subject: [PATCH] refactor(versioning): Separate generic from loose versioning
 (#13747)

---
 lib/versioning/aws-machine-image/index.ts               | 2 +-
 lib/versioning/docker/index.ts                          | 2 +-
 lib/versioning/{loose/utils.spec.ts => generic.spec.ts} | 2 +-
 lib/versioning/{loose => }/generic.ts                   | 2 +-
 lib/versioning/git/index.ts                             | 2 +-
 lib/versioning/index.spec.ts                            | 2 +-
 lib/versioning/loose/index.ts                           | 2 +-
 lib/versioning/nuget/index.ts                           | 2 +-
 lib/versioning/regex/index.ts                           | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename lib/versioning/{loose/utils.spec.ts => generic.spec.ts} (99%)
 rename lib/versioning/{loose => }/generic.ts (98%)

diff --git a/lib/versioning/aws-machine-image/index.ts b/lib/versioning/aws-machine-image/index.ts
index 01bec556d9..674ec65e35 100644
--- a/lib/versioning/aws-machine-image/index.ts
+++ b/lib/versioning/aws-machine-image/index.ts
@@ -1,5 +1,5 @@
 import { regEx } from '../../util/regex';
-import { GenericVersion, GenericVersioningApi } from '../loose/generic';
+import { GenericVersion, GenericVersioningApi } from '../generic';
 import type { VersioningApi } from '../types';
 
 export const id = 'aws-machine-image';
diff --git a/lib/versioning/docker/index.ts b/lib/versioning/docker/index.ts
index 3e9ce2ad5e..4dc32bc918 100644
--- a/lib/versioning/docker/index.ts
+++ b/lib/versioning/docker/index.ts
@@ -1,5 +1,5 @@
 import { regEx } from '../../util/regex';
-import { GenericVersion, GenericVersioningApi } from '../loose/generic';
+import { GenericVersion, GenericVersioningApi } from '../generic';
 import type { VersioningApi } from '../types';
 
 export const id = 'docker';
diff --git a/lib/versioning/loose/utils.spec.ts b/lib/versioning/generic.spec.ts
similarity index 99%
rename from lib/versioning/loose/utils.spec.ts
rename to lib/versioning/generic.spec.ts
index 5d9bae18dd..455acadd52 100644
--- a/lib/versioning/loose/utils.spec.ts
+++ b/lib/versioning/generic.spec.ts
@@ -1,6 +1,6 @@
 import { GenericVersion, GenericVersioningApi } from './generic';
 
-describe('versioning/loose/utils', () => {
+describe('versioning/generic', () => {
   const optionalFunctions = [
     'isLessThanRange',
     'valueToVersion',
diff --git a/lib/versioning/loose/generic.ts b/lib/versioning/generic.ts
similarity index 98%
rename from lib/versioning/loose/generic.ts
rename to lib/versioning/generic.ts
index cfcb3b657f..32df1a1b90 100644
--- a/lib/versioning/loose/generic.ts
+++ b/lib/versioning/generic.ts
@@ -1,5 +1,5 @@
 import is from '@sindresorhus/is';
-import type { NewValueConfig, VersioningApi } from '../types';
+import type { NewValueConfig, VersioningApi } from './types';
 
 export interface GenericVersion {
   release: number[];
diff --git a/lib/versioning/git/index.ts b/lib/versioning/git/index.ts
index 3c2e509917..a5507b95ec 100644
--- a/lib/versioning/git/index.ts
+++ b/lib/versioning/git/index.ts
@@ -1,5 +1,5 @@
 import { regEx } from '../../util/regex';
-import { GenericVersion, GenericVersioningApi } from '../loose/generic';
+import { GenericVersion, GenericVersioningApi } from '../generic';
 import type { VersioningApi } from '../types';
 
 export const id = 'git';
diff --git a/lib/versioning/index.spec.ts b/lib/versioning/index.spec.ts
index d6f118aa7e..8289aa3cca 100644
--- a/lib/versioning/index.spec.ts
+++ b/lib/versioning/index.spec.ts
@@ -1,7 +1,7 @@
 import { getOptions } from '../config/options';
 import { loadModules } from '../util/modules';
 import { isVersioningApiConstructor } from './common';
-import { GenericVersion, GenericVersioningApi } from './loose/generic';
+import { GenericVersion, GenericVersioningApi } from './generic';
 import * as semverVersioning from './semver';
 import type { VersioningApi, VersioningApiConstructor } from './types';
 import * as allVersioning from '.';
diff --git a/lib/versioning/loose/index.ts b/lib/versioning/loose/index.ts
index 4386ab2ad4..6bf92038dd 100644
--- a/lib/versioning/loose/index.ts
+++ b/lib/versioning/loose/index.ts
@@ -1,6 +1,6 @@
 import { regEx } from '../../util/regex';
+import { GenericVersion, GenericVersioningApi } from '../generic';
 import type { VersioningApi } from '../types';
-import { GenericVersion, GenericVersioningApi } from './generic';
 
 export const id = 'loose';
 export const displayName = 'Loose';
diff --git a/lib/versioning/nuget/index.ts b/lib/versioning/nuget/index.ts
index fdd4dec0da..bb0e3ebb7e 100644
--- a/lib/versioning/nuget/index.ts
+++ b/lib/versioning/nuget/index.ts
@@ -1,6 +1,6 @@
 import semver from 'semver';
 import { regEx } from '../../util/regex';
-import { GenericVersion, GenericVersioningApi } from '../loose/generic';
+import { GenericVersion, GenericVersioningApi } from '../generic';
 import type { VersioningApi } from '../types';
 
 export const id = 'nuget';
diff --git a/lib/versioning/regex/index.ts b/lib/versioning/regex/index.ts
index 417dd48633..782aad65cf 100644
--- a/lib/versioning/regex/index.ts
+++ b/lib/versioning/regex/index.ts
@@ -2,7 +2,7 @@ import is from '@sindresorhus/is';
 import semver from 'semver';
 import { CONFIG_VALIDATION } from '../../constants/error-messages';
 import { regEx } from '../../util/regex';
-import { GenericVersion, GenericVersioningApi } from '../loose/generic';
+import { GenericVersion, GenericVersioningApi } from '../generic';
 import type { VersioningApiConstructor } from '../types';
 
 export const id = 'regex';
-- 
GitLab