@zuplo/cli 7.0.1 → 7.1.0

package/node_modules/pino/test/metadata.test.js

@@ -1,26 +1,29 @@
 'use strict'
 
+const test = require('node:test')
 const os = require('node:os')
-const { test } = require('tap')
+const tspl = require('@matteo.collina/tspl')
+
 const pino = require('../')
 
 const { pid } = process
 const hostname = os.hostname()
 
-test('metadata works', async ({ ok, same, equal }) => {
+test('metadata works', async (t) => {
+  const plan = tspl(t, { plan: 7 })
   const now = Date.now()
   const instance = pino({}, {
     [Symbol.for('pino.metadata')]: true,
     write (chunk) {
-      equal(instance, this.lastLogger)
-      equal(30, this.lastLevel)
-      equal('a msg', this.lastMsg)
-      ok(Number(this.lastTime) >= now)
-      same(this.lastObj, { hello: 'world' })
+      plan.equal(instance, this.lastLogger)
+      plan.equal(30, this.lastLevel)
+      plan.equal('a msg', this.lastMsg)
+      plan.ok(Number(this.lastTime) >= now)
+      plan.deepEqual(this.lastObj, { hello: 'world' })
       const result = JSON.parse(chunk)
-      ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+      plan.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
       delete result.time
-      same(result, {
+      plan.deepEqual(result, {
         pid,
         hostname,
         level: 30,
@@ -31,20 +34,23 @@ test('metadata works', async ({ ok, same, equal }) => {
   })
 
   instance.info({ hello: 'world' }, 'a msg')
+
+  await plan
 })
 
-test('child loggers works', async ({ ok, same, equal }) => {
+test('child loggers works', async (t) => {
+  const plan = tspl(t, { plan: 6 })
   const instance = pino({}, {
     [Symbol.for('pino.metadata')]: true,
     write (chunk) {
-      equal(child, this.lastLogger)
-      equal(30, this.lastLevel)
-      equal('a msg', this.lastMsg)
-      same(this.lastObj, { from: 'child' })
+      plan.equal(child, this.lastLogger)
+      plan.equal(30, this.lastLevel)
+      plan.equal('a msg', this.lastMsg)
+      plan.deepEqual(this.lastObj, { from: 'child' })
       const result = JSON.parse(chunk)
-      ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+      plan.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
       delete result.time
-      same(result, {
+      plan.deepEqual(result, {
         pid,
         hostname,
         level: 30,
@@ -57,20 +63,23 @@ test('child loggers works', async ({ ok, same, equal }) => {
 
   const child = instance.child({ hello: 'world' })
   child.info({ from: 'child' }, 'a msg')
+
+  await plan
 })
 
-test('without object', async ({ ok, same, equal }) => {
+test('without object', async (t) => {
+  const plan = tspl(t, { plan: 6 })
   const instance = pino({}, {
     [Symbol.for('pino.metadata')]: true,
     write (chunk) {
-      equal(instance, this.lastLogger)
-      equal(30, this.lastLevel)
-      equal('a msg', this.lastMsg)
-      same({ }, this.lastObj)
+      plan.equal(instance, this.lastLogger)
+      plan.equal(30, this.lastLevel)
+      plan.equal('a msg', this.lastMsg)
+      plan.deepEqual({ }, this.lastObj)
       const result = JSON.parse(chunk)
-      ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+      plan.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
       delete result.time
-      same(result, {
+      plan.deepEqual(result, {
         pid,
         hostname,
         level: 30,
@@ -80,20 +89,23 @@ test('without object', async ({ ok, same, equal }) => {
   })
 
   instance.info('a msg')
+
+  await plan
 })
 
-test('without msg', async ({ ok, same, equal }) => {
+test('without msg', async (t) => {
+  const plan = tspl(t, { plan: 6 })
   const instance = pino({}, {
     [Symbol.for('pino.metadata')]: true,
     write (chunk) {
-      equal(instance, this.lastLogger)
-      equal(30, this.lastLevel)
-      equal(undefined, this.lastMsg)
-      same({ hello: 'world' }, this.lastObj)
+      plan.equal(instance, this.lastLogger)
+      plan.equal(30, this.lastLevel)
+      plan.equal(undefined, this.lastMsg)
+      plan.deepEqual({ hello: 'world' }, this.lastObj)
       const result = JSON.parse(chunk)
-      ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+      plan.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
       delete result.time
-      same(result, {
+      plan.deepEqual(result, {
         pid,
         hostname,
         level: 30,
@@ -103,4 +115,6 @@ test('without msg', async ({ ok, same, equal }) => {
   })
 
   instance.info({ hello: 'world' })
+
+  await plan
 })

package/node_modules/pino/test/mixin-merge-strategy.test.js

@@ -1,13 +1,15 @@
 'use strict'
 
-const { test } = require('tap')
+const test = require('node:test')
+const assert = require('node:assert')
+
 const { sink, once } = require('./helper')
 const pino = require('../')
 
 const level = 50
 const name = 'error'
 
-test('default merge strategy', async ({ ok, same }) => {
+test('default merge strategy', async () => {
   const stream = sink()
   const instance = pino({
     base: {},
@@ -20,16 +22,16 @@ test('default merge strategy', async ({ ok, same }) => {
     tag: 'local'
   }, 'test')
   const result = await once(stream, 'data')
-  ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+  assert.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
   delete result.time
-  same(result, {
+  assert.deepEqual(result, {
     level,
     msg: 'test',
     tag: 'local'
   })
 })
 
-test('custom merge strategy with mixin priority', async ({ ok, same }) => {
+test('custom merge strategy with mixin priority', async () => {
   const stream = sink()
   const instance = pino({
     base: {},
@@ -45,9 +47,9 @@ test('custom merge strategy with mixin priority', async ({ ok, same }) => {
     tag: 'local'
   }, 'test')
   const result = await once(stream, 'data')
-  ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+  assert.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
   delete result.time
-  same(result, {
+  assert.deepEqual(result, {
     level,
     msg: 'test',
     tag: 'k8s'

package/node_modules/pino/test/mixin.test.js

@@ -1,7 +1,10 @@
 'use strict'
 
+const test = require('node:test')
+const assert = require('node:assert')
 const os = require('node:os')
-const { test } = require('tap')
+const tspl = require('@matteo.collina/tspl')
+
 const { sink, once } = require('./helper')
 const pino = require('../')
 
@@ -10,7 +13,7 @@ const hostname = os.hostname()
 const level = 50
 const name = 'error'
 
-test('mixin object is included', async ({ ok, same }) => {
+test('mixin object is included', async () => {
   let n = 0
   const stream = sink()
   const instance = pino({
@@ -21,9 +24,9 @@ test('mixin object is included', async ({ ok, same }) => {
   instance.level = name
   instance[name]('test')
   const result = await once(stream, 'data')
-  ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+  assert.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
   delete result.time
-  same(result, {
+  assert.deepEqual(result, {
     pid,
     hostname,
     level,
@@ -32,8 +35,8 @@ test('mixin object is included', async ({ ok, same }) => {
   })
 })
 
-test('mixin object is new every time', async ({ plan, ok, same }) => {
-  plan(6)
+test('mixin object is new every time', async (t) => {
+  const plan = tspl(t, { plan: 6 })
 
   let n = 0
   const stream = sink()
@@ -50,9 +53,9 @@ test('mixin object is new every time', async ({ plan, ok, same }) => {
     instance[name](msg)
     stream.resume()
     const result = await once(stream, 'data')
-    ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+    plan.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
     delete result.time
-    same(result, {
+    plan.deepEqual(result, {
       pid,
       hostname,
       level,
@@ -60,20 +63,22 @@ test('mixin object is new every time', async ({ plan, ok, same }) => {
       hello: n
     })
   }
+
+  await plan
 })
 
-test('mixin object is not called if below log level', async ({ ok }) => {
+test('mixin object is not called if below log level', async () => {
   const stream = sink()
   const instance = pino({
     mixin () {
-      ok(false, 'should not call mixin function')
+      throw Error('should not call mixin function')
     }
   }, stream)
   instance.level = 'error'
   instance.info('test')
 })
 
-test('mixin object + logged object', async ({ ok, same }) => {
+test('mixin object + logged object', async () => {
   const stream = sink()
   const instance = pino({
     mixin () {
@@ -83,9 +88,9 @@ test('mixin object + logged object', async ({ ok, same }) => {
   instance.level = name
   instance[name]({ bar: 3, baz: 4 })
   const result = await once(stream, 'data')
-  ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
+  assert.ok(new Date(result.time) <= new Date(), 'time is greater than Date.now()')
   delete result.time
-  same(result, {
+  assert.deepEqual(result, {
     pid,
     hostname,
     level,
@@ -95,20 +100,21 @@ test('mixin object + logged object', async ({ ok, same }) => {
   })
 })
 
-test('mixin not a function', async ({ throws }) => {
+test('mixin not a function', async () => {
   const stream = sink()
-  throws(function () {
+  assert.throws(function () {
     pino({ mixin: 'not a function' }, stream)
   })
 })
 
-test('mixin can use context', async ({ ok, same }) => {
+test('mixin can use context', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   const stream = sink()
   const instance = pino({
     mixin (context) {
-      ok(context !== null, 'context should be defined')
-      ok(context !== undefined, 'context should be defined')
-      same(context, {
+      plan.ok(context !== null, 'context should be defined')
+      plan.ok(context !== undefined, 'context should be defined')
+      plan.deepEqual(context, {
         message: '123',
         stack: 'stack'
       })
@@ -123,15 +129,18 @@ test('mixin can use context', async ({ ok, same }) => {
     message: '123',
     stack: 'stack'
   }, 'test')
+
+  await plan
 })
 
-test('mixin works without context', async ({ ok, same }) => {
+test('mixin works without context', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   const stream = sink()
   const instance = pino({
     mixin (context) {
-      ok(context !== null, 'context is still defined w/o passing mergeObject')
-      ok(context !== undefined, 'context is still defined w/o passing mergeObject')
-      same(context, {})
+      plan.ok(context !== null, 'context is still defined w/o passing mergeObject')
+      plan.ok(context !== undefined, 'context is still defined w/o passing mergeObject')
+      plan.deepEqual(context, {})
       return {
         something: true
       }
@@ -139,15 +148,18 @@ test('mixin works without context', async ({ ok, same }) => {
   }, stream)
   instance.level = name
   instance[name]('test')
+
+  await plan
 })
 
-test('mixin can use level number', async ({ ok, same }) => {
+test('mixin can use level number', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   const stream = sink()
   const instance = pino({
     mixin (context, num) {
-      ok(num !== null, 'level should be defined')
-      ok(num !== undefined, 'level should be defined')
-      same(num, level)
+      plan.ok(num !== null, 'level should be defined')
+      plan.ok(num !== undefined, 'level should be defined')
+      plan.deepEqual(num, level)
       return Object.assign({
         error: context.message,
         stack: context.stack
@@ -159,15 +171,18 @@ test('mixin can use level number', async ({ ok, same }) => {
     message: '123',
     stack: 'stack'
   }, 'test')
+
+  await plan
 })
 
-test('mixin receives logger as third parameter', async ({ ok, same }) => {
+test('mixin receives logger as third parameter', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   const stream = sink()
   const instance = pino({
     mixin (context, num, logger) {
-      ok(logger !== null, 'logger should be defined')
-      ok(logger !== undefined, 'logger should be defined')
-      same(logger, instance)
+      plan.ok(logger !== null, 'logger should be defined')
+      plan.ok(logger !== undefined, 'logger should be defined')
+      plan.deepEqual(logger, instance)
       return { ...context, num }
     }
   }, stream)
@@ -175,16 +190,19 @@ test('mixin receives logger as third parameter', async ({ ok, same }) => {
   instance[name]({
     message: '123'
   }, 'test')
+
+  await plan
 })
 
-test('mixin receives child logger', async ({ ok, same }) => {
+test('mixin receives child logger', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   const stream = sink()
   let child = null
   const instance = pino({
     mixin (context, num, logger) {
-      ok(logger !== null, 'logger should be defined')
-      ok(logger !== undefined, 'logger should be defined')
-      same(logger.expected, child.expected)
+      plan.ok(logger !== null, 'logger should be defined')
+      plan.ok(logger !== undefined, 'logger should be defined')
+      plan.deepEqual(logger.expected, child.expected)
       return { ...context, num }
     }
   }, stream)
@@ -195,16 +213,19 @@ test('mixin receives child logger', async ({ ok, same }) => {
   child[name]({
     message: '123'
   }, 'test')
+
+  await plan
 })
 
-test('mixin receives logger even if child exists', async ({ ok, same }) => {
+test('mixin receives logger even if child exists', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   const stream = sink()
   let child = null
   const instance = pino({
     mixin (context, num, logger) {
-      ok(logger !== null, 'logger should be defined')
-      ok(logger !== undefined, 'logger should be defined')
-      same(logger.expected, instance.expected)
+      plan.ok(logger !== null, 'logger should be defined')
+      plan.ok(logger !== undefined, 'logger should be defined')
+      plan.deepEqual(logger.expected, instance.expected)
       return { ...context, num }
     }
   }, stream)
@@ -215,4 +236,6 @@ test('mixin receives logger even if child exists', async ({ ok, same }) => {
   instance[name]({
     message: '123'
   }, 'test')
+
+  await plan
 })