ts-patch - npm Package Compare versions

Comparing version 1.0.3 to 1.0.4

lib/actions.js

@@ -22,2 +22,3 @@ "use strict";
 var resolve = require("resolve");
+exports.tsDependencies = ['ts-node', 'resolve'];
 shell.config.silent = true;
@@ -75,7 +76,10 @@ exports.SRC_FILES = ['tsc.js', 'tsserverlibrary.js', 'typescript.js', 'typescriptServices.js'];
 }
-function removeTSNode(tsPackage) {
+function removeDependencies(tsPackage) {
     var pkgFile = path.join(tsPackage.packageDir, 'package.json');
     try {
         var pkgData = JSON.parse(fs.readFileSync(pkgFile, 'utf8'));
-        delete pkgData.dependencies['ts-node'];
+        for (var _i = 0, tsDependencies_1 = exports.tsDependencies; _i < tsDependencies_1.length; _i++) {
+            var d = tsDependencies_1[_i];
+            delete pkgData.dependencies[d];
+        }
         fs.writeFileSync(pkgFile, JSON.stringify(pkgData, null, 2));
@@ -87,3 +91,3 @@ }
 }
-function addTSNode(tsPackage) {
+function installDependencies(tsPackage) {
     var pkgFile = path.join(tsPackage.packageDir, 'package.json');
@@ -97,21 +101,35 @@ var pkgData;
     }
-    var tsNodeVersion;
-    try {
-        var location = resolve.sync('ts-node/package.json', { basedir: tsPackage.packageDir });
-        tsNodeVersion = require(location).version;
+    var getDependenciesDetail = function () {
+        return exports.tsDependencies
+            .map(function (name) {
+            var location;
+            var version;
+            try {
+                location = resolve.sync(name + "/package.json", { basedir: tsPackage.packageDir });
+                version = require(location).version;
+            }
+            catch (e) { }
+            return ({ name: name, location: location, version: version });
+        });
+    };
+    var missingDeps = getDependenciesDetail().filter(function (_a) {
+        var version = _a.version;
+        return !version;
+    });
+    if (missingDeps.length > 0) {
+        system_1.Log(['~', "Installing dependencies: " + missingDeps.map(function (_a) {
+                var name = _a.name;
+                return name;
+            }).join(', ') + " (via npm)..."], system_1.Log.verbose);
+        shell.exec("npm i " + missingDeps.map(function (_a) {
+            var name = _a.name;
+            return name;
+        }).join(' '), { cwd: path.resolve(tsPackage.packageDir, '..') });
+        if (shell.error())
+            throw new system_1.NPMError("Error while installing dependencies: " + shell.error());
     }
-    catch (e) {
-        tsNodeVersion = system_1.tspPackageJSON.dependencies['ts-node'];
+    for (var _i = 0, _a = getDependenciesDetail(); _i < _a.length; _i++) {
+        var _b = _a[_i], name = _b.name, version = _b.version;
+        pkgData.dependencies[name] = "^" + version;
     }
-    if (tsNodeVersion) {
-        if (pkgData.dependencies['ts-node'])
-            return;
-    }
-    else {
-        system_1.Log(['~', "Installing ts-node (via npm)..."], system_1.Log.verbose);
-        if (shell.exec("npm i ts-node@latest", { cwd: path.resolve(tsPackage.packageDir, '..') }) && shell.error())
-            throw new system_1.NPMError("Error installing ts-node dependency: " + shell.error());
-        tsNodeVersion = require(resolve.sync('ts-node/package.json', { basedir: tsPackage.packageDir })).version;
-    }
-    pkgData.dependencies['ts-node'] = "^" + tsNodeVersion;
     try {
@@ -178,3 +196,3 @@ fs.writeFileSync(pkgFile, JSON.stringify(pkgData, null, 2));
     tsPackage.config.save();
-    addTSNode(tsPackage);
+    installDependencies(tsPackage);
     if (modules.unPatchable.length > 1) {
@@ -218,3 +236,3 @@ system_1.Log(['!',
         shell.rm('-rf', tsPackage.config.file);
-        removeTSNode(tsPackage);
+        removeDependencies(tsPackage);
     }
@@ -279,2 +297,2 @@ if (Object.keys(errors).length > 0) {
 exports.disablePersistence = disablePersistence;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/lib/actions.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/lib/actions.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "ts-patch",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Patch typescript to support custom transformers in tsconfig.json",
@@ -5,0 +5,0 @@ "main": "./index.js",

resources/module-patch.js

@@ -99,10 +99,3 @@ (function () {
             if (importKey === void 0) { importKey = 'default'; }
-            var hasTSNode = function (nodeModule) {
-                if (nodeModule === null)
-                    return false;
-                if (nodeModule.id.split(/[\/\\]/).indexOf('ts-node'))
-                    return true;
-                return (nodeModule.parent === null) ? false : hasTSNode(nodeModule.parent);
-            };
-            if (!tsNodeIncluded && transform.match(/\.ts$/) && !hasTSNode(module.parent)) {
+            if (!tsNodeIncluded && transform.match(/\.ts$/)) {
                 require('ts-node').register({
@@ -109,0 +102,0 @@ transpileOnly: true,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

107824

increased by1.05%

Lines of code

1172

increased by0.95%

Number of low supply chain risk alerts

9

decreased by-10%

No dependency changes