@wocker/core 1.1.3 → 1.1.4-beta.0

package/lib/makes/File.js

@@ -103,7 +103,7 @@ class File {
             throw new Error("Line number must be a non-zero");
         }
         const bufferSize = 1024, isForward = line > 0, targetLine = Math.abs(line), stats = this.stat();
-        let position = isForward ? 0 : stats.size, currentLine = 0, currentOffset = isForward ? 0 : stats.size + 1, stump = "";
+        let position = isForward ? 0 : stats.size, currentLine = 0, currentOffset = isForward ? 0 : stats.size + 1, stump = "", isFirstChunk = true;
         while (isForward ? position < stats.size : position > 0) {
             const readSize = isForward
                 ? Math.min(bufferSize, stats.size - position)
@@ -115,6 +115,11 @@ class File {
             if (isForward) {
                 position += readSize;
             }
+            if (!isForward && isFirstChunk && lines[lines.length - 1] === "") {
+                lines.pop();
+                currentOffset -= 1;
+            }
+            isFirstChunk = false;
             if (isForward ? position === stats.size : position === 0) {
                 stump = "";
             }

package/lib/makes/VersionRange.d.ts

@@ -1,6 +1,8 @@
+import { Version } from "./Version";
 import { VersionRule } from "./VersionRule";
 export declare class VersionRange {
     protected rules: VersionRule[][];
     constructor(rules: VersionRule[][]);
+    match(version: string | Version, withTag?: boolean): boolean;
     static parse(range: string): VersionRange;
 }

package/lib/makes/VersionRange.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionRange = void 0;
+const Version_1 = require("./Version");
 const VersionRule_1 = require("./VersionRule");
 class VersionRange {
     constructor(rules) {
         this.rules = rules;
     }
-    static parse(range) {
-        const rules = range.split("||").map((range) => {
-            return range.split(" ").map((rule) => {
-                return VersionRule_1.VersionRule.parse(rule);
+    match(version, withTag) {
+        if (typeof version === "string") {
+            version = Version_1.Version.parse(version);
+        }
+        return this.rules.some((rules) => {
+            return rules.every((rule) => {
+                return rule.match(version, withTag);
             });
         });
+    }
+    static parse(range) {
+        const rules = range.split("||").map((group) => {
+            return group
+                .trim()
+                .split(/\s+/)
+                .filter((rule) => rule.length > 0)
+                .map((rule) => VersionRule_1.VersionRule.parse(rule));
+        });
         return new VersionRange(rules);
     }
 }

package/lib/modules/docker/services/ContainerService.d.ts

@@ -53,5 +53,6 @@ export declare namespace ContainerService {
     };
     type LogsParams = {
         signal?: AbortSignal;
+        tail?: number;
     };
 }

package/lib/modules/preset/makes/Preset.d.ts

@@ -27,8 +27,8 @@ export type PresetVariableConfig = TextOption | ConfirmOption | SelectOption;
 export type PresetProperties = PickProperties<Preset>;
 export declare abstract class Preset {
     name: string;
-    source?: PresetSource;
     version: string;
+    source?: PresetSource;
     type?: string;
     image?: string;
     dockerfile?: string;

package/lib/services/AppService.js

@@ -119,6 +119,7 @@ let AppService = class AppService {
         return [
             "projectComposeType",
             "buildKit",
+            "presetV2",
             "dns"
         ];
     }

package/lib/services/LogService.js

@@ -38,10 +38,13 @@ let LogService = class LogService {
         const logData = data.map((item) => {
             return typeof item !== "string" ? JSON.stringify(item) : item;
         }).join(" ");
+        const escapedLogData = logData
+            .replace(/\\/g, "\\\\")
+            .replace(/\r\n|\r|\n/g, "\\n");
         if (!this.fs.exists(this.logName)) {
             this.fs.writeFile(this.logName, "");
         }
-        this.fs.appendFile(this.logName, `[${time}] ${type}: ${logData}\n`);
+        this.fs.appendFile(this.logName, `[${time}] ${type}: ${escapedLogData}\n`);
     }
     debug(...data) {
         this._log(types_1.LogLevel.DEBUG, ...data);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/core",
     "type": "commonjs",
-    "version": "1.1.3",
+    "version": "1.1.4-beta.0",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",
@@ -37,7 +37,7 @@
     },
     "devDependencies": {
         "@types/docker-modem": "^3.0.6",
-        "@types/dockerode": "^3.3.23",
+        "@types/dockerode": "^4.0.1",
         "@types/jest": "^30.0.0",
         "@types/node": "^24.5.2",
         "jest": "^30.1.3",