use pnpm and upgrade deps (#45)

.eslintignore

@@ -1,4 +1,3 @@
-package-lock.json
 node_modules
 addon/gn
 build

.github/workflows/integration.yml

@@ -15,12 +15,16 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
+      - name: Install Pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: latest
       - name: Install NodeJS
         uses: actions/setup-node@v3
         with:
           node-version: latest
           check-latest: true
-          cache: npm
+          cache: pnpm
       - name: Install Python
         uses: actions/setup-python@v4
         with:
@@ -39,8 +43,8 @@ jobs:
               sudo apt install -y ninja-build
               ;;
             macOS)
-              brew install llvm@15 ninja
-              addpath "$(brew --prefix llvm@15)/bin"
+              brew install llvm ninja
+              addpath "$(brew --prefix llvm)/bin"
               ;;
             Windows)
               choco install ninja
@@ -66,13 +70,13 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('addon/deps.json') }}
           path: addon/gn
       - name: Prepare Dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
       - name: Build Debug
-        run: npm run debug
+        run: pnpm debug
       - name: Run Test
-        run: npm test
+        run: pnpm test
       - name: Build Release
-        run: npm run build
+        run: pnpm build
       - name: Upload Archive
         uses: actions/upload-artifact@v3
         if: ${{ runner.os == 'Linux' }}

.prettierignore

@@ -1,4 +1,4 @@
-package-lock.json
+pnpm-lock.yaml
 node_modules
 addon/gn
 build

addon/addon.cc

@@ -36,10 +36,10 @@ enum class GNSymbolKind {
 };
 
 struct GNDocumentSymbol {
-  const GNSymbolKind kind = GNSymbolKind::Unknown;
-  const LocationRange range;
-  const std::string name;
-  const LocationRange selection_range;
+  GNSymbolKind kind = GNSymbolKind::Unknown;
+  LocationRange range;
+  std::string name;
+  LocationRange selection_range;
   std::list<GNDocumentSymbol> children;
 };
 
@@ -423,13 +423,15 @@ class GNDocument {
         case Token::EQUAL:
         case Token::PLUS_EQUALS:
         case Token::MINUS_EQUALS:
-          result.emplace_back(
+          result.emplace_back() =
               GNDocumentSymbol{GNSymbolKind::Variable,
                                binary_op->GetRange(),
                                ExpressionToString(binary_op->left()),
                                binary_op->left()->GetRange(),
-                               {}});
-        default:;
+                               {}};
+          break;
+        default:
+          break;
       }
     } else if (const auto* function_call = node->AsFunctionCall()) {
       // Call        = identifier "(" [ ExprList ] ")" [ Block ] .
@@ -441,7 +443,7 @@ class GNDocument {
                               selection_range,
                               {}};
       symbol.children = ConstructDocumentSymbolAST(function_call->block());
-      result.emplace_back(symbol);
+      result.emplace_back() = std::move(symbol);
     } else if (const auto* condition = node->AsCondition()) {
       // Condition     = "if" "(" Expr ")" Block
       //                 [ "else" ( Condition | Block ) ] .
@@ -457,7 +459,7 @@ class GNDocument {
             elseNode->GetRange(), ConstructDocumentSymbolAST(elseNode)};
         symbol.children.emplace_back(elseSymbol);
       }
-      result.emplace_back(std::move(symbol));
+      result.emplace_back() = std::move(symbol);
     } else if (const auto* block = node->AsBlock()) {
       // Block        = "{" [ StatementList ] "}" .
       for (const auto& statement : block->statements()) {

addon/deps.json

@@ -2,7 +2,7 @@
   {
     "name": "gn",
     "repo": "https://gn.googlesource.com/gn",
-    "commit": "ffeea1b1fd070cb6a8d47154a03f8523486b50a7",
+    "commit": "e4702d7409069c4f12d45ea7b7f0890717ca3f4b",
     "patches": ["gn.patch"]
   }
 ]

jest.config.ts

@@ -1,6 +1,6 @@
-import type {Config} from '@jest/types'
+import type {Config} from 'jest'
 
-export default <Config.InitialOptions>{
+export default {
   roots: ['<rootDir>/src'],
   transform: {'\\.tsx?$': 'ts-jest'},
-}
+} as Config