@sprucelabs/spruce-cli 24.1.1 → 24.1.3

package/package.json

@@ -4,7 +4,7 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "24.1.1",
+	"version": "24.1.3",
 	"skill": {
 		"namespace": "spruce-cli",
 		"upgradeIgnoreList": [
@@ -73,18 +73,18 @@
 	},
 	"dependencies": {
 		"@jest/reporters": "^29.7.0",
-		"@sprucelabs/error": "^6.0.577",
-		"@sprucelabs/globby": "^2.0.501",
-		"@sprucelabs/heartwood-view-controllers": "^117.2.5",
-		"@sprucelabs/jest-json-reporter": "^8.0.578",
-		"@sprucelabs/mercury-client": "^42.0.733",
-		"@sprucelabs/mercury-event-emitter": "^42.0.733",
-		"@sprucelabs/mercury-types": "^47.2.28",
-		"@sprucelabs/schema": "^31.0.44",
-		"@sprucelabs/spruce-core-schemas": "^40.1.634",
-		"@sprucelabs/spruce-event-utils": "^40.2.32",
-		"@sprucelabs/spruce-skill-utils": "^31.2.47",
-		"@sprucelabs/spruce-templates": "^24.1.1",
+		"@sprucelabs/error": "^6.0.581",
+		"@sprucelabs/globby": "^2.0.502",
+		"@sprucelabs/heartwood-view-controllers": "^117.2.14",
+		"@sprucelabs/jest-json-reporter": "^8.0.582",
+		"@sprucelabs/mercury-client": "^42.0.739",
+		"@sprucelabs/mercury-event-emitter": "^42.0.739",
+		"@sprucelabs/mercury-types": "^47.2.39",
+		"@sprucelabs/schema": "^31.0.55",
+		"@sprucelabs/spruce-core-schemas": "^40.1.645",
+		"@sprucelabs/spruce-event-utils": "^40.2.44",
+		"@sprucelabs/spruce-skill-utils": "^31.2.60",
+		"@sprucelabs/spruce-templates": "^24.1.3",
 		"@typescript-eslint/eslint-plugin": "^7.7.1",
 		"@typescript-eslint/parser": "^7.7.1",
 		"cfonts": "^3.3.0",
@@ -110,22 +110,22 @@
 		"uuid": "^11.1.0"
 	},
 	"devDependencies": {
-		"@sprucelabs/data-stores": "^28.5.57",
-		"@sprucelabs/mercury-core-events": "^26.0.9",
-		"@sprucelabs/resolve-path-aliases": "^2.0.531",
-		"@sprucelabs/spruce-conversation-plugin": "^66.0.20",
-		"@sprucelabs/spruce-deploy-plugin": "^66.0.20",
-		"@sprucelabs/spruce-store-plugin": "^66.0.20",
-		"@sprucelabs/spruce-test-fixtures": "^66.0.20",
-		"@sprucelabs/test": "^9.0.71",
-		"@sprucelabs/test-utils": "^5.3.4",
+		"@sprucelabs/data-stores": "^28.5.69",
+		"@sprucelabs/mercury-core-events": "^26.0.21",
+		"@sprucelabs/resolve-path-aliases": "^2.0.534",
+		"@sprucelabs/spruce-conversation-plugin": "^66.0.26",
+		"@sprucelabs/spruce-deploy-plugin": "^66.0.26",
+		"@sprucelabs/spruce-store-plugin": "^66.0.26",
+		"@sprucelabs/spruce-test-fixtures": "^66.0.26",
+		"@sprucelabs/test": "^9.0.73",
+		"@sprucelabs/test-utils": "^5.5.14",
 		"@types/blessed": "^0.1.25",
 		"@types/eslint": "^9.6.1",
 		"@types/fs-extra": "^11.0.4",
 		"@types/inquirer": "^9.0.7",
 		"@types/lodash": "^4.17.15",
 		"@types/md5": "^2.3.5",
-		"@types/node": "^22.13.4",
+		"@types/node": "^22.13.5",
 		"@types/promise.allsettled": "^1.0.6",
 		"@types/ps-node": "^0.1.3",
 		"@types/semver": "^7.5.8",
@@ -138,7 +138,7 @@
 		"concurrently": "^9.1.2",
 		"conventional-changelog-sprucelabs": "2.0.1",
 		"dotenv": "^16.4.7",
-		"eslint": "^9.20.1",
+		"eslint": "^9.21.0",
 		"eslint-config-spruce": "^11.2.26",
 		"find-process": "^1.4.10",
 		"jest": "^29.7.0",
@@ -147,7 +147,7 @@
 		"jest-reporters": "^0.0.2",
 		"prettier": "^3.2.5",
 		"ps-node": "^0.1.6",
-		"ts-jest": "^29.2.5",
+		"ts-jest": "^29.2.6",
 		"ts-node": "^10.9.2",
 		"tsc-watch": "^6.2.1",
 		"tsconfig-paths": "^4.2.0"
@@ -571,5 +571,5 @@
 			"open"
 		]
 	},
-	"gitHead": "669ae48f27db7c566596eee69843e0ba594da4aa"
+	"gitHead": "16cc2438adb35cf10ace9348d722839749707ecc"
 }

package/src/__tests__/behavioral/tests/migrationToInstance/StaticToInstanceTestFileMigrator.test.ts

@@ -147,6 +147,14 @@ protected suiteMethod() {}`
         this.assertMigratedEquals(before, expected)
     }
 
+    @test()
+    protected properlyMigrationsAbstractTests2() {
+        const before = this.readTestFile('AbstractStaticTest2.txt')
+        const expected = this.readTestFile('AbstractInstanceTest2.txt')
+
+        this.assertMigratedEquals(before, expected)
+    }
+
     @test()
     protected canMigrateMoreComplexTest() {
         const before = this.readTestFile('StaticTest2.txt')
@@ -163,6 +171,14 @@ protected suiteMethod() {}`
         this.assertMigratedEquals(before, expected)
     }
 
+    @test()
+    protected canMigrateAnotherComplexTest2() {
+        const before = this.readTestFile('StaticTest4.txt')
+        const expected = this.readTestFile('InstanceTest4.txt')
+
+        this.assertMigratedEquals(before, expected)
+    }
+
     private readTestFile(name: string) {
         return diskUtil.readFile(this.resolveTestClassPath(name))
     }

package/src/__tests__/behavioral/tests/migrationToInstance/support/AbstractInstanceTest2.txt

@@ -0,0 +1,24 @@
+import { AbstractSpruceFixtureTest } from '@sprucelabs/spruce-test-fixtures'
+import { assert } from '@sprucelabs/test-utils'
+import HomeIntegrationsStore from '../../stores/HomeIntegrations.store'
+import EventFaker from './EventFaker'
+
+export default class AbstractGoogleTest extends AbstractSpruceFixtureTest {
+    protected eventFaker!: EventFaker
+    private homeIntegrations!: HomeIntegrationsStore
+
+    protected async beforeEach(): Promise<void> {
+        await super.beforeEach()
+        this.eventFaker = new EventFaker()
+        this.homeIntegrations = await this.stores.getStore('homeIntegrations')
+    }
+
+    protected async getFirstHomeIntegration() {
+        const match = await this.homeIntegrations.findOne(
+            {},
+            { shouldIncludePrivateFields: true }
+        )
+        assert.isTruthy(match, 'No home integration found')
+        return match
+    }
+}

package/src/__tests__/behavioral/tests/migrationToInstance/support/AbstractStaticTest2.txt

@@ -0,0 +1,24 @@
+import { AbstractSpruceFixtureTest } from '@sprucelabs/spruce-test-fixtures'
+import { assert } from '@sprucelabs/test-utils'
+import HomeIntegrationsStore from '../../stores/HomeIntegrations.store'
+import EventFaker from './EventFaker'
+
+export default class AbstractGoogleTest extends AbstractSpruceFixtureTest {
+    protected static eventFaker: EventFaker
+    private static homeIntegrations: HomeIntegrationsStore
+
+    protected static async beforeEach(): Promise<void> {
+        await super.beforeEach()
+        this.eventFaker = new EventFaker()
+        this.homeIntegrations = await this.stores.getStore('homeIntegrations')
+    }
+
+    protected static async getFirstHomeIntegration() {
+        const match = await this.homeIntegrations.findOne(
+            {},
+            { shouldIncludePrivateFields: true }
+        )
+        assert.isTruthy(match, 'No home integration found')
+        return match
+    }
+}

package/src/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest.txt

@@ -10,10 +10,13 @@ import AbstractSpruceTest, {
 @fake.login()
 @suite()
 export default class StaticTestFinderTest extends AbstractSpruceTest {
+    private responseBody = generateId()
+
     @test()
     protected async throwsWithMissing() {
         const finder = StaticTestFinder.Finder()
         const err = await assert.doesThrowAsync(() => finder.find())
+        console.log(this.responseBody)
         errorAssert.assertError(err, 'MISSING_PARAMETERS', {
             parameters: ['lookupDir'],
         })
@@ -23,6 +26,11 @@ export default class StaticTestFinderTest extends AbstractSpruceTest {
     protected async yourNextTest() {
         assert.isTrue(false)
     }
+
+    @test('this has a description')
+    protected async anotherTest() {
+        assert.isFalse(true)
+    }
 }
 
 class StaticTestFinder {

package/src/__tests__/behavioral/tests/migrationToInstance/support/InstanceTest3.txt

@@ -21,7 +21,7 @@ export default class RootSkillViewTest extends AbstractGoogleTest {
     private fakedIntegrations: PublicHomeIntegration[] = []
     protected names: string[] = []
 
-    protected async beforeEach(): Promise<void> {
+    protected async beforeEach() {
         await super.beforeEach()
 
         this.fakedIntegrations = []