@sprucelabs/spruce-cli 21.1.0 → 22.0.0

package/src/features/VersionResolver.ts

@@ -0,0 +1,121 @@
+import { assertOptions } from '@sprucelabs/schema'
+import {
+    GraphicsInterface,
+    PkgService,
+    versionUtil,
+} from '@sprucelabs/spruce-skill-utils'
+
+export default class VersionResolver {
+    private constructor(
+        private ui: GraphicsInterface,
+        private pkg: PkgService
+    ) {}
+
+    public static Resolver(ui: GraphicsInterface, pkg: PkgService) {
+        assertOptions({ ui, pkg }, ['ui', 'pkg'])
+        return new this(ui, pkg)
+    }
+
+    public async resolveVersion(
+        resolvedDestination: string,
+        userSuppliedVersion?: string | null
+    ) {
+        if (userSuppliedVersion) {
+            versionUtil.assertValidVersion(userSuppliedVersion)
+        }
+        let resolvedVersion = versionUtil.generateVersion(
+            userSuppliedVersion ?? undefined
+        ).constValue
+
+        if (!userSuppliedVersion) {
+            resolvedVersion =
+                await this.askForVersionIfTodaysVersionDoesNotExist(
+                    resolvedDestination,
+                    resolvedVersion
+                )
+        }
+
+        const version = versionUtil.generateVersion(resolvedVersion).dirValue
+
+        this.persistVersion(version)
+
+        return version
+    }
+
+    private persistVersion(version: string) {
+        this.pkg.set({
+            path: 'skill.version',
+            value: version,
+        })
+    }
+
+    private async askForVersionIfTodaysVersionDoesNotExist(
+        resolvedDestination: string,
+        fallbackVersion: string
+    ) {
+        const versions = this.loadVersions(resolvedDestination)
+        const choices = this.buildChoices(versions)
+
+        if (versions.length > 0) {
+            return await this.ui.prompt({
+                type: 'select',
+                label: 'Version',
+                hint: 'Confirm which version you want to use?',
+                isRequired: true,
+                options: {
+                    choices,
+                },
+            })
+        }
+        return fallbackVersion
+    }
+
+    private buildChoices(
+        versions: { intValue: number; constValue: string; dirValue: string }[]
+    ) {
+        const todaysVersion = versionUtil.generateVersion()
+        const alreadyHasToday = !!versions.find(
+            (version) => version.dirValue === todaysVersion.dirValue
+        )
+        const choices = []
+
+        if (!alreadyHasToday) {
+            choices.push({
+                label: 'New Version',
+                value: todaysVersion.dirValue,
+            })
+        }
+
+        choices.push(
+            ...versions
+                .sort((a, b) => {
+                    return a.intValue > b.intValue ? -1 : 1
+                })
+                .map((version) => ({
+                    value: version.dirValue,
+                    label: version.dirValue,
+                }))
+        )
+        return choices
+    }
+
+    private loadVersions(resolvedDestination: string) {
+        const versions = versionUtil.getAllVersions(resolvedDestination)
+        const persistedVersion = this.pkg.get('skill.version')
+        const todaysVersion = versionUtil.generateVersion().dirValue
+
+        if (
+            persistedVersion &&
+            todaysVersion !== persistedVersion &&
+            !versions.find((v) => v.dirValue === persistedVersion)
+        ) {
+            versions.push({
+                intValue:
+                    versionUtil.generateVersion(persistedVersion).intValue,
+                dirValue: persistedVersion,
+                constValue: persistedVersion,
+            })
+        }
+        return versions
+    }
+}

package/src/features/view/actions/CreateAction.ts

@@ -20,11 +20,12 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
 
         const writer = this.Writer('view')
 
-        if (
+        const shouldAskAboutRootSvc =
             viewType === 'skillView' &&
             !isRoot &&
-            !writer.doesRootControllerExist(this.cwd)
-        ) {
+            !(await writer.doesRootControllerExist(this.cwd))
+
+        if (shouldAskAboutRootSvc) {
             isRoot = await this.ui.confirm(
                 'Do you want to create a root view controller?'
             )

package/src/features/view/writers/ViewWriter.ts

@@ -1,3 +1,4 @@
+import globby from '@sprucelabs/globby'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import {
     VcTemplateItem,
@@ -119,9 +120,9 @@ export default class ViewWriter extends AbstractWriter {
         return results
     }
 
-    public doesRootControllerExist(cwd: string) {
-        const { path } = this.buildViewControllerPath(cwd, 'skillView', 'Root')
-        return diskUtil.doesFileExist(path)
+    public async doesRootControllerExist(cwd: string) {
+        const matches = await globby('**/Root.svc.ts', { cwd })
+        return matches.length > 0
     }
 
     public async writeViewControllerPlugin(options: {

package/src/tests/buildTestCache.ts

@@ -48,7 +48,7 @@ async function run() {
     term.clear()
 
     if (process.env.WILL_BUILD_CACHE_SCRIPT) {
-        term.renderLine('Running pre build cache script')
+        term.renderLine('Running will-build cache script')
         if (process.env.CLEAN_CACHE_SCRIPT) {
             try {
                 execSync(process.env.CLEAN_CACHE_SCRIPT)
@@ -236,7 +236,7 @@ function dropInS(remaining: number) {
 void run()
     .then(() => {
         if (process.env.DID_BUILD_CACHE_SCRIPT) {
-            term.renderLine('Running pre build cache script')
+            term.renderLine('Running did-build cache script')
             execSync(process.env.DID_BUILD_CACHE_SCRIPT)
         }
         if (progressInterval) {

package/build/__tests__/behavioral/CreatingAConversationTopic.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CreatingAConversationTopic.test.js","sourceRoot":"","sources":["../../../src/__tests__/behavioral/CreatingAConversationTopic.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,kDAA+C;AAC/C,uDAAqD;AACrD,kFAAyD;AACzD,sFAAyD;AAGzD,MAAqB,8BAA+B,SAAQ,yBAAe;IAEhD,AAAb,MAAM,CAAC,KAAK,CAAC,2BAA2B;QAC9C,mBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAA;IACpE,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,uCAAuC;QAC1D,MAAM,GAAG,GACL,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAA;QAErE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YAChE,YAAY,EAAE,qBAAqB;YACnC,SAAS,EAAE,mBAAmB;SACjC,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,sBAAQ,CAAC,gCAAgC,CACnD,4BAA4B,EAC5B,OAAO,CAAC,KAAK,CAChB,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QAElE,mBAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACzB,mBAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAA;QACrD,mBAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACnC,mBAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAE/B,MAAM,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,CAAA;IACpD,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,GAAiB;QACnE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAA;QACtC,YAAY;QACZ,mBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QACpC,YAAY;QACZ,mBAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC1C,YAAY;QACZ,mBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAC9C,YAAY;QACZ,mBAAM,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IACvE,CAAC;CACJ;AA1CD,iDA0CC;AAxC0B;IADtB,IAAA,iBAAI,GAAE;uEAGN;AAGsB;IADtB,IAAA,iBAAI,GAAE;mFAuBN"}

package/build/__tests__/behavioral/GettingCliVersion.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GettingCliVersion.test.js","sourceRoot":"","sources":["../../../src/__tests__/behavioral/GettingCliVersion.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uDAAqD;AACrD,kFAAyD;AAEzD,MAAqB,qBAAsB,SAAQ,yBAAe;IACpD,MAAM,CAAC,KAAK,CAAC,UAAU;QAC7B,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAC5D,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,sBAAsB;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CACjD,0BAA0B,CAC7B,CAAA;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAA;QAEvD,mBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,4BAA4B;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CACjD,iCAAiC,CACpC,CAAA;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAA;QAEvD,mBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;CACJ;AAzBD,wCAyBC;AAlB0B;IADtB,IAAA,iBAAI,GAAE;yDAQN;AAGsB;IADtB,IAAA,iBAAI,GAAE;+DAQN"}

package/build/__tests__/behavioral/RegisteringConversationsOnBoot.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RegisteringConversationsOnBoot.test.js","sourceRoot":"","sources":["../../../src/__tests__/behavioral/RegisteringConversationsOnBoot.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uDAAqD;AACrD,sFAA6D;AAE7D,MAAqB,kCAAmC,SAAQ,2BAAiB;IAEtD,AAAb,MAAM,CAAC,KAAK,CAAC,8BAA8B;QACjD,MAAM,EAAE,YAAY,EAAE,GAClB,MAAM,IAAI,CAAC,iDAAiD,CACxD,cAAc,CACjB,CAAA;QAEL,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YAChD,YAAY,EAAE,qBAAqB;YACnC,SAAS,EAAE,mBAAmB;SACjC,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAExE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACnC,OAAO,EAAE,YAAY,CAAC,EAAE;YACxB,MAAM,EAAE,YAAY,CAAC,MAAM;SAC9B,CAAC,CAAA;QAEF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YAClD,gBAAgB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM;SACvC,CAAC,CAAC,qBAAqB,EAAE,CAAA;QAE1B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAA;QAElC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAA;QAEjB,mBAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAC1B,mBAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAA;IACtD,CAAC;CACJ;AA/BD,qDA+BC;AA7B0B;IADtB,IAAA,iBAAI,GAAE;8EA6BN"}

package/build/__tests__/behavioral/TestingAConversation.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TestingAConversation.test.js","sourceRoot":"","sources":["../../../src/__tests__/behavioral/TestingAConversation.test.ts"],"names":[],"mappings":"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"}