multilang 1.2.0 → 1.2.2

package/bin/multilang-run.js

@@ -2,10 +2,11 @@
 
 "use strict";
 
-var program = require('commander');
+var program = require('commander').program;
 var multilang = require('./multilang');
-var fs = require('fs-promise');
+var fs = require('fs/promises');
 var path = require('path');
+var os = require('os');
 
 function realPath(inFile) {
     return Promise.resolve().then(function() {
@@ -28,6 +29,7 @@ function langs(val) {
 program
     .version(require('../package').version)
     .usage('[options] input.md')
+    .argument('[input.md]', 'Name of the input file')
     .option('-i, --input [input.md]', 'Name of the input file')
     .option('-l, --lang [lang1]', 'Language to generate', langs)
     .option('-o, --output [name]', 'Name of the output file. Requires --langs!')
@@ -36,9 +38,12 @@ program
     .option('-s, --silent', 'Do not output anything')
     .option('--strip-comments', 'Remove HTML comments from output')
     .option('--no-strip-comments', 'Do not remove HTML comments from output')
+    .option('--eol <type>', 'End of line for the output files: LF or CRLF (default: the OS end of line)')
     .option('-v, --verbose', 'Output all progress informations')
     .parse(process.argv);
 
+var options = program.opts();
+
 
 function isLongOptionSet(ame) {
     var a=program.rawArgs;
@@ -48,18 +53,30 @@ function isLongOptionSet(ame) {
     return false;
 }
 
-if( (""==program.args && !program.input) ){
+if( (""==program.args && !options.input) ){
     program.help();
 }
 
 var params = {};
-params.input = program.input ? program.input : program.args[0];
-params.output = program.output;
-params.check = program.check;
-params.silent = program.silent;
-params.langs = program.lang;
-params.directory = program.directory;
-params.verbose = program.verbose;
+params.input = options.input ? options.input : program.args[0];
+params.output = options.output;
+params.check = options.check;
+params.silent = options.silent;
+params.langs = options.lang;
+params.directory = options.directory;
+params.verbose = options.verbose;
+
+var eolByName = {LF:'\n', CRLF:'\r\n'};
+if(options.eol) {
+    var eolName = String(options.eol).toUpperCase();
+    if(! (eolName in eolByName)) {
+        process.stderr.write("ERROR: invalid --eol value '"+options.eol+"', expected LF or CRLF\n");
+        program.help();
+    }
+    params.eol = eolByName[eolName];
+} else {
+    params.eol = os.EOL;
+}
 
 if(isLongOptionSet('--no-strip-comments')) {
     params.stripComments = false;

package/bin/multilang.js

@@ -4,7 +4,8 @@
 var multilang={};
 
 var yaml = require('js-yaml');
-var fs = require('fs-promise');
+var fs = require('fs/promises');
+var fsSync = require('fs');
 var stripBom = require('strip-bom-string');
 var Path = require('path');
 var changing = require('best-globals').changing;
@@ -167,7 +168,7 @@ multilang.parseLang=function parseLang(lang){
         var langDir = Path.dirname(Path.resolve(module.filename));
         langDir = langDir.substr(0, langDir.length-4); // erase '/bin'
         var langFile = Path.normalize(langDir+'/langs/lang-'+lang+'.yaml');
-        theLang=yaml.load(stripBom(fs.readFileSync(langFile, 'utf8')));
+        theLang=yaml.load(stripBom(fsSync.readFileSync(langFile, 'utf8')));
     }
     return changing(this.langs[this.defLang], theLang);
 };
@@ -410,6 +411,10 @@ multilang.stripComments = function stripComments(doc) {
     return o.join('');
 };
 
+multilang.adjustEol=function adjustEol(content, eol){
+    return content.replace(/\r?\n/g, eol);
+};
+
 multilang.changeNamedDoc=function changeNamedDoc(documentName, documentText, lang){
     var content = multilang.changeDoc(documentText, lang);
     if(multilang.stripCommentsFlag || (documentName === 'README.md' && multilang.stripCommentsFlag !== false)) {
@@ -463,6 +468,9 @@ multilang.main=function main(parameters){
                     chanout.write("Generating '"+oFile.lang+"', writing to '"+oFile.file+"'...\n");
                 }
                 var changedContent=multilang.changeNamedDoc(Path.basename(oFile.file), readContent, oFile.lang);
+                if(parameters.eol) {
+                    changedContent = multilang.adjustEol(changedContent, parameters.eol);
+                }
                 return fs.writeFile(oFile.file, changedContent).then(function(){
                     if(parameters.verbose) {
                         chanout.write("Generated '"+oFile.lang+"', file '"+oFile.file+"'.\n");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "multilang",
   "description": "Tools for multilanguage and Markdown multilang",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "https://github.com/codenautas/multilang",
@@ -19,26 +19,30 @@
     "multilang": "./bin/multilang-run.js"
   },
   "main": "./bin/multilang.js",
+  "overrides": {
+    "diff": ">=8.0.2",
+    "serialize-javascript": ">=7.0.0",
+    "uuid": ">=14.0.0"
+  },
   "dependencies": {
-    "commander": "9.4.0",
-    "fs-promise": "~2.0.3",
-    "js-yaml": "4.1.0",
-    "strip-bom-string": "~1.0.0",
-    "best-globals": "~1.0.3"
+    "commander": "^15.0.0",
+    "js-yaml": "^4.2.0",
+    "strip-bom-string": "^1.0.0",
+    "best-globals": "^2.2.0"
   },
   "devDependencies": {
-    "expect.js": "~0.3.1",
-    "istanbul": "~0.4.5",
-    "mocha": "~10.0.0",
-    "expect-called": "~0.4.0"
+    "expect.js": "^0.3.1",
+    "nyc": "^18.0.0",
+    "mocha": "^11.7.6",
+    "expect-called": "^0.4.0"
   },
   "engines": {
-    "node": ">= 6"
+    "node": ">= 22"
   },
   "scripts": {
     "test": "mocha --reporter spec --bail --check-leaks test/",
-    "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
+    "test-ci": "nyc --reporter=lcov mocha --reporter spec --check-leaks test/",
+    "test-cov": "nyc mocha --reporter dot --check-leaks test/",
     "qac": "qa-control . -v",
     "all": "npm test && npm run test-cov && npm run qac",
     "start": "node example/server.js"