@wocker/core 1.0.22-beta.3 → 1.0.22

package/lib/core/ControllerWrapper.js

@@ -4,6 +4,7 @@ exports.ControllerWrapper = void 0;
 require("reflect-metadata");
 const InstanceWrapper_1 = require("./InstanceWrapper");
 const Route_1 = require("./Route");
+const env_1 = require("../env");
 class ControllerWrapper extends InstanceWrapper_1.InstanceWrapper {
     constructor(module, type) {
         super(module, type);
@@ -12,7 +13,7 @@ class ControllerWrapper extends InstanceWrapper_1.InstanceWrapper {
         if (!this.type) {
             return;
         }
-        this.description = Reflect.getMetadata("CONTROLLER_DESCRIPTION", this.type) || "";
+        this.description = Reflect.getMetadata(env_1.DESCRIPTION_METADATA, this.type) || "";
         for (const method of Object.getOwnPropertyNames(this.type.prototype)) {
             const route = new Route_1.Route(this.type, method);
             if (route.isCommand) {

package/lib/core/Route.js

@@ -15,10 +15,10 @@ class Route {
         if (!descriptor) {
             return;
         }
-        this.description = Reflect.getMetadata(env_1.COMMAND_DESCRIPTION_METADATA, descriptor.value) || "";
+        this.description = Reflect.getMetadata(env_1.DESCRIPTION_METADATA, descriptor.value) || "";
         this.commandNames = Reflect.getMetadata(env_1.COMMAND_METADATA, descriptor.value) || [];
         this.completions = Reflect.getMetadata(env_1.COMPLETION_METADATA, descriptor.value) || [];
-        const argsMeta = Reflect.getMetadata(env_1.ARGS_METADATA, this.type, this.method) || [], argsAliases = Reflect.getMetadata(env_1.ALIAS_METADATA, this.type, this.method) || {}, argsDescription = Reflect.getMetadata(env_1.ARGS_DESCRIPTION_METADATA, this.type, method) || {}, designTypes = Reflect.getMetadata(env_1.PARAMTYPES_METADATA, this.type.prototype, this.method) || [];
+        const argsMeta = Reflect.getMetadata(env_1.ARGS_METADATA, this.type, this.method) || [], argsAliases = Reflect.getMetadata(env_1.ALIAS_METADATA, this.type, this.method) || {}, argsDescription = Reflect.getMetadata(env_1.DESCRIPTION_METADATA, this.type, method) || {}, designTypes = Reflect.getMetadata(env_1.PARAMTYPES_METADATA, this.type.prototype, this.method) || [];
         this.argsMeta = argsMeta;
         this.designTypes = designTypes;
         for (let i = 0; i < argsMeta.length; i++) {

package/lib/decorators/Controller.d.ts

@@ -1,6 +1 @@
-type Params = {
-    command?: string;
-    description?: string;
-};
-export declare const Controller: (params?: Params) => ClassDecorator;
-export {};
+export declare const Controller: () => ClassDecorator;

package/lib/decorators/Controller.js

@@ -1,17 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Controller = void 0;
-const Controller = (params) => {
-    const { command, description } = params || {};
+const Controller = () => {
     return (target) => {
         Reflect.defineMetadata("IS_CONTROLLER", true, target);
-        if (description) {
-            Reflect.defineMetadata("CONTROLLER_DESCRIPTION", description, target);
-        }
-        if (!command) {
-            return;
-        }
-        // TODO:
     };
 };
 exports.Controller = Controller;

package/lib/decorators/Description.js

@@ -7,7 +7,7 @@ const Description = (description) => {
     return (target, propertyKey, descriptorOrIndex) => {
         // Class
         if (typeof target === "function" && typeof propertyKey === "undefined" && typeof descriptorOrIndex === "undefined") {
-            Reflect.defineMetadata(env_1.COMMAND_DESCRIPTION_METADATA, description, target);
+            Reflect.defineMetadata(env_1.DESCRIPTION_METADATA, description, target);
             return;
         }
         if (typeof target !== "object" || !propertyKey) {
@@ -15,16 +15,16 @@ const Description = (description) => {
         }
         // Property
         if (typeof descriptorOrIndex === "undefined") {
-            Reflect.defineMetadata(env_1.COMMAND_DESCRIPTION_METADATA, description, target, propertyKey);
+            Reflect.defineMetadata(env_1.DESCRIPTION_METADATA, description, target, propertyKey);
             return;
         }
         // Method
         if (typeof descriptorOrIndex !== "number") {
-            Reflect.defineMetadata(env_1.COMMAND_DESCRIPTION_METADATA, description, descriptorOrIndex.value);
+            Reflect.defineMetadata(env_1.DESCRIPTION_METADATA, description, descriptorOrIndex.value);
             return;
         }
         // Parameter
-        Reflect.defineMetadata(env_1.ARGS_DESCRIPTION_METADATA, Object.assign(Object.assign({}, Reflect.getMetadata(env_1.ARGS_DESCRIPTION_METADATA, target.constructor, propertyKey) || {}), { [descriptorOrIndex]: description }), target.constructor, propertyKey);
+        Reflect.defineMetadata(env_1.DESCRIPTION_METADATA, Object.assign(Object.assign({}, Reflect.getMetadata(env_1.DESCRIPTION_METADATA, target.constructor, propertyKey) || {}), { [descriptorOrIndex]: description }), target.constructor, propertyKey);
     };
 };
 exports.Description = Description;

package/lib/decorators/Module.d.ts

@@ -1,9 +1,9 @@
 import { MODULE_METADATA } from "../env";
 import { Provider } from "../types/Provider";
-export type ModuleConfig = {
+export type ModuleMetadata = {
     [MODULE_METADATA.CONTROLLERS]?: any[];
     [MODULE_METADATA.PROVIDERS]?: Provider[];
     [MODULE_METADATA.IMPORTS]?: any[];
     [MODULE_METADATA.EXPORTS]?: any[];
 };
-export declare const Module: (config: ModuleConfig) => ClassDecorator;
+export declare const Module: (config: ModuleMetadata) => ClassDecorator;

package/lib/decorators/Option.d.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
 import { Option as O } from "@kearisp/cli";
 type AliasOrParams = string | Partial<Omit<O, "name">>;
-export declare const Option: (name: string, params?: AliasOrParams) => ParameterDecorator;
+export declare const Option: (name: string, aliasOrParams?: AliasOrParams) => ParameterDecorator;
 export {};

package/lib/decorators/Option.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Option = void 0;
 require("reflect-metadata");
 const env_1 = require("../env");
-const Option = (name, params) => {
+const Option = (name, aliasOrParams) => {
     return (target, key, index) => {
         if (!key) {
             return;
@@ -12,7 +12,7 @@ const Option = (name, params) => {
             {
                 type: "option",
                 name,
-                params: typeof params === "string" ? { alias: params } : params,
+                params: typeof aliasOrParams === "string" ? { alias: aliasOrParams } : aliasOrParams,
                 index
             },
             ...Reflect.getMetadata(env_1.ARGS_METADATA, target.constructor, key) || []

package/lib/decorators/Param.d.ts

@@ -1,2 +1 @@
-import "reflect-metadata";
 export declare const Param: (name: string) => ParameterDecorator;

package/lib/decorators/Param.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Param = void 0;
-require("reflect-metadata");
 const env_1 = require("../env");
 const Param = (name) => {
     return (target, propertyKey, parameterIndex) => {

package/lib/decorators/Plugin.d.ts

@@ -1,6 +1,6 @@
-import { ModuleConfig } from "./Module";
+import { ModuleMetadata } from "./Module";
 import { PLUGIN_NAME_METADATA } from "../env";
-type PluginConfig = ModuleConfig & {
+type PluginConfig = ModuleMetadata & {
     [PLUGIN_NAME_METADATA]: string;
 };
 export declare const Plugin: (config: PluginConfig) => ClassDecorator;

package/lib/decorators/index.d.ts

@@ -9,3 +9,8 @@ export * from "./Module";
 export * from "./Option";
 export * from "./Param";
 export * from "./Plugin";
+export type { 
+/**
+ * @deprecated
+ */
+ModuleMetadata as ModuleConfig } from "./Module";

package/lib/env.d.ts

@@ -1,13 +1,11 @@
 export declare const IS_GLOBAL_METADATA = "IS_GLOBAL";
 export declare const IS_MODULE_METADATA = "isModule";
 export declare const INJECTABLE_WATERMARK = "__injectable__";
-export declare const ARGS_META = "__ARGS__";
+export declare const DESCRIPTION_METADATA = "__DESCRIPTION__";
 export declare const COMMAND_METADATA = "command";
-export declare const COMMAND_DESCRIPTION_METADATA = "__COMMAND_DESCRIPTION__";
 export declare const COMPLETION_METADATA = "completion";
 export declare const ARGS_METADATA = "__ARGS__";
 export declare const ALIAS_METADATA = "__ALIAS_METADATA__";
-export declare const ARGS_DESCRIPTION_METADATA = "__ARGS_DESCRIPTION__";
 export declare const OPTION_META = "__OPTION_META__";
 export declare const PARAMTYPES_METADATA = "design:paramtypes";
 export declare const SELF_DECLARED_DEPS_METADATA = "self:paramtypes";

package/lib/env.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MODULE_METADATA = exports.PLUGIN_NAME_METADATA = exports.PLUGIN_DIR_KEY = exports.INJECT_TOKEN_METADATA = exports.SELF_DECLARED_DEPS_METADATA = exports.PARAMTYPES_METADATA = exports.OPTION_META = exports.ARGS_DESCRIPTION_METADATA = exports.ALIAS_METADATA = exports.ARGS_METADATA = exports.COMPLETION_METADATA = exports.COMMAND_DESCRIPTION_METADATA = exports.COMMAND_METADATA = exports.ARGS_META = exports.INJECTABLE_WATERMARK = exports.IS_MODULE_METADATA = exports.IS_GLOBAL_METADATA = void 0;
+exports.MODULE_METADATA = exports.PLUGIN_NAME_METADATA = exports.PLUGIN_DIR_KEY = exports.INJECT_TOKEN_METADATA = exports.SELF_DECLARED_DEPS_METADATA = exports.PARAMTYPES_METADATA = exports.OPTION_META = exports.ALIAS_METADATA = exports.ARGS_METADATA = exports.COMPLETION_METADATA = exports.COMMAND_METADATA = exports.DESCRIPTION_METADATA = exports.INJECTABLE_WATERMARK = exports.IS_MODULE_METADATA = exports.IS_GLOBAL_METADATA = void 0;
 exports.IS_GLOBAL_METADATA = "IS_GLOBAL";
 exports.IS_MODULE_METADATA = "isModule";
 exports.INJECTABLE_WATERMARK = "__injectable__";
-exports.ARGS_META = "__ARGS__";
+exports.DESCRIPTION_METADATA = "__DESCRIPTION__";
 exports.COMMAND_METADATA = "command";
-exports.COMMAND_DESCRIPTION_METADATA = "__COMMAND_DESCRIPTION__";
 exports.COMPLETION_METADATA = "completion";
 exports.ARGS_METADATA = "__ARGS__";
 exports.ALIAS_METADATA = "__ALIAS_METADATA__";
-exports.ARGS_DESCRIPTION_METADATA = "__ARGS_DESCRIPTION__";
 exports.OPTION_META = "__OPTION_META__";
 exports.PARAMTYPES_METADATA = "design:paramtypes";
 exports.SELF_DECLARED_DEPS_METADATA = "self:paramtypes";

package/lib/makes/AppConfig.d.ts

@@ -1,5 +1,5 @@
-import { EnvConfig, PickProperties } from "../types";
-import { PresetType } from "./Preset";
+import { EnvConfig } from "../types";
+import { PresetSource } from "./Preset";
 type ProjectData = {
     id: string;
     name?: string;
@@ -13,20 +13,26 @@ type PluginData = {
 };
 type PresetData = {
     name: string;
-    source: PresetType;
+    source: PresetSource;
     path?: string;
 };
-export type AppConfigProperties = Omit<PickProperties<AppConfig>, "logLevel" | "plugins"> & {
-    plugins?: (string | PluginData)[];
-    logLevel?: AppConfig["logLevel"];
+export type AppConfigProperties = {
+    debug?: boolean;
+    keystore?: string;
+    logLevel?: "off" | "info" | "warn" | "error";
+    plugins?: PluginData[];
+    presets?: PresetData[];
+    projects?: ProjectData[];
+    meta?: EnvConfig;
+    env?: EnvConfig;
 };
 export declare abstract class AppConfig {
     debug?: boolean;
     keystore?: string;
     logLevel: "off" | "info" | "warn" | "error";
     plugins: PluginData[];
-    presets?: PresetData[];
-    projects?: ProjectData[];
+    presets: PresetData[];
+    projects: ProjectData[];
     meta?: EnvConfig;
     env?: EnvConfig;
     protected constructor(data: AppConfigProperties);
@@ -35,7 +41,7 @@ export declare abstract class AppConfig {
     getProject(id: string): ProjectData | undefined;
     addProject(id: string, name: string, path: string): void;
     removeProject(id: string): void;
-    registerPreset(name: string, source: PresetType, path?: string): void;
+    registerPreset(name: string, source: PresetSource, path?: string): void;
     unregisterPreset(name: string): void;
     hasMeta(name: string): boolean;
     getMeta(name: string): string | undefined;
@@ -47,7 +53,11 @@ export declare abstract class AppConfig {
     setEnv(name: string, value: string): void;
     unsetEnv(name: string): void;
     abstract save(): void;
+    /**
+     * @deprecated
+     */
     toJson(): AppConfigProperties;
+    toObject(): AppConfigProperties;
     toJsString(): string;
     toString(): string;
 }

package/lib/makes/AppConfig.js

@@ -16,7 +16,7 @@ const Preset_1 = require("./Preset");
 class AppConfig {
     constructor(data) {
         this.logLevel = "off";
-        const { plugins = [] } = data, rest = __rest(data, ["plugins"]);
+        const { plugins = [], presets = [], projects = [] } = data, rest = __rest(data, ["plugins", "presets", "projects"]);
         Object.assign(this, rest);
         this.plugins = plugins.map((plugin) => {
             if (typeof plugin === "string") {
@@ -27,6 +27,8 @@ class AppConfig {
             }
             return plugin;
         });
+        this.presets = presets;
+        this.projects = projects;
     }
     addPlugin(name, env = "latest") {
         const plugin = this.plugins.find((plugin) => plugin.name === name);
@@ -77,21 +79,21 @@ class AppConfig {
         projectData.path = path;
     }
     removeProject(id) {
-        if (!this.projects) {
+        if (this.projects.length === 0) {
             return;
         }
         this.projects = this.projects.filter((projectData) => {
             return projectData.id !== id;
         });
-        if (this.projects.length === 0) {
-            delete this.projects;
-        }
     }
     registerPreset(name, source, path) {
-        if (!this.presets) {
-            this.presets = [];
+        if (source === Preset_1.PRESET_SOURCE_INTERNAL) {
+            return;
         }
         let presetData = this.presets.find((preset) => {
+            if (source === Preset_1.PRESET_SOURCE_EXTERNAL && preset.path === path) {
+                return true;
+            }
             return preset.name === name;
         });
         if (!presetData) {
@@ -110,15 +112,12 @@ class AppConfig {
         }
     }
     unregisterPreset(name) {
-        if (!this.presets) {
+        if (this.presets.length === 0) {
             return;
         }
         this.presets = this.presets.filter((preset) => {
             return preset.name !== name;
         });
-        if (this.presets.length === 0) {
-            delete this.presets;
-        }
     }
     hasMeta(name) {
         if (!this.meta) {
@@ -168,30 +167,30 @@ class AppConfig {
             delete this.env;
         }
     }
+    /**
+     * @deprecated
+     */
     toJson() {
-        const json = {
+        return this.toObject();
+    }
+    toObject() {
+        return {
             debug: this.debug,
             logLevel: this.logLevel,
             keystore: this.keystore,
             plugins: this.plugins.length > 0 ? this.plugins : undefined,
-            projects: this.projects,
-            presets: this.presets,
+            presets: this.presets.length > 0 ? this.presets : undefined,
+            projects: this.projects.length > 0 ? this.projects : undefined,
             env: this.env,
             meta: this.meta
         };
-        return Object.keys(json).reduce((res, key) => {
-            if (typeof json[key] !== "undefined") {
-                res[key] = json[key];
-            }
-            return res;
-        }, {});
     }
     toJsString() {
-        const json = JSON.stringify(this.toJson(), null, 4);
+        const json = JSON.stringify(this.toObject(), null, 4);
         return `// Wocker config\nexports.config = ${json};`;
     }
     toString() {
-        return JSON.stringify(this.toJson(), null, 4);
+        return JSON.stringify(this.toObject(), null, 4);
     }
 }
 exports.AppConfig = AppConfig;

package/lib/makes/FS.js

@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FS = void 0;
 const fs_1 = __importDefault(require("fs"));
 const Path = __importStar(require("path"));
+/* istanbul ignore next */
 /**
  * @deprecated
  */

package/lib/makes/Preset.d.ts

@@ -27,7 +27,7 @@ export type PresetVariableConfig = TextOption | ConfirmOption | SelectOption;
 export type PresetProperties = PickProperties<Preset>;
 export declare abstract class Preset {
     name: string;
-    source?: PresetType;
+    source?: PresetSource;
     version: string;
     type?: string;
     image?: string;
@@ -42,12 +42,16 @@ export declare abstract class Preset {
     volumes?: string[];
     volumeOptions?: string[];
     protected constructor(data: PresetProperties);
-    abstract save(): Promise<void>;
-    abstract delete(): Promise<void>;
+    abstract save(): void;
+    abstract delete(): void;
+    /**
+     * @deprecated
+     */
     toJSON(): PresetProperties;
+    toObject(): PresetProperties;
 }
-export declare const PRESET_SOURCE_INTERNAL = "internal";
-export declare const PRESET_SOURCE_EXTERNAL = "external";
-export declare const PRESET_SOURCE_GITHUB = "github";
-export type PresetType = typeof PRESET_SOURCE_INTERNAL | typeof PRESET_SOURCE_EXTERNAL | typeof PRESET_SOURCE_GITHUB;
+export declare const PRESET_SOURCE_INTERNAL: "internal";
+export declare const PRESET_SOURCE_EXTERNAL: "external";
+export declare const PRESET_SOURCE_GITHUB: "github";
+export type PresetSource = typeof PRESET_SOURCE_INTERNAL | typeof PRESET_SOURCE_EXTERNAL | typeof PRESET_SOURCE_GITHUB;
 export {};

package/lib/makes/Preset.js

@@ -15,18 +15,21 @@ class Preset {
         this.volumes = data.volumes;
         this.volumeOptions = data.volumeOptions;
     }
-    // noinspection JSUnusedGlobalSymbols
+    /**
+     * @deprecated
+     */
     toJSON() {
+        return this.toObject();
+    }
+    toObject() {
         return {
             name: this.name,
             version: this.version,
             type: this.type,
-            source: this.source,
             image: this.image,
             dockerfile: this.dockerfile,
             buildArgsOptions: this.buildArgsOptions,
             envOptions: this.envOptions,
-            path: this.path,
             volumes: this.volumes,
             volumeOptions: this.volumeOptions
         };

package/lib/services/AppConfigService.d.ts

@@ -1,4 +1,4 @@
-import { AppConfig } from "../makes";
+import { AppConfig, PresetSource } from "../makes";
 export declare abstract class AppConfigService {
     abstract get config(): AppConfig;
     get version(): string;
@@ -13,5 +13,7 @@ export declare abstract class AppConfigService {
     getConfig(): AppConfig;
     addProject(id: string, name: string, path: string): void;
     removeProject(id: string): void;
+    registerPreset(name: string, source: PresetSource, path?: string): void;
+    unregisterPreset(name: string): void;
     save(): void;
 }

package/lib/services/AppConfigService.js

@@ -33,9 +33,19 @@ let AppConfigService = class AppConfigService {
     }
     addProject(id, name, path) {
         this.config.addProject(id, name, path);
+        this.config.save();
     }
     removeProject(id) {
         this.config.removeProject(id);
+        this.config.save();
+    }
+    registerPreset(name, source, path) {
+        this.config.registerPreset(name, source, path);
+        this.save();
+    }
+    unregisterPreset(name) {
+        this.config.unregisterPreset(name);
+        this.config.save();
     }
     save() {
         this.config.save();

package/package.json

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

package/test/index.ts

@@ -1,6 +0,0 @@
-import {jest} from "@jest/globals";
-import {vol} from "memfs";
-
-
-jest.mock("fs", () => vol);
-jest.mock("fs/promises", () => vol.promises);