Merge branch 'multitheftauto:main' into feature/changelog-property

Author: FileEX

.github/workflows/build.yaml

@@ -0,0 +1,24 @@
+name: Build
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - name: Install dependencies and build
+        working-directory: ./web
+        run: |
+          npm install
+          npm run build

.github/workflows/codeql.yml

@@ -0,0 +1,100 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '31 4 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: javascript-typescript
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/validate.yaml

@@ -1,5 +1,8 @@
 name: YAML validation
 
+permissions:
+  contents: read
+
 on:
   push:
     paths:

web/.gitignore

@@ -19,3 +19,7 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
+
+# tmLanguage file
+src/grammars/
+public/grammars/

web/ec.config.mjs

@@ -0,0 +1,17 @@
+import fs from 'fs';
+
+export default {
+  themes: [
+    JSON.parse(fs.readFileSync('./src/themes/mtasa_lua-theme_dark.json', 'utf-8')),
+    JSON.parse(fs.readFileSync('./src/themes/mtasa_lua-theme_light.json', 'utf-8')),
+  ],
+  shiki: {
+    langs: [
+      {
+        id: 'lua',
+        scopeName: 'source.lua.mta',
+        ...JSON.parse(fs.readFileSync('./src/grammars/lua-mta.tmLanguage.json', 'utf-8')),
+      },
+    ],
+  },
+};

web/mta_highlighting/generate-lua-tmlanguage.js

@@ -0,0 +1,73 @@
+import fs from 'fs';
+import path from 'path';
+import yaml from 'js-yaml';
+import { glob } from 'glob';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const functionsDir = path.resolve(__dirname, '../../functions');
+const basePath = path.resolve(__dirname, './lua-base.tmLanguage.json');
+const outputPath = path.resolve(__dirname, '../src/grammars/lua-mta.tmLanguage.json');
+const publicPath = path.resolve(__dirname, '../public/grammars/lua-mta.tmLanguage.json');
+
+const mtaKeywords = ['string','bool','boolean','number','int','float','element','player','vehicle','ped','object','building'];
+
+function extractFunctionsWithScope(yamlContent) {
+  if (yamlContent.shared?.name) {
+    return [{ name: yamlContent.shared.name, scope: 'support.function.mta-shared' }];
+  } else if (yamlContent.client?.name) {
+    return [{ name: yamlContent.client.name, scope: 'support.function.mta-client' }];
+  } else if (yamlContent.server?.name) {
+    return [{ name: yamlContent.server.name, scope: 'support.function.mta-server' }];
+  }
+  return [];
+}
+
+async function generateTmLanguage() {
+  const files = await glob('**/*.yaml', { cwd: functionsDir, absolute: true });
+
+  const functionsMap = Object.fromEntries(
+    ['shared', 'server', 'client'].map(scope => [`support.function.mta-${scope}`, new Set()])
+  );
+
+  files.forEach(file => {
+    const yamlContent = yaml.load(fs.readFileSync(file, 'utf-8'));
+    console.log('Processing file:', file);
+
+    const items = Array.isArray(yamlContent) ? yamlContent : [yamlContent];
+    items.flatMap(extractFunctionsWithScope).forEach(({ name, scope }) => functionsMap[scope].add(name));
+  });
+
+  const patterns = Object.entries(functionsMap)
+    .filter(([, namesSet]) => namesSet.size > 0)
+    .map(([scope, namesSet]) => ({
+      match: `\\b(${Array.from(namesSet).join('|')})\\b`,
+      name: scope,
+    }));
+
+  if (mtaKeywords.length > 0) {
+    patterns.push({
+      match: `\\b(${mtaKeywords.join('|')})\\b`,
+      name: 'keyword.mta',
+    });
+  }
+
+  const baseGrammar = JSON.parse(fs.readFileSync(basePath, 'utf-8'));
+  baseGrammar.patterns = [...patterns, ...(baseGrammar.patterns || [])];
+
+  // Ensure the directoroes exist
+  fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+  fs.mkdirSync(path.dirname(publicPath), { recursive: true });
+
+  // Write the updated grammar to the output file
+  fs.writeFileSync(outputPath, JSON.stringify(baseGrammar, null, 2));
+  
+  // Create file also in public directory for clickable keywords
+  fs.copyFileSync(outputPath, publicPath);
+  
+  console.log(`Done!`);
+}
+
+generateTmLanguage();

web/mta_highlighting/generate-tmlanguage.cmd

@@ -0,0 +1,3 @@
+@echo off
+node generate-lua-tmlanguage.js
+pause