@datatruck/cli 0.3.2 → 0.4.0

package/Action/ConfigAction.d.ts

@@ -1,3 +1,4 @@
+import { GlobalOptionsType } from "../Command/CommandAbstract";
 import type { ConfigType } from "../Config/Config";
 import { IfRequireKeys } from "../util/ts-util";
 export declare type ConfigActionOptionsType = {
@@ -10,5 +11,9 @@ export declare class ConfigAction<TRequired extends boolean = true> {
     static validate(config: ConfigType): void;
     static check(config: ConfigType): void;
     static normalize(config: ConfigType): ConfigType;
-    exec(): Promise<ConfigType>;
+    static fromGlobalOptions(globalOptions: GlobalOptionsType<true>): Promise<ConfigType>;
+    exec(): Promise<{
+        path: string;
+        data: ConfigType;
+    }>;
 }

package/Action/ConfigAction.js

@@ -53,12 +53,28 @@ class ConfigAction {
         });
         return config;
     }
+    static async fromGlobalOptions(globalOptions) {
+        if (typeof globalOptions.config === "string") {
+            const configAction = new ConfigAction({
+                path: globalOptions.config,
+                verbose: !!globalOptions.verbose && globalOptions.verbose > 0,
+            });
+            const result = await configAction.exec();
+            return result.data;
+        }
+        else {
+            return globalOptions.config;
+        }
+    }
     async exec() {
         const path = await (0, fs_util_1.findFile)(this.options.path, "datatruck.config", fs_util_1.parseFileExtensions, "Config path not found");
         const config = await (0, fs_util_1.parseFile)(path, "config");
         ConfigAction.validate(config);
         ConfigAction.check(config);
-        return ConfigAction.normalize(config);
+        return {
+            path,
+            data: ConfigAction.normalize(config),
+        };
     }
 }
 exports.ConfigAction = ConfigAction;

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @datatruck/cli
 
+## 0.4.0
+
+### Minor Changes
+
+- [`eeb00a6`](https://github.com/swordev/datatruck/commit/eeb00a69d75c91da40711ae79475612b1d5193b6) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `tempDir` config option
+
 ## 0.3.2
 
 ### Patch Changes

package/Command/BackupCommand.js

@@ -44,11 +44,7 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
     }
     async onExec() {
         const verbose = this.globalOptions.verbose ?? 0;
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: verbose > 0,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const backup = new BackupAction_1.BackupAction(config, {
             packageNames: this.options.package,
             repositoryNames: this.options.repository,

package/Command/BackupSessionsCommand.js

@@ -37,11 +37,7 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
     }
     async onExec() {
         const verbose = this.globalOptions.verbose ?? 0;
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: verbose > 0,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const action = new BackupSessionsAction_1.BackupSessionsAction(config, {
             packageNames: this.options.package,
             repositoryNames: this.options.repository,

package/Command/CommandAbstract.d.ts

@@ -1,8 +1,9 @@
+import { ConfigType } from "../Config/Config";
 import { FormatType } from "../util/DataFormat";
 import { OptionsType } from "../util/cli-util";
 import { SimilarObject } from "../util/ts-util";
 export declare type GlobalOptionsType<TResolved = false> = {
-    config: string;
+    config: string | ConfigType;
     outputFormat?: FormatType;
     verbose?: number;
 };

package/Command/ConfigCommand.js

@@ -27,11 +27,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
         });
     }
     async onExec() {
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: !!this.globalOptions.verbose,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const packages = (0, config_util_1.filterPackages)(config, {
             packageNames: this.options.package,
             repositoryNames: this.options.repository,

package/Command/InitCommand.js

@@ -25,11 +25,7 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
     }
     async onExec() {
         const verbose = this.globalOptions.verbose ?? 0;
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: verbose > 0,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const init = new InitAction_1.InitAction(config, {
             repositoryNames: this.options.repository,
             repositoryTypes: this.options.repositoryType,

package/Command/PruneCommand.js

@@ -101,11 +101,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
     }
     async onExec() {
         const verbose = this.globalOptions.verbose ?? 0;
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: verbose > 0,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const prune = new PruneAction_1.PruneAction(config, {
             ids: this.options.id,
             packageNames: this.options.package,

package/Command/RestoreCommand.js

@@ -40,11 +40,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
     }
     async onExec() {
         const verbose = this.globalOptions.verbose ?? 0;
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: verbose > 0,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const restore = new RestoreAction_1.RestoreAction(config, {
             snapshotId: this.options.id,
             packageNames: this.options.package,

package/Command/RestoreSessionsCommand.js

@@ -37,11 +37,7 @@ class RestoreSessionsCommand extends CommandAbstract_1.CommandAbstract {
     }
     async onExec() {
         const verbose = this.globalOptions.verbose ?? 0;
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: verbose > 0,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const action = new RestoreSessionsAction_1.RestoreSessionsAction(config, {
             packageNames: this.options.package,
             repositoryNames: this.options.repository,

package/Command/SnapshotsCommand.js

@@ -83,11 +83,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
     }
     async onExec() {
         const verbose = this.globalOptions.verbose ?? 0;
-        const configAction = new ConfigAction_1.ConfigAction({
-            path: this.globalOptions.config,
-            verbose: verbose > 0,
-        });
-        const config = await configAction.exec();
+        const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const snapshots = new SnapshotsAction_1.SnapshotsAction(config, {
             ids: this.options.id,
             packageNames: this.options.package,

package/Config/Config.d.ts

@@ -2,6 +2,7 @@ import { PackageConfigType } from "./PackageConfig";
 import { RepositoryConfigType } from "./RepositoryConfig";
 import type { JSONSchema7 } from "json-schema";
 export declare type ConfigType = {
+    tempDir?: string;
     repositories: RepositoryConfigType[];
     packages: PackageConfigType[];
 };

package/Config/Config.js

@@ -8,6 +8,7 @@ exports.configDefinition = {
     additionalProperties: false,
     properties: {
         $schema: { type: "string" },
+        tempDir: { type: "string" },
         repositories: {
             type: "array",
             items: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.repository),

package/cli.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = exports.parseArgs = exports.buildArgs = void 0;
+const ConfigAction_1 = require("./Action/ConfigAction");
 const AppError_1 = require("./Error/AppError");
 const CommandFactory_1 = require("./Factory/CommandFactory");
+const globalData_1 = __importDefault(require("./globalData"));
 const cli_util_1 = require("./util/cli-util");
 const fs_util_1 = require("./util/fs-util");
 const process_util_1 = require("./util/process-util");
@@ -35,7 +40,19 @@ function makeCommandAction(command) {
         let exitCode = 1;
         const globalOptions = getGlobalOptions();
         try {
-            exitCode = await (0, CommandFactory_1.CommandFactory)(command, getGlobalOptions(), options).onExec();
+            const configAction = new ConfigAction_1.ConfigAction({
+                path: globalOptions.config,
+                verbose: !!globalOptions.verbose,
+            });
+            const config = await configAction.exec();
+            if (config.data.tempDir)
+                globalData_1.default.tempDir = (0, path_1.isAbsolute)(config.data.tempDir)
+                    ? config.data.tempDir
+                    : (0, path_1.join)((0, path_1.dirname)(config.path), config.data.tempDir);
+            exitCode = await (0, CommandFactory_1.CommandFactory)(command, {
+                ...globalOptions,
+                config: config.data,
+            }, options).onExec();
         }
         catch (e) {
             const error = e;

package/config.schema.json

@@ -769,6 +769,9 @@
         "$schema": {
           "type": "string"
         },
+        "tempDir": {
+          "type": "string"
+        },
         "repositories": {
           "type": "array",
           "items": {

package/globalData.d.ts

@@ -0,0 +1,5 @@
+declare const globalData: {
+    configDir?: string;
+    tempDir: string;
+};
+export default globalData;

package/globalData.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = require("os");
+const globalData = {
+    tempDir: (0, os_1.tmpdir)(),
+};
+exports.default = globalData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "dependencies": {
     "ajv": "^8.11.0",
     "chalk": "^4.1.2",

package/util/fs-util.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = 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;
+const globalData_1 = __importDefault(require("../globalData"));
 const path_util_1 = require("./path-util");
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
@@ -8,7 +12,6 @@ const fs_2 = require("fs");
 const fs_extra_1 = require("fs-extra");
 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");
 function isLocalDir(path) {
@@ -110,8 +113,7 @@ async function existsFile(path) {
 }
 exports.existsFile = existsFile;
 function parentTmpDir() {
-    const tmpDir = (0, os_1.tmpdir)();
-    return (0, path_1.join)(tmpDir, "datatruck");
+    return (0, path_1.join)(globalData_1.default.tempDir, "datatruck-temp");
 }
 exports.parentTmpDir = parentTmpDir;
 function sessionTmpDir() {