@sprucelabs/spruce-cli 28.2.3 → 29.0.1

package/src/errors/directoryNotGoModule.builder.ts

@@ -0,0 +1,13 @@
+import { buildErrorSchema } from '@sprucelabs/schema'
+
+export default buildErrorSchema({
+    id: 'directoryNotGoModule',
+    name: 'Directory not go module',
+    fields: {
+        cwd: {
+            type: 'text',
+            label: 'Current Working Directory',
+            isRequired: true,
+        },
+    },
+})

package/src/features/AbstractAction.ts

@@ -1,4 +1,5 @@
 import { Schema, SchemaValues, SchemaPartialValues } from '@sprucelabs/schema'
+import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { Templates } from '@sprucelabs/spruce-templates'
 import { GlobalEmitter } from '../GlobalEmitter'
 import ServiceFactory, {
@@ -111,14 +112,15 @@ export default abstract class AbstractAction<S extends Schema = Schema>
         return validateAndNormalizer.validateAndNormalize(schema, options)
     }
 
+    protected getProjectLanguage() {
+        return diskUtil.detectProjectLanguage(this.cwd)
+    }
+
     protected async resolveVersion(
         userSuppliedVersion: string | null | undefined,
         resolvedDestination: string
     ) {
-        const versions = VersionResolver.Resolver(
-            this.ui,
-            this.serviceFactory.Service(this.cwd, 'pkg')
-        )
+        const versions = VersionResolver.Resolver(this.ui, this.Service('pkg'))
         const version = await versions.resolveVersion(
             resolvedDestination,
             userSuppliedVersion

package/src/features/AbstractFeature.ts

@@ -1,6 +1,7 @@
 import pathUtil from 'path'
 import globby from '@sprucelabs/globby'
 import { Schema, SchemaValues } from '@sprucelabs/schema'
+import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { Templates } from '@sprucelabs/spruce-templates'
 import { GlobalEmitter } from '../GlobalEmitter'
 import ServiceFactory, {
@@ -34,7 +35,14 @@ export default abstract class AbstractFeature<
 {
     public abstract description: string
     public readonly dependencies: FeatureDependency[] = []
-    public readonly packageDependencies: NpmPackage[] = []
+    protected _packageDependencies: PackageDependency[] = []
+    public get packageDependencies() {
+        const resolved = this._packageDependencies.filter((dep) => {
+            const goDep = dep as GoPackage
+            return !goDep.type || goDep.type === this.getProjectLanguage()
+        })
+        return resolved
+    }
     public readonly optionsSchema?: S
     public readonly fileDescriptions: FileDescription[] = []
 
@@ -114,6 +122,10 @@ export default abstract class AbstractFeature<
         return this.features.getFeature(code)
     }
 
+    public getProjectLanguage() {
+        return diskUtil.detectProjectLanguage(this.cwd)
+    }
+
     public async getAvailableActionCodes(): Promise<string[]> {
         if (!this.actionsDir) {
             return []
@@ -176,3 +188,10 @@ export interface FeatureOptions {
     apiClientFactory: ApiClientFactory
     actionExecuter: ActionExecuter
 }
+
+export type PackageDependency = NpmPackage | GoPackage
+
+export interface GoPackage {
+    type: 'go'
+    name: string
+}

package/src/features/ActionFactory.ts

@@ -43,7 +43,8 @@ export default class ActionFactory {
             )
         }
 
-        let Class: new (options: ActionOptions) => FeatureAction | undefined
+        let Class: (new (options: ActionOptions) => FeatureAction) | undefined =
+            undefined
         let originalError: Error | undefined
 
         const key = ActionFactory.overrideKey(featureCode, actionCode)
@@ -61,7 +62,6 @@ export default class ActionFactory {
             }
         }
 
-        //@ts-ignore
         if (!Class) {
             throw new SpruceError({
                 code: 'GENERIC',

package/src/features/ActionQuestionAsker.ts

@@ -54,7 +54,6 @@ export default class ActionQuestionAskerImpl<
             while (notInstalled.length > 0) {
                 const toInstall = notInstalled.shift()
                 if (!toInstall) {
-                    // for typescript
                     throw new Error('Dependent feature error')
                 }
 

package/src/features/FeatureInstaller.ts

@@ -9,7 +9,10 @@ import ServiceFactory, {
     ServiceMap,
 } from '../services/ServiceFactory'
 import { InternalUpdateHandler, NpmPackage } from '../types/cli.types'
-import AbstractFeature, { FeatureDependency } from './AbstractFeature'
+import AbstractFeature, {
+    FeatureDependency,
+    GoPackage,
+} from './AbstractFeature'
 import {
     InstallFeatureOptions,
     FeatureInstallResponse,
@@ -107,11 +110,14 @@ export class FeatureInstallerImpl implements ServiceProvider, FeatureInstaller {
 
     public getFeatureDependencies<C extends FeatureCode>(
         featureCode: C
-        // trackedFeatures: FeatureDependency[] = []
     ): FeatureDependency[] {
+        if (this.isInGoProject()) {
+            return []
+        }
+
         let deps = this.getFeatureDependenciesIncludingSelf(
             { code: featureCode, isRequired: true },
-            [] // trackedFeatures
+            []
         ).filter((f) => f.code !== featureCode)
 
         deps = this.sortFeatures(deps)
@@ -119,6 +125,10 @@ export class FeatureInstallerImpl implements ServiceProvider, FeatureInstaller {
         return deps
     }
 
+    private isInGoProject() {
+        return diskUtil.detectProjectLanguage(this.cwd) === 'go'
+    }
+
     private getFeatureDependenciesIncludingSelf(
         featureDependency: FeatureDependency,
         trackedFeatures: FeatureDependency[] = []
@@ -415,13 +425,27 @@ export class FeatureInstallerImpl implements ServiceProvider, FeatureInstaller {
 
             didUpdateHandler?.(`Checking node dependency: ${pkg.name}`)
 
-            if (
-                pkg.isDev &&
+            const goPkg = pkg as GoPackage
+            const nodePkg = pkg as NpmPackage
+            const isGoPackage = goPkg.type === 'go'
+
+            const shouldConsider =
+                (isGoPackage && this.isInGoProject()) ||
+                (!isGoPackage && !this.isInGoProject())
+
+            if (!shouldConsider) {
+                return
+            }
+
+            if (isGoPackage) {
+                this.packagesToInstall.push(packageName)
+            } else if (
+                nodePkg.isDev &&
                 this.devPackagesToInstall.indexOf(packageName) === -1
             ) {
                 this.devPackagesToInstall.push(packageName)
             } else if (
-                !pkg.isDev &&
+                !nodePkg.isDev &&
                 this.packagesToInstall.indexOf(packageName) === -1
             ) {
                 this.packagesToInstall.push(packageName)

package/src/features/FeatureInstallerFactory.ts

@@ -120,6 +120,15 @@ export default class FeatureInstallerFactory {
 
         return featureInstaller
     }
+
+    public static setFeature<C extends FeatureCode>(code: C, feature: any) {
+        const index = this.featureCodes.indexOf(code)
+        if (index === -1) {
+            throw new Error(`Feature code "${code}" is not recognized.`)
+        }
+
+        this.features[index] = feature
+    }
 }
 
 interface InstallerWithAllFeaturesOptions {

package/src/features/OverrideActionDecorator.ts

@@ -140,7 +140,7 @@ export default class OverrideActionDecorator implements FeatureAction {
             const overrides = this.optionOverrides?.[commandStr]
             if (overrides) {
                 this.ui?.renderLine(
-                    `Overrides found in package.json of ${namespace}.`
+                    `Overrides found in ${this.parent.getProjectLanguage() === 'go' ? '.spruce/settings.json' : 'package.json'} of ${namespace}.`
                 )
                 this.ui?.renderObject(overrides)
                 options = {

package/src/features/VersionResolver.ts

@@ -54,9 +54,9 @@ export default class VersionResolver {
         fallbackVersion: string
     ) {
         const versions = this.loadVersions(resolvedDestination)
-        const choices = this.buildChoices(versions)
 
         if (versions.length > 0) {
+            const choices = this.buildChoices(versions)
             return await this.ui.prompt({
                 type: 'select',
                 label: 'Version',
@@ -67,6 +67,7 @@ export default class VersionResolver {
                 },
             })
         }
+
         return fallbackVersion
     }
 

package/src/features/agent/AgentFeature.ts

@@ -11,7 +11,7 @@ export default class AgentFeature extends AbstractFeature {
     public dependencies: FeatureDependency[] = [
         { code: 'event', isRequired: true },
     ]
-    public packageDependencies = [
+    public _packageDependencies = [
         {
             name: '@sprucelabs/spruce-agent-plugin',
         },

package/src/features/conversation/ConversationFeature.ts

@@ -15,7 +15,7 @@ export default class ConversationFeature extends AbstractFeature {
     public dependencies: FeatureDependency[] = [
         { code: 'event', isRequired: true },
     ]
-    public packageDependencies: NpmPackage[] = [
+    public _packageDependencies: NpmPackage[] = [
         {
             name: '@sprucelabs/spruce-conversation-plugin@latest',
             isDev: false,

package/src/features/dependencies/DependencyFeature.ts

@@ -13,7 +13,6 @@ export default class DependencyFeature extends AbstractFeature {
             isRequired: true,
         },
     ]
-    public packageDependencies = []
 
     public async isInstalled() {
         return this.features.isInstalled('skill')

package/src/features/deploy/DeployFeature.ts

@@ -15,7 +15,7 @@ export default class DeployFeature extends AbstractFeature {
             isRequired: true,
         },
     ]
-    public packageDependencies = [
+    public _packageDependencies = [
         { name: '@sprucelabs/spruce-deploy-plugin@latest', isDev: false },
     ]
 

package/src/features/error/ErrorFeature.ts

@@ -17,7 +17,7 @@ export default class ErrorFeature extends AbstractFeature {
         { code: 'schema', isRequired: true },
         { code: 'node', isRequired: true },
     ]
-    public packageDependencies: NpmPackage[] = [
+    public _packageDependencies: NpmPackage[] = [
         {
             name: '@sprucelabs/error@latest',
         },

package/src/features/event/EventFeature.ts

@@ -20,7 +20,7 @@ export default class EventFeature extends AbstractFeature {
         { code: 'schema', isRequired: true },
         { code: 'permission', isRequired: true },
     ]
-    public packageDependencies = [
+    public _packageDependencies = [
         {
             name: '@sprucelabs/mercury-client',
         },

package/src/features/eventContract/EventContractFeature.ts

@@ -1,6 +1,6 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { FileDescription } from '../../types/cli.types'
-import AbstractFeature, { FeatureDependency } from '../AbstractFeature'
+import AbstractFeature from '../AbstractFeature'
 import { FeatureCode } from '../features.types'
 
 export default class EventContractFeature extends AbstractFeature {
@@ -8,8 +8,6 @@ export default class EventContractFeature extends AbstractFeature {
     public nameReadable = 'Event Contract'
     public description =
         'Pull core Mercury events down and write to single, portable, dependency-free, strongly typed contract.'
-    public dependencies: FeatureDependency[] = []
-    public packageDependencies = []
 
     public actionsDir = diskUtil.resolvePath(__dirname, 'actions')
     public readonly fileDescriptions: FileDescription[] = []

package/src/features/node/NodeFeature.ts

@@ -22,7 +22,7 @@ export default class NodeFeature<
     public description = ''
     public dependencies: FeatureDependency[] = []
     public optionsSchema = nodeFeatureOptionsSchema as S
-    public packageDependencies = [...universalDevDependencies]
+    public _packageDependencies = [...universalDevDependencies]
 
     public scripts = {
         ...universalScripts,

package/src/features/onboard/OnboardFeature.ts

@@ -1,9 +1,6 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import createTestOptionsSchema from '#spruce/schemas/spruceCli/v2020_07_22/createTestOptions.schema'
-import AbstractFeature, {
-    FeatureDependency,
-    FeatureOptions,
-} from '../AbstractFeature'
+import AbstractFeature, { FeatureOptions } from '../AbstractFeature'
 import featuresUtil from '../feature.utilities'
 import { FeatureCode } from '../features.types'
 import ScriptLoader from './ScriptLoader'
@@ -13,9 +10,6 @@ export default class OnboardFeature extends AbstractFeature {
     public code: FeatureCode = 'onboard'
     public nameReadable = 'Onboard'
     public description = 'Get building your first skill already!'
-    public dependencies: FeatureDependency[] = []
-    public packageDependencies = []
-
     public actionsDir = diskUtil.resolvePath(__dirname, 'actions')
 
     private onboardingStore?: OnboardingStore

package/src/features/organization/OrganizationFeature.ts

@@ -16,7 +16,6 @@ export default class OrganizationFeature extends AbstractFeature {
             isRequired: true,
         },
     ]
-    public packageDependencies = []
 
     public actionsDir = diskUtil.resolvePath(__dirname, 'actions')
 }

package/src/features/permission/PermissionFeature.ts

@@ -1,7 +1,6 @@
 import { PermissionContractMap } from '@sprucelabs/mercury-types'
 import { diskUtil, NpmPackage } from '@sprucelabs/spruce-skill-utils'
 import AbstractFeature, {
-    FeatureDependency,
     FeatureOptions,
     InstallResults,
 } from '../AbstractFeature'
@@ -12,9 +11,8 @@ export default class PermissionFeature extends AbstractFeature {
     public code: FeatureCode = 'permission'
     public nameReadable = 'permission'
     public description = 'Manage permissions for your skill'
-    public dependencies: FeatureDependency[] = []
     public actionsDir = diskUtil.resolvePath(__dirname, 'actions')
-    public packageDependencies: NpmPackage[] = [
+    public _packageDependencies: NpmPackage[] = [
         {
             name: '@sprucelabs/spruce-permission-plugin@latest',
         },

package/src/features/person/PersonFeature.ts

@@ -1,14 +1,11 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
-import AbstractFeature, { FeatureDependency } from '../AbstractFeature'
+import AbstractFeature from '../AbstractFeature'
 import { FeatureCode } from '../features.types'
 
 export default class PersonFeature extends AbstractFeature {
     public code: FeatureCode = 'person'
     public nameReadable = 'Person'
     public description = 'Log in, log out, etc.'
-    public dependencies: FeatureDependency[] = []
-    public packageDependencies = []
-
     public actionsDir = diskUtil.resolvePath(__dirname, 'actions')
 
     public isInstalled = async () => {

package/src/features/polish/PolishFeature.ts

@@ -13,7 +13,7 @@ export default class PolishFeature extends AbstractFeature {
             isRequired: false,
         },
     ]
-    public packageDependencies: NpmPackage[] = [
+    public _packageDependencies: NpmPackage[] = [
         {
             name: '@sprucelabs/heartwood-polish',
             isDev: true,

package/src/features/sandbox/SandboxFeature.ts

@@ -14,7 +14,6 @@ export default class SandboxFeature extends AbstractFeature {
             isRequired: true,
         },
     ]
-    public packageDependencies = []
     public actionsDir = diskUtil.resolvePath(__dirname, 'actions')
 
     public constructor(options: ActionOptions) {

package/src/features/schema/SchemaFeature.ts

@@ -1,9 +1,9 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
-import { NpmPackage } from '../../types/cli.types'
 import AbstractFeature, {
     FeatureDependency,
     FeatureOptions,
     InstallResults,
+    PackageDependency,
 } from '../AbstractFeature'
 import { FeatureCode } from '../features.types'
 
@@ -14,7 +14,7 @@ export default class SchemaFeature extends AbstractFeature {
         { code: 'skill', isRequired: false },
         { code: 'node', isRequired: true },
     ]
-    public packageDependencies: NpmPackage[] = [
+    public _packageDependencies: PackageDependency[] = [
         {
             name: '@sprucelabs/schema@latest',
         },
@@ -25,6 +25,10 @@ export default class SchemaFeature extends AbstractFeature {
         {
             name: '@sprucelabs/spruce-skill-utils',
         },
+        {
+            type: 'go',
+            name: 'github.com/sprucelabsai-community/spruce-schema/v32/pkg/fields',
+        },
     ]
 
     public code: FeatureCode = 'schema'
@@ -94,6 +98,8 @@ export default class SchemaFeature extends AbstractFeature {
             return {}
         }
 
+        this.Service('settings').markAsInstalled(this.code)
+
         const files = await this.writePlugin()
 
         return {

package/src/features/schema/actions/SyncAction.ts

@@ -14,9 +14,6 @@ import { FeatureActionResponse } from '../../features.types'
 import schemaDiskUtil from '../utilities/schemaDisk.utility'
 import ValueTypeBuilder from '../ValueTypeBuilder'
 
-type OptionsSchema =
-    SpruceSchemas.SpruceCli.v2020_07_22.SyncSchemasOptionsSchema
-type Options = SpruceSchemas.SpruceCli.v2020_07_22.SyncSchemasOptions
 export default class SyncAction extends AbstractAction<OptionsSchema> {
     public optionsSchema = syncSchemasActionSchema
     public commandAliases = ['sync.schemas']
@@ -24,12 +21,10 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
     private readonly schemaWriter = this.Writer('schema')
     private readonly schemaStore = this.Store('schema')
+    private readonly skillStore = this.Store('skill')
 
     public async execute(options: Options): Promise<FeatureActionResponse> {
         const normalizedOptions = this.validateAndNormalizeOptions(options)
-        const isInCoreSchemasModule =
-            this.Service('pkg').get('name') ===
-            '@sprucelabs/spruce-core-schemas'
 
         let {
             schemaTypesDestinationDirOrFile,
@@ -39,7 +34,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
             shouldEnableVersioning,
             globalSchemaNamespace,
             shouldFetchRemoteSchemas,
-            shouldGenerateCoreSchemaTypes = isInCoreSchemasModule,
+            shouldGenerateCoreSchemaTypes,
             shouldFetchLocalSchemas,
             generateFieldTypes,
             generateStandaloneTypesFile,
@@ -54,8 +49,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
         this.ui.startLoading('Loading details about your skill... 🧐')
 
-        let localNamespace =
-            await this.Store('skill').loadCurrentSkillsNamespace()
+        let localNamespace = await this.skillStore.loadCurrentSkillsNamespace()
         let shouldImportCoreSchemas = true
 
         if (shouldGenerateCoreSchemaTypes) {
@@ -79,6 +73,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
             generateStandaloneTypesFile,
             schemaTypesDestinationDirOrFile,
             fieldTypesDestinationDir,
+            language: this.getProjectLanguage(),
         })
 
         this.ui.startLoading('Generating field types...')
@@ -125,7 +120,6 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
             if (deleteOrphanedSchemas) {
                 this.ui.startLoading('Identifying orphaned schemas...')
-
                 await schemaDiskUtil.deleteOrphanedSchemas(
                     resolvedSchemaTypesDestinationDirOrFile,
                     schemaTemplateItems
@@ -140,20 +134,30 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
             let valueTypes: ValueTypes | undefined
 
             try {
-                valueTypes = await this.generateValueTypes({
-                    resolvedDestination: resolvedFieldTypesDestination,
-                    fieldTemplateItems,
-                    schemaTemplateItems,
-                    globalSchemaNamespace: globalSchemaNamespace ?? undefined,
-                })
+                valueTypes = this.isInGoProject()
+                    ? undefined
+                    : await this.generateValueTypes({
+                          resolvedDestination: resolvedFieldTypesDestination,
+                          fieldTemplateItems,
+                          schemaTemplateItems,
+                          globalSchemaNamespace:
+                              globalSchemaNamespace ?? undefined,
+                      })
             } catch (err: any) {
                 schemaErrors.push(err)
             }
 
-            if (valueTypes) {
+            if (valueTypes || this.isInGoProject()) {
                 try {
                     this.ui.startLoading('Determining what changed... ⚡️')
 
+                    let goModuleNameAndPath: string | undefined = undefined
+                    if (this.isInGoProject()) {
+                        goModuleNameAndPath = this.skillStore.getGoModuleName({
+                            shouldIncludePathFromCwd: true,
+                        })
+                    }
+
                     typeResults = await this.schemaWriter.writeSchemasAndTypes(
                         resolvedSchemaTypesDestination,
                         {
@@ -162,11 +166,13 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
                             schemaTemplateItems,
                             shouldImportCoreSchemas,
                             valueTypes,
+                            goModuleNameAndPath,
+                            language: this.getProjectLanguage(),
                             globalSchemaNamespace:
                                 globalSchemaNamespace ?? undefined,
-                            typesTemplate: generateStandaloneTypesFile
-                                ? 'schema/core.schemas.types.ts.hbs'
-                                : undefined,
+                            typesTemplate: this.resolveTypesTemplate(
+                                generateStandaloneTypesFile
+                            ),
                         }
                     )
                 } catch (err: any) {
@@ -176,7 +182,10 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
         }
 
         const p = resolvedSchemaTypesDestination
-        diskUtil.deleteEmptyDirs(diskUtil.isDir(p) ? p : pathUtil.dirname(p))
+        const dir = diskUtil.isDir(p) ? p : pathUtil.dirname(p)
+        if (diskUtil.doesDirExist(dir)) {
+            diskUtil.deleteEmptyDirs(dir)
+        }
 
         this.ui.stopLoading()
 
@@ -192,6 +201,18 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
         })
     }
 
+    private resolveTypesTemplate(
+        generateStandaloneTypesFile: boolean
+    ): string | undefined {
+        if (this.isInGoProject()) {
+            return 'schema/schemas.go.hbs'
+        }
+
+        return generateStandaloneTypesFile
+            ? 'schema/core.schemas.types.ts.hbs'
+            : undefined
+    }
+
     private async optionallyInstallRemoteModules(
         schemaTemplateItems: SchemaTemplateItem[],
         forceInstall?: boolean
@@ -202,6 +223,10 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
                 .filter((i) => !!i)
         ) as string[]
 
+        if (this.isInGoProject()) {
+            return
+        }
+
         const notInstalled: string[] = []
 
         const pkg = this.Service('pkg')
@@ -287,11 +312,12 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
                 },
             })
 
-        const hashSpruceDestination =
-            resolvedSchemaTypesDestinationDirOrFile.replace(
-                diskUtil.resolveHashSprucePath(this.cwd),
-                '#spruce'
-            )
+        const hashSpruceDestination = this.isInGoProject()
+            ? this.cwd
+            : resolvedSchemaTypesDestinationDirOrFile.replace(
+                  diskUtil.resolveHashSprucePath(this.cwd),
+                  '#spruce'
+              )
 
         let total = 0
         let totalNamespaces = 0
@@ -317,11 +343,23 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
         return { schemaTemplateItems, schemaErrors }
     }
 
+    private isInGoProject() {
+        return this.getProjectLanguage() === 'go'
+    }
+
     private async generateFieldTemplateItems(options: {
         addonsLookupDir: string
         shouldGenerateFieldTypes: boolean
         resolvedFieldTypesDestination: string
     }) {
+        if (this.isInGoProject()) {
+            return {
+                generateFieldFiles: [],
+                fieldTemplateItems: [],
+                fieldErrors: [],
+            }
+        }
+
         const {
             addonsLookupDir,
             shouldGenerateFieldTypes: generateFieldTypes,
@@ -358,3 +396,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
         return builder.generateValueTypes(options)
     }
 }
+
+type OptionsSchema =
+    SpruceSchemas.SpruceCli.v2020_07_22.SyncSchemasOptionsSchema
+type Options = SpruceSchemas.SpruceCli.v2020_07_22.SyncSchemasOptions