@sprucelabs/spruce-cli 24.1.2 → 24.1.4

package/build/__tests__/behavioral/tests/migrationToInstance/support/StaticTest4.txt

@@ -0,0 +1,530 @@
+import {
+    FormViewController,
+    SkillViewControllerId,
+    buttonAssert,
+    formAssert,
+    interactor,
+    navigationAssert,
+    vcAssert,
+} from '@sprucelabs/heartwood-view-controllers'
+import { selectAssert } from '@sprucelabs/schema'
+import { SelectChoice } from '@sprucelabs/spruce-core-schemas'
+import { FormCardViewController } from '@sprucelabs/spruce-form-utils'
+import { eventFaker, fake, seed } from '@sprucelabs/spruce-test-fixtures'
+import { assert, generateId, test } from '@sprucelabs/test-utils'
+import GenerateSkillViewController, {
+    CurrentChallengeSchema,
+    GenerateStorySchema,
+} from '../../../generation/Generate.svc'
+import { storyElements } from '../../../generation/storyElements'
+import AbstractEightBitTest from '../../support/AbstractEightBitTest'
+import {
+    GenerateStoryTargetAndPayload,
+    GetStoryStatusTargetAndPayload,
+} from '../../support/EventFaker'
+
+@fake.login()
+export default class GenerateSkillViewTest extends AbstractEightBitTest {
+    private static vc: SpyGenerateSkillView
+    private static checkStatusIntervalCb: undefined | (() => Promise<void>)
+    private static checkStatusIntervalMs: number | undefined
+    private static intervalId: string
+    private static passedIntervalIdToClear?: string
+
+    @seed('familyMembers', 3)
+    protected static async beforeEach(): Promise<void> {
+        await super.beforeEach()
+
+        this.views.setController(
+            'eightbitstories.generate',
+            SpyGenerateSkillView
+        )
+        this.views.setController('forms.card', SpyFormCard)
+
+        this.vc = this.Vc()
+
+        await this.eventFaker.fakeListFamilyMembers(() => this.members.find({}))
+        await this.loadVc()
+
+        delete this.checkStatusIntervalCb
+        delete this.checkStatusIntervalMs
+        delete this.passedIntervalIdToClear
+
+        this.intervalId = generateId()
+
+        //@ts-ignore
+        GenerateSkillViewController.setInterval = (
+            cb: () => Promise<void>,
+            intervalMs: number
+        ) => {
+            this.checkStatusIntervalMs = intervalMs
+            this.checkStatusIntervalCb = cb
+            return this.intervalId
+        }
+
+        //@ts-ignore
+        GenerateSkillViewController.clearInterval = (id: string) => {
+            this.passedIntervalIdToClear = id
+        }
+
+        console.log(this.locationIds)
+        console.log(this.organizationIds)
+    }
+
+    private static get locationIds() {
+        console.log('here')
+    }
+
+    private static set organizationIds() {
+        console.log('here')
+    }
+
+    @test()
+    protected static async requiresLogin() {
+        await vcAssert.assertLoginIsRequired(this.vc)
+    }
+
+    @test()
+    protected static async rendersExpectedCards() {
+        vcAssert.assertSkillViewRendersCards(this.vc, [
+            'elements',
+            'members',
+            'currentChallenge',
+            'controls',
+        ])
+    }
+
+    @test()
+    protected static async controlsCardRendersExpectedButtons() {
+        buttonAssert.cardRendersButtons(this.controlsVc, ['back', 'generate'])
+    }
+
+    @test()
+    protected static async rendersAlertAndRedirectsIfNoMembers() {
+        await this.eventFaker.fakeListFamilyMembers(() => [])
+        this.vc = this.Vc()
+        await vcAssert.assertRendersAlertThenRedirects({
+            vc: this.vc,
+            router: this.views.getRouter(),
+            destination: {
+                id: 'eightbitstories.root',
+            },
+            action: () => this.loadVc(),
+        })
+    }
+
+    @test()
+    protected static async clickingBackGoesBackToRoot() {
+        await vcAssert.assertActionRedirects({
+            action: () => interactor.clickButton(this.controlsVc, 'back'),
+            destination: {
+                id: 'eightbitstories.root',
+            },
+            router: this.views.getRouter(),
+        })
+    }
+
+    @test()
+    protected static elementsAndMembersCardsRendersForms() {
+        formAssert.cardRendersForm(this.elementsVc)
+        formAssert.cardRendersForm(this.membersVc)
+        formAssert.cardRendersForm(this.currentChallengeVc)
+    }
+
+    @test()
+    protected static async formCardsDoNotRenderButtons() {
+        assert.isFalse(this.elementsFormVc.getShouldRenderSubmitControls())
+        assert.isFalse(this.membersFormVc.getShouldRenderSubmitControls())
+        assert.isFalse(
+            this.currentChallengeFormVc.getShouldRenderSubmitControls()
+        )
+    }
+
+    @test()
+    protected static async elementsFormRendersExpectedFields() {
+        formAssert.formRendersFields(this.elementsFormVc, ['elements'])
+    }
+
+    @test()
+    protected static async elementsFormRendersExpectedChoices() {
+        const schema = this.elementsFormVc.getSchema()
+        selectAssert.assertSelectChoicesMatch(
+            schema.fields.elements.options.choices,
+            storyElements.map((element) => element.id)
+        )
+    }
+
+    @test()
+    protected static async rendersElementsAsTags() {
+        formAssert.formFieldRendersAs(this.elementsFormVc, 'elements', 'tags')
+    }
+
+    @test()
+    protected static async membersFormRendersExpectedFields() {
+        formAssert.formRendersFields(this.membersFormVc, ['members'])
+    }
+
+    @test()
+    protected static async membersFormRendersAsTags() {
+        formAssert.formFieldRendersAs(this.membersFormVc, 'members', 'tags')
+    }
+
+    @test()
+    protected static async membersRendersExpectedChoices() {
+        const members = await this.getAllMembers()
+        const expected = members.map((member) => member.id)
+
+        const schema = this.membersFormVc.getSchema()
+        selectAssert.assertSelectChoicesMatch(
+            schema.fields.members.options.choices as SelectChoice[],
+            expected
+        )
+    }
+
+    @test()
+    protected static async currentChallengeFormRendersAsExpected() {
+        formAssert.formRendersField(
+            this.currentChallengeFormVc,
+            'currentChallenge'
+        )
+        formAssert.formFieldRendersAs(
+            this.currentChallengeFormVc,
+            'currentChallenge',
+            'textarea'
+        )
+    }
+
+    @test()
+    protected static async clickingGenerateSetsControlsToBusy() {
+        await this.eventFaker.fakeGenerateStory(() => {})
+
+        await this.selectFirstMember()
+        await this.selectFirstElement()
+
+        const promise = this.clickGenerateAndAssertRedirect()
+        this.assertFooterIsBusy()
+
+        await promise
+    }
+
+    @test()
+    protected static async rendersAlertIfFailsToGenerateStory() {
+        await eventFaker.makeEventThrow(
+            'eightbitstories.generate-story::v2023_09_05'
+        )
+
+        const alertVc = await vcAssert.assertRendersAlert(this.vc, () =>
+            this.clickGenerate()
+        )
+
+        this.assertFooterIsBusy()
+
+        await alertVc.hide()
+
+        this.assertFooterIsNotBusy()
+    }
+
+    @test('submits selected members and elements 1', [0], [0])
+    @test('submits selected members and elements 2', [1], [2])
+    @test('submits selected members and elements 3', [0, 1], [2, 3])
+    protected static async generatePassesSelectedMembersAndElements(
+        memberIdxs: number[],
+        elementIdxs: number[]
+    ) {
+        let passedPayload: GenerateStoryTargetAndPayload['payload'] | undefined
+
+        await this.eventFaker.fakeGenerateStory(({ payload }) => {
+            passedPayload = payload
+        })
+
+        const selectedMembers = await this.selectMembers(memberIdxs)
+        const selectedElements = await this.selectElements(elementIdxs)
+
+        const currentChallenge = generateId()
+        await this.currentChallengeFormVc.setValue(
+            'currentChallenge',
+            currentChallenge
+        )
+
+        await this.clickGenerateAndAssertRedirect()
+
+        assert.isEqualDeep(passedPayload, {
+            familyMembers: selectedMembers,
+            storyElements: selectedElements,
+            currentChallenge,
+            storyHash: this.vc.getHash(),
+        })
+    }
+
+    @test()
+    protected static async generatingStoryRedirectsToStoryWithArgs() {
+        await this.eventFaker.fakeGenerateStory()
+
+        await this.selectFirstElement()
+        await this.selectFirstMember()
+
+        const destination = {
+            id: 'eightbitstories.story' as SkillViewControllerId,
+            args: {
+                story: generateId(),
+            },
+        }
+
+        await this.clickGenerateAndAssertRedirect(destination)
+    }
+
+    @test()
+    protected static async callingDestroyRemovesDidGenerateListener() {
+        await this.vc.destroy()
+
+        await eventFaker.handleReactiveEvent(
+            'eightbitstories.did-generate-story::v2023_09_05'
+        )
+
+        await this.emitDidGenerate()
+    }
+
+    @test()
+    protected static async rendersNullNavigation() {
+        navigationAssert.skillViewDoesNotRenderNavigation(this.vc)
+    }
+
+    @test()
+    protected static async checksForGeneratedStoryAfterSubmitting() {
+        let passedTarget: GetStoryStatusTargetAndPayload['target'] | undefined
+        await this.eventFaker.fakeGetStoryGenerationStatus(({ target }) => {
+            passedTarget = target
+        })
+
+        await this.fakeGenerateSelectEverythingClickGenerateAndInvokeIntervalCb()
+
+        assert.isEqualDeep(passedTarget, {
+            storyHash: this.vc.getHash(),
+        })
+    }
+
+    @test()
+    protected static async passesExpectedIntervalToChecksAfterSubmit() {
+        await this.eventFaker.fakeGenerateStory()
+        await this.selectElementFamilyMemberAndClickGenerate()
+        assert.isEqual(this.checkStatusIntervalMs, 1000 * 10)
+    }
+
+    @test()
+    protected static async doesNotSetIntervalIfGenerateThrows() {
+        await eventFaker.makeEventThrow(
+            'eightbitstories.generate-story::v2023_09_05'
+        )
+
+        await vcAssert.assertRendersAlert(this.vc, () =>
+            this.selectElementFamilyMemberAndClickGenerate()
+        )
+        assert.isUndefined(
+            this.checkStatusIntervalCb,
+            'should not have been set'
+        )
+    }
+
+    @test()
+    protected static async redirectsIfResponseIsStoryGenerated() {
+        const storyId = generateId()
+        await this.eventFaker.fakeGetStoryGenerationStatus(() => {
+            return {
+                status: 'ready',
+                storyId,
+            }
+        })
+
+        await this.fakeGenerateSelectEverythingAndClickGenerate()
+        await vcAssert.assertActionRedirects({
+            action: () => this.checkStatusIntervalCb?.(),
+            destination: {
+                id: 'eightbitstories.story',
+                args: {
+                    story: storyId,
+                },
+            },
+            router: this.views.getRouter(),
+        })
+    }
+
+    @test()
+    protected static async clearsTimeoutOnBlur() {
+        await this.fakeGenerateSelectEverythingAndClickGenerate()
+        assert.isFalsy(this.passedIntervalIdToClear)
+        await interactor.blur(this.vc)
+        assert.isEqual(
+            this.passedIntervalIdToClear,
+            this.intervalId,
+            'did not pass response to setInterval to clearInterval'
+        )
+    }
+
+    private static async fakeGenerateSelectEverythingClickGenerateAndInvokeIntervalCb() {
+        await this.fakeGenerateSelectEverythingAndClickGenerate()
+        await this.checkStatusIntervalCb?.()
+    }
+
+    private static async fakeGenerateSelectEverythingAndClickGenerate() {
+        await this.eventFaker.fakeGenerateStory()
+        await this.selectElementFamilyMemberAndClickGenerate()
+    }
+
+    private static async selectElementFamilyMemberAndClickGenerate() {
+        await this.selectFirstElement()
+        await this.selectFirstMember()
+        await this.clickGenerate()
+    }
+
+    private static async clickGenerateAndAssertRedirect(destination?: {
+        id: SkillViewControllerId
+        args: { story: string }
+    }) {
+        await vcAssert.assertActionRedirects({
+            action: async () => {
+                await this.clickGenerate()
+                await this.emitDidGenerate(destination?.args?.story)
+            },
+            router: this.views.getRouter(),
+            destination,
+        })
+    }
+
+    private static async emitDidGenerate(storyId?: string) {
+        await this.fakedClient.emitAndFlattenResponses(
+            'eightbitstories.did-generate-story::v2023_09_05',
+            {
+                target: {
+                    personId: generateId(),
+                },
+                payload: {
+                    storyId: storyId ?? generateId(),
+                },
+            }
+        )
+    }
+
+    private static async selectFirstElement() {
+        const selectedElement = await this.selectElement(0)
+        return selectedElement
+    }
+
+    private static async selectElement(idx: number) {
+        const selectedElements = await this.selectElements([idx])
+        return selectedElements[0]
+    }
+
+    private static async selectElements(allIdxs: number[]) {
+        const selectedElements = allIdxs.map((idx) => storyElements[idx].id)
+        await this.elementsFormVc.setValue('elements', selectedElements)
+        return selectedElements
+    }
+
+    private static async selectFirstMember() {
+        const selectedMember = await this.selectMember(0)
+        return selectedMember
+    }
+
+    private static async selectMember(idx: number) {
+        const selectedMembers = await this.selectMembers([idx])
+        return selectedMembers[0]
+    }
+
+    private static async selectMembers(allIdxs: number[]) {
+        const members = await this.getAllMembers()
+        const selectedMembers = allIdxs.map((idx) => members[idx].id)
+        await this.membersFormVc.setValue('members', selectedMembers as any)
+        return selectedMembers
+    }
+
+    private static async getAllMembers() {
+        return await this.members.find({})
+    }
+
+    private static assertFooterIsNotBusy() {
+        assert.isFalse(this.getIsFooterBusy())
+    }
+
+    private static assertFooterIsBusy() {
+        assert.isTrue(this.getIsFooterBusy())
+    }
+
+    private static getIsFooterBusy(): boolean | null | undefined {
+        return this.controlsVc.getFooter()?.isBusy
+    }
+
+    private static async clickGenerate() {
+        await interactor.clickButton(this.controlsVc, 'generate')
+    }
+
+    private static get membersFormVc() {
+        return this.vc.getMembersFormVc()
+    }
+
+    private static get elementsFormVc() {
+        return this.vc.getElementsFormVc()
+    }
+
+    private static async loadVc() {
+        await this.views.load(this.vc)
+    }
+
+    private static get membersVc() {
+        return this.vc.getMembersVc()
+    }
+
+    private static get currentChallengeVc() {
+        return this.vc.getCurrentChallengeVc()
+    }
+
+    private static get currentChallengeFormVc() {
+        return this.currentChallengeVc.getFormVc() as FormViewController<CurrentChallengeSchema>
+    }
+
+    private static get elementsVc() {
+        return this.vc.getElementsVc()
+    }
+
+    private static get controlsVc() {
+        return this.vc.getControlsCardVc()
+    }
+
+    private static Vc(): SpyGenerateSkillView {
+        return this.views.Controller(
+            'eightbitstories.generate',
+            {}
+        ) as SpyGenerateSkillView
+    }
+}
+
+class SpyGenerateSkillView extends GenerateSkillViewController {
+    public getHash() {
+        return this.storyHash!
+    }
+
+    public getCurrentChallengeVc() {
+        return this.currentChallengeVc
+    }
+
+    public getMembersFormVc() {
+        return this.getMembersVc().getFormVc() as FormViewController<GenerateStorySchema>
+    }
+    public getElementsFormVc() {
+        return this.getElementsVc().getFormVc() as FormViewController<GenerateStorySchema>
+    }
+    public getElementsVc() {
+        return this.elementsVc as SpyFormCard
+    }
+    public getMembersVc() {
+        return this.membersVc as SpyFormCard
+    }
+    public getControlsCardVc() {
+        return this.controlsVc
+    }
+}
+
+class SpyFormCard extends FormCardViewController {
+    public getFormVc() {
+        return this.formVc
+    }
+}

package/build/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.js

@@ -12,14 +12,14 @@ class StaticToInstanceTestFileMigratorImpl {
         //    that has the `@test()` decorator
         // 1b. If the contents include `export default abstract class`,
         //     remove `static` from all methods
-        const includesAbstractExport = contents.includes('export default abstract class');
-        let cleanedUp = includesAbstractExport
+        const isAbstractTest = /export\s+default\s+(?:abstract\s+class\b|class\s+(Abstract\w*))/m.test(contents);
+        let cleanedUp = isAbstractTest
             ? contents.replaceAll(' static ', ' ')
             : contents.replace(
             // Matches @test() or @seed(...) followed (on next line) by optional visibility and `static`.
-            /(@(?:test\(\)|seed\([^)]*\))\s*\n\s*(?:public|protected)\s+)static\s+/g, '$1');
+            /(@(?:(?:test|seed)\([\s\S]*?\))\s*\n\s*(?:public|protected)\s+)static\s+/g, '$1');
         // 2. Add `@suite()` above `export default class` if it's not already present
-        if (!cleanedUp.includes('@suite')) {
+        if (!isAbstractTest && !cleanedUp.includes('@suite')) {
             cleanedUp = cleanedUp.replace(/export default class/, '@suite()\nexport default class');
         }
         // 3. Ensure `suite` is imported from `@sprucelabs/test-utils`
@@ -41,9 +41,11 @@ class StaticToInstanceTestFileMigratorImpl {
         // 4. lifecicle methods
         const methods = ['beforeEach', 'afterEach'];
         for (const method of methods) {
-            cleanedUp = cleanedUp.replace(`protected static async ${method}()`, `protected async ${method}()`);
+            cleanedUp = cleanedUp.replace(`static async ${method}()`, `async ${method}()`);
         }
         cleanedUp = this.fixNonNullAssertions(cleanedUp);
+        cleanedUp = cleanedUp.replaceAll('= >', '=>');
+        cleanedUp = cleanedUp.replaceAll('! =', ' =');
         return cleanedUp;
     }
     hasSuiteImport(text) {
@@ -51,8 +53,9 @@ class StaticToInstanceTestFileMigratorImpl {
         return pattern.test(text);
     }
     findThisCalls(contents) {
-        // Matches `this.myProp` if followed by space, punctuation, parentheses, or end of string
-        const thisPropertyRegex = /this\.(\w+)(?=[\s.(),;]|$)/g;
+        // Matches either `this.myProp` or `delete this.myProp`
+        // if followed by space, punctuation, parentheses, or end of string
+        const thisPropertyRegex = /(?:delete\s+)?this\.(\w+)(?=[\s.(),;]|$)/g;
         const names = [];
         let match;
         while ((match = thisPropertyRegex.exec(contents)) !== null) {
@@ -83,19 +86,20 @@ class StaticToInstanceTestFileMigratorImpl {
             return `${g1 ?? ''}${asyncPart}${accessorPart}${g4}(`;
         });
         /**
-         * 2) Remove `static` from property declarations and add a non-null assertion.
+         * 2) Remove `static` from property declarations and add a non-null assertion
+         *    if the property is not optional.
          *    e.g.
          *    private static myProp: Type => private myProp!: Type
+         *    private static passedIntervalIdToClear?: string => private passedIntervalIdToClear?: string
          */
         const propertyPattern = new RegExp(`((?:public|protected|private)?\\s+)?` + // group 1: optional visibility
             `static\\s+` + // literal "static "
-            `(${name})` + // group 2: the property name
+            `(${name})(\\?)?` + // group 2: property name, group 3: optional "?"
             `(?=[\\s=:\\[;]|$)`, // lookahead: space, '=', ':', '[', ';', or end-of-string
         'g');
-        updated = updated.replace(propertyPattern, (match, g1, g2) => {
-            // g1 = "private " / "public " / "protected " or empty
-            // g2 = property name
-            return `${g1 ?? ''}${g2}!`;
+        updated = updated.replace(propertyPattern, (match, g1, g2, g3) => {
+            // If the property is optional (g3 is "?"), leave it. Otherwise, add a non-null assertion.
+            return `${g1 ?? ''}${g2}${g3 !== undefined ? g3 : '!'}`;
         });
         return updated;
     }

package/build/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"StaticToInstanceTestFileMigrator.js","sourceRoot":"","sources":["../../../src/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StaticToInstanceTestFileMigrator.js","sourceRoot":"","sources":["../../../src/tests/staticToInstanceMigration/StaticToInstanceTestFileMigrator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -4,7 +4,7 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "24.1.2",
+	"version": "24.1.4",
 	"skill": {
 		"namespace": "spruce-cli",
 		"upgradeIgnoreList": [
@@ -84,7 +84,7 @@
 		"@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.2",
+		"@sprucelabs/spruce-templates": "^24.1.4",
 		"@typescript-eslint/eslint-plugin": "^7.7.1",
 		"@typescript-eslint/parser": "^7.7.1",
 		"cfonts": "^3.3.0",
@@ -571,5 +571,5 @@
 			"open"
 		]
 	},
-	"gitHead": "0d5c0969ffb26aec1498c147e8676846c75f3013"
+	"gitHead": "707d106956af7e757498d86e84108a3f62915db6"
 }

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