update deps

electrovir · May 31, 2023 · dd85162 · dd85162
1 parent 4cefbbf
commit dd85162
Show file tree

Hide file tree

Showing 8 changed files with 11,099 additions and 3,125 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,4 +1,4 @@
-const baseConfig = require('virmator/base-configs/base-prettierrc.js');
+const {basePrettierConfig} = require('virmator/base-configs/base-prettierrc.js');
 
 /**
  * @typedef {import('prettier-plugin-multiline-arrays').MultilineArrayOptions} MultilineOptions
@@ -7,7 +7,7 @@ const baseConfig = require('virmator/base-configs/base-prettierrc.js');
  * @type {PrettierOptions & MultilineOptions}
  */
 const prettierConfig = {
-    ...baseConfig,
+    ...basePrettierConfig,
 };
 
 module.exports = prettierConfig;
diff --git a/configs/ncu.config.ts b/configs/ncu.config.ts
@@ -0,0 +1,11 @@
+import {RunOptions} from 'npm-check-updates';
+
+export const ncuConfig: RunOptions = {
+    color: true,
+    upgrade: true,
+    root: true,
+    // exclude these
+    reject: [],
+    // include only these
+    filter: [],
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-multiline-arrays",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "description": "Prettier plugin to force all arrays to be multiline.",
     "keywords": [
         "array",
@@ -40,31 +40,34 @@
         "test:types": "tsc --noEmit"
     },
     "dependencies": {
-        "@augment-vir/common": "^8.1.0"
+        "@augment-vir/common": "^14.2.0"
     },
     "devDependencies": {
         "@electrovir/nyc": "^15.1.0-fix0",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
-        "@types/chai": "^4.3.4",
+        "@types/chai": "^4.3.5",
         "@types/esprima": "^4.0.3",
         "@types/mocha": "^10.0.1",
         "@types/prettier": "^2.7.2",
         "chai": "^4.3.7",
         "cross-env": "^7.0.3",
-        "cspell": "^6.18.1",
+        "cspell": "^6.31.1",
+        "esbuild": "^0.17.19",
         "istanbul-smart-text-reporter": "^1.1.1",
-        "markdown-code-example-inserter": "^0.1.13",
+        "markdown-code-example-inserter": "^0.3.0",
         "mocha": "^10.2.0",
         "mocha-spec-reporter-with-file-names": "^0.0.3",
-        "prettier": "^2.8.2",
+        "npm-check-updates": "^16.10.12",
+        "prettier": "^2.8.8",
+        "prettier-plugin-interpolated-html-tags": "^0.0.3",
         "prettier-plugin-jsdoc": "^0.4.2",
         "prettier-plugin-multiline-arrays": "*",
         "prettier-plugin-organize-imports": "^3.2.2",
-        "prettier-plugin-packagejson": "^2.3.0",
+        "prettier-plugin-packagejson": "^2.4.3",
         "prettier-plugin-sort-json": "^1.0.0",
         "prettier-plugin-toml": "^0.3.1",
         "ts-node": "^10.9.1",
-        "typescript": "4.9.4",
-        "virmator": "^5.3.2"
+        "typescript": "5.0.4",
+        "virmator": "^6.6.0"
     }
 }
diff --git a/src/printer/insert-new-lines.ts b/src/printer/insert-new-lines.ts
@@ -1,4 +1,4 @@
-import {getObjectTypedKeys, ObjectValueType} from '@augment-vir/common';
+import {getObjectTypedKeys, PropertyValueType} from '@augment-vir/common';
 import {CallExpression, Node} from 'estree';
 import {AstPath, Doc, doc, ParserOptions} from 'prettier';
 import {isDocCommand, stringifyDoc} from '../augments/doc';
@@ -430,7 +430,7 @@ function insertLinesIntoArray(
 function getLatestSetValue<T extends object>(
     currentLine: number,
     triggers: CommentTriggerWithEnding<T>,
-): ObjectValueType<T> | undefined {
+): PropertyValueType<T> | undefined {
     const relevantSetLineCountsKey: keyof T = getObjectTypedKeys(triggers)
         .sort()
         .reduce((closestKey, currentKey): keyof T => {
@@ -444,7 +444,7 @@ function getLatestSetValue<T extends object>(
 
             return closestKey;
         }, '' as keyof T);
-    const relevantSetLineCount: ObjectValueType<T> | undefined =
+    const relevantSetLineCount: PropertyValueType<T> | undefined =
         triggers[relevantSetLineCountsKey]?.data;
 
     return relevantSetLineCount;

diff --git a/src/printer/multiline-array-printer.ts b/src/printer/multiline-array-printer.ts
@@ -1,6 +1,6 @@
 import {Node} from 'estree';
 import {AstPath, ParserOptions, Printer} from 'prettier';
-import {envDebugKey, fillInOptions, MultilineArrayOptions} from '../options';
+import {MultilineArrayOptions, envDebugKey, fillInOptions} from '../options';
 import {printWithMultilineArrays} from './insert-new-lines';
 import {getOriginalPrinter} from './original-printer';
 

diff --git a/src/test/run-tests.ts b/src/test/run-tests.ts
@@ -1,4 +1,4 @@
-import {PartialWithNullable} from '@augment-vir/common';
+import {PartialAndNullable} from '@augment-vir/common';
 import {assert} from 'chai';
 import {it} from 'mocha';
 import {format as prettierFormat, Options as PrettierOptions} from 'prettier';
@@ -37,7 +37,7 @@ export type MultilineArrayTest = {
     name: string;
     code: string;
     expected?: string | undefined;
-    options?: (Partial<MultilineArrayOptions> & PartialWithNullable<PrettierOptions>) | undefined;
+    options?: (Partial<MultilineArrayOptions> & PartialAndNullable<PrettierOptions>) | undefined;
     force?: true;
     exclude?: true;
     failureMessage?: string;

diff --git a/tsconfig.json b/tsconfig.json
@@ -22,6 +22,7 @@
         "useUnknownInCatchVariables": true
     },
     "exclude": [
+        "configs",
         "dist",
         "node_modules",
         "separate-configs",