danger 11.2.7 → 11.3.0

package/CHANGELOG.md

@@ -17,6 +17,14 @@
 <!-- Your comment below this -->
 <!-- Your comment above this -->
 
+## 11.3.0
+
+- GitLab: Upgrade `@gitbeaker/node` from `^21.3.0` to `^35.8.1` [@buffcode]
+
+## 11.2.8
+
+- Another fix for Gitlab inline comments #1395 [@glensc]
+
 ## 11.2.7
 
 - Fix issue where GitLab inline comments would not show on merge requests #1351 - [@davidbrunow]
@@ -1959,6 +1967,7 @@ Not usable for others, only stubs of classes etc. - [@orta]
 [@azz]: https://github.com/azz
 [@bdotdub]: https://github.com/bdotdub
 [@bigkraig]: https://github.com/bigkraig
+[@buffcode]: https://github.com/buffcode
 [@caffodian]: https://github.com/caffodian
 [@codestergit]: https://github.com/codestergit
 [@cwright017]: https://github.com/Cwright017

package/distribution/commands/utils/reporting.js

@@ -10,7 +10,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeResults = exports.resultsWithFailure = exports.markdownCode = void 0;
-var markdownCode = function (string) { return "\n```sh\n".concat(string, "\n```\n"); };
+var markdownCode = function (string) { return "\n```\n".concat(string, "\n```\n"); };
 exports.markdownCode = markdownCode;
 var resultsWithFailure = function (failure, moreMarkdown) {
     var fail = { message: failure };

package/distribution/commands/utils/reporting.js.map

@@ -1 +1 @@
-{"version":3,"file":"reporting.js","sourceRoot":"","sources":["../../../source/commands/utils/reporting.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEO,IAAM,YAAY,GAAG,UAAC,MAAc,IAAa,OAAA,mBAEtD,MAAM,YAEP,EAJuD,CAIvD,CAAA;AAJY,QAAA,YAAY,gBAIxB;AACM,IAAM,kBAAkB,GAAG,UAAC,OAAe,EAAE,YAAqB;IACvE,IAAM,IAAI,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;IACjC,OAAO;QACL,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,CAAC,IAAI,CAAC;QACb,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;KAC3D,CAAA;AACH,CAAC,CAAA;AARY,QAAA,kBAAkB,sBAQ9B;AAEM,IAAM,YAAY,GAAG,UAAC,IAAmB,EAAE,KAAoB;IACpE,OAAO;QACL,QAAQ,kCAAM,IAAI,CAAC,QAAQ,SAAK,KAAK,CAAC,QAAQ,OAAC;QAC/C,QAAQ,kCAAM,IAAI,CAAC,QAAQ,SAAK,KAAK,CAAC,QAAQ,OAAC;QAC/C,KAAK,kCAAM,IAAI,CAAC,KAAK,SAAK,KAAK,CAAC,KAAK,OAAC;QACtC,SAAS,kCAAM,IAAI,CAAC,SAAS,SAAK,KAAK,CAAC,SAAS,OAAC;KACnD,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB"}
+{"version":3,"file":"reporting.js","sourceRoot":"","sources":["../../../source/commands/utils/reporting.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEO,IAAM,YAAY,GAAG,UAAC,MAAc,IAAa,OAAA,iBAEtD,MAAM,YAEP,EAJuD,CAIvD,CAAA;AAJY,QAAA,YAAY,gBAIxB;AACM,IAAM,kBAAkB,GAAG,UAAC,OAAe,EAAE,YAAqB;IACvE,IAAM,IAAI,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;IACjC,OAAO;QACL,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,CAAC,IAAI,CAAC;QACb,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;KAC3D,CAAA;AACH,CAAC,CAAA;AARY,QAAA,kBAAkB,sBAQ9B;AAEM,IAAM,YAAY,GAAG,UAAC,IAAmB,EAAE,KAAoB;IACpE,OAAO;QACL,QAAQ,kCAAM,IAAI,CAAC,QAAQ,SAAK,KAAK,CAAC,QAAQ,OAAC;QAC/C,QAAQ,kCAAM,IAAI,CAAC,QAAQ,SAAK,KAAK,CAAC,QAAQ,OAAC;QAC/C,KAAK,kCAAM,IAAI,CAAC,KAAK,SAAK,KAAK,CAAC,KAAK,OAAC;QACtC,SAAS,kCAAM,IAAI,CAAC,SAAS,SAAK,KAAK,CAAC,SAAS,OAAC;KACnD,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB"}

package/distribution/commands/utils/runDangerSubprocess.js

@@ -151,7 +151,7 @@ var runDangerSubprocess = function (subprocessName, dslJSON, exec, config) {
         }
     });
     child.on("close", function (code) { return __awaiter(void 0, void 0, void 0, function () {
-        var failResults, danger;
+        var moreMarkdown, failResults, danger;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -160,7 +160,8 @@ var runDangerSubprocess = function (subprocessName, dslJSON, exec, config) {
                     if (code) {
                         d("Handling fail from subprocess");
                         process.exitCode = code;
-                        failResults = (0, reporting_1.resultsWithFailure)("`".concat(processDisplayName, "` failed."), "### Log\n\n" + (0, reporting_1.markdownCode)(allLogs));
+                        moreMarkdown = "### Log\n\n<details>\n\n" + (0, reporting_1.markdownCode)(allLogs) + "\n\n</details>\n";
+                        failResults = (0, reporting_1.resultsWithFailure)("`".concat(processDisplayName, "` failed."), moreMarkdown);
                         if (results) {
                             results = (0, reporting_1.mergeResults)(results, failResults);
                         }

package/distribution/commands/utils/runDangerSubprocess.js.map

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

package/distribution/danger.d.ts

@@ -3,7 +3,8 @@
 //
 
 import { Octokit as GitHub } from "@octokit/rest"
-import { Gitlab } from "@gitbeaker/node"
+import { Gitlab, Types } from "@gitbeaker/node"
+import { Types as CoreTypes } from "@gitbeaker/core/dist"
 import { File } from "parse-diff"
 
 type MarkdownString = string
@@ -1475,11 +1476,11 @@ interface GitLabJSONDSL {
   /** Info about the repo */
   metadata: RepoMetaData
   /** Info about the merge request */
-  mr: GitLabMR
-  /** All of the individual commits in the merge request */
-  commits: GitLabMRCommit[]
+  mr: CoreTypes.ExpandedMergeRequestSchema
+  /** All the individual commits in the merge request */
+  commits: Types.CommitSchema[]
   /** Merge Request-level MR approvals Configuration */
-  approvals: GitLabApproval
+  approvals: Types.MergeRequestLevelMergeRequestApprovalSchema
 }
 
 // danger.gitlab
@@ -1493,274 +1494,6 @@ interface GitLabDSL extends GitLabJSONDSL {
   api: InstanceType<typeof Gitlab>
 }
 
-// ---
-// JSON responses from API
-
-interface GitLabUser {
-  id: number
-  name: string
-  username: string
-  state: "active" | "blocked"
-  avatar_url: string | null
-  web_url: string
-}
-
-interface GitLabUserProfile extends GitLabUser {
-  created_at: string
-  bio: string | null
-  location: string | null
-  public_email: string
-  skype: string
-  linkedin: string
-  twitter: string
-  website_url: string
-  organization: string
-  last_sign_in_at: string
-  confirmed_at: string
-  theme_id: number
-  last_activity_on: string
-  color_scheme_id: number
-  projects_limit: number
-  current_sign_in_at: string
-  identities: [{ provider: string; extern_uid: string }]
-  can_create_group: boolean
-  can_create_project: boolean
-  two_factor_enabled: boolean
-  external: boolean
-  private_profile: boolean
-}
-
-interface GitLabMRBase {
-  /** The MR's id */
-  id: number
-
-  /** The unique ID for this MR */
-  iid: number
-
-  /** The project ID for this MR */
-  project_id: number
-
-  /** The given name of the MR */
-  title: string
-
-  /** The body text describing the MR */
-  description: string
-
-  /** The MR's current availability */
-  state: "closed" | "open" | "locked" | "merged"
-
-  /** When was the MR made */
-  created_at: string
-
-  /** When was the MR updated */
-  updated_at: string
-
-  /** What branch is this MR being merged into */
-  target_branch: string
-  /** What branch is this MR come from */
-  source_branch: string
-
-  /** How many folks have given it an upvote */
-  upvotes: number
-  /** How many folks have given it an downvote */
-  downvotes: number
-
-  /** Who made it */
-  author: GitLabUser
-  /** Access rights for the user who created the MR */
-  user: {
-    /** Does the author have access to merge? */
-    can_merge: boolean
-  }
-  /** Who was assigned as the person to review */
-  assignee?: GitLabUser
-  assignees: GitLabUser[]
-  /** Users who were added as reviewers to the MR */
-  reviewers: GitLabUser[]
-  source_project_id: number
-  target_project_id: number
-  labels: string[]
-  work_in_progress: boolean
-  milestone: {
-    id: number
-    iid: number
-    project_id: number
-    title: string
-    description: string
-    state: "closed" | "active"
-    created_at: string
-    updated_at: string
-    due_date: string
-    start_date: string
-    web_url: string
-  }
-  merge_when_pipeline_succeeds: boolean
-  merge_status: "can_be_merged" // XXX: other statuses?
-  merge_error: null | null
-  sha: string
-  merge_commit_sha: string | null
-  user_notes_count: number
-  discussion_locked: null | null
-  should_remove_source_branch: boolean
-  force_remove_source_branch: boolean
-  allow_collaboration: boolean
-  allow_maintainer_to_push: boolean
-  web_url: string
-  time_stats: {
-    time_estimate: number
-    total_time_spent: number
-    human_time_estimate: number | null
-    human_total_time_spent: number | null
-  }
-}
-
-/** TODO: These need more comments from someone who uses GitLab, see GitLabDSL.ts in the danger-js repo */
-interface GitLabMR extends GitLabMRBase {
-  squash: boolean
-  subscribed: boolean
-  changes_count: string
-  merged_by: GitLabUser
-  merged_at: string
-  closed_by: GitLabUser | null
-  closed_at: string | null
-  latest_build_started_at: string
-  latest_build_finished_at: string
-  first_deployed_to_production_at: string | null
-  pipeline: {
-    id: number
-    sha: string
-    ref: string
-    status: "canceled" | "failed" | "pending" | "running" | "skipped" | "success"
-    web_url: string
-  }
-  diff_refs: {
-    base_sha: string
-    head_sha: string
-    start_sha: string
-  }
-  diverged_commits_count: number
-  rebase_in_progress: boolean
-  approvals_before_merge: null | null
-}
-
-interface GitLabMRChange {
-  old_path: string
-  new_path: string
-  a_mode: string
-  b_mode: string
-  diff: string
-  new_file: boolean
-  renamed_file: boolean
-  deleted_file: boolean
-}
-
-interface GitLabMRChanges extends GitLabMRBase {
-  changes: GitLabMRChange[]
-}
-
-interface GitLabNote {
-  id: number
-  type: "DiffNote" | "DiscussionNote" | null // XXX: other types? null means "normal comment"
-  body: string
-  attachment: null // XXX: what can an attachment be?
-  author: GitLabUser
-  created_at: string
-  updated_at: string
-  system: boolean
-  noteable_id: number
-  noteable_type: "MergeRequest" // XXX: other types...?
-  resolvable: boolean
-  noteable_iid: number
-}
-
-interface GitLabDiscussion {
-  id: string //40 character hex
-  individual_note: boolean
-  notes: GitLabNote[]
-}
-
-interface GitLabDiscussionTextPosition {
-  position_type: "text"
-  base_sha: string
-  start_sha: string
-  head_sha: string
-  new_path: string
-  new_line: number
-  old_path: string
-  old_line: number | null
-}
-
-interface GitLabDiscussionCreationOptions {
-  position?: GitLabDiscussionTextPosition
-}
-
-interface GitLabInlineNote extends GitLabNote {
-  position: {
-    base_sha: string
-    start_sha: string
-    head_sha: string
-    old_path: string
-    new_path: string
-    position_type: "text" // XXX: other types?
-    old_line: number | null
-    new_line: number
-  }
-  resolvable: boolean
-  resolved: boolean
-  resolved_by: GitLabUser | null
-}
-
-interface GitLabMRCommit {
-  id: string
-  short_id: string
-  created_at: string
-  parent_ids: string[]
-  title: string
-  message: string
-  author_name: string
-  author_email: string
-  authored_date: string
-  committer_name: string
-  committer_email: string
-  committed_date: string
-}
-
-interface GitLabCommit {
-  id: string
-  short_id: string
-  title: string
-  author_name: string
-  author_email: string
-  created_at: string
-}
-
-interface GitLabRepositoryCompare {
-  commit: GitLabCommit
-  commits: GitLabCommit[]
-  diffs: GitLabMRChange[]
-  compare_timeout: boolean
-  compare_same_ref: boolean
-}
-
-interface GitLabApproval {
-  id: number
-  iid: number
-  project_id: number
-  title: string
-  description: string
-  state: "closed" | "open" | "locked" | "merged"
-  created_at: string
-  updated_at: string
-  merge_status: "can_be_merged"
-  approvals_required: number
-  approvals_left: number
-  approved_by?:
-    | {
-        user: GitLabUser
-      }[]
-    | GitLabUser[]
-}
-
 /** Key details about a repo */
 interface RepoMetaData {
   /** A path like "artsy/eigen" */

package/distribution/danger.js.flow

@@ -1925,17 +1925,17 @@ declare interface GitLabJSONDSL {
   /**
    * Info about the merge request
    */
-  mr: GitLabMR;
+  mr: CoreTypes.ExpandedMergeRequestSchema;
 
   /**
-   * All of the individual commits in the merge request
+   * All the individual commits in the merge request
    */
-  commits: GitLabMRCommit[];
+  commits: Types.CommitSchema[];
 
   /**
    * Merge Request-level MR approvals Configuration
    */
-  approvals: GitLabApproval;
+  approvals: Types.MergeRequestLevelMergeRequestApprovalSchema;
 }
 /**
  * The GitLab metadata for your MR
@@ -1948,302 +1948,7 @@ declare type GitLabDSL = {
   },
   api: InstanceType<typeof Gitlab>,
 } & GitLabJSONDSL
-declare interface GitLabUser {
-  id: number;
-  name: string;
-  username: string;
-  state: "active" | "blocked";
-  avatar_url: string | null;
-  web_url: string;
-}
-declare type GitLabUserProfile = {
-  created_at: string,
-  bio: string | null,
-  location: string | null,
-  public_email: string,
-  skype: string,
-  linkedin: string,
-  twitter: string,
-  website_url: string,
-  organization: string,
-  last_sign_in_at: string,
-  confirmed_at: string,
-  theme_id: number,
-  last_activity_on: string,
-  color_scheme_id: number,
-  projects_limit: number,
-  current_sign_in_at: string,
-  identities: [
-    {
-      provider: string,
-      extern_uid: string,
-    }
-  ],
-  can_create_group: boolean,
-  can_create_project: boolean,
-  two_factor_enabled: boolean,
-  external: boolean,
-  private_profile: boolean,
-} & GitLabUser
-declare interface GitLabMRBase {
-  /**
-   * The MR's id
-   */
-  id: number;
-
-  /**
-   * The unique ID for this MR
-   */
-  iid: number;
-
-  /**
-   * The project ID for this MR
-   */
-  project_id: number;
-
-  /**
-   * The given name of the MR
-   */
-  title: string;
-
-  /**
-   * The body text describing the MR
-   */
-  description: string;
-
-  /**
-   * The MR's current availability
-   */
-  state: "closed" | "open" | "locked" | "merged";
-
-  /**
-   * When was the MR made
-   */
-  created_at: string;
-
-  /**
-   * When was the MR updated
-   */
-  updated_at: string;
-
-  /**
-   * What branch is this MR being merged into
-   */
-  target_branch: string;
-
-  /**
-   * What branch is this MR come from
-   */
-  source_branch: string;
-
-  /**
-   * How many folks have given it an upvote
-   */
-  upvotes: number;
-
-  /**
-   * How many folks have given it an downvote
-   */
-  downvotes: number;
-
-  /**
-   * Who made it
-   */
-  author: GitLabUser;
 
-  /**
-   * Access rights for the user who created the MR
-   */
-  user: {
-    /**
-     * Does the author have access to merge?
-     */
-    can_merge: boolean,
-  };
-
-  /**
-   * Who was assigned as the person to review
-   */
-  assignee?: GitLabUser;
-  assignees: GitLabUser[];
-
-  /**
-   * Users who were added as reviewers to the MR
-   */
-  reviewers: GitLabUser[];
-  source_project_id: number;
-  target_project_id: number;
-  labels: string[];
-  work_in_progress: boolean;
-  milestone: {
-    id: number,
-    iid: number,
-    project_id: number,
-    title: string,
-    description: string,
-    state: "closed" | "active",
-    created_at: string,
-    updated_at: string,
-    due_date: string,
-    start_date: string,
-    web_url: string,
-  };
-  merge_when_pipeline_succeeds: boolean;
-  merge_status: "can_be_merged";
-  merge_error: null | null;
-  sha: string;
-  merge_commit_sha: string | null;
-  user_notes_count: number;
-  discussion_locked: null | null;
-  should_remove_source_branch: boolean;
-  force_remove_source_branch: boolean;
-  allow_collaboration: boolean;
-  allow_maintainer_to_push: boolean;
-  web_url: string;
-  time_stats: {
-    time_estimate: number,
-    total_time_spent: number,
-    human_time_estimate: number | null,
-    human_total_time_spent: number | null,
-  };
-}
-/**
- * TODO: These need more comments from someone who uses GitLab, see GitLabDSL.ts in the danger-js repo
- */
-declare type GitLabMR = {
-  squash: boolean,
-  subscribed: boolean,
-  changes_count: string,
-  merged_by: GitLabUser,
-  merged_at: string,
-  closed_by: GitLabUser | null,
-  closed_at: string | null,
-  latest_build_started_at: string,
-  latest_build_finished_at: string,
-  first_deployed_to_production_at: string | null,
-  pipeline: {
-    id: number,
-    sha: string,
-    ref: string,
-    status: "canceled" | "failed" | "pending" | "running" | "skipped" | "success",
-    web_url: string,
-  },
-  diff_refs: {
-    base_sha: string,
-    head_sha: string,
-    start_sha: string,
-  },
-  diverged_commits_count: number,
-  rebase_in_progress: boolean,
-  approvals_before_merge: null | null,
-} & GitLabMRBase
-declare interface GitLabMRChange {
-  old_path: string;
-  new_path: string;
-  a_mode: string;
-  b_mode: string;
-  diff: string;
-  new_file: boolean;
-  renamed_file: boolean;
-  deleted_file: boolean;
-}
-declare type GitLabMRChanges = {
-  changes: GitLabMRChange[],
-} & GitLabMRBase
-declare interface GitLabNote {
-  id: number;
-  type: "DiffNote" | "DiscussionNote" | null;
-  body: string;
-  attachment: null;
-  author: GitLabUser;
-  created_at: string;
-  updated_at: string;
-  system: boolean;
-  noteable_id: number;
-  noteable_type: "MergeRequest";
-  resolvable: boolean;
-  noteable_iid: number;
-}
-declare interface GitLabDiscussion {
-  id: string;
-  individual_note: boolean;
-  notes: GitLabNote[];
-}
-declare interface GitLabDiscussionTextPosition {
-  position_type: "text";
-  base_sha: string;
-  start_sha: string;
-  head_sha: string;
-  new_path: string;
-  new_line: number;
-  old_path: string;
-  old_line: number | null;
-}
-declare interface GitLabDiscussionCreationOptions {
-  position?: GitLabDiscussionTextPosition;
-}
-declare type GitLabInlineNote = {
-  position: {
-    base_sha: string,
-    start_sha: string,
-    head_sha: string,
-    old_path: string,
-    new_path: string,
-    position_type: "text",
-    old_line: number | null,
-    new_line: number,
-  },
-  resolvable: boolean,
-  resolved: boolean,
-  resolved_by: GitLabUser | null,
-} & GitLabNote
-declare interface GitLabMRCommit {
-  id: string;
-  short_id: string;
-  created_at: string;
-  parent_ids: string[];
-  title: string;
-  message: string;
-  author_name: string;
-  author_email: string;
-  authored_date: string;
-  committer_name: string;
-  committer_email: string;
-  committed_date: string;
-}
-declare interface GitLabCommit {
-  id: string;
-  short_id: string;
-  title: string;
-  author_name: string;
-  author_email: string;
-  created_at: string;
-}
-declare interface GitLabRepositoryCompare {
-  commit: GitLabCommit;
-  commits: GitLabCommit[];
-  diffs: GitLabMRChange[];
-  compare_timeout: boolean;
-  compare_same_ref: boolean;
-}
-declare interface GitLabApproval {
-  id: number;
-  iid: number;
-  project_id: number;
-  title: string;
-  description: string;
-  state: "closed" | "open" | "locked" | "merged";
-  created_at: string;
-  updated_at: string;
-  merge_status: "can_be_merged";
-  approvals_required: number;
-  approvals_left: number;
-  approved_by?:
-    | {
-        user: GitLabUser,
-      }[]
-    | GitLabUser[];
-}
 /**
  * Key details about a repo
  */