@neurodevs/meta-node 0.19.16 → 0.19.19

package/src/impl/NpmAutopackage.ts

@@ -365,10 +365,13 @@ export default prettierConfigNdx
     }
 
     private async updatePackageJsonFile() {
+        this.removeOldKeysFromPackageJson()
+
         const ordered = this.orderJsonKeys(this.updatedPackageJson, [
             'name',
             'version',
             'description',
+            'type',
             'keywords',
             'license',
             'author',
@@ -382,7 +385,6 @@ export default prettierConfigNdx
             'dependencies',
             'devDependencies',
             'jest',
-            'skill',
         ])
 
         await this.writeFile(
@@ -392,6 +394,42 @@ export default prettierConfigNdx
         )
     }
 
+    private removeOldKeysFromPackageJson() {
+        const keysToRemove = [
+            'skill',
+            'jest.testPathIgnorePatterns',
+            'jest.moduleNameMapper',
+            'scripts.build.resolve-paths',
+            'scripts.lint.tsc',
+            'scripts.post.watch.build',
+            'scripts.resolve-paths.lint',
+            'scripts.watch.rebuild',
+            'scripts.watch.tsc',
+        ]
+
+        for (const key of keysToRemove) {
+            this.deleteByPath(this.originalPackageJson, key)
+        }
+    }
+
+    private deleteByPath(obj: any, path: string): void {
+        const dot = path.indexOf('.')
+
+        if (dot === -1) {
+            delete obj[path]
+            return
+        }
+
+        const parentKey = path.slice(0, dot)
+        const childKey = path.slice(dot + 1)
+
+        const parent = obj[parentKey]
+
+        if (parent) {
+            delete parent[childKey]
+        }
+    }
+
     private get updatedPackageJson() {
         return {
             ...this.originalPackageJson,
@@ -410,7 +448,38 @@ export default prettierConfigNdx
             bugs: {
                 url: `https://github.com/${this.gitNamespace}/${this.packageName}/issues`,
             },
+            scripts: {
+                ...(this.originalPackageJson.scripts ?? {}),
+                'build.ci': 'yarn run build.tsc && yarn run lint',
+                'build.dev':
+                    'yarn run build.tsc --sourceMap ; yarn run lint ; prettier --write .',
+                'build.copy-files':
+                    "mkdir -p build && rsync -avzq --exclude='*.ts' ./src/ ./build/",
+                'build.tsc': 'yarn run build.copy-files && tsc',
+                clean: 'yarn run clean.build',
+                'clean.all':
+                    'yarn run clean.dependencies && yarn run clean.build',
+                'clean.build': 'rm -rf build/',
+                'clean.dependencies':
+                    'rm -rf node_modules/ package-lock.json yarn.lock',
+                'fix.lint': "eslint --fix --cache '**/*.ts'",
+                lint: "eslint --cache '**/*.ts'",
+                rebuild:
+                    'yarn run clean.all && yarn install && yarn run build.dev',
+                'update.dependencies': 'yarn run clean.dependencies && yarn',
+                test: 'NODE_OPTIONS=--experimental-vm-modules jest',
+                'watch.build.dev':
+                    "tsc-watch --sourceMap --onCompilationComplete 'yarn run build.copy-files'",
+            },
             dependencies: this.originalPackageJson.dependencies ?? {},
+            jest: {
+                ...(this.originalPackageJson.jest ?? {}),
+                testEnvironment: 'node',
+                testRunner: 'jest-circus/runner',
+                testMatch: ['<rootDir>/build/__tests__/**/*.test.js?(x)'],
+                testTimeout: 5000,
+                maxWorkers: 4,
+            },
         }
     }
 
@@ -681,6 +750,8 @@ export default prettierConfigNdx
     }
 
     private async installDefaultDevDependencies() {
+        await this.removeDefaultDevDependencies()
+
         const generateIdVersion = await this.getLatestVersion(
             '@neurodevs/generate-id'
         )
@@ -706,13 +777,38 @@ export default prettierConfigNdx
             console.log('Installing default devDependencies...')
 
             await this.exec(
-                'yarn add -D @neurodevs/generate-id @neurodevs/node-tdd @neurodevs/eslint-config-ndx @neurodevs/prettier-config-ndx',
+                'yarn add -D @neurodevs/generate-id @neurodevs/node-tdd @neurodevs/eslint-config-ndx @neurodevs/prettier-config-ndx prettier',
                 { cwd: this.packageDir }
             )
             await this.commitInstallDevDependencies()
         }
     }
 
+    private async removeDefaultDevDependencies() {
+        if (this.hasOldDevDependency) {
+            console.log('Removing default devDependencies...')
+
+            await this.exec(
+                'yarn remove eslint eslint-config-spruce prettier chokidar-cli ts-node @types/node',
+                { cwd: this.packageDir }
+            )
+        }
+    }
+
+    private get hasOldDevDependency() {
+        return Object.keys(this.originalPackageJson.devDependencies!).some(
+            (dep) =>
+                [
+                    'eslint',
+                    'eslint-config-spruce',
+                    'prettier',
+                    'chokidar-cli',
+                    'ts-node',
+                    '@types/node',
+                ].includes(dep)
+        )
+    }
+
     private async getLatestVersion(scopedPackageName: string) {
         const { stdout } = await this.exec(
             `yarn info ${scopedPackageName} version --silent`,
@@ -831,7 +927,7 @@ export default prettierConfigNdx
             return ''
         }
     }
-    
+
     private get eslintConfigIsUpToDate() {
         return this.originalEslintConfig.trim() === this.eslintConfigFile.trim()
     }
@@ -848,9 +944,13 @@ export default prettierConfigNdx
         if (!this.prettierConfigIsUpToDate) {
             console.log('Installing prettier.config.js...')
 
-            await this.writeFile(this.prettierConfigPath, this.prettierConfigFile, {
-                encoding: 'utf-8',
-            })
+            await this.writeFile(
+                this.prettierConfigPath,
+                this.prettierConfigFile,
+                {
+                    encoding: 'utf-8',
+                }
+            )
 
             await this.commitInstallPrettierConfigFile()
         }
@@ -867,7 +967,10 @@ export default prettierConfigNdx
     }
 
     private get prettierConfigIsUpToDate() {
-        return this.originalPrettierConfig.trim() === this.prettierConfigFile.trim()
+        return (
+            this.originalPrettierConfig.trim() ===
+            this.prettierConfigFile.trim()
+        )
     }
 
     private async commitInstallPrettierConfigFile() {
@@ -882,14 +985,10 @@ export default prettierConfigNdx
         if (!this.settingsJsonIsUpToDate) {
             console.log('Installing .vscode/settings.json...')
 
-            await this.writeFile(
-                this.settingsJsonPath,
-                this.settingsJsonFile,
-                {
-                    encoding: 'utf-8',
-                }
-            )
-            
+            await this.writeFile(this.settingsJsonPath, this.settingsJsonFile, {
+                encoding: 'utf-8',
+            })
+
             await this.commitInstallSettingsJsonFile()
         }
     }

package/tsconfig.json

@@ -1,28 +1,25 @@
 {
-	"compilerOptions": {
-		"module": "nodenext",
-		"moduleResolution": "nodenext",
-		"target": "ES2022",
-		"lib": ["ES2022"],
-		"types": ["node"],
-		"baseUrl": "src",
-		"outDir": "build",
-		"sourceMap": false,
-		"strict": true,
-		"noImplicitAny": true,
-		"noImplicitReturns": true,
-		"noUnusedLocals": true,
-		"forceConsistentCasingInFileNames": true,
-		"declaration": true,
-		"skipLibCheck": true,
-		"esModuleInterop": true,
-		"moduleDetection": "force",
-		"allowJs": true,
-		"resolveJsonModule": true,
-		"experimentalDecorators": true
-	},
-	"include": [
-		"./src/*.ts",
-		"./src/**/*.ts"
-	]
-}
+  "compilerOptions": {
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "target": "ES2022",
+    "lib": ["ES2022"],
+    "types": ["node"],
+    "baseUrl": "src",
+    "outDir": "build",
+    "sourceMap": false,
+    "strict": true,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "moduleDetection": "force",
+    "allowJs": true,
+    "resolveJsonModule": true,
+    "experimentalDecorators": true
+  },
+  "include": ["./src/*.ts", "./src/**/*.ts"]
+}