chore(types): remove dup types, clean up some itesm

declarations.d.ts

@@ -218,3 +218,15 @@ declare const $crossOriginLoading$;
 declare const chunkId;
 
 type TODO = any;
+
+declare interface SourcePosition {
+	line: number;
+	column: number;
+}
+
+declare interface DependencyLocation {
+	name: string;
+	index: number;
+	start: SourcePosition;
+	end: SourcePosition;
+}

lib/AsyncDependenciesBlock.js

@@ -13,24 +13,11 @@ const DependenciesBlock = require("./DependenciesBlock");
  *
  */
 
-/**
- * @typedef {Object} SourcePosition
- * @property {number} line
- * @property {number} column
- */
-
-/**
- * @typedef {Object} SourceLocation
- * @property {number} index
- * @property {SourcePosition} start
- * @property {SourcePosition} end
- */
-
 module.exports = class AsyncDependenciesBlock extends DependenciesBlock {
 	/**
 	 * @param {GroupOptions} groupOptions options for the group
 	 * @param {Module} module the Module object
-	 * @param {SourceLocation=} loc the line of code
+	 * @param {DependencyLocation=} loc the line of code
 	 * @param {TODO=} request the request
 	 */
 	constructor(groupOptions, module, loc, request) {

lib/Compilation.js

@@ -84,19 +84,6 @@ const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
  * @property {Dependency[]} dependencies
  */
 
-/**
- * @typedef {Object} SourcePosition
- * @property {number} line
- * @property {number} column
- */
-
-/**
- * @typedef {Object} SourceLocation
- * @property {number} index
- * @property {SourcePosition} start
- * @property {SourcePosition} end
- */
-
 /**
  * @typedef {Object} AvailableModulesChunkGroupMapping
  * @property {ChunkGroup} chunkGroup
@@ -1313,7 +1300,7 @@ class Compilation extends Tapable {
 	/**
 	 * @param {any} groupOptions options provided for group
 	 * @param {Module} module module in question
-	 * @param {SourceLocation} loc source location reference
+	 * @param {DependencyLocation} loc source location reference
 	 * @param {string} request request string
 	 * @returns {ChunkGroup} the chunk group added inside
 	 */

lib/Module.js

@@ -11,14 +11,9 @@ const ModuleReason = require("./ModuleReason");
 const SortableSet = require("./util/SortableSet");
 const Template = require("./Template");
 
-<<<<<<< HEAD
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./RequestShortener")} RequestShortener */
-=======
 /** @typedef {typeof import("./Chunk")} Chunk */
 /** @typedef {typeof import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./WebpackError")} WebpackError */
->>>>>>> 206d1a6... chore(types): add Compiler and Compilation type support
 
 const EMPTY_RESOLVE_OPTIONS = {};