@verdaccio/config 6.0.0-6-next.7 → 6.0.0-6-next.11

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @verdaccio/config
 
+## 6.0.0-6-next.11
+
+### Patch Changes
+
+- Updated dependencies [f86c31ed]
+  - @verdaccio/utils@6.0.0-6-next.9
+
+## 6.0.0-6-next.10
+
+### Patch Changes
+
+- Updated dependencies [6c1eb021]
+  - @verdaccio/core@6.0.0-6-next.3
+  - @verdaccio/utils@6.0.0-6-next.8
+
+## 6.0.0-6-next.9
+
+### Major Changes
+
+- 794af76c: Remove Node 12 support
+
+  - We need move to the new `undici` and does not support Node.js 12
+
+### Minor Changes
+
+- 154b2ecd: refactor: remove @verdaccio/commons-api in favor @verdaccio/core and remove duplications
+
+### Patch Changes
+
+- Updated dependencies [794af76c]
+- Updated dependencies [154b2ecd]
+  - @verdaccio/core@6.0.0-6-next.2
+  - @verdaccio/utils@6.0.0-6-next.7
+
+## 6.0.0-6-next.8
+
+### Major Changes
+
+- 459b6fa7: refactor: search v1 endpoint and local-database
+
+  - refactor search `api v1` endpoint, improve performance
+  - remove usage of `async` dependency https://github.com/verdaccio/verdaccio/issues/1225
+  - refactor method storage class
+  - create new module `core` to reduce the ammount of modules with utilities
+  - use `undici` instead `node-fetch`
+  - use `fastify` instead `express` for functional test
+
+  ### Breaking changes
+
+  - plugin storage API changes
+  - remove old search endpoint (return 404)
+  - filter local private packages at plugin level
+
+  The storage api changes for methods `get`, `add`, `remove` as promise base. The `search` methods also changes and recieves a `query` object that contains all query params from the client.
+
+  ```ts
+  export interface IPluginStorage<T> extends IPlugin {
+    add(name: string): Promise<void>;
+    remove(name: string): Promise<void>;
+    get(): Promise<any>;
+    init(): Promise<void>;
+    getSecret(): Promise<string>;
+    setSecret(secret: string): Promise<any>;
+    getPackageStorage(packageInfo: string): IPackageStorage;
+    search(query: searchUtils.SearchQuery): Promise<searchUtils.SearchItem[]>;
+    saveToken(token: Token): Promise<any>;
+    deleteToken(user: string, tokenKey: string): Promise<any>;
+    readTokens(filter: TokenFilter): Promise<Token[]>;
+  }
+  ```
+
+### Patch Changes
+
+- Updated dependencies [459b6fa7]
+  - @verdaccio/commons-api@11.0.0-6-next.4
+  - @verdaccio/utils@6.0.0-6-next.6
+
 ## 6.0.0-6-next.7
 
 ### Patch Changes

package/build/conf/default.yaml

@@ -100,11 +100,6 @@ logs:
   # { type: file, path: verdaccio.log, level: http}
   # FIXME: this should be documented
   # More info about log rotation https://github.com/pinojs/pino/blob/master/docs/help.md#log-rotation
-flags:
-  # support for npm token command
-  token: false
-  # support for the new v1 search endpoint, functional by incomplete read more on ticket 1732
-  search: false
 
 # This affect the web and api (not developed yet)
 i18n:

package/build/config-path.js

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.readDefaultConfig = readDefaultConfig;
 exports.findConfigFile = findConfigFile;
+exports.readDefaultConfig = readDefaultConfig;
 
-var _fs = _interopRequireDefault(require("fs"));
+var _debug = _interopRequireDefault(require("debug"));
 
-var _path = _interopRequireDefault(require("path"));
+var _fs = _interopRequireDefault(require("fs"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _debug = _interopRequireDefault(require("debug"));
+var _path = _interopRequireDefault(require("path"));
 
-var _commonsApi = require("@verdaccio/commons-api");
+var _core = require("@verdaccio/core");
 
 var _configUtils = require("./config-utils");
 
@@ -81,7 +81,7 @@ function readDefaultConfig() {
   } // @ts-ignore
 
 
-  return _fs.default.readFileSync(pathDefaultConf, _commonsApi.CHARACTER_ENCODING.UTF8);
+  return _fs.default.readFileSync(pathDefaultConf, _core.CHARACTER_ENCODING.UTF8);
 }
 
 function createConfigFolder(configLocation) {

package/build/config-path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/config-path.ts"],"names":["CONFIG_FILE","XDG","WIN","WIN32","pkgJSON","name","debug","findConfigFile","configPath","path","resolve","configPaths","getConfigPaths","length","_","isEmpty","Error","primaryConf","find","configLocation","createConfigFile","head","createConfigFolder","defaultConfig","updateStorageLinks","readDefaultConfig","fs","writeFileSync","pathDefaultConf","__dirname","accessSync","constants","R_OK","TypeError","readFileSync","CHARACTER_ENCODING","UTF8","mkdirSync","dirname","recursive","type","dataDir","process","env","XDG_DATA_HOME","join","HOME","replace","listPaths","getXDGDirectory","getWindowsDirectory","getRelativeDefaultDirectory","getOldDirectory","reduce","acc","currentValue","push","xDGConfigPath","XDG_CONFIG_HOME","platform","APPDATA"],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport _ from 'lodash';\nimport buildDebug from 'debug';\n\nimport { CHARACTER_ENCODING } from '@verdaccio/commons-api';\nimport { folderExists, fileExists } from './config-utils';\n\nconst CONFIG_FILE = 'config.yaml';\nconst XDG = 'xdg';\nconst WIN = 'win';\nconst WIN32 = 'win32';\n// eslint-disable-next-line\nconst pkgJSON = {\n  name: 'verdaccio',\n};\n\nexport type SetupDirectory = {\n  path: string;\n  type: string;\n};\n\nconst debug = buildDebug('verdaccio:config');\n\n/**\n * Find and get the first config file that match.\n * @return {String} the config file path\n */\nfunction findConfigFile(configPath?: string): string {\n  // console.log(process.env);\n  if (typeof configPath !== 'undefined') {\n    return path.resolve(configPath);\n  }\n\n  const configPaths: SetupDirectory[] = getConfigPaths();\n  debug('%o posible locations found', configPaths.length);\n  if (_.isEmpty(configPaths)) {\n    // this should never happens\n    throw new Error('no configuration files can be processed');\n  }\n\n  // find the first location that already exist\n  const primaryConf: SetupDirectory | void = _.find(configPaths, (configLocation: SetupDirectory) =>\n    fileExists(configLocation.path)\n  );\n\n  if (typeof primaryConf !== 'undefined') {\n    debug('previous location exist already %s', primaryConf?.path);\n    return primaryConf.path;\n  }\n\n  // @ts-ignore\n  return createConfigFile(_.head(configPaths)).path;\n}\n\nfunction createConfigFile(configLocation: SetupDirectory): SetupDirectory {\n  createConfigFolder(configLocation);\n\n  const defaultConfig = updateStorageLinks(configLocation, readDefaultConfig());\n\n  fs.writeFileSync(configLocation.path, defaultConfig);\n\n  return configLocation;\n}\n\nexport function readDefaultConfig(): Buffer {\n  const pathDefaultConf: string = path.resolve(__dirname, 'conf/default.yaml');\n  try {\n    debug('default configuration file %s', pathDefaultConf);\n    fs.accessSync(pathDefaultConf, fs.constants.R_OK);\n  } catch {\n    throw new TypeError('configuration file does not have enough permissions for reading');\n  }\n  // @ts-ignore\n  return fs.readFileSync(pathDefaultConf, CHARACTER_ENCODING.UTF8);\n}\n\nfunction createConfigFolder(configLocation): void {\n  fs.mkdirSync(path.dirname(configLocation.path), { recursive: true });\n  debug(`Creating default config file in %o`, configLocation?.path);\n}\n\nfunction updateStorageLinks(configLocation, defaultConfig): string {\n  if (configLocation.type !== XDG) {\n    return defaultConfig;\n  }\n\n  // $XDG_DATA_HOME defines the base directory relative to which user specific data\n  // files should be stored, If $XDG_DATA_HOME is either not set or empty, a default\n  // equal to $HOME/.local/share should be used.\n  let dataDir =\n    process.env.XDG_DATA_HOME || path.join(process.env.HOME as string, '.local', 'share');\n  if (folderExists(dataDir)) {\n    debug(`previous storage located`);\n    debug(`update storage links to %s`, dataDir);\n    dataDir = path.resolve(path.join(dataDir, pkgJSON.name, 'storage'));\n    return defaultConfig.replace(/^storage: .\\/storage$/m, `storage: ${dataDir}`);\n  }\n  debug(`could not find a previous storage location, skip override`);\n  return defaultConfig;\n}\n\n/**\n * Return a list of configuration locations by platform.\n * @returns\n */\nfunction getConfigPaths(): SetupDirectory[] {\n  const listPaths: (SetupDirectory | void)[] = [\n    getXDGDirectory(),\n    getWindowsDirectory(),\n    getRelativeDefaultDirectory(),\n    getOldDirectory(),\n  ];\n\n  return listPaths.reduce(function (acc, currentValue: SetupDirectory | void): SetupDirectory[] {\n    if (typeof currentValue !== 'undefined') {\n      debug('directory detected path %s for type %s', currentValue?.path, currentValue.type);\n      acc.push(currentValue);\n    }\n    return acc;\n  }, [] as SetupDirectory[]);\n}\n\n/**\n * Get XDG_CONFIG_HOME or HOME location (usually unix)\n * @returns\n */\nconst getXDGDirectory = (): SetupDirectory | void => {\n  const xDGConfigPath =\n    process.env.XDG_CONFIG_HOME || (process.env.HOME && path.join(process.env.HOME, '.config'));\n  if (xDGConfigPath && folderExists(xDGConfigPath)) {\n    debug('XDGConfig folder path %s', xDGConfigPath);\n    return {\n      path: path.join(xDGConfigPath, pkgJSON.name, CONFIG_FILE),\n      type: XDG,\n    };\n  }\n};\n\n/**\n * Detect windows location, APPDATA\n * usually something like C:\\User\\<Build User>\\AppData\\Local\n * @returns\n */\nconst getWindowsDirectory = (): SetupDirectory | void => {\n  if (process.platform === WIN32 && process.env.APPDATA && folderExists(process.env.APPDATA)) {\n    debug('is windows appdata: %s', process.env.APPDATA);\n    return {\n      path: path.resolve(path.join(process.env.APPDATA, pkgJSON.name, CONFIG_FILE)),\n      type: WIN,\n    };\n  }\n};\n\n/**\n * Return relative directory, this is the default.\n * It will cretate config in your {currentLocation/verdaccio/config.yaml}\n * @returns\n */\nconst getRelativeDefaultDirectory = (): SetupDirectory => {\n  return {\n    path: path.resolve(path.join('.', pkgJSON.name, CONFIG_FILE)),\n    type: 'def',\n  };\n};\n\n/**\n * This should never happens, consider it DEPRECATED\n * @returns\n */\nconst getOldDirectory = (): SetupDirectory => {\n  return {\n    path: path.resolve(path.join('.', CONFIG_FILE)),\n    type: 'old',\n  };\n};\n\nexport { findConfigFile };\n"],"file":"config-path.js"}
+{"version":3,"sources":["../src/config-path.ts"],"names":["CONFIG_FILE","XDG","WIN","WIN32","pkgJSON","name","debug","findConfigFile","configPath","path","resolve","configPaths","getConfigPaths","length","_","isEmpty","Error","primaryConf","find","configLocation","createConfigFile","head","createConfigFolder","defaultConfig","updateStorageLinks","readDefaultConfig","fs","writeFileSync","pathDefaultConf","__dirname","accessSync","constants","R_OK","TypeError","readFileSync","CHARACTER_ENCODING","UTF8","mkdirSync","dirname","recursive","type","dataDir","process","env","XDG_DATA_HOME","join","HOME","replace","listPaths","getXDGDirectory","getWindowsDirectory","getRelativeDefaultDirectory","getOldDirectory","reduce","acc","currentValue","push","xDGConfigPath","XDG_CONFIG_HOME","platform","APPDATA"],"mappings":"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","sourcesContent":["import buildDebug from 'debug';\nimport fs from 'fs';\nimport _ from 'lodash';\nimport path from 'path';\n\nimport { CHARACTER_ENCODING } from '@verdaccio/core';\n\nimport { fileExists, folderExists } from './config-utils';\n\nconst CONFIG_FILE = 'config.yaml';\nconst XDG = 'xdg';\nconst WIN = 'win';\nconst WIN32 = 'win32';\n// eslint-disable-next-line\nconst pkgJSON = {\n  name: 'verdaccio',\n};\n\nexport type SetupDirectory = {\n  path: string;\n  type: string;\n};\n\nconst debug = buildDebug('verdaccio:config');\n\n/**\n * Find and get the first config file that match.\n * @return {String} the config file path\n */\nfunction findConfigFile(configPath?: string): string {\n  // console.log(process.env);\n  if (typeof configPath !== 'undefined') {\n    return path.resolve(configPath);\n  }\n\n  const configPaths: SetupDirectory[] = getConfigPaths();\n  debug('%o posible locations found', configPaths.length);\n  if (_.isEmpty(configPaths)) {\n    // this should never happens\n    throw new Error('no configuration files can be processed');\n  }\n\n  // find the first location that already exist\n  const primaryConf: SetupDirectory | void = _.find(configPaths, (configLocation: SetupDirectory) =>\n    fileExists(configLocation.path)\n  );\n\n  if (typeof primaryConf !== 'undefined') {\n    debug('previous location exist already %s', primaryConf?.path);\n    return primaryConf.path;\n  }\n\n  // @ts-ignore\n  return createConfigFile(_.head(configPaths)).path;\n}\n\nfunction createConfigFile(configLocation: SetupDirectory): SetupDirectory {\n  createConfigFolder(configLocation);\n\n  const defaultConfig = updateStorageLinks(configLocation, readDefaultConfig());\n\n  fs.writeFileSync(configLocation.path, defaultConfig);\n\n  return configLocation;\n}\n\nexport function readDefaultConfig(): Buffer {\n  const pathDefaultConf: string = path.resolve(__dirname, 'conf/default.yaml');\n  try {\n    debug('default configuration file %s', pathDefaultConf);\n    fs.accessSync(pathDefaultConf, fs.constants.R_OK);\n  } catch {\n    throw new TypeError('configuration file does not have enough permissions for reading');\n  }\n  // @ts-ignore\n  return fs.readFileSync(pathDefaultConf, CHARACTER_ENCODING.UTF8);\n}\n\nfunction createConfigFolder(configLocation): void {\n  fs.mkdirSync(path.dirname(configLocation.path), { recursive: true });\n  debug(`Creating default config file in %o`, configLocation?.path);\n}\n\nfunction updateStorageLinks(configLocation, defaultConfig): string {\n  if (configLocation.type !== XDG) {\n    return defaultConfig;\n  }\n\n  // $XDG_DATA_HOME defines the base directory relative to which user specific data\n  // files should be stored, If $XDG_DATA_HOME is either not set or empty, a default\n  // equal to $HOME/.local/share should be used.\n  let dataDir =\n    process.env.XDG_DATA_HOME || path.join(process.env.HOME as string, '.local', 'share');\n  if (folderExists(dataDir)) {\n    debug(`previous storage located`);\n    debug(`update storage links to %s`, dataDir);\n    dataDir = path.resolve(path.join(dataDir, pkgJSON.name, 'storage'));\n    return defaultConfig.replace(/^storage: .\\/storage$/m, `storage: ${dataDir}`);\n  }\n  debug(`could not find a previous storage location, skip override`);\n  return defaultConfig;\n}\n\n/**\n * Return a list of configuration locations by platform.\n * @returns\n */\nfunction getConfigPaths(): SetupDirectory[] {\n  const listPaths: (SetupDirectory | void)[] = [\n    getXDGDirectory(),\n    getWindowsDirectory(),\n    getRelativeDefaultDirectory(),\n    getOldDirectory(),\n  ];\n\n  return listPaths.reduce(function (acc, currentValue: SetupDirectory | void): SetupDirectory[] {\n    if (typeof currentValue !== 'undefined') {\n      debug('directory detected path %s for type %s', currentValue?.path, currentValue.type);\n      acc.push(currentValue);\n    }\n    return acc;\n  }, [] as SetupDirectory[]);\n}\n\n/**\n * Get XDG_CONFIG_HOME or HOME location (usually unix)\n * @returns\n */\nconst getXDGDirectory = (): SetupDirectory | void => {\n  const xDGConfigPath =\n    process.env.XDG_CONFIG_HOME || (process.env.HOME && path.join(process.env.HOME, '.config'));\n  if (xDGConfigPath && folderExists(xDGConfigPath)) {\n    debug('XDGConfig folder path %s', xDGConfigPath);\n    return {\n      path: path.join(xDGConfigPath, pkgJSON.name, CONFIG_FILE),\n      type: XDG,\n    };\n  }\n};\n\n/**\n * Detect windows location, APPDATA\n * usually something like C:\\User\\<Build User>\\AppData\\Local\n * @returns\n */\nconst getWindowsDirectory = (): SetupDirectory | void => {\n  if (process.platform === WIN32 && process.env.APPDATA && folderExists(process.env.APPDATA)) {\n    debug('is windows appdata: %s', process.env.APPDATA);\n    return {\n      path: path.resolve(path.join(process.env.APPDATA, pkgJSON.name, CONFIG_FILE)),\n      type: WIN,\n    };\n  }\n};\n\n/**\n * Return relative directory, this is the default.\n * It will cretate config in your {currentLocation/verdaccio/config.yaml}\n * @returns\n */\nconst getRelativeDefaultDirectory = (): SetupDirectory => {\n  return {\n    path: path.resolve(path.join('.', pkgJSON.name, CONFIG_FILE)),\n    type: 'def',\n  };\n};\n\n/**\n * This should never happens, consider it DEPRECATED\n * @returns\n */\nconst getOldDirectory = (): SetupDirectory => {\n  return {\n    path: path.resolve(path.join('.', CONFIG_FILE)),\n    type: 'old',\n  };\n};\n\nexport { findConfigFile };\n"],"file":"config-path.js"}

package/build/config-utils.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.folderExists = folderExists;
 exports.fileExists = fileExists;
+exports.folderExists = folderExists;
 
 var _fs = _interopRequireDefault(require("fs"));
 

package/build/config.d.ts

@@ -1,5 +1,4 @@
-import { PackageList, Config as AppConfig, ConfigRuntime, Security, PackageAccess, ServerSettingsConf, AuthConf } from '@verdaccio/types';
-export declare type MatchedPackage = PackageAccess | void;
+import { Config as AppConfig, AuthConf, ConfigRuntime, PackageAccess, PackageList, Security, ServerSettingsConf } from '@verdaccio/types';
 export declare const WEB_TITLE = "Verdaccio";
 /**
  * Coordinates the application configuration
@@ -21,7 +20,7 @@ declare class Config implements AppConfig {
     /**
      * Check for package spec
      */
-    getMatchedPackagesSpec(pkgName: string): MatchedPackage;
+    getMatchedPackagesSpec(pkgName: string): PackageAccess | void;
     /**
      * Store or create whether receive a secret key
      */

package/build/config.js

@@ -3,30 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Config = exports.WEB_TITLE = void 0;
+exports.WEB_TITLE = exports.Config = void 0;
 
 var _assert = _interopRequireDefault(require("assert"));
 
+var _debug = _interopRequireDefault(require("debug"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _debug = _interopRequireDefault(require("debug"));
+var _core = require("@verdaccio/core");
 
 var _utils = require("@verdaccio/utils");
 
-var _commonsApi = require("@verdaccio/commons-api");
-
-var _token = require("./token");
+var _agent = require("./agent");
 
 var _packageAccess = require("./package-access");
 
-var _uplinks = require("./uplinks");
-
 var _security = require("./security");
 
-var _agent = require("./agent");
-
 var _serverSettings = _interopRequireDefault(require("./serverSettings"));
 
+var _token = require("./token");
+
+var _uplinks = require("./uplinks");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -87,7 +87,7 @@ class Config {
     } // some weird shell scripts are valid yaml files parsed as string
 
 
-    (0, _assert.default)(_lodash.default.isObject(config), _commonsApi.APP_ERROR.CONFIG_NOT_VALID); // sanity check for strategic config properties
+    (0, _assert.default)(_lodash.default.isObject(config), _core.APP_ERROR.CONFIG_NOT_VALID); // sanity check for strategic config properties
 
     strategicConfigProps.forEach(function (x) {
       if (self[x] == null) {
@@ -116,7 +116,8 @@ class Config {
 
 
   getMatchedPackagesSpec(pkgName) {
-    return (0, _packageAccess.getMatchedPackagesSpec)(pkgName, this.packages);
+    // TODO: remove this method and replace by library utils
+    return (0, _utils.getMatchedPackagesSpec)(pkgName, this.packages);
   }
   /**
    * Store or create whether receive a secret key

package/build/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/config.ts"],"names":["strategicConfigProps","allowedEnvConfig","debug","WEB_TITLE","Config","constructor","config","self","storage","process","env","VERDACCIO_STORAGE_PATH","config_path","plugins","security","_","merge","defaultSecurity","serverSettings","configProp","isNil","user_agent","isObject","APP_ERROR","CONFIG_NOT_VALID","forEach","x","uplinks","packages","envConf","toUpperCase","server_id","getMatchedPackagesSpec","pkgName","checkSecretKey","secret","isString","isEmpty"],"mappings":"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","sourcesContent":["import assert from 'assert';\nimport _ from 'lodash';\nimport buildDebug from 'debug';\n\nimport { generateRandomHexString, isObject } from '@verdaccio/utils';\nimport { APP_ERROR } from '@verdaccio/commons-api';\nimport {\n  PackageList,\n  Config as AppConfig,\n  ConfigRuntime,\n  Security,\n  PackageAccess,\n  ServerSettingsConf,\n  AuthConf,\n} from '@verdaccio/types';\n\nimport { generateRandomSecretKey } from './token';\nimport { getMatchedPackagesSpec, normalisePackageAccess } from './package-access';\nimport { sanityCheckUplinksProps, uplinkSanityCheck } from './uplinks';\nimport { defaultSecurity } from './security';\nimport { getUserAgent } from './agent';\nimport serverSettings from './serverSettings';\n\nconst strategicConfigProps = ['uplinks', 'packages'];\nconst allowedEnvConfig = ['http_proxy', 'https_proxy', 'no_proxy'];\n\nexport type MatchedPackage = PackageAccess | void;\n\nconst debug = buildDebug('verdaccio:config');\n\nexport const WEB_TITLE = 'Verdaccio';\n\n/**\n * Coordinates the application configuration\n */\nclass Config implements AppConfig {\n  public user_agent: string;\n  public uplinks: any;\n  public packages: PackageList;\n  public users: any;\n  public auth: AuthConf;\n  public server_id: string;\n  public config_path: string;\n  public storage: string | void;\n  public plugins: string | void;\n  public security: Security;\n  public serverSettings: ServerSettingsConf;\n  // @ts-ignore\n  public secret: string;\n\n  public constructor(config: ConfigRuntime) {\n    const self = this;\n    this.storage = process.env.VERDACCIO_STORAGE_PATH || config.storage;\n    this.config_path = config.config_path;\n    this.plugins = config.plugins;\n    this.security = _.merge(defaultSecurity, config.security);\n    this.serverSettings = serverSettings;\n\n    for (const configProp in config) {\n      if (self[configProp] == null) {\n        self[configProp] = config[configProp];\n      }\n    }\n\n    // @ts-ignore\n    if (_.isNil(this.user_agent)) {\n      this.user_agent = getUserAgent();\n    }\n\n    // some weird shell scripts are valid yaml files parsed as string\n    assert(_.isObject(config), APP_ERROR.CONFIG_NOT_VALID);\n\n    // sanity check for strategic config properties\n    strategicConfigProps.forEach(function (x): void {\n      if (self[x] == null) {\n        self[x] = {};\n      }\n\n      assert(isObject(self[x]), `CONFIG: bad \"${x}\" value (object expected)`);\n    });\n\n    this.uplinks = sanityCheckUplinksProps(uplinkSanityCheck(this.uplinks));\n    this.packages = normalisePackageAccess(self.packages);\n\n    // loading these from ENV if aren't in config\n    allowedEnvConfig.forEach((envConf): void => {\n      if (!(envConf in self)) {\n        self[envConf] = process.env[envConf] || process.env[envConf.toUpperCase()];\n      }\n    });\n\n    // unique identifier of self server (or a cluster), used to avoid loops\n    // @ts-ignore\n    if (!this.server_id) {\n      this.server_id = generateRandomHexString(6);\n    }\n  }\n\n  /**\n   * Check for package spec\n   */\n  public getMatchedPackagesSpec(pkgName: string): MatchedPackage {\n    return getMatchedPackagesSpec(pkgName, this.packages);\n  }\n\n  /**\n   * Store or create whether receive a secret key\n   */\n  public checkSecretKey(secret?: string): string {\n    debug('check secret key');\n    if (_.isString(secret) && _.isEmpty(secret) === false) {\n      this.secret = secret;\n      debug('reusing previous key');\n      return secret;\n    }\n    // it generates a secret key\n    // FUTURE: this might be an external secret key, perhaps within config file?\n    debug('generate a new key');\n    this.secret = generateRandomSecretKey();\n    return this.secret;\n  }\n}\n\nexport { Config };\n"],"file":"config.js"}
+{"version":3,"sources":["../src/config.ts"],"names":["strategicConfigProps","allowedEnvConfig","debug","WEB_TITLE","Config","constructor","config","self","storage","process","env","VERDACCIO_STORAGE_PATH","config_path","plugins","security","_","merge","defaultSecurity","serverSettings","configProp","isNil","user_agent","isObject","APP_ERROR","CONFIG_NOT_VALID","forEach","x","uplinks","packages","envConf","toUpperCase","server_id","getMatchedPackagesSpec","pkgName","checkSecretKey","secret","isString","isEmpty"],"mappings":"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","sourcesContent":["import assert from 'assert';\nimport buildDebug from 'debug';\nimport _ from 'lodash';\n\nimport { APP_ERROR } from '@verdaccio/core';\nimport {\n  Config as AppConfig,\n  AuthConf,\n  ConfigRuntime,\n  PackageAccess,\n  PackageList,\n  Security,\n  ServerSettingsConf,\n} from '@verdaccio/types';\nimport { generateRandomHexString, getMatchedPackagesSpec, isObject } from '@verdaccio/utils';\n\nimport { getUserAgent } from './agent';\nimport { normalisePackageAccess } from './package-access';\nimport { defaultSecurity } from './security';\nimport serverSettings from './serverSettings';\nimport { generateRandomSecretKey } from './token';\nimport { sanityCheckUplinksProps, uplinkSanityCheck } from './uplinks';\n\nconst strategicConfigProps = ['uplinks', 'packages'];\nconst allowedEnvConfig = ['http_proxy', 'https_proxy', 'no_proxy'];\nconst debug = buildDebug('verdaccio:config');\n\nexport const WEB_TITLE = 'Verdaccio';\n\n/**\n * Coordinates the application configuration\n */\nclass Config implements AppConfig {\n  public user_agent: string;\n  public uplinks: any;\n  public packages: PackageList;\n  public users: any;\n  public auth: AuthConf;\n  public server_id: string;\n  public config_path: string;\n  public storage: string | void;\n  public plugins: string | void;\n  public security: Security;\n  public serverSettings: ServerSettingsConf;\n  // @ts-ignore\n  public secret: string;\n\n  public constructor(config: ConfigRuntime) {\n    const self = this;\n    this.storage = process.env.VERDACCIO_STORAGE_PATH || config.storage;\n    this.config_path = config.config_path;\n    this.plugins = config.plugins;\n    this.security = _.merge(defaultSecurity, config.security);\n    this.serverSettings = serverSettings;\n\n    for (const configProp in config) {\n      if (self[configProp] == null) {\n        self[configProp] = config[configProp];\n      }\n    }\n\n    // @ts-ignore\n    if (_.isNil(this.user_agent)) {\n      this.user_agent = getUserAgent();\n    }\n\n    // some weird shell scripts are valid yaml files parsed as string\n    assert(_.isObject(config), APP_ERROR.CONFIG_NOT_VALID);\n\n    // sanity check for strategic config properties\n    strategicConfigProps.forEach(function (x): void {\n      if (self[x] == null) {\n        self[x] = {};\n      }\n\n      assert(isObject(self[x]), `CONFIG: bad \"${x}\" value (object expected)`);\n    });\n\n    this.uplinks = sanityCheckUplinksProps(uplinkSanityCheck(this.uplinks));\n    this.packages = normalisePackageAccess(self.packages);\n\n    // loading these from ENV if aren't in config\n    allowedEnvConfig.forEach((envConf): void => {\n      if (!(envConf in self)) {\n        self[envConf] = process.env[envConf] || process.env[envConf.toUpperCase()];\n      }\n    });\n\n    // unique identifier of self server (or a cluster), used to avoid loops\n    // @ts-ignore\n    if (!this.server_id) {\n      this.server_id = generateRandomHexString(6);\n    }\n  }\n\n  /**\n   * Check for package spec\n   */\n  public getMatchedPackagesSpec(pkgName: string): PackageAccess | void {\n    // TODO: remove this method and replace by library utils\n    return getMatchedPackagesSpec(pkgName, this.packages);\n  }\n\n  /**\n   * Store or create whether receive a secret key\n   */\n  public checkSecretKey(secret?: string): string {\n    debug('check secret key');\n    if (_.isString(secret) && _.isEmpty(secret) === false) {\n      this.secret = secret;\n      debug('reusing previous key');\n      return secret;\n    }\n    // it generates a secret key\n    // FUTURE: this might be an external secret key, perhaps within config file?\n    debug('generate a new key');\n    this.secret = generateRandomSecretKey();\n    return this.secret;\n  }\n}\n\nexport { Config };\n"],"file":"config.js"}

package/build/package-access.d.ts

@@ -1,5 +1,4 @@
-import { PackageList, PackageAccess } from '@verdaccio/types';
-import { MatchedPackage } from './config';
+import { PackageAccess } from '@verdaccio/types';
 export interface LegacyPackageList {
     [key: string]: PackageAccess;
 }
@@ -17,5 +16,4 @@ export declare const PACKAGE_ACCESS: {
     ALL: string;
 };
 export declare function normalizeUserList(groupsList: any): any;
-export declare function getMatchedPackagesSpec(pkgName: string, packages: PackageList): MatchedPackage;
 export declare function normalisePackageAccess(packages: LegacyPackageList): LegacyPackageList;

package/build/package-access.js

@@ -3,18 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeUserList = normalizeUserList;
-exports.getMatchedPackagesSpec = getMatchedPackagesSpec;
+exports.ROLES = exports.PACKAGE_ACCESS = void 0;
 exports.normalisePackageAccess = normalisePackageAccess;
-exports.PACKAGE_ACCESS = exports.ROLES = void 0;
+exports.normalizeUserList = normalizeUserList;
 
 var _assert = _interopRequireDefault(require("assert"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _minimatch = _interopRequireDefault(require("minimatch"));
-
-var _utils = require("@verdaccio/utils");
+var _core = require("@verdaccio/core");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -54,22 +51,12 @@ function normalizeUserList(groupsList) {
   } else if (Array.isArray(groupsList)) {
     result.push(groupsList);
   } else {
-    throw _utils.ErrorCode.getInternalError('CONFIG: bad package acl (array or string expected): ' + JSON.stringify(groupsList));
+    throw _core.errorUtils.getInternalError('CONFIG: bad package acl (array or string expected): ' + JSON.stringify(groupsList));
   }
 
   return _lodash.default.flatten(result);
 }
 
-function getMatchedPackagesSpec(pkgName, packages) {
-  for (const i in packages) {
-    if (_minimatch.default.makeRe(i).exec(pkgName)) {
-      return packages[i];
-    }
-  }
-
-  return;
-}
-
 function normalisePackageAccess(packages) {
   const normalizedPkgs = _objectSpread({}, packages);
 

package/build/package-access.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/package-access.ts"],"names":["ROLES","$ALL","ALL","$AUTH","$ANONYMOUS","DEPRECATED_ALL","DEPRECATED_AUTH","DEPRECATED_ANONYMOUS","PACKAGE_ACCESS","SCOPE","normalizeUserList","groupsList","result","_","isNil","isString","groupsArray","split","push","Array","isArray","ErrorCode","getInternalError","JSON","stringify","flatten","getMatchedPackagesSpec","pkgName","packages","i","minimatch","makeRe","exec","normalisePackageAccess","normalizedPkgs","access","publish","unpublish","proxy","pkg","Object","prototype","hasOwnProperty","call","packageAccess","isInvalid","isObject","isUndefined"],"mappings":"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","sourcesContent":["import assert from 'assert';\nimport _ from 'lodash';\nimport minimatch from 'minimatch';\n\nimport { PackageList, PackageAccess } from '@verdaccio/types';\nimport { ErrorCode } from '@verdaccio/utils';\nimport { MatchedPackage } from './config';\n\nexport interface LegacyPackageList {\n  [key: string]: PackageAccess;\n}\n\nexport const ROLES = {\n  $ALL: '$all',\n  ALL: 'all',\n  $AUTH: '$authenticated',\n  $ANONYMOUS: '$anonymous',\n  DEPRECATED_ALL: '@all',\n  DEPRECATED_AUTH: '@authenticated',\n  DEPRECATED_ANONYMOUS: '@anonymous',\n};\n\nexport const PACKAGE_ACCESS = {\n  SCOPE: '@*/*',\n  ALL: '**',\n};\n\nexport function normalizeUserList(groupsList: any): any {\n  const result: any[] = [];\n  if (_.isNil(groupsList)) {\n    return result;\n  }\n\n  // if it's a string, split it to array\n  if (_.isString(groupsList)) {\n    const groupsArray = groupsList.split(/\\s+/);\n\n    result.push(groupsArray);\n  } else if (Array.isArray(groupsList)) {\n    result.push(groupsList);\n  } else {\n    throw ErrorCode.getInternalError(\n      'CONFIG: bad package acl (array or string expected): ' + JSON.stringify(groupsList)\n    );\n  }\n\n  return _.flatten(result);\n}\n\nexport function getMatchedPackagesSpec(pkgName: string, packages: PackageList): MatchedPackage {\n  for (const i in packages) {\n    if (minimatch.makeRe(i).exec(pkgName)) {\n      return packages[i];\n    }\n  }\n  return;\n}\n\nexport function normalisePackageAccess(packages: LegacyPackageList): LegacyPackageList {\n  const normalizedPkgs: LegacyPackageList = { ...packages };\n  if (_.isNil(normalizedPkgs['**'])) {\n    normalizedPkgs['**'] = {\n      access: [],\n      publish: [],\n      unpublish: [],\n      proxy: [],\n    };\n  }\n\n  for (const pkg in packages) {\n    if (Object.prototype.hasOwnProperty.call(packages, pkg)) {\n      const packageAccess = packages[pkg];\n      const isInvalid = _.isObject(packageAccess) && _.isArray(packageAccess) === false;\n      assert(isInvalid, `CONFIG: bad \"'${pkg}'\" package description (object expected)`);\n\n      normalizedPkgs[pkg].access = normalizeUserList(packageAccess.access);\n      normalizedPkgs[pkg].publish = normalizeUserList(packageAccess.publish);\n      normalizedPkgs[pkg].proxy = normalizeUserList(packageAccess.proxy);\n      // if unpublish is not defined, we set to false to fallback in publish access\n      normalizedPkgs[pkg].unpublish = _.isUndefined(packageAccess.unpublish)\n        ? false\n        : normalizeUserList(packageAccess.unpublish);\n    }\n  }\n\n  return normalizedPkgs;\n}\n"],"file":"package-access.js"}
+{"version":3,"sources":["../src/package-access.ts"],"names":["ROLES","$ALL","ALL","$AUTH","$ANONYMOUS","DEPRECATED_ALL","DEPRECATED_AUTH","DEPRECATED_ANONYMOUS","PACKAGE_ACCESS","SCOPE","normalizeUserList","groupsList","result","_","isNil","isString","groupsArray","split","push","Array","isArray","errorUtils","getInternalError","JSON","stringify","flatten","normalisePackageAccess","packages","normalizedPkgs","access","publish","unpublish","proxy","pkg","Object","prototype","hasOwnProperty","call","packageAccess","isInvalid","isObject","isUndefined"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEA;;;;;;;;;;AAOO,MAAMA,KAAK,GAAG;AACnBC,EAAAA,IAAI,EAAE,MADa;AAEnBC,EAAAA,GAAG,EAAE,KAFc;AAGnBC,EAAAA,KAAK,EAAE,gBAHY;AAInBC,EAAAA,UAAU,EAAE,YAJO;AAKnBC,EAAAA,cAAc,EAAE,MALG;AAMnBC,EAAAA,eAAe,EAAE,gBANE;AAOnBC,EAAAA,oBAAoB,EAAE;AAPH,CAAd;;AAUA,MAAMC,cAAc,GAAG;AAC5BC,EAAAA,KAAK,EAAE,MADqB;AAE5BP,EAAAA,GAAG,EAAE;AAFuB,CAAvB;;;AAKA,SAASQ,iBAAT,CAA2BC,UAA3B,EAAiD;AACtD,QAAMC,MAAa,GAAG,EAAtB;;AACA,MAAIC,gBAAEC,KAAF,CAAQH,UAAR,CAAJ,EAAyB;AACvB,WAAOC,MAAP;AACD,GAJqD,CAMtD;;;AACA,MAAIC,gBAAEE,QAAF,CAAWJ,UAAX,CAAJ,EAA4B;AAC1B,UAAMK,WAAW,GAAGL,UAAU,CAACM,KAAX,CAAiB,KAAjB,CAApB;AAEAL,IAAAA,MAAM,CAACM,IAAP,CAAYF,WAAZ;AACD,GAJD,MAIO,IAAIG,KAAK,CAACC,OAAN,CAAcT,UAAd,CAAJ,EAA+B;AACpCC,IAAAA,MAAM,CAACM,IAAP,CAAYP,UAAZ;AACD,GAFM,MAEA;AACL,UAAMU,iBAAWC,gBAAX,CACJ,yDAAyDC,IAAI,CAACC,SAAL,CAAeb,UAAf,CADrD,CAAN;AAGD;;AAED,SAAOE,gBAAEY,OAAF,CAAUb,MAAV,CAAP;AACD;;AAEM,SAASc,sBAAT,CAAgCC,QAAhC,EAAgF;AACrF,QAAMC,cAAiC,qBAAQD,QAAR,CAAvC;;AACA,MAAId,gBAAEC,KAAF,CAAQc,cAAc,CAAC,IAAD,CAAtB,CAAJ,EAAmC;AACjCA,IAAAA,cAAc,CAAC,IAAD,CAAd,GAAuB;AACrBC,MAAAA,MAAM,EAAE,EADa;AAErBC,MAAAA,OAAO,EAAE,EAFY;AAGrBC,MAAAA,SAAS,EAAE,EAHU;AAIrBC,MAAAA,KAAK,EAAE;AAJc,KAAvB;AAMD;;AAED,OAAK,MAAMC,GAAX,IAAkBN,QAAlB,EAA4B;AAC1B,QAAIO,MAAM,CAACC,SAAP,CAAiBC,cAAjB,CAAgCC,IAAhC,CAAqCV,QAArC,EAA+CM,GAA/C,CAAJ,EAAyD;AACvD,YAAMK,aAAa,GAAGX,QAAQ,CAACM,GAAD,CAA9B;AACA,YAAMM,SAAS,GAAG1B,gBAAE2B,QAAF,CAAWF,aAAX,KAA6BzB,gBAAEO,OAAF,CAAUkB,aAAV,MAA6B,KAA5E;AACA,2BAAOC,SAAP,EAAmB,iBAAgBN,GAAI,0CAAvC;AAEAL,MAAAA,cAAc,CAACK,GAAD,CAAd,CAAoBJ,MAApB,GAA6BnB,iBAAiB,CAAC4B,aAAa,CAACT,MAAf,CAA9C;AACAD,MAAAA,cAAc,CAACK,GAAD,CAAd,CAAoBH,OAApB,GAA8BpB,iBAAiB,CAAC4B,aAAa,CAACR,OAAf,CAA/C;AACAF,MAAAA,cAAc,CAACK,GAAD,CAAd,CAAoBD,KAApB,GAA4BtB,iBAAiB,CAAC4B,aAAa,CAACN,KAAf,CAA7C,CAPuD,CAQvD;;AACAJ,MAAAA,cAAc,CAACK,GAAD,CAAd,CAAoBF,SAApB,GAAgClB,gBAAE4B,WAAF,CAAcH,aAAa,CAACP,SAA5B,IAC5B,KAD4B,GAE5BrB,iBAAiB,CAAC4B,aAAa,CAACP,SAAf,CAFrB;AAGD;AACF;;AAED,SAAOH,cAAP;AACD","sourcesContent":["import assert from 'assert';\nimport _ from 'lodash';\n\nimport { errorUtils } from '@verdaccio/core';\nimport { PackageAccess } from '@verdaccio/types';\n\nexport interface LegacyPackageList {\n  [key: string]: PackageAccess;\n}\n\nexport const ROLES = {\n  $ALL: '$all',\n  ALL: 'all',\n  $AUTH: '$authenticated',\n  $ANONYMOUS: '$anonymous',\n  DEPRECATED_ALL: '@all',\n  DEPRECATED_AUTH: '@authenticated',\n  DEPRECATED_ANONYMOUS: '@anonymous',\n};\n\nexport const PACKAGE_ACCESS = {\n  SCOPE: '@*/*',\n  ALL: '**',\n};\n\nexport function normalizeUserList(groupsList: any): any {\n  const result: any[] = [];\n  if (_.isNil(groupsList)) {\n    return result;\n  }\n\n  // if it's a string, split it to array\n  if (_.isString(groupsList)) {\n    const groupsArray = groupsList.split(/\\s+/);\n\n    result.push(groupsArray);\n  } else if (Array.isArray(groupsList)) {\n    result.push(groupsList);\n  } else {\n    throw errorUtils.getInternalError(\n      'CONFIG: bad package acl (array or string expected): ' + JSON.stringify(groupsList)\n    );\n  }\n\n  return _.flatten(result);\n}\n\nexport function normalisePackageAccess(packages: LegacyPackageList): LegacyPackageList {\n  const normalizedPkgs: LegacyPackageList = { ...packages };\n  if (_.isNil(normalizedPkgs['**'])) {\n    normalizedPkgs['**'] = {\n      access: [],\n      publish: [],\n      unpublish: [],\n      proxy: [],\n    };\n  }\n\n  for (const pkg in packages) {\n    if (Object.prototype.hasOwnProperty.call(packages, pkg)) {\n      const packageAccess = packages[pkg];\n      const isInvalid = _.isObject(packageAccess) && _.isArray(packageAccess) === false;\n      assert(isInvalid, `CONFIG: bad \"'${pkg}'\" package description (object expected)`);\n\n      normalizedPkgs[pkg].access = normalizeUserList(packageAccess.access);\n      normalizedPkgs[pkg].publish = normalizeUserList(packageAccess.publish);\n      normalizedPkgs[pkg].proxy = normalizeUserList(packageAccess.proxy);\n      // if unpublish is not defined, we set to false to fallback in publish access\n      normalizedPkgs[pkg].unpublish = _.isUndefined(packageAccess.unpublish)\n        ? false\n        : normalizeUserList(packageAccess.unpublish);\n    }\n  }\n\n  return normalizedPkgs;\n}\n"],"file":"package-access.js"}

package/build/parse.d.ts

@@ -1,2 +1,6 @@
 import { ConfigRuntime } from '@verdaccio/types';
+/**
+ * Parse a config file from yaml to JSON.
+ * @param configPath the absolute path of the configuration file
+ */
 export declare function parseConfigFile(configPath: string): ConfigRuntime;

package/build/parse.js

@@ -9,16 +9,22 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
 
-var _commonsApi = require("@verdaccio/commons-api");
+var _core = require("@verdaccio/core");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/**
+ * Parse a config file from yaml to JSON.
+ * @param configPath the absolute path of the configuration file
+ */
 function parseConfigFile(configPath) {
   try {
     if (/\.ya?ml$/i.test(configPath)) {
       const yamlConfig = _jsYaml.default.safeLoad(_fs.default.readFileSync(configPath, 'utf8'));
 
       return Object.assign({}, yamlConfig, {
+        configPath,
+        // @deprecated use configPath instead
         config_path: configPath
       });
     }
@@ -26,14 +32,16 @@ function parseConfigFile(configPath) {
     const jsonConfig = require(configPath);
 
     return Object.assign({}, jsonConfig, {
+      configPath,
+      // @deprecated use configPath instead
       config_path: configPath
     });
   } catch (e) {
     if (e.code !== 'MODULE_NOT_FOUND') {
-      e.message = _commonsApi.APP_ERROR.CONFIG_NOT_VALID;
+      e.message = _core.APP_ERROR.CONFIG_NOT_VALID;
     }
 
-    throw new Error(e);
+    throw e;
   }
 }
 //# sourceMappingURL=parse.js.map

package/build/parse.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/parse.ts"],"names":["parseConfigFile","configPath","test","yamlConfig","YAML","safeLoad","fs","readFileSync","Object","assign","config_path","jsonConfig","require","e","code","message","APP_ERROR","CONFIG_NOT_VALID","Error"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;;;AAGO,SAASA,eAAT,CAAyBC,UAAzB,EAA4D;AACjE,MAAI;AACF,QAAI,YAAYC,IAAZ,CAAiBD,UAAjB,CAAJ,EAAkC;AAChC,YAAME,UAAU,GAAGC,gBAAKC,QAAL,CAAcC,YAAGC,YAAH,CAAgBN,UAAhB,EAA4B,MAA5B,CAAd,CAAnB;;AACA,aAAOO,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBN,UAAlB,EAA8B;AACnCO,QAAAA,WAAW,EAAET;AADsB,OAA9B,CAAP;AAGD;;AAED,UAAMU,UAAU,GAAGC,OAAO,CAACX,UAAD,CAA1B;;AACA,WAAOO,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBE,UAAlB,EAA8B;AACnCD,MAAAA,WAAW,EAAET;AADsB,KAA9B,CAAP;AAGD,GAZD,CAYE,OAAOY,CAAP,EAAe;AACf,QAAIA,CAAC,CAACC,IAAF,KAAW,kBAAf,EAAmC;AACjCD,MAAAA,CAAC,CAACE,OAAF,GAAYC,sBAAUC,gBAAtB;AACD;;AAED,UAAM,IAAIC,KAAJ,CAAUL,CAAV,CAAN;AACD;AACF","sourcesContent":["import fs from 'fs';\nimport YAML from 'js-yaml';\nimport { APP_ERROR } from '@verdaccio/commons-api';\nimport { ConfigRuntime, ConfigYaml } from '@verdaccio/types';\n\nexport function parseConfigFile(configPath: string): ConfigRuntime {\n  try {\n    if (/\\.ya?ml$/i.test(configPath)) {\n      const yamlConfig = YAML.safeLoad(fs.readFileSync(configPath, 'utf8')) as ConfigYaml;\n      return Object.assign({}, yamlConfig, {\n        config_path: configPath,\n      });\n    }\n\n    const jsonConfig = require(configPath) as ConfigYaml;\n    return Object.assign({}, jsonConfig, {\n      config_path: configPath,\n    });\n  } catch (e: any) {\n    if (e.code !== 'MODULE_NOT_FOUND') {\n      e.message = APP_ERROR.CONFIG_NOT_VALID;\n    }\n\n    throw new Error(e);\n  }\n}\n"],"file":"parse.js"}
+{"version":3,"sources":["../src/parse.ts"],"names":["parseConfigFile","configPath","test","yamlConfig","YAML","safeLoad","fs","readFileSync","Object","assign","config_path","jsonConfig","require","e","code","message","APP_ERROR","CONFIG_NOT_VALID"],"mappings":";;;;;;;AAAA;;AACA;;AAEA;;;;AAGA;AACA;AACA;AACA;AACO,SAASA,eAAT,CAAyBC,UAAzB,EAA4D;AACjE,MAAI;AACF,QAAI,YAAYC,IAAZ,CAAiBD,UAAjB,CAAJ,EAAkC;AAChC,YAAME,UAAU,GAAGC,gBAAKC,QAAL,CAAcC,YAAGC,YAAH,CAAgBN,UAAhB,EAA4B,MAA5B,CAAd,CAAnB;;AACA,aAAOO,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBN,UAAlB,EAA8B;AACnCF,QAAAA,UADmC;AAEnC;AACAS,QAAAA,WAAW,EAAET;AAHsB,OAA9B,CAAP;AAKD;;AAED,UAAMU,UAAU,GAAGC,OAAO,CAACX,UAAD,CAA1B;;AACA,WAAOO,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBE,UAAlB,EAA8B;AACnCV,MAAAA,UADmC;AAEnC;AACAS,MAAAA,WAAW,EAAET;AAHsB,KAA9B,CAAP;AAKD,GAhBD,CAgBE,OAAOY,CAAP,EAAe;AACf,QAAIA,CAAC,CAACC,IAAF,KAAW,kBAAf,EAAmC;AACjCD,MAAAA,CAAC,CAACE,OAAF,GAAYC,gBAAUC,gBAAtB;AACD;;AAED,UAAMJ,CAAN;AACD;AACF","sourcesContent":["import fs from 'fs';\nimport YAML from 'js-yaml';\n\nimport { APP_ERROR } from '@verdaccio/core';\nimport { ConfigRuntime, ConfigYaml } from '@verdaccio/types';\n\n/**\n * Parse a config file from yaml to JSON.\n * @param configPath the absolute path of the configuration file\n */\nexport function parseConfigFile(configPath: string): ConfigRuntime {\n  try {\n    if (/\\.ya?ml$/i.test(configPath)) {\n      const yamlConfig = YAML.safeLoad(fs.readFileSync(configPath, 'utf8')) as ConfigYaml;\n      return Object.assign({}, yamlConfig, {\n        configPath,\n        // @deprecated use configPath instead\n        config_path: configPath,\n      });\n    }\n\n    const jsonConfig = require(configPath) as ConfigYaml;\n    return Object.assign({}, jsonConfig, {\n      configPath,\n      // @deprecated use configPath instead\n      config_path: configPath,\n    });\n  } catch (e: any) {\n    if (e.code !== 'MODULE_NOT_FOUND') {\n      e.message = APP_ERROR.CONFIG_NOT_VALID;\n    }\n\n    throw e;\n  }\n}\n"],"file":"parse.js"}

package/build/token.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.generateRandomSecretKey = generateRandomSecretKey;
 exports.TOKEN_VALID_LENGTH = void 0;
+exports.generateRandomSecretKey = generateRandomSecretKey;
 
 var _crypto = require("crypto");
 

package/build/uplinks.d.ts

@@ -3,8 +3,5 @@ export declare const DEFAULT_REGISTRY = "https://registry.npmjs.org";
 export declare const DEFAULT_UPLINK = "npmjs";
 export declare function uplinkSanityCheck(uplinks: UpLinksConfList, users?: any): UpLinksConfList;
 export declare function sanityCheckUplinksProps(configUpLinks: UpLinksConfList): UpLinksConfList;
-/**
- * Check whether an uplink can proxy
- */
 export declare function hasProxyTo(pkg: string, upLink: string, packages: PackageList): boolean;
 export declare function sanityCheckNames(item: string, users: any): any;

package/build/uplinks.js

@@ -3,17 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uplinkSanityCheck = uplinkSanityCheck;
-exports.sanityCheckUplinksProps = sanityCheckUplinksProps;
+exports.DEFAULT_UPLINK = exports.DEFAULT_REGISTRY = void 0;
 exports.hasProxyTo = hasProxyTo;
 exports.sanityCheckNames = sanityCheckNames;
-exports.DEFAULT_UPLINK = exports.DEFAULT_REGISTRY = void 0;
+exports.sanityCheckUplinksProps = sanityCheckUplinksProps;
+exports.uplinkSanityCheck = uplinkSanityCheck;
 
 var _assert = _interopRequireDefault(require("assert"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _packageAccess = require("./package-access");
+var _utils = require("@verdaccio/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -60,13 +60,9 @@ function sanityCheckUplinksProps(configUpLinks) {
 
   return uplinks;
 }
-/**
- * Check whether an uplink can proxy
- */
-
 
 function hasProxyTo(pkg, upLink, packages) {
-  const matchedPkg = (0, _packageAccess.getMatchedPackagesSpec)(pkg, packages);
+  const matchedPkg = (0, _utils.getMatchedPackagesSpec)(pkg, packages);
   const proxyList = typeof matchedPkg !== 'undefined' ? matchedPkg.proxy : [];
 
   if (proxyList) {

package/build/uplinks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/uplinks.ts"],"names":["DEFAULT_REGISTRY","DEFAULT_UPLINK","BLACKLIST","all","anonymous","undefined","owner","none","uplinkSanityCheck","uplinks","users","newUplinks","_","clone","newUsers","uplink","Object","prototype","hasOwnProperty","call","isNil","cache","sanityCheckNames","sanityCheckUplinksProps","configUpLinks","url","isString","replace","hasProxyTo","pkg","upLink","packages","matchedPkg","proxyList","proxy","some","curr","item","match"],"mappings":"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","sourcesContent":["import assert from 'assert';\nimport { PackageList, UpLinksConfList } from '@verdaccio/types';\nimport _ from 'lodash';\n\nimport { getMatchedPackagesSpec } from './package-access';\nimport { MatchedPackage } from './config';\n\nexport const DEFAULT_REGISTRY = 'https://registry.npmjs.org';\nexport const DEFAULT_UPLINK = 'npmjs';\n\nconst BLACKLIST = {\n  all: true,\n  anonymous: true,\n  undefined: true,\n  owner: true,\n  none: true,\n};\n\nexport function uplinkSanityCheck(\n  uplinks: UpLinksConfList,\n  users: any = BLACKLIST\n): UpLinksConfList {\n  const newUplinks = _.clone(uplinks);\n  let newUsers = _.clone(users);\n\n  for (const uplink in newUplinks) {\n    if (Object.prototype.hasOwnProperty.call(newUplinks, uplink)) {\n      if (_.isNil(newUplinks[uplink].cache)) {\n        newUplinks[uplink].cache = true;\n      }\n      newUsers = sanityCheckNames(uplink, newUsers);\n    }\n  }\n\n  return newUplinks;\n}\n\nexport function sanityCheckUplinksProps(configUpLinks: UpLinksConfList): UpLinksConfList {\n  const uplinks = _.clone(configUpLinks);\n\n  for (const uplink in uplinks) {\n    if (Object.prototype.hasOwnProperty.call(uplinks, uplink)) {\n      assert(uplinks[uplink].url, 'CONFIG: no url for uplink: ' + uplink);\n      assert(_.isString(uplinks[uplink].url), 'CONFIG: wrong url format for uplink: ' + uplink);\n      uplinks[uplink].url = uplinks[uplink].url.replace(/\\/$/, '');\n    }\n  }\n\n  return uplinks;\n}\n\n/**\n * Check whether an uplink can proxy\n */\nexport function hasProxyTo(pkg: string, upLink: string, packages: PackageList): boolean {\n  const matchedPkg: MatchedPackage = getMatchedPackagesSpec(pkg, packages);\n  const proxyList = typeof matchedPkg !== 'undefined' ? matchedPkg.proxy : [];\n  if (proxyList) {\n    return proxyList.some((curr) => upLink === curr);\n  }\n\n  return false;\n}\n\nexport function sanityCheckNames(item: string, users: any): any {\n  assert(\n    item !== 'all' &&\n      item !== 'owner' &&\n      item !== 'anonymous' &&\n      item !== 'undefined' &&\n      item !== 'none',\n    'CONFIG: reserved uplink name: ' + item\n  );\n  assert(!item.match(/\\s/), 'CONFIG: invalid uplink name: ' + item);\n  assert(_.isNil(users[item]), 'CONFIG: duplicate uplink name: ' + item);\n  users[item] = true;\n\n  return users;\n}\n"],"file":"uplinks.js"}
+{"version":3,"sources":["../src/uplinks.ts"],"names":["DEFAULT_REGISTRY","DEFAULT_UPLINK","BLACKLIST","all","anonymous","undefined","owner","none","uplinkSanityCheck","uplinks","users","newUplinks","_","clone","newUsers","uplink","Object","prototype","hasOwnProperty","call","isNil","cache","sanityCheckNames","sanityCheckUplinksProps","configUpLinks","url","isString","replace","hasProxyTo","pkg","upLink","packages","matchedPkg","proxyList","proxy","some","curr","item","match"],"mappings":"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","sourcesContent":["import assert from 'assert';\nimport _ from 'lodash';\n\nimport { PackageList, UpLinksConfList } from '@verdaccio/types';\nimport { getMatchedPackagesSpec } from '@verdaccio/utils';\n\nexport const DEFAULT_REGISTRY = 'https://registry.npmjs.org';\nexport const DEFAULT_UPLINK = 'npmjs';\n\nconst BLACKLIST = {\n  all: true,\n  anonymous: true,\n  undefined: true,\n  owner: true,\n  none: true,\n};\n\nexport function uplinkSanityCheck(\n  uplinks: UpLinksConfList,\n  users: any = BLACKLIST\n): UpLinksConfList {\n  const newUplinks = _.clone(uplinks);\n  let newUsers = _.clone(users);\n\n  for (const uplink in newUplinks) {\n    if (Object.prototype.hasOwnProperty.call(newUplinks, uplink)) {\n      if (_.isNil(newUplinks[uplink].cache)) {\n        newUplinks[uplink].cache = true;\n      }\n      newUsers = sanityCheckNames(uplink, newUsers);\n    }\n  }\n\n  return newUplinks;\n}\n\nexport function sanityCheckUplinksProps(configUpLinks: UpLinksConfList): UpLinksConfList {\n  const uplinks = _.clone(configUpLinks);\n\n  for (const uplink in uplinks) {\n    if (Object.prototype.hasOwnProperty.call(uplinks, uplink)) {\n      assert(uplinks[uplink].url, 'CONFIG: no url for uplink: ' + uplink);\n      assert(_.isString(uplinks[uplink].url), 'CONFIG: wrong url format for uplink: ' + uplink);\n      uplinks[uplink].url = uplinks[uplink].url.replace(/\\/$/, '');\n    }\n  }\n\n  return uplinks;\n}\n\nexport function hasProxyTo(pkg: string, upLink: string, packages: PackageList): boolean {\n  const matchedPkg = getMatchedPackagesSpec(pkg, packages);\n  const proxyList = typeof matchedPkg !== 'undefined' ? matchedPkg.proxy : [];\n  if (proxyList) {\n    return proxyList.some((curr) => upLink === curr);\n  }\n\n  return false;\n}\n\nexport function sanityCheckNames(item: string, users: any): any {\n  assert(\n    item !== 'all' &&\n      item !== 'owner' &&\n      item !== 'anonymous' &&\n      item !== 'undefined' &&\n      item !== 'none',\n    'CONFIG: reserved uplink name: ' + item\n  );\n  assert(!item.match(/\\s/), 'CONFIG: invalid uplink name: ' + item);\n  assert(_.isNil(users[item]), 'CONFIG: duplicate uplink name: ' + item);\n  users[item] = true;\n\n  return users;\n}\n"],"file":"uplinks.js"}

package/build/user.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createRemoteUser = createRemoteUser;
 exports.createAnonymousRemoteUser = createAnonymousRemoteUser;
+exports.createRemoteUser = createRemoteUser;
 exports.defaultNonLoggedUserRoles = exports.defaultLoggedUserRoles = void 0;
 
 var _packageAccess = require("./package-access");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@verdaccio/config",
-	"version": "6.0.0-6-next.7",
+	"version": "6.0.0-6-next.11",
 	"description": "logger",
 	"main": "./build/index.js",
 	"types": "build/index.d.ts",
@@ -26,17 +26,17 @@
 		"verdaccio"
 	],
 	"engines": {
-		"node": ">=10",
+		"node": ">=14",
 		"npm": ">=6"
 	},
 	"dependencies": {
-		"@verdaccio/commons-api": "11.0.0-alpha.3",
-		"@verdaccio/utils": "6.0.0-6-next.5",
+		"@verdaccio/core": "6.0.0-6-next.3",
+		"@verdaccio/utils": "6.0.0-6-next.9",
 		"debug": "4.3.2",
 		"js-yaml": "3.14.1",
 		"lodash": "4.17.21",
 		"minimatch": "3.0.4",
-		"yup": "0.32.9"
+		"yup": "0.32.11"
 	},
 	"devDependencies": {
 		"@types/minimatch": "3.0.5",

package/src/conf/default.yaml

@@ -100,11 +100,6 @@ logs:
   # { type: file, path: verdaccio.log, level: http}
   # FIXME: this should be documented
   # More info about log rotation https://github.com/pinojs/pino/blob/master/docs/help.md#log-rotation
-flags:
-  # support for npm token command
-  token: false
-  # support for the new v1 search endpoint, functional by incomplete read more on ticket 1732
-  search: false
 
 # This affect the web and api (not developed yet)
 i18n:

package/src/config-path.ts

@@ -1,10 +1,11 @@
+import buildDebug from 'debug';
 import fs from 'fs';
-import path from 'path';
 import _ from 'lodash';
-import buildDebug from 'debug';
+import path from 'path';
+
+import { CHARACTER_ENCODING } from '@verdaccio/core';
 
-import { CHARACTER_ENCODING } from '@verdaccio/commons-api';
-import { folderExists, fileExists } from './config-utils';
+import { fileExists, folderExists } from './config-utils';
 
 const CONFIG_FILE = 'config.yaml';
 const XDG = 'xdg';

package/src/config.ts

@@ -1,31 +1,28 @@
 import assert from 'assert';
-import _ from 'lodash';
 import buildDebug from 'debug';
+import _ from 'lodash';
 
-import { generateRandomHexString, isObject } from '@verdaccio/utils';
-import { APP_ERROR } from '@verdaccio/commons-api';
+import { APP_ERROR } from '@verdaccio/core';
 import {
-  PackageList,
   Config as AppConfig,
+  AuthConf,
   ConfigRuntime,
-  Security,
   PackageAccess,
+  PackageList,
+  Security,
   ServerSettingsConf,
-  AuthConf,
 } from '@verdaccio/types';
+import { generateRandomHexString, getMatchedPackagesSpec, isObject } from '@verdaccio/utils';
 
-import { generateRandomSecretKey } from './token';
-import { getMatchedPackagesSpec, normalisePackageAccess } from './package-access';
-import { sanityCheckUplinksProps, uplinkSanityCheck } from './uplinks';
-import { defaultSecurity } from './security';
 import { getUserAgent } from './agent';
+import { normalisePackageAccess } from './package-access';
+import { defaultSecurity } from './security';
 import serverSettings from './serverSettings';
+import { generateRandomSecretKey } from './token';
+import { sanityCheckUplinksProps, uplinkSanityCheck } from './uplinks';
 
 const strategicConfigProps = ['uplinks', 'packages'];
 const allowedEnvConfig = ['http_proxy', 'https_proxy', 'no_proxy'];
-
-export type MatchedPackage = PackageAccess | void;
-
 const debug = buildDebug('verdaccio:config');
 
 export const WEB_TITLE = 'Verdaccio';
@@ -99,7 +96,8 @@ class Config implements AppConfig {
   /**
    * Check for package spec
    */
-  public getMatchedPackagesSpec(pkgName: string): MatchedPackage {
+  public getMatchedPackagesSpec(pkgName: string): PackageAccess | void {
+    // TODO: remove this method and replace by library utils
     return getMatchedPackagesSpec(pkgName, this.packages);
   }
 

package/src/package-access.ts

@@ -1,10 +1,8 @@
 import assert from 'assert';
 import _ from 'lodash';
-import minimatch from 'minimatch';
 
-import { PackageList, PackageAccess } from '@verdaccio/types';
-import { ErrorCode } from '@verdaccio/utils';
-import { MatchedPackage } from './config';
+import { errorUtils } from '@verdaccio/core';
+import { PackageAccess } from '@verdaccio/types';
 
 export interface LegacyPackageList {
   [key: string]: PackageAccess;
@@ -39,7 +37,7 @@ export function normalizeUserList(groupsList: any): any {
   } else if (Array.isArray(groupsList)) {
     result.push(groupsList);
   } else {
-    throw ErrorCode.getInternalError(
+    throw errorUtils.getInternalError(
       'CONFIG: bad package acl (array or string expected): ' + JSON.stringify(groupsList)
     );
   }
@@ -47,15 +45,6 @@ export function normalizeUserList(groupsList: any): any {
   return _.flatten(result);
 }
 
-export function getMatchedPackagesSpec(pkgName: string, packages: PackageList): MatchedPackage {
-  for (const i in packages) {
-    if (minimatch.makeRe(i).exec(pkgName)) {
-      return packages[i];
-    }
-  }
-  return;
-}
-
 export function normalisePackageAccess(packages: LegacyPackageList): LegacyPackageList {
   const normalizedPkgs: LegacyPackageList = { ...packages };
   if (_.isNil(normalizedPkgs['**'])) {

package/src/parse.ts

@@ -1,19 +1,28 @@
 import fs from 'fs';
 import YAML from 'js-yaml';
-import { APP_ERROR } from '@verdaccio/commons-api';
+
+import { APP_ERROR } from '@verdaccio/core';
 import { ConfigRuntime, ConfigYaml } from '@verdaccio/types';
 
+/**
+ * Parse a config file from yaml to JSON.
+ * @param configPath the absolute path of the configuration file
+ */
 export function parseConfigFile(configPath: string): ConfigRuntime {
   try {
     if (/\.ya?ml$/i.test(configPath)) {
       const yamlConfig = YAML.safeLoad(fs.readFileSync(configPath, 'utf8')) as ConfigYaml;
       return Object.assign({}, yamlConfig, {
+        configPath,
+        // @deprecated use configPath instead
         config_path: configPath,
       });
     }
 
     const jsonConfig = require(configPath) as ConfigYaml;
     return Object.assign({}, jsonConfig, {
+      configPath,
+      // @deprecated use configPath instead
       config_path: configPath,
     });
   } catch (e: any) {
@@ -21,6 +30,6 @@ export function parseConfigFile(configPath: string): ConfigRuntime {
       e.message = APP_ERROR.CONFIG_NOT_VALID;
     }
 
-    throw new Error(e);
+    throw e;
   }
 }

package/src/uplinks.ts

@@ -1,9 +1,8 @@
 import assert from 'assert';
-import { PackageList, UpLinksConfList } from '@verdaccio/types';
 import _ from 'lodash';
 
-import { getMatchedPackagesSpec } from './package-access';
-import { MatchedPackage } from './config';
+import { PackageList, UpLinksConfList } from '@verdaccio/types';
+import { getMatchedPackagesSpec } from '@verdaccio/utils';
 
 export const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
 export const DEFAULT_UPLINK = 'npmjs';
@@ -49,11 +48,8 @@ export function sanityCheckUplinksProps(configUpLinks: UpLinksConfList): UpLinks
   return uplinks;
 }
 
-/**
- * Check whether an uplink can proxy
- */
 export function hasProxyTo(pkg: string, upLink: string, packages: PackageList): boolean {
-  const matchedPkg: MatchedPackage = getMatchedPackagesSpec(pkg, packages);
+  const matchedPkg = getMatchedPackagesSpec(pkg, packages);
   const proxyList = typeof matchedPkg !== 'undefined' ? matchedPkg.proxy : [];
   if (proxyList) {
     return proxyList.some((curr) => upLink === curr);

package/test/config-parsing.spec.ts

@@ -12,13 +12,13 @@ describe('Package access utilities', () => {
     test('parse invalid.json', () => {
       expect(function () {
         parseConfigFile(parseConfigurationFile('invalid.json'));
-      }).toThrow(/Error/);
+      }).toThrow(/CONFIG: it does not look like a valid config file/);
     });
 
     test('parse not-exists.json', () => {
       expect(function () {
         parseConfigFile(parseConfigurationFile('not-exists.json'));
-      }).toThrow(/Error/);
+      }).toThrow(/Cannot find module/);
     });
   });
 
@@ -32,13 +32,13 @@ describe('Package access utilities', () => {
     test('parse invalid.js', () => {
       expect(function () {
         parseConfigFile(parseConfigurationFile('invalid.js'));
-      }).toThrow(/Error/);
+      }).toThrow(/CONFIG: it does not look like a valid config file/);
     });
 
     test('parse not-exists.js', () => {
       expect(function () {
         parseConfigFile(parseConfigurationFile('not-exists.js'));
-      }).toThrow(/Error/);
+      }).toThrow(/Cannot find module/);
     });
   });
 });

package/test/config.path.spec.ts

@@ -1,4 +1,5 @@
 import os from 'os';
+
 import { findConfigFile } from '../src/config-path';
 
 const mockmkDir = jest.fn();
@@ -96,9 +97,9 @@ describe('config-path', () => {
         delete process.env.XDG_CONFIG_HOME;
         delete process.env.HOME;
         process.env.APPDATA = '/app/data/';
-        expect(findConfigFile()).toEqual('D:\\app\\data\\verdaccio\\config.yaml');
-        expect(mockwriteFile).toHaveBeenCalledWith('D:\\app\\data\\verdaccio\\config.yaml');
-        expect(mockmkDir).toHaveBeenCalledWith('D:\\app\\data\\verdaccio');
+        expect(findConfigFile()).toMatch('\\app\\data\\verdaccio\\config.yaml');
+        expect(mockwriteFile).toHaveBeenCalled();
+        expect(mockmkDir).toHaveBeenCalled();
       });
     }
   });

package/test/config.spec.ts

@@ -1,14 +1,14 @@
-import path from 'path';
 import _ from 'lodash';
+import path from 'path';
 
 import {
   Config,
   DEFAULT_REGISTRY,
   DEFAULT_UPLINK,
-  defaultSecurity,
-  parseConfigFile,
   ROLES,
   WEB_TITLE,
+  defaultSecurity,
+  parseConfigFile,
 } from '../src';
 import { parseConfigurationFile } from './utils';
 

package/test/package-access.spec.ts

@@ -1,11 +1,7 @@
 import _ from 'lodash';
 
-import {
-  getMatchedPackagesSpec,
-  normalisePackageAccess,
-  PACKAGE_ACCESS,
-} from '../src/package-access';
 import { parseConfigFile } from '../src';
+import { PACKAGE_ACCESS, normalisePackageAccess } from '../src/package-access';
 import { parseConfigurationFile } from './utils';
 
 describe('Package access utilities', () => {
@@ -127,30 +123,4 @@ describe('Package access utilities', () => {
       expect(_.isArray(all.publish)).toBeTruthy();
     });
   });
-
-  describe('getMatchedPackagesSpec', () => {
-    test('should test basic config', () => {
-      const { packages } = parseConfigFile(parseConfigurationFile('pkgs-custom'));
-      // @ts-expect-error
-      expect(getMatchedPackagesSpec('react', packages).proxy).toMatch('facebook');
-      // @ts-expect-error
-      expect(getMatchedPackagesSpec('angular', packages).proxy).toMatch('google');
-      // @ts-expect-error
-      expect(getMatchedPackagesSpec('vue', packages).proxy).toMatch('npmjs');
-      // @ts-expect-error
-      expect(getMatchedPackagesSpec('@scope/vue', packages).proxy).toMatch('npmjs');
-    });
-
-    test('should test no ** wildcard on config', () => {
-      const { packages } = parseConfigFile(parseConfigurationFile('pkgs-nosuper-wildcard-custom'));
-      // @ts-expect-error
-      expect(getMatchedPackagesSpec('react', packages).proxy).toMatch('facebook');
-      // @ts-expect-error
-      expect(getMatchedPackagesSpec('angular', packages).proxy).toMatch('google');
-      // @ts-expect-error
-      expect(getMatchedPackagesSpec('@fake/angular', packages).proxy).toMatch('npmjs');
-      expect(getMatchedPackagesSpec('vue', packages)).toBeUndefined();
-      expect(getMatchedPackagesSpec('@scope/vue', packages)).toBeUndefined();
-    });
-  });
 });

package/test/token.spec.ts

@@ -1,4 +1,4 @@
-import { generateRandomSecretKey, TOKEN_VALID_LENGTH } from '../src/token';
+import { TOKEN_VALID_LENGTH, generateRandomSecretKey } from '../src/token';
 
 test('token test valid length', () => {
   const token = generateRandomSecretKey();

package/test/uplinks.spec.ts

@@ -1,5 +1,5 @@
-import { hasProxyTo, sanityCheckUplinksProps, uplinkSanityCheck } from '../src/uplinks';
 import { normalisePackageAccess, parseConfigFile } from '../src';
+import { hasProxyTo, sanityCheckUplinksProps, uplinkSanityCheck } from '../src/uplinks';
 import { parseConfigurationFile } from './utils';
 
 describe('Uplinks Utilities', () => {

package/test/utils.spec.ts

@@ -1,5 +1,5 @@
+import { ROLES, createAnonymousRemoteUser, createRemoteUser } from '../src';
 import { spliceURL } from '../src/string';
-import { createAnonymousRemoteUser, createRemoteUser, ROLES } from '../src';
 
 describe('spliceURL', () => {
   test('should splice two strings and generate a url', () => {

package/tsconfig.json

@@ -7,9 +7,6 @@
   "include": ["src/**/*.ts"],
   "exclude": ["src/**/*.test.ts"],
   "references": [
-    {
-      "path": "../core/commons-api"
-    },
     {
       "path": "../utils"
     }

package/test/partials/config/yaml/pkgs-nosuper-wildcard-custom.yaml

@@ -1,13 +0,0 @@
-packages:
-  'react':
-    access: admin
-    publish: admin
-    proxy: facebook
-  'angular':
-    access: admin
-    publish: admin
-    proxy: google
-  '@fake/*':
-    access: $all
-    publish: $authenticated
-    proxy: npmjs