@sprucelabs/spruce-cli 28.2.0 → 28.2.2

package/src/features/permission/writers/PermissionWriter.ts

@@ -11,7 +11,17 @@ export default class PermissionWriter extends AbstractWriter {
             'permissions.types.ts'
         )
 
-        const contents = this.templates.permissionTypes({ contracts: map })
+        const keys = Object.keys(map)
+        keys.sort()
+        const sorted: Partial<PermissionContractMap> = {}
+        for (const key of keys) {
+            map[key].sort((a, b) => a.localeCompare(b))
+            sorted[key] = map[key]
+        }
+
+        const contents = this.templates.permissionTypes({
+            contracts: sorted as PermissionContractMap,
+        })
 
         const files = await this.writeFileIfChangedMixinResults(
             destination,

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

@@ -159,3 +159,5 @@ const followUpSchema = buildSchema({
 })
 
 type OptionsSchema = typeof optionsSchema
+
+export type CreateViewOptions = SchemaValues<OptionsSchema>

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

@@ -25,7 +25,10 @@ export default class ViewWriter extends AbstractWriter {
         return this.writeController(path, { ...options, viewType: 'skillView' })
     }
 
-    public async writeCombinedViewsFile(cwd: string, options: ViewsOptions) {
+    public async writeCombinedViewsFile(
+        cwd: string,
+        options: Omit<ViewsOptions, 'allTemplateItems'>
+    ) {
         let {
             vcTemplateItems,
             svcTemplateItems,
@@ -59,11 +62,22 @@ export default class ViewWriter extends AbstractWriter {
             )
         }
 
+        svcTemplateItems.sort((a, b) =>
+            a.namePascal.localeCompare(b.namePascal)
+        )
+
+        vcTemplateItems.sort((a, b) => a.namePascal.localeCompare(b.namePascal))
+
+        const allTemplateItems = [...vcTemplateItems, ...svcTemplateItems].sort(
+            (a, b) => a.namePascal.localeCompare(b.namePascal)
+        )
+
         const contents = this.templates.views({
             vcTemplateItems,
             svcTemplateItems,
             viewPluginItems,
             appTemplateItem,
+            allTemplateItems,
             ...rest,
         })