conflicts unresolved

Author: wizardsimms

.github/workflows/autoformat.yml

@@ -1,8 +1,9 @@
-name: Auto-format code
+name: Auto-format code and update test coverage
 
 on:
   pull_request:
     types: [opened, synchronize, reopened]
+  workflow_dispatch:
 
 permissions:
   contents: write
@@ -38,3 +39,17 @@ jobs:
           commit_user_name: 'LangNav Bot'
           commit_user_email: 'noreply@github.com'
           skip_dirty_check: false
+
+      - name: Compute vitest test coverage, it saves to an untracked JSON file
+        run: npm run test:coverage
+
+      - name: Produce markdown file that's easier to track based on the test coverage
+        run: node scripts/coverage-summary.mjs > test-coverage.md
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'Testing: update test coverage'
+          commit_user_name: 'LangNav Bot'
+          commit_user_email: 'noreply@github.com'
+          skip_dirty_check: false

.github/workflows/test.yml

@@ -4,19 +4,13 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
-permissions:
-  contents: write
-
 jobs:
   test:
     if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -29,17 +23,3 @@ jobs:
 
       - name: Run vitest (.test.tsx) tests
         run: npm run test:run
-
-      - name: Compute vitest test coverage, it saves to an untracked JSON file
-        run: npm run test:coverage
-
-      - name: Produce markdown file that's easier to track based on the test coverage
-        run: node scripts/coverage-summary.mjs > test-coverage.md
-
-      - name: Commit changes to summary
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: 'Tests: Update test coverage'
-          commit_user_name: 'LangNav Bot'
-          commit_user_email: 'noreply@github.com'
-          skip_dirty_check: false

.gitignore

@@ -13,7 +13,7 @@ dist-ssr
 *.local
 
 # Editor directories and files
-.vscode/*
+# .vscode/*
 !.vscode/extensions.json
 .idea
 .DS_Store

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+  // --- Editor formatting ---
+  "editor.formatOnSave": true,
+  // --- Let ESLint run code actions on save ---
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "always", // run all fixers (includes prettier if wired)
+    "source.fixAll.eslint": "always" // explicitly run eslint --fix
+  },
+  // --- ESLint integration ---
+  "eslint.enable": true,
+  "eslint.run": "onType",
+  "eslint.format.enable": true,
+  "eslint.useFlatConfig": true,
+  "eslint.validate": ["typescript", "typescriptreact", "javascript", "javascriptreact"]
+}

README.md

@@ -5,9 +5,9 @@ This repository contain a dataset about the world's languages and language-like
 ![Preview of the website](/public/preview.png)
 
 There are multiple ways to visualize the data
-|Card List|Details|Hierarchy|Table|Reports|
-|--|--|--|--|--|
-|<img src="public/cardlist.png" alt="Card List" style="max-width: 200px;" />|<img src="public/details.png" alt="Details" style="max-width: 200px;" />|<img src="public/hierarchy.png" alt="Hierarchy" style="max-width: 200px;" />|<img src="public/table.png" alt="Table" style="max-width: 200px;" />|<img src="public/reports.png" alt="Reports" style="max-width: 200px;" />
+| Card List | Details | Hierarchy | Table | Reports | Map |
+| --------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------------------------------------------------------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------------------------------------------------------------- |
+| <img src="public/cardlist.png" alt="Card List" style="max-width: 200px;" /> | <img src="public/details.png" alt="Details" style="max-width: 200px;" /> | <img src="public/hierarchy.png" alt="Hierarchy" style="max-width: 200px;" /> | <img src="public/table.png" alt="Table" style="max-width: 200px;" /> | <img src="public/reports.png" alt="Reports" style="max-width: 200px;" /> | <img src="public/map.png" alt="Map" style="max-width: 200px;" /> |
 
 ## Project Overview
 
@@ -97,8 +97,8 @@ Here's a list of planned functionality. Completed functions are checked off.
     - [x] ISO parent/child connections
     - [x] Language families
     - [x] Glottolog
-    - [ ] Digital Support details
-    - [ ] Vitality details
+    - [x] Digital Support details
+    - [x] Vitality details
     - [ ] Keyboard availability details
   - [x] Territories
     - [x] Countries & Dependencies
@@ -110,18 +110,20 @@ Here's a list of planned functionality. Completed functions are checked off.
   - [x] Writing Systems
     - [x] Basic data
     - [x] Relationship w/ other writing systems (containment, lineage)
-  - [ ] Language Variants / IANA tags
+  - [x] Language Variants / IANA tags
   - [x] Censuses
     - [x] Regular censuses
     - [x] Include citation information
-    - [ ] Continue importing new censuses
+    - [x] Continue importing new censuses
     - [ ] Convert other imported datasets into census-like objects
 - [x] Views
   - [x] Cards
   - [x] Details
   - [x] Hierarchy
   - [x] Table
-  - [ ] Map
+  - [x] Map
+    - [ ] Extend for more data layers
+  - [ ] Graphs
   - [x] Reports
     - [x] Language name overlap
     - [ ] Invalid languages
@@ -148,7 +150,7 @@ Here's a list of planned functionality. Completed functions are checked off.
   - [x] Visual options
     - [x] Change locale separator (\_ or -)
   - [ ] Selection
-  - [ ] Export
+  - [x] Export
 - [ ] Manage data sources
   - [x] Show results based on different definitions of what a language is
     - [x] ISO, Glottolog, CLDR, All

eslint.config.js

@@ -50,7 +50,27 @@ export default defineConfig([
       'import/order': [
         'warn',
         {
-          groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
+          groups: [
+            'builtin', // fs, path, url, etc.
+            'external', // react, lodash, etc.
+            'internal', // @shared, @features, ...
+            'parent', // ../
+            'sibling', // ./
+            'index', // ./ (index)
+            'object', // import('pkg').prop
+            'type', // import type { X } ...
+          ],
+          pathGroups: [
+            { pattern: '@app/**', group: 'internal', position: 'after' },
+            { pattern: '@pages/**', group: 'internal', position: 'after' },
+            { pattern: '@widgets/**', group: 'internal', position: 'after' },
+            { pattern: '@features/**', group: 'internal', position: 'after' },
+            { pattern: '@entities/**', group: 'internal', position: 'after' },
+            { pattern: '@shared/**', group: 'internal', position: 'after' },
+            { pattern: '@strings/**', group: 'internal', position: 'after' },
+            { pattern: '@tests/**', group: 'internal', position: 'after' },
+          ],
+          pathGroupsExcludedImportTypes: ['builtin'],
           'newlines-between': 'always',
           alphabetize: { order: 'asc', caseInsensitive: true },
         },

index.html

@@ -7,6 +7,6 @@
   </head>
   <body>
     <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
+    <script type="module" src="/src/app/main.tsx"></script>
   </body>
 </html>

package-lock.json

@@ -1,4 +1,4 @@
-{
+ {
   "name": "lang-nav",
   "private": true,
   "version": "0.0.0",
@@ -37,9 +37,9 @@
     "@vitejs/plugin-react": "^4.3.4",
     "@vitest/coverage-v8": "^3.2.4",
     "eslint": "^9.30.1",
-    "eslint-config-prettier": "^10.1.2",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",

package.json

@@ -3,8 +3,7 @@
 #isoRegionCode		AR
 #yearCollected		2022
 #datePublished		2024
-#eligiblePopulation		382,697
-#respondingPopulation		300,541
+#eligiblePopulation		46,044,703
 #notes		Census - de jure - complete tabulation
 #modality		Spoken
 #domain		Home