@wocker/core 1.0.25-beta.0 → 1.0.25-beta.1

package/lib/core/ApplicationContext.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationContext = void 0;
 const cli_1 = require("@kearisp/cli");
+const AsyncStorage_1 = require("./AsyncStorage");
 class ApplicationContext {
     constructor(module, container) {
         this.module = module;
@@ -29,33 +30,37 @@ class ApplicationContext {
     }
     run(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cli = this.get(cli_1.Cli);
-            cli.command("").action(() => {
-                for (const [, module] of this.container.modules) {
-                    for (const [, container] of module.controllers) {
-                        if (!container.description) {
-                            continue;
-                        }
-                        console.info(`${container.description}:`);
-                        const spaceLength = container.commands.reduce((space, route) => {
-                            return route.commandNames.reduce((space, command) => {
-                                return Math.max(space, command.length + 2);
-                            }, space);
-                        }, 0);
-                        for (const route of container.commands) {
-                            if (!route.description) {
-                                continue;
-                            }
-                            for (const commandName of route.commandNames) {
-                                const space = " ".repeat(Math.max(0, spaceLength - commandName.length));
-                                console.info(`  ${commandName} ${space} ${route.description}`);
+            return new Promise((resolve) => {
+                AsyncStorage_1.AsyncStorage.run(this.container, () => {
+                    const cli = this.get(cli_1.Cli);
+                    cli.command("").action(() => {
+                        for (const [, module] of this.container.modules) {
+                            for (const [, container] of module.controllers) {
+                                if (!container.description) {
+                                    continue;
+                                }
+                                console.info(`${container.description}:`);
+                                const spaceLength = container.commands.reduce((space, route) => {
+                                    return route.commandNames.reduce((space, command) => {
+                                        return Math.max(space, command.length + 2);
+                                    }, space);
+                                }, 0);
+                                for (const route of container.commands) {
+                                    if (!route.description) {
+                                        continue;
+                                    }
+                                    for (const commandName of route.commandNames) {
+                                        const space = " ".repeat(Math.max(0, spaceLength - commandName.length));
+                                        console.info(`  ${commandName} ${space} ${route.description}`);
+                                    }
+                                }
+                                console.info("");
                             }
                         }
-                        console.info("");
-                    }
-                }
+                    });
+                    return resolve(cli.run(args));
+                });
             });
-            return cli.run(args);
         });
     }
 }

package/lib/core/AsyncStorage.d.ts

@@ -0,0 +1,3 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+import type { Container } from "./Container";
+export declare const AsyncStorage: AsyncLocalStorage<Container>;

package/lib/core/AsyncStorage.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncStorage = void 0;
+const node_async_hooks_1 = require("node:async_hooks");
+exports.AsyncStorage = new node_async_hooks_1.AsyncLocalStorage();

package/lib/core/Container.d.ts

@@ -10,5 +10,6 @@ export declare class Container {
     hasModule<TInput = any>(type: Type<TInput>): boolean;
     getModule<TInput = any>(type: Type<TInput>): ModuleWrapper<TInput>;
     addProvider(type: InjectionToken, wrapper: InstanceWrapper): void;
+    getProvider(type: InjectionToken): InstanceWrapper | undefined;
     replace(type: InjectionToken, provider: ProviderType): void;
 }

package/lib/core/Container.js

@@ -31,6 +31,12 @@ class Container {
             : type;
         this.globalProviders.set(token, wrapper);
     }
+    getProvider(type) {
+        const token = typeof type !== "string"
+            ? Reflect.getMetadata(env_1.INJECT_TOKEN_METADATA, type) || type
+            : type;
+        return this.globalProviders.get(token);
+    }
     replace(type, provider) {
         const token = typeof type !== "string"
             ? Reflect.getMetadata(env_1.INJECT_TOKEN_METADATA, type) || type

package/lib/core/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./AsyncStorage";
 export * from "./ApplicationContext";
 export * from "./Container";
 export * from "./Factory";

package/lib/core/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("./AsyncStorage"), exports);
 __exportStar(require("./ApplicationContext"), exports);
 __exportStar(require("./Container"), exports);
 __exportStar(require("./Factory"), exports);

package/lib/makes/Logger.d.ts

@@ -1,6 +1,5 @@
-import { LogService } from "../services/LogService";
 export declare class Logger {
-    static install(ls: LogService): void;
+    protected static getLogService(): any | undefined;
     static log(...data: any[]): void;
     static info(...data: any[]): void;
     static warn(...data: any[]): void;

package/lib/makes/Logger.js

@@ -1,34 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
-let loggerService;
+const core_1 = require("../core");
+const services_1 = require("../services");
 class Logger {
-    static install(ls) {
-        loggerService = ls;
-    }
-    static log(...data) {
-        if (!loggerService) {
+    static getLogService() {
+        var _a;
+        const container = core_1.AsyncStorage.getStore();
+        if (!container) {
             return;
         }
-        loggerService.log(...data);
+        return (_a = container.getProvider(services_1.LogService)) === null || _a === void 0 ? void 0 : _a.instance;
+    }
+    static log(...data) {
+        var _a;
+        (_a = Logger.getLogService()) === null || _a === void 0 ? void 0 : _a.log(...data);
     }
     static info(...data) {
-        if (!loggerService) {
-            return;
-        }
-        loggerService.info(...data);
+        var _a;
+        (_a = Logger.getLogService()) === null || _a === void 0 ? void 0 : _a.info(...data);
     }
     static warn(...data) {
-        if (!loggerService) {
-            return;
-        }
-        loggerService.warn(...data);
+        var _a;
+        (_a = Logger.getLogService()) === null || _a === void 0 ? void 0 : _a.warn(...data);
     }
     static error(...data) {
-        if (!loggerService) {
-            return;
-        }
-        loggerService.error(...data);
+        var _a;
+        (_a = Logger.getLogService()) === null || _a === void 0 ? void 0 : _a.error(...data);
     }
 }
 exports.Logger = Logger;

package/lib/makes/Preset.d.ts

@@ -1,4 +1,4 @@
-import { PickProperties } from "../types";
+import { PickProperties } from "../types/PickProperties";
 type TextOption = {
     type: "text" | "string" | "number" | "int" | "password";
     message?: string;

package/lib/makes/Project.d.ts

@@ -4,7 +4,7 @@ export type ProjectProperties = Omit<PickProperties<Project>, "containerName" |
 export declare abstract class Project {
     id: string;
     name: string;
-    type: string;
+    type: ProjectType;
     path: string;
     preset?: string;
     presetMode?: "global" | "project";
@@ -18,7 +18,7 @@ export declare abstract class Project {
     metadata?: EnvConfig;
     ports?: string[];
     volumes?: string[];
-    protected constructor(data: ProjectProperties);
+    constructor(data: ProjectProperties);
     get containerName(): string;
     get domains(): string[];
     hasDomain(domain: string): boolean;
@@ -45,10 +45,6 @@ export declare abstract class Project {
     abstract getSecret(key: string, byDefault?: string): Promise<string | undefined>;
     abstract setSecret(key: string, value: string): Promise<void>;
     abstract save(): void;
-    /**
-     * @deprecated
-     */
-    toJSON(): ProjectProperties;
     toObject(): ProjectProperties;
 }
 export declare const PROJECT_TYPE_DOCKERFILE = "dockerfile";

package/lib/makes/Project.js

@@ -4,21 +4,6 @@ exports.PROJECT_TYPE_COMPOSE = exports.PROJECT_TYPE_PRESET = exports.PROJECT_TYP
 const volumeParse_1 = require("../utils/volumeParse");
 class Project {
     constructor(data) {
-        this.id = data.id;
-        this.name = data.name;
-        this.type = data.type;
-        this.path = data.path;
-        this.preset = data.preset;
-        this.presetMode = data.presetMode;
-        this.imageName = data.imageName;
-        this.dockerfile = data.dockerfile;
-        this.scripts = data.scripts;
-        this.buildArgs = data.buildArgs;
-        this.env = data.env;
-        this.ports = data.ports;
-        this.volumes = data.volumes;
-        this.extraHosts = data.extraHosts;
-        this.metadata = data.metadata;
         Object.assign(this, data);
     }
     get containerName() {
@@ -187,12 +172,6 @@ class Project {
             delete this.extraHosts;
         }
     }
-    /**
-     * @deprecated
-     */
-    toJSON() {
-        return this.toObject();
-    }
     toObject() {
         return {
             id: this.id,

package/lib/services/AppConfigService.d.ts

@@ -1,4 +1,5 @@
-import { AppConfig, PresetSource } from "../makes";
+import { AppConfig } from "../makes/AppConfig";
+import { PresetSource } from "../makes/Preset";
 import { ProjectRef } from "../types/ProjectRef";
 import { PluginRef } from "../types/PluginRef";
 import { AppFileSystemService } from "./AppFileSystemService";
@@ -50,6 +51,7 @@ export declare class AppConfigService {
     getMeta(name: string, byDefault: string): string;
     setMeta(name: string, value: string): void;
     unsetMeta(name: string): void;
+    isExperimentalEnabled(key: string): boolean;
     getProjectTypes(): TypeMap;
     save(): void;
 }

package/lib/services/AppConfigService.js

@@ -18,7 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfigService = void 0;
 const path_1 = __importDefault(require("path"));
 const decorators_1 = require("../decorators");
-const makes_1 = require("../makes");
+const AppConfig_1 = require("../makes/AppConfig");
+const Project_1 = require("../makes/Project");
 const AppFileSystemService_1 = require("./AppFileSystemService");
 const ProcessService_1 = require("./ProcessService");
 const env_1 = require("../env");
@@ -28,15 +29,16 @@ let AppConfigService = class AppConfigService {
         this.processService = processService;
         this.fs = fs;
         this.mapTypes = {
-            [makes_1.PROJECT_TYPE_PRESET]: "Preset",
-            [makes_1.PROJECT_TYPE_IMAGE]: "Image",
-            [makes_1.PROJECT_TYPE_DOCKERFILE]: "Dockerfile"
+            [Project_1.PROJECT_TYPE_PRESET]: "Preset",
+            [Project_1.PROJECT_TYPE_IMAGE]: "Image",
+            [Project_1.PROJECT_TYPE_DOCKERFILE]: "Dockerfile"
         };
         this._pwd = (process.cwd() || process.env.PWD);
     }
     get experimentalFeatures() {
         return [
-            "projectComposeType"
+            "projectComposeType",
+            "buildKit"
         ];
     }
     get debug() {
@@ -83,7 +85,7 @@ let AppConfigService = class AppConfigService {
                     recursive: true
                 });
             }
-            this._config = new makes_1.AppConfig(data);
+            this._config = new AppConfig_1.AppConfig(data);
         }
         return this._config;
     }
@@ -163,9 +165,12 @@ let AppConfigService = class AppConfigService {
     unsetMeta(name) {
         this.config.unsetMeta(name);
     }
+    isExperimentalEnabled(key) {
+        return this.config.getMeta(`experimental.${key}`) === "enabled";
+    }
     getProjectTypes() {
-        if (this.config.getMeta("experimental.projectComposeType")) {
-            return Object.assign(Object.assign({}, this.mapTypes), { [makes_1.PROJECT_TYPE_COMPOSE]: "Docker compose" });
+        if (this.isExperimentalEnabled("projectComposeType")) {
+            return Object.assign(Object.assign({}, this.mapTypes), { [Project_1.PROJECT_TYPE_COMPOSE]: "Docker compose" });
         }
         return this.mapTypes;
     }

package/lib/services/AppFileSystemService.d.ts

@@ -1,4 +1,4 @@
-import { FileSystem } from "../makes";
+import { FileSystem } from "../makes/FileSystem";
 export declare class AppFileSystemService extends FileSystem {
     constructor(dataDir: string);
 }

package/lib/services/AppFileSystemService.js

@@ -14,9 +14,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppFileSystemService = void 0;
 const decorators_1 = require("../decorators");
-const makes_1 = require("../makes");
+const FileSystem_1 = require("../makes/FileSystem");
 const env_1 = require("../env");
-let AppFileSystemService = class AppFileSystemService extends makes_1.FileSystem {
+let AppFileSystemService = class AppFileSystemService extends FileSystem_1.FileSystem {
     constructor(dataDir) {
         super(dataDir);
     }

package/lib/services/DockerService.d.ts

@@ -38,6 +38,7 @@ export declare namespace DockerServiceParams {
         };
     };
     type BuildImage = {
+        version?: "1" | "2";
         tag: string;
         buildArgs?: {
             [key: string]: string;
@@ -46,8 +47,12 @@ export declare namespace DockerServiceParams {
             [key: string]: string;
         };
         context: string;
+    } & ({
+        /** @deprecated */
         src: string;
-    };
+    } | {
+        dockerfile: string;
+    });
     type Exec = {
         cmd: string[];
         tty?: boolean;

package/lib/services/ModemService.js

@@ -12,5 +12,5 @@ let ModemService = class ModemService {
 };
 exports.ModemService = ModemService;
 exports.ModemService = ModemService = __decorate([
-    (0, decorators_1.Injectable)("MODEM_SERVICE")
+    (0, decorators_1.Injectable)("DOCKER_MODEM_SERVICE")
 ], ModemService);

package/lib/types/PresetRef.d.ts

@@ -1,4 +1,4 @@
-import { PresetSource } from "../makes";
+import { PresetSource } from "../makes/Preset";
 export type PresetRef = {
     name: string;
     source: PresetSource;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/core",
-    "version": "1.0.25-beta.0",
+    "version": "1.0.25-beta.1",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",
@@ -40,7 +40,7 @@
         "@types/docker-modem": "^3.0.6",
         "@types/dockerode": "^3.3.23",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.15.17",
+        "@types/node": "^24.0.13",
         "jest": "^29.7.0",
         "make-coverage-badge": "^1.2.0",
         "memfs": "^4.17.1",