@sprucelabs/spruce-cli 24.0.0 → 24.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/build/InFlightEntertainment.d.ts +2 -2
- package/build/__tests__/behavioral/DeployingASkill.test.js.map +1 -1
- package/build/__tests__/behavioral/EnablingAndDisablingCache.test.js.map +1 -1
- package/build/__tests__/behavioral/conversations/CreatingAConversationTopic.test.js +2 -2
- package/build/__tests__/behavioral/conversations/CreatingAConversationTopic.test.js.map +1 -1
- package/build/__tests__/behavioral/conversations/RegisteringConversationsOnBoot.test.js +1 -1
- package/build/__tests__/behavioral/conversations/RegisteringConversationsOnBoot.test.js.map +1 -1
- package/build/__tests__/behavioral/conversations/TestingAConversation.test.js +5 -5
- package/build/__tests__/behavioral/conversations/TestingAConversation.test.js.map +1 -1
- package/build/__tests__/behavioral/lint/LintService.test.js.map +1 -1
- package/build/__tests__/behavioral/node/CreatingANodeModule.test.js.map +1 -1
- package/build/__tests__/behavioral/onboard/StartingOnboarding.test.js.map +1 -1
- package/build/__tests__/behavioral/organization/CreatingAnOrg.test.js.map +1 -1
- package/build/__tests__/behavioral/skill/CreatingASkill.test.js.map +1 -1
- package/build/__tests__/behavioral/skill/RebuildingASkill.test.js.map +1 -1
- package/build/__tests__/behavioral/stores/CreatingADataStore.test.js.map +1 -1
- package/build/__tests__/behavioral/tests/migrationToInstance/AbstractInstanceTest.d.ts +11 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/AbstractInstanceTest.js +49 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/AbstractInstanceTest.js.map +1 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/InstanceBasedTesting.test.d.ts +5 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/InstanceBasedTesting.test.js +34 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/InstanceBasedTesting.test.js.map +1 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/MigratingTests.test.d.ts +12 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/MigratingTests.test.js +88 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/MigratingTests.test.js.map +1 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticTestFinder.test.d.ts +13 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticTestFinder.test.js +109 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticTestFinder.test.js.map +1 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticTestsWhenAlreadyExists.test.d.ts +4 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticTestsWhenAlreadyExists.test.js +29 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticTestsWhenAlreadyExists.test.js.map +1 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceMigrator.test.d.ts +29 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceMigrator.test.js +300 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceMigrator.test.js.map +1 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceTestFileMigrator.test.d.ts +26 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceTestFileMigrator.test.js +202 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceTestFileMigrator.test.js.map +1 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/AbstractInstanceTest.txt +24 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/AbstractStaticTest.txt +24 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest.txt +36 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest2.txt +63 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest3.txt +222 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/StaticTest.txt +34 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/StaticTest2.txt +62 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/support/StaticTest3.txt +221 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/testFileContentsGenerators.d.ts +2 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/testFileContentsGenerators.js +51 -0
- package/build/__tests__/behavioral/tests/migrationToInstance/testFileContentsGenerators.js.map +1 -0
- package/build/__tests__/behavioral/upgrading/UpdatingDependencies2.test.js.map +1 -1
- package/build/__tests__/behavioral/upgrading/UpgradingANodeModule.test.js.map +1 -1
- package/build/__tests__/behavioral/upgrading/UpgradingANonSpruceNodeModule.test.js.map +1 -1
- package/build/__tests__/behavioral/upgrading/UpgradingASkill3.test.js.map +1 -1
- package/build/__tests__/behavioral/upgrading/UpgradingASkill4.test.js.map +1 -1
- package/build/__tests__/behavioral/upgrading/UpgradingASkill5.test.js.map +1 -1
- package/build/__tests__/behavioral/versions/ResolvingVersions.test.js +0 -3
- package/build/__tests__/behavioral/versions/ResolvingVersions.test.js.map +1 -1
- package/build/__tests__/behavioral/views/WatchingSkillViews.test.js.map +1 -1
- package/build/__tests__/implementation/ActionExecuter2.test.js.map +1 -1
- package/build/__tests__/implementation/ActionExecuter4.test.js.map +1 -1
- package/build/__tests__/implementation/FeatureInstaller.test.js.map +1 -1
- package/build/__tests__/implementation/OrganizationStore.test.js +2 -2
- package/build/__tests__/implementation/OrganizationStore.test.js.map +1 -1
- package/build/__tests__/implementation/PkgService.test.js.map +1 -1
- package/build/__tests__/implementation/StoreFeature.test.js.map +1 -1
- package/build/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/AnotherStaticTest.test.ts +33 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/ShouldBeIgnored.ts +0 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/StaticTest1.test.ts +33 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_2/src/DoNotInclude.ts +0 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_2/src/__tests__/AStaticTest.test.ts +33 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_2/src/__tests__/AnotherStaticTest1.test.ts +33 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_3/NotAFileThatShouldBeMigrated.ts +0 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_3/src/__tests__/AStaticTest2.test.ts +17 -0
- package/build/__tests__/testDirsAndFiles/static_test_migration_3/src/__tests__/AbstractWhateverTest.ts +3 -0
- package/build/boot.js.map +1 -1
- package/build/features/skill/actions/BootAction.js.map +1 -1
- package/build/features/test/TestRunner.d.ts +2 -2
- package/build/features/test/TestRunner.js.map +1 -1
- package/build/features/test/actions/CreateAction.d.ts +1 -0
- package/build/features/test/actions/CreateAction.js +13 -0
- package/build/features/test/actions/CreateAction.js.map +1 -1
- package/build/features/test/actions/MigrateAction.d.ts +17 -0
- package/build/features/test/actions/MigrateAction.js +42 -0
- package/build/features/test/actions/MigrateAction.js.map +1 -0
- package/build/features/vscode/services/VsCodeService.d.ts +2 -2
- package/build/features/vscode/services/VsCodeService.js.map +1 -1
- package/build/services/BuildService.d.ts +2 -2
- package/build/services/BuildService.js.map +1 -1
- package/build/services/CommandService.d.ts +20 -12
- package/build/services/CommandService.js +4 -4
- package/build/services/CommandService.js.map +1 -1
- package/build/services/GameService.d.ts +2 -2
- package/build/services/GameService.js.map +1 -1
- package/build/services/ImportService.d.ts +2 -2
- package/build/services/ImportService.js.map +1 -1
- package/build/services/LintService.d.ts +1 -1
- package/build/services/PkgService.d.ts +2 -2
- package/build/services/PkgService.js.map +1 -1
- package/build/services/ServiceFactory.d.ts +2 -2
- package/build/services/ServiceFactory.js.map +1 -1
- package/build/tests/AbstractCliTest.js.map +1 -1
- package/build/tests/CommandFaker.js.map +1 -1
- package/build/tests/staticToInstanceMigration/StaticTestFinder.d.ts +8 -0
- package/build/tests/staticToInstanceMigration/StaticTestFinder.js +23 -0
- package/build/tests/staticToInstanceMigration/StaticTestFinder.js.map +1 -0
- package/build/tests/staticToInstanceMigration/StaticToInstanceMigrator.d.ts +61 -0
- package/build/tests/staticToInstanceMigration/StaticToInstanceMigrator.js +55 -0
- package/build/tests/staticToInstanceMigration/StaticToInstanceMigrator.js.map +1 -0
- package/build/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.d.ts +12 -0
- package/build/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.js +138 -0
- package/build/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.js.map +1 -0
- package/package.json +27 -27
- package/src/InFlightEntertainment.ts +2 -2
- package/src/__tests__/behavioral/DeployingASkill.test.ts +26 -23
- package/src/__tests__/behavioral/EnablingAndDisablingCache.test.ts +13 -13
- package/src/__tests__/behavioral/conversations/CreatingAConversationTopic.test.ts +2 -2
- package/src/__tests__/behavioral/conversations/RegisteringConversationsOnBoot.test.ts +1 -1
- package/src/__tests__/behavioral/conversations/TestingAConversation.test.ts +5 -5
- package/src/__tests__/behavioral/lint/LintService.test.ts +3 -3
- package/src/__tests__/behavioral/node/CreatingANodeModule.test.ts +2 -2
- package/src/__tests__/behavioral/onboard/StartingOnboarding.test.ts +2 -2
- package/src/__tests__/behavioral/organization/CreatingAnOrg.test.ts +0 -1
- package/src/__tests__/behavioral/skill/CreatingASkill.test.ts +2 -2
- package/src/__tests__/behavioral/skill/RebuildingASkill.test.ts +3 -3
- package/src/__tests__/behavioral/stores/CreatingADataStore.test.ts +3 -3
- package/src/__tests__/behavioral/tests/migrationToInstance/AbstractInstanceTest.ts +77 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/InstanceBasedTesting.test.ts +19 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/MigratingTests.test.ts +99 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/StaticTestFinder.test.ts +72 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/StaticTestsWhenAlreadyExists.test.ts +31 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceMigrator.test.ts +310 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceTestFileMigrator.test.ts +193 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/AbstractInstanceTest.txt +24 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/AbstractStaticTest.txt +24 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest.txt +36 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest2.txt +63 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest3.txt +222 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/StaticTest.txt +34 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/StaticTest2.txt +62 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/support/StaticTest3.txt +221 -0
- package/src/__tests__/behavioral/tests/migrationToInstance/testFileContentsGenerators.ts +50 -0
- package/src/__tests__/behavioral/upgrading/UpdatingDependencies2.test.ts +3 -3
- package/src/__tests__/behavioral/upgrading/UpgradingANodeModule.test.ts +6 -6
- package/src/__tests__/behavioral/upgrading/UpgradingANonSpruceNodeModule.test.ts +4 -4
- package/src/__tests__/behavioral/upgrading/UpgradingASkill3.test.ts +9 -9
- package/src/__tests__/behavioral/upgrading/UpgradingASkill4.test.ts +4 -4
- package/src/__tests__/behavioral/upgrading/UpgradingASkill5.test.ts +4 -4
- package/src/__tests__/behavioral/versions/ResolvingVersions.test.ts +1 -3
- package/src/__tests__/behavioral/views/WatchingSkillViews.test.ts +2 -2
- package/src/__tests__/implementation/ActionExecuter2.test.ts +2 -2
- package/src/__tests__/implementation/ActionExecuter4.test.ts +3 -3
- package/src/__tests__/implementation/FeatureInstaller.test.ts +2 -2
- package/src/__tests__/implementation/OrganizationStore.test.ts +6 -2
- package/src/__tests__/implementation/PkgService.test.ts +3 -3
- package/src/__tests__/implementation/StoreFeature.test.ts +2 -2
- package/src/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/AnotherStaticTest.test.ts +33 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/ShouldBeIgnored.ts +0 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_1/src/__tests__/StaticTest1.test.ts +33 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_2/src/DoNotInclude.ts +0 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_2/src/__tests__/AStaticTest.test.ts +33 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_2/src/__tests__/AnotherStaticTest1.test.ts +33 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_3/NotAFileThatShouldBeMigrated.ts +0 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_3/src/__tests__/AStaticTest2.test.ts +17 -0
- package/src/__tests__/testDirsAndFiles/static_test_migration_3/src/__tests__/AbstractWhateverTest.ts +3 -0
- package/src/boot.ts +2 -2
- package/src/features/skill/actions/BootAction.ts +2 -2
- package/src/features/test/TestRunner.ts +3 -3
- package/src/features/test/actions/CreateAction.ts +17 -0
- package/src/features/test/actions/MigrateAction.ts +44 -0
- package/src/features/vscode/services/VsCodeService.ts +2 -2
- package/src/services/BuildService.ts +3 -3
- package/src/services/CommandService.ts +27 -14
- package/src/services/GameService.ts +3 -3
- package/src/services/ImportService.ts +3 -3
- package/src/services/LintService.ts +1 -1
- package/src/services/PkgService.ts +3 -3
- package/src/services/ServiceFactory.ts +6 -6
- package/src/tests/AbstractCliTest.ts +2 -2
- package/src/tests/CommandFaker.ts +4 -4
- package/src/tests/staticToInstanceMigration/StaticTestFinder.ts +25 -0
- package/src/tests/staticToInstanceMigration/StaticToInstanceMigrator.ts +83 -0
- package/src/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.ts +197 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceFactory.js","sourceRoot":"","sources":["../../src/services/ServiceFactory.ts"],"names":[],"mappings":";;;;;AAAA,uEAIuC;AACvC,qGAA4E;AAC5E,6FAAoE;AAEpE,8FAAqE;AACrE,8FAAqE;AACrE,kEAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"ServiceFactory.js","sourceRoot":"","sources":["../../src/services/ServiceFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractCliTest.js","sourceRoot":"","sources":["../../src/tests/AbstractCliTest.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AbstractCliTest.js","sourceRoot":"","sources":["../../src/tests/AbstractCliTest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandFaker.js","sourceRoot":"","sources":["../../src/tests/CommandFaker.ts"],"names":[],"mappings":";;;;;AAAA,uDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"CommandFaker.js","sourceRoot":"","sources":["../../src/tests/CommandFaker.ts"],"names":[],"mappings":";;;;;AAAA,uDAA+C;AAC/C,gFAA2D;AAI3D,MAAqB,YAAY;IACtB,WAAW,CAAC,OAAgB,EAAE,IAAI,GAAG,CAAC;QACzC,wBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE;YACpC,IAAI;SACP,CAAC,CAAA;IACN,CAAC;IAEM,EAAE,CAAC,OAAgB,EAAE,EAAc;QACtC,wBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE;YACpC,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,EAAE;SACf,CAAC,CAAA;IACN,CAAC;IAEM,gBAAgB,CAAC,OAAgB;QACpC,wBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE;YACpC,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,GAAG,EAAE,CACX,mBAAM,CAAC,IAAI,CAAC,GAAG,OAAO,8BAA8B,CAAC;SAC5D,CAAC,CAAA;IACN,CAAC;IAEM,WAAW,CAAC,IAAI,GAAG,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC7C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAEM,cAAc,CAAC,IAAI,GAAG,CAAC;QAC1B,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAA;IAC9C,CAAC;IAEM,SAAS,CAAC,IAAI,GAAG,CAAC;QACrB,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAA;IAC5C,CAAC;IAEM,WAAW,CAAC,IAAI,GAAG,CAAC;QACvB,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;IAC3C,CAAC;CACJ;AAtCD,+BAsCC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export default class StaticTestFinderImpl implements StaticTestFinder {
|
|
2
|
+
static Class?: new () => StaticTestFinder;
|
|
3
|
+
static Finder(): StaticTestFinder;
|
|
4
|
+
find(lookupDir: string): Promise<string[]>;
|
|
5
|
+
}
|
|
6
|
+
export interface StaticTestFinder {
|
|
7
|
+
find(lookupDir: string): Promise<string[]>;
|
|
8
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const globby_1 = __importDefault(require("@sprucelabs/globby"));
|
|
7
|
+
const schema_1 = require("@sprucelabs/schema");
|
|
8
|
+
class StaticTestFinderImpl {
|
|
9
|
+
static Class;
|
|
10
|
+
static Finder() {
|
|
11
|
+
return new (this.Class ?? this)();
|
|
12
|
+
}
|
|
13
|
+
async find(lookupDir) {
|
|
14
|
+
(0, schema_1.assertOptions)({ lookupDir }, ['lookupDir']);
|
|
15
|
+
const matches = await (0, globby_1.default)([
|
|
16
|
+
`${lookupDir}/**/Abstract*Test.ts`,
|
|
17
|
+
`${lookupDir}/**/*.test.ts`,
|
|
18
|
+
]);
|
|
19
|
+
return matches;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.default = StaticTestFinderImpl;
|
|
23
|
+
//# sourceMappingURL=StaticTestFinder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StaticTestFinder.js","sourceRoot":"","sources":["../../../src/tests/staticToInstanceMigration/StaticTestFinder.ts"],"names":[],"mappings":";;;;;AAAA,gEAAuC;AACvC,+CAAkD;AAElD,MAAqB,oBAAoB;IAC9B,MAAM,CAAC,KAAK,CAA6B;IAEzC,MAAM,CAAC,MAAM;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,SAAiB;QAC/B,IAAA,sBAAa,EAAC,EAAE,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;QAE3C,MAAM,OAAO,GAAG,MAAM,IAAA,gBAAM,EAAC;YACzB,GAAG,SAAS,sBAAsB;YAClC,GAAG,SAAS,eAAe;SAC9B,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAClB,CAAC;CACJ;AAjBD,uCAiBC"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import LintService from '../../services/LintService';
|
|
2
|
+
import StaticTestFinder from './StaticTestFinder';
|
|
3
|
+
import { StaticToInstanceTestFileMigrator } from './StaticToInstanceTestFileMigrator';
|
|
4
|
+
export default class StaticToInstanceMigratorImpl implements StaticToInstanceMigrator {
|
|
5
|
+
static diskUtil: {
|
|
6
|
+
writeFile(destination: string, contents: string): void;
|
|
7
|
+
readDir(destination: string): string[];
|
|
8
|
+
readFile(source: string): string;
|
|
9
|
+
deleteFile(destination: string): void;
|
|
10
|
+
createDir(destination: string): void;
|
|
11
|
+
moveDir(source: string, destination: string): void;
|
|
12
|
+
moveFile(source: string, destination: string): void;
|
|
13
|
+
copyDir(source: string, destination: string): Promise<unknown>;
|
|
14
|
+
deleteDir(target: string): void;
|
|
15
|
+
doesFileExist(target: string): boolean;
|
|
16
|
+
isDir(target: string): boolean;
|
|
17
|
+
isDirPath(path: string): boolean;
|
|
18
|
+
isFile(target: string): boolean;
|
|
19
|
+
doesDirExist(target: string): boolean;
|
|
20
|
+
resolveHashSprucePath(cwd: string, ...filePath: string[]): string;
|
|
21
|
+
doesHashSprucePathExist(cwd: string, ...filePath: string[]): boolean;
|
|
22
|
+
resolveBuiltHashSprucePath(cwd: string, ...filePath: string[]): string;
|
|
23
|
+
doesBuiltHashSprucePathExist(cwd: string, ...filePath: string[]): boolean;
|
|
24
|
+
isFileDifferent(destination: string, contents: string): boolean;
|
|
25
|
+
deleteEmptyDirs(dir: string): void;
|
|
26
|
+
resolvePath(cwd: string, ...filePath: string[]): string;
|
|
27
|
+
resolveRelativePath(path1: string, path2: string): string;
|
|
28
|
+
resolveFile(...pathItems: string[]): string | false;
|
|
29
|
+
createTempDir(...files: string[]): string;
|
|
30
|
+
createRandomTempDir(): string;
|
|
31
|
+
hasFileChanged(...filePath: string[]): boolean;
|
|
32
|
+
markFileAsUnchanged(...filePath: string[]): void;
|
|
33
|
+
resolveCacheDirForDir(dir: string): string;
|
|
34
|
+
resolveFileInHashSpruceDir(cwd: string, ...filePath: string[]): string;
|
|
35
|
+
getFileChangedCacheFile(file: string): string;
|
|
36
|
+
};
|
|
37
|
+
static Class?: new (options: StaticToInstanceMigratorOptions) => StaticToInstanceMigrator;
|
|
38
|
+
private testFinder;
|
|
39
|
+
private testFileMigrator;
|
|
40
|
+
private lintService;
|
|
41
|
+
protected constructor(options: StaticToInstanceMigratorOptions);
|
|
42
|
+
static Migrator(options: StaticToInstanceMigratorOptions): StaticToInstanceMigrator;
|
|
43
|
+
run(lookupDir: string): Promise<{
|
|
44
|
+
totalTestsUpdated: number;
|
|
45
|
+
totalTestsSkipped: number;
|
|
46
|
+
}>;
|
|
47
|
+
private readFile;
|
|
48
|
+
private writeFile;
|
|
49
|
+
}
|
|
50
|
+
export interface StaticToInstanceMigratorOptions {
|
|
51
|
+
testFinder: StaticTestFinder;
|
|
52
|
+
testFileMigrator: StaticToInstanceTestFileMigrator;
|
|
53
|
+
lintService: LintService;
|
|
54
|
+
}
|
|
55
|
+
export interface StaticToInstanceMigratorResults {
|
|
56
|
+
totalTestsUpdated: number;
|
|
57
|
+
totalTestsSkipped: number;
|
|
58
|
+
}
|
|
59
|
+
export interface StaticToInstanceMigrator {
|
|
60
|
+
run(lookupDir: string): Promise<StaticToInstanceMigratorResults>;
|
|
61
|
+
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const schema_1 = require("@sprucelabs/schema");
|
|
4
|
+
const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
5
|
+
class StaticToInstanceMigratorImpl {
|
|
6
|
+
static diskUtil = spruce_skill_utils_1.diskUtil;
|
|
7
|
+
static Class;
|
|
8
|
+
testFinder;
|
|
9
|
+
testFileMigrator;
|
|
10
|
+
lintService;
|
|
11
|
+
constructor(options) {
|
|
12
|
+
const { testFinder, testFileMigrator, lintService } = options;
|
|
13
|
+
this.testFinder = testFinder;
|
|
14
|
+
this.testFileMigrator = testFileMigrator;
|
|
15
|
+
this.lintService = lintService;
|
|
16
|
+
}
|
|
17
|
+
static Migrator(options) {
|
|
18
|
+
(0, schema_1.assertOptions)(options, [
|
|
19
|
+
'testFinder',
|
|
20
|
+
'testFileMigrator',
|
|
21
|
+
'lintService',
|
|
22
|
+
]);
|
|
23
|
+
return new (this.Class ?? this)(options);
|
|
24
|
+
}
|
|
25
|
+
async run(lookupDir) {
|
|
26
|
+
(0, schema_1.assertOptions)({ lookupDir }, ['lookupDir']);
|
|
27
|
+
const matches = await this.testFinder.find(lookupDir);
|
|
28
|
+
let totalTestsUpdated = 0;
|
|
29
|
+
let totalTestsSkipped = 0;
|
|
30
|
+
for (const match of matches) {
|
|
31
|
+
const contents = this.readFile(match);
|
|
32
|
+
const updated = this.testFileMigrator.migrate(contents);
|
|
33
|
+
if (contents === updated) {
|
|
34
|
+
totalTestsSkipped++;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
totalTestsUpdated++;
|
|
38
|
+
this.writeFile(match, updated);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
await this.lintService.fix('**/*.ts');
|
|
42
|
+
return {
|
|
43
|
+
totalTestsUpdated,
|
|
44
|
+
totalTestsSkipped,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
readFile(match) {
|
|
48
|
+
return StaticToInstanceMigratorImpl.diskUtil.readFile(match);
|
|
49
|
+
}
|
|
50
|
+
writeFile(match, updated) {
|
|
51
|
+
StaticToInstanceMigratorImpl.diskUtil.writeFile(match, updated);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
exports.default = StaticToInstanceMigratorImpl;
|
|
55
|
+
//# sourceMappingURL=StaticToInstanceMigrator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StaticToInstanceMigrator.js","sourceRoot":"","sources":["../../../src/tests/staticToInstanceMigration/StaticToInstanceMigrator.ts"],"names":[],"mappings":";;AAAA,+CAAkD;AAClD,uEAAyD;AAKzD,MAAqB,4BAA4B;IAGtC,MAAM,CAAC,QAAQ,GAAG,6BAAQ,CAAA;IAC1B,MAAM,CAAC,KAAK,CAEU;IAErB,UAAU,CAAkB;IAC5B,gBAAgB,CAAkC;IAClD,WAAW,CAAa;IAEhC,YAAsB,OAAwC;QAC1D,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;QAC7D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAClC,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,OAAwC;QAC3D,IAAA,sBAAa,EAAC,OAAO,EAAE;YACnB,YAAY;YACZ,kBAAkB;YAClB,aAAa;SAChB,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,SAAiB;QAC9B,IAAA,sBAAa,EAAC,EAAE,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAErD,IAAI,iBAAiB,GAAG,CAAC,CAAA;QACzB,IAAI,iBAAiB,GAAG,CAAC,CAAA;QAEzB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACvD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACvB,iBAAiB,EAAE,CAAA;YACvB,CAAC;iBAAM,CAAC;gBACJ,iBAAiB,EAAE,CAAA;gBACnB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YAClC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAErC,OAAO;YACH,iBAAiB;YACjB,iBAAiB;SACpB,CAAA;IACL,CAAC;IAEO,QAAQ,CAAC,KAAa;QAC1B,OAAO,4BAA4B,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAChE,CAAC;IAEO,SAAS,CAAC,KAAa,EAAE,OAAe;QAC5C,4BAA4B,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACnE,CAAC;;AA5DL,+CA6DC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export default class StaticToInstanceTestFileMigratorImpl implements StaticToInstanceTestFileMigrator {
|
|
2
|
+
static Class?: new () => StaticToInstanceTestFileMigrator;
|
|
3
|
+
static Migrator(): StaticToInstanceTestFileMigrator;
|
|
4
|
+
migrate(contents: string): string;
|
|
5
|
+
private hasSuiteImport;
|
|
6
|
+
private findThisCalls;
|
|
7
|
+
private removeStaticFromDeclaration;
|
|
8
|
+
private fixNonNullAssertions;
|
|
9
|
+
}
|
|
10
|
+
export interface StaticToInstanceTestFileMigrator {
|
|
11
|
+
migrate(contents: string): string;
|
|
12
|
+
}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const schema_1 = require("@sprucelabs/schema");
|
|
4
|
+
class StaticToInstanceTestFileMigratorImpl {
|
|
5
|
+
static Class;
|
|
6
|
+
static Migrator() {
|
|
7
|
+
return new (this.Class ?? this)();
|
|
8
|
+
}
|
|
9
|
+
migrate(contents) {
|
|
10
|
+
(0, schema_1.assertOptions)({ contents }, ['contents']);
|
|
11
|
+
// 1a. Remove `static ` only when it appears immediately before a method
|
|
12
|
+
// that has the `@test()` decorator
|
|
13
|
+
// 1b. If the contents include `export default abstract class`,
|
|
14
|
+
// remove `static` from all methods
|
|
15
|
+
const includesAbstractExport = contents.includes('export default abstract class');
|
|
16
|
+
let cleanedUp = includesAbstractExport
|
|
17
|
+
? contents.replaceAll(' static ', ' ')
|
|
18
|
+
: contents.replace(
|
|
19
|
+
// Matches @test() or @seed(...) followed (on next line) by optional visibility and `static`.
|
|
20
|
+
/(@(?:test\(\)|seed\([^)]*\))\s*\n\s*(?:public|protected)\s+)static\s+/g, '$1');
|
|
21
|
+
// 2. Add `@suite()` above `export default class` if it's not already present
|
|
22
|
+
if (!cleanedUp.includes('@suite')) {
|
|
23
|
+
cleanedUp = cleanedUp.replace(/export default class/, '@suite()\nexport default class');
|
|
24
|
+
}
|
|
25
|
+
// 3. Ensure `suite` is imported from `@sprucelabs/test-utils`
|
|
26
|
+
if (!this.hasSuiteImport(cleanedUp)) {
|
|
27
|
+
if (cleanedUp.includes('{ test')) {
|
|
28
|
+
cleanedUp = cleanedUp.replace('{ test', '{ test, suite');
|
|
29
|
+
}
|
|
30
|
+
else if (cleanedUp.includes('test }')) {
|
|
31
|
+
cleanedUp = cleanedUp.replace('test }', 'test, suite }');
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
cleanedUp = cleanedUp.replace('test,', 'test,\n suite,');
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
const thisCallNames = this.findThisCalls(cleanedUp);
|
|
38
|
+
for (const name of thisCallNames) {
|
|
39
|
+
cleanedUp = this.removeStaticFromDeclaration(cleanedUp, name);
|
|
40
|
+
}
|
|
41
|
+
// 4. lifecicle methods
|
|
42
|
+
const methods = ['beforeEach', 'afterEach'];
|
|
43
|
+
for (const method of methods) {
|
|
44
|
+
cleanedUp = cleanedUp.replace(`protected static async ${method}()`, `protected async ${method}()`);
|
|
45
|
+
}
|
|
46
|
+
cleanedUp = this.fixNonNullAssertions(cleanedUp);
|
|
47
|
+
return cleanedUp;
|
|
48
|
+
}
|
|
49
|
+
hasSuiteImport(text) {
|
|
50
|
+
const pattern = new RegExp(`import\\s+(?:[\\s\\S]*?\\bsuite\\b[\\s\\S]*?)\\s+from\\s+['"]@sprucelabs/test-utils['"]`);
|
|
51
|
+
return pattern.test(text);
|
|
52
|
+
}
|
|
53
|
+
findThisCalls(contents) {
|
|
54
|
+
// Matches `this.myProp` if followed by space, punctuation, parentheses, or end of string
|
|
55
|
+
const thisPropertyRegex = /this\.(\w+)(?=[\s.(),;]|$)/g;
|
|
56
|
+
const names = [];
|
|
57
|
+
let match;
|
|
58
|
+
while ((match = thisPropertyRegex.exec(contents)) !== null) {
|
|
59
|
+
const propName = match[1];
|
|
60
|
+
if (!names.includes(propName)) {
|
|
61
|
+
names.push(propName);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return names;
|
|
65
|
+
}
|
|
66
|
+
removeStaticFromDeclaration(contents, name) {
|
|
67
|
+
/**
|
|
68
|
+
* 1) Remove `static` for methods/getters/setters, e.g.:
|
|
69
|
+
* private static async doSomething() => private async doSomething()
|
|
70
|
+
* private static get value() => private get value()
|
|
71
|
+
* private static set value(v) => private set value(v)
|
|
72
|
+
*/
|
|
73
|
+
const methodPattern = new RegExp(`((?:public|protected|private)?\\s+)?` + // group 1
|
|
74
|
+
`static\\s+` + // literal "static "
|
|
75
|
+
`(?:(async)\\s+)?` + // group 2: "async"?
|
|
76
|
+
`(?:(get|set)\\s+)?` + // group 3: "get" or "set"?
|
|
77
|
+
`(${name})\\s*\\(`, // group 4: the identifier + '('
|
|
78
|
+
'g');
|
|
79
|
+
let updated = contents.replace(methodPattern, (match, g1, g2, g3, g4) => {
|
|
80
|
+
const asyncPart = g2 ? g2 + ' ' : '';
|
|
81
|
+
const accessorPart = g3 ? g3 + ' ' : '';
|
|
82
|
+
// Rebuild the declaration without "static"
|
|
83
|
+
return `${g1 ?? ''}${asyncPart}${accessorPart}${g4}(`;
|
|
84
|
+
});
|
|
85
|
+
/**
|
|
86
|
+
* 2) Remove `static` from property declarations and add a non-null assertion.
|
|
87
|
+
* e.g.
|
|
88
|
+
* private static myProp: Type => private myProp!: Type
|
|
89
|
+
*/
|
|
90
|
+
const propertyPattern = new RegExp(`((?:public|protected|private)?\\s+)?` + // group 1: optional visibility
|
|
91
|
+
`static\\s+` + // literal "static "
|
|
92
|
+
`(${name})` + // group 2: the property name
|
|
93
|
+
`(?=[\\s=:\\[;]|$)`, // lookahead: space, '=', ':', '[', ';', or end-of-string
|
|
94
|
+
'g');
|
|
95
|
+
updated = updated.replace(propertyPattern, (match, g1, g2) => {
|
|
96
|
+
// g1 = "private " / "public " / "protected " or empty
|
|
97
|
+
// g2 = property name
|
|
98
|
+
return `${g1 ?? ''}${g2}!`;
|
|
99
|
+
});
|
|
100
|
+
return updated;
|
|
101
|
+
}
|
|
102
|
+
fixNonNullAssertions(contents) {
|
|
103
|
+
const lines = contents.split('\n');
|
|
104
|
+
const propertyRegex = /^(\s*)(public|protected|private)(\s+readonly)?\s+(\w+)\s*(!)?\s*:\s*([^=;]+)(=.*)?;?$/;
|
|
105
|
+
const updatedLines = lines.map((originalLine) => {
|
|
106
|
+
// Skip lines containing "static"
|
|
107
|
+
if (originalLine.includes('static')) {
|
|
108
|
+
return originalLine;
|
|
109
|
+
}
|
|
110
|
+
const match = originalLine.match(propertyRegex);
|
|
111
|
+
if (!match) {
|
|
112
|
+
return originalLine;
|
|
113
|
+
}
|
|
114
|
+
let [, leadingWhitespace, visibility, readonlyPart = '', propName, exclamation, typeDecl, assignment,] = match;
|
|
115
|
+
// Trim trailing whitespace from the type
|
|
116
|
+
typeDecl = typeDecl.trim();
|
|
117
|
+
if (assignment) {
|
|
118
|
+
// Remove the bang if there's an assignment
|
|
119
|
+
exclamation = '';
|
|
120
|
+
// Remove trailing semicolon
|
|
121
|
+
assignment = assignment.replace(/;$/, '');
|
|
122
|
+
// Ensure we always have " = " at the start
|
|
123
|
+
// E.g. "=something" => " = something"
|
|
124
|
+
assignment = assignment.replace(/^=\s*/, ' = ');
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
// No assignment? Add bang
|
|
128
|
+
exclamation = '!';
|
|
129
|
+
}
|
|
130
|
+
// Rebuild line, preserving leading indentation
|
|
131
|
+
const rebuilt = `${leadingWhitespace}${visibility}${readonlyPart} ${propName}${exclamation}: ${typeDecl}${assignment ?? ''}`;
|
|
132
|
+
return rebuilt;
|
|
133
|
+
});
|
|
134
|
+
return updatedLines.join('\n');
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
exports.default = StaticToInstanceTestFileMigratorImpl;
|
|
138
|
+
//# sourceMappingURL=StaticToInstanceTestFileMigrator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StaticToInstanceTestFileMigrator.js","sourceRoot":"","sources":["../../../src/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "24.
|
|
7
|
+
"version": "24.1.1",
|
|
8
8
|
"skill": {
|
|
9
9
|
"namespace": "spruce-cli",
|
|
10
10
|
"upgradeIgnoreList": [
|
|
@@ -73,18 +73,18 @@
|
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
75
|
"@jest/reporters": "^29.7.0",
|
|
76
|
-
"@sprucelabs/error": "^6.0.
|
|
76
|
+
"@sprucelabs/error": "^6.0.577",
|
|
77
77
|
"@sprucelabs/globby": "^2.0.501",
|
|
78
|
-
"@sprucelabs/heartwood-view-controllers": "^
|
|
79
|
-
"@sprucelabs/jest-json-reporter": "^8.0.
|
|
80
|
-
"@sprucelabs/mercury-client": "^42.0.
|
|
81
|
-
"@sprucelabs/mercury-event-emitter": "^42.0.
|
|
82
|
-
"@sprucelabs/mercury-types": "^47.2.
|
|
83
|
-
"@sprucelabs/schema": "^31.0.
|
|
84
|
-
"@sprucelabs/spruce-core-schemas": "^40.1.
|
|
85
|
-
"@sprucelabs/spruce-event-utils": "^40.
|
|
86
|
-
"@sprucelabs/spruce-skill-utils": "^31.2.
|
|
87
|
-
"@sprucelabs/spruce-templates": "^24.
|
|
78
|
+
"@sprucelabs/heartwood-view-controllers": "^117.2.5",
|
|
79
|
+
"@sprucelabs/jest-json-reporter": "^8.0.578",
|
|
80
|
+
"@sprucelabs/mercury-client": "^42.0.733",
|
|
81
|
+
"@sprucelabs/mercury-event-emitter": "^42.0.733",
|
|
82
|
+
"@sprucelabs/mercury-types": "^47.2.28",
|
|
83
|
+
"@sprucelabs/schema": "^31.0.44",
|
|
84
|
+
"@sprucelabs/spruce-core-schemas": "^40.1.634",
|
|
85
|
+
"@sprucelabs/spruce-event-utils": "^40.2.32",
|
|
86
|
+
"@sprucelabs/spruce-skill-utils": "^31.2.47",
|
|
87
|
+
"@sprucelabs/spruce-templates": "^24.1.1",
|
|
88
88
|
"@typescript-eslint/eslint-plugin": "^7.7.1",
|
|
89
89
|
"@typescript-eslint/parser": "^7.7.1",
|
|
90
90
|
"cfonts": "^3.3.0",
|
|
@@ -101,31 +101,31 @@
|
|
|
101
101
|
"md5": "^2.3.0",
|
|
102
102
|
"open": "^8.4.2",
|
|
103
103
|
"ora": "5.4.1",
|
|
104
|
-
"semver": "^7.
|
|
104
|
+
"semver": "^7.7.1",
|
|
105
105
|
"string-argv": "^0.3.2",
|
|
106
106
|
"terminal-kit": "sprucelabsai/terminal-kit",
|
|
107
107
|
"tree-kill": "^1.2.2",
|
|
108
108
|
"tsutils": "^3.21.0",
|
|
109
109
|
"typescript": "^5.7.3",
|
|
110
|
-
"uuid": "^11.0
|
|
110
|
+
"uuid": "^11.1.0"
|
|
111
111
|
},
|
|
112
112
|
"devDependencies": {
|
|
113
|
-
"@sprucelabs/data-stores": "^28.5.
|
|
114
|
-
"@sprucelabs/mercury-core-events": "^
|
|
115
|
-
"@sprucelabs/resolve-path-aliases": "^2.0.
|
|
116
|
-
"@sprucelabs/spruce-conversation-plugin": "^
|
|
117
|
-
"@sprucelabs/spruce-deploy-plugin": "^
|
|
118
|
-
"@sprucelabs/spruce-store-plugin": "^
|
|
119
|
-
"@sprucelabs/spruce-test-fixtures": "^
|
|
120
|
-
"@sprucelabs/test": "^9.0.
|
|
121
|
-
"@sprucelabs/test-utils": "^5.
|
|
113
|
+
"@sprucelabs/data-stores": "^28.5.57",
|
|
114
|
+
"@sprucelabs/mercury-core-events": "^26.0.9",
|
|
115
|
+
"@sprucelabs/resolve-path-aliases": "^2.0.531",
|
|
116
|
+
"@sprucelabs/spruce-conversation-plugin": "^66.0.20",
|
|
117
|
+
"@sprucelabs/spruce-deploy-plugin": "^66.0.20",
|
|
118
|
+
"@sprucelabs/spruce-store-plugin": "^66.0.20",
|
|
119
|
+
"@sprucelabs/spruce-test-fixtures": "^66.0.20",
|
|
120
|
+
"@sprucelabs/test": "^9.0.71",
|
|
121
|
+
"@sprucelabs/test-utils": "^5.3.4",
|
|
122
122
|
"@types/blessed": "^0.1.25",
|
|
123
123
|
"@types/eslint": "^9.6.1",
|
|
124
124
|
"@types/fs-extra": "^11.0.4",
|
|
125
125
|
"@types/inquirer": "^9.0.7",
|
|
126
|
-
"@types/lodash": "^4.17.
|
|
126
|
+
"@types/lodash": "^4.17.15",
|
|
127
127
|
"@types/md5": "^2.3.5",
|
|
128
|
-
"@types/node": "^22.
|
|
128
|
+
"@types/node": "^22.13.4",
|
|
129
129
|
"@types/promise.allsettled": "^1.0.6",
|
|
130
130
|
"@types/ps-node": "^0.1.3",
|
|
131
131
|
"@types/semver": "^7.5.8",
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
"concurrently": "^9.1.2",
|
|
139
139
|
"conventional-changelog-sprucelabs": "2.0.1",
|
|
140
140
|
"dotenv": "^16.4.7",
|
|
141
|
-
"eslint": "^9.
|
|
141
|
+
"eslint": "^9.20.1",
|
|
142
142
|
"eslint-config-spruce": "^11.2.26",
|
|
143
143
|
"find-process": "^1.4.10",
|
|
144
144
|
"jest": "^29.7.0",
|
|
@@ -571,5 +571,5 @@
|
|
|
571
571
|
"open"
|
|
572
572
|
]
|
|
573
573
|
},
|
|
574
|
-
"gitHead": "
|
|
574
|
+
"gitHead": "669ae48f27db7c566596eee69843e0ba594da4aa"
|
|
575
575
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import TerminalInterface from './interfaces/TerminalInterface'
|
|
2
|
-
import
|
|
2
|
+
import CommandServiceImpl from './services/CommandService'
|
|
3
3
|
import GameService from './services/GameService'
|
|
4
4
|
|
|
5
5
|
export default class InFlightEntertainment {
|
|
@@ -7,7 +7,7 @@ export default class InFlightEntertainment {
|
|
|
7
7
|
private static game?: GameService
|
|
8
8
|
|
|
9
9
|
public static setup(options: {
|
|
10
|
-
command:
|
|
10
|
+
command: CommandServiceImpl
|
|
11
11
|
ui: TerminalInterface
|
|
12
12
|
}) {
|
|
13
13
|
this.game = new GameService(options.command, options.ui)
|