@pnpm/default-reporter 8.6.3 → 8.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -48,26 +48,35 @@ function default_1(log$, opts) {
48
48
  const pkgsDiff$ = Rx.combineLatest(log$.root.pipe(filterPrefix), deprecationSet$).pipe((0, operators_1.scan)((pkgsDiff, args) => {
49
49
  const rootLog = args[0];
50
50
  const deprecationSet = args[1];
51
+ let action;
52
+ let log; // eslint-disable-line
51
53
  if (rootLog['added']) {
52
- pkgsDiff[rootLog['added'].dependencyType || 'nodeModulesOnly'][`+${rootLog['added'].name}`] = {
53
- added: true,
54
- deprecated: deprecationSet.has(rootLog['added'].id),
55
- from: rootLog['added'].linkedFrom,
56
- latest: rootLog['added'].latest,
57
- name: rootLog['added'].name,
58
- realName: rootLog['added'].realName,
59
- version: rootLog['added'].version,
60
- };
54
+ action = '+';
55
+ log = rootLog['added'];
56
+ }
57
+ else if (rootLog['removed']) {
58
+ action = '-';
59
+ log = rootLog['removed'];
60
+ }
61
+ else {
61
62
  return pkgsDiff;
62
63
  }
63
- if (rootLog['removed']) {
64
- pkgsDiff[rootLog['removed'].dependencyType || 'nodeModulesOnly'][`-${rootLog['removed'].name}`] = {
65
- added: false,
66
- name: rootLog['removed'].name,
67
- version: rootLog['removed'].version,
68
- };
64
+ const depType = log.dependencyType || 'nodeModulesOnly';
65
+ const oppositeKey = `${action === '-' ? '+' : '-'}${log.name}`;
66
+ const previous = pkgsDiff[depType][oppositeKey];
67
+ if (previous && previous.version === log.version) {
68
+ delete pkgsDiff[depType][oppositeKey];
69
69
  return pkgsDiff;
70
70
  }
71
+ pkgsDiff[depType][`${action}${log.name}`] = {
72
+ added: action === '+',
73
+ deprecated: deprecationSet.has(log.id),
74
+ from: log.linkedFrom,
75
+ latest: log.latest,
76
+ name: log.name,
77
+ realName: log.realName,
78
+ version: log.version,
79
+ };
71
80
  return pkgsDiff;
72
81
  }, {
73
82
  dev: {},
@@ -1 +1 @@
1
- {"version":3,"file":"pkgsDiff.js","sourceRoot":"","sources":["../../src/reporterForClient/pkgsDiff.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pkgsDiff.js","sourceRoot":"","sources":["../../src/reporterForClient/pkgsDiff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAA0B;AAC1B,8CAAkF;AAClF,4DAAmC;AACnC,sEAA6C;AAgBhC,QAAA,wBAAwB,GAAG;IACtC,GAAG,EAAE,iBAAiB;IACtB,eAAe,EAAE,cAAc;IAC/B,QAAQ,EAAE,sBAAsB;IAChC,IAAI,EAAE,kBAAkB;IACxB,IAAI,EAAE,cAAc;CACrB,CAAA;AAED,mBACE,IAKC,EACD,IAEC;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW;SACrC,IAAI,CACH,IAAA,kBAAM,EAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,EAC3C,IAAA,gBAAI,EAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAChB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAClB,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,EACb,IAAA,qBAAS,EAAC,IAAI,GAAG,EAAE,CAAC,CACrB,CAAA;IAEH,MAAM,YAAY,GAAG,IAAA,kBAAM,EAAC,CAAC,GAAuB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAA;IACpF,MAAM,SAAS,GAAG,EAAE,CAAC,aAAa,CAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAC5B,eAAe,CAChB,CAAC,IAAI,CACJ,IAAA,gBAAI,EAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,cAAc,GAAG,IAAI,CAAC,CAAC,CAAgB,CAAA;QAC7C,IAAI,MAA6B,CAAA;QACjC,IAAI,GAAS,CAAA,CAAC,sBAAsB;QACpC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,GAAG,GAAG,CAAA;YACZ,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;SACvB;aAAM,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;YAC7B,MAAM,GAAG,GAAG,CAAA;YACZ,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;SACzB;aAAM;YACL,OAAO,QAAQ,CAAA;SAChB;QACD,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,IAAI,iBAAiB,CAAA;QACvD,MAAM,WAAW,GAAG,GAAG,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,IAAc,EAAE,CAAA;QACxE,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAA;QAC/C,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE;YAChD,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAA;YACrC,OAAO,QAAQ,CAAA;SAChB;QACD,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,IAAc,EAAE,CAAC,GAAG;YACpD,KAAK,EAAE,MAAM,KAAK,GAAG;YACrB,UAAU,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACtC,IAAI,EAAE,GAAG,CAAC,UAAU;YACpB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAA;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,EAAE;QACD,GAAG,EAAE,EAAE;QACP,eAAe,EAAE,EAAE;QACnB,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KAMT,CAAC,EACF,IAAA,qBAAS,EAAC;QACR,GAAG,EAAE,EAAE;QACP,eAAe,EAAE,EAAE;QACnB,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KACT,CAAC,CACH,CAAA;IAED,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAC/B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,EACvC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAA,iBAAK,EAAC,EAAE,CAAC,CAAC,CAC3C;SACE,IAAI,CACH,IAAA,gBAAI,EAAC,CAAC,CAAC,EACP,IAAA,kBAAM,EAAC,eAAK,EAAE,EAAS,CAAC,CAAC,yDAAyD;KACnF,CAAA;IAEH,OAAO,EAAE,CAAC,aAAa,CACrB,SAAS,EACT,gBAAgB,CACjB;SACE,IAAI,CACH,IAAA,eAAG,EACD,CAAC,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,EAAE;QAC/B,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC;YAAE,OAAO,QAAQ,CAAA;QAEnG,MAAM,sBAAsB,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;QACtF,MAAM,sBAAsB,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;QAEtF,KAAK,MAAM,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE;YACzD,MAAM,IAAI,GAAG,gCAAwB,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YACnE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YACnE,MAAM,WAAW,GAAG,IAAA,oBAAU,EAAC,WAAW,EAAE,WAAW,CAAC,CAAA;YAExD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBACpC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE;oBACxC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,GAAG;wBACpC,KAAK,EAAE,KAAK;wBACZ,IAAI,EAAE,UAAU;wBAChB,OAAO,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC;qBAClD,CAAA;iBACF;aACF;YAED,MAAM,SAAS,GAAG,IAAA,oBAAU,EAAC,WAAW,EAAE,WAAW,CAAC,CAAA;YAEtD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,EAAE;oBACtC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,GAAG;wBAClC,KAAK,EAAE,IAAI;wBACX,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;qBAChD,CAAA;iBACF;aACF;SACF;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,CACF,CACF,CAAA;AACL,CAAC;AAnID,4BAmIC;AAED,SAAS,0BAA0B,CAAE,GAAoB;IACvD,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,IAAI,IAAI,CAAC;QAAE,OAAO,GAAG,CAAA;IAChF,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QACnD,IAAI,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;SACjC;KACF;IACD,OAAO,GAAG,CAAA;AACZ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/default-reporter",
3
- "version": "8.6.3",
3
+ "version": "8.6.4",
4
4
  "description": "The default reporter of pnpm",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -24,7 +24,7 @@
24
24
  "@pnpm/logger": "^4.0.0"
25
25
  },
26
26
  "dependencies": {
27
- "@pnpm/config": "13.14.2",
27
+ "@pnpm/config": "13.14.3",
28
28
  "@pnpm/core-loggers": "6.1.5",
29
29
  "@pnpm/error": "2.1.0",
30
30
  "@pnpm/render-peer-issues": "1.1.3",
@@ -44,7 +44,7 @@
44
44
  "strip-ansi": "^6.0.1"
45
45
  },
46
46
  "devDependencies": {
47
- "@pnpm/default-reporter": "8.6.3",
47
+ "@pnpm/default-reporter": "8.6.4",
48
48
  "@pnpm/logger": "^4.0.0",
49
49
  "@types/normalize-path": "^3.0.0",
50
50
  "@types/ramda": "0.27.39",
@@ -58,7 +58,6 @@
58
58
  "scripts": {
59
59
  "start": "tsc --watch",
60
60
  "lint": "eslint src/**/*.ts test/**/*.ts",
61
- "pretty-test": "ts-node test | tap-diff",
62
61
  "just-test-preview": "ts-node test --type-check",
63
62
  "_test": "jest",
64
63
  "test": "pnpm run compile && pnpm run _test",