Commit 4adccc7 for jssip.net
commit 4adccc773d567c6291933e0debaf6a141a8ed856
Author: José Luis Millán <jmillan@aliax.net>
Date: Fri Jan 9 11:54:12 2026 +0100
run grammar generation from npm-scripts.js rathen than gulpfile.js
diff --git a/gulpfile.js b/gulpfile.js
index f698a85..3284fba 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,14 +2,9 @@
'use strict';
/* eslint-enable strict */
-const fs = require('fs');
-const path = require('path');
-const exec = require('child_process').exec;
const gulp = require('gulp');
const expect = require('gulp-expect-file');
const nodeunit = require('gulp-nodeunit-runner');
-const log = require('fancy-log');
-const colors = require('ansi-colors');
// gulp-expect-file options.
const EXPECT_OPTIONS = {
@@ -34,40 +29,3 @@ gulp.task('test', function()
.pipe(expect(EXPECT_OPTIONS, src))
.pipe(nodeunit({ reporter: 'default' }));
});
-
-gulp.task('grammar', function(cb)
-{
- const local_pegjs = path.resolve('./node_modules/.bin/pegjs');
- const Grammar_pegjs = path.resolve('lib/Grammar.pegjs');
- const Grammar_js = path.resolve('lib/Grammar.js');
-
- log('grammar: compiling Grammar.pegjs into Grammar.js...');
-
- exec(`${local_pegjs } ${ Grammar_pegjs } ${ Grammar_js}`,
- function(error, stdout, stderr)
- {
- if (error)
- {
- cb(new Error(stderr));
- }
- log(`grammar: ${ colors.yellow('done')}`);
-
- // Modify the generated Grammar.js file with custom changes.
- log('grammar: applying custom changes to Grammar.js...');
-
- const grammar = fs.readFileSync('lib/Grammar.js').toString();
- let modified_grammar = grammar.replace(/throw new this\.SyntaxError\(([\s\S]*?)\);([\s\S]*?)}([\s\S]*?)return result;/, 'new this.SyntaxError($1);\n return -1;$2}$3return data;');
-
- modified_grammar = modified_grammar.replace(/\s+$/mg, '');
- fs.writeFileSync('lib/Grammar.js', modified_grammar);
- log(`grammar: ${ colors.yellow('done')}`);
- cb();
- }
- );
-});
-
-gulp.task('devel', gulp.series('grammar'));
-
-gulp.task('dist', gulp.series('test'));
-
-gulp.task('default', gulp.series('dist'));
diff --git a/npm-scripts.js b/npm-scripts.js
index 5620f12..61ad513 100644
--- a/npm-scripts.js
+++ b/npm-scripts.js
@@ -1,3 +1,5 @@
+const fs = require('fs');
+const path = require('path');
const process = require('process');
const { execSync } = require('child_process');
const { version } = require('./package.json');
@@ -11,6 +13,13 @@ console.log(`npm-scripts.js [INFO] running task "${task}"`);
switch (task)
{
+ case 'grammar':
+ {
+ grammar();
+
+ break;
+ }
+
case 'lint':
{
lint();
@@ -28,7 +37,7 @@ switch (task)
case 'release':
{
lint();
- executeCmd('gulp');
+ executeCmd('gulp test');
executeCmd(`git commit -am '${version}'`);
executeCmd(`git tag -a ${version} -m '${version}'`);
executeCmd('git push origin master && git push origin --tags');
@@ -55,6 +64,32 @@ function lint()
);
}
+function grammar()
+{
+ logInfo('grammar()');
+
+ const local_pegjs = path.resolve('./node_modules/.bin/pegjs');
+ const Grammar_pegjs = path.resolve('lib/Grammar.pegjs');
+ const Grammar_js = path.resolve('lib/Grammar.js');
+
+ logInfo('compiling Grammar.pegjs into Grammar.js...');
+
+ executeCmd(`${local_pegjs } ${ Grammar_pegjs } ${ Grammar_js}`);
+
+ logInfo('grammar compiled');
+
+ // Modify the generated Grammar.js file with custom changes.
+ logInfo('applying custom changes to Grammar.js...');
+
+ const current_grammar = fs.readFileSync('lib/Grammar.js').toString();
+ let modified_grammar = current_grammar.replace(/throw new this\.SyntaxError\(([\s\S]*?)\);([\s\S]*?)}([\s\S]*?)return result;/, 'new this.SyntaxError($1);\n return -1;$2}$3return data;');
+
+ modified_grammar = modified_grammar.replace(/\s+$/mg, '');
+ fs.writeFileSync('lib/Grammar.js', modified_grammar);
+
+ logInfo('grammar done');
+}
+
function executeCmd(command)
{
// eslint-disable-next-line no-console
diff --git a/package.json b/package.json
index f693263..cbcd253 100644
--- a/package.json
+++ b/package.json
@@ -34,9 +34,7 @@
"sdp-transform": "^2.14.1"
},
"devDependencies": {
- "ansi-colors": "^3.2.4",
"eslint": "^5.16.0",
- "fancy-log": "^1.3.3",
"gulp": "^4.0.2",
"gulp-expect-file": "^1.0.2",
"gulp-nodeunit-runner": "^0.2.2",
@@ -45,7 +43,6 @@
"scripts": {
"lint": "node npm-scripts.js lint",
"test": "node npm-scripts.js test",
- "prepublish": "node npm-scripts.js prepublish",
"release": "node npm-scripts.js release"
}
}