Merge pull request #694 from sir-gon/develop

Develop

Author: sir-gon

.github/workflows/eslint-code-scanning.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 24.x
 
       - name: Install ESLint
         run: |

.github/workflows/eslint.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-24.04", "macos-14", "windows-2022"]
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x, 24.x]
         # See supported Node.js release schedule
         # at https://nodejs.org/en/about/releases/
     permissions:
@@ -43,7 +43,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: ${{ matrix.node-version }}
 
       - name: Install ESLint
         run: |

.github/workflows/markdown-lint.yml

@@ -16,20 +16,14 @@ jobs:
     name: Markdown Lint
     runs-on: ubuntu-24.04
 
-    strategy:
-      matrix:
-        node-version: [22.x]
-        # See supported Node.js release schedule
-        # at https://nodejs.org/en/about/releases/
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: Set up Node.js ${{ matrix.node-version }}
+      - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 24.x
 
       - name: Install dependencies
         run: npm install -g markdownlint-cli

.github/workflows/node-coverage.js.yml renamed to .github/workflows/node-coverage.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 24.x
 
       - name: Install dependencies
         run: npm ci --verbose

.github/workflows/node.js.yml renamed to .github/workflows/node-test.js.yml

@@ -11,13 +11,13 @@ on: # yamllint disable-line rule:truthy
   workflow_dispatch:
 
 jobs:
-  build:
+  test:
     name: NodeJS Jest CI Test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: ["ubuntu-24.04", "macos-14", "windows-2022"]
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x, 24.x]
         # See supported Node.js release schedule
         # at https://nodejs.org/en/about/releases/
 

.github/workflows/prettier-json.yml

@@ -0,0 +1,30 @@
+---
+name: Prettier JSON Lint
+
+on: # yamllint disable-line rule:truthy
+  push:
+    branches: ['main']
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ['main']
+  workflow_dispatch:
+
+jobs:
+  json-lint:
+    name: 'Prettier JSON Lint'
+    runs-on: ['ubuntu-24.04']
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24.x
+
+      - name: Install Prettier
+        run: |
+          npm install -g [email protected]
+
+      - name: Prettier LINT / Style JSON
+        run: >
+          prettier --check ./src/**/*.json

.prettierrc renamed to .prettierrc.yaml

@@ -1,7 +1,7 @@
+---
 singleQuote: true
 quoteProps: preserve
 useTabs: false
 printWidth: 80
 tabWidth: 2
 trailingComma: none
-parser: typescript

Dockerfile

@@ -17,7 +17,8 @@ WORKDIR ${WORKDIR}
 
 RUN  apk add --update --no-cache make nodejs npm \
   && apk add --update --no-cache yamllint \
-  && npm install -g --ignore-scripts markdownlint-cli
+  && npm install -g --ignore-scripts markdownlint-cli \
+  && npm install -g --ignore-scripts prettier
 
 # [!TIP] Use a bind-mount to "/app" to override following "copys"
 # for lint and test against "current" sources in this stage
@@ -39,7 +40,7 @@ COPY ./package-lock.json ${WORKDIR}/package-lock.json
 COPY ./Makefile ${WORKDIR}/
 
 # code linting conf
-COPY ./.prettierrc ${WORKDIR}/
+COPY ./.prettierrc.yaml ${WORKDIR}/
 COPY ./.prettierignore ${WORKDIR}/
 COPY ./eslint.config.js ${WORKDIR}/
 COPY ./.babelrc ${WORKDIR}/

Makefile

@@ -63,23 +63,31 @@ dependencies:
 	test -x ./node_modules ||  npm install --verbose
 	@echo "################################################################################"
 
+lint/json:
+	prettier --check ./src/**/*.json
+
 lint/markdown:
 	markdownlint '**/*.md' --ignore node_modules && echo '✔  Your code looks good.'
 
 lint/yaml:
 	yamllint --stric . && echo '✔  Your code looks good.'
 
-lint: lint/markdown lint/yaml test/styling test/static
+lint: lint/markdown lint/yaml lint/json test/styling test/static
 
 test/static: dependencies
 	${NPM} run lint
 
 test/styling: dependencies
 	${NPM} run style:check
 
-format: dependencies
+format/sources: dependencies
 	${NPM} run style:format
 
+format/json:
+	prettier --write ./src/**/*.json
+
+format: format/sources format/json
+
 test: env dependencies
 	${NPM} run jest:ci
 

src/hackerrank/interview_preparation_kit/arrays/cruch_testcases_test.json

@@ -3,70 +3,30 @@
     "title": "Sample Test Case 0",
     "n": 5,
     "queries": [
-      [
-        1,
-        2,
-        100
-      ],
-      [
-        2,
-        5,
-        100
-      ],
-      [
-        3,
-        4,
-        100
-      ]
+      [1, 2, 100],
+      [2, 5, 100],
+      [3, 4, 100]
     ],
     "expected": 200
   },
   {
     "title": "Sample Test Case 1",
     "n": 10,
     "queries": [
-      [
-        1,
-        5,
-        3
-      ],
-      [
-        4,
-        8,
-        7
-      ],
-      [
-        6,
-        9,
-        1
-      ]
+      [1, 5, 3],
+      [4, 8, 7],
+      [6, 9, 1]
     ],
     "expected": 10
   },
   {
     "title": "Sample Test Case 3",
     "n": 10,
     "queries": [
-      [
-        2,
-        6,
-        8
-      ],
-      [
-        3,
-        5,
-        7
-      ],
-      [
-        1,
-        8,
-        1
-      ],
-      [
-        5,
-        9,
-        15
-      ]
+      [2, 6, 8],
+      [3, 5, 7],
+      [1, 8, 1],
+      [5, 9, 15]
     ],
     "expected": 31
   }