@flowscripter/dynamic-cli-framework 7.1.3 → 8.0.1

package/dist/src/runtime/values/subCommandValuePopulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subCommandValuePopulation.d.ts","sourceRoot":"","sources":["../../../../src/runtime/values/subCommandValuePopulation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,yCAAyC,CAAC;AAGjD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAujBlF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAC9C,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,EACpC,aAAa,EAAE,eAAe,GAAG,SAAS,GACzC,+BAA+B,CAkEjC"}
+{"version":3,"file":"subCommandValuePopulation.d.ts","sourceRoot":"","sources":["../../../../src/runtime/values/subCommandValuePopulation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,yCAAyC,CAAC;AAGjD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAsjBlF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAC9C,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,EACpC,aAAa,EAAE,eAAe,GAAG,SAAS,GACzC,+BAA+B,CAkEjC"}

package/dist/src/runtime/values/subCommandValuePopulation.js

@@ -131,6 +131,7 @@ class ParseContext {
         const complexAndArrayPathElements = [];
         let option = undefined;
         let currentValue = this.populatedArgumentValues;
+        let lookupPath = this.subCommand.name;
         for (let i = 0; i < complexPathElements.length; i++) {
             let arrayIndexString;
             let complexPathElement = complexPathElements[i];
@@ -140,7 +141,6 @@ class ParseContext {
                     .slice(0, complexPathElement.length - 1)
                     .split("[");
             }
-            let lookupPath = this.subCommand.name;
             // root option navigation
             if (i === 0) {
                 if (complexPathElement.startsWith("--")) {
@@ -164,7 +164,7 @@ class ParseContext {
                 complexPathElement = option.name;
             } // complex option property navigation
             else {
-                lookupPath = `${lookupPath}${option.name}`;
+                lookupPath = `${lookupPath}.${option.name}`;
                 // lazy creation of nested option paths to options
                 if (!this.optionLookupMapsByPath.has(lookupPath)) {
                     const properties = option.properties;

package/dist/src/service/prettyPrinter/DefaultPrettyPrinterService.d.ts

@@ -1,8 +1,10 @@
 import type { PrettyPrinterService } from "@flowscripter/dynamic-cli-framework-api";
 import type { Plugin } from "prettier";
 /**
- * Default implementation of {@link PrettyPrinterService} which provides by default the
- * syntaxes built into prettier.
+ * Default implementation of {@link PrettyPrinterService} which provides JSON by default.
+ *
+ * Only prettier's babel and estree plugins are bundled, which provide the JSON parser and printer.
+ * Other syntaxes are added with {@link registerSyntax}.
  */
 export default class DefaultPrettyPrinterService implements PrettyPrinterService {
     #private;

package/dist/src/service/prettyPrinter/DefaultPrettyPrinterService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultPrettyPrinterService.d.ts","sourceRoot":"","sources":["../../../../src/service/prettyPrinter/DefaultPrettyPrinterService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA4B,YAAW,oBAAoB;;IASxE,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAM5D;IAEK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBhE;IAEK,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAYrF;CACF"}
+{"version":3,"file":"DefaultPrettyPrinterService.d.ts","sourceRoot":"","sources":["../../../../src/service/prettyPrinter/DefaultPrettyPrinterService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,UAAU,CAAC;AAIhD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA4B,YAAW,oBAAoB;;IAI9E,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAEtD;IAEK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAShE;IAED,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/E;CACF"}

package/dist/src/service/prettyPrinter/DefaultPrettyPrinterService.js

@@ -1,45 +1,33 @@
-import * as prettier from "prettier";
+import * as prettier from "prettier/standalone";
+import * as babel from "prettier/plugins/babel";
+import * as estree from "prettier/plugins/estree";
 /**
- * Default implementation of {@link PrettyPrinterService} which provides by default the
- * syntaxes built into prettier.
+ * Default implementation of {@link PrettyPrinterService} which provides JSON by default.
+ *
+ * Only prettier's babel and estree plugins are bundled, which provide the JSON parser and printer.
+ * Other syntaxes are added with {@link registerSyntax}.
  */
 export default class DefaultPrettyPrinterService {
-    #registeredSyntaxes = new Array();
-    #syntaxNameToPluginnMap = new Map();
-    async #populateBuiltInSyntaxes() {
-        const languages = (await prettier.getSupportInfo()).languages;
-        this.#registeredSyntaxes = languages.map((language) => language.name.toLowerCase());
-    }
-    async getRegisteredSyntaxes() {
-        if (this.#registeredSyntaxes.length === 0) {
-            await this.#populateBuiltInSyntaxes();
-        }
-        return this.#registeredSyntaxes;
+    #registeredSyntaxes = ["json"];
+    #plugins = [babel, estree];
+    getRegisteredSyntaxes() {
+        return Promise.resolve(this.#registeredSyntaxes);
     }
     async prettify(text, syntaxName) {
-        if (this.#registeredSyntaxes.length === 0) {
-            await this.#populateBuiltInSyntaxes();
-        }
         const name = syntaxName.toLowerCase();
         if (!this.#registeredSyntaxes.includes(name)) {
             throw new Error(`Syntax name is not registered: ${name}`);
         }
-        const options = { parser: syntaxName };
-        const syntaxPlugin = this.#syntaxNameToPluginnMap.get(name);
-        if (syntaxPlugin) {
-            options.plugins = [syntaxPlugin];
-        }
+        const options = { parser: syntaxName, plugins: this.#plugins };
         return prettier.format(text, options);
     }
-    async registerSyntax(syntaxName, syntaxPlugin) {
-        if (this.#registeredSyntaxes.length === 0) {
-            await this.#populateBuiltInSyntaxes();
-        }
+    registerSyntax(syntaxName, syntaxPlugin) {
         const name = syntaxName.toLowerCase();
         if (this.#registeredSyntaxes.includes(name)) {
-            throw new Error(`Syntax name already registered: ${name}`);
+            return Promise.reject(new Error(`Syntax name already registered: ${name}`));
         }
         this.#registeredSyntaxes.push(name);
-        this.#syntaxNameToPluginnMap.set(name, syntaxPlugin);
+        this.#plugins.push(syntaxPlugin);
+        return Promise.resolve();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "7.1.3",
+  "version": "8.0.1",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -26,6 +26,7 @@
     "LICENSE"
   ],
   "type": "module",
+  "sideEffects": false,
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/runtime/values/subCommandValuePopulation.ts

@@ -168,6 +168,7 @@ class ParseContext {
       | PopulatedValueType
       | undefined = this.populatedArgumentValues;
 
+    let lookupPath = this.subCommand.name;
     for (let i = 0; i < complexPathElements.length; i++) {
       let arrayIndexString: string | undefined;
       let complexPathElement = complexPathElements[i]!;
@@ -179,8 +180,6 @@ class ParseContext {
           .split("[") as [string, string | undefined];
       }
 
-      let lookupPath = this.subCommand.name;
-
       // root option navigation
       if (i === 0) {
         if (complexPathElement.startsWith("--")) {
@@ -205,7 +204,7 @@ class ParseContext {
         complexPathElement = option.name;
       } // complex option property navigation
       else {
-        lookupPath = `${lookupPath}${option!.name}`;
+        lookupPath = `${lookupPath}.${option!.name}`;
 
         // lazy creation of nested option paths to options
         if (!this.optionLookupMapsByPath.has(lookupPath)) {

package/src/service/prettyPrinter/DefaultPrettyPrinterService.ts

@@ -1,59 +1,42 @@
 import type { PrettyPrinterService } from "@flowscripter/dynamic-cli-framework-api";
-import * as prettier from "prettier";
-import type { Plugin } from "prettier";
+import * as prettier from "prettier/standalone";
+import type { Options, Plugin } from "prettier";
+import * as babel from "prettier/plugins/babel";
+import * as estree from "prettier/plugins/estree";
 
 /**
- * Default implementation of {@link PrettyPrinterService} which provides by default the
- * syntaxes built into prettier.
+ * Default implementation of {@link PrettyPrinterService} which provides JSON by default.
+ *
+ * Only prettier's babel and estree plugins are bundled, which provide the JSON parser and printer.
+ * Other syntaxes are added with {@link registerSyntax}.
  */
 export default class DefaultPrettyPrinterService implements PrettyPrinterService {
-  #registeredSyntaxes = new Array<string>();
-  #syntaxNameToPluginnMap = new Map<string, Plugin<unknown>>();
+  readonly #registeredSyntaxes = ["json"];
+  readonly #plugins: Array<Plugin<unknown>> = [babel, estree as Plugin<unknown>];
 
-  async #populateBuiltInSyntaxes(): Promise<void> {
-    const languages = (await prettier.getSupportInfo()).languages;
-    this.#registeredSyntaxes = languages.map((language) => language.name.toLowerCase());
-  }
-
-  async getRegisteredSyntaxes(): Promise<ReadonlyArray<string>> {
-    if (this.#registeredSyntaxes.length === 0) {
-      await this.#populateBuiltInSyntaxes();
-    }
-
-    return this.#registeredSyntaxes;
+  getRegisteredSyntaxes(): Promise<ReadonlyArray<string>> {
+    return Promise.resolve(this.#registeredSyntaxes);
   }
 
   async prettify(text: string, syntaxName: string): Promise<string> {
-    if (this.#registeredSyntaxes.length === 0) {
-      await this.#populateBuiltInSyntaxes();
-    }
-
     const name = syntaxName.toLowerCase();
     if (!this.#registeredSyntaxes.includes(name)) {
       throw new Error(`Syntax name is not registered: ${name}`);
     }
 
-    const options: prettier.Options = { parser: syntaxName };
-
-    const syntaxPlugin = this.#syntaxNameToPluginnMap.get(name);
-    if (syntaxPlugin) {
-      options.plugins = [syntaxPlugin];
-    }
+    const options: Options = { parser: syntaxName, plugins: this.#plugins };
 
     return prettier.format(text, options);
   }
 
-  async registerSyntax(syntaxName: string, syntaxPlugin: Plugin<unknown>): Promise<void> {
-    if (this.#registeredSyntaxes.length === 0) {
-      await this.#populateBuiltInSyntaxes();
-    }
-
+  registerSyntax(syntaxName: string, syntaxPlugin: Plugin<unknown>): Promise<void> {
     const name = syntaxName.toLowerCase();
     if (this.#registeredSyntaxes.includes(name)) {
-      throw new Error(`Syntax name already registered: ${name}`);
+      return Promise.reject(new Error(`Syntax name already registered: ${name}`));
     }
 
     this.#registeredSyntaxes.push(name);
-    this.#syntaxNameToPluginnMap.set(name, syntaxPlugin);
+    this.#plugins.push(syntaxPlugin);
+    return Promise.resolve();
   }
 }