danger 11.3.1 → 12.0.0

package/CHANGELOG.md

@@ -17,6 +17,21 @@
 <!-- Your comment below this -->
 <!-- Your comment above this -->
 
+## 12.0.0
+
+Bumping to 12.x because we've raised the minimum to node version from 14 to 18. This is due to some of our dependencies
+requiring a newer version of node. This is a breaking change for some folk! Also, 14 has been out of support for quite a while
+now and Node 18 gives us a full year. - [@orta]
+
+- Remove the user checks in GitHub comment/inline comment lookups, to allow using app tokens [#1433] - [@orta]
+- Upgrade `node` engine from `>=14.13.1` to `>=18` [@heltoft]
+- Upgrade `@types/node` from `^10.11.3` to `18.19.18` [@heltoft]
+- GitLab: [#1386] Move from `@gitbeaker/node` to `@gitbeaker/rest` [@heltoft]
+- GitLab: [#1412] Danger fails to create inline comments on Gitlab [@heltoft]
+- GitLab: [#1405] Can't post multiple inline comments [@heltoft]
+- GitLab: Do not delete system resolved danger inline comments [@heltoft]
+- Fix for ESM imports in Dangerfiles [@mgol]
+
 ## 11.3.1
 
 - Adds `pull_number` into `thisPR` in the GitHub SDL  [@radimsv]
@@ -2002,6 +2017,7 @@ Not usable for others, only stubs of classes etc. - [@orta]
 [@hanneskaeufler]: https://github.com/hanneskaeufler
 [@happylinks]: https://github.com/happylinks
 [@hellocore]: https://github.com/HelloCore
+[@heltoft]: https://github.com/heltoft
 [@hiroppy]: https://github.com/hiroppy
 [@hmcc]: https://github.com/hmcc
 [@hmschreiner]: https://github.com/hmschreiner

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-slim as build
+FROM node:18-slim as build
 
 LABEL maintainer="Orta Therox"
 LABEL "com.github.actions.name"="Danger JS Action"
@@ -16,7 +16,7 @@ RUN yarn install --production --frozen-lockfile
 RUN chmod +x distribution/commands/danger.js
 
 
-FROM node:14-slim
+FROM node:18-slim
 WORKDIR /usr/src/danger
 ENV PATH="/usr/src/danger/node_modules/.bin:$PATH"
 COPY package.json ./

package/distribution/commands/danger-pr.js

@@ -65,7 +65,6 @@ var platform_1 = require("../platforms/platform");
 var GitLabAPI_1 = require("../platforms/gitlab/GitLabAPI");
 var d = (0, debug_1.debug)("pr");
 var log = console.log;
-var gitLabApiCredentials = (0, GitLabAPI_1.getGitLabAPICredentialsFromEnv)(process.env);
 commander_1.default
     .usage("[options] <pr_url>")
     .description("Emulate running Danger against an existing GitHub Pull Request.")
@@ -80,8 +79,8 @@ commander_1.default
         !process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] &&
         !process.env["DANGER_BITBUCKETCLOUD_USERNAME"] &&
         !process.env["DANGER_BITBUCKETCLOUD_REPO_ACCESSTOKEN"] &&
-        !gitLabApiCredentials.token &&
-        !gitLabApiCredentials.oauthToken) {
+        !process.env["DANGER_GITLAB_API_TOKEN"] &&
+        !process.env["DANGER_GITLAB_API_OAUTH_TOKEN"]) {
         log("");
         log("     You don't have a DANGER_GITHUB_API_TOKEN/DANGER_GITLAB_API_TOKEN/DANGER_GITLAB_API_OAUTH_TOKEN/DANGER_BITBUCKETCLOUD_OAUTH_KEY/DANGER_BITBUCKETCLOUD_USERNAME/DANGER_BITBUCKETCLOUD_REPO_ACCESSTOKEN set up, this is optional, but TBH, you want to do this.");
         log("     Check out: http://danger.systems/js/guides/the_dangerfile.html#working-on-your-dangerfile");
@@ -105,7 +104,7 @@ if (commander_1.default.args.length === 0) {
     process.exitCode = 1;
 }
 else {
-    var customHost_1 = process.env["DANGER_GITHUB_HOST"] || process.env["DANGER_BITBUCKETSERVER_HOST"] || gitLabApiCredentials.host; // this defaults to https://gitlab.com
+    var customHost_1 = process.env["DANGER_GITHUB_HOST"] || process.env["DANGER_BITBUCKETSERVER_HOST"] || (0, GitLabAPI_1.getGitLabHostFromEnv)(process.env); // This defaults to https://www.gitlab.com
     // Allow an ambiguous amount of args to find the PR reference
     var findPR = commander_1.default.args.find(function (a) { return a.includes(customHost_1) || a.includes("github") || a.includes("bitbucket.org"); });
     if (!findPR) {

package/distribution/commands/danger-pr.js.map

@@ -1 +1 @@
-{"version":3,"file":"danger-pr.js","sourceRoot":"","sources":["../../source/commands/danger-pr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"danger-pr.js","sourceRoot":"","sources":["../../source/commands/danger-pr.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wDAA+B;AAC/B,kCAAgC;AAChC,0DAAmC;AAEnC,oDAAoD;AACpD,oEAAkE;AAClE,+CAAkD;AAClD,sFAAuE;AACvE,uDAAyD;AACzD,mEAA8D;AAC9D,sCAAuC;AACvC,kDAAmE;AAEnE,2DAAoE;AAEpE,IAAM,CAAC,GAAG,IAAA,aAAK,EAAC,IAAI,CAAC,CAAA;AACrB,IAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AASvB,mBAAO;KACJ,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,iEAAiE,CAAC;KAC9E,MAAM,CAAC,YAAY,EAAE,6EAA6E,CAAC;KACnG,MAAM,CAAC,UAAU,EAAE,4CAA4C,CAAC;KAChE,kBAAkB,CAAC,IAAI,CAAC;KAExB,EAAE,CAAC,QAAQ,EAAE;IACZ,GAAG,CAAC,IAAI,CAAC,CAAA;IACT,GAAG,CAAC,SAAS,CAAC,CAAA;IACd,IACE,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;QACvC,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;QAC3C,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC;QAC/C,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC;QAC9C,CAAC,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC;QACtD,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;QACvC,CAAC,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,EAC7C;QACA,GAAG,CAAC,EAAE,CAAC,CAAA;QACP,GAAG,CACD,mQAAmQ,CACpQ,CAAA;QACD,GAAG,CAAC,gGAAgG,CAAC,CAAA;QACrG,GAAG,CAAC,EAAE,CAAC,CAAA;KACR;IACD,GAAG,CAAC,EAAE,CAAC,CAAA;IACP,GAAG,CAAC,sBAAsB,CAAC,CAAA;IAC3B,GAAG,CAAC,gDAAgD,CAAC,CAAA;IACrD,GAAG,CAAC,EAAE,CAAC,CAAA;IACP,GAAG,CAAC,yBAAyB,CAAC,CAAA;IAC9B,GAAG,CAAC,6DAA6D,CAAC,CAAA;IAClE,GAAG,CAAC,EAAE,CAAC,CAAA;IACP,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAC5B,GAAG,CAAC,4DAA4D,CAAC,CAAA;AACnE,CAAC,CAAC,CAAA;AAEJ,IAAA,8BAAa,EAAC,mBAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAE1C,IAAM,GAAG,GAAG,mBAAqB,CAAA;AACjC,IAAM,aAAa,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;AAEnC,IAAI,mBAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;IAC7B,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;IACvD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;CACrB;KAAM;IACL,IAAM,YAAU,GACd,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,IAAI,IAAA,gCAAoB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAA,CAAC,0CAA0C;IAEjK,6DAA6D;IAC7D,IAAM,MAAM,GAAG,mBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,YAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,EAA7E,CAA6E,CAAC,CAAA;IAEtH,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,CAAC,KAAK,CAAC,6FAA6F,CAAC,CAAA;QAC5G,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;KACrB;SAAM;QACL,IAAM,EAAE,GAAG,IAAA,qCAAiB,EAAC,MAAM,CAAC,CAAA;QACpC,IAAI,CAAC,EAAE,EAAE;YACP,OAAO,CAAC,KAAK,CAAC,6DAAsD,MAAM,wBAAqB,CAAC,CAAA;YAChG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;SACrB;aAAM;YACL,iGAAiG;YACjG,2EAA2E;YAE3E,IAAM,MAAM,GAAG,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,CAAA;YACjC,IAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA;YACjD,IAAI,CAAC,gCAAyB,EAAE,CAAC,IAAI,cAAI,EAAE,CAAC,iBAAiB,CAAE,CAAC,CAAA;YAChE,IAAI,aAAa,IAAI,MAAM,IAAI,IAAA,0BAAc,EAAC,mBAAO,CAAC,EAAE;gBACtD,IAAI,CAAC,aAAa,EAAE;oBAClB,CAAC,CAAC,kCAA2B,IAAA,0BAAc,EAAC,mBAAO,CAAC,CAAE,CAAC,CAAA;iBACxD;gBACD,IAAM,MAAM,GAAG,IAAI,aAAM,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,CAAC,iBAAiB,EAAE,CAAC,CAAA;gBAC9F,IAAM,QAAQ,GAAG,IAAA,4BAAiB,wBAE3B,OAAO,CAAC,GAAG;oBACd,uGAAuG;oBACvG,0GAA0G;oBAC1G,8FAA8F;oBAC9F,4GAA4G;oBAC5G,eAAe;oBACf,kBAAkB,EAAE,EAAE,CAAC,QAAQ,KAEjC,MAAM,CACP,CAAA;gBAED,IAAI,MAAM,EAAE;oBACV,CAAC,CAAC,8BAA8B,CAAC,CAAA;oBACjC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;iBACrC;qBAAM;oBACL,CAAC,CAAC,kCAAkC,CAAC,CAAA;oBACrC,uCAAuC;oBACvC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAA;oBAEnB,sCAAsC;oBACtC,OAAO,GAAG,CAAC,EAAE,CAAA;oBACb,OAAO,GAAG,CAAC,IAAI,CAAA;oBACf,IAAA,kBAAS,EAAC,GAAG,EAAE,EAAE,MAAM,QAAA,EAAE,QAAQ,UAAA,EAAE,iBAAiB,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;iBACvF;aACF;SACF;KACF;CACF;AAED,oEAAoE;AACpE,SAAe,kBAAkB,CAAC,QAAkB,EAAE,MAAgB;;;;;wBAClD,qBAAM,IAAA,+BAAgB,EAAC,QAAQ,EAAE,MAAM,EAAE,mBAAO,CAAC;oBACnE,4BAA4B;kBADuC;;oBAA7D,SAAS,GAAG,SAAiD;oBACnE,4BAA4B;oBAC5B,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE;wBACtE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAA;qBACtG;oBAEK,YAAY,GAAG,IAAA,sCAAgB,EAAC,SAAS,CAAC,CAAA;oBAC1C,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;oBAEvC,IAAI,GAAG,CAAC,IAAI,EAAE;wBACZ,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;qBACtD;yBAAM,IAAI,GAAG,CAAC,EAAE,EAAE;wBACjB,OAAO,CAAC,GAAG,CAAC,oBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;qBACvC;;;;;CACF"}

package/distribution/danger.d.ts

@@ -3,8 +3,7 @@
 //
 
 import { Octokit as GitHub } from "@octokit/rest"
-import { Gitlab, Types } from "@gitbeaker/node"
-import { Types as CoreTypes } from "@gitbeaker/core/dist"
+import type * as Types from "@gitbeaker/rest"
 import { File } from "parse-diff"
 
 type MarkdownString = string
@@ -833,6 +832,8 @@ interface TextDiff {
 interface StructuredDiff {
   /** Git diff chunks */
   chunks: File["chunks"]
+  /** The file path pre-change */
+  fromPath: string | undefined
 }
 
 /** The results of running a JSON patch */
@@ -1481,7 +1482,7 @@ interface GitLabJSONDSL {
   /** Info about the repo */
   metadata: RepoMetaData
   /** Info about the merge request */
-  mr: CoreTypes.ExpandedMergeRequestSchema
+  mr: Types.ExpandedMergeRequestSchema
   /** All the individual commits in the merge request */
   commits: Types.CommitSchema[]
   /** Merge Request-level MR approvals Configuration */
@@ -1496,7 +1497,7 @@ interface GitLabDSL extends GitLabJSONDSL {
     addLabels(...labels: string[]): Promise<boolean>
     removeLabels(...labels: string[]): Promise<boolean>
   }
-  api: InstanceType<typeof Gitlab>
+  api: InstanceType<typeof Types.Gitlab>
 }
 
 /** Key details about a repo */

package/distribution/danger.js.flow

@@ -1165,6 +1165,11 @@ declare interface StructuredDiff {
    * Git diff chunks
    */
   chunks: "NO PRINT IMPLEMENTED: IndexedAccessType";
+
+  /**
+   * The file path pre-change
+   */
+  fromPath: string | void;
 }
 /**
  * The results of running a JSON patch
@@ -1931,7 +1936,7 @@ declare interface GitLabJSONDSL {
   /**
    * Info about the merge request
    */
-  mr: CoreTypes.ExpandedMergeRequestSchema;
+  mr: Types.ExpandedMergeRequestSchema;
 
   /**
    * All the individual commits in the merge request
@@ -1952,7 +1957,7 @@ declare type GitLabDSL = {
     addLabels(...labels: string[]): Promise<boolean>,
     removeLabels(...labels: string[]): Promise<boolean>,
   },
-  api: InstanceType<typeof Gitlab>,
+  api: InstanceType<typeof undefined>,
 } & GitLabJSONDSL
 
 /**

package/distribution/dsl/GitDSL.d.ts

@@ -18,6 +18,8 @@ export interface TextDiff {
 export interface StructuredDiff {
     /** Git diff chunks */
     chunks: File["chunks"];
+    /** The file path pre-change */
+    fromPath: string | undefined;
 }
 /** The results of running a JSON patch */
 export interface JSONPatch {

package/distribution/dsl/GitLabDSL.d.ts

@@ -1,11 +1,10 @@
-import { Gitlab, Types } from "@gitbeaker/node";
+import type * as Types from "@gitbeaker/rest";
 import { RepoMetaData } from "./RepoMetaData";
-import { Types as CoreTypes } from "@gitbeaker/core/dist";
 export interface GitLabJSONDSL {
     /** Info about the repo */
     metadata: RepoMetaData;
     /** Info about the merge request */
-    mr: CoreTypes.ExpandedMergeRequestSchema;
+    mr: Types.ExpandedMergeRequestSchema;
     /** All the individual commits in the merge request */
     commits: Types.CommitSchema[];
     /** Merge Request-level MR approvals Configuration */
@@ -18,5 +17,5 @@ export interface GitLabDSL extends GitLabJSONDSL {
         addLabels(...labels: string[]): Promise<boolean>;
         removeLabels(...labels: string[]): Promise<boolean>;
     };
-    api: InstanceType<typeof Gitlab>;
+    api: InstanceType<typeof Types.Gitlab>;
 }

package/distribution/platforms/FakePlatform.js

@@ -77,7 +77,7 @@ var FakePlatform = /** @class */ (function () {
                             return [2 /*return*/, ({ before: "", after: "", diff: "", added: "", removed: "" })];
                         }); }); },
                         structuredDiffForFile: function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/, ({ chunks: [] })];
+                            return [2 /*return*/, ({ chunks: [], fromPath: undefined })];
                         }); }); },
                         JSONDiffForFile: function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                             return [2 /*return*/, ({})];

package/distribution/platforms/FakePlatform.js.map

@@ -1 +1 @@
-{"version":3,"file":"FakePlatform.js","sourceRoot":"","sources":["../../source/platforms/FakePlatform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FakePlatform.js","sourceRoot":"","sources":["../../source/platforms/FakePlatform.ts"],"names":[],"mappings":"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"}

package/distribution/platforms/GitLab.d.ts

@@ -2,7 +2,7 @@ import GitLabAPI from "./gitlab/GitLabAPI";
 import { Comment, Platform } from "./platform";
 import { GitDSL, GitJSONDSL } from "../dsl/GitDSL";
 import { GitLabDSL, GitLabJSONDSL } from "../dsl/GitLabDSL";
-import { Types } from "@gitbeaker/node";
+import type * as Types from "@gitbeaker/rest";
 declare class GitLab implements Platform {
     readonly api: GitLabAPI;
     readonly name: string;
@@ -14,21 +14,23 @@ declare class GitLab implements Platform {
     supportsCommenting(): boolean;
     supportsInlineComments(): boolean;
     updateOrCreateComment: (dangerID: string, newComment: string) => Promise<string>;
-    createComment: (_dangerID: string, comment: string) => Promise<Types.DiscussionNote | undefined>;
+    createComment: (_dangerID: string, comment: string) => Promise<Types.DiscussionNoteSchema | Types.MergeRequestNoteSchema | undefined>;
     createInlineComment: (git: GitDSL, comment: string, path: string, line: number) => Promise<Types.DiscussionSchema>;
-    updateInlineComment: (comment: string, id: string) => Promise<Types.DiscussionNote>;
+    updateInlineComment: (comment: string, id: string) => Promise<Types.MergeRequestNoteSchema>;
     deleteInlineComment: (id: string) => Promise<boolean>;
     /**
      * Attempts to delete the "main" Danger comment. If the "main" Danger
      * comment has any comments on it then that comment will not be deleted.
      */
     deleteMainComment: (dangerID: string) => Promise<boolean>;
-    deleteNotes: (notes: Types.DiscussionNote[]) => Promise<boolean>;
+    deleteDiscussions: (discussions: Types.DiscussionSchema[]) => Promise<boolean>;
+    deleteDiscussion: (discussion: Types.DiscussionSchema) => Promise<boolean>;
     /**
      * Only fetches the discussions where danger owns the top note
      */
     getDangerDiscussions: (dangerID: string) => Promise<Types.DiscussionSchema[]>;
-    reduceNotesFromDiscussions: (discussions: Types.DiscussionSchema[]) => Types.DiscussionNote[];
+    isDangerDiscussionSystemResolved: (discussion: Types.DiscussionSchema) => boolean;
+    getDiffNotesFromDiscussions: (discussions: Types.DiscussionSchema[]) => Types.DiscussionNoteSchema[];
     /**
      * Attempts to find the "main" Danger note and should return at most
      * one item. If the "main" Danger note has any comments on it then that
@@ -38,7 +40,7 @@ declare class GitLab implements Platform {
     /**
      * Filters a note to determine if it was created by Danger.
      */
-    getDangerDiscussionNoteFilter: (dangerID: string) => Promise<(note: Types.DiscussionNote) => boolean>;
+    getDangerDiscussionNoteFilter: (dangerID: string) => Promise<(note: Types.DiscussionNoteSchema) => boolean>;
     /**
      * Filters a note to the "main" Danger note. If that note has any
      * comments on it then it will not be found.

package/distribution/platforms/GitLab.js

@@ -46,17 +46,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gitlabJSONToGitLabDSL = void 0;
+var inlinePositionParser_1 = require("./gitlab/inlinePositionParser");
 var debug_1 = require("../debug");
 var githubIssueTemplate_1 = require("../runner/templates/githubIssueTemplate");
 var d = (0, debug_1.debug)("GitLab");
@@ -100,13 +92,13 @@ var GitLab = /** @class */ (function () {
         }); };
         // TODO: test
         this.getPlatformGitRepresentation = function () { return __awaiter(_this, void 0, void 0, function () {
-            var changes, commits, mappedCommits, modified_files, created_files, deleted_files;
+            var diffs, commits, mappedCommits, modified_files, created_files, deleted_files;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.api.getMergeRequestChanges()];
+                    case 0: return [4 /*yield*/, this.api.getMergeRequestDiffs()];
                     case 1:
-                        changes = _a.sent();
+                        diffs = _a.sent();
                         return [4 /*yield*/, this.api.getMergeRequestCommits()];
                     case 2:
                         commits = _a.sent();
@@ -116,12 +108,12 @@ var GitLab = /** @class */ (function () {
                                 author: {
                                     name: commit.author_name,
                                     email: commit.author_email,
-                                    date: commit.authored_date.toString(),
+                                    date: commit.authored_date,
                                 },
                                 committer: {
                                     name: commit.committer_name,
                                     email: commit.committer_email,
-                                    date: commit.committed_date.toString(),
+                                    date: commit.committed_date,
                                 },
                                 message: commit.message,
                                 parents: commit.parent_ids,
@@ -129,11 +121,11 @@ var GitLab = /** @class */ (function () {
                                 tree: null,
                             };
                         });
-                        modified_files = changes
-                            .filter(function (change) { return !change.new_file && !change.deleted_file; })
-                            .map(function (change) { return change.new_path; });
-                        created_files = changes.filter(function (change) { return change.new_file; }).map(function (change) { return change.new_path; });
-                        deleted_files = changes.filter(function (change) { return change.deleted_file; }).map(function (change) { return change.new_path; });
+                        modified_files = diffs
+                            .filter(function (diff) { return !diff.new_file && !diff.deleted_file; })
+                            .map(function (diff) { return diff.new_path; });
+                        created_files = diffs.filter(function (diff) { return diff.new_file; }).map(function (diff) { return diff.new_path; });
+                        deleted_files = diffs.filter(function (diff) { return diff.deleted_file; }).map(function (diff) { return diff.new_path; });
                         return [2 /*return*/, {
                                 modified_files: modified_files,
                                 created_files: created_files,
@@ -144,53 +136,67 @@ var GitLab = /** @class */ (function () {
             });
         }); };
         this.getInlineComments = function (dangerID) { return __awaiter(_this, void 0, void 0, function () {
-            var dangerUserID;
+            var dangerUserID, dangerDiscussions, diffNotes;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.api.getUser()];
+                    case 0:
+                        d("getInlineComments", { dangerID: dangerID });
+                        return [4 /*yield*/, this.api.getUser()];
                     case 1:
                         dangerUserID = (_a.sent()).id;
-                        return [4 /*yield*/, this.api.getMergeRequestInlineNotes()];
-                    case 2: return [2 /*return*/, (_a.sent()).map(function (note) {
-                            return {
-                                id: "".concat(note.id),
-                                body: note.body,
-                                ownedByDanger: note.author.id === dangerUserID && note.body.includes(dangerID),
-                            };
-                        })];
+                        return [4 /*yield*/, this.getDangerDiscussions(dangerID)
+                            // Remove system resolved danger discussions to not end up deleting danger inline comments
+                            // on old versions of the diff. This is preferred as otherwise the discussion ends up in a state where
+                            // the auto resolve system note can become the first note on the discussion resulting in poor change history on the MR.
+                        ];
+                    case 2:
+                        dangerDiscussions = _a.sent();
+                        // Remove system resolved danger discussions to not end up deleting danger inline comments
+                        // on old versions of the diff. This is preferred as otherwise the discussion ends up in a state where
+                        // the auto resolve system note can become the first note on the discussion resulting in poor change history on the MR.
+                        dangerDiscussions = dangerDiscussions.filter(function (discussion) { return !_this.isDangerDiscussionSystemResolved(discussion); });
+                        d("getInlineComments found danger discussions", dangerDiscussions);
+                        diffNotes = this.getDiffNotesFromDiscussions(dangerDiscussions);
+                        return [2 /*return*/, diffNotes.map(function (note) {
+                                return {
+                                    id: "".concat(note.id),
+                                    body: note.body,
+                                    ownedByDanger: note.author.id === dangerUserID && note.body.includes(dangerID),
+                                };
+                            })];
                 }
             });
         }); };
         this.updateOrCreateComment = function (dangerID, newComment) { return __awaiter(_this, void 0, void 0, function () {
             var discussions, firstDiscussion, existingNote, newOrUpdatedNote, notes, note, _i, notes_1, deleteme;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         d("updateOrCreateComment", { dangerID: dangerID, newComment: newComment });
                         if (!useThreads()) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.getDangerDiscussions(dangerID)];
                     case 1:
-                        discussions = _b.sent();
+                        discussions = _d.sent();
+                        d("updateOrCreateComment using threads, discussions", discussions);
                         firstDiscussion = discussions.shift();
                         existingNote = (_a = firstDiscussion === null || firstDiscussion === void 0 ? void 0 : firstDiscussion.notes) === null || _a === void 0 ? void 0 : _a[0];
-                        // Delete all notes from all other danger discussions (discussions cannot be deleted as a whole):
-                        return [4 /*yield*/, this.deleteNotes(this.reduceNotesFromDiscussions(discussions))]; //delete the rest
+                        return [4 /*yield*/, this.deleteDiscussions(discussions)];
                     case 2:
-                        // Delete all notes from all other danger discussions (discussions cannot be deleted as a whole):
-                        _b.sent(); //delete the rest
+                        _d.sent();
                         newOrUpdatedNote = void 0;
                         if (!existingNote) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.api.updateMergeRequestNote(existingNote.id, newComment)];
                     case 3:
                         // update the existing comment
-                        newOrUpdatedNote = _b.sent();
+                        newOrUpdatedNote = _d.sent();
                         return [3 /*break*/, 6];
-                    case 4: return [4 /*yield*/, this.createComment(dangerID, newComment)];
+                    case 4: return [4 /*yield*/, this.api.createMergeRequestDiscussion(newComment)];
                     case 5:
                         // create a new comment
-                        newOrUpdatedNote = _b.sent();
-                        _b.label = 6;
+                        newOrUpdatedNote = (_c = (_b = (_d.sent())) === null || _b === void 0 ? void 0 : _b.notes) === null || _c === void 0 ? void 0 : _c[0];
+                        _d.label = 6;
                     case 6:
                         if (!newOrUpdatedNote) {
                             throw new Error("Could not update or create comment");
@@ -200,7 +206,8 @@ var GitLab = /** @class */ (function () {
                         return [2 /*return*/, "".concat(this.api.mergeRequestURL, "#note_").concat(newOrUpdatedNote.id)];
                     case 7: return [4 /*yield*/, this.getMainDangerNotes(dangerID)];
                     case 8:
-                        notes = _b.sent();
+                        notes = _d.sent();
+                        d("updateOrCreateComment not using threads, main danger notes", notes);
                         note = void 0;
                         if (!notes.length) return [3 /*break*/, 14];
                         return [4 /*yield*/, this.api.updateMergeRequestNote(notes[0].id, newComment)
@@ -208,9 +215,9 @@ var GitLab = /** @class */ (function () {
                         ];
                     case 9:
                         // update the first
-                        note = _b.sent();
+                        note = _d.sent();
                         _i = 0, notes_1 = notes;
-                        _b.label = 10;
+                        _d.label = 10;
                     case 10:
                         if (!(_i < notes_1.length)) return [3 /*break*/, 13];
                         deleteme = notes_1[_i];
@@ -219,8 +226,8 @@ var GitLab = /** @class */ (function () {
                         }
                         return [4 /*yield*/, this.api.deleteMergeRequestNote(deleteme.id)];
                     case 11:
-                        _b.sent();
-                        _b.label = 12;
+                        _d.sent();
+                        _d.label = 12;
                     case 12:
                         _i++;
                         return [3 /*break*/, 10];
@@ -228,8 +235,8 @@ var GitLab = /** @class */ (function () {
                     case 14: return [4 /*yield*/, this.api.createMergeRequestNote(newComment)];
                     case 15:
                         // create a new note
-                        note = _b.sent();
-                        _b.label = 16;
+                        note = _d.sent();
+                        _d.label = 16;
                     case 16: 
                     // create URL from note
                     // "https://gitlab.com/group/project/merge_requests/154#note_132143425"
@@ -251,25 +258,35 @@ var GitLab = /** @class */ (function () {
             });
         }); };
         this.createInlineComment = function (git, comment, path, line) { return __awaiter(_this, void 0, void 0, function () {
-            var mr;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var structuredDiffForFile, inlinePosition, mr, position;
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         d("createInlineComment", { git: git, comment: comment, path: path, line: line });
-                        return [4 /*yield*/, this.api.getMergeRequestInfo()];
+                        return [4 /*yield*/, git.structuredDiffForFile(path)];
                     case 1:
-                        mr = _a.sent();
+                        structuredDiffForFile = _c.sent();
+                        if (!structuredDiffForFile) {
+                            return [2 /*return*/, Promise.reject("Unable to find diff for file ".concat(path))];
+                        }
+                        inlinePosition = (0, inlinePositionParser_1.inlinePositionParser)(structuredDiffForFile, path, line);
+                        d("createInlineComment inlinePosition", inlinePosition);
+                        return [4 /*yield*/, this.api.getMergeRequestInfo()];
+                    case 2:
+                        mr = _c.sent();
+                        position = {
+                            positionType: "text",
+                            baseSha: mr.diff_refs.base_sha,
+                            startSha: mr.diff_refs.start_sha,
+                            headSha: mr.diff_refs.head_sha,
+                            oldPath: inlinePosition.pathDiff.oldPath,
+                            newPath: inlinePosition.pathDiff.newPath,
+                            oldLine: (_a = inlinePosition.lineDiff.oldLine) === null || _a === void 0 ? void 0 : _a.toString(),
+                            newLine: (_b = inlinePosition.lineDiff.newLine) === null || _b === void 0 ? void 0 : _b.toString(),
+                        };
                         return [2 /*return*/, this.api.createMergeRequestDiscussion(comment, {
-                                position: {
-                                    position_type: "text",
-                                    base_sha: mr.diff_refs.base_sha,
-                                    start_sha: mr.diff_refs.start_sha,
-                                    head_sha: mr.diff_refs.head_sha,
-                                    old_path: path,
-                                    old_line: undefined,
-                                    new_path: path,
-                                    new_line: line,
-                                },
+                                position: position,
                             })];
                 }
             });
@@ -315,7 +332,7 @@ var GitLab = /** @class */ (function () {
                         return [4 /*yield*/, this.getDangerDiscussions(dangerID)];
                     case 1:
                         discussions = _a.sent();
-                        return [4 /*yield*/, this.deleteNotes(this.reduceNotesFromDiscussions(discussions))];
+                        return [4 /*yield*/, this.deleteDiscussions(discussions)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3: return [4 /*yield*/, this.getMainDangerNotes(dangerID)];
                     case 4:
@@ -337,25 +354,49 @@ var GitLab = /** @class */ (function () {
                 }
             });
         }); };
-        this.deleteNotes = function (notes) { return __awaiter(_this, void 0, void 0, function () {
-            var _i, notes_3, note;
+        this.deleteDiscussions = function (discussions) { return __awaiter(_this, void 0, void 0, function () {
+            var _i, discussions_1, discussion;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _i = 0, notes_3 = notes;
+                        d("deleteDiscussions", { length: discussions.length });
+                        _i = 0, discussions_1 = discussions;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < notes_3.length)) return [3 /*break*/, 4];
-                        note = notes_3[_i];
-                        d("deleteNotes", { id: note.id });
-                        return [4 /*yield*/, this.api.deleteMergeRequestNote(note.id)];
+                        if (!(_i < discussions_1.length)) return [3 /*break*/, 4];
+                        discussion = discussions_1[_i];
+                        return [4 /*yield*/, this.deleteDiscussion(discussion)];
                     case 2:
                         _a.sent();
                         _a.label = 3;
                     case 3:
                         _i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, notes.length > 0];
+                    case 4: return [2 /*return*/, discussions.length > 0];
+                }
+            });
+        }); };
+        this.deleteDiscussion = function (discussion) { return __awaiter(_this, void 0, void 0, function () {
+            var discussionNotes, _i, discussionNotes_1, discussionNote;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        d("deleteDiscussion", { discussionId: discussion.id });
+                        discussionNotes = (_a = discussion.notes) !== null && _a !== void 0 ? _a : [];
+                        _i = 0, discussionNotes_1 = discussionNotes;
+                        _b.label = 1;
+                    case 1:
+                        if (!(_i < discussionNotes_1.length)) return [3 /*break*/, 4];
+                        discussionNote = discussionNotes_1[_i];
+                        return [4 /*yield*/, this.api.deleteMergeRequestNote(discussionNote.id)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/, discussionNotes.length > 0];
                 }
             });
         }); };
@@ -379,12 +420,30 @@ var GitLab = /** @class */ (function () {
                 }
             });
         }); };
-        this.reduceNotesFromDiscussions = function (discussions) {
-            return discussions.reduce(function (acc, _a) {
-                var notes = _a.notes;
-                notes = notes || [];
-                return __spreadArray(__spreadArray([], acc, true), notes, true);
-            }, []);
+        this.isDangerDiscussionSystemResolved = function (discussion) {
+            var notes = discussion.notes;
+            if (!notes) {
+                return false;
+            }
+            var dangerNote = notes[0];
+            if (!dangerNote || !dangerNote.resolved) {
+                return false;
+            }
+            // Check for a system note that resolved it
+            return notes.some(function (note) {
+                return note.system === true;
+            });
+        };
+        this.getDiffNotesFromDiscussions = function (discussions) {
+            var diffNotes = discussions.map(function (discussion) {
+                var _a;
+                var note = (_a = discussion.notes) === null || _a === void 0 ? void 0 : _a[0];
+                if (!note || note.type != "DiffNote") {
+                    return undefined;
+                }
+                return note;
+            });
+            return diffNotes.filter(Boolean);
         };
         /**
          * Attempts to find the "main" Danger note and should return at most