Skip to content

Commit 388b3cf

Browse files
jherrjherr
committed
better factoring
1 parent 007127f commit 388b3cf

File tree

11 files changed

+64
-77
lines changed

11 files changed

+64
-77
lines changed

‎src/cta/lib/engine-handling/add-to-app-wrapper.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { resolve } from 'node:path'
22
import { TMP_TARGET_DIR } from '../constants'
3+
import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
4+
import { getProjectPath } from './server-environment'
5+
import { createAppWrapper } from './create-app-wrapper'
6+
import { createMemoryEnvironment } from './memory-environment'
7+
38
import type { Response } from 'express'
49
import type { DryRunOutput } from '../types'
10+
import type { Environment } from '@tanstack/cta-engine'
511

612
export async function addToAppWrapper(
713
addOns: Array<string>,
@@ -22,10 +28,6 @@ export async function addToAppWrapper(
2228
recursivelyGatherFiles,
2329
writeConfigFileToEnvironment,
2430
} = await import('@tanstack/cta-engine')
25-
const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
26-
const { getProjectPath } = await import('./server-environment')
27-
const { createAppWrapper } = await import('./create-app-wrapper')
28-
const { createMemoryEnvironment } = await import('./memory-environment')
2931

3032
const projectPath = getProjectPath()
3133

‎src/cta/lib/engine-handling/create-app-wrapper.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
import { resolve } from 'node:path'
2+
23
import { TMP_TARGET_DIR } from '../constants'
4+
5+
import { ensureFrameworkRegistered } from './framework-registry'
6+
import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
7+
import { getApplicationMode, getProjectPath } from './server-environment'
8+
import { createMemoryEnvironment } from './memory-environment'
9+
310
import type { Response } from 'express'
411

512
export async function createAppWrapper(
@@ -18,15 +25,9 @@ export async function createAppWrapper(
1825
getFrameworkById,
1926
loadStarter,
2027
} = await import('@tanstack/cta-engine')
21-
const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
22-
const { getApplicationMode, getProjectPath } = await import(
23-
'./server-environment'
24-
)
25-
const { createMemoryEnvironment } = await import('./memory-environment')
26-
const { ensureFrameworkRegistered } = await import('./framework-registry')
2728

2829
// Ensure framework is registered
29-
await ensureFrameworkRegistered()
30+
ensureFrameworkRegistered()
3031

3132
const framework = getFrameworkById(projectOptions.framework)!
3233
if (!framework) {

‎src/cta/lib/engine-handling/framework-registry.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1+
import { registerFramework } from '@tanstack/cta-engine'
2+
import { createFrameworkDefinition } from '@tanstack/cta-framework-react-cra'
3+
14
let frameworkRegistered = false
25

3-
export async function ensureFrameworkRegistered() {
6+
export function ensureFrameworkRegistered() {
47
if (frameworkRegistered) {
58
return
69
}
710

8-
const { registerFramework } = await import('@tanstack/cta-engine')
9-
const { createFrameworkDefinition } = await import(
10-
'@tanstack/cta-framework-react-cra'
11-
)
12-
1311
registerFramework(createFrameworkDefinition())
1412
frameworkRegistered = true
1513
}

‎src/cta/lib/engine-handling/generate-initial-payload.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
import { basename, resolve } from 'node:path'
2+
3+
import { ensureFrameworkRegistered } from './framework-registry'
4+
import { cleanUpFiles } from './file-helpers'
5+
import { createAppWrapper } from './create-app-wrapper'
6+
import {
7+
getApplicationMode,
8+
getForcedAddOns,
9+
getForcedRouterMode,
10+
getProjectOptions,
11+
getProjectPath,
12+
getRegistry as getRegistryURL,
13+
} from './server-environment'
14+
215
import type { AddOnInfo } from '../types'
316

417
function convertAddOnToAddOnInfo(addOn: any): AddOnInfo {
@@ -26,20 +39,9 @@ export async function generateInitialPayload() {
2639
readConfigFile,
2740
recursivelyGatherFiles,
2841
} = await import('@tanstack/cta-engine')
29-
const { cleanUpFiles } = await import('./file-helpers')
30-
const { createAppWrapper } = await import('./create-app-wrapper')
31-
const {
32-
getApplicationMode,
33-
getForcedAddOns,
34-
getForcedRouterMode,
35-
getProjectOptions,
36-
getProjectPath,
37-
getRegistry: getRegistryURL,
38-
} = await import('./server-environment')
39-
const { ensureFrameworkRegistered } = await import('./framework-registry')
4042

4143
// Ensure framework is registered
42-
await ensureFrameworkRegistered()
44+
ensureFrameworkRegistered()
4345

4446
const projectPath = getProjectPath()
4547
const applicationMode = getApplicationMode()

‎src/forge/engine-handling/add-to-app-wrapper.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { resolve } from 'node:path'
22
import { TMP_TARGET_DIR } from '~/forge/constants'
33
import type { DryRunOutput } from '~/forge/types'
4+
import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
5+
import { getProjectPath } from './server-environment'
6+
import { createAppWrapper } from './create-app-wrapper'
47

58
export async function addToAppWrapper(
69
addOns: Array<string>,
@@ -22,9 +25,6 @@ export async function addToAppWrapper(
2225
recursivelyGatherFiles,
2326
writeConfigFileToEnvironment,
2427
} = await import('@tanstack/cta-engine')
25-
const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
26-
const { getProjectPath } = await import('./server-environment')
27-
const { createAppWrapper } = await import('./create-app-wrapper')
2828

2929
const projectPath = getProjectPath()
3030

‎src/forge/engine-handling/create-app-wrapper.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { resolve } from 'node:path'
22
import { TMP_TARGET_DIR } from '~/forge/constants'
3+
import { ensureFrameworkRegistered } from './framework-registry'
4+
import { cleanUpFileArray, cleanUpFiles } from './file-helpers'
5+
import { getApplicationMode, getProjectPath } from './server-environment'
36

47
export async function createAppWrapper(
58
projectOptions: any,
@@ -18,14 +21,9 @@ export async function createAppWrapper(
1821
getFrameworkById,
1922
loadStarter,
2023
} = await import('@tanstack/cta-engine')
21-
const { cleanUpFileArray, cleanUpFiles } = await import('./file-helpers')
22-
const { getApplicationMode, getProjectPath } = await import(
23-
'./server-environment'
24-
)
25-
const { ensureFrameworkRegistered } = await import('./framework-registry')
2624

2725
// Ensure framework is registered
28-
await ensureFrameworkRegistered()
26+
ensureFrameworkRegistered()
2927

3028
const framework = getFrameworkById(projectOptions.framework)!
3129
if (!framework) {

‎src/forge/engine-handling/framework-registry.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1+
import { registerFramework } from '@tanstack/cta-engine'
2+
import { createFrameworkDefinition } from '@tanstack/cta-framework-react-cra'
3+
14
let frameworkRegistered = false
25

3-
export async function ensureFrameworkRegistered() {
6+
export function ensureFrameworkRegistered() {
47
if (frameworkRegistered) {
58
return
69
}
710

8-
const { registerFramework } = await import('@tanstack/cta-engine')
9-
const { createFrameworkDefinition } = await import(
10-
'@tanstack/cta-framework-react-cra'
11-
)
12-
1311
registerFramework(createFrameworkDefinition())
1412
frameworkRegistered = true
1513
}

‎src/forge/engine-handling/generate-initial-payload.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
import { basename, resolve } from 'node:path'
22
import type { AddOnInfo } from '~/forge/types'
3+
import { ensureFrameworkRegistered } from './framework-registry'
4+
import { cleanUpFiles } from './file-helpers'
5+
import { createAppWrapper } from './create-app-wrapper'
6+
import {
7+
getApplicationMode,
8+
getForcedAddOns,
9+
getForcedRouterMode,
10+
getProjectOptions,
11+
getProjectPath,
12+
getRegistry as getRegistryURL,
13+
} from './server-environment'
314

415
function convertAddOnToAddOnInfo(addOn: any): AddOnInfo {
516
return {
@@ -26,20 +37,9 @@ export async function generateInitialPayload() {
2637
readConfigFile,
2738
recursivelyGatherFiles,
2839
} = await import('@tanstack/cta-engine')
29-
const { cleanUpFiles } = await import('./file-helpers')
30-
const { createAppWrapper } = await import('./create-app-wrapper')
31-
const {
32-
getApplicationMode,
33-
getForcedAddOns,
34-
getForcedRouterMode,
35-
getProjectOptions,
36-
getProjectPath,
37-
getRegistry: getRegistryURL,
38-
} = await import('./server-environment')
39-
const { ensureFrameworkRegistered } = await import('./framework-registry')
4040

4141
// Ensure framework is registered
42-
await ensureFrameworkRegistered()
42+
ensureFrameworkRegistered()
4343

4444
const projectPath = getProjectPath()
4545
const applicationMode = getApplicationMode()

‎src/forge/tools.ts‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import type { Id } from 'convex/_generated/dataModel'
99

1010
import { generateFileTree } from '~/forge/file-tree-generator'
1111
import type { DryRunOutput } from '~/forge/types'
12+
import { ensureFrameworkRegistered } from '~/forge/engine-handling/framework-registry'
13+
import { setServerEnvironment } from '~/forge/engine-handling/server-environment'
14+
import { addToAppWrapper } from '~/forge/engine-handling/add-to-app-wrapper'
15+
import { createAppWrapper } from '~/forge/engine-handling/create-app-wrapper'
1216

1317
function enforceFSPath(path: string) {
1418
if (path.startsWith('./')) {
@@ -38,21 +42,9 @@ export const getTools = async (convex: ConvexHttpClient, projectId: string) => {
3842
getAllAddOns,
3943
createDefaultEnvironment,
4044
} = await import('@tanstack/cta-engine')
41-
const { addToAppWrapper } = await import(
42-
'~/forge/engine-handling/add-to-app-wrapper'
43-
)
44-
const { createAppWrapper } = await import(
45-
'~/forge/engine-handling/create-app-wrapper'
46-
)
47-
const { setServerEnvironment } = await import(
48-
'~/forge/engine-handling/server-environment'
49-
)
50-
const { ensureFrameworkRegistered } = await import(
51-
'~/forge/engine-handling/framework-registry'
52-
)
5345

5446
// Ensure framework is registered
55-
await ensureFrameworkRegistered()
47+
ensureFrameworkRegistered()
5648

5749
const projectFiles = await convex.query(api.forge.getProjectFiles, {
5850
projectId: projectId as Id<'forge_projects'>,

‎src/routes/api/dry-run-create-app.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createFileRoute } from '@tanstack/react-router'
22
import { z } from 'zod'
3+
import { ensureFrameworkRegistered } from '~/cta/lib/engine-handling/framework-registry'
34

45
const requestOptionsSchema = z.object({
56
starter: z.string().optional(),
@@ -26,11 +27,8 @@ export const Route = createFileRoute('/api/dry-run-create-app')({
2627
const { createMemoryEnvironment } = await import(
2728
'~/cta/lib/engine-handling/memory-environment'
2829
)
29-
const { ensureFrameworkRegistered } = await import(
30-
'~/cta/lib/engine-handling/framework-registry'
31-
)
3230

33-
await ensureFrameworkRegistered()
31+
ensureFrameworkRegistered()
3432

3533
const body = await request.json()
3634
const validationResult = requestOptionsSchema.safeParse(body.options)

0 commit comments

Comments
 (0)