@wocker/ws 1.0.32-beta.1 → 1.1.0-beta.0

package/lib/main.js

@@ -8,7 +8,7 @@ const core_1 = require("@wocker/core");
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const AppModule_1 = require("./AppModule");
 (async () => {
-    const context = await core_1.Factory.create(AppModule_1.AppModule), appConfigService = context.get(core_1.AppConfigService), logService = context.get(core_1.LogService);
+    const context = await core_1.Factory.create(AppModule_1.AppModule), appService = context.get(core_1.AppService), logService = context.get(core_1.LogService);
     try {
         const res = await context.run(process.argv);
         if (res) {
@@ -27,7 +27,7 @@ const AppModule_1 = require("./AppModule");
         if (err instanceof core_1.CommandNotFoundError) {
             return;
         }
-        if (appConfigService.debug) {
+        if (appService.debug) {
             logService.error(err.stack || err.toString());
         }
     }

package/lib/makes/index.d.ts

@@ -1,4 +1,2 @@
 export * from "./Http";
 export * from "./Plugin";
-export * from "./Version";
-export * from "./VersionRule";

package/lib/makes/index.js

@@ -16,5 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Http"), exports);
 __exportStar(require("./Plugin"), exports);
-__exportStar(require("./Version"), exports);
-__exportStar(require("./VersionRule"), exports);

package/lib/modules/core/controllers/DebugController.d.ts

@@ -1,11 +1,10 @@
-import { LogService, AppConfigService } from "@wocker/core";
+import { LogService, AppService } from "@wocker/core";
 export declare class DebugController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, logService: LogService);
+    constructor(appService: AppService, logService: LogService);
     debug(): Promise<string>;
     setDebug(status: string): Promise<void>;
-    setLog(level: string): Promise<void>;
     testLog(level: string, args: string[]): Promise<void>;
     debugCompletion(): Promise<string[]>;
     getLevels(): string[];

package/lib/modules/core/controllers/DebugController.js

@@ -15,24 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebugController = void 0;
 const core_1 = require("@wocker/core");
 let DebugController = class DebugController {
-    constructor(appConfigService, logService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, logService) {
+        this.appService = appService;
         this.logService = logService;
     }
     async debug() {
-        return this.appConfigService.debug ? "on" : "off";
+        return this.appService.debug ? "on" : "off";
     }
     async setDebug(status) {
-        this.appConfigService.debug = status === "on";
-        this.appConfigService.save();
-    }
-    async setLog(level) {
-        const validLevels = this.getLevels();
-        if (!validLevels.includes(level)) {
-            throw new Error(`Invalid log level: ${level}. Valid options are ${validLevels.join(', ')}`);
-        }
-        this.appConfigService.config.logLevel = level;
-        this.appConfigService.save();
+        this.appService.debug = status === "on";
     }
     async testLog(level, args) {
         this.logService._log(level, ...args);
@@ -59,14 +50,6 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], DebugController.prototype, "setDebug", null);
-__decorate([
-    (0, core_1.Description)("Set the log level (options: debug, log, info, warn, error)"),
-    (0, core_1.Command)("loglevel <level>"),
-    __param(0, (0, core_1.Param)("level")),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Promise)
-], DebugController.prototype, "setLog", null);
 __decorate([
     (0, core_1.Command)("log:<level> [...args]"),
     __param(0, (0, core_1.Param)("level")),
@@ -89,6 +72,6 @@ __decorate([
 ], DebugController.prototype, "getLevels", null);
 exports.DebugController = DebugController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.LogService])
 ], DebugController);

package/lib/modules/core/controllers/ExperimentalController.d.ts

@@ -1,7 +1,7 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 export declare class ExperimentalController {
-    protected readonly appService: AppConfigService;
-    constructor(appService: AppConfigService);
+    protected readonly appService: AppService;
+    constructor(appService: AppService);
     enable(feature?: string): void;
     disable(feature?: string): void;
     getFeatures(): string[];

package/lib/modules/core/controllers/ExperimentalController.js

@@ -72,5 +72,5 @@ __decorate([
 exports.ExperimentalController = ExperimentalController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Manage experimental features"),
-    __metadata("design:paramtypes", [core_1.AppConfigService])
+    __metadata("design:paramtypes", [core_1.AppService])
 ], ExperimentalController);

package/lib/modules/dns/index.js

@@ -20,9 +20,9 @@ let DnsModule = DnsModule_1 = class DnsModule {
     static register() {
         return {
             module: DnsModule_1,
-            inject: [core_1.AppConfigService],
-            useFactory: (appConfigService) => {
-                if (!appConfigService.isExperimentalEnabled("dns")) {
+            inject: [core_1.AppService],
+            useFactory: (appService) => {
+                if (!appService.isExperimentalEnabled("dns")) {
                     return {};
                 }
                 return {

package/lib/modules/keystore/controllers/KeystoreController.d.ts

@@ -1,8 +1,8 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 import { KeystoreService } from "../services/KeystoreService";
 export declare class KeystoreController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly keystoreService: KeystoreService;
-    constructor(appConfigService: AppConfigService, keystoreService: KeystoreService);
+    constructor(appService: AppService, keystoreService: KeystoreService);
     init(provider?: string): Promise<void>;
 }

package/lib/modules/keystore/controllers/KeystoreController.js

@@ -17,8 +17,8 @@ const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const KeystoreService_1 = require("../services/KeystoreService");
 let KeystoreController = class KeystoreController {
-    constructor(appConfigService, keystoreService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, keystoreService) {
+        this.appService = appService;
         this.keystoreService = keystoreService;
     }
     async init(provider) {
@@ -28,14 +28,14 @@ let KeystoreController = class KeystoreController {
                 message: "Keystore provider",
                 type: "text",
                 options: ["file", "keytar"],
-                default: this.appConfigService.config.keystore
+                default: this.appService.config.keystore
             });
         }
         if (!this.keystoreService.hasProvider(provider)) {
             throw new Error(`Provider "${provider}" not found`);
         }
-        this.appConfigService.config.keystore = provider;
-        this.appConfigService.save();
+        this.appService.config.keystore = provider;
+        this.appService.save();
     }
 };
 exports.KeystoreController = KeystoreController;
@@ -51,6 +51,6 @@ __decorate([
 exports.KeystoreController = KeystoreController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Keystore commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         KeystoreService_1.KeystoreService])
 ], KeystoreController);

package/lib/modules/keystore/services/KeystoreService.d.ts

@@ -1,9 +1,9 @@
-import { AppConfigService, AppFileSystemService, KeystoreService as CoreKeystoreService, KeystoreProvider } from "@wocker/core";
+import { AppService, AppFileSystemService, KeystoreService as CoreKeystoreService, KeystoreProvider } from "@wocker/core";
 export declare class KeystoreService extends CoreKeystoreService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly fs: AppFileSystemService;
     protected providers: Map<string, KeystoreProvider>;
-    constructor(appConfigService: AppConfigService, fs: AppFileSystemService);
+    constructor(appService: AppService, fs: AppFileSystemService);
     hasProvider(name: string): boolean;
     provider(name?: string): KeystoreProvider;
     get(keys: string | string[], byDefault?: string): Promise<string | undefined>;

package/lib/modules/keystore/services/KeystoreService.js

@@ -14,9 +14,9 @@ const core_1 = require("@wocker/core");
 const KeytarKeystoreProvider_1 = require("../providers/KeytarKeystoreProvider");
 const FileKeystoreProvider_1 = require("../providers/FileKeystoreProvider");
 let KeystoreService = class KeystoreService extends core_1.KeystoreService {
-    constructor(appConfigService, fs) {
+    constructor(appService, fs) {
         super();
-        this.appConfigService = appConfigService;
+        this.appService = appService;
         this.fs = fs;
         this.providers = new Map();
     }
@@ -25,7 +25,7 @@ let KeystoreService = class KeystoreService extends core_1.KeystoreService {
     }
     provider(name) {
         if (!name) {
-            name = this.appConfigService.config.keystore;
+            name = this.appService.config.keystore;
         }
         if (!name) {
             name = "file";
@@ -70,6 +70,6 @@ let KeystoreService = class KeystoreService extends core_1.KeystoreService {
 exports.KeystoreService = KeystoreService;
 exports.KeystoreService = KeystoreService = __decorate([
     (0, core_1.Injectable)("KEYSTORE_SERVICE"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.AppFileSystemService])
 ], KeystoreService);

package/lib/modules/package-manager/service/PackageManager.d.ts

@@ -1,8 +1,8 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 import { PackageManagerProvider } from "../types/PackageManagerProvider";
 export declare class PackageManager {
-    protected readonly appConfigService: AppConfigService;
-    constructor(appConfigService: AppConfigService);
+    protected readonly appService: AppService;
+    constructor(appService: AppService);
     getManager(): Promise<PackageManagerProvider>;
     getPackages(global?: boolean): Promise<import("../types/Package").Package[]>;
     install(name: string, version?: string): Promise<void>;

package/lib/modules/package-manager/service/PackageManager.js

@@ -16,12 +16,12 @@ const NpmProvider_1 = require("../providers/NpmProvider");
 const PnpmProvider_1 = require("../providers/PnpmProvider");
 const YarnProvider_1 = require("../providers/YarnProvider");
 let PackageManager = class PackageManager {
-    constructor(appConfigService) {
-        this.appConfigService = appConfigService;
+    constructor(appService) {
+        this.appService = appService;
     }
     async getManager() {
-        if (!this.appConfigService.config.pm) {
-            this.appConfigService.config.pm = await (0, utils_1.promptSelect)({
+        if (!this.appService.config.pm) {
+            this.appService.config.pm = await (0, utils_1.promptSelect)({
                 label: "Package manager:",
                 options: [
                     {
@@ -39,9 +39,9 @@ let PackageManager = class PackageManager {
                 ],
                 required: true
             });
-            this.appConfigService.save();
+            this.appService.save();
         }
-        switch (this.appConfigService.config.pm) {
+        switch (this.appService.config.pm) {
             case "npm":
                 return new NpmProvider_1.NpmProvider();
             case "pnpm":
@@ -66,5 +66,5 @@ let PackageManager = class PackageManager {
 exports.PackageManager = PackageManager;
 exports.PackageManager = PackageManager = __decorate([
     (0, core_1.Injectable)("PACKAGE_MANAGER_SERVICE"),
-    __metadata("design:paramtypes", [core_1.AppConfigService])
+    __metadata("design:paramtypes", [core_1.AppService])
 ], PackageManager);

package/lib/modules/plugin/controllers/PluginController.d.ts

@@ -1,9 +1,9 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 import { PluginService } from "../services/PluginService";
 export declare class PluginController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly pluginService: PluginService;
-    constructor(appConfigService: AppConfigService, pluginService: PluginService);
+    constructor(appService: AppService, pluginService: PluginService);
     list(): Promise<string>;
     add(names: string[]): Promise<void>;
     remove(names: string[]): Promise<void>;

package/lib/modules/plugin/controllers/PluginController.js

@@ -16,8 +16,8 @@ exports.PluginController = void 0;
 const core_1 = require("@wocker/core");
 const PluginService_1 = require("../services/PluginService");
 let PluginController = class PluginController {
-    constructor(appConfigService, pluginService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, pluginService) {
+        this.appService = appService;
         this.pluginService = pluginService;
     }
     async list() {
@@ -38,7 +38,7 @@ let PluginController = class PluginController {
         await this.pluginService.update();
     }
     getInstalledPlugins() {
-        return this.appConfigService.plugins.map(pluginRef => pluginRef.name);
+        return this.appService.plugins.map(pluginRef => pluginRef.name);
     }
 };
 exports.PluginController = PluginController;
@@ -82,6 +82,6 @@ __decorate([
 exports.PluginController = PluginController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Plugin commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         PluginService_1.PluginService])
 ], PluginController);

package/lib/modules/plugin/index.js

@@ -18,14 +18,14 @@ let PluginModule = PluginModule_1 = class PluginModule {
         return {
             module: PluginModule_1,
             inject: [
-                core_1.AppConfigService,
+                core_1.AppService,
                 core_1.AppFileSystemService,
                 core_1.LogService,
                 PluginService_1.PluginService
             ],
-            useFactory: async (appConfigService, fs, logService, pluginService) => {
+            useFactory: async (appService, fs, logService, pluginService) => {
                 const imports = [];
-                for (const pluginData of appConfigService.plugins) {
+                for (const pluginData of appService.plugins) {
                     try {
                         const plugin = await pluginService.import(pluginData.name);
                         imports.push({
@@ -43,8 +43,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
                             pluginName: pluginData.name,
                             pluginEnv: pluginData.env
                         });
-                        appConfigService.removePlugin(pluginData.name);
-                        appConfigService.save();
+                        appService.removePlugin(pluginData.name);
                     }
                 }
                 return {

package/lib/modules/plugin/services/PluginService.d.ts

@@ -1,14 +1,14 @@
-import { Cli, AppConfigService, LogService } from "@wocker/core";
+import { Cli, AppService, LogService } from "@wocker/core";
 import { PackageManager, RegistryService } from "../../package-manager";
 import { Plugin } from "../../../makes";
 export declare class PluginService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly pm: PackageManager;
     protected readonly registryService: RegistryService;
     protected readonly logService: LogService;
     protected readonly cli: Cli;
     protected rule: string;
-    constructor(appConfigService: AppConfigService, pm: PackageManager, registryService: RegistryService, logService: LogService, cli: Cli);
+    constructor(appService: AppService, pm: PackageManager, registryService: RegistryService, logService: LogService, cli: Cli);
     getPluginsTable(): string;
     checkPlugin(pluginName: string): Promise<boolean>;
     install(pluginName: string, version?: string): Promise<void>;

package/lib/modules/plugin/services/PluginService.js

@@ -52,8 +52,8 @@ const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const package_manager_1 = require("../../package-manager");
 const makes_1 = require("../../../makes");
 let PluginService = class PluginService {
-    constructor(appConfigService, pm, registryService, logService, cli) {
-        this.appConfigService = appConfigService;
+    constructor(appService, pm, registryService, logService, cli) {
+        this.appService = appService;
         this.pm = pm;
         this.registryService = registryService;
         this.logService = logService;
@@ -65,10 +65,10 @@ let PluginService = class PluginService {
             head: ["Name", "Env"],
             colWidths: [30]
         });
-        if (this.appConfigService.plugins.length === 0) {
+        if (this.appService.plugins.length === 0) {
             return yoctocolors_cjs_1.default.gray("No plugins installed");
         }
-        for (const plugin of this.appConfigService.plugins) {
+        for (const plugin of this.appService.plugins) {
             table.push([plugin.name, plugin.env]);
         }
         return table.toString();
@@ -88,14 +88,14 @@ let PluginService = class PluginService {
     async install(pluginName, version = "latest") {
         const [, prefix = "@wocker/", name, suffix = "-plugin"] = /^(@wocker\/)?(\w+)(-plugin)?$/.exec(pluginName) || [];
         const fullName = `${prefix}${name}${suffix}`;
-        const currentVersion = await this.getCurrentVersion(fullName), wRule = makes_1.VersionRule.parse(this.rule), rule = makes_1.VersionRule.parse(version === "latest" ? "x" : version || this.rule);
+        const currentVersion = await this.getCurrentVersion(fullName), wRule = core_1.VersionRule.parse(this.rule), rule = core_1.VersionRule.parse(version === "latest" ? "x" : version || this.rule);
         const packageInfo = await this.registryService.getPackageInfo(fullName);
         const versions = Object.keys(packageInfo.versions)
             .filter((version) => {
             return wRule.match(version, true) && rule.match(version, true);
         })
             .sort((a, b) => {
-            return makes_1.Version.parse(b).compare(a);
+            return core_1.Version.parse(b).compare(a);
         });
         const bestSatisfyingVersion = versions.find((version) => rule.match(version)) ??
             versions.find((version) => rule.match(version, true));
@@ -105,8 +105,7 @@ let PluginService = class PluginService {
         if ((!currentVersion || currentVersion !== bestSatisfyingVersion) || !await this.checkPlugin(fullName)) {
             await this.pm.install(fullName, bestSatisfyingVersion);
         }
-        this.appConfigService.addPlugin(fullName, version);
-        this.appConfigService.save();
+        this.appService.addPlugin(fullName, version);
         console.info(`Plugin ${fullName} activated`);
     }
     async uninstall(pluginName) {
@@ -115,8 +114,7 @@ let PluginService = class PluginService {
         if (await this.checkPlugin(fullName)) {
             await this.pm.uninstall(fullName);
         }
-        this.appConfigService.removePlugin(fullName);
-        this.appConfigService.save();
+        this.appService.removePlugin(fullName);
         console.info(`Plugin ${fullName} deactivated`);
     }
     async import(name) {
@@ -124,11 +122,11 @@ let PluginService = class PluginService {
         return new makes_1.Plugin(type);
     }
     async update() {
-        if (this.appConfigService.plugins.length === 0) {
+        if (this.appService.plugins.length === 0) {
             console.info("No plugins installed");
             return;
         }
-        for (const plugin of this.appConfigService.plugins) {
+        for (const plugin of this.appService.plugins) {
             console.info(`Checking ${plugin.name}...`);
             try {
                 await this.install(plugin.name, plugin.env);
@@ -156,7 +154,7 @@ let PluginService = class PluginService {
 exports.PluginService = PluginService;
 exports.PluginService = PluginService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         package_manager_1.PackageManager,
         package_manager_1.RegistryService,
         core_1.LogService,

package/lib/modules/preset/controllers/PresetController.d.ts

@@ -1,13 +1,13 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 import { DockerService } from "@wocker/docker-module";
 import { PresetRepository } from "../repositories/PresetRepository";
 import { PresetService } from "../services/PresetService";
 export declare class PresetController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly dockerService: DockerService;
     protected readonly presetRepository: PresetRepository;
     protected readonly presetService: PresetService;
-    constructor(appConfigService: AppConfigService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
+    constructor(appService: AppService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
     init(): Promise<void>;
     list(): Promise<string>;
     install(repository: string, version?: string): Promise<void>;

package/lib/modules/preset/controllers/PresetController.js

@@ -23,8 +23,8 @@ const utils_1 = require("@wocker/utils");
 const PresetRepository_1 = require("../repositories/PresetRepository");
 const PresetService_1 = require("../services/PresetService");
 let PresetController = class PresetController {
-    constructor(appConfigService, dockerService, presetRepository, presetService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, dockerService, presetRepository, presetService) {
+        this.appService = appService;
         this.dockerService = dockerService;
         this.presetRepository = presetRepository;
         this.presetService = presetService;
@@ -81,7 +81,7 @@ let PresetController = class PresetController {
             await this.dockerService.imageRm(imageName);
         }
         await this.dockerService.buildImage({
-            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
+            version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
             tag: imageName,
             labels: {
                 presetName: preset.name
@@ -157,7 +157,7 @@ __decorate([
 exports.PresetController = PresetController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Preset commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         docker_module_1.DockerService,
         PresetRepository_1.PresetRepository,
         PresetService_1.PresetService])

package/lib/modules/preset/controllers/PresetListener.d.ts

@@ -1,13 +1,13 @@
-import { Project, AppConfigService } from "@wocker/core";
+import { Project, AppService } from "@wocker/core";
 import { DockerService } from "@wocker/docker-module";
 import { PresetRepository } from "../repositories/PresetRepository";
 import { PresetService } from "../services/PresetService";
 export declare class PresetListener {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly dockerService: DockerService;
     protected readonly presetRepository: PresetRepository;
     protected readonly presetService: PresetService;
-    constructor(appConfigService: AppConfigService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
+    constructor(appService: AppService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
     onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;

package/lib/modules/preset/controllers/PresetListener.js

@@ -17,14 +17,14 @@ const PresetRepository_1 = require("../repositories/PresetRepository");
 const PresetService_1 = require("../services/PresetService");
 const utils_2 = require("../../../utils");
 let PresetListener = class PresetListener {
-    constructor(appConfigService, dockerService, presetRepository, presetService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, dockerService, presetRepository, presetService) {
+        this.appService = appService;
         this.dockerService = dockerService;
         this.presetRepository = presetRepository;
         this.presetService = presetService;
     }
     async onInit(project) {
-        if (project.type !== core_1.PROJECT_TYPE_PRESET) {
+        if (project.type !== core_1.ProjectType.PRESET) {
             return;
         }
         const presets = this.presetRepository.search();
@@ -92,7 +92,7 @@ let PresetListener = class PresetListener {
         }
     }
     async onRebuild(project) {
-        if (project.type !== core_1.PROJECT_TYPE_PRESET) {
+        if (project.type !== core_1.ProjectType.PRESET) {
             return;
         }
         const preset = this.presetService.get(project.preset);
@@ -107,7 +107,7 @@ let PresetListener = class PresetListener {
         }
     }
     async onBeforeStart(project) {
-        if (project.type !== core_1.PROJECT_TYPE_PRESET) {
+        if (project.type !== core_1.ProjectType.PRESET) {
             return;
         }
         const preset = this.presetService.get(project.preset);
@@ -115,7 +115,7 @@ let PresetListener = class PresetListener {
             project.imageName = this.presetService.getImageNameForProject(project, preset);
             if (!await this.dockerService.imageExists(project.imageName)) {
                 await this.dockerService.buildImage({
-                    version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
+                    version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
                     tag: project.imageName,
                     labels: {
                         presetName: preset.name
@@ -149,7 +149,7 @@ __decorate([
 ], PresetListener.prototype, "onBeforeStart", null);
 exports.PresetListener = PresetListener = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         docker_module_1.DockerService,
         PresetRepository_1.PresetRepository,
         PresetService_1.PresetService])

package/lib/modules/preset/repositories/PresetRepository.d.ts

@@ -1,14 +1,14 @@
-import { AppConfig, PresetServiceSearchOptions as SearchOptions, Preset, PresetSource, AppConfigService, LogService, FileSystemDriver } from "@wocker/core";
+import { AppConfig, PresetServiceSearchOptions as SearchOptions, Preset, PresetSource, AppService, LogService, FileSystemDriver } from "@wocker/core";
 type PresetData = {
     name: string;
     source: PresetSource;
     path?: string;
 };
 export declare class PresetRepository {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly logService: LogService;
     protected readonly driver: FileSystemDriver;
-    constructor(appConfigService: AppConfigService, logService: LogService, driver: FileSystemDriver);
+    constructor(appService: AppService, logService: LogService, driver: FileSystemDriver);
     protected load(data: PresetData): Preset;
     protected configs(): AppConfig["presets"];
     search(options?: SearchOptions): Preset[];

package/lib/modules/preset/repositories/PresetRepository.js

@@ -16,8 +16,8 @@ exports.PresetRepository = void 0;
 const core_1 = require("@wocker/core");
 const env_1 = require("../../../env");
 let PresetRepository = class PresetRepository {
-    constructor(appConfigService, logService, driver) {
-        this.appConfigService = appConfigService;
+    constructor(appService, logService, driver) {
+        this.appService = appService;
         this.logService = logService;
         this.driver = driver;
     }
@@ -39,7 +39,7 @@ let PresetRepository = class PresetRepository {
                         fs.writeJSON("config.json", this.toObject());
                         break;
                 }
-                _this.appConfigService.registerPreset(this.name, this.source, data.path);
+                _this.appService.registerPreset(this.name, this.source, data.path);
             }
             delete() {
                 switch (this.source) {
@@ -51,13 +51,13 @@ let PresetRepository = class PresetRepository {
                         }
                         break;
                 }
-                _this.appConfigService.unregisterPreset(this.name);
+                _this.appService.unregisterPreset(this.name);
             }
         }(config);
     }
     configs() {
         const fs = new core_1.FileSystem(env_1.PRESETS_DIR, this.driver), dirs = fs.exists("") ? fs.readdir("") : [];
-        const { presets = [] } = this.appConfigService.config;
+        const { presets = [] } = this.appService.config;
         return [
             ...dirs.map((name) => {
                 return {
@@ -70,7 +70,7 @@ let PresetRepository = class PresetRepository {
                 if (item.source === core_1.PRESET_SOURCE_GITHUB) {
                     return {
                         ...item,
-                        path: this.appConfigService.fs.path("presets", item.name)
+                        path: this.appService.fs.path("presets", item.name)
                     };
                 }
                 return item;
@@ -113,6 +113,6 @@ exports.PresetRepository = PresetRepository;
 exports.PresetRepository = PresetRepository = __decorate([
     (0, core_1.Injectable)(),
     __param(2, (0, core_1.Inject)(core_1.FILE_SYSTEM_DRIVER_KEY)),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.LogService, Object])
 ], PresetRepository);