Added barrel file for models

boilerplate/app/app.tsx.ejs

@@ -25,7 +25,7 @@ import {
   setRootNavigation,
   useNavigationPersistence,
 } from "./navigation"
-import { RootStore, RootStoreProvider, setupRootStore } from "./models/root-store"
+import { RootStore, RootStoreProvider, setupRootStore } from "./models"
 
 // This puts screens in a native ViewController or Activity. If you want fully native
 // stack navigation, use `createNativeStackNavigator` in place of `createStackNavigator`:

boilerplate/app/models/extensions/with-root-store.ts

@@ -1,5 +1,5 @@
 import { getRoot, IStateTreeNode } from "mobx-state-tree"
-import { RootStoreModel } from "../root-store"
+import { RootStoreModel } from "../root-store/root-store"
 
 /**
  * Adds a rootStore property to the node for a convenient

boilerplate/app/models/index.ts

@@ -0,0 +1,6 @@
+export * from "./extensions/with-environment"
+export * from "./extensions/with-root-store"
+export * from "./extensions/with-status"
+export * from "./root-store/root-store"
+export * from "./root-store/root-store-context"
+export * from "./root-store/setup-root-store"

src/commands/generate/model.ts

@@ -32,14 +32,18 @@ export const run = async function(toolbox: GluegunToolbox) {
     },
   ]
 
-  const rollupPath = `app/models/${name}/index.ts`
-  const rollupExists = filesystem.exists(rollupPath)
-
-  if (rollupExists) {
-    await patching.prepend(rollupPath, `export * from "./${name}"`)
-  } else {
-    jobs.push({ template: "rollup-index.ts.ejs", target: rollupPath })
+  // patch the barrel export file
+  const barrelExportPath = `${process.cwd()}/app/models/index.ts`
+  const exportToAdd = `export * from "./${name}/${name}"\n`
+
+  if (!filesystem.exists(barrelExportPath)) {
+    const msg =
+      `No '${barrelExportPath}' file found. Can't export model.` +
+      `Export your new model manually.`
+    print.warning(msg)
+    process.exit(1)
   }
+  await patching.append(barrelExportPath, exportToAdd)
 
   await ignite.copyBatch(toolbox, jobs, props)
 

templates/function-component.tsx.ejs

@@ -2,7 +2,7 @@ import React, { FunctionComponent as Component } from "react"
 import { View } from "react-native"
 import { Text } from "../"
 // import { observer } from "mobx-react-lite"
-// import { useStores } from "../../models/root-store"
+// import { useStores } from "../../models"
 import { <%= props.camelCaseName %>Styles as styles } from "./<%= props.name %>.styles"
 
 export interface <%= props.pascalName %>Props {}

templates/screen.ejs

@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite"
 import { ViewStyle } from "react-native"
 import { Screen, Text } from "../components"
 // import { useNavigation } from "@react-navigation/native"
-// import { useStores } from "../models/root-store"
+// import { useStores } from "../models"
 import { color } from "../theme"
 
 const ROOT: ViewStyle = {

test/generators-integration.test.ts

@@ -106,7 +106,7 @@ describe("a generated app", () => {
     await execaShell(`${IGNITE_COMMAND} g model ${simpleModel}`, { preferLocal: false })
     expect(jetpack.exists(`app/models/${simpleModel}/${simpleModel}.ts`)).toBe("file")
     expect(jetpack.exists(`app/models/${simpleModel}/${simpleModel}.test.ts`)).toBe("file")
-    expect(jetpack.exists(`app/models/${simpleModel}/index.ts`)).toBe("file")
+    expect(jetpack.exists(`app/models/index.ts`)).toBe("file")
     const lint = await execa("npm", ["-s", "run", "lint"])
     expect(lint.stderr).toBe("")
   })