@datatruck/cli 0.13.0 → 0.13.1

package/Repository/DatatruckRepository.js

@@ -273,6 +273,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 basePath: sourcePath,
             },
             targetPath: outPath,
+            skipNotFoundError: true,
             concurrency: this.config.fileCopyConcurrency,
             async onPath({ isDir, entryPath }) {
                 if (isDir)

package/Task/GitTask.js

@@ -169,6 +169,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                     basePath: path,
                 },
                 targetPath: outPath,
+                skipNotFoundError: true,
                 concurrency: this.config.fileCopyConcurrency,
                 onPath: async ({ entryPath }) => {
                     currentFiles++;

package/Task/SqlDumpTaskAbstract.js

@@ -15,6 +15,7 @@ const path_1 = require("path");
 exports.sqlDumpTaskDefinition = {
     type: "object",
     required: ["password", "hostname", "username", "database"],
+    additionalProperties: false,
     properties: {
         password: {
             anyOf: [

package/config.schema.json

@@ -683,6 +683,7 @@
         "username",
         "database"
       ],
+      "additionalProperties": false,
       "properties": {
         "password": {
           "anyOf": [

package/package.json

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

package/util/fs-util.d.ts

@@ -57,6 +57,7 @@ export declare function writePathLists(options: {
 }>;
 export declare function copyFileWithStreams(source: string, target: string): Promise<unknown>;
 export declare function updateFileStats(path: string, fileInfo: Stats): Promise<void>;
+export declare function isNotFoundError(error: unknown): boolean;
 export declare function cpy(options: {
     input: {
         type: "glob";
@@ -77,6 +78,7 @@ export declare function cpy(options: {
      * @default 1
      */
     concurrency?: number;
+    skipNotFoundError?: boolean;
     onPath?: (data: {
         isDir: boolean;
         entryPath: string;

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.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.fastFolderSizeAsync = 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;
+exports.cpy = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.fastFolderSizeAsync = 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");
@@ -373,6 +373,10 @@ async function updateFileStats(path, fileInfo) {
     await (0, promises_1.chown)(path, fileInfo.uid, fileInfo.gid);
 }
 exports.updateFileStats = updateFileStats;
+function isNotFoundError(error) {
+    return error.code === "ENOENT";
+}
+exports.isNotFoundError = isNotFoundError;
 async function cpy(options) {
     const stats = { paths: 0, files: 0, dirs: 0 };
     const dirs = new Set();
@@ -410,17 +414,34 @@ async function cpy(options) {
             stats.files++;
             // https://github.com/nodejs/node/issues/44261
             if (exports.isWSLSystem) {
-                const fileInfo = await (0, promises_1.stat)(entrySourcePath);
-                const isWritable = (fileInfo.mode & 0o200) === 0o200;
-                if (!isWritable) {
-                    await copyFileWithStreams(entrySourcePath, entryTargetPath);
-                    await updateFileStats(entryTargetPath, fileInfo);
-                    return;
+                let fileInfo;
+                try {
+                    fileInfo = await (0, promises_1.stat)(entrySourcePath);
+                }
+                catch (error) {
+                    const skipError = options.skipNotFoundError && isNotFoundError(error);
+                    if (!skipError)
+                        throw error;
+                }
+                if (fileInfo) {
+                    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,
-            });
+            try {
+                await (0, promises_1.cp)(entrySourcePath, entryTargetPath, {
+                    preserveTimestamps: true,
+                });
+            }
+            catch (error) {
+                const skipError = options.skipNotFoundError && isNotFoundError(error);
+                if (!skipError)
+                    throw error;
+            }
         }
     };
     const { input } = options;

package/util/zip-util.d.ts

@@ -45,6 +45,7 @@ export declare type UnzipStreamDataType = {
     };
 };
 export declare function buildArguments(filters: (ZipDataFilterType | string)[]): string[];
+export declare function checkSSEOption(command?: string): Promise<boolean>;
 export declare function zip(data: ZipDataType): Promise<{
     folders: number;
     files: number;

package/util/zip-util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unzip = exports.zip = exports.buildArguments = void 0;
+exports.unzip = exports.zip = exports.checkSSEOption = exports.buildArguments = void 0;
 const process_util_1 = require("./process-util");
 const path_1 = require("path");
 function buildArguments(filters) {
@@ -60,6 +60,14 @@ function parseZipStream(chunk, buffer, cb) {
         }
     }
 }
+let checkSSEOptionResult;
+async function checkSSEOption(command = "7z") {
+    const result = await (0, process_util_1.exec)(command);
+    if (typeof checkSSEOptionResult === "boolean")
+        return checkSSEOptionResult;
+    return (checkSSEOptionResult = result.stdout.includes(" -sse"));
+}
+exports.checkSSEOption = checkSSEOption;
 async function zip(data) {
     let result = {
         folders: 0,
@@ -68,7 +76,9 @@ async function zip(data) {
     let buffer = {};
     await (0, process_util_1.exec)(data.command ?? "7z", [
         "a",
-        "-mmt1",
+        // https://sourceforge.net/p/sevenzip/bugs/2099/,
+        // https://github.com/mcmilk/7-Zip/commit/87ba6f01ba3c5b2ce3186bddfe3d7d880639193c#diff-779d6b1bfa6196b288478f78ca96c4d4c6d7ac6cf8be15a28a20dabc9137ca36L515
+        ...((await checkSSEOption(data.command)) ? [] : ["-mmt1"]),
         "-bsp1",
         ...(data.deleteOnZip ? ["-sdel"] : []),
         (0, path_1.normalize)(data.output),
@@ -79,9 +89,7 @@ async function zip(data) {
         cwd: data.path,
     }, {
         log: data.verbose ?? false,
-        stderr: {
-            toExitCode: true,
-        },
+        onExitCodeError: (data, error) => (data.exitCode > 2 ? error : false),
         stdout: {
             onData: (chunk) => {
                 parseZipStream(chunk, buffer, (stream) => {
@@ -113,7 +121,6 @@ function parseUnzipStream(chunk, cb) {
 async function unzip(data) {
     return await (0, process_util_1.exec)(data.command ?? "7z", [
         "x",
-        "-mmt1",
         "-bsp1",
         (0, path_1.normalize)(data.input),
         ...buildArguments(data.files ?? []),