Merge pull request #15 from devatherock/node-app

feat: Rewrote the app in javascript

Author: devatherock

.circleci/config.yml

@@ -17,7 +17,7 @@ resource_class: &resource_class
 executors:
   docker-executor:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/node:20.10.0
         <<: *docker_auth
     <<: *resource_class
     <<: *work_directory
@@ -54,7 +54,14 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker
+      - attach_workspace:
+          at: ~/minify-js
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+            - v1-dependencies-      
       - run: |
+          npm install
           TAG=${CIRCLE_SHA1:0:8}
           echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
           docker buildx create --name rockbuilder \
@@ -64,6 +71,10 @@ jobs:
             --push \
             -t devatherock/minify-js:$TAG \
             -t devatherock/minify-js:latest .
+      - save_cache:
+          paths:
+            - ~/node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}      
 
   dockerhub_readme:
     docker:

.gitignore

@@ -1,4 +1,8 @@
 .project
 *.iml
 .gradle
-build/
+build/
+bin/test
+node_modules
+.settings
+.classpath

Dockerfile

@@ -1,10 +1,8 @@
-FROM node:12-alpine3.12
+FROM node:20.10.0-alpine3.18
 LABEL maintainer="devatherock@gmail.com"
 
-RUN npm install -g minify@6.0.1 \
-    &&  npm cache clean --force
-RUN apk update \
-	&& apk add --no-cache moreutils
+COPY node_modules /app/node_modules/
+COPY bin/cli.mjs /app/bin/cli.mjs
+COPY lib /app/lib/
 
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["sh", "/entrypoint.sh"]
+ENTRYPOINT ["node", "/app/bin/cli.mjs"]

Makefile

@@ -4,7 +4,9 @@ all=false
 clean:
 	./gradlew clean
 docker-build:
+	npm install
 	docker build -t devatherock/minify-js:latest .
+	rm -rf node_modules
 test:
 ifeq ($(all), true)
 	yamllint -d relaxed . --no-warnings

bin/cli.mjs

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+import fs from 'fs'
+import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
+import { minifyFiles } from '../lib/minify-js.mjs'
+import { stringToBoolean, valueFromEnvVariables, getLogger } from '../lib/utils.mjs'
+
+const inputPathVariables = ['PLUGIN_INPUT_PATH', 'PARAMETER_INPUT_PATH', 'INPUT_DIRECTORY']
+const outputPathVariables = ['PLUGIN_OUTPUT_PATH', 'PARAMETER_OUTPUT_PATH', 'INPUT_OUTPUT']
+const addSuffixVariables = ['PLUGIN_ADD_SUFFIX', 'PARAMETER_ADD_SUFFIX', 'INPUT_ADD_SUFFIX']
+
+const options = yargs(hideBin(process.argv))
+  .option('input-path', {
+    alias: 'i',
+    type: 'string',
+    description: 'File to minify or a folder containing files to minify',
+    default: valueFromEnvVariables(inputPathVariables) ? valueFromEnvVariables(inputPathVariables) : process.cwd()
+  })
+  .option('output-path', {
+    alias: 'o',
+    type: 'string',
+    description: 'Path where the minified files will be saved',
+    default: valueFromEnvVariables(outputPathVariables)
+  })
+  .option('add-suffix', {
+    alias: 'a',
+    type: 'boolean',
+    description: 'Indicates if the output files should have the suffix `.min` added after the name',
+    default: valueFromEnvVariables(addSuffixVariables) ? stringToBoolean(valueFromEnvVariables(addSuffixVariables)) : true
+  })
+  .parse()
+
+const inputPath = options.i
+const outputPath = options.o
+const addSuffix = options.a
+
+if (fs.existsSync(inputPath)) {
+  minifyFiles(inputPath, addSuffix, outputPath)
+} else {
+  getLogger().error('Input path ', inputPath, " doesn't exist")
+}

build.gradle

@@ -13,6 +13,7 @@ dependencies {
 test {
     useJUnitPlatform()
     testLogging {
+        showStandardStreams = Boolean.getBoolean('test.logs')
         events 'passed', 'failed'
     }
 }

entrypoint.sh

@@ -0,0 +1,64 @@
+import { minify } from 'minify'
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+import { getLogger, isDirectory, pathWithTrailingSeparator } from '../lib/utils.mjs'
+
+const supportedExtensions = ['.js', '.html', '.css']
+
+export async function minifyFile (inputFile, addSuffix, outputPath) {
+  // Calculate output path
+  const fileSeparatorIndex = inputFile.lastIndexOf(path.sep)
+  if (outputPath) {
+    getLogger().debug('Output path is specified')
+
+    // Create output folder if it doesn't exist
+    if (!fs.existsSync(outputPath)) {
+      fs.mkdirSync(outputPath, { recursive: true })
+    }
+  } else {
+    // Can be -1 if input file is in the working folder
+    if (fileSeparatorIndex !== -1) {
+      outputPath = inputFile.substring(0, fileSeparatorIndex)
+    } else {
+      outputPath = ''
+    }
+  }
+  getLogger().debug('Output path: ', outputPath)
+
+  // Extract input file name and extension
+  const inputFileExtension = path.extname(inputFile)
+  const inputFileName = path.basename(inputFile, inputFileExtension)
+
+  // Calculate complete output file name
+  const outputFileName = pathWithTrailingSeparator(outputPath) + inputFileName + (addSuffix ? '.min' : '') + inputFileExtension
+  getLogger().debug('Complete output file name: ', outputFileName)
+
+  // Minify file and write to output file
+  const minifiedContent = await minify(inputFile)
+  getLogger().debug(minifiedContent)
+  fs.writeFileSync(outputFileName, `${minifiedContent}${os.EOL}`)
+
+  getLogger().info('Minified ', inputFile, ' > ', outputFileName)
+}
+
+export function minifyFiles (inputPath, addSuffix, outputPath) {
+  if (isDirectory(inputPath)) {
+    getLogger().debug('Input path ', inputPath, ' is a directory')
+
+    // Loop through all the files in the input path
+    fs.readdir(inputPath, function (_, files) {
+      files.forEach(function (file, index) {
+        minifyFiles(pathWithTrailingSeparator(inputPath) + file, addSuffix, outputPath)
+      })
+    })
+  } else {
+    getLogger().debug('Input path ', inputPath, ' is a file')
+
+    if (supportedExtensions.includes(path.extname(inputPath))) {
+      minifyFile(inputPath, addSuffix, outputPath)
+    } else {
+      getLogger().debug('Skipping file ', inputPath, ' with unsupported extension')
+    }
+  }
+}

lib/minify-js.mjs

@@ -0,0 +1,44 @@
+import fs from 'fs'
+import path from 'path'
+import SimpleNodeLogger from 'simple-node-logger'
+
+var logger
+
+export function stringToBoolean (value) {
+  return value === 'true'
+}
+
+export function valueFromEnvVariables (envVariables) {
+  var value
+
+  for (var index = 0; index < envVariables.length; index++) {
+    var variableName = envVariables[index]
+    value = process.env[variableName]
+
+    if (value) {
+      break
+    }
+  }
+
+  return value
+}
+
+export function pathWithTrailingSeparator (inputPath) {
+  return inputPath.endsWith(path.sep) ? inputPath : inputPath + path.sep
+}
+
+export function getLogger () {
+  if (!logger) {
+    logger = SimpleNodeLogger.createSimpleLogger()
+
+    if (process.env.LOGGING_LEVEL_ROOT) {
+      logger.setLevel(process.env.LOGGING_LEVEL_ROOT)
+    }
+  }
+
+  return logger
+}
+
+export function isDirectory (inputPath) {
+  return fs.lstatSync(inputPath).isDirectory()
+}