@datatruck/cli 0.11.0 → 0.11.3

package/Repository/GitRepository.js

@@ -124,7 +124,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 return result;
             if (pkgPatterns && !(0, micromatch_1.isMatch)(parsedTag.package, pkgPatterns))
                 return result;
-            if (pkgTaskPatterns && !(0, micromatch_1.isMatch)(parsedTag.task || "", pkgTaskPatterns))
+            if (pkgTaskPatterns && !(0, string_util_1.checkMatch)(parsedTag.task, pkgTaskPatterns))
                 return result;
             if (data.options.tags &&
                 !parsedTag.tags.some((value) => data.options.tags?.includes(value)))

package/Repository/LocalRepository.js

@@ -138,7 +138,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 continue;
             const metaPath = (0, path_1.join)(this.config.outPath, snapshotName);
             const meta = await LocalRepository.parseMetaData(metaPath);
-            if (taskPatterns && !(0, micromatch_1.isMatch)(meta.task || "", taskPatterns))
+            if (taskPatterns && !(0, string_util_1.checkMatch)(meta.task, taskPatterns))
                 continue;
             if (data.options.ids &&
                 !data.options.ids.some((id) => meta.id.startsWith(id)))

package/Repository/ResticRepository.js

@@ -139,7 +139,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 return items;
             if (packagePatterns && !(0, micromatch_1.isMatch)(tag.package, packagePatterns))
                 return items;
-            if (taskNamePatterns && !(0, micromatch_1.isMatch)(tag.task || "", taskNamePatterns))
+            if (taskNamePatterns && !(0, string_util_1.checkMatch)(tag.task, taskNamePatterns))
                 return items;
             const itemTags = tag.tags ?? [];
             if (data.options.tags && !itemTags.some((t) => itemTags.includes(t)))

package/Task/MysqlDumpTask.js

@@ -66,6 +66,8 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         information_schema.tables
       WHERE
         table_schema = '${database}'
+      ORDER BY
+        table_name
 	`);
     }
     async onExportTables(tableNames, output) {

package/Task/PostgresqlDumpTask.js

@@ -69,6 +69,8 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
       WHERE
         table_catalog = '${database}' AND
         table_schema NOT IN ('pg_catalog', 'information_schema')
+      ORDER BY
+        CONCAT(table_schema, '.', table_name)
 	  `);
     }
     async onExportTables(tableNames, output) {

package/package.json

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

package/util/fs-util.js

@@ -395,7 +395,7 @@ async function cpy(options) {
             stats.files++;
             // https://github.com/nodejs/node/issues/44261
             if (exports.isWSLSystem) {
-                const fileInfo = await (0, promises_1.stat)(entryTargetPath);
+                const fileInfo = await (0, promises_1.stat)(entrySourcePath);
                 const isWritable = (fileInfo.mode & 0o200) === 0o200;
                 if (!isWritable) {
                     await copyFileWithStreams(entrySourcePath, entryTargetPath);

package/util/string-util.d.ts

@@ -15,4 +15,5 @@ export declare type UriType = {
 export declare function formatUri(input: UriType, hidePassword?: boolean): string;
 export declare function formatSeconds(seconds: number): string;
 export declare function makePathPatterns(values: string[] | undefined): string[] | undefined;
+export declare function checkMatch(subject: string | undefined, patterns: string[]): boolean;
 export declare function formatDateTime(datetime: string): string;

package/util/string-util.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDateTime = exports.makePathPatterns = exports.formatSeconds = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = exports.lcfirst = exports.ucfirst = exports.serialize = void 0;
+exports.formatDateTime = exports.checkMatch = exports.makePathPatterns = exports.formatSeconds = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = exports.lcfirst = exports.ucfirst = exports.serialize = void 0;
 const AppError_1 = require("../Error/AppError");
+const micromatch_1 = require("micromatch");
 function serialize(message, data) {
     if (data)
         return `${message} (${JSON.stringify(data, null, 2)})`;
@@ -88,9 +89,22 @@ function formatSeconds(seconds) {
 }
 exports.formatSeconds = formatSeconds;
 function makePathPatterns(values) {
-    return values?.flatMap((v) => [v, `${v}/**`]);
+    return values?.flatMap((v) => {
+        if (v === "*" || v === "**" || v === "<empty>" || v === "!<empty>") {
+            return [v];
+        }
+        else {
+            return [v, `${v}/**`];
+        }
+    });
 }
 exports.makePathPatterns = makePathPatterns;
+function checkMatch(subject, patterns) {
+    if (!subject?.length)
+        subject = "<empty>";
+    return (0, micromatch_1.isMatch)(subject, patterns);
+}
+exports.checkMatch = checkMatch;
 function formatDateTime(datetime) {
     const date = new Date(datetime);
     const [result] = new Date(date.getTime() - date.getTimezoneOffset() * 60000)

package/util/zip-util.js

@@ -31,7 +31,7 @@ function buildArguments(filters) {
 }
 exports.buildArguments = buildArguments;
 function parseZipStream(chunk, buffer, cb) {
-    const lines = chunk.trim().split(/\r?\n/g);
+    const lines = chunk.replaceAll("\b", "").trim().split(/\r?\n/);
     for (const line of lines) {
         let matches = null;
         if ((matches = /^(\d+)% (\d+ )?\+/.exec(line))) {