@luvio/cli 0.123.0 → 0.124.0

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 (6) hide show
  1. package/lib/commands/generate.js +3 -5
  2. package/lib/commands/generate.js.map +1 -1
  3. package/lib/reporter.d.ts +2 -2
  4. package/lib/reporter.js +33 -12
  5. package/lib/reporter.js.map +1 -1
  6. package/package.json +4 -3
package/lib/commands/generate.js CHANGED
@@ -47,11 +47,9 @@ async function compile(input, outputDir, plugin) {
47
47
  // You might imagine a GraphQLSourcePrinter that is configured to print some extra code for each Type.
48
48
  const graphQLSourcePrinter = new compiler_1.GraphQLSourcePrinter(new compiler_1.GraphQLTypeSourcePrinter(), new compiler_1.GraphQLResourceSourcePrinter(), new compiler_1.GraphQLAdapterSourcePrinter(), new compiler_1.GraphQLDirectiveSourcePrinter(), compilerBaseOutputDir, plugin);
49
49
  const compiler = new compiler_1.LuvioRamlCompiler(parser, sourceWriter, [graphQLSourcePrinter, restSourcePrinter], compilerBaseOutputDir, plugin);
50
- const parseErrors = await compiler.generate();
51
- if (Array.isArray(parseErrors)) {
52
- // eslint-disable-next-line no-console
53
- console.log((0, reporter_1.default)(filePath, parseErrors));
54
- }
50
+ const parseResult = await compiler.generate();
51
+ // eslint-disable-next-line no-console
52
+ console.log((0, reporter_1.default)(filePath, parseResult === null || parseResult === void 0 ? void 0 : parseResult.errors, parseResult === null || parseResult === void 0 ? void 0 : parseResult.warnings));
55
53
  }
56
54
  exports.compile = compile;
57
55
  //# sourceMappingURL=generate.js.map
package/lib/commands/generate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":";;;;AAAA,sCAA6C;AAC7C,8CAWyB;AACzB,6DAAwB;AACxB,wEAAmC;AACnC,MAAqB,QAAS,SAAQ,cAAO;IAwBzC,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC;QACX,IAAI,KAAK,CAAC,MAAM,EAAE;YACd,MAAM,GAAG,qEAAa,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAC,CAAC;SACrD;QAED,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;;AAhCL,2BAiCC;AAhCU,oBAAW,GAAG,4DAA4D,CAAC;AAE3E,iBAAQ,GAAG,CAAC,0CAA0C,CAAC,CAAC;AAExD,aAAI,GAAG;IACV;QACI,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,YAAY;KAC5B;IACD;QACI,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,kBAAkB;KAClC;CACJ,CAAC;AAEK,cAAK,GAAG;IACX,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG;KACZ,CAAC;CACL,CAAC;AAaC,KAAK,UAAU,OAAO,CAAC,KAAa,EAAE,SAAiB,EAAE,MAAY;IACxE,MAAM,QAAQ,GAAG,KAAK,CAAC;IAEvB,MAAM,qBAAqB,GAAG,cAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAI,iCAAsB,CAAC,SAAS,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,IAAI,8BAAmB,CAAC,QAAQ,CAAC,CAAC;IAEjD,MAAM,wBAAwB,GAAG,IAAI,mCAAwB,CACzD,UAAU,EACV,qBAAqB,EACrB,MAAM,CACT,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAI,4BAAiB,CAC3C,wBAAwB,EACxB,qBAAqB,EACrB,MAAM,CACT,CAAC;IAEF,2IAA2I;IAC3I,sGAAsG;IACtG,MAAM,oBAAoB,GAAG,IAAI,+BAAoB,CACjD,IAAI,mCAAwB,EAAE,EAC9B,IAAI,uCAA4B,EAAE,EAClC,IAAI,sCAA2B,EAAE,EACjC,IAAI,wCAA6B,EAAE,EACnC,qBAAqB,EACrB,MAAM,CACT,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,4BAAiB,CAClC,MAAM,EACN,YAAY,EACZ,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,EACzC,qBAAqB,EACrB,MAAM,CACT,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC5B,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,IAAA,kBAAQ,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;KAChD;AACL,CAAC;AAxCD,0BAwCC"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":";;;;AAAA,sCAA6C;AAC7C,8CAWyB;AACzB,6DAAwB;AACxB,wEAAmC;AACnC,MAAqB,QAAS,SAAQ,cAAO;IAwBzC,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC;QACX,IAAI,KAAK,CAAC,MAAM,EAAE;YACd,MAAM,GAAG,qEAAa,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAC,CAAC;SACrD;QAED,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;;AAhCL,2BAiCC;AAhCU,oBAAW,GAAG,4DAA4D,CAAC;AAE3E,iBAAQ,GAAG,CAAC,0CAA0C,CAAC,CAAC;AAExD,aAAI,GAAG;IACV;QACI,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,YAAY;KAC5B;IACD;QACI,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,kBAAkB;KAClC;CACJ,CAAC;AAEK,cAAK,GAAG;IACX,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG;KACZ,CAAC;CACL,CAAC;AAaC,KAAK,UAAU,OAAO,CAAC,KAAa,EAAE,SAAiB,EAAE,MAAY;IACxE,MAAM,QAAQ,GAAG,KAAK,CAAC;IAEvB,MAAM,qBAAqB,GAAG,cAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAI,iCAAsB,CAAC,SAAS,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,IAAI,8BAAmB,CAAC,QAAQ,CAAC,CAAC;IAEjD,MAAM,wBAAwB,GAAG,IAAI,mCAAwB,CACzD,UAAU,EACV,qBAAqB,EACrB,MAAM,CACT,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAI,4BAAiB,CAC3C,wBAAwB,EACxB,qBAAqB,EACrB,MAAM,CACT,CAAC;IAEF,2IAA2I;IAC3I,sGAAsG;IACtG,MAAM,oBAAoB,GAAG,IAAI,+BAAoB,CACjD,IAAI,mCAAwB,EAAE,EAC9B,IAAI,uCAA4B,EAAE,EAClC,IAAI,sCAA2B,EAAE,EACjC,IAAI,wCAA6B,EAAE,EACnC,qBAAqB,EACrB,MAAM,CACT,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,4BAAiB,CAClC,MAAM,EACN,YAAY,EACZ,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,EACzC,qBAAqB,EACrB,MAAM,CACT,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC9C,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,IAAA,kBAAQ,EAAC,QAAQ,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,CAAC,CAAC,CAAC;AAChF,CAAC;AAtCD,0BAsCC"}
package/lib/reporter.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- import type { ParseError } from '@luvio/compiler';
2
- export default function reporter(filePath: string, errors: ParseError[]): any;
1
+ import type { ParseError, ParseWarning } from '@luvio/compiler';
2
+ export default function reporter(filePath: string, errors?: ParseError[], warnings?: ParseWarning[]): any;
package/lib/reporter.js CHANGED
@@ -12,20 +12,33 @@ const chalk = require('chalk'), stripAnsi = require('strip-ansi'), table = requi
12
12
  function pluralize(word, count) {
13
13
  return count === 1 ? word : `${word}s`;
14
14
  }
15
- function reporter(filePath, errors) {
15
+ function reporter(filePath, errors = [], warnings = []) {
16
16
  const errorCount = errors.length;
17
+ const warningCount = warnings.length;
17
18
  let output = '\n';
18
19
  output += `${chalk.underline(filePath)}\n`;
19
- output += `${table(errors.map((error) => {
20
- const messageType = chalk.red('error');
21
- return [
22
- '',
23
- error.line,
24
- error.column,
25
- messageType,
26
- error.message.replace(/([^ ])\.$/u, '$1'),
27
- ];
28
- }), {
20
+ output += `${table([
21
+ ...errors.map((error) => {
22
+ const messageType = chalk.red('error');
23
+ return [
24
+ '',
25
+ error.line,
26
+ error.column,
27
+ messageType,
28
+ error.message.replace(/([^ ])\.$/u, '$1'),
29
+ ];
30
+ }),
31
+ ...warnings.map((warning) => {
32
+ const messageType = chalk.yellow('warning');
33
+ return [
34
+ '',
35
+ warning.line,
36
+ warning.column,
37
+ messageType,
38
+ warning.message.replace(/([^ ])\.$/u, '$1'),
39
+ ];
40
+ }),
41
+ ], {
29
42
  align: ['', 'r', 'l'],
30
43
  stringLength(str) {
31
44
  return stripAnsi(str).length;
@@ -34,7 +47,15 @@ function reporter(filePath, errors) {
34
47
  .split('\n')
35
48
  .map((el) => el.replace(/(\d+)\s+(\d+)/u, (m, p1, p2) => chalk.dim(`${p1}:${p2}`)))
36
49
  .join('\n')}\n\n`;
37
- output += chalk['red'].bold(['\u2716 ', errorCount, pluralize(' error', errorCount), '\n'].join(''));
50
+ if (errorCount > 0) {
51
+ output += chalk['red'].bold(['\u2716 ', errorCount, pluralize(' error', errorCount), '\n'].join(''));
52
+ }
53
+ if (warningCount > 0) {
54
+ output += chalk['yellow'].bold(['\u26A0 ', warningCount, pluralize(' warning', warningCount), '\n'].join(''));
55
+ }
56
+ if (errorCount === 0) {
57
+ output += chalk['green'].bold(['\u2714 ', 'Success'].join(''));
58
+ }
38
59
  return chalk.reset(output);
39
60
  }
40
61
  exports.default = reporter;
package/lib/reporter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reporter.js","sourceRoot":"","sources":["../src/reporter.ts"],"names":[],"mappings":";;AAEA,sCAAsC;AACtC,oFAAoF;AAEpF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,EAC1B,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,EACjC,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAElC;;;;;GAKG;AACH,SAAS,SAAS,CAAC,IAAY,EAAE,KAAa;IAC1C,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC;AAC3C,CAAC;AAED,SAAwB,QAAQ,CAAC,QAAgB,EAAE,MAAoB;IACnE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACjC,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;IAE3C,MAAM,IAAI,GAAG,KAAK,CACd,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACjB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEvC,OAAO;YACH,EAAE;YACF,KAAK,CAAC,IAAI;YACV,KAAK,CAAC,MAAM;YACZ,WAAW;YACX,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC;SAC5C,CAAC;IACN,CAAC,CAAC,EACF;QACI,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,YAAY,CAAC,GAAW;YACpB,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QACjC,CAAC;KACJ,CACJ;SACI,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;SAC1F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAEtB,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CACvB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAC1E,CAAC;IAEF,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAlCD,2BAkCC"}
1
+ {"version":3,"file":"reporter.js","sourceRoot":"","sources":["../src/reporter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luvio/cli",
3
- "version": "0.123.0",
3
+ "version": "0.124.0",
4
4
  "description": "CLI for Luvio Compiler",
5
5
  "keywords": [
6
6
  "oclif"
@@ -26,7 +26,7 @@
26
26
  "clean": "rm -rf lib"
27
27
  },
28
28
  "dependencies": {
29
- "@luvio/compiler": "0.123.0",
29
+ "@luvio/compiler": "0.124.0",
30
30
  "@oclif/core": "^1.0.11",
31
31
  "chalk": "^4.0.0",
32
32
  "strip-ansi": "^6.0.0",
@@ -47,5 +47,6 @@
47
47
  "oclif": {
48
48
  "commands": "./lib/commands",
49
49
  "bin": "luvio"
50
- }
50
+ },
51
+ "gitHead": "50e7f51b6cf902290c846bc7ea661febc48fd145"
51
52
  }