docker-composer 4.1.3 → 5.0.0

package/.eslintrc.yml

@@ -0,0 +1,9 @@
+env:
+  browser: true
+  es2021: true
+extends: google
+overrides: []
+parserOptions:
+  ecmaVersion: latest
+  sourceType: module
+rules: {}

package/README.md

@@ -14,9 +14,10 @@ Docker Compose Reference is [HERE](https://docs.docker.com/compose/compose-file/
 
 ###  Changes of the Latest Release
 
-## Version 4.1.3 (22.12.2022)
-- Remove gulp
+## Version 5.0.0 (29.12.2022)
+- Reorganize code base
 - Update dependencies
+- Change code style
 
 You can find all Release Notes [HERE](https://github.com/tudvari/docker-composer/blob/master/ReleaseNotes.md).
 
@@ -24,9 +25,9 @@ You can find all Release Notes [HERE](https://github.com/tudvari/docker-composer
 
 ```javascript
 
-  const composer = require('docker-composer')
+  const composer = require('docker-composer');
     .
-  var generatedYML = composer.generate( inputJSON )
+  const generatedYML = composer.generate(inputJSON);
 ```
 
 ## Full Example

package/ReleaseNotes.md

@@ -1,5 +1,10 @@
 # Release Notes
 
+## Version 5.0.0 (29.12.2022)
+- Reorganize code base
+- Update dependencies
+- Change code style
+
 ## Version 4.1.3 (22.12.2022)
 - Remove gulp
 - Update dependencies

package/index.js

@@ -1,18 +1,14 @@
-const fs = require('fs')
-const path = require('path')
-const YAML = require('json2yaml')
-const Validator = require('jsonschema').Validator
-const v = new Validator()
-
-function generateCompose ( inputJSON ) {
-	let schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, './schema.json')))
-
-	if ( !v.validate(inputJSON, schema).valid )
-		throw new Error('Invalid input!')
-
-	return YAML.stringify( inputJSON )
+const lib = require('./lib/lib.js');
+
+/**
+ * Generate compose file from a JSON document
+ * @param {string} inputJSON - JSON document, what represent the compose file.
+ * @return {string} The generated compose file in YAML format.
+ */
+function generateCompose(inputJSON) {
+  return lib.generateCompose(inputJSON);
 }
 
 module.exports = {
-	generate: generateCompose
-}
+  generate: generateCompose,
+};

package/lib/lib.js

@@ -0,0 +1,24 @@
+const fs = require('fs');
+const path = require('path');
+const YAML = require('json2yaml');
+const Validator = require('jsonschema').Validator;
+const v = new Validator();
+
+/**
+ * Generate compose file from a JSON document
+ * @param {string} inputJSON - JSON document, what represent the compose file.
+ * @return {string} The generated compose file in YAML format.
+ */
+function generateCompose(inputJSON) {
+  const schema = JSON.parse(
+      fs.readFileSync(path.resolve(__dirname, '../schema.json')));
+
+  if (!v.validate(inputJSON, schema).valid) {
+    throw new Error('Invalid input!');
+  }
+  return YAML.stringify(inputJSON);
+}
+
+module.exports = {
+  generateCompose,
+};

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "docker-composer",
-  "version": "4.1.3",
-  "description": "NodeJS module for generating docker-compose.yml from a json document.",
+  "version": "5.0.0",
+  "description": "Library for generating docker-compose.yml from JSON.",
   "main": "index.js",
   "scripts": {
-    "test": "./node_modules/mocha/bin/mocha.js *Test.js",
+    "test": "./node_modules/mocha/bin/mocha.js ./tests/*Test.js",
     "coverage": "nyc npm run test",
-    "generate-ts-types": "node compile-ts-types.js"
+    "generate-ts-types": "node ./scripts/compile-ts-types.js",
+    "linter": "npx eslint *.js tests/*.js"
   },
   "keywords": [
     "docker",
@@ -34,7 +35,8 @@
     "jsonschema": "^1.4.0"
   },
   "devDependencies": {
-    "eslint": "8.30.0",
+    "eslint": "^8.30.0",
+    "eslint-config-google": "^0.14.0",
     "js-yaml": "^4.0.0",
     "json-schema-to-typescript": "^11.0.0",
     "mocha": "10.2.0",

package/scripts/compile-ts-types.js

@@ -0,0 +1,16 @@
+const fs = require('fs');
+const path = require('path');
+const compiler = require('json-schema-to-typescript');
+
+/**
+ * Helper function to generate typescript types from json schema
+ */
+async function runner() {
+  const compiledTs = await compiler.compileFromFile(
+      path.resolve(__dirname, '../schema.json'));
+  fs.writeFileSync('index.d.ts', compiledTs);
+  console.log('Types are generated..');
+}
+
+runner();
+

package/compile-ts-types.js

@@ -1,10 +0,0 @@
-const fs = require('fs')
-const compiler = require('json-schema-to-typescript')
-
-async function f() {
-  const compiledTs = await compiler.compileFromFile('schema.json');
-  fs.writeFileSync('index.d.ts', compiledTs)
-}
-
-f();
-