@appland/appmap 3.39.0 → 3.40.1

package/built/utils.js

@@ -1,40 +1,46 @@
 "use strict";
-/* eslint-disable func-names */
-const { constants: fsConstants, promises: fsp } = require('fs');
-const { queue } = require('async');
-const glob = require('glob');
-const { buildAppMap } = require('@appland/models');
-const { promisify } = require('util');
-const { join } = require('path');
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prefixLines = exports.exists = exports.listAppMapFiles = exports.processFiles = exports.writeFileAtomic = exports.mtime = exports.baseName = exports.verbose = exports.endTime = void 0;
+const fs_1 = require("fs");
+const async_1 = require("async");
+const glob_1 = __importDefault(require("glob"));
+const util_1 = require("util");
+const path_1 = require("path");
 const StartTime = Date.now();
 function endTime() {
     return (Date.now() - StartTime) / 1000;
 }
+exports.endTime = endTime;
 let isVerbose = false;
-function verbose(/** @type {boolean|null} */ v = null) {
+function verbose(v = null) {
     if (v !== null) {
         isVerbose = v;
     }
     return isVerbose;
 }
-function baseName(/** @type string */ fileName) {
+exports.verbose = verbose;
+function baseName(fileName) {
     return fileName.substring(0, fileName.length - '.appmap.json'.length);
 }
+exports.baseName = baseName;
 /**
  * Gets the last modified time of a file.
  *
- * @returns {Promise<number|null>} file mtime, or null if the file does not exist or
+ * @returns file mtime in ms, or null if the file does not exist or
  * is not a file.
  */
-// NB: 'ctime' is actually the time that the stats of the file were last changed.
-// And 'birthtime' is not guaranteed across platforms.
-// Therefore mtime is the most reliable indicator of when the file was created,
-// especially since we write files atomically (e.g. by moving them into place after writing them
-// as temp files).
 async function mtime(filePath) {
+    // NB: 'ctime' is actually the time that the stats of the file were last changed.
+    // And 'birthtime' is not guaranteed across platforms.
+    // Therefore mtime is the most reliable indicator of when the file was created,
+    // especially since we write files atomically (e.g. by moving them into place after writing them
+    // as temp files).
     let fileStat;
     try {
-        fileStat = await fsp.stat(filePath);
+        fileStat = await fs_1.promises.stat(filePath);
     }
     catch (e) {
         return null;
@@ -44,37 +50,32 @@ async function mtime(filePath) {
     }
     return fileStat.mtimeMs;
 }
+exports.mtime = mtime;
 /**
  * Atomically write a file by first writing to a temporary file in the same
  * directory then renaming in place.
- * @param {string} dirName target directory path
- * @param {string} fileName target file name
- * @param {unknown} jobId used to create the temporary file name
- * @param {string} data
+ * @param dirName target directory path
+ * @param fileName target file name
+ * @param suffix used to create the temporary file name
+ * @param data
  */
-async function writeFileAtomic(dirName, fileName, jobId, data) {
-    const suffix = jobId.toString();
+async function writeFileAtomic(dirName, fileName, suffix, data) {
     // first make sure the temp name isn't too long
     const NAME_MAX = 255; // note: might not be true on some esoteric systems
     const name = fileName.slice(0, NAME_MAX - suffix.length - 1);
-    const tempFilePath = join(dirName, `${name}.${suffix}`);
-    await fsp.writeFile(tempFilePath, data);
-    await fsp.rename(tempFilePath, join(dirName, fileName));
+    const tempFilePath = (0, path_1.join)(dirName, `${name}.${suffix}`);
+    await fs_1.promises.writeFile(tempFilePath, data);
+    await fs_1.promises.rename(tempFilePath, (0, path_1.join)(dirName, fileName));
 }
+exports.writeFileAtomic = writeFileAtomic;
 /**
  * Call a function with each matching file. No guarantee is given that
  * files will be processed in any particular order.
- *
- * @param {string} pattern
- * @param {(filePath: string): void} fn
- * @param {(fileCount: number): void} fileCountFn
  */
-async function processFiles(pattern, fn, 
-// eslint-disable-next-line no-unused-vars
-fileCountFn = (/** @type {number} */ count) => { }) {
-    const q = queue(fn, 5);
+async function processFiles(pattern, fn, fileCountFn = (count) => { }) {
+    const q = (0, async_1.queue)(fn, 5);
     q.pause();
-    const files = await promisify(glob)(pattern);
+    const files = await (0, util_1.promisify)(glob_1.default)(pattern);
     if (fileCountFn) {
         fileCountFn(files.length);
     }
@@ -84,27 +85,22 @@ fileCountFn = (/** @type {number} */ count) => { }) {
     q.resume();
     await q.drain();
 }
+exports.processFiles = processFiles;
 /**
  * Lists all appmap.json files in a directory, and passes them to a function.
  * With `await`, `listAppMapFiles` blocks until all the files have been processed.
- *
- * @param {string} directory
- * @param {Function(string)} fn
  */
 async function listAppMapFiles(directory, fn) {
     if (verbose()) {
         console.warn(`Scanning ${directory} for AppMaps`);
     }
-    await Promise.all((await promisify(glob)(`${directory}/**/*.appmap.json`)).map(fn));
+    await Promise.all((await (0, util_1.promisify)(glob_1.default)(`${directory}/**/*.appmap.json`)).map(fn));
 }
-/**
- * @param {PathLike} path
- * @returns {Promise<boolean>}
- */
+exports.listAppMapFiles = listAppMapFiles;
 function exists(path) {
     return new Promise((resolve) => {
-        fsp
-            .access(path, fsConstants.R_OK)
+        fs_1.promises
+            .access(path, fs_1.constants.R_OK)
             .then(() => {
             resolve(true);
         })
@@ -113,50 +109,15 @@ function exists(path) {
         });
     });
 }
-async function loadAppMap(filePath) {
-    return buildAppMap()
-        .source(JSON.parse(await fsp.readFile(filePath)))
-        .normalize()
-        .build();
-}
-function formatValue(value) {
-    if (!value) {
-        return 'Null';
-    }
-    const valueStr = value.value.indexOf('#<') === 0 ? null : value.value;
-    return [value.class, valueStr].filter((e) => e).join(' ');
-}
-function formatHttpServerRequest(event) {
-    const data = {
-        method: event.httpServerRequest.request_method,
-        path: event.httpServerRequest.normalized_path_info || event.httpServerRequest.path_info,
-        statusCode: event.returnEvent && event.httpServerResponse
-            ? event.httpServerResponse.status_code || event.httpServerResponse.status
-            : '<none>',
-    };
-    return [data.method, data.path, `(${data.statusCode})`].join(' ');
-}
+exports.exists = exists;
 /**
  * Append a prefix to each line in a string
- * @param {string} str the string to be prefixed
- * @param {string} prefix a string to prefix each line with
- * @returns {string} the resulting string which starts each line with a prefix
+ * @param str the string to be prefixed
+ * @param prefix a string to prefix each line with
+ * @returns the resulting string which starts each line with a prefix
  */
 function prefixLines(str, prefix) {
     return str.replace(/^/gm, prefix);
 }
-module.exports = {
-    baseName,
-    endTime,
-    formatValue,
-    formatHttpServerRequest,
-    writeFileAtomic,
-    listAppMapFiles,
-    loadAppMap,
-    mtime,
-    verbose,
-    processFiles,
-    exists,
-    prefixLines,
-};
+exports.prefixLines = prefixLines;
 //# sourceMappingURL=utils.js.map

package/built/utils.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/appmap",
-  "version": "3.39.0",
+  "version": "3.40.1",
   "description": "",
   "bin": "built/cli.js",
   "publishConfig": {