@verdaccio/store 7.0.0-next.6 → 8.0.0-next-8.0

package/build/type.d.ts

@@ -54,3 +54,8 @@ export type UpdateManifestOptions = {
  * values in the body.
  */
 export type StarManifestBody = Pick<Manifest, '_id' | 'users' | '_rev'>;
+/**
+ * When the command `npm owner add/rm` is executed, the body only contains the following
+ * values in the body.
+ */
+export type OwnerManifestBody = Pick<Manifest, '_id' | 'maintainers' | '_rev'>;

package/build/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","names":[],"sources":["../src/type.ts"],"sourcesContent":["import { FetchOptions } from '@verdaccio/proxy';\nimport { Manifest, RemoteUser } from '@verdaccio/types';\nimport { RequestOptions } from '@verdaccio/url';\n\n// @deprecated use IGetPackageOptionsNext\nexport type IGetPackageOptionsNext = {\n  /**\n   * Package name, could be scoped\n   * eg: @scope/package-name or package-name\n   */\n  name: string;\n  /**\n   * Package version, optional.\n   *\n   * @type {string}\n   */\n  version?: string;\n  /**\n   * @deprecated use `TBA` instead\n   */\n  keepUpLinkData?: boolean;\n  remoteUser?: RemoteUser;\n  // fetch library retry options (mostly used by unit tests)\n  retry?: FetchOptions['retry'];\n  /**\n   * Define if the package should be look up in the uplinks\n   */\n  uplinksLook: boolean;\n  requestOptions: RequestOptions;\n  /**\n   *\n   * The property write=true is used by package managers to get the most frest data\n   * internally indicates to avoid any cache layer.\n   */\n  byPassCache?: boolean;\n\n  /**\n   * Reduce the package metadata to the minimum required to get the package.\n   * https://github.com/npm/registry/blob/c0b573593fb5d6e0268de7d6612addd7059cb779/docs/responses/package-metadata.md#package-metadata\n   */\n  abbreviated?: boolean;\n};\n\n// @deprecate remove this type\nexport type PublishOptions = {\n  signal: AbortSignal;\n} & IGetPackageOptionsNext;\n\nexport type UpdateManifestOptions = {\n  name: string;\n  version?: string;\n  revision?: string;\n  keepUpLinkData?: boolean;\n  remoteUser?: RemoteUser;\n  uplinksLook: boolean;\n  requestOptions: RequestOptions;\n  signal: AbortSignal;\n};\n\n/**\n * When the command `npm star` is executed, the body only contains the following\n * values in the body.\n */\nexport type StarManifestBody = Pick<Manifest, '_id' | 'users' | '_rev'>;\n"],"mappings":""}
+{"version":3,"file":"type.js","names":[],"sources":["../src/type.ts"],"sourcesContent":["import { FetchOptions } from '@verdaccio/proxy';\nimport { Manifest, RemoteUser } from '@verdaccio/types';\nimport { RequestOptions } from '@verdaccio/url';\n\n// @deprecated use IGetPackageOptionsNext\nexport type IGetPackageOptionsNext = {\n  /**\n   * Package name, could be scoped\n   * eg: @scope/package-name or package-name\n   */\n  name: string;\n  /**\n   * Package version, optional.\n   *\n   * @type {string}\n   */\n  version?: string;\n  /**\n   * @deprecated use `TBA` instead\n   */\n  keepUpLinkData?: boolean;\n  remoteUser?: RemoteUser;\n  // fetch library retry options (mostly used by unit tests)\n  retry?: FetchOptions['retry'];\n  /**\n   * Define if the package should be look up in the uplinks\n   */\n  uplinksLook: boolean;\n  requestOptions: RequestOptions;\n  /**\n   *\n   * The property write=true is used by package managers to get the most frest data\n   * internally indicates to avoid any cache layer.\n   */\n  byPassCache?: boolean;\n\n  /**\n   * Reduce the package metadata to the minimum required to get the package.\n   * https://github.com/npm/registry/blob/c0b573593fb5d6e0268de7d6612addd7059cb779/docs/responses/package-metadata.md#package-metadata\n   */\n  abbreviated?: boolean;\n};\n\n// @deprecate remove this type\nexport type PublishOptions = {\n  signal: AbortSignal;\n} & IGetPackageOptionsNext;\n\nexport type UpdateManifestOptions = {\n  name: string;\n  version?: string;\n  revision?: string;\n  keepUpLinkData?: boolean;\n  remoteUser?: RemoteUser;\n  uplinksLook: boolean;\n  requestOptions: RequestOptions;\n  signal: AbortSignal;\n};\n\n/**\n * When the command `npm star` is executed, the body only contains the following\n * values in the body.\n */\nexport type StarManifestBody = Pick<Manifest, '_id' | 'users' | '_rev'>;\n\n/**\n * When the command `npm owner add/rm` is executed, the body only contains the following\n * values in the body.\n */\nexport type OwnerManifestBody = Pick<Manifest, '_id' | 'maintainers' | '_rev'>;\n"],"mappings":"","ignoreList":[]}

package/jest.config.js

@@ -5,8 +5,8 @@ module.exports = Object.assign({}, config, {
     global: {
       // FIXME: increase to 90
       branches: 62,
-      functions: 86,
-      lines: 76,
+      functions: 84,
+      lines: 74,
     },
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/store",
-  "version": "7.0.0-next.6",
+  "version": "8.0.0-next-8.0",
   "description": "loaders logic",
   "main": "./build/index.js",
   "types": "build/index.d.ts",
@@ -29,27 +29,28 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@verdaccio/config": "7.0.0-next.6",
-    "@verdaccio/core": "7.0.0-next.6",
-    "@verdaccio/hooks": "7.0.0-next.6",
-    "@verdaccio/loaders": "7.0.0-next.6",
-    "@verdaccio/local-storage": "12.0.0-next.6",
-    "@verdaccio/logger": "7.0.0-next.6",
-    "@verdaccio/proxy": "7.0.0-next.6",
-    "@verdaccio/tarball": "12.0.0-next.6",
-    "@verdaccio/url": "12.0.0-next.6",
-    "@verdaccio/utils": "7.0.0-next.6",
+    "@verdaccio/config": "8.0.0-next-8.0",
+    "@verdaccio/core": "8.0.0-next-8.0",
+    "@verdaccio/hooks": "8.0.0-next-8.0",
+    "@verdaccio/loaders": "8.0.0-next-8.0",
+    "@verdaccio/local-storage": "13.0.0-next-8.0",
+    "@verdaccio/logger": "8.0.0-next-8.0",
+    "@verdaccio/proxy": "8.0.0-next-8.0",
+    "@verdaccio/search": "8.0.0-next-8.0",
+    "@verdaccio/tarball": "13.0.0-next-8.0",
+    "@verdaccio/url": "13.0.0-next-8.0",
+    "@verdaccio/utils": "7.0.1-next-8.0",
     "JSONStream": "1.3.5",
-    "debug": "4.3.4",
+    "debug": "4.3.7",
     "lodash": "4.17.21",
     "merge2": "1.4.1",
-    "semver": "7.5.4"
+    "semver": "7.6.3"
   },
   "devDependencies": {
-    "@verdaccio/test-helper": "3.0.0-next.1",
-    "@verdaccio/types": "12.0.0-next.2",
+    "@verdaccio/test-helper": "4.0.0-next-8.0",
+    "@verdaccio/types": "13.0.0-next-8.0",
     "mockdate": "3.0.5",
-    "nock": "13.4.0",
+    "nock": "13.5.1",
     "node-mocks-http": "1.14.1"
   },
   "funding": {

package/src/index.ts

@@ -1,6 +1,5 @@
 export { Storage } from './storage';
 export * from './lib/storage-utils';
-export * from './lib/search-utils';
 export * from './lib/versions-utils';
 export * from './lib/star-utils';
 export * from './type';

package/src/lib/storage-utils.ts

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import semver from 'semver';
 
-import { errorUtils, pkgUtils, validatioUtils } from '@verdaccio/core';
-import { API_ERROR, DIST_TAGS, HTTP_STATUS, USERS } from '@verdaccio/core';
+import { errorUtils, pkgUtils, searchUtils, validatioUtils } from '@verdaccio/core';
+import { API_ERROR, DIST_TAGS, HTTP_STATUS, MAINTAINERS, USERS } from '@verdaccio/core';
 import { AttachMents, Manifest, Version, Versions } from '@verdaccio/types';
 import { generateRandomHexString, isNil, isObject } from '@verdaccio/utils';
 
@@ -28,6 +28,7 @@ export function generatePackageTemplate(name: string): Manifest {
     time: {},
     [USERS]: {},
     [DIST_TAGS]: {},
+    [MAINTAINERS]: [],
     _uplinks: {},
     _distfiles: {},
     _attachments: {},
@@ -109,6 +110,7 @@ export const WHITELIST = [
   'time',
   '_id',
   'users',
+  'maintainers',
 ];
 
 export function cleanUpLinksRef(result: Manifest, keepUpLinkData?: boolean): Manifest {
@@ -290,6 +292,8 @@ export function mergeVersions(cacheManifest: Manifest, remoteManifest: Manifest)
     }
   }
 
+  // TODO: Should we merge owners? _cacheManifest[MAINTAINERS]
+
   return cacheManifest;
 }
 
@@ -360,3 +364,37 @@ export function hasDeprecatedVersions(pkgInfo: Manifest): boolean {
 export function isDeprecatedManifest(manifest: Manifest): boolean {
   return hasDeprecatedVersions(manifest) && Object.keys(manifest._attachments).length === 0;
 }
+
+export function mapManifestToSearchPackageBody(
+  pkg: Manifest,
+  searchItem: searchUtils.SearchItem
+): searchUtils.SearchPackageBody {
+  const latest = pkgUtils.getLatest(pkg);
+  const version: Version = pkg.versions[latest];
+  const result: searchUtils.SearchPackageBody = {
+    name: version.name,
+    scope: '',
+    description: version.description,
+    version: latest,
+    keywords: version.keywords,
+    date: pkg.time[latest],
+    // FIXME: type
+    author: version.author as any,
+    // FIXME: not possible fill this out from a private package
+    publisher: {},
+    // FIXME: type
+    maintainers: version.maintainers as any,
+    links: {
+      npm: '',
+      homepage: version.homepage,
+      repository: version.repository,
+      bugs: version.bugs,
+    },
+  };
+
+  if (typeof searchItem.package.scoped === 'string') {
+    result.scope = searchItem.package.scoped;
+  }
+
+  return result;
+}

package/src/lib/versions-utils.ts

@@ -1,9 +1,12 @@
+import buildDebug from 'debug';
 import _ from 'lodash';
 import semver, { SemVer } from 'semver';
 
-import { DIST_TAGS } from '@verdaccio/core';
+import { DIST_TAGS, searchUtils } from '@verdaccio/core';
 import { Manifest, StringValue, Version, Versions } from '@verdaccio/types';
 
+const debug = buildDebug('verdaccio:storage:utils');
+
 /**
  * Gets version from a package object taking into account semver weirdness.
  * @return {String} return the semantic version of a package
@@ -85,3 +88,49 @@ export function tagVersionNext(manifest: Manifest, version: string, tag: StringV
   }
   return data;
 }
+
+/**
+ *  Check if the version is newer than the older version.
+ * @param newVersion
+ * @param oldVersion
+ * @returns
+ */
+export function isNewerVersion(newVersion, oldVersion) {
+  const comparisonResult = semver.compare(newVersion, oldVersion);
+
+  return comparisonResult === 1 || comparisonResult === 0;
+}
+
+/**
+ * Remove duplicates from search results.
+ * @param {Array} objects
+ * @return {Array} filtered array
+ */
+export function removeLowerVersions(objects: searchUtils.SearchPackageItem[]) {
+  const versionMap = new Map();
+
+  // Iterate through the array and keep the highest version for each name
+  objects.forEach((item) => {
+    const { name, version } = item.package;
+    const key = name;
+
+    if (versionMap.has(name) === false || isNewerVersion(version, versionMap.get(name))) {
+      debug('keeping %o@%o', name, version);
+      versionMap.set(key, version);
+    }
+  });
+
+  // Filter objects based on the version map
+  return objects.reduce((acc, item) => {
+    const { name, version } = item.package;
+    if (
+      versionMap.has(name) &&
+      versionMap.get(name) === version &&
+      acc.find((i) => i.package.name === name) === undefined
+    ) {
+      debug('adding %o@%o', name, version);
+      acc.push(item);
+    }
+    return acc;
+  }, [] as searchUtils.SearchPackageItem[]);
+}

package/src/local-storage.ts

@@ -2,7 +2,7 @@ import assert from 'assert';
 import buildDebug from 'debug';
 import _ from 'lodash';
 
-import { errorUtils, pluginUtils } from '@verdaccio/core';
+import { PLUGIN_CATEGORY, errorUtils, pluginUtils } from '@verdaccio/core';
 import { asyncLoadPlugin } from '@verdaccio/loaders';
 import LocalDatabase from '@verdaccio/local-storage';
 import { Config, Logger } from '@verdaccio/types';
@@ -75,7 +75,8 @@ class LocalStorage {
       (plugin) => {
         return typeof plugin.getPackageStorage !== 'undefined';
       },
-      this.config?.serverSettings?.pluginPrefix
+      this.config?.serverSettings?.pluginPrefix,
+      PLUGIN_CATEGORY.STORAGE
     );
 
     if (plugins.length > 1) {