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

package/lib/core/CoreModule.js

@@ -5,21 +5,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreModule = void 0;
 const cli_1 = require("@kearisp/cli");
-const fs_1 = __importDefault(require("fs"));
 const decorators_1 = require("../decorators");
-const AppService_1 = require("../services/AppService");
-const AppConfigService_1 = require("../services/AppConfigService");
-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 services_1 = require("../services");
 const env_1 = require("../env");
 let CoreModule = class CoreModule {
 };
@@ -37,30 +27,26 @@ exports.CoreModule = CoreModule = __decorate([
                 provide: env_1.WOCKER_DATA_DIR_KEY,
                 useValue: env_1.WOCKER_DATA_DIR
             },
-            {
-                provide: env_1.FILE_SYSTEM_DRIVER_KEY,
-                useValue: fs_1.default
-            },
-            AppService_1.AppService,
-            AppConfigService_1.AppConfigService,
-            AppFileSystemService_1.AppFileSystemService,
-            ProjectRepository_1.ProjectRepository,
-            ProcessService_1.ProcessService,
-            EventService_1.EventService,
-            LogService_1.LogService
+            services_1.AppService,
+            services_1.AppConfigService,
+            services_1.AppFileSystemService,
+            services_1.ProjectRepository,
+            services_1.ProcessService,
+            services_1.EventService,
+            services_1.LogService
         ],
         exports: [
             cli_1.Cli,
             env_1.WOCKER_VERSION_KEY,
             env_1.WOCKER_DATA_DIR_KEY,
             env_1.FILE_SYSTEM_DRIVER_KEY,
-            AppService_1.AppService,
-            AppConfigService_1.AppConfigService,
-            AppFileSystemService_1.AppFileSystemService,
-            ProjectRepository_1.ProjectRepository,
-            ProcessService_1.ProcessService,
-            EventService_1.EventService,
-            LogService_1.LogService
+            services_1.AppService,
+            services_1.AppConfigService,
+            services_1.AppFileSystemService,
+            services_1.ProjectRepository,
+            services_1.ProcessService,
+            services_1.EventService,
+            services_1.LogService
         ]
     })
 ], CoreModule);

package/lib/core/Factory.d.ts

@@ -1,6 +1,5 @@
 import { ApplicationContext } from "./ApplicationContext";
-import { Type } from "../types";
-import { ApplicationOptions } from "../types/ApplicationOptions";
+import { ApplicationOptions, Type } from "../types";
 export declare class Factory {
     static create(module: Type, options?: ApplicationOptions): Promise<ApplicationContext>;
 }

package/lib/core/Factory.js

@@ -16,7 +16,7 @@ const Scanner_1 = require("./Scanner");
 class Factory {
     static create(module_1) {
         return __awaiter(this, arguments, void 0, function* (module, options = {}) {
-            const container = new Container_1.Container(), scanner = new Scanner_1.Scanner(container);
+            const container = new Container_1.Container(), scanner = new Scanner_1.Scanner(container, options);
             yield scanner.scan(module);
             return new ApplicationContext_1.ApplicationContext(module, container, options);
         });

package/lib/core/Scanner.d.ts

@@ -1,11 +1,11 @@
 import { Cli } from "@kearisp/cli";
-import { Type, DynamicModule, ProviderType } from "../types";
+import { Type, DynamicModule, ProviderType, ApplicationOptions } from "../types";
 import { Container } from "./Container";
 import { ControllerWrapper } from "./ControllerWrapper";
 import { ModuleWrapper } from "./ModuleWrapper";
 export declare class Scanner {
     readonly container: Container;
-    constructor(container?: Container);
+    constructor(container?: Container, options?: ApplicationOptions);
     scan(moduleDefinition: Type | DynamicModule): Promise<void>;
     protected getMetadata(moduleDefinition: Type | DynamicModule): DynamicModule;
     protected scanModule(moduleDefinition: Type | DynamicModule): ModuleWrapper;

package/lib/core/Scanner.js

@@ -8,21 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Scanner = void 0;
 const cli_1 = require("@kearisp/cli");
+const fs_1 = __importDefault(require("fs"));
 const Container_1 = require("./Container");
 const ModuleWrapper_1 = require("./ModuleWrapper");
 const CoreModule_1 = require("./CoreModule");
 const InstanceWrapper_1 = require("./InstanceWrapper");
 const env_1 = require("../env");
 class Scanner {
-    constructor(container) {
+    constructor(container, options = {}) {
+        const { fsDriver = fs_1.default } = options;
         this.container = container || new Container_1.Container();
         this.container.globalProviders.set("CORE_CONTAINER", new InstanceWrapper_1.InstanceWrapper(new ModuleWrapper_1.ModuleWrapper(this.container, null), {
             provide: "CORE_CONTAINER",
             useValue: this.container
         }));
+        this.container.globalProviders.set(env_1.FILE_SYSTEM_DRIVER_KEY, new InstanceWrapper_1.InstanceWrapper(new ModuleWrapper_1.ModuleWrapper(this.container, null), {
+            provide: env_1.FILE_SYSTEM_DRIVER_KEY,
+            useValue: fsDriver
+        }));
     }
     scan(moduleDefinition) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/makes/AppConfig.d.ts

@@ -13,6 +13,7 @@ export declare abstract class AppConfig {
     addPlugin(name: string, env?: PluginRef["env"]): void;
     removePlugin(name: string): void;
     getProject(name: string): ProjectRef | undefined;
+    getProjectByPath(path: string): ProjectRef | undefined;
     addProject(name: string, path: string): void;
     removeProject(name: string): void;
     registerPreset(name: string, source: PresetSource, path?: string): void;

package/lib/makes/AppConfig.js

@@ -61,6 +61,11 @@ class AppConfig {
             return projectData.name === name;
         });
     }
+    getProjectByPath(path) {
+        return this.projects.find((ref) => {
+            return ref.path === path;
+        });
+    }
     addProject(name, path) {
         let projectRef = this.getProject(name);
         if (!projectRef) {

package/lib/makes/JsonEditor.d.ts

@@ -1,15 +1,22 @@
 import { JSONPath, Node, ModificationOptions } from "jsonc-parser";
+type OrderMap = {
+    [key: string]: string[] | ((key: string, properties: string[]) => number);
+};
 export declare class JsonEditor<T extends object> {
     protected readonly original: string;
+    protected readonly orderMap: OrderMap;
     protected content: string;
     protected root: Node;
     state: T;
-    constructor(original: string);
+    constructor(original: string, orderMap?: OrderMap);
     protected createProxy(keys: JSONPath, options?: JsonEditor.CreateProxyOptions): any;
+    protected getInsertionIndex(path: JSONPath): ((properties: string[]) => number) | undefined;
     get(key: string | JSONPath): any;
     set(key: string | JSONPath, value: any, options?: ModificationOptions): void;
+    unset(key: string | JSONPath): void;
     isDirty(): boolean;
     toString(): string;
+    static getNodeValue(node: Node): any;
 }
 export declare namespace JsonEditor {
     type CreateProxyOptions = {
@@ -17,3 +24,4 @@ export declare namespace JsonEditor {
         removeOnEmpty?: boolean;
     };
 }
+export {};

package/lib/makes/JsonEditor.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonEditor = void 0;
 const jsonc_parser_1 = require("jsonc-parser");
 class JsonEditor {
-    constructor(original) {
+    constructor(original, orderMap = {}) {
         this.original = original;
+        this.orderMap = orderMap;
         this.content = this.original;
         this.root = (0, jsonc_parser_1.parseTree)(this.content);
         this.state = this.createProxy([]);
@@ -21,12 +22,7 @@ class JsonEditor {
                     if (typeof target[property] === "function") {
                         return (...args) => {
                             const res = target[property](...args);
-                            this.set(keys, target, {
-                                formattingOptions: {
-                                    keepLines: false,
-                                    insertSpaces: true
-                                }
-                            });
+                            this.set(keys, target);
                             return res;
                         };
                     }
@@ -45,16 +41,11 @@ class JsonEditor {
                 if (Array.isArray(_)) {
                     property = parseInt(property);
                 }
-                this.set([...keys, property], value, {
-                    formattingOptions: {
-                        keepLines: false,
-                        insertSpaces: true
-                    }
-                });
+                this.set([...keys, property], value);
                 if (removeOnEmpty) {
                     const value = this.get(keys);
                     if (typeof value === "object" && Object.keys(value).length === 0) {
-                        this.set(keys, undefined);
+                        this.unset(keys);
                     }
                 }
                 return true;
@@ -66,36 +57,94 @@ class JsonEditor {
                 if (Array.isArray(_)) {
                     property = parseInt(property);
                 }
-                this.set([...keys, property], undefined);
+                this.unset([...keys, property]);
                 if (removeOnEmpty) {
                     const value = this.get(keys);
                     if (typeof value === "object" && Object.keys(value).length === 0) {
-                        this.set(keys, undefined);
+                        this.unset(keys);
                     }
                 }
                 return true;
             }
         });
     }
-    ;
+    getInsertionIndex(path) {
+        const key = path[path.length - 1], orderKey = path.slice(0, -1).join("."), ordered = this.orderMap[orderKey];
+        if (!ordered) {
+            return undefined;
+        }
+        return (properties) => {
+            if (typeof ordered === "function") {
+                return ordered(key, properties);
+            }
+            const keyIndex = ordered.indexOf(key);
+            if (keyIndex === -1) {
+                return properties.length;
+            }
+            let insertIndex = 0;
+            for (const property of properties) {
+                const propertyIndex = ordered.indexOf(property);
+                if (propertyIndex !== -1 && propertyIndex < keyIndex) {
+                    insertIndex++;
+                }
+            }
+            return insertIndex;
+        };
+    }
     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);
+        return JsonEditor.getNodeValue(node);
     }
-    set(key, value, options = {}) {
+    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.content = (0, jsonc_parser_1.applyEdits)(this.content, (0, jsonc_parser_1.modify)(this.content, path, value, options || {
+            formattingOptions: {
+                insertSpaces: true,
+                keepLines: false,
+                insertFinalNewline: true
+            },
+            getInsertionIndex: this.getInsertionIndex(path)
+        }));
         this.root = (0, jsonc_parser_1.parseTree)(this.content);
     }
+    unset(key) {
+        this.set(key, undefined);
+    }
     isDirty() {
         return this.content !== this.original;
     }
     toString() {
         return this.content;
     }
+    static getNodeValue(node) {
+        var _a;
+        switch (node.type) {
+            case "array":
+                return (_a = node.children) === null || _a === void 0 ? void 0 : _a.map(jsonc_parser_1.getNodeValue);
+            case "object": {
+                const obj = Object.create({});
+                if (node.children) {
+                    for (let prop of node.children) {
+                        const [keyNode, valueNode] = prop.children || [];
+                        if (keyNode && valueNode) {
+                            obj[keyNode.value] = this.getNodeValue(valueNode);
+                        }
+                    }
+                }
+                return obj;
+            }
+            case "null":
+            case "string":
+            case "number":
+            case "boolean":
+                return node.value;
+            default:
+                return undefined;
+        }
+    }
 }
 exports.JsonEditor = JsonEditor;

package/lib/makes/Project.d.ts

@@ -3,9 +3,10 @@ import { EnvConfig, ProjectConfigScope, ProjectRef, ProjectType } from "../types
 export declare class Project {
     name: string;
     path: string;
-    readonly ref?: ProjectRef;
+    protected _ref?: ProjectRef;
     readonly configs: Record<ProjectConfigScope, ProjectConfig>;
     constructor(name: string, path: string);
+    get ref(): ProjectRef | undefined;
     get type(): ProjectType;
     set type(type: ProjectType);
     get containerName(): string;
@@ -14,7 +15,10 @@ export declare class Project {
     set preset(preset: string | undefined);
     get presetMode(): "project" | "global";
     set presetMode(mode: "project" | "global");
+    get image(): string | undefined;
+    /** @deprecated */
     get imageName(): string | undefined;
+    /** @deprecated */
     set imageName(image: string | undefined);
     get dockerfile(): string | undefined;
     set dockerfile(dockerfile: string | undefined);
@@ -54,6 +58,9 @@ export declare class Project {
     get extraHosts(): any;
     addExtraHost(host: string, domain: string): void;
     removeExtraHost(host: string): void;
+    get metadata(): {
+        [x: string]: string;
+    };
     get services(): any;
     getSecret(key: string): Promise<string | undefined>;
     getSecret(key: string, byDefault: string): Promise<string>;

package/lib/makes/Project.js

@@ -20,12 +20,15 @@ class Project {
         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._ref = appService.getProject(this.name);
         this.configs = {
-            [types_1.ProjectConfigScope.APP]: projectRepository.getConfig(this.name, types_1.ProjectConfigScope.APP),
-            [types_1.ProjectConfigScope.LOCAL]: projectRepository.getConfig(this.name, types_1.ProjectConfigScope.LOCAL)
+            [types_1.ProjectConfigScope.APP]: projectRepository.getConfig(types_1.ProjectConfigScope.APP, this.name, this.path),
+            [types_1.ProjectConfigScope.LOCAL]: projectRepository.getConfig(types_1.ProjectConfigScope.LOCAL, this.name, this.path)
         };
     }
+    get ref() {
+        return this._ref;
+    }
     get type() {
         return this.configs.app.type || this.configs.project.type;
     }
@@ -39,37 +42,42 @@ class Project {
         return Object.assign(Object.assign({}, this.configs.project.scripts), this.configs.app.scripts);
     }
     get preset() {
-        return this.configs.project.preset || this.configs.app.preset;
+        return this.configs.app.preset || this.configs.project.preset;
     }
     set preset(preset) {
         this.configs.app.preset = preset;
     }
     get presetMode() {
-        return this.configs.app.presetMode;
+        return this.configs.app.presetMode || this.configs.project.presetMode;
     }
     set presetMode(mode) {
         this.configs.app.presetMode = mode;
     }
+    get image() {
+        return this.configs.app.image || this.configs.project.image;
+    }
+    /** @deprecated */
     get imageName() {
-        return this.configs.app.image;
+        return this.configs.app.image || this.configs.project.image;
     }
+    /** @deprecated */
     set imageName(image) {
         this.configs.app.image = image;
     }
     get dockerfile() {
-        return this.configs.project.dockerfile || this.configs.app.dockerfile;
+        return this.configs.app.dockerfile || this.configs.project.dockerfile;
     }
     set dockerfile(dockerfile) {
         this.configs.app.dockerfile = dockerfile;
     }
     get composefile() {
-        return this.configs.project.composefile || this.configs.app.composefile;
+        return this.configs.app.composefile || this.configs.project.composefile;
     }
     set composefile(composefile) {
         this.configs.app.composefile = composefile;
     }
     get cmd() {
-        return this.configs.app.cmd;
+        return this.configs.app.cmd || this.configs.project.cmd;
     }
     get domains() {
         const host = this.getEnv("VIRTUAL_HOST");
@@ -200,6 +208,9 @@ class Project {
     removeExtraHost(host) {
         this.configs.app.removeExtraHost(host);
     }
+    get metadata() {
+        return Object.assign(Object.assign({}, this.configs.project.metadata), this.configs.app.metadata);
+    }
     get services() {
         return this.configs.app.services;
     }

package/lib/makes/ProjectConfig.d.ts

@@ -1,32 +1,33 @@
-import { FileSystem } from "./FileSystem";
-import { EnvConfig, ProjectType } from "../types";
+import { EnvConfig, ProjectType, ProjectConfigScope } from "../types";
 import { JsonEditor } from "./JsonEditor";
 import { ServiceConfig } from "./ServiceConfig";
 export declare class ProjectConfig extends JsonEditor<ProjectConfig.Data> {
-    constructor(content: string);
+    readonly _scope: ProjectConfigScope;
+    constructor(_scope: ProjectConfigScope, 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 composefile(): string | undefined;
+    set composefile(composefile: string | undefined);
+    get preset(): string | undefined;
+    set preset(preset: string | undefined);
+    get presetMode(): ProjectConfig.Data["presetMode"];
+    set presetMode(presetMode: ProjectConfig.Data["presetMode"]);
+    get buildArgs(): EnvConfig;
+    set buildArgs(buildArgs: EnvConfig);
+    get env(): EnvConfig;
+    set env(env: EnvConfig | undefined);
+    get metadata(): EnvConfig;
+    set metadata(metadata: EnvConfig);
     get cmd(): string[] | undefined;
     set cmd(cmd: string[] | undefined);
     get scripts(): any;
+    set scripts(scripts: any);
     get services(): any;
     get extraHosts(): any;
     set extraHosts(extraHosts: any);
@@ -35,7 +36,7 @@ export declare class ProjectConfig extends JsonEditor<ProjectConfig.Data> {
     get ports(): string[];
     set ports(ports: string[]);
     setBuildArg(key: string, value: string, service?: string): void;
-    unsetBuildArg(name: string, service?: string): void;
+    unsetBuildArg(key: string, service?: string): void;
     getEnv(key: string): string | undefined;
     getEnv(key: string, byDefault: string): string;
     hasEnv(key: string): boolean;
@@ -49,8 +50,6 @@ export declare class ProjectConfig extends JsonEditor<ProjectConfig.Data> {
     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 = {

package/lib/makes/ProjectConfig.js

@@ -4,55 +4,32 @@ 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;
+    constructor(_scope, content) {
+        super(content, {
+            "": [
+                // "version",
+                "type",
+                "image",
+                "dockerfile",
+                "composefile",
+                "preset",
+                "presetMode",
+                "scripts",
+                "cmd",
+                "buildArgs",
+                "env",
+                "metadata",
+                "volumes",
+                "ports",
+                "extraHosts",
+                "services"
+            ],
+            "env": [
+                "VIRTUAL_HOST",
+                "VIRTUAL_PORT"
+            ]
+        });
+        this._scope = _scope;
     }
     get type() {
         return this.state.type;
@@ -60,29 +37,30 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
     set type(type) {
         this.state.type = type;
     }
-    get buildArgs() {
-        return this.createProxy(["buildArgs"], {
-            removeOnEmpty: true
-        });
+    get image() {
+        return this.state.image || this.state.imageName;
     }
-    set buildArgs(buildArgs) {
-        this.state.buildArgs = Object.assign({}, buildArgs);
+    set image(image) {
+        this.state.image = image;
+        this.state.imageName = undefined;
     }
-    get env() {
-        return this.createProxy(["env"], {
-            removeOnEmpty: true
-        });
+    get imageName() {
+        return this.image;
     }
-    set env(env) {
-        this.state.env = env ? Object.assign({}, env) : env;
+    set imageName(image) {
+        this.image = image;
     }
-    get metadata() {
-        return this.createProxy(["metadata"], {
-            removeOnEmpty: true
-        });
+    get dockerfile() {
+        return this.state.dockerfile;
     }
-    set metadata(metadata) {
-        this.state.metadata = Object.assign({}, metadata);
+    set dockerfile(dockerfile) {
+        this.state.dockerfile = dockerfile;
+    }
+    get composefile() {
+        return this.state.composefile;
+    }
+    set composefile(composefile) {
+        this.state.composefile = composefile;
     }
     get preset() {
         return this.state.preset;
@@ -96,29 +74,29 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
     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;
+    get buildArgs() {
+        return this.createProxy(["buildArgs"], {
+            removeOnEmpty: true
+        });
     }
-    set imageName(image) {
-        this.state.imageName = image;
+    set buildArgs(buildArgs) {
+        this.state.buildArgs = Object.assign({}, buildArgs);
     }
-    get composefile() {
-        return this.state.composefile;
+    get env() {
+        return this.createProxy(["env"], {
+            removeOnEmpty: true
+        });
     }
-    set composefile(composefile) {
-        this.state.composefile = composefile;
+    set env(env) {
+        this.state.env = env ? Object.assign({}, env) : env;
     }
-    get dockerfile() {
-        return this.state.dockerfile;
+    get metadata() {
+        return this.createProxy(["metadata"], {
+            removeOnEmpty: true
+        });
     }
-    set dockerfile(dockerfile) {
-        this.state.dockerfile = dockerfile;
+    set metadata(metadata) {
+        this.state.metadata = Object.assign({}, metadata);
     }
     get cmd() {
         return this.state.cmd;
@@ -127,13 +105,20 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
         this.state.cmd = cmd;
     }
     get scripts() {
-        return {};
+        return this.createProxy(["scripts"], {
+            removeOnEmpty: true
+        });
+    }
+    set scripts(scripts) {
+        this.state.scripts = scripts;
     }
     get services() {
         return {};
     }
     get extraHosts() {
-        return this.createProxy(["extraHosts"]);
+        return this.createProxy(["extraHosts"], {
+            removeOnEmpty: true
+        });
     }
     set extraHosts(extraHosts) {
         this.state.extraHosts = Object.assign({}, extraHosts);
@@ -158,33 +143,17 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
     }
     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;
+            this.set(["services", service, "buildArgs", key], value);
             return;
         }
         this.buildArgs[key] = value;
     }
-    unsetBuildArg(name, service) {
+    unsetBuildArg(key, 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];
-            // }
+            this.unset(["services", service, "buildArgs", key]);
             return;
         }
-        if (name in this.buildArgs) {
-            delete this.buildArgs[name];
-        }
+        delete this.buildArgs[key];
     }
     getEnv(key, byDefault) {
         if (key in this.env) {
@@ -201,32 +170,14 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
             ? (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;
+            this.set(["services", service, "env", key], sValue);
             return;
         }
-        this.env[key] = sValue;
+        this.set(["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;
-            //     }
-            // }
+            this.unset(["services", service, "env", key]);
             return;
         }
         if (key in this.env) {
@@ -290,40 +241,5 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
             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/services/ProjectRepository.d.ts

@@ -8,7 +8,7 @@ export declare class ProjectRepository {
     protected readonly fs: AppFileSystemService;
     protected readonly driver: FileSystemDriver;
     constructor(appService: AppService, fs: AppFileSystemService, driver: FileSystemDriver);
-    getConfig(name: string, scope: ProjectConfigScope): ProjectConfig;
+    getConfig(scope: ProjectConfigScope, name: string, path?: string): ProjectConfig;
     getByName(name: string): Project;
     save(project: Project): void;
     search(params: ProjectRepository.SearchParams): Project[];

package/lib/services/ProjectRepository.js

@@ -14,9 +14,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectRepository = void 0;
 const decorators_1 = require("../decorators");
+const makes_1 = require("../makes");
+// noinspection ES6PreferShortImport
 const Project_1 = require("../makes/Project");
 const ProjectConfig_1 = require("../makes/ProjectConfig");
-const makes_1 = require("../makes");
 const AppService_1 = require("./AppService");
 const AppFileSystemService_1 = require("./AppFileSystemService");
 const types_1 = require("../types");
@@ -27,16 +28,29 @@ let ProjectRepository = class ProjectRepository {
         this.fs = fs;
         this.driver = driver;
     }
-    getConfig(name, scope) {
+    getConfig(scope, name, path) {
         const ref = this.appService.getProject(name);
-        if (!ref) {
-            throw new Error("");
-        }
         switch (scope) {
-            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 makes_1.FileSystem(ref.path, this.driver), "wocker.config.json");
+            case types_1.ProjectConfigScope.APP: {
+                if (!ref) {
+                    return new ProjectConfig_1.ProjectConfig(scope, "{}");
+                }
+                const fs = this.fs.cd(`projects/${ref.name}`);
+                if (!fs.exists("config.json")) {
+                    return new ProjectConfig_1.ProjectConfig(scope, "{}");
+                }
+                return new ProjectConfig_1.ProjectConfig(scope, fs.readFile("config.json").toString());
+            }
+            case types_1.ProjectConfigScope.LOCAL:
+                path = path || (ref === null || ref === void 0 ? void 0 : ref.path);
+                if (!path) {
+                    return new ProjectConfig_1.ProjectConfig(scope, "{}");
+                }
+                const fs = new makes_1.FileSystem(path);
+                if (!fs.exists("wocker.config.json")) {
+                    return new ProjectConfig_1.ProjectConfig(scope, "{}");
+                }
+                return new ProjectConfig_1.ProjectConfig(scope, fs.readFile("wocker.config.json").toString());
         }
     }
     getByName(name) {

package/lib/types/ApplicationOptions.d.ts

@@ -1 +1,4 @@
-export type ApplicationOptions = {};
+import { FileSystemDriver } from "./FileSystemDriver";
+export type ApplicationOptions = {
+    fsDriver?: FileSystemDriver;
+};

package/lib/types/FileSystemDriver.d.ts

@@ -9,7 +9,7 @@ export interface FileSystemDriver {
     fstatSync(fd: number): FS.Stats;
     mkdirSync(path: string, options?: FS.MakeDirectoryOptions): void;
     readdir(path: string, options: any, callback: (err: NodeJS.ErrnoException | null, files: string[]) => void): void;
-    readdirSync(path: string, options?: any): (string | Buffer)[] | Dirent[] | Dirent<Buffer>[];
+    readdirSync(path: string, options?: any): (string | Buffer<ArrayBufferLike>)[] | Dirent[] | Dirent<Buffer>[];
     readFileSync(path: string): string | Buffer;
     writeFileSync(path: string, data: string | Buffer | NodeJS.ArrayBufferView, options?: FS.WriteFileOptions): void;
     appendFileSync(path: FS.PathOrFileDescriptor, data: string | Uint8Array, options?: FS.WriteFileOptions): void;

package/lib/types/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./ApplicationOptions";
 export * from "./DynamicModule";
 export * from "./EnvConfig";
 export * from "./FileSystemDriver";

package/lib/types/index.js

@@ -14,6 +14,7 @@ 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("./ApplicationOptions"), exports);
 __exportStar(require("./DynamicModule"), exports);
 __exportStar(require("./EnvConfig"), exports);
 __exportStar(require("./FileSystemDriver"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/core",
     "type": "commonjs",
-    "version": "1.1.0-beta.3",
+    "version": "1.1.0-beta.5",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",