@flowscripter/dynamic-cli-framework 1.1.0 → 1.1.2

package/bun.lock

@@ -13,7 +13,7 @@
         "ts-log": "^2.2.7",
       },
       "devDependencies": {
-        "@types/bun": "^1.2.5",
+        "@types/bun": "^1.2.8",
       },
       "peerDependencies": {
         "typescript": "^5.8.2",
@@ -21,7 +21,7 @@
     },
   },
   "packages": {
-    "@types/bun": ["@types/bun@1.2.5", "", { "dependencies": { "bun-types": "1.2.5" } }, "sha512-w2OZTzrZTVtbnJew1pdFmgV99H0/L+Pvw+z1P67HaR18MHOzYnTYOi6qzErhK8HyT+DB782ADVPPE92Xu2/Opg=="],
+    "@types/bun": ["@types/bun@1.2.8", "", { "dependencies": { "bun-types": "1.2.7" } }, "sha512-t8L1RvJVUghW5V+M/fL3Thbxcs0HwNsXsnTEBEfEVqGteiJToOlZ/fyOEaR1kZsNqnu+3XA4RI/qmnX4w6+S+w=="],
 
     "@types/hast": ["@types/hast@3.0.4", "", { "dependencies": { "@types/unist": "*" } }, "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ=="],
 
@@ -31,7 +31,7 @@
 
     "@types/ws": ["@types/ws@8.5.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw=="],
 
-    "bun-types": ["bun-types@1.2.5", "", { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } }, "sha512-3oO6LVGGRRKI4kHINx5PIdIgnLRb7l/SprhzqXapmoYkFl5m4j6EvALvbDVuuBFaamB46Ap6HCUxIXNLCGy+tg=="],
+    "bun-types": ["bun-types@1.2.7", "", { "dependencies": { "@types/node": "*", "@types/ws": "*" } }, "sha512-P4hHhk7kjF99acXqKvltyuMQ2kf/rzIw3ylEDpCxDS9Xa0X0Yp/gJu/vDCucmWpiur5qJ0lwB2bWzOXa2GlHqA=="],
 
     "chalk": ["chalk@5.4.1", "", {}, "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="],
 

package/index.ts

@@ -67,6 +67,11 @@ export type { default as SyntaxHighlighterService } from "./src/api/service/core
 export { default as DefaultSyntaxHighlighterService } from "./src/service/syntaxHighlighter/DefaultSyntaxHighlighterService.ts";
 export { default as SyntaxHighlighterServiceProvider } from "./src/service/syntaxHighlighter/SyntaxHighlighterServiceProvider.ts";
 
+export { PRETTY_PRINTER_SERVICE_ID } from "./src/api/service/core/PrettyPrinterService.ts";
+export type { default as PrettyPrinterService } from "./src/api/service/core/PrettyPrinterService.ts";
+export { default as DefaultPrettyPrinterService } from "./src/service/prettyPrinter/DefaultPrettyPrinterService.ts";
+export { default as PrettyPrinterServiceProvider } from "./src/service/prettyPrinter/PrettyPrinterServiceProvider.ts";
+
 // CLI API
 export type { InvalidArgument } from "./src/api/RunResult.ts";
 export type { default as Context } from "./src/api/Context.ts";

package/package.json

@@ -18,12 +18,12 @@
   ],
   "module": "index.ts",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@types/bun": "^1.2.5"
+    "@types/bun": "^1.2.8"
   },
   "peerDependencies": {
     "typescript": "^5.8.2"

package/src/api/service/core/PrettyPrinterService.ts

@@ -1,7 +1,7 @@
 export const PRETTY_PRINTER_SERVICE_ID =
   "@flowscripter/dynamic-cli-framework/pretty-printer-service";
 
-import type { Plugin as PrettierSyntax } from "prettier";
+import type { Plugin } from "prettier";
 
 /**
  * Service providing syntax based pretty printing of text for the CLI using [prettier](https://github.com/prettier/prettier).
@@ -20,11 +20,11 @@ export default interface PrettyPrinterService {
    * * https://prettier.io/docs/plugins
    *
    * @param syntaxName the name used to refer to the syntax.
-   * @param syntaxDefinition the definition for the syntax conforming to the Prettier plugin syntax.
+   * @param syntaxDefinition the definition for the syntax conforming to the Prettier plugin interface.
    */
   registerSyntax(
     syntaxName: string,
-    syntaxDefinition: PrettierSyntax<unknown>,
+    syntaxDefinition: Plugin<unknown>,
   ): Promise<void>;
 
   /**

package/src/service/prettyPrinter/DefaultPrettyPrinterService.ts

@@ -1,15 +1,15 @@
 import type PrettyPrinterService from "../../api/service/core/PrettyPrinterService.ts";
 import * as prettier from "prettier";
-import type { Plugin as PrettierSyntax } from "prettier";
+import type { Plugin } from "prettier";
 
 /**
- * Default implementation of {@link PrettyPrinterService} which already has syntax definitions
- * for those built into prettier.
+ * Default implementation of {@link PrettyPrinterService} which provides by default the
+ * syntaxes built into prettier.
  */
 export default class DefaultPrettyPrinterService
   implements PrettyPrinterService {
   #registeredSyntaxes = new Array<string>();
-  #syntaxNameToDefinitionMap = new Map<string, PrettierSyntax>();
+  #syntaxNameToPluginnMap = new Map<string, Plugin>();
 
   async #populateBuiltInSyntaxes(): Promise<void> {
     const languages = (await prettier.getSupportInfo()).languages;
@@ -38,11 +38,11 @@ export default class DefaultPrettyPrinterService
 
     const options: prettier.Options = { parser: syntaxName };
 
-    const syntaxDefinition = this.#syntaxNameToDefinitionMap.get(
+    const syntaxPlugin = this.#syntaxNameToPluginnMap.get(
       name,
     );
-    if (syntaxDefinition) {
-      options.plugins = [syntaxDefinition];
+    if (syntaxPlugin) {
+      options.plugins = [syntaxPlugin];
     }
 
     return prettier.format(text, options);
@@ -50,7 +50,7 @@ export default class DefaultPrettyPrinterService
 
   async registerSyntax(
     syntaxName: string,
-    syntaxDefinition: PrettierSyntax,
+    syntaxPlugin: Plugin,
   ): Promise<void> {
     if (this.#registeredSyntaxes.length === 0) {
       await this.#populateBuiltInSyntaxes();
@@ -62,6 +62,6 @@ export default class DefaultPrettyPrinterService
     }
 
     this.#registeredSyntaxes.push(name);
-    this.#syntaxNameToDefinitionMap.set(name, syntaxDefinition);
+    this.#syntaxNameToPluginnMap.set(name, syntaxPlugin);
   }
 }

package/src/service/printer/command/LogLevelCommand.ts

@@ -46,21 +46,25 @@ export default class LogLevelCommand implements GlobalModifierCommand {
 
     switch (logLevel) {
       case "DEBUG":
-        return this.#printerServiceProvider.printerService!.setLevel(
+        this.#printerServiceProvider.printerService!.setLevel(
           Level.DEBUG,
         );
+        break;
       case "INFO":
-        return this.#printerServiceProvider.printerService!.setLevel(
+        this.#printerServiceProvider.printerService!.setLevel(
           Level.INFO,
         );
+        break;
       case "WARN":
-        return this.#printerServiceProvider.printerService!.setLevel(
+        this.#printerServiceProvider.printerService!.setLevel(
           Level.WARN,
         );
+        break;
       case "ERROR":
-        return this.#printerServiceProvider.printerService!.setLevel(
+        this.#printerServiceProvider.printerService!.setLevel(
           Level.ERROR,
         );
+        break;
     }
 
     return Promise.resolve();

package/src/util/logger.ts

@@ -28,28 +28,17 @@ let maxLoggerNameLength = 0;
 const LOGGER_NAME_PADDINGS: Record<string, string> = {};
 
 function getDefaultLogger(): Logger {
-  if (debugEnabled) {
-    return {
-      trace: () => {},
-      debug: (message, ...optionalParams) => {
-        console.debug(message, ...optionalParams);
-      },
-      info: (message, ...optionalParams) => {
-        console.info(message, ...optionalParams);
-      },
-      warn: (message, ...optionalParams) => {
-        console.warn(message, ...optionalParams);
-      },
-      error: (message, ...optionalParams) => {
-        console.error(message, ...optionalParams);
-      },
-    };
-  }
   return {
     trace: () => {},
-    debug: () => {},
-    info: () => {},
-    warn: () => {},
+    debug: (message, ...optionalParams) => {
+      console.debug(message, ...optionalParams);
+    },
+    info: (message, ...optionalParams) => {
+      console.info(message, ...optionalParams);
+    },
+    warn: (message, ...optionalParams) => {
+      console.warn(message, ...optionalParams);
+    },
     error: (message, ...optionalParams) => {
       console.error(message, ...optionalParams);
     },

package/tests/fixtures/prettierPluginFoo.ts

@@ -1,11 +1,13 @@
-const languages = [
+import type { Parser, Plugin, Printer, SupportLanguage } from "prettier";
+
+const languages: SupportLanguage[] = [
   {
     name: "foo",
     parsers: ["foo"],
   },
 ];
 
-const parsers = {
+const parsers: Record<string, Parser> = {
   foo: {
     astFormat: "foo",
     parse: () => "",
@@ -14,14 +16,16 @@ const parsers = {
   },
 };
 
-const printers = {
+const printers: Record<string, Printer> = {
   "foo": {
     print: () => "foo",
   },
 };
 
-export default {
+const prettierPluginFoo: Plugin = {
   languages,
   parsers,
   printers,
 };
+
+export default prettierPluginFoo;