registry-sync 4.0.2 → 5.0.0

package/README.md

@@ -8,7 +8,7 @@ The local copy can then be used as a simple private NPM registry without publish
 
 ## Pre-requisites
 
-- Node.js v14.0.0 or newer
+- Node.js v16.14.0 or newer
 
 ## Installation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "registry-sync",
-  "version": "4.0.2",
+  "version": "5.0.0",
   "description": "synchronize a remote npm registry for private use",
   "repository": "https://github.com/heikkipora/registry-sync",
   "bin": {
@@ -20,35 +20,35 @@
   "license": "MIT",
   "dependencies": {
     "@yarnpkg/lockfile": "1.1.0",
-    "axios": "1.2.2",
-    "commander": "9.5.0",
-    "semver": "7.3.8",
-    "ssri": "10.0.1",
-    "tar-fs": "2.1.1"
+    "axios": "1.5.0",
+    "commander": "11.0.0",
+    "semver": "7.5.4",
+    "ssri": "10.0.5",
+    "tar-fs": "3.0.4"
   },
   "devDependencies": {
     "@arkweid/lefthook": "0.7.7",
-    "@types/chai": "4.3.4",
-    "@types/lodash": "4.14.191",
+    "@types/chai": "4.3.6",
+    "@types/lodash": "4.14.197",
     "@types/mocha": "10.0.1",
-    "@types/node": "18.11.18",
-    "@types/semver": "7.3.13",
+    "@types/node": "20.5.9",
+    "@types/semver": "7.5.1",
     "@types/ssri": "7.1.1",
     "@types/tar-fs": "2.0.1",
-    "@types/yarnpkg__lockfile": "1.1.5",
-    "@typescript-eslint/eslint-plugin": "5.48.1",
-    "@typescript-eslint/parser": "5.48.1",
-    "chai": "4.3.7",
-    "eslint": "8.31.0",
-    "eslint-config-prettier": "8.6.0",
+    "@types/yarnpkg__lockfile": "1.1.6",
+    "@typescript-eslint/eslint-plugin": "6.6.0",
+    "@typescript-eslint/parser": "6.6.0",
+    "chai": "4.3.8",
+    "eslint": "8.48.0",
+    "eslint-config-prettier": "9.0.0",
     "eslint-formatter-codeframe": "7.32.1",
     "eslint-plugin-mocha": "10.1.0",
     "express": "4.18.2",
-    "lint-staged": "13.1.0",
+    "lint-staged": "14.0.1",
     "mocha": "10.2.0",
-    "prettier": "2.8.2",
+    "prettier": "3.0.3",
     "ts-node": "10.9.1",
-    "typescript": "4.9.4"
+    "typescript": "5.2.2"
   },
   "keywords": [
     "registry",
@@ -58,6 +58,6 @@
     "offline"
   ],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.14.0"
   }
 }

package/src/resolve.js

@@ -128,7 +128,11 @@ function resolveNpmPackagesFromYarnLockDependencies(yarnLockDependencies) {
 }
 async function parseDependenciesFromNpmLockFile(lockFilepath, includeDevDependencies) {
     const packageLock = JSON.parse(await fs.promises.readFile(lockFilepath, 'utf8'));
-    const dependencies = recurseNpmLockfileDependencies(packageLock, includeDevDependencies);
+    const fileVersion = packageLock.lockfileVersion || 1;
+    if (![2, 3].includes(packageLock.lockfileVersion)) {
+        throw new Error(`Unsupported package-lock.json version ${fileVersion}`);
+    }
+    const dependencies = collectNpmLockfileDependencies(packageLock, includeDevDependencies);
     return dependencies.map(({ name, version }) => ({ id: `${name}@${version}`, name, version }));
 }
 async function parseDependenciesFromYarnLockFile(lockFilepath) {
@@ -180,28 +184,18 @@ function isNotLocal(dependency) {
     // that we set up anyway, so don't attempt to synchronize it
     return !dependency.version.startsWith('file:');
 }
-function recurseNpmLockfileDependencies({ dependencies }, includeDevDependencies) {
-    if (!dependencies) {
-        return [];
-    }
-    const includeFn = includeDevDependencies ? filterOutBundledDependencies : filterOutBundledAndDevDependencies;
-    return Object.entries(dependencies)
-        .filter(includeFn)
-        .map(([name, props]) => [deAlias(name, props)].concat(recurseNpmLockfileDependencies(props, includeDevDependencies)))
-        .flat();
-}
-function deAlias(name, props) {
-    if (props.version.startsWith('npm:')) {
-        const [realName, realVersion] = props.version.replace(/^npm:/, '').split('@');
-        return { name: realName, version: realVersion };
-    }
-    return { name, version: props.version };
-}
-function filterOutBundledDependencies([, props]) {
-    return !props.bundled;
-}
-function filterOutBundledAndDevDependencies([, props]) {
-    return !(props.bundled || props.dev);
+function collectNpmLockfileDependencies({ packages }, includeDevDependencies) {
+    return Object.entries(packages)
+        .filter(([name, props]) => name.length > 0 && (includeDevDependencies || !props.dev))
+        .map(([name, props]) => ({
+        name: props.name || pathToName(name),
+        version: props.version
+    }));
+}
+// "node_modules/lodash" -> "lodash"
+// "node_modules/make-dir/node_modules/semver" -> "semver"
+function pathToName(path) {
+    return path.split('node_modules/').pop();
 }
 function isDeepEqual(a, b) {
     try {