update tests and formatting

electrovir · Oct 22, 2023 · 965ed87 · 965ed87
1 parent 2d3df33
commit 965ed87
Show file tree

Hide file tree

Showing 10 changed files with 450 additions and 429 deletions.
diff --git a/base-configs/base-prettierrc.js b/base-configs/base-prettierrc.js
@@ -1,32 +1,3 @@
-const fs = require('fs');
-const path = require('path');
-
-function toPosixPath(input) {
-    return input.replace(/\\/g, '/').replace(/^\w+:/, '');
-}
-
-const posixDirname = path.posix.dirname(toPosixPath(__dirname));
-const packageRoot = path.parse(__dirname).root;
-
-function findClosestPackagePath(dirPath, packageName) {
-    const currentAttempt = path.join(dirPath, 'node_modules', packageName);
-
-    if (fs.existsSync(currentAttempt)) {
-        return currentAttempt;
-    } else if (dirPath === packageRoot) {
-        throw new Error(`Could not find ${packageName} package.`);
-    } else {
-        return findClosestPackagePath(path.dirname(dirPath), packageName);
-    }
-}
-
-function getPluginPathFromName(pluginName) {
-    return path.posix.resolve(
-        posixDirname,
-        toPosixPath(findClosestPackagePath(__dirname, pluginName)),
-    );
-}
-
 /**
  * @typedef {import('prettier-plugin-multiline-arrays').MultilineArrayOptions} MultilineOptions
  *
@@ -58,6 +29,4 @@ const basePrettierConfig = {
 
 module.exports = {
     basePrettierConfig,
-    /** Export this in case consumers want to add more plugins */
-    getPluginPathFromName,
 };
diff --git a/configs/ncu.config.ts b/configs/ncu.config.ts
@@ -5,7 +5,8 @@ export const ncuConfig: RunOptions = {
     ...baseNcuConfig,
     // exclude these
     reject: [
-        ...baseNcuConfig.reject,
+        // ...baseNcuConfig.reject,
+        'npm-check-updates',
         'glob',
     ],
     // include only these

diff --git a/configs/src/index.html b/configs/src/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
     <head>
         <title>Page Name</title>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "virmator",
-    "version": "9.2.0",
+    "version": "10.0.0",
     "description": "Handle common package configs, commands, and dependencies.",
     "keywords": [
         "automation",
@@ -33,7 +33,7 @@
         "docs": "npm run compile && ts-node src/scripts/save-help-message.ts && md-code README.md",
         "docs:check": "npm run compile && ts-node src/scripts/save-help-message.ts check && md-code --check README.md",
         "format": "npm run format:base -- --write --list-different",
-        "format:base": "prettier \"./**/*.+(ts|json|html|css|md|js)\"",
+        "format:base": "prettier \"./**/*.+(ts|json|html|css|md|js)\" --config .prettierrc.js",
         "publish": "virmator publish \"npm run test:all\"",
         "test": "npm run compile && test-as-package mocha --config mocha.config.js",
         "test:all": "npm ci && concurrently --color --kill-others-on-fail -c auto --names tests,spelling,format,docs \"npm run compile && npm run test\" \"npm run test:spelling -- --no-progress\" \"npm run test:format\" \"npm run docs:check\"",
@@ -71,7 +71,7 @@
         "@web/test-runner-visual-regression": "^0.8.2",
         "chai": "^4.3.10",
         "cspell": "^7.3.8",
-        "dependency-cruiser": "^14.1.2",
+        "dependency-cruiser": "^15.0.0",
         "element-vir": "^16.5.0",
         "esbuild": "^0.19.5",
         "fs-extra": "^11.1.1",
@@ -80,14 +80,14 @@
         "mocha": "^10.2.0",
         "mocha-spec-reporter-with-file-names": "^0.0.3",
         "npm-check-updates": "~16.12.3",
-        "prettier": "^2.8.8",
-        "prettier-plugin-interpolated-html-tags": "^0.0.4",
-        "prettier-plugin-jsdoc": "^0.4.2",
-        "prettier-plugin-multiline-arrays": "^2.0.0",
+        "prettier": "^3.0.3",
+        "prettier-plugin-interpolated-html-tags": "^1.0.1",
+        "prettier-plugin-jsdoc": "^1.1.1",
+        "prettier-plugin-multiline-arrays": "^3.0.0",
         "prettier-plugin-organize-imports": "^3.2.3",
         "prettier-plugin-packagejson": "^2.4.6",
-        "prettier-plugin-sort-json": "^2.0.0",
-        "prettier-plugin-toml": "^0.3.1",
+        "prettier-plugin-sort-json": "^3.1.0",
+        "prettier-plugin-toml": "^1.0.0",
         "test-as-package": "^0.0.4",
         "test-established-expectations": "^0.5.0",
         "ts-node": "^10.9.1",

diff --git a/src/augments/object.ts b/src/augments/object.ts
@@ -20,17 +20,20 @@ export function deeplyCombineObjects<
     originalObject: OriginalObjectGeneric,
     overwriteObject: OverwriteObjectGeneric,
 ): Overwrite<OriginalObjectGeneric, OverwriteObjectGeneric> {
-    return getObjectTypedKeys(overwriteObject).reduce((accum, currentKey) => {
-        const currentNewValue = overwriteObject[currentKey];
-        const currentOldValue =
-            typedHasProperty(originalObject, currentKey) && originalObject[currentKey];
-        if (isObject(currentOldValue) && isObject(currentNewValue)) {
-            accum[currentKey] = deeplyCombineObjects(currentOldValue, currentNewValue) as any;
-        } else {
-            accum[currentKey] = currentNewValue as any;
-        }
-        return accum;
-    }, originalObject as unknown as Overwrite<OriginalObjectGeneric, OverwriteObjectGeneric>);
+    return getObjectTypedKeys(overwriteObject).reduce(
+        (accum, currentKey) => {
+            const currentNewValue = overwriteObject[currentKey];
+            const currentOldValue =
+                typedHasProperty(originalObject, currentKey) && originalObject[currentKey];
+            if (isObject(currentOldValue) && isObject(currentNewValue)) {
+                accum[currentKey] = deeplyCombineObjects(currentOldValue, currentNewValue) as any;
+            } else {
+                accum[currentKey] = currentNewValue as any;
+            }
+            return accum;
+        },
+        originalObject as unknown as Overwrite<OriginalObjectGeneric, OverwriteObjectGeneric>,
+    );
 }
 
 export function filterToDifferentValues<T extends object>(

diff --git a/src/test/run-test-command.ts b/src/test/run-test-command.ts
@@ -96,12 +96,15 @@ export type TestCommandOutput = {
 async function runCliCommandForTest<KeyGeneric extends string>(
     inputs: RunCliCommandInputs<KeyGeneric>,
 ): Promise<TestCommandOutput> {
-    const configFilesExistedBeforeTest = inputs.configFilesToCheck.reduce((accum, configFile) => {
-        if (existsSync(join(inputs.dir, configFile.copyToPathRelativeToRepoDir))) {
-            accum[configFile.copyToPathRelativeToRepoDir] = true;
-        }
-        return accum;
-    }, {} as Record<string, boolean>);
+    const configFilesExistedBeforeTest = inputs.configFilesToCheck.reduce(
+        (accum, configFile) => {
+            if (existsSync(join(inputs.dir, configFile.copyToPathRelativeToRepoDir))) {
+                accum[configFile.copyToPathRelativeToRepoDir] = true;
+            }
+            return accum;
+        },
+        {} as Record<string, boolean>,
+    );
     await initDirectory(inputs.dir, inputs.keepFiles);
     const dirFileNamesBefore = (await readdir(inputs.dir)).sort();
     const dirFileContentsBefore = await readAllDirContents({

diff --git a/test-files/test-expectations.json b/test-files/test-expectations.json
@@ -171,7 +171,7 @@
             "dir": "format/invalid-format-repo",
             "exitCode": 1,
             "key": "fail on format failures in a folder",
-            "stderr": "[warn] invalid-format.ts [warn] Code style issues found in the above file. Forgot to run Prettier? format failed.",
+            "stderr": "[warn] invalid-format.ts [warn] Code style issues found in the above file. Run Prettier to fix. format failed.",
             "stdout": "Installing prettier... Installing prettier-plugin-jsdoc... Installing prettier-plugin-multiline-arrays... Installing prettier-plugin-organize-imports... Installing prettier-plugin-packagejson... Installing prettier-plugin-sort-json... Installing prettier-plugin-toml... Installing prettier-plugin-interpolated-html-tags... running format... Successfully copied .prettierignore Successfully copied .prettierrc.js node_modules/.bin/prettier --color --cache --cache-strategy content \"./**/*.+(cjs|css|graphql|html|js|json|jsx|less|md|mjs|scss|toml|ts|tsx|yaml|yml)\" --check"
         },
         "format should update invalid files": {

diff --git a/test-files/update-configs/full-repo/.gitignore b/test-files/update-configs/full-repo/.gitignore
@@ -1,5 +1,6 @@
 *.tgz
 .DS_Store
+.not-committed
 /Icon?
 coverage/
 dist-docs/

diff --git a/test-files/update-configs/full-repo/.npmignore b/test-files/update-configs/full-repo/.npmignore
@@ -5,6 +5,7 @@
 *.test.*
 *.tgz
 .*
+.not-committed
 /Icon?
 /configs/
 /coverage/