@wocker/ws 1.0.2 → 1.0.3

package/lib/services/PresetService.js

@@ -1,63 +1,64 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresetService = void 0;
-var _core = require("@wocker/core");
-var _md = _interopRequireDefault(require("md5"));
-var _makes = require("../makes");
-var _env = require("../env");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-class PresetService extends _core.PresetService {
-  constructor(di) {
-    super();
-  }
-  getImageName(preset, buildArgs = {}) {
-    const rawValues = [];
-    const hashValues = [];
-    Object.keys(preset.buildArgsOptions || {}).forEach(key => {
-      const hash = (preset.buildArgsOptions[key] || {}).hash || true;
-      const value = buildArgs[key];
-      if (hash) {
-        hashValues.push(value);
-      } else {
-        rawValues.push(value);
-      }
-    });
-    const version = [...rawValues, (0, _md.default)(hashValues.join(",")).substr(0, 6)].filter(value => {
-      return !!value;
-    }).join("-");
-    return `ws-preset-${preset.name}:${version}`;
-  }
-  async save(preset) {
-    //
-  }
-  async get(name) {
-    const config = await _makes.FS.readJSON(_env.PRESETS_DIR, name, "config.json");
-    return new _core.Preset({
-      name,
-      ...config
-    });
-  }
-  async search(options = {}) {
-    const {
-      name
-    } = options;
-    const presets = [];
-    const dirs = await _makes.FS.readdir(_env.PRESETS_DIR);
-    for (const dir of dirs) {
-      if (name && name !== dir) {
-        continue;
-      }
-      const config = await _makes.FS.readJSON(_env.PRESETS_DIR, dir, "config.json");
-      const preset = new _core.Preset({
-        name: dir,
-        ...config
-      });
-      presets.push(preset);
+const md5_1 = __importDefault(require("md5"));
+const env_1 = require("../env");
+const makes_1 = require("../makes");
+class PresetService {
+    constructor(di) { }
+    getImageName(preset, buildArgs = {}) {
+        const rawValues = [];
+        const hashValues = [];
+        Object.keys(preset.buildArgsOptions || {}).forEach((key) => {
+            const hash = (preset.buildArgsOptions[key] || {}).hash || true;
+            const value = buildArgs[key];
+            if (hash) {
+                hashValues.push(value);
+            }
+            else {
+                rawValues.push(value);
+            }
+        });
+        const version = [
+            ...rawValues,
+            (0, md5_1.default)(hashValues.join(",")).substr(0, 6)
+        ].filter((value) => {
+            return !!value;
+        }).join("-");
+        return `ws-preset-${preset.name}:${version}`;
+    }
+    async save(preset) {
+    }
+    async get(name) {
+        const config = await makes_1.FS.readJSON(env_1.PRESETS_DIR, name, "config.json");
+        return new makes_1.Preset({
+            name,
+            ...config
+        });
+    }
+    async search(options = {}) {
+        const { name } = options;
+        const presets = [];
+        const dirs = await makes_1.FS.readdir(env_1.PRESETS_DIR);
+        for (const dir of dirs) {
+            if (name && name !== dir) {
+                continue;
+            }
+            const config = await makes_1.FS.readJSON(env_1.PRESETS_DIR, dir, "config.json");
+            const preset = new makes_1.Preset({
+                name: dir,
+                ...config
+            });
+            presets.push(preset);
+        }
+        return presets;
+    }
+    async searchOne(options = {}) {
+        const [preset] = await this.search(options);
+        return preset || null;
     }
-    return presets;
-  }
 }
-exports.PresetService = PresetService;
+exports.PresetService = PresetService;

package/lib/services/ProjectService.d.ts

@@ -1,11 +1,18 @@
-import { DI, AppConfigService as CoreAppConfigService, AppEventsService as CoreAppEventsService, DockerService, ProjectService as CoreProjectService, ProjectServiceSearchParams as SearchParams, Project } from "@wocker/core";
-declare class ProjectService extends CoreProjectService {
-    protected appConfigService: CoreAppConfigService;
-    protected appEventsService: CoreAppEventsService;
+import { DI, Project } from "../makes";
+import { DockerService, AppConfigService, AppEventsService } from "../services";
+type SearchParams = Partial<{
+    id: string;
+    name: string;
+    path: string;
+}>;
+declare class ProjectService {
+    protected appConfigService: AppConfigService;
+    protected appEventsService: AppEventsService;
     protected dockerService: DockerService;
     constructor(di: DI);
     cdProject(name: string): Promise<void>;
     get(): Promise<Project>;
+    getContainer(): Promise<import("dockerode").Container>;
     start(): Promise<void>;
     stop(): Promise<void>;
     save(project: Project): Promise<void>;

package/lib/services/ProjectService.js

@@ -1,143 +1,154 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = void 0;
-var _core = require("@wocker/core");
-var Path = _interopRequireWildcard(require("path"));
-var _makes = require("../makes");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-class ProjectService extends _core.ProjectService {
-  constructor(di) {
-    super();
-    this.appConfigService = di.resolveService(_core.AppConfigService);
-    this.appEventsService = di.resolveService(_core.AppEventsService);
-    this.dockerService = di.resolveService(_core.DockerService);
-  }
-  async cdProject(name) {
-    const project = await _core.Project.searchOne({
-      name
-    });
-    if (!project) {
-      throw new Error("Project not found");
-    }
-    this.appConfigService.setPWD(project.path);
-  }
-  async get() {
-    const project = await _core.Project.searchOne({
-      path: this.appConfigService.getPWD()
-    });
-    if (!project) {
-      throw new Error("Project not found");
+const Path = __importStar(require("path"));
+const makes_1 = require("../makes");
+const services_1 = require("../services");
+class ProjectService {
+    constructor(di) {
+        this.appConfigService = di.resolveService(services_1.AppConfigService);
+        this.appEventsService = di.resolveService(services_1.AppEventsService);
+        this.dockerService = di.resolveService(services_1.DockerService);
     }
-    return project;
-  }
-  async start() {
-    const project = await this.get();
-    if (project.type === "dockerfile") {
-      project.imageName = `project-${project.name}:develop`;
-      const images = await _makes.Docker.imageLs({
-        tag: project.imageName
-      });
-      if (images.length === 0) {
-        await _makes.Docker.imageBuild2({
-          tag: project.imageName,
-          context: this.appConfigService.getPWD(),
-          src: project.dockerfile
+    async cdProject(name) {
+        const project = await makes_1.Project.searchOne({
+            name
         });
-      }
-    }
-    await this.appEventsService.emit("project:beforeStart", project);
-    const containerName = `${project.name}.workspace`;
-    let container = await this.dockerService.getContainer(containerName);
-    if (!container) {
-      container = await _makes.Docker.createContainer({
-        name: containerName,
-        image: project.imageName,
-        env: {
-          ...(await this.appConfigService.getAllEnvVariables()),
-          ...(project.env || {})
-        },
-        volumes: (project.volumes || []).map(volume => {
-          const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
-          const [, source, destination, options] = regVolume.exec(volume);
-          return `${Path.join(this.appConfigService.getPWD(), source)}:${destination}` + (options ? `:${options}` : "");
-        }),
-        ports: project.ports || []
-      });
-    } else {
-      process.stdout.write("Container already exists\n");
-    }
-    if (container) {
-      const {
-        State: {
-          Status
+        if (!project) {
+            throw new Error("Project not found");
         }
-      } = await container.inspect();
-      if (Status === "created" || Status === "exited") {
-        await container.start();
-        await this.appEventsService.emit("project:start", project);
-      }
+        this.appConfigService.setPWD(project.path);
     }
-  }
-  async stop() {
-    const project = await this.get();
-    const container = await _makes.Docker.getContainer(`${project.name}.workspace`);
-    if (container) {
-      await this.appEventsService.emit("project:stop", project);
-      await _makes.Docker.removeContainer(`${project.name}.workspace`);
+    async get() {
+        const project = await makes_1.Project.searchOne({
+            path: this.appConfigService.getPWD()
+        });
+        if (!project) {
+            throw new Error("Project not found");
+        }
+        return project;
     }
-  }
-  async save(project) {
-    if (!project.name) {
-      throw new Error("Project should has a name");
+    async getContainer() {
+        const project = await this.get();
+        return this.dockerService.getContainer(project.containerName);
     }
-    if (!project.path) {
-      throw new Error("Project should has a path");
+    async start() {
+        const project = await this.get();
+        if (project.type === "dockerfile") {
+            project.imageName = `project-${project.name}:develop`;
+            const images = await makes_1.Docker.imageLs({
+                tag: project.imageName
+            });
+            if (images.length === 0) {
+                await makes_1.Docker.imageBuild2({
+                    tag: project.imageName,
+                    context: this.appConfigService.getPWD(),
+                    src: project.dockerfile
+                });
+            }
+        }
+        await this.appEventsService.emit("project:beforeStart", project);
+        let container = await this.dockerService.getContainer(project.containerName);
+        if (!container) {
+            container = await makes_1.Docker.createContainer({
+                name: project.containerName,
+                image: project.imageName,
+                env: {
+                    ...await this.appConfigService.getAllEnvVariables(),
+                    ...project.env || {}
+                },
+                volumes: (project.volumes || []).map((volume) => {
+                    const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
+                    const [, source, destination, options] = regVolume.exec(volume);
+                    return `${Path.join(this.appConfigService.getPWD(), source)}:${destination}` + (options ? `:${options}` : "");
+                }),
+                ports: project.ports || []
+            });
+        }
+        else {
+            process.stdout.write("Container already exists\n");
+        }
+        if (container) {
+            const { State: { Status } } = await container.inspect();
+            if (Status === "created" || Status === "exited") {
+                await container.start();
+                await this.appEventsService.emit("project:start", project);
+            }
+        }
     }
-    if (!project.id) {
-      project.id = project.name;
+    async stop() {
+        const project = await this.get();
+        const container = await makes_1.Docker.getContainer(project.containerName);
+        if (container) {
+            await this.appEventsService.emit("project:stop", project);
+            await makes_1.Docker.removeContainer(`${project.name}.workspace`);
+        }
     }
-    const projectDirPath = this.appConfigService.dataPath("projects", project.id);
-    const configPath = this.appConfigService.dataPath("projects", project.id, "config.json");
-    if (!_makes.FS.existsSync(projectDirPath)) {
-      await _makes.FS.mkdir(projectDirPath, {
-        recursive: true
-      });
+    async save(project) {
+        if (!project.name) {
+            throw new Error("Project should has a name");
+        }
+        if (!project.path) {
+            throw new Error("Project should has a path");
+        }
+        if (!project.id) {
+            project.id = project.name;
+        }
+        const projectDirPath = this.appConfigService.dataPath("projects", project.id);
+        const configPath = this.appConfigService.dataPath("projects", project.id, "config.json");
+        if (!makes_1.FS.existsSync(projectDirPath)) {
+            await makes_1.FS.mkdir(projectDirPath, {
+                recursive: true
+            });
+        }
+        await this.appConfigService.setProjectConfig(project.id, project.path);
+        await makes_1.FS.writeJSON(configPath, project);
     }
-    await this.appConfigService.setProjectConfig(project.id, project.path);
-    await _makes.FS.writeJSON(configPath, project);
-  }
-  async search(params = {}) {
-    const {
-      id,
-      name,
-      path
-    } = params;
-    const {
-      projects: configs
-    } = await this.appConfigService.getAppConfig();
-    const projects = [];
-    for (const config of configs) {
-      if (id && config.id !== id) {
-        continue;
-      }
-      if (path && config.src !== path) {
-        continue;
-      }
-      const projectData = await _makes.FS.readJSON(this.appConfigService.dataPath("projects", config.id, "config.json"));
-      if (name && projectData.name !== name) {
-        continue;
-      }
-      const project = _core.Project.fromObject({
-        id: config.id,
-        ...projectData
-      });
-      projects.push(project);
+    async search(params = {}) {
+        const { id, name, path } = params;
+        const { projects: configs } = await this.appConfigService.getAppConfig();
+        const projects = [];
+        for (const config of configs) {
+            if (id && config.id !== id) {
+                continue;
+            }
+            if (path && config.src !== path) {
+                continue;
+            }
+            const projectData = await makes_1.FS.readJSON(this.appConfigService.dataPath("projects", config.id, "config.json"));
+            if (name && projectData.name !== name) {
+                continue;
+            }
+            const project = makes_1.Project.fromObject({
+                id: config.id,
+                ...projectData
+            });
+            projects.push(project);
+        }
+        return projects;
     }
-    return projects;
-  }
 }
-exports.ProjectService = ProjectService;
+exports.ProjectService = ProjectService;

package/lib/services/index.js

@@ -1,82 +1,23 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _AppConfigService = require("./AppConfigService");
-Object.keys(_AppConfigService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _AppConfigService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _AppConfigService[key];
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-  });
-});
-var _AppEventsService = require("./AppEventsService");
-Object.keys(_AppEventsService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _AppEventsService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _AppEventsService[key];
-    }
-  });
-});
-var _DockerService = require("./DockerService");
-Object.keys(_DockerService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _DockerService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _DockerService[key];
-    }
-  });
-});
-var _LogService = require("./LogService");
-Object.keys(_LogService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _LogService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _LogService[key];
-    }
-  });
-});
-var _PluginService = require("./PluginService");
-Object.keys(_PluginService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PluginService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _PluginService[key];
-    }
-  });
-});
-var _PresetService = require("./PresetService");
-Object.keys(_PresetService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PresetService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _PresetService[key];
-    }
-  });
-});
-var _ProjectService = require("./ProjectService");
-Object.keys(_ProjectService).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ProjectService[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ProjectService[key];
-    }
-  });
-});
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./AppConfigService"), exports);
+__exportStar(require("./AppEventsService"), exports);
+__exportStar(require("./DockerService"), exports);
+__exportStar(require("./LogService"), exports);
+__exportStar(require("./PluginService"), exports);
+__exportStar(require("./PresetService"), exports);
+__exportStar(require("./ProjectService"), exports);

package/lib/types/Config.d.ts

@@ -1,8 +1,9 @@
+import { EnvConfig } from "./EnvConfig";
 export type Config = {
     debug?: boolean;
-    env: {
-        [key: string]: string;
-    };
+    meta: EnvConfig;
+    env: EnvConfig;
+    plugins: string[];
     projects: {
         id: string;
         name?: string;

package/lib/types/Config.js

@@ -1,5 +1,2 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/EnvConfig.js

@@ -1,5 +1,2 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/index.js

@@ -1,27 +1,18 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _Config = require("./Config");
-Object.keys(_Config).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _Config[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _Config[key];
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-  });
-});
-var _EnvConfig = require("./EnvConfig");
-Object.keys(_EnvConfig).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _EnvConfig[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _EnvConfig[key];
-    }
-  });
-});
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./Config"), exports);
+__exportStar(require("./EnvConfig"), exports);

package/lib/utils/buildOptions.js

@@ -1,12 +1,9 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildOptions = void 0;
 const buildOptions = (name, options) => {
-  return Object.keys(options).map(key => {
-    return `--${name} ${key}=${options[key]}`;
-  }).join(" ");
+    return Object.keys(options).map((key) => {
+        return `--${name} ${key}=${options[key]}`;
+    }).join(" ");
 };
-exports.buildOptions = buildOptions;
+exports.buildOptions = buildOptions;