@tsed/cli-core 6.1.12 → 6.1.14

package/lib/esm/services/CliProxyAgent.js

@@ -2,7 +2,6 @@ import { __decorate } from "tslib";
 import { URL } from "node:url";
 import { Configuration, Inject, inject, Injectable, refValue } from "@tsed/di";
 import { camelCase } from "change-case";
-import tunnel from "tunnel";
 import { coerce } from "../utils/coerce.js";
 import { CliExeca } from "./CliExeca.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
@@ -12,6 +11,9 @@ let CliProxyAgent = class CliProxyAgent {
         this.projectPackageJson = Inject(ProjectPackageJson);
         this.cliExeca = inject(CliExeca);
     }
+    async $onInit() {
+        this.tunnel = await import("tunnel");
+    }
     hasProxy() {
         return !!this.proxySettings.value.url;
     }
@@ -29,8 +31,8 @@ let CliProxyAgent = class CliProxyAgent {
                 }
             };
             const method = camelCase([type, "over", protocol].join(" "));
-            if (tunnel[method]) {
-                return tunnel[method](options);
+            if (this.tunnel[method]) {
+                return this.tunnel[method](options);
             }
         }
         return null;

package/lib/esm/services/index.js

@@ -7,9 +7,7 @@ export * from "./CliLoadFile.js";
 export * from "./CliPackageJson.js";
 export * from "./CliPlugins.js";
 export * from "./CliProxyAgent.js";
-export * from "./CliRunScript.js";
 export * from "./CliService.js";
 export * from "./CliYaml.js";
 export * from "./NpmRegistryClient.js";
 export * from "./ProjectPackageJson.js";
-export * from "./Renderer.js";

package/lib/types/services/CliProxyAgent.d.ts

@@ -9,6 +9,8 @@ export declare class CliProxyAgent {
     };
     protected projectPackageJson: any;
     protected cliExeca: CliExeca;
+    protected tunnel: typeof import("tunnel");
+    $onInit(): Promise<void>;
     hasProxy(): boolean;
     get(type: "http" | "https"): any;
     resolveProxySettings(): Promise<void>;

package/lib/types/services/index.d.ts

@@ -7,9 +7,7 @@ export * from "./CliLoadFile.js";
 export * from "./CliPackageJson.js";
 export * from "./CliPlugins.js";
 export * from "./CliProxyAgent.js";
-export * from "./CliRunScript.js";
 export * from "./CliService.js";
 export * from "./CliYaml.js";
 export * from "./NpmRegistryClient.js";
 export * from "./ProjectPackageJson.js";
-export * from "./Renderer.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "6.1.12",
+  "version": "6.1.14",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -31,25 +31,19 @@
     "listr"
   ],
   "dependencies": {
-    "@npmcli/run-script": "9.0.0",
     "@tsed/logger": ">=7.0.1",
     "@tsed/normalize-path": ">=7.14.2",
-    "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^9.0.7",
     "ajv": "^8.17.1",
     "axios": "^1.7.7",
     "chalk": "^5.3.0",
     "change-case": "^5.4.4",
     "commander": "^12.1.0",
-    "consolidate": "^1.0.4",
-    "create-frame": "^1.0.0",
     "enquirer": "^2.4.1",
     "execa": "^8.0.1",
     "figures": "^6.1.0",
     "fs-extra": "^11.2.0",
     "globby": "^14.0.2",
-    "handlebars": "^4.7.8",
-    "handlebars-utils": "^1.0.6",
     "inquirer": "^9.3.7",
     "inquirer-autocomplete-prompt": "^3.0.1",
     "js-yaml": "^4.1.0",
@@ -66,10 +60,10 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "6.1.12",
+    "@tsed/typescript": "6.1.14",
     "@types/commander": "2.12.2",
-    "@types/consolidate": "0.14.4",
     "@types/figures": "3.0.1",
+    "@types/fs-extra": "^11.0.4",
     "@types/globby": "9.1.0",
     "@types/js-yaml": "4.0.9",
     "@types/semver": "7.5.8",

package/lib/esm/services/CliRunScript.js

@@ -1,22 +0,0 @@
-import { __decorate } from "tslib";
-// @ts-ignore
-import runScript from "@npmcli/run-script";
-import { inject, Injectable } from "@tsed/di";
-import { ProjectPackageJson } from "./ProjectPackageJson.js";
-let CliRunScript = class CliRunScript {
-    run(cmd, args, options = {}) {
-        return runScript({
-            event: "run",
-            ...options,
-            cmd: `${cmd} ${args.join(" ")}`,
-            path: options.cwd || inject(ProjectPackageJson).dir,
-            env: options.env || {},
-            stdio: options.stdio || "inherit",
-            banner: false
-        });
-    }
-};
-CliRunScript = __decorate([
-    Injectable()
-], CliRunScript);
-export { CliRunScript };

package/lib/esm/services/Renderer.js

@@ -1,162 +0,0 @@
-import { __decorate } from "tslib";
-import "../utils/hbs/index.js";
-import { basename, dirname, join, relative } from "node:path";
-import { isString } from "@tsed/core";
-import { constant, inject, Injectable } from "@tsed/di";
-import { normalizePath } from "@tsed/normalize-path";
-import Consolidate from "consolidate";
-import fs from "fs-extra";
-import { globby } from "globby";
-import handlebars from "handlebars";
-import { Observable } from "rxjs";
-import { insertAfter } from "../utils/renderer/insertAfter.js";
-import { insertImport } from "../utils/renderer/insertImport.js";
-import { CliFs } from "./CliFs.js";
-export class Renderer {
-    constructor() {
-        this.templateDir = constant("templateDir", "");
-        this.fs = inject(CliFs);
-        this.cache = new Set();
-    }
-    async loadPartials(cwd) {
-        if (this.cache.has(cwd)) {
-            return;
-        }
-        const files = await globby("**/_partials/*.hbs", {
-            cwd
-        });
-        files.forEach((filename) => {
-            let template = this.fs.readFileSync(join(cwd, filename), "utf8");
-            const name = basename(filename).replace(".hbs", "");
-            handlebars.registerPartial(name, template);
-        });
-        this.cache.add(cwd);
-    }
-    async render(path, data, options = {}) {
-        const { output, templateDir, rootDir } = this.mapOptions(path, options);
-        let content = "";
-        const file = normalizePath(join(templateDir, path));
-        options.baseDir && (await this.loadPartials(join(templateDir, options.baseDir)));
-        if (path.endsWith(".hbs")) {
-            content = await Consolidate.handlebars(file, data);
-        }
-        else {
-            content = await this.fs.readFile(file, { encoding: "utf8" });
-        }
-        return this.write(content, { output, rootDir });
-    }
-    renderAll(paths, data, options = {}) {
-        let count = 0;
-        const mapOptions = (opts) => {
-            if (isString(opts)) {
-                return { ...options, path: opts };
-            }
-            return {
-                ...options,
-                ...opts
-            };
-        };
-        return new Observable((observer) => {
-            observer.next(`[${count}/${paths.length}] Rendering files...`);
-            const promises = paths
-                .filter(Boolean)
-                .map(mapOptions)
-                .map(async ({ path, ...opts }) => {
-                await this.render(path, data, opts);
-                count++;
-                observer.next(`[${count}/${paths.length}] Rendering files...`);
-            });
-            Promise.all(promises)
-                .then(() => {
-                observer.next(`[${count}/${paths.length}] Rendering files...`);
-                observer.complete();
-            })
-                .catch((err) => {
-                observer.error(err);
-            });
-        });
-    }
-    async write(content, options) {
-        const { output, rootDir = this.rootDir } = options;
-        const outputFile = join(...[rootDir, output].filter(Boolean));
-        await this.fs.ensureDir(dirname(outputFile));
-        return this.fs.writeFile(outputFile, content, { encoding: "utf8" });
-    }
-    templateExists(path, options = {}) {
-        const { templateDir } = this.mapOptions(path, options);
-        return fs.existsSync(join(templateDir, path));
-    }
-    async scan(pattern, options = {}) {
-        const result = await globby(pattern.map((s) => normalizePath(s)), {
-            ...options,
-            objectMode: true,
-            cwd: this.rootDir
-        });
-        return result.map((entry) => entry.path);
-    }
-    relativeFrom(path) {
-        return relative(dirname(join(this.rootDir, path)), this.rootDir);
-    }
-    async update(path, actions) {
-        path = join(this.rootDir, path);
-        if (!this.fs.exists(path)) {
-            return;
-        }
-        const content = actions.reduce((fileContent, action) => {
-            switch (action.type) {
-                case "import":
-                    return insertImport(fileContent, action.content);
-                case "insert-after":
-                    return insertAfter(fileContent, action.content, action.pattern);
-                default:
-                    break;
-            }
-            return fileContent;
-        }, await this.fs.readFile(path, { encoding: "utf8" }));
-        return this.fs.writeFile(path, content, { encoding: "utf8" });
-    }
-    mapOptions(path, options) {
-        const { templateDir = this.templateDir, rootDir = this.rootDir } = options;
-        let { output = path } = options;
-        if (options.baseDir) {
-            output = normalizePath(join("/", relative(options.baseDir, path)));
-        }
-        if (options.basename) {
-            output = normalizePath(join(dirname(output), options.basename));
-        }
-        output = output.replace(/\.hbs$/, "");
-        if (options.replaces) {
-            options.replaces.filter(Boolean).forEach((replace) => {
-                output = output.replace(replace, "");
-            });
-        }
-        return { output, templateDir, rootDir };
-    }
-}
-let RootRendererService = class RootRendererService extends Renderer {
-    get rootDir() {
-        return constant("project.rootDir", "");
-    }
-};
-RootRendererService = __decorate([
-    Injectable()
-], RootRendererService);
-export { RootRendererService };
-let SrcRendererService = class SrcRendererService extends Renderer {
-    get rootDir() {
-        return join(...[constant("project.rootDir"), constant("project.srcDir")].filter(Boolean));
-    }
-};
-SrcRendererService = __decorate([
-    Injectable()
-], SrcRendererService);
-export { SrcRendererService };
-let ScriptsRendererService = class ScriptsRendererService extends Renderer {
-    get rootDir() {
-        return join(...[constant("project.rootDir"), constant("project.scriptsDir")].filter(Boolean));
-    }
-};
-ScriptsRendererService = __decorate([
-    Injectable()
-], ScriptsRendererService);
-export { ScriptsRendererService };