@sprucelabs/spruce-cli 28.2.1 → 28.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/build/__tests__/behavioral/events/KeepingEventsInSync2.test.js +9 -9
  3. package/build/__tests__/behavioral/events/KeepingEventsInSync2.test.js.map +1 -1
  4. package/build/__tests__/behavioral/views/KeepingViewsInSync.test.d.ts +5 -0
  5. package/build/__tests__/behavioral/views/KeepingViewsInSync.test.js +60 -7
  6. package/build/__tests__/behavioral/views/KeepingViewsInSync.test.js.map +1 -1
  7. package/build/features/view/actions/CreateAction.d.ts +1 -0
  8. package/build/features/view/writers/ViewWriter.d.ts +1 -1
  9. package/build/features/view/writers/ViewWriter.js +4 -0
  10. package/build/features/view/writers/ViewWriter.js.map +1 -1
  11. package/package.json +3 -3
  12. package/src/__tests__/behavioral/events/KeepingEventsInSync2.test.ts +23 -10
  13. package/src/__tests__/behavioral/views/KeepingViewsInSync.test.ts +89 -7
  14. package/src/features/view/actions/CreateAction.ts +2 -0
  15. package/src/features/view/writers/ViewWriter.ts +15 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,14 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [28.2.2](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v28.2.1...v28.2.2) (2025-10-15)
7
+
8
+ **Note:** Version bump only for package @sprucelabs/spruce-cli
9
+
10
+
11
+
12
+
13
+
6
14
  ## [28.2.1](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v28.2.0...v28.2.1) (2025-10-13)
7
15
 
8
16
  **Note:** Version bump only for package @sprucelabs/spruce-cli
package/build/__tests__/behavioral/events/KeepingEventsInSync2.test.js CHANGED
@@ -121,17 +121,17 @@ class KeepingEventsInSyncTest extends AbstractEventTest_1.default {
121
121
  test_utils_1.assert.doesInclude(match, `${spruce_skill_utils_1.namesUtil.toCamel(skill2.slug)}${path_1.default.sep}myNewEvent.${this.todaysVersion.dirValue}.contract.ts`);
122
122
  const contract = (await this.Service('import').importDefault(match));
123
123
  const sig = spruce_event_utils_1.eventContractUtil.getSignatureByName(contract, fqen);
124
- test_utils_1.assert.isTruthy(sig.emitPayloadSchema);
125
- test_utils_1.assert.isTruthy(
124
+ test_utils_1.assert.isTruthy(sig.emitPayloadSchema, 'Did not save emitPayloadSchema');
125
+ test_utils_1.assert.isEqual(
126
126
  //@ts-ignore
127
- sig.emitPayloadSchema.fields?.payload?.options?.schema?.id, 'myNewEventEmitPayloadId');
128
- test_utils_1.assert.isTruthy(sig.responsePayloadSchema?.id, 'myNewEventResponsePayloadId');
129
- test_utils_1.assert.isTruthy(sig.emitPermissionContract);
130
- test_utils_1.assert.isEqual(sig.emitPermissionContract.id, `${skill2.slug}.myNewEventEmitPermissionContract`);
131
- test_utils_1.assert.isEqual(sig.emitPermissionContract.permissions[0].id, 'can-emit');
127
+ sig.emitPayloadSchema.fields?.payload?.options?.schema?.id, 'myNewEventEmitPayloadId', 'emitPayloadSchema id is wrong');
128
+ test_utils_1.assert.isEqual(sig.responsePayloadSchema?.id, 'myNewEventResponsePayloadId', 'responsePayloadSchema id is wrong');
129
+ test_utils_1.assert.isTruthy(sig.emitPermissionContract, 'emitPermissionContract missing');
130
+ test_utils_1.assert.isEqual(sig.emitPermissionContract.id, `${skill2.slug}.myNewEventEmitPermissionContract`, 'emitPermissionContract id is wrong');
131
+ test_utils_1.assert.isEqual(sig.emitPermissionContract.permissions[0].id, 'can-emit', 'emitPermissionContract permission id is wrong');
132
132
  test_utils_1.assert.isTruthy(sig.listenPermissionContract);
133
- test_utils_1.assert.isEqual(sig.listenPermissionContract.id, `${skill2.slug}.myNewEventListenPermissionContract`);
134
- test_utils_1.assert.isEqual(sig.listenPermissionContract.permissions[0].id, 'can-listen');
133
+ test_utils_1.assert.isEqual(sig.listenPermissionContract.id, `${skill2.slug}.myNewEventListenPermissionContract`, 'listenPermissionContract id is wrong');
134
+ test_utils_1.assert.isEqual(sig.listenPermissionContract.permissions[0].id, 'can-listen', 'listenPermissionContract permission id is wrong');
135
135
  test_utils_1.assert.isEqual(sig.description, description, 'description missing');
136
136
  test_utils_1.assert.isEqual(sig.aiInstructions, aiInstructions, 'aiInstructions missing');
137
137
  }
package/build/__tests__/behavioral/events/KeepingEventsInSync2.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"KeepingEventsInSync2.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/events/KeepingEventsInSync2.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"KeepingEventsInSync2.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/events/KeepingEventsInSync2.test.ts"],"names":[],"mappings":"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"}
package/build/__tests__/behavioral/views/KeepingViewsInSync.test.d.ts CHANGED
@@ -8,5 +8,10 @@ export default class KeepingViewsInSyncTest extends AbstractSkillTest {
8
8
  protected static createsValidCombinedEventsFileWhenCreatingANewSvc(): Promise<void>;
9
9
  protected static generatesValidTypesFileWithNoSkillViews(): Promise<void>;
10
10
  protected static exportUndefinedApp(): Promise<void>;
11
+ protected static alwaysRendersCombinedViewsFileAlphabetically(): Promise<void>;
12
+ protected static sortsSkillViewsAlphabetically(): Promise<void>;
13
+ private static readCombinedViewsFile;
14
+ private static createCardViewController;
15
+ private static create;
11
16
  private static assertValuedViewsFile;
12
17
  }
package/build/__tests__/behavioral/views/KeepingViewsInSync.test.js CHANGED
@@ -36,13 +36,7 @@ class KeepingViewsInSyncTest extends AbstractSkillTest_1.default {
36
36
  await this.assertValuedViewsFile(results);
37
37
  }
38
38
  static async generatesValidTypesFileWithNoSkillViews() {
39
- const results = await this.Action('view', 'create').execute({
40
- viewType: 'view',
41
- nameReadable: 'test',
42
- viewModel: 'Card',
43
- });
44
- test_utils_1.assert.isFalsy(results.errors);
45
- await this.assertValuedViewsFile(results);
39
+ await this.createCardViewController('test');
46
40
  }
47
41
  static async exportUndefinedApp() {
48
42
  const testScript = `import { App } from '#` +
@@ -54,6 +48,59 @@ class KeepingViewsInSyncTest extends AbstractSkillTest_1.default {
54
48
  spruce_skill_utils_1.diskUtil.writeFile(testScriptPath, testScript);
55
49
  await this.Service('typeChecker').check(testScriptPath);
56
50
  }
51
+ static async alwaysRendersCombinedViewsFileAlphabetically() {
52
+ await this.createCardViewController('apple bottom');
53
+ await this.createCardViewController('banana bottom');
54
+ await this.createCardViewController('zebra tooshie');
55
+ const contents = this.readCombinedViewsFile();
56
+ const vcsExpeced = `{
57
+ AppleBottomViewController,
58
+ BananaBottomViewController,
59
+ RootSkillViewController,
60
+ TestViewController,
61
+ ZebraTooshieViewController,
62
+ }`;
63
+ test_utils_1.assert.doesInclude(contents, vcsExpeced, 'views.ts vcs = {} out of order');
64
+ const viewControllerMapExpected = `'testing-views.apple-bottom': AppleBottomViewController
65
+ 'testing-views.banana-bottom': BananaBottomViewController
66
+ 'testing-views.root': RootSkillViewController
67
+ 'testing-views.test': TestViewController
68
+ 'testing-views.zebra-tooshie': ZebraTooshieViewController`;
69
+ test_utils_1.assert.doesInclude(contents, viewControllerMapExpected, 'views.ts viewControllerMap out of order');
70
+ const viewControllerOptionsMapExpected = `'testing-views.apple-bottom': ConstructorParameters<typeof AppleBottomViewController>[0]
71
+ 'testing-views.banana-bottom': ConstructorParameters<typeof BananaBottomViewController>[0]
72
+ 'testing-views.test': ConstructorParameters<typeof TestViewController>[0]
73
+ 'testing-views.zebra-tooshie': ConstructorParameters<typeof ZebraTooshieViewController>[0]`;
74
+ test_utils_1.assert.doesInclude(contents, viewControllerOptionsMapExpected, 'views.ts viewControllerOptionsMap out of order');
75
+ }
76
+ static async sortsSkillViewsAlphabetically() {
77
+ await this.create({
78
+ viewType: 'skillView',
79
+ nameReadable: 'Cheesey',
80
+ isRoot: false,
81
+ });
82
+ const skillViewControllerMapExpected = `'testing-views.cheesey': CheeseySkillViewController
83
+ 'testing-views.root': RootSkillViewController`;
84
+ const contents = this.readCombinedViewsFile();
85
+ test_utils_1.assert.doesInclude(contents, skillViewControllerMapExpected, 'views.ts skillViewControllerMap out of order');
86
+ }
87
+ static readCombinedViewsFile() {
88
+ return spruce_skill_utils_1.diskUtil.readFile(this.resolvePath('src/.spruce/views/views.ts'));
89
+ }
90
+ static async createCardViewController(name) {
91
+ const options = {
92
+ viewType: 'view',
93
+ nameReadable: name,
94
+ viewModel: 'Card',
95
+ };
96
+ const results = await this.create(options);
97
+ await this.assertValuedViewsFile(results);
98
+ }
99
+ static async create(options) {
100
+ const results = await this.Action('view', 'create').execute(options);
101
+ test_utils_1.assert.isFalsy(results.errors);
102
+ return results;
103
+ }
57
104
  static async assertValuedViewsFile(results) {
58
105
  const match = test_utility_1.default.assertFileByPathInGeneratedFiles(`views/views.ts`, results.files);
59
106
  await this.Service('typeChecker').check(match);
@@ -75,4 +122,10 @@ __decorate([
75
122
  __decorate([
76
123
  (0, test_utils_1.test)()
77
124
  ], KeepingViewsInSyncTest, "exportUndefinedApp", null);
125
+ __decorate([
126
+ (0, test_utils_1.test)()
127
+ ], KeepingViewsInSyncTest, "alwaysRendersCombinedViewsFileAlphabetically", null);
128
+ __decorate([
129
+ (0, test_utils_1.test)()
130
+ ], KeepingViewsInSyncTest, "sortsSkillViewsAlphabetically", null);
78
131
  //# sourceMappingURL=KeepingViewsInSync.test.js.map
package/build/__tests__/behavioral/views/KeepingViewsInSync.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"KeepingViewsInSync.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/views/KeepingViewsInSync.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uEAAyD;AACzD,uDAAqD;AAGrD,yFAAgE;AAChE,yFAA4D;AAE5D,MAAqB,sBAAuB,SAAQ,2BAAiB;IACvD,MAAM,CAAC,aAAa,GAAG,OAAO,CAAA;IAChC,MAAM,CAAC,MAAM,CAAY;IAEvB,MAAM,CAAC,KAAK,CAAC,UAAU;QAC7B,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,aAAa;QAChC,mBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC;QACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;QAC3C,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9B,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,iDAAiD;QACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YACxD,QAAQ,EAAE,WAAW;YACrB,MAAM,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,uCAAuC;QAC1D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YACxD,QAAQ,EAAE,MAAM;YAChB,YAAY,EAAE,MAAM;YACpB,SAAS,EAAE,MAAM;SACpB,CAAC,CAAA;QACF,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9B,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,kBAAkB;QACrC,MAAM,UAAU,GACZ,wBAAwB;YACxB;;;UAGF,CAAA;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;QACtD,6BAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAE9C,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAC3D,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAA8B;QACrE,MAAM,KAAK,GAAG,sBAAQ,CAAC,gCAAgC,CACnD,gBAAgB,EAChB,OAAO,CAAC,KAAK,CAChB,CAAA;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAClD,CAAC;;AAhEL,yCAiEC;AAvD0B;IADtB,IAAA,iBAAI,GAAE;iDAGN;AAGsB;IADtB,IAAA,iBAAI,GAAE;sEAKN;AAGsB;IADtB,IAAA,iBAAI,GAAE;qFAQN;AAGsB;IADtB,IAAA,iBAAI,GAAE;2EASN;AAGsB;IADtB,IAAA,iBAAI,GAAE;sDAaN"}
1
+ {"version":3,"file":"KeepingViewsInSync.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/views/KeepingViewsInSync.test.ts"],"names":[],"mappings":"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"}
package/build/features/view/actions/CreateAction.d.ts CHANGED
@@ -52,4 +52,5 @@ declare const optionsSchema: {
52
52
  };
53
53
  };
54
54
  type OptionsSchema = typeof optionsSchema;
55
+ export type CreateViewOptions = SchemaValues<OptionsSchema>;
55
56
  export {};
package/build/features/view/writers/ViewWriter.d.ts CHANGED
@@ -5,7 +5,7 @@ export default class ViewWriter extends AbstractWriter {
5
5
  namePascal: string;
6
6
  nameKebab: string;
7
7
  }): Promise<import("../../../writers/AbstractWriter").WriteResults>;
8
- writeCombinedViewsFile(cwd: string, options: ViewsOptions): Promise<import("../../../writers/AbstractWriter").WriteResults>;
8
+ writeCombinedViewsFile(cwd: string, options: Omit<ViewsOptions, 'allTemplateItems'>): Promise<import("../../../writers/AbstractWriter").WriteResults>;
9
9
  private removeFileExtensionsFromTemplateItems;
10
10
  private makePathRelative;
11
11
  writeViewController(cwd: string, options: {
package/build/features/view/writers/ViewWriter.js CHANGED
@@ -22,11 +22,15 @@ class ViewWriter extends AbstractWriter_1.default {
22
22
  if (appTemplateItem) {
23
23
  appTemplateItem = this.makePathRelative(appTemplateItem, destinationDir);
24
24
  }
25
+ svcTemplateItems.sort((a, b) => a.namePascal.localeCompare(b.namePascal));
26
+ vcTemplateItems.sort((a, b) => a.namePascal.localeCompare(b.namePascal));
27
+ const allTemplateItems = [...vcTemplateItems, ...svcTemplateItems].sort((a, b) => a.namePascal.localeCompare(b.namePascal));
25
28
  const contents = this.templates.views({
26
29
  vcTemplateItems,
27
30
  svcTemplateItems,
28
31
  viewPluginItems,
29
32
  appTemplateItem,
33
+ allTemplateItems,
30
34
  ...rest,
31
35
  });
32
36
  const results = await this.writeFileIfChangedMixinResults(destination, contents, 'Used to export your controllers to Heartwood.');
package/build/features/view/writers/ViewWriter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ViewWriter.js","sourceRoot":"","sources":["../../../../src/features/view/writers/ViewWriter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ViewWriter.js","sourceRoot":"","sources":["../../../../src/features/view/writers/ViewWriter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
7
- "version": "28.2.1",
7
+ "version": "28.2.2",
8
8
  "skill": {
9
9
  "namespace": "spruce-cli",
10
10
  "upgradeIgnoreList": [
@@ -85,7 +85,7 @@
85
85
  "@sprucelabs/spruce-core-schemas": "^41.3.7",
86
86
  "@sprucelabs/spruce-event-utils": "^41.0.126",
87
87
  "@sprucelabs/spruce-skill-utils": "^32.0.116",
88
- "@sprucelabs/spruce-templates": "^28.2.1",
88
+ "@sprucelabs/spruce-templates": "^28.2.2",
89
89
  "@typescript-eslint/eslint-plugin": "^8.45.0",
90
90
  "@typescript-eslint/parser": "^8.45.0",
91
91
  "cfonts": "^3.3.1",
@@ -570,5 +570,5 @@
570
570
  "conventional-changelog-sprucelabs"
571
571
  ]
572
572
  },
573
- "gitHead": "115e161f24f1c68f5ac121b2255d05ece86223ea"
573
+ "gitHead": "ba4318682bd68509a074a3a9c5361a1688aec22c"
574
574
  }
package/src/__tests__/behavioral/events/KeepingEventsInSync2.test.ts CHANGED
@@ -172,31 +172,44 @@ export default class KeepingEventsInSyncTest extends AbstractEventTest {
172
172
  )) as any
173
173
  const sig = eventContractUtil.getSignatureByName(contract, fqen)
174
174
 
175
- assert.isTruthy(sig.emitPayloadSchema)
176
- assert.isTruthy(
175
+ assert.isTruthy(sig.emitPayloadSchema, 'Did not save emitPayloadSchema')
176
+ assert.isEqual(
177
177
  //@ts-ignore
178
178
  sig.emitPayloadSchema.fields?.payload?.options?.schema?.id,
179
- 'myNewEventEmitPayloadId'
179
+ 'myNewEventEmitPayloadId',
180
+ 'emitPayloadSchema id is wrong'
180
181
  )
181
- assert.isTruthy(
182
+ assert.isEqual(
182
183
  sig.responsePayloadSchema?.id,
183
- 'myNewEventResponsePayloadId'
184
+ 'myNewEventResponsePayloadId',
185
+ 'responsePayloadSchema id is wrong'
186
+ )
187
+
188
+ assert.isTruthy(
189
+ sig.emitPermissionContract,
190
+ 'emitPermissionContract missing'
184
191
  )
185
192
 
186
- assert.isTruthy(sig.emitPermissionContract)
187
193
  assert.isEqual(
188
194
  sig.emitPermissionContract.id,
189
- `${skill2.slug}.myNewEventEmitPermissionContract`
195
+ `${skill2.slug}.myNewEventEmitPermissionContract`,
196
+ 'emitPermissionContract id is wrong'
197
+ )
198
+ assert.isEqual(
199
+ sig.emitPermissionContract.permissions[0].id,
200
+ 'can-emit',
201
+ 'emitPermissionContract permission id is wrong'
190
202
  )
191
- assert.isEqual(sig.emitPermissionContract.permissions[0].id, 'can-emit')
192
203
  assert.isTruthy(sig.listenPermissionContract)
193
204
  assert.isEqual(
194
205
  sig.listenPermissionContract.id,
195
- `${skill2.slug}.myNewEventListenPermissionContract`
206
+ `${skill2.slug}.myNewEventListenPermissionContract`,
207
+ 'listenPermissionContract id is wrong'
196
208
  )
197
209
  assert.isEqual(
198
210
  sig.listenPermissionContract.permissions[0].id,
199
- 'can-listen'
211
+ 'can-listen',
212
+ 'listenPermissionContract permission id is wrong'
200
213
  )
201
214
 
202
215
  assert.isEqual(sig.description, description, 'description missing')
package/src/__tests__/behavioral/views/KeepingViewsInSync.test.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { diskUtil } from '@sprucelabs/spruce-skill-utils'
2
2
  import { test, assert } from '@sprucelabs/test-utils'
3
3
  import { FeatureActionResponse } from '../../../features/features.types'
4
+ import { CreateViewOptions } from '../../../features/view/actions/CreateAction'
4
5
  import SyncAction from '../../../features/view/actions/SyncAction'
5
6
  import AbstractSkillTest from '../../../tests/AbstractSkillTest'
6
7
  import testUtil from '../../../tests/utilities/test.utility'
@@ -38,13 +39,7 @@ export default class KeepingViewsInSyncTest extends AbstractSkillTest {
38
39
 
39
40
  @test()
40
41
  protected static async generatesValidTypesFileWithNoSkillViews() {
41
- const results = await this.Action('view', 'create').execute({
42
- viewType: 'view',
43
- nameReadable: 'test',
44
- viewModel: 'Card',
45
- })
46
- assert.isFalsy(results.errors)
47
- await this.assertValuedViewsFile(results)
42
+ await this.createCardViewController('test')
48
43
  }
49
44
 
50
45
  @test()
@@ -62,6 +57,93 @@ export default class KeepingViewsInSyncTest extends AbstractSkillTest {
62
57
  await this.Service('typeChecker').check(testScriptPath)
63
58
  }
64
59
 
60
+ @test()
61
+ protected static async alwaysRendersCombinedViewsFileAlphabetically() {
62
+ await this.createCardViewController('apple bottom')
63
+ await this.createCardViewController('banana bottom')
64
+ await this.createCardViewController('zebra tooshie')
65
+
66
+ const contents = this.readCombinedViewsFile()
67
+
68
+ const vcsExpeced = `{
69
+ AppleBottomViewController,
70
+ BananaBottomViewController,
71
+ RootSkillViewController,
72
+ TestViewController,
73
+ ZebraTooshieViewController,
74
+ }`
75
+
76
+ assert.doesInclude(
77
+ contents,
78
+ vcsExpeced,
79
+ 'views.ts vcs = {} out of order'
80
+ )
81
+
82
+ const viewControllerMapExpected = `'testing-views.apple-bottom': AppleBottomViewController
83
+ 'testing-views.banana-bottom': BananaBottomViewController
84
+ 'testing-views.root': RootSkillViewController
85
+ 'testing-views.test': TestViewController
86
+ 'testing-views.zebra-tooshie': ZebraTooshieViewController`
87
+
88
+ assert.doesInclude(
89
+ contents,
90
+ viewControllerMapExpected,
91
+ 'views.ts viewControllerMap out of order'
92
+ )
93
+
94
+ const viewControllerOptionsMapExpected = `'testing-views.apple-bottom': ConstructorParameters<typeof AppleBottomViewController>[0]
95
+ 'testing-views.banana-bottom': ConstructorParameters<typeof BananaBottomViewController>[0]
96
+ 'testing-views.test': ConstructorParameters<typeof TestViewController>[0]
97
+ 'testing-views.zebra-tooshie': ConstructorParameters<typeof ZebraTooshieViewController>[0]`
98
+
99
+ assert.doesInclude(
100
+ contents,
101
+ viewControllerOptionsMapExpected,
102
+ 'views.ts viewControllerOptionsMap out of order'
103
+ )
104
+ }
105
+
106
+ @test()
107
+ protected static async sortsSkillViewsAlphabetically() {
108
+ await this.create({
109
+ viewType: 'skillView',
110
+ nameReadable: 'Cheesey',
111
+ isRoot: false,
112
+ })
113
+
114
+ const skillViewControllerMapExpected = `'testing-views.cheesey': CheeseySkillViewController
115
+ 'testing-views.root': RootSkillViewController`
116
+
117
+ const contents = this.readCombinedViewsFile()
118
+
119
+ assert.doesInclude(
120
+ contents,
121
+ skillViewControllerMapExpected,
122
+ 'views.ts skillViewControllerMap out of order'
123
+ )
124
+ }
125
+
126
+ private static readCombinedViewsFile() {
127
+ return diskUtil.readFile(this.resolvePath('src/.spruce/views/views.ts'))
128
+ }
129
+
130
+ private static async createCardViewController(name: string) {
131
+ const options = {
132
+ viewType: 'view',
133
+ nameReadable: name,
134
+ viewModel: 'Card',
135
+ }
136
+ const results = await this.create(options)
137
+
138
+ await this.assertValuedViewsFile(results)
139
+ }
140
+
141
+ private static async create(options: CreateViewOptions) {
142
+ const results = await this.Action('view', 'create').execute(options)
143
+ assert.isFalsy(results.errors)
144
+ return results
145
+ }
146
+
65
147
  private static async assertValuedViewsFile(results: FeatureActionResponse) {
66
148
  const match = testUtil.assertFileByPathInGeneratedFiles(
67
149
  `views/views.ts`,
package/src/features/view/actions/CreateAction.ts CHANGED
@@ -159,3 +159,5 @@ const followUpSchema = buildSchema({
159
159
  })
160
160
 
161
161
  type OptionsSchema = typeof optionsSchema
162
+
163
+ export type CreateViewOptions = SchemaValues<OptionsSchema>
package/src/features/view/writers/ViewWriter.ts CHANGED
@@ -25,7 +25,10 @@ export default class ViewWriter extends AbstractWriter {
25
25
  return this.writeController(path, { ...options, viewType: 'skillView' })
26
26
  }
27
27
 
28
- public async writeCombinedViewsFile(cwd: string, options: ViewsOptions) {
28
+ public async writeCombinedViewsFile(
29
+ cwd: string,
30
+ options: Omit<ViewsOptions, 'allTemplateItems'>
31
+ ) {
29
32
  let {
30
33
  vcTemplateItems,
31
34
  svcTemplateItems,
@@ -59,11 +62,22 @@ export default class ViewWriter extends AbstractWriter {
59
62
  )
60
63
  }
61
64
 
65
+ svcTemplateItems.sort((a, b) =>
66
+ a.namePascal.localeCompare(b.namePascal)
67
+ )
68
+
69
+ vcTemplateItems.sort((a, b) => a.namePascal.localeCompare(b.namePascal))
70
+
71
+ const allTemplateItems = [...vcTemplateItems, ...svcTemplateItems].sort(
72
+ (a, b) => a.namePascal.localeCompare(b.namePascal)
73
+ )
74
+
62
75
  const contents = this.templates.views({
63
76
  vcTemplateItems,
64
77
  svcTemplateItems,
65
78
  viewPluginItems,
66
79
  appTemplateItem,
80
+ allTemplateItems,
67
81
  ...rest,
68
82
  })
69
83