@sprucelabs/spruce-cli 14.29.5 → 14.29.9

package/src/features/event/EventFeature.ts

@@ -111,7 +111,6 @@ export default class EventFeature extends AbstractFeature {
 			actionCode !== 'setRemote'
 		) {
 			const remoteResults = await this.appendRemoteToResultsOrPrompt()
-
 			results = actionUtil.mergeActionResults(results, remoteResults)
 		}
 

package/src/features/node/NodeFeature.ts

@@ -62,6 +62,9 @@ export default class NodeFeature<
 
 	private async handleUpgrade(): Promise<FeatureActionResponse> {
 		try {
+			this.ui.clear()
+			this.ui.renderHero('Upgrade')
+
 			this.ui.startLoading('Cleaning build...')
 			await this.Service('command').execute('yarn clean.build')
 

package/src/features/node/actions/UpgradeAction.ts

@@ -31,6 +31,7 @@ export default class UpgradeAction extends AbstractAction<OptionsSchema> {
 				shouldWriteIndex: false,
 			})
 
+			this.ui.clear()
 			InFlightEntertainment.start([
 				"Let's start the upgrade!",
 				'While things are going, see if you can beat 1k points!',

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

package/build/__tests__/implementation/AuthService.test.js

@@ -1,255 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
-
-var _spruceSkillUtils = require("@sprucelabs/spruce-skill-utils");
-
-var _test = require("@sprucelabs/test");
-
-var _testUtils = require("@sprucelabs/test-utils");
-
-var _AbstractCliTest2 = _interopRequireDefault(require("../../tests/AbstractCliTest"));
-
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class, _class2, _temp;
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var AuthServiceTest = (_dec = (0, _test.test)(), _dec2 = (0, _test.test)(), _dec3 = (0, _test.test)(), _dec4 = (0, _test.test)(), _dec5 = (0, _test.test)(), _dec6 = (0, _test.test)(), _dec7 = (0, _test.test)(), _dec8 = (0, _test.test)(), (_class = (_temp = _class2 = /*#__PURE__*/function (_AbstractCliTest) {
-  (0, _inherits2["default"])(AuthServiceTest, _AbstractCliTest);
-
-  var _super = _createSuper(AuthServiceTest);
-
-  function AuthServiceTest() {
-    (0, _classCallCheck2["default"])(this, AuthServiceTest);
-    return _super.apply(this, arguments);
-  }
-
-  (0, _createClass2["default"])(AuthServiceTest, null, [{
-    key: "beforeEach",
-    value: function () {
-      var _beforeEach = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return (0, _get2["default"])((0, _getPrototypeOf2["default"])(AuthServiceTest), "beforeEach", this).call(this);
-
-              case 2:
-                _spruceSkillUtils.diskUtil.createDir(this.resolvePath(_spruceSkillUtils.HASH_SPRUCE_DIR));
-
-                this.auth = this.Service('auth');
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function beforeEach() {
-        return _beforeEach.apply(this, arguments);
-      }
-
-      return beforeEach;
-    }()
-  }, {
-    key: "canInstantiatePersonStore",
-    value: function () {
-      var _canInstantiatePersonStore = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _test.assert.isTruthy(this.auth);
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function canInstantiatePersonStore() {
-        return _canInstantiatePersonStore.apply(this, arguments);
-      }
-
-      return canInstantiatePersonStore;
-    }()
-  }, {
-    key: "hasLoggedInPersonMethod",
-    value: function () {
-      var _hasLoggedInPersonMethod = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _test.assert.isFunction(this.auth.getLoggedInPerson);
-
-              case 1:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function hasLoggedInPersonMethod() {
-        return _hasLoggedInPersonMethod.apply(this, arguments);
-      }
-
-      return hasLoggedInPersonMethod;
-    }()
-  }, {
-    key: "loggedInPersonIsNullWhenNotLoggedIn",
-    value: function () {
-      var _loggedInPersonIsNullWhenNotLoggedIn = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _test.assert.isNull(this.auth.getLoggedInPerson());
-
-              case 1:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4, this);
-      }));
-
-      function loggedInPersonIsNullWhenNotLoggedIn() {
-        return _loggedInPersonIsNullWhenNotLoggedIn.apply(this, arguments);
-      }
-
-      return loggedInPersonIsNullWhenNotLoggedIn;
-    }()
-  }, {
-    key: "cantSaveBadLoggedInPerson",
-    value: function () {
-      var _cantSaveBadLoggedInPerson = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-        var _this = this;
-
-        var err;
-        return _regenerator["default"].wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                err = _test.assert.doesThrow(function () {
-                  return (//@ts-ignore
-                    _this.auth.setLoggedInPerson({
-                      test: true
-                    })
-                  );
-                });
-
-                _testUtils.errorAssertUtil.assertError(err, 'MISSING_PARAMETERS');
-
-              case 2:
-              case "end":
-                return _context5.stop();
-            }
-          }
-        }, _callee5);
-      }));
-
-      function cantSaveBadLoggedInPerson() {
-        return _cantSaveBadLoggedInPerson.apply(this, arguments);
-      }
-
-      return cantSaveBadLoggedInPerson;
-    }()
-  }, {
-    key: "canSaveLoggedInPerson",
-    value: function canSaveLoggedInPerson() {
-      var auth = this.auth;
-      var person = {
-        id: 'test',
-        casualName: 'friend',
-        token: 'token'
-      };
-      auth.setLoggedInPerson(person);
-      var loggedIn = auth.getLoggedInPerson();
-
-      _test.assert.isEqualDeep(loggedIn, _objectSpread(_objectSpread({}, person), {}, {
-        isLoggedIn: true
-      }));
-    }
-  }, {
-    key: "canLogOut",
-    value: function canLogOut() {
-      var auth = this.auth;
-      var person = {
-        id: 'test',
-        casualName: 'friend',
-        token: 'token'
-      };
-      auth.setLoggedInPerson(person);
-      auth.logOutPerson();
-
-      _test.assert.isNull(auth.getLoggedInPerson());
-    }
-  }, {
-    key: "getCurrentSkillReturnsNull",
-    value: function getCurrentSkillReturnsNull() {
-      this.writePackageJson();
-
-      _test.assert.isNull(this.auth.getCurrentSkill());
-    }
-  }, {
-    key: "canSetCurrentSkill",
-    value: function canSetCurrentSkill() {
-      this.writePackageJson();
-      var skill = {
-        id: '123467aaoeuaoeu',
-        apiKey: 'taco',
-        name: 'go team',
-        slug: 'taco-bravo'
-      };
-      this.auth.updateCurrentSkill(skill);
-
-      _test.assert.isEqualDeep(this.auth.getCurrentSkill(), skill);
-    }
-  }, {
-    key: "writePackageJson",
-    value: function writePackageJson() {
-      _spruceSkillUtils.diskUtil.writeFile(this.resolvePath('package.json'), '{}');
-    }
-  }]);
-  return AuthServiceTest;
-}(_AbstractCliTest2["default"]), (0, _defineProperty2["default"])(_class2, "auth", void 0), _temp), ((0, _applyDecoratedDescriptor2["default"])(_class, "canInstantiatePersonStore", [_dec], Object.getOwnPropertyDescriptor(_class, "canInstantiatePersonStore"), _class), (0, _applyDecoratedDescriptor2["default"])(_class, "hasLoggedInPersonMethod", [_dec2], Object.getOwnPropertyDescriptor(_class, "hasLoggedInPersonMethod"), _class), (0, _applyDecoratedDescriptor2["default"])(_class, "loggedInPersonIsNullWhenNotLoggedIn", [_dec3], Object.getOwnPropertyDescriptor(_class, "loggedInPersonIsNullWhenNotLoggedIn"), _class), (0, _applyDecoratedDescriptor2["default"])(_class, "cantSaveBadLoggedInPerson", [_dec4], Object.getOwnPropertyDescriptor(_class, "cantSaveBadLoggedInPerson"), _class), (0, _applyDecoratedDescriptor2["default"])(_class, "canSaveLoggedInPerson", [_dec5], Object.getOwnPropertyDescriptor(_class, "canSaveLoggedInPerson"), _class), (0, _applyDecoratedDescriptor2["default"])(_class, "canLogOut", [_dec6], Object.getOwnPropertyDescriptor(_class, "canLogOut"), _class), (0, _applyDecoratedDescriptor2["default"])(_class, "getCurrentSkillReturnsNull", [_dec7], Object.getOwnPropertyDescriptor(_class, "getCurrentSkillReturnsNull"), _class), (0, _applyDecoratedDescriptor2["default"])(_class, "canSetCurrentSkill", [_dec8], Object.getOwnPropertyDescriptor(_class, "canSetCurrentSkill"), _class)), _class));
-exports["default"] = AuthServiceTest;
-//# sourceMappingURL=AuthService.test.js.map

package/build/__tests__/implementation/AuthService.test.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/__tests__/implementation/AuthService.test.ts"],"names":["AuthServiceTest","diskUtil","createDir","resolvePath","HASH_SPRUCE_DIR","auth","Service","assert","isTruthy","isFunction","getLoggedInPerson","isNull","err","doesThrow","setLoggedInPerson","test","errorAssertUtil","assertError","person","id","casualName","token","loggedIn","isEqualDeep","isLoggedIn","logOutPerson","writePackageJson","getCurrentSkill","skill","apiKey","name","slug","updateCurrentSkill","writeFile","AbstractCliTest"],"mappings":"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","sourcesContent":["import { diskUtil, HASH_SPRUCE_DIR } from '@sprucelabs/spruce-skill-utils'\nimport { test, assert } from '@sprucelabs/test'\nimport { errorAssertUtil } from '@sprucelabs/test-utils'\nimport AuthService from '../../services/AuthService'\nimport AbstractCliTest from '../../tests/AbstractCliTest'\n\nexport default class AuthServiceTest extends AbstractCliTest {\n\tprivate static auth: AuthService\n\tprotected static async beforeEach() {\n\t\tawait super.beforeEach()\n\t\tdiskUtil.createDir(this.resolvePath(HASH_SPRUCE_DIR))\n\t\tthis.auth = this.Service('auth')\n\t}\n\n\t@test()\n\tprotected static async canInstantiatePersonStore() {\n\t\tassert.isTruthy(this.auth)\n\t}\n\n\t@test()\n\tprotected static async hasLoggedInPersonMethod() {\n\t\tassert.isFunction(this.auth.getLoggedInPerson)\n\t}\n\n\t@test()\n\tprotected static async loggedInPersonIsNullWhenNotLoggedIn() {\n\t\tassert.isNull(this.auth.getLoggedInPerson())\n\t}\n\n\t@test()\n\tprotected static async cantSaveBadLoggedInPerson() {\n\t\tconst err = assert.doesThrow(() =>\n\t\t\t//@ts-ignore\n\t\t\tthis.auth.setLoggedInPerson({ test: true })\n\t\t)\n\n\t\terrorAssertUtil.assertError(err, 'MISSING_PARAMETERS')\n\t}\n\n\t@test()\n\tprotected static canSaveLoggedInPerson() {\n\t\tconst auth = this.auth\n\t\tconst person = {\n\t\t\tid: 'test',\n\t\t\tcasualName: 'friend',\n\t\t\ttoken: 'token',\n\t\t}\n\n\t\tauth.setLoggedInPerson(person)\n\n\t\tconst loggedIn = auth.getLoggedInPerson()\n\n\t\tassert.isEqualDeep(loggedIn, { ...person, isLoggedIn: true })\n\t}\n\n\t@test()\n\tprotected static canLogOut() {\n\t\tconst auth = this.auth\n\t\tconst person = {\n\t\t\tid: 'test',\n\t\t\tcasualName: 'friend',\n\t\t\ttoken: 'token',\n\t\t}\n\n\t\tauth.setLoggedInPerson(person)\n\t\tauth.logOutPerson()\n\n\t\tassert.isNull(auth.getLoggedInPerson())\n\t}\n\n\t@test()\n\tprotected static getCurrentSkillReturnsNull() {\n\t\tthis.writePackageJson()\n\t\tassert.isNull(this.auth.getCurrentSkill())\n\t}\n\n\t@test()\n\tprotected static canSetCurrentSkill() {\n\t\tthis.writePackageJson()\n\t\tconst skill = {\n\t\t\tid: '123467aaoeuaoeu',\n\t\t\tapiKey: 'taco',\n\t\t\tname: 'go team',\n\t\t\tslug: 'taco-bravo',\n\t\t}\n\n\t\tthis.auth.updateCurrentSkill(skill)\n\n\t\tassert.isEqualDeep(this.auth.getCurrentSkill(), skill)\n\t}\n\n\tprivate static writePackageJson() {\n\t\tdiskUtil.writeFile(this.resolvePath('package.json'), '{}')\n\t}\n}\n"],"file":"AuthService.test.js"}

package/build/services/AuthService.d.ts

@@ -1,23 +0,0 @@
-import { SpruceSchemas } from '@sprucelabs/mercury-types';
-import { EnvService } from '@sprucelabs/spruce-skill-utils';
-import PkgService from './PkgService';
-declare type PersonWithToken = SpruceSchemas.SpruceCli.v2020_07_22.PersonWithToken;
-export interface SkillAuth {
-    id: string;
-    apiKey: string;
-    name: string;
-    slug: string;
-}
-export default class AuthService {
-    private env;
-    private pkg;
-    constructor(envService: EnvService, pkgService: PkgService);
-    getLoggedInPerson(): PersonWithToken | null;
-    setLoggedInPerson(person: PersonWithToken): void;
-    logOutPerson(): void;
-    getCurrentSkill(): SkillAuth | null;
-    logoutCurrentSkill(): void;
-    updateCurrentSkill(skill: SkillAuth): void;
-    updateCurrentSkillNamespace(namespace: string): void;
-}
-export {};

package/build/services/AuthService.js

@@ -1,109 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _schema = require("@sprucelabs/schema");
-
-var _spruceSkillUtils = require("@sprucelabs/spruce-skill-utils");
-
-var _personWithToken = _interopRequireDefault(require("../.spruce/schemas/spruceCli/v2020_07_22/personWithToken.schema"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var LOGGED_IN_PERSON_KEY = 'LOGGED_IN_PERSON';
-
-var AuthService = /*#__PURE__*/function () {
-  function AuthService(envService, pkgService) {
-    (0, _classCallCheck2["default"])(this, AuthService);
-    (0, _defineProperty2["default"])(this, "env", void 0);
-    (0, _defineProperty2["default"])(this, "pkg", void 0);
-    this.env = envService;
-    this.pkg = pkgService;
-  }
-
-  (0, _createClass2["default"])(AuthService, [{
-    key: "getLoggedInPerson",
-    value: function getLoggedInPerson() {
-      var p = this.env.get(LOGGED_IN_PERSON_KEY);
-
-      if (typeof p === 'string') {
-        return JSON.parse(p);
-      }
-
-      return null;
-    }
-  }, {
-    key: "setLoggedInPerson",
-    value: function setLoggedInPerson(person) {
-      var normalized = (0, _schema.normalizeSchemaValues)(_personWithToken["default"], person);
-      (0, _schema.validateSchemaValues)(_personWithToken["default"], normalized);
-      this.env.set(LOGGED_IN_PERSON_KEY, JSON.stringify(_objectSpread(_objectSpread({}, normalized), {}, {
-        isLoggedIn: true
-      })));
-    }
-  }, {
-    key: "logOutPerson",
-    value: function logOutPerson() {
-      this.env.unset(LOGGED_IN_PERSON_KEY);
-    }
-  }, {
-    key: "getCurrentSkill",
-    value: function getCurrentSkill() {
-      var id = this.env.get('SKILL_ID');
-      var apiKey = this.env.get('SKILL_API_KEY');
-      var name = this.env.get('SKILL_NAME');
-      var slug = this.pkg.get('skill.namespace');
-
-      if (id && apiKey) {
-        return {
-          id: id,
-          apiKey: apiKey,
-          name: name,
-          slug: slug
-        };
-      }
-
-      return null;
-    }
-  }, {
-    key: "logoutCurrentSkill",
-    value: function logoutCurrentSkill() {
-      this.env.unset('SKILL_ID');
-      this.env.unset('SKILL_API_KEY');
-      this.env.unset('SKILL_NAME');
-    }
-  }, {
-    key: "updateCurrentSkill",
-    value: function updateCurrentSkill(skill) {
-      this.env.set('SKILL_ID', skill.id);
-      this.env.set('SKILL_API_KEY', skill.apiKey);
-      this.env.set('SKILL_NAME', skill.name);
-      this.updateCurrentSkillNamespace(skill.slug);
-    }
-  }, {
-    key: "updateCurrentSkillNamespace",
-    value: function updateCurrentSkillNamespace(namespace) {
-      this.pkg.set({
-        path: 'skill.namespace',
-        value: _spruceSkillUtils.namesUtil.toKebab(namespace)
-      });
-    }
-  }]);
-  return AuthService;
-}();
-
-exports["default"] = AuthService;
-//# sourceMappingURL=AuthService.js.map

package/build/services/AuthService.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/services/AuthService.ts"],"names":["LOGGED_IN_PERSON_KEY","AuthService","envService","pkgService","env","pkg","p","get","JSON","parse","person","normalized","personWithTokenSchema","set","stringify","isLoggedIn","unset","id","apiKey","name","slug","skill","updateCurrentSkillNamespace","namespace","path","value","namesUtil","toKebab"],"mappings":";;;;;;;;;;;;;;;AACA;;AACA;;AACA;;;;;;AAYA,IAAMA,oBAAoB,GAAG,kBAA7B;;IAEqBC,W;AAIpB,uBAAmBC,UAAnB,EAA2CC,UAA3C,EAAmE;AAAA;AAAA;AAAA;AAClE,SAAKC,GAAL,GAAWF,UAAX;AACA,SAAKG,GAAL,GAAWF,UAAX;AACA;;;;WAED,6BAAmD;AAClD,UAAMG,CAAC,GAAG,KAAKF,GAAL,CAASG,GAAT,CAAaP,oBAAb,CAAV;;AACA,UAAI,OAAOM,CAAP,KAAa,QAAjB,EAA2B;AAC1B,eAAOE,IAAI,CAACC,KAAL,CAAWH,CAAX,CAAP;AACA;;AAED,aAAO,IAAP;AACA;;;WAED,2BAAyBI,MAAzB,EAAkD;AACjD,UAAMC,UAAU,GAAG,mCAAsBC,2BAAtB,EAA6CF,MAA7C,CAAnB;AACA,wCAAqBE,2BAArB,EAA4CD,UAA5C;AAEA,WAAKP,GAAL,CAASS,GAAT,CACCb,oBADD,EAECQ,IAAI,CAACM,SAAL,iCACIH,UADJ;AAECI,QAAAA,UAAU,EAAE;AAFb,SAFD;AAOA;;;WAED,wBAAsB;AACrB,WAAKX,GAAL,CAASY,KAAT,CAAehB,oBAAf;AACA;;;WAED,2BAA2C;AAC1C,UAAMiB,EAAE,GAAG,KAAKb,GAAL,CAASG,GAAT,CAAa,UAAb,CAAX;AACA,UAAMW,MAAM,GAAG,KAAKd,GAAL,CAASG,GAAT,CAAa,eAAb,CAAf;AACA,UAAMY,IAAI,GAAG,KAAKf,GAAL,CAASG,GAAT,CAAa,YAAb,CAAb;AACA,UAAMa,IAAI,GAAG,KAAKf,GAAL,CAASE,GAAT,CAAa,iBAAb,CAAb;;AAEA,UAAIU,EAAE,IAAIC,MAAV,EAAkB;AACjB,eAAO;AACND,UAAAA,EAAE,EAAFA,EADM;AAENC,UAAAA,MAAM,EAANA,MAFM;AAGNC,UAAAA,IAAI,EAAJA,IAHM;AAINC,UAAAA,IAAI,EAAJA;AAJM,SAAP;AAMA;;AAED,aAAO,IAAP;AACA;;;WAED,8BAA4B;AAC3B,WAAKhB,GAAL,CAASY,KAAT,CAAe,UAAf;AACA,WAAKZ,GAAL,CAASY,KAAT,CAAe,eAAf;AACA,WAAKZ,GAAL,CAASY,KAAT,CAAe,YAAf;AACA;;;WAED,4BAA0BK,KAA1B,EAA4C;AAC3C,WAAKjB,GAAL,CAASS,GAAT,CAAa,UAAb,EAAyBQ,KAAK,CAACJ,EAA/B;AACA,WAAKb,GAAL,CAASS,GAAT,CAAa,eAAb,EAA8BQ,KAAK,CAACH,MAApC;AACA,WAAKd,GAAL,CAASS,GAAT,CAAa,YAAb,EAA2BQ,KAAK,CAACF,IAAjC;AAEA,WAAKG,2BAAL,CAAiCD,KAAK,CAACD,IAAvC;AACA;;;WAED,qCAAmCG,SAAnC,EAAsD;AACrD,WAAKlB,GAAL,CAASQ,GAAT,CAAa;AACZW,QAAAA,IAAI,EAAE,iBADM;AAEZC,QAAAA,KAAK,EAAEC,4BAAUC,OAAV,CAAkBJ,SAAlB;AAFK,OAAb;AAIA","sourcesContent":["import { SpruceSchemas } from '@sprucelabs/mercury-types'\nimport { normalizeSchemaValues, validateSchemaValues } from '@sprucelabs/schema'\nimport { EnvService, namesUtil } from '@sprucelabs/spruce-skill-utils'\nimport personWithTokenSchema from '#spruce/schemas/spruceCli/v2020_07_22/personWithToken.schema'\nimport PkgService from './PkgService'\n\ntype PersonWithToken = SpruceSchemas.SpruceCli.v2020_07_22.PersonWithToken\n\nexport interface SkillAuth {\n\tid: string\n\tapiKey: string\n\tname: string\n\tslug: string\n}\n\nconst LOGGED_IN_PERSON_KEY = 'LOGGED_IN_PERSON'\n\nexport default class AuthService {\n\tprivate env: EnvService\n\tprivate pkg: PkgService\n\n\tpublic constructor(envService: EnvService, pkgService: PkgService) {\n\t\tthis.env = envService\n\t\tthis.pkg = pkgService\n\t}\n\n\tpublic getLoggedInPerson(): PersonWithToken | null {\n\t\tconst p = this.env.get(LOGGED_IN_PERSON_KEY)\n\t\tif (typeof p === 'string') {\n\t\t\treturn JSON.parse(p)\n\t\t}\n\n\t\treturn null\n\t}\n\n\tpublic setLoggedInPerson(person: PersonWithToken) {\n\t\tconst normalized = normalizeSchemaValues(personWithTokenSchema, person)\n\t\tvalidateSchemaValues(personWithTokenSchema, normalized)\n\n\t\tthis.env.set(\n\t\t\tLOGGED_IN_PERSON_KEY,\n\t\t\tJSON.stringify({\n\t\t\t\t...normalized,\n\t\t\t\tisLoggedIn: true,\n\t\t\t})\n\t\t)\n\t}\n\n\tpublic logOutPerson() {\n\t\tthis.env.unset(LOGGED_IN_PERSON_KEY)\n\t}\n\n\tpublic getCurrentSkill(): SkillAuth | null {\n\t\tconst id = this.env.get('SKILL_ID') as string\n\t\tconst apiKey = this.env.get('SKILL_API_KEY') as string\n\t\tconst name = this.env.get('SKILL_NAME') as string\n\t\tconst slug = this.pkg.get('skill.namespace') as string\n\n\t\tif (id && apiKey) {\n\t\t\treturn {\n\t\t\t\tid,\n\t\t\t\tapiKey,\n\t\t\t\tname,\n\t\t\t\tslug,\n\t\t\t}\n\t\t}\n\n\t\treturn null\n\t}\n\n\tpublic logoutCurrentSkill() {\n\t\tthis.env.unset('SKILL_ID')\n\t\tthis.env.unset('SKILL_API_KEY')\n\t\tthis.env.unset('SKILL_NAME')\n\t}\n\n\tpublic updateCurrentSkill(skill: SkillAuth) {\n\t\tthis.env.set('SKILL_ID', skill.id)\n\t\tthis.env.set('SKILL_API_KEY', skill.apiKey)\n\t\tthis.env.set('SKILL_NAME', skill.name)\n\n\t\tthis.updateCurrentSkillNamespace(skill.slug)\n\t}\n\n\tpublic updateCurrentSkillNamespace(namespace: string) {\n\t\tthis.pkg.set({\n\t\t\tpath: 'skill.namespace',\n\t\t\tvalue: namesUtil.toKebab(namespace),\n\t\t})\n\t}\n}\n"],"file":"AuthService.js"}