@datatruck/cli 0.26.1 → 0.26.2

package/Action/RestoreAction.d.ts

@@ -14,7 +14,7 @@ export type RestoreActionOptionsType = {
     repositoryNames?: string[];
     repositoryTypes?: string[];
     verbose?: boolean;
-    noRestorePath?: boolean;
+    restorePath?: boolean;
 };
 type SnapshotType = SnapshotResultType & {
     repositoryName: string;

package/Action/RestoreAction.js

@@ -145,7 +145,7 @@ class RestoreAction {
         });
         let repoError;
         let repoInstance;
-        if (this.options.noRestorePath)
+        if (!this.options.restorePath)
             pkg = {
                 ...pkg,
                 restorePath: pkg.path,

package/Command/RestoreCommand.d.ts

@@ -9,7 +9,7 @@ export type RestoreCommandOptionsType<TResolved = false> = {
     repository?: If<TResolved, string[]>;
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
     tag?: If<TResolved, string[]>;
-    noRestorePath?: boolean;
+    restorePath?: boolean;
 };
 export declare class RestoreCommand extends CommandAbstract<RestoreCommandOptionsType<false>, RestoreCommandOptionsType<true>> {
     onOptions(): import("../utils/cli").OptionsType<RestoreCommandOptionsType<false>, RestoreCommandOptionsType<true>>;

package/Command/RestoreCommand.js

@@ -21,7 +21,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
                 option: "-p,--package <values>",
                 parser: string_1.parseStringList,
             },
-            noRestorePath: {
+            restorePath: {
                 description: "Disable restore path",
                 option: "--no-restore-path",
             },
@@ -63,7 +63,7 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             repositoryTypes: this.options.repositoryType,
             tags: this.options.tag,
             verbose: verbose > 0,
-            noRestorePath: this.options.noRestorePath,
+            restorePath: this.options.restorePath,
         });
         const sessionManager = new RestoreSessionManager_1.RestoreSessionManager({
             driver: new SqliteSessionDriver_1.SqliteSessionDriver({

package/Task/MysqlDumpTask.js

@@ -163,7 +163,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         const database = {
             name: (0, config_1.resolveDatabaseName)(this.config.database, params),
         };
-        if (this.config.targetDatabase && !data.options.noRestorePath)
+        if (this.config.targetDatabase && data.options.restorePath)
             database.name = (0, config_1.resolveDatabaseName)(this.config.targetDatabase.name, {
                 ...params,
                 database: database.name,

package/Task/SqlDumpTaskAbstract.js

@@ -192,7 +192,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 database: undefined,
             }),
         };
-        if (this.config.targetDatabase && !data.options.noRestorePath) {
+        if (this.config.targetDatabase && data.options.restorePath) {
             database.name = (0, config_1.resolveDatabaseName)(this.config.targetDatabase.name, {
                 packageName: data.package.name,
                 snapshotId: data.options.snapshotId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "dependencies": {
     "@supercharge/promise-pool": "^3.1.0",
     "ajv": "^8.12.0",

package/utils/cli.js

@@ -96,7 +96,9 @@ exports.errorColumn = errorColumn;
 function parseOptions(object, options) {
     const result = {};
     for (const key in options) {
-        const value = object?.[key] ?? options[key].defaults;
+        const isNegative = options[key].option.startsWith("--no");
+        const defaultsValue = isNegative ? true : options[key].defaults;
+        const value = object?.[key] ?? defaultsValue;
         const parser = options[key].parser;
         if (typeof value !== "undefined") {
             result[key] = parser ? parser(value) : value;