@sprucelabs/spruce-cli 14.29.2 → 14.29.6

package/build/services/ServiceFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/ServiceFactory.ts"],"names":["ServiceFactory","cwd","type","AuthService","EnvService","PkgService","VsCodeService","SchemaService","command","CommandService","LintService","Service","RemoteService","TypeCheckerService","buildImportService","SettingsService","DependencyService","commandService","BuildService","EventSettingsService","Error","ImportService"],"mappings":";;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;IAwBqBA,c;;;;;;;;;;;;;;;;;MACpB,UAAkCC,GAAlC,EAA+CC,IAA/C,EAAuE;AAAA;;AACtE,cAAQA,IAAR;AACC,aAAK,MAAL;AACC,iBAAO,IAAIC,uBAAJ,CACN,IAAIC,4BAAJ,CAAeH,GAAf,CADM,EAEN,IAAII,sBAAJ,CAAeJ,GAAf,CAFM,CAAP;;AAID,aAAK,KAAL;AACC,iBAAO,IAAII,sBAAJ,CAAeJ,GAAf,CAAP;;AACD,aAAK,KAAL;AACC,iBAAO,IAAIG,4BAAJ,CAAeH,GAAf,CAAP;;AACD,aAAK,QAAL;AACC,iBAAO,IAAIK,yBAAJ,CAAkBL,GAAlB,CAAP;;AACD,aAAK,QAAL;AACC,iBAAO,IAAIM,yBAAJ,CAAkB;AACxBN,YAAAA,GAAG,EAAHA,GADwB;AAExBO,YAAAA,OAAO,EAAE,IAAIC,0BAAJ,CAAmBR,GAAnB;AAFe,WAAlB,CAAP;;AAID,aAAK,MAAL;AACC,iBAAO,IAAIS,uBAAJ,CAAgBT,GAAhB,EAAqB;AAAA,mBAC3B,KAAI,CAACU,OAAL,CAAaV,GAAb,EAAkB,SAAlB,CAD2B;AAAA,WAArB,CAAP;;AAGD,aAAK,SAAL;AAAgB;AACf,mBAAO,IAAIQ,0BAAJ,CAAmBR,GAAnB,CAAP;AACA;;AACD,aAAK,QAAL;AACC,iBAAO,IAAIW,yBAAJ,CAAkB,IAAIR,4BAAJ,CAAeH,GAAf,CAAlB,CAAP;;AACD,aAAK,aAAL;AACC,iBAAO,IAAIY,8BAAJ,CACN,KAAKC,kBAAL,CAAwBb,GAAxB,CADM,CAAP;;AAGD,aAAK,UAAL;AACC,iBAAO,IAAIc,iCAAJ,CAAiCd,GAAjC,CAAP;;AACD,aAAK,YAAL;AACC,iBAAO,IAAIe,6BAAJ,CACN,IAAID,iCAAJ,CAAiCd,GAAjC,CADM,CAAP;;AAGD,aAAK,QAAL;AACC,iBAAO,KAAKa,kBAAL,CAAwBb,GAAxB,CAAP;;AACD,aAAK,OAAL;AAAc;AACb,gBAAMgB,cAAc,GAAG,IAAIR,0BAAJ,CAAmBR,GAAnB,CAAvB;AACA,mBAAO,IAAIiB,wBAAJ,CACND,cADM,EAEN,IAAIP,uBAAJ,CAAgBT,GAAhB,EAAqB;AAAA,qBAAM,KAAI,CAACU,OAAL,CAAaV,GAAb,EAAkB,SAAlB,CAAN;AAAA,aAArB,CAFM,CAAP;AAIA;;AACD,aAAK,eAAL;AACC,iBAAO,IAAIkB,gCAAJ,CACN,IAAIJ,iCAAJ,CAAoBd,GAApB,CADM,CAAP;;AAGD;AACC,gBAAM,IAAImB,KAAJ,qBAAsBlB,IAAtB,kBAAN;AAlDF;AAoDA,K;;;WAED,4BAA2BD,GAA3B,EAAuD;AACtD,aAAO,IAAIoB,yBAAJ,CAAkB;AACxBpB,QAAAA,GAAG,EAAHA,GADwB;AAExBO,QAAAA,OAAO,EAAE,IAAIC,0BAAJ,CAAmBR,GAAnB;AAFe,OAAlB,CAAP;AAIA","sourcesContent":["import { SettingsService, EnvService } from '@sprucelabs/spruce-skill-utils'\nimport EventSettingsService from '../features/event/services/EventSettingsService'\nimport RemoteService from '../features/event/services/RemoteService'\nimport { FeatureCode } from '../features/features.types'\nimport SchemaService from '../features/schema/services/SchemaService'\nimport VsCodeService from '../features/vscode/services/VsCodeService'\nimport AuthService from './AuthService'\nimport BuildService from './BuildService'\nimport CommandService from './CommandService'\nimport DependencyService from './DependencyService'\nimport ImportService from './ImportService'\nimport LintService from './LintService'\nimport PkgService from './PkgService'\nimport TypeCheckerService from './TypeCheckerService'\n\nexport interface ServiceMap {\n\tpkg: PkgService\n\tvsCode: VsCodeService\n\tschema: SchemaService\n\tlint: LintService\n\tcommand: CommandService\n\ttypeChecker: TypeCheckerService\n\timport: ImportService\n\tbuild: BuildService\n\tsettings: SettingsService\n\tenv: EnvService\n\tauth: AuthService\n\tremote: RemoteService\n\teventSettings: EventSettingsService\n\tdependency: DependencyService\n}\n\nexport type Service = keyof ServiceMap\n\nexport interface ServiceProvider {\n\tService<S extends Service>(type: S, cwd?: string): ServiceMap[S]\n}\nexport default class ServiceFactory {\n\tpublic Service<S extends Service>(cwd: string, type: S): ServiceMap[S] {\n\t\tswitch (type) {\n\t\t\tcase 'auth':\n\t\t\t\treturn new AuthService(\n\t\t\t\t\tnew EnvService(cwd),\n\t\t\t\t\tnew PkgService(cwd)\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'pkg':\n\t\t\t\treturn new PkgService(cwd) as ServiceMap[S]\n\t\t\tcase 'env':\n\t\t\t\treturn new EnvService(cwd) as ServiceMap[S]\n\t\t\tcase 'vsCode':\n\t\t\t\treturn new VsCodeService(cwd) as ServiceMap[S]\n\t\t\tcase 'schema':\n\t\t\t\treturn new SchemaService({\n\t\t\t\t\tcwd,\n\t\t\t\t\tcommand: new CommandService(cwd),\n\t\t\t\t}) as ServiceMap[S]\n\t\t\tcase 'lint':\n\t\t\t\treturn new LintService(cwd, () =>\n\t\t\t\t\tthis.Service(cwd, 'command')\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'command': {\n\t\t\t\treturn new CommandService(cwd) as ServiceMap[S]\n\t\t\t}\n\t\t\tcase 'remote':\n\t\t\t\treturn new RemoteService(new EnvService(cwd)) as ServiceMap[S]\n\t\t\tcase 'typeChecker':\n\t\t\t\treturn new TypeCheckerService(\n\t\t\t\t\tthis.buildImportService(cwd)\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'settings':\n\t\t\t\treturn new SettingsService<FeatureCode>(cwd) as ServiceMap[S]\n\t\t\tcase 'dependency':\n\t\t\t\treturn new DependencyService(\n\t\t\t\t\tnew SettingsService<FeatureCode>(cwd)\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'import':\n\t\t\t\treturn this.buildImportService(cwd) as ServiceMap[S]\n\t\t\tcase 'build': {\n\t\t\t\tconst commandService = new CommandService(cwd)\n\t\t\t\treturn new BuildService(\n\t\t\t\t\tcommandService,\n\t\t\t\t\tnew LintService(cwd, () => this.Service(cwd, 'command'))\n\t\t\t\t) as ServiceMap[S]\n\t\t\t}\n\t\t\tcase 'eventSettings':\n\t\t\t\treturn new EventSettingsService(\n\t\t\t\t\tnew SettingsService(cwd)\n\t\t\t\t) as ServiceMap[S]\n\t\t\tdefault:\n\t\t\t\tthrow new Error(`Service \"${type}\" not found`)\n\t\t}\n\t}\n\n\tprivate buildImportService(cwd: string): ImportService {\n\t\treturn new ImportService({\n\t\t\tcwd,\n\t\t\tcommand: new CommandService(cwd),\n\t\t})\n\t}\n}\n"],"file":"ServiceFactory.js"}
+{"version":3,"sources":["../../src/services/ServiceFactory.ts"],"names":["ServiceFactory","cwd","type","AuthService","Auth","PkgService","Service","EnvService","VsCodeService","SchemaService","command","CommandService","LintService","RemoteService","TypeCheckerService","buildImportService","SettingsService","DependencyService","commandService","BuildService","EventSettingsService","Error","ImportService"],"mappings":";;;;;;;;;;;;;AAAA;;AAKA;;AACA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;IAwBqBA,c;;;;;;;;;;;;;;;;;MACpB,UAAkCC,GAAlC,EAA+CC,IAA/C,EAAuE;AAAA;;AACtE,cAAQA,IAAR;AACC,aAAK,MAAL;AACC,iBAAOC,8BAAYC,IAAZ,CAAiBH,GAAjB,CAAP;;AACD,aAAK,KAAL;AACC,iBAAO,IAAII,sBAAJ,CACNJ,GADM,EAEN,KAAKK,OAAL,CAAaL,GAAb,EAAkB,SAAlB,CAFM,CAAP;;AAID,aAAK,KAAL;AACC,iBAAO,IAAIM,4BAAJ,CAAeN,GAAf,CAAP;;AACD,aAAK,QAAL;AACC,iBAAO,IAAIO,yBAAJ,CAAkBP,GAAlB,CAAP;;AACD,aAAK,QAAL;AACC,iBAAO,IAAIQ,yBAAJ,CAAkB;AACxBR,YAAAA,GAAG,EAAHA,GADwB;AAExBS,YAAAA,OAAO,EAAE,IAAIC,0BAAJ,CAAmBV,GAAnB;AAFe,WAAlB,CAAP;;AAID,aAAK,MAAL;AACC,iBAAO,IAAIW,uBAAJ,CAAgBX,GAAhB,EAAqB;AAAA,mBAC3B,KAAI,CAACK,OAAL,CAAaL,GAAb,EAAkB,SAAlB,CAD2B;AAAA,WAArB,CAAP;;AAGD,aAAK,SAAL;AAAgB;AACf,mBAAO,IAAIU,0BAAJ,CAAmBV,GAAnB,CAAP;AACA;;AACD,aAAK,QAAL;AACC,iBAAO,IAAIY,yBAAJ,CAAkB,IAAIN,4BAAJ,CAAeN,GAAf,CAAlB,CAAP;;AACD,aAAK,aAAL;AACC,iBAAO,IAAIa,8BAAJ,CACN,KAAKC,kBAAL,CAAwBd,GAAxB,CADM,CAAP;;AAGD,aAAK,UAAL;AACC,iBAAO,IAAIe,iCAAJ,CAAiCf,GAAjC,CAAP;;AACD,aAAK,YAAL;AACC,iBAAO,IAAIgB,6BAAJ,CACN,IAAID,iCAAJ,CAAiCf,GAAjC,CADM,CAAP;;AAGD,aAAK,QAAL;AACC,iBAAO,KAAKc,kBAAL,CAAwBd,GAAxB,CAAP;;AACD,aAAK,OAAL;AAAc;AACb,gBAAMiB,cAAc,GAAG,IAAIP,0BAAJ,CAAmBV,GAAnB,CAAvB;AACA,mBAAO,IAAIkB,wBAAJ,CACND,cADM,EAEN,IAAIN,uBAAJ,CAAgBX,GAAhB,EAAqB;AAAA,qBAAM,KAAI,CAACK,OAAL,CAAaL,GAAb,EAAkB,SAAlB,CAAN;AAAA,aAArB,CAFM,CAAP;AAIA;;AACD,aAAK,eAAL;AACC,iBAAO,IAAImB,gCAAJ,CACN,IAAIJ,iCAAJ,CAAoBf,GAApB,CADM,CAAP;;AAGD;AACC,gBAAM,IAAIoB,KAAJ,qBAAsBnB,IAAtB,kBAAN;AAlDF;AAoDA,K;;;WAED,4BAA2BD,GAA3B,EAAuD;AACtD,aAAO,IAAIqB,yBAAJ,CAAkB;AACxBrB,QAAAA,GAAG,EAAHA,GADwB;AAExBS,QAAAA,OAAO,EAAE,IAAIC,0BAAJ,CAAmBV,GAAnB;AAFe,OAAlB,CAAP;AAIA","sourcesContent":["import {\n\tSettingsService,\n\tEnvService,\n\tAuthService,\n} from '@sprucelabs/spruce-skill-utils'\nimport EventSettingsService from '../features/event/services/EventSettingsService'\nimport RemoteService from '../features/event/services/RemoteService'\nimport { FeatureCode } from '../features/features.types'\nimport SchemaService from '../features/schema/services/SchemaService'\nimport VsCodeService from '../features/vscode/services/VsCodeService'\nimport BuildService from './BuildService'\nimport CommandService from './CommandService'\nimport DependencyService from './DependencyService'\nimport ImportService from './ImportService'\nimport LintService from './LintService'\nimport PkgService from './PkgService'\nimport TypeCheckerService from './TypeCheckerService'\n\nexport interface ServiceMap {\n\tpkg: PkgService\n\tvsCode: VsCodeService\n\tschema: SchemaService\n\tlint: LintService\n\tcommand: CommandService\n\ttypeChecker: TypeCheckerService\n\timport: ImportService\n\tbuild: BuildService\n\tsettings: SettingsService\n\tenv: EnvService\n\tauth: AuthService\n\tremote: RemoteService\n\teventSettings: EventSettingsService\n\tdependency: DependencyService\n}\n\nexport type Service = keyof ServiceMap\n\nexport interface ServiceProvider {\n\tService<S extends Service>(type: S, cwd?: string): ServiceMap[S]\n}\nexport default class ServiceFactory {\n\tpublic Service<S extends Service>(cwd: string, type: S): ServiceMap[S] {\n\t\tswitch (type) {\n\t\t\tcase 'auth':\n\t\t\t\treturn AuthService.Auth(cwd) as ServiceMap[S]\n\t\t\tcase 'pkg':\n\t\t\t\treturn new PkgService(\n\t\t\t\t\tcwd,\n\t\t\t\t\tthis.Service(cwd, 'command')\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'env':\n\t\t\t\treturn new EnvService(cwd) as ServiceMap[S]\n\t\t\tcase 'vsCode':\n\t\t\t\treturn new VsCodeService(cwd) as ServiceMap[S]\n\t\t\tcase 'schema':\n\t\t\t\treturn new SchemaService({\n\t\t\t\t\tcwd,\n\t\t\t\t\tcommand: new CommandService(cwd),\n\t\t\t\t}) as ServiceMap[S]\n\t\t\tcase 'lint':\n\t\t\t\treturn new LintService(cwd, () =>\n\t\t\t\t\tthis.Service(cwd, 'command')\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'command': {\n\t\t\t\treturn new CommandService(cwd) as ServiceMap[S]\n\t\t\t}\n\t\t\tcase 'remote':\n\t\t\t\treturn new RemoteService(new EnvService(cwd)) as ServiceMap[S]\n\t\t\tcase 'typeChecker':\n\t\t\t\treturn new TypeCheckerService(\n\t\t\t\t\tthis.buildImportService(cwd)\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'settings':\n\t\t\t\treturn new SettingsService<FeatureCode>(cwd) as ServiceMap[S]\n\t\t\tcase 'dependency':\n\t\t\t\treturn new DependencyService(\n\t\t\t\t\tnew SettingsService<FeatureCode>(cwd)\n\t\t\t\t) as ServiceMap[S]\n\t\t\tcase 'import':\n\t\t\t\treturn this.buildImportService(cwd) as ServiceMap[S]\n\t\t\tcase 'build': {\n\t\t\t\tconst commandService = new CommandService(cwd)\n\t\t\t\treturn new BuildService(\n\t\t\t\t\tcommandService,\n\t\t\t\t\tnew LintService(cwd, () => this.Service(cwd, 'command'))\n\t\t\t\t) as ServiceMap[S]\n\t\t\t}\n\t\t\tcase 'eventSettings':\n\t\t\t\treturn new EventSettingsService(\n\t\t\t\t\tnew SettingsService(cwd)\n\t\t\t\t) as ServiceMap[S]\n\t\t\tdefault:\n\t\t\t\tthrow new Error(`Service \"${type}\" not found`)\n\t\t}\n\t}\n\n\tprivate buildImportService(cwd: string): ImportService {\n\t\treturn new ImportService({\n\t\t\tcwd,\n\t\t\tcommand: new CommandService(cwd),\n\t\t})\n\t}\n}\n"],"file":"ServiceFactory.js"}

package/build/types/cli.types.d.ts

@@ -1,6 +1,7 @@
 import { SpruceSchemas } from "./../.spruce/schemas/schemas.types";
 import { FeatureAction, FeatureActionResponse } from '../features/features.types';
 import { GraphicsInterface as IGraphicsInterface } from './graphicsInterface.types';
+export { NpmPackage } from '@sprucelabs/spruce-skill-utils';
 export interface GraphicsInterface extends IGraphicsInterface {
     renderActionSummary(results: ExecutionResults & {
         totalTime?: number;
@@ -18,11 +19,6 @@ export interface GraphicsInterface extends IGraphicsInterface {
 export declare type GeneratedFile = SpruceSchemas.SpruceCli.v2020_07_22.GeneratedFile;
 export declare type GeneratedDir = SpruceSchemas.SpruceCli.v2020_07_22.GeneratedDir;
 export declare type GeneratedFileOrDir = SpruceSchemas.SpruceCli.v2020_07_22.WatcherDidDetectChangesEmitPayload['changes'][number];
-export interface NpmPackage {
-    name: string;
-    version?: string;
-    isDev?: boolean;
-}
 export interface ExecutionResults extends FeatureActionResponse {
     featureCode: string;
     actionCode: string;
@@ -50,4 +46,3 @@ export interface OptionOverrides {
 export interface BlockedCommands {
     [command: string]: string;
 }
-export {};

package/build/types/cli.types.js

@@ -3,4 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "NpmPackage", {
+  enumerable: true,
+  get: function get() {
+    return _spruceSkillUtils.NpmPackage;
+  }
+});
+
+var _spruceSkillUtils = require("@sprucelabs/spruce-skill-utils");
 //# sourceMappingURL=cli.types.js.map

package/build/types/cli.types.js.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[],"file":"cli.types.js"}
+{"version":3,"sources":["../../src/types/cli.types.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA","sourcesContent":["import { SpruceSchemas } from '#spruce/schemas/schemas.types'\nimport {\n\tFeatureAction,\n\tFeatureActionResponse,\n} from '../features/features.types'\nimport { GraphicsInterface as IGraphicsInterface } from './graphicsInterface.types'\nexport { NpmPackage } from '@sprucelabs/spruce-skill-utils'\n\nexport interface GraphicsInterface extends IGraphicsInterface {\n\trenderActionSummary(results: ExecutionResults & { totalTime?: number }): void\n\tgetCursorPosition(): Promise<{ x: number; y: number } | null>\n\tmoveCursorTo(x: number, y: number): void\n\tclearBelowCursor(): void\n\tclear(): void\n\twaitForEnter(message?: string): Promise<void>\n\tsendInput(message: string): Promise<void>\n}\n\nexport type GeneratedFile = SpruceSchemas.SpruceCli.v2020_07_22.GeneratedFile\nexport type GeneratedDir = SpruceSchemas.SpruceCli.v2020_07_22.GeneratedDir\nexport type GeneratedFileOrDir =\n\tSpruceSchemas.SpruceCli.v2020_07_22.WatcherDidDetectChangesEmitPayload['changes'][number]\n\nexport interface ExecutionResults extends FeatureActionResponse {\n\tfeatureCode: string\n\tactionCode: string\n\theadline: string\n\taction: FeatureAction\n}\n\ntype Skill = Omit<SpruceSchemas.Spruce.v2020_07_22.Skill, 'creators'>\n\nexport type CurrentSkill = Partial<Skill> & {\n\tname: string\n\tisRegistered: boolean\n\tnamespacePascal: string\n}\n\nexport type RegisteredSkill = Omit<\n\tSpruceSchemas.Spruce.v2020_07_22.Skill,\n\t'creators'\n>\n\nexport type UpgradeMode =\n\tSpruceSchemas.SpruceCli.v2020_07_22.UpgradeSkillOptions['upgradeMode']\n\nexport type FileDescription = {\n\tpath: string\n\tdescription: string\n\tshouldOverwriteWhenChanged: boolean\n\tconfirmPromptOnFirstWrite?: string\n}\n\nexport type InternalUpdateHandler = (message: string) => void\n\nexport interface OptionOverrides {\n\t[command: string]: Record<string, any>\n}\n\nexport interface BlockedCommands {\n\t[command: string]: string\n}\n"],"file":"cli.types.js"}

package/package.json

@@ -18,7 +18,7 @@
     ]
   },
   "license": "MIT",
-  "version": "14.29.2",
+  "version": "14.29.6",
   "bin": {
     "spruce": "./build/index.js"
   },
@@ -75,20 +75,20 @@
     "@babel/cli": "^7.16.0",
     "@babel/plugin-proposal-decorators": "^7.16.4",
     "@babel/runtime": "^7.16.3",
-    "@jest/reporters": "^27.4.2",
-    "@sprucelabs/error": "^5.0.317",
-    "@sprucelabs/heartwood-view-controllers": "^51.6.51",
-    "@sprucelabs/jest-json-reporter": "^6.0.265",
-    "@sprucelabs/mercury-client": "^17.4.29",
-    "@sprucelabs/mercury-event-emitter": "^17.4.29",
-    "@sprucelabs/mercury-types": "^26.1.992",
-    "@sprucelabs/schema": "^25.4.67",
-    "@sprucelabs/spruce-core-schemas": "^22.6.250",
-    "@sprucelabs/spruce-event-plugin": "^18.1.0",
-    "@sprucelabs/spruce-event-utils": "^17.1.272",
-    "@sprucelabs/spruce-skill-booter": "^18.1.0",
-    "@sprucelabs/spruce-skill-utils": "^22.1.50",
-    "@sprucelabs/spruce-templates": "^14.29.2",
+    "@jest/reporters": "^27.4.4",
+    "@sprucelabs/error": "^5.0.332",
+    "@sprucelabs/heartwood-view-controllers": "^51.14.1",
+    "@sprucelabs/jest-json-reporter": "^6.0.276",
+    "@sprucelabs/mercury-client": "^17.4.85",
+    "@sprucelabs/mercury-event-emitter": "^17.4.85",
+    "@sprucelabs/mercury-types": "^26.1.1050",
+    "@sprucelabs/schema": "^25.4.102",
+    "@sprucelabs/spruce-core-schemas": "^22.6.299",
+    "@sprucelabs/spruce-event-plugin": "^18.3.3",
+    "@sprucelabs/spruce-event-utils": "^17.1.339",
+    "@sprucelabs/spruce-skill-booter": "^18.3.3",
+    "@sprucelabs/spruce-skill-utils": "^22.2.3",
+    "@sprucelabs/spruce-templates": "^14.29.6",
     "@typescript-eslint/eslint-plugin": "^5.6.0",
     "@typescript-eslint/parser": "^5.6.0",
     "cfonts": "^2.10.0",
@@ -119,26 +119,26 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@sprucelabs/data-stores": "^7.2.0",
-    "@sprucelabs/jest-sheets-reporter": "^1.2.268",
-    "@sprucelabs/mercury-core-events": "^1.6.215",
-    "@sprucelabs/resolve-path-aliases": "^1.0.236",
-    "@sprucelabs/spruce-conversation-plugin": "^18.1.0",
-    "@sprucelabs/spruce-deploy-plugin": "^18.1.0",
-    "@sprucelabs/spruce-store-plugin": "^18.1.0",
-    "@sprucelabs/spruce-test-fixtures": "^18.1.0",
-    "@sprucelabs/test": "^7.7.248",
-    "@sprucelabs/test-utils": "^3.0.301",
+    "@sprucelabs/data-stores": "^7.2.1",
+    "@sprucelabs/jest-sheets-reporter": "^1.2.276",
+    "@sprucelabs/mercury-core-events": "^1.6.289",
+    "@sprucelabs/resolve-path-aliases": "^1.0.240",
+    "@sprucelabs/spruce-conversation-plugin": "^18.3.3",
+    "@sprucelabs/spruce-deploy-plugin": "^18.3.3",
+    "@sprucelabs/spruce-store-plugin": "^18.3.3",
+    "@sprucelabs/spruce-test-fixtures": "^18.3.3",
+    "@sprucelabs/test": "^7.7.258",
+    "@sprucelabs/test-utils": "^3.0.320",
     "@types/blessed": "^0.1.19",
     "@types/eslint": "^8.2.1",
     "@types/fs-extra": "^9.0.13",
     "@types/inflection": "^1.13.0",
     "@types/inquirer": "^8.1.3",
     "@types/jsonwebtoken": "^8.5.6",
-    "@types/lodash": "^4.14.177",
+    "@types/lodash": "^4.14.178",
     "@types/md5": "^2.3.1",
     "@types/mkdirp": "^1.0.2",
-    "@types/node": "^16.11.11",
+    "@types/node": "^16.11.12",
     "@types/promise.allsettled": "^1.0.3",
     "@types/ps-node": "^0.1.1",
     "@types/rimraf": "^3.0.2",
@@ -152,21 +152,21 @@
     "concurrently": "^6.4.0",
     "conventional-changelog-sprucelabs": "^1.1.2",
     "dotenv": "^10.0.0",
-    "eslint": "^8.4.0",
-    "eslint-config-spruce": "^10.10.16",
+    "eslint": "^8.4.1",
+    "eslint-config-spruce": "^10.11.0",
     "find-process": "^1.4.7",
-    "jest": "^27.4.3",
-    "jest-circus": "^27.4.2",
+    "jest": "^27.4.4",
+    "jest-circus": "^27.4.4",
     "jest-junit": "^13.0.0",
     "jest-reporters": "^0.0.2",
     "prettier": "^2.5.1",
     "ps-node": "^0.1.6",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.0",
+    "ts-jest": "^27.1.1",
     "ts-node": "^10.4.0",
     "tsc-watch": "^4.5.0",
     "tsconfig-paths": "^3.12.0",
-    "typescript": "^4.5.2"
+    "typescript": "^4.5.3"
   },
   "testSkillCache": {
     "everything": [
@@ -597,5 +597,5 @@
       "ora"
     ]
   },
-  "gitHead": "0f8f6dd87e9cb555da15d985236cd190a9ab1d51"
+  "gitHead": "7e3cfb4f6c0edf37269de5d431eec3b3f19fd3c1"
 }

package/src/__tests__/behavioral/events/CreatingAListener.test.ts

@@ -265,6 +265,26 @@ export default class CreatingAListenerTest extends AbstractEventTest {
 		)
 	}
 
+	@test()
+	protected static async listeningToAnEventWithNoEmitTargetOrPayloadGeneratesValidListener() {
+		const { listenerPath } =
+			await this.setupSkillsInstallAtOrgRegisterEventContractAndGenerateListener(
+				{
+					isGlobal: true,
+					responsePayloadSchema: {
+						id: 'test',
+						fields: {
+							id: {
+								type: 'id',
+							},
+						},
+					},
+				}
+			)
+
+		await this.Service('typeChecker').check(listenerPath)
+	}
+
 	private static async installEventsAndCreateListener() {
 		const cli = await this.installEventFeature('events')
 

package/src/__tests__/behavioral/{ListeningToAnEventYouCreate.test.ts → events/ListeningToAnEventYouCreate.test.ts}

@@ -1,8 +1,8 @@
 import { eventNameUtil } from '@sprucelabs/spruce-event-utils'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test'
-import AbstractEventTest from '../../tests/AbstractEventTest'
-import testUtil from '../../tests/utilities/test.utility'
+import AbstractEventTest from '../../../tests/AbstractEventTest'
+import testUtil from '../../../tests/utilities/test.utility'
 
 export default class ListeningToAnEventYouCreateTest extends AbstractEventTest {
 	@test()

package/src/__tests__/implementation/PkgService.test.ts

@@ -15,8 +15,7 @@ export default class PkgServiceTest extends AbstractSkillTest {
 
 	@test()
 	protected static async canCreatePkgService() {
-		const pkg = PkgServiceTest.beforeEach()
-		assert.isTruthy(pkg)
+		assert.isTruthy(this.pkg)
 	}
 
 	@test()

package/src/cli.ts

@@ -361,6 +361,9 @@ export default class Cli implements CliInterface {
 
 		let auth: SpruceSchemas.Mercury.v2020_12_25.AuthenticateEmitPayload = {}
 
+		const pkg = serviceFactory.Service(cwd, 'pkg')
+		const doesPkgExist = pkg.doesExist()
+
 		if (options?.skillId && options?.apiKey) {
 			auth = {
 				skillId: options.skillId,
@@ -375,7 +378,7 @@ export default class Cli implements CliInterface {
 					apiKey: skill.apiKey,
 				}
 			}
-		} else if (shouldAuthAsLoggedInPerson) {
+		} else if (doesPkgExist && shouldAuthAsLoggedInPerson) {
 			const person = serviceFactory.Service(cwd, 'auth').getLoggedInPerson()
 
 			if (person) {

package/src/features/deploy/actions/HerokuAction.ts

@@ -1,7 +1,6 @@
 import { buildSchema, SchemaValues } from '@sprucelabs/schema'
-import { diskUtil, namesUtil } from '@sprucelabs/spruce-skill-utils'
+import { diskUtil, namesUtil, SkillAuth } from '@sprucelabs/spruce-skill-utils'
 import SpruceError from '../../../errors/SpruceError'
-import { SkillAuth } from '../../../services/AuthService'
 import actionUtil from '../../../utilities/action.utility'
 import AbstractAction from '../../AbstractAction'
 import { FeatureActionResponse } from '../../features.types'

package/src/features/skill/actions/RegisterAction.ts

@@ -67,6 +67,9 @@ export default class RegisterAction extends AbstractAction<OptionsSchema> {
 			}
 		} catch (err) {
 			return {
+				hints: [
+					`If you've already registered your skill, try 'spruce skill.login'!`,
+				],
 				errors: [err],
 			}
 		}

package/src/schemas/v2020_07_22/personWithToken.builder.ts

@@ -1,4 +1,5 @@
 import { buildSchema } from '@sprucelabs/schema'
+// eslint-disable-next-line spruce/prohibit-import-of-schema-in-builders
 import personSchema from '#spruce/schemas/spruce/v2020_07_22/person.schema'
 
 export default buildSchema({

package/src/services/PkgService.ts

@@ -1,9 +1,8 @@
 import pathUtil from 'path'
-import { diskUtil } from '@sprucelabs/spruce-skill-utils'
-import fs from 'fs-extra'
-import { set, get } from 'lodash'
-import SpruceError from '../errors/SpruceError'
-import { NpmPackage } from '../types/cli.types'
+import {
+	diskUtil,
+	PkgService as BasePkgService,
+} from '@sprucelabs/spruce-skill-utils'
 import isCi from '../utilities/isCi'
 import CommandService from './CommandService'
 
@@ -13,68 +12,12 @@ export interface AddOptions {
 	shouldCleanupLockFiles?: boolean
 }
 
-export default class PkgService extends CommandService {
-	private _parsedPkg?: Record<string, any>
+export default class PkgService extends BasePkgService {
+	private commandService: CommandService
 
-	public get(path: string | string[]) {
-		const contents = this.readPackage()
-		return get(contents, path)
-	}
-
-	public set(options: {
-		path: string | string[]
-		value: string | Record<string, any> | undefined
-	}) {
-		const { path, value } = options
-		const contents = this.readPackage()
-		const updated = set(contents, path, value)
-		const destination = this.buildPath()
-
-		fs.outputFileSync(destination, JSON.stringify(updated, null, 2))
-		this._parsedPkg = undefined
-	}
-
-	public doesExist() {
-		return diskUtil.doesFileExist(this.buildPath())
-	}
-
-	public unset(path: string | string[]) {
-		this.set({ path, value: undefined })
-	}
-
-	public readPackage(): Record<string, any | undefined> {
-		if (this._parsedPkg) {
-			return this._parsedPkg
-		}
-		const packagePath = this.buildPath()
-
-		try {
-			const contents = fs.readFileSync(packagePath).toString()
-			const parsed = JSON.parse(contents)
-			this._parsedPkg = parsed
-
-			return parsed
-		} catch (err: any) {
-			throw new SpruceError({
-				code: 'FAILED_TO_IMPORT',
-				file: packagePath,
-				originalError: err,
-			})
-		}
-	}
-
-	private buildPath() {
-		return pathUtil.join(this.cwd, 'package.json')
-	}
-
-	public isInstalled(pkg: string) {
-		try {
-			const contents = this.readPackage()
-
-			return !!contents.dependencies?.[pkg] || !!contents.devDependencies?.[pkg]
-		} catch (e) {
-			return false
-		}
+	public constructor(cwd: string, commandService: CommandService) {
+		super(cwd)
+		this.commandService = commandService
 	}
 
 	public async install(pkg?: string[] | string, options?: AddOptions) {
@@ -84,7 +27,7 @@ export default class PkgService extends CommandService {
 			: () => {}
 
 		if (!pkg) {
-			await this.execute('yarn', { args: ['install'] })
+			await this.commandService.execute('yarn', { args: ['install'] })
 			deleteLockFile()
 			return { totalInstalled: -1, totalSkipped: -1 }
 		}
@@ -115,13 +58,13 @@ export default class PkgService extends CommandService {
 				options
 			)
 
-			await this.execute(executable, {
+			await this.commandService.execute(executable, {
 				args,
 			})
 		} else if (
 			!diskUtil.doesDirExist(pathUtil.join(this.cwd, 'node_modules'))
 		) {
-			await this.execute('yarn', { args: ['install'] })
+			await this.commandService.execute('yarn', { args: ['install'] })
 		}
 
 		deleteLockFile()
@@ -150,20 +93,10 @@ export default class PkgService extends CommandService {
 		return { executable, args }
 	}
 
-	public deleteLockFile() {
-		const files = ['package-lock.json', 'yarn.lock']
-		for (const file of files) {
-			const lock = pathUtil.join(this.cwd, file)
-			if (diskUtil.doesFileExist(lock)) {
-				diskUtil.deleteFile(lock)
-			}
-		}
-	}
-
 	public async uninstall(pkg: string[] | string) {
 		const packages = Array.isArray(pkg) ? pkg : [pkg]
 		const args: string[] = ['uninstall', ...packages]
-		await this.execute('npm', {
+		await this.commandService.execute('npm', {
 			args,
 		})
 
@@ -171,17 +104,4 @@ export default class PkgService extends CommandService {
 
 		await this.install()
 	}
-
-	public stripLatest(name: string): string {
-		return name.replace('@latest', '')
-	}
-
-	public buildPackageName(dep: NpmPackage): string {
-		const { name, version } = dep
-		if (!version) {
-			return name
-		}
-
-		return `${name}@${version}`
-	}
 }

package/src/services/ServiceFactory.ts

@@ -1,10 +1,13 @@
-import { SettingsService, EnvService } from '@sprucelabs/spruce-skill-utils'
+import {
+	SettingsService,
+	EnvService,
+	AuthService,
+} from '@sprucelabs/spruce-skill-utils'
 import EventSettingsService from '../features/event/services/EventSettingsService'
 import RemoteService from '../features/event/services/RemoteService'
 import { FeatureCode } from '../features/features.types'
 import SchemaService from '../features/schema/services/SchemaService'
 import VsCodeService from '../features/vscode/services/VsCodeService'
-import AuthService from './AuthService'
 import BuildService from './BuildService'
 import CommandService from './CommandService'
 import DependencyService from './DependencyService'
@@ -39,12 +42,12 @@ export default class ServiceFactory {
 	public Service<S extends Service>(cwd: string, type: S): ServiceMap[S] {
 		switch (type) {
 			case 'auth':
-				return new AuthService(
-					new EnvService(cwd),
-					new PkgService(cwd)
-				) as ServiceMap[S]
+				return AuthService.Auth(cwd) as ServiceMap[S]
 			case 'pkg':
-				return new PkgService(cwd) as ServiceMap[S]
+				return new PkgService(
+					cwd,
+					this.Service(cwd, 'command')
+				) as ServiceMap[S]
 			case 'env':
 				return new EnvService(cwd) as ServiceMap[S]
 			case 'vsCode':

package/src/types/cli.types.ts

@@ -4,6 +4,7 @@ import {
 	FeatureActionResponse,
 } from '../features/features.types'
 import { GraphicsInterface as IGraphicsInterface } from './graphicsInterface.types'
+export { NpmPackage } from '@sprucelabs/spruce-skill-utils'
 
 export interface GraphicsInterface extends IGraphicsInterface {
 	renderActionSummary(results: ExecutionResults & { totalTime?: number }): void
@@ -20,12 +21,6 @@ export type GeneratedDir = SpruceSchemas.SpruceCli.v2020_07_22.GeneratedDir
 export type GeneratedFileOrDir =
 	SpruceSchemas.SpruceCli.v2020_07_22.WatcherDidDetectChangesEmitPayload['changes'][number]
 
-export interface NpmPackage {
-	name: string
-	version?: string
-	isDev?: boolean
-}
-
 export interface ExecutionResults extends FeatureActionResponse {
 	featureCode: string
 	actionCode: string

package/build/__tests__/behavioral/ListeningToAnEventYouCreate.test.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/__tests__/behavioral/ListeningToAnEventYouCreate.test.ts"],"names":["ListeningToAnEventYouCreateTest","registerCurrentSkillAndInstallToOrg","currentSkill","eventName","version","fqen","eventNameUtil","join","eventNamespace","slug","source","resolveTestPath","destination","resolvePath","diskUtil","copyDir","listenPromise","Action","execute","waitForInput","ui","sendInput","results","assert","isFalsy","errors","match","testUtil","assertFileByNameInGeneratedFiles","files","doesInclude","assertClientIsProperlyTyped","sourceFile","contents","readFile","replace","destinationFile","writeFile","Service","check","AbstractEventTest"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;;;IAEqBA,+B,WACnB,iB;;;;;;;;;;;;;qHAAD;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAEgC,KAAKC,mCAAL,EAFhC;;AAAA;AAAA;AAESC,gBAAAA,YAFT,yBAESA,YAFT;AAIOC,gBAAAA,SAJP,GAImB,sBAJnB;AAKOC,gBAAAA,OALP,GAKiB,aALjB;AAOOC,gBAAAA,IAPP,GAOcC,gCAAcC,IAAd,CAAmB;AAC/BJ,kBAAAA,SAAS,EAATA,SAD+B;AAE/BK,kBAAAA,cAAc,EAAEN,YAAY,CAACO,IAFE;AAG/BL,kBAAAA,OAAO,EAAPA;AAH+B,iBAAnB,CAPd;AAaOM,gBAAAA,MAbP,GAagB,KAAKC,eAAL,CAAqB,sCAArB,CAbhB;AAcOC,gBAAAA,WAdP,GAcqB,KAAKC,WAAL,CAAiB,KAAjB,CAdrB;AAAA;AAAA,uBAgBOC,2BAASC,OAAT,CAAiBL,MAAjB,EAAyBE,WAAzB,CAhBP;;AAAA;AAkBOI,gBAAAA,aAlBP,GAkBuB,KAAKC,MAAL,CAAY,OAAZ,EAAqB,QAArB,EAA+BC,OAA/B,CAAuC,EAAvC,CAlBvB;AAAA;AAAA,uBAoBO,KAAKC,YAAL,EApBP;;AAAA;AAAA;AAAA,uBAqBO,KAAKC,EAAL,CAAQC,SAAR,CAAkBnB,YAAY,CAACO,IAA/B,CArBP;;AAAA;AAAA;AAAA,uBAuBO,KAAKU,YAAL,EAvBP;;AAAA;AAAA;AAAA,uBAwBO,KAAKC,EAAL,CAAQC,SAAR,CAAkBhB,IAAlB,CAxBP;;AAAA;AAAA;AAAA,uBA0BuBW,aA1BvB;;AAAA;AA0BOM,gBAAAA,OA1BP;;AA4BCC,6BAAOC,OAAP,CAAeF,OAAO,CAACG,MAAvB;;AAEMC,gBAAAA,KA9BP,GA8BeC,kBAASC,gCAAT,WACVzB,SADU,cACGC,OADH,mBAEbkB,OAAO,CAACO,KAFK,CA9Bf;;AAmCCN,6BAAOO,WAAP,CACCJ,KADD,EAECZ,2BAASD,WAAT,CAAqB,WAArB,EAAkCX,YAAY,CAACO,IAA/C,CAFD;;AAnCD;AAAA,uBAwCO,KAAKsB,2BAAL,CAAiC7B,YAAY,CAACO,IAA9C,CAxCP;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O;;;;;;;;;;;uHA2CA,kBAAiDD,cAAjD;AAAA;AAAA;AAAA;AAAA;AAAA;AACOwB,gBAAAA,UADP,GACoB,KAAKnB,WAAL,CAAiB,6BAAjB,CADpB;AAEOoB,gBAAAA,QAFP,GAEkBnB,2BACfoB,QADe,CACNF,UADM,EAEfG,OAFe,CAEP,oBAFO,EAEe3B,cAFf,CAFlB;AAMO4B,gBAAAA,eANP,GAMyB,KAAKvB,WAAL,CAAiB,yBAAjB,CANzB;;AAOCC,2CAASuB,SAAT,CAAmBD,eAAnB,EAAoCH,QAApC;;AAPD;AAAA,uBASO,KAAKK,OAAL,CAAa,aAAb,EAA4BC,KAA5B,CAAkCH,eAAlC,CATP;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O;;;;;;;;;;EA5C4DI,8B","sourcesContent":["import { eventNameUtil } from '@sprucelabs/spruce-event-utils'\nimport { diskUtil } from '@sprucelabs/spruce-skill-utils'\nimport { test, assert } from '@sprucelabs/test'\nimport AbstractEventTest from '../../tests/AbstractEventTest'\nimport testUtil from '../../tests/utilities/test.utility'\n\nexport default class ListeningToAnEventYouCreateTest extends AbstractEventTest {\n\t@test()\n\tprotected static async canListenToEventWeCreated() {\n\t\tconst { currentSkill } = await this.registerCurrentSkillAndInstallToOrg()\n\n\t\tconst eventName = 'register-skill-views'\n\t\tconst version = 'v2021_04_11'\n\n\t\tconst fqen = eventNameUtil.join({\n\t\t\teventName,\n\t\t\teventNamespace: currentSkill.slug,\n\t\t\tversion,\n\t\t})\n\n\t\tconst source = this.resolveTestPath('skill_register_skill_views_event/src')\n\t\tconst destination = this.resolvePath('src')\n\n\t\tawait diskUtil.copyDir(source, destination)\n\n\t\tconst listenPromise = this.Action('event', 'listen').execute({})\n\n\t\tawait this.waitForInput()\n\t\tawait this.ui.sendInput(currentSkill.slug)\n\n\t\tawait this.waitForInput()\n\t\tawait this.ui.sendInput(fqen)\n\n\t\tconst results = await listenPromise\n\n\t\tassert.isFalsy(results.errors)\n\n\t\tconst match = testUtil.assertFileByNameInGeneratedFiles(\n\t\t\t`${eventName}.${version}.listener.ts`,\n\t\t\tresults.files\n\t\t)\n\n\t\tassert.doesInclude(\n\t\t\tmatch,\n\t\t\tdiskUtil.resolvePath('listeners', currentSkill.slug)\n\t\t)\n\n\t\tawait this.assertClientIsProperlyTyped(currentSkill.slug)\n\t}\n\n\tprivate static async assertClientIsProperlyTyped(eventNamespace: string) {\n\t\tconst sourceFile = this.resolvePath('src/client-type-test.ts.hbs')\n\t\tconst contents = diskUtil\n\t\t\t.readFile(sourceFile)\n\t\t\t.replace('{{eventNamespace}}', eventNamespace)\n\n\t\tconst destinationFile = this.resolvePath('src/client-type-test.ts')\n\t\tdiskUtil.writeFile(destinationFile, contents)\n\n\t\tawait this.Service('typeChecker').check(destinationFile)\n\t}\n}\n"],"file":"ListeningToAnEventYouCreate.test.js"}

package/build/__tests__/behavioral/README.md

@@ -1,8 +0,0 @@
-
-# Behavioral tests
-
-These are the tests that matter. They should test everything just under the interface. Interface tests can go into implementation since they'll often change.
-
-If all these pass, we ship.
-
-

package/build/__tests__/implementation/AuthService.test.d.ts

@@ -1,14 +0,0 @@
-import AbstractCliTest from '../../tests/AbstractCliTest';
-export default class AuthServiceTest extends AbstractCliTest {
-    private static auth;
-    protected static beforeEach(): Promise<void>;
-    protected static canInstantiatePersonStore(): Promise<void>;
-    protected static hasLoggedInPersonMethod(): Promise<void>;
-    protected static loggedInPersonIsNullWhenNotLoggedIn(): Promise<void>;
-    protected static cantSaveBadLoggedInPerson(): Promise<void>;
-    protected static canSaveLoggedInPerson(): void;
-    protected static canLogOut(): void;
-    protected static getCurrentSkillReturnsNull(): void;
-    protected static canSetCurrentSkill(): void;
-    private static writePackageJson;
-}