@wocker/core 1.1.0-beta.2 → 1.1.0-beta.3

package/lib/core/Container.js

@@ -55,8 +55,8 @@ let Container = class Container {
         if (wrapper) {
             wrapper.replace(provider);
         }
-        this.modules.forEach((moduleRef) => {
-            moduleRef.replace(token, provider);
+        this.modules.forEach((moduleWrapper) => {
+            moduleWrapper.replace(token, provider);
         });
     }
 };

package/lib/core/CoreModule.js

@@ -19,6 +19,7 @@ const AppFileSystemService_1 = require("../services/AppFileSystemService");
 const ProcessService_1 = require("../services/ProcessService");
 const EventService_1 = require("../services/EventService");
 const LogService_1 = require("../services/LogService");
+const ProjectRepository_1 = require("../services/ProjectRepository");
 const env_1 = require("../env");
 let CoreModule = class CoreModule {
 };
@@ -43,6 +44,7 @@ exports.CoreModule = CoreModule = __decorate([
             AppService_1.AppService,
             AppConfigService_1.AppConfigService,
             AppFileSystemService_1.AppFileSystemService,
+            ProjectRepository_1.ProjectRepository,
             ProcessService_1.ProcessService,
             EventService_1.EventService,
             LogService_1.LogService
@@ -55,6 +57,7 @@ exports.CoreModule = CoreModule = __decorate([
             AppService_1.AppService,
             AppConfigService_1.AppConfigService,
             AppFileSystemService_1.AppFileSystemService,
+            ProjectRepository_1.ProjectRepository,
             ProcessService_1.ProcessService,
             EventService_1.EventService,
             LogService_1.LogService

package/lib/makes/JsonEditor.d.ts

@@ -0,0 +1,19 @@
+import { JSONPath, Node, ModificationOptions } from "jsonc-parser";
+export declare class JsonEditor<T extends object> {
+    protected readonly original: string;
+    protected content: string;
+    protected root: Node;
+    state: T;
+    constructor(original: string);
+    protected createProxy(keys: JSONPath, options?: JsonEditor.CreateProxyOptions): any;
+    get(key: string | JSONPath): any;
+    set(key: string | JSONPath, value: any, options?: ModificationOptions): void;
+    isDirty(): boolean;
+    toString(): string;
+}
+export declare namespace JsonEditor {
+    type CreateProxyOptions = {
+        isArray?: boolean;
+        removeOnEmpty?: boolean;
+    };
+}

package/lib/makes/JsonEditor.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonEditor = void 0;
+const jsonc_parser_1 = require("jsonc-parser");
+class JsonEditor {
+    constructor(original) {
+        this.original = original;
+        this.content = this.original;
+        this.root = (0, jsonc_parser_1.parseTree)(this.content);
+        this.state = this.createProxy([]);
+    }
+    createProxy(keys, options = {}) {
+        const { isArray, removeOnEmpty } = options;
+        let target = this.get(keys);
+        if (!target) {
+            target = isArray ? [] : {};
+        }
+        return new Proxy(target, {
+            get: (target, property) => {
+                if (target && target.__proto__ && property in target.__proto__) {
+                    if (typeof target[property] === "function") {
+                        return (...args) => {
+                            const res = target[property](...args);
+                            this.set(keys, target, {
+                                formattingOptions: {
+                                    keepLines: false,
+                                    insertSpaces: true
+                                }
+                            });
+                            return res;
+                        };
+                    }
+                    return target[property];
+                }
+                if (Array.isArray(target)) {
+                    property = parseInt(property);
+                }
+                const value = this.get([...keys, property]);
+                if (value !== null && typeof value === "object") {
+                    return this.createProxy([...keys, property]);
+                }
+                return value;
+            },
+            set: (_, property, value) => {
+                if (Array.isArray(_)) {
+                    property = parseInt(property);
+                }
+                this.set([...keys, property], value, {
+                    formattingOptions: {
+                        keepLines: false,
+                        insertSpaces: true
+                    }
+                });
+                if (removeOnEmpty) {
+                    const value = this.get(keys);
+                    if (typeof value === "object" && Object.keys(value).length === 0) {
+                        this.set(keys, undefined);
+                    }
+                }
+                return true;
+            },
+            has: (target, property) => {
+                return property in target;
+            },
+            deleteProperty: (_, property) => {
+                if (Array.isArray(_)) {
+                    property = parseInt(property);
+                }
+                this.set([...keys, property], undefined);
+                if (removeOnEmpty) {
+                    const value = this.get(keys);
+                    if (typeof value === "object" && Object.keys(value).length === 0) {
+                        this.set(keys, undefined);
+                    }
+                }
+                return true;
+            }
+        });
+    }
+    ;
+    get(key) {
+        const path = typeof key === "string" ? key.split(".") : key;
+        const node = (0, jsonc_parser_1.findNodeAtLocation)(this.root, path);
+        if (!node) {
+            return undefined;
+        }
+        return (0, jsonc_parser_1.getNodeValue)(node);
+    }
+    set(key, value, options = {}) {
+        const path = typeof key === "string" ? key.split(".") : key;
+        this.content = (0, jsonc_parser_1.applyEdits)(this.content, (0, jsonc_parser_1.modify)(this.content, path, value, options));
+        this.root = (0, jsonc_parser_1.parseTree)(this.content);
+    }
+    isDirty() {
+        return this.content !== this.original;
+    }
+    toString() {
+        return this.content;
+    }
+}
+exports.JsonEditor = JsonEditor;

package/lib/{modules/project/makes → makes}/Project.d.ts

@@ -1,18 +1,15 @@
-import { EnvConfig, ProjectType } from "../../../types";
-import { ProjectConfigScope } from "../types";
 import { ProjectConfig } from "./ProjectConfig";
+import { EnvConfig, ProjectConfigScope, ProjectRef, ProjectType } from "../types";
 export declare class Project {
     name: string;
     path: string;
-    protected configs: Record<ProjectConfigScope, ProjectConfig>;
+    readonly ref?: ProjectRef;
+    readonly configs: Record<ProjectConfigScope, ProjectConfig>;
     constructor(name: string, path: string);
-    protected getConfig(scope: ProjectConfigScope): ProjectConfig;
     get type(): ProjectType;
     set type(type: ProjectType);
     get containerName(): string;
-    get scripts(): {
-        [x: string]: string;
-    };
+    get scripts(): any;
     get preset(): string | undefined;
     set preset(preset: string | undefined);
     get presetMode(): "project" | "global";
@@ -36,7 +33,7 @@ export declare class Project {
     unlinkPort(hostPort: number, containerPort: number): void;
     get buildArgs(): EnvConfig;
     set buildArgs(buildArgs: EnvConfig);
-    setBuildArg(name: string, value: string, service?: string): void;
+    setBuildArg(key: string, value: string, service?: string): void;
     unsetBuildArg(name: string, service?: string): void;
     get env(): EnvConfig;
     set env(env: EnvConfig);
@@ -54,12 +51,10 @@ export declare class Project {
     getVolumeByDestination(destination: string): string | undefined;
     volumeMount(...volumes: string[]): void;
     volumeUnmount(...volumes: string[]): void;
-    get extraHosts(): {
-        [x: string]: string;
-    };
+    get extraHosts(): any;
     addExtraHost(host: string, domain: string): void;
     removeExtraHost(host: string): void;
-    get services(): Record<string, import("../types").ServiceProperties>;
+    get services(): any;
     getSecret(key: string): Promise<string | undefined>;
     getSecret(key: string, byDefault: string): Promise<string>;
     setSecret(key: string, value: string): Promise<void>;

package/lib/{modules/project/makes → makes}/Project.js

@@ -10,24 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Project = void 0;
-const AsyncStorage_1 = require("../../../core/AsyncStorage");
-const AppService_1 = require("../../../services/AppService");
-const volumeParse_1 = require("../../../utils/volumeParse");
-const ProjectRepository_1 = require("../repositories/ProjectRepository");
+const AsyncStorage_1 = require("../core/AsyncStorage");
+const AppService_1 = require("../services/AppService");
+const ProjectRepository_1 = require("../services/ProjectRepository");
+const volumeParse_1 = require("../utils/volumeParse");
 const types_1 = require("../types");
 class Project {
     constructor(name, path) {
         this.name = name;
         this.path = path;
+        const container = AsyncStorage_1.AsyncStorage.getContainer(), appService = container.get(AppService_1.AppService), projectRepository = container.get(ProjectRepository_1.ProjectRepository);
+        this.ref = appService.getProject(this.name);
         this.configs = {
-            [types_1.ProjectConfigScope.APP]: this.getConfig(types_1.ProjectConfigScope.APP),
-            [types_1.ProjectConfigScope.LOCAL]: this.getConfig(types_1.ProjectConfigScope.LOCAL)
+            [types_1.ProjectConfigScope.APP]: projectRepository.getConfig(this.name, types_1.ProjectConfigScope.APP),
+            [types_1.ProjectConfigScope.LOCAL]: projectRepository.getConfig(this.name, types_1.ProjectConfigScope.LOCAL)
         };
     }
-    getConfig(scope) {
-        const container = AsyncStorage_1.AsyncStorage.getContainer(), projectRepository = container.get(ProjectRepository_1.ProjectRepository);
-        return projectRepository.getConfig(this.name, scope);
-    }
     get type() {
         return this.configs.app.type || this.configs.project.type;
     }
@@ -41,7 +39,7 @@ class Project {
         return Object.assign(Object.assign({}, this.configs.project.scripts), this.configs.app.scripts);
     }
     get preset() {
-        return this.configs.app.preset;
+        return this.configs.project.preset || this.configs.app.preset;
     }
     set preset(preset) {
         this.configs.app.preset = preset;
@@ -140,18 +138,8 @@ class Project {
     set buildArgs(buildArgs) {
         this.configs.app.buildArgs = buildArgs;
     }
-    setBuildArg(name, value, service) {
-        if (service) {
-            if (!this.configs.app.services[service]) {
-                throw new Error(`Service "${service}" not found`);
-            }
-            if (!this.configs.app.services[service].buildArgs) {
-                this.configs.app.services[service].buildArgs = {};
-            }
-            this.configs.app.services[service].buildArgs[name] = value;
-            return;
-        }
-        this.configs.app.buildArgs[name] = value;
+    setBuildArg(key, value, service) {
+        this.configs.app.setBuildArg(key, value, service);
     }
     unsetBuildArg(name, service) {
         this.configs.app.unsetBuildArg(name, service);
@@ -234,13 +222,8 @@ class Project {
         });
     }
     save() {
-        const container = AsyncStorage_1.AsyncStorage.getContainer(), appService = container.get(AppService_1.AppService), projectRepository = container.get(ProjectRepository_1.ProjectRepository);
-        appService.addProject(this.name, this.path);
-        this.configs.app.save();
-        // const container = AsyncStorage.getContainer(),
-        //       projectRepository = container.get(ProjectRepository);
-        //
-        // projectRepository.save(this);
+        const container = AsyncStorage_1.AsyncStorage.getContainer(), projectRepository = container.get(ProjectRepository_1.ProjectRepository);
+        projectRepository.save(this);
     }
 }
 exports.Project = Project;

package/lib/makes/ProjectConfig.d.ts

@@ -0,0 +1,85 @@
+import { FileSystem } from "./FileSystem";
+import { EnvConfig, ProjectType } from "../types";
+import { JsonEditor } from "./JsonEditor";
+import { ServiceConfig } from "./ServiceConfig";
+export declare class ProjectConfig extends JsonEditor<ProjectConfig.Data> {
+    constructor(content: string);
+    get type(): ProjectType | undefined;
+    set type(type: ProjectType | undefined);
+    get buildArgs(): EnvConfig;
+    set buildArgs(buildArgs: EnvConfig);
+    get env(): EnvConfig;
+    set env(env: EnvConfig | undefined);
+    get metadata(): EnvConfig;
+    set metadata(metadata: EnvConfig);
+    get preset(): string | undefined;
+    set preset(preset: string | undefined);
+    get presetMode(): "project" | "global" | undefined;
+    set presetMode(presetMode: "project" | "global" | undefined);
+    get image(): string | undefined;
+    set image(image: string | undefined);
+    get imageName(): string | undefined;
+    set imageName(image: string | undefined);
+    get composefile(): string | undefined;
+    set composefile(composefile: string | undefined);
+    get dockerfile(): string | undefined;
+    set dockerfile(dockerfile: string | undefined);
+    get cmd(): string[] | undefined;
+    set cmd(cmd: string[] | undefined);
+    get scripts(): any;
+    get services(): any;
+    get extraHosts(): any;
+    set extraHosts(extraHosts: any);
+    get volumes(): string[];
+    set volumes(volumes: string[]);
+    get ports(): string[];
+    set ports(ports: string[]);
+    setBuildArg(key: string, value: string, service?: string): void;
+    unsetBuildArg(name: string, service?: string): void;
+    getEnv(key: string): string | undefined;
+    getEnv(key: string, byDefault: string): string;
+    hasEnv(key: string): boolean;
+    setEnv(key: string, value: string | boolean, service?: string): void;
+    unsetEnv(key: string, service?: string): void;
+    getVolumeBySource(source: string): string | undefined;
+    getVolumeByDestination(destination: string): string | undefined;
+    volumeMount(...volumes: string[]): void;
+    volumeUnmount(...volumes: string[]): void;
+    addExtraHost(host: string, domain: string): void;
+    removeExtraHost(host: string): void;
+    addService(name: string, data: ServiceConfig.Data): void;
+    service(name: string): any;
+    toObject(): ProjectConfig.Data;
+    static make(fs: FileSystem, filename: string): ProjectConfig;
+}
+export declare namespace ProjectConfig {
+    type Data = {
+        type?: ProjectType;
+        image?: string;
+        /** @deprecated */
+        imageName?: string;
+        dockerfile?: string;
+        composefile?: string;
+        preset?: string;
+        presetMode?: "global" | "project";
+        scripts?: {
+            [script: string]: string;
+        };
+        cmd?: string[];
+        buildArgs?: EnvConfig;
+        env?: EnvConfig;
+        metadata?: EnvConfig;
+        volumes?: string[];
+        ports?: string[];
+        extraHosts?: EnvConfig;
+        services?: Record<string, ProjectConfig.Service>;
+    };
+    type Service = {
+        type?: "compose" | "plugin";
+        containerName?: string;
+        buildArgs?: EnvConfig;
+        env?: EnvConfig;
+        ports?: string[];
+        volumes?: string[];
+    };
+}

package/lib/makes/ProjectConfig.js

@@ -0,0 +1,329 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectConfig = void 0;
+const volumeParse_1 = require("../utils/volumeParse");
+const JsonEditor_1 = require("./JsonEditor");
+class ProjectConfig extends JsonEditor_1.JsonEditor {
+    // public editor: JsonEditor<ProjectConfig.Data>;
+    // protected state: ProjectConfig.Data;
+    // public type?: ProjectType;
+    // public image?: string;
+    // public dockerfile?: string;
+    // public composefile?: string;
+    // public preset?: string;
+    // public presetMode?: "global" | "project";
+    // public scripts: {
+    //     [script: string]: string;
+    // };
+    // public cmd?: string[];
+    // public metadata: EnvConfig;
+    // public ports: string[];
+    // public volumes: string[];
+    // public extraHosts: EnvConfig;
+    // public services: Record<string, ProjectConfig.Service>;
+    constructor(content) {
+        super(content);
+        // this.editor = new JsonEditor<ProjectConfig.Data>(content);
+        // const {
+        //     type,
+        //     imageName,
+        //     image = imageName,
+        //     dockerfile,
+        //     composefile,
+        //     preset,
+        //     presetMode,
+        //     scripts = {},
+        //     cmd,
+        //     metadata = {},
+        //     volumes = [],
+        //     ports = [],
+        //     extraHosts = {},
+        //     services = {}
+        // } = data;
+        // this.type = type;
+        // this.image = image;
+        // this.dockerfile = dockerfile;
+        // this.composefile = composefile;
+        // this.preset = preset;
+        // this.presetMode = presetMode;
+        // this.scripts = scripts;
+        // this.cmd = cmd;
+        // this.metadata = metadata;
+        // this.volumes = volumes;
+        // this.ports = ports;
+        // this.extraHosts = extraHosts;
+        // this.services = services;
+    }
+    get type() {
+        return this.state.type;
+    }
+    set type(type) {
+        this.state.type = type;
+    }
+    get buildArgs() {
+        return this.createProxy(["buildArgs"], {
+            removeOnEmpty: true
+        });
+    }
+    set buildArgs(buildArgs) {
+        this.state.buildArgs = Object.assign({}, buildArgs);
+    }
+    get env() {
+        return this.createProxy(["env"], {
+            removeOnEmpty: true
+        });
+    }
+    set env(env) {
+        this.state.env = env ? Object.assign({}, env) : env;
+    }
+    get metadata() {
+        return this.createProxy(["metadata"], {
+            removeOnEmpty: true
+        });
+    }
+    set metadata(metadata) {
+        this.state.metadata = Object.assign({}, metadata);
+    }
+    get preset() {
+        return this.state.preset;
+    }
+    set preset(preset) {
+        this.state.preset = preset;
+    }
+    get presetMode() {
+        return this.state.presetMode;
+    }
+    set presetMode(presetMode) {
+        this.state.presetMode = presetMode;
+    }
+    get image() {
+        return this.state.image;
+    }
+    set image(image) {
+        this.state.image = image;
+    }
+    get imageName() {
+        return this.state.imageName;
+    }
+    set imageName(image) {
+        this.state.imageName = image;
+    }
+    get composefile() {
+        return this.state.composefile;
+    }
+    set composefile(composefile) {
+        this.state.composefile = composefile;
+    }
+    get dockerfile() {
+        return this.state.dockerfile;
+    }
+    set dockerfile(dockerfile) {
+        this.state.dockerfile = dockerfile;
+    }
+    get cmd() {
+        return this.state.cmd;
+    }
+    set cmd(cmd) {
+        this.state.cmd = cmd;
+    }
+    get scripts() {
+        return {};
+    }
+    get services() {
+        return {};
+    }
+    get extraHosts() {
+        return this.createProxy(["extraHosts"]);
+    }
+    set extraHosts(extraHosts) {
+        this.state.extraHosts = Object.assign({}, extraHosts);
+    }
+    get volumes() {
+        return this.createProxy(["volumes"], {
+            removeOnEmpty: true,
+            isArray: true
+        });
+    }
+    set volumes(volumes) {
+        this.state.volumes = volumes;
+    }
+    get ports() {
+        return this.createProxy(["ports"], {
+            isArray: true,
+            removeOnEmpty: true
+        });
+    }
+    set ports(ports) {
+        this.state.ports = [...ports];
+    }
+    setBuildArg(key, value, service) {
+        if (service) {
+            // if(!this.services[service]) {
+            //     this.services[service] = {};
+            // }
+            //
+            // if(!this.services[service].buildArgs) {
+            //     this.services[service].buildArgs = {};
+            // }
+            //
+            // this.services[service].buildArgs[key] = value;
+            return;
+        }
+        this.buildArgs[key] = value;
+    }
+    unsetBuildArg(name, service) {
+        if (service) {
+            // if(!this.services[service]) {
+            //     return;
+            // }
+            //
+            // if(this.services[service].buildArgs && name in this.services[service].buildArgs) {
+            //     delete this.services[service].buildArgs[name];
+            // }
+            return;
+        }
+        if (name in this.buildArgs) {
+            delete this.buildArgs[name];
+        }
+    }
+    getEnv(key, byDefault) {
+        if (key in this.env) {
+            return this.env[key];
+        }
+        return byDefault;
+    }
+    hasEnv(key) {
+        // return this.env.hasOwnProperty(key);
+        return key in this.env;
+    }
+    setEnv(key, value, service) {
+        const sValue = typeof value === "boolean"
+            ? (value ? "true" : "false")
+            : value;
+        if (service) {
+            // if(!this.services[service]) {
+            //     return;
+            // }
+            //
+            // if(!this.services[service].env) {
+            //     this.services[service].env = {};
+            // }
+            //
+            // this.services[service].env[key] = sValue;
+            return;
+        }
+        this.env[key] = sValue;
+    }
+    unsetEnv(key, service) {
+        if (service) {
+            // if(!this.services[service]) {
+            //     throw new Error(`Service "${service}" not found`);
+            // }
+            //
+            // if(this.services[service].env && key in this.services[service].env) {
+            //     delete this.services[service].env[key];
+            //
+            //     if(Object.keys(this.services[service].env).length === 0) {
+            //         delete this.services[service].env;
+            //     }
+            // }
+            return;
+        }
+        if (key in this.env) {
+            delete this.env[key];
+        }
+    }
+    getVolumeBySource(source) {
+        return (this.state.volumes || []).find((volume) => {
+            return (0, volumeParse_1.volumeParse)(volume).source === source;
+        });
+    }
+    getVolumeByDestination(destination) {
+        return (this.state.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.state.volumes = [
+            ...(this.state.volumes || []).filter((v) => {
+                return v !== this.getVolumeByDestination(destination);
+            }),
+            volume
+        ];
+        this.volumeMount(...restVolumes);
+    }
+    volumeUnmount(...volumes) {
+        if (!this.state.volumes || volumes.length === 0) {
+            return;
+        }
+        const [volume, ...restVolumes] = volumes;
+        const v = (0, volumeParse_1.volumeParse)(volume);
+        this.state.volumes = this.state.volumes.filter((mounted) => {
+            const m = (0, volumeParse_1.volumeParse)(mounted);
+            return v.source !== m.source && v.destination !== m.destination;
+        });
+        if (this.state.volumes.length === 0) {
+            return;
+        }
+        this.volumeUnmount(...restVolumes);
+    }
+    addExtraHost(host, domain) {
+        if (!this.state.extraHosts) {
+            this.state.extraHosts = {};
+        }
+        this.state.extraHosts[host] = domain;
+    }
+    removeExtraHost(host) {
+        if (this.state.extraHosts && host in this.state.extraHosts) {
+            delete this.state.extraHosts[host];
+        }
+    }
+    addService(name, data) {
+    }
+    service(name) {
+        return this.createProxy(["services", name], {
+            removeOnEmpty: true
+        });
+    }
+    toObject() {
+        // return {
+        //     type: this.type,
+        //     image: this.image,
+        //     dockerfile: this.dockerfile,
+        //     composefile: this.composefile,
+        //     preset: this.preset,
+        //     presetMode: this.presetMode,
+        //     scripts: Object.keys(this.scripts).length > 0 ? this.scripts : undefined,
+        //     cmd: this.cmd,
+        //     buildArgs: Object.keys(this.buildArgs).length > 0 ? this.buildArgs : undefined,
+        //     env: Object.keys(this.env).length > 0 ? this.env : undefined,
+        //     metadata: Object.keys(this.metadata).length > 0 ? this.metadata : undefined,
+        //     volumes: this.volumes.length > 0 ? this.volumes : undefined,
+        //     ports: this.ports.length > 0 ? this.ports : undefined,
+        // };
+        return this.state;
+    }
+    static make(fs, filename) {
+        let content = "{}";
+        if (fs.exists(filename)) {
+            content = fs.readFile(filename).toString();
+        }
+        return new class extends ProjectConfig {
+            save() {
+                // if(!fs.exists()) {
+                //     fs.mkdir("", {
+                //         recursive: true
+                //     });
+                // }
+                //
+                // fs.writeJSON(filename, this.toObject());
+            }
+        }(content);
+    }
+}
+exports.ProjectConfig = ProjectConfig;

package/lib/makes/ServiceConfig.d.ts

@@ -0,0 +1,23 @@
+import { EnvConfig } from "../types";
+export declare class ServiceConfig {
+    protected readonly original: ServiceConfig.Data;
+    protected readonly state: ServiceConfig.Data;
+    constructor(original: ServiceConfig.Data);
+    get buildArgs(): EnvConfig;
+    set buildArgs(buildArgs: EnvConfig);
+    get env(): EnvConfig;
+    set env(env: EnvConfig);
+    isDirty(): boolean;
+    toObject(): ServiceConfig.Data;
+}
+export declare namespace ServiceConfig {
+    type Data = {
+        type?: "compose" | "plugin";
+        image?: string;
+        containerName?: string;
+        buildArgs?: EnvConfig;
+        env?: EnvConfig;
+        ports?: string[];
+        volumes?: string[];
+    };
+}

package/lib/makes/ServiceConfig.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceConfig = void 0;
+class ServiceConfig {
+    constructor(original) {
+        this.original = original;
+        this.state = JSON.parse(JSON.stringify(this.original));
+    }
+    get buildArgs() {
+        if (!this.state.buildArgs) {
+            this.state.buildArgs = {};
+        }
+        return this.state.buildArgs;
+    }
+    set buildArgs(buildArgs) {
+        this.state.buildArgs = Object.assign({}, buildArgs);
+    }
+    get env() {
+        if (!this.state.env) {
+            this.state.env = {};
+        }
+        return this.state.env;
+    }
+    set env(env) {
+        this.state.env = Object.assign({}, env);
+    }
+    isDirty() {
+        return JSON.stringify(this.toObject()) !== JSON.stringify(this.original);
+    }
+    toObject() {
+        const { type, image, containerName, buildArgs, env, volumes, ports } = this.state;
+        const object = {};
+        if (type) {
+            object.type = type;
+        }
+        if (image) {
+            object.image = image;
+        }
+        if (containerName) {
+            object.containerName = containerName;
+        }
+        if (buildArgs && Object.keys(buildArgs).length > 0) {
+            object.buildArgs = Object.assign({}, buildArgs);
+        }
+        if (env && Object.keys(env).length > 0) {
+            object.env = Object.assign({}, env);
+        }
+        if (volumes && volumes.length > 0) {
+            object.volumes = [...volumes];
+        }
+        if (ports && ports.length > 0) {
+            object.ports = [...ports];
+        }
+        return object;
+    }
+}
+exports.ServiceConfig = ServiceConfig;

package/lib/makes/index.d.ts

@@ -4,6 +4,7 @@ export * from "./ConfigCollection";
 export * from "./FileSystem";
 export * from "./FileSystemManager";
 export * from "./Logger";
+export * from "./Project";
 export * from "./Version";
 export * from "./VersionRange";
 export * from "./VersionRule";

package/lib/makes/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./ConfigCollection"), exports);
 __exportStar(require("./FileSystem"), exports);
 __exportStar(require("./FileSystemManager"), exports);
 __exportStar(require("./Logger"), exports);
+__exportStar(require("./Project"), exports);
 __exportStar(require("./Version"), exports);
 __exportStar(require("./VersionRange"), exports);
 __exportStar(require("./VersionRule"), exports);

package/lib/modules/project/index.d.ts

@@ -1,5 +1 @@
-export * from "./makes/Project";
-export * from "./makes/ProjectConfig";
-export * from "./repositories/ProjectRepository";
 export * from "./services/ProjectService";
-export { ServiceProperties } from "./types";

package/lib/modules/project/index.js

@@ -14,7 +14,4 @@ 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("./makes/Project"), exports);
-__exportStar(require("./makes/ProjectConfig"), exports);
-__exportStar(require("./repositories/ProjectRepository"), exports);
 __exportStar(require("./services/ProjectService"), exports);

package/lib/modules/project/services/ProjectService.d.ts

@@ -1,5 +1,5 @@
-import { Project } from "../makes/Project";
-import { ProjectRepository } from "../repositories/ProjectRepository";
+import { Project } from "../../../makes/Project";
+import { ProjectRepository } from "../../../services/ProjectRepository";
 export declare abstract class ProjectService {
     abstract get(name?: string): Project;
     abstract save(project: Project): void;

package/lib/{modules/project/repositories → services}/ProjectRepository.d.ts

@@ -1,8 +1,8 @@
 import { Project } from "../makes/Project";
 import { ProjectConfig } from "../makes/ProjectConfig";
-import { AppFileSystemService, AppService } from "../../../services";
-import { FileSystemDriver } from "../../../types";
-import { ProjectConfigScope } from "../types";
+import { AppService } from "./AppService";
+import { AppFileSystemService } from "./AppFileSystemService";
+import { FileSystemDriver, ProjectConfigScope } from "../types";
 export declare class ProjectRepository {
     protected readonly appService: AppService;
     protected readonly fs: AppFileSystemService;

package/lib/{modules/project/repositories → services}/ProjectRepository.js

@@ -13,13 +13,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectRepository = void 0;
-const decorators_1 = require("../../../decorators");
+const decorators_1 = require("../decorators");
 const Project_1 = require("../makes/Project");
 const ProjectConfig_1 = require("../makes/ProjectConfig");
-const FileSystem_1 = require("../../../makes/FileSystem");
-const services_1 = require("../../../services");
-const env_1 = require("../../../env");
+const makes_1 = require("../makes");
+const AppService_1 = require("./AppService");
+const AppFileSystemService_1 = require("./AppFileSystemService");
 const types_1 = require("../types");
+const env_1 = require("../env");
 let ProjectRepository = class ProjectRepository {
     constructor(appService, fs, driver) {
         this.appService = appService;
@@ -35,7 +36,7 @@ let ProjectRepository = class ProjectRepository {
             case types_1.ProjectConfigScope.APP:
                 return ProjectConfig_1.ProjectConfig.make(this.fs.cd(`projects/${ref.name}`), "config.json");
             case types_1.ProjectConfigScopeEnum.LOCAL:
-                return ProjectConfig_1.ProjectConfig.make(new FileSystem_1.FileSystem(ref.path, this.driver), "wocker.config.json");
+                return ProjectConfig_1.ProjectConfig.make(new makes_1.FileSystem(ref.path, this.driver), "wocker.config.json");
         }
     }
     getByName(name) {
@@ -46,7 +47,19 @@ let ProjectRepository = class ProjectRepository {
         return new Project_1.Project(ref.name, ref.path);
     }
     save(project) {
-        project.save();
+        if (!project.ref) {
+            this.appService.addProject(project.name, project.path);
+        }
+        if (!this.fs.exists(`projects/${project.name}`)) {
+            this.fs.mkdir(`projects/${project.name}`);
+        }
+        if (project.configs.app.isDirty()) {
+            this.fs.writeFile(`projects/${project.name}/config.json`, project.configs.app.toString());
+        }
+        if (project.configs.project.isDirty()) {
+            const projectFS = new makes_1.FileSystem(project.path, this.driver);
+            projectFS.writeFile("wocker.config.json", project.configs.project.toString());
+        }
     }
     search(params) {
         const { name, path } = params, projects = [];
@@ -71,6 +84,6 @@ exports.ProjectRepository = ProjectRepository;
 exports.ProjectRepository = ProjectRepository = __decorate([
     (0, decorators_1.Injectable)("PROJECT_REPOSITORY"),
     __param(2, (0, decorators_1.Inject)(env_1.FILE_SYSTEM_DRIVER_KEY)),
-    __metadata("design:paramtypes", [services_1.AppService,
-        services_1.AppFileSystemService, Object])
+    __metadata("design:paramtypes", [AppService_1.AppService,
+        AppFileSystemService_1.AppFileSystemService, Object])
 ], ProjectRepository);

package/lib/services/index.d.ts

@@ -4,3 +4,4 @@ export * from "./AppService";
 export * from "./EventService";
 export * from "./LogService";
 export * from "./ProcessService";
+export * from "./ProjectRepository";

package/lib/services/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./AppService"), exports);
 __exportStar(require("./EventService"), exports);
 __exportStar(require("./LogService"), exports);
 __exportStar(require("./ProcessService"), exports);
+__exportStar(require("./ProjectRepository"), exports);

package/lib/{modules/project/types → types}/ProjectConfigScope.d.ts

@@ -1,4 +1,4 @@
-import { ProjectRef } from "../../../types";
+import { ProjectRef } from "../types";
 export declare enum ProjectConfigScopeEnum {
     APP = "app",
     LOCAL = "project"

package/lib/types/index.d.ts

@@ -7,6 +7,7 @@ export * from "./ModuleMetadata";
 export * from "./PackageManagerType";
 export * from "./PickProperties";
 export * from "./PluginMetadata";
+export * from "./ProjectConfigScope";
 export * from "./PluginRef";
 export * from "./PresetRef";
 export * from "./PresetSource";

package/lib/types/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./ModuleMetadata"), exports);
 __exportStar(require("./PackageManagerType"), exports);
 __exportStar(require("./PickProperties"), exports);
 __exportStar(require("./PluginMetadata"), exports);
+__exportStar(require("./ProjectConfigScope"), exports);
 __exportStar(require("./PluginRef"), exports);
 __exportStar(require("./PresetRef"), exports);
 __exportStar(require("./PresetSource"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/core",
     "type": "commonjs",
-    "version": "1.1.0-beta.2",
+    "version": "1.1.0-beta.3",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",
@@ -29,6 +29,7 @@
     "dependencies": {
         "@kearisp/cli": "^2.0.9",
         "date-fns": "^4.1.0",
+        "jsonc-parser": "^3.3.1",
         "readline": "^1.3.0",
         "reflect-metadata": "^0.2.2",
         "stream": "^0.0.3",

package/lib/modules/project/makes/ProjectConfig.d.ts

@@ -1,61 +0,0 @@
-import { FileSystem } from "../../../makes";
-import { EnvConfig, ProjectType } from "../../../types";
-import { ServiceProperties } from "../types";
-export declare abstract class ProjectConfig {
-    type?: ProjectType;
-    image?: string;
-    dockerfile?: string;
-    composefile?: string;
-    preset?: string;
-    presetMode?: "global" | "project";
-    scripts: {
-        [script: string]: string;
-    };
-    cmd?: string[];
-    buildArgs: EnvConfig;
-    env: EnvConfig;
-    metadata: EnvConfig;
-    ports: string[];
-    volumes: string[];
-    extraHosts: EnvConfig;
-    services: Record<string, ServiceProperties>;
-    constructor(data: ProjectConfig.Data);
-    unsetBuildArg(name: string, service?: string): void;
-    getEnv(key: string): string | undefined;
-    getEnv(key: string, byDefault: string): string;
-    hasEnv(key: string): boolean;
-    setEnv(key: string, value: string | boolean, service?: string): void;
-    unsetEnv(key: string, service?: string): void;
-    abstract save(): void;
-    getVolumeBySource(source: string): string | undefined;
-    getVolumeByDestination(destination: string): string | undefined;
-    volumeMount(...volumes: string[]): void;
-    volumeUnmount(...volumes: string[]): void;
-    addExtraHost(host: string, domain: string): void;
-    removeExtraHost(host: string): void;
-    toObject(): ProjectConfig.Data;
-    static make(fs: FileSystem, filename: string): ProjectConfig;
-}
-export declare namespace ProjectConfig {
-    type Data = {
-        type?: ProjectType;
-        image?: string;
-        /** @deprecated */
-        imageName?: string;
-        dockerfile?: string;
-        composefile?: string;
-        preset?: string;
-        presetMode?: "global" | "project";
-        scripts?: {
-            [script: string]: string;
-        };
-        cmd?: string[];
-        buildArgs?: EnvConfig;
-        env?: EnvConfig;
-        metadata?: EnvConfig;
-        volumes?: string[];
-        ports?: string[];
-        extraHosts?: EnvConfig;
-        services?: Record<string, ServiceProperties>;
-    };
-}

package/lib/modules/project/makes/ProjectConfig.js

@@ -1,164 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectConfig = void 0;
-const volumeParse_1 = require("../../../utils/volumeParse");
-class ProjectConfig {
-    constructor(data) {
-        const { type, imageName, image = imageName, dockerfile, composefile, preset, presetMode, scripts = {}, cmd, buildArgs = {}, env = {}, metadata = {}, volumes = [], ports = [], extraHosts = {}, services = {} } = data;
-        this.type = type;
-        this.image = image;
-        this.dockerfile = dockerfile;
-        this.composefile = composefile;
-        this.preset = preset;
-        this.presetMode = presetMode;
-        this.scripts = scripts;
-        this.cmd = cmd;
-        this.buildArgs = buildArgs;
-        this.env = env;
-        this.metadata = metadata;
-        this.volumes = volumes;
-        this.ports = ports;
-        this.extraHosts = extraHosts;
-        this.services = services;
-    }
-    unsetBuildArg(name, service) {
-        if (service) {
-            if (!this.services[service]) {
-                return;
-            }
-            if (this.services[service].buildArgs && name in this.services[service].buildArgs) {
-                delete this.services[service].buildArgs[name];
-            }
-            return;
-        }
-        if (name in this.buildArgs) {
-            delete this.buildArgs[name];
-        }
-    }
-    getEnv(key, byDefault) {
-        if (key in this.env) {
-            return this.env[key];
-        }
-        return byDefault;
-    }
-    hasEnv(key) {
-        return this.env.hasOwnProperty(key);
-    }
-    setEnv(key, value, service) {
-        const sValue = typeof value === "boolean"
-            ? (value ? "true" : "false")
-            : value;
-        if (service) {
-            if (!this.services[service]) {
-                return;
-            }
-            if (!this.services[service].env) {
-                this.services[service].env = {};
-            }
-            this.services[service].env[key] = sValue;
-            return;
-        }
-        this.env[key] = sValue;
-    }
-    unsetEnv(key, service) {
-        if (service) {
-            if (!this.services[service]) {
-                throw new Error(`Service "${service}" not found`);
-            }
-            if (this.services[service].env && key in this.services[service].env) {
-                delete this.services[service].env[key];
-                if (Object.keys(this.services[service].env).length === 0) {
-                    delete this.services[service].env;
-                }
-            }
-            return;
-        }
-        if (key in this.env) {
-            delete this.env[key];
-        }
-    }
-    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) {
-            return;
-        }
-        this.volumeUnmount(...restVolumes);
-    }
-    addExtraHost(host, domain) {
-        this.extraHosts[host] = domain;
-    }
-    removeExtraHost(host) {
-        if (host in this.extraHosts) {
-            delete this.extraHosts[host];
-        }
-    }
-    toObject() {
-        return {
-            type: this.type,
-            image: this.image,
-            dockerfile: this.dockerfile,
-            composefile: this.composefile,
-            preset: this.preset,
-            presetMode: this.presetMode,
-            scripts: Object.keys(this.scripts).length > 0 ? this.scripts : undefined,
-            cmd: this.cmd,
-            buildArgs: Object.keys(this.buildArgs).length > 0 ? this.buildArgs : undefined,
-            env: Object.keys(this.env).length > 0 ? this.env : undefined,
-            metadata: Object.keys(this.metadata).length > 0 ? this.metadata : undefined,
-            volumes: this.volumes.length > 0 ? this.volumes : undefined,
-            ports: this.ports.length > 0 ? this.ports : undefined,
-        };
-    }
-    static make(fs, filename) {
-        let data = {};
-        if (fs.exists(filename)) {
-            data = fs.readJSON(filename);
-        }
-        return new class extends ProjectConfig {
-            constructor(data) {
-                super(data);
-            }
-            save() {
-                if (!fs.exists()) {
-                    fs.mkdir("", {
-                        recursive: true
-                    });
-                }
-                fs.writeJSON(filename, this.toObject());
-            }
-        }(data);
-    }
-}
-exports.ProjectConfig = ProjectConfig;

package/lib/modules/project/makes/ServiceConfig.d.ts

@@ -1,2 +0,0 @@
-export declare class ServiceConfig {
-}

package/lib/modules/project/makes/ServiceConfig.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceConfig = void 0;
-class ServiceConfig {
-}
-exports.ServiceConfig = ServiceConfig;

package/lib/modules/project/types/ProjectV1.d.ts

@@ -1,25 +0,0 @@
-import { EnvConfig, ProjectType } from "../../../types";
-import { ServiceProperties } from "./ServiceProperties";
-export type ProjectV1 = {
-    name: string;
-    type: ProjectType;
-    path: string;
-    imageName?: string;
-    dockerfile?: string;
-    composefile?: string;
-    preset?: string;
-    presetMode?: "global" | "project";
-    cmd?: string[];
-    scripts?: {
-        [script: string]: string;
-    };
-    services?: {
-        [service: string]: ServiceProperties;
-    };
-    buildArgs?: EnvConfig;
-    env?: EnvConfig;
-    metadata?: EnvConfig;
-    ports?: string[];
-    extraHosts?: EnvConfig;
-    volumes?: string[];
-};

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

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

package/lib/modules/project/types/ServiceProperties.d.ts

@@ -1,9 +0,0 @@
-import { EnvConfig } from "../../../types";
-export type ServiceProperties = {
-    type?: "compose" | "plugin";
-    containerName?: string;
-    buildArgs?: EnvConfig;
-    env?: EnvConfig;
-    ports?: string[];
-    volumes?: string[];
-};

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

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

package/lib/modules/project/types/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./ProjectConfigScope";
-export * from "./ProjectV1";
-export * from "./ServiceProperties";

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

@@ -1,19 +0,0 @@
-"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("./ProjectConfigScope"), exports);
-__exportStar(require("./ProjectV1"), exports);
-__exportStar(require("./ServiceProperties"), exports);