@wocker/core 1.0.26-beta.2 → 1.0.26-beta.4

package/lib/core/Route.js

@@ -18,24 +18,44 @@ class Route {
         this.commandNames = Reflect.getMetadata(env_1.COMMAND_METADATA, descriptor.value) || [];
         this.completions = Reflect.getMetadata(env_1.COMPLETION_METADATA, descriptor.value) || [];
         this.designTypes = Reflect.getMetadata(env_1.PARAMTYPES_METADATA, this.type.prototype, this.method) || [];
-        const argsMetadata = Reflect.getMetadata(env_1.ARGS_METADATA, this.type, this.method) || [], argsAliases = Reflect.getMetadata(env_1.ALIAS_METADATA, this.type, this.method) || {};
-        for (const index in argsMetadata) {
-            const argMeta = argsMetadata[index];
+        const argsMetadata = Reflect.getMetadata(env_1.ARGS_METADATA, this.type, this.method) || [], argsOldMetadata = Reflect.getMetadata(env_1.ARGS_OLD_METADATA, this.type, this.method) || [], argsDescription = Reflect.getMetadata(env_1.DESCRIPTION_METADATA, this.type, method) || {}, argsAliases = Reflect.getMetadata(env_1.ALIAS_METADATA, this.type, this.method) || {};
+        for (const key in argsMetadata) {
+            const index = key, argMeta = argsMetadata[index];
+            if (argMeta.type === "param") {
+                this.args[index] = {
+                    type: argMeta.type,
+                    name: argMeta.name,
+                    params: {
+                        description: argMeta.description
+                    }
+                };
+            }
+            else if (argMeta.type === "option") {
+                const { type, alias, description } = argMeta.params || {};
+                this.args[index] = {
+                    type: argMeta.type,
+                    name: argMeta.name,
+                    params: Object.assign(Object.assign({}, argMeta.params), { type: this.getArgType(index) || type, alias: argsAliases[index] || alias, description: argMeta.description || description })
+                };
+            }
+        }
+        for (let i = 0; i < argsOldMetadata.length; i++) {
+            const argMeta = argsOldMetadata[i];
             if (argMeta.type === "param") {
                 this.args[argMeta.index] = {
                     type: argMeta.type,
                     name: argMeta.name,
                     params: {
-                        description: argMeta.description,
+                        description: argsDescription[argMeta.index] || ""
                     }
                 };
             }
-            if (argMeta.type === "option") {
+            else if (argMeta.type === "option") {
                 const { type, alias, description } = argMeta.params || {};
                 this.args[argMeta.index] = {
                     type: argMeta.type,
                     name: argMeta.name,
-                    params: Object.assign(Object.assign({}, argMeta.params), { type: this.getArgType(argMeta.index) || type, alias: argsAliases[argMeta.index] || alias, description: argMeta.description || description })
+                    params: Object.assign(Object.assign({}, argMeta.params), { type: this.getArgType(argMeta.index) || type, alias: argsAliases[argMeta.index] || alias, description: argsDescription[argMeta.index] || description })
                 };
             }
         }

package/lib/decorators/Option.js

@@ -20,15 +20,17 @@ const Option = (name, aliasOrParams) => {
             return;
         }
         const _a = Reflect.getMetadata(env_1.ARGS_METADATA, target.constructor, propertyKey) || {}, _b = parameterIndex, options = _a[_b], rest = __rest(_a, [typeof _b === "symbol" ? _b : _b + ""]);
-        Reflect.defineMetadata(env_1.ARGS_METADATA, Object.assign(Object.assign({}, rest), { [parameterIndex]: Object.assign(Object.assign({}, options || {}), { type: "option", name, params: typeof aliasOrParams === "string" ? { alias: aliasOrParams } : aliasOrParams, index: parameterIndex }) }), target.constructor, propertyKey);
-        Reflect.defineMetadata(env_1.ARGS_METADATA_OLD, [
+        Reflect.defineMetadata(env_1.ARGS_METADATA, Object.assign(Object.assign({}, rest), { [parameterIndex]: Object.assign(Object.assign({}, options || {}), { name, type: "option", params: typeof aliasOrParams === "string"
+                    ? { alias: aliasOrParams }
+                    : aliasOrParams }) }), target.constructor, propertyKey);
+        Reflect.defineMetadata(env_1.ARGS_OLD_METADATA, [
             {
                 type: "option",
                 name,
                 params: typeof aliasOrParams === "string" ? { alias: aliasOrParams } : aliasOrParams,
                 index: parameterIndex
             },
-            ...Reflect.getMetadata(env_1.ARGS_METADATA_OLD, target.constructor, propertyKey) || []
+            ...Reflect.getMetadata(env_1.ARGS_OLD_METADATA, target.constructor, propertyKey) || []
         ], target.constructor, propertyKey);
     };
 };

package/lib/decorators/Param.js

@@ -20,8 +20,8 @@ const Param = (name) => {
         }
         const _a = Reflect.getMetadata(env_1.ARGS_METADATA, target.constructor, propertyKey) || {}, _b = parameterIndex, options = _a[_b], rest = __rest(_a, [typeof _b === "symbol" ? _b : _b + ""]);
         Reflect.defineMetadata(env_1.ARGS_METADATA, Object.assign(Object.assign({}, rest), { [parameterIndex]: Object.assign(Object.assign({}, options || {}), { type: "param", name, index: parameterIndex }) }), target.constructor, propertyKey);
-        Reflect.defineMetadata(env_1.ARGS_METADATA_OLD, [
-            ...Reflect.getMetadata(env_1.ARGS_METADATA_OLD, target.constructor, propertyKey) || [],
+        Reflect.defineMetadata(env_1.ARGS_OLD_METADATA, [
+            ...Reflect.getMetadata(env_1.ARGS_OLD_METADATA, target.constructor, propertyKey) || [],
             {
                 type: "param",
                 name,

package/lib/env.d.ts

@@ -5,7 +5,7 @@ export declare const DESCRIPTION_METADATA = "__DESCRIPTION__";
 export declare const COMMAND_METADATA = "command";
 export declare const COMPLETION_METADATA = "completion";
 export declare const ARGS_METADATA = "__ARGS_METADATA__";
-export declare const ARGS_METADATA_OLD = "__ARGS__";
+export declare const ARGS_OLD_METADATA = "__ARGS__";
 export declare const ALIAS_METADATA = "__ALIAS_METADATA__";
 export declare const OPTION_META = "__OPTION_META__";
 export declare const PARAMTYPES_METADATA = "design:paramtypes";

package/lib/env.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WOCKER_DATA_DIR_KEY = exports.WOCKER_VERSION_KEY = exports.DATA_DIR = 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_OLD = 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.WOCKER_DATA_DIR_KEY = exports.WOCKER_VERSION_KEY = exports.DATA_DIR = 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_OLD_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;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 exports.IS_GLOBAL_METADATA = "IS_GLOBAL";
@@ -13,7 +13,7 @@ exports.DESCRIPTION_METADATA = "__DESCRIPTION__";
 exports.COMMAND_METADATA = "command";
 exports.COMPLETION_METADATA = "completion";
 exports.ARGS_METADATA = "__ARGS_METADATA__";
-exports.ARGS_METADATA_OLD = "__ARGS__";
+exports.ARGS_OLD_METADATA = "__ARGS__";
 exports.ALIAS_METADATA = "__ALIAS_METADATA__";
 exports.OPTION_META = "__OPTION_META__";
 exports.PARAMTYPES_METADATA = "design:paramtypes";

package/lib/makes/AppConfig.d.ts

@@ -2,7 +2,7 @@ import { EnvConfig, PackageManagerType } from "../types";
 import { PluginRef } from "../types/PluginRef";
 import { PresetRef } from "../types/PresetRef";
 import { ProjectRef, ProjectOldRef } from "../types/ProjectRef";
-import { PresetSource } from "./Preset";
+import { PresetSource } from "../types/PresetSource";
 export type AppConfigProperties = {
     debug?: boolean;
     pm?: PackageManagerType;

package/lib/makes/AppConfig.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
-const Preset_1 = require("./Preset");
+const PresetSource_1 = require("../types/PresetSource");
 class AppConfig {
     constructor(data) {
         this.logLevel = "off";
@@ -83,11 +83,11 @@ class AppConfig {
         });
     }
     registerPreset(name, source, path) {
-        if (source === Preset_1.PRESET_SOURCE_INTERNAL) {
+        if (source === PresetSource_1.PRESET_SOURCE_INTERNAL) {
             return;
         }
         let presetData = this.presets.find((preset) => {
-            if (source === Preset_1.PRESET_SOURCE_EXTERNAL && preset.path === path) {
+            if (source === PresetSource_1.PRESET_SOURCE_EXTERNAL && preset.path === path) {
                 return true;
             }
             return preset.name === name;
@@ -100,7 +100,7 @@ class AppConfig {
             this.presets.push(presetData);
         }
         presetData.source = source;
-        if (presetData.source === Preset_1.PRESET_SOURCE_EXTERNAL) {
+        if (presetData.source === PresetSource_1.PRESET_SOURCE_EXTERNAL) {
             presetData.path = path;
         }
         else if (presetData.path) {

package/lib/makes/FileSystem.d.ts

@@ -36,6 +36,7 @@ export declare class FileSystem {
     writeJSON(path: string, data: any, options?: FS.WriteFileOptions): void;
     appendFile(path: string, data: string | Uint8Array, options?: FS.WriteFileOptions): void;
     rm(path: string, options?: FS.RmOptions): void;
+    mv(src: string, dest: string): void;
     createWriteStream(path: string, options?: WriteStreamOptions): FS.WriteStream;
     createReadStream(path: string, options?: ReadStreamOptions): FS.ReadStream;
     createReadlineStream(path: string, options?: ReadlineOptions): Readable;

package/lib/makes/FileSystem.js

@@ -110,6 +110,32 @@ class FileSystem {
         const fullPath = this.path(path);
         this.driver.rmSync(fullPath, options);
     }
+    mv(src, dest) {
+        const srcPath = this.path(src), destPath = this.path(dest), destDir = this.path(dest, ".."), srcStat = this.stat(src);
+        if (!this.driver.existsSync(destDir)) {
+            this.driver.mkdirSync(destDir, {
+                recursive: true
+            });
+        }
+        let sameFs = false;
+        try {
+            const destStat = this.driver.statSync(destDir);
+            sameFs = srcStat.dev === destStat.dev;
+        }
+        catch (_a) { }
+        if (sameFs) {
+            this.driver.renameSync(srcPath, destPath);
+        }
+        else {
+            this.driver.cpSync(srcPath, destPath, {
+                recursive: true
+            });
+            this.driver.rmSync(srcPath, {
+                recursive: true,
+                force: true
+            });
+        }
+    }
     createWriteStream(path, options) {
         return this.driver.createWriteStream(this.path(path), options);
     }

package/lib/makes/Preset.d.ts

@@ -1,4 +1,5 @@
 import { PickProperties } from "../types/PickProperties";
+import { PresetSource } from "../types/PresetSource";
 type TextOption = {
     type: "text" | "string" | "number" | "int" | "password";
     message?: string;
@@ -50,8 +51,4 @@ export declare abstract class Preset {
     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 PresetSource = typeof PRESET_SOURCE_INTERNAL | typeof PRESET_SOURCE_EXTERNAL | typeof PRESET_SOURCE_GITHUB;
 export {};

package/lib/makes/Preset.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PRESET_SOURCE_GITHUB = exports.PRESET_SOURCE_EXTERNAL = exports.PRESET_SOURCE_INTERNAL = exports.Preset = void 0;
+exports.Preset = void 0;
 class Preset {
     constructor(data) {
         this.name = data.name;
@@ -36,6 +36,3 @@ class Preset {
     }
 }
 exports.Preset = Preset;
-exports.PRESET_SOURCE_INTERNAL = "internal";
-exports.PRESET_SOURCE_EXTERNAL = "external";
-exports.PRESET_SOURCE_GITHUB = "github";

package/lib/services/AppConfigService.d.ts

@@ -1,7 +1,8 @@
 import { AppConfig } from "../makes/AppConfig";
-import { PresetSource } from "../makes/Preset";
+import { PresetRef } from "../types/PresetRef";
 import { ProjectRef } from "../types/ProjectRef";
 import { PluginRef } from "../types/PluginRef";
+import { PresetSource } from "../types/PresetSource";
 import { AppFileSystemService } from "./AppFileSystemService";
 import { ProcessService } from "./ProcessService";
 type TypeMap = {
@@ -19,6 +20,7 @@ export declare class AppConfigService {
     get debug(): boolean;
     set debug(debug: boolean);
     get config(): AppConfig;
+    get presets(): PresetRef[];
     get projects(): ProjectRef[];
     get plugins(): PluginRef[];
     /**

package/lib/services/AppConfigService.js

@@ -90,6 +90,9 @@ let AppConfigService = class AppConfigService {
         }
         return this._config;
     }
+    get presets() {
+        return this.config.presets;
+    }
     get projects() {
         return this.config.projects;
     }

package/lib/types/ArgMeta.d.ts

@@ -1,7 +1,13 @@
+import { Option } from "@kearisp/cli";
 export type ArgMeta = {
-    index: number;
-    type: "param" | "option";
     name: string;
+    type: "param" | "option";
     description?: string;
-    params: any;
+    params: Omit<Option, "name">;
+};
+export type ArgOldMeta = {
+    name: string;
+    type: "param" | "option";
+    index: number;
+    params: Omit<Option, "name">;
 };

package/lib/types/FileSystemDriver.d.ts

@@ -34,5 +34,7 @@ export interface FileSystemDriver {
     createReadStream(path: string, options?: ReadStreamOptions): FS.ReadStream;
     watch(file: string, options: FS.WatchOptions, listener?: FS.WatchListener<string | Buffer>): FS.FSWatcher;
     watchFile(path: string, listener: FS.StatsListener): FS.StatWatcher;
+    cpSync(source: string, destination: string, opts?: FS.CopySyncOptions): void;
+    renameSync(oldPath: string, newPath: string): void;
 }
 export {};

package/lib/types/PresetRef.d.ts

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

package/lib/types/PresetSource.d.ts

@@ -0,0 +1,4 @@
+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;

package/lib/types/PresetSource.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PRESET_SOURCE_GITHUB = exports.PRESET_SOURCE_EXTERNAL = exports.PRESET_SOURCE_INTERNAL = void 0;
+exports.PRESET_SOURCE_INTERNAL = "internal";
+exports.PRESET_SOURCE_EXTERNAL = "external";
+exports.PRESET_SOURCE_GITHUB = "github";

package/lib/types/index.d.ts

@@ -6,6 +6,8 @@ export * from "./ModuleMetadata";
 export * from "./PackageManagerType";
 export * from "./PickProperties";
 export * from "./PluginMetadata";
+export * from "./PresetRef";
+export * from "./PresetSource";
 export * from "./Type";
 export * from "./Volume";
 export * from "./ProviderType";

package/lib/types/index.js

@@ -22,6 +22,8 @@ __exportStar(require("./ModuleMetadata"), exports);
 __exportStar(require("./PackageManagerType"), exports);
 __exportStar(require("./PickProperties"), exports);
 __exportStar(require("./PluginMetadata"), exports);
+__exportStar(require("./PresetRef"), exports);
+__exportStar(require("./PresetSource"), exports);
 __exportStar(require("./Type"), exports);
 __exportStar(require("./Volume"), exports);
 __exportStar(require("./ProviderType"), exports);

package/package.json

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