@datatruck/cli 0.32.3 → 0.34.0

package/config.schema.json

@@ -4,6 +4,9 @@
     "$schema": {
       "type": "string"
     },
+    "hostname": {
+      "type": "string"
+    },
     "tempDir": {
       "type": "string"
     },
@@ -493,7 +496,7 @@
             }
           },
           "prunePolicy": {
-            "$ref": "#/definitions/PrunePolicyConfig"
+            "$ref": "#/definitions/DatatruckPolicyConfig"
           },
           "repositoryConfigs": {
             "type": "array",
@@ -717,7 +720,7 @@
       }
     },
     "prunePolicy": {
-      "$ref": "#/definitions/PrunePolicyConfig"
+      "$ref": "#/definitions/DatatruckPolicyConfig"
     }
   },
   "additionalProperties": false,
@@ -894,7 +897,7 @@
     "RepositoryEnabledObject": {
       "type": "object",
       "properties": {
-        "snapshots": {
+        "backup": {
           "type": "boolean"
         },
         "init": {
@@ -903,10 +906,10 @@
         "prune": {
           "type": "boolean"
         },
-        "backup": {
+        "restore": {
           "type": "boolean"
         },
-        "restore": {
+        "snapshots": {
           "type": "boolean"
         },
         "defaults": {
@@ -959,21 +962,21 @@
         "path": {
           "type": "string"
         },
-        "protocol": {
-          "enum": [
-            "http",
-            "https"
-          ],
+        "username": {
           "type": "string"
         },
         "host": {
           "type": "string"
         },
-        "username": {
-          "type": "string"
-        },
         "port": {
           "type": "number"
+        },
+        "protocol": {
+          "enum": [
+            "http",
+            "https"
+          ],
+          "type": "string"
         }
       }
     },
@@ -1188,7 +1191,7 @@
         }
       }
     },
-    "PrunePolicyConfig": {
+    "DatatruckPolicyConfig": {
       "type": "object",
       "properties": {
         "tags": {
@@ -1197,6 +1200,17 @@
             "type": "string"
           }
         },
+        "groupBy": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "packageName",
+              "repositoryName",
+              "repositoryType"
+            ],
+            "type": "string"
+          }
+        },
         "keepDaily": {
           "type": "number"
         },
@@ -1217,17 +1231,6 @@
         },
         "keepYearly": {
           "type": "number"
-        },
-        "groupBy": {
-          "type": "array",
-          "items": {
-            "enum": [
-              "packageName",
-              "repositoryName",
-              "repositoryType"
-            ],
-            "type": "string"
-          }
         }
       },
       "additionalProperties": false
@@ -1392,10 +1395,101 @@
     "CronAction": {
       "anyOf": [
         {
+          "additionalProperties": false,
           "type": "object",
           "properties": {
             "schedule": {
-              "type": "string"
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "minute": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "hour": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "day": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "month": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "weekDay": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "string"
+                }
+              ]
             },
             "name": {
               "type": "string",
@@ -1431,14 +1525,104 @@
               },
               "additionalProperties": false
             }
-          },
-          "additionalProperties": false
+          }
         },
         {
+          "additionalProperties": false,
           "type": "object",
           "properties": {
             "schedule": {
-              "type": "string"
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "minute": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "hour": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "day": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "month": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "weekDay": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "string"
+                }
+              ]
             },
             "name": {
               "type": "string",
@@ -1468,10 +1652,172 @@
               },
               "additionalProperties": false
             }
-          },
-          "additionalProperties": false
+          }
+        },
+        {
+          "additionalProperties": false,
+          "type": "object",
+          "properties": {
+            "schedule": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "minute": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "hour": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "day": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "month": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    },
+                    "weekDay": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "each": {
+                              "type": "number"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "number"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            },
+            "name": {
+              "type": "string",
+              "const": "prune"
+            },
+            "options": {
+              "$ref": "#/definitions/PruneCommandOptions"
+            }
+          }
         }
       ]
+    },
+    "PruneCommandOptions": {
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "keepLast": {
+          "type": "number"
+        },
+        "keepMinutely": {
+          "type": "number"
+        },
+        "keepHourly": {
+          "type": "number"
+        },
+        "keepDaily": {
+          "type": "number"
+        },
+        "keepWeekly": {
+          "type": "number"
+        },
+        "keepMonthly": {
+          "type": "number"
+        },
+        "keepYearly": {
+          "type": "number"
+        },
+        "id": {
+          "type": "string"
+        },
+        "longId": {
+          "type": "boolean"
+        },
+        "package": {
+          "type": "string"
+        },
+        "repository": {
+          "type": "string"
+        },
+        "repositoryType": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        },
+        "groupBy": {
+          "type": "string"
+        },
+        "dryRun": {
+          "type": "boolean"
+        },
+        "showAll": {
+          "type": "boolean"
+        },
+        "confirm": {
+          "type": "boolean"
+        }
+      }
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"

package/lib/{Action → actions}/BackupAction.d.ts

@@ -1,8 +1,7 @@
-import type { Config } from "../Config/Config";
-import { PackageConfig } from "../Config/PackageConfig";
-import { RepositoryConfig } from "../Config/RepositoryConfig";
-import { PreSnapshot } from "../Repository/RepositoryAbstract";
+import { PreSnapshot } from "../repositories/RepositoryAbstract";
 import { DataFormat } from "../utils/DataFormat";
+import type { Config, PackageConfig, RepositoryConfig } from "../utils/datatruck/config-type";
+import { ReportListTaskContext } from "../utils/datatruck/report-list";
 import { Listr3TaskResultEnd } from "../utils/list";
 import { Progress, ProgressMode } from "../utils/progress";
 import { Streams } from "../utils/stream";
@@ -32,22 +31,21 @@ type Context = {
     backup: {
         packageName: string;
         repositoryName: string;
+        bytes: number;
     };
     cleanup: {};
     copy: {
         packageName: string;
         repositoryName: string;
         mirrorRepositoryName: string;
+        bytes: number;
     };
     prune: {
         packageName: string;
         total: number;
         pruned: number;
     };
-    report: {
-        type: string;
-    };
-};
+} & ReportListTaskContext;
 export declare class BackupAction<TRequired extends boolean = true> {
     readonly config: Config;
     readonly options: IfRequireKeys<TRequired, BackupActionOptions>;
@@ -64,26 +62,22 @@ export declare class BackupAction<TRequired extends boolean = true> {
         snapshotPath: string | undefined;
         pkg: PackageConfig;
         onProgress: (data: Progress) => void;
-    }): Promise<void>;
+    }): Promise<{
+        bytes: number;
+    }>;
     protected copy(data: {
         repositoryName: string;
         mirrorRepositoryName: string;
         snapshot: PreSnapshot;
         pkg: PackageConfig;
         onProgress: (data: Progress) => void;
-    }): Promise<void>;
+    }): Promise<{
+        bytes: number;
+    }>;
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
         streams?: Streams;
         verbose?: number;
     }): DataFormat;
-    exec(): Promise<({
-        key: "summary";
-        keyIndex?: string | undefined;
-        data: {
-            errors: number;
-        };
-        elapsed: number;
-        error?: Error | undefined;
-    } | import("../utils/list").Listr3TaskResult<Context>)[]>;
+    exec(): Promise<(import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[]>;
 }
 export {};