@wocker/core 1.0.25 → 1.0.26-beta.0

package/lib/modules/project/types/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ProjectType"), exports);
+__exportStar(require("./ProjectV1"), exports);
+__exportStar(require("./ServiceProperties"), exports);

package/lib/services/AppConfigService.d.ts

@@ -41,12 +41,14 @@ export declare class AppConfigService {
      * @deprecated
      */
     getConfig(): AppConfig;
-    addProject(id: string, name: string, path: string): void;
-    removeProject(id: string): void;
+    addProject(name: string, path: string): void;
+    removeProject(name: string): void;
     registerPreset(name: string, source: PresetSource, path?: string): void;
     unregisterPreset(name: string): void;
     addPlugin(name: string, env?: PluginRef["env"]): void;
     removePlugin(name: string): void;
+    setEnv(name: string, value: string): void;
+    unsetEnv(name: string): void;
     getMeta(name: string, byDefault?: string): string | undefined;
     getMeta(name: string, byDefault: string): string;
     setMeta(name: string, value: string): void;

package/lib/services/AppConfigService.js

@@ -19,7 +19,7 @@ exports.AppConfigService = void 0;
 const path_1 = __importDefault(require("path"));
 const decorators_1 = require("../decorators");
 const AppConfig_1 = require("../makes/AppConfig");
-const Project_1 = require("../makes/Project");
+const modules_1 = require("../modules");
 const AppFileSystemService_1 = require("./AppFileSystemService");
 const ProcessService_1 = require("./ProcessService");
 const env_1 = require("../env");
@@ -29,16 +29,17 @@ let AppConfigService = class AppConfigService {
         this.processService = processService;
         this.fs = fs;
         this.mapTypes = {
-            [Project_1.PROJECT_TYPE_PRESET]: "Preset",
-            [Project_1.PROJECT_TYPE_IMAGE]: "Image",
-            [Project_1.PROJECT_TYPE_DOCKERFILE]: "Dockerfile"
+            [modules_1.PROJECT_TYPE_PRESET]: "Preset",
+            [modules_1.PROJECT_TYPE_IMAGE]: "Image",
+            [modules_1.PROJECT_TYPE_DOCKERFILE]: "Dockerfile"
         };
         this._pwd = (process.cwd() || process.env.PWD);
     }
     get experimentalFeatures() {
         return [
             "projectComposeType",
-            "buildKit"
+            "buildKit",
+            "dns"
         ];
     }
     get debug() {
@@ -135,11 +136,11 @@ let AppConfigService = class AppConfigService {
     getConfig() {
         return this.config;
     }
-    addProject(id, name, path) {
-        this.config.addProject(id, name, path);
+    addProject(name, path) {
+        this.config.addProject(name, path);
     }
-    removeProject(id) {
-        this.config.removeProject(id);
+    removeProject(name) {
+        this.config.removeProject(name);
         this.save();
     }
     registerPreset(name, source, path) {
@@ -156,6 +157,12 @@ let AppConfigService = class AppConfigService {
     removePlugin(name) {
         this.config.removePlugin(name);
     }
+    setEnv(name, value) {
+        this.config.setEnv(name, value);
+    }
+    unsetEnv(name) {
+        this.config.unsetEnv(name);
+    }
     getMeta(name, byDefault) {
         return this.config.getMeta(name, byDefault);
     }
@@ -170,7 +177,7 @@ let AppConfigService = class AppConfigService {
     }
     getProjectTypes() {
         if (this.isExperimentalEnabled("projectComposeType")) {
-            return Object.assign(Object.assign({}, this.mapTypes), { [Project_1.PROJECT_TYPE_COMPOSE]: "Docker compose" });
+            return Object.assign(Object.assign({}, this.mapTypes), { [modules_1.PROJECT_TYPE_COMPOSE]: "Docker compose" });
         }
         return this.mapTypes;
     }
@@ -182,7 +189,7 @@ let AppConfigService = class AppConfigService {
             });
         }
         fs.writeFile("wocker.config.js", this.config.toJsString());
-        fs.writeFile("wocker.config.json", this.config.toString()); // Backup file
+        fs.writeJSON("wocker.config.json", this.config.toObject()); // Backup file
         if (fs.exists("data.json")) {
             fs.rm("data.json");
         }

package/lib/services/AppService.d.ts

@@ -13,7 +13,7 @@ export declare class AppService {
     isVersionGTE(version: string): boolean;
     get experimentalFeatures(): string[];
     getProjectTypes(): TypeMap;
-    addProject(id: string, name: string, path: string): void;
+    addProject(name: string, path: string): void;
     getMeta(name: string, byDefault?: string): string | undefined;
     getMeta(name: string, byDefault: string): string;
 }

package/lib/services/AppService.js

@@ -45,8 +45,8 @@ let AppService = class AppService {
     getProjectTypes() {
         return this.appConfigService.getProjectTypes();
     }
-    addProject(id, name, path) {
-        this.appConfigService.addProject(id, name, path);
+    addProject(name, path) {
+        this.appConfigService.addProject(name, path);
         this.appConfigService.save();
     }
     getMeta(name, byDefault) {

package/lib/services/index.d.ts

@@ -10,5 +10,4 @@ export * from "./PluginConfigService";
 export * from "./PluginFileSystemService";
 export * from "./PresetService";
 export * from "./ProcessService";
-export * from "./ProjectService";
 export * from "./ProxyService";

package/lib/services/index.js

@@ -26,5 +26,4 @@ __exportStar(require("./PluginConfigService"), exports);
 __exportStar(require("./PluginFileSystemService"), exports);
 __exportStar(require("./PresetService"), exports);
 __exportStar(require("./ProcessService"), exports);
-__exportStar(require("./ProjectService"), exports);
 __exportStar(require("./ProxyService"), exports);

package/lib/types/ArgMeta.d.ts

@@ -2,5 +2,6 @@ export type ArgMeta = {
     index: number;
     type: "param" | "option";
     name: string;
+    description?: string;
     params: any;
 };

package/lib/types/DynamicModule.d.ts

@@ -0,0 +1,9 @@
+import { InjectionToken } from "./InjectionToken";
+import { Type } from "./Type";
+import { ModuleMetadata } from "./ModuleMetadata";
+export type DynamicModule = ModuleMetadata & {
+    module: Type;
+    global?: boolean;
+    inject?: Array<InjectionToken | Type>;
+    useFactory?: (...args: any[]) => ModuleMetadata | Promise<ModuleMetadata>;
+};

package/lib/types/DynamicModule.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/ModuleMetadata.d.ts

@@ -0,0 +1,11 @@
+import { MODULE_METADATA } from "../env";
+import { ProviderType } from "./ProviderType";
+import { Type } from "./Type";
+import { DynamicModule } from "./DynamicModule";
+import { InjectionToken } from "./InjectionToken";
+export type ModuleMetadata = {
+    [MODULE_METADATA.IMPORTS]?: Array<Type | DynamicModule>;
+    [MODULE_METADATA.CONTROLLERS]?: Type[];
+    [MODULE_METADATA.PROVIDERS]?: ProviderType[];
+    [MODULE_METADATA.EXPORTS]?: Array<InjectionToken | Type>;
+};

package/lib/types/ModuleMetadata.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const env_1 = require("../env");

package/lib/types/PluginMetadata.d.ts

@@ -0,0 +1,5 @@
+import { ModuleMetadata } from "./ModuleMetadata";
+import { PLUGIN_NAME_METADATA } from "../env";
+export type PluginMetadata = ModuleMetadata & {
+    [PLUGIN_NAME_METADATA]: string;
+};

package/lib/types/PluginMetadata.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const env_1 = require("../env");

package/lib/types/index.d.ts

@@ -1,6 +1,20 @@
+export * from "./DynamicModule";
 export * from "./EnvConfig";
 export * from "./FileSystemDriver";
 export * from "./InjectionToken";
+export * from "./ModuleMetadata";
 export * from "./PickProperties";
+export * from "./PluginMetadata";
+export * from "./Type";
 export * from "./Volume";
 export * from "./ProviderType";
+export type { 
+/**
+ * @deprecated
+ */
+ModuleMetadata as ModuleConfig } from "./ModuleMetadata";
+export type { 
+/**
+ * @deprecated
+ */
+PluginMetadata as PluginConfig } from "./PluginMetadata";

package/lib/types/index.js

@@ -14,9 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./DynamicModule"), exports);
 __exportStar(require("./EnvConfig"), exports);
 __exportStar(require("./FileSystemDriver"), exports);
 __exportStar(require("./InjectionToken"), exports);
+__exportStar(require("./ModuleMetadata"), exports);
 __exportStar(require("./PickProperties"), exports);
+__exportStar(require("./PluginMetadata"), exports);
+__exportStar(require("./Type"), exports);
 __exportStar(require("./Volume"), exports);
 __exportStar(require("./ProviderType"), exports);

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "@wocker/core",
-    "version": "1.0.25",
+    "type": "commonjs",
+    "version": "1.0.26-beta.0",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",
@@ -28,9 +29,6 @@
     "dependencies": {
         "@kearisp/cli": "^2.0.8",
         "date-fns": "^4.1.0",
-        "fs": "^0.0.1-security",
-        "os": "^0.1.2",
-        "path": "^0.12.7",
         "readline": "^1.3.0",
         "reflect-metadata": "^0.2.2",
         "stream": "^0.0.3",
@@ -39,14 +37,14 @@
     "devDependencies": {
         "@types/docker-modem": "^3.0.6",
         "@types/dockerode": "^3.3.23",
-        "@types/jest": "^29.5.14",
-        "@types/node": "^24.0.13",
-        "jest": "^29.7.0",
+        "@types/jest": "^30.0.0",
+        "@types/node": "^24.5.2",
+        "jest": "^30.1.3",
         "make-coverage-badge": "^1.2.0",
         "memfs": "^4.17.1",
-        "ts-jest": "^29.3.2",
+        "ts-jest": "^29.4.4",
         "ts-node": "^10.9.2",
-        "typescript": "^5.8.3",
+        "typescript": "^5.9.2",
         "unionfs": "^4.5.4"
     }
 }

package/lib/makes/Project.js

@@ -1,200 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROJECT_TYPE_COMPOSE = exports.PROJECT_TYPE_PRESET = exports.PROJECT_TYPE_IMAGE = exports.PROJECT_TYPE_DOCKERFILE = exports.Project = void 0;
-const volumeParse_1 = require("../utils/volumeParse");
-class Project {
-    constructor(data) {
-        Object.assign(this, data);
-    }
-    get containerName() {
-        return `${this.name}.workspace`;
-    }
-    get domains() {
-        const host = this.getEnv("VIRTUAL_HOST");
-        if (!host) {
-            return [];
-        }
-        return host.split(",");
-    }
-    hasDomain(domain) {
-        return this.domains.includes(domain);
-    }
-    addDomain(addDomain) {
-        let domains = [
-            ...this.domains.filter((domain) => {
-                return domain !== addDomain;
-            }),
-            addDomain
-        ];
-        this.setEnv("VIRTUAL_HOST", domains.join(","));
-    }
-    removeDomain(removeDomain) {
-        if (!this.hasDomain(removeDomain)) {
-            return;
-        }
-        let domains = this.domains.filter((domain) => {
-            return domain !== removeDomain;
-        });
-        this.setEnv("VIRTUAL_HOST", domains.join(","));
-    }
-    clearDomains() {
-        this.unsetEnv("VIRTUAL_HOST");
-    }
-    linkPort(hostPort, containerPort) {
-        if (!this.ports) {
-            this.ports = [];
-        }
-        this.ports = [
-            ...this.ports.filter((link) => {
-                return link !== `${hostPort}:${containerPort}`;
-            }),
-            `${hostPort}:${containerPort}`
-        ];
-    }
-    unlinkPort(hostPort, containerPort) {
-        if (!this.ports) {
-            return;
-        }
-        this.ports = this.ports.filter((link) => {
-            return link !== `${hostPort}:${containerPort}`;
-        });
-        if (this.ports.length === 0) {
-            delete this.ports;
-        }
-    }
-    hasEnv(name) {
-        if (!this.env) {
-            return false;
-        }
-        return this.env.hasOwnProperty(name);
-    }
-    getEnv(name, defaultValue) {
-        const { [name]: value = defaultValue } = this.env || {};
-        return value;
-    }
-    setEnv(name, value) {
-        if (!this.env) {
-            this.env = {};
-        }
-        this.env[name] = typeof value === "boolean"
-            ? (value ? "true" : "false")
-            : value;
-    }
-    unsetEnv(name) {
-        if (!this.env) {
-            return;
-        }
-        if (name in this.env) {
-            delete this.env[name];
-        }
-        if (Object.keys(this.env).length === 0) {
-            delete this.env;
-        }
-    }
-    hasMeta(name) {
-        return !!this.metadata && this.metadata.hasOwnProperty(name);
-    }
-    getMeta(name, defaultValue) {
-        const { [name]: value = defaultValue } = this.metadata || {};
-        return value;
-    }
-    setMeta(name, value) {
-        if (!this.metadata) {
-            this.metadata = {};
-        }
-        this.metadata[name] = typeof value === "boolean"
-            ? (value ? "true" : "false")
-            : value;
-    }
-    unsetMeta(name) {
-        if (!this.metadata) {
-            return;
-        }
-        if (name in this.metadata) {
-            delete this.metadata[name];
-        }
-        if (Object.keys(this.metadata).length === 0) {
-            delete this.metadata;
-        }
-    }
-    getVolumeBySource(source) {
-        return (this.volumes || []).find((volume) => {
-            return (0, volumeParse_1.volumeParse)(volume).source === source;
-        });
-    }
-    getVolumeByDestination(destination) {
-        return (this.volumes || []).find((volume) => {
-            return (0, volumeParse_1.volumeParse)(volume).destination === destination;
-        });
-    }
-    volumeMount(...volumes) {
-        if (volumes.length === 0) {
-            return;
-        }
-        const [volume, ...restVolumes] = volumes;
-        const { destination } = (0, volumeParse_1.volumeParse)(volume);
-        this.volumes = [
-            ...(this.volumes || []).filter((v) => {
-                return v !== this.getVolumeByDestination(destination);
-            }),
-            volume
-        ];
-        this.volumeMount(...restVolumes);
-    }
-    volumeUnmount(...volumes) {
-        if (!this.volumes || volumes.length === 0) {
-            return;
-        }
-        const [volume, ...restVolumes] = volumes;
-        const v = (0, volumeParse_1.volumeParse)(volume);
-        this.volumes = this.volumes.filter((mounted) => {
-            const m = (0, volumeParse_1.volumeParse)(mounted);
-            return v.source !== m.source && v.destination !== m.destination;
-        });
-        if (this.volumes.length === 0) {
-            delete this.volumes;
-            return;
-        }
-        this.volumeUnmount(...restVolumes);
-    }
-    addExtraHost(host, domain) {
-        if (!this.extraHosts) {
-            this.extraHosts = {};
-        }
-        this.extraHosts[host] = domain;
-    }
-    removeExtraHost(host) {
-        if (!this.extraHosts || !this.extraHosts[host]) {
-            return;
-        }
-        delete this.extraHosts[host];
-        if (Object.keys(this.extraHosts).length === 0) {
-            delete this.extraHosts;
-        }
-    }
-    toObject() {
-        return {
-            id: this.id,
-            name: this.name,
-            type: this.type,
-            path: this.path,
-            preset: this.preset,
-            presetMode: this.presetMode,
-            imageName: this.imageName,
-            dockerfile: this.dockerfile,
-            composefile: this.composefile,
-            scripts: this.scripts,
-            ports: this.ports,
-            volumes: this.volumes,
-            env: this.env,
-            buildArgs: this.buildArgs,
-            extraHosts: this.extraHosts,
-            metadata: this.metadata
-        };
-    }
-}
-exports.Project = Project;
-exports.PROJECT_TYPE_DOCKERFILE = "dockerfile";
-exports.PROJECT_TYPE_IMAGE = "image";
-exports.PROJECT_TYPE_PRESET = "preset";
-exports.PROJECT_TYPE_COMPOSE = "compose";