fix: adjust to use lastUsed or "default" if you profile is specified

starpit · starpit · commit ea441d99b441 · 2022-07-25T19:26:32.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/plugin-madwizard/package.json b/plugins/plugin-madwizard/package.json
@@ -23,6 +23,6 @@
     "access": "public"
   },
   "dependencies": {
-    "madwizard": "^0.15.11"
+    "madwizard": "^0.15.12"
   }
 }
diff --git a/plugins/plugin-madwizard/src/plugin.ts b/plugins/plugin-madwizard/src/plugin.ts
@@ -77,6 +77,13 @@ export function doMadwizard(
         process.env.QUIET_CONSOLE = "true"
       }
 
+      // decide which profile to use
+      const profile =
+        parsedOptions.p || // specified on command line
+        (await import("madwizard").then((_) => _.Profiles.lastUsed())) || // last used profile
+        "default" // the default, if no lastUsed is found!
+      console.error("!!!!", profile)
+
       await cli(
         [
           "madwizard",
@@ -89,7 +96,7 @@ export function doMadwizard(
         {
           store: parsedOptions.s || process.env.GUIDEBOOK_STORE,
           verbose: parsedOptions.V,
-          profile: parsedOptions.p,
+          profile,
           interactive: parsedOptions.i || !parsedOptions.y,
         }
       )

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,13 @@ export function doMadwizard(`
`77`	`77`	`process.env.QUIET_CONSOLE = "true"`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ // decide which profile to use`
	`81`	`+ const profile =`
	`82`	`+ parsedOptions.p \|\| // specified on command line`
	`83`	`+ (await import("madwizard").then((_) => _.Profiles.lastUsed())) \|\| // last used profile`
	`84`	`+ "default" // the default, if no lastUsed is found!`
	`85`	`+ console.error("!!!!", profile)`
	`86`	`+`
`80`	`87`	`await cli(`
`81`	`88`	`[`
`82`	`89`	`"madwizard",`
`@@ -89,7 +96,7 @@ export function doMadwizard(`
`89`	`96`	`{`
`90`	`97`	`store: parsedOptions.s \|\| process.env.GUIDEBOOK_STORE,`
`91`	`98`	`verbose: parsedOptions.V,`
`92`		`- profile: parsedOptions.p,`
	`99`	`+ profile,`
`93`	`100`	`interactive: parsedOptions.i \|\| !parsedOptions.y,`
`94`	`101`	`}`
`95`	`102`	`)`