@verdaccio/package-filter 14.0.0-next-9.47 → 14.0.0-next-9.49

package/build/config/parser.js

@@ -43,9 +43,11 @@ function parseConfig(config) {
 		if (isNaN(minAgeDays) || minAgeDays < 0) throw new TypeError(`Invalid number ${config.minAgeDays} was provided for minAgeDays`);
 		minAgeMs = minAgeDays * 24 * 60 * 60 * 1e3;
 	}
+	const excludeDeprecated = config.excludeDeprecated === true;
 	return {
 		dateThreshold,
 		minAgeMs,
+		excludeDeprecated,
 		blockRules: blockMap,
 		allowRules: allowMap
 	};

package/build/config/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","names":[],"sources":["../../src/config/parser.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range } from 'semver';\n\nimport type { ConfigRule, ParsedConfig, ParsedRule, PluginConfig } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:config');\n\nfunction parseConfigRules(configRules: ConfigRule[]): Map<string, ParsedRule> {\n  const ruleMap = new Map<string, ParsedRule>();\n  for (const rule of configRules) {\n    if ('scope' in rule && typeof rule.scope === 'string') {\n      if (!rule.scope.startsWith('@')) {\n        throw new TypeError(`Scope value must start with @, found: ${rule.scope}`);\n      }\n\n      ruleMap.set(rule.scope, 'scope');\n      continue;\n    }\n\n    if ('package' in rule && !('versions' in rule)) {\n      ruleMap.set(rule.package, 'package');\n      continue;\n    }\n\n    if ('package' in rule && 'versions' in rule) {\n      const previousConfig = ruleMap.get(rule.package) || { versions: [] };\n\n      if (typeof previousConfig === 'string') {\n        throw new Error(\n          `Package ${rule.package} is already specified by another strict rule ${previousConfig}`\n        );\n      }\n\n      // Merge version ranges of the rules for the same package\n      const range = new Range(rule.versions);\n      ruleMap.set(rule.package, {\n        versions: [...previousConfig.versions, range],\n        strategy: rule.strategy ?? 'block',\n      });\n\n      continue;\n    }\n\n    throw new TypeError(`Could not parse rule ${JSON.stringify(rule, null, 4)}`);\n  }\n\n  return ruleMap;\n}\n\nexport function parseConfig(config: PluginConfig): ParsedConfig {\n  debug('parsing config: %o', config);\n  const blockMap = parseConfigRules(config.block ?? []);\n  const allowMap = parseConfigRules(config.allow ?? []);\n  debug('parsed %d block rules, %d allow rules', blockMap.size, allowMap.size);\n  const dateThreshold = config.dateThreshold ? new Date(config.dateThreshold) : null;\n  if (dateThreshold && isNaN(dateThreshold.getTime())) {\n    throw new TypeError(`Invalid date ${config.dateThreshold} was provided for dateThreshold`);\n  }\n\n  const minAgeDays = config.minAgeDays ? Number(config.minAgeDays) : null;\n  let minAgeMs: number | null = null;\n  if (minAgeDays !== null) {\n    if (isNaN(minAgeDays) || minAgeDays < 0) {\n      throw new TypeError(`Invalid number ${config.minAgeDays} was provided for minAgeDays`);\n    }\n\n    minAgeMs = minAgeDays * 24 * 60 * 60 * 1000;\n  }\n\n  return {\n    dateThreshold,\n    minAgeMs,\n    blockRules: blockMap,\n    allowRules: allowMap,\n  };\n}\n"],"mappings":";;;;;AAKA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;AAEjE,SAAS,iBAAiB,aAAoD;CAC5E,MAAM,0BAAU,IAAI,IAAwB;CAC5C,KAAK,MAAM,QAAQ,aAAa;EAC9B,IAAI,WAAW,QAAQ,OAAO,KAAK,UAAU,UAAU;GACrD,IAAI,CAAC,KAAK,MAAM,WAAW,GAAG,GAC5B,MAAM,IAAI,UAAU,yCAAyC,KAAK,OAAO;GAG3E,QAAQ,IAAI,KAAK,OAAO,OAAO;GAC/B;EACF;EAEA,IAAI,aAAa,QAAQ,EAAE,cAAc,OAAO;GAC9C,QAAQ,IAAI,KAAK,SAAS,SAAS;GACnC;EACF;EAEA,IAAI,aAAa,QAAQ,cAAc,MAAM;GAC3C,MAAM,iBAAiB,QAAQ,IAAI,KAAK,OAAO,KAAK,EAAE,UAAU,CAAC,EAAE;GAEnE,IAAI,OAAO,mBAAmB,UAC5B,MAAM,IAAI,MACR,WAAW,KAAK,QAAQ,+CAA+C,gBACzE;GAIF,MAAM,QAAQ,IAAI,OAAA,MAAM,KAAK,QAAQ;GACrC,QAAQ,IAAI,KAAK,SAAS;IACxB,UAAU,CAAC,GAAG,eAAe,UAAU,KAAK;IAC5C,UAAU,KAAK,YAAY;GAC7B,CAAC;GAED;EACF;EAEA,MAAM,IAAI,UAAU,wBAAwB,KAAK,UAAU,MAAM,MAAM,CAAC,GAAG;CAC7E;CAEA,OAAO;AACT;AAEA,SAAgB,YAAY,QAAoC;CAC9D,QAAM,sBAAsB,MAAM;CAClC,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,QAAM,yCAAyC,SAAS,MAAM,SAAS,IAAI;CAC3E,MAAM,gBAAgB,OAAO,gBAAgB,IAAI,KAAK,OAAO,aAAa,IAAI;CAC9E,IAAI,iBAAiB,MAAM,cAAc,QAAQ,CAAC,GAChD,MAAM,IAAI,UAAU,gBAAgB,OAAO,cAAc,gCAAgC;CAG3F,MAAM,aAAa,OAAO,aAAa,OAAO,OAAO,UAAU,IAAI;CACnE,IAAI,WAA0B;CAC9B,IAAI,eAAe,MAAM;EACvB,IAAI,MAAM,UAAU,KAAK,aAAa,GACpC,MAAM,IAAI,UAAU,kBAAkB,OAAO,WAAW,6BAA6B;EAGvF,WAAW,aAAa,KAAK,KAAK,KAAK;CACzC;CAEA,OAAO;EACL;EACA;EACA,YAAY;EACZ,YAAY;CACd;AACF"}
+{"version":3,"file":"parser.js","names":[],"sources":["../../src/config/parser.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range } from 'semver';\n\nimport type { ConfigRule, ParsedConfig, ParsedRule, PluginConfig } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:config');\n\nfunction parseConfigRules(configRules: ConfigRule[]): Map<string, ParsedRule> {\n  const ruleMap = new Map<string, ParsedRule>();\n  for (const rule of configRules) {\n    if ('scope' in rule && typeof rule.scope === 'string') {\n      if (!rule.scope.startsWith('@')) {\n        throw new TypeError(`Scope value must start with @, found: ${rule.scope}`);\n      }\n\n      ruleMap.set(rule.scope, 'scope');\n      continue;\n    }\n\n    if ('package' in rule && !('versions' in rule)) {\n      ruleMap.set(rule.package, 'package');\n      continue;\n    }\n\n    if ('package' in rule && 'versions' in rule) {\n      const previousConfig = ruleMap.get(rule.package) || { versions: [] };\n\n      if (typeof previousConfig === 'string') {\n        throw new Error(\n          `Package ${rule.package} is already specified by another strict rule ${previousConfig}`\n        );\n      }\n\n      // Merge version ranges of the rules for the same package\n      const range = new Range(rule.versions);\n      ruleMap.set(rule.package, {\n        versions: [...previousConfig.versions, range],\n        strategy: rule.strategy ?? 'block',\n      });\n\n      continue;\n    }\n\n    throw new TypeError(`Could not parse rule ${JSON.stringify(rule, null, 4)}`);\n  }\n\n  return ruleMap;\n}\n\nexport function parseConfig(config: PluginConfig): ParsedConfig {\n  debug('parsing config: %o', config);\n  const blockMap = parseConfigRules(config.block ?? []);\n  const allowMap = parseConfigRules(config.allow ?? []);\n  debug('parsed %d block rules, %d allow rules', blockMap.size, allowMap.size);\n  const dateThreshold = config.dateThreshold ? new Date(config.dateThreshold) : null;\n  if (dateThreshold && isNaN(dateThreshold.getTime())) {\n    throw new TypeError(`Invalid date ${config.dateThreshold} was provided for dateThreshold`);\n  }\n\n  const minAgeDays = config.minAgeDays ? Number(config.minAgeDays) : null;\n  let minAgeMs: number | null = null;\n  if (minAgeDays !== null) {\n    if (isNaN(minAgeDays) || minAgeDays < 0) {\n      throw new TypeError(`Invalid number ${config.minAgeDays} was provided for minAgeDays`);\n    }\n\n    minAgeMs = minAgeDays * 24 * 60 * 60 * 1000;\n  }\n\n  const excludeDeprecated = config.excludeDeprecated === true;\n\n  return {\n    dateThreshold,\n    minAgeMs,\n    excludeDeprecated,\n    blockRules: blockMap,\n    allowRules: allowMap,\n  };\n}\n"],"mappings":";;;;;AAKA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;AAEjE,SAAS,iBAAiB,aAAoD;CAC5E,MAAM,0BAAU,IAAI,IAAwB;CAC5C,KAAK,MAAM,QAAQ,aAAa;EAC9B,IAAI,WAAW,QAAQ,OAAO,KAAK,UAAU,UAAU;GACrD,IAAI,CAAC,KAAK,MAAM,WAAW,GAAG,GAC5B,MAAM,IAAI,UAAU,yCAAyC,KAAK,OAAO;GAG3E,QAAQ,IAAI,KAAK,OAAO,OAAO;GAC/B;EACF;EAEA,IAAI,aAAa,QAAQ,EAAE,cAAc,OAAO;GAC9C,QAAQ,IAAI,KAAK,SAAS,SAAS;GACnC;EACF;EAEA,IAAI,aAAa,QAAQ,cAAc,MAAM;GAC3C,MAAM,iBAAiB,QAAQ,IAAI,KAAK,OAAO,KAAK,EAAE,UAAU,CAAC,EAAE;GAEnE,IAAI,OAAO,mBAAmB,UAC5B,MAAM,IAAI,MACR,WAAW,KAAK,QAAQ,+CAA+C,gBACzE;GAIF,MAAM,QAAQ,IAAI,OAAA,MAAM,KAAK,QAAQ;GACrC,QAAQ,IAAI,KAAK,SAAS;IACxB,UAAU,CAAC,GAAG,eAAe,UAAU,KAAK;IAC5C,UAAU,KAAK,YAAY;GAC7B,CAAC;GAED;EACF;EAEA,MAAM,IAAI,UAAU,wBAAwB,KAAK,UAAU,MAAM,MAAM,CAAC,GAAG;CAC7E;CAEA,OAAO;AACT;AAEA,SAAgB,YAAY,QAAoC;CAC9D,QAAM,sBAAsB,MAAM;CAClC,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,QAAM,yCAAyC,SAAS,MAAM,SAAS,IAAI;CAC3E,MAAM,gBAAgB,OAAO,gBAAgB,IAAI,KAAK,OAAO,aAAa,IAAI;CAC9E,IAAI,iBAAiB,MAAM,cAAc,QAAQ,CAAC,GAChD,MAAM,IAAI,UAAU,gBAAgB,OAAO,cAAc,gCAAgC;CAG3F,MAAM,aAAa,OAAO,aAAa,OAAO,OAAO,UAAU,IAAI;CACnE,IAAI,WAA0B;CAC9B,IAAI,eAAe,MAAM;EACvB,IAAI,MAAM,UAAU,KAAK,aAAa,GACpC,MAAM,IAAI,UAAU,kBAAkB,OAAO,WAAW,6BAA6B;EAGvF,WAAW,aAAa,KAAK,KAAK,KAAK;CACzC;CAEA,MAAM,oBAAoB,OAAO,sBAAsB;CAEvD,OAAO;EACL;EACA;EACA;EACA,YAAY;EACZ,YAAY;CACd;AACF"}

package/build/config/parser.mjs

@@ -41,9 +41,11 @@ function parseConfig(config) {
 		if (isNaN(minAgeDays) || minAgeDays < 0) throw new TypeError(`Invalid number ${config.minAgeDays} was provided for minAgeDays`);
 		minAgeMs = minAgeDays * 24 * 60 * 60 * 1e3;
 	}
+	const excludeDeprecated = config.excludeDeprecated === true;
 	return {
 		dateThreshold,
 		minAgeMs,
+		excludeDeprecated,
 		blockRules: blockMap,
 		allowRules: allowMap
 	};

package/build/config/parser.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"parser.mjs","names":[],"sources":["../../src/config/parser.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range } from 'semver';\n\nimport type { ConfigRule, ParsedConfig, ParsedRule, PluginConfig } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:config');\n\nfunction parseConfigRules(configRules: ConfigRule[]): Map<string, ParsedRule> {\n  const ruleMap = new Map<string, ParsedRule>();\n  for (const rule of configRules) {\n    if ('scope' in rule && typeof rule.scope === 'string') {\n      if (!rule.scope.startsWith('@')) {\n        throw new TypeError(`Scope value must start with @, found: ${rule.scope}`);\n      }\n\n      ruleMap.set(rule.scope, 'scope');\n      continue;\n    }\n\n    if ('package' in rule && !('versions' in rule)) {\n      ruleMap.set(rule.package, 'package');\n      continue;\n    }\n\n    if ('package' in rule && 'versions' in rule) {\n      const previousConfig = ruleMap.get(rule.package) || { versions: [] };\n\n      if (typeof previousConfig === 'string') {\n        throw new Error(\n          `Package ${rule.package} is already specified by another strict rule ${previousConfig}`\n        );\n      }\n\n      // Merge version ranges of the rules for the same package\n      const range = new Range(rule.versions);\n      ruleMap.set(rule.package, {\n        versions: [...previousConfig.versions, range],\n        strategy: rule.strategy ?? 'block',\n      });\n\n      continue;\n    }\n\n    throw new TypeError(`Could not parse rule ${JSON.stringify(rule, null, 4)}`);\n  }\n\n  return ruleMap;\n}\n\nexport function parseConfig(config: PluginConfig): ParsedConfig {\n  debug('parsing config: %o', config);\n  const blockMap = parseConfigRules(config.block ?? []);\n  const allowMap = parseConfigRules(config.allow ?? []);\n  debug('parsed %d block rules, %d allow rules', blockMap.size, allowMap.size);\n  const dateThreshold = config.dateThreshold ? new Date(config.dateThreshold) : null;\n  if (dateThreshold && isNaN(dateThreshold.getTime())) {\n    throw new TypeError(`Invalid date ${config.dateThreshold} was provided for dateThreshold`);\n  }\n\n  const minAgeDays = config.minAgeDays ? Number(config.minAgeDays) : null;\n  let minAgeMs: number | null = null;\n  if (minAgeDays !== null) {\n    if (isNaN(minAgeDays) || minAgeDays < 0) {\n      throw new TypeError(`Invalid number ${config.minAgeDays} was provided for minAgeDays`);\n    }\n\n    minAgeMs = minAgeDays * 24 * 60 * 60 * 1000;\n  }\n\n  return {\n    dateThreshold,\n    minAgeMs,\n    blockRules: blockMap,\n    allowRules: allowMap,\n  };\n}\n"],"mappings":";;;AAKA,IAAM,QAAQ,WAAW,wCAAwC;AAEjE,SAAS,iBAAiB,aAAoD;CAC5E,MAAM,0BAAU,IAAI,IAAwB;CAC5C,KAAK,MAAM,QAAQ,aAAa;EAC9B,IAAI,WAAW,QAAQ,OAAO,KAAK,UAAU,UAAU;GACrD,IAAI,CAAC,KAAK,MAAM,WAAW,GAAG,GAC5B,MAAM,IAAI,UAAU,yCAAyC,KAAK,OAAO;GAG3E,QAAQ,IAAI,KAAK,OAAO,OAAO;GAC/B;EACF;EAEA,IAAI,aAAa,QAAQ,EAAE,cAAc,OAAO;GAC9C,QAAQ,IAAI,KAAK,SAAS,SAAS;GACnC;EACF;EAEA,IAAI,aAAa,QAAQ,cAAc,MAAM;GAC3C,MAAM,iBAAiB,QAAQ,IAAI,KAAK,OAAO,KAAK,EAAE,UAAU,CAAC,EAAE;GAEnE,IAAI,OAAO,mBAAmB,UAC5B,MAAM,IAAI,MACR,WAAW,KAAK,QAAQ,+CAA+C,gBACzE;GAIF,MAAM,QAAQ,IAAI,MAAM,KAAK,QAAQ;GACrC,QAAQ,IAAI,KAAK,SAAS;IACxB,UAAU,CAAC,GAAG,eAAe,UAAU,KAAK;IAC5C,UAAU,KAAK,YAAY;GAC7B,CAAC;GAED;EACF;EAEA,MAAM,IAAI,UAAU,wBAAwB,KAAK,UAAU,MAAM,MAAM,CAAC,GAAG;CAC7E;CAEA,OAAO;AACT;AAEA,SAAgB,YAAY,QAAoC;CAC9D,MAAM,sBAAsB,MAAM;CAClC,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,MAAM,yCAAyC,SAAS,MAAM,SAAS,IAAI;CAC3E,MAAM,gBAAgB,OAAO,gBAAgB,IAAI,KAAK,OAAO,aAAa,IAAI;CAC9E,IAAI,iBAAiB,MAAM,cAAc,QAAQ,CAAC,GAChD,MAAM,IAAI,UAAU,gBAAgB,OAAO,cAAc,gCAAgC;CAG3F,MAAM,aAAa,OAAO,aAAa,OAAO,OAAO,UAAU,IAAI;CACnE,IAAI,WAA0B;CAC9B,IAAI,eAAe,MAAM;EACvB,IAAI,MAAM,UAAU,KAAK,aAAa,GACpC,MAAM,IAAI,UAAU,kBAAkB,OAAO,WAAW,6BAA6B;EAGvF,WAAW,aAAa,KAAK,KAAK,KAAK;CACzC;CAEA,OAAO;EACL;EACA;EACA,YAAY;EACZ,YAAY;CACd;AACF"}
+{"version":3,"file":"parser.mjs","names":[],"sources":["../../src/config/parser.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range } from 'semver';\n\nimport type { ConfigRule, ParsedConfig, ParsedRule, PluginConfig } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:config');\n\nfunction parseConfigRules(configRules: ConfigRule[]): Map<string, ParsedRule> {\n  const ruleMap = new Map<string, ParsedRule>();\n  for (const rule of configRules) {\n    if ('scope' in rule && typeof rule.scope === 'string') {\n      if (!rule.scope.startsWith('@')) {\n        throw new TypeError(`Scope value must start with @, found: ${rule.scope}`);\n      }\n\n      ruleMap.set(rule.scope, 'scope');\n      continue;\n    }\n\n    if ('package' in rule && !('versions' in rule)) {\n      ruleMap.set(rule.package, 'package');\n      continue;\n    }\n\n    if ('package' in rule && 'versions' in rule) {\n      const previousConfig = ruleMap.get(rule.package) || { versions: [] };\n\n      if (typeof previousConfig === 'string') {\n        throw new Error(\n          `Package ${rule.package} is already specified by another strict rule ${previousConfig}`\n        );\n      }\n\n      // Merge version ranges of the rules for the same package\n      const range = new Range(rule.versions);\n      ruleMap.set(rule.package, {\n        versions: [...previousConfig.versions, range],\n        strategy: rule.strategy ?? 'block',\n      });\n\n      continue;\n    }\n\n    throw new TypeError(`Could not parse rule ${JSON.stringify(rule, null, 4)}`);\n  }\n\n  return ruleMap;\n}\n\nexport function parseConfig(config: PluginConfig): ParsedConfig {\n  debug('parsing config: %o', config);\n  const blockMap = parseConfigRules(config.block ?? []);\n  const allowMap = parseConfigRules(config.allow ?? []);\n  debug('parsed %d block rules, %d allow rules', blockMap.size, allowMap.size);\n  const dateThreshold = config.dateThreshold ? new Date(config.dateThreshold) : null;\n  if (dateThreshold && isNaN(dateThreshold.getTime())) {\n    throw new TypeError(`Invalid date ${config.dateThreshold} was provided for dateThreshold`);\n  }\n\n  const minAgeDays = config.minAgeDays ? Number(config.minAgeDays) : null;\n  let minAgeMs: number | null = null;\n  if (minAgeDays !== null) {\n    if (isNaN(minAgeDays) || minAgeDays < 0) {\n      throw new TypeError(`Invalid number ${config.minAgeDays} was provided for minAgeDays`);\n    }\n\n    minAgeMs = minAgeDays * 24 * 60 * 60 * 1000;\n  }\n\n  const excludeDeprecated = config.excludeDeprecated === true;\n\n  return {\n    dateThreshold,\n    minAgeMs,\n    excludeDeprecated,\n    blockRules: blockMap,\n    allowRules: allowMap,\n  };\n}\n"],"mappings":";;;AAKA,IAAM,QAAQ,WAAW,wCAAwC;AAEjE,SAAS,iBAAiB,aAAoD;CAC5E,MAAM,0BAAU,IAAI,IAAwB;CAC5C,KAAK,MAAM,QAAQ,aAAa;EAC9B,IAAI,WAAW,QAAQ,OAAO,KAAK,UAAU,UAAU;GACrD,IAAI,CAAC,KAAK,MAAM,WAAW,GAAG,GAC5B,MAAM,IAAI,UAAU,yCAAyC,KAAK,OAAO;GAG3E,QAAQ,IAAI,KAAK,OAAO,OAAO;GAC/B;EACF;EAEA,IAAI,aAAa,QAAQ,EAAE,cAAc,OAAO;GAC9C,QAAQ,IAAI,KAAK,SAAS,SAAS;GACnC;EACF;EAEA,IAAI,aAAa,QAAQ,cAAc,MAAM;GAC3C,MAAM,iBAAiB,QAAQ,IAAI,KAAK,OAAO,KAAK,EAAE,UAAU,CAAC,EAAE;GAEnE,IAAI,OAAO,mBAAmB,UAC5B,MAAM,IAAI,MACR,WAAW,KAAK,QAAQ,+CAA+C,gBACzE;GAIF,MAAM,QAAQ,IAAI,MAAM,KAAK,QAAQ;GACrC,QAAQ,IAAI,KAAK,SAAS;IACxB,UAAU,CAAC,GAAG,eAAe,UAAU,KAAK;IAC5C,UAAU,KAAK,YAAY;GAC7B,CAAC;GAED;EACF;EAEA,MAAM,IAAI,UAAU,wBAAwB,KAAK,UAAU,MAAM,MAAM,CAAC,GAAG;CAC7E;CAEA,OAAO;AACT;AAEA,SAAgB,YAAY,QAAoC;CAC9D,MAAM,sBAAsB,MAAM;CAClC,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,MAAM,WAAW,iBAAiB,OAAO,SAAS,CAAC,CAAC;CACpD,MAAM,yCAAyC,SAAS,MAAM,SAAS,IAAI;CAC3E,MAAM,gBAAgB,OAAO,gBAAgB,IAAI,KAAK,OAAO,aAAa,IAAI;CAC9E,IAAI,iBAAiB,MAAM,cAAc,QAAQ,CAAC,GAChD,MAAM,IAAI,UAAU,gBAAgB,OAAO,cAAc,gCAAgC;CAG3F,MAAM,aAAa,OAAO,aAAa,OAAO,OAAO,UAAU,IAAI;CACnE,IAAI,WAA0B;CAC9B,IAAI,eAAe,MAAM;EACvB,IAAI,MAAM,UAAU,KAAK,aAAa,GACpC,MAAM,IAAI,UAAU,kBAAkB,OAAO,WAAW,6BAA6B;EAGvF,WAAW,aAAa,KAAK,KAAK,KAAK;CACzC;CAEA,MAAM,oBAAoB,OAAO,sBAAsB;CAEvD,OAAO;EACL;EACA;EACA;EACA,YAAY;EACZ,YAAY;CACd;AACF"}

package/build/config/types.d.ts

@@ -22,6 +22,11 @@ export interface PluginConfig {
      * the earlier (more restrictive) date wins.
      */
     minAgeDays?: number;
+    /**
+     * When true, versions whose metadata contains a deprecation notice
+     * will be removed from the manifest.
+     */
+    excludeDeprecated?: boolean;
     block?: ConfigRule[];
     allow?: ConfigRule[];
 }
@@ -34,6 +39,7 @@ export type ParsedRule = ParsedConfigRule | PackageScopeLevel;
 export interface ParsedConfig {
     dateThreshold: Date | null;
     minAgeMs: number | null;
+    excludeDeprecated: boolean;
     blockRules: Map<string, ParsedRule>;
     allowRules: Map<string, ParsedRule>;
 }

package/build/filtering/deprecated.d.ts

@@ -0,0 +1,6 @@
+import type { Manifest } from '@verdaccio/types';
+import type { MatchResult } from './types';
+/**
+ * Filter out all package versions that have a deprecation notice.
+ */
+export declare function filterDeprecatedVersions(manifest: Manifest, allowMatch: MatchResult | undefined): Manifest;

package/build/filtering/deprecated.js

@@ -0,0 +1,27 @@
+const require_runtime = require("../_virtual/_rolldown/runtime.js");
+const require_matcher = require("./matcher.js");
+let debug = require("debug");
+debug = require_runtime.__toESM(debug);
+//#region src/filtering/deprecated.ts
+var debug$1 = (0, debug.default)("verdaccio:plugin:package-filter:filter");
+/**
+* Filter out all package versions that have a deprecation notice.
+*/
+function filterDeprecatedVersions(manifest, allowMatch) {
+	const { allowAll, whitelistedVersions } = require_matcher.resolveAllowList(allowMatch);
+	if (allowAll) return manifest;
+	const removedVersions = [];
+	Object.entries(manifest.versions).forEach(([version, versionData]) => {
+		if (whitelistedVersions.includes(version)) return;
+		if (typeof versionData.deprecated === "string" && versionData.deprecated.length > 0) {
+			removedVersions.push(version);
+			delete manifest.versions[version];
+		}
+	});
+	if (removedVersions.length > 0) debug$1("deprecated filter removed %d versions from %s: %o", removedVersions.length, manifest.name, removedVersions);
+	return manifest;
+}
+//#endregion
+exports.filterDeprecatedVersions = filterDeprecatedVersions;
+
+//# sourceMappingURL=deprecated.js.map

package/build/filtering/deprecated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deprecated.js","names":[],"sources":["../../src/filtering/deprecated.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport { resolveAllowList } from './matcher';\nimport type { MatchResult } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all package versions that have a deprecation notice.\n */\nexport function filterDeprecatedVersions(\n  manifest: Manifest,\n  allowMatch: MatchResult | undefined\n): Manifest {\n  const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);\n  if (allowAll) {\n    return manifest;\n  }\n\n  const removedVersions: string[] = [];\n\n  Object.entries(manifest.versions).forEach(([version, versionData]) => {\n    if (whitelistedVersions.includes(version)) {\n      return;\n    }\n\n    if (typeof versionData.deprecated === 'string' && versionData.deprecated.length > 0) {\n      removedVersions.push(version);\n      delete manifest.versions[version];\n    }\n  });\n\n  if (removedVersions.length > 0) {\n    debug(\n      'deprecated filter removed %d versions from %s: %o',\n      removedVersions.length,\n      manifest.name,\n      removedVersions\n    );\n  }\n\n  return manifest;\n}\n"],"mappings":";;;;;AAOA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;;;;AAKjE,SAAgB,yBACd,UACA,YACU;CACV,MAAM,EAAE,UAAU,wBAAwB,gBAAA,iBAAiB,UAAU;CACrE,IAAI,UACF,OAAO;CAGT,MAAM,kBAA4B,CAAC;CAEnC,OAAO,QAAQ,SAAS,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,iBAAiB;EACpE,IAAI,oBAAoB,SAAS,OAAO,GACtC;EAGF,IAAI,OAAO,YAAY,eAAe,YAAY,YAAY,WAAW,SAAS,GAAG;GACnF,gBAAgB,KAAK,OAAO;GAC5B,OAAO,SAAS,SAAS;EAC3B;CACF,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,QACE,qDACA,gBAAgB,QAChB,SAAS,MACT,eACF;CAGF,OAAO;AACT"}

package/build/filtering/deprecated.mjs

@@ -0,0 +1,25 @@
+import { resolveAllowList } from "./matcher.mjs";
+import buildDebug from "debug";
+//#region src/filtering/deprecated.ts
+var debug = buildDebug("verdaccio:plugin:package-filter:filter");
+/**
+* Filter out all package versions that have a deprecation notice.
+*/
+function filterDeprecatedVersions(manifest, allowMatch) {
+	const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);
+	if (allowAll) return manifest;
+	const removedVersions = [];
+	Object.entries(manifest.versions).forEach(([version, versionData]) => {
+		if (whitelistedVersions.includes(version)) return;
+		if (typeof versionData.deprecated === "string" && versionData.deprecated.length > 0) {
+			removedVersions.push(version);
+			delete manifest.versions[version];
+		}
+	});
+	if (removedVersions.length > 0) debug("deprecated filter removed %d versions from %s: %o", removedVersions.length, manifest.name, removedVersions);
+	return manifest;
+}
+//#endregion
+export { filterDeprecatedVersions };
+
+//# sourceMappingURL=deprecated.mjs.map

package/build/filtering/deprecated.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"deprecated.mjs","names":[],"sources":["../../src/filtering/deprecated.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport { resolveAllowList } from './matcher';\nimport type { MatchResult } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all package versions that have a deprecation notice.\n */\nexport function filterDeprecatedVersions(\n  manifest: Manifest,\n  allowMatch: MatchResult | undefined\n): Manifest {\n  const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);\n  if (allowAll) {\n    return manifest;\n  }\n\n  const removedVersions: string[] = [];\n\n  Object.entries(manifest.versions).forEach(([version, versionData]) => {\n    if (whitelistedVersions.includes(version)) {\n      return;\n    }\n\n    if (typeof versionData.deprecated === 'string' && versionData.deprecated.length > 0) {\n      removedVersions.push(version);\n      delete manifest.versions[version];\n    }\n  });\n\n  if (removedVersions.length > 0) {\n    debug(\n      'deprecated filter removed %d versions from %s: %o',\n      removedVersions.length,\n      manifest.name,\n      removedVersions\n    );\n  }\n\n  return manifest;\n}\n"],"mappings":";;;AAOA,IAAM,QAAQ,WAAW,wCAAwC;;;;AAKjE,SAAgB,yBACd,UACA,YACU;CACV,MAAM,EAAE,UAAU,wBAAwB,iBAAiB,UAAU;CACrE,IAAI,UACF,OAAO;CAGT,MAAM,kBAA4B,CAAC;CAEnC,OAAO,QAAQ,SAAS,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,iBAAiB;EACpE,IAAI,oBAAoB,SAAS,OAAO,GACtC;EAGF,IAAI,OAAO,YAAY,eAAe,YAAY,YAAY,WAAW,SAAS,GAAG;GACnF,gBAAgB,KAAK,OAAO;GAC5B,OAAO,SAAS,SAAS;EAC3B;CACF,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,MACE,qDACA,gBAAgB,QAChB,SAAS,MACT,eACF;CAGF,OAAO;AACT"}

package/build/filtering/matcher.d.ts

@@ -6,3 +6,12 @@ import type { MatchResult } from './types';
  * If found, returns the rule and the matched package versions from the manifest.
  */
 export declare function matchRules(manifest: Manifest, rules: Map<string, ParsedRule>): MatchResult | undefined;
+/**
+ * Derive the allow-list outcome from a precomputed allow-rule match:
+ * whether the whole package/scope is allow-listed, and which versions
+ * (if any) are individually whitelisted.
+ */
+export declare function resolveAllowList(allowMatch: MatchResult | undefined): {
+    allowAll: boolean;
+    whitelistedVersions: string[];
+};

package/build/filtering/matcher.js

@@ -65,7 +65,19 @@ function matchRules(manifest, rules) {
 		versions: matchedVersions
 	};
 }
+/**
+* Derive the allow-list outcome from a precomputed allow-rule match:
+* whether the whole package/scope is allow-listed, and which versions
+* (if any) are individually whitelisted.
+*/
+function resolveAllowList(allowMatch) {
+	return {
+		allowAll: !!allowMatch && (allowMatch.type === require_types.MatchType.SCOPE || allowMatch.type === require_types.MatchType.PACKAGE),
+		whitelistedVersions: allowMatch?.versions ?? []
+	};
+}
 //#endregion
 exports.matchRules = matchRules;
+exports.resolveAllowList = resolveAllowList;
 
 //# sourceMappingURL=matcher.js.map

package/build/filtering/matcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"matcher.js","names":[],"sources":["../../src/filtering/matcher.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { satisfies } from 'semver';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport type { ParsedRule } from '../config/types';\nimport type { MatchResult } from './types';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Split a package name into name itself and scope.\n */\nfunction splitName(name: string): { name: string; scope?: string } {\n  if (!name) {\n    return { name: '' };\n  }\n\n  const parts = name.split('/');\n\n  if (parts.length > 1) {\n    return {\n      scope: parts[0],\n      name: parts[1],\n    };\n  } else {\n    return {\n      name: parts[0],\n    };\n  }\n}\n\n/**\n * Try to find a rule that matches the package.\n * If found, returns the rule and the matched package versions from the manifest.\n */\nexport function matchRules(\n  manifest: Manifest,\n  rules: Map<string, ParsedRule>\n): MatchResult | undefined {\n  const { scope } = splitName(manifest.name);\n  if (scope) {\n    const rule = rules.get(scope);\n    if (rule === 'scope') {\n      debug('scope match: %s matched rule for %s', manifest.name, scope);\n      return {\n        type: MatchType.SCOPE,\n        rule,\n        scope,\n        versions: Object.keys(manifest.versions),\n      };\n    }\n  }\n\n  const rule = rules.get(manifest.name);\n  if (!rule) {\n    // No match\n    return undefined;\n  }\n\n  if (rule === 'package') {\n    debug('package match: %s', manifest.name);\n    return {\n      type: MatchType.PACKAGE,\n      rule,\n      package: manifest.name,\n      versions: Object.keys(manifest.versions),\n    };\n  }\n\n  if (rule === 'scope') {\n    throw new Error('Unexpected case - rule for package should never be \"scope\"');\n  }\n\n  const versionRanges = rule.versions;\n  if (versionRanges.length === 0) {\n    // No match\n    return undefined;\n  }\n\n  const matchedVersions: string[] = [];\n  Object.keys(manifest.versions).forEach((version) => {\n    versionRanges.forEach((versionRange) => {\n      if (\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        matchedVersions.push(version);\n      }\n    });\n  });\n\n  if (matchedVersions.length > 0) {\n    debug(\n      'version match: %s matched %d versions: %o',\n      manifest.name,\n      matchedVersions.length,\n      matchedVersions\n    );\n  }\n\n  return {\n    type: MatchType.VERSIONS,\n    rule,\n    versions: matchedVersions,\n  };\n}\n"],"mappings":";;;;;;AASA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;;;;AAKjE,SAAS,UAAU,MAAgD;CACjE,IAAI,CAAC,MACH,OAAO,EAAE,MAAM,GAAG;CAGpB,MAAM,QAAQ,KAAK,MAAM,GAAG;CAE5B,IAAI,MAAM,SAAS,GACjB,OAAO;EACL,OAAO,MAAM;EACb,MAAM,MAAM;CACd;MAEA,OAAO,EACL,MAAM,MAAM,GACd;AAEJ;;;;;AAMA,SAAgB,WACd,UACA,OACyB;CACzB,MAAM,EAAE,UAAU,UAAU,SAAS,IAAI;CACzC,IAAI,OAAO;EACT,MAAM,OAAO,MAAM,IAAI,KAAK;EAC5B,IAAI,SAAS,SAAS;GACpB,QAAM,uCAAuC,SAAS,MAAM,KAAK;GACjE,OAAO;IACL,MAAM,cAAA,UAAU;IAChB;IACA;IACA,UAAU,OAAO,KAAK,SAAS,QAAQ;GACzC;EACF;CACF;CAEA,MAAM,OAAO,MAAM,IAAI,SAAS,IAAI;CACpC,IAAI,CAAC,MAEH;CAGF,IAAI,SAAS,WAAW;EACtB,QAAM,qBAAqB,SAAS,IAAI;EACxC,OAAO;GACL,MAAM,cAAA,UAAU;GAChB;GACA,SAAS,SAAS;GAClB,UAAU,OAAO,KAAK,SAAS,QAAQ;EACzC;CACF;CAEA,IAAI,SAAS,SACX,MAAM,IAAI,MAAM,8DAA4D;CAG9E,MAAM,gBAAgB,KAAK;CAC3B,IAAI,cAAc,WAAW,GAE3B;CAGF,MAAM,kBAA4B,CAAC;CACnC,OAAO,KAAK,SAAS,QAAQ,CAAC,CAAC,SAAS,YAAY;EAClD,cAAc,SAAS,iBAAiB;GACtC,KAAA,GAAA,OAAA,UAAA,CACY,SAAS,cAAc;IAC/B,mBAAmB;IACnB,OAAO;GACT,CAAC,GAED,gBAAgB,KAAK,OAAO;EAEhC,CAAC;CACH,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,QACE,6CACA,SAAS,MACT,gBAAgB,QAChB,eACF;CAGF,OAAO;EACL,MAAM,cAAA,UAAU;EAChB;EACA,UAAU;CACZ;AACF"}
+{"version":3,"file":"matcher.js","names":[],"sources":["../../src/filtering/matcher.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { satisfies } from 'semver';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport type { ParsedRule } from '../config/types';\nimport type { MatchResult } from './types';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Split a package name into name itself and scope.\n */\nfunction splitName(name: string): { name: string; scope?: string } {\n  if (!name) {\n    return { name: '' };\n  }\n\n  const parts = name.split('/');\n\n  if (parts.length > 1) {\n    return {\n      scope: parts[0],\n      name: parts[1],\n    };\n  } else {\n    return {\n      name: parts[0],\n    };\n  }\n}\n\n/**\n * Try to find a rule that matches the package.\n * If found, returns the rule and the matched package versions from the manifest.\n */\nexport function matchRules(\n  manifest: Manifest,\n  rules: Map<string, ParsedRule>\n): MatchResult | undefined {\n  const { scope } = splitName(manifest.name);\n  if (scope) {\n    const rule = rules.get(scope);\n    if (rule === 'scope') {\n      debug('scope match: %s matched rule for %s', manifest.name, scope);\n      return {\n        type: MatchType.SCOPE,\n        rule,\n        scope,\n        versions: Object.keys(manifest.versions),\n      };\n    }\n  }\n\n  const rule = rules.get(manifest.name);\n  if (!rule) {\n    // No match\n    return undefined;\n  }\n\n  if (rule === 'package') {\n    debug('package match: %s', manifest.name);\n    return {\n      type: MatchType.PACKAGE,\n      rule,\n      package: manifest.name,\n      versions: Object.keys(manifest.versions),\n    };\n  }\n\n  if (rule === 'scope') {\n    throw new Error('Unexpected case - rule for package should never be \"scope\"');\n  }\n\n  const versionRanges = rule.versions;\n  if (versionRanges.length === 0) {\n    // No match\n    return undefined;\n  }\n\n  const matchedVersions: string[] = [];\n  Object.keys(manifest.versions).forEach((version) => {\n    versionRanges.forEach((versionRange) => {\n      if (\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        matchedVersions.push(version);\n      }\n    });\n  });\n\n  if (matchedVersions.length > 0) {\n    debug(\n      'version match: %s matched %d versions: %o',\n      manifest.name,\n      matchedVersions.length,\n      matchedVersions\n    );\n  }\n\n  return {\n    type: MatchType.VERSIONS,\n    rule,\n    versions: matchedVersions,\n  };\n}\n\n/**\n * Derive the allow-list outcome from a precomputed allow-rule match:\n * whether the whole package/scope is allow-listed, and which versions\n * (if any) are individually whitelisted.\n */\nexport function resolveAllowList(allowMatch: MatchResult | undefined): {\n  allowAll: boolean;\n  whitelistedVersions: string[];\n} {\n  const allowAll =\n    !!allowMatch && (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE);\n  return { allowAll, whitelistedVersions: allowMatch?.versions ?? [] };\n}\n"],"mappings":";;;;;;AASA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;;;;AAKjE,SAAS,UAAU,MAAgD;CACjE,IAAI,CAAC,MACH,OAAO,EAAE,MAAM,GAAG;CAGpB,MAAM,QAAQ,KAAK,MAAM,GAAG;CAE5B,IAAI,MAAM,SAAS,GACjB,OAAO;EACL,OAAO,MAAM;EACb,MAAM,MAAM;CACd;MAEA,OAAO,EACL,MAAM,MAAM,GACd;AAEJ;;;;;AAMA,SAAgB,WACd,UACA,OACyB;CACzB,MAAM,EAAE,UAAU,UAAU,SAAS,IAAI;CACzC,IAAI,OAAO;EACT,MAAM,OAAO,MAAM,IAAI,KAAK;EAC5B,IAAI,SAAS,SAAS;GACpB,QAAM,uCAAuC,SAAS,MAAM,KAAK;GACjE,OAAO;IACL,MAAM,cAAA,UAAU;IAChB;IACA;IACA,UAAU,OAAO,KAAK,SAAS,QAAQ;GACzC;EACF;CACF;CAEA,MAAM,OAAO,MAAM,IAAI,SAAS,IAAI;CACpC,IAAI,CAAC,MAEH;CAGF,IAAI,SAAS,WAAW;EACtB,QAAM,qBAAqB,SAAS,IAAI;EACxC,OAAO;GACL,MAAM,cAAA,UAAU;GAChB;GACA,SAAS,SAAS;GAClB,UAAU,OAAO,KAAK,SAAS,QAAQ;EACzC;CACF;CAEA,IAAI,SAAS,SACX,MAAM,IAAI,MAAM,8DAA4D;CAG9E,MAAM,gBAAgB,KAAK;CAC3B,IAAI,cAAc,WAAW,GAE3B;CAGF,MAAM,kBAA4B,CAAC;CACnC,OAAO,KAAK,SAAS,QAAQ,CAAC,CAAC,SAAS,YAAY;EAClD,cAAc,SAAS,iBAAiB;GACtC,KAAA,GAAA,OAAA,UAAA,CACY,SAAS,cAAc;IAC/B,mBAAmB;IACnB,OAAO;GACT,CAAC,GAED,gBAAgB,KAAK,OAAO;EAEhC,CAAC;CACH,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,QACE,6CACA,SAAS,MACT,gBAAgB,QAChB,eACF;CAGF,OAAO;EACL,MAAM,cAAA,UAAU;EAChB;EACA,UAAU;CACZ;AACF;;;;;;AAOA,SAAgB,iBAAiB,YAG/B;CAGA,OAAO;EAAE,UADP,CAAC,CAAC,eAAe,WAAW,SAAS,cAAA,UAAU,SAAS,WAAW,SAAS,cAAA,UAAU;EACrE,qBAAqB,YAAY,YAAY,CAAC;CAAE;AACrE"}

package/build/filtering/matcher.mjs

@@ -63,7 +63,18 @@ function matchRules(manifest, rules) {
 		versions: matchedVersions
 	};
 }
+/**
+* Derive the allow-list outcome from a precomputed allow-rule match:
+* whether the whole package/scope is allow-listed, and which versions
+* (if any) are individually whitelisted.
+*/
+function resolveAllowList(allowMatch) {
+	return {
+		allowAll: !!allowMatch && (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE),
+		whitelistedVersions: allowMatch?.versions ?? []
+	};
+}
 //#endregion
-export { matchRules };
+export { matchRules, resolveAllowList };
 
 //# sourceMappingURL=matcher.mjs.map

package/build/filtering/matcher.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"matcher.mjs","names":[],"sources":["../../src/filtering/matcher.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { satisfies } from 'semver';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport type { ParsedRule } from '../config/types';\nimport type { MatchResult } from './types';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Split a package name into name itself and scope.\n */\nfunction splitName(name: string): { name: string; scope?: string } {\n  if (!name) {\n    return { name: '' };\n  }\n\n  const parts = name.split('/');\n\n  if (parts.length > 1) {\n    return {\n      scope: parts[0],\n      name: parts[1],\n    };\n  } else {\n    return {\n      name: parts[0],\n    };\n  }\n}\n\n/**\n * Try to find a rule that matches the package.\n * If found, returns the rule and the matched package versions from the manifest.\n */\nexport function matchRules(\n  manifest: Manifest,\n  rules: Map<string, ParsedRule>\n): MatchResult | undefined {\n  const { scope } = splitName(manifest.name);\n  if (scope) {\n    const rule = rules.get(scope);\n    if (rule === 'scope') {\n      debug('scope match: %s matched rule for %s', manifest.name, scope);\n      return {\n        type: MatchType.SCOPE,\n        rule,\n        scope,\n        versions: Object.keys(manifest.versions),\n      };\n    }\n  }\n\n  const rule = rules.get(manifest.name);\n  if (!rule) {\n    // No match\n    return undefined;\n  }\n\n  if (rule === 'package') {\n    debug('package match: %s', manifest.name);\n    return {\n      type: MatchType.PACKAGE,\n      rule,\n      package: manifest.name,\n      versions: Object.keys(manifest.versions),\n    };\n  }\n\n  if (rule === 'scope') {\n    throw new Error('Unexpected case - rule for package should never be \"scope\"');\n  }\n\n  const versionRanges = rule.versions;\n  if (versionRanges.length === 0) {\n    // No match\n    return undefined;\n  }\n\n  const matchedVersions: string[] = [];\n  Object.keys(manifest.versions).forEach((version) => {\n    versionRanges.forEach((versionRange) => {\n      if (\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        matchedVersions.push(version);\n      }\n    });\n  });\n\n  if (matchedVersions.length > 0) {\n    debug(\n      'version match: %s matched %d versions: %o',\n      manifest.name,\n      matchedVersions.length,\n      matchedVersions\n    );\n  }\n\n  return {\n    type: MatchType.VERSIONS,\n    rule,\n    versions: matchedVersions,\n  };\n}\n"],"mappings":";;;;AASA,IAAM,QAAQ,WAAW,wCAAwC;;;;AAKjE,SAAS,UAAU,MAAgD;CACjE,IAAI,CAAC,MACH,OAAO,EAAE,MAAM,GAAG;CAGpB,MAAM,QAAQ,KAAK,MAAM,GAAG;CAE5B,IAAI,MAAM,SAAS,GACjB,OAAO;EACL,OAAO,MAAM;EACb,MAAM,MAAM;CACd;MAEA,OAAO,EACL,MAAM,MAAM,GACd;AAEJ;;;;;AAMA,SAAgB,WACd,UACA,OACyB;CACzB,MAAM,EAAE,UAAU,UAAU,SAAS,IAAI;CACzC,IAAI,OAAO;EACT,MAAM,OAAO,MAAM,IAAI,KAAK;EAC5B,IAAI,SAAS,SAAS;GACpB,MAAM,uCAAuC,SAAS,MAAM,KAAK;GACjE,OAAO;IACL,MAAM,UAAU;IAChB;IACA;IACA,UAAU,OAAO,KAAK,SAAS,QAAQ;GACzC;EACF;CACF;CAEA,MAAM,OAAO,MAAM,IAAI,SAAS,IAAI;CACpC,IAAI,CAAC,MAEH;CAGF,IAAI,SAAS,WAAW;EACtB,MAAM,qBAAqB,SAAS,IAAI;EACxC,OAAO;GACL,MAAM,UAAU;GAChB;GACA,SAAS,SAAS;GAClB,UAAU,OAAO,KAAK,SAAS,QAAQ;EACzC;CACF;CAEA,IAAI,SAAS,SACX,MAAM,IAAI,MAAM,8DAA4D;CAG9E,MAAM,gBAAgB,KAAK;CAC3B,IAAI,cAAc,WAAW,GAE3B;CAGF,MAAM,kBAA4B,CAAC;CACnC,OAAO,KAAK,SAAS,QAAQ,CAAC,CAAC,SAAS,YAAY;EAClD,cAAc,SAAS,iBAAiB;GACtC,IACE,UAAU,SAAS,cAAc;IAC/B,mBAAmB;IACnB,OAAO;GACT,CAAC,GAED,gBAAgB,KAAK,OAAO;EAEhC,CAAC;CACH,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,MACE,6CACA,SAAS,MACT,gBAAgB,QAChB,eACF;CAGF,OAAO;EACL,MAAM,UAAU;EAChB;EACA,UAAU;CACZ;AACF"}
+{"version":3,"file":"matcher.mjs","names":[],"sources":["../../src/filtering/matcher.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { satisfies } from 'semver';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport type { ParsedRule } from '../config/types';\nimport type { MatchResult } from './types';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Split a package name into name itself and scope.\n */\nfunction splitName(name: string): { name: string; scope?: string } {\n  if (!name) {\n    return { name: '' };\n  }\n\n  const parts = name.split('/');\n\n  if (parts.length > 1) {\n    return {\n      scope: parts[0],\n      name: parts[1],\n    };\n  } else {\n    return {\n      name: parts[0],\n    };\n  }\n}\n\n/**\n * Try to find a rule that matches the package.\n * If found, returns the rule and the matched package versions from the manifest.\n */\nexport function matchRules(\n  manifest: Manifest,\n  rules: Map<string, ParsedRule>\n): MatchResult | undefined {\n  const { scope } = splitName(manifest.name);\n  if (scope) {\n    const rule = rules.get(scope);\n    if (rule === 'scope') {\n      debug('scope match: %s matched rule for %s', manifest.name, scope);\n      return {\n        type: MatchType.SCOPE,\n        rule,\n        scope,\n        versions: Object.keys(manifest.versions),\n      };\n    }\n  }\n\n  const rule = rules.get(manifest.name);\n  if (!rule) {\n    // No match\n    return undefined;\n  }\n\n  if (rule === 'package') {\n    debug('package match: %s', manifest.name);\n    return {\n      type: MatchType.PACKAGE,\n      rule,\n      package: manifest.name,\n      versions: Object.keys(manifest.versions),\n    };\n  }\n\n  if (rule === 'scope') {\n    throw new Error('Unexpected case - rule for package should never be \"scope\"');\n  }\n\n  const versionRanges = rule.versions;\n  if (versionRanges.length === 0) {\n    // No match\n    return undefined;\n  }\n\n  const matchedVersions: string[] = [];\n  Object.keys(manifest.versions).forEach((version) => {\n    versionRanges.forEach((versionRange) => {\n      if (\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        matchedVersions.push(version);\n      }\n    });\n  });\n\n  if (matchedVersions.length > 0) {\n    debug(\n      'version match: %s matched %d versions: %o',\n      manifest.name,\n      matchedVersions.length,\n      matchedVersions\n    );\n  }\n\n  return {\n    type: MatchType.VERSIONS,\n    rule,\n    versions: matchedVersions,\n  };\n}\n\n/**\n * Derive the allow-list outcome from a precomputed allow-rule match:\n * whether the whole package/scope is allow-listed, and which versions\n * (if any) are individually whitelisted.\n */\nexport function resolveAllowList(allowMatch: MatchResult | undefined): {\n  allowAll: boolean;\n  whitelistedVersions: string[];\n} {\n  const allowAll =\n    !!allowMatch && (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE);\n  return { allowAll, whitelistedVersions: allowMatch?.versions ?? [] };\n}\n"],"mappings":";;;;AASA,IAAM,QAAQ,WAAW,wCAAwC;;;;AAKjE,SAAS,UAAU,MAAgD;CACjE,IAAI,CAAC,MACH,OAAO,EAAE,MAAM,GAAG;CAGpB,MAAM,QAAQ,KAAK,MAAM,GAAG;CAE5B,IAAI,MAAM,SAAS,GACjB,OAAO;EACL,OAAO,MAAM;EACb,MAAM,MAAM;CACd;MAEA,OAAO,EACL,MAAM,MAAM,GACd;AAEJ;;;;;AAMA,SAAgB,WACd,UACA,OACyB;CACzB,MAAM,EAAE,UAAU,UAAU,SAAS,IAAI;CACzC,IAAI,OAAO;EACT,MAAM,OAAO,MAAM,IAAI,KAAK;EAC5B,IAAI,SAAS,SAAS;GACpB,MAAM,uCAAuC,SAAS,MAAM,KAAK;GACjE,OAAO;IACL,MAAM,UAAU;IAChB;IACA;IACA,UAAU,OAAO,KAAK,SAAS,QAAQ;GACzC;EACF;CACF;CAEA,MAAM,OAAO,MAAM,IAAI,SAAS,IAAI;CACpC,IAAI,CAAC,MAEH;CAGF,IAAI,SAAS,WAAW;EACtB,MAAM,qBAAqB,SAAS,IAAI;EACxC,OAAO;GACL,MAAM,UAAU;GAChB;GACA,SAAS,SAAS;GAClB,UAAU,OAAO,KAAK,SAAS,QAAQ;EACzC;CACF;CAEA,IAAI,SAAS,SACX,MAAM,IAAI,MAAM,8DAA4D;CAG9E,MAAM,gBAAgB,KAAK;CAC3B,IAAI,cAAc,WAAW,GAE3B;CAGF,MAAM,kBAA4B,CAAC;CACnC,OAAO,KAAK,SAAS,QAAQ,CAAC,CAAC,SAAS,YAAY;EAClD,cAAc,SAAS,iBAAiB;GACtC,IACE,UAAU,SAAS,cAAc;IAC/B,mBAAmB;IACnB,OAAO;GACT,CAAC,GAED,gBAAgB,KAAK,OAAO;EAEhC,CAAC;CACH,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,MACE,6CACA,SAAS,MACT,gBAAgB,QAChB,eACF;CAGF,OAAO;EACL,MAAM,UAAU;EAChB;EACA,UAAU;CACZ;AACF;;;;;;AAOA,SAAgB,iBAAiB,YAG/B;CAGA,OAAO;EAAE,UADP,CAAC,CAAC,eAAe,WAAW,SAAS,UAAU,SAAS,WAAW,SAAS,UAAU;EACrE,qBAAqB,YAAY,YAAY,CAAC;CAAE;AACrE"}

package/build/filtering/packageVersion.d.ts

@@ -1,5 +1,6 @@
 import type { Logger, Manifest } from '@verdaccio/types';
 import type { ParsedRule } from '../config/types';
+import type { MatchResult } from './types';
 /**
  * Filter out all blocked package versions.
  * If package or scope is blocked, then block all versions.
@@ -17,4 +18,4 @@ import type { ParsedRule } from '../config/types';
  *
  * Today the only workaround is using awkward ranges like ">=1.0.0-0 <1.0.0".
  */
-export declare function filterBlockedVersions(manifest: Manifest, blockRules: Map<string, ParsedRule>, allowRules: Map<string, ParsedRule>, logger: Logger): Manifest;
+export declare function filterBlockedVersions(manifest: Manifest, blockRules: Map<string, ParsedRule>, allowMatch: MatchResult | undefined, logger: Logger): Manifest;

package/build/filtering/packageVersion.js

@@ -23,9 +23,9 @@ var debug$1 = (0, debug.default)("verdaccio:plugin:package-filter:filter");
 *
 * Today the only workaround is using awkward ranges like ">=1.0.0-0 <1.0.0".
 */
-function filterBlockedVersions(manifest, blockRules, allowRules, logger) {
-	const allowMatch = require_matcher.matchRules(manifest, allowRules);
-	if (allowMatch && (allowMatch.type === require_types.MatchType.SCOPE || allowMatch.type === require_types.MatchType.PACKAGE)) {
+function filterBlockedVersions(manifest, blockRules, allowMatch, logger) {
+	const { allowAll, whitelistedVersions } = require_matcher.resolveAllowList(allowMatch);
+	if (allowAll) {
 		logger.trace({ name: manifest.name }, "package @{name} is allow-listed, skipping block rules");
 		return manifest;
 	}
@@ -35,7 +35,6 @@ function filterBlockedVersions(manifest, blockRules, allowRules, logger) {
 		name: manifest.name,
 		type: blockMatch.type
 	}, "block rule matched for @{name} (type: @{type})");
-	const whitelistedVersions = allowMatch ? allowMatch.versions : [];
 	let blockRule = {
 		versions: [new semver.Range("*")],
 		strategy: "block"

package/build/filtering/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","names":[],"sources":["../../src/filtering/packageVersion.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range, satisfies } from 'semver';\n\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport type { ParsedConfigRule, ParsedRule } from '../config/types';\nimport { matchRules } from './matcher';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all blocked package versions.\n * If package or scope is blocked, then block all versions.\n *\n * TODO: consider adding a `prerelease` filter option to block/allow\n * prerelease versions independently. Currently prereleases are matched by\n * semver ranges with `includePrerelease: true`, but there's no dedicated toggle.\n *\n * Example config (not yet implemented):\n *   block:\n *     - package: 'foo'\n *       prerelease: true    # block 1.0.0-beta.1, 2.0.0-rc.1, keep 1.0.0, 2.0.0\n *     - package: 'bar'\n *       prerelease: false   # block 1.0.0, 2.0.0, keep 1.0.0-beta.1\n *\n * Today the only workaround is using awkward ranges like \">=1.0.0-0 <1.0.0\".\n */\nexport function filterBlockedVersions(\n  manifest: Manifest,\n  blockRules: Map<string, ParsedRule>,\n  allowRules: Map<string, ParsedRule>,\n  logger: Logger\n): Manifest {\n  const allowMatch = matchRules(manifest, allowRules);\n  if (\n    allowMatch &&\n    (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE)\n  ) {\n    // An entire scope or package is whitelisted\n    logger.trace({ name: manifest.name }, 'package @{name} is allow-listed, skipping block rules');\n    return manifest;\n  }\n\n  const blockMatch = matchRules(manifest, blockRules);\n  if (!blockMatch) {\n    // No rule is blocking this package\n    return manifest;\n  }\n\n  logger.trace(\n    { name: manifest.name, type: blockMatch.type },\n    'block rule matched for @{name} (type: @{type})'\n  );\n\n  const whitelistedVersions: string[] = allowMatch ? allowMatch.versions : [];\n  let blockRule: ParsedConfigRule = {\n    versions: [new Range('*')],\n    strategy: 'block',\n  };\n\n  if (blockMatch.type === MatchType.SCOPE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (scope %s blocked)', manifest.name, blockMatch.scope);\n      logger.trace(\n        { name: manifest.name, scope: blockMatch.scope },\n        'all versions of @{name} blocked (scope @{scope})'\n      );\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All packages in scope ${blockMatch.scope} are blocked by rule`,\n      };\n    }\n  } else if (blockMatch.type === MatchType.PACKAGE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (package blocked)', manifest.name);\n      logger.trace({ name: manifest.name }, 'all versions of @{name} blocked (package rule)');\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All package versions are blocked by rule`,\n      };\n    }\n  } else {\n    blockRule = { ...blockRule, ...blockMatch.rule };\n  }\n\n  const versionRanges = blockRule.versions;\n\n  if (blockRule.strategy === 'block') {\n    const blockedVersions = blockMatch.versions.filter((v) => !whitelistedVersions.includes(v));\n    for (const version of blockedVersions) {\n      delete manifest.versions[version];\n    }\n\n    if (blockedVersions.length > 0) {\n      debug(\n        'blocked %d versions of %s: %o',\n        blockedVersions.length,\n        manifest.name,\n        blockedVersions\n      );\n      logger.trace(\n        {\n          name: manifest.name,\n          count: blockedVersions.length,\n          versions: blockedVersions.join(', '),\n        },\n        '@{count} versions of @{name} blocked: @{versions}'\n      );\n      // Add debug info for devs\n      manifest.readme =\n        (manifest.readme || '') +\n        `\\nSome versions(${blockedVersions.length}) of package are blocked by rules: ${versionRanges.map(\n          (range) => range.raw\n        )}`;\n    }\n\n    return manifest;\n  }\n\n  // Process block rule strategy 'replace'.\n  // We assume that the order of versions is already sorted.\n  const nonBlockedVersions = { ...manifest.versions };\n  const newVersionsMapping: Record<string, string | null> = {};\n\n  versionRanges.forEach((versionRange) => {\n    const allVersions = Object.keys(nonBlockedVersions);\n\n    let lastNonBlockedVersion: string | null = null;\n\n    allVersions.forEach((version) => {\n      if (\n        !whitelistedVersions.includes(version) &&\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        delete nonBlockedVersions[version];\n        newVersionsMapping[version] = lastNonBlockedVersion;\n      } else {\n        lastNonBlockedVersion = version;\n      }\n    });\n  });\n\n  debug('replacing versions for %s: %o', manifest.name, newVersionsMapping);\n\n  const removedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace === null\n  ) as [string, null][];\n  const replacedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace !== null\n  ) as [string, string][];\n\n  removedVersions.forEach(([version]) => {\n    debug('no version to replace %s in %s', version, manifest.name);\n    logger.trace(\n      { name: manifest.name, version },\n      'version @{version} of @{name} removed (no replacement available)'\n    );\n    delete manifest.versions[version];\n  });\n\n  replacedVersions.forEach(([version, replaceVersion]) => {\n    logger.trace(\n      { name: manifest.name, version, replaceVersion },\n      'version @{version} of @{name} replaced with @{replaceVersion}'\n    );\n    manifest.versions[version] = {\n      ...manifest.versions[replaceVersion],\n      version,\n    };\n  });\n\n  if (removedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package could not be replaced and thus are fully blocked (${removedVersions.length}):` +\n      ` ${removedVersions.map((a) => a[0])}`;\n  }\n\n  if (replacedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package are replaced by other(${replacedVersions.length}):` +\n      ` ${replacedVersions.map((a) => `${a[0]} => ${a[1]}`)}`;\n  }\n\n  return manifest;\n}\n"],"mappings":"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"}
+{"version":3,"file":"packageVersion.js","names":[],"sources":["../../src/filtering/packageVersion.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range, satisfies } from 'semver';\n\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport type { ParsedConfigRule, ParsedRule } from '../config/types';\nimport { matchRules, resolveAllowList } from './matcher';\nimport type { MatchResult } from './types';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all blocked package versions.\n * If package or scope is blocked, then block all versions.\n *\n * TODO: consider adding a `prerelease` filter option to block/allow\n * prerelease versions independently. Currently prereleases are matched by\n * semver ranges with `includePrerelease: true`, but there's no dedicated toggle.\n *\n * Example config (not yet implemented):\n *   block:\n *     - package: 'foo'\n *       prerelease: true    # block 1.0.0-beta.1, 2.0.0-rc.1, keep 1.0.0, 2.0.0\n *     - package: 'bar'\n *       prerelease: false   # block 1.0.0, 2.0.0, keep 1.0.0-beta.1\n *\n * Today the only workaround is using awkward ranges like \">=1.0.0-0 <1.0.0\".\n */\nexport function filterBlockedVersions(\n  manifest: Manifest,\n  blockRules: Map<string, ParsedRule>,\n  allowMatch: MatchResult | undefined,\n  logger: Logger\n): Manifest {\n  const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);\n  if (allowAll) {\n    // An entire scope or package is whitelisted\n    logger.trace({ name: manifest.name }, 'package @{name} is allow-listed, skipping block rules');\n    return manifest;\n  }\n\n  const blockMatch = matchRules(manifest, blockRules);\n  if (!blockMatch) {\n    // No rule is blocking this package\n    return manifest;\n  }\n\n  logger.trace(\n    { name: manifest.name, type: blockMatch.type },\n    'block rule matched for @{name} (type: @{type})'\n  );\n\n  let blockRule: ParsedConfigRule = {\n    versions: [new Range('*')],\n    strategy: 'block',\n  };\n\n  if (blockMatch.type === MatchType.SCOPE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (scope %s blocked)', manifest.name, blockMatch.scope);\n      logger.trace(\n        { name: manifest.name, scope: blockMatch.scope },\n        'all versions of @{name} blocked (scope @{scope})'\n      );\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All packages in scope ${blockMatch.scope} are blocked by rule`,\n      };\n    }\n  } else if (blockMatch.type === MatchType.PACKAGE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (package blocked)', manifest.name);\n      logger.trace({ name: manifest.name }, 'all versions of @{name} blocked (package rule)');\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All package versions are blocked by rule`,\n      };\n    }\n  } else {\n    blockRule = { ...blockRule, ...blockMatch.rule };\n  }\n\n  const versionRanges = blockRule.versions;\n\n  if (blockRule.strategy === 'block') {\n    const blockedVersions = blockMatch.versions.filter((v) => !whitelistedVersions.includes(v));\n    for (const version of blockedVersions) {\n      delete manifest.versions[version];\n    }\n\n    if (blockedVersions.length > 0) {\n      debug(\n        'blocked %d versions of %s: %o',\n        blockedVersions.length,\n        manifest.name,\n        blockedVersions\n      );\n      logger.trace(\n        {\n          name: manifest.name,\n          count: blockedVersions.length,\n          versions: blockedVersions.join(', '),\n        },\n        '@{count} versions of @{name} blocked: @{versions}'\n      );\n      // Add debug info for devs\n      manifest.readme =\n        (manifest.readme || '') +\n        `\\nSome versions(${blockedVersions.length}) of package are blocked by rules: ${versionRanges.map(\n          (range) => range.raw\n        )}`;\n    }\n\n    return manifest;\n  }\n\n  // Process block rule strategy 'replace'.\n  // We assume that the order of versions is already sorted.\n  const nonBlockedVersions = { ...manifest.versions };\n  const newVersionsMapping: Record<string, string | null> = {};\n\n  versionRanges.forEach((versionRange) => {\n    const allVersions = Object.keys(nonBlockedVersions);\n\n    let lastNonBlockedVersion: string | null = null;\n\n    allVersions.forEach((version) => {\n      if (\n        !whitelistedVersions.includes(version) &&\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        delete nonBlockedVersions[version];\n        newVersionsMapping[version] = lastNonBlockedVersion;\n      } else {\n        lastNonBlockedVersion = version;\n      }\n    });\n  });\n\n  debug('replacing versions for %s: %o', manifest.name, newVersionsMapping);\n\n  const removedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace === null\n  ) as [string, null][];\n  const replacedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace !== null\n  ) as [string, string][];\n\n  removedVersions.forEach(([version]) => {\n    debug('no version to replace %s in %s', version, manifest.name);\n    logger.trace(\n      { name: manifest.name, version },\n      'version @{version} of @{name} removed (no replacement available)'\n    );\n    delete manifest.versions[version];\n  });\n\n  replacedVersions.forEach(([version, replaceVersion]) => {\n    logger.trace(\n      { name: manifest.name, version, replaceVersion },\n      'version @{version} of @{name} replaced with @{replaceVersion}'\n    );\n    manifest.versions[version] = {\n      ...manifest.versions[replaceVersion],\n      version,\n    };\n  });\n\n  if (removedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package could not be replaced and thus are fully blocked (${removedVersions.length}):` +\n      ` ${removedVersions.map((a) => a[0])}`;\n  }\n\n  if (replacedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package are replaced by other(${replacedVersions.length}):` +\n      ` ${replacedVersions.map((a) => `${a[0]} => ${a[1]}`)}`;\n  }\n\n  return manifest;\n}\n"],"mappings":";;;;;;;AAUA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;;;;;;;;;;;;;;;;;;AAmBjE,SAAgB,sBACd,UACA,YACA,YACA,QACU;CACV,MAAM,EAAE,UAAU,wBAAwB,gBAAA,iBAAiB,UAAU;CACrE,IAAI,UAAU;EAEZ,OAAO,MAAM,EAAE,MAAM,SAAS,KAAK,GAAG,uDAAuD;EAC7F,OAAO;CACT;CAEA,MAAM,aAAa,gBAAA,WAAW,UAAU,UAAU;CAClD,IAAI,CAAC,YAEH,OAAO;CAGT,OAAO,MACL;EAAE,MAAM,SAAS;EAAM,MAAM,WAAW;CAAK,GAC7C,gDACF;CAEA,IAAI,YAA8B;EAChC,UAAU,CAAC,IAAI,OAAA,MAAM,GAAG,CAAC;EACzB,UAAU;CACZ;CAEA,IAAI,WAAW,SAAS,cAAA,UAAU;MAC5B,oBAAoB,WAAW,GAAG;GACpC,QAAM,kDAAkD,SAAS,MAAM,WAAW,KAAK;GACvF,OAAO,MACL;IAAE,MAAM,SAAS;IAAM,OAAO,WAAW;GAAM,GAC/C,kDACF;GACA,OAAO;IACL,GAAG;IACH,UAAU,CAAC;IACX,QAAQ,yBAAyB,WAAW,MAAM;GACpD;EACF;QACK,IAAI,WAAW,SAAS,cAAA,UAAU;MACnC,oBAAoB,WAAW,GAAG;GACpC,QAAM,iDAAiD,SAAS,IAAI;GACpE,OAAO,MAAM,EAAE,MAAM,SAAS,KAAK,GAAG,gDAAgD;GACtF,OAAO;IACL,GAAG;IACH,UAAU,CAAC;IACX,QAAQ;GACV;EACF;QAEA,YAAY;EAAE,GAAG;EAAW,GAAG,WAAW;CAAK;CAGjD,MAAM,gBAAgB,UAAU;CAEhC,IAAI,UAAU,aAAa,SAAS;EAClC,MAAM,kBAAkB,WAAW,SAAS,QAAQ,MAAM,CAAC,oBAAoB,SAAS,CAAC,CAAC;EAC1F,KAAK,MAAM,WAAW,iBACpB,OAAO,SAAS,SAAS;EAG3B,IAAI,gBAAgB,SAAS,GAAG;GAC9B,QACE,iCACA,gBAAgB,QAChB,SAAS,MACT,eACF;GACA,OAAO,MACL;IACE,MAAM,SAAS;IACf,OAAO,gBAAgB;IACvB,UAAU,gBAAgB,KAAK,IAAI;GACrC,GACA,mDACF;GAEA,SAAS,UACN,SAAS,UAAU,MACpB,mBAAmB,gBAAgB,OAAO,qCAAqC,cAAc,KAC1F,UAAU,MAAM,GACnB;EACJ;EAEA,OAAO;CACT;CAIA,MAAM,qBAAqB,EAAE,GAAG,SAAS,SAAS;CAClD,MAAM,qBAAoD,CAAC;CAE3D,cAAc,SAAS,iBAAiB;EACtC,MAAM,cAAc,OAAO,KAAK,kBAAkB;EAElD,IAAI,wBAAuC;EAE3C,YAAY,SAAS,YAAY;GAC/B,IACE,CAAC,oBAAoB,SAAS,OAAO,MAAA,GAAA,OAAA,UAAA,CAC3B,SAAS,cAAc;IAC/B,mBAAmB;IACnB,OAAO;GACT,CAAC,GACD;IACA,OAAO,mBAAmB;IAC1B,mBAAmB,WAAW;GAChC,OACE,wBAAwB;EAE5B,CAAC;CACH,CAAC;CAED,QAAM,iCAAiC,SAAS,MAAM,kBAAkB;CAExE,MAAM,kBAAkB,OAAO,QAAQ,kBAAkB,CAAC,CAAC,QACxD,CAAC,GAAG,aAAa,YAAY,IAChC;CACA,MAAM,mBAAmB,OAAO,QAAQ,kBAAkB,CAAC,CAAC,QACzD,CAAC,GAAG,aAAa,YAAY,IAChC;CAEA,gBAAgB,SAAS,CAAC,aAAa;EACrC,QAAM,kCAAkC,SAAS,SAAS,IAAI;EAC9D,OAAO,MACL;GAAE,MAAM,SAAS;GAAM;EAAQ,GAC/B,kEACF;EACA,OAAO,SAAS,SAAS;CAC3B,CAAC;CAED,iBAAiB,SAAS,CAAC,SAAS,oBAAoB;EACtD,OAAO,MACL;GAAE,MAAM,SAAS;GAAM;GAAS;EAAe,GAC/C,+DACF;EACA,SAAS,SAAS,WAAW;GAC3B,GAAG,SAAS,SAAS;GACrB;EACF;CACF,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,SAAS,UACP,gFAAgF,gBAAgB,OAAO,KACnG,gBAAgB,KAAK,MAAM,EAAE,EAAE;CAGvC,IAAI,iBAAiB,SAAS,GAC5B,SAAS,UACP,oDAAoD,iBAAiB,OAAO,KACxE,iBAAiB,KAAK,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI;CAGxD,OAAO;AACT"}

package/build/filtering/packageVersion.mjs

@@ -1,5 +1,5 @@
 import { MatchType } from "./types.mjs";
-import { matchRules } from "./matcher.mjs";
+import { matchRules, resolveAllowList } from "./matcher.mjs";
 import buildDebug from "debug";
 import { Range, satisfies } from "semver";
 //#region src/filtering/packageVersion.ts
@@ -21,9 +21,9 @@ var debug = buildDebug("verdaccio:plugin:package-filter:filter");
 *
 * Today the only workaround is using awkward ranges like ">=1.0.0-0 <1.0.0".
 */
-function filterBlockedVersions(manifest, blockRules, allowRules, logger) {
-	const allowMatch = matchRules(manifest, allowRules);
-	if (allowMatch && (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE)) {
+function filterBlockedVersions(manifest, blockRules, allowMatch, logger) {
+	const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);
+	if (allowAll) {
 		logger.trace({ name: manifest.name }, "package @{name} is allow-listed, skipping block rules");
 		return manifest;
 	}
@@ -33,7 +33,6 @@ function filterBlockedVersions(manifest, blockRules, allowRules, logger) {
 		name: manifest.name,
 		type: blockMatch.type
 	}, "block rule matched for @{name} (type: @{type})");
-	const whitelistedVersions = allowMatch ? allowMatch.versions : [];
 	let blockRule = {
 		versions: [new Range("*")],
 		strategy: "block"

package/build/filtering/packageVersion.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.mjs","names":[],"sources":["../../src/filtering/packageVersion.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range, satisfies } from 'semver';\n\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport type { ParsedConfigRule, ParsedRule } from '../config/types';\nimport { matchRules } from './matcher';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all blocked package versions.\n * If package or scope is blocked, then block all versions.\n *\n * TODO: consider adding a `prerelease` filter option to block/allow\n * prerelease versions independently. Currently prereleases are matched by\n * semver ranges with `includePrerelease: true`, but there's no dedicated toggle.\n *\n * Example config (not yet implemented):\n *   block:\n *     - package: 'foo'\n *       prerelease: true    # block 1.0.0-beta.1, 2.0.0-rc.1, keep 1.0.0, 2.0.0\n *     - package: 'bar'\n *       prerelease: false   # block 1.0.0, 2.0.0, keep 1.0.0-beta.1\n *\n * Today the only workaround is using awkward ranges like \">=1.0.0-0 <1.0.0\".\n */\nexport function filterBlockedVersions(\n  manifest: Manifest,\n  blockRules: Map<string, ParsedRule>,\n  allowRules: Map<string, ParsedRule>,\n  logger: Logger\n): Manifest {\n  const allowMatch = matchRules(manifest, allowRules);\n  if (\n    allowMatch &&\n    (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE)\n  ) {\n    // An entire scope or package is whitelisted\n    logger.trace({ name: manifest.name }, 'package @{name} is allow-listed, skipping block rules');\n    return manifest;\n  }\n\n  const blockMatch = matchRules(manifest, blockRules);\n  if (!blockMatch) {\n    // No rule is blocking this package\n    return manifest;\n  }\n\n  logger.trace(\n    { name: manifest.name, type: blockMatch.type },\n    'block rule matched for @{name} (type: @{type})'\n  );\n\n  const whitelistedVersions: string[] = allowMatch ? allowMatch.versions : [];\n  let blockRule: ParsedConfigRule = {\n    versions: [new Range('*')],\n    strategy: 'block',\n  };\n\n  if (blockMatch.type === MatchType.SCOPE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (scope %s blocked)', manifest.name, blockMatch.scope);\n      logger.trace(\n        { name: manifest.name, scope: blockMatch.scope },\n        'all versions of @{name} blocked (scope @{scope})'\n      );\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All packages in scope ${blockMatch.scope} are blocked by rule`,\n      };\n    }\n  } else if (blockMatch.type === MatchType.PACKAGE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (package blocked)', manifest.name);\n      logger.trace({ name: manifest.name }, 'all versions of @{name} blocked (package rule)');\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All package versions are blocked by rule`,\n      };\n    }\n  } else {\n    blockRule = { ...blockRule, ...blockMatch.rule };\n  }\n\n  const versionRanges = blockRule.versions;\n\n  if (blockRule.strategy === 'block') {\n    const blockedVersions = blockMatch.versions.filter((v) => !whitelistedVersions.includes(v));\n    for (const version of blockedVersions) {\n      delete manifest.versions[version];\n    }\n\n    if (blockedVersions.length > 0) {\n      debug(\n        'blocked %d versions of %s: %o',\n        blockedVersions.length,\n        manifest.name,\n        blockedVersions\n      );\n      logger.trace(\n        {\n          name: manifest.name,\n          count: blockedVersions.length,\n          versions: blockedVersions.join(', '),\n        },\n        '@{count} versions of @{name} blocked: @{versions}'\n      );\n      // Add debug info for devs\n      manifest.readme =\n        (manifest.readme || '') +\n        `\\nSome versions(${blockedVersions.length}) of package are blocked by rules: ${versionRanges.map(\n          (range) => range.raw\n        )}`;\n    }\n\n    return manifest;\n  }\n\n  // Process block rule strategy 'replace'.\n  // We assume that the order of versions is already sorted.\n  const nonBlockedVersions = { ...manifest.versions };\n  const newVersionsMapping: Record<string, string | null> = {};\n\n  versionRanges.forEach((versionRange) => {\n    const allVersions = Object.keys(nonBlockedVersions);\n\n    let lastNonBlockedVersion: string | null = null;\n\n    allVersions.forEach((version) => {\n      if (\n        !whitelistedVersions.includes(version) &&\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        delete nonBlockedVersions[version];\n        newVersionsMapping[version] = lastNonBlockedVersion;\n      } else {\n        lastNonBlockedVersion = version;\n      }\n    });\n  });\n\n  debug('replacing versions for %s: %o', manifest.name, newVersionsMapping);\n\n  const removedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace === null\n  ) as [string, null][];\n  const replacedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace !== null\n  ) as [string, string][];\n\n  removedVersions.forEach(([version]) => {\n    debug('no version to replace %s in %s', version, manifest.name);\n    logger.trace(\n      { name: manifest.name, version },\n      'version @{version} of @{name} removed (no replacement available)'\n    );\n    delete manifest.versions[version];\n  });\n\n  replacedVersions.forEach(([version, replaceVersion]) => {\n    logger.trace(\n      { name: manifest.name, version, replaceVersion },\n      'version @{version} of @{name} replaced with @{replaceVersion}'\n    );\n    manifest.versions[version] = {\n      ...manifest.versions[replaceVersion],\n      version,\n    };\n  });\n\n  if (removedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package could not be replaced and thus are fully blocked (${removedVersions.length}):` +\n      ` ${removedVersions.map((a) => a[0])}`;\n  }\n\n  if (replacedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package are replaced by other(${replacedVersions.length}):` +\n      ` ${replacedVersions.map((a) => `${a[0]} => ${a[1]}`)}`;\n  }\n\n  return manifest;\n}\n"],"mappings":";;;;;AASA,IAAM,QAAQ,WAAW,wCAAwC;;;;;;;;;;;;;;;;;;AAmBjE,SAAgB,sBACd,UACA,YACA,YACA,QACU;CACV,MAAM,aAAa,WAAW,UAAU,UAAU;CAClD,IACE,eACC,WAAW,SAAS,UAAU,SAAS,WAAW,SAAS,UAAU,UACtE;EAEA,OAAO,MAAM,EAAE,MAAM,SAAS,KAAK,GAAG,uDAAuD;EAC7F,OAAO;CACT;CAEA,MAAM,aAAa,WAAW,UAAU,UAAU;CAClD,IAAI,CAAC,YAEH,OAAO;CAGT,OAAO,MACL;EAAE,MAAM,SAAS;EAAM,MAAM,WAAW;CAAK,GAC7C,gDACF;CAEA,MAAM,sBAAgC,aAAa,WAAW,WAAW,CAAC;CAC1E,IAAI,YAA8B;EAChC,UAAU,CAAC,IAAI,MAAM,GAAG,CAAC;EACzB,UAAU;CACZ;CAEA,IAAI,WAAW,SAAS,UAAU;MAC5B,oBAAoB,WAAW,GAAG;GACpC,MAAM,kDAAkD,SAAS,MAAM,WAAW,KAAK;GACvF,OAAO,MACL;IAAE,MAAM,SAAS;IAAM,OAAO,WAAW;GAAM,GAC/C,kDACF;GACA,OAAO;IACL,GAAG;IACH,UAAU,CAAC;IACX,QAAQ,yBAAyB,WAAW,MAAM;GACpD;EACF;QACK,IAAI,WAAW,SAAS,UAAU;MACnC,oBAAoB,WAAW,GAAG;GACpC,MAAM,iDAAiD,SAAS,IAAI;GACpE,OAAO,MAAM,EAAE,MAAM,SAAS,KAAK,GAAG,gDAAgD;GACtF,OAAO;IACL,GAAG;IACH,UAAU,CAAC;IACX,QAAQ;GACV;EACF;QAEA,YAAY;EAAE,GAAG;EAAW,GAAG,WAAW;CAAK;CAGjD,MAAM,gBAAgB,UAAU;CAEhC,IAAI,UAAU,aAAa,SAAS;EAClC,MAAM,kBAAkB,WAAW,SAAS,QAAQ,MAAM,CAAC,oBAAoB,SAAS,CAAC,CAAC;EAC1F,KAAK,MAAM,WAAW,iBACpB,OAAO,SAAS,SAAS;EAG3B,IAAI,gBAAgB,SAAS,GAAG;GAC9B,MACE,iCACA,gBAAgB,QAChB,SAAS,MACT,eACF;GACA,OAAO,MACL;IACE,MAAM,SAAS;IACf,OAAO,gBAAgB;IACvB,UAAU,gBAAgB,KAAK,IAAI;GACrC,GACA,mDACF;GAEA,SAAS,UACN,SAAS,UAAU,MACpB,mBAAmB,gBAAgB,OAAO,qCAAqC,cAAc,KAC1F,UAAU,MAAM,GACnB;EACJ;EAEA,OAAO;CACT;CAIA,MAAM,qBAAqB,EAAE,GAAG,SAAS,SAAS;CAClD,MAAM,qBAAoD,CAAC;CAE3D,cAAc,SAAS,iBAAiB;EACtC,MAAM,cAAc,OAAO,KAAK,kBAAkB;EAElD,IAAI,wBAAuC;EAE3C,YAAY,SAAS,YAAY;GAC/B,IACE,CAAC,oBAAoB,SAAS,OAAO,KACrC,UAAU,SAAS,cAAc;IAC/B,mBAAmB;IACnB,OAAO;GACT,CAAC,GACD;IACA,OAAO,mBAAmB;IAC1B,mBAAmB,WAAW;GAChC,OACE,wBAAwB;EAE5B,CAAC;CACH,CAAC;CAED,MAAM,iCAAiC,SAAS,MAAM,kBAAkB;CAExE,MAAM,kBAAkB,OAAO,QAAQ,kBAAkB,CAAC,CAAC,QACxD,CAAC,GAAG,aAAa,YAAY,IAChC;CACA,MAAM,mBAAmB,OAAO,QAAQ,kBAAkB,CAAC,CAAC,QACzD,CAAC,GAAG,aAAa,YAAY,IAChC;CAEA,gBAAgB,SAAS,CAAC,aAAa;EACrC,MAAM,kCAAkC,SAAS,SAAS,IAAI;EAC9D,OAAO,MACL;GAAE,MAAM,SAAS;GAAM;EAAQ,GAC/B,kEACF;EACA,OAAO,SAAS,SAAS;CAC3B,CAAC;CAED,iBAAiB,SAAS,CAAC,SAAS,oBAAoB;EACtD,OAAO,MACL;GAAE,MAAM,SAAS;GAAM;GAAS;EAAe,GAC/C,+DACF;EACA,SAAS,SAAS,WAAW;GAC3B,GAAG,SAAS,SAAS;GACrB;EACF;CACF,CAAC;CAED,IAAI,gBAAgB,SAAS,GAC3B,SAAS,UACP,gFAAgF,gBAAgB,OAAO,KACnG,gBAAgB,KAAK,MAAM,EAAE,EAAE;CAGvC,IAAI,iBAAiB,SAAS,GAC5B,SAAS,UACP,oDAAoD,iBAAiB,OAAO,KACxE,iBAAiB,KAAK,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI;CAGxD,OAAO;AACT"}
+{"version":3,"file":"packageVersion.mjs","names":[],"sources":["../../src/filtering/packageVersion.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport { Range, satisfies } from 'semver';\n\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport type { ParsedConfigRule, ParsedRule } from '../config/types';\nimport { matchRules, resolveAllowList } from './matcher';\nimport type { MatchResult } from './types';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all blocked package versions.\n * If package or scope is blocked, then block all versions.\n *\n * TODO: consider adding a `prerelease` filter option to block/allow\n * prerelease versions independently. Currently prereleases are matched by\n * semver ranges with `includePrerelease: true`, but there's no dedicated toggle.\n *\n * Example config (not yet implemented):\n *   block:\n *     - package: 'foo'\n *       prerelease: true    # block 1.0.0-beta.1, 2.0.0-rc.1, keep 1.0.0, 2.0.0\n *     - package: 'bar'\n *       prerelease: false   # block 1.0.0, 2.0.0, keep 1.0.0-beta.1\n *\n * Today the only workaround is using awkward ranges like \">=1.0.0-0 <1.0.0\".\n */\nexport function filterBlockedVersions(\n  manifest: Manifest,\n  blockRules: Map<string, ParsedRule>,\n  allowMatch: MatchResult | undefined,\n  logger: Logger\n): Manifest {\n  const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);\n  if (allowAll) {\n    // An entire scope or package is whitelisted\n    logger.trace({ name: manifest.name }, 'package @{name} is allow-listed, skipping block rules');\n    return manifest;\n  }\n\n  const blockMatch = matchRules(manifest, blockRules);\n  if (!blockMatch) {\n    // No rule is blocking this package\n    return manifest;\n  }\n\n  logger.trace(\n    { name: manifest.name, type: blockMatch.type },\n    'block rule matched for @{name} (type: @{type})'\n  );\n\n  let blockRule: ParsedConfigRule = {\n    versions: [new Range('*')],\n    strategy: 'block',\n  };\n\n  if (blockMatch.type === MatchType.SCOPE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (scope %s blocked)', manifest.name, blockMatch.scope);\n      logger.trace(\n        { name: manifest.name, scope: blockMatch.scope },\n        'all versions of @{name} blocked (scope @{scope})'\n      );\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All packages in scope ${blockMatch.scope} are blocked by rule`,\n      };\n    }\n  } else if (blockMatch.type === MatchType.PACKAGE) {\n    if (whitelistedVersions.length === 0) {\n      debug('blocking all versions of %s (package blocked)', manifest.name);\n      logger.trace({ name: manifest.name }, 'all versions of @{name} blocked (package rule)');\n      return {\n        ...manifest,\n        versions: {},\n        readme: `All package versions are blocked by rule`,\n      };\n    }\n  } else {\n    blockRule = { ...blockRule, ...blockMatch.rule };\n  }\n\n  const versionRanges = blockRule.versions;\n\n  if (blockRule.strategy === 'block') {\n    const blockedVersions = blockMatch.versions.filter((v) => !whitelistedVersions.includes(v));\n    for (const version of blockedVersions) {\n      delete manifest.versions[version];\n    }\n\n    if (blockedVersions.length > 0) {\n      debug(\n        'blocked %d versions of %s: %o',\n        blockedVersions.length,\n        manifest.name,\n        blockedVersions\n      );\n      logger.trace(\n        {\n          name: manifest.name,\n          count: blockedVersions.length,\n          versions: blockedVersions.join(', '),\n        },\n        '@{count} versions of @{name} blocked: @{versions}'\n      );\n      // Add debug info for devs\n      manifest.readme =\n        (manifest.readme || '') +\n        `\\nSome versions(${blockedVersions.length}) of package are blocked by rules: ${versionRanges.map(\n          (range) => range.raw\n        )}`;\n    }\n\n    return manifest;\n  }\n\n  // Process block rule strategy 'replace'.\n  // We assume that the order of versions is already sorted.\n  const nonBlockedVersions = { ...manifest.versions };\n  const newVersionsMapping: Record<string, string | null> = {};\n\n  versionRanges.forEach((versionRange) => {\n    const allVersions = Object.keys(nonBlockedVersions);\n\n    let lastNonBlockedVersion: string | null = null;\n\n    allVersions.forEach((version) => {\n      if (\n        !whitelistedVersions.includes(version) &&\n        satisfies(version, versionRange, {\n          includePrerelease: true,\n          loose: true,\n        })\n      ) {\n        delete nonBlockedVersions[version];\n        newVersionsMapping[version] = lastNonBlockedVersion;\n      } else {\n        lastNonBlockedVersion = version;\n      }\n    });\n  });\n\n  debug('replacing versions for %s: %o', manifest.name, newVersionsMapping);\n\n  const removedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace === null\n  ) as [string, null][];\n  const replacedVersions = Object.entries(newVersionsMapping).filter(\n    ([_, replace]) => replace !== null\n  ) as [string, string][];\n\n  removedVersions.forEach(([version]) => {\n    debug('no version to replace %s in %s', version, manifest.name);\n    logger.trace(\n      { name: manifest.name, version },\n      'version @{version} of @{name} removed (no replacement available)'\n    );\n    delete manifest.versions[version];\n  });\n\n  replacedVersions.forEach(([version, replaceVersion]) => {\n    logger.trace(\n      { name: manifest.name, version, replaceVersion },\n      'version @{version} of @{name} replaced with @{replaceVersion}'\n    );\n    manifest.versions[version] = {\n      ...manifest.versions[replaceVersion],\n      version,\n    };\n  });\n\n  if (removedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package could not be replaced and thus are fully blocked (${removedVersions.length}):` +\n      ` ${removedVersions.map((a) => a[0])}`;\n  }\n\n  if (replacedVersions.length > 0) {\n    manifest.readme +=\n      `\\nSome versions of package are replaced by other(${replacedVersions.length}):` +\n      ` ${replacedVersions.map((a) => `${a[0]} => ${a[1]}`)}`;\n  }\n\n  return manifest;\n}\n"],"mappings":"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"}

package/build/filtering/publishDate.d.ts

@@ -1,6 +1,6 @@
 import type { Manifest } from '@verdaccio/types';
-import type { ParsedRule } from '../config/types';
+import type { MatchResult } from './types';
 /**
  * Filter out all package versions that were published after dateThreshold.
  */
-export declare function filterVersionsByPublishDate(manifest: Manifest, dateThreshold: Date, allowRules: Map<string, ParsedRule>): Manifest;
+export declare function filterVersionsByPublishDate(manifest: Manifest, dateThreshold: Date, allowMatch: MatchResult | undefined): Manifest;

package/build/filtering/publishDate.js

@@ -1,5 +1,4 @@
 const require_runtime = require("../_virtual/_rolldown/runtime.js");
-const require_types = require("./types.js");
 const require_matcher = require("./matcher.js");
 let debug = require("debug");
 debug = require_runtime.__toESM(debug);
@@ -8,12 +7,11 @@ var debug$1 = (0, debug.default)("verdaccio:plugin:package-filter:filter");
 /**
 * Filter out all package versions that were published after dateThreshold.
 */
-function filterVersionsByPublishDate(manifest, dateThreshold, allowRules) {
-	const allowMatch = require_matcher.matchRules(manifest, allowRules);
-	if (allowMatch && (allowMatch.type === require_types.MatchType.SCOPE || allowMatch.type === require_types.MatchType.PACKAGE)) return manifest;
+function filterVersionsByPublishDate(manifest, dateThreshold, allowMatch) {
+	const { allowAll, whitelistedVersions } = require_matcher.resolveAllowList(allowMatch);
+	if (allowAll) return manifest;
 	const { versions, time, name } = manifest;
 	if (!time) throw new TypeError(`Time of publication was not provided for package ${name}`);
-	const whitelistedVersions = allowMatch ? allowMatch.versions : [];
 	const clearVersions = [];
 	Object.keys(versions).forEach((version) => {
 		if (whitelistedVersions.includes(version)) return;

package/build/filtering/publishDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"publishDate.js","names":[],"sources":["../../src/filtering/publishDate.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport type { ParsedRule } from '../config/types';\nimport { matchRules } from './matcher';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all package versions that were published after dateThreshold.\n */\nexport function filterVersionsByPublishDate(\n  manifest: Manifest,\n  dateThreshold: Date,\n  allowRules: Map<string, ParsedRule>\n): Manifest {\n  const allowMatch = matchRules(manifest, allowRules);\n  if (\n    allowMatch &&\n    (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE)\n  ) {\n    // An entire scope or package is whitelisted\n    return manifest;\n  }\n\n  const { versions, time, name } = manifest;\n\n  if (!time) {\n    throw new TypeError(`Time of publication was not provided for package ${name}`);\n  }\n\n  const whitelistedVersions: string[] = allowMatch ? allowMatch.versions : [];\n  const clearVersions: string[] = [];\n\n  Object.keys(versions).forEach((version) => {\n    if (whitelistedVersions.includes(version)) {\n      return;\n    }\n\n    const publishTime = time[version];\n\n    if (!publishTime) {\n      throw new TypeError(\n        `Time of publication was not provided for package ${name}, version ${version}`\n      );\n    }\n\n    if (new Date(publishTime) > dateThreshold) {\n      // clear untrusted version\n      clearVersions.push(version);\n    }\n  });\n\n  // delete version from versions\n  clearVersions.forEach((version) => {\n    delete manifest.versions[version];\n  });\n\n  if (clearVersions.length > 0) {\n    debug(\n      'date filter removed %d versions from %s: %o',\n      clearVersions.length,\n      manifest.name,\n      clearVersions\n    );\n  }\n\n  return manifest;\n}\n"],"mappings":";;;;;;AAQA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;;;;AAKjE,SAAgB,4BACd,UACA,eACA,YACU;CACV,MAAM,aAAa,gBAAA,WAAW,UAAU,UAAU;CAClD,IACE,eACC,WAAW,SAAS,cAAA,UAAU,SAAS,WAAW,SAAS,cAAA,UAAU,UAGtE,OAAO;CAGT,MAAM,EAAE,UAAU,MAAM,SAAS;CAEjC,IAAI,CAAC,MACH,MAAM,IAAI,UAAU,oDAAoD,MAAM;CAGhF,MAAM,sBAAgC,aAAa,WAAW,WAAW,CAAC;CAC1E,MAAM,gBAA0B,CAAC;CAEjC,OAAO,KAAK,QAAQ,CAAC,CAAC,SAAS,YAAY;EACzC,IAAI,oBAAoB,SAAS,OAAO,GACtC;EAGF,MAAM,cAAc,KAAK;EAEzB,IAAI,CAAC,aACH,MAAM,IAAI,UACR,oDAAoD,KAAK,YAAY,SACvE;EAGF,IAAI,IAAI,KAAK,WAAW,IAAI,eAE1B,cAAc,KAAK,OAAO;CAE9B,CAAC;CAGD,cAAc,SAAS,YAAY;EACjC,OAAO,SAAS,SAAS;CAC3B,CAAC;CAED,IAAI,cAAc,SAAS,GACzB,QACE,+CACA,cAAc,QACd,SAAS,MACT,aACF;CAGF,OAAO;AACT"}
+{"version":3,"file":"publishDate.js","names":[],"sources":["../../src/filtering/publishDate.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport { resolveAllowList } from './matcher';\nimport type { MatchResult } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all package versions that were published after dateThreshold.\n */\nexport function filterVersionsByPublishDate(\n  manifest: Manifest,\n  dateThreshold: Date,\n  allowMatch: MatchResult | undefined\n): Manifest {\n  const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);\n  if (allowAll) {\n    // An entire scope or package is whitelisted\n    return manifest;\n  }\n\n  const { versions, time, name } = manifest;\n\n  if (!time) {\n    throw new TypeError(`Time of publication was not provided for package ${name}`);\n  }\n\n  const clearVersions: string[] = [];\n\n  Object.keys(versions).forEach((version) => {\n    if (whitelistedVersions.includes(version)) {\n      return;\n    }\n\n    const publishTime = time[version];\n\n    if (!publishTime) {\n      throw new TypeError(\n        `Time of publication was not provided for package ${name}, version ${version}`\n      );\n    }\n\n    if (new Date(publishTime) > dateThreshold) {\n      // clear untrusted version\n      clearVersions.push(version);\n    }\n  });\n\n  // delete version from versions\n  clearVersions.forEach((version) => {\n    delete manifest.versions[version];\n  });\n\n  if (clearVersions.length > 0) {\n    debug(\n      'date filter removed %d versions from %s: %o',\n      clearVersions.length,\n      manifest.name,\n      clearVersions\n    );\n  }\n\n  return manifest;\n}\n"],"mappings":";;;;;AAOA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,wCAAwC;;;;AAKjE,SAAgB,4BACd,UACA,eACA,YACU;CACV,MAAM,EAAE,UAAU,wBAAwB,gBAAA,iBAAiB,UAAU;CACrE,IAAI,UAEF,OAAO;CAGT,MAAM,EAAE,UAAU,MAAM,SAAS;CAEjC,IAAI,CAAC,MACH,MAAM,IAAI,UAAU,oDAAoD,MAAM;CAGhF,MAAM,gBAA0B,CAAC;CAEjC,OAAO,KAAK,QAAQ,CAAC,CAAC,SAAS,YAAY;EACzC,IAAI,oBAAoB,SAAS,OAAO,GACtC;EAGF,MAAM,cAAc,KAAK;EAEzB,IAAI,CAAC,aACH,MAAM,IAAI,UACR,oDAAoD,KAAK,YAAY,SACvE;EAGF,IAAI,IAAI,KAAK,WAAW,IAAI,eAE1B,cAAc,KAAK,OAAO;CAE9B,CAAC;CAGD,cAAc,SAAS,YAAY;EACjC,OAAO,SAAS,SAAS;CAC3B,CAAC;CAED,IAAI,cAAc,SAAS,GACzB,QACE,+CACA,cAAc,QACd,SAAS,MACT,aACF;CAGF,OAAO;AACT"}

package/build/filtering/publishDate.mjs

@@ -1,17 +1,15 @@
-import { MatchType } from "./types.mjs";
-import { matchRules } from "./matcher.mjs";
+import { resolveAllowList } from "./matcher.mjs";
 import buildDebug from "debug";
 //#region src/filtering/publishDate.ts
 var debug = buildDebug("verdaccio:plugin:package-filter:filter");
 /**
 * Filter out all package versions that were published after dateThreshold.
 */
-function filterVersionsByPublishDate(manifest, dateThreshold, allowRules) {
-	const allowMatch = matchRules(manifest, allowRules);
-	if (allowMatch && (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE)) return manifest;
+function filterVersionsByPublishDate(manifest, dateThreshold, allowMatch) {
+	const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);
+	if (allowAll) return manifest;
 	const { versions, time, name } = manifest;
 	if (!time) throw new TypeError(`Time of publication was not provided for package ${name}`);
-	const whitelistedVersions = allowMatch ? allowMatch.versions : [];
 	const clearVersions = [];
 	Object.keys(versions).forEach((version) => {
 		if (whitelistedVersions.includes(version)) return;

package/build/filtering/publishDate.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"publishDate.mjs","names":[],"sources":["../../src/filtering/publishDate.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport type { ParsedRule } from '../config/types';\nimport { matchRules } from './matcher';\nimport { MatchType } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all package versions that were published after dateThreshold.\n */\nexport function filterVersionsByPublishDate(\n  manifest: Manifest,\n  dateThreshold: Date,\n  allowRules: Map<string, ParsedRule>\n): Manifest {\n  const allowMatch = matchRules(manifest, allowRules);\n  if (\n    allowMatch &&\n    (allowMatch.type === MatchType.SCOPE || allowMatch.type === MatchType.PACKAGE)\n  ) {\n    // An entire scope or package is whitelisted\n    return manifest;\n  }\n\n  const { versions, time, name } = manifest;\n\n  if (!time) {\n    throw new TypeError(`Time of publication was not provided for package ${name}`);\n  }\n\n  const whitelistedVersions: string[] = allowMatch ? allowMatch.versions : [];\n  const clearVersions: string[] = [];\n\n  Object.keys(versions).forEach((version) => {\n    if (whitelistedVersions.includes(version)) {\n      return;\n    }\n\n    const publishTime = time[version];\n\n    if (!publishTime) {\n      throw new TypeError(\n        `Time of publication was not provided for package ${name}, version ${version}`\n      );\n    }\n\n    if (new Date(publishTime) > dateThreshold) {\n      // clear untrusted version\n      clearVersions.push(version);\n    }\n  });\n\n  // delete version from versions\n  clearVersions.forEach((version) => {\n    delete manifest.versions[version];\n  });\n\n  if (clearVersions.length > 0) {\n    debug(\n      'date filter removed %d versions from %s: %o',\n      clearVersions.length,\n      manifest.name,\n      clearVersions\n    );\n  }\n\n  return manifest;\n}\n"],"mappings":";;;;AAQA,IAAM,QAAQ,WAAW,wCAAwC;;;;AAKjE,SAAgB,4BACd,UACA,eACA,YACU;CACV,MAAM,aAAa,WAAW,UAAU,UAAU;CAClD,IACE,eACC,WAAW,SAAS,UAAU,SAAS,WAAW,SAAS,UAAU,UAGtE,OAAO;CAGT,MAAM,EAAE,UAAU,MAAM,SAAS;CAEjC,IAAI,CAAC,MACH,MAAM,IAAI,UAAU,oDAAoD,MAAM;CAGhF,MAAM,sBAAgC,aAAa,WAAW,WAAW,CAAC;CAC1E,MAAM,gBAA0B,CAAC;CAEjC,OAAO,KAAK,QAAQ,CAAC,CAAC,SAAS,YAAY;EACzC,IAAI,oBAAoB,SAAS,OAAO,GACtC;EAGF,MAAM,cAAc,KAAK;EAEzB,IAAI,CAAC,aACH,MAAM,IAAI,UACR,oDAAoD,KAAK,YAAY,SACvE;EAGF,IAAI,IAAI,KAAK,WAAW,IAAI,eAE1B,cAAc,KAAK,OAAO;CAE9B,CAAC;CAGD,cAAc,SAAS,YAAY;EACjC,OAAO,SAAS,SAAS;CAC3B,CAAC;CAED,IAAI,cAAc,SAAS,GACzB,MACE,+CACA,cAAc,QACd,SAAS,MACT,aACF;CAGF,OAAO;AACT"}
+{"version":3,"file":"publishDate.mjs","names":[],"sources":["../../src/filtering/publishDate.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport type { Manifest } from '@verdaccio/types';\n\nimport { resolveAllowList } from './matcher';\nimport type { MatchResult } from './types';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter:filter');\n\n/**\n * Filter out all package versions that were published after dateThreshold.\n */\nexport function filterVersionsByPublishDate(\n  manifest: Manifest,\n  dateThreshold: Date,\n  allowMatch: MatchResult | undefined\n): Manifest {\n  const { allowAll, whitelistedVersions } = resolveAllowList(allowMatch);\n  if (allowAll) {\n    // An entire scope or package is whitelisted\n    return manifest;\n  }\n\n  const { versions, time, name } = manifest;\n\n  if (!time) {\n    throw new TypeError(`Time of publication was not provided for package ${name}`);\n  }\n\n  const clearVersions: string[] = [];\n\n  Object.keys(versions).forEach((version) => {\n    if (whitelistedVersions.includes(version)) {\n      return;\n    }\n\n    const publishTime = time[version];\n\n    if (!publishTime) {\n      throw new TypeError(\n        `Time of publication was not provided for package ${name}, version ${version}`\n      );\n    }\n\n    if (new Date(publishTime) > dateThreshold) {\n      // clear untrusted version\n      clearVersions.push(version);\n    }\n  });\n\n  // delete version from versions\n  clearVersions.forEach((version) => {\n    delete manifest.versions[version];\n  });\n\n  if (clearVersions.length > 0) {\n    debug(\n      'date filter removed %d versions from %s: %o',\n      clearVersions.length,\n      manifest.name,\n      clearVersions\n    );\n  }\n\n  return manifest;\n}\n"],"mappings":";;;AAOA,IAAM,QAAQ,WAAW,wCAAwC;;;;AAKjE,SAAgB,4BACd,UACA,eACA,YACU;CACV,MAAM,EAAE,UAAU,wBAAwB,iBAAiB,UAAU;CACrE,IAAI,UAEF,OAAO;CAGT,MAAM,EAAE,UAAU,MAAM,SAAS;CAEjC,IAAI,CAAC,MACH,MAAM,IAAI,UAAU,oDAAoD,MAAM;CAGhF,MAAM,gBAA0B,CAAC;CAEjC,OAAO,KAAK,QAAQ,CAAC,CAAC,SAAS,YAAY;EACzC,IAAI,oBAAoB,SAAS,OAAO,GACtC;EAGF,MAAM,cAAc,KAAK;EAEzB,IAAI,CAAC,aACH,MAAM,IAAI,UACR,oDAAoD,KAAK,YAAY,SACvE;EAGF,IAAI,IAAI,KAAK,WAAW,IAAI,eAE1B,cAAc,KAAK,OAAO;CAE9B,CAAC;CAGD,cAAc,SAAS,YAAY;EACjC,OAAO,SAAS,SAAS;CAC3B,CAAC;CAED,IAAI,cAAc,SAAS,GACzB,MACE,+CACA,cAAc,QACd,SAAS,MACT,aACF;CAGF,OAAO;AACT"}

package/build/packageFilter.js

@@ -1,5 +1,7 @@
 const require_runtime = require("./_virtual/_rolldown/runtime.js");
 const require_parser = require("./config/parser.js");
+const require_matcher = require("./filtering/matcher.js");
+const require_deprecated = require("./filtering/deprecated.js");
 const require_packageVersion = require("./filtering/packageVersion.js");
 const require_publishDate = require("./filtering/publishDate.js");
 const require_jsonUtils = require("./utils/jsonUtils.js");
@@ -33,9 +35,13 @@ var PackageFilterPlugin = class extends _verdaccio_core.pluginUtils.Plugin {
 			debug$1("min age: %d days", minAgeDays);
 			this.logger.trace({ minAgeDays }, "package-filter min age: @{minAgeDays} days");
 		}
+		if (this.parsedConfig.excludeDeprecated) {
+			debug$1("excludeDeprecated enabled");
+			this.logger.trace("package-filter excludeDeprecated is enabled");
+		}
 	}
 	async filter_metadata(manifest) {
-		const { dateThreshold, minAgeMs, blockRules, allowRules } = this.parsedConfig;
+		const { dateThreshold, minAgeMs, excludeDeprecated, blockRules, allowRules } = this.parsedConfig;
 		const versionCount = Object.keys(manifest.versions ?? {}).length;
 		debug$1("filtering manifest for %s (%d versions)", manifest.name, versionCount);
 		this.logger.trace({
@@ -43,7 +49,9 @@ var PackageFilterPlugin = class extends _verdaccio_core.pluginUtils.Plugin {
 			versionCount
 		}, "package-filter processing @{name} (@{versionCount} versions)");
 		let newManifest = require_manifestUtils.getManifestClone(manifest);
-		if (blockRules.size > 0) newManifest = require_packageVersion.filterBlockedVersions(newManifest, blockRules, allowRules, this.logger);
+		const allowMatch = require_matcher.matchRules(newManifest, allowRules);
+		if (blockRules.size > 0) newManifest = require_packageVersion.filterBlockedVersions(newManifest, blockRules, allowMatch, this.logger);
+		if (excludeDeprecated) newManifest = require_deprecated.filterDeprecatedVersions(newManifest, allowMatch);
 		let earliestDateThreshold = null;
 		if (minAgeMs) earliestDateThreshold = new Date(Date.now() - minAgeMs);
 		if (dateThreshold && (!earliestDateThreshold || dateThreshold < earliestDateThreshold)) earliestDateThreshold = dateThreshold;
@@ -53,7 +61,7 @@ var PackageFilterPlugin = class extends _verdaccio_core.pluginUtils.Plugin {
 				name: manifest.name,
 				threshold: earliestDateThreshold.toISOString()
 			}, "applying date filter for @{name}, cutoff: @{threshold}");
-			newManifest = require_publishDate.filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowRules);
+			newManifest = require_publishDate.filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowMatch);
 		}
 		require_manifestUtils.cleanupTags(newManifest);
 		require_manifestUtils.setupLatestTag(newManifest);

package/build/packageFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageFilter.js","names":[],"sources":["../src/packageFilter.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport { pluginUtils } from '@verdaccio/core';\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport { parseConfig } from './config/parser';\nimport type { ParsedConfig, PluginConfig } from './config/types';\nimport { filterBlockedVersions } from './filtering/packageVersion';\nimport { filterVersionsByPublishDate } from './filtering/publishDate';\nimport { jsonLogReplacer } from './utils/jsonUtils';\nimport {\n  cleanupDistFiles,\n  cleanupTags,\n  cleanupTime,\n  getManifestClone,\n  setupCreatedAndModified,\n  setupLatestTag,\n} from './utils/manifestUtils';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter');\n\nexport class PackageFilterPlugin\n  extends pluginUtils.Plugin<PluginConfig>\n  implements pluginUtils.ManifestFilter<PluginConfig>\n{\n  public readonly config: PluginConfig;\n  private readonly parsedConfig: ParsedConfig;\n  protected readonly logger: Logger;\n\n  public constructor(config: PluginConfig, options: pluginUtils.PluginOptions) {\n    super(config, options);\n    this.config = config ?? {};\n    this.logger = options.logger;\n    this.parsedConfig = parseConfig(this.config);\n\n    debug(\n      'plugin loaded: block rules: %d, allow rules: %d',\n      this.parsedConfig.blockRules.size,\n      this.parsedConfig.allowRules.size\n    );\n    this.logger.debug(\n      { config: JSON.stringify(this.parsedConfig, jsonLogReplacer) },\n      'package-filter loaded with config: @{config}'\n    );\n    this.logger.trace(\n      {\n        blockRules: this.parsedConfig.blockRules.size,\n        allowRules: this.parsedConfig.allowRules.size,\n      },\n      'package-filter plugin initialized: @{blockRules} block rules, @{allowRules} allow rules'\n    );\n    if (this.parsedConfig.dateThreshold) {\n      debug('date threshold: %s', this.parsedConfig.dateThreshold.toISOString());\n      this.logger.trace(\n        { dateThreshold: this.parsedConfig.dateThreshold.toISOString() },\n        'package-filter date threshold: @{dateThreshold}'\n      );\n    }\n    if (this.parsedConfig.minAgeMs) {\n      const minAgeDays = this.parsedConfig.minAgeMs / (24 * 60 * 60 * 1000);\n      debug('min age: %d days', minAgeDays);\n      this.logger.trace({ minAgeDays }, 'package-filter min age: @{minAgeDays} days');\n    }\n  }\n\n  public async filter_metadata(manifest: Readonly<Manifest>): Promise<Manifest> {\n    const { dateThreshold, minAgeMs, blockRules, allowRules } = this.parsedConfig;\n    const versionCount = Object.keys(manifest.versions ?? {}).length;\n    debug('filtering manifest for %s (%d versions)', manifest.name, versionCount);\n    this.logger.trace(\n      { name: manifest.name, versionCount },\n      'package-filter processing @{name} (@{versionCount} versions)'\n    );\n\n    let newManifest = getManifestClone(manifest);\n    if (blockRules.size > 0) {\n      newManifest = filterBlockedVersions(newManifest, blockRules, allowRules, this.logger);\n    }\n\n    let earliestDateThreshold: Date | null = null;\n    if (minAgeMs) {\n      earliestDateThreshold = new Date(Date.now() - minAgeMs);\n    }\n\n    if (dateThreshold && (!earliestDateThreshold || dateThreshold < earliestDateThreshold)) {\n      earliestDateThreshold = dateThreshold;\n    }\n\n    if (earliestDateThreshold) {\n      debug(\n        'applying date filter for %s, threshold: %s',\n        manifest.name,\n        earliestDateThreshold.toISOString()\n      );\n      this.logger.trace(\n        { name: manifest.name, threshold: earliestDateThreshold.toISOString() },\n        'applying date filter for @{name}, cutoff: @{threshold}'\n      );\n      newManifest = filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowRules);\n    }\n\n    cleanupTags(newManifest);\n    setupLatestTag(newManifest);\n    cleanupTime(newManifest);\n    setupCreatedAndModified(newManifest);\n    cleanupDistFiles(newManifest);\n\n    const filteredCount = Object.keys(newManifest.versions).length;\n    const removedCount = versionCount - filteredCount;\n    if (filteredCount !== versionCount) {\n      debug(\n        'filtered %s: %d -> %d versions (%d removed)',\n        manifest.name,\n        versionCount,\n        filteredCount,\n        removedCount\n      );\n      this.logger.trace(\n        { name: manifest.name, before: versionCount, after: filteredCount, removed: removedCount },\n        'package-filter @{name}: @{before} -> @{after} versions (@{removed} removed)'\n      );\n    } else {\n      debug('no versions filtered for %s', manifest.name);\n    }\n\n    return newManifest;\n  }\n}\n"],"mappings":";;;;;;;;;;AAmBA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,iCAAiC;AAE1D,IAAa,sBAAb,cACU,gBAAA,YAAY,OAEtB;CACE;CACA;CACA;CAEA,YAAmB,QAAsB,SAAoC;EAC3E,MAAM,QAAQ,OAAO;EACrB,KAAK,SAAS,UAAU,CAAC;EACzB,KAAK,SAAS,QAAQ;EACtB,KAAK,eAAe,eAAA,YAAY,KAAK,MAAM;EAE3C,QACE,mDACA,KAAK,aAAa,WAAW,MAC7B,KAAK,aAAa,WAAW,IAC/B;EACA,KAAK,OAAO,MACV,EAAE,QAAQ,KAAK,UAAU,KAAK,cAAc,kBAAA,eAAe,EAAE,GAC7D,8CACF;EACA,KAAK,OAAO,MACV;GACE,YAAY,KAAK,aAAa,WAAW;GACzC,YAAY,KAAK,aAAa,WAAW;EAC3C,GACA,yFACF;EACA,IAAI,KAAK,aAAa,eAAe;GACnC,QAAM,sBAAsB,KAAK,aAAa,cAAc,YAAY,CAAC;GACzE,KAAK,OAAO,MACV,EAAE,eAAe,KAAK,aAAa,cAAc,YAAY,EAAE,GAC/D,iDACF;EACF;EACA,IAAI,KAAK,aAAa,UAAU;GAC9B,MAAM,aAAa,KAAK,aAAa,YAAY,OAAU,KAAK;GAChE,QAAM,oBAAoB,UAAU;GACpC,KAAK,OAAO,MAAM,EAAE,WAAW,GAAG,4CAA4C;EAChF;CACF;CAEA,MAAa,gBAAgB,UAAiD;EAC5E,MAAM,EAAE,eAAe,UAAU,YAAY,eAAe,KAAK;EACjE,MAAM,eAAe,OAAO,KAAK,SAAS,YAAY,CAAC,CAAC,CAAC,CAAC;EAC1D,QAAM,2CAA2C,SAAS,MAAM,YAAY;EAC5E,KAAK,OAAO,MACV;GAAE,MAAM,SAAS;GAAM;EAAa,GACpC,8DACF;EAEA,IAAI,cAAc,sBAAA,iBAAiB,QAAQ;EAC3C,IAAI,WAAW,OAAO,GACpB,cAAc,uBAAA,sBAAsB,aAAa,YAAY,YAAY,KAAK,MAAM;EAGtF,IAAI,wBAAqC;EACzC,IAAI,UACF,wBAAwB,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ;EAGxD,IAAI,kBAAkB,CAAC,yBAAyB,gBAAgB,wBAC9D,wBAAwB;EAG1B,IAAI,uBAAuB;GACzB,QACE,8CACA,SAAS,MACT,sBAAsB,YAAY,CACpC;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,WAAW,sBAAsB,YAAY;GAAE,GACtE,wDACF;GACA,cAAc,oBAAA,4BAA4B,aAAa,uBAAuB,UAAU;EAC1F;EAEA,sBAAA,YAAY,WAAW;EACvB,sBAAA,eAAe,WAAW;EAC1B,sBAAA,YAAY,WAAW;EACvB,sBAAA,wBAAwB,WAAW;EACnC,sBAAA,iBAAiB,WAAW;EAE5B,MAAM,gBAAgB,OAAO,KAAK,YAAY,QAAQ,CAAC,CAAC;EACxD,MAAM,eAAe,eAAe;EACpC,IAAI,kBAAkB,cAAc;GAClC,QACE,+CACA,SAAS,MACT,cACA,eACA,YACF;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,QAAQ;IAAc,OAAO;IAAe,SAAS;GAAa,GACzF,6EACF;EACF,OACE,QAAM,+BAA+B,SAAS,IAAI;EAGpD,OAAO;CACT;AACF"}
+{"version":3,"file":"packageFilter.js","names":[],"sources":["../src/packageFilter.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport { pluginUtils } from '@verdaccio/core';\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport { parseConfig } from './config/parser';\nimport type { ParsedConfig, PluginConfig } from './config/types';\nimport { filterDeprecatedVersions } from './filtering/deprecated';\nimport { matchRules } from './filtering/matcher';\nimport { filterBlockedVersions } from './filtering/packageVersion';\nimport { filterVersionsByPublishDate } from './filtering/publishDate';\nimport { jsonLogReplacer } from './utils/jsonUtils';\nimport {\n  cleanupDistFiles,\n  cleanupTags,\n  cleanupTime,\n  getManifestClone,\n  setupCreatedAndModified,\n  setupLatestTag,\n} from './utils/manifestUtils';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter');\n\nexport class PackageFilterPlugin\n  extends pluginUtils.Plugin<PluginConfig>\n  implements pluginUtils.ManifestFilter<PluginConfig>\n{\n  public readonly config: PluginConfig;\n  private readonly parsedConfig: ParsedConfig;\n  protected readonly logger: Logger;\n\n  public constructor(config: PluginConfig, options: pluginUtils.PluginOptions) {\n    super(config, options);\n    this.config = config ?? {};\n    this.logger = options.logger;\n    this.parsedConfig = parseConfig(this.config);\n\n    debug(\n      'plugin loaded: block rules: %d, allow rules: %d',\n      this.parsedConfig.blockRules.size,\n      this.parsedConfig.allowRules.size\n    );\n    this.logger.debug(\n      { config: JSON.stringify(this.parsedConfig, jsonLogReplacer) },\n      'package-filter loaded with config: @{config}'\n    );\n    this.logger.trace(\n      {\n        blockRules: this.parsedConfig.blockRules.size,\n        allowRules: this.parsedConfig.allowRules.size,\n      },\n      'package-filter plugin initialized: @{blockRules} block rules, @{allowRules} allow rules'\n    );\n    if (this.parsedConfig.dateThreshold) {\n      debug('date threshold: %s', this.parsedConfig.dateThreshold.toISOString());\n      this.logger.trace(\n        { dateThreshold: this.parsedConfig.dateThreshold.toISOString() },\n        'package-filter date threshold: @{dateThreshold}'\n      );\n    }\n    if (this.parsedConfig.minAgeMs) {\n      const minAgeDays = this.parsedConfig.minAgeMs / (24 * 60 * 60 * 1000);\n      debug('min age: %d days', minAgeDays);\n      this.logger.trace({ minAgeDays }, 'package-filter min age: @{minAgeDays} days');\n    }\n    if (this.parsedConfig.excludeDeprecated) {\n      debug('excludeDeprecated enabled');\n      this.logger.trace('package-filter excludeDeprecated is enabled');\n    }\n  }\n\n  public async filter_metadata(manifest: Readonly<Manifest>): Promise<Manifest> {\n    const { dateThreshold, minAgeMs, excludeDeprecated, blockRules, allowRules } =\n      this.parsedConfig;\n    const versionCount = Object.keys(manifest.versions ?? {}).length;\n    debug('filtering manifest for %s (%d versions)', manifest.name, versionCount);\n    this.logger.trace(\n      { name: manifest.name, versionCount },\n      'package-filter processing @{name} (@{versionCount} versions)'\n    );\n\n    let newManifest = getManifestClone(manifest);\n    const allowMatch = matchRules(newManifest, allowRules);\n\n    if (blockRules.size > 0) {\n      newManifest = filterBlockedVersions(newManifest, blockRules, allowMatch, this.logger);\n    }\n\n    if (excludeDeprecated) {\n      newManifest = filterDeprecatedVersions(newManifest, allowMatch);\n    }\n\n    let earliestDateThreshold: Date | null = null;\n    if (minAgeMs) {\n      earliestDateThreshold = new Date(Date.now() - minAgeMs);\n    }\n\n    if (dateThreshold && (!earliestDateThreshold || dateThreshold < earliestDateThreshold)) {\n      earliestDateThreshold = dateThreshold;\n    }\n\n    if (earliestDateThreshold) {\n      debug(\n        'applying date filter for %s, threshold: %s',\n        manifest.name,\n        earliestDateThreshold.toISOString()\n      );\n      this.logger.trace(\n        { name: manifest.name, threshold: earliestDateThreshold.toISOString() },\n        'applying date filter for @{name}, cutoff: @{threshold}'\n      );\n      newManifest = filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowMatch);\n    }\n\n    cleanupTags(newManifest);\n    setupLatestTag(newManifest);\n    cleanupTime(newManifest);\n    setupCreatedAndModified(newManifest);\n    cleanupDistFiles(newManifest);\n\n    const filteredCount = Object.keys(newManifest.versions).length;\n    const removedCount = versionCount - filteredCount;\n    if (filteredCount !== versionCount) {\n      debug(\n        'filtered %s: %d -> %d versions (%d removed)',\n        manifest.name,\n        versionCount,\n        filteredCount,\n        removedCount\n      );\n      this.logger.trace(\n        { name: manifest.name, before: versionCount, after: filteredCount, removed: removedCount },\n        'package-filter @{name}: @{before} -> @{after} versions (@{removed} removed)'\n      );\n    } else {\n      debug('no versions filtered for %s', manifest.name);\n    }\n\n    return newManifest;\n  }\n}\n"],"mappings":";;;;;;;;;;;;AAqBA,IAAM,WAAA,GAAA,MAAA,QAAA,CAAmB,iCAAiC;AAE1D,IAAa,sBAAb,cACU,gBAAA,YAAY,OAEtB;CACE;CACA;CACA;CAEA,YAAmB,QAAsB,SAAoC;EAC3E,MAAM,QAAQ,OAAO;EACrB,KAAK,SAAS,UAAU,CAAC;EACzB,KAAK,SAAS,QAAQ;EACtB,KAAK,eAAe,eAAA,YAAY,KAAK,MAAM;EAE3C,QACE,mDACA,KAAK,aAAa,WAAW,MAC7B,KAAK,aAAa,WAAW,IAC/B;EACA,KAAK,OAAO,MACV,EAAE,QAAQ,KAAK,UAAU,KAAK,cAAc,kBAAA,eAAe,EAAE,GAC7D,8CACF;EACA,KAAK,OAAO,MACV;GACE,YAAY,KAAK,aAAa,WAAW;GACzC,YAAY,KAAK,aAAa,WAAW;EAC3C,GACA,yFACF;EACA,IAAI,KAAK,aAAa,eAAe;GACnC,QAAM,sBAAsB,KAAK,aAAa,cAAc,YAAY,CAAC;GACzE,KAAK,OAAO,MACV,EAAE,eAAe,KAAK,aAAa,cAAc,YAAY,EAAE,GAC/D,iDACF;EACF;EACA,IAAI,KAAK,aAAa,UAAU;GAC9B,MAAM,aAAa,KAAK,aAAa,YAAY,OAAU,KAAK;GAChE,QAAM,oBAAoB,UAAU;GACpC,KAAK,OAAO,MAAM,EAAE,WAAW,GAAG,4CAA4C;EAChF;EACA,IAAI,KAAK,aAAa,mBAAmB;GACvC,QAAM,2BAA2B;GACjC,KAAK,OAAO,MAAM,6CAA6C;EACjE;CACF;CAEA,MAAa,gBAAgB,UAAiD;EAC5E,MAAM,EAAE,eAAe,UAAU,mBAAmB,YAAY,eAC9D,KAAK;EACP,MAAM,eAAe,OAAO,KAAK,SAAS,YAAY,CAAC,CAAC,CAAC,CAAC;EAC1D,QAAM,2CAA2C,SAAS,MAAM,YAAY;EAC5E,KAAK,OAAO,MACV;GAAE,MAAM,SAAS;GAAM;EAAa,GACpC,8DACF;EAEA,IAAI,cAAc,sBAAA,iBAAiB,QAAQ;EAC3C,MAAM,aAAa,gBAAA,WAAW,aAAa,UAAU;EAErD,IAAI,WAAW,OAAO,GACpB,cAAc,uBAAA,sBAAsB,aAAa,YAAY,YAAY,KAAK,MAAM;EAGtF,IAAI,mBACF,cAAc,mBAAA,yBAAyB,aAAa,UAAU;EAGhE,IAAI,wBAAqC;EACzC,IAAI,UACF,wBAAwB,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ;EAGxD,IAAI,kBAAkB,CAAC,yBAAyB,gBAAgB,wBAC9D,wBAAwB;EAG1B,IAAI,uBAAuB;GACzB,QACE,8CACA,SAAS,MACT,sBAAsB,YAAY,CACpC;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,WAAW,sBAAsB,YAAY;GAAE,GACtE,wDACF;GACA,cAAc,oBAAA,4BAA4B,aAAa,uBAAuB,UAAU;EAC1F;EAEA,sBAAA,YAAY,WAAW;EACvB,sBAAA,eAAe,WAAW;EAC1B,sBAAA,YAAY,WAAW;EACvB,sBAAA,wBAAwB,WAAW;EACnC,sBAAA,iBAAiB,WAAW;EAE5B,MAAM,gBAAgB,OAAO,KAAK,YAAY,QAAQ,CAAC,CAAC;EACxD,MAAM,eAAe,eAAe;EACpC,IAAI,kBAAkB,cAAc;GAClC,QACE,+CACA,SAAS,MACT,cACA,eACA,YACF;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,QAAQ;IAAc,OAAO;IAAe,SAAS;GAAa,GACzF,6EACF;EACF,OACE,QAAM,+BAA+B,SAAS,IAAI;EAGpD,OAAO;CACT;AACF"}

package/build/packageFilter.mjs

@@ -1,4 +1,6 @@
 import { parseConfig } from "./config/parser.mjs";
+import { matchRules } from "./filtering/matcher.mjs";
+import { filterDeprecatedVersions } from "./filtering/deprecated.mjs";
 import { filterBlockedVersions } from "./filtering/packageVersion.mjs";
 import { filterVersionsByPublishDate } from "./filtering/publishDate.mjs";
 import { jsonLogReplacer } from "./utils/jsonUtils.mjs";
@@ -31,9 +33,13 @@ var PackageFilterPlugin = class extends pluginUtils.Plugin {
 			debug("min age: %d days", minAgeDays);
 			this.logger.trace({ minAgeDays }, "package-filter min age: @{minAgeDays} days");
 		}
+		if (this.parsedConfig.excludeDeprecated) {
+			debug("excludeDeprecated enabled");
+			this.logger.trace("package-filter excludeDeprecated is enabled");
+		}
 	}
 	async filter_metadata(manifest) {
-		const { dateThreshold, minAgeMs, blockRules, allowRules } = this.parsedConfig;
+		const { dateThreshold, minAgeMs, excludeDeprecated, blockRules, allowRules } = this.parsedConfig;
 		const versionCount = Object.keys(manifest.versions ?? {}).length;
 		debug("filtering manifest for %s (%d versions)", manifest.name, versionCount);
 		this.logger.trace({
@@ -41,7 +47,9 @@ var PackageFilterPlugin = class extends pluginUtils.Plugin {
 			versionCount
 		}, "package-filter processing @{name} (@{versionCount} versions)");
 		let newManifest = getManifestClone(manifest);
-		if (blockRules.size > 0) newManifest = filterBlockedVersions(newManifest, blockRules, allowRules, this.logger);
+		const allowMatch = matchRules(newManifest, allowRules);
+		if (blockRules.size > 0) newManifest = filterBlockedVersions(newManifest, blockRules, allowMatch, this.logger);
+		if (excludeDeprecated) newManifest = filterDeprecatedVersions(newManifest, allowMatch);
 		let earliestDateThreshold = null;
 		if (minAgeMs) earliestDateThreshold = new Date(Date.now() - minAgeMs);
 		if (dateThreshold && (!earliestDateThreshold || dateThreshold < earliestDateThreshold)) earliestDateThreshold = dateThreshold;
@@ -51,7 +59,7 @@ var PackageFilterPlugin = class extends pluginUtils.Plugin {
 				name: manifest.name,
 				threshold: earliestDateThreshold.toISOString()
 			}, "applying date filter for @{name}, cutoff: @{threshold}");
-			newManifest = filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowRules);
+			newManifest = filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowMatch);
 		}
 		cleanupTags(newManifest);
 		setupLatestTag(newManifest);

package/build/packageFilter.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"packageFilter.mjs","names":[],"sources":["../src/packageFilter.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport { pluginUtils } from '@verdaccio/core';\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport { parseConfig } from './config/parser';\nimport type { ParsedConfig, PluginConfig } from './config/types';\nimport { filterBlockedVersions } from './filtering/packageVersion';\nimport { filterVersionsByPublishDate } from './filtering/publishDate';\nimport { jsonLogReplacer } from './utils/jsonUtils';\nimport {\n  cleanupDistFiles,\n  cleanupTags,\n  cleanupTime,\n  getManifestClone,\n  setupCreatedAndModified,\n  setupLatestTag,\n} from './utils/manifestUtils';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter');\n\nexport class PackageFilterPlugin\n  extends pluginUtils.Plugin<PluginConfig>\n  implements pluginUtils.ManifestFilter<PluginConfig>\n{\n  public readonly config: PluginConfig;\n  private readonly parsedConfig: ParsedConfig;\n  protected readonly logger: Logger;\n\n  public constructor(config: PluginConfig, options: pluginUtils.PluginOptions) {\n    super(config, options);\n    this.config = config ?? {};\n    this.logger = options.logger;\n    this.parsedConfig = parseConfig(this.config);\n\n    debug(\n      'plugin loaded: block rules: %d, allow rules: %d',\n      this.parsedConfig.blockRules.size,\n      this.parsedConfig.allowRules.size\n    );\n    this.logger.debug(\n      { config: JSON.stringify(this.parsedConfig, jsonLogReplacer) },\n      'package-filter loaded with config: @{config}'\n    );\n    this.logger.trace(\n      {\n        blockRules: this.parsedConfig.blockRules.size,\n        allowRules: this.parsedConfig.allowRules.size,\n      },\n      'package-filter plugin initialized: @{blockRules} block rules, @{allowRules} allow rules'\n    );\n    if (this.parsedConfig.dateThreshold) {\n      debug('date threshold: %s', this.parsedConfig.dateThreshold.toISOString());\n      this.logger.trace(\n        { dateThreshold: this.parsedConfig.dateThreshold.toISOString() },\n        'package-filter date threshold: @{dateThreshold}'\n      );\n    }\n    if (this.parsedConfig.minAgeMs) {\n      const minAgeDays = this.parsedConfig.minAgeMs / (24 * 60 * 60 * 1000);\n      debug('min age: %d days', minAgeDays);\n      this.logger.trace({ minAgeDays }, 'package-filter min age: @{minAgeDays} days');\n    }\n  }\n\n  public async filter_metadata(manifest: Readonly<Manifest>): Promise<Manifest> {\n    const { dateThreshold, minAgeMs, blockRules, allowRules } = this.parsedConfig;\n    const versionCount = Object.keys(manifest.versions ?? {}).length;\n    debug('filtering manifest for %s (%d versions)', manifest.name, versionCount);\n    this.logger.trace(\n      { name: manifest.name, versionCount },\n      'package-filter processing @{name} (@{versionCount} versions)'\n    );\n\n    let newManifest = getManifestClone(manifest);\n    if (blockRules.size > 0) {\n      newManifest = filterBlockedVersions(newManifest, blockRules, allowRules, this.logger);\n    }\n\n    let earliestDateThreshold: Date | null = null;\n    if (minAgeMs) {\n      earliestDateThreshold = new Date(Date.now() - minAgeMs);\n    }\n\n    if (dateThreshold && (!earliestDateThreshold || dateThreshold < earliestDateThreshold)) {\n      earliestDateThreshold = dateThreshold;\n    }\n\n    if (earliestDateThreshold) {\n      debug(\n        'applying date filter for %s, threshold: %s',\n        manifest.name,\n        earliestDateThreshold.toISOString()\n      );\n      this.logger.trace(\n        { name: manifest.name, threshold: earliestDateThreshold.toISOString() },\n        'applying date filter for @{name}, cutoff: @{threshold}'\n      );\n      newManifest = filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowRules);\n    }\n\n    cleanupTags(newManifest);\n    setupLatestTag(newManifest);\n    cleanupTime(newManifest);\n    setupCreatedAndModified(newManifest);\n    cleanupDistFiles(newManifest);\n\n    const filteredCount = Object.keys(newManifest.versions).length;\n    const removedCount = versionCount - filteredCount;\n    if (filteredCount !== versionCount) {\n      debug(\n        'filtered %s: %d -> %d versions (%d removed)',\n        manifest.name,\n        versionCount,\n        filteredCount,\n        removedCount\n      );\n      this.logger.trace(\n        { name: manifest.name, before: versionCount, after: filteredCount, removed: removedCount },\n        'package-filter @{name}: @{before} -> @{after} versions (@{removed} removed)'\n      );\n    } else {\n      debug('no versions filtered for %s', manifest.name);\n    }\n\n    return newManifest;\n  }\n}\n"],"mappings":";;;;;;;;AAmBA,IAAM,QAAQ,WAAW,iCAAiC;AAE1D,IAAa,sBAAb,cACU,YAAY,OAEtB;CACE;CACA;CACA;CAEA,YAAmB,QAAsB,SAAoC;EAC3E,MAAM,QAAQ,OAAO;EACrB,KAAK,SAAS,UAAU,CAAC;EACzB,KAAK,SAAS,QAAQ;EACtB,KAAK,eAAe,YAAY,KAAK,MAAM;EAE3C,MACE,mDACA,KAAK,aAAa,WAAW,MAC7B,KAAK,aAAa,WAAW,IAC/B;EACA,KAAK,OAAO,MACV,EAAE,QAAQ,KAAK,UAAU,KAAK,cAAc,eAAe,EAAE,GAC7D,8CACF;EACA,KAAK,OAAO,MACV;GACE,YAAY,KAAK,aAAa,WAAW;GACzC,YAAY,KAAK,aAAa,WAAW;EAC3C,GACA,yFACF;EACA,IAAI,KAAK,aAAa,eAAe;GACnC,MAAM,sBAAsB,KAAK,aAAa,cAAc,YAAY,CAAC;GACzE,KAAK,OAAO,MACV,EAAE,eAAe,KAAK,aAAa,cAAc,YAAY,EAAE,GAC/D,iDACF;EACF;EACA,IAAI,KAAK,aAAa,UAAU;GAC9B,MAAM,aAAa,KAAK,aAAa,YAAY,OAAU,KAAK;GAChE,MAAM,oBAAoB,UAAU;GACpC,KAAK,OAAO,MAAM,EAAE,WAAW,GAAG,4CAA4C;EAChF;CACF;CAEA,MAAa,gBAAgB,UAAiD;EAC5E,MAAM,EAAE,eAAe,UAAU,YAAY,eAAe,KAAK;EACjE,MAAM,eAAe,OAAO,KAAK,SAAS,YAAY,CAAC,CAAC,CAAC,CAAC;EAC1D,MAAM,2CAA2C,SAAS,MAAM,YAAY;EAC5E,KAAK,OAAO,MACV;GAAE,MAAM,SAAS;GAAM;EAAa,GACpC,8DACF;EAEA,IAAI,cAAc,iBAAiB,QAAQ;EAC3C,IAAI,WAAW,OAAO,GACpB,cAAc,sBAAsB,aAAa,YAAY,YAAY,KAAK,MAAM;EAGtF,IAAI,wBAAqC;EACzC,IAAI,UACF,wBAAwB,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ;EAGxD,IAAI,kBAAkB,CAAC,yBAAyB,gBAAgB,wBAC9D,wBAAwB;EAG1B,IAAI,uBAAuB;GACzB,MACE,8CACA,SAAS,MACT,sBAAsB,YAAY,CACpC;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,WAAW,sBAAsB,YAAY;GAAE,GACtE,wDACF;GACA,cAAc,4BAA4B,aAAa,uBAAuB,UAAU;EAC1F;EAEA,YAAY,WAAW;EACvB,eAAe,WAAW;EAC1B,YAAY,WAAW;EACvB,wBAAwB,WAAW;EACnC,iBAAiB,WAAW;EAE5B,MAAM,gBAAgB,OAAO,KAAK,YAAY,QAAQ,CAAC,CAAC;EACxD,MAAM,eAAe,eAAe;EACpC,IAAI,kBAAkB,cAAc;GAClC,MACE,+CACA,SAAS,MACT,cACA,eACA,YACF;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,QAAQ;IAAc,OAAO;IAAe,SAAS;GAAa,GACzF,6EACF;EACF,OACE,MAAM,+BAA+B,SAAS,IAAI;EAGpD,OAAO;CACT;AACF"}
+{"version":3,"file":"packageFilter.mjs","names":[],"sources":["../src/packageFilter.ts"],"sourcesContent":["import buildDebug from 'debug';\n\nimport { pluginUtils } from '@verdaccio/core';\nimport type { Logger, Manifest } from '@verdaccio/types';\n\nimport { parseConfig } from './config/parser';\nimport type { ParsedConfig, PluginConfig } from './config/types';\nimport { filterDeprecatedVersions } from './filtering/deprecated';\nimport { matchRules } from './filtering/matcher';\nimport { filterBlockedVersions } from './filtering/packageVersion';\nimport { filterVersionsByPublishDate } from './filtering/publishDate';\nimport { jsonLogReplacer } from './utils/jsonUtils';\nimport {\n  cleanupDistFiles,\n  cleanupTags,\n  cleanupTime,\n  getManifestClone,\n  setupCreatedAndModified,\n  setupLatestTag,\n} from './utils/manifestUtils';\n\nconst debug = buildDebug('verdaccio:plugin:package-filter');\n\nexport class PackageFilterPlugin\n  extends pluginUtils.Plugin<PluginConfig>\n  implements pluginUtils.ManifestFilter<PluginConfig>\n{\n  public readonly config: PluginConfig;\n  private readonly parsedConfig: ParsedConfig;\n  protected readonly logger: Logger;\n\n  public constructor(config: PluginConfig, options: pluginUtils.PluginOptions) {\n    super(config, options);\n    this.config = config ?? {};\n    this.logger = options.logger;\n    this.parsedConfig = parseConfig(this.config);\n\n    debug(\n      'plugin loaded: block rules: %d, allow rules: %d',\n      this.parsedConfig.blockRules.size,\n      this.parsedConfig.allowRules.size\n    );\n    this.logger.debug(\n      { config: JSON.stringify(this.parsedConfig, jsonLogReplacer) },\n      'package-filter loaded with config: @{config}'\n    );\n    this.logger.trace(\n      {\n        blockRules: this.parsedConfig.blockRules.size,\n        allowRules: this.parsedConfig.allowRules.size,\n      },\n      'package-filter plugin initialized: @{blockRules} block rules, @{allowRules} allow rules'\n    );\n    if (this.parsedConfig.dateThreshold) {\n      debug('date threshold: %s', this.parsedConfig.dateThreshold.toISOString());\n      this.logger.trace(\n        { dateThreshold: this.parsedConfig.dateThreshold.toISOString() },\n        'package-filter date threshold: @{dateThreshold}'\n      );\n    }\n    if (this.parsedConfig.minAgeMs) {\n      const minAgeDays = this.parsedConfig.minAgeMs / (24 * 60 * 60 * 1000);\n      debug('min age: %d days', minAgeDays);\n      this.logger.trace({ minAgeDays }, 'package-filter min age: @{minAgeDays} days');\n    }\n    if (this.parsedConfig.excludeDeprecated) {\n      debug('excludeDeprecated enabled');\n      this.logger.trace('package-filter excludeDeprecated is enabled');\n    }\n  }\n\n  public async filter_metadata(manifest: Readonly<Manifest>): Promise<Manifest> {\n    const { dateThreshold, minAgeMs, excludeDeprecated, blockRules, allowRules } =\n      this.parsedConfig;\n    const versionCount = Object.keys(manifest.versions ?? {}).length;\n    debug('filtering manifest for %s (%d versions)', manifest.name, versionCount);\n    this.logger.trace(\n      { name: manifest.name, versionCount },\n      'package-filter processing @{name} (@{versionCount} versions)'\n    );\n\n    let newManifest = getManifestClone(manifest);\n    const allowMatch = matchRules(newManifest, allowRules);\n\n    if (blockRules.size > 0) {\n      newManifest = filterBlockedVersions(newManifest, blockRules, allowMatch, this.logger);\n    }\n\n    if (excludeDeprecated) {\n      newManifest = filterDeprecatedVersions(newManifest, allowMatch);\n    }\n\n    let earliestDateThreshold: Date | null = null;\n    if (minAgeMs) {\n      earliestDateThreshold = new Date(Date.now() - minAgeMs);\n    }\n\n    if (dateThreshold && (!earliestDateThreshold || dateThreshold < earliestDateThreshold)) {\n      earliestDateThreshold = dateThreshold;\n    }\n\n    if (earliestDateThreshold) {\n      debug(\n        'applying date filter for %s, threshold: %s',\n        manifest.name,\n        earliestDateThreshold.toISOString()\n      );\n      this.logger.trace(\n        { name: manifest.name, threshold: earliestDateThreshold.toISOString() },\n        'applying date filter for @{name}, cutoff: @{threshold}'\n      );\n      newManifest = filterVersionsByPublishDate(newManifest, earliestDateThreshold, allowMatch);\n    }\n\n    cleanupTags(newManifest);\n    setupLatestTag(newManifest);\n    cleanupTime(newManifest);\n    setupCreatedAndModified(newManifest);\n    cleanupDistFiles(newManifest);\n\n    const filteredCount = Object.keys(newManifest.versions).length;\n    const removedCount = versionCount - filteredCount;\n    if (filteredCount !== versionCount) {\n      debug(\n        'filtered %s: %d -> %d versions (%d removed)',\n        manifest.name,\n        versionCount,\n        filteredCount,\n        removedCount\n      );\n      this.logger.trace(\n        { name: manifest.name, before: versionCount, after: filteredCount, removed: removedCount },\n        'package-filter @{name}: @{before} -> @{after} versions (@{removed} removed)'\n      );\n    } else {\n      debug('no versions filtered for %s', manifest.name);\n    }\n\n    return newManifest;\n  }\n}\n"],"mappings":";;;;;;;;;;AAqBA,IAAM,QAAQ,WAAW,iCAAiC;AAE1D,IAAa,sBAAb,cACU,YAAY,OAEtB;CACE;CACA;CACA;CAEA,YAAmB,QAAsB,SAAoC;EAC3E,MAAM,QAAQ,OAAO;EACrB,KAAK,SAAS,UAAU,CAAC;EACzB,KAAK,SAAS,QAAQ;EACtB,KAAK,eAAe,YAAY,KAAK,MAAM;EAE3C,MACE,mDACA,KAAK,aAAa,WAAW,MAC7B,KAAK,aAAa,WAAW,IAC/B;EACA,KAAK,OAAO,MACV,EAAE,QAAQ,KAAK,UAAU,KAAK,cAAc,eAAe,EAAE,GAC7D,8CACF;EACA,KAAK,OAAO,MACV;GACE,YAAY,KAAK,aAAa,WAAW;GACzC,YAAY,KAAK,aAAa,WAAW;EAC3C,GACA,yFACF;EACA,IAAI,KAAK,aAAa,eAAe;GACnC,MAAM,sBAAsB,KAAK,aAAa,cAAc,YAAY,CAAC;GACzE,KAAK,OAAO,MACV,EAAE,eAAe,KAAK,aAAa,cAAc,YAAY,EAAE,GAC/D,iDACF;EACF;EACA,IAAI,KAAK,aAAa,UAAU;GAC9B,MAAM,aAAa,KAAK,aAAa,YAAY,OAAU,KAAK;GAChE,MAAM,oBAAoB,UAAU;GACpC,KAAK,OAAO,MAAM,EAAE,WAAW,GAAG,4CAA4C;EAChF;EACA,IAAI,KAAK,aAAa,mBAAmB;GACvC,MAAM,2BAA2B;GACjC,KAAK,OAAO,MAAM,6CAA6C;EACjE;CACF;CAEA,MAAa,gBAAgB,UAAiD;EAC5E,MAAM,EAAE,eAAe,UAAU,mBAAmB,YAAY,eAC9D,KAAK;EACP,MAAM,eAAe,OAAO,KAAK,SAAS,YAAY,CAAC,CAAC,CAAC,CAAC;EAC1D,MAAM,2CAA2C,SAAS,MAAM,YAAY;EAC5E,KAAK,OAAO,MACV;GAAE,MAAM,SAAS;GAAM;EAAa,GACpC,8DACF;EAEA,IAAI,cAAc,iBAAiB,QAAQ;EAC3C,MAAM,aAAa,WAAW,aAAa,UAAU;EAErD,IAAI,WAAW,OAAO,GACpB,cAAc,sBAAsB,aAAa,YAAY,YAAY,KAAK,MAAM;EAGtF,IAAI,mBACF,cAAc,yBAAyB,aAAa,UAAU;EAGhE,IAAI,wBAAqC;EACzC,IAAI,UACF,wBAAwB,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ;EAGxD,IAAI,kBAAkB,CAAC,yBAAyB,gBAAgB,wBAC9D,wBAAwB;EAG1B,IAAI,uBAAuB;GACzB,MACE,8CACA,SAAS,MACT,sBAAsB,YAAY,CACpC;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,WAAW,sBAAsB,YAAY;GAAE,GACtE,wDACF;GACA,cAAc,4BAA4B,aAAa,uBAAuB,UAAU;EAC1F;EAEA,YAAY,WAAW;EACvB,eAAe,WAAW;EAC1B,YAAY,WAAW;EACvB,wBAAwB,WAAW;EACnC,iBAAiB,WAAW;EAE5B,MAAM,gBAAgB,OAAO,KAAK,YAAY,QAAQ,CAAC,CAAC;EACxD,MAAM,eAAe,eAAe;EACpC,IAAI,kBAAkB,cAAc;GAClC,MACE,+CACA,SAAS,MACT,cACA,eACA,YACF;GACA,KAAK,OAAO,MACV;IAAE,MAAM,SAAS;IAAM,QAAQ;IAAc,OAAO;IAAe,SAAS;GAAa,GACzF,6EACF;EACF,OACE,MAAM,+BAA+B,SAAS,IAAI;EAGpD,OAAO;CACT;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/package-filter",
-  "version": "14.0.0-next-9.47",
+  "version": "14.0.0-next-9.49",
   "description": "Package filter plugin for Verdaccio that allows blocking packages by name, scope, version or date",
   "keywords": [
     "private",
@@ -35,16 +35,16 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@verdaccio/core": "9.0.0-next-9.23",
+    "@verdaccio/core": "9.0.0-next-9.25",
     "debug": "4.4.3",
     "semver": "7.8.5"
   },
   "devDependencies": {
     "@types/debug": "4.1.13",
-    "@verdaccio/config": "9.0.0-next-9.23",
-    "@verdaccio/logger": "9.0.0-next-9.23",
-    "@verdaccio/plugin-verifier": "1.0.0-next-9.19",
-    "@verdaccio/types": "14.0.0-next-9.11",
+    "@verdaccio/config": "9.0.0-next-9.25",
+    "@verdaccio/logger": "9.0.0-next-9.25",
+    "@verdaccio/plugin-verifier": "1.0.0-next-9.21",
+    "@verdaccio/types": "14.0.0-next-9.12",
     "rimraf": "6.1.3",
     "vite": "8.1.5",
     "vitest": "4.1.10"