just-task 1.12.0 → 1.13.0

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "just-task",
   "entries": [
     {
-      "date": "Fri, 28 Mar 2025 08:01:39 GMT",
+      "date": "Thu, 11 Dec 2025 17:20:50 GMT",
+      "version": "1.13.0",
+      "tag": "just-task_v1.13.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "just-task",
+            "commit": "9f2ae785ea8288e0dd60c4e684a17858c2d67902",
+            "comment": "Merge just-task-logger into this package"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 28 Mar 2025 08:01:48 GMT",
       "version": "1.12.0",
       "tag": "just-task_v1.12.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - just-task
 
-<!-- This log was last generated on Fri, 28 Mar 2025 08:01:39 GMT and should not be manually modified. -->
+<!-- This log was last generated on Thu, 11 Dec 2025 17:20:50 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 1.13.0
+
+Thu, 11 Dec 2025 17:20:50 GMT
+
+### Minor changes
+
+- Merge just-task-logger into this package (elcraig@microsoft.com)
+
 ## 1.12.0
 
-Fri, 28 Mar 2025 08:01:39 GMT
+Fri, 28 Mar 2025 08:01:48 GMT
 
 ### Minor changes
 

package/lib/cache.js

@@ -6,7 +6,7 @@ const option_1 = require("./option");
 const resolve_1 = require("./resolve");
 const fs = require("fs-extra");
 const path = require("path");
-const just_task_logger_1 = require("just-task-logger");
+const logger_1 = require("./logger");
 const findDependents_1 = require("./package/findDependents");
 const findGitRoot_1 = require("./package/findGitRoot");
 const child_process_1 = require("child_process");
@@ -41,7 +41,7 @@ function isCached(taskName) {
         shouldCache = JSON.stringify(currentHash) === JSON.stringify(cachedHash);
     }
     catch (e) {
-        just_task_logger_1.logger.warn('Invalid package-deps.json detected');
+        logger_1.logger.warn('Invalid package-deps.json detected');
     }
     return shouldCache;
 }
@@ -95,7 +95,7 @@ function getLockFileHashes() {
     return results;
 }
 function getHash(taskName) {
-    (0, just_task_logger_1.mark)('cache:getHash');
+    (0, logger_1.mark)('cache:getHash');
     const { ...args } = (0, option_1.argv)();
     const packageRootPath = getPackageRootPath();
     const packageDeps = {
@@ -108,11 +108,11 @@ function getHash(taskName) {
         hash: packageDeps,
         dependentHashTimestamps: getDependentHashTimestamps(),
     };
-    just_task_logger_1.logger.perf('cache:getHash');
+    logger_1.logger.perf('cache:getHash');
     return hash;
 }
 function getDependentHashTimestamps() {
-    (0, just_task_logger_1.mark)('cache:getDependentHashTimestamps');
+    (0, logger_1.mark)('cache:getDependentHashTimestamps');
     const dependentPkgPaths = (0, findDependents_1.findDependents)();
     const timestampsByPackage = {};
     for (const pkgDepInfo of dependentPkgPaths) {
@@ -128,6 +128,6 @@ function getDependentHashTimestamps() {
             timestampsByPackage[pkgDepInfo.name] = new Date().getTime();
         }
     }
-    just_task_logger_1.logger.perf('cache:getDependentHashTimestamps');
+    logger_1.logger.perf('cache:getDependentHashTimestamps');
     return timestampsByPackage;
 }

package/lib/cli.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const undertaker_1 = require("./undertaker");
 const option_1 = require("./option");
-const just_task_logger_1 = require("just-task-logger");
+const logger_1 = require("./logger");
 const config_1 = require("./config");
 const task_1 = require("./task");
 const originalEmitWarning = process.emitWarning;
@@ -55,7 +55,7 @@ if (command) {
         undertaker_1.undertaker.series(registry.get(command))(() => undefined);
     }
     else {
-        just_task_logger_1.logger.error(`Command not defined: ${command}`);
+        logger_1.logger.error(`Command not defined: ${command}`);
         process.exitCode = 1;
     }
 }

package/lib/config.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const path = require("path");
 const option_1 = require("./option");
 const resolve_1 = require("./resolve");
-const just_task_logger_1 = require("just-task-logger");
+const logger_1 = require("./logger");
 const enableTypeScript_1 = require("./enableTypeScript");
 function resolveConfigFile(args) {
     for (const entry of [
@@ -37,21 +37,21 @@ function readConfig() {
         }
         try {
             const configModule = require(configFile);
-            (0, just_task_logger_1.mark)('registry:configModule');
+            (0, logger_1.mark)('registry:configModule');
             if (typeof configModule === 'function') {
                 configModule();
             }
-            just_task_logger_1.logger.perf('registry:configModule');
+            logger_1.logger.perf('registry:configModule');
             return configModule;
         }
         catch (e) {
-            just_task_logger_1.logger.error(`Invalid configuration file: ${configFile}`);
-            just_task_logger_1.logger.error(`Error: ${e.stack || e.message || e}`);
+            logger_1.logger.error(`Invalid configuration file: ${configFile}`);
+            logger_1.logger.error(`Error: ${e.stack || e.message || e}`);
             process.exit(1);
         }
     }
     else {
-        just_task_logger_1.logger.error(`Cannot find config file "${configFile}".`, `Please create a file called "just.config.js" in the root of the project next to "package.json".`);
+        logger_1.logger.error(`Cannot find config file "${configFile}".`, `Please create a file called "just.config.js" in the root of the project next to "package.json".`);
     }
 }
 exports.readConfig = readConfig;

package/lib/enableTypeScript.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableTypeScript = void 0;
 const resolve_1 = require("./resolve");
-const just_task_logger_1 = require("just-task-logger");
+const logger_1 = require("./logger");
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function enableTypeScript({ transpileOnly = true, esm = false }) {
     const tsNodeModule = (0, resolve_1.resolve)('ts-node');
@@ -25,7 +25,7 @@ function enableTypeScript({ transpileOnly = true, esm = false }) {
         });
     }
     else {
-        just_task_logger_1.logger.error(`In order to use TypeScript with just.config.ts, you need to install "ts-node" module:
+        logger_1.logger.error(`In order to use TypeScript with just.config.ts, you need to install "ts-node" module:
 
   npm install -D ts-node
 

package/lib/logger.d.ts

@@ -1,2 +1,17 @@
-export * from 'just-task-logger';
+export declare function mark(marker: string): void;
+export interface Logger {
+    /** Whether verbose logging is enabled. Default false unless --verbose arg is given. */
+    enableVerbose: boolean;
+    /** Log to `console.info` with a timestamp, but only if verbose logging is enabled. */
+    verbose(...args: any[]): void;
+    /** Log to `console.info` with a timestamp. */
+    info(...args: any[]): void;
+    /** Log to `console.warn` with a timestamp. */
+    warn(...args: any[]): void;
+    /** Log to `console.error` with a timestamp. */
+    error(...args: any[]): void;
+    /** Log perf marker data to `consold.info` with timestamp, only if verbose is enabled */
+    perf(marker: string, ...args: any[]): void;
+}
+export declare const logger: Logger;
 //# sourceMappingURL=logger.d.ts.map

package/lib/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAcA,wBAAgB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEzC;AAYD,MAAM,WAAW,MAAM;IACrB,uFAAuF;IACvF,aAAa,EAAE,OAAO,CAAC;IACvB,sFAAsF;IACtF,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC9B,8CAA8C;IAC9C,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,8CAA8C;IAC9C,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,+CAA+C;IAC/C,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5B,wFAAwF;IACxF,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5C;AAMD,eAAO,MAAM,MAAM,EAAE,MAqCpB,CAAC"}

package/lib/logger.js

@@ -1,13 +1,54 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("just-task-logger"), exports);
+exports.logger = exports.mark = void 0;
+const chalk = require("chalk");
+const parser = require("yargs-parser");
+const argv = parser(process.argv.slice(2));
+function logInternal(method, symbol, ...args) {
+    const now = new Date();
+    const timestamp = chalk.gray(`[${now.toLocaleTimeString()}]`);
+    console[method](timestamp, symbol, ...args);
+}
+const markers = {};
+function mark(marker) {
+    markers[marker] = process.hrtime();
+}
+exports.mark = mark;
+function getDeltaAndClearMark(marker) {
+    if (markers[marker]) {
+        const delta = process.hrtime(markers[marker]);
+        delete markers[marker];
+        return delta;
+    }
+    return null;
+}
+const emptySquare = '\u25a1';
+const square = '\u25a0';
+const triangle = '\u25b2';
+exports.logger = {
+    enableVerbose: !!argv.verbose,
+    verbose(...args) {
+        if (exports.logger.enableVerbose) {
+            logInternal('info', chalk.gray(emptySquare), ...args);
+        }
+    },
+    info(...args) {
+        logInternal('info', chalk.green(square), ...args);
+    },
+    warn(...args) {
+        logInternal('warn', chalk.yellow(triangle), ...args);
+    },
+    error(...args) {
+        logInternal('error', chalk.redBright('x'), ...args);
+    },
+    perf(marker, ...args) {
+        if (exports.logger.enableVerbose) {
+            const delta = getDeltaAndClearMark(marker);
+            if (delta) {
+                const ns = delta[0] * 1e9 + delta[1];
+                const deltaMsg = `${ns / 1e9}s`;
+                logInternal('info', chalk.cyan(square), `mark(${chalk.cyanBright(marker)}): took ${chalk.cyanBright(deltaMsg)}`, ...args);
+            }
+        }
+    },
+};

package/lib/package/findDependents.js

@@ -5,13 +5,13 @@ const fs = require("fs");
 const path = require("path");
 const resolve_1 = require("../resolve");
 const findPackageRoot_1 = require("./findPackageRoot");
-const just_task_logger_1 = require("just-task-logger");
+const logger_1 = require("../logger");
 const findGitRoot_1 = require("./findGitRoot");
 const paths_1 = require("../paths");
 function findDependents() {
-    (0, just_task_logger_1.mark)('cache:findDependents');
+    (0, logger_1.mark)('cache:findDependents');
     const results = collectAllDependentPaths((0, findPackageRoot_1.findPackageRoot)());
-    just_task_logger_1.logger.perf('cache:findDependents');
+    logger_1.logger.perf('cache:findDependents');
     return results;
 }
 exports.findDependents = findDependents;
@@ -38,12 +38,12 @@ function getDepsPaths(pkgPath) {
             .filter(p => p && p.path.indexOf('node_modules') === -1 && (0, paths_1.isChildOf)(p.path, gitRoot));
     }
     catch (e) {
-        just_task_logger_1.logger.error(`Invalid package.json detected at ${packageJsonFile} `, e);
+        logger_1.logger.error(`Invalid package.json detected at ${packageJsonFile} `, e);
         return [];
     }
 }
 function collectAllDependentPaths(pkgPath, collected = new Set()) {
-    (0, just_task_logger_1.mark)(`collectAllDependentPaths:${pkgPath}`);
+    (0, logger_1.mark)(`collectAllDependentPaths:${pkgPath}`);
     const depPaths = getDepsPaths(pkgPath);
     depPaths.forEach(depPath => collected.add(depPath));
     for (const depPath of depPaths) {
@@ -51,6 +51,6 @@ function collectAllDependentPaths(pkgPath, collected = new Set()) {
             collectAllDependentPaths(depPath.path, collected);
         }
     }
-    just_task_logger_1.logger.perf(`collectAllDependentPaths:${pkgPath}`);
+    logger_1.logger.perf(`collectAllDependentPaths:${pkgPath}`);
     return collected;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "just-task",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Build task definition library",
   "keywords": [],
   "repository": {
@@ -34,7 +34,6 @@
     "chalk": "^4.0.0",
     "chokidar": "^3.5.2",
     "fs-extra": "^11.0.0",
-    "just-task-logger": ">=1.3.0 <2.0.0",
     "resolve": "^1.19.0",
     "undertaker": "^2.0.0",
     "undertaker-registry": "^2.0.0",

package/src/cache.ts

@@ -3,7 +3,7 @@ import { argv } from './option';
 import { resolveCwd } from './resolve';
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import { logger, mark } from 'just-task-logger';
+import { logger, mark } from './logger';
 import { findDependents } from './package/findDependents';
 import { findGitRoot } from './package/findGitRoot';
 import { spawnSync } from 'child_process';

package/src/cli.ts

@@ -1,6 +1,6 @@
 import { undertaker } from './undertaker';
 import { option, parseCommand } from './option';
-import { logger } from 'just-task-logger';
+import { logger } from './logger';
 import { TaskFunction } from './interfaces';
 import { readConfig } from './config';
 import { task } from './task';

package/src/config.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 
 import { argv } from './option';
 import { resolve } from './resolve';
-import { mark, logger } from 'just-task-logger';
+import { mark, logger } from './logger';
 import { enableTypeScript } from './enableTypeScript';
 import yargsParser = require('yargs-parser');
 import { TaskFunction } from './interfaces';

package/src/enableTypeScript.ts

@@ -1,5 +1,5 @@
 import { resolve } from './resolve';
-import { logger } from 'just-task-logger';
+import { logger } from './logger';
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function enableTypeScript({ transpileOnly = true, esm = false }): void {

package/src/logger.ts

@@ -1 +1,85 @@
-export * from 'just-task-logger';
+import chalk = require('chalk');
+import * as parser from 'yargs-parser';
+
+const argv = parser(process.argv.slice(2));
+
+function logInternal(method: 'info' | 'warn' | 'error', symbol: string, ...args: any[]) {
+  const now = new Date();
+  const timestamp = chalk.gray(`[${now.toLocaleTimeString()}]`);
+
+  console[method](timestamp, symbol, ...args);
+}
+
+const markers: { [marker: string]: [number, number] } = {};
+
+export function mark(marker: string): void {
+  markers[marker] = process.hrtime();
+}
+
+function getDeltaAndClearMark(marker: string): [number, number] | null {
+  if (markers[marker]) {
+    const delta = process.hrtime(markers[marker]);
+    delete markers[marker];
+    return delta;
+  }
+
+  return null;
+}
+
+export interface Logger {
+  /** Whether verbose logging is enabled. Default false unless --verbose arg is given. */
+  enableVerbose: boolean;
+  /** Log to `console.info` with a timestamp, but only if verbose logging is enabled. */
+  verbose(...args: any[]): void;
+  /** Log to `console.info` with a timestamp. */
+  info(...args: any[]): void;
+  /** Log to `console.warn` with a timestamp. */
+  warn(...args: any[]): void;
+  /** Log to `console.error` with a timestamp. */
+  error(...args: any[]): void;
+  /** Log perf marker data to `consold.info` with timestamp, only if verbose is enabled */
+  perf(marker: string, ...args: any[]): void;
+}
+
+const emptySquare = '\u25a1';
+const square = '\u25a0';
+const triangle = '\u25b2';
+
+export const logger: Logger = {
+  enableVerbose: !!argv.verbose,
+
+  verbose(...args: any[]) {
+    if (logger.enableVerbose) {
+      logInternal('info', chalk.gray(emptySquare), ...args);
+    }
+  },
+
+  info(...args: any[]) {
+    logInternal('info', chalk.green(square), ...args);
+  },
+
+  warn(...args: any[]) {
+    logInternal('warn', chalk.yellow(triangle), ...args);
+  },
+
+  error(...args: any[]) {
+    logInternal('error', chalk.redBright('x'), ...args);
+  },
+
+  perf(marker: string, ...args: any[]) {
+    if (logger.enableVerbose) {
+      const delta = getDeltaAndClearMark(marker);
+
+      if (delta) {
+        const ns = delta[0] * 1e9 + delta[1];
+        const deltaMsg = `${ns / 1e9}s`;
+        logInternal(
+          'info',
+          chalk.cyan(square),
+          `mark(${chalk.cyanBright(marker)}): took ${chalk.cyanBright(deltaMsg)}`,
+          ...args,
+        );
+      }
+    }
+  },
+};

package/src/package/findDependents.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { resolveCwd } from '../resolve';
 import { findPackageRoot } from './findPackageRoot';
-import { logger, mark } from 'just-task-logger';
+import { logger, mark } from '../logger';
 import { findGitRoot } from './findGitRoot';
 import { isChildOf } from '../paths';