jexp 0.0.12 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/index.js +39 -39
  2. package/index.js.map +1 -1
  3. package/package.json +2 -2
package/index.js CHANGED
@@ -19,49 +19,44 @@ const { program, Option } = require('commander');
19
19
  const colorize = require('json-colorizer');
20
20
  const yaml = require('js-yaml');
21
21
  const run = (expression, source, options) => __awaiter(void 0, void 0, void 0, function* () {
22
- try {
23
- let data = {};
24
- let extension = '';
25
- if ((source.startsWith('[') || source.startsWith('{'))) {
26
- data = js_expressions_1.Helper.tryParse(source);
27
- }
28
- else {
29
- extension = path_1.default.extname(source);
30
- if (!['.json', '.yaml', 'yml'].includes(extension)) {
31
- throw Error(`extension ${extension} not supported `);
32
- }
33
- const content = yield js_expressions_1.Helper.readFile(source);
34
- if (!content) {
35
- throw Error(`can not read file ${source}`);
36
- }
37
- if (extension === 'json') {
38
- data = js_expressions_1.Helper.tryParse(content);
39
- }
40
- else {
41
- data = yaml.load(content);
42
- }
22
+ let data = {};
23
+ let extension = '';
24
+ if ((source.startsWith('[') || source.startsWith('{'))) {
25
+ data = js_expressions_1.Helper.tryParse(source);
26
+ }
27
+ else {
28
+ extension = path_1.default.extname(source);
29
+ if (!['.json', '.yaml', 'yml'].includes(extension)) {
30
+ throw Error(`extension ${extension} not supported `);
43
31
  }
44
- if (data === null || data === undefined) {
45
- throw Error(`can not parse content of ${source}`);
32
+ const content = yield js_expressions_1.Helper.readFile(source);
33
+ if (!content) {
34
+ throw Error(`can not read file ${source}`);
46
35
  }
47
- const result = js_expressions_1.expressions.eval(expression, { '.': data });
48
- const forceJson = options.output === 'json';
49
- const forceYaml = options.output === 'yaml';
50
- if (forceYaml || (!forceJson && extension && ['.yaml', 'yml'].includes(extension))) {
51
- console.log(yaml.dump(result));
36
+ if (extension === 'json') {
37
+ data = js_expressions_1.Helper.tryParse(content);
52
38
  }
53
39
  else {
54
- const formatted = options.beautiful ? JSON.stringify(result, null, 2) : JSON.stringify(result);
55
- if (options.decorate) {
56
- console.log(colorize(formatted));
57
- }
58
- else {
59
- console.log(formatted);
60
- }
40
+ data = yaml.load(content);
61
41
  }
62
42
  }
63
- catch (error) {
64
- console.error(error.stack);
43
+ if (data === null || data === undefined) {
44
+ throw Error(`can not parse content of ${source}`);
45
+ }
46
+ const result = js_expressions_1.expressions.eval(expression, { '.': data });
47
+ const forceJson = options.output === 'json';
48
+ const forceYaml = options.output === 'yaml';
49
+ if (forceYaml || (!forceJson && extension && ['.yaml', 'yml'].includes(extension))) {
50
+ console.log(yaml.dump(result));
51
+ }
52
+ else {
53
+ const formatted = options.beautiful ? JSON.stringify(result, null, 2) : JSON.stringify(result);
54
+ if (options.decorate) {
55
+ console.log(colorize(formatted));
56
+ }
57
+ else {
58
+ console.log(formatted);
59
+ }
65
60
  }
66
61
  });
67
62
  const getInput = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -89,8 +84,13 @@ function main() {
89
84
  .option('-d, --decorate', 'Decorate output', false)
90
85
  .option('-q, --query-file <path>', 'query file')
91
86
  .action((expression, source, options) => __awaiter(this, void 0, void 0, function* () {
92
- const data = (source !== undefined) ? source : yield getInput();
93
- yield run(expression, data, options);
87
+ try {
88
+ const data = (source !== undefined) ? source : yield getInput();
89
+ yield run(expression, data, options);
90
+ }
91
+ catch (error) {
92
+ console.error(error.message);
93
+ }
94
94
  }));
95
95
  yield program.parseAsync(process.argv);
96
96
  });
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jexp",
3
- "version": "0.0.12",
3
+ "version": "0.1.1",
4
4
  "description": "Parser and evaluator of expressions by line of commands. The expressions correspond to the package js-expressions",
5
5
  "author": "Flavio Lionel Rita <flaviolrita@hotmail.com>",
6
6
  "license": "Apache-2.0 License",
@@ -18,7 +18,7 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "commander": "^9.4.0",
21
- "js-expressions": "1.0.10",
21
+ "js-expressions": "1.0.11",
22
22
  "js-yaml": "^4.1.0",
23
23
  "json-colorizer": "^2.2.2"
24
24
  },