@tanstack/cta-engine 0.10.0-alpha.17 → 0.10.0-alpha.18

package/dist/add-ons.js

@@ -1,73 +1,10 @@
-import { readFile } from 'node:fs/promises';
-import { existsSync, readdirSync, statSync } from 'node:fs';
-import { resolve } from 'node:path';
-import chalk from 'chalk';
-import { getTemplatesRoot } from './templates.js';
-import { DEFAULT_FRAMEWORK } from './constants.js';
-import { readFileHelper } from './file-helper.js';
-function isDirectory(path) {
-    return statSync(path).isDirectory();
-}
-function findFilesRecursively(path, files) {
-    const dirFiles = readdirSync(path);
-    for (const file of dirFiles) {
-        const filePath = resolve(path, file);
-        if (isDirectory(filePath)) {
-            findFilesRecursively(filePath, files);
-        }
-        else {
-            files[filePath] = readFileHelper(filePath);
-        }
-    }
-}
-export async function getAllAddOns(framework, template) {
-    const addOns = [];
-    for (const type of ['add-on', 'example']) {
-        const addOnsBase = resolve(getTemplatesRoot(), framework, type);
-        if (!existsSync(addOnsBase)) {
-            continue;
-        }
-        for (const dir of await readdirSync(addOnsBase).filter((file) => isDirectory(resolve(addOnsBase, file)))) {
-            const filePath = resolve(addOnsBase, dir, 'info.json');
-            const fileContent = await readFile(filePath, 'utf-8');
-            const info = JSON.parse(fileContent);
-            if (!info.templates.includes(template)) {
-                continue;
-            }
-            let packageAdditions = {};
-            if (existsSync(resolve(addOnsBase, dir, 'package.json'))) {
-                packageAdditions = JSON.parse(await readFile(resolve(addOnsBase, dir, 'package.json'), 'utf-8'));
-            }
-            let readme;
-            if (existsSync(resolve(addOnsBase, dir, 'README.md'))) {
-                readme = await readFile(resolve(addOnsBase, dir, 'README.md'), 'utf-8');
-            }
-            const absoluteFiles = {};
-            const assetsDir = resolve(addOnsBase, dir, 'assets');
-            if (existsSync(assetsDir)) {
-                await findFilesRecursively(assetsDir, absoluteFiles);
-            }
-            const files = {};
-            for (const file of Object.keys(absoluteFiles)) {
-                files[file.replace(assetsDir, '.')] = absoluteFiles[file];
-            }
-            addOns.push({
-                ...info,
-                id: dir,
-                type,
-                packageAdditions,
-                readme,
-                files,
-                deletedFiles: [],
-            });
-        }
-    }
-    return addOns;
+export function getAllAddOns(framework, template) {
+    return framework.getAddOns().filter((a) => a.templates.includes(template));
 }
 // Turn the list of chosen add-on IDs into a final list of add-ons by resolving dependencies
 export async function finalizeAddOns(framework, template, chosenAddOnIDs) {
     const finalAddOnIDs = new Set(chosenAddOnIDs);
-    const addOns = await getAllAddOns(framework, template);
+    const addOns = getAllAddOns(framework, template);
     for (const addOnID of finalAddOnIDs) {
         let addOn;
         const localAddOn = addOns.find((a) => a.id === addOnID);
@@ -92,12 +29,6 @@ export async function finalizeAddOns(framework, template, chosenAddOnIDs) {
     const finalAddOns = [...finalAddOnIDs].map((id) => addOns.find((a) => a.id === id));
     return finalAddOns;
 }
-export async function listAddOns(options, { forcedMode, forcedAddOns = [], }) {
-    const addOns = await getAllAddOns(options.framework || DEFAULT_FRAMEWORK, forcedMode || options.template || 'typescript');
-    for (const addOn of addOns.filter((a) => !forcedAddOns.includes(a.id))) {
-        console.log(`${chalk.bold(addOn.id)}: ${addOn.description}`);
-    }
-}
 function loadAddOn(addOn) {
     return addOn;
 }
@@ -105,5 +36,9 @@ export async function loadRemoteAddOn(url) {
     const response = await fetch(url);
     const fileContent = await response.json();
     fileContent.id = url;
-    return fileContent;
+    return {
+        ...fileContent,
+        getFiles: () => Promise.resolve(Object.keys(fileContent.files)),
+        getFileContents: (path) => Promise.resolve(fileContent.files[path]),
+    };
 }

package/dist/{add.js → add-to-app.js}

@@ -1,15 +1,14 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { existsSync, statSync } from 'node:fs';
 import { basename, dirname, resolve } from 'node:path';
-import chalk from 'chalk';
 import { execa, execaSync } from 'execa';
-import { cancel, confirm, intro, isCancel, log, outro, spinner, } from '@clack/prompts';
 import { CONFIG_FILE } from './constants.js';
+import { finalizeAddOns } from './add-ons.js';
+import { getFrameworkById } from './frameworks.js';
 import { createDefaultEnvironment, createMemoryEnvironment, } from './environment.js';
 import { createApp } from './create-app.js';
-import { finalizeAddOns } from './add-ons.js';
-import { sortObject } from './utils.js';
 import { readConfigFile, writeConfigFile } from './config-file.js';
+import { sortObject } from './utils.js';
 function isDirectory(path) {
     return statSync(path).isDirectory();
 }
@@ -18,10 +17,16 @@ async function hasPendingGitChanges() {
     return status.stdout.length > 0;
 }
 async function createOptions(json, addOns) {
+    const framework = getFrameworkById(json.framework);
     return {
         ...json,
+        framework,
         tailwind: true,
-        chosenAddOns: await finalizeAddOns(json.framework, json.mode, [...json.existingAddOns, ...addOns]),
+        addOns: true,
+        chosenAddOns: await finalizeAddOns(framework, json.mode, [
+            ...json.existingAddOns,
+            ...addOns,
+        ]),
     };
 }
 async function runCreateApp(options) {
@@ -34,19 +39,17 @@ async function runCreateApp(options) {
     });
     return output;
 }
-export async function add(addOns, { silent = false, } = {}) {
+export async function addToApp(addOns, { silent = false, } = {}, environment) {
     const persistedOptions = await readConfigFile(process.cwd());
     if (!persistedOptions) {
-        console.error(`${chalk.red('There is no .cta.json file in your project.')}
-
-This is probably because this was created with an older version of create-tsrouter-app.`);
+        environment.error('There is no .cta.json file in your project.', 'This is probably because this was created with an older version of create-tsrouter-app.');
         return;
     }
     if (!silent) {
-        intro(`Adding ${addOns.join(', ')} to the project...`);
+        environment.intro(`Adding ${addOns.join(', ')} to the project...`);
     }
     if (await hasPendingGitChanges()) {
-        log.error(`${chalk.red('You have pending git changes.')} Please commit or stash them before adding add-ons.`);
+        environment.error('You have pending git changes.', 'Please commit or stash them before adding add-ons.');
         return;
     }
     const newOptions = await createOptions(persistedOptions, addOns);
@@ -72,12 +75,9 @@ This is probably because this was created with an older version of create-tsrout
         }
     }
     if (overwrittenFiles.length > 0 && !silent) {
-        log.warn(`${chalk.yellow('The following will be overwritten:')}\n${overwrittenFiles.join('\n')}`);
-        const shouldContinue = await confirm({
-            message: 'Do you want to continue?',
-        });
-        if (isCancel(shouldContinue)) {
-            cancel('Operation cancelled.');
+        environment.warn('The following will be overwritten:', overwrittenFiles.join('\n'));
+        const shouldContinue = await environment.confirm('Do you want to continue?');
+        if (!shouldContinue) {
             process.exit(0);
         }
     }
@@ -115,11 +115,11 @@ This is probably because this was created with an older version of create-tsrout
     }
     const realEnvironment = createDefaultEnvironment();
     writeConfigFile(realEnvironment, process.cwd(), newOptions);
-    const s = silent ? null : spinner();
+    const s = silent ? null : environment.spinner();
     s?.start(`Installing dependencies via ${newOptions.packageManager}...`);
     await realEnvironment.execute(newOptions.packageManager, ['install'], resolve(process.cwd()));
     s?.stop(`Installed dependencies`);
     if (!silent) {
-        outro('Add-ons added successfully!');
+        environment.outro('Add-ons added successfully!');
     }
 }

package/dist/config-file.js

@@ -2,19 +2,22 @@ import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { CONFIG_FILE } from './constants.js';
 export async function writeConfigFile(environment, targetDir, options) {
+    /* eslint-disable unused-imports/no-unused-vars */
+    const { addOns, chosenAddOns, framework, ...rest } = options;
+    /* eslint-enable unused-imports/no-unused-vars */
     const persistedOptions = {
-        ...options,
+        ...rest,
         version: 1,
+        framework: options.framework.id,
         existingAddOns: options.chosenAddOns.map((addOn) => addOn.id),
     };
-    delete persistedOptions.addOns;
-    delete persistedOptions.chosenAddOns;
     await environment.writeFile(resolve(targetDir, CONFIG_FILE), JSON.stringify(persistedOptions, null, 2));
 }
 export async function readConfigFile(targetDir) {
     try {
         const configFile = resolve(targetDir, CONFIG_FILE);
         const config = await readFile(configFile, 'utf8');
+        // TODO: Look for old config files and convert them to the new format
         return JSON.parse(config);
     }
     catch {

package/dist/constants.js

@@ -1,5 +1,3 @@
 export const CODE_ROUTER = 'code-router';
 export const FILE_ROUTER = 'file-router';
-export const SUPPORTED_FRAMEWORKS = ['solid', 'react'];
-export const DEFAULT_FRAMEWORK = 'react';
 export const CONFIG_FILE = '.cta.json';