Prettier (#203)

* Enabled prettier * Update lint, fix issues * Restore some array formatting
whscullin · Nov 24, 2023 · 1e79d9d · 1e79d9d
1 parent e789111
commit 1e79d9d
Show file tree

Hide file tree

Showing 172 changed files with 35,282 additions and 33,599 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,5 @@
 dist
 json/disks/index.js
 node_modules
+submodules
 tmp
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,23 +1,17 @@
 {
     // Global
     "root": true,
+    "plugins": [
+        "prettier"
+    ],
     "parser": "@typescript-eslint/parser",
     "extends": [
         "eslint:recommended",
+        "plugin:prettier/recommended",
         "plugin:jest/recommended"
     ],
     "rules": {
-        "indent": [
-            "error",
-            4,
-            {
-                "SwitchCase": 1
-            }
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
+        "prettier/prettier": "error",
         "linebreak-style": [
             "error",
             "unix"
@@ -80,12 +74,6 @@
             "rules": {
                 // recommended is just "warn"
                 "@typescript-eslint/no-explicit-any": "error",
-                // enforce semicolons at ends of statements
-                "semi": "off",
-                "@typescript-eslint/semi": [
-                    "error",
-                    "always"
-                ],
                 // enforce semicolons to separate members
                 "@typescript-eslint/member-delimiter-style": [
                     "error",

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -3,25 +3,25 @@ name: Node CI
 on: [push]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+    build:
+        runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x]
+        strategy:
+            matrix:
+                node-version: [16.x, 18.x]
 
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: "true"
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: npm install, build, and test
-        run: |
-          npm ci
-          npm run build --if-present
-          npm test
-        env:
-          CI: true
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  submodules: 'true'
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: npm install, build, and test
+              run: |
+                  npm ci
+                  npm run build --if-present
+                  npm test
+              env:
+                  CI: true
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,2 @@
+js/roms
+submodules
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,6 @@
+{
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": true
+}
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -1,10 +1,9 @@
 {
-  "extends": [
-    "stylelint-config-standard-scss",
-    "stylelint-config-css-modules"
-  ],
-  "rules": {
-    "indentation": 4,
-    "selector-class-pattern": "^[a-z][a-zA-Z0-9_-]+$"
-  }
+    "extends": [
+        "stylelint-config-standard-scss",
+        "stylelint-config-css-modules"
+    ],
+    "rules": {
+        "selector-class-pattern": "^[a-z][a-zA-Z0-9_-]+$"
+    }
 }
diff --git a/README.md b/README.md
@@ -46,132 +46,134 @@ then
 
 ### 2019-03-02
 
-* Behind the scenes
+-   Behind the scenes
 
     A lot of not so visible changes behind the scenes. The website now runs directly off of github, and has a more modern toolchain (Goodbye make, Perl and closure compiler, hello Webpack!) to facilitate development.
 
-* Performance
+-   Performance
 
     In particular, the screen no longer redraws as quickly as possible.
 
-* Drag and Drop
+-   Drag and Drop
 
     Disk images can be dragged into the window to load them.
 
-* Contributions
+-   Contributions
 
     Thanks to [Ian Flanigan](https://github.com/iflan) for additions to improve ChromeBook behavior.
 
 ### 2017-10-08
 
-* Better iOS support
+-   Better iOS support
 
     Bluetooth keyboards now work better. Reset is Ctrl-Shift-Delete. iOS now allows loading disks from iCloud and services like Drop Box. Saving locally is still not supported by iOS. I now understand why sound doesn't work, and I'm working on a work-around.
 
-* Source Maps
+-   Source Maps
 
     Although the source code has always been available, by default I serve up minified Javascript for performance reasons. But now you can poke around more easily.
 
 ## Updates (2017-08-31)
 
 (It's been a long time since I updated, so this is a rough list)
 
-* Videx Videoterm Emulation (\]\[js)
+-   Videx Videoterm Emulation (\]\[js)
 
     PR#3 now does something on the Apple \]\[!.
 
-* AppleColor RGB Card Emulation (//jse)
+-   AppleColor RGB Card Emulation (//jse)
 
     Now supports a bunch of the mostly non-standard video formats found on the AppleColor RGB card, including 16 color text, 16 color hires mode, and mixed black and white and color double hires
-* Machine selection
+
+-   Machine selection
 
     You can now select between original, autostart and plus Apple \]\[s, and unenhanced and enhanced //es.
 
 ## Updates (2013-07-04)
 
-* RAMFactor Emulation (//jse)
+-   RAMFactor Emulation (//jse)
 
     I now simulate having a 1 Megabyte RAMFactor card in slot 2.
 
-* Thunderclock Emulation
+-   Thunderclock Emulation
 
     There is cursory emulation of the Thunderclock card, enough to keep ProDOS applications from asking you to enter the date all the time. ProDOS attempts to guess the year from the month, the day and the day of the week, something that needs to be patched every 6 years. This means newer versions think it's 1996, older versions are stuck in the 80s.
 
-* Firefox Nightly Joystick Support
+-   Firefox Nightly Joystick Support
 
     Joystick support has yet to officially land, but the latest nightlies support the gamepad API.
 
 ## Updates (2013-03-20)
 
-* Animation Frames
+-   Animation Frames
 
     I've switched from using setInterval() to requestAnimationFrame() where supported. This, in conjunction with the graphics re-write, seems to smooth performance and provide a more stable CPU speed.
-* Graphics Re-Write
+
+-   Graphics Re-Write
 
     This (third) re-write of the graphics system should improve performance with graphics intensive programs. Rather than rendering each graphics update as it happens, updates are rendered each animation frame.
 
 ## Updates (2013-03-12)
 
-* Apple //e
+-   Apple //e
 
     After much flailing, and much staring at MMU emulation code in despair, I've finally published my Apple //e emulator. It's probably a little more rough than I'd hoped, but it has a lot of features that I really wanted to get into it, like basic double hires support, and it uses the enhanced Apple //e ROMs.
 
 ## Updates (2013-02-25)
 
-* Joystick Support
+-   Joystick Support
 
     Chrome only so far, the nascent gamepad API has finally allowed me to add basic joystick support. I can now re-live my glory days of Skyfox.
 
-* Re-written CPU emulator
+-   Re-written CPU emulator
 
     I finally got around to applying some of the many lessons I learned along the way writing my first CPU emulator in Javascript. The last re-working gave me about a 100% performance gain.
 
-* Finally Fixed Oregon Trail
+-   Finally Fixed Oregon Trail
 
     This seems to have been a major disappointment for many people. I was able to make it as a banker, but I'm embarassed to reveal my score.
 
-* Competition
+-   Competition
 
     Now in addition to [Gil Megidish's](http://www.megidish.net/apple2js/) Apple2JS, there's a couple of new kids on the block, including [David Caldwell's](http://porkrind.org/a2/) Apple II+ emulator where he's put a lot more thought into the graphics rendering than I have, and [appletoo](https://github.com/nicholasbs/appletoo), which I just stumbled across while looking for David's emulator and haven't had much time to look at.
 
 ## Requirements
 
-* A Browser with HTML5 Support
+-   A Browser with HTML5 Support
 
     The most recent versions of [Google Chrome](https://www.google.com/chrome/), [Safari](https://www.apple.com/safari/), [Firefox](https://www.firefox.com/), and [Opera](https//www.opera.com/) all seem to work reasonably well these days,although variations in HTML5 support pop up, and occasionally a major release will move things around out from under me. IE prior to 9 lacks canvas tag support and is unsupported. [IE 9+](https://windows.microsoft.com/ie9) renders nicely on a modern machine.
 
-* Basic Knowledge of the Apple \]\[
+-   Basic Knowledge of the Apple \]\[
 
     If you don't know how to use an Apple \]\[, this won't be much fun for you.
 
 ## Acknowledgements
 
-* I'm using the following libraries:
+-   I'm using the following libraries:
 
-  * [jQuery](https://jquery.com) and [jQuery UI](https://jqueryui.com)
-  * Base64 Utilities via [KvZ](http://kevin.vanzonneveld.net/)
-  * LED graphics from [Modern Life](http://modernl.com/).
-  * [CFFA2 Firmware](http://dreher.net/?s=projects/CFforAppleII&c=projects/CFforAppleII/downloads1.php) by Chris Schumann, Rich Dreher and Dave Lyons
+    -   [jQuery](https://jquery.com) and [jQuery UI](https://jqueryui.com)
+    -   Base64 Utilities via [KvZ](http://kevin.vanzonneveld.net/)
+    -   LED graphics from [Modern Life](http://modernl.com/).
+    -   [CFFA2 Firmware](http://dreher.net/?s=projects/CFforAppleII&c=projects/CFforAppleII/downloads1.php) by Chris Schumann, Rich Dreher and Dave Lyons
 
-* I heavily referenced:
+-   I heavily referenced:
 
-  * [_Beneath Apple DOS_](http://www.scribd.com/doc/200679/Beneath-Apple-DOS-By-Don-Worth-and-Pieter-Lechner) by Don Worth and Pieter Lechner
-  * _Inside the Apple //e_ by Gary B. Little
-  * [_DOS 3.3 Anatomy_](http://apple2.org.za/gswv/a2zine/GS.WorldView/Resources/DOS.3.3.ANATOMY/)
-  * [_Apple II Disk Drive Article_](http://www.doc.ic.ac.uk/~ih/doc/stepper/others/example3/diskii_specs.html) by Neil Parker
-  * [6502.org](http://6502.org/)
-  * The [comp.sys.apple2.programmer](http://www.faqs.org/faqs/apple2/programmerfaq/part1/) FAQ
-  * [Understanding the Apple \]\[](https://archive.org/details/understanding_the_apple_ii) and [Understanding the Apple //e](https://archive.org/details/Understanding_the_Apple_IIe) by Jim Sather.
-  * [Apple II Colors](https://mrob.com/pub/xapple2/colors.html) by Robert Munafo.
+    -   [_Beneath Apple DOS_](http://www.scribd.com/doc/200679/Beneath-Apple-DOS-By-Don-Worth-and-Pieter-Lechner) by Don Worth and Pieter Lechner
+    -   _Inside the Apple //e_ by Gary B. Little
+    -   [_DOS 3.3 Anatomy_](http://apple2.org.za/gswv/a2zine/GS.WorldView/Resources/DOS.3.3.ANATOMY/)
+    -   [_Apple II Disk Drive Article_](http://www.doc.ic.ac.uk/~ih/doc/stepper/others/example3/diskii_specs.html) by Neil Parker
+    -   [6502.org](http://6502.org/)
+    -   The [comp.sys.apple2.programmer](http://www.faqs.org/faqs/apple2/programmerfaq/part1/) FAQ
+    -   [Understanding the Apple \]\[](https://archive.org/details/understanding_the_apple_ii) and [Understanding the Apple //e](https://archive.org/details/Understanding_the_Apple_IIe) by Jim Sather.
+    -   [Apple II Colors](https://mrob.com/pub/xapple2/colors.html) by Robert Munafo.
 
-* And special thanks to:
+-   And special thanks to:
 
-  * [ADTPro](http://adtpro.sourceforge.net/) for allowing me to pull some of my circa 1980 programming efforts off some ancient floppies.
-  * [KEGS](http://kegs.sourceforge.net/), because at some point I got so tired of futzing with ADC/SBC code I just ported the KEGS C code for those opcodes to Javascript so I could stop worrying about it.
-  * [Apple II History](http://apple2history.org/), for a lovely, informative site.
-  * [Gil Megidish](http://www.megidish.net/apple2js/), for the kick in the pants to finally post my version, once I realized there was, in fact, another apple2js in the world.
-  * [AppleWin](https://github.com/AppleWin/AppleWin/), whose source code is a goldmine of useful references.
-  * [Zellyn Hunter](https://github.com/zellyn/a2audit) and a2audit, for allowing me to get really nitpicky in my memory emulation.
+    -   [ADTPro](http://adtpro.sourceforge.net/) for allowing me to pull some of my circa 1980 programming efforts off some ancient floppies.
+    -   [KEGS](http://kegs.sourceforge.net/), because at some point I got so tired of futzing with ADC/SBC code I just ported the KEGS C code for those opcodes to Javascript so I could stop worrying about it.
+    -   [Apple II History](http://apple2history.org/), for a lovely, informative site.
+    -   [Gil Megidish](http://www.megidish.net/apple2js/), for the kick in the pants to finally post my version, once I realized there was, in fact, another apple2js in the world.
+    -   [AppleWin](https://github.com/AppleWin/AppleWin/), whose source code is a goldmine of useful references.
+    -   [Zellyn Hunter](https://github.com/zellyn/a2audit) and a2audit, for allowing me to get really nitpicky in my memory emulation.
 
-* Contributors
-  * [Snapperfish](http://github.com/Snapperfish) Various fixes
+-   Contributors
+    -   [Snapperfish](http://github.com/Snapperfish) Various fixes
diff --git a/babel.config.js b/babel.config.js
@@ -12,16 +12,17 @@ module.exports = {
         [
             '@babel/typescript',
             {
-                jsxPragma: 'h'
-            }
+                jsxPragma: 'h',
+            },
         ],
     ],
     plugins: [
         [
-            '@babel/plugin-transform-react-jsx', {
+            '@babel/plugin-transform-react-jsx',
+            {
                 pragma: 'h',
                 pragmaFrag: 'Fragment',
-            }
-        ]
-    ]
+            },
+        ],
+    ],
 };
diff --git a/bin/dsk2json b/bin/dsk2json
@@ -44,7 +44,7 @@ function read2MG(fileData) {
     return {
         diskData: fileData.slice(headerLength),
         type: type,
-        readOnly: readOnly
+        readOnly: readOnly,
     };
 }
 
@@ -53,11 +53,11 @@ function readTracks(type, diskData) {
 
     if (type === 'nib') {
         let start = 0;
-        let end = 0x1A00;
+        let end = 0x1a00;
         while (start < diskData.length) {
             const trackData = diskData.slice(start, end);
-            start += 0x1A00;
-            end += 0x1A00;
+            start += 0x1a00;
+            end += 0x1a00;
 
             tracks.push(trackData.toString('base64'));
         }
@@ -82,7 +82,6 @@ function readTracks(type, diskData) {
 
 const fileName = argv._[0];
 
-
 let readOnly = argv.r || argv.readOnly ? true : undefined;
 const name = argv.n || argv.name;
 const category = argv.c || argv.category;
@@ -110,7 +109,7 @@ fs.readFile(fileName, (err, fileData) => {
     let diskData;
 
     if (type === '2mg') {
-        ({diskData, readOnly, type} = read2MG(fileData));
+        ({ diskData, readOnly, type } = read2MG(fileData));
     } else {
         diskData = fileData;
     }
@@ -123,7 +122,7 @@ fs.readFile(fileName, (err, fileData) => {
         readOnly,
         disk,
         '2e': e,
-        data: readTracks(type, diskData)
+        data: readTracks(type, diskData),
     };
 
     Object.keys(entry).forEach((key) => {

diff --git a/bin/index b/bin/index
@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-
 const fs = require('fs');
 const path = require('path');
 
@@ -13,8 +12,12 @@ for (const fileName of dir.sort()) {
     if (/\.json$/.test(fileName)) {
         const json = fs.readFileSync(path.resolve(diskPath, fileName));
         const data = JSON.parse(json);
-        if (data.private) { continue; }
-        if (!data.name || !data.category) { continue; }
+        if (data.private) {
+            continue;
+        }
+        if (!data.name || !data.category) {
+            continue;
+        }
 
         const entry = {
             filename: `json/disks/${fileName}`,