@atlaspack/diagnostic 2.14.2-typescript-d6e6d169c.0 → 2.14.2-typescript-6de04fbae.0

package/lib/{index.d.ts → index.d.mts}

@@ -38,7 +38,7 @@ export type DiagnosticCodeFrame = {
     codeHighlights: Array<DiagnosticCodeHighlight>;
 };
 /** A JSON object (as in "map") */
-export type JSONObject = {
+type JSONObject = {
     [key: string]: any;
 };
 /**
@@ -160,3 +160,4 @@ export interface MdFunction {
     strikethrough: (s: TemplateInput) => TemplateInput;
 }
 export declare const md: MdFunction;
+export {};

package/lib/index.js

@@ -1,325 +1,310 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', {
-  value: true,
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
 });
 function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name],
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
     });
 }
 _export(exports, {
-  anyToDiagnostic: function () {
-    return anyToDiagnostic;
-  },
-  convertSourceLocationToHighlight: function () {
-    return convertSourceLocationToHighlight;
-  },
-  /**
-   * An error wrapper around a diagnostic that can be <code>throw</code>n (e.g. to signal a
-   * build error).
-   */ default: function () {
-    return ThrowableDiagnostic;
-  },
-  encodeJSONKeyComponent: function () {
-    return encodeJSONKeyComponent;
-  },
-  errorToDiagnostic: function () {
-    return errorToDiagnostic;
-  },
-  escapeMarkdown: function () {
-    return escapeMarkdown;
-  },
-  generateJSONCodeHighlights: function () {
-    return generateJSONCodeHighlights;
-  },
-  getJSONHighlightLocation: function () {
-    return getJSONHighlightLocation;
-  },
-  getJSONSourceLocation: function () {
-    return getJSONSourceLocation;
-  },
-  md: function () {
-    return md;
-  },
+    anyToDiagnostic: function() {
+        return anyToDiagnostic;
+    },
+    convertSourceLocationToHighlight: function() {
+        return convertSourceLocationToHighlight;
+    },
+    /**
+ * An error wrapper around a diagnostic that can be <code>throw</code>n (e.g. to signal a
+ * build error).
+ */ default: function() {
+        return ThrowableDiagnostic;
+    },
+    encodeJSONKeyComponent: function() {
+        return encodeJSONKeyComponent;
+    },
+    errorToDiagnostic: function() {
+        return errorToDiagnostic;
+    },
+    escapeMarkdown: function() {
+        return escapeMarkdown;
+    },
+    generateJSONCodeHighlights: function() {
+        return generateJSONCodeHighlights;
+    },
+    getJSONHighlightLocation: function() {
+        return getJSONHighlightLocation;
+    },
+    getJSONSourceLocation: function() {
+        return getJSONSourceLocation;
+    },
+    md: function() {
+        return md;
+    }
 });
-const _nodeassert = /*#__PURE__*/ _interop_require_default(
-  require('node:assert'),
-);
-const _nullthrows = /*#__PURE__*/ _interop_require_default(
-  require('nullthrows'),
-);
-const _jsonsourcemap = /*#__PURE__*/ _interop_require_wildcard(
-  require('@mischnic/json-sourcemap'),
-);
+const _nodeassert = /*#__PURE__*/ _interop_require_default(require("node:assert"));
+const _nullthrows = /*#__PURE__*/ _interop_require_default(require("nullthrows"));
+const _jsonsourcemap = /*#__PURE__*/ _interop_require_wildcard(require("@mischnic/json-sourcemap"));
 function _interop_require_default(obj) {
-  return obj && obj.__esModule
-    ? obj
-    : {
-        default: obj,
-      };
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
 }
 function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== 'function') return null;
-  var cacheBabelInterop = new WeakMap();
-  var cacheNodeInterop = new WeakMap();
-  return (_getRequireWildcardCache = function (nodeInterop) {
-    return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
 }
 function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || (typeof obj !== 'object' && typeof obj !== 'function')) {
-    return {
-      default: obj,
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
     };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {
-    __proto__: null,
-  };
-  var hasPropertyDescriptor =
-    Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== 'default' && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor
-        ? Object.getOwnPropertyDescriptor(obj, key)
-        : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
     }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
+    return newObj;
 }
 function anyToDiagnostic(input) {
-  if (Array.isArray(input)) {
-    return input.flatMap((e) => anyToDiagnostic(e));
-  } else if (input instanceof ThrowableDiagnostic) {
-    return input.diagnostics;
-  } else if (input instanceof Error) {
-    return errorToDiagnostic(input);
-  } else if (typeof input === 'string') {
-    return [
-      {
-        message: input,
-      },
-    ];
-  } else if (typeof input === 'object') {
-    return [input];
-  } else {
-    return errorToDiagnostic(input);
-  }
+    if (Array.isArray(input)) {
+        return input.flatMap((e)=>anyToDiagnostic(e));
+    } else if (input instanceof ThrowableDiagnostic) {
+        return input.diagnostics;
+    } else if (input instanceof Error) {
+        return errorToDiagnostic(input);
+    } else if (typeof input === 'string') {
+        return [
+            {
+                message: input
+            }
+        ];
+    } else if (typeof input === 'object') {
+        return [
+            input
+        ];
+    } else {
+        return errorToDiagnostic(input);
+    }
 }
 function errorToDiagnostic(error, defaultValues) {
-  let codeFrames = undefined;
-  if (typeof error === 'string') {
+    let codeFrames = undefined;
+    if (typeof error === 'string') {
+        return [
+            {
+                origin: defaultValues?.origin ?? 'Error',
+                message: escapeMarkdown(error)
+            }
+        ];
+    }
+    if (error instanceof ThrowableDiagnostic) {
+        return error.diagnostics.map((d)=>{
+            return {
+                ...d,
+                origin: d.origin ?? defaultValues?.origin ?? 'unknown'
+            };
+        });
+    }
+    if (error.loc && error.source != null) {
+        codeFrames = [
+            {
+                filePath: error.filePath ?? error.fileName ?? defaultValues?.filePath ?? undefined,
+                code: error.source,
+                codeHighlights: [
+                    {
+                        start: {
+                            line: error.loc.line,
+                            column: error.loc.column
+                        },
+                        end: {
+                            line: error.loc.line,
+                            column: error.loc.column
+                        }
+                    }
+                ]
+            }
+        ];
+    }
     return [
-      {
-        origin: defaultValues?.origin ?? 'Error',
-        message: escapeMarkdown(error),
-      },
+        {
+            origin: defaultValues?.origin ?? 'Error',
+            message: escapeMarkdown(error.message),
+            name: error.name,
+            stack: codeFrames == null ? error.highlightedCodeFrame ?? error.codeFrame ?? error.stack : undefined,
+            codeFrames
+        }
     ];
-  }
-  if (error instanceof ThrowableDiagnostic) {
-    return error.diagnostics.map((d) => {
-      return {
-        ...d,
-        origin: d.origin ?? defaultValues?.origin ?? 'unknown',
-      };
+}
+class ThrowableDiagnostic extends Error {
+    diagnostics;
+    constructor(opts){
+        let diagnostics = Array.isArray(opts.diagnostic) ? opts.diagnostic : [
+            opts.diagnostic
+        ];
+        // Construct error from diagnostics
+        super(diagnostics[0].message);
+        // @ts-ignore
+        this.stack = diagnostics[0].stack ?? super.stack;
+        // @ts-ignore
+        this.name = diagnostics[0].name ?? super.name;
+        this.diagnostics = diagnostics;
+    }
+}
+function generateJSONCodeHighlights(data, ids) {
+    let map = typeof data == 'string' ? _jsonsourcemap.default.parse(data, undefined, {
+        dialect: 'JSON5',
+        tabWidth: 1
+    }) : data;
+    return ids.map(({ key, type, message })=>{
+        let pos = _nullthrows.default.default(map.pointers[key]);
+        return {
+            ...getJSONHighlightLocation(pos, type),
+            message
+        };
     });
-  }
-  if (error.loc && error.source != null) {
-    codeFrames = [
-      {
-        filePath:
-          error.filePath ??
-          error.fileName ??
-          defaultValues?.filePath ??
-          undefined,
-        code: error.source,
-        codeHighlights: [
-          {
+}
+function getJSONHighlightLocation(pos, type) {
+    let key = 'key' in pos ? pos.key : undefined;
+    let keyEnd = 'keyEnd' in pos ? pos.keyEnd : undefined;
+    if (!type && key && pos.value) {
+        // key and value
+        return {
             start: {
-              line: error.loc.line,
-              column: error.loc.column,
+                line: key.line + 1,
+                column: key.column + 1
             },
             end: {
-              line: error.loc.line,
-              column: error.loc.column,
+                line: pos.valueEnd.line + 1,
+                column: pos.valueEnd.column
+            }
+        };
+    } else if (type == 'key' || !pos.value) {
+        (0, _nodeassert.default)(key && keyEnd);
+        return {
+            start: {
+                line: key.line + 1,
+                column: key.column + 1
             },
-          },
-        ],
-      },
-    ];
-  }
-  return [
-    {
-      origin: defaultValues?.origin ?? 'Error',
-      message: escapeMarkdown(error.message),
-      name: error.name,
-      stack:
-        codeFrames == null
-          ? error.highlightedCodeFrame ?? error.codeFrame ?? error.stack
-          : undefined,
-      codeFrames,
-    },
-  ];
-}
-class ThrowableDiagnostic extends Error {
-  diagnostics;
-  constructor(opts) {
-    let diagnostics = Array.isArray(opts.diagnostic)
-      ? opts.diagnostic
-      : [opts.diagnostic];
-    // Construct error from diagnostics
-    super(diagnostics[0].message);
-    // @ts-ignore
-    this.stack = diagnostics[0].stack ?? super.stack;
-    // @ts-ignore
-    this.name = diagnostics[0].name ?? super.name;
-    this.diagnostics = diagnostics;
-  }
+            end: {
+                line: keyEnd.line + 1,
+                column: keyEnd.column
+            }
+        };
+    } else {
+        return {
+            start: {
+                line: pos.value.line + 1,
+                column: pos.value.column + 1
+            },
+            end: {
+                line: pos.valueEnd.line + 1,
+                column: pos.valueEnd.column
+            }
+        };
+    }
 }
-function generateJSONCodeHighlights(data, ids) {
-  let map =
-    typeof data == 'string'
-      ? _jsonsourcemap.default.parse(data, undefined, {
-          dialect: 'JSON5',
-          tabWidth: 1,
-        })
-      : data;
-  return ids.map(({key, type, message}) => {
-    let pos = _nullthrows.default.default(map.pointers[key]);
+function getJSONSourceLocation(pos, type) {
+    let v = getJSONHighlightLocation(pos, type);
     return {
-      ...getJSONHighlightLocation(pos, type),
-      message,
+        start: v.start,
+        end: {
+            line: v.end.line,
+            column: v.end.column + 1
+        }
     };
-  });
 }
-function getJSONHighlightLocation(pos, type) {
-  let key = 'key' in pos ? pos.key : undefined;
-  let keyEnd = 'keyEnd' in pos ? pos.keyEnd : undefined;
-  if (!type && key && pos.value) {
-    // key and value
-    return {
-      start: {
-        line: key.line + 1,
-        column: key.column + 1,
-      },
-      end: {
-        line: pos.valueEnd.line + 1,
-        column: pos.valueEnd.column,
-      },
-    };
-  } else if (type == 'key' || !pos.value) {
-    (0, _nodeassert.default)(key && keyEnd);
-    return {
-      start: {
-        line: key.line + 1,
-        column: key.column + 1,
-      },
-      end: {
-        line: keyEnd.line + 1,
-        column: keyEnd.column,
-      },
-    };
-  } else {
+function convertSourceLocationToHighlight({ start, end }, message) {
     return {
-      start: {
-        line: pos.value.line + 1,
-        column: pos.value.column + 1,
-      },
-      end: {
-        line: pos.valueEnd.line + 1,
-        column: pos.valueEnd.column,
-      },
+        message,
+        start,
+        end: {
+            line: end.line,
+            column: end.column - 1
+        }
     };
-  }
-}
-function getJSONSourceLocation(pos, type) {
-  let v = getJSONHighlightLocation(pos, type);
-  return {
-    start: v.start,
-    end: {
-      line: v.end.line,
-      column: v.end.column + 1,
-    },
-  };
-}
-function convertSourceLocationToHighlight({start, end}, message) {
-  return {
-    message,
-    start,
-    end: {
-      line: end.line,
-      column: end.column - 1,
-    },
-  };
 }
 function encodeJSONKeyComponent(component) {
-  return component.replace(/~/g, '~0').replace(/\//g, '~1');
+    return component.replace(/~/g, '~0').replace(/\//g, '~1');
 }
-const escapeCharacters = ['\\', '*', '_', '~'];
+const escapeCharacters = [
+    '\\',
+    '*',
+    '_',
+    '~'
+];
 function escapeMarkdown(s) {
-  let result = s;
-  for (const char of escapeCharacters) {
-    result = result.replace(new RegExp(`\\${char}`, 'g'), `\\${char}`);
-  }
-  return result;
+    let result = s;
+    for (const char of escapeCharacters){
+        result = result.replace(new RegExp(`\\${char}`, 'g'), `\\${char}`);
+    }
+    return result;
 }
 const mdVerbatim = Symbol();
-const md = function (strings, ...params) {
-  let result = [];
-  for (let i = 0; i < params.length; i++) {
-    result.push(strings[i]);
-    let param = params[i];
-    if (Array.isArray(param)) {
-      for (let j = 0; j < param.length; j++) {
-        result.push(param[j]?.[mdVerbatim] ?? escapeMarkdown(`${param[j]}`));
-        if (j < param.length - 1) {
-          result.push(', ');
+const md = function(strings, ...params) {
+    let result = [];
+    for(let i = 0; i < params.length; i++){
+        result.push(strings[i]);
+        let param = params[i];
+        if (Array.isArray(param)) {
+            for(let j = 0; j < param.length; j++){
+                result.push(param[j]?.[mdVerbatim] ?? escapeMarkdown(`${param[j]}`));
+                if (j < param.length - 1) {
+                    result.push(', ');
+                }
+            }
+        } else {
+            result.push(param?.[mdVerbatim] ?? escapeMarkdown(`${param}`));
         }
-      }
-    } else {
-      result.push(param?.[mdVerbatim] ?? escapeMarkdown(`${param}`));
     }
-  }
-  return result.join('') + strings[strings.length - 1];
+    return result.join('') + strings[strings.length - 1];
 };
-md.bold = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {
-    [mdVerbatim]: '**' + escapeMarkdown(`${s}`) + '**',
-  };
+md.bold = function(s) {
+    // $FlowFixMe[invalid-computed-prop]
+    return {
+        [mdVerbatim]: '**' + escapeMarkdown(`${s}`) + '**'
+    };
 };
-md.italic = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {
-    [mdVerbatim]: '_' + escapeMarkdown(`${s}`) + '_',
-  };
+md.italic = function(s) {
+    // $FlowFixMe[invalid-computed-prop]
+    return {
+        [mdVerbatim]: '_' + escapeMarkdown(`${s}`) + '_'
+    };
 };
-md.underline = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {
-    [mdVerbatim]: '__' + escapeMarkdown(`${s}`) + '__',
-  };
+md.underline = function(s) {
+    // $FlowFixMe[invalid-computed-prop]
+    return {
+        [mdVerbatim]: '__' + escapeMarkdown(`${s}`) + '__'
+    };
 };
-md.strikethrough = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {
-    [mdVerbatim]: '~~' + escapeMarkdown(`${s}`) + '~~',
-  };
+md.strikethrough = function(s) {
+    // $FlowFixMe[invalid-computed-prop]
+    return {
+        [mdVerbatim]: '~~' + escapeMarkdown(`${s}`) + '~~'
+    };
 };

package/lib/index.mjs

@@ -3,94 +3,97 @@ import nullthrows from 'nullthrows';
 import * as jsonSourcemap from '@mischnic/json-sourcemap';
 /** Normalize the given value into a diagnostic. */
 export function anyToDiagnostic(input) {
-  if (Array.isArray(input)) {
-    return input.flatMap((e) => anyToDiagnostic(e));
-  } else if (input instanceof ThrowableDiagnostic) {
-    return input.diagnostics;
-  } else if (input instanceof Error) {
-    return errorToDiagnostic(input);
-  } else if (typeof input === 'string') {
-    return [{message: input}];
-  } else if (typeof input === 'object') {
-    return [input];
-  } else {
-    return errorToDiagnostic(input);
-  }
+    if (Array.isArray(input)) {
+        return input.flatMap((e) => anyToDiagnostic(e));
+    }
+    else if (input instanceof ThrowableDiagnostic) {
+        return input.diagnostics;
+    }
+    else if (input instanceof Error) {
+        return errorToDiagnostic(input);
+    }
+    else if (typeof input === 'string') {
+        return [{ message: input }];
+    }
+    else if (typeof input === 'object') {
+        return [input];
+    }
+    else {
+        return errorToDiagnostic(input);
+    }
 }
 /** Normalize the given error into a diagnostic. */
 export function errorToDiagnostic(error, defaultValues) {
-  let codeFrames = undefined;
-  if (typeof error === 'string') {
-    return [
-      {
-        origin: defaultValues?.origin ?? 'Error',
-        message: escapeMarkdown(error),
-      },
-    ];
-  }
-  if (error instanceof ThrowableDiagnostic) {
-    return error.diagnostics.map((d) => {
-      return {
-        ...d,
-        origin: d.origin ?? defaultValues?.origin ?? 'unknown',
-      };
-    });
-  }
-  if (error.loc && error.source != null) {
-    codeFrames = [
-      {
-        filePath:
-          error.filePath ??
-          error.fileName ??
-          defaultValues?.filePath ??
-          undefined,
-        code: error.source,
-        codeHighlights: [
-          {
-            start: {
-              line: error.loc.line,
-              column: error.loc.column,
+    let codeFrames = undefined;
+    if (typeof error === 'string') {
+        return [
+            {
+                origin: defaultValues?.origin ?? 'Error',
+                message: escapeMarkdown(error),
             },
-            end: {
-              line: error.loc.line,
-              column: error.loc.column,
+        ];
+    }
+    if (error instanceof ThrowableDiagnostic) {
+        return error.diagnostics.map((d) => {
+            return {
+                ...d,
+                origin: d.origin ?? defaultValues?.origin ?? 'unknown',
+            };
+        });
+    }
+    if (error.loc && error.source != null) {
+        codeFrames = [
+            {
+                filePath: error.filePath ??
+                    error.fileName ??
+                    defaultValues?.filePath ??
+                    undefined,
+                code: error.source,
+                codeHighlights: [
+                    {
+                        start: {
+                            line: error.loc.line,
+                            column: error.loc.column,
+                        },
+                        end: {
+                            line: error.loc.line,
+                            column: error.loc.column,
+                        },
+                    },
+                ],
             },
-          },
-        ],
-      },
+        ];
+    }
+    return [
+        {
+            origin: defaultValues?.origin ?? 'Error',
+            message: escapeMarkdown(error.message),
+            name: error.name,
+            stack: codeFrames == null
+                ? error.highlightedCodeFrame ?? error.codeFrame ?? error.stack
+                : undefined,
+            codeFrames,
+        },
     ];
-  }
-  return [
-    {
-      origin: defaultValues?.origin ?? 'Error',
-      message: escapeMarkdown(error.message),
-      name: error.name,
-      stack:
-        codeFrames == null
-          ? error.highlightedCodeFrame ?? error.codeFrame ?? error.stack
-          : undefined,
-      codeFrames,
-    },
-  ];
 }
 /**
  * An error wrapper around a diagnostic that can be <code>throw</code>n (e.g. to signal a
  * build error).
  */
 export default class ThrowableDiagnostic extends Error {
-  diagnostics;
-  constructor(opts) {
-    let diagnostics = Array.isArray(opts.diagnostic)
-      ? opts.diagnostic
-      : [opts.diagnostic];
-    // Construct error from diagnostics
-    super(diagnostics[0].message);
-    // @ts-ignore
-    this.stack = diagnostics[0].stack ?? super.stack;
-    // @ts-ignore
-    this.name = diagnostics[0].name ?? super.name;
-    this.diagnostics = diagnostics;
-  }
+    diagnostics;
+    constructor(opts) {
+        let diagnostics = Array.isArray(opts.diagnostic)
+            ? opts.diagnostic
+            : [opts.diagnostic];
+        // Construct error from diagnostics
+        super(diagnostics[0].message);
+        // @ts-ignore
+        this.stack = diagnostics[0].stack ?? super.stack;
+        // @ts-ignore
+        this.name = diagnostics[0].name ?? super.name;
+        this.diagnostics = diagnostics;
+    }
 }
 /**
  * Turns a list of positions in a JSON5 file with messages into a list of diagnostics.
@@ -101,99 +104,98 @@ export default class ThrowableDiagnostic extends Error {
  * <code>type</code> signifies whether the key of the value in a JSON object should be highlighted.
  */
 export function generateJSONCodeHighlights(data, ids) {
-  let map =
-    typeof data == 'string'
-      ? jsonSourcemap.default.parse(data, undefined, {
-          dialect: 'JSON5',
-          tabWidth: 1,
-        })
-      : data;
-  return ids.map(({key, type, message}) => {
-    let pos = nullthrows.default(map.pointers[key]);
-    return {
-      ...getJSONHighlightLocation(pos, type),
-      message,
-    };
-  });
+    let map = typeof data == 'string'
+        ? jsonSourcemap.default.parse(data, undefined, { dialect: 'JSON5', tabWidth: 1 })
+        : data;
+    return ids.map(({ key, type, message }) => {
+        let pos = nullthrows.default(map.pointers[key]);
+        return {
+            ...getJSONHighlightLocation(pos, type),
+            message,
+        };
+    });
 }
 /**
  * Converts entries in <a href="https://github.com/mischnic/json-sourcemap">@mischnic/json-sourcemap</a>'s
  * <code>result.pointers</code> array.
  */
 export function getJSONHighlightLocation(pos, type) {
-  let key = 'key' in pos ? pos.key : undefined;
-  let keyEnd = 'keyEnd' in pos ? pos.keyEnd : undefined;
-  if (!type && key && pos.value) {
-    // key and value
-    return {
-      start: {line: key.line + 1, column: key.column + 1},
-      end: {line: pos.valueEnd.line + 1, column: pos.valueEnd.column},
-    };
-  } else if (type == 'key' || !pos.value) {
-    assert(key && keyEnd);
-    return {
-      start: {line: key.line + 1, column: key.column + 1},
-      end: {line: keyEnd.line + 1, column: keyEnd.column},
-    };
-  } else {
-    return {
-      start: {line: pos.value.line + 1, column: pos.value.column + 1},
-      end: {line: pos.valueEnd.line + 1, column: pos.valueEnd.column},
-    };
-  }
+    let key = 'key' in pos ? pos.key : undefined;
+    let keyEnd = 'keyEnd' in pos ? pos.keyEnd : undefined;
+    if (!type && key && pos.value) {
+        // key and value
+        return {
+            start: { line: key.line + 1, column: key.column + 1 },
+            end: { line: pos.valueEnd.line + 1, column: pos.valueEnd.column },
+        };
+    }
+    else if (type == 'key' || !pos.value) {
+        assert(key && keyEnd);
+        return {
+            start: { line: key.line + 1, column: key.column + 1 },
+            end: { line: keyEnd.line + 1, column: keyEnd.column },
+        };
+    }
+    else {
+        return {
+            start: { line: pos.value.line + 1, column: pos.value.column + 1 },
+            end: { line: pos.valueEnd.line + 1, column: pos.valueEnd.column },
+        };
+    }
 }
 /** Result is 1-based, but end is exclusive */
 export function getJSONSourceLocation(pos, type) {
-  let v = getJSONHighlightLocation(pos, type);
-  return {start: v.start, end: {line: v.end.line, column: v.end.column + 1}};
+    let v = getJSONHighlightLocation(pos, type);
+    return { start: v.start, end: { line: v.end.line, column: v.end.column + 1 } };
 }
-export function convertSourceLocationToHighlight({start, end}, message) {
-  return {message, start, end: {line: end.line, column: end.column - 1}};
+export function convertSourceLocationToHighlight({ start, end }, message) {
+    return { message, start, end: { line: end.line, column: end.column - 1 } };
 }
 /** Sanitizes object keys before using them as <code>key</code> in generateJSONCodeHighlights */
 export function encodeJSONKeyComponent(component) {
-  return component.replace(/~/g, '~0').replace(/\//g, '~1');
+    return component.replace(/~/g, '~0').replace(/\//g, '~1');
 }
 const escapeCharacters = ['\\', '*', '_', '~'];
 export function escapeMarkdown(s) {
-  let result = s;
-  for (const char of escapeCharacters) {
-    result = result.replace(new RegExp(`\\${char}`, 'g'), `\\${char}`);
-  }
-  return result;
+    let result = s;
+    for (const char of escapeCharacters) {
+        result = result.replace(new RegExp(`\\${char}`, 'g'), `\\${char}`);
+    }
+    return result;
 }
 const mdVerbatim = Symbol();
 export const md = function (strings, ...params) {
-  let result = [];
-  for (let i = 0; i < params.length; i++) {
-    result.push(strings[i]);
-    let param = params[i];
-    if (Array.isArray(param)) {
-      for (let j = 0; j < param.length; j++) {
-        result.push(param[j]?.[mdVerbatim] ?? escapeMarkdown(`${param[j]}`));
-        if (j < param.length - 1) {
-          result.push(', ');
+    let result = [];
+    for (let i = 0; i < params.length; i++) {
+        result.push(strings[i]);
+        let param = params[i];
+        if (Array.isArray(param)) {
+            for (let j = 0; j < param.length; j++) {
+                result.push(param[j]?.[mdVerbatim] ?? escapeMarkdown(`${param[j]}`));
+                if (j < param.length - 1) {
+                    result.push(', ');
+                }
+            }
+        }
+        else {
+            result.push(param?.[mdVerbatim] ?? escapeMarkdown(`${param}`));
         }
-      }
-    } else {
-      result.push(param?.[mdVerbatim] ?? escapeMarkdown(`${param}`));
     }
-  }
-  return result.join('') + strings[strings.length - 1];
+    return result.join('') + strings[strings.length - 1];
 };
 md.bold = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {[mdVerbatim]: '**' + escapeMarkdown(`${s}`) + '**'};
+    // $FlowFixMe[invalid-computed-prop]
+    return { [mdVerbatim]: '**' + escapeMarkdown(`${s}`) + '**' };
 };
 md.italic = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {[mdVerbatim]: '_' + escapeMarkdown(`${s}`) + '_'};
+    // $FlowFixMe[invalid-computed-prop]
+    return { [mdVerbatim]: '_' + escapeMarkdown(`${s}`) + '_' };
 };
 md.underline = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {[mdVerbatim]: '__' + escapeMarkdown(`${s}`) + '__'};
+    // $FlowFixMe[invalid-computed-prop]
+    return { [mdVerbatim]: '__' + escapeMarkdown(`${s}`) + '__' };
 };
 md.strikethrough = function (s) {
-  // $FlowFixMe[invalid-computed-prop]
-  return {[mdVerbatim]: '~~' + escapeMarkdown(`${s}`) + '~~'};
+    // $FlowFixMe[invalid-computed-prop]
+    return { [mdVerbatim]: '~~' + escapeMarkdown(`${s}`) + '~~' };
 };

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@atlaspack/diagnostic",
-  "version": "2.14.2-typescript-d6e6d169c.0",
+  "version": "2.14.2-typescript-6de04fbae.0",
   "description": "Types and utilities for printing source-code located errors, warning and information messages.",
   "license": "(MIT OR Apache-2.0)",
+  "type": "commonjs",
   "publishConfig": {
     "access": "public"
   },
@@ -11,12 +12,12 @@
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
   "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "types": "lib/index.d.mts",
   "exports": {
     ".": {
       "atlaspack::sources": "./src/index.mts",
       "types": [
-        "./lib/index.d.ts",
+        "./lib/index.d.mts",
         "./src/index.mts"
       ],
       "import": "./lib/index.mjs",
@@ -35,5 +36,5 @@
     "@mischnic/json-sourcemap": "^0.1.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "d6e6d169cb16a0bbc98d7743646a7097b82c7fe2"
+  "gitHead": "6de04fbaeccfba1e7832c737f6318cbd603fc74d"
 }

package/src/index.mts

@@ -45,7 +45,7 @@ export type DiagnosticCodeFrame = {
 };
 
 /** A JSON object (as in "map") */
-export type JSONObject = {
+type JSONObject = {
   // $FlowFixMe
   [key: string]: any;
 };