@datatruck/cli 0.10.0 → 0.11.0

package/Command/BackupSessionsCommand.js

@@ -51,8 +51,9 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
             }),
             verbose: verbose > 1,
         });
+        const items = await action.exec(manager);
         const dataFormat = new DataFormat_1.DataFormat({
-            items: await action.exec(manager),
+            items,
             table: {
                 labels: [
                     "   ",
@@ -77,7 +78,13 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.info(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    sids: () => items.map((i) => i.snapshotId).join(),
+                    ssids: () => items.map((i) => i.snapshotId.slice(0, 8)).join(),
+                    pkgNames: () => items.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/Command/ConfigCommand.d.ts

@@ -8,7 +8,7 @@ export declare type ConfigCommandOptionsType<TResolved = false> = {
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
 };
 export declare type ConfigCommandLogType = {
-    package: string;
+    packageName: string;
     repositoryNames: string[];
     taskName: string | undefined;
 }[];

package/Command/ConfigCommand.js

@@ -40,7 +40,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             repositoryTypes: this.options.repositoryType,
         });
         const summaryConfig = packages.flatMap((pkg) => ({
-            package: pkg.name,
+            packageName: pkg.name,
             repositoryNames: pkg.repositoryNames ?? [],
             taskName: pkg.task?.name,
         }));
@@ -49,14 +49,18 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             table: {
                 labels: ["Package", "Repository", "Task"],
                 handler: (item) => [
-                    item.package,
+                    item.packageName,
                     item.repositoryNames.join(", "),
                     item.taskName ?? "",
                 ],
             },
         });
         if (this.globalOptions.outputFormat)
-            console.info(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    pkgNames: () => summaryConfig.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/Command/RestoreSessionsCommand.js

@@ -50,8 +50,9 @@ class RestoreSessionsCommand extends CommandAbstract_1.CommandAbstract {
                 verbose: verbose > 1,
             }),
         });
+        const items = await action.exec(manager);
         const dataFormat = new DataFormat_1.DataFormat({
-            items: await action.exec(manager),
+            items,
             table: {
                 labels: [
                     "   ",
@@ -76,7 +77,13 @@ class RestoreSessionsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.info(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    sids: () => items.map((i) => i.snapshotId).join(),
+                    ssids: () => items.map((i) => i.snapshotId.slice(0, 8)).join(),
+                    pkgNames: () => items.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/Command/SnapshotsCommand.js

@@ -106,8 +106,9 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             verbose: verbose > 0,
             tags: this.options.tag,
         });
+        const items = await snapshots.exec();
         const dataFormat = new DataFormat_1.DataFormat({
-            items: await snapshots.exec(),
+            items,
             table: {
                 labels: [
                     "Id.",
@@ -128,7 +129,13 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.info(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    sids: () => items.map((i) => i.id).join(),
+                    ssids: () => items.map((i) => i.shortId).join(),
+                    pkgNames: () => items.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/cli.js

@@ -78,9 +78,10 @@ const cwd = process.cwd();
 program.name(subname);
 program.version(version);
 program.description(description);
+program.usage("dtt");
 program.option("-v,--verbose", "Verbose", (_, previous) => previous + 1, 0);
 program.option("-c,--config <path>", "Config path", process.env["DATATRUCK_CONFIG"] ?? (cwd.endsWith(path_1.sep) ? cwd : `${cwd}${path_1.sep}`));
-program.option("-o,--output-format <format>", "Output format (json, pjson, yaml, table, custom=$)", "table");
+program.option("-o,--output-format <format>", "Output format (json, pjson, yaml, table, custom=$, tpl=name)", "table");
 makeCommand(CommandFactory_1.CommandEnum.config).alias("c");
 makeCommand(CommandFactory_1.CommandEnum.init).alias("i");
 makeCommand(CommandFactory_1.CommandEnum.snapshots).alias("s");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",

package/util/DataFormat.d.ts

@@ -1,4 +1,4 @@
-export declare type FormatType = "json" | "pjson" | "table" | "yaml" | "custom";
+export declare type FormatType = "json" | "pjson" | "table" | "yaml" | "custom" | "tpl";
 export declare class DataFormat<TItem extends Record<string, unknown>> {
     readonly options: {
         items: TItem[];
@@ -20,5 +20,7 @@ export declare class DataFormat<TItem extends Record<string, unknown>> {
     protected formatToPrettyJson(): string;
     protected formatToYaml(): any;
     protected formatToTable(): string;
-    format(format: FormatType): any;
+    format(format: FormatType, options?: {
+        tpl?: Record<string, () => string>;
+    }): any;
 }

package/util/DataFormat.js

@@ -8,6 +8,7 @@ const AppError_1 = require("../Error/AppError");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const util_1 = require("util");
 const customPrefix = "custom=";
+const tplPrefix = "tpl=";
 class DataFormat {
     constructor(options) {
         this.options = options;
@@ -34,7 +35,7 @@ class DataFormat {
             table.push(this.options.table.handler(item));
         return table.toString();
     }
-    format(format) {
+    format(format, options) {
         if (format === "table") {
             return this.formatToTable();
         }
@@ -51,6 +52,15 @@ class DataFormat {
             const code = format.slice(customPrefix.length);
             return runCustomCode(this.options.items, code);
         }
+        else if (format.startsWith(tplPrefix)) {
+            const name = format.slice(tplPrefix.length);
+            const tpl = options?.tpl || {};
+            if (!(name in tpl)) {
+                const tplNames = Object.keys(tpl).join(", ");
+                throw new AppError_1.AppError(`Template name not found: ${name} (valid names: ${tplNames})`);
+            }
+            return tpl[name]();
+        }
         else {
             throw new AppError_1.AppError(`Invalid output format: ${format}`);
         }

package/util/fs-util.d.ts

@@ -1,6 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
+import { Stats } from "fs";
 import { Interface } from "readline";
+export declare const isWSLSystem: boolean;
 export declare function isLocalDir(path: string): boolean;
 export declare function isDirEmpty(path: string): Promise<boolean>;
 export declare function mkdirIfNotExists(path: string): Promise<string>;
@@ -47,6 +50,8 @@ export declare function writePathLists(options: {
         multipleStats: Record<string, number>;
     };
 }>;
+export declare function copyFileWithStreams(source: string, target: string): Promise<unknown>;
+export declare function updateFileStats(path: string, fileInfo: Stats): Promise<void>;
 export declare function cpy(options: {
     input: {
         type: "glob";

package/util/fs-util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cpy = exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = void 0;
+exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = exports.isWSLSystem = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
 const path_util_1 = require("./path-util");
 const async_1 = require("async");
@@ -13,9 +13,11 @@ const fs_1 = require("fs");
 const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
+const os_1 = require("os");
 const path_1 = require("path");
 const path_2 = require("path");
 const readline_1 = require("readline");
+exports.isWSLSystem = (0, os_1.release)().includes("microsoft-standard-WSL");
 function isLocalDir(path) {
     return /^[\/\.]|([A-Z]:)/i.test(path);
 }
@@ -332,6 +334,30 @@ async function writePathLists(options) {
     };
 }
 exports.writePathLists = writePathLists;
+async function copyFileWithStreams(source, target) {
+    const r = (0, fs_1.createReadStream)(source);
+    const w = (0, fs_2.createWriteStream)(target);
+    try {
+        return await new Promise((resolve, reject) => {
+            r.on("error", reject);
+            w.on("error", reject);
+            w.on("finish", resolve);
+            r.pipe(w);
+        });
+    }
+    catch (error) {
+        r.destroy();
+        w.end();
+        throw error;
+    }
+}
+exports.copyFileWithStreams = copyFileWithStreams;
+async function updateFileStats(path, fileInfo) {
+    await (0, promises_1.utimes)(path, fileInfo.atime, fileInfo.mtime);
+    await (0, promises_1.chmod)(path, fileInfo.mode);
+    await (0, promises_1.chown)(path, fileInfo.uid, fileInfo.gid);
+}
+exports.updateFileStats = updateFileStats;
 async function cpy(options) {
     const stats = { paths: 0, files: 0, dirs: 0 };
     const dirs = new Set();
@@ -367,7 +393,19 @@ async function cpy(options) {
             const dir = (0, path_1.dirname)(entryTargetPath);
             await makeRecursiveDir(dir);
             stats.files++;
-            await (0, promises_1.cp)(entrySourcePath, entryTargetPath);
+            // https://github.com/nodejs/node/issues/44261
+            if (exports.isWSLSystem) {
+                const fileInfo = await (0, promises_1.stat)(entryTargetPath);
+                const isWritable = (fileInfo.mode & 0o200) === 0o200;
+                if (!isWritable) {
+                    await copyFileWithStreams(entrySourcePath, entryTargetPath);
+                    await updateFileStats(entryTargetPath, fileInfo);
+                    return;
+                }
+            }
+            await (0, promises_1.cp)(entrySourcePath, entryTargetPath, {
+                preserveTimestamps: true,
+            });
         }
     };
     const { input } = options;