rename types (compressor -> compress, generator -> docs), fix error code 0111 message, updates

Author: JustDeveloper1

.github/workflows/ci.yml

@@ -10,7 +10,18 @@ concurrency:
   group: ${{ github.ref }}-ci
 
 jobs:
-  compressor:
+  redirect:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+        - run: bash tests/redirect.sh
+          shell: bash
+        - name: Generate with _just
+          uses: ./
+          with:
+            path: test
+  compress:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -21,25 +32,14 @@ jobs:
         uses: ./
         with:
           path: test
-  generator:
+  docs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - run: bash tests/generator.sh
+      - run: bash tests/docs.sh
         shell: bash
       - name: Generate with _just
         uses: ./
         with:
-          path: test
-  redirect:
-      runs-on: ubuntu-latest
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v4
-        - run: bash tests/redirect.sh
-          shell: bash
-        - name: Generate with _just
-          uses: ./
-          with:
-            path: test
+          path: test

.github/workflows/test.yml

@@ -21,6 +21,7 @@ jobs:
           path: website
   commit:
     runs-on: ubuntu-latest
+    needs: build
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -30,7 +31,7 @@ jobs:
           source-directory: "website"
           destination-github-username: js-just
           destination-repository-name: test
-          user-email: "[email protected]"
-          user-name: "GitHub Actions"
+          user-email: "[email protected]"
+          target-branch: main
         env:
           API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}

data/codes.json

@@ -68,7 +68,7 @@
         },
         {
             "code": "0111",
-            "message": "Invalid value of property \"type\" in just.config.js. It must be one of: \"postprocessor\", \"redirector\", \"compressor\".",
+            "message": "Invalid value of property \"type\" in just.config.js. It must be one of: \"postprocessor\", \"redirect\", \"compress\", \"docs\".",
             "crashed": true,
             "link": ""
         },

just.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    type: "generator",
+    type: "docs",
     docs_config: {
         metatitle: "Just an Ultimate Site Tool",
         domain: "just.is-a.dev",

src/compress.js

@@ -91,7 +91,7 @@ findAndCompressFiles(deployDir);
 EXAMPLE just.config.js FILE to minify js, css, html files in your static website:
 
 module.exports = {
-    type: "compressor"
+    type: "compress"
 }
 
 */

src/run.sh

@@ -82,13 +82,13 @@ if [ -z "$TYPE" ]; then
     echo "$ERROR_MESSAGE" && exit 1
 fi
 
-if [[ "$TYPE" != "postprocessor" && "$TYPE" != "redirector" && "$TYPE" != "compressor" && "$TYPE" != "generator" ]]; then
+if [[ "$TYPE" != "postprocessor" && "$TYPE" != "redirect" && "$TYPE" != "compress" && "$TYPE" != "docs" ]]; then
     ERROR_MESSAGE=$(ErrorMessage "run.sh" "0111")
     echo "$ERROR_MESSAGE" && exit 1
 fi
 
 _just_d="no" && \
-if [[ "$TYPE" != "compressor" && ! ( "$TYPE" == "generator" && "$INPUT_PATH" != "." ) ]]; then
+if [[ "$TYPE" != "compress" && ! ( "$TYPE" == "docs" && "$INPUT_PATH" != "." ) ]]; then
     if [ -d "deploy" ]; then
         ERROR_MESSAGE=$(ErrorMessage "important_dirs" "0106")
         echo "$ERROR_MESSAGE" && exit 1
@@ -99,7 +99,7 @@ if [[ "$TYPE" != "compressor" && ! ( "$TYPE" == "generator" && "$INPUT_PATH" !=
     fi
     mkdir -p deploy
     mkdir -p _just_data
-elif [ "$TYPE" == "generator" ]; then
+elif [ "$TYPE" == "docs" ]; then
     JDD=$(echo "$INPUT_PATH/_just_data" | sed 's#//*#/#g')
     _just_dir=$(echo "$INPUT_PATH/_just" | sed 's#//*#/#g')
     if [ -d "$JDD" ]; then
@@ -135,18 +135,18 @@ if [ "$TYPE" == "postprocessor" ]; then
     node $GITHUB_ACTION_PATH/src/compress.js "deploy" && \
     bash $GITHUB_ACTION_PATH/src/postprocessor/build_map.sh && \
     echo "$msg4"
-elif [ "$TYPE" == "redirector" ]; then
+elif [ "$TYPE" == "redirect" ]; then
     mkdir -p deploy/_just
     installNodejs && \
     bash $GITHUB_ACTION_PATH/src/redirect/checks.sh && \
     node $GITHUB_ACTION_PATH/src/redirect/index.js && \
     echo "$msg5"
-elif [ "$TYPE" == "compressor" ]; then
+elif [ "$TYPE" == "compress" ]; then
     mkdir -p deploy && \
     installNodejs && \
     node $GITHUB_ACTION_PATH/src/compress.js "$INPUT_PATH" && \
     echo "$msg6"
-elif [ "$TYPE" == "generator" ]; then
+elif [ "$TYPE" == "docs" ]; then
     HTML=$(cat "$GITHUB_ACTION_PATH/src/documentation/templates/page.html")
     CSS=$(cat "$GITHUB_ACTION_PATH/src/documentation/templates/page.css")
     JS=$(cat "$GITHUB_ACTION_PATH/src/documentation/templates/page.js")

tests/compress.js

@@ -0,0 +1,3 @@
+module.exports = {
+    type: "compress"
+}

tests/compressor.sh tests/compress.shtests/compressor.sh renamed to tests/compress.sh

@@ -22,7 +22,7 @@
 
 #!/bin/bash
 mkdir -p test
-CONFIG=$(cat "tests/compressor.js")
+CONFIG=$(cat "tests/compress.js")
 HTML=$(cat "website/index.html")
 rm -f "just.config.js"
 rm -r "website"

tests/compressor.js

@@ -1,5 +1,5 @@
 module.exports = {
-    type: "generator",
+    type: "docs",
     docs_config: {
         metatitle: "Just an Ultimate Site Tool",
         domain: "just.is-a.dev"