typesync 0.10.0 → 0.11.0

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.
package/README.md CHANGED
@@ -56,7 +56,7 @@ To ignore certain sections, you can use the `--ignoredeps=` flag. For example, t
56
56
  To ignore certain packages, you can use the `--ignorepackages=` flag. For example, to ignore `nodemon`, use `--ignorepackages=nodemon`.
57
57
  To ignore multiple, comma-separate them, like this: `--ignorepackages=nodemon,whatever` (ignores `nodemon` and `whatever`).
58
58
 
59
- ## Use config file
59
+ ## Using a config file
60
60
 
61
61
  Alternatively, you can use a TypeSync config file: `.typesyncrc` or a `"typesync"` section in your `package.json`. TypeSync will **automatically** search for configuration files. See [cosmiconfig][cosmiconfig] for details.
62
62
 
@@ -122,8 +122,6 @@ TypeSync will try to respect semver parity for the code and typings packages, an
122
122
 
123
123
  If you use a Semver `^` or `~` for a package, the same prefix will be used for the typings package. If you pin to an exact version (`"some-package": "1.2.3"`), no prefix will be written.
124
124
 
125
- If a typings package in your `package.json` is not used (has no corresponding code package in your `package.json` and does not contribute to the global namespace), TypeSync will automatically remove it.
126
-
127
125
  # Monorepos
128
126
 
129
127
  TypeSync added support for monorepos in v0.4.0. It will look at `packages`/`workspaces` globs in `package.json` and sync every matching file in one fell swoop.
package/lib/cli.js CHANGED
@@ -92,7 +92,6 @@ var chalk_1 = __importDefault(require("chalk"));
92
92
  var path = __importStar(require("path"));
93
93
  var C = __importStar(require("./cli-util"));
94
94
  var type_syncer_1 = require("./type-syncer");
95
- var type_definition_source_1 = require("./type-definition-source");
96
95
  var package_json_file_service_1 = require("./package-json-file-service");
97
96
  var config_service_1 = require("./config-service");
98
97
  var globber_1 = require("./globber");
@@ -110,7 +109,6 @@ function startCli() {
110
109
  container = (0, awilix_1.createContainer)({
111
110
  injectionMode: awilix_1.InjectionMode.CLASSIC,
112
111
  }).register({
113
- typeDefinitionSource: (0, awilix_1.asFunction)(type_definition_source_1.createTypeDefinitionSource).singleton(),
114
112
  packageJSONService: (0, awilix_1.asFunction)(package_json_file_service_1.createPackageJSONFileService).singleton(),
115
113
  packageSource: (0, awilix_1.asFunction)(package_source_1.createPackageSource).singleton(),
116
114
  configService: (0, awilix_1.asFunction)(config_service_1.createConfigService).singleton(),
@@ -161,23 +159,18 @@ function run(syncer) {
161
159
  totals = result.syncedFiles
162
160
  .map(function (f) { return ({
163
161
  newTypings: f.newTypings.length,
164
- removedTypings: f.removedTypings.length,
165
162
  }); })
166
163
  .reduce(function (accum, next) { return ({
167
164
  newTypings: accum.newTypings + next.newTypings,
168
- removedTypings: accum.removedTypings + next.removedTypings,
169
- }); }, { newTypings: 0, removedTypings: 0 });
170
- if (flags.dry === 'fail' &&
171
- (totals.newTypings > 0 || totals.removedTypings > 0)) {
165
+ }); }, { newTypings: 0 });
166
+ if (flags.dry === 'fail' && totals.newTypings > 0) {
172
167
  C.error('Typings changed; check failed.');
173
168
  process.exitCode = 1;
174
169
  return [2 /*return*/];
175
170
  }
176
171
  C.success(totals.newTypings === 0
177
- ? "No new typings added, looks like you're all synced up!".concat(totals.removedTypings > 0
178
- ? (0, chalk_1.default)(templateObject_2 || (templateObject_2 = __makeTemplateObject([" {gray.italic Also removed ", " unused typings, no big deal.}"], [" {gray.italic Also removed ", " unused typings, no big deal.}"])), totals.removedTypings.toString()) : '')
179
- : (0, chalk_1.default)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["", " new typings added", ".\n\n", "\n\n\u2728 Go ahead and run {green npm install} or {green yarn} to install the packages that were added."], ["", " new typings added", ".\\n\\n", "\\n\\n\u2728 Go ahead and run {green npm install} or {green yarn} to install the packages that were added."])), totals.newTypings.toString(), totals.removedTypings > 0
180
- ? (0, chalk_1.default)(templateObject_3 || (templateObject_3 = __makeTemplateObject([" {italic (", " unused removed)}"], [" {italic (", " unused removed)}"])), totals.removedTypings.toString()) : '', syncedFilesOutput));
172
+ ? "No new typings added, looks like you're all synced up!"
173
+ : (0, chalk_1.default)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["", " new typings added.\n\n", "\n\n\u2728 Go ahead and run {green npm install} or {green yarn} to install the packages that were added."], ["", " new typings added.\\n\\n", "\\n\\n\u2728 Go ahead and run {green npm install} or {green yarn} to install the packages that were added."])), totals.newTypings.toString(), syncedFilesOutput));
181
174
  return [2 /*return*/];
182
175
  }
183
176
  });
@@ -190,8 +183,7 @@ function run(syncer) {
190
183
  */
191
184
  function renderTypeDef(typeDef, isLast) {
192
185
  var treeNode = isLast ? '└─' : '├─';
193
- return (0, chalk_1.default)(templateObject_9 || (templateObject_9 = __makeTemplateObject(["", " ", " {gray @types/}", ""], ["", " ", " {gray @types/}", ""])), treeNode, typeDef.action === 'add' ? (0, chalk_1.default)(templateObject_5 || (templateObject_5 = __makeTemplateObject(["{green.bold +}"], ["{green.bold +}"]))) : (0, chalk_1.default)(templateObject_6 || (templateObject_6 = __makeTemplateObject(["{red.bold -}"], ["{red.bold -}"]))), typeDef.action === 'add'
194
- ? (0, chalk_1.default)(templateObject_7 || (templateObject_7 = __makeTemplateObject(["{bold.blue ", "}"], ["{bold.blue ", "}"])), typeDef.typingsName) : (0, chalk_1.default)(templateObject_8 || (templateObject_8 = __makeTemplateObject(["{bold.yellow ", "} {gray.italic (unused)}"], ["{bold.yellow ", "} {gray.italic (unused)}"])), typeDef.typingsName));
186
+ return (0, chalk_1.default)(templateObject_5 || (templateObject_5 = __makeTemplateObject(["", " ", " {gray @types/}", ""], ["", " ", " {gray @types/}", ""])), treeNode, (0, chalk_1.default)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{green.bold +}"], ["{green.bold +}"]))), (0, chalk_1.default)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{bold.blue ", "}"], ["{bold.blue ", "}"])), typeDef.typingsName));
195
187
  }
196
188
  /**
197
189
  * Renders a synced file.
@@ -199,12 +191,12 @@ function renderTypeDef(typeDef, isLast) {
199
191
  * @param file
200
192
  */
201
193
  function renderSyncedFile(file) {
202
- var badge = file.newTypings.length === 0 && file.removedTypings.length === 0
203
- ? (0, chalk_1.default)(templateObject_10 || (templateObject_10 = __makeTemplateObject(["{blue.bold (no new typings added)}"], ["{blue.bold (no new typings added)}"]))) : (0, chalk_1.default)(templateObject_11 || (templateObject_11 = __makeTemplateObject(["{green.bold (", " new typings added, ", " unused typings removed)}"], ["{green.bold (", " new typings added, ", " unused typings removed)}"])), file.newTypings.length.toString(), file.removedTypings.length.toString());
194
+ var badge = file.newTypings.length === 0
195
+ ? (0, chalk_1.default)(templateObject_6 || (templateObject_6 = __makeTemplateObject(["{blue.bold (no new typings added)}"], ["{blue.bold (no new typings added)}"]))) : (0, chalk_1.default)(templateObject_7 || (templateObject_7 = __makeTemplateObject(["{green.bold (", " new typings added)}"], ["{green.bold (", " new typings added)}"])), file.newTypings.length.toString());
204
196
  var dirName = path.basename(path.dirname(path.resolve(file.filePath)));
205
- var title = (0, chalk_1.default)(templateObject_12 || (templateObject_12 = __makeTemplateObject(["\uD83D\uDCE6 ", " {gray.italic \u2014 ", "} ", ""], ["\uD83D\uDCE6 ", " {gray.italic \u2014 ", "} ", ""])), file.package.name || dirName, file.filePath, badge);
197
+ var title = (0, chalk_1.default)(templateObject_8 || (templateObject_8 = __makeTemplateObject(["\uD83D\uDCE6 ", " {gray.italic \u2014 ", "} ", ""], ["\uD83D\uDCE6 ", " {gray.italic \u2014 ", "} ", ""])), file.package.name || dirName, file.filePath, badge);
206
198
  var nl = '\n';
207
- var combined = __spreadArray(__spreadArray([], file.newTypings.map(function (t) { return (__assign(__assign({}, t), { action: 'add' })); }), true), file.removedTypings.map(function (t) { return (__assign(__assign({}, t), { action: 'remove' })); }), true);
199
+ var combined = __spreadArray([], file.newTypings.map(function (t) { return (__assign(__assign({}, t), { action: 'add' })); }), true);
208
200
  var rendered = title +
209
201
  nl +
210
202
  combined
@@ -216,7 +208,7 @@ function renderSyncedFile(file) {
216
208
  * Prints the help text.
217
209
  */
218
210
  function printHelp() {
219
- console.log((0, chalk_1.default)(templateObject_13 || (templateObject_13 = __makeTemplateObject(["\n{blue.bold typesync} - adds missing TypeScript definitions to package.json\n\nOptions\n {magenta.bold --dry} dry run, won't save the package.json\n {magenta.bold --ignoredeps=<deps|dev|peer|optional>} ignores dependencies in the specified sections (comma separate for multiple). Example: {magenta ignoredeps=dev,peer}\n {magenta.bold --help} shows this help menu\n "], ["\n{blue.bold typesync} - adds missing TypeScript definitions to package.json\n\nOptions\n {magenta.bold --dry} dry run, won't save the package.json\n {magenta.bold --ignoredeps=<deps|dev|peer|optional>} ignores dependencies in the specified sections (comma separate for multiple). Example: {magenta ignoredeps=dev,peer}\n {magenta.bold --help} shows this help menu\n "]))).trim());
211
+ console.log((0, chalk_1.default)(templateObject_9 || (templateObject_9 = __makeTemplateObject(["\n{blue.bold typesync} - adds missing TypeScript definitions to package.json\n\nOptions\n {magenta.bold --dry} dry run, won't save the package.json\n {magenta.bold --ignoredeps=<deps|dev|peer|optional>} ignores dependencies in the specified sections (comma separate for multiple). Example: {magenta ignoredeps=dev,peer}\n {magenta.bold --help} shows this help menu\n "], ["\n{blue.bold typesync} - adds missing TypeScript definitions to package.json\n\nOptions\n {magenta.bold --dry} dry run, won't save the package.json\n {magenta.bold --ignoredeps=<deps|dev|peer|optional>} ignores dependencies in the specified sections (comma separate for multiple). Example: {magenta ignoredeps=dev,peer}\n {magenta.bold --help} shows this help menu\n "]))).trim());
220
212
  }
221
- var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7, templateObject_8, templateObject_9, templateObject_10, templateObject_11, templateObject_12, templateObject_13;
213
+ var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7, templateObject_8, templateObject_9;
222
214
  //# sourceMappingURL=cli.js.map
package/lib/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAmE;AACnE,gDAAyB;AACzB,yCAA4B;AAC5B,4CAA+B;AAE/B,6CAAgD;AAChD,mEAAqE;AACrE,yEAA0E;AAC1E,mDAAsD;AACtD,qCAAyC;AACzC,mDAAsD;AAEtD;;GAEG;AACH,SAAsB,QAAQ;;;;;;;oBAGpB,SAAS,GAAG,IAAA,wBAAe,EAAC;wBAChC,aAAa,EAAE,sBAAa,CAAC,OAAO;qBACrC,CAAC,CAAC,QAAQ,CAAC;wBACV,oBAAoB,EAAE,IAAA,mBAAU,EAAC,mDAA0B,CAAC,CAAC,SAAS,EAAE;wBACxE,kBAAkB,EAAE,IAAA,mBAAU,EAAC,wDAA4B,CAAC,CAAC,SAAS,EAAE;wBACxE,aAAa,EAAE,IAAA,mBAAU,EAAC,oCAAmB,CAAC,CAAC,SAAS,EAAE;wBAC1D,aAAa,EAAE,IAAA,mBAAU,EAAC,oCAAmB,CAAC,CAAC,SAAS,EAAE;wBAC1D,OAAO,EAAE,IAAA,mBAAU,EAAC,uBAAa,CAAC,CAAC,SAAS,EAAE;wBAC9C,UAAU,EAAE,IAAA,mBAAU,EAAC,8BAAgB,CAAC;qBACzC,CAAC,CAAA;oBACF,qBAAM,GAAG,CAAC,SAAS,CAAC,OAAO,CAAc,YAAY,CAAC,CAAC,EAAA;;oBAAvD,SAAuD,CAAA;;;;oBAEvD,CAAC,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;oBACZ,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;;;;;;CAEvB;AAlBD,4BAkBC;AAED;;;GAGG;AACH,SAAe,GAAG,CAAC,MAAmB;;;;;;oBAC9B,KAAkB,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAvD,IAAI,UAAA,EAAE,KAAK,WAAA,CAA4C;oBACxD,KAA6B,IAAI,GAAR,EAAzB,QAAQ,mBAAG,cAAc,KAAA,CAAQ;oBACxC,IAAI,KAAK,CAAC,IAAI,EAAE;wBACd,SAAS,EAAE,CAAA;wBACX,sBAAM;qBACP;oBAED,CAAC,CAAC,GAAG,KAAC,eAAK,4FAAA,mBAAoB,EAAkC,GAAG,KAArC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAI,CAAA;oBACrE,IAAI,KAAK,CAAC,GAAG,EAAE;wBACb,CAAC,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAA;qBAC9C;oBACc,qBAAM,CAAC,CAAC,SAAS,CAC9B,sCAA+B,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAK,EACxD,cAAM,OAAA,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAA5B,CAA4B,CACnC,EAAA;;oBAHK,MAAM,GAAG,SAGd;oBAEK,iBAAiB,GAAG,MAAM,CAAC,WAAW;yBACzC,GAAG,CAAC,gBAAgB,CAAC;yBACrB,IAAI,CAAC,MAAM,CAAC,CAAA;oBACT,MAAM,GAAG,MAAM,CAAC,WAAW;yBAC9B,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC;wBACX,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,MAAM;wBAC/B,cAAc,EAAE,CAAC,CAAC,cAAc,CAAC,MAAM;qBACxC,CAAC,EAHU,CAGV,CAAC;yBACF,MAAM,CACL,UAAC,KAAK,EAAE,IAAI,IAAK,OAAA,CAAC;wBAChB,UAAU,EAAE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU;wBAC9C,cAAc,EAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc;qBAC3D,CAAC,EAHe,CAGf,EACF,EAAE,UAAU,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,CACrC,CAAA;oBACH,IACE,KAAK,CAAC,GAAG,KAAK,MAAM;wBACpB,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,IAAI,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,EACpD;wBACA,CAAC,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;wBACzC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;wBACpB,sBAAM;qBACP;oBACD,CAAC,CAAC,OAAO,CACP,MAAM,CAAC,UAAU,KAAK,CAAC;wBACrB,CAAC,CAAC,gEACE,MAAM,CAAC,cAAc,GAAG,CAAC;4BACvB,CAAC,KAAC,eAAK,mIAAA,6BAA8B,EAAgC,gCAAgC,KAAhE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EACrE,CAAC,CAAC,EAAE,CACN;wBACJ,CAAC,KAAC,eAAK,kNAAA,EAAG,EAA4B,oBAAqB,EAIzD,SAAQ,EAAiB,6GAAsG,KAJvH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,EAClC,MAAM,CAAC,cAAc,GAAG,CAAC;4BACvB,CAAC,KAAC,eAAK,qGAAA,YAAa,EAAgC,mBAAmB,KAAnD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EACpD,CAAC,CAAC,EAAE,EACA,iBAAiB,CAAsG,CACpI,CAAA;;;;;CACF;AAED;;;;GAIG;AACH,SAAS,aAAa,CACpB,OAA6C,EAC7C,MAAe;IAEf,IAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;IACrC,WAAO,eAAK,kGAAA,EAAG,EAAQ,GAAI,EAE3B,iBAAkB,EAIlB,EAAE,KANa,QAAQ,EACrB,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,KAAC,eAAK,oFAAA,gBAAgB,KAAC,CAAC,KAAC,eAAK,kFAAA,cAAc,IAAA,EAEtE,OAAO,CAAC,MAAM,KAAK,KAAK;QACtB,CAAC,KAAC,eAAK,sFAAA,aAAc,EAAmB,GAAG,KAAtB,OAAO,CAAC,WAAW,EACxC,CAAC,KAAC,eAAK,+GAAA,eAAgB,EAAmB,0BAA0B,KAA7C,OAAO,CAAC,WAAW,CAA0B,EACtE;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,IAAiB;IACzC,IAAM,KAAK,GACT,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC;QAC9D,CAAC,KAAC,eAAK,0GAAA,oCAAoC,KAC3C,CAAC,KAAC,eAAK,0IAAA,eAAgB,EAAiC,sBAAuB,EAAqC,2BAA2B,KAAxH,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAuB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,CAA2B,CAAA;IAEnJ,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACxE,IAAM,KAAK,OAAG,eAAK,wHAAA,eAAM,EAA4B,uBAAmB,EAExE,IAAK,EAAK,EAAE,KAFa,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,EACnD,IAAI,CAAC,QAAQ,EACV,KAAK,CAAE,CAAA;IAEZ,IAAM,EAAE,GAAG,IAAI,CAAA;IACf,IAAM,QAAQ,mCACT,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,uBAAM,CAAC,KAAE,MAAM,EAAE,KAAK,IAAG,EAAzB,CAAyB,CAAC,SACrD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,uBAAM,CAAC,KAAE,MAAM,EAAE,QAAQ,IAAG,EAA5B,CAA4B,CAAC,OAChE,CAAA;IACD,IAAM,QAAQ,GACZ,KAAK;QACL,EAAE;QACF,QAAQ;aACL,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAArD,CAAqD,CAAC;aACjE,IAAI,CAAC,EAAE,CAAC,CAAA;IAEb,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,SAAS;IAChB,OAAO,CAAC,GAAG,CACT,IAAA,eAAK,ggBAAA,0bAON,KAAC,IAAI,EAAE,CACP,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  export * from './type-syncer';
2
2
  export * from './config-service';
3
3
  export * from './types';
4
- export * from './type-definition-source';
5
4
  export * from './package-source';
package/lib/index.js CHANGED
@@ -17,6 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./type-syncer"), exports);
18
18
  __exportStar(require("./config-service"), exports);
19
19
  __exportStar(require("./types"), exports);
20
- __exportStar(require("./type-definition-source"), exports);
21
20
  __exportStar(require("./package-source"), exports);
22
21
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,mDAAgC;AAChC,0CAAuB;AACvB,2DAAwC;AACxC,mDAAgC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,mDAAgC;AAChC,0CAAuB;AACvB,mDAAgC"}
@@ -35,9 +35,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
+ var __importDefault = (this && this.__importDefault) || function (mod) {
39
+ return (mod && mod.__esModule) ? mod : { "default": mod };
40
+ };
38
41
  Object.defineProperty(exports, "__esModule", { value: true });
39
42
  exports.createPackageSource = void 0;
40
- var npm_client_1 = require("./npm-client");
43
+ var npm_registry_fetch_1 = __importDefault(require("npm-registry-fetch"));
41
44
  var semver_1 = require("semver");
42
45
  /**
43
46
  * Creates a package source.
@@ -49,12 +52,24 @@ function createPackageSource() {
49
52
  * Fetches info about a package, or `null` if not found.
50
53
  */
51
54
  fetch: function (name) { return __awaiter(_this, void 0, void 0, function () {
52
- var data, versions;
55
+ var response, data, versions;
53
56
  return __generator(this, function (_a) {
54
57
  switch (_a.label) {
55
- case 0: return [4 /*yield*/, npm_client_1.npmClient.getPackageManifest(encodeURIComponent(name))];
58
+ case 0: return [4 /*yield*/, (0, npm_registry_fetch_1.default)(encodeURIComponent(name)).catch(function (err) {
59
+ if (err.statusCode === 404) {
60
+ return null;
61
+ }
62
+ /* istanbul ignore next */
63
+ throw err;
64
+ })];
56
65
  case 1:
66
+ response = _a.sent();
67
+ return [4 /*yield*/, (response === null || response === void 0 ? void 0 : response.json())];
68
+ case 2:
57
69
  data = _a.sent();
70
+ if (!data) {
71
+ return [2 /*return*/, null];
72
+ }
58
73
  versions = Object.keys(data.versions).map(function (v) {
59
74
  var item = data.versions[v];
60
75
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"package-source.js","sourceRoot":"","sources":["../src/package-source.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAAwC;AACxC,iCAAgC;AAEhC;;GAEG;AACH,SAAgB,mBAAmB;IAAnC,iBA2BC;IA1BC,OAAO;QACL;;WAEG;QACH,KAAK,EAAE,UAAO,IAAI;;;;4BACH,qBAAM,sBAAS,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAA;;wBAAnE,IAAI,GAAG,SAA4D;wBACnE,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAC7C,UAAC,CAAC;4BACA,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;4BAC7B,OAAO;gCACL,OAAO,EAAE,IAAI,CAAC,OAAO;gCACrB,uBAAuB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO;6BACxD,CAAA;wBACH,CAAC,CACF,CAAA;wBAED,sBAAO;gCACL,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM;gCACvC,0CAA0C;gCAC1C,QAAQ,EAAE,QAAQ;qCACf,IAAI,CAAC,UAAC,IAAI,EAAE,KAAK,IAAK,OAAA,IAAA,gBAAO,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,EAApC,CAAoC,CAAC;qCAC3D,OAAO,EAAE;6BACb,EAAA;;;aACF;KACF,CAAA;AACH,CAAC;AA3BD,kDA2BC"}
1
+ {"version":3,"file":"package-source.js","sourceRoot":"","sources":["../src/package-source.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0EAAsC;AACtC,iCAAgC;AAEhC;;GAEG;AACH,SAAgB,mBAAmB;IAAnC,iBA2CC;IA1CC,OAAO;QACL;;WAEG;QACH,KAAK,EAAE,UAAO,IAAI;;;;4BACC,qBAAM,IAAA,4BAAK,EAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAC1D,UAAC,GAAQ;4BACP,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;gCAC1B,OAAO,IAAI,CAAA;6BACZ;4BAED,0BAA0B;4BAC1B,MAAM,GAAG,CAAA;wBACX,CAAC,CACF,EAAA;;wBATK,QAAQ,GAAG,SAShB;wBAEY,qBAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAA,EAAA;;wBAA7B,IAAI,GAAG,SAAsB;wBAEnC,IAAI,CAAC,IAAI,EAAE;4BACT,sBAAO,IAAI,EAAA;yBACZ;wBAEK,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAC7C,UAAC,CAAC;4BACA,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;4BAC7B,OAAO;gCACL,OAAO,EAAE,IAAI,CAAC,OAAO;gCACrB,uBAAuB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO;6BACxD,CAAA;wBACH,CAAC,CACF,CAAA;wBAED,sBAAO;gCACL,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM;gCACvC,0CAA0C;gCAC1C,QAAQ,EAAE,QAAQ;qCACf,IAAI,CAAC,UAAC,IAAI,EAAE,KAAK,IAAK,OAAA,IAAA,gBAAO,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,EAApC,CAAoC,CAAC;qCAC3D,OAAO,EAAE;6BACb,EAAA;;;aACF;KACF,CAAA;AACH,CAAC;AA3CD,kDA2CC"}
@@ -1,4 +1,4 @@
1
- import { ITypeSyncer, IPackageJSONService, ITypeDefinitionSource, IPackageSource, IConfigService } from './types';
1
+ import { ITypeSyncer, IPackageJSONService, IPackageSource, IConfigService } from './types';
2
2
  import { IGlobber } from './globber';
3
3
  /**
4
4
  * Creates a type syncer.
@@ -6,4 +6,4 @@ import { IGlobber } from './globber';
6
6
  * @param packageJSONservice
7
7
  * @param typeDefinitionSource
8
8
  */
9
- export declare function createTypeSyncer(packageJSONService: IPackageJSONService, typeDefinitionSource: ITypeDefinitionSource, packageSource: IPackageSource, configService: IConfigService, globber: IGlobber): ITypeSyncer;
9
+ export declare function createTypeSyncer(packageJSONService: IPackageJSONService, packageSource: IPackageSource, configService: IConfigService, globber: IGlobber): ITypeSyncer;
@@ -66,7 +66,7 @@ var semver_1 = require("semver");
66
66
  * @param packageJSONservice
67
67
  * @param typeDefinitionSource
68
68
  */
69
- function createTypeSyncer(packageJSONService, typeDefinitionSource, packageSource, configService, globber) {
69
+ function createTypeSyncer(packageJSONService, packageSource, configService, globber) {
70
70
  var fetchPackageInfo = (0, util_1.memoizeAsync)(packageSource.fetch);
71
71
  return {
72
72
  sync: sync,
@@ -76,28 +76,25 @@ function createTypeSyncer(packageJSONService, typeDefinitionSource, packageSourc
76
76
  */
77
77
  function sync(filePath, flags) {
78
78
  return __awaiter(this, void 0, void 0, function () {
79
- var dryRun, _a, file, allTypings, syncOpts, subPackages, syncedFiles;
79
+ var dryRun, _a, file, syncOpts, subPackages, syncedFiles;
80
80
  return __generator(this, function (_b) {
81
81
  switch (_b.label) {
82
82
  case 0:
83
83
  dryRun = !!flags.dry;
84
84
  return [4 /*yield*/, Promise.all([
85
85
  packageJSONService.readPackageFile(filePath),
86
- typeDefinitionSource.fetch(),
87
86
  configService.readConfig(filePath, flags),
88
87
  ])];
89
88
  case 1:
90
- _a = _b.sent(), file = _a[0], allTypings = _a[1], syncOpts = _a[2];
89
+ _a = _b.sent(), file = _a[0], syncOpts = _a[1];
91
90
  return [4 /*yield*/, Promise.all(__spreadArray(__spreadArray([], (0, util_1.ensureWorkspacesArray)(file.packages), true), (0, util_1.ensureWorkspacesArray)(file.workspaces), true).map(globber.globPackageFiles))
92
91
  .then(util_1.flatten)
93
92
  .then(util_1.uniq)];
94
93
  case 2:
95
94
  subPackages = _b.sent();
96
95
  return [4 /*yield*/, Promise.all(__spreadArray([
97
- syncFile(filePath, file, allTypings, syncOpts, dryRun)
98
- ], subPackages.map(function (p) {
99
- return syncFile(p, null, allTypings, syncOpts, dryRun);
100
- }), true))];
96
+ syncFile(filePath, file, syncOpts, dryRun)
97
+ ], subPackages.map(function (p) { return syncFile(p, null, syncOpts, dryRun); }), true))];
101
98
  case 3:
102
99
  syncedFiles = _b.sent();
103
100
  return [2 /*return*/, {
@@ -115,9 +112,9 @@ function createTypeSyncer(packageJSONService, typeDefinitionSource, packageSourc
115
112
  * @param allTypings
116
113
  * @param opts
117
114
  */
118
- function syncFile(filePath, file, allTypings, opts, dryRun) {
115
+ function syncFile(filePath, file, opts, dryRun) {
119
116
  return __awaiter(this, void 0, void 0, function () {
120
- var ignoreDeps, ignorePackages, packageFile, _a, allPackages, allPackageNames, newTypings, used, devDepsToAdd, devDeps, unused;
117
+ var ignoreDeps, ignorePackages, packageFile, _a, allPackages, allPackageNames, potentiallyUntypedPackages, used, devDepsToAdd, devDeps;
121
118
  var _this = this;
122
119
  return __generator(this, function (_b) {
123
120
  switch (_b.label) {
@@ -137,18 +134,24 @@ function createTypeSyncer(packageJSONService, typeDefinitionSource, packageSourc
137
134
  return getPackagesFromSection(section, ignoredSection, ignorePackages);
138
135
  }));
139
136
  allPackageNames = (0, util_1.uniq)(allPackages.map(function (p) { return p.name; }));
140
- newTypings = filterNewTypings(allPackageNames, allTypings);
137
+ potentiallyUntypedPackages = getPotentiallyUntypedPackages(allPackageNames);
141
138
  used = [];
142
- return [4 /*yield*/, Promise.all(newTypings.map(function (t) { return __awaiter(_this, void 0, void 0, function () {
139
+ return [4 /*yield*/, Promise.all(potentiallyUntypedPackages.map(function (t) { return __awaiter(_this, void 0, void 0, function () {
143
140
  var typePackageInfoPromise, codePackageInfo, codePackage, closestMatchingCodeVersion, typePackageInfo, closestMatchingTypingsVersion, version, semverRangeSpecifier;
144
141
  var _a;
145
142
  return __generator(this, function (_b) {
146
143
  switch (_b.label) {
147
144
  case 0:
148
- typePackageInfoPromise = fetchPackageInfo((0, util_1.typed)(t.typingsName));
149
- return [4 /*yield*/, fetchPackageInfo(t.codePackageName)];
145
+ typePackageInfoPromise = fetchPackageInfo(t.typesPackageName);
146
+ return [4 /*yield*/, fetchPackageInfo(t.codePackageName)
147
+ // If the code package was not found, there's nothing else to do.
148
+ ];
150
149
  case 1:
151
150
  codePackageInfo = _b.sent();
151
+ // If the code package was not found, there's nothing else to do.
152
+ if (!codePackageInfo) {
153
+ return [2 /*return*/, {}];
154
+ }
152
155
  codePackage = allPackages.find(function (p) { return p.name === t.codePackageName; });
153
156
  closestMatchingCodeVersion = getClosestMatchingVersion(codePackageInfo, codePackage.version);
154
157
  // If the closest matching version contains internal typings, don't include it.
@@ -156,33 +159,37 @@ function createTypeSyncer(packageJSONService, typeDefinitionSource, packageSourc
156
159
  return [2 /*return*/, {}];
157
160
  }
158
161
  return [4 /*yield*/, typePackageInfoPromise
159
- // Gets the closest matching typings version, or the newest one.
162
+ // If the types package was not found, there's nothing else to do.
163
+ /* istanbul ignore next */
160
164
  ];
161
165
  case 2:
162
166
  typePackageInfo = _b.sent();
167
+ // If the types package was not found, there's nothing else to do.
168
+ /* istanbul ignore next */
169
+ if (!typePackageInfo) {
170
+ return [2 /*return*/, {}];
171
+ }
163
172
  closestMatchingTypingsVersion = getClosestMatchingVersion(typePackageInfo, codePackage.version);
164
173
  version = closestMatchingTypingsVersion.version;
165
174
  semverRangeSpecifier = getSemverRangeSpecifier(codePackage.version);
166
175
  used.push(t);
167
176
  return [2 /*return*/, (_a = {},
168
- _a[(0, util_1.typed)(t.typingsName)] = semverRangeSpecifier + version,
177
+ _a[t.typesPackageName] = semverRangeSpecifier + version,
169
178
  _a)];
170
179
  }
171
180
  });
172
181
  }); })).then(util_1.mergeObjects)];
173
182
  case 3:
174
183
  devDepsToAdd = _b.sent();
175
- devDeps = packageFile.devDependencies || /* istanbul ignore next */ {};
176
- unused = getUnusedTypings(allPackageNames, devDeps, allTypings);
184
+ devDeps = packageFile.devDependencies;
177
185
  if (!!dryRun) return [3 /*break*/, 5];
178
- return [4 /*yield*/, packageJSONService.writePackageFile(filePath, __assign(__assign({}, packageFile), { devDependencies: (0, util_1.orderObject)(__assign(__assign({}, devDepsToAdd), removeUnusedTypings(devDeps, unused))) }))];
186
+ return [4 /*yield*/, packageJSONService.writePackageFile(filePath, __assign(__assign({}, packageFile), { devDependencies: (0, util_1.orderObject)(__assign(__assign({}, devDepsToAdd), devDeps)) }))];
179
187
  case 4:
180
188
  _b.sent();
181
189
  _b.label = 5;
182
190
  case 5: return [2 /*return*/, {
183
191
  filePath: filePath,
184
192
  newTypings: used,
185
- removedTypings: unused,
186
193
  package: packageFile,
187
194
  }];
188
195
  }
@@ -191,53 +198,6 @@ function createTypeSyncer(packageJSONService, typeDefinitionSource, packageSourc
191
198
  }
192
199
  }
193
200
  exports.createTypeSyncer = createTypeSyncer;
194
- /**
195
- * Removes unused typings from the devDependencies section.
196
- *
197
- * @param allPackageNames
198
- * @param devDependencies
199
- */
200
- function removeUnusedTypings(devDependencies, unusedTypings) {
201
- var result = {};
202
- var _loop_1 = function (packageName) {
203
- var version = devDependencies[packageName];
204
- if (unusedTypings.some(function (t) { return t.typingsPackageName === packageName; })) {
205
- return "continue";
206
- }
207
- result[packageName] = version;
208
- };
209
- for (var packageName in devDependencies) {
210
- _loop_1(packageName);
211
- }
212
- return result;
213
- }
214
- /**
215
- * Removes unused typings from the devDependencies section.
216
- *
217
- * @param allPackageNames
218
- * @param devDependencies
219
- */
220
- function getUnusedTypings(allPackageNames, devDependencies, allTypings) {
221
- var result = [];
222
- var _loop_2 = function (packageName) {
223
- if (packageName.startsWith('@types/')) {
224
- var codePackageName_1 = (0, util_1.untyped)(packageName);
225
- // Make sure the corresponding code package is in `allPackages`.
226
- var hasCodePackageForTyping = allPackageNames.some(function (p) { return p === codePackageName_1; });
227
- if (!hasCodePackageForTyping) {
228
- var typingsNameForCodePackage_1 = getTypingsName(codePackageName_1);
229
- var typeDef = allTypings.find(function (t) { return t.typingsName === typingsNameForCodePackage_1; });
230
- if (typeDef && !typeDef.isGlobal) {
231
- result.push(__assign({ codePackageName: codePackageName_1, typingsPackageName: packageName }, typeDef));
232
- }
233
- }
234
- }
235
- };
236
- for (var packageName in devDependencies) {
237
- _loop_2(packageName);
238
- }
239
- return result;
240
- }
241
201
  /**
242
202
  * Gets the closest matching package version info.
243
203
  *
@@ -249,26 +209,29 @@ function getClosestMatchingVersion(packageInfo, version) {
249
209
  packageInfo.versions[0]);
250
210
  }
251
211
  /**
252
- * Returns an array of new typings as well as the code package name that was matched to it.
212
+ * Returns an array of packages that do not have a `@types/` package.
253
213
  *
254
214
  * @param allPackageNames Used to filter the typings that are new.
255
215
  * @param allTypings All typings available
256
216
  */
257
- function filterNewTypings(allPackageNames, allTypings) {
217
+ function getPotentiallyUntypedPackages(allPackageNames) {
258
218
  var existingTypings = allPackageNames.filter(function (x) { return x.startsWith('@types/'); });
259
219
  return (0, util_1.filterMap)(allPackageNames, function (p) {
260
- var typingsName = getTypingsName(p);
261
- var typingsForPackage = allTypings.find(function (x) { return x.typingsName === typingsName; });
262
- if (!typingsForPackage) {
263
- // No typings available.
220
+ // Ignore typings packages themselves.
221
+ if (p.startsWith('@types/')) {
264
222
  return false;
265
223
  }
266
- var fullTypingsPackage = (0, util_1.typed)(typingsForPackage.typingsName);
224
+ var typingsName = getTypingsName(p);
225
+ var fullTypingsPackage = (0, util_1.typed)(p);
267
226
  var alreadyHasTyping = existingTypings.some(function (t) { return t === fullTypingsPackage; });
268
227
  if (alreadyHasTyping) {
269
228
  return false;
270
229
  }
271
- return __assign(__assign({}, typingsForPackage), { codePackageName: p });
230
+ return {
231
+ typingsName: typingsName,
232
+ typesPackageName: fullTypingsPackage,
233
+ codePackageName: p,
234
+ };
272
235
  });
273
236
  }
274
237
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"type-syncer.js","sourceRoot":"","sources":["../src/type-syncer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type-syncer.js","sourceRoot":"","sources":["../src/type-syncer.ts"],"names":[],"mappings":"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"}
package/lib/types.d.ts CHANGED
@@ -26,15 +26,6 @@ export interface IConfigService {
26
26
  */
27
27
  readConfig(filePath: string, flags: ICLIArguments['flags']): Promise<ISyncOptions>;
28
28
  }
29
- /**
30
- * Fetches available type definitions.
31
- */
32
- export interface ITypeDefinitionSource {
33
- /**
34
- * Fetches available type definitions.
35
- */
36
- fetch(): Promise<Array<ITypeDefinition>>;
37
- }
38
29
  /**
39
30
  * Fetches info about a package.
40
31
  */
@@ -44,7 +35,7 @@ export interface IPackageSource {
44
35
  *
45
36
  * @param packageName
46
37
  */
47
- fetch(packageName: string): Promise<IPackageInfo>;
38
+ fetch(packageName: string): Promise<IPackageInfo | null>;
48
39
  }
49
40
  /**
50
41
  * File service.
@@ -111,16 +102,17 @@ export interface IPackageVersion {
111
102
  version: string;
112
103
  }
113
104
  /**
114
- * Represents a type definition pulled from a source.
105
+ * Describes how a package may be typed.
115
106
  */
116
- export interface ITypeDefinition {
107
+ export interface IPackageTypingDescriptor {
117
108
  typingsName: string;
118
- isGlobal: boolean;
109
+ codePackageName: string;
110
+ typesPackageName: string;
119
111
  }
120
112
  /**
121
113
  * A type definition with the corresponding code package name.
122
114
  */
123
- export interface ISyncedTypeDefinition extends ITypeDefinition {
115
+ export interface ISyncedTypeDefinition extends IPackageTypingDescriptor {
124
116
  codePackageName: string;
125
117
  }
126
118
  /**
@@ -148,10 +140,6 @@ export interface ISyncedFile {
148
140
  * The new typings that were added.
149
141
  */
150
142
  newTypings: Array<ISyncedTypeDefinition>;
151
- /**
152
- * The typings that were removed because they were unused.
153
- */
154
- removedTypings: Array<ISyncedTypeDefinition>;
155
143
  }
156
144
  /**
157
145
  * Dependency sections.
package/lib/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AA+KA;;GAEG;AACH,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,iCAAW,CAAA;IACX,mCAAa,CAAA;IACb,2CAAqB,CAAA;IACrB,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAK7B"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAkKA;;GAEG;AACH,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,iCAAW,CAAA;IACX,mCAAa,CAAA;IACb,2CAAqB,CAAA;IACrB,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAK7B"}
package/lib/util.js CHANGED
@@ -123,6 +123,11 @@ exports.mergeObjects = mergeObjects;
123
123
  * @param name Package name
124
124
  */
125
125
  function typed(name) {
126
+ // If the package is scoped, the typings scheme is slightly different.
127
+ if (/^@.*?\//i.test(name)) {
128
+ var splat = name.split('/');
129
+ return "@types/".concat(splat[0].slice(1), "__").concat(splat[1]);
130
+ }
126
131
  return "@types/".concat(name);
127
132
  }
128
133
  exports.typed = typed;
package/lib/util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "typesync",
3
- "version": "0.10.0",
3
+ "version": "0.11.0",
4
4
  "description": "Install missing TypeScript typings for your dependencies.",
5
5
  "engines": {
6
6
  "node": ">=14.0.0"
@@ -47,28 +47,29 @@
47
47
  },
48
48
  "homepage": "https://github.com/jeffijoe/typesync#readme",
49
49
  "dependencies": {
50
- "awilix": "^8.0.0",
51
- "axios": "^1.2.6",
50
+ "awilix": "^8.0.1",
52
51
  "chalk": "^4.1.2",
53
- "cosmiconfig": "^8.0.0",
52
+ "cosmiconfig": "^8.1.3",
54
53
  "detect-indent": "^6.0.0",
55
54
  "glob": "^8.1.0",
55
+ "npm-registry-fetch": "^14.0.5",
56
56
  "ora": "^5.1.0",
57
- "semver": "^7.3.8"
57
+ "semver": "^7.5.0"
58
58
  },
59
59
  "devDependencies": {
60
- "@types/glob": "^8.0.1",
61
- "@types/jest": "^29.4.0",
60
+ "@types/glob": "^8.1.0",
61
+ "@types/jest": "^29.5.1",
62
+ "@types/npm-registry-fetch": "^8.0.4",
62
63
  "@types/semver": "^7.3.13",
63
- "jest": "^29.4.1",
64
- "nodemon": "^2.0.20",
65
- "prettier": "^2.8.3",
66
- "rimraf": "^4.1.2",
67
- "ts-jest": "^29.0.5",
64
+ "jest": "^29.5.0",
65
+ "nodemon": "^2.0.22",
66
+ "prettier": "^2.8.8",
67
+ "rimraf": "^5.0.0",
68
+ "ts-jest": "^29.1.0",
68
69
  "tslint": "^6.1.3",
69
70
  "tslint-config-prettier": "^1.18.0",
70
71
  "tslint-config-standard": "^9.0.0",
71
- "typescript": "^4.9.5"
72
+ "typescript": "^5.0.4"
72
73
  },
73
74
  "jest": {
74
75
  "testEnvironment": "node",
@@ -1,10 +0,0 @@
1
- /**
2
- * Read registry from npm config.
3
- */
4
- export declare function getNpmRegistry(): Promise<string>;
5
- /**
6
- * Simple wrapper around the NPM API.
7
- */
8
- export declare const npmClient: {
9
- getPackageManifest: (name: string) => Promise<any>;
10
- };
package/lib/npm-client.js DELETED
@@ -1,95 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
- function verb(n) { return function (v) { return step([n, v]); }; }
15
- function step(op) {
16
- if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
- if (y = 0, t) op = [op[0] & 2, t.value];
20
- switch (op[0]) {
21
- case 0: case 1: t = op; break;
22
- case 4: _.label++; return { value: op[1], done: false };
23
- case 5: _.label++; y = op[1]; op = [0]; continue;
24
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
- default:
26
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
- if (t[2]) _.ops.pop();
31
- _.trys.pop(); continue;
32
- }
33
- op = body.call(thisArg, _);
34
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
- }
37
- };
38
- var __importDefault = (this && this.__importDefault) || function (mod) {
39
- return (mod && mod.__esModule) ? mod : { "default": mod };
40
- };
41
- Object.defineProperty(exports, "__esModule", { value: true });
42
- exports.npmClient = exports.getNpmRegistry = void 0;
43
- var axios_1 = __importDefault(require("axios"));
44
- var child_process_1 = __importDefault(require("child_process"));
45
- var util_1 = require("util");
46
- var util_2 = require("./util");
47
- var execAsync = (0, util_1.promisify)(child_process_1.default.exec);
48
- /**
49
- * Read registry from npm config.
50
- */
51
- function getNpmRegistry() {
52
- return __awaiter(this, void 0, void 0, function () {
53
- var stdout;
54
- return __generator(this, function (_a) {
55
- switch (_a.label) {
56
- case 0: return [4 /*yield*/, execAsync('npm config get registry')
57
- /* istanbul ignore next */
58
- ];
59
- case 1:
60
- stdout = (_a.sent()).stdout;
61
- /* istanbul ignore next */
62
- return [2 /*return*/, stdout.trim() || 'https://registry.npmjs.org'];
63
- }
64
- });
65
- });
66
- }
67
- exports.getNpmRegistry = getNpmRegistry;
68
- var getClient = (0, util_2.memoizeAsync)(function () { return __awaiter(void 0, void 0, void 0, function () {
69
- var registryUrl;
70
- return __generator(this, function (_a) {
71
- switch (_a.label) {
72
- case 0: return [4 /*yield*/, getNpmRegistry()];
73
- case 1:
74
- registryUrl = _a.sent();
75
- return [2 /*return*/, axios_1.default.create({ baseURL: registryUrl })];
76
- }
77
- });
78
- }); });
79
- /**
80
- * Simple wrapper around the NPM API.
81
- */
82
- exports.npmClient = {
83
- getPackageManifest: function (name) { return __awaiter(void 0, void 0, void 0, function () {
84
- var client;
85
- return __generator(this, function (_a) {
86
- switch (_a.label) {
87
- case 0: return [4 /*yield*/, getClient()];
88
- case 1:
89
- client = _a.sent();
90
- return [2 /*return*/, client.get(name).then(function (r) { return r.data; })];
91
- }
92
- });
93
- }); },
94
- };
95
- //# sourceMappingURL=npm-client.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"npm-client.js","sourceRoot":"","sources":["../src/npm-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,gEAAiC;AACjC,6BAAgC;AAChC,+BAAqC;AAErC,IAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,uBAAK,CAAC,IAAI,CAAC,CAAA;AAEvC;;GAEG;AACH,SAAsB,cAAc;;;;;wBACf,qBAAM,SAAS,CAAC,yBAAyB,CAAC;oBAC7D,0BAA0B;kBADmC;;oBAArD,MAAM,GAAK,CAAA,SAA0C,CAAA,OAA/C;oBACd,0BAA0B;oBAC1B,sBAAO,MAAM,CAAC,IAAI,EAAE,IAAI,4BAA4B,EAAA;;;;CACrD;AAJD,wCAIC;AAED,IAAM,SAAS,GAAG,IAAA,mBAAY,EAAC;;;;oBACT,qBAAM,cAAc,EAAE,EAAA;;gBAApC,WAAW,GAAG,SAAsB;gBAC1C,sBAAO,eAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,EAAA;;;KAC9C,CAAC,CAAA;AAEF;;GAEG;AACU,QAAA,SAAS,GAAG;IACvB,kBAAkB,EAAE,UAAO,IAAY;;;;wBACtB,qBAAM,SAAS,EAAE,EAAA;;oBAA1B,MAAM,GAAG,SAAiB;oBAChC,sBAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,EAAN,CAAM,CAAC,EAAA;;;SAC5C;CACF,CAAA"}
@@ -1,5 +0,0 @@
1
- import { ITypeDefinitionSource } from './types';
2
- /**
3
- * Used to pull definitions.
4
- */
5
- export declare function createTypeDefinitionSource(): ITypeDefinitionSource;
@@ -1,82 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
- function verb(n) { return function (v) { return step([n, v]); }; }
15
- function step(op) {
16
- if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
- if (y = 0, t) op = [op[0] & 2, t.value];
20
- switch (op[0]) {
21
- case 0: case 1: t = op; break;
22
- case 4: _.label++; return { value: op[1], done: false };
23
- case 5: _.label++; y = op[1]; op = [0]; continue;
24
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
- default:
26
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
- if (t[2]) _.ops.pop();
31
- _.trys.pop(); continue;
32
- }
33
- op = body.call(thisArg, _);
34
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
- }
37
- };
38
- var __importDefault = (this && this.__importDefault) || function (mod) {
39
- return (mod && mod.__esModule) ? mod : { "default": mod };
40
- };
41
- Object.defineProperty(exports, "__esModule", { value: true });
42
- exports.createTypeDefinitionSource = void 0;
43
- var axios_1 = __importDefault(require("axios"));
44
- var typedefsUrl = 'https://typespublisher.blob.core.windows.net/typespublisher/data/search-index-min.json';
45
- /**
46
- * Used to pull definitions.
47
- */
48
- function createTypeDefinitionSource() {
49
- var _this = this;
50
- return {
51
- /**
52
- * Fetches available type defs.
53
- */
54
- fetch: function () { return __awaiter(_this, void 0, void 0, function () {
55
- var data;
56
- return __generator(this, function (_a) {
57
- switch (_a.label) {
58
- case 0: return [4 /*yield*/, axios_1.default
59
- .get(typedefsUrl, {
60
- timeout: 60000,
61
- timeoutErrorMessage: 'Timed out while trying to fetch the type definitions.',
62
- })
63
- .then(function (x) { return x.data; })
64
- /* istanbul ignore next */
65
- ];
66
- case 1:
67
- data = _a.sent();
68
- /* istanbul ignore next */
69
- if (!Array.isArray(data)) {
70
- throw new Error('The type definitions endpoint did not return the expected shape.');
71
- }
72
- return [2 /*return*/, data.map(function (d) { return ({
73
- typingsName: d.t,
74
- isGlobal: d.g && d.g.length > 0,
75
- }); })];
76
- }
77
- });
78
- }); },
79
- };
80
- }
81
- exports.createTypeDefinitionSource = createTypeDefinitionSource;
82
- //# sourceMappingURL=type-definition-source.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"type-definition-source.js","sourceRoot":"","sources":["../src/type-definition-source.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAyB;AAEzB,IAAM,WAAW,GACf,wFAAwF,CAAA;AAE1F;;GAEG;AACH,SAAgB,0BAA0B;IAA1C,iBA2BC;IA1BC,OAAO;QACL;;WAEG;QACH,KAAK,EAAE;;;;4BACQ,qBAAM,eAAK;6BACrB,GAAG,CAAC,WAAW,EAAE;4BAChB,OAAO,EAAE,KAAK;4BACd,mBAAmB,EACjB,uDAAuD;yBAC1D,CAAC;6BACD,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAa,EAAf,CAAe,CAAC;wBAE/B,0BAA0B;sBAFK;;wBANzB,IAAI,GAAG,SAMkB;wBAE/B,0BAA0B;wBAC1B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;4BACxB,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAA;yBACF;wBAED,sBAAO,IAAI,CAAC,GAAG,CAAkB,UAAC,CAAM,IAAK,OAAA,CAAC;gCAC5C,WAAW,EAAE,CAAC,CAAC,CAAC;gCAChB,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;6BAChC,CAAC,EAH2C,CAG3C,CAAC,EAAA;;;aACJ;KACF,CAAA;AACH,CAAC;AA3BD,gEA2BC"}