Moving away from tweenode.config.ts, since it bugs out on node and de…

…no, may return later

__tests__/handle_config.test.ts

@@ -28,7 +28,7 @@ describe('Tweenode Configuration', () => {
             version: 'v2.2.0',
           },
           storyFormats: {
-            useTweegoBuiltin: false,
+            cleanTweegoBuiltins: false,
             formats: [
               {
                 name: 'Example',

build.mts

@@ -9,6 +9,7 @@ await Bun.build({
   outdir: './dist',
   sourcemap: 'external',
   target: 'node',
+  format: 'esm',
   minify: false,
   external: ['adm-zip', 'fs-extra'],
   plugins: [dts()],

package.json

@@ -41,5 +41,8 @@
   "dependencies": {
     "adm-zip": "^0.5.16",
     "fs-extra": "^11.2.0"
-  }
+  },
+"publishConfig": {
+
+}
 }

src/download_tweego.ts

@@ -2,16 +2,16 @@ import { existsSync } from 'node:fs'
 import { mkdir, rm } from 'node:fs/promises'
 import { resolve } from 'node:path'
 
-import { loadConfig } from './handle_config'
+import { config } from './state'
 import { downloadFile, extract } from './utils'
 import { getTweegoUrl } from './get_tweego_url'
+import { TweenodeSetupConfig } from './handle_config'
+import { emptyDir } from 'fs-extra'
 
 export const getTweenodeFolderPath = () => {
   return resolve(process.cwd(), './.tweenode/')
 }
 
-const config = await loadConfig()
-
 // interface FileStat {
 //   name: string
 //   hash: any
@@ -82,15 +82,18 @@ const config = await loadConfig()
 
 // }
 
-export const downloadTweego = async () => {
+export const downloadTweego = async (options?: TweenodeSetupConfig) => {
+  let usedConfig = config.setup!.tweegoBinaries!
+  if (options?.tweegoBinaries) {
+    usedConfig = options!.tweegoBinaries
+  }
+
   if (!existsSync(getTweenodeFolderPath())) {
     await mkdir(getTweenodeFolderPath(), { recursive: true })
   }
 
   const url =
-    config.setup!.tweegoBinaries!.customUrl !== ''
-      ? getTweegoUrl()
-      : config.setup!.tweegoBinaries!.customUrl
+    usedConfig!.customUrl !== '' ? getTweegoUrl() : usedConfig!.customUrl
   await downloadFile(
     url!,
     resolve(getTweenodeFolderPath(), url!.split('/').pop()!)
@@ -105,8 +108,19 @@ export const extractTweego = async () => {
   await rm(archivePath)
 }
 
-export const downloadCustomStoryFormats = async () => {
-  for await (const format of config.setup!.storyFormats!.formats!) {
+export const downloadCustomStoryFormats = async (
+  options?: TweenodeSetupConfig
+) => {
+  let usedConfig = config.setup!.storyFormats
+  if (options?.storyFormats) {
+    usedConfig = options?.storyFormats
+  }
+
+  if (usedConfig!.cleanTweegoBuiltins) {
+    await emptyDir(resolve(getTweenodeFolderPath(), './storyformats/'))
+  }
+
+  for await (const format of usedConfig!.formats!) {
     const archiveName = format.src!.split('/').pop()
 
     let path = ''
@@ -140,13 +154,16 @@ export const downloadCustomStoryFormats = async () => {
   }
 }
 
-export const setupTweego = async () => {
+export const setupTweego = async (options?: TweenodeSetupConfig) => {
   if (!existsSync(getTweenodeFolderPath())) {
-    await downloadTweego()
+    await downloadTweego(options)
     await extractTweego()
 
-    if (config.setup!.storyFormats!.formats!.length > 0) {
-      await downloadCustomStoryFormats()
+    if (
+      config.setup!.storyFormats!.formats!.length > 0 ||
+      options!.storyFormats!.formats!.length > 0
+    ) {
+      await downloadCustomStoryFormats(options)
     }
   }
 }

src/get_tweego_url.ts

@@ -1,5 +1,4 @@
-import { loadConfig } from './handle_config'
-const config = await loadConfig()
+import { config } from './state'
 
 const ARCH_MAPPING = {
   ia32: 'x86',

src/handle_config.ts

@@ -82,8 +82,13 @@ export interface TweenodeSetupConfig {
   storyFormats?: {
     /**
      * When `false`, it will delete all formats shipped with Tweego
+     * @deprecated use cleanTweegoBuiltins
      */
-    useTweegoBuiltin: boolean
+    useTweegoBuiltin?: boolean
+    /**
+     * When `true`, it will delete all formats shipped with Tweego
+     */
+    cleanTweegoBuiltins: boolean
     /**
      * Array of custom formats to be downloaded
      */
@@ -93,6 +98,7 @@ export interface TweenodeSetupConfig {
 
 export interface TweenodeDebugConfig {
   writeToLog: boolean
+  detachProcess: boolean
 }
 
 export interface TweenodeConfig {
@@ -143,6 +149,7 @@ export const loadConfig = async (
 export const defaultConfig: Partial<TweenodeConfig> = {
   debug: {
     writeToLog: false,
+    detachProcess: false,
   },
   build: {
     output: {
@@ -157,7 +164,7 @@ export const defaultConfig: Partial<TweenodeConfig> = {
       version: '2.1.1',
     },
     storyFormats: {
-      useTweegoBuiltin: false,
+      cleanTweegoBuiltins: false,
       formats: [
         {
           name: 'sugarcube-2',
@@ -179,6 +186,8 @@ export const defaultConfig: Partial<TweenodeConfig> = {
 
 /**
  * Defines configs for use in Tweenode
+ * # This may get removed
+ * # Currently, only works as intended on Bun
  * @example
  * // ./tweenode.config.ts (Can be .js)
  *import { defineConfig, type TweenodeConfig } from 'tweenode'

src/index.ts

@@ -1,5 +1,5 @@
-import { defineConfig } from './handle_config'
+import { defineConfig, defaultConfig } from './handle_config'
 import { Tweenode } from './run_tweego'
 import { setupTweego } from './download_tweego'
 
-export { Tweenode, setupTweego, defineConfig }
+export { Tweenode, setupTweego, defineConfig, defaultConfig }

src/run_tweego.ts

@@ -2,14 +2,13 @@ import { spawn, type ChildProcessWithoutNullStreams } from 'node:child_process'
 import { resolve } from 'node:path'
 import { appendFileSync } from 'node:fs'
 import { outputFile, removeSync } from 'fs-extra/esm'
-import {
-  loadConfig,
+import type {
   TweenodeBuildConfig,
   TweenodeDebugConfig,
   TweenodeSetupConfig,
 } from './handle_config'
 
-const loadedConfig = await loadConfig()
+import { config as loadedConfig } from './state'
 
 import { verifyBinarie } from './verify_tweego'
 import { getTweenodeFolderPath } from './download_tweego'
@@ -48,8 +47,9 @@ export class Tweenode {
     const args = getArgs(this.buildConfig)
 
     try {
+      console.log(args)
       this.childProcess = spawn(this.tweegoBinariePath, args, {
-        detached: true,
+        detached: this.debugConfig.detachProcess,
         env: {
           ...process.env,
           TWEEGO_PATH: resolve(getTweenodeFolderPath(), 'storyformats'),

src/state.ts

@@ -0,0 +1,5 @@
+import { loadConfig } from './handle_config'
+
+let config = await loadConfig()
+
+export { config }