npm - @neurodevs/ndx-cli - Versions diffs - 0.1.33 → 0.1.35 - Mend

@neurodevs/ndx-cli 0.1.33 → 0.1.35

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 (20) hide show

package/build/__tests__/modules/CliCommandRunner.test.d.ts CHANGED Viewed

@@ -49,12 +49,16 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
     protected static upgradePackageCreatesNpmAutopackage(): Promise<void>;
     protected static upgradePackageRunsNpmAutopackage(): Promise<void>;
     protected static upgradePackageAddsDefaultKeywordsIfMissing(): Promise<void>;
-    protected static upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing(): Promise<void>;
+    protected static upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing(): Promise<void>;
+    protected static upgradePackageExtractsPackageNameFromScopedName(): Promise<void>;
     private static runCreateUi;
     private static setFakeReadFileResultToTsconfig;
     private static setFakeReadToEmptyPackageJson;
     private static setFakeReadToAllInstalledExcept;
     private static setFakeReadToAllInstalled;
+    private static setFakePackageJson;
+    private static readonly infoFromPackageJson;
+    private static get scopedPackageName();
     private static readonly allInstalled;
     private static readonly allRequiredDependencies;
     private static readonly installDependenciesCommand;

package/build/__tests__/modules/CliCommandRunner.test.js CHANGED Viewed

@@ -323,15 +323,10 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
         test_utils_1.assert.isTruthy(instance, `Failed to create instance for ${this.upgradePackageCommand}!`);
     }
     static async upgradePackageCreatesNpmAutopackage() {
-        const infoFromPackageJson = {
-            name: this.packageName,
-            description: this.description,
-            keywords: this.keywordsWithDefaults,
-        };
-        (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
         await this.runUpgradePackage();
         test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0], {
-            ...infoFromPackageJson,
+            ...this.infoFromPackageJson,
+            name: `@neurodevs/${this.packageName}`,
             gitNamespace: 'neurodevs',
             npmNamespace: 'neurodevs',
             installDir: this.expandHomeDir('~/dev'),
@@ -344,24 +339,29 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
         test_utils_1.assert.isEqual(meta_node_1.FakeAutopackage.numCallsToRun, 1, 'Did not call run on NpmAutopackage!');
     }
     static async upgradePackageAddsDefaultKeywordsIfMissing() {
-        const infoFromPackageJson = {
+        await this.runUpgradePackage({
             name: this.packageName,
             description: this.description,
             keywords: [],
-        };
-        (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
-        await this.runUpgradePackage();
+        });
         test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.keywords, this.defaultKeywords, 'Did not add default keywords!');
     }
-    static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing() {
-        const infoFromPackageJson = {
+    static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing() {
+        const keywords = [(0, test_utils_1.generateId)(), (0, test_utils_1.generateId)()];
+        await this.runUpgradePackage({
             name: this.packageName,
             description: this.description,
-            keywords: [(0, test_utils_1.generateId)(), (0, test_utils_1.generateId)()],
-        };
-        (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
-        await this.runUpgradePackage();
-        test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.keywords, [...this.defaultKeywords, ...infoFromPackageJson.keywords], 'Should not have overwritten keywords!');
+            keywords,
+        });
+        test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.keywords, [...this.defaultKeywords, ...keywords], 'Should not have overwritten keywords!');
+    }
+    static async upgradePackageExtractsPackageNameFromScopedName() {
+        await this.runUpgradePackage({
+            name: this.scopedPackageName,
+            description: this.description,
+            keywords: this.keywordsWithDefaults,
+        });
+        test_utils_1.assert.isEqualDeep(meta_node_1.FakeAutopackage.callsToConstructor[0]?.name, this.scopedPackageName, 'Did not extract package name from scoped name!');
     }
     static async runCreateUi(responses) {
         (0, fakePrompts_1.setFakeResponses)({
@@ -384,6 +384,17 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
     static setFakeReadToAllInstalled() {
         (0, fake_node_core_1.setFakeReadFileResult)('package.json', this.allInstalled);
     }
+    static setFakePackageJson(responses) {
+        const infoFromPackageJson = {
+            ...this.infoFromPackageJson,
+            ...responses,
+        };
+        (0, fake_node_core_1.setFakeReadFileResult)('package.json', JSON.stringify(infoFromPackageJson));
+        return infoFromPackageJson;
+    }
+    static get scopedPackageName() {
+        return `@neurodevs/${this.packageName}`;
+    }
     static async runCreateImpl(responses) {
         (0, fakePrompts_1.setFakeResponses)({
             interfaceName: this.interfaceName,
@@ -405,7 +416,8 @@ class CliCommandRunnerTest extends AbstractPackageTest_1.default {
         await instance.run();
         return instance;
     }
-    static async runUpgradePackage() {
+    static async runUpgradePackage(responses) {
+        this.setFakePackageJson(responses);
         const instance = this.CliCommandRunner([this.upgradePackageCommand]);
         await instance.run();
         return instance;
@@ -479,6 +491,11 @@ CliCommandRunnerTest.defaultKeywords = ['nodejs', 'typescript', 'tdd'];
 CliCommandRunnerTest.createUiCommand = 'create.ui';
 CliCommandRunnerTest.componentName = (0, test_utils_1.generateId)();
 CliCommandRunnerTest.upgradePackageCommand = 'upgrade.package';
+CliCommandRunnerTest.infoFromPackageJson = {
+    name: _a.packageName,
+    description: _a.description,
+    keywords: _a.keywordsWithDefaults,
+};
 CliCommandRunnerTest.allInstalled = `
         {
             "dependencies": {
@@ -663,5 +680,8 @@ __decorate([
 ], CliCommandRunnerTest, "upgradePackageAddsDefaultKeywordsIfMissing", null);
 __decorate([
     (0, test_utils_1.test)()
-], CliCommandRunnerTest, "upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing", null);
+], CliCommandRunnerTest, "upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing", null);
+__decorate([
+    (0, test_utils_1.test)()
+], CliCommandRunnerTest, "upgradePackageExtractsPackageNameFromScopedName", null);
 //# sourceMappingURL=CliCommandRunner.test.js.map

package/build/__tests__/modules/CliCommandRunner.test.js.map CHANGED Viewed

	@@ -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/CreatePackageCommand.d.ts CHANGED Viewed

@@ -10,7 +10,6 @@ export default class CreatePackageCommand {
     private readonly keywordsMessage;
     private splitOnCommaOrWhitespace;
     private get userInputExistsForCreatePackage();
-    private expandHomeDir;
     private get prompts();
     private NpmAutopackage;
 }

package/build/modules/commands/CreatePackageCommand.js CHANGED Viewed

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
 const meta_node_1 = require("@neurodevs/meta-node");
 const CliCommandRunner_1 = __importDefault(require("../CliCommandRunner"));
+const expandHomeDir_1 = __importDefault(require("../expandHomeDir"));
 class CreatePackageCommand {
     constructor() {
         this.packageNameMessage = 'What should the package be called? Example: useful-package';
@@ -54,11 +53,6 @@ class CreatePackageCommand {
     get userInputExistsForCreatePackage() {
         return this.packageName && this.description;
     }
-    expandHomeDir(inputPath) {
-        return inputPath.startsWith('~')
-            ? path_1.default.join(os_1.default.homedir(), inputPath.slice(1))
-            : inputPath;
-    }
     get prompts() {
         return CliCommandRunner_1.default.prompts;
     }
@@ -69,7 +63,7 @@ class CreatePackageCommand {
             keywords: ['nodejs', 'typescript', 'tdd', ...this.keywords],
             gitNamespace: 'neurodevs',
             npmNamespace: 'neurodevs',
-            installDir: this.expandHomeDir('~/dev'),
+            installDir: (0, expandHomeDir_1.default)('~/dev'),
             license: 'MIT',
             author: 'Eric Yates <hello@ericthecurious.com>',
         });

package/build/modules/commands/CreatePackageCommand.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CreatePackageCommand.js","sourceRoot":"","sources":["../../../src/modules/commands/CreatePackageCommand.ts"],"names":[],"mappings":";;;;;AAAA,~~4CAAmB;AACnB,gDAAuB;AACvB,~~oDAAqD;AACrD,2EAAkD;~~AAElD~~,MAAqB,oBAAoB;IAKrC;QAyCiB,uBAAkB,GAC/B,4DAA4D,CAAA;QAE/C,uBAAkB,GAC/B,oEAAoE,CAAA;QAEvD,oBAAe,GAC5B,iEAAiE,CAAA;IAhD/C,CAAC;IAEhB,KAAK,CAAC,GAAG;QACZ,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,GACxC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;QAErC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAExB,IAAI,CAAC,IAAI,CAAC,+BAA+B,EAAE,CAAC;YACxC,OAAM;QACV,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACzC,MAAM,WAAW,CAAC,GAAG,EAAE,CAAA;IAC3B,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAC9B,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;YACtB;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,IAAI,CAAC,kBAAkB;aACnC;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,IAAI,CAAC,kBAAkB;aACnC;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,IAAI,CAAC,eAAe;gBAC7B,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CACd,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;aACxD;SACJ,CAAC,CAAA;IACN,CAAC;IAWO,wBAAwB,CAAC,KAAa;QAC1C,OAAO,KAAK;aACP,KAAK,CAAC,QAAQ,CAAC;aACf,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC;IAED,IAAY,+BAA+B;QACvC,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAA;IAC/C,CAAC;~~IAEO,aAAa,CAAC,SAAiB;QACnC,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;YAC5B,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAA;IACnB,CAAC;~~IAED,IAAY,OAAO;QACf,OAAO,0BAAgB,CAAC,OAAO,CAAA;IACnC,CAAC;IAEO,cAAc;QAClB,OAAO,0BAAc,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,IAAI,CAAC,WAAW;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC3D,YAAY,EAAE,WAAW;YACzB,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,~~IAAI~~,~~CAAC~~,~~aAAa~~,~~CAAC,~~OAAO,CAAC;~~YACvC~~,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,uCAAuC;SAClD,CAAC,CAAA;IACN,CAAC;CACJ;~~AAxFD~~,~~uCAwFC~~"}
1	+ {"version":3,"file":"CreatePackageCommand.js","sourceRoot":"","sources":["../../../src/modules/commands/CreatePackageCommand.ts"],"names":[],"mappings":";;;;;AAAA,oDAAqD;AACrD,2EAAkD;AAClD,qEAA4C;AAE5C,MAAqB,oBAAoB;IAKrC;QAyCiB,uBAAkB,GAC/B,4DAA4D,CAAA;QAE/C,uBAAkB,GAC/B,oEAAoE,CAAA;QAEvD,oBAAe,GAC5B,iEAAiE,CAAA;IAhD/C,CAAC;IAEhB,KAAK,CAAC,GAAG;QACZ,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,GACxC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;QAErC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAExB,IAAI,CAAC,IAAI,CAAC,+BAA+B,EAAE,CAAC;YACxC,OAAM;QACV,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACzC,MAAM,WAAW,CAAC,GAAG,EAAE,CAAA;IAC3B,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAC9B,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;YACtB;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,IAAI,CAAC,kBAAkB;aACnC;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,IAAI,CAAC,kBAAkB;aACnC;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,IAAI,CAAC,eAAe;gBAC7B,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CACd,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;aACxD;SACJ,CAAC,CAAA;IACN,CAAC;IAWO,wBAAwB,CAAC,KAAa;QAC1C,OAAO,KAAK;aACP,KAAK,CAAC,QAAQ,CAAC;aACf,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC;IAED,IAAY,+BAA+B;QACvC,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAA;IAC/C,CAAC;IAED,IAAY,OAAO;QACf,OAAO,0BAAgB,CAAC,OAAO,CAAA;IACnC,CAAC;IAEO,cAAc;QAClB,OAAO,0BAAc,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,IAAI,CAAC,WAAW;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC3D,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;AAlFD,uCAkFC"}

package/build/modules/commands/UpgradePackageCommand.d.ts CHANGED Viewed

@@ -6,7 +6,6 @@ export default class UpgradePackageCommand {
     run(): Promise<void>;
     private loadInfoFromPackageJson;
     private readonly defaultKeywords;
-    private expandHomeDir;
     private get readFile();
     private NpmAutopackage;
 }

package/build/modules/commands/UpgradePackageCommand.js CHANGED Viewed

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
 const meta_node_1 = require("@neurodevs/meta-node");
 const CliCommandRunner_1 = __importDefault(require("../CliCommandRunner"));
+const expandHomeDir_1 = __importDefault(require("../expandHomeDir"));
 class UpgradePackageCommand {
     constructor() {
         this.defaultKeywords = ['nodejs', 'typescript', 'tdd'];
@@ -19,28 +18,23 @@ class UpgradePackageCommand {
     async loadInfoFromPackageJson() {
         const raw = await this.readFile('package.json', 'utf-8');
         const { name, description, keywords } = JSON.parse(raw);
-        this.packageName = name;
+        this.packageName = name.includes('/') ? name.split('/')[1] : name;
         this.description = description;
         this.keywords = this.defaultKeywords.every((keyword) => keywords?.includes(keyword))
             ? keywords
             : [...this.defaultKeywords, ...(keywords || [])];
     }
-    expandHomeDir(inputPath) {
-        return inputPath.startsWith('~')
-            ? path_1.default.join(os_1.default.homedir(), inputPath.slice(1))
-            : inputPath;
-    }
     get readFile() {
         return CliCommandRunner_1.default.readFile;
     }
     NpmAutopackage() {
         return meta_node_1.NpmAutopackage.Create({
-            name: this.packageName,
+            name: `@neurodevs/${this.packageName}`,
             description: this.description,
             keywords: this.keywords,
             gitNamespace: 'neurodevs',
             npmNamespace: 'neurodevs',
-            installDir: this.expandHomeDir('~/dev'),
+            installDir: (0, expandHomeDir_1.default)('~/dev'),
             license: 'MIT',
             author: 'Eric Yates <hello@ericthecurious.com>',
         });

package/build/modules/commands/UpgradePackageCommand.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"UpgradePackageCommand.js","sourceRoot":"","sources":["../../../src/modules/commands/UpgradePackageCommand.ts"],"names":[],"mappings":";;;;;AAAA,~~4CAAmB;AACnB,gDAAuB;AACvB,~~oDAAqD;AACrD,2EAAkD;~~AAElD~~,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;~~IAIO~~,~~aAAa,CAAC,SAAiB;QACnC,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;YAC5B,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAA;IACnB,CAAC;IAED,~~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,~~IAAI~~,~~CAAC~~,~~aAAa~~,~~CAAC,~~OAAO,CAAC;~~YACvC~~,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,uCAAuC;SAClD,CAAC,CAAA;IACN,CAAC;CACJ;~~AApDD~~,~~wCAoDC~~"}
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,cAAc,IAAI,CAAC,WAAW,EAAE;YACtC,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/build/modules/expandHomeDir.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export default function expandHomeDir(inputPath: string): string;

package/build/modules/expandHomeDir.js ADDED Viewed

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = expandHomeDir;
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+function expandHomeDir(inputPath) {
+    return inputPath.startsWith('~')
+        ? path_1.default.join(os_1.default.homedir(), inputPath.slice(1))
+        : inputPath;
+}
+//# sourceMappingURL=expandHomeDir.js.map

package/build/modules/expandHomeDir.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"expandHomeDir.js","sourceRoot":"","sources":["../../src/modules/expandHomeDir.ts"],"names":[],"mappings":";;;;;AAGA,gCAIC;AAPD,4CAAmB;AACnB,gDAAuB;AAEvB,SAAwB,aAAa,CAAC,SAAiB;IACnD,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;QAC5B,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,SAAS,CAAA;AACnB,CAAC"}

package/build/scripts/runNeurodevsAutocloner.js CHANGED Viewed

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const expandHomeDir_1 = __importDefault(require("../modules/expandHomeDir"));
 const NeurodevsAutocloner_1 = __importDefault(require("../modules/NeurodevsAutocloner"));
 async function main() {
     const cloner = NeurodevsAutocloner_1.default.Create();
-    await cloner.run('/Users/ericthecurious/dev');
+    await cloner.run((0, expandHomeDir_1.default)('~/dev'));
 }
 main().catch((err) => {
     console.error(err);

package/build/scripts/runNeurodevsAutocloner.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runNeurodevsAutocloner.js","sourceRoot":"","sources":["../../src/scripts/runNeurodevsAutocloner.ts"],"names":[],"mappings":";;;;;AAAA,yFAAgE;AAEhE,KAAK,UAAU,IAAI;IACf,MAAM,MAAM,GAAG,6BAAmB,CAAC,MAAM,EAAE,CAAA;IAC3C,MAAM,MAAM,CAAC,GAAG,CAAC,~~2BAA2B~~,CAAC,CAAA;~~AACjD~~,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACjB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"runNeurodevsAutocloner.js","sourceRoot":"","sources":["../../src/scripts/runNeurodevsAutocloner.ts"],"names":[],"mappings":";;;;;AAAA,6EAAoD;AACpD,yFAAgE;AAEhE,KAAK,UAAU,IAAI;IACf,MAAM,MAAM,GAAG,6BAAmB,CAAC,MAAM,EAAE,CAAA;IAC3C,MAAM,MAAM,CAAC,GAAG,CAAC,IAAA,uBAAa,EAAC,OAAO,CAAC,CAAC,CAAA;AAC5C,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACjB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAC,CAAA"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@neurodevs/ndx-cli",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "CLI tools for the Neurodevs ecosystem.",
   "keywords": [
     "nodejs",
@@ -48,7 +48,7 @@
     "watch.tsc": "tsc -w"
   },
   "dependencies": {
-    "@neurodevs/meta-node": "^0.10.5",
+    "@neurodevs/meta-node": "^0.10.6",
     "prompts": "^2.4.2"
   },
   "devDependencies": {

package/src/__tests__/modules/CliCommandRunner.test.ts CHANGED Viewed

@@ -564,23 +564,13 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
     @test()
     protected static async upgradePackageCreatesNpmAutopackage() {
-        const infoFromPackageJson = {
-            name: this.packageName,
-            description: this.description,
-            keywords: this.keywordsWithDefaults,
-        }
-        setFakeReadFileResult(
-            'package.json',
-            JSON.stringify(infoFromPackageJson)
-        )
         await this.runUpgradePackage()
         assert.isEqualDeep(
             FakeAutopackage.callsToConstructor[0],
             {
-                ...infoFromPackageJson,
+                ...this.infoFromPackageJson,
+                name: `@neurodevs/${this.packageName}`,
                 gitNamespace: 'neurodevs',
                 npmNamespace: 'neurodevs',
                 installDir: this.expandHomeDir('~/dev'),
@@ -604,18 +594,11 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
     @test()
     protected static async upgradePackageAddsDefaultKeywordsIfMissing() {
-        const infoFromPackageJson = {
+        await this.runUpgradePackage({
             name: this.packageName,
             description: this.description,
-            keywords: [],
-        }
-        setFakeReadFileResult(
-            'package.json',
-            JSON.stringify(infoFromPackageJson)
-        )
-        await this.runUpgradePackage()
+            keywords: [] as string[],
+        })
         assert.isEqualDeep(
             FakeAutopackage.callsToConstructor[0]?.keywords,
@@ -625,24 +608,34 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
     }
     @test()
-    protected static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsAreMissing() {
-        const infoFromPackageJson = {
+    protected static async upgradePackageDoesNotOverwriteKeywordsEvenIfDefaultsMissing() {
+        const keywords = [generateId(), generateId()]
+        await this.runUpgradePackage({
             name: this.packageName,
             description: this.description,
-            keywords: [generateId(), generateId()],
-        }
+            keywords,
+        })
-        setFakeReadFileResult(
-            'package.json',
-            JSON.stringify(infoFromPackageJson)
+        assert.isEqualDeep(
+            FakeAutopackage.callsToConstructor[0]?.keywords,
+            [...this.defaultKeywords, ...keywords],
+            'Should not have overwritten keywords!'
         )
+    }
-        await this.runUpgradePackage()
+    @test()
+    protected static async upgradePackageExtractsPackageNameFromScopedName() {
+        await this.runUpgradePackage({
+            name: this.scopedPackageName,
+            description: this.description,
+            keywords: this.keywordsWithDefaults,
+        })
         assert.isEqualDeep(
-            FakeAutopackage.callsToConstructor[0]?.keywords,
-            [...this.defaultKeywords, ...infoFromPackageJson.keywords],
-            'Should not have overwritten keywords!'
+            FakeAutopackage.callsToConstructor[0]?.name,
+            this.scopedPackageName,
+            'Did not extract package name from scoped name!'
         )
     }
@@ -679,6 +672,32 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
         setFakeReadFileResult('package.json', this.allInstalled)
     }
+    private static setFakePackageJson(
+        responses?: Record<string, string | string[]>
+    ) {
+        const infoFromPackageJson = {
+            ...this.infoFromPackageJson,
+            ...responses,
+        }
+        setFakeReadFileResult(
+            'package.json',
+            JSON.stringify(infoFromPackageJson)
+        )
+        return infoFromPackageJson
+    }
+    private static readonly infoFromPackageJson = {
+        name: this.packageName,
+        description: this.description,
+        keywords: this.keywordsWithDefaults,
+    }
+    private static get scopedPackageName() {
+        return `@neurodevs/${this.packageName}`
+    }
     private static readonly allInstalled = `
         {
             "dependencies": {
@@ -742,7 +761,11 @@ export default class CliCommandRunnerTest extends AbstractPackageTest {
         return instance
     }
-    private static async runUpgradePackage() {
+    private static async runUpgradePackage(
+        responses?: Record<string, string | string[]>
+    ) {
+        this.setFakePackageJson(responses)
         const instance = this.CliCommandRunner([this.upgradePackageCommand])
         await instance.run()

package/src/modules/commands/CreatePackageCommand.ts CHANGED Viewed

@@ -1,7 +1,6 @@
-import os from 'os'
-import path from 'path'
 import { NpmAutopackage } from '@neurodevs/meta-node'
 import CliCommandRunner from '../CliCommandRunner'
+import expandHomeDir from '../expandHomeDir'
 export default class CreatePackageCommand {
     private packageName!: string
@@ -69,12 +68,6 @@ export default class CreatePackageCommand {
         return this.packageName && this.description
     }
-    private expandHomeDir(inputPath: string): string {
-        return inputPath.startsWith('~')
-            ? path.join(os.homedir(), inputPath.slice(1))
-            : inputPath
-    }
     private get prompts() {
         return CliCommandRunner.prompts
     }
@@ -86,7 +79,7 @@ export default class CreatePackageCommand {
             keywords: ['nodejs', 'typescript', 'tdd', ...this.keywords],
             gitNamespace: 'neurodevs',
             npmNamespace: 'neurodevs',
-            installDir: this.expandHomeDir('~/dev'),
+            installDir: expandHomeDir('~/dev'),
             license: 'MIT',
             author: 'Eric Yates <hello@ericthecurious.com>',
         })

package/src/modules/commands/UpgradePackageCommand.ts CHANGED Viewed

@@ -1,7 +1,6 @@
-import os from 'os'
-import path from 'path'
 import { NpmAutopackage } from '@neurodevs/meta-node'
 import CliCommandRunner from '../CliCommandRunner'
+import expandHomeDir from '../expandHomeDir'
 export default class UpgradePackageCommand {
     private packageName!: string
@@ -21,7 +20,7 @@ export default class UpgradePackageCommand {
         const raw = await this.readFile('package.json', 'utf-8')
         const { name, description, keywords } = JSON.parse(raw)
-        this.packageName = name
+        this.packageName = name.includes('/') ? name.split('/')[1] : name
         this.description = description
         this.keywords = this.defaultKeywords.every((keyword) =>
@@ -33,24 +32,18 @@ export default class UpgradePackageCommand {
     private readonly defaultKeywords = ['nodejs', 'typescript', 'tdd']
-    private expandHomeDir(inputPath: string): string {
-        return inputPath.startsWith('~')
-            ? path.join(os.homedir(), inputPath.slice(1))
-            : inputPath
-    }
     private get readFile() {
         return CliCommandRunner.readFile
     }
     private NpmAutopackage() {
         return NpmAutopackage.Create({
-            name: this.packageName,
+            name: `@neurodevs/${this.packageName}`,
             description: this.description,
             keywords: this.keywords,
             gitNamespace: 'neurodevs',
             npmNamespace: 'neurodevs',
-            installDir: this.expandHomeDir('~/dev'),
+            installDir: expandHomeDir('~/dev'),
             license: 'MIT',
             author: 'Eric Yates <hello@ericthecurious.com>',
         })

package/src/modules/expandHomeDir.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import os from 'os'
+import path from 'path'
+export default function expandHomeDir(inputPath: string): string {
+    return inputPath.startsWith('~')
+        ? path.join(os.homedir(), inputPath.slice(1))
+        : inputPath
+}

package/src/scripts/runNeurodevsAutocloner.ts CHANGED Viewed

@@ -1,8 +1,9 @@
+import expandHomeDir from '../modules/expandHomeDir'
 import NeurodevsAutocloner from '../modules/NeurodevsAutocloner'
 async function main() {
     const cloner = NeurodevsAutocloner.Create()
-    await cloner.run('/Users/ericthecurious/dev')
+    await cloner.run(expandHomeDir('~/dev'))
 }
 main().catch((err) => {