Komodo / komodo-center-messaging

Browse Code »

Commit d1dad71515c29ffd2c552b68947b27bbb22c1563

Authored by Adhidarma Hadiwinoto 6 years ago

1 parent 2326273027

Exists in master

Smart delimiter

Showing 2 changed files with 9 additions and 1 deletions Inline Diff

lib/command-parser.js
test/command-parser.js

lib/command-parser.js

Diff comments View file @ d1dad71

 "use strict";
 const commands = require('./command-group');
 function splitToken(msg) {
     if (typeof msg !== 'string') {
         return;
     }
     if (!msg.trim()) {
         return;
     }
-    return msg.trim().split(/[\s\.]+/); // eslint-disable-line no-useless-escape
+    const delimiters = msg.trim().match(/^\w+(\W)/);
+    const delimiter = delimiters && delimiters[1] ? delimiters[1] : null;
+    const delimiterRegex = delimiter ? new RegExp('\\' + delimiter + '+') : new RegExp('[\\s\\.]+');
+    return msg.trim().split(delimiterRegex);
 }
 function _makeSureAsTokensArray(msgOrTokens) {
     if (typeof msgOrTokens === 'string') {
         return splitToken(msgOrTokens);
     }
     return msgOrTokens;
 }
 function extractCommand(msgOrTokens) {
     msgOrTokens = _makeSureAsTokensArray(msgOrTokens);
     if (!msgOrTokens) return;
     return msgOrTokens[0];
 }
 function extractCommandGroup(msgOrTokens) {
     const cmd = extractCommand(msgOrTokens);
     if (!cmd) return;
     return commands[ cmd.toLowerCase() ];
 }
 exports.splitToken = splitToken;
 exports.extractCommand = extractCommand;
 exports.extractCommandGroup = extractCommandGroup;

test/command-parser.js

Diff comments View file @ d1dad71

 "use strict";
 /* global describe it */
 const should = require('should');
 const commandParser = require('../lib/command-parser');
 describe('#command-parser', function() {
     describe('#splitToken', function() {
         it('should return correct tokens', function() {
             commandParser.splitToken('SAL.1234')[0].should.equal('SAL');
             commandParser.splitToken('SAL')[0].should.equal('SAL');
             commandParser.splitToken('SAL.1234')[1].should.equal('1234');
             commandParser.splitToken('SAL 1234')[1].should.equal('1234');
+        })
+        it('should handle repeating splitter', function() {
             commandParser.splitToken('SAL  1234')[1].should.equal('1234');
         })
         it('should handle empty message', function() {
             should.not.exists(commandParser.splitToken(''));
             should.not.exists(commandParser.splitToken());
         })
     })
     describe('#extractCommand', function() {
         it('should handle array of token as input', function() {
             commandParser.extractCommand(['SAL', '1234']).should.equal('SAL');
         })
         it('should handle message string as input', function() {
             commandParser.extractCommand('SAL.1234').should.equal('SAL');
             commandParser.extractCommand('SAL 1234').should.equal('SAL');
             commandParser.extractCommand('SAL  1234').should.equal('SAL');
         })
         it('should handle empty message', function() {
             should.not.exists(commandParser.extractCommand(''));
             should.not.exists(commandParser.extractCommand());
         })
     })
     describe('#extractCommandGroup', function() {
         it('should return correct command group from a message string', function() {
             commandParser.extractCommandGroup('SAL.1234').should.equal('balance');
         })
         it('should return correct command group from an array of tokens', function() {
             commandParser.extractCommandGroup(['SAL', '1234']).should.equal('balance');
         })
         it('should handle invalid message', function() {
             should.not.exists(commandParser.extractCommandGroup());
             should.not.exists(commandParser.extractCommandGroup(''));
         })
     })
 })