chore: package-json cleanup

Author: jherr

packages/cta-core/src/add-ons.ts

@@ -1,11 +1,11 @@
 import { readFile } from 'node:fs/promises'
 import { existsSync, readdirSync } from 'node:fs'
-import { basename, dirname, resolve } from 'node:path'
+import { resolve } from 'node:path'
 
-import { getBinaryFile } from './file-helper.js'
+import { readFileHelper } from './file-helper.js'
 import { findFilesRecursively, isDirectory } from './utils.js'
 
-import type { AddOn, Environment, FrameworkDefinition } from './types.js'
+import type { AddOn, FrameworkDefinition } from './types.js'
 
 export async function getAllAddOns(
   framework: FrameworkDefinition,
@@ -50,7 +50,14 @@ export async function getAllAddOns(
       }
       const files: Record<string, string> = {}
       for (const file of Object.keys(absoluteFiles)) {
-        files[file.replace(assetsDir, '.')] = absoluteFiles[file]
+        files[file.replace(assetsDir, '.')] = await readFileHelper(file)
+      }
+
+      const getFiles = () => {
+        return Promise.resolve(Object.keys(files))
+      }
+      const getFileContents = (path: string) => {
+        return Promise.resolve(files[path])
       }
 
       addOns.push({
@@ -61,6 +68,8 @@ export async function getAllAddOns(
         readme,
         files,
         deletedFiles: [],
+        getFiles,
+        getFileContents,
       })
     }
   }
@@ -113,46 +122,9 @@ export async function loadRemoteAddOn(url: string): Promise<AddOn> {
   const response = await fetch(url)
   const fileContent = await response.json()
   fileContent.id = url
-  return fileContent
-}
-
-export async function copyAddOnFile(
-  environment: Environment,
-  content: string,
-  target: string,
-  targetPath: string,
-  templateFile: (content: string, targetFileName: string) => Promise<void>,
-) {
-  let targetFile = basename(target).replace(/^_dot_/, '.')
-  let isTemplate = false
-  if (targetFile.endsWith('.ejs')) {
-    targetFile = targetFile.replace('.ejs', '')
-    isTemplate = true
-  }
-  let isAppend = false
-  if (targetFile.endsWith('.append')) {
-    targetFile = targetFile.replace('.append', '')
-    isAppend = true
-  }
-
-  const finalTargetPath = resolve(dirname(targetPath), targetFile)
-
-  const binaryContent = getBinaryFile(content)
-  if (binaryContent) {
-    await environment.writeFile(
-      finalTargetPath,
-      binaryContent as unknown as string,
-    )
-    return
-  }
-
-  if (isTemplate) {
-    await templateFile(content, finalTargetPath)
-  } else {
-    if (isAppend) {
-      await environment.appendFile(finalTargetPath, content)
-    } else {
-      await environment.writeFile(finalTargetPath, content)
-    }
+  return {
+    ...fileContent,
+    getFiles: () => Promise.resolve(Object.keys(fileContent.files)),
+    getFileContents: (path: string) => Promise.resolve(fileContent.files[path]),
   }
 }

packages/cta-core/src/frameworks.ts

@@ -1,3 +1,4 @@
+import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 
 import { findFilesRecursively } from './utils.js'
@@ -9,6 +10,15 @@ const frameworks: Array<Framework> = []
 
 export function registerFramework(framework: FrameworkDefinition) {
   const baseAssetsDirectory = resolve(framework.baseDirectory, 'base')
+
+  const basePackageJSON = JSON.parse(
+    readFileSync(resolve(baseAssetsDirectory, 'package.json'), 'utf8'),
+  )
+  const optionalPackages = JSON.parse(
+    readFileSync(resolve(framework.baseDirectory, 'packages.json'), 'utf8'),
+  )
+  console.log(optionalPackages)
+
   const frameworkWithBundler: Framework = {
     ...framework,
     getFiles: () => {
@@ -23,6 +33,8 @@ export function registerFramework(framework: FrameworkDefinition) {
     getFileContents: (path: string) => {
       return Promise.resolve(readFileHelper(resolve(baseAssetsDirectory, path)))
     },
+    basePackageJSON,
+    optionalPackages,
   }
 
   frameworks.push(frameworkWithBundler)

packages/cta-core/src/index.ts

@@ -1,9 +1,4 @@
-export {
-  copyAddOnFile,
-  finalizeAddOns,
-  getAllAddOns,
-  loadRemoteAddOn,
-} from './add-ons.js'
+export { finalizeAddOns, getAllAddOns, loadRemoteAddOn } from './add-ons.js'
 export {
   createMemoryEnvironment,
   createDefaultEnvironment,

packages/cta-core/src/types.ts

@@ -22,7 +22,11 @@ export type FrameworkDefinition = {
   examplesDirectory: string
 }
 
-export type Framework = FrameworkDefinition & FileBundleHandler
+export type Framework = FrameworkDefinition &
+  FileBundleHandler & {
+    basePackageJSON: Record<string, any>
+    optionalPackages: Record<string, any>
+  }
 
 export interface Options {
   framework: Framework
@@ -98,7 +102,7 @@ type StringVariable = {
 
 export type Variable = BooleanVariable | NumberVariable | StringVariable
 
-export type AddOn = {
+export type AddOnDefinition = {
   id: string
   name: string
   description: string
@@ -136,7 +140,7 @@ export type AddOn = {
   deletedFiles?: Array<string>
 }
 
-export type Starter = AddOn & {
+export type StarterDefinition = AddOnDefinition & {
   type: 'starter'
   version: string
   author: string
@@ -147,3 +151,6 @@ export type Starter = AddOn & {
   typescript: boolean
   tailwind: boolean
 }
+
+export type AddOn = AddOnDefinition & FileBundleHandler
+export type Starter = StarterDefinition & FileBundleHandler