@trenskow/parse 0.1.7 → 0.1.8

package/.vscode/launch.json

@@ -5,7 +5,7 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"type": "pwa-node",
+			"type": "node",
 			"request": "launch",
 			"name": "Run test",
 			"skipFiles": [

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "[javascript]": {
+        "editor.formatOnSave": true,
+        "editor.formatOnPaste": true
+    }
+}

package/index.js

@@ -37,6 +37,14 @@ export default (opening, closing, options) => {
 		throw new TypeError('Max depth must be a number.');
 	}
 
+	let boundaries = options.boundaries;
+
+	if (typeof boundaries === 'undefined') boundaries = 'exclude';
+
+	if (!['exclude', 'include'].includes(boundaries)) {
+		throw new TypeError('Boundaries must be either `\'exclude\'` (default) or `\'include\'`.');
+	}
+
 	if (maxDepth < 0) {
 		throw new TypeError('Max depth must be greater than zero.');
 	}
@@ -77,11 +85,17 @@ export default (opening, closing, options) => {
 							if (text.substring(idx, idx + opening.length) === opening) {
 
 								if (maxDepth > depth) {
+
 									result.push(literal);
+
 									let value;
+
 									[idx, value] = next(text, idx + opening.length, depth + 1);
+
 									result.push(value);
+
 									literal = '';
+
 								} else {
 									literal += text[idx];
 									ignoredDepths++;
@@ -97,6 +111,17 @@ export default (opening, closing, options) => {
 										result = result[0];
 									}
 
+									if (depth > 0 && boundaries === 'include') {
+										if (Array.isArray(result)) {
+											if (Array.isArray(result[0])) result[0] = [opening].concat(result[0]);
+											else result[0] = `${opening}${result[0]}`;
+											if (Array.isArray(result[result.length - 1])) result.push(closing);
+											else result[result.length - 1] = `${result[result.length - 1]}${closing}`;
+										} else {
+											result = `${opening}${result}${closing}`;
+										}
+									}
+
 									return [idx + closing.length - 1, result];
 
 								} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/parse",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "A small library for parsing a string into a tree.",
   "main": "index.js",
   "type": "module",

package/test.js

@@ -34,6 +34,21 @@ describe('parser', () => {
 			'.'
 		]);
 	});
+	it ('should come back with parsed tree (with escapes and boundaries).', () => {
+		expect(parse('[', ']', { boundaries: 'include' }).do('This [is [my [\\[nested\\]] string]].')).to.eql([
+			'This ',
+			[
+				'[is ',
+				[
+					'[my ',
+					'[[nested]]',
+					' string]'
+				],
+				']'
+			],
+			'.'
+		]);
+	});
 	it ('should come back with parsed tree (long tokens).', () => {
 		expect(parse('hello', 'goodbye').do('This hello is hello my hello nested goodbye string goodbye goodbye.')).to.eql([
 			'This ',
@@ -109,4 +124,9 @@ describe('parser', () => {
 			parse('[', ']', { maxDepth: -1 });
 		}).to.throw('Max depth must be greater than zero.');
 	});
+	it ('should throw an error if boundaries is unknown value.', () => {
+		expect(() => {
+			parse('[', ']', { boundaries: 'wrong' });
+		}).to.throw('Boundaries must be either `\'exclude\'` (default) or `\'include\'`.');
+	});
 });