@flowscripter/dynamic-cli-framework 1.1.1 → 1.1.3

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 (8) hide show
  1. package/bun.lock +5 -5
  2. package/package.json +3 -3
  3. package/src/service/asciiBannerGenerator/DefaultAsciiBannerGeneratorService.ts +1 -0
  4. package/src/service/printer/command/LogLevelCommand.ts +8 -4
  5. package/src/service/syntaxHighlighter/DefaultSyntaxHighlighterService.ts +7 -2
  6. package/src/service/syntaxHighlighter/SyntaxHighlighterServiceProvider.ts +14 -0
  7. package/src/util/logger.ts +9 -20
  8. package/tests/service/printer/PrinterServiceProvider.test.ts +12 -2
package/bun.lock CHANGED
@@ -13,15 +13,15 @@
13
13
  "ts-log": "^2.2.7",
14
14
  },
15
15
  "devDependencies": {
16
- "@types/bun": "^1.2.5",
16
+ "@types/bun": "^1.2.8",
17
17
  },
18
18
  "peerDependencies": {
19
- "typescript": "^5.8.2",
19
+ "typescript": "^5.8.3",
20
20
  },
21
21
  },
22
22
  },
23
23
  "packages": {
24
- "@types/bun": ["@types/bun@1.2.5", "", { "dependencies": { "bun-types": "1.2.5" } }, "sha512-w2OZTzrZTVtbnJew1pdFmgV99H0/L+Pvw+z1P67HaR18MHOzYnTYOi6qzErhK8HyT+DB782ADVPPE92Xu2/Opg=="],
24
+ "@types/bun": ["@types/bun@1.2.8", "", { "dependencies": { "bun-types": "1.2.7" } }, "sha512-t8L1RvJVUghW5V+M/fL3Thbxcs0HwNsXsnTEBEfEVqGteiJToOlZ/fyOEaR1kZsNqnu+3XA4RI/qmnX4w6+S+w=="],
25
25
 
26
26
  "@types/hast": ["@types/hast@3.0.4", "", { "dependencies": { "@types/unist": "*" } }, "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ=="],
27
27
 
@@ -31,7 +31,7 @@
31
31
 
32
32
  "@types/ws": ["@types/ws@8.5.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw=="],
33
33
 
34
- "bun-types": ["bun-types@1.2.5", "", { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } }, "sha512-3oO6LVGGRRKI4kHINx5PIdIgnLRb7l/SprhzqXapmoYkFl5m4j6EvALvbDVuuBFaamB46Ap6HCUxIXNLCGy+tg=="],
34
+ "bun-types": ["bun-types@1.2.7", "", { "dependencies": { "@types/node": "*", "@types/ws": "*" } }, "sha512-P4hHhk7kjF99acXqKvltyuMQ2kf/rzIw3ylEDpCxDS9Xa0X0Yp/gJu/vDCucmWpiur5qJ0lwB2bWzOXa2GlHqA=="],
35
35
 
36
36
  "chalk": ["chalk@5.4.1", "", {}, "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="],
37
37
 
@@ -55,7 +55,7 @@
55
55
 
56
56
  "ts-log": ["ts-log@2.2.7", "", {}, "sha512-320x5Ggei84AxzlXp91QkIGSw5wgaLT6GeAH0KsqDmRZdVWW2OiSeVvElVoatk3f7nicwXlElXsoFkARiGE2yg=="],
57
57
 
58
- "typescript": ["typescript@5.8.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="],
58
+ "typescript": ["typescript@5.8.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ=="],
59
59
 
60
60
  "undici-types": ["undici-types@6.20.0", "", {}, "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="],
61
61
 
package/package.json CHANGED
@@ -18,15 +18,15 @@
18
18
  ],
19
19
  "module": "index.ts",
20
20
  "type": "module",
21
- "version": "1.1.1",
21
+ "version": "1.1.3",
22
22
  "publishConfig": {
23
23
  "access": "public"
24
24
  },
25
25
  "devDependencies": {
26
- "@types/bun": "^1.2.5"
26
+ "@types/bun": "^1.2.8"
27
27
  },
28
28
  "peerDependencies": {
29
- "typescript": "^5.8.2"
29
+ "typescript": "^5.8.3"
30
30
  },
31
31
  "dependencies": {
32
32
  "emphasize": "^7.0.0",
package/src/service/asciiBannerGenerator/DefaultAsciiBannerGeneratorService.ts CHANGED
@@ -14,6 +14,7 @@ export default class DefaultAsciiBannerGeneratorService
14
14
  constructor() {
15
15
  this.registerFont("standard", standardFont.font);
16
16
  }
17
+
17
18
  getRegisteredFonts(): ReadonlyArray<string> {
18
19
  return this.#registeredFontNames;
19
20
  }
package/src/service/printer/command/LogLevelCommand.ts CHANGED
@@ -46,21 +46,25 @@ export default class LogLevelCommand implements GlobalModifierCommand {
46
46
 
47
47
  switch (logLevel) {
48
48
  case "DEBUG":
49
- return this.#printerServiceProvider.printerService!.setLevel(
49
+ this.#printerServiceProvider.printerService!.setLevel(
50
50
  Level.DEBUG,
51
51
  );
52
+ break;
52
53
  case "INFO":
53
- return this.#printerServiceProvider.printerService!.setLevel(
54
+ this.#printerServiceProvider.printerService!.setLevel(
54
55
  Level.INFO,
55
56
  );
57
+ break;
56
58
  case "WARN":
57
- return this.#printerServiceProvider.printerService!.setLevel(
59
+ this.#printerServiceProvider.printerService!.setLevel(
58
60
  Level.WARN,
59
61
  );
62
+ break;
60
63
  case "ERROR":
61
- return this.#printerServiceProvider.printerService!.setLevel(
64
+ this.#printerServiceProvider.printerService!.setLevel(
62
65
  Level.ERROR,
63
66
  );
67
+ break;
64
68
  }
65
69
 
66
70
  return Promise.resolve();
package/src/service/syntaxHighlighter/DefaultSyntaxHighlighterService.ts CHANGED
@@ -6,7 +6,11 @@ import json from "highlight.js/lib/languages/json";
6
6
  interface Emphasize {
7
7
  listLanguages(): ReadonlyArray<string>;
8
8
  registered(name: string): boolean;
9
- highlight(name: string, text: string): { value: string };
9
+ highlight(
10
+ name: string,
11
+ text: string,
12
+ sheet: Record<string, (string) => string> | undefined,
13
+ ): { value: string };
10
14
  register(name: string, syntax: HighlightSyntax): void;
11
15
  }
12
16
 
@@ -17,6 +21,7 @@ interface Emphasize {
17
21
  export default class DefaultSyntaxHighlighterService
18
22
  implements SyntaxHighlighterService {
19
23
  colorEnabled = true;
24
+ sheet: Record<string, (text: string) => string> | undefined;
20
25
  emphasize: Emphasize;
21
26
 
22
27
  constructor() {
@@ -39,7 +44,7 @@ export default class DefaultSyntaxHighlighterService
39
44
  return text;
40
45
  }
41
46
 
42
- return this.emphasize.highlight(name, text).value;
47
+ return this.emphasize.highlight(name, text, this.sheet).value;
43
48
  }
44
49
 
45
50
  registerSyntax(syntaxName: string, syntaxDefinition: HighlightSyntax): void {
package/src/service/syntaxHighlighter/SyntaxHighlighterServiceProvider.ts CHANGED
@@ -46,6 +46,20 @@ export default class SyntaxHighlighterServiceProvider
46
46
  this.#defaultSyntaxHighlighterService.colorEnabled =
47
47
  printerService.colorEnabled;
48
48
 
49
+ if (this.#defaultSyntaxHighlighterService.sheet === undefined) {
50
+ this.#defaultSyntaxHighlighterService.sheet = {
51
+ comment: printerService.secondary,
52
+ keyword: printerService.primary,
53
+ built_in: printerService.primary,
54
+ type: printerService.emphasised,
55
+ operator: printerService.blue,
56
+ punctuation: printerService.green,
57
+ literal: printerService.selected,
58
+ string: printerService.selected,
59
+ number: printerService.selected,
60
+ };
61
+ }
62
+
49
63
  return Promise.resolve(undefined);
50
64
  }
51
65
  }
package/src/util/logger.ts CHANGED
@@ -28,28 +28,17 @@ let maxLoggerNameLength = 0;
28
28
  const LOGGER_NAME_PADDINGS: Record<string, string> = {};
29
29
 
30
30
  function getDefaultLogger(): Logger {
31
- if (debugEnabled) {
32
- return {
33
- trace: () => {},
34
- debug: (message, ...optionalParams) => {
35
- console.debug(message, ...optionalParams);
36
- },
37
- info: (message, ...optionalParams) => {
38
- console.info(message, ...optionalParams);
39
- },
40
- warn: (message, ...optionalParams) => {
41
- console.warn(message, ...optionalParams);
42
- },
43
- error: (message, ...optionalParams) => {
44
- console.error(message, ...optionalParams);
45
- },
46
- };
47
- }
48
31
  return {
49
32
  trace: () => {},
50
- debug: () => {},
51
- info: () => {},
52
- warn: () => {},
33
+ debug: (message, ...optionalParams) => {
34
+ console.debug(message, ...optionalParams);
35
+ },
36
+ info: (message, ...optionalParams) => {
37
+ console.info(message, ...optionalParams);
38
+ },
39
+ warn: (message, ...optionalParams) => {
40
+ console.warn(message, ...optionalParams);
41
+ },
53
42
  error: (message, ...optionalParams) => {
54
43
  console.error(message, ...optionalParams);
55
44
  },
package/tests/service/printer/PrinterServiceProvider.test.ts CHANGED
@@ -6,14 +6,24 @@ import { SHUTDOWN_SERVICE_ID } from "../../../src/api/service/core/ShutdownServi
6
6
  import DefaultShutdownService from "../../../src/service/shutdown/DefaultShutdownService.ts";
7
7
  import TtyTerminal from "../../../src/service/printer/terminal/TtyTerminal.ts";
8
8
  import StreamString from "../../fixtures/StreamString.ts";
9
+ import TtyStyler from "../../../src/service/printer/terminal/TtyStyler.ts";
10
+ import DefaultPrinterService from "../../../src/service/printer/DefaultPrinterService.ts";
9
11
 
10
12
  describe("PrinterServiceProvider tests", () => {
11
13
  test("PrinterServiceProvider provide works", async () => {
12
14
  const streamString = new StreamString();
13
- const printerServiceProvider = new PrinterServiceProvider(
14
- 100,
15
+ const printerService = new DefaultPrinterService(
15
16
  streamString.writableStream,
17
+ streamString.writableStream,
18
+ true,
19
+ true,
16
20
  new TtyTerminal(streamString.writeStream),
21
+ new TtyStyler(3),
22
+ );
23
+
24
+ const printerServiceProvider = new PrinterServiceProvider(
25
+ 100,
26
+ printerService,
17
27
  );
18
28
  const cliConfig = getCLIConfig();
19
29
  const context = new DefaultContext(cliConfig);