@sprucelabs/spruce-cli 22.3.0 → 23.1.0

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

@@ -19,7 +19,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
     public async execute(): Promise<FeatureActionResponse> {
         const targetDir = diskUtil.resolvePath(this.cwd, 'src')
         const matches = await globby(
-            ['**/*.svc.ts', '**/*.vc.ts', '**/*.view.plugin.ts', '**/*.avc.ts'],
+            ['**/*.svc.ts', '**/*.vc.ts', '**/*.view.plugin.ts', '**/*.ac.ts'],
             {
                 cwd: targetDir,
             }
@@ -39,8 +39,12 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
         introspect.forEach(({ classes }) => {
             for (const thisClass of classes) {
-                const { vc, svc, plugin, avc } =
-                    this.mapIntrospectedClassToTemplateItem(thisClass)
+                const {
+                    vc,
+                    svc,
+                    plugin,
+                    ac: avc,
+                } = this.mapIntrospectedClassToTemplateItem(thisClass)
 
                 if (vc) {
                     vcTemplateItems.push(vc)
@@ -77,7 +81,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
         vc?: VcTemplateItem
         svc?: VcTemplateItem
         plugin?: ViewControllerPluginItem
-        avc?: VcTemplateItem
+        ac?: VcTemplateItem
     } {
         const item = {
             id: c.staticProperties.id,
@@ -87,13 +91,13 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
         let vc: VcTemplateItem | undefined
         let svc: VcTemplateItem | undefined
-        let avc: VcTemplateItem | undefined
+        let ac: VcTemplateItem | undefined
         let plugin: ViewControllerPluginItem | undefined
 
         if (c.classPath.endsWith('.svc.ts')) {
             svc = item
-        } else if (c.classPath.endsWith('avc.ts')) {
-            avc = item
+        } else if (c.classPath.endsWith('ac.ts')) {
+            ac = item
         } else if (c.classPath.endsWith('view.plugin.ts')) {
             const nameCamel = c.classPath.match(/([^/]+).view.plugin.ts$/)![1]
             plugin = { ...item, nameCamel }
@@ -101,7 +105,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
             vc = item
         }
 
-        return { svc, vc, plugin, avc }
+        return { svc, vc, plugin, ac }
     }
 }
 

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

@@ -26,8 +26,13 @@ export default class ViewWriter extends AbstractWriter {
     }
 
     public async writeCombinedViewsFile(cwd: string, options: ViewsOptions) {
-        let { vcTemplateItems, svcTemplateItems, viewPluginItems, ...rest } =
-            options
+        let {
+            vcTemplateItems,
+            svcTemplateItems,
+            viewPluginItems,
+            appTemplateItem,
+            ...rest
+        } = options
 
         const destinationDir = diskUtil.resolveHashSprucePath(cwd, 'views')
         const destination = diskUtil.resolvePath(destinationDir, 'views.ts')
@@ -47,10 +52,18 @@ export default class ViewWriter extends AbstractWriter {
             destinationDir
         )
 
+        if (appTemplateItem) {
+            appTemplateItem = this.makePathRelative(
+                appTemplateItem,
+                destinationDir
+            )
+        }
+
         const contents = this.templates.views({
             vcTemplateItems,
             svcTemplateItems,
             viewPluginItems,
+            appTemplateItem,
             ...rest,
         })
 
@@ -66,12 +79,20 @@ export default class ViewWriter extends AbstractWriter {
     private removeFileExtensionsFromTemplateItems<
         T extends VcTemplateItem | ViewControllerPluginItem,
     >(vcTemplateItems: T[], destinationDir: string): T[] {
-        return vcTemplateItems.map((i) => ({
+        return vcTemplateItems.map((i) =>
+            this.makePathRelative<T>(i, destinationDir)
+        )
+    }
+
+    private makePathRelative<
+        T extends VcTemplateItem | ViewControllerPluginItem,
+    >(i: T, destinationDir: string): T & { path: string } {
+        return {
             ...i,
             path: diskUtil
                 .resolveRelativePath(destinationDir, i.path)
                 .replace('.ts', ''),
-        }))
+        }
     }
 
     public writeViewController(
@@ -215,17 +236,21 @@ export default class ViewWriter extends AbstractWriter {
         return { path, filename }
     }
 
-    public async writeAppViewController(cwd: string) {
-        const match = await globby(cwd + '/**/App.avc.ts')
+    public async writeAppController(
+        cwd: string,
+        id: string,
+        namespacePascal: string
+    ) {
+        const match = await globby(cwd + '/**/App.ac.ts')
 
         if (match.length > 0) {
             throw new SpruceError({
-                code: 'APP_VIEW_CONTROLLER_ALREADY_EXISTS',
+                code: 'APP_CONTROLLER_ALREADY_EXISTS',
             })
         }
 
-        const destination = diskUtil.resolvePath(cwd, 'src', 'App.avc.ts')
-        const contents = this.templates.appViewController()
+        const destination = diskUtil.resolvePath(cwd, 'src', 'App.ac.ts')
+        const contents = this.templates.appController({ id, namespacePascal })
 
         return this.writeFileIfChangedMixinResults(
             destination,

package/src/features/watch/WatchFeature.ts

@@ -44,8 +44,7 @@ export default class WatchFeature extends AbstractFeature {
 
         this.watcher.on('all', async (action: ChokidarAction, path: string) => {
             this.changesSinceLastChange.push({
-                schemaId: this.mapChokidarActionToSchemaId(action),
-                version: 'v2020_07_22',
+                id: this.mapChokidarActionToSchemaId(action),
                 values: {
                     action: this.mapChokidarActionToGeneratedAction(action),
                     path,
@@ -65,7 +64,7 @@ export default class WatchFeature extends AbstractFeature {
 
     private mapChokidarActionToSchemaId(
         action: ChokidarAction
-    ): GeneratedFileOrDir['schemaId'] {
+    ): GeneratedFileOrDir['id'] {
         return action.search(/dir/gi) > -1 ? 'generatedDir' : 'generatedFile'
     }
 

package/build/.spruce/errors/spruceCli/appViewControllerAlreadyExists.schema.d.ts

@@ -1,3 +0,0 @@
-import { SpruceErrors } from '../errors.types';
-declare const appViewControllerAlreadyExistsSchema: SpruceErrors.SpruceCli.AppViewControllerAlreadyExistsSchema;
-export default appViewControllerAlreadyExistsSchema;

package/build/.spruce/errors/spruceCli/appViewControllerAlreadyExists.schema.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const schema_1 = require("@sprucelabs/schema");
-const appViewControllerAlreadyExistsSchema = {
-    id: 'appViewControllerAlreadyExists',
-    namespace: 'SpruceCli',
-    name: 'App view controller already exists',
-    fields: {}
-};
-schema_1.SchemaRegistry.getInstance().trackSchema(appViewControllerAlreadyExistsSchema);
-exports.default = appViewControllerAlreadyExistsSchema;
-//# sourceMappingURL=appViewControllerAlreadyExists.schema.js.map

package/build/.spruce/errors/spruceCli/appViewControllerAlreadyExists.schema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"appViewControllerAlreadyExists.schema.js","sourceRoot":"","sources":["../../../../src/.spruce/errors/spruceCli/appViewControllerAlreadyExists.schema.ts"],"names":[],"mappings":";;AAAA,+CAAmD;AAKnD,MAAM,oCAAoC,GAAiE;IAC1G,EAAE,EAAE,gCAAgC;IACpC,SAAS,EAAE,WAAW;IACtB,IAAI,EAAE,oCAAoC;IACtC,MAAM,EAAE,EACP;CACL,CAAA;AAED,uBAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,oCAAoC,CAAC,CAAA;AAE9E,kBAAe,oCAAoC,CAAA"}

package/build/__tests__/behavioral/views/CreatingAnAppViewController.test.js.map

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

package/build/errors/appViewControllerAlreadyExists.builder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"appViewControllerAlreadyExists.builder.js","sourceRoot":"","sources":["../../src/errors/appViewControllerAlreadyExists.builder.ts"],"names":[],"mappings":";;AAAA,+CAAqD;AAErD,kBAAe,IAAA,yBAAgB,EAAC;IAC5B,EAAE,EAAE,gCAAgC;IACpC,IAAI,EAAE,oCAAoC;IAC1C,MAAM,EAAE,EAAE;CACb,CAAC,CAAA"}

package/build/features/skill/actions/InstallFeature.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=InstallFeature.js.map

package/build/features/skill/actions/InstallFeature.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"InstallFeature.js","sourceRoot":"","sources":["../../../../src/features/skill/actions/InstallFeature.ts"],"names":[],"mappings":""}

package/src/.spruce/errors/spruceCli/appViewControllerAlreadyExists.schema.ts

@@ -1,16 +0,0 @@
-import { SchemaRegistry } from '@sprucelabs/schema'
-import { SpruceErrors } from '../errors.types'
-
-
-
-const appViewControllerAlreadyExistsSchema: SpruceErrors.SpruceCli.AppViewControllerAlreadyExistsSchema  = {
-	id: 'appViewControllerAlreadyExists',
-	namespace: 'SpruceCli',
-	name: 'App view controller already exists',
-	    fields: {
-	    }
-}
-
-SchemaRegistry.getInstance().trackSchema(appViewControllerAlreadyExistsSchema)
-
-export default appViewControllerAlreadyExistsSchema