@neurodevs/meta-node 0.14.8 → 0.14.10

package/build/__tests__/impl/NpmAutopackage.test.d.ts

@@ -1,4 +1,4 @@
-import AbstractPackageTest from '../AbstractPackageTest';
+import AbstractPackageTest from '../AbstractPackageTest.js';
 export default class NpmAutopackageTest extends AbstractPackageTest {
     private static instance;
     protected static beforeEach(): Promise<void>;
@@ -8,7 +8,8 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     protected static thenChdirToInstallDir(): Promise<void>;
     protected static thenGitClone(): Promise<void>;
     protected static thenChdirToPackageDir(): Promise<void>;
-    protected static thenGitPull(): Promise<void>;
+    protected static thenGitFetchOrigin(): Promise<void>;
+    protected static thenGitFetchResetHard(): Promise<void>;
     protected static thenSpruceCreateModule(): Promise<void>;
     protected static thenCommitCreatePackage(): Promise<void>;
     protected static thenReadPackageJson(): Promise<void>;

package/build/__tests__/impl/NpmAutopackage.test.js

@@ -1,25 +1,20 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const path_1 = __importDefault(require("path"));
-const util_1 = require("util");
-const test_utils_1 = require("@sprucelabs/test-utils");
-const fake_node_core_1 = require("@neurodevs/fake-node-core");
-const generate_id_1 = __importDefault(require("@neurodevs/generate-id"));
-const NpmAutopackage_1 = __importDefault(require("../../impl/NpmAutopackage"));
-const AbstractPackageTest_1 = __importDefault(require("../AbstractPackageTest"));
-const exec = (0, util_1.promisify)(child_process_1.exec);
-class NpmAutopackageTest extends AbstractPackageTest_1.default {
+import { exec as execSync } from 'child_process';
+import path from 'path';
+import { promisify } from 'util';
+import { callsToChdir, callsToExec, callsToFetch, callsToReadFile, callsToWriteFile, fakeChdir, fakeExec, fakeFetch, fakePathExists, fakeReadFile, fakeWriteFile, resetCallsToChdir, resetCallsToExec, resetCallsToFetch, resetCallsToPathExists, resetCallsToReadFile, resetCallsToWriteFile, setFakeExecResult, setFakeFetchResponse, setFakeReadFileResult, setPathShouldExist, } from '@neurodevs/fake-node-core';
+import generateId from '@neurodevs/generate-id';
+import { test, assert } from '@neurodevs/node-tdd';
+import NpmAutopackage from '../../impl/NpmAutopackage.js';
+import AbstractPackageTest from '../AbstractPackageTest.js';
+const exec = promisify(execSync);
+export default class NpmAutopackageTest extends AbstractPackageTest {
+    static instance;
     static async beforeEach() {
         await super.beforeEach();
         this.fakeChdir();
@@ -33,20 +28,20 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
         this.instance = this.NpmAutopackage();
     }
     static async createsInstance() {
-        test_utils_1.assert.isTruthy(this.instance, 'Failed to create instance!');
+        assert.isTruthy(this.instance, 'Failed to create instance!');
     }
     static async throwsIfGithubTokenNotSet() {
         delete process.env.GITHUB_TOKEN;
-        await test_utils_1.assert.doesThrowAsync(async () => {
+        await assert.doesThrowAsync(async () => {
             const instance = this.NpmAutopackage();
             await instance.run();
         }, 'Please set process.env.GITHUB_TOKEN!', 'Did not throw with missing process.env.GITHUB_TOKEN!');
     }
     static async firstCreateRepoInGithubOrg() {
         await this.run();
-        test_utils_1.assert.isEqualDeep({
-            passedUrl: fake_node_core_1.callsToFetch[1]?.input,
-            passedInit: fake_node_core_1.callsToFetch[1]?.init,
+        assert.isEqualDeep({
+            passedUrl: callsToFetch[1]?.input,
+            passedInit: callsToFetch[1]?.init,
         }, {
             passedUrl: `https://api.github.com/orgs/${this.gitNamespace}/repos`,
             passedInit: {
@@ -69,27 +64,31 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenChdirToInstallDir() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToChdir[0], this.installDir, 'Did not change to installDir!');
+        assert.isEqual(callsToChdir[0], this.installDir, 'Did not change to installDir!');
     }
     static async thenGitClone() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec[0], `git clone https://github.com/${this.gitNamespace}/${this.packageName}.git`, 'Did not call git clone!');
+        assert.isEqual(callsToExec[0], `git clone https://github.com/${this.gitNamespace}/${this.packageName}.git`, 'Did not call git clone!');
     }
     static async thenChdirToPackageDir() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToChdir[1], this.packageDir, 'Did not change to packageDir!');
+        assert.isEqual(callsToChdir[1], this.packageDir, 'Did not change to packageDir!');
+    }
+    static async thenGitFetchOrigin() {
+        await this.run();
+        assert.isEqual(callsToExec[1], `git fetch origin`, 'Did not call git fetch origin!');
     }
-    static async thenGitPull() {
+    static async thenGitFetchResetHard() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec[1], `git pull`, 'Did not call git pull!');
+        assert.isEqual(callsToExec[2], `git reset --hard origin/main`, 'Did not call git reset hard!');
     }
     static async thenSpruceCreateModule() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec[3], this.createModuleCmd, 'Did not call "spruce create.module"!');
+        assert.isEqual(callsToExec[4], this.createModuleCmd, 'Did not call "spruce create.module"!');
     }
     static async thenCommitCreatePackage() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToExec.slice(4, 7), [
+        assert.isEqualDeep(callsToExec.slice(5, 8), [
             'git add .',
             `git commit -m "patch: create package (@neurodevs/meta-node: ${this.metaNodeVersion})"`,
             'git push',
@@ -97,14 +96,14 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenReadPackageJson() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToReadFile[1], {
+        assert.isEqualDeep(callsToReadFile[1], {
             path: this.packageJsonPath,
             options: { encoding: 'utf-8' },
         });
     }
     static async thenUpdatePackageJson() {
         await this.run();
-        const actual = fake_node_core_1.callsToWriteFile[0];
+        const actual = callsToWriteFile[0];
         const ordered = this.orderJsonKeys(JSON.parse(this.updatedPackageJson), [
             'name',
             'version',
@@ -129,7 +128,7 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
             data: JSON.stringify(ordered, null, 2) + '\n',
             options: { encoding: 'utf-8' },
         };
-        test_utils_1.assert.isEqualDeep({
+        assert.isEqualDeep({
             ...actual,
             data: this.normalize(actual.data),
         }, {
@@ -139,7 +138,7 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenCommitUpdatePackage() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToExec.slice(7, 10), [
+        assert.isEqualDeep(callsToExec.slice(8, 11), [
             'git add .',
             `git commit -m "patch: update package.json (@neurodevs/meta-node: ${this.metaNodeVersion})"`,
             'git push',
@@ -147,7 +146,7 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenAddBuildDirToGitignore() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToWriteFile[1], {
+        assert.isEqualDeep(callsToWriteFile[1], {
             file: this.gitignorePath,
             data: this.buildDirGitignorePattern,
             options: { encoding: 'utf-8', flag: 'a' },
@@ -155,7 +154,7 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenCommitUpdateGitignore() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToExec.slice(10, 13), [
+        assert.isEqualDeep(callsToExec.slice(11, 14), [
             'git add .',
             `git commit -m "patch: add build dir to gitignore (@neurodevs/meta-node: ${this.metaNodeVersion})"`,
             'git push',
@@ -163,11 +162,11 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenSpruceSetupVscode() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec[13], this.setupVscodeCmd, 'Did not call "spruce setup.vscode"!');
+        assert.isEqual(callsToExec[14], this.setupVscodeCmd, 'Did not call "spruce setup.vscode"!');
     }
     static async thenCommitVscodeChanges() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToExec.slice(14, 17), [
+        assert.isEqualDeep(callsToExec.slice(15, 18), [
             'git add .',
             `git commit -m "patch: setup vscode (@neurodevs/meta-node: ${this.metaNodeVersion})"`,
             'git push',
@@ -175,7 +174,7 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenUpdatesVscodeTasksJson() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToWriteFile[2], {
+        assert.isEqualDeep(callsToWriteFile[2], {
             file: this.tasksJsonPath,
             data: this.updatedTasksJson,
             options: { encoding: 'utf-8' },
@@ -183,7 +182,7 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenCommitsUpdateVscodeTasksJson() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToExec.slice(17, 20), [
+        assert.isEqualDeep(callsToExec.slice(18, 21), [
             'git add .',
             `git commit -m "patch: update vscode tasks.json (@neurodevs/meta-node: ${this.metaNodeVersion})"`,
             'git push',
@@ -191,11 +190,11 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async thenInstallsDefaultDevDependencies() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec[21], 'yarn add -D @neurodevs/generate-id@latest', 'Did not install default devDependencies!');
+        assert.isEqual(callsToExec[22], 'yarn add -D @neurodevs/generate-id@latest', 'Did not install default devDependencies!');
     }
     static async thenCommitsInstallDefaultDevDependencies() {
         await this.run();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToExec.slice(22, 25), [
+        assert.isEqualDeep(callsToExec.slice(23, 26), [
             'git add .',
             `git commit -m "patch: install default devDependencies (@neurodevs/meta-node: ${this.metaNodeVersion})"`,
             'git push',
@@ -203,76 +202,76 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     }
     static async lastlyOpensVscodeAtEnd() {
         await this.run();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec[25], 'code .', 'Did not open vscode at end!');
+        assert.isEqual(callsToExec[26], 'code .', 'Did not open vscode at end!');
     }
     static async doesNotCreateRepoInGithubOrgIfDone() {
         const fakeResponse = new Response(null, {
             status: 200,
             statusText: 'OK',
         });
-        (0, fake_node_core_1.setFakeFetchResponse)(this.reposUrl, fakeResponse);
+        setFakeFetchResponse(this.reposUrl, fakeResponse);
         await this.createAndRunAutopackage();
-        const numCalls = fake_node_core_1.callsToFetch.filter((call) => call.input === this.orgsUrl).length;
-        test_utils_1.assert.isEqual(numCalls, 0, 'Should not have created repo!');
+        const numCalls = callsToFetch.filter((call) => call.input === this.orgsUrl).length;
+        assert.isEqual(numCalls, 0, 'Should not have created repo!');
     }
     static async doesNotCloneRepoIfDone() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec.filter((cmd) => cmd ===
+        assert.isEqual(callsToExec.filter((cmd) => cmd ===
             `git clone https://github.com/${this.gitNamespace}/${this.packageName}.git`).length, 1, 'Did not clone repo once!');
     }
     static async doesNotSpruceCreateModuleIfDone() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec.filter((cmd) => cmd === this.createModuleCmd).length, 1, 'Did not call spruce create.module once!');
+        assert.isEqual(callsToExec.filter((cmd) => cmd === this.createModuleCmd).length, 1, 'Did not call spruce create.module once!');
     }
     static async doesNotRunSetupVscodeIfDone() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec.filter((cmd) => cmd === this.setupVscodeCmd).length, 1, 'Did not call spruce setup.vscode once!');
+        assert.isEqual(callsToExec.filter((cmd) => cmd === this.setupVscodeCmd).length, 1, 'Did not call spruce setup.vscode once!');
     }
     static async doesNotCommitCreatePackageIfDone() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec.filter((cmd) => cmd ===
+        assert.isEqual(callsToExec.filter((cmd) => cmd ===
             `git commit -m "patch: create package (@neurodevs/meta-node: ${this.metaNodeVersion})"`).length, 1, 'Did not commit create package changes once!');
     }
     static async doesNotCommitUpdatePackageIfDone() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec.filter((cmd) => cmd ===
+        assert.isEqual(callsToExec.filter((cmd) => cmd ===
             `git commit -m "patch: update package.json (@neurodevs/meta-node: ${this.metaNodeVersion})"`).length, 1, 'Did not commit update package changes once!');
     }
     static async doesNotCommitUpdateGitignoreIfDone() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec.filter((cmd) => cmd ===
+        assert.isEqual(callsToExec.filter((cmd) => cmd ===
             `git commit -m "patch: add build dir to gitignore (@neurodevs/meta-node: ${this.metaNodeVersion})"`).length, 1, 'Did not commit gitignore changes once!');
     }
     static async doesNotCommitSetupVscodeIfDone() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqual(fake_node_core_1.callsToExec.filter((cmd) => cmd ===
+        assert.isEqual(callsToExec.filter((cmd) => cmd ===
             `git commit -m "patch: setup vscode (@neurodevs/meta-node: ${this.metaNodeVersion})"`).length, 1, 'Did not commit vscode changes once!');
     }
     static async doesNotOverrideOriginalDependencies() {
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqualDeep(JSON.parse(fake_node_core_1.callsToWriteFile[0]?.data).dependencies, this.dependencies, 'Did not update package.json as expected!');
+        assert.isEqualDeep(JSON.parse(callsToWriteFile[0]?.data).dependencies, this.dependencies, 'Did not update package.json as expected!');
     }
     static async doesNotUpdateTasksJsonIfAlreadyDone() {
-        (0, fake_node_core_1.setFakeReadFileResult)(this.tasksJsonPath, this.updatedTasksJson);
+        setFakeReadFileResult(this.tasksJsonPath, this.updatedTasksJson);
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isEqualDeep(fake_node_core_1.callsToWriteFile.filter((call) => call.file === this.tasksJsonPath)
+        assert.isEqualDeep(callsToWriteFile.filter((call) => call.file === this.tasksJsonPath)
             .length, 0, 'Did not update tasks.json once!');
     }
     static async doesNotOpenVscodeIfNotCloned() {
-        (0, fake_node_core_1.setPathShouldExist)(this.packageName, true);
+        setPathShouldExist(this.packageName, true);
         await this.createAndRunAutopackage();
-        test_utils_1.assert.isFalse(fake_node_core_1.callsToExec.includes('code .'), 'Should not open vscode if not cloned!');
+        assert.isFalse(callsToExec.includes('code .'), 'Should not open vscode if not cloned!');
     }
     static async doesNotInstallDevDependenciesIfLatest() {
-        (0, fake_node_core_1.setFakeExecResult)(this.checkGenerateIdVersionCmd, {
+        setFakeExecResult(this.checkGenerateIdVersionCmd, {
             stdout: '1.0.0',
         });
         await this.createAndRunAutopackage();
-        const calls = fake_node_core_1.callsToExec.filter((cmd) => cmd === 'yarn add -D @neurodevs/generate-id@latest');
-        test_utils_1.assert.isEqual(calls.length, 0, 'Should not install default devDependencies if already installed!');
+        const calls = callsToExec.filter((cmd) => cmd === 'yarn add -D @neurodevs/generate-id@latest');
+        assert.isEqual(calls.length, 0, 'Should not install default devDependencies if already installed!');
     }
     static async doesNotThrowIfGenerateIdNotInPackageJson() {
-        (0, fake_node_core_1.setFakeReadFileResult)(this.packageJsonPath, this.originalPackageJson.replace('@neurodevs/generate-id', ''));
+        setFakeReadFileResult(this.packageJsonPath, this.originalPackageJson.replace('@neurodevs/generate-id', ''));
         await this.createAndRunAutopackage();
     }
     static async run() {
@@ -288,9 +287,16 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
     static get packageDir() {
         return this.packageName;
     }
+    static packageJsonPath = 'package.json';
+    static gitignorePath = '.gitignore';
+    static buildDirGitignorePattern = '\nbuild/\n';
     static get createModuleCmd() {
         return `spruce create.module --name "${this.packageName}" --destination "." --description "${this.packageDescription}"`;
     }
+    static setupVscodeCmd = 'spruce setup.vscode --all true';
+    static checkGenerateIdVersionCmd = `yarn info @neurodevs/generate-id version --silent`;
+    static yarnGlobalDirCmd = 'yarn global dir';
+    static fakeGlobalRoot = generateId();
     static orderJsonKeys(json, keyOrder) {
         const ordered = {};
         for (const key of keyOrder) {
@@ -307,48 +313,63 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
         return ordered;
     }
     static fakeChdir() {
-        NpmAutopackage_1.default.chdir = fake_node_core_1.fakeChdir;
-        (0, fake_node_core_1.resetCallsToChdir)();
+        NpmAutopackage.chdir = fakeChdir;
+        resetCallsToChdir();
     }
     static fakeExec() {
-        NpmAutopackage_1.default.exec = fake_node_core_1.fakeExec;
-        (0, fake_node_core_1.resetCallsToExec)();
-        (0, fake_node_core_1.setFakeExecResult)(this.yarnGlobalDirCmd, {
+        NpmAutopackage.exec = fakeExec;
+        resetCallsToExec();
+        setFakeExecResult(this.yarnGlobalDirCmd, {
             stdout: this.fakeGlobalRoot,
         });
-        (0, fake_node_core_1.setFakeReadFileResult)(path_1.default.join(this.fakeGlobalRoot, 'node_modules', '@neurodevs', 'meta-node', 'package.json'), JSON.stringify({ version: this.metaNodeVersion }));
+        setFakeReadFileResult(path.join(this.fakeGlobalRoot, 'node_modules', '@neurodevs', 'meta-node', 'package.json'), JSON.stringify({ version: this.metaNodeVersion }));
     }
     static fakePathExists() {
-        NpmAutopackage_1.default.pathExists = fake_node_core_1.fakePathExists;
-        (0, fake_node_core_1.resetCallsToPathExists)();
+        NpmAutopackage.pathExists = fakePathExists;
+        resetCallsToPathExists();
     }
     static fakeFetch() {
-        NpmAutopackage_1.default.fetch = fake_node_core_1.fakeFetch;
-        (0, fake_node_core_1.resetCallsToFetch)();
+        NpmAutopackage.fetch = fakeFetch;
+        resetCallsToFetch();
     }
     static fakeReadFile() {
-        NpmAutopackage_1.default.readFile = fake_node_core_1.fakeReadFile;
-        (0, fake_node_core_1.resetCallsToReadFile)();
-        (0, fake_node_core_1.setFakeReadFileResult)(this.packageJsonPath, this.originalPackageJson);
-        (0, fake_node_core_1.setFakeReadFileResult)(this.tasksJsonPath, JSON.stringify(this.originalTasksJson));
+        NpmAutopackage.readFile = fakeReadFile;
+        resetCallsToReadFile();
+        setFakeReadFileResult(this.packageJsonPath, this.originalPackageJson);
+        setFakeReadFileResult(this.tasksJsonPath, JSON.stringify(this.originalTasksJson));
     }
     static fakeWriteFile() {
-        NpmAutopackage_1.default.writeFile = fake_node_core_1.fakeWriteFile;
-        (0, fake_node_core_1.resetCallsToWriteFile)();
+        NpmAutopackage.writeFile = fakeWriteFile;
+        resetCallsToWriteFile();
     }
     static fakeFetchForRepoNotFound() {
         const fakeResponse = new Response(null, {
             status: 404,
             statusText: 'Not Found',
         });
-        (0, fake_node_core_1.setFakeFetchResponse)(this.reposUrl, fakeResponse);
-    }
+        setFakeFetchResponse(this.reposUrl, fakeResponse);
+    }
+    static packageName = generateId();
+    static packageDescription = generateId();
+    static gitNamespace = generateId();
+    static npmNamespace = generateId();
+    static installDir = generateId();
+    static keywords = [generateId(), generateId()];
+    static license = generateId();
+    static author = generateId();
+    static githubToken = generateId();
+    static metaNodeVersion = generateId();
+    static randomId = generateId();
     static get reposUrl() {
         return `https://api.github.com/repos/${this.gitNamespace}/${this.packageName}`;
     }
     static get orgsUrl() {
         return `https://api.github.com/orgs/${this.gitNamespace}/repos`;
     }
+    static dependencies = {
+        [generateId()]: generateId(),
+        [generateId()]: generateId(),
+    };
     static get originalPackageJson() {
         return JSON.stringify({
             name: this.packageName,
@@ -379,6 +400,20 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
             dependencies: this.dependencies,
         });
     }
+    static tasksJsonPath = '.vscode/tasks.json';
+    static originalTasksJson = {
+        [this.randomId]: this.randomId,
+        tasks: [
+            {
+                [this.randomId]: this.randomId,
+            },
+        ],
+        inputs: [
+            {
+                [this.randomId]: this.randomId,
+            },
+        ],
+    };
     static get updatedTasksJson() {
         return JSON.stringify({
             ...this.originalTasksJson,
@@ -408,158 +443,123 @@ class NpmAutopackageTest extends AbstractPackageTest_1.default {
             ],
         }, null, 4);
     }
+    static defaultOptions = {
+        name: this.packageName,
+        description: this.packageDescription,
+        gitNamespace: this.gitNamespace,
+        npmNamespace: this.npmNamespace,
+        installDir: this.installDir,
+        keywords: this.keywords,
+        license: this.license,
+        author: this.author,
+    };
     static NpmAutopackage(options) {
-        return NpmAutopackage_1.default.Create({ ...this.defaultOptions, ...options });
+        return NpmAutopackage.Create({ ...this.defaultOptions, ...options });
     }
 }
-_a = NpmAutopackageTest;
-NpmAutopackageTest.packageJsonPath = 'package.json';
-NpmAutopackageTest.gitignorePath = '.gitignore';
-NpmAutopackageTest.buildDirGitignorePattern = '\nbuild/\n';
-NpmAutopackageTest.setupVscodeCmd = 'spruce setup.vscode --all true';
-NpmAutopackageTest.checkGenerateIdVersionCmd = `yarn info @neurodevs/generate-id version --silent`;
-NpmAutopackageTest.yarnGlobalDirCmd = 'yarn global dir';
-NpmAutopackageTest.fakeGlobalRoot = (0, generate_id_1.default)();
-NpmAutopackageTest.packageName = (0, generate_id_1.default)();
-NpmAutopackageTest.packageDescription = (0, generate_id_1.default)();
-NpmAutopackageTest.gitNamespace = (0, generate_id_1.default)();
-NpmAutopackageTest.npmNamespace = (0, generate_id_1.default)();
-NpmAutopackageTest.installDir = (0, generate_id_1.default)();
-NpmAutopackageTest.keywords = [(0, generate_id_1.default)(), (0, generate_id_1.default)()];
-NpmAutopackageTest.license = (0, generate_id_1.default)();
-NpmAutopackageTest.author = (0, generate_id_1.default)();
-NpmAutopackageTest.githubToken = (0, generate_id_1.default)();
-NpmAutopackageTest.metaNodeVersion = (0, generate_id_1.default)();
-NpmAutopackageTest.randomId = (0, generate_id_1.default)();
-NpmAutopackageTest.dependencies = {
-    [(0, generate_id_1.default)()]: (0, generate_id_1.default)(),
-    [(0, generate_id_1.default)()]: (0, generate_id_1.default)(),
-};
-NpmAutopackageTest.tasksJsonPath = '.vscode/tasks.json';
-NpmAutopackageTest.originalTasksJson = {
-    [this.randomId]: _a.randomId,
-    tasks: [
-        {
-            [this.randomId]: _a.randomId,
-        },
-    ],
-    inputs: [
-        {
-            [this.randomId]: _a.randomId,
-        },
-    ],
-};
-NpmAutopackageTest.defaultOptions = {
-    name: _a.packageName,
-    description: _a.packageDescription,
-    gitNamespace: _a.gitNamespace,
-    npmNamespace: _a.npmNamespace,
-    installDir: _a.installDir,
-    keywords: _a.keywords,
-    license: _a.license,
-    author: _a.author,
-};
-exports.default = NpmAutopackageTest;
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "createsInstance", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "throwsIfGithubTokenNotSet", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "firstCreateRepoInGithubOrg", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenChdirToInstallDir", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenGitClone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenChdirToPackageDir", null);
 __decorate([
-    (0, test_utils_1.test)()
-], NpmAutopackageTest, "thenGitPull", null);
+    test()
+], NpmAutopackageTest, "thenGitFetchOrigin", null);
+__decorate([
+    test()
+], NpmAutopackageTest, "thenGitFetchResetHard", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenSpruceCreateModule", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenCommitCreatePackage", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenReadPackageJson", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenUpdatePackageJson", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenCommitUpdatePackage", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenAddBuildDirToGitignore", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenCommitUpdateGitignore", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenSpruceSetupVscode", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenCommitVscodeChanges", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenUpdatesVscodeTasksJson", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenCommitsUpdateVscodeTasksJson", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenInstallsDefaultDevDependencies", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "thenCommitsInstallDefaultDevDependencies", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "lastlyOpensVscodeAtEnd", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotCreateRepoInGithubOrgIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotCloneRepoIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotSpruceCreateModuleIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotRunSetupVscodeIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotCommitCreatePackageIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotCommitUpdatePackageIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotCommitUpdateGitignoreIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotCommitSetupVscodeIfDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotOverrideOriginalDependencies", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotUpdateTasksJsonIfAlreadyDone", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotOpenVscodeIfNotCloned", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotInstallDevDependenciesIfLatest", null);
 __decorate([
-    (0, test_utils_1.test)()
+    test()
 ], NpmAutopackageTest, "doesNotThrowIfGenerateIdNotInPackageJson", null);
 //# sourceMappingURL=NpmAutopackage.test.js.map