[pull] master from diygod:master

.devcontainer/devcontainer.json

@@ -16,9 +16,9 @@
                 "EditorConfig.EditorConfig",
                 "esbenp.prettier-vscode",
                 "deepscan.vscode-deepscan",
-                "rangav.vscode-thunder-client",
                 "SonarSource.sonarlint-vscode",
                 "unifiedjs.vscode-mdx",
+                "VASubasRaj.flashpost", // Thunder Client is paywalled in WSL/Codespaces/SSH > 2.30.0
                 "ZihanLi.at-helper"
             ]
         }

.github/workflows/dependabot-fork.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Comment Dependabot PR
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@v3
         with:
           message: '@dependabot ignore this dependency'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-test-cont.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Fetch Docker image
         if: (env.TEST_CONTINUE)
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v7
         with:
           workflow: ${{ github.event.workflow_run.workflow_id }}
           run_id: ${{ github.event.workflow_run.id }}

.github/workflows/issue-command.yml

@@ -42,12 +42,31 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     permissions:
-      issues: write
       attestations: write
+      issues: write
+      pull-requests: write
     steps:
+      - name: Fetch PR data (for PR)
+        if: github.event.issue.pull_request
+        uses: octokit/[email protected]
+        id: pr-data
+        with:
+          route: GET /repos/{repo}/pulls/{number}
+          repo: ${{ github.repository }}
+          number: ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Checkout
+        if: ${{ !github.event.issue.pull_request }}
         uses: actions/checkout@v4
 
+      - name: Checkout PR
+        if: github.event.issue.pull_request
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ fromJson(steps.pr-data.outputs.data).head.ref }}
+
       - name: Install pnpm
         uses: pnpm/action-setup@v4
 
@@ -105,7 +124,7 @@ jobs:
             await test({ github, context, core }, link, routes, number)
 
       - name: Print logs
-        if: (env.TEST_CONTINUE)
+        if: env.TEST_CONTINUE
         run: cat ${{ github.workspace }}/logs/combined.log
 
       - name: Upload Artifact

.github/workflows/npm-publish.yml

@@ -24,8 +24,7 @@ jobs:
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          # pinned to 18 until https://github.com/compulim/version-from-git/issues/16 is fixed
-          node-version: 18
+          node-version: lts/*
           cache: 'pnpm'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies (pnpm)

.github/workflows/test.yml

@@ -15,31 +15,6 @@ permissions:
   checks: write
 
 jobs:
-  fix-pnpm-lock:
-    # workaround for https://github.com/dependabot/dependabot-core/issues/7258
-    # until https://github.com/pnpm/pnpm/issues/6530 is fixed
-    if: github.triggering_actor == 'dependabot[bot]' && github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-          cache: 'pnpm'
-      - run: |
-          rm pnpm-lock.yaml
-          pnpm i
-      - uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: 'chore: fix pnpm install'
-          commit_user_name: dependabot[bot]
-          commit_user_email: 49699333+dependabot[bot]@users.noreply.github.com
-          commit_author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-
   vitest:
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -52,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 20, 22 ]
+        node-version: [ latest, lts/*, lts/-1 ]
     name: Vitest on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v4
@@ -72,8 +47,8 @@ jobs:
         env:
           REDIS_URL: redis://localhost:${{ job.services.redis.ports[6379] }}/
       - name: Upload coverage to Codecov
-        if: ${{ matrix.node-version == '20' }}
-        uses: codecov/codecov-action@v4
+        if: ${{ matrix.node-version == 'lts/*' }}
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos as documented, but seems broken
 
@@ -83,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 20, 22 ]
+        node-version: [ latest, lts/*, lts/-1 ]
         chromium:
           - name: bundled Chromium
             dependency: ''
@@ -140,7 +115,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 20, 22 ]
+        node-version: [ 23, 22, 20 ]
     name: Build radar and maintainer on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v4

.gitpod.yml

@@ -32,7 +32,7 @@ vscode:
     - EditorConfig.EditorConfig
     - esbenp.prettier-vscode
     - deepscan.vscode-deepscan
-    - rangav.vscode-thunder-client
     - sonarsource.sonarlint-vscode
+    # - VASubasRaj.flashpost not available on Open VSX, Thunder Client is paywalled in WSL/Codespaces/SSH > 2.30.0
     - unifiedjs.vscode-mdx
     # - ZihanLi.at-helper not available on Open VSX

Dockerfile

@@ -8,6 +8,7 @@ WORKDIR /app
 ARG USE_CHINA_NPM_REGISTRY=0
 RUN \
     set -ex && \
+    corepack enable pnpm && \
     if [ "$USE_CHINA_NPM_REGISTRY" = 1 ]; then \
         echo 'use npm mirror' && \
         npm config set registry https://registry.npmmirror.com && \
@@ -23,7 +24,6 @@ COPY ./package.json /app/
 RUN \
     set -ex && \
     export PUPPETEER_SKIP_DOWNLOAD=true && \
-    corepack enable pnpm && \
     pnpm install --frozen-lockfile && \
     pnpm rb
 

eslint.config.mjs

@@ -99,7 +99,10 @@ export default [{
 
         'no-restricted-syntax': ['warn', {
             selector: "CallExpression[callee.property.name='get'][arguments.length=0]",
-            message: "Please use toArray instead.",
+            message: "Please use .toArray() instead.",
+        }, {
+            selector: "CallExpression[callee.property.name='toArray'] MemberExpression[object.callee.property.name='map']",
+            message: "Please use .toArray() before .map().",
         }],
 
         'no-unneeded-ternary': 'error',
@@ -179,6 +182,7 @@ export default [{
         }],
 
         'unicorn/prefer-code-point': 'warn',
+        'unicorn/prefer-global-this': 'off',
         'unicorn/prefer-logical-operator-over-ternary': 'warn',
         'unicorn/prefer-module': 'off',
         'unicorn/prefer-node-protocol': 'off',

lib/api/category/one.ts

@@ -32,23 +32,50 @@ const ParamsSchema = z.object({
     }),
 });
 
+const QuerySchema = z.object({
+    categories: z
+        .string()
+        .transform((val) => val.split(','))
+        .optional(),
+    lang: z.string().optional(),
+});
+
 const route = createRoute({
     method: 'get',
     path: '/category/{category}',
     tags: ['Category'],
     request: {
+        query: QuerySchema,
         params: ParamsSchema,
     },
     responses: {
         200: {
-            description: 'Namespace list by category',
+            description: 'Namespace list by categories and language',
         },
     },
 });
 
 const handler: RouteHandler<typeof route> = (ctx) => {
+    const { categories, lang } = ctx.req.valid('query');
     const { category } = ctx.req.valid('param');
-    return ctx.json(categoryList[category]);
+
+    let allCategories = [category];
+    if (categories && categories.length > 0) {
+        allCategories = [...allCategories, ...categories];
+    }
+
+    // Get namespaces that exist in all requested categories
+    const commonNamespaces = Object.keys(categoryList[category] || {}).filter((namespace) => allCategories.every((cat) => categoryList[cat]?.[namespace]));
+
+    // Create result directly from common namespaces
+    let result = Object.fromEntries(commonNamespaces.map((namespace) => [namespace, categoryList[category][namespace]]));
+
+    // Filter by language if provided
+    if (lang) {
+        result = Object.fromEntries(Object.entries(result).filter(([, value]) => value.lang === lang));
+    }
+
+    return ctx.json(result);
 };
 
 export { route, handler };