@appium/docutils 2.4.2 → 2.4.3

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.
Files changed (41) hide show
  1. package/build/lib/builder/deploy.d.ts.map +1 -1
  2. package/build/lib/builder/deploy.js +2 -3
  3. package/build/lib/builder/deploy.js.map +1 -1
  4. package/build/lib/cli/check.d.ts.map +1 -1
  5. package/build/lib/cli/check.js +9 -11
  6. package/build/lib/cli/check.js.map +1 -1
  7. package/build/lib/cli/config.d.ts.map +1 -1
  8. package/build/lib/cli/config.js +1 -2
  9. package/build/lib/cli/config.js.map +1 -1
  10. package/build/lib/cli/index.d.ts.map +1 -1
  11. package/build/lib/cli/index.js +1 -2
  12. package/build/lib/cli/index.js.map +1 -1
  13. package/build/lib/fs.d.ts +19 -7
  14. package/build/lib/fs.d.ts.map +1 -1
  15. package/build/lib/fs.js +21 -18
  16. package/build/lib/fs.js.map +1 -1
  17. package/build/lib/logger.d.ts +0 -7
  18. package/build/lib/logger.d.ts.map +1 -1
  19. package/build/lib/logger.js +8 -6
  20. package/build/lib/logger.js.map +1 -1
  21. package/build/lib/scaffold.d.ts.map +1 -1
  22. package/build/lib/scaffold.js +4 -5
  23. package/build/lib/scaffold.js.map +1 -1
  24. package/build/lib/util.d.ts +16 -6
  25. package/build/lib/util.d.ts.map +1 -1
  26. package/build/lib/util.js +69 -18
  27. package/build/lib/util.js.map +1 -1
  28. package/build/lib/validate.d.ts.map +1 -1
  29. package/build/lib/validate.js +3 -7
  30. package/build/lib/validate.js.map +1 -1
  31. package/lib/builder/deploy.ts +10 -5
  32. package/lib/cli/check.ts +10 -9
  33. package/lib/cli/config.ts +1 -2
  34. package/lib/cli/index.ts +1 -2
  35. package/lib/fs.ts +22 -27
  36. package/lib/logger.ts +7 -3
  37. package/lib/scaffold.ts +7 -8
  38. package/lib/util.ts +69 -26
  39. package/lib/validate.ts +3 -4
  40. package/package.json +4 -5
  41. package/requirements.txt +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAczD,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAKxD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC;;OAEG;IACH,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC;AAED;;;GAGG;AACH,wBAAsB,MAAM,CAAC,EAC3B,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,aAAa,EAAE,OAAO,EACtB,GAAmB,EACnB,KAAa,EACb,IAAY,EACZ,MAA8B,EAC9B,MAA8B,EAC9B,YAAY,EACZ,OAAO,EACP,KAAK,EACL,SAAqC,EACrC,IAAyB,EACzB,IAAyB,EACzB,SAAS,EACT,QAAQ,GACT,GAAE,UAAe,iBAiEjB"}
1
+ {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAczD,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAKxD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC;;OAEG;IACH,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC;AAED;;;GAGG;AACH,wBAAsB,MAAM,CAAC,EAC3B,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,aAAa,EAAE,OAAO,EACtB,GAAmB,EACnB,KAAa,EACb,IAAY,EACZ,MAA8B,EAC9B,MAA8B,EAC9B,YAAY,EACZ,OAAO,EACP,KAAK,EACL,SAAqC,EACrC,IAAyB,EACzB,IAAyB,EACzB,SAAS,EACT,QAAQ,GACT,GAAE,UAAe,iBAuEjB"}
@@ -9,7 +9,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
9
9
  };
10
10
  Object.defineProperty(exports, "__esModule", { value: true });
11
11
  exports.deploy = deploy;
12
- const lodash_1 = __importDefault(require("lodash"));
13
12
  const node_path_1 = __importDefault(require("node:path"));
14
13
  const constants_1 = require("../constants");
15
14
  const error_1 = require("../error");
@@ -51,7 +50,7 @@ async function deploy({ mkdocsYml: mkDocsYmlPath, packageJson: packageJsonPath,
51
50
  }
52
51
  if (serve) {
53
52
  const mikeArgs = [
54
- ...(0, util_1.argify)(lodash_1.default.pickBy(mikeOpts, (value) => lodash_1.default.isNumber(value) || Boolean(value))),
53
+ ...(0, util_1.argify)(Object.fromEntries(Object.entries(mikeOpts).filter(([, value]) => typeof value === 'number' || Boolean(value)))),
55
54
  ];
56
55
  stop(); // discard
57
56
  // unsure about how SIGHUP is handled here
@@ -60,7 +59,7 @@ async function deploy({ mkdocsYml: mkDocsYmlPath, packageJson: packageJsonPath,
60
59
  else {
61
60
  log.info('Deploying into branch %s', branch);
62
61
  const mikeArgs = [
63
- ...(0, util_1.argify)(lodash_1.default.omitBy(mikeOpts, (value, key) => lodash_1.default.includes(['port', 'host'], key) || (!lodash_1.default.isNumber(value) && !value))),
62
+ ...(0, util_1.argify)(Object.fromEntries(Object.entries(mikeOpts).filter(([key, value]) => !['port', 'host'].includes(key) && (typeof value === 'number' || Boolean(value))))),
64
63
  ];
65
64
  if (alias) {
66
65
  mikeArgs.push('--update-aliases', '--alias-type', aliasType);
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;AA8GH,wBAkFC;AA9LD,oDAAuB;AACvB,0DAA6B;AAE7B,4CASsB;AACtB,oCAAuC;AACvC,8BAAiG;AACjG,sCAAoC;AAEpC,kCAAyF;AAEzF,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,gBAAgB,CAAC,CAAC;AAqFxC;;;GAGG;AACI,KAAK,UAAU,MAAM,CAAC,EAC3B,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,aAAa,EAAE,OAAO,EACtB,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EACnB,KAAK,GAAG,KAAK,EACb,IAAI,GAAG,KAAK,EACZ,MAAM,GAAG,iCAAqB,EAC9B,MAAM,GAAG,iCAAqB,EAC9B,YAAY,EACZ,OAAO,EACP,KAAK,EACL,SAAS,GAAG,qCAAyB,EACrC,IAAI,GAAG,8BAAkB,EACzB,IAAI,GAAG,8BAAkB,EACzB,SAAS,EACT,QAAQ,MACM,EAAE;IAChB,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,QAAQ,CAAC,CAAC;IAEjC,MAAM,IAAA,kBAAa,GAAE,CAAC;IAEtB,MAAM,eAAe,GAAG,MAAM,IAAA,sBAAiB,GAAE,CAAC;IAClD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,qBAAa,CAAC,iDAAiD,oBAAQ,QAAQ,CAAC,CAAC;IAC7F,CAAC;IAED,aAAa,GAAG,aAAa,IAAI,CAAC,MAAM,IAAA,kBAAa,EAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,qBAAa,CACrB,kBAAkB,2BAAe,SAAS,GAAG,iBAAiB,oBAAQ,QAAQ,CAC/E,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,OAAO,IAAI,CAAC,MAAM,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;IAErE,wCAAwC;IACxC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,QAAQ,GAAG;QACf,aAAa,EAAE,aAAa;QAC5B,IAAI;QACJ,MAAM;QACN,MAAM;QACN,eAAe,EAAE,YAAY;QAC7B,OAAO;QACP,IAAI;QACJ,IAAI;KACL,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAQ,GAAE,CAAC;IAClC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,qBAAa,CACrB,kBAAkB,qBAAS,4BAA4B,oBAAQ,QAAQ,CACxE,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG;YACf,GAAG,IAAA,aAAM,EAAC,gBAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;SAC9E,CAAC;QACF,IAAI,EAAE,CAAC,CAAC,UAAU;QAClB,0CAA0C;QAC1C,MAAM,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG;YACf,GAAG,IAAA,aAAM,EACP,gBAAC,CAAC,MAAM,CACN,QAAQ,EACR,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CACpF,CACF;SACF,CAAC;QACF,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7D,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QACD,MAAM,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAE7C,GAAG,CAAC,OAAO,CAAC,2CAA2C,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,OAAO,CACpB,QAAgB,EAChB,OAAiB,EAAE,EACnB,OAAmC,EAAE;IAErC,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,qBAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACrE,OAAO,IAAA,6BAAsB,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,QAAQ,CAAC,QAAgB,EAAE,OAAiB,EAAE,EAAE,OAA+B,EAAE;IAC9F,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,qBAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACrE,OAAO,MAAM,IAAA,4BAAqB,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,iBAAiB,CAAC,eAAwB,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IAC5E,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,IAAA,oBAAe,EAAC,eAAe,CAAC,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjG,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,qBAAa,CACrB,yFAAyF,CAC1F,CAAC;IACJ,CAAC;IAED,6FAA6F;IAC7F,gCAAgC;IAChC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC"}
1
+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../lib/cli/check.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAmBnC;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvE,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAkCxB"}
1
+ {"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../lib/cli/check.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAoBnC;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvE,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAkCxB"}
@@ -3,14 +3,11 @@
3
3
  * Provides functions to validate user-provided options as part of Yargs' post-parsing "check" phase
4
4
  * @module
5
5
  */
6
- var __importDefault = (this && this.__importDefault) || function (mod) {
7
- return (mod && mod.__esModule) ? mod : { "default": mod };
8
- };
9
6
  Object.defineProperty(exports, "__esModule", { value: true });
10
7
  exports.checkMissingPaths = checkMissingPaths;
11
8
  const support_1 = require("@appium/support");
12
- const lodash_1 = __importDefault(require("lodash"));
13
9
  const logger_1 = require("../logger");
10
+ const util_1 = require("../util");
14
11
  const log = (0, logger_1.getLogger)('check');
15
12
  /**
16
13
  * Takes user-provided paths and checks for existence.
@@ -25,21 +22,21 @@ const log = (0, logger_1.getLogger)('check');
25
22
  * @returns `true` if all paths exist or otherwise an error message
26
23
  */
27
24
  async function checkMissingPaths(opts, group, argv) {
28
- const argsToCheck = lodash_1.default.keys(lodash_1.default.pickBy(opts, (opt, id) => opt?.group === group && id in argv));
25
+ const argsToCheck = Object.keys(opts).filter((id) => opts[id]?.group === group && id in argv);
29
26
  // yargs is pretty loose about allowing CLI args multiple times, and the value could potentially
30
27
  // be a `string[]` instead of `string`; we don't want to allow more than one path per arg.
31
- if (!argsToCheck.every((id) => lodash_1.default.isString(argv[id]))) {
28
+ if (!argsToCheck.every((id) => typeof argv[id] === 'string')) {
32
29
  return 'Paths may only be provided once each';
33
30
  }
34
- const pathsToCheck = lodash_1.default.map(argsToCheck, (id) => ({
31
+ const pathsToCheck = argsToCheck.map((id) => ({
35
32
  id,
36
33
  path: String(argv[id]), // this must be a string per the above check
37
34
  }));
38
- log.debug('Checking for existence of %s: %s', support_1.util.pluralize('path', pathsToCheck.length), lodash_1.default.map(pathsToCheck, 'path'));
35
+ log.debug('Checking for existence of %s: %s', support_1.util.pluralize('path', pathsToCheck.length), pathsToCheck.map(({ path }) => path));
39
36
  const missingPaths = await filterMissing(pathsToCheck);
40
37
  if (missingPaths.length) {
41
38
  return missingPaths
42
- .map(({ id, path }) => `Default or specified path via --${lodash_1.default.kebabCase(id)} (${path}) does not exist`)
39
+ .map(({ id, path }) => `Default or specified path via --${(0, util_1.kebabCase)(id)} (${path}) does not exist`)
43
40
  .join('\n');
44
41
  }
45
42
  return true;
@@ -51,7 +48,8 @@ async function checkMissingPaths(opts, group, argv) {
51
48
  */
52
49
  async function filterMissing(paths) {
53
50
  const exists = await Promise.all(paths.map(async ({ id, path }) => ({ id, path, exists: await support_1.fs.exists(path) })));
54
- const results = lodash_1.default.reject(exists, 'exists');
55
- return lodash_1.default.map(results, (result) => lodash_1.default.omit(result, 'exists'));
51
+ return exists
52
+ .filter((result) => !result.exists)
53
+ .map(({ id, path }) => ({ id, path }));
56
54
  }
57
55
  //# sourceMappingURL=check.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"check.js","sourceRoot":"","sources":["../../../lib/cli/check.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AAmCH,8CAsCC;AAvED,6CAAyC;AACzC,oDAAuB;AAEvB,sCAAoC;AAEpC,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,OAAO,CAAC,CAAC;AAgB/B;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,iBAAiB,CACrC,IAAO,EACP,KAAa,EACb,IAA6B;IAE7B,MAAM,WAAW,GAAG,gBAAC,CAAC,IAAI,CACxB,gBAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,GAAY,EAAE,EAAU,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,KAAK,IAAI,EAAE,IAAI,IAAI,CAAe,CAC/F,CAAC;IAEF,gGAAgG;IAChG,0FAA0F;IAC1F,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,sCAAsC,CAAC;IAChD,CAAC;IAED,MAAM,YAAY,GAAsB,gBAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAClE,EAAE;QACF,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,4CAA4C;KACrE,CAAC,CAAC,CAAC;IAEJ,GAAG,CAAC,KAAK,CACP,kCAAkC,EAClC,cAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAC3C,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAC5B,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC;IAEvD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,YAAY;aAChB,GAAG,CACF,CAAC,EAAC,EAAE,EAAE,IAAI,EAAC,EAAE,EAAE,CACb,mCAAmC,gBAAC,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,IAAI,kBAAkB,CAChF;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAAC,KAAwB;IACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC,CAC7E,CAAC;IACF,MAAM,OAAO,GAAG,gBAAC,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3C,OAAO,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAC,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC9D,CAAC"}
1
+ {"version":3,"file":"check.js","sourceRoot":"","sources":["../../../lib/cli/check.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAmCH,8CAsCC;AAvED,6CAAyC;AAEzC,sCAAoC;AACpC,kCAAkC;AAElC,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,OAAO,CAAC,CAAC;AAgB/B;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,iBAAiB,CACrC,IAAO,EACP,KAAa,EACb,IAA6B;IAE7B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAC1C,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,KAAK,KAAK,IAAI,EAAE,IAAI,IAAI,CAChD,CAAC;IAEF,gGAAgG;IAChG,0FAA0F;IAC1F,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;QAC7D,OAAO,sCAAsC,CAAC;IAChD,CAAC;IAED,MAAM,YAAY,GAAsB,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/D,EAAE;QACF,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,4CAA4C;KACrE,CAAC,CAAC,CAAC;IAEJ,GAAG,CAAC,KAAK,CACP,kCAAkC,EAClC,cAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAC3C,YAAY,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CACnC,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC;IAEvD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,YAAY;aAChB,GAAG,CACF,CAAC,EAAC,EAAE,EAAE,IAAI,EAAC,EAAE,EAAE,CACb,mCAAmC,IAAA,gBAAS,EAAC,EAAE,CAAC,KAAK,IAAI,kBAAkB,CAC9E;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAAC,KAAwB;IACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC,CAC7E,CAAC;IACF,OAAO,MAAM;SACV,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;SAClC,GAAG,CAAC,CAAC,EAAC,EAAE,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;AACvC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../lib/cli/config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAqBH;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAAC,IAAI,GAAE,MAAM,EAA0B,gBAqBtE;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,SAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAwBrF"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../lib/cli/config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAoBH;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAAC,IAAI,GAAE,MAAM,EAA0B,gBAqBtE;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,SAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAwBrF"}
@@ -43,7 +43,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
43
43
  exports.findConfig = findConfig;
44
44
  exports.loadConfig = loadConfig;
45
45
  const lilconfig_1 = require("lilconfig");
46
- const lodash_1 = __importDefault(require("lodash"));
47
46
  const node_path_1 = __importDefault(require("node:path"));
48
47
  const YAML = __importStar(require("yaml"));
49
48
  const yargs_parser_1 = __importDefault(require("yargs-parser"));
@@ -55,7 +54,7 @@ const log = (0, logger_1.getLogger)('config');
55
54
  /**
56
55
  * `lilconfig` loader for YAML
57
56
  */
58
- const loadYaml = lodash_1.default.rearg(YAML.parse, [2, 0, 1]);
57
+ const loadYaml = (_filepath, content) => YAML.parse(content);
59
58
  /**
60
59
  * Controls how we load/find a config file.
61
60
  *
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/cli/config.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoCH,gCAqBC;AAQD,gCAwBC;AAtFD,yCAAoC;AACpC,oDAAuB;AACvB,0DAA6B;AAC7B,2CAA6B;AAC7B,gEAAkC;AAClC,2CAAsC;AAEtC,4CAAyD;AACzD,sCAAkE;AAClE,kCAAiC;AAEjC,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,QAAQ,CAAC,CAAC;AAEhC;;GAEG;AACH,MAAM,QAAQ,GAAW,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAExD;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,UAAU,CAAC,OAAiB,IAAA,iBAAO,EAAC,OAAO,CAAC,IAAI,CAAC;IACrE,MAAM,OAAO,GAAG,IAAA,sBAAM,EAAC,IAAI,CAAC,CAAC;IAE7B,oDAAoD;IACpD,4CAA4C;IAC5C,IAAI,QAAkC,CAAC;IACvC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,QAAQ,GAAG,OAAO,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,8DAA8D;QAC9D,QAAQ,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,6BAAiB,CAAC;IACvF,CAAC;IACD,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC;IAErB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,GAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO;QACxD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,MAA4B,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAAC,QAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IACrE,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,qBAAS,EAAC,oBAAQ,EAAE;QACnC,OAAO,EAAE;YACP,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,QAAQ;SACjB;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,QAAQ;QACrB,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,mBAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC,CAAC,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClD,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;IAClD,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/cli/config.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmCH,gCAqBC;AAQD,gCAwBC;AArFD,yCAAoC;AACpC,0DAA6B;AAC7B,2CAA6B;AAC7B,gEAAkC;AAClC,2CAAsC;AAEtC,4CAAyD;AACzD,sCAAkE;AAClE,kCAAiC;AAEjC,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,QAAQ,CAAC,CAAC;AAEhC;;GAEG;AACH,MAAM,QAAQ,GAAW,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAErE;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,UAAU,CAAC,OAAiB,IAAA,iBAAO,EAAC,OAAO,CAAC,IAAI,CAAC;IACrE,MAAM,OAAO,GAAG,IAAA,sBAAM,EAAC,IAAI,CAAC,CAAC;IAE7B,oDAAoD;IACpD,4CAA4C;IAC5C,IAAI,QAAkC,CAAC;IACvC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,QAAQ,GAAG,OAAO,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,8DAA8D;QAC9D,QAAQ,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,6BAAiB,CAAC;IACvF,CAAC;IACD,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC;IAErB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,GAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO;QACxD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,MAA4B,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAAC,QAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IACrE,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,qBAAS,EAAC,oBAAQ,EAAE;QACnC,OAAO,EAAE;YACP,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,QAAQ;SACjB;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,QAAQ;QACrB,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,mBAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC,CAAC,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClD,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;IAClD,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/cli/index.ts"],"names":[],"mappings":";AAGA;;;GAGG;AAmBH;;;GAGG;AACH,wBAAsB,IAAI,CAAC,IAAI,WAAwB;;;;;;;;;;GAuFtD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/cli/index.ts"],"names":[],"mappings":";AAGA;;;GAGG;AAkBH;;;GAGG;AACH,wBAAsB,IAAI,CAAC,IAAI,WAAwB;;;;;;;;;;GAuFtD"}
@@ -11,7 +11,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
11
11
  exports.main = main;
12
12
  const logger_1 = require("../logger");
13
13
  const support_1 = require("@appium/support");
14
- const lodash_1 = __importDefault(require("lodash"));
15
14
  const read_pkg_1 = require("read-pkg");
16
15
  const helpers_1 = require("yargs/helpers");
17
16
  const yargs_1 = __importDefault(require("yargs/yargs"));
@@ -44,7 +43,7 @@ async function main(argv = (0, helpers_1.hideBin)(process.argv)) {
44
43
  choices: ['debug', 'info', 'warn', 'error', 'silent'],
45
44
  describe: 'Sets the log level',
46
45
  default: constants_1.DEFAULT_LOG_LEVEL,
47
- coerce: lodash_1.default.identity,
46
+ coerce: ((x) => x),
48
47
  },
49
48
  config: {
50
49
  alias: 'c',
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/cli/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/cli/index.ts"],"names":[],"mappings":"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"}
package/build/lib/fs.d.ts CHANGED
@@ -2,7 +2,6 @@
2
2
  * Functions which touch the filesystem
3
3
  * @module
4
4
  */
5
- import _ from 'lodash';
6
5
  import type { NormalizedPackageJson, PackageJson } from 'read-pkg';
7
6
  import type { JsonValue } from 'type-fest';
8
7
  import type { MkDocsYml } from './model';
@@ -33,7 +32,9 @@ export declare function findInPkgDir(filename: string, cwd?: string): Promise<st
33
32
  * @param cwd - Current working directory
34
33
  * @returns Path to `mkdocs.yml`
35
34
  */
36
- export declare const findMkDocsYml: ((cwd?: string | undefined) => Promise<string | undefined>) & _.MemoizedFunction;
35
+ export declare const findMkDocsYml: ((cwd?: any) => Promise<string | undefined>) & {
36
+ cache: Map<unknown, Promise<string | undefined>>;
37
+ };
37
38
  /**
38
39
  * Given a directory path, finds closest `package.json` and reads it.
39
40
  * @param cwd - Current working directory
@@ -51,11 +52,18 @@ declare function _readPkgJson(cwd: string, normalize?: false): Promise<{
51
52
  /**
52
53
  * Given a directory to start from, reads a `package.json` file and returns its path and contents
53
54
  */
54
- export declare const readPackageJson: typeof _readPkgJson & _.MemoizedFunction;
55
+ export declare const readPackageJson: typeof _readPkgJson & {
56
+ cache: Map<unknown, Promise<{
57
+ pkgPath: string;
58
+ pkg: PackageJson;
59
+ }>>;
60
+ };
55
61
  /**
56
62
  * Reads a JSON file and parses it
57
63
  */
58
- export declare const readJson: (<T extends JsonValue>(filepath: string) => Promise<T>) & _.MemoizedFunction;
64
+ export declare const readJson: (<T extends JsonValue>(filepath: string) => Promise<T>) & {
65
+ cache: Map<unknown, Promise<JsonValue>>;
66
+ };
59
67
  /**
60
68
  * Writes contents to a file. Any JSON objects are stringified
61
69
  * @param filepath - Path to file
@@ -65,7 +73,9 @@ export declare function writeFileString(filepath: string, content: JsonValue): P
65
73
  /**
66
74
  * Check if `mkdocs` is installed
67
75
  */
68
- export declare const isMkDocsInstalled: (() => Promise<boolean>) & _.MemoizedFunction;
76
+ export declare const isMkDocsInstalled: (() => Promise<boolean>) & {
77
+ cache: Map<unknown, Promise<boolean>>;
78
+ };
69
79
  /**
70
80
  * `mike` cannot be invoked via `python -m`, so we need to find the script.
71
81
  */
@@ -75,7 +85,9 @@ export declare const findMike: () => Promise<string | undefined>;
75
85
  *
76
86
  * `python3` is preferred over `python`, since the latter could be Python 2.
77
87
  */
78
- export declare const findPython: (() => Promise<string | null>) & _.MemoizedFunction;
88
+ export declare const findPython: (() => Promise<string | null>) & {
89
+ cache: Map<unknown, Promise<string | null>>;
90
+ };
79
91
  /**
80
92
  * Check if a path to Python exists, otherwise raise DocutilsError
81
93
  */
@@ -88,6 +100,6 @@ export declare function requirePython(pythonPath?: string): Promise<string>;
88
100
  * @param filepath Patgh to an `mkdocs.yml` file
89
101
  * @returns Parsed `mkdocs.yml` file
90
102
  */
91
- export declare const readMkDocsYml: ((filepath: string, cwd?: any) => Promise<MkDocsYml>) & _.MemoizedFunction;
103
+ export declare const readMkDocsYml: (filepath: string, cwd?: string) => Promise<MkDocsYml>;
92
104
  export {};
93
105
  //# sourceMappingURL=fs.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAO,KAAK,EAAC,qBAAqB,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AAEjE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAYzC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;AAYvC;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAIjD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAIjD,CAAC;AAYF;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,GAAG,SAAgB,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM7B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,kFAAsD,CAAC;AAEjF;;;;;GAKG;AACH,iBAAe,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,IAAI,GACd,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,CAAC,CAAC;AAC1D,iBAAe,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,KAAK,GAChB,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,WAAW,CAAA;CAAC,CAAC,CAAC;AAsBhD;;GAEG;AACH,eAAO,MAAM,eAAe,0CAA0B,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,QAAQ,IACZ,CAAC,SAAS,SAAS,YAAY,MAAM,KAAG,OAAO,CAAC,CAAC,CAAC,sBAE1D,CAAC;AAIF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,iBAKnE;AAiBD;;GAEG;AACH,eAAO,MAAM,iBAAiB,SAAuB,OAAO,CAAC,OAAO,CAAC,sBAiBnE,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,QAAQ,mCAsBnB,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,UAAU,SACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,sBACjC,CAAC;AAEF;;GAEG;AACH,wBAAsB,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMxE;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,cACP,MAAM,gBAAwB,OAAO,CAAC,SAAS,CAAC,sBAyBlE,CAAC"}
1
+ {"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAC,qBAAqB,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AAEjE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAYzC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;AAavC;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,SAAS,KAAG,MACF,CAAC;AAEhD;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,SAAS,KAAG,MAA6C,CAAC;AAY/F;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,GAAG,SAAgB,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM7B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,aAAa;;CAEzB,CAAC;AAEF;;;;;GAKG;AACH,iBAAe,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,IAAI,GACd,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,CAAC,CAAC;AAC1D,iBAAe,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,KAAK,GAChB,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,WAAW,CAAA;CAAC,CAAC,CAAC;AAsBhD;;GAEG;AACH,eAAO,MAAM,eAAe;;iBAzBP,MAAM;aAAO,WAAW;;CAyBY,CAAC;AAE1D;;GAEG;AACH,eAAO,MAAM,QAAQ,IACZ,CAAC,SAAS,SAAS,YAAY,MAAM,KAAG,OAAO,CAAC,CAAC,CAAC;;CAE1D,CAAC;AAIF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,iBAKnE;AAiBD;;GAEG;AACH,eAAO,MAAM,iBAAiB,SAA0B,OAAO,CAAC,OAAO,CAAC;;CAiBtE,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,QAAQ,mCAsBpB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,SACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;;CACjC,CAAC;AAEF;;GAEG;AACH,wBAAsB,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMxE;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CA0BhF,CAAC"}
package/build/lib/fs.js CHANGED
@@ -45,7 +45,6 @@ exports.findInPkgDir = findInPkgDir;
45
45
  exports.writeFileString = writeFileString;
46
46
  exports.requirePython = requirePython;
47
47
  const support_1 = require("@appium/support");
48
- const lodash_1 = __importDefault(require("lodash"));
49
48
  const node_path_1 = __importDefault(require("node:path"));
50
49
  const package_directory_1 = require("package-directory");
51
50
  const read_pkg_1 = require("read-pkg");
@@ -54,29 +53,32 @@ const constants_1 = require("./constants");
54
53
  const error_1 = require("./error");
55
54
  const logger_1 = require("./logger");
56
55
  const teen_process_1 = require("teen_process");
56
+ const util_1 = require("./util");
57
57
  const log = (0, logger_1.getLogger)('fs');
58
58
  /**
59
59
  * Finds path to closest `package.json`
60
60
  *
61
61
  * Caches result
62
62
  */
63
- const findPkgDir = lodash_1.default.memoize(package_directory_1.packageDirectory, (opts) => opts?.cwd);
63
+ const findPkgDir = support_1.util.memoize(package_directory_1.packageDirectory, (opts) => opts?.cwd);
64
64
  /**
65
65
  * Stringifies a thing into a YAML
66
66
  * @param value Something to yamlify
67
67
  * @returns Some nice YAML 4 u
68
68
  */
69
- exports.stringifyYaml = lodash_1.default.partialRight(YAML.stringify, { indent: 2 }, undefined);
69
+ const stringifyYaml = (value) => YAML.stringify(value, undefined, { indent: 2 });
70
+ exports.stringifyYaml = stringifyYaml;
70
71
  /**
71
72
  * Pretty-stringifies a JSON value
72
73
  * @param value Something to stringify
73
74
  * @returns JSON string
74
75
  */
75
- exports.stringifyJson = lodash_1.default.partialRight(JSON.stringify, 2, undefined);
76
+ const stringifyJson = (value) => JSON.stringify(value, undefined, 2);
77
+ exports.stringifyJson = stringifyJson;
76
78
  /**
77
79
  * Reads a YAML file, parses it and caches the result
78
80
  */
79
- const readYaml = lodash_1.default.memoize(async (filepath) => YAML.parse(await support_1.fs.readFile(filepath, 'utf8'), {
81
+ const readYaml = support_1.util.memoize(async (filepath) => YAML.parse(await support_1.fs.readFile(filepath, 'utf8'), {
80
82
  prettyErrors: false,
81
83
  logLevel: 'silent',
82
84
  }));
@@ -101,7 +103,7 @@ async function findInPkgDir(filename, cwd = process.cwd()) {
101
103
  * @param cwd - Current working directory
102
104
  * @returns Path to `mkdocs.yml`
103
105
  */
104
- exports.findMkDocsYml = lodash_1.default.memoize(lodash_1.default.partial(findInPkgDir, constants_1.NAME_MKDOCS_YML));
106
+ exports.findMkDocsYml = support_1.util.memoize(async (cwd = process.cwd()) => await findInPkgDir(constants_1.NAME_MKDOCS_YML, cwd));
105
107
  async function _readPkgJson(cwd, normalize) {
106
108
  const pkgDir = await findPkgDir({ cwd });
107
109
  if (!pkgDir) {
@@ -121,18 +123,18 @@ async function _readPkgJson(cwd, normalize) {
121
123
  /**
122
124
  * Given a directory to start from, reads a `package.json` file and returns its path and contents
123
125
  */
124
- exports.readPackageJson = lodash_1.default.memoize(_readPkgJson);
126
+ exports.readPackageJson = support_1.util.memoize(_readPkgJson);
125
127
  /**
126
128
  * Reads a JSON file and parses it
127
129
  */
128
- exports.readJson = lodash_1.default.memoize(async (filepath) => JSON.parse(await support_1.fs.readFile(filepath, 'utf8')));
130
+ exports.readJson = support_1.util.memoize(async (filepath) => JSON.parse(await support_1.fs.readFile(filepath, 'utf8')));
129
131
  /**
130
132
  * Writes contents to a file. Any JSON objects are stringified
131
133
  * @param filepath - Path to file
132
134
  * @param content - File contents
133
135
  */
134
136
  function writeFileString(filepath, content) {
135
- const data = lodash_1.default.isString(content) ? content : JSON.stringify(content, undefined, 2);
137
+ const data = typeof content === 'string' ? content : JSON.stringify(content, undefined, 2);
136
138
  return support_1.fs.writeFile(filepath, data, {
137
139
  encoding: 'utf8',
138
140
  });
@@ -140,19 +142,19 @@ function writeFileString(filepath, content) {
140
142
  /**
141
143
  * `which` with memoization
142
144
  */
143
- const cachedWhich = lodash_1.default.memoize(support_1.fs.which);
145
+ const cachedWhich = support_1.util.memoize(support_1.fs.which);
144
146
  /**
145
147
  * Finds `python` executable
146
148
  */
147
- const whichPython = lodash_1.default.partial(cachedWhich, constants_1.NAME_PYTHON, { nothrow: true });
149
+ const whichPython = async () => await cachedWhich(constants_1.NAME_PYTHON, { nothrow: true });
148
150
  /**
149
151
  * Finds `python3` executable
150
152
  */
151
- const whichPython3 = lodash_1.default.partial(cachedWhich, `${constants_1.NAME_PYTHON}3`, { nothrow: true });
153
+ const whichPython3 = async () => await cachedWhich(`${constants_1.NAME_PYTHON}3`, { nothrow: true });
152
154
  /**
153
155
  * Check if `mkdocs` is installed
154
156
  */
155
- exports.isMkDocsInstalled = lodash_1.default.memoize(async () => {
157
+ exports.isMkDocsInstalled = support_1.util.memoize(async () => {
156
158
  // see if it's in PATH
157
159
  const mkDocsPath = await cachedWhich(constants_1.NAME_MKDOCS, { nothrow: true });
158
160
  if (mkDocsPath) {
@@ -174,7 +176,7 @@ exports.isMkDocsInstalled = lodash_1.default.memoize(async () => {
174
176
  /**
175
177
  * `mike` cannot be invoked via `python -m`, so we need to find the script.
176
178
  */
177
- exports.findMike = lodash_1.default.partial(async () => {
179
+ const findMike = async () => {
178
180
  // see if it's in PATH
179
181
  let mikePath = await cachedWhich(constants_1.NAME_MIKE, { nothrow: true });
180
182
  if (mikePath) {
@@ -197,13 +199,14 @@ exports.findMike = lodash_1.default.partial(async () => {
197
199
  }
198
200
  }
199
201
  catch { }
200
- });
202
+ };
203
+ exports.findMike = findMike;
201
204
  /**
202
205
  * Finds the `python3` or `python` executable in the user's `PATH`.
203
206
  *
204
207
  * `python3` is preferred over `python`, since the latter could be Python 2.
205
208
  */
206
- exports.findPython = lodash_1.default.memoize(async () => (await whichPython3()) ?? (await whichPython()));
209
+ exports.findPython = support_1.util.memoize(async () => (await whichPython3()) ?? (await whichPython()));
207
210
  /**
208
211
  * Check if a path to Python exists, otherwise raise DocutilsError
209
212
  */
@@ -222,7 +225,7 @@ async function requirePython(pythonPath) {
222
225
  * @param filepath Patgh to an `mkdocs.yml` file
223
226
  * @returns Parsed `mkdocs.yml` file
224
227
  */
225
- exports.readMkDocsYml = lodash_1.default.memoize(async (filepath, cwd = process.cwd()) => {
228
+ exports.readMkDocsYml = support_1.util.memoize(async (filepath, cwd = process.cwd()) => {
226
229
  let mkDocsYml = (await readYaml(filepath));
227
230
  if (mkDocsYml.site_dir) {
228
231
  mkDocsYml.site_dir = node_path_1.default.resolve(cwd, node_path_1.default.dirname(filepath), mkDocsYml.site_dir);
@@ -239,7 +242,7 @@ exports.readMkDocsYml = lodash_1.default.memoize(async (filepath, cwd = process.
239
242
  inheritYml.docs_dir = node_path_1.default.resolve(node_path_1.default.dirname(inheritPath), inheritYml.docs_dir);
240
243
  log.debug('Resolved docs_dir to %s', inheritYml.docs_dir);
241
244
  }
242
- mkDocsYml = lodash_1.default.defaultsDeep(mkDocsYml, inheritYml);
245
+ mkDocsYml = (0, util_1.mergeDefaultsDeep)(mkDocsYml, inheritYml);
243
246
  inheritPath = inheritYml.INHERIT
244
247
  ? node_path_1.default.resolve(node_path_1.default.dirname(inheritPath), inheritYml.INHERIT)
245
248
  : undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"fs.js","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs.js","sourceRoot":"","sources":["../../lib/fs.ts"],"names":[],"mappings":"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"}
@@ -18,13 +18,6 @@ export declare function isLogLevelString(level: any): level is keyof typeof LogL
18
18
  * @param parent Parent logger to derive from.
19
19
  */
20
20
  export declare function getLogger(tag: string, parent?: any): any;
21
- /**
22
- * Initialize the logging system.
23
- *
24
- * This should only be called once. The loglevel cannot be changed once it is set.
25
- *
26
- * @remarks Child loggers seem to inherit the "paused" state of the parent, so when this is called, we must resume all of them.
27
- */
28
21
  export declare const initLogger: (level: keyof typeof LogLevelMap | typeof LogLevel) => void;
29
22
  export {};
30
23
  //# sourceMappingURL=logger.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,QAAA,MAAuC,QAAQ,KAAsB,CAAC;AAEtE,OAAO,EAAoB,WAAW,EAAC,MAAM,aAAa,CAAC;AAS3D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,MAAM,OAAO,WAAW,CAE9E;AAsBD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,MAAa,OAWzD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,UAAkB,MAAM,OAAO,WAAW,GAAG,OAAO,QAAQ,SAWjF,CAAC"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,QAAA,MAAuC,QAAQ,KAAsB,CAAC;AACtE,OAAO,EAAoB,WAAW,EAAC,MAAM,aAAa,CAAC;AAS3D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,MAAM,OAAO,WAAW,CAE9E;AAsBD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,MAAa,OAWzD;AAUD,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,OAAO,WAAW,GAAG,OAAO,QAAQ,SAe3E,CAAC"}
@@ -6,16 +6,12 @@
6
6
  *
7
7
  * @module
8
8
  */
9
- var __importDefault = (this && this.__importDefault) || function (mod) {
10
- return (mod && mod.__esModule) ? mod : { "default": mod };
11
- };
12
9
  Object.defineProperty(exports, "__esModule", { value: true });
13
10
  exports.initLogger = void 0;
14
11
  exports.isLogLevelString = isLogLevelString;
15
12
  exports.getLogger = getLogger;
16
13
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
17
14
  const { ConsolaInstance, createConsola, LogLevel } = require('consola');
18
- const lodash_1 = __importDefault(require("lodash"));
19
15
  const constants_1 = require("./constants");
20
16
  /**
21
17
  * The global log level
@@ -72,7 +68,12 @@ function getLogger(tag, parent = rootLogger) {
72
68
  *
73
69
  * @remarks Child loggers seem to inherit the "paused" state of the parent, so when this is called, we must resume all of them.
74
70
  */
75
- exports.initLogger = lodash_1.default.once((level) => {
71
+ let hasInitializedLogger = false;
72
+ const initLogger = (level) => {
73
+ if (hasInitializedLogger) {
74
+ return;
75
+ }
76
+ hasInitializedLogger = true;
76
77
  globalLevel = isLogLevelString(level) ? constants_1.LogLevelMap[level] : level;
77
78
  rootLogger.level = globalLevel;
78
79
  rootLogger.resumeLogs();
@@ -83,5 +84,6 @@ exports.initLogger = lodash_1.default.once((level) => {
83
84
  logger.resumeLogs();
84
85
  }
85
86
  }
86
- });
87
+ };
88
+ exports.initLogger = initLogger;
87
89
  //# sourceMappingURL=logger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AAmBH,4CAEC;AA2BD,8BAWC;AAxDD,6DAA6D;AAC7D,MAAM,EAAC,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACtE,oDAAuB;AACvB,2CAA2D;AAE3D;;;;GAIG;AACH,IAAI,WAAW,GAAoB,uBAAW,CAAC,6BAAiB,CAAC,CAAC;AAElE;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,KAAU;IACzC,OAAO,KAAK,IAAI,uBAAW,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,EAAC,GAAG,EAAE,UAAU,EAAC;IAC3B,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE;QACb,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,KAAK;KACZ;CACF,CAAC,CAAC;AACH,sDAAsD;AACtD,UAAU,CAAC,SAAS,EAAE,CAAC;AAEvB;;GAEG;AACH,MAAM,OAAO,GAAiD,IAAI,GAAG,EAAE,CAAC;AAExE;;;;GAIG;AACH,SAAgB,SAAS,CAAC,GAAW,EAAE,MAAM,GAAG,UAAU;IACxD,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;QACzC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACU,QAAA,UAAU,GAAG,gBAAC,CAAC,IAAI,CAAC,CAAC,KAAiD,EAAE,EAAE;IACrF,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,UAAU,CAAC,KAAK,GAAG,WAAW,CAAC;IAC/B,UAAU,CAAC,UAAU,EAAE,CAAC;IACxB,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC;YAC3B,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAkBH,4CAEC;AA2BD,8BAWC;AAvDD,6DAA6D;AAC7D,MAAM,EAAC,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACtE,2CAA2D;AAE3D;;;;GAIG;AACH,IAAI,WAAW,GAAoB,uBAAW,CAAC,6BAAiB,CAAC,CAAC;AAElE;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,KAAU;IACzC,OAAO,KAAK,IAAI,uBAAW,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,EAAC,GAAG,EAAE,UAAU,EAAC;IAC3B,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE;QACb,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,KAAK;KACZ;CACF,CAAC,CAAC;AACH,sDAAsD;AACtD,UAAU,CAAC,SAAS,EAAE,CAAC;AAEvB;;GAEG;AACH,MAAM,OAAO,GAAiD,IAAI,GAAG,EAAE,CAAC;AAExE;;;;GAIG;AACH,SAAgB,SAAS,CAAC,GAAW,EAAE,MAAM,GAAG,UAAU;IACxD,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;QACzC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,IAAI,oBAAoB,GAAG,KAAK,CAAC;AAC1B,MAAM,UAAU,GAAG,CAAC,KAAiD,EAAE,EAAE;IAC9E,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IACD,oBAAoB,GAAG,IAAI,CAAC;IAC5B,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,UAAU,CAAC,KAAK,GAAG,WAAW,CAAC;IAC/B,UAAU,CAAC,UAAU,EAAE,CAAC;IACxB,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC;YAC3B,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,UAAU,cAerB"}
@@ -1 +1 @@
1
- {"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../lib/scaffold.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAC,SAAS,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AAUrD;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,IAAI,SAAS,mBAAmB,IAAI,IAAI,CACnE,IAAI,EACJ,MAAM,mBAAmB,CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,UAAU,IAAI,CACjF,IAAI,EAAE,IAAI,KACP,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpC;;;GAGG;AACH,MAAM,MAAM,uBAAuB,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,SAAS,IAAI,CAC3F,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EACpB,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC5B,GAAG,EAAE,QAAQ,CAAC,qBAAqB,CAAC,KACjC,CAAC,CAAC;AAEP;;GAEG;AACH,MAAM,MAAM,wBAAwB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,MAAM,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,yBAAyB,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,SAAS;IAC9F;;OAEG;IACH,SAAS,CAAC,EAAE,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7C;;OAEG;IACH,WAAW,CAAC,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAC1C;;OAEG;IACH,SAAS,CAAC,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,UAAU,EACvF,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,CAAC,EACjB,WAAW,EAAE,MAAM,EACnB,EACE,SAAsB,EACtB,WAAwB,EACxB,SAAyB,GAC1B,GAAE,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAAM,GACzC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CA6EvB"}
1
+ {"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../lib/scaffold.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAC,SAAS,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AASrD;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,IAAI,SAAS,mBAAmB,IAAI,IAAI,CACnE,IAAI,EACJ,MAAM,mBAAmB,CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,UAAU,IAAI,CACjF,IAAI,EAAE,IAAI,KACP,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpC;;;GAGG;AACH,MAAM,MAAM,uBAAuB,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,SAAS,IAAI,CAC3F,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EACpB,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC5B,GAAG,EAAE,QAAQ,CAAC,qBAAqB,CAAC,KACjC,CAAC,CAAC;AAEP;;GAEG;AACH,MAAM,MAAM,wBAAwB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,MAAM,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,yBAAyB,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,SAAS;IAC9F;;OAEG;IACH,SAAS,CAAC,EAAE,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7C;;OAEG;IACH,WAAW,CAAC,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAC1C;;OAEG;IACH,SAAS,CAAC,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,mBAAmB,EAAE,CAAC,SAAS,UAAU,EACvF,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,CAAC,EACjB,WAAW,EAAE,MAAM,EACnB,EACE,SAAgC,EAChC,WAAwB,EACxB,SAAyB,GAC1B,GAAE,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAAM,GACzC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CA6EvB"}
@@ -14,7 +14,6 @@ const node_path_1 = __importDefault(require("node:path"));
14
14
  const diff_1 = require("diff");
15
15
  const error_1 = require("./error");
16
16
  const util_1 = require("./util");
17
- const lodash_1 = __importDefault(require("lodash"));
18
17
  const fs_1 = require("./fs");
19
18
  const constants_1 = require("./constants");
20
19
  const log = (0, logger_1.getLogger)('init');
@@ -28,7 +27,7 @@ const dryRunLog = (0, logger_1.getLogger)('dry-run', log);
28
27
  * @param opts Options
29
28
  * @returns A scaffold task
30
29
  */
31
- function createScaffoldTask(defaultFilename, defaultContent, description, { transform = lodash_1.default.identity, deserialize = JSON.parse, serialize = fs_1.stringifyJson, } = {}) {
30
+ function createScaffoldTask(defaultFilename, defaultContent, description, { transform = (content) => content, deserialize = JSON.parse, serialize = fs_1.stringifyJson, } = {}) {
32
31
  return async ({ overwrite = false, cwd = process.cwd(), packageJson: packageJsonPath, dest, dryRun = false, ...opts }) => {
33
32
  const relativePath = (0, util_1.relative)(cwd);
34
33
  const { pkgPath, pkg } = await (0, fs_1.readPackageJson)(packageJsonPath ? node_path_1.default.dirname(packageJsonPath) : cwd, true);
@@ -55,8 +54,8 @@ function createScaffoldTask(defaultFilename, defaultContent, description, { tran
55
54
  isNew = true;
56
55
  }
57
56
  const defaults = transform(defaultContent, opts, pkg);
58
- const finalDestContent = lodash_1.default.defaultsDeep({}, destContent, defaults);
59
- destChangesNeeded = destChangesNeeded || !lodash_1.default.isEqual(destContent, finalDestContent);
57
+ const finalDestContent = (0, util_1.mergeDefaultsDeep)(destContent, defaults);
58
+ destChangesNeeded = destChangesNeeded || !support_1.util.isEqual(destContent, finalDestContent);
60
59
  if (destChangesNeeded) {
61
60
  log.info('Changes needed in %s', relativeDest);
62
61
  log.debug('Original %s: %O', relativeDest, destContent);
@@ -104,6 +103,6 @@ function createScaffoldTask(defaultFilename, defaultContent, description, { tran
104
103
  * @returns Patch string
105
104
  */
106
105
  function makePatch(filename, oldData, newData, serializer = fs_1.stringifyJson) {
107
- return (0, diff_1.createPatch)(filename, lodash_1.default.isString(oldData) ? oldData : serializer(oldData), lodash_1.default.isString(newData) ? newData : serializer(newData));
106
+ return (0, diff_1.createPatch)(filename, typeof oldData === 'string' ? oldData : serializer(oldData), typeof newData === 'string' ? newData : serializer(newData));
108
107
  }
109
108
  //# sourceMappingURL=scaffold.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../lib/scaffold.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../lib/scaffold.ts"],"names":[],"mappings":"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"}