@neurodevs/ndx-cli 0.1.34 → 0.1.36

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 (8) hide show
  1. package/build/__tests__/modules/CliCommandRunner.test.d.ts +4 -1
  2. package/build/__tests__/modules/CliCommandRunner.test.js +37 -20
  3. package/build/__tests__/modules/CliCommandRunner.test.js.map +1 -1
  4. package/build/modules/commands/UpgradePackageCommand.js +1 -1
  5. package/build/modules/commands/UpgradePackageCommand.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/__tests__/modules/CliCommandRunner.test.ts +53 -34
  8. package/src/modules/commands/UpgradePackageCommand.ts +1 -1
package/build/__tests__/modules/CliCommandRunner.test.d.ts CHANGED
@@ -49,12 +49,15 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
49
49
  protected static upgradePackageCreatesNpmAutopackage(): Promise<void>;
50
50
  protected static upgradePackageRunsNpmAutopackage(): Promise<void>;
51
51
  protected static upgradePackageAddsDefaultKeywordsIfMissing(): Promise<void>;
52
- protected static upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing(): Promise<void>;
52
+ protected static upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing(): Promise<void>;
53
+ protected static upgradePackageExtractsPackageNameFromScopedName(): Promise<void>;
53
54
  private static runCreateUi;
54
55
  private static setFakeReadFileResultToTsconfig;
55
56
  private static setFakeReadToEmptyPackageJson;
56
57
  private static setFakeReadToAllInstalledExcept;
57
58
  private static setFakeReadToAllInstalled;
59
+ private static setFakePackageJson;
60
+ private static readonly infoFromPackageJson;
58
61
  private static readonly allInstalled;
59
62
  private static readonly allRequiredDependencies;
60
63
  private static readonly installDependenciesCommand;
package/build/__tests__/modules/CliCommandRunner.test.js CHANGED
@@ -323,15 +323,10 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
323
323
  test_utils_1.assert.isTruthy(instance, `Failed to create instance for ${this.upgradePackageCommand}!`);
324
324
  }
325
325
  static async upgradePackageCreatesNpmAutopackage() {
326
- const infoFromPackageJson = {
327
- name: this.packageName,
328
- description: this.description,
329
- keywords: this.keywordsWithDefaults,
330
- };
331
- (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
332
326
  await this.runUpgradePackage();
333
327
  test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0], {
334
- ...infoFromPackageJson,
328
+ ...this.infoFromPackageJson,
329
+ name: `${this.packageName}`,
335
330
  gitNamespace: 'neurodevs',
336
331
  npmNamespace: 'neurodevs',
337
332
  installDir: this.expandHomeDir('~/dev'),
@@ -344,24 +339,29 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
344
339
  test_utils_1.assert.isEqual(meta_node_1.FakeAutopackage.numCallsToRun, 1, 'Did not call run on NpmAutopackage!');
345
340
  }
346
341
  static async upgradePackageAddsDefaultKeywordsIfMissing() {
347
- const infoFromPackageJson = {
342
+ await this.runUpgradePackage({
348
343
  name: this.packageName,
349
344
  description: this.description,
350
345
  keywords: [],
351
- };
352
- (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
353
- await this.runUpgradePackage();
346
+ });
354
347
  test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.keywords, this.defaultKeywords, 'Did not add default keywords!');
355
348
  }
356
- static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing() {
357
- const infoFromPackageJson = {
349
+ static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing() {
350
+ const keywords = [(0, test_utils_1.generateId)(), (0, test_utils_1.generateId)()];
351
+ await this.runUpgradePackage({
358
352
  name: this.packageName,
359
353
  description: this.description,
360
- keywords: [(0, test_utils_1.generateId)(), (0, test_utils_1.generateId)()],
361
- };
362
- (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
363
- await this.runUpgradePackage();
364
- test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.keywords, [...this.defaultKeywords, ...infoFromPackageJson.keywords], 'Should not have overwritten keywords!');
354
+ keywords,
355
+ });
356
+ test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.keywords, [...this.defaultKeywords, ...keywords], 'Should not have overwritten keywords!');
357
+ }
358
+ static async upgradePackageExtractsPackageNameFromScopedName() {
359
+ await this.runUpgradePackage({
360
+ name: this.packageName,
361
+ description: this.description,
362
+ keywords: this.keywordsWithDefaults,
363
+ });
364
+ test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.name, this.packageName, 'Did not extract package name from scoped name!');
365
365
  }
366
366
  static async runCreateUi(responses) {
367
367
  (0, fakePrompts_1.setFakeResponses)({
@@ -384,6 +384,14 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
384
384
  static setFakeReadToAllInstalled() {
385
385
  (0, fake_node_core_1.setFakeReadFileResult)('package.json', this.allInstalled);
386
386
  }
387
+ static setFakePackageJson(responses) {
388
+ const infoFromPackageJson = {
389
+ ...this.infoFromPackageJson,
390
+ ...responses,
391
+ };
392
+ (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
393
+ return infoFromPackageJson;
394
+ }
387
395
  static async runCreateImpl(responses) {
388
396
  (0, fakePrompts_1.setFakeResponses)({
389
397
  interfaceName: this.interfaceName,
@@ -405,7 +413,8 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
405
413
  await instance.run();
406
414
  return instance;
407
415
  }
408
- static async runUpgradePackage() {
416
+ static async runUpgradePackage(responses) {
417
+ this.setFakePackageJson(responses);
409
418
  const instance = this.CliCommandRunner([this.upgradePackageCommand]);
410
419
  await instance.run();
411
420
  return instance;
@@ -479,6 +488,11 @@ CliCommandRunnerTest.defaultKeywords = ['nodejs', 'typescript', 'tdd'];
479
488
  CliCommandRunnerTest.createUiCommand = 'create.ui';
480
489
  CliCommandRunnerTest.componentName = (0, test_utils_1.generateId)();
481
490
  CliCommandRunnerTest.upgradePackageCommand = 'upgrade.package';
491
+ CliCommandRunnerTest.infoFromPackageJson = {
492
+ name: _a.packageName,
493
+ description: _a.description,
494
+ keywords: _a.keywordsWithDefaults,
495
+ };
482
496
  CliCommandRunnerTest.allInstalled = `
483
497
  {
484
498
  "dependencies": {
@@ -663,5 +677,8 @@ __decorate([
663
677
  ], CliCommandRunnerTest, "upgradePackageAddsDefaultKeywordsIfMissing", null);
664
678
  __decorate([
665
679
  (0, test_utils_1.test)()
666
- ], CliCommandRunnerTest, "upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing", null);
680
+ ], CliCommandRunnerTest, "upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing", null);
681
+ __decorate([
682
+ (0, test_utils_1.test)()
683
+ ], CliCommandRunnerTest, "upgradePackageExtractsPackageNameFromScopedName", null);
667
684
  //# sourceMappingURL=CliCommandRunner.test.js.map
package/build/__tests__/modules/CliCommandRunner.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CliCommandRunner.test.js","sourceRoot":"","sources":["../../../src/__tests__/modules/CliCommandRunner.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CliCommandRunner.test.js","sourceRoot":"","sources":["../../../src/__tests__/modules/CliCommandRunner.test.ts"],"names":[],"mappings":"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"}
package/build/modules/commands/UpgradePackageCommand.js CHANGED
@@ -18,7 +18,7 @@ class UpgradePackageCommand {
18
18
  async loadInfoFromPackageJson() {
19
19
  const raw = await this.readFile('package.json', 'utf-8');
20
20
  const { name, description, keywords } = JSON.parse(raw);
21
- this.packageName = name;
21
+ this.packageName = name.includes('/') ? name.split('/')[1] : name;
22
22
  this.description = description;
23
23
  this.keywords = this.defaultKeywords.every((keyword) => keywords?.includes(keyword))
24
24
  ? keywords
package/build/modules/commands/UpgradePackageCommand.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UpgradePackageCommand.js","sourceRoot":"","sources":["../../../src/modules/commands/UpgradePackageCommand.ts"],"names":[],"mappings":";;;;;AAAA,oDAAqD;AACrD,2EAAkD;AAClD,qEAA4C;AAE5C,MAAqB,qBAAqB;IAKtC;QAuBiB,oBAAe,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;IAvB5C,CAAC;IAEhB,KAAK,CAAC,GAAG;QACZ,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAEpC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACzC,MAAM,WAAW,CAAC,GAAG,EAAE,CAAA;IAC3B,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACjC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QACxD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEvD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAE9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CACnD,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAC9B;YACG,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAA;IACxD,CAAC;IAID,IAAY,QAAQ;QAChB,OAAO,0BAAgB,CAAC,QAAQ,CAAA;IACpC,CAAC;IAEO,cAAc;QAClB,OAAO,0BAAc,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,IAAI,CAAC,WAAW;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY,EAAE,WAAW;YACzB,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,IAAA,uBAAa,EAAC,OAAO,CAAC;YAClC,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,uCAAuC;SAClD,CAAC,CAAA;IACN,CAAC;CACJ;AA9CD,wCA8CC"}
1
+ {"version":3,"file":"UpgradePackageCommand.js","sourceRoot":"","sources":["../../../src/modules/commands/UpgradePackageCommand.ts"],"names":[],"mappings":";;;;;AAAA,oDAAqD;AACrD,2EAAkD;AAClD,qEAA4C;AAE5C,MAAqB,qBAAqB;IAKtC;QAuBiB,oBAAe,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;IAvB5C,CAAC;IAEhB,KAAK,CAAC,GAAG;QACZ,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAEpC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACzC,MAAM,WAAW,CAAC,GAAG,EAAE,CAAA;IAC3B,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACjC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QACxD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEvD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACjE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAE9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CACnD,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAC9B;YACG,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAA;IACxD,CAAC;IAID,IAAY,QAAQ;QAChB,OAAO,0BAAgB,CAAC,QAAQ,CAAA;IACpC,CAAC;IAEO,cAAc;QAClB,OAAO,0BAAc,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,IAAI,CAAC,WAAW;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY,EAAE,WAAW;YACzB,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,IAAA,uBAAa,EAAC,OAAO,CAAC;YAClC,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,uCAAuC;SAClD,CAAC,CAAA;IACN,CAAC;CACJ;AA9CD,wCA8CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@neurodevs/ndx-cli",
3
- "version": "0.1.34",
3
+ "version": "0.1.36",
4
4
  "description": "CLI tools for the Neurodevs ecosystem.",
5
5
  "keywords": [
6
6
  "nodejs",
package/src/__tests__/modules/CliCommandRunner.test.ts CHANGED
@@ -564,23 +564,13 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
564
564
 
565
565
  @test()
566
566
  protected static async upgradePackageCreatesNpmAutopackage() {
567
- const infoFromPackageJson = {
568
- name: this.packageName,
569
- description: this.description,
570
- keywords: this.keywordsWithDefaults,
571
- }
572
-
573
- setFakeReadFileResult(
574
- 'package.json',
575
- JSON.stringify(infoFromPackageJson)
576
- )
577
-
578
567
  await this.runUpgradePackage()
579
568
 
580
569
  assert.isEqualDeep(
581
570
  FakeAutopackage.callsToConstructor[0],
582
571
  {
583
- ...infoFromPackageJson,
572
+ ...this.infoFromPackageJson,
573
+ name: `${this.packageName}`,
584
574
  gitNamespace: 'neurodevs',
585
575
  npmNamespace: 'neurodevs',
586
576
  installDir: this.expandHomeDir('~/dev'),
@@ -604,18 +594,11 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
604
594
 
605
595
  @test()
606
596
  protected static async upgradePackageAddsDefaultKeywordsIfMissing() {
607
- const infoFromPackageJson = {
597
+ await this.runUpgradePackage({
608
598
  name: this.packageName,
609
599
  description: this.description,
610
- keywords: [],
611
- }
612
-
613
- setFakeReadFileResult(
614
- 'package.json',
615
- JSON.stringify(infoFromPackageJson)
616
- )
617
-
618
- await this.runUpgradePackage()
600
+ keywords: [] as string[],
601
+ })
619
602
 
620
603
  assert.isEqualDeep(
621
604
  FakeAutopackage.callsToConstructor[0]?.keywords,
@@ -625,24 +608,34 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
625
608
  }
626
609
 
627
610
  @test()
628
- protected static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing() {
629
- const infoFromPackageJson = {
611
+ protected static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing() {
612
+ const keywords = [generateId(), generateId()]
613
+
614
+ await this.runUpgradePackage({
630
615
  name: this.packageName,
631
616
  description: this.description,
632
- keywords: [generateId(), generateId()],
633
- }
617
+ keywords,
618
+ })
634
619
 
635
- setFakeReadFileResult(
636
- 'package.json',
637
- JSON.stringify(infoFromPackageJson)
620
+ assert.isEqualDeep(
621
+ FakeAutopackage.callsToConstructor[0]?.keywords,
622
+ [...this.defaultKeywords, ...keywords],
623
+ 'Should not have overwritten keywords!'
638
624
  )
625
+ }
639
626
 
640
- await this.runUpgradePackage()
627
+ @test()
628
+ protected static async upgradePackageExtractsPackageNameFromScopedName() {
629
+ await this.runUpgradePackage({
630
+ name: this.packageName,
631
+ description: this.description,
632
+ keywords: this.keywordsWithDefaults,
633
+ })
641
634
 
642
635
  assert.isEqualDeep(
643
- FakeAutopackage.callsToConstructor[0]?.keywords,
644
- [...this.defaultKeywords, ...infoFromPackageJson.keywords],
645
- 'Should not have overwritten keywords!'
636
+ FakeAutopackage.callsToConstructor[0]?.name,
637
+ this.packageName,
638
+ 'Did not extract package name from scoped name!'
646
639
  )
647
640
  }
648
641
 
@@ -679,6 +672,28 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
679
672
  setFakeReadFileResult('package.json', this.allInstalled)
680
673
  }
681
674
 
675
+ private static setFakePackageJson(
676
+ responses?: Record<string, string | string[]>
677
+ ) {
678
+ const infoFromPackageJson = {
679
+ ...this.infoFromPackageJson,
680
+ ...responses,
681
+ }
682
+
683
+ setFakeReadFileResult(
684
+ 'package.json',
685
+ JSON.stringify(infoFromPackageJson)
686
+ )
687
+
688
+ return infoFromPackageJson
689
+ }
690
+
691
+ private static readonly infoFromPackageJson = {
692
+ name: this.packageName,
693
+ description: this.description,
694
+ keywords: this.keywordsWithDefaults,
695
+ }
696
+
682
697
  private static readonly allInstalled = `
683
698
  {
684
699
  "dependencies": {
@@ -742,7 +757,11 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
742
757
  return instance
743
758
  }
744
759
 
745
- private static async runUpgradePackage() {
760
+ private static async runUpgradePackage(
761
+ responses?: Record<string, string | string[]>
762
+ ) {
763
+ this.setFakePackageJson(responses)
764
+
746
765
  const instance = this.CliCommandRunner([this.upgradePackageCommand])
747
766
  await instance.run()
748
767
 
package/src/modules/commands/UpgradePackageCommand.ts CHANGED
@@ -20,7 +20,7 @@ export default class UpgradePackageCommand {
20
20
  const raw = await this.readFile('package.json', 'utf-8')
21
21
  const { name, description, keywords } = JSON.parse(raw)
22
22
 
23
- this.packageName = name
23
+ this.packageName = name.includes('/') ? name.split('/')[1] : name
24
24
  this.description = description
25
25
 
26
26
  this.keywords = this.defaultKeywords.every((keyword) =>