occam-verify-cli 0.0.707 → 0.0.710

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.
@@ -35,13 +35,14 @@ function _unsupported_iterable_to_array(o, minLen) {
35
35
  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
36
36
  }
37
37
  function createReleaseContext(dependency, dependentNames, context, callback) {
38
- var log = context.log, releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
38
+ var log = context.log, releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), dependencyString = dependency.asString(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
39
+ log.debug("Creating the '".concat(releaseName, "' context given the '").concat(dependencyString, "' dependency..."));
39
40
  if (releaseContext !== null) {
40
- var error = null;
41
+ var error = null, version = releaseContext.getVersion(), versionString = version.toString();
42
+ log.debug("...already created the '".concat(releaseName, ":").concat(versionString, "' context."));
41
43
  callback(error);
42
44
  return;
43
45
  }
44
- log.info("Creating the '".concat(releaseName, "' context."));
45
46
  var releaseContextFromDependency = context.releaseContextFromDependency;
46
47
  releaseContextFromDependency(dependency, context, function(error, releaseContext) {
47
48
  if (error) {
@@ -60,6 +61,8 @@ function createReleaseContext(dependency, dependentNames, context, callback) {
60
61
  callback(_$error1);
61
62
  return;
62
63
  }
64
+ var version = releaseContext.getVersion(), versionString = version.toString();
65
+ log.info("...created the '".concat(releaseName, "@").concat(versionString, "' context."));
63
66
  releaseContextMap[releaseName] = releaseContext;
64
67
  createDependencyReleaseContexts(dependency, dependentNames, context, callback);
65
68
  }, context);
@@ -88,8 +91,8 @@ function checkReleaseMatchesDependency(releaseContext, dependency, dependentName
88
91
  if (shortenedVersion !== null) {
89
92
  var entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);
90
93
  if (!entriesMatchShortenedVersion) {
91
- var log = context.log, version = releaseContext.getVersion(), versionString = version.toString(), lastDependentName = (0, _array.last)(dependentNames), dependentName = lastDependentName, dependencyName = dependency.getName(), shortenedVersion1 = dependency.getShortedVersion(), shortenedVersionString = shortenedVersion1.toString();
92
- log.error("Version mismatch: '".concat(dependentName, "' requires '").concat(dependencyName, "' to be version ").concat(shortenedVersionString, ".0 or higher but version ").concat(versionString, " has been supplied."));
94
+ var log = context.log, version = releaseContext.getVersion(), lastDependentName = (0, _array.last)(dependentNames), dependentName = lastDependentName, versionString = version.toString(), dependencyString = dependency.asString();
95
+ log.error("Version mismatch: '".concat(dependentName, "' requires the '").concat(dependencyString, "' dependency but a context with version '").concat(versionString, "' has already been created."));
93
96
  releaseMatchesDependency = false;
94
97
  }
95
98
  }
@@ -114,11 +117,10 @@ function createDependencyReleaseContexts(dependency, dependentNames, context, ca
114
117
  }
115
118
  next();
116
119
  });
117
- }, done);
118
- function done() {
120
+ }, function() {
119
121
  var error = null;
120
122
  callback(error);
121
- }
123
+ });
122
124
  }
123
125
 
124
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/releaseContext/create.js"],"sourcesContent":["\"use strict\";\n\nimport { last } from \"../utilities/array\";\n\nexport default function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { log, releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = null;\n\n    callback(error);\n\n    return;\n  }\n\n  log.info(`Creating the '${releaseName}' context.`)\n\n  const { releaseContextFromDependency } = context;\n\n  releaseContextFromDependency(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    const releaseContextCreated = checkReleaseContextCreated(releaseContext, dependency, context);\n\n    if (!releaseContextCreated) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    const releaseMatchesDependency = checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context);\n\n    if (!releaseMatchesDependency) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nfunction checkReleaseContextCreated(releaseContext, dependency, context) {\n  const releaseContextCreated = (releaseContext !== null);\n\n  if (!releaseContextCreated) {\n    const { log } = context,\n          dependencyName = dependency.getName(),\n          releaseName = dependencyName; ///\n\n    log.error(`The '${releaseName}' context could not be created.`);\n  }\n\n  return releaseContextCreated;\n}\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n            ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context) {\n  let releaseMatchesDependency = true;\n\n  const entries = releaseContext.getEntries(),\n        shortenedVersion = dependency.getShortedVersion();\n\n  if (shortenedVersion !== null) {\n    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n    if (!entriesMatchShortenedVersion) {\n      const { log } = context,\n            version = releaseContext.getVersion(),\n            versionString = version.toString(),\n            lastDependentName = last(dependentNames),\n            dependentName = lastDependentName,  ///\n            dependencyName = dependency.getName(),\n            shortenedVersion = dependency.getShortedVersion(),\n            shortenedVersionString = shortenedVersion.toString();\n\n      log.error(`Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`);\n\n      releaseMatchesDependency = false;\n    }\n  }\n\n  return releaseMatchesDependency;\n}\n\nfunction createDependencyReleaseContexts(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n\n  function done() {\n    const error = null;\n\n    callback(error);\n  }\n}\n"],"names":["createReleaseContext","dependency","dependentNames","context","callback","log","releaseContextMap","dependencyName","getName","releaseName","releaseContext","error","info","releaseContextFromDependency","releaseContextCreated","checkReleaseContextCreated","releaseMatchesDependency","checkReleaseMatchesDependency","createDependencyReleaseContexts","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","shortenedVersion","getShortedVersion","entriesMatchShortenedVersion","matchShortenedVersion","version","getVersion","versionString","toString","lastDependentName","last","dependentName","shortenedVersionString","dependencies","getDependencies","asynchronousForEachDependency","next","done"],"mappings":"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"}
126
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/releaseContext/create.js"],"sourcesContent":["\"use strict\";\n\nimport { last } from \"../utilities/array\";\n\nexport default function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { log, releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        dependencyString = dependency.asString(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  log.debug(`Creating the '${releaseName}' context given the '${dependencyString}' dependency...`);\n\n  if (releaseContext !== null) {\n    const error = null,\n          version = releaseContext.getVersion(),\n          versionString = version.toString();\n\n    log.debug(`...already created the '${releaseName}:${versionString}' context.`);\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependency } = context;\n\n  releaseContextFromDependency(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    const releaseContextCreated = checkReleaseContextCreated(releaseContext, dependency, context);\n\n    if (!releaseContextCreated) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    const releaseMatchesDependency = checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context);\n\n    if (!releaseMatchesDependency) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    const version = releaseContext.getVersion(),\n          versionString = version.toString();\n\n    log.info(`...created the '${releaseName}@${versionString}' context.`);\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nfunction checkReleaseContextCreated(releaseContext, dependency, context) {\n  const releaseContextCreated = (releaseContext !== null);\n\n  if (!releaseContextCreated) {\n    const { log } = context,\n          dependencyName = dependency.getName(),\n          releaseName = dependencyName; ///\n\n    log.error(`The '${releaseName}' context could not be created.`);\n  }\n\n  return releaseContextCreated;\n}\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n            ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context) {\n  let releaseMatchesDependency = true;\n\n  const entries = releaseContext.getEntries(),\n        shortenedVersion = dependency.getShortedVersion();\n\n  if (shortenedVersion !== null) {\n    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n    if (!entriesMatchShortenedVersion) {\n      const { log } = context,\n            version = releaseContext.getVersion(),\n            lastDependentName = last(dependentNames),\n            dependentName = lastDependentName,  ///\n            versionString = version.toString(),\n            dependencyString = dependency.asString();\n\n      log.error(`Version mismatch: '${dependentName}' requires the '${dependencyString}' dependency but a context with version '${versionString}' has already been created.`);\n\n      releaseMatchesDependency = false;\n    }\n  }\n\n  return releaseMatchesDependency;\n}\n\nfunction createDependencyReleaseContexts(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, () => {\n    const error = null;\n\n    callback(error);\n  });\n}\n"],"names":["createReleaseContext","dependency","dependentNames","context","callback","log","releaseContextMap","dependencyName","getName","dependencyString","asString","releaseName","releaseContext","debug","error","version","getVersion","versionString","toString","releaseContextFromDependency","releaseContextCreated","checkReleaseContextCreated","releaseMatchesDependency","checkReleaseMatchesDependency","info","createDependencyReleaseContexts","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","shortenedVersion","getShortedVersion","entriesMatchShortenedVersion","matchShortenedVersion","lastDependentName","last","dependentName","dependencies","getDependencies","asynchronousForEachDependency","next","done"],"mappings":"AAAA;;;;+BAIA;;;eAAwBA;;;qBAFH;;;;;;;;;;;;;;;;;;;;;;;;;;AAEN,SAASA,qBAAqBC,UAAU,EAAEC,cAAc,EAAEC,OAAO,EAAEC,QAAQ;IACxF,IAAQC,MAA2BF,QAA3BE,KAAKC,oBAAsBH,QAAtBG,mBACPC,iBAAiBN,WAAWO,OAAO,IACnCC,mBAAmBR,WAAWS,QAAQ,IACtCC,cAAcJ,gBACdK,iBAAiBN,iBAAiB,CAACK,YAAY,IAAI;IAEzDN,IAAIQ,KAAK,CAAC,AAAC,iBAAmDJ,OAAnCE,aAAY,yBAAwC,OAAjBF,kBAAiB;IAE/E,IAAIG,mBAAmB,MAAM;QAC3B,IAAME,QAAQ,MACRC,UAAUH,eAAeI,UAAU,IACnCC,gBAAgBF,QAAQG,QAAQ;QAEtCb,IAAIQ,KAAK,CAAC,AAAC,2BAAyCI,OAAfN,aAAY,KAAiB,OAAdM,eAAc;QAElEb,SAASU;QAET;IACF;IAEA,IAAM,AAAEK,+BAAiChB,QAAjCgB;IAERA,6BAA6BlB,YAAYE,SAAS,SAACW,OAAOF;QACxD,IAAIE,OAAO;YACTV,SAASU;YAET;QACF;QAEA,IAAMM,wBAAwBC,2BAA2BT,gBAAgBX,YAAYE;QAErF,IAAI,CAACiB,uBAAuB;YAC1B,IAAMN,UAAQ;YAEdV,SAASU;YAET;QACF;QAEA,IAAMQ,2BAA2BC,8BAA8BX,gBAAgBX,YAAYC,gBAAgBC;QAE3G,IAAI,CAACmB,0BAA0B;YAC7B,IAAMR,WAAQ;YAEdV,SAASU;YAET;QACF;QAEA,IAAMC,UAAUH,eAAeI,UAAU,IACnCC,gBAAgBF,QAAQG,QAAQ;QAEtCb,IAAImB,IAAI,CAAC,AAAC,mBAAiCP,OAAfN,aAAY,KAAiB,OAAdM,eAAc;QAEzDX,iBAAiB,CAACK,YAAY,GAAGC;QAEjCa,gCAAgCxB,YAAYC,gBAAgBC,SAASC;IACvE,GAAGD;AACL;AAEA,SAASkB,2BAA2BT,cAAc,EAAEX,UAAU,EAAEE,OAAO;IACrE,IAAMiB,wBAAyBR,mBAAmB;IAElD,IAAI,CAACQ,uBAAuB;QAC1B,IAAM,AAAEf,MAAQF,QAARE,KACFE,iBAAiBN,WAAWO,OAAO,IACnCG,cAAcJ,gBAAgB,GAAG;QAEvCF,IAAIS,KAAK,CAAC,AAAC,QAAmB,OAAZH,aAAY;IAChC;IAEA,OAAOS;AACT;AAEA,SAASM,4BAA4BzB,UAAU,EAAEC,cAAc,EAAEC,OAAO;IACtE,IAAMI,iBAAiBN,WAAWO,OAAO,IACnCmB,uCAAuCzB,eAAe0B,QAAQ,CAACrB,iBAC/DsB,yBAAyBF,sCAAuC,GAAG;IAEzE,IAAIE,wBAAwB;QAC1B,IAAM,AAAExB,MAAQF,QAARE,KACFyB,qBAAqBC,MAAM7B,iBAC3B8B,kBAAkB,AAChB,qBAAG9B,uBADa;YAEhB4B;SACD,GACDG,wBAAwBD,gBAAgBE,IAAI,CAAE;QAEpD7B,IAAIS,KAAK,CAAC,AAAC,kCAAuD,OAAtBmB,uBAAsB;IACpE;IAEA,OAAOJ;AACT;AAEA,SAASN,8BAA8BX,cAAc,EAAEX,UAAU,EAAEC,cAAc,EAAEC,OAAO;IACxF,IAAImB,2BAA2B;IAE/B,IAAMa,UAAUvB,eAAewB,UAAU,IACnCC,mBAAmBpC,WAAWqC,iBAAiB;IAErD,IAAID,qBAAqB,MAAM;QAC7B,IAAME,+BAA+BJ,QAAQK,qBAAqB,CAACH;QAEnE,IAAI,CAACE,8BAA8B;YACjC,IAAM,AAAElC,MAAQF,QAARE,KACFU,UAAUH,eAAeI,UAAU,IACnCyB,oBAAoBC,IAAAA,WAAI,EAACxC,iBACzByC,gBAAgBF,mBAChBxB,gBAAgBF,QAAQG,QAAQ,IAChCT,mBAAmBR,WAAWS,QAAQ;YAE5CL,IAAIS,KAAK,CAAC,AAAC,sBAAqDL,OAAhCkC,eAAc,oBAA8E1B,OAA5DR,kBAAiB,6CAAyD,OAAdQ,eAAc;YAE1IK,2BAA2B;QAC7B;IACF;IAEA,OAAOA;AACT;AAEA,SAASG,gCAAgCxB,UAAU,EAAEC,cAAc,EAAEC,OAAO,EAAEC,QAAQ;IACpF,IAAM,AAAEE,oBAAsBH,QAAtBG,mBACFC,iBAAiBN,WAAWO,OAAO,IACnCG,cAAcJ,gBACdK,iBAAiBN,iBAAiB,CAACK,YAAY,EAC/CiC,eAAehC,eAAeiC,eAAe;IAEnD3C,iBAAiB,AAAE,qBAAGA,uBAAL;QAAqBK;KAAgB,GAAG,GAAG;IAE5DqC,aAAaE,6BAA6B,CAAC,SAAC7C,YAAY8C,MAAMC;QAC5D,IAAMnB,yBAAyBH,4BAA4BzB,YAAYC;QAEvE,IAAI2B,wBAAwB;YAC1B,IAAMf,QAAQ;YAEdV,SAASU;YAET;QACF;QAEAd,qBAAqBC,YAAYC,gBAAgBC,SAAS,SAACW;YACzD,IAAIA,OAAO;gBACTV,SAASU;gBAET;YACF;YAEAiC;QACF;IACF,GAAG;QACD,IAAMjC,QAAQ;QAEdV,SAASU;IACX;AACF"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "0.0.707",
4
+ "version": "0.0.710",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -14,8 +14,8 @@
14
14
  "necessary": "^13.1.4",
15
15
  "occam-custom-grammars": "^5.0.567",
16
16
  "occam-dom": "^3.1.91",
17
- "occam-entities": "^1.0.33",
18
- "occam-file-system": "^6.0.79",
17
+ "occam-entities": "^1.0.35",
18
+ "occam-file-system": "^6.0.80",
19
19
  "occam-grammar-utilities": "^8.0.77"
20
20
  },
21
21
  "devDependencies": {
@@ -5,19 +5,24 @@ import { last } from "../utilities/array";
5
5
  export default function createReleaseContext(dependency, dependentNames, context, callback) {
6
6
  const { log, releaseContextMap } = context,
7
7
  dependencyName = dependency.getName(),
8
+ dependencyString = dependency.asString(),
8
9
  releaseName = dependencyName, ///
9
10
  releaseContext = releaseContextMap[releaseName] || null;
10
11
 
12
+ log.debug(`Creating the '${releaseName}' context given the '${dependencyString}' dependency...`);
13
+
11
14
  if (releaseContext !== null) {
12
- const error = null;
15
+ const error = null,
16
+ version = releaseContext.getVersion(),
17
+ versionString = version.toString();
18
+
19
+ log.debug(`...already created the '${releaseName}:${versionString}' context.`);
13
20
 
14
21
  callback(error);
15
22
 
16
23
  return;
17
24
  }
18
25
 
19
- log.info(`Creating the '${releaseName}' context.`)
20
-
21
26
  const { releaseContextFromDependency } = context;
22
27
 
23
28
  releaseContextFromDependency(dependency, context, (error, releaseContext) => {
@@ -47,6 +52,11 @@ export default function createReleaseContext(dependency, dependentNames, context
47
52
  return;
48
53
  }
49
54
 
55
+ const version = releaseContext.getVersion(),
56
+ versionString = version.toString();
57
+
58
+ log.info(`...created the '${releaseName}@${versionString}' context.`);
59
+
50
60
  releaseContextMap[releaseName] = releaseContext;
51
61
 
52
62
  createDependencyReleaseContexts(dependency, dependentNames, context, callback);
@@ -99,14 +109,12 @@ function checkReleaseMatchesDependency(releaseContext, dependency, dependentName
99
109
  if (!entriesMatchShortenedVersion) {
100
110
  const { log } = context,
101
111
  version = releaseContext.getVersion(),
102
- versionString = version.toString(),
103
112
  lastDependentName = last(dependentNames),
104
113
  dependentName = lastDependentName, ///
105
- dependencyName = dependency.getName(),
106
- shortenedVersion = dependency.getShortedVersion(),
107
- shortenedVersionString = shortenedVersion.toString();
114
+ versionString = version.toString(),
115
+ dependencyString = dependency.asString();
108
116
 
109
- log.error(`Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`);
117
+ log.error(`Version mismatch: '${dependentName}' requires the '${dependencyString}' dependency but a context with version '${versionString}' has already been created.`);
110
118
 
111
119
  releaseMatchesDependency = false;
112
120
  }
@@ -144,11 +152,9 @@ function createDependencyReleaseContexts(dependency, dependentNames, context, ca
144
152
 
145
153
  next();
146
154
  });
147
- }, done);
148
-
149
- function done() {
155
+ }, () => {
150
156
  const error = null;
151
157
 
152
158
  callback(error);
153
- }
159
+ });
154
160
  }