@neurodevs/meta-node 0.6.1 → 0.7.0

package/src/modules/ImplAutomodule.ts

@@ -1,9 +1,12 @@
+import { exec as execSync } from 'child_process'
 import { readFile, writeFile } from 'fs/promises'
 import path from 'path'
-import pathExists from './pathExists'
+import { promisify } from 'util'
+import { pathExists } from 'fs-extra'
 
 export default class ImplAutomodule implements Automodule {
     public static Class?: AutomoduleConstructor
+    public static exec = promisify(execSync)
     public static pathExists = pathExists
     public static readFile = readFile
     public static writeFile = writeFile
@@ -37,15 +40,20 @@ export default class ImplAutomodule implements Automodule {
     }
 
     public async run() {
-        await this.throwIfTestDirDoesNotExist()
-        await this.throwIfModuleDirDoesNotExist()
-        await this.throwIfFakeDirDoesNotExist()
+        await this.throwIfDirectoriesDoNotExist()
 
         await this.createTestFile()
         await this.createModuleFile()
         await this.createFakeFile()
 
         await this.updateIndexFileExports()
+        await this.bumpMinorVersion()
+    }
+
+    private async throwIfDirectoriesDoNotExist() {
+        await this.throwIfTestDirDoesNotExist()
+        await this.throwIfModuleDirDoesNotExist()
+        await this.throwIfFakeDirDoesNotExist()
     }
 
     private async throwIfTestDirDoesNotExist() {
@@ -111,6 +119,29 @@ export default class ImplAutomodule implements Automodule {
 
     private readonly indexFilePath = './src/index.ts'
 
+    private get sortedIndexFile() {
+        const blocks = this.indexFilePattern
+            .split(/(?=\/\/)/)
+            .map((s) => s.trim())
+            .filter(Boolean)
+
+        blocks.sort((a, b) => {
+            const aKey = a.match(/^\/\/\s*([^\n]*)/)?.[1]?.trim() ?? ''
+            const bKey = b.match(/^\/\/\s*([^\n]*)/)?.[1]?.trim() ?? ''
+            return aKey.localeCompare(bKey)
+        })
+
+        return blocks.join('\n\n')
+    }
+
+    private async bumpMinorVersion() {
+        await this.exec('yarn version --minor --no-git-tag-version')
+    }
+
+    private get exec() {
+        return ImplAutomodule.exec
+    }
+
     private get pathExists() {
         return ImplAutomodule.pathExists
     }
@@ -198,21 +229,6 @@ export default class ImplAutomodule implements Automodule {
             export * from './testDoubles/${this.interfaceName}/Fake${this.interfaceName}'
         `
     }
-
-    private get sortedIndexFile() {
-        const blocks = this.indexFilePattern
-            .split(/(?=\/\/)/)
-            .map((s) => s.trim())
-            .filter(Boolean)
-
-        blocks.sort((a, b) => {
-            const aKey = a.match(/^\/\/\s*([^\n]*)/)?.[1]?.trim() ?? ''
-            const bKey = b.match(/^\/\/\s*([^\n]*)/)?.[1]?.trim() ?? ''
-            return aKey.localeCompare(bKey)
-        })
-
-        return blocks.join('\n\n')
-    }
 }
 
 export interface Automodule {

package/src/modules/NpmAutopackage.ts

@@ -1,14 +1,16 @@
-import { execSync } from 'child_process'
-import fs from 'fs'
+import { exec as execSync } from 'child_process'
+import { readFile, writeFile } from 'fs/promises'
+import { promisify } from 'util'
+import { pathExists } from 'fs-extra'
 
 export default class NpmAutopackage implements Autopackage {
     public static Class?: AutopackageConstructor
     public static chdir = process.chdir
-    public static execSync = execSync
-    public static existsSync = fs.existsSync
-    public static fetch = globalThis.fetch
-    public static readFileSync = fs.readFileSync
-    public static writeFileSync = fs.writeFileSync
+    public static exec = promisify(execSync)
+    public static fetch = fetch
+    public static pathExists = pathExists
+    public static readFile = readFile
+    public static writeFile = writeFile
 
     private packageName: string
     private description: string
@@ -19,6 +21,7 @@ export default class NpmAutopackage implements Autopackage {
     private author?: string
 
     private originalJsonFile!: Record<string, unknown>
+    private originalGitignoreFile!: string
 
     protected constructor(options: AutopackageOptions) {
         const {
@@ -50,12 +53,13 @@ export default class NpmAutopackage implements Autopackage {
         await this.createRepoInGithubOrg()
 
         this.chdirToInstallDir()
-        this.cloneGitRepo()
+        await this.cloneGitRepo()
+
         this.chdirToPackageDir()
-        this.spruceCreateModule()
-        this.updatePackage()
-        this.updateGitignore()
-        this.setupVscode()
+        await this.spruceCreateModule()
+        await this.updatePackage()
+        await this.updateGitignore()
+        await this.setupVscode()
     }
 
     private throwIfGithubTokenNotInEnv() {
@@ -94,15 +98,17 @@ export default class NpmAutopackage implements Autopackage {
         this.chdir(this.installDir)
     }
 
-    private cloneGitRepo() {
-        if (!this.packageDirExists) {
+    private async cloneGitRepo() {
+        const packageDirExists = await this.checkIfPackageDirExists()
+
+        if (!packageDirExists) {
             console.log('Cloning git repository...')
-            this.exec(`git clone ${this.gitUrl}`)
+            await this.exec(`git clone ${this.gitUrl}`)
         }
     }
 
-    private get packageDirExists() {
-        return this.existsSync(this.packageDir)
+    private async checkIfPackageDirExists() {
+        return this.pathExists(this.packageDir)
     }
 
     private get packageDir() {
@@ -117,58 +123,60 @@ export default class NpmAutopackage implements Autopackage {
         this.chdir(this.packageDir)
     }
 
-    private spruceCreateModule() {
-        if (!this.packageJsonExists) {
+    private async spruceCreateModule() {
+        const packageJsonExists = await this.checkIfPackageJsonExists()
+
+        if (!packageJsonExists) {
             console.log('Running spruce create.module...')
-            this.execSpruceCreateModule()
-            this.commitCreatePackage()
+            await this.execSpruceCreateModule()
+            await this.commitCreatePackage()
         }
     }
 
-    private get packageJsonExists() {
-        return this.existsSync(this.packageJsonPath)
+    private async checkIfPackageJsonExists() {
+        return this.pathExists(this.packageJsonPath)
     }
 
     private get packageJsonPath() {
         return `${this.packageDir}/package.json`
     }
 
-    private execSpruceCreateModule() {
-        this.exec(
+    private async execSpruceCreateModule() {
+        await this.exec(
             `spruce create.module --name "${this.packageName}" --destination "${this.installDir}/${this.packageName}" --description "${this.description}"`
         )
     }
 
-    private commitCreatePackage() {
-        this.gitAddAll()
-        this.gitCommitCreatePackage()
-        this.gitPush()
+    private async commitCreatePackage() {
+        await this.gitAddAll()
+        await this.gitCommitCreatePackage()
+        await this.gitPush()
     }
 
-    private gitAddAll() {
-        this.exec('git add .')
+    private async gitAddAll() {
+        await this.exec('git add .')
     }
 
-    private gitCommitCreatePackage() {
-        this.exec('git commit -m "patch: create package"')
+    private async gitCommitCreatePackage() {
+        await this.exec('git commit -m "patch: create package"')
     }
 
-    private gitPush() {
-        this.exec('git push')
+    private async gitPush() {
+        await this.exec('git push')
     }
 
-    private updatePackage() {
-        this.originalJsonFile = this.loadOriginalJsonFile()
+    private async updatePackage() {
+        this.originalJsonFile = await this.loadPackageJsonFile()
 
         if (!this.isPackageUpToDate) {
             console.log('Updating package.json...')
-            this.updatePackageJson()
-            this.commitUpdatePackage()
+            await this.updatePackageJson()
+            await this.commitUpdatePackage()
         }
     }
 
-    private loadOriginalJsonFile() {
-        const raw = this.readFileSync(this.packageJsonPath, {
+    private async loadPackageJsonFile() {
+        const raw = await this.readFile(this.packageJsonPath, {
             encoding: 'utf-8',
         })
         return JSON.parse(raw)
@@ -181,7 +189,7 @@ export default class NpmAutopackage implements Autopackage {
         )
     }
 
-    private updatePackageJson() {
+    private async updatePackageJson() {
         const ordered = this.orderJsonKeys(this.updatedJsonFile, [
             'name',
             'version',
@@ -202,7 +210,7 @@ export default class NpmAutopackage implements Autopackage {
             'skill',
         ])
 
-        this.writeFileSync(
+        await this.writeFile(
             this.packageJsonPath,
             JSON.stringify(ordered, null, 2) + '\n',
             { encoding: 'utf-8' }
@@ -254,73 +262,88 @@ export default class NpmAutopackage implements Autopackage {
         return ordered
     }
 
-    private commitUpdatePackage() {
-        this.gitAddAll()
-        this.gitCommitUpdatePackage()
-        this.gitPush()
+    private async commitUpdatePackage() {
+        await this.gitAddAll()
+        await this.gitCommitUpdatePackage()
+        await this.gitPush()
     }
 
-    private gitCommitUpdatePackage() {
-        this.exec('git commit -m "patch: update package"')
+    private async gitCommitUpdatePackage() {
+        await this.exec('git commit -m "patch: update package"')
     }
 
-    private updateGitignore() {
-        if (!this.gitignoreUpdated) {
+    private async updateGitignore() {
+        this.originalGitignoreFile = await this.loadGitignoreFile()
+
+        if (!this.isGitignoreUpdated) {
             console.log('Updating .gitignore...')
-            this.writeFileSync(this.gitignorePath, '\nbuild/\n', {
-                encoding: 'utf-8',
-                flag: 'a',
-            })
-            this.commitUpdateGitignore()
+
+            await this.addBuildDirToGitignore()
+            await this.commitUpdateGitignore()
         }
     }
 
-    private get gitignoreUpdated() {
-        const content = this.readFileSync(this.gitignorePath, {
+    private async loadGitignoreFile() {
+        return await this.readFile(this.gitignorePath, {
             encoding: 'utf-8',
         })
-        const lines = content.split(/\r?\n/).map((line) => line.trim())
-        return lines.includes('build/')
     }
 
     private get gitignorePath() {
         return `${this.packageDir}/.gitignore`
     }
 
-    private commitUpdateGitignore() {
-        this.gitAddAll()
-        this.gitCommitUpdateGitignore()
-        this.gitPush()
+    private get isGitignoreUpdated() {
+        const lines = this.originalGitignoreFile
+            .split(/\r?\n/)
+            .map((line) => line.trim())
+
+        return lines.includes('build/')
     }
 
-    private gitCommitUpdateGitignore() {
-        this.exec('git commit -m "patch: add build dir to gitignore"')
+    private async addBuildDirToGitignore() {
+        await this.writeFile(this.gitignorePath, '\nbuild/\n', {
+            encoding: 'utf-8',
+            flag: 'a',
+        })
+    }
+
+    private async commitUpdateGitignore() {
+        await this.gitAddAll()
+        await this.gitCommitUpdateGitignore()
+        await this.gitPush()
     }
 
-    private setupVscode() {
-        if (!this.vscodeSettingsExists) {
+    private async gitCommitUpdateGitignore() {
+        await this.exec('git commit -m "patch: add build dir to gitignore"')
+    }
+
+    private async setupVscode() {
+        const vscodeSettingsExist = await this.checkIfVscodeSettingsExist()
+
+        if (!vscodeSettingsExist) {
             console.log('Setting up VSCode...')
-            this.spruceSetupVscode()
-            this.commitSetupVscode()
+            await this.spruceSetupVscode()
+            await this.commitSetupVscode()
         }
     }
 
-    private get vscodeSettingsExists() {
-        return this.existsSync(`${this.packageDir}/.vscode/settings.json`)
+    private async checkIfVscodeSettingsExist() {
+        return this.pathExists(`${this.packageDir}/.vscode/settings.json`)
     }
 
-    private spruceSetupVscode() {
-        this.exec('spruce setup.vscode --all true')
+    private async spruceSetupVscode() {
+        await this.exec('spruce setup.vscode --all true')
     }
 
-    private commitSetupVscode() {
-        this.gitAddAll()
-        this.gitCommitSetup()
-        this.gitPush()
+    private async commitSetupVscode() {
+        await this.gitAddAll()
+        await this.gitCommitSetup()
+        await this.gitPush()
     }
 
-    private gitCommitSetup() {
-        this.exec('git commit -m "patch: setup vscode"')
+    private async gitCommitSetup() {
+        await this.exec('git commit -m "patch: setup vscode"')
     }
 
     private get chdir() {
@@ -328,23 +351,23 @@ export default class NpmAutopackage implements Autopackage {
     }
 
     private get exec() {
-        return NpmAutopackage.execSync
+        return NpmAutopackage.exec
     }
 
-    private get existsSync() {
-        return NpmAutopackage.existsSync
+    private get pathExists() {
+        return NpmAutopackage.pathExists
     }
 
     private get fetch() {
         return NpmAutopackage.fetch
     }
 
-    private get readFileSync() {
-        return NpmAutopackage.readFileSync
+    private get readFile() {
+        return NpmAutopackage.readFile
     }
 
-    private get writeFileSync() {
-        return NpmAutopackage.writeFileSync
+    private get writeFile() {
+        return NpmAutopackage.writeFile
     }
 }
 

package/src/scripts/runAutomodule.ts

@@ -8,9 +8,9 @@ async function main() {
             '/Users/ericthecurious/dev/meta-node/src/__tests__/modules',
         moduleSaveDir: '/Users/ericthecurious/dev/meta-node/src/modules',
         fakeSaveDir:
-            '/Users/ericthecurious/dev/meta-node/src/testDoubles/Autodocumenter',
-        interfaceName: 'Autodocumenter',
-        implName: 'PackageAutodocumenter',
+            '/Users/ericthecurious/dev/meta-node/src/testDoubles/Autothingy',
+        interfaceName: 'Autothingy',
+        implName: 'PackageAutothingy',
     })
 
     await instance.run()

package/src/scripts/runAutopackage.ts

@@ -1,4 +1,4 @@
-import { execSync } from 'child_process'
+import { exec as execSync } from 'child_process'
 import NpmAutopackage from '../modules/NpmAutopackage'
 
 async function main() {

package/build/modules/pathExists.d.ts

@@ -1 +0,0 @@
-export default function pathExists(path: string): Promise<boolean>;

package/build/modules/pathExists.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = pathExists;
-const promises_1 = require("fs/promises");
-async function pathExists(path) {
-    try {
-        await (0, promises_1.access)(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-//# sourceMappingURL=pathExists.js.map

package/build/modules/pathExists.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pathExists.js","sourceRoot":"","sources":["../../src/modules/pathExists.ts"],"names":[],"mappings":";;AAEA,6BAOC;AATD,0CAAoC;AAErB,KAAK,UAAU,UAAU,CAAC,IAAY;IACjD,IAAI,CAAC;QACD,MAAM,IAAA,iBAAM,EAAC,IAAI,CAAC,CAAA;QAClB,OAAO,IAAI,CAAA;IACf,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC"}

package/build/testDoubles/fs/fakePathExists.d.ts

@@ -1,3 +0,0 @@
-export declare let pathShouldExist: Record<string, boolean>;
-export declare function setPathShouldExist(path: string, shouldExist: boolean): void;
-export default function fakePathExists(path: string): Promise<boolean>;

package/build/testDoubles/fs/fakePathExists.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pathShouldExist = void 0;
-exports.setPathShouldExist = setPathShouldExist;
-exports.default = fakePathExists;
-exports.pathShouldExist = {};
-function setPathShouldExist(path, shouldExist) {
-    exports.pathShouldExist[path] = shouldExist;
-}
-async function fakePathExists(path) {
-    return exports.pathShouldExist[path];
-}
-//# sourceMappingURL=fakePathExists.js.map

package/build/testDoubles/fs/fakePathExists.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fakePathExists.js","sourceRoot":"","sources":["../../../src/testDoubles/fs/fakePathExists.ts"],"names":[],"mappings":";;;AAEA,gDAEC;AAED,iCAEC;AARU,QAAA,eAAe,GAA4B,EAAE,CAAA;AAExD,SAAgB,kBAAkB,CAAC,IAAY,EAAE,WAAoB;IACjE,uBAAe,CAAC,IAAI,CAAC,GAAG,WAAW,CAAA;AACvC,CAAC;AAEc,KAAK,UAAU,cAAc,CAAC,IAAY;IACrD,OAAO,uBAAe,CAAC,IAAI,CAAC,CAAA;AAChC,CAAC"}

package/build/testDoubles/fs/fakeReadFile.d.ts

@@ -1,5 +0,0 @@
-export declare let callsToReadFile: string[];
-export declare function resetCallsToReadFile(): void;
-export declare let fakeReadFileResult: string;
-export declare function setFakeReadFileResult(result: string): void;
-export default function fakeReadFile(file: string): Promise<string>;

package/build/testDoubles/fs/fakeReadFile.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fakeReadFileResult = exports.callsToReadFile = void 0;
-exports.resetCallsToReadFile = resetCallsToReadFile;
-exports.setFakeReadFileResult = setFakeReadFileResult;
-exports.default = fakeReadFile;
-const test_utils_1 = require("@sprucelabs/test-utils");
-exports.callsToReadFile = [];
-function resetCallsToReadFile() {
-    exports.callsToReadFile = [];
-}
-exports.fakeReadFileResult = (0, test_utils_1.generateId)();
-function setFakeReadFileResult(result) {
-    exports.fakeReadFileResult = result;
-}
-async function fakeReadFile(file) {
-    exports.callsToReadFile.push(file);
-    return exports.fakeReadFileResult;
-}
-//# sourceMappingURL=fakeReadFile.js.map

package/build/testDoubles/fs/fakeReadFile.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fakeReadFile.js","sourceRoot":"","sources":["../../../src/testDoubles/fs/fakeReadFile.ts"],"names":[],"mappings":";;;AAIA,oDAEC;AAID,sDAEC;AAED,+BAGC;AAjBD,uDAAmD;AAExC,QAAA,eAAe,GAAa,EAAE,CAAA;AAEzC,SAAgB,oBAAoB;IAChC,uBAAe,GAAG,EAAE,CAAA;AACxB,CAAC;AAEU,QAAA,kBAAkB,GAAG,IAAA,uBAAU,GAAE,CAAA;AAE5C,SAAgB,qBAAqB,CAAC,MAAc;IAChD,0BAAkB,GAAG,MAAM,CAAA;AAC/B,CAAC;AAEc,KAAK,UAAU,YAAY,CAAC,IAAY;IACnD,uBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,0BAAkB,CAAA;AAC7B,CAAC"}

package/build/testDoubles/fs/fakeWriteFile.d.ts

@@ -1,6 +0,0 @@
-export declare let callsToWriteFile: {
-    file: string;
-    data: string;
-}[];
-export declare function resetCallsToWriteFile(): void;
-export default function fakeWriteFile(file: string, data: string): Promise<void>;

package/build/testDoubles/fs/fakeWriteFile.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.callsToWriteFile = void 0;
-exports.resetCallsToWriteFile = resetCallsToWriteFile;
-exports.default = fakeWriteFile;
-exports.callsToWriteFile = [];
-function resetCallsToWriteFile() {
-    exports.callsToWriteFile = [];
-}
-async function fakeWriteFile(file, data) {
-    exports.callsToWriteFile.push({ file, data });
-}
-//# sourceMappingURL=fakeWriteFile.js.map

package/build/testDoubles/fs/fakeWriteFile.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fakeWriteFile.js","sourceRoot":"","sources":["../../../src/testDoubles/fs/fakeWriteFile.ts"],"names":[],"mappings":";;;AAKA,sDAEC;AAED,gCAEC;AAXU,QAAA,gBAAgB,GAGrB,EAAE,CAAA;AAER,SAAgB,qBAAqB;IACjC,wBAAgB,GAAG,EAAE,CAAA;AACzB,CAAC;AAEc,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,IAAY;IAClE,wBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;AACzC,CAAC"}

package/src/modules/pathExists.ts

@@ -1,10 +0,0 @@
-import { access } from 'fs/promises'
-
-export default async function pathExists(path: string) {
-    try {
-        await access(path)
-        return true
-    } catch {
-        return false
-    }
-}

package/src/testDoubles/fs/fakePathExists.ts

@@ -1,9 +0,0 @@
-export let pathShouldExist: Record<string, boolean> = {}
-
-export function setPathShouldExist(path: string, shouldExist: boolean) {
-    pathShouldExist[path] = shouldExist
-}
-
-export default async function fakePathExists(path: string) {
-    return pathShouldExist[path]
-}

package/src/testDoubles/fs/fakeReadFile.ts

@@ -1,18 +0,0 @@
-import { generateId } from '@sprucelabs/test-utils'
-
-export let callsToReadFile: string[] = []
-
-export function resetCallsToReadFile() {
-    callsToReadFile = []
-}
-
-export let fakeReadFileResult = generateId()
-
-export function setFakeReadFileResult(result: string) {
-    fakeReadFileResult = result
-}
-
-export default async function fakeReadFile(file: string) {
-    callsToReadFile.push(file)
-    return fakeReadFileResult
-}

package/src/testDoubles/fs/fakeWriteFile.ts

@@ -1,12 +0,0 @@
-export let callsToWriteFile: {
-    file: string
-    data: string
-}[] = []
-
-export function resetCallsToWriteFile() {
-    callsToWriteFile = []
-}
-
-export default async function fakeWriteFile(file: string, data: string) {
-    callsToWriteFile.push({ file, data })
-}