stringEncodes an array of tokens into a string.
+Array.<number>Decodes a string into an array of tokens.
+string
+Encodes an array of tokens into a string.
+
+**Returns**: string - Encoded string.
+
+| Param | Type | Default | Description |
+| ------ | --------------------------------- | ------------------------------- | ------------------------------------------------------------------- |
+| tokens | Array.<number> | | Array of tokens. |
+| [mode] | number | MODE_SIMPLE_STRING | Mode: MODE_SIMPLE_STRING or MODE_DELTA_STRING. See: `zip.constants` |
+
+
+
+## decode(string) ⇒ Array.<number>
+Decodes a string into an array of tokens.
+
+**Returns**: Array.<number> - Array of tokens.
+
+| Param | Type | Description |
+| ------ | ------------------- | --------------- |
+| string | string | Encoded string. |
+
-Поддерживаются 2 способа сжатия: диапазоны с выносом за скобку и дельта-строки.
\ No newline at end of file
diff --git a/constants/index.js b/constants/index.js
new file mode 100644
index 0000000..87178c8
--- /dev/null
+++ b/constants/index.js
@@ -0,0 +1,21 @@
+const DELTA = '~';
+const MULTIPLICATION = 'x';
+const NUM_DELIMITER = ',';
+const DELTA_LIST_BY_ONE = '.';
+const DELTA_LIST_BY_TWO = ':';
+const ZIP_START_DELIMITER = '(';
+const ZIP_END_DELIMITER = ')';
+const MODE_SIMPLE_STRING = 1;
+const MODE_DELTA_STRING = 2;
+
+module.exports = {
+ DELTA,
+ MULTIPLICATION,
+ NUM_DELIMITER,
+ DELTA_LIST_BY_ONE,
+ DELTA_LIST_BY_TWO,
+ ZIP_START_DELIMITER,
+ ZIP_END_DELIMITER,
+ MODE_SIMPLE_STRING,
+ MODE_DELTA_STRING,
+};
diff --git a/index.js b/index.js
index 9e89856..11fb74e 100644
--- a/index.js
+++ b/index.js
@@ -1,228 +1,23 @@
-
-const NUM_DELIMITER = ',';
-const DELTA_LIST_BY_ONE = '.';
-const DELTA_LIST_BY_TWO = ':';
-const ZIP_START_DELIMITER = '(';
-const ZIP_END_DELIMITER = ')';
-
+const Encode = require('./scripts/encode');
+const Decode = require('./scripts/decode');
+const constants = require('./constants');
/**
- * Parse string to array of encoding numbers
- *
- * @param string
- * @returns {[]|*[]}
+ * Encodes an array of tokens into a string.
+ * @param {number[]} tokens Array of tokens.
+ * @param {number} [mode=MODE_SIMPLE_STRING] Mode: MODE_SIMPLE_STRING or MODE_DELTA_STRING.
+ * See: `zip.constants`
+ * @returns {string} Encoded string.
*/
-const decode = string => {
- if (!string) {
- return [];
- }
- let items;
-
- // Parse base for int
- if (string.startsWith('x')) {
- // Дописать функционал
- }
-
- // Parse empty string as empty list
- if (string.startsWith('~')) {
- items = parseDelta(string.slice(1));
- console.log(items);
- }
- else {
- items = parseString(string);
- console.log(items)
- }
-
- return items;
-};
+const encode = (tokens, mode) => new Encode().parse(tokens, mode);
/**
- * Parse string to tokens
- *
- * @param string
- * @return {[]}
+ * Decodes a string into an array of tokens.
+ * @param {string} string Encoded string.
+ * @returns {number[]} Array of tokens.
*/
-const parseString = string => {
- let buff = '', tokens = [], zipBuff = [];
-
- for (const ltr of string) {
- if (ltr === ZIP_START_DELIMITER) zipBuff.push(1);
- if (ltr === ZIP_END_DELIMITER) zipBuff.pop();
- if (zipBuff.length === 0 && ltr === NUM_DELIMITER) {
- parseToken(buff).forEach((item) => {
- tokens.push(item);
- });
- buff = '';
- }
- else buff += ltr;
- }
-
- if (buff) {
- parseToken(buff).forEach((item) => {
- tokens.push(item);
- });
- }
-
- return tokens;
-};
-
-
-/**
- * Parse token from string
- *
- * @param token
- * @return {[]} array with tokens
- */
-const parseToken = token => {
- let tokens = [];
- if (token.indexOf(ZIP_START_DELIMITER) > -1) {
- let [base, subString] = token.split(ZIP_START_DELIMITER);
- base = parseInt(base, 10);
- let items = parseString(subString.slice(0, subString.length-1));
- items.forEach((item) => tokens.push(item+base));
- return tokens;
- }
- if (token.indexOf('-') > -1) {
- let [start, stop] = token.split('-');
- start = parseInt(start, 10);
- stop = parseInt(stop, 10);
-
- for (let i = start; i <= stop; i += 1) {
- tokens.push(i);
- }
- }
- else tokens = [parseInt(token)];
- return tokens;
-};
-
-/**
- * Parse string by delta
- *
- * @param string
- * @return {[]} array with tokens
- */
-const parseDelta = string => {
- let tokens = [],
- chunks = deltaChunks(string);
-
- chunks.forEach((chunk) => tokens = tokens.concat(parseDeltaChunks(chunk)));
-
- let last = 0;
- tokens.forEach((token, i) => {
- tokens[i]=token+last;
- last=tokens[i];
- });
-
- return tokens;
-};
-
-
-/**
- * Parse chunk of delta
- *
- * @param chunk
- * @return {[]} array with tokens
- */
-const parseDeltaChunks = chunk => {
- let listBy, blocks, tokens = [];
- if (chunk.startsWith(DELTA_LIST_BY_ONE)) listBy = 1;
- if (chunk.startsWith(DELTA_LIST_BY_TWO)) listBy = 2;
- if (listBy) chunk = chunk.slice(1);
- blocks = chunk.split('x');
-
- if (listBy) {
- if (blocks.length === 1) {
- tokens = wrap(chunk, listBy);
- }
- else {
- // Дописать функционал
- }
-
- }
- else if (blocks.length === 2) {
- let num = parseInt(blocks[1], 10);
- for (let i = 0; i < blocks[0]; i++) {
- tokens.push(num);
- }
- }
- else tokens = [parseInt(chunk, 10)];
-
- return tokens;
-
- };
-
-/**
- * Yield chunks for delta string
- *
- * @param string for split into chunks
- * @return [] of chunks
- */
-const deltaChunks = string => {
- let chunks = [],
- buf = '';
- for (let ltr of string) {
- if (ltr === NUM_DELIMITER) {
- (buf!=='') && chunks.push(buf);
- buf = '';
- }
- else if (ltr === DELTA_LIST_BY_ONE || ltr === DELTA_LIST_BY_TWO) {
- (buf!=='') && chunks.push(buf);
- buf = ltr;
- }
- else {
- buf += ltr;
- }
- }
- if (buf !== '') chunks.push(buf);
- return chunks;
-};
-
-/**
- * Convert string to several strings of length of count symbols
- *
- * @param string
- * @param count symbols
- * @returns {[]} list of several strings
- */
-const wrap = (string, count) => {
- let list = [];
- for (let i = 0; i