@wocker/core 1.1.3 → 1.1.4-beta.1

package/lib/makes/AppConfig.d.ts

@@ -1,5 +1,5 @@
 import { FileSystem } from "./FileSystem";
-import { EnvConfig, PackageManagerType, PluginRef, PresetRef, ProjectRef, ProjectOldRef, PresetSource } from "../types";
+import { EnvConfig, PackageManagerType, PluginRef, PresetRef, ProjectRef, ProjectOldRef } from "../types";
 export declare abstract class AppConfig {
     debug?: boolean;
     pm?: PackageManagerType;
@@ -16,8 +16,8 @@ export declare abstract class AppConfig {
     getProjectByPath(path: string): ProjectRef | undefined;
     addProject(name: string, path: string): void;
     removeProject(name: string): void;
-    registerPreset(name: string, source: PresetSource, path?: string): void;
-    unregisterPreset(name: string): void;
+    registerPreset(presetRef: PresetRef): void;
+    unregisterPreset(path: string): void;
     hasMeta(name: string): boolean;
     getMeta(name: string, defaultValue?: string): string | undefined;
     getMeta(name: string, defaultValue: string): string;

package/lib/makes/AppConfig.js

@@ -12,7 +12,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
-const types_1 = require("../types");
 class AppConfig {
     constructor(data) {
         const { plugins = [], presets = [], projects = [] } = data, rest = __rest(data, ["plugins", "presets", "projects"]);
@@ -86,37 +85,30 @@ class AppConfig {
             return projectData.name !== name;
         });
     }
-    registerPreset(name, source, path) {
-        if (source === types_1.PresetSource.INTERNAL) {
+    registerPreset(presetRef) {
+        const { name, path } = presetRef;
+        if (!path) {
             return;
         }
         let presetData = this.presets.find((preset) => {
-            if (source === types_1.PresetSource.EXTERNAL && preset.path === path) {
-                return true;
-            }
-            return preset.name === name;
+            return preset.path === path;
         });
         if (!presetData) {
             presetData = {
                 name,
-                source
+                path
             };
             this.presets.push(presetData);
         }
-        presetData.source = source;
-        if (presetData.source === types_1.PresetSource.EXTERNAL) {
-            presetData.path = path;
-        }
-        else if (presetData.path) {
-            delete presetData.path;
-        }
+        presetData.name = name;
+        presetData.path = path;
     }
-    unregisterPreset(name) {
+    unregisterPreset(path) {
         if (this.presets.length === 0) {
             return;
         }
         this.presets = this.presets.filter((preset) => {
-            return preset.name !== name;
+            return preset.path !== path;
         });
     }
     hasMeta(name) {

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

@@ -1,19 +1,34 @@
 import { PickProperties, PresetSource } from "../../../types";
-type TextOption = {
+export type PresetVariableCondition = {
+    variable: string;
+    equals?: string;
+    notEquals?: string;
+    in?: string[];
+    notIn?: string[];
+    contains?: string;
+    includes?: string | string[];
+};
+type BaseVariableConfig = {
+    when?: PresetVariableCondition;
+};
+type TextOption = BaseVariableConfig & {
     type: "text" | "string" | "number" | "int" | "password";
     message?: string;
     default?: string | number;
 };
-type ConfirmOption = {
+type ConfirmOption = BaseVariableConfig & {
     type: "boolean";
     message?: string;
     required?: boolean;
     default?: boolean;
 };
-type SelectOption = {
+export type PresetSelectMode = "flags" | "variable";
+type SelectOption = BaseVariableConfig & {
     type: "select";
     required?: boolean;
     multiple?: boolean;
+    mode?: PresetSelectMode;
+    delimiter?: string;
     options: string[] | {
         label?: string;
         value: string;
@@ -27,8 +42,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/modules/preset/services/PresetService.d.ts

@@ -3,6 +3,7 @@ import { Preset } from "../makes/Preset";
 type SearchOptions = Partial<{
     name: string;
     source: string;
+    version: string;
     path: string;
 }>;
 declare abstract class PresetService {

package/lib/services/AppConfigService.js

@@ -67,10 +67,21 @@ let AppConfigService = class AppConfigService {
         this.appService.removePlugin(name);
     }
     registerPreset(name, source, path) {
-        this.appService.registerPreset(name, source, path);
+        if (!path) {
+            return;
+        }
+        this.appService.registerPreset({
+            name,
+            source,
+            path
+        });
     }
     unregisterPreset(name) {
-        this.appService.unregisterPreset(name);
+        const preset = this.appService.config.presets.find(p => p.name === name);
+        if (!preset || !preset.path) {
+            return;
+        }
+        this.appService.unregisterPreset(preset.path);
     }
     getEnv(key, byDefault) {
         return this.appService.getEnv(key, byDefault);

package/lib/services/AppService.d.ts

@@ -2,7 +2,7 @@ import { AppConfig } from "../makes/AppConfig";
 import { AppFileSystemService } from "./AppFileSystemService";
 import { ProcessService } from "./ProcessService";
 import { LogService } from "./LogService";
-import { ProjectRef, PluginRef, PresetRef, PresetSource } from "../types";
+import { ProjectRef, PluginRef, PresetRef } from "../types";
 type TypeMap = {
     [type: string]: string;
 };
@@ -28,8 +28,8 @@ export declare class AppService {
     removeProject(name: string): void;
     addPlugin(name: string, env?: PluginRef["env"]): void;
     removePlugin(name: string): void;
-    registerPreset(name: string, source: PresetSource, path?: string): void;
-    unregisterPreset(name: string): void;
+    registerPreset(presetRef: PresetRef): void;
+    unregisterPreset(path: string): void;
     getEnv(key: string, byDefault?: string): string | undefined;
     getEnv(key: string, byDefault: string): string;
     setEnv(key: string, value: string): void;

package/lib/services/AppService.js

@@ -85,12 +85,12 @@ let AppService = class AppService {
         this.config.removePlugin(name);
         this.config.save();
     }
-    registerPreset(name, source, path) {
-        this.config.registerPreset(name, source, path);
+    registerPreset(presetRef) {
+        this.config.registerPreset(presetRef);
         this.config.save();
     }
-    unregisterPreset(name) {
-        this.config.unregisterPreset(name);
+    unregisterPreset(path) {
+        this.config.unregisterPreset(path);
         this.config.save();
     }
     getEnv(key, byDefault) {
@@ -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/lib/types/PresetRef.d.ts

@@ -1,6 +1,7 @@
 import { PresetSource } from "./PresetSource";
 export type PresetRef = {
     name: string;
-    source: PresetSource;
+    /** @deprecated */
+    source?: PresetSource;
     path?: string;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/core",
     "type": "commonjs",
-    "version": "1.1.3",
+    "version": "1.1.4-beta.1",
     "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",