@sprucelabs/spruce-cli 14.29.5 → 14.29.6

package/build/services/PkgService.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/PkgService.ts"],"names":["PkgService","path","contents","readPackage","options","value","updated","destination","buildPath","fs","outputFileSync","JSON","stringify","_parsedPkg","undefined","diskUtil","doesFileExist","set","packagePath","readFileSync","toString","parsed","parse","err","SpruceError","code","file","originalError","pathUtil","join","cwd","pkg","dependencies","devDependencies","e","shouldCleanupLockFiles","deleteLockFile","bind","execute","args","totalInstalled","totalSkipped","packages","Array","isArray","toInstall","labsModules","thisPackage","isInstalled","shouldForceInstall","startsWith","push","stripLatest","buildCommandAndArgs","executable","doesDirExist","length","files","lock","deleteFile","install","name","replace","dep","version","createRandomTempDir","filter","a","isDev","CommandService"],"mappings":"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","sourcesContent":["import pathUtil from 'path'\nimport { diskUtil } from '@sprucelabs/spruce-skill-utils'\nimport fs from 'fs-extra'\nimport { set, get } from 'lodash'\nimport SpruceError from '../errors/SpruceError'\nimport { NpmPackage } from '../types/cli.types'\nimport isCi from '../utilities/isCi'\nimport CommandService from './CommandService'\n\nexport interface AddOptions {\n\tisDev?: boolean\n\tshouldForceInstall?: boolean\n\tshouldCleanupLockFiles?: boolean\n}\n\nexport default class PkgService extends CommandService {\n\tprivate _parsedPkg?: Record<string, any>\n\n\tpublic get(path: string | string[]) {\n\t\tconst contents = this.readPackage()\n\t\treturn get(contents, path)\n\t}\n\n\tpublic set(options: {\n\t\tpath: string | string[]\n\t\tvalue: string | Record<string, any> | undefined\n\t}) {\n\t\tconst { path, value } = options\n\t\tconst contents = this.readPackage()\n\t\tconst updated = set(contents, path, value)\n\t\tconst destination = this.buildPath()\n\n\t\tfs.outputFileSync(destination, JSON.stringify(updated, null, 2))\n\t\tthis._parsedPkg = undefined\n\t}\n\n\tpublic doesExist() {\n\t\treturn diskUtil.doesFileExist(this.buildPath())\n\t}\n\n\tpublic unset(path: string | string[]) {\n\t\tthis.set({ path, value: undefined })\n\t}\n\n\tpublic readPackage(): Record<string, any | undefined> {\n\t\tif (this._parsedPkg) {\n\t\t\treturn this._parsedPkg\n\t\t}\n\t\tconst packagePath = this.buildPath()\n\n\t\ttry {\n\t\t\tconst contents = fs.readFileSync(packagePath).toString()\n\t\t\tconst parsed = JSON.parse(contents)\n\t\t\tthis._parsedPkg = parsed\n\n\t\t\treturn parsed\n\t\t} catch (err: any) {\n\t\t\tthrow new SpruceError({\n\t\t\t\tcode: 'FAILED_TO_IMPORT',\n\t\t\t\tfile: packagePath,\n\t\t\t\toriginalError: err,\n\t\t\t})\n\t\t}\n\t}\n\n\tprivate buildPath() {\n\t\treturn pathUtil.join(this.cwd, 'package.json')\n\t}\n\n\tpublic isInstalled(pkg: string) {\n\t\ttry {\n\t\t\tconst contents = this.readPackage()\n\n\t\t\treturn !!contents.dependencies?.[pkg] || !!contents.devDependencies?.[pkg]\n\t\t} catch (e) {\n\t\t\treturn false\n\t\t}\n\t}\n\n\tpublic async install(pkg?: string[] | string, options?: AddOptions) {\n\t\tconst shouldCleanupLockFiles = options?.shouldCleanupLockFiles !== false\n\t\tconst deleteLockFile = shouldCleanupLockFiles\n\t\t\t? this.deleteLockFile.bind(this)\n\t\t\t: () => {}\n\n\t\tif (!pkg) {\n\t\t\tawait this.execute('yarn', { args: ['install'] })\n\t\t\tdeleteLockFile()\n\t\t\treturn { totalInstalled: -1, totalSkipped: -1 }\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst toInstall = []\n\t\tconst labsModules: string[] = []\n\n\t\tlet totalInstalled = 0\n\t\tlet totalSkipped = 0\n\n\t\tfor (const thisPackage of packages) {\n\t\t\tconst isInstalled =\n\t\t\t\t!options?.shouldForceInstall && this.isInstalled(thisPackage)\n\t\t\tif (thisPackage.startsWith('@sprucelabs/') || !isInstalled) {\n\t\t\t\ttoInstall.push(this.stripLatest(thisPackage))\n\t\t\t\ttotalInstalled++\n\t\t\t} else {\n\t\t\t\ttotalSkipped++\n\t\t\t}\n\t\t}\n\n\t\tif (totalInstalled > 0) {\n\t\t\tconst { executable, args } = PkgService.buildCommandAndArgs(\n\t\t\t\ttoInstall,\n\t\t\t\toptions\n\t\t\t)\n\n\t\t\tawait this.execute(executable, {\n\t\t\t\targs,\n\t\t\t})\n\t\t} else if (\n\t\t\t!diskUtil.doesDirExist(pathUtil.join(this.cwd, 'node_modules'))\n\t\t) {\n\t\t\tawait this.execute('yarn', { args: ['install'] })\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tthis._parsedPkg = undefined\n\n\t\treturn { totalInstalled: totalInstalled + labsModules.length, totalSkipped }\n\t}\n\n\tpublic static buildCommandAndArgs(\n\t\ttoInstall: string[],\n\t\toptions: AddOptions | undefined\n\t) {\n\t\tconst args: any[] = [\n\t\t\tisCi() && '--cache-folder',\n\t\t\tisCi() && diskUtil.createRandomTempDir(),\n\t\t\t'add',\n\t\t\t...toInstall,\n\t\t].filter((a) => !!a)\n\n\t\tif (options?.isDev) {\n\t\t\targs.push('-D')\n\t\t}\n\n\t\tconst executable = 'yarn'\n\t\treturn { executable, args }\n\t}\n\n\tpublic deleteLockFile() {\n\t\tconst files = ['package-lock.json', 'yarn.lock']\n\t\tfor (const file of files) {\n\t\t\tconst lock = pathUtil.join(this.cwd, file)\n\t\t\tif (diskUtil.doesFileExist(lock)) {\n\t\t\t\tdiskUtil.deleteFile(lock)\n\t\t\t}\n\t\t}\n\t}\n\n\tpublic async uninstall(pkg: string[] | string) {\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst args: string[] = ['uninstall', ...packages]\n\t\tawait this.execute('npm', {\n\t\t\targs,\n\t\t})\n\n\t\tthis._parsedPkg = undefined\n\n\t\tawait this.install()\n\t}\n\n\tpublic stripLatest(name: string): string {\n\t\treturn name.replace('@latest', '')\n\t}\n\n\tpublic buildPackageName(dep: NpmPackage): string {\n\t\tconst { name, version } = dep\n\t\tif (!version) {\n\t\t\treturn name\n\t\t}\n\n\t\treturn `${name}@${version}`\n\t}\n}\n"],"file":"PkgService.js"}
+{"version":3,"sources":["../../src/services/PkgService.ts"],"names":["PkgService","cwd","commandService","pkg","options","shouldCleanupLockFiles","deleteLockFile","bind","execute","args","totalInstalled","totalSkipped","packages","Array","isArray","toInstall","labsModules","thisPackage","isInstalled","shouldForceInstall","startsWith","push","stripLatest","buildCommandAndArgs","executable","diskUtil","doesDirExist","pathUtil","join","_parsedPkg","undefined","length","install","createRandomTempDir","filter","a","isDev","BasePkgService"],"mappings":"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","sourcesContent":["import pathUtil from 'path'\nimport {\n\tdiskUtil,\n\tPkgService as BasePkgService,\n} from '@sprucelabs/spruce-skill-utils'\nimport isCi from '../utilities/isCi'\nimport CommandService from './CommandService'\n\nexport interface AddOptions {\n\tisDev?: boolean\n\tshouldForceInstall?: boolean\n\tshouldCleanupLockFiles?: boolean\n}\n\nexport default class PkgService extends BasePkgService {\n\tprivate commandService: CommandService\n\n\tpublic constructor(cwd: string, commandService: CommandService) {\n\t\tsuper(cwd)\n\t\tthis.commandService = commandService\n\t}\n\n\tpublic async install(pkg?: string[] | string, options?: AddOptions) {\n\t\tconst shouldCleanupLockFiles = options?.shouldCleanupLockFiles !== false\n\t\tconst deleteLockFile = shouldCleanupLockFiles\n\t\t\t? this.deleteLockFile.bind(this)\n\t\t\t: () => {}\n\n\t\tif (!pkg) {\n\t\t\tawait this.commandService.execute('yarn', { args: ['install'] })\n\t\t\tdeleteLockFile()\n\t\t\treturn { totalInstalled: -1, totalSkipped: -1 }\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst toInstall = []\n\t\tconst labsModules: string[] = []\n\n\t\tlet totalInstalled = 0\n\t\tlet totalSkipped = 0\n\n\t\tfor (const thisPackage of packages) {\n\t\t\tconst isInstalled =\n\t\t\t\t!options?.shouldForceInstall && this.isInstalled(thisPackage)\n\t\t\tif (thisPackage.startsWith('@sprucelabs/') || !isInstalled) {\n\t\t\t\ttoInstall.push(this.stripLatest(thisPackage))\n\t\t\t\ttotalInstalled++\n\t\t\t} else {\n\t\t\t\ttotalSkipped++\n\t\t\t}\n\t\t}\n\n\t\tif (totalInstalled > 0) {\n\t\t\tconst { executable, args } = PkgService.buildCommandAndArgs(\n\t\t\t\ttoInstall,\n\t\t\t\toptions\n\t\t\t)\n\n\t\t\tawait this.commandService.execute(executable, {\n\t\t\t\targs,\n\t\t\t})\n\t\t} else if (\n\t\t\t!diskUtil.doesDirExist(pathUtil.join(this.cwd, 'node_modules'))\n\t\t) {\n\t\t\tawait this.commandService.execute('yarn', { args: ['install'] })\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tthis._parsedPkg = undefined\n\n\t\treturn { totalInstalled: totalInstalled + labsModules.length, totalSkipped }\n\t}\n\n\tpublic static buildCommandAndArgs(\n\t\ttoInstall: string[],\n\t\toptions: AddOptions | undefined\n\t) {\n\t\tconst args: any[] = [\n\t\t\tisCi() && '--cache-folder',\n\t\t\tisCi() && diskUtil.createRandomTempDir(),\n\t\t\t'add',\n\t\t\t...toInstall,\n\t\t].filter((a) => !!a)\n\n\t\tif (options?.isDev) {\n\t\t\targs.push('-D')\n\t\t}\n\n\t\tconst executable = 'yarn'\n\t\treturn { executable, args }\n\t}\n\n\tpublic async uninstall(pkg: string[] | string) {\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst args: string[] = ['uninstall', ...packages]\n\t\tawait this.commandService.execute('npm', {\n\t\t\targs,\n\t\t})\n\n\t\tthis._parsedPkg = undefined\n\n\t\tawait this.install()\n\t}\n}\n"],"file":"PkgService.js"}

package/build/services/ServiceFactory.d.ts

@@ -1,9 +1,8 @@
-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 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';

package/build/services/ServiceFactory.js

@@ -21,8 +21,6 @@ var _SchemaService = _interopRequireDefault(require("../features/schema/services
 
 var _VsCodeService = _interopRequireDefault(require("../features/vscode/services/VsCodeService"));
 
-var _AuthService = _interopRequireDefault(require("./AuthService"));
-
 var _BuildService = _interopRequireDefault(require("./BuildService"));
 
 var _CommandService = _interopRequireDefault(require("./CommandService"));
@@ -59,10 +57,10 @@ var ServiceFactory = /*#__PURE__*/function () {
 
       switch (type) {
         case 'auth':
-          return new _AuthService["default"](new _spruceSkillUtils.EnvService(cwd), new _PkgService["default"](cwd));
+          return _spruceSkillUtils.AuthService.Auth(cwd);
 
         case 'pkg':
-          return new _PkgService["default"](cwd);
+          return new _PkgService["default"](cwd, this.Service(cwd, 'command'));
 
         case 'env':
           return new _spruceSkillUtils.EnvService(cwd);

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.5",
+  "version": "14.29.6",
   "bin": {
     "spruce": "./build/index.js"
   },
@@ -87,8 +87,8 @@
     "@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.1.89",
-    "@sprucelabs/spruce-templates": "^14.29.5",
+    "@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",
@@ -597,5 +597,5 @@
       "ora"
     ]
   },
-  "gitHead": "8ccb47496479c9a30dfcf462d76456b6ad6552ed"
+  "gitHead": "7e3cfb4f6c0edf37269de5d431eec3b3f19fd3c1"
 }

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/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__/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;
-}