Modified destructuring style

GMOD · Nov 9, 2023 · fe0a131 · fe0a131
1 parent 01ba4c7
commit fe0a131
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -4,14 +4,14 @@ on: push
 
 jobs:
   test:
-    name: Lint, build, and test on node 14.x and ubuntu-latest
+    name: Lint, build, and test on node 20.x and ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 20.x
       - name: Install deps (with cache)
         uses: bahmutov/npm-install@v1
       - name: Lint codebase

diff --git a/README.md b/README.md
@@ -192,7 +192,7 @@ as it performs more validity checks than using `set()`.
 *   `raFile` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)** An ra file, either as a single
     string or an array of strings with one stanza per entry. Supports both LF
     and CRLF line terminators. (optional, default `[]`)
-*   `options` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `{checkIndent:true,skipValidation:false}`)
+*   `options` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
 
     *   `options.checkIndent` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** \[true] - Check if a the stanzas within
         the file are indented consistently and keep track of the indentation
@@ -268,7 +268,7 @@ than using `set()`.
 *   `stanza` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)** An ra file stanza, either as a
     string or a array of strings with one line per entry. Supports both LF and
     CRLF line terminators. (optional, default `[]`)
-*   `options` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `{checkIndent:true,skipValidation:false}`)
+*   `options` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
 
     *   `options.checkIndent` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** \[true] - Check if a stanza is indented
         consistently and keep track of the indentation

diff --git a/src/raFile.ts b/src/raFile.ts
@@ -30,13 +30,10 @@ export default class RaFile extends Map<string, RaStanza> {
 
   constructor(
     raFile: string | string[] = [],
-    options: { checkIndent?: boolean; skipValidation?: boolean } = {
-      checkIndent: true,
-      skipValidation: false,
-    },
+    options?: { checkIndent?: boolean; skipValidation?: boolean },
   ) {
     super()
-    const { checkIndent } = options
+    const { checkIndent = true, skipValidation = false } = options || {}
     this._checkIndent = !!checkIndent
     let stanzas: string[]
     if (typeof raFile === 'string') {
@@ -51,7 +48,7 @@ export default class RaFile extends Map<string, RaStanza> {
       this.add(stanza)
     })
 
-    if (!options.skipValidation) {
+    if (!skipValidation) {
       this.validate()
     }
   }

diff --git a/src/raStanza.ts b/src/raStanza.ts
@@ -45,13 +45,10 @@ export default class RaStanza extends Map<string, string> {
 
   constructor(
     stanza: string | string[] = [],
-    options: { checkIndent?: boolean; skipValidation?: boolean } = {
-      checkIndent: true,
-      skipValidation: false,
-    },
+    options?: { checkIndent?: boolean; skipValidation?: boolean },
   ) {
     super()
-    const { checkIndent } = options
+    const { checkIndent = true, skipValidation = false } = options || {}
     this._checkIndent = !!checkIndent
     let stanzaLines: string[]
     if (typeof stanza === 'string') {
@@ -66,7 +63,7 @@ export default class RaStanza extends Map<string, string> {
       this.add(line)
     })
 
-    if (!options.skipValidation) {
+    if (!skipValidation) {
       this.validate()
     }
   }