start watch server

.github/workflows/auto-deprecate.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Use Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org/'

.github/workflows/continuous-delivery.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org'

.github/workflows/continuous-integration.yml

@@ -40,9 +40,9 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
-          node-version: 20
+          node-version: 17
 
       - name: Install Node.js dependencies
         run: npm i && npm run build

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org'

.github/workflows/release-please.yml

@@ -14,7 +14,7 @@ jobs:
           bump-patch-for-minor-pre-major: true
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         if: ${{ steps.release.outputs.release_created }}
-      - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
+      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
           node-version: 17
           registry-url: 'https://registry.npmjs.org'

CHANGELOG.md

@@ -2,81 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.3.5](https://github.com/sern-handler/cli/compare/v1.3.4...v1.3.5) (2025-01-29)
-
-
-### Bug Fixes
-
-* Update Dockerfile.TS.sern ([#149](https://github.com/sern-handler/cli/issues/149)) ([fca3c76](https://github.com/sern-handler/cli/commit/fca3c7601604215af9b6d66a137370064ae656e1))
-
-## [1.3.4](https://github.com/sern-handler/cli/compare/v1.3.3...v1.3.4) (2025-01-22)
-
-
-### Bug Fixes
-
-* tsconfig generator ([#145](https://github.com/sern-handler/cli/issues/145)) ([23d70c6](https://github.com/sern-handler/cli/commit/23d70c6e03860d1a69e3bffedd6910aba82071ab))
-
-## [1.3.3](https://github.com/sern-handler/cli/compare/v1.3.2...v1.3.3) (2024-08-07)
-
-
-### Bug Fixes
-
-* bunpnpminstall ([9c2d6d7](https://github.com/sern-handler/cli/commit/9c2d6d7389c41a071ab86570cebf987b02bbf450))
-
-## [1.3.2](https://github.com/sern-handler/cli/compare/v1.3.1...v1.3.2) (2024-07-31)
-
-
-### Bug Fixes
-
-* make tsconfig work with comments/trailing commas ([#142](https://github.com/sern-handler/cli/issues/142)) ([53ca446](https://github.com/sern-handler/cli/commit/53ca446a38076ed7b165dbbb41f346f028b7e394))
-
-## [1.3.1](https://github.com/sern-handler/cli/compare/v1.3.0...v1.3.1) (2024-07-27)
-
-
-### Miscellaneous Chores
-
-* release 1.3.1 ([2bb169f](https://github.com/sern-handler/cli/commit/2bb169f600172af8c8316b6c9420684a4de34e0d))
-
-## [1.3.0](https://github.com/sern-handler/cli/compare/v1.2.1...v1.3.0) (2024-07-27)
-
-
-### Features
-
-* plugin, no prompt, bug fixes ([#139](https://github.com/sern-handler/cli/issues/139)) ([20364fa](https://github.com/sern-handler/cli/commit/20364fa20d1f3bf70a1c0cfefbc1d6c9365a4925))
-
-
-### Bug Fixes
-
-* fix publish command for bun & pnpm ([#137](https://github.com/sern-handler/cli/issues/137)) ([d581142](https://github.com/sern-handler/cli/commit/d581142f082ed888036e58aa33e9d88d84d34c2f))
-
-## [1.2.1](https://github.com/sern-handler/cli/compare/v1.2.0...v1.2.1) (2024-02-08)
-
-
-### Bug Fixes
-
-* better error messages for publish ([d1832e4](https://github.com/sern-handler/cli/commit/d1832e44ce1b10aeb5b9dc902b7d35ab51c41ff3))
-
-## [1.2.0](https://github.com/sern-handler/cli/compare/v1.1.0...v1.2.0) (2024-01-29)
-
-
-### Features
-
-* make application id optional, thanks [@trueharuu](https://github.com/trueharuu) ([#130](https://github.com/sern-handler/cli/issues/130)) ([2d6e65a](https://github.com/sern-handler/cli/commit/2d6e65a1e6073f605aab192b8cea33037a04af2c))
-
-## [1.1.0](https://github.com/sern-handler/cli/compare/v1.0.3...v1.1.0) (2024-01-28)
-
-
-### Features
-
-* command clear ([#128](https://github.com/sern-handler/cli/issues/128)) ([303ac02](https://github.com/sern-handler/cli/commit/303ac0280c7c7c55f2670d49c9685b911670bc05))
-
-## [1.0.3](https://github.com/sern-handler/cli/compare/v1.0.2...v1.0.3) (2023-12-25)
-
-
-### Bug Fixes
-
-* intellisense for esm build ts ([#126](https://github.com/sern-handler/cli/issues/126)) ([a5cb668](https://github.com/sern-handler/cli/commit/a5cb66828eae47d3eac5b86c7e67c01dbed500d5))
-
 ## [1.0.2](https://github.com/sern-handler/cli/compare/v1.0.1...v1.0.2) (2023-11-04)
 
 

README.md

@@ -3,11 +3,11 @@
 </div>
 
 # Features
-- Manage discord application commands from the command line.
-- Install plugins from the community.
-- Really fast startup times (I think).
-- Deploy with premade docker configurations.
-- Inhouse build tool based on esbuild built for sern applications, nearly **zero** config.
+
+😁 **User Friendly** <br>
+💦 **Simple** <br>
+🌱 **Efficient** <br>
+💪 **Powerful** <br>
 
 ## Installation
 
@@ -61,23 +61,3 @@ Run `npm create @sern/bot` for an interactive setup on a brand new project using
 
 sern runs on your plugins. Contribute to our [repository](https://github.com/sern-handler/awesome-plugins) and then install the plugins via our cli! <br>
 Run `sern plugins` to see all installable plugins.
-
-
-## Development
-
-```sh
-git clone https://github.com/sern-handler/cli.git
-```
-## insall i
-```sh 
-npm i 
-```
-## build it
-```sh 
-npm run build
-```
-## make it usable globally
-- if sern is installed globally already, you may need to uninstall it.
-```sh 
-npm link
-```

package.json

@@ -1,63 +1,63 @@
 {
-  "name": "@sern/cli",
-  "version": "1.3.5",
-  "description": "Official CLI for @sern/handler",
-  "exports": "./dist/index.js",
-  "bin": {
-    "sern": "./dist/index.js"
-  },
-  "type": "module",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "format": "prettier --check .",
-    "fix": "prettier --write .",
-    "build": "tsup",
-    "watch": "tsup --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sern-handler/cli.git"
-  },
-  "keywords": [
-    "cli",
-    "discord",
-    "discord.js",
-    "sern",
-    "sern-handler"
-  ],
-  "author": "EvolutionX",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/sern-handler/cli/issues"
-  },
-  "homepage": "https://sern.dev",
-  "dependencies": {
-    "@esbuild-kit/cjs-loader": "^2.4.2",
-    "@esbuild-kit/esm-loader": "^2.5.5",
-    "colorette": "2.0.20",
-    "commander": "11.0.0",
-    "dotenv": "^16.3.1",
-    "esbuild": "^0.19.1",
-    "execa": "7.2.0",
-    "find-up": "6.3.0",
-    "glob": "^10.3.3",
-    "ora": "6.3.1",
-    "prompts": "2.4.2",
-    "undici": "5.23.0"
-  },
-  "devDependencies": {
-    "@babel/parser": "^7.22.5",
-    "@favware/npm-deprecate": "1.0.7",
-    "@types/prompts": "2.4.4",
-    "prettier": "2.8.8",
-    "tsup": "^6.7.0",
-    "typescript": "5.2.2"
-  },
-  "engines": {
-    "node": ">= 18.16.x"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  }
+    "name": "@sern/cli",
+    "version": "1.0.2",
+    "description": "Official CLI for @sern/handler",
+    "exports": "./dist/index.js",
+    "bin": {
+        "sern": "./dist/index.js"
+    },
+    "type": "module",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "format": "prettier --check .",
+        "fix": "prettier --write .",
+        "build": "tsup",
+        "watch": "tsup --watch"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/sern-handler/cli.git"
+    },
+    "keywords": [
+        "cli",
+        "discord",
+        "discord.js",
+        "sern",
+        "sern-handler"
+    ],
+    "author": "EvolutionX",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/sern-handler/cli/issues"
+    },
+    "homepage": "https://sern.dev",
+    "dependencies": {
+        "@esbuild-kit/cjs-loader": "^2.4.2",
+        "@esbuild-kit/esm-loader": "^2.5.5",
+        "colorette": "2.0.20",
+        "commander": "11.0.0",
+        "dotenv": "^16.3.1",
+        "esbuild": "^0.19.1",
+        "execa": "7.2.0",
+        "find-up": "6.3.0",
+        "glob": "^10.3.3",
+        "ora": "6.3.1",
+        "prompts": "2.4.2",
+        "undici": "5.23.0"
+    },
+    "devDependencies": {
+        "@babel/parser": "^7.22.5",
+        "@favware/npm-deprecate": "1.0.7",
+        "@types/prompts": "2.4.4",
+        "prettier": "2.8.8",
+        "tsup": "^6.7.0",
+        "typescript": "5.2.2"
+    },
+    "engines": {
+        "node": ">= 18.16.x"
+    },
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org/",
+        "access": "public"
+    }
 }

src/commands/build.ts

@@ -1,18 +1,16 @@
 import esbuild from 'esbuild';
-import { getConfig } from '../utilities/getConfig';
-import p from 'node:path';
+import { getConfig, type sernConfig } from '../utilities/getConfig';
+import { resolve } from 'node:path';
 import { glob } from 'glob';
 import { configDotenv } from 'dotenv';
 import assert from 'node:assert';
+import { imageLoader, validExtensions } from '../plugins/imageLoader';
 import defaultEsbuild from '../utilities/defaultEsbuildConfig';
 import { require } from '../utilities/require';
 import { pathExists, pathExistsSync } from 'find-up';
-import { mkdir, writeFile, readFile } from 'fs/promises';
+import { mkdir, writeFile } from 'fs/promises';
 import * as Preprocessor from '../utilities/preprocessor';
 import { bold, magentaBright } from 'colorette';
-import { parseTsConfig } from '../utilities/parseTsconfig';
-
-const VALID_EXTENSIONS = ['.ts', '.js' ];
 
 type BuildOptions = {
     /**
@@ -25,6 +23,10 @@ type BuildOptions = {
      * default = esm
      */
     format?: 'cjs' | 'esm';
+    /**
+     * extra esbuild plugins to build with sern.
+     */
+    esbuildPlugins?: esbuild.Plugin[];
     /**
      * https://esbuild.github.io/api/#drop-labels
      **/
@@ -44,81 +46,88 @@ type BuildOptions = {
      * default to .env.
      */
     env?: string;
-    /**
-     * flag: default false
-     */
-    sourcemap?: boolean;
-
 };
 
-const CommandHandlerPlugin = (buildConfig: Partial<BuildOptions>, ambientFilePath: string, sernTsConfigPath: string) => {
-    return {
-        name: "commandhandler",
-        setup(build) {
-
-            const options = build.initialOptions
-            const defVersion = () => JSON.stringify(require(p.resolve('package.json')).version);
-            options.define = { 
-                ...buildConfig.define ?? {},
-                __DEV__: `${buildConfig.mode === 'development'}`,
-                __PROD__: `${buildConfig.mode === 'production'}`,
-                __VERSION__: `${buildConfig.defineVersion ? `${defVersion()}` : 'undefined'}`
-            } ?? {} 
-            Preprocessor.writeTsConfig(buildConfig.format!, sernTsConfigPath, writeFile);
-            Preprocessor.writeAmbientFile(ambientFilePath, options.define!, writeFile);
-            
-        }
-    } as esbuild.Plugin
+/*
+ * locates jsconfig or tsconfig depending on language.
+ * If path is not given, default to the current working directory's `(js|ts)config.json`
+ */
+function resolveConfigPath (path: string|undefined, language: string) {
+   if(language === 'javascript') {
+    return path ?? resolve('jsconfig.json')
+   }
+   return path ?? resolve('tsconfig.json')
 }
-const resolveBuildConfig = (path: string|undefined, language: string) => {
-    if(language === 'javascript') {
-        return path ?? 'jsconfig.json'
+
+async function createBuildConfig(options: Record<string,any>, sernConfig: sernConfig) {
+    const buildConfigPath = resolve(options.project ?? 'sern.build.js');    
+    const defaultBuildConfig = {
+        defineVersion: true,
+        format: options.format ?? 'esm',
+        mode: options.mode ?? 'development',
+        dropLabels: [],
+        esbuildPlugins: [],
+        tsconfig: resolveConfigPath(options.tsconfig, sernConfig.language),
+        env: options.env ?? resolve('.env'),
+    } satisfies BuildOptions;
+
+    if(pathExistsSync(buildConfigPath)) {
+        return {
+             ...defaultBuildConfig,
+            ...(await import('file:///' + buildConfigPath)).default,
+        }
+    } else {
+        return defaultBuildConfig;
     }
-    return path ?? 'tsconfig.json'
+}
+
+function fillEnv(options: Record<string, any>) {
+    let env = {} as Record<string, string>;
+    configDotenv({ path: options.env, processEnv: env });
+    return env;
 }
 
 export async function build(options: Record<string, any>) {
     if (!options.supressWarnings) {
         console.info(`${magentaBright('EXPERIMENTAL')}: This API has not been stabilized. add -W or --suppress-warnings flag to suppress`);
     }
-    console.log(options)
     const sernConfig = await getConfig();
-    let buildConfig: BuildOptions; 
-    const buildConfigPath = p.resolve(options.project ?? 'sern.build.js');
+    const entryPoints = await glob(`./src/**/*{${validExtensions.join(',')}}`, {
+        ignore: {
+            ignored: (p) => p.name.endsWith('.d.ts'),
+        },
+    });
 
-    const defaultBuildConfig = {
-        defineVersion: true,
-        format: options.format ?? 'esm',
-        mode: options.mode ?? 'development',
-        dropLabels: [],
-        sourcemap: options.sourceMaps,
-        tsconfig: resolveBuildConfig(options.tsconfig, sernConfig.language),
-        env: options.env ?? '.env',
-        include: []
-    };
-    if (pathExistsSync(buildConfigPath)) {
-        //throwable, buildConfigPath may not exist
-        buildConfig = { ...defaultBuildConfig, ...(await import('file:///' + buildConfigPath)).default };
-    } else {
-        buildConfig = defaultBuildConfig;
-        console.log('No build config found, defaulting');
+    const buildConfig = await createBuildConfig(options, sernConfig);
+    let env = fillEnv(options);
+
+    if (env.MODE && !env.NODE_ENV) {
+        console.warn('Use NODE_ENV instead of MODE');
+        console.warn('MODE has no effect.');
+        console.warn(`https://nodejs.dev/en/learn/nodejs-the-difference-between-development-and-production/`);
     }
-    configDotenv({ path: buildConfig.env  });
-    
-    if (process.env.NODE_ENV) {
-        buildConfig.mode = process.env.NODE_ENV as 'production' | 'development';
+
+    if (env.NODE_ENV) {
+        buildConfig.mode = env.NODE_ENV as 'production' | 'development';
         console.log(magentaBright('NODE_ENV:'), 'Found NODE_ENV variable, setting `mode` to this.');
     }
-    assert(buildConfig.mode === 'development' || buildConfig.mode === 'production', 'Mode is not `production` or `development`');
+
+    assert(buildConfig.mode === 'development' 
+        || buildConfig.mode === 'production', 'Mode is not `production` or `development`');
+
+
     try {
-        let config = await parseTsConfig(buildConfig.tsconfig!);
-        config?.extends && console.warn("Extend the generated tsconfig")
+        let config = require(buildConfig.tsconfig!);
+        config.extends && console.warn("Please ensure to extend the generated tsconfig")
     } catch(e) {
-         console.error("no tsconfig / jsconfig found");
-         console.error(`Please create a ${sernConfig.language === 'javascript' ? 'jsconfig.json' : 'tsconfig.json' }`);
-         console.error('It should have at least extend the generated one sern makes.\n \
-                        { "extends": "./.sern/tsconfig.json" }');
-         throw e;
+         console.warn("no tsconfig / jsconfig found");
+         console.warn(`Please create a ${sernConfig.language === 'javascript' ? 'jsconfig.json' : 'tsconfig.json' }`);
+         console.warn("It should have at least extend the generated one sern makes.")
+         console.warn(`
+            { 
+                "extends": "./.sern/tsconfig.json",
+            }`.trim())
+        throw e;
     }
 
     console.log(bold('Building with:'));
@@ -127,35 +136,42 @@ export async function build(options: Record<string, any>) {
     console.log(' ', magentaBright('mode'), buildConfig.mode);
     console.log(' ', magentaBright('tsconfig'), buildConfig.tsconfig);
     console.log(' ', magentaBright('env'), buildConfig.env);
-    console.log(' ', magentaBright('sourceMaps'), buildConfig.sourcemap);
 
-    const sernDir = p.resolve('.sern'),
-          [ambientFilePath, sernTsConfigPath, genDir] = 
-          ['ambient.d.ts', 'tsconfig.json', 'generated'].map(f => p.resolve(sernDir, f));
+    const sernDir = resolve('.sern'),
+        genDir = resolve(sernDir, 'generated'),
+        ambientFilePath = resolve(sernDir, 'ambient.d.ts'),
+        packageJsonPath = resolve('package.json'),
+        sernTsConfigPath = resolve(sernDir, 'tsconfig.json'),
+        packageJson = () => require(packageJsonPath);
 
     if (!(await pathExists(genDir))) {
         console.log('Making .sern/generated dir, does not exist');
         await mkdir(genDir, { recursive: true });
     }
-    
-    const entryPoints = await glob(`src/**/*{${VALID_EXTENSIONS.join(',')}}`,{ 
-         ignore: {
-            ignored: (p) => p.name.endsWith('.d.ts'),
-        }
-    });
-    //https://esbuild.github.io/content-types/#tsconfig-json
-    const ctx = await esbuild.context({
-        entryPoints,
-        plugins: [CommandHandlerPlugin(buildConfig, ambientFilePath, sernTsConfigPath)],
-        sourcemap: buildConfig.sourcemap,
-        ...defaultEsbuild(buildConfig.format!, buildConfig.tsconfig),
-        dropLabels: [buildConfig.mode === 'production' ? '__DEV__' : '__PROD__', ...buildConfig.dropLabels!],
-    });
 
-    await ctx.rebuild()
-    if(options.watch) {
-        await ctx.watch()
-    } else {
-        await ctx.dispose()
+    try {
+        const defVersion = () => JSON.stringify(packageJson().version);
+        const define = {
+            ...(buildConfig.define ?? {}),
+            __DEV__: `${buildConfig.mode === 'development'}`,
+            __PROD__: `${buildConfig.mode === 'production'}`,
+        } satisfies Record<string, string>;
+
+        buildConfig.defineVersion && Object.assign(define, { __VERSION__: defVersion() });
+
+        await Preprocessor.writeTsConfig(buildConfig.format!, sernTsConfigPath, writeFile);
+        await Preprocessor.writeAmbientFile(ambientFilePath, define, writeFile);
+
+        //https://esbuild.github.io/content-types/#tsconfig-json
+        await esbuild.build({
+            entryPoints,
+            plugins: [imageLoader, ...(buildConfig.esbuildPlugins ?? [])],
+            ...defaultEsbuild(buildConfig.format!, buildConfig.tsconfig),
+            define,
+            dropLabels: [buildConfig.mode === 'production' ? '__DEV__' : '__PROD__', ...buildConfig.dropLabels!],
+        });
+    } catch (e) {
+        console.error(e);
+        process.exit(1);
     }
 }

src/commands/command-clear.ts

@@ -1,60 +0,0 @@
-import * as Rest from '../rest.js'
-import assert from 'node:assert'
-import dotenv from 'dotenv'
-import ora from 'ora';
-import type { CommandData, GuildId } from '../utilities/types.js';
-import { readFileSync, writeFile } from 'node:fs'
-import { resolve } from 'node:path'
-import prompts from 'prompts';
-
-const getConfirmation = (args: Record<string,any> ) => {
-    if(args.yes) {
-        return args.yes
-    } else {
-        return prompts({
-            type: 'confirm',
-            name: 'confirmation',
-            message: 'Are you sure you want to delete ALL your application commands?',
-            initial: true
-        }, { onCancel: () => (console.log("Cancelled operation  (￣┰￣*)"), process.exit(1)) })
-        .then(response => response.confirmation);
-    }
-}
-export async function commandClear(args: Record<string,any>) {
-    dotenv.configDotenv({ path: args.env || resolve('.env') })
-    const token = process.env.token || process.env.DISCORD_TOKEN;
-    assert(token, 'Could not find a token for this bot in .env or commandline. Do you have DISCORD_TOKEN in env?');
-    
-    const confirmation = await getConfirmation(args);
-   
-    if (confirmation) {
-        const spin = ora({
-            text: `Deleting ALL application commands...`,
-            spinner: 'aesthetic',
-        }).start();
-        const rest = await Rest.create(token);
-        let guildCommands: Record<GuildId, CommandData[]> 
-        try {
-            guildCommands = JSON.parse(readFileSync('.sern/command-data-remote.json', 'utf-8'))
-            await rest.updateGlobal([]);
-            delete guildCommands.global
-            for (const guildId in guildCommands) {
-                await rest.putGuildCommands(guildId, []);
-            }
-            writeFile('.sern/command-data-remote.json', "{}", (err) => {
-                if(err) {
-                    spin.fail("Error happened while writing to json:");
-                    console.error(err)
-                    process.exit(1)
-                }
-            })
-            spin.succeed();
-        } catch(e) {
-            spin.fail("Something went wrong. ");
-            throw e;
-        }
-    } else {
-        console.log('Operation canceled.  (￣┰￣*)');
-    }
-
-}

src/commands/list.ts

@@ -14,11 +14,9 @@ export function list() {
     const globalCommands = commands.global;
 
     delete commands.global;
-    if(globalCommands) {
-        console.log(bold('Global Commands'));
-        for (const command of globalCommands) log(command);
-    }
-    
+    console.log(bold('Global Commands'));
+    for (const command of globalCommands) log(command);
+
     console.log('\t');
 
     for (const guildId in commands) {

src/commands/plugins.ts

@@ -2,13 +2,12 @@ import { greenBright } from 'colorette';
 import fs from 'fs';
 import prompt from 'prompts';
 import { fetch } from 'undici';
+import { pluginsQ } from '../prompts/plugin.js';
 import { fromCwd } from '../utilities/fromCwd.js';
 import esbuild from 'esbuild';
-import { getConfig } from '../utilities/getConfig.js';
-import type { PromptObject } from 'prompts';
+import { getLang } from '../utilities/getLang.js';
 import { resolve } from 'path';
 import { require } from '../utilities/require.js';
-
 interface PluginData {
     description: string;
     hash: string;
@@ -16,57 +15,25 @@ interface PluginData {
     author: string[];
     link: string;
     example: string;
-    version: string;
+    version: '1.0.0';
 }
 
-const link = `https://raw.githubusercontent.com/sern-handler/awesome-plugins/main/pluginlist.json`;
-export async function fetchPluginData(): Promise<PluginData[]> {
-    return fetch(link)
-        .then(res => res.json())
-        .then(data =>  (data as PluginData[])) 
-        .catch(() => [])
-}
-
-export function pluginsQ(choices: PluginData[]): PromptObject[] {
-    return [{
-        name: 'list',
-        type: 'autocompleteMultiselect',
-        message: 'What plugins do you want to install?',
-        choices: choices.map(e => ({ title: e.name, value: e })),
-        min: 1,
-    }];
-}
 /**
  * Installs plugins to project
  */
-export async function plugins(args: string[], opts: Record<string, unknown>) {
-    const plugins = await fetchPluginData();
-    let selectedPlugins : PluginData[];
-    if(args.length) {
-        const normalizedArgs = args.map(str => str.toLowerCase())
-        console.log("Trying to find plugins to install...");
-        const results = plugins.reduce((acc, cur) => {
-            if(normalizedArgs.includes(cur.name.toLowerCase())) {
-                return [...acc, cur]
-            }
-            return acc;
-        }, [] as PluginData[]);
-        selectedPlugins = results;
-    } else {
-        selectedPlugins = (await prompt(pluginsQ(plugins))).list;
-    }
-    if (!selectedPlugins.length) {
-        process.exit(1);
-    }
-    const { language } = await getConfig();
-    for await (const plgData of selectedPlugins) {
+export async function plugins() {
+    const e: PluginData[] = (await prompt([await pluginsQ()])).list;
+    if (!e) process.exit(1);
+
+    const lang = await getLang();
+    for await (const plgData of e) {
         const pluginText = await download(plgData.link);
         const dir = fromCwd('/src/plugins');
         const linkNoExtension = `${process.cwd()}/src/plugins/${plgData.name}`;
         if (!fs.existsSync(dir)) {
             fs.mkdirSync(dir, { recursive: true });
         }
-        if (language === 'typescript') {
+        if (lang === 'typescript') {
             fs.writeFileSync(linkNoExtension + '.ts', pluginText);
         } else {
             const { type = undefined } = require(resolve('package.json'));
@@ -87,7 +54,7 @@ export async function plugins(args: string[], opts: Record<string, unknown>) {
         }
     }
 
-    const pluginNames = selectedPlugins.map((data) => {
+    const pluginNames = e.map((data) => {
         return 'Installed ' + data.name + ' ' + 'from ' + data.author.join(',');
     });
     console.log(`Successfully downloaded plugin(s):\n${greenBright(pluginNames.join('\n'))}`);

src/commands/publish.ts

@@ -11,22 +11,24 @@ export async function publish(commandDir: string | undefined, args: Partial<Publ
     // pass in args into the command.
     const rootPath = new URL('../', import.meta.url),
         publishScript = new URL('../dist/create-publish.js', rootPath);
-
     // assign args.import to empty array if non existent
     args.import ??= [];
 
+    args.token && console.info('Token passed through command line');
+    args.applicationId && console.info('applicationId passed through command line');
     commandDir && console.info('Publishing with override path: ', commandDir);
 
-    const isBunOrPnpm = rootPath.pathname.includes('.bun') || rootPath.pathname.includes('.pnpm');
-
-    const esmLoader = new URL(`${isBunOrPnpm ? '../../' : '../'}node_modules/@esbuild-kit/esm-loader/dist/index.js`, rootPath);
-
-    await import('dotenv/config');
+    const dotenvLocation = new URL('../node_modules/dotenv/config.js', rootPath),
+        esmLoader = new URL('../node_modules/@esbuild-kit/esm-loader/dist/index.js', rootPath);
 
     // We dynamically load the create-publish script in a child process so that we can pass the special
     // loader flag to require typescript files
     const command = fork(fileURLToPath(publishScript), [], {
-        execArgv: ['--loader', esmLoader.toString(), '--no-warnings'],
+        execArgv: ['--loader', esmLoader.toString(), '-r', fileURLToPath(dotenvLocation), '--no-warnings'],
+        env: {
+            token: args.token ?? '',
+            applicationId: args.applicationId ?? '',
+        },
     });
     // send paths object so we dont have to recalculate it in script
     command.send({ config, preloads: args.import, commandDir });

src/commands/watch.ts

@@ -0,0 +1,5 @@
+import esbuild from 'esbuild'
+
+export async function watch(argv: unknown) {
+
+}

src/create-publish.mts

@@ -2,38 +2,64 @@
  * This file is meant to be run with the esm / cjs esbuild-kit loader to properly import typescript modules
  */
 
-import { readdir, mkdir, writeFile } from 'fs/promises';
-import { basename, resolve, posix as pathpsx } from 'node:path';
+import { readdir, stat, mkdir, writeFile } from 'fs/promises';
+import { join, basename, extname, resolve } from 'node:path';
 import { pathExistsSync } from 'find-up';
 import assert from 'assert';
 import { once } from 'node:events';
 import * as Rest from './rest';
-import type { SernConfig } from './utilities/getConfig';
+import type { sernConfig } from './utilities/getConfig';
 import type { PublishableData, PublishableModule, Typeable } from './create-publish.d.ts';
 import { cyanBright, greenBright, redBright } from 'colorette';
-import { inspect } from 'node:util'
 import ora from 'ora';
 
+async function deriveFileInfo(dir: string, file: string) {
+    const fullPath = join(dir, file);
+    return {
+        fullPath,
+        fileStats: await stat(fullPath),
+        base: basename(file),
+    };
+}
+
+function isSkippable(filename: string) {
+    // empty string is for non extension files (directories)
+    const validExtensions = ['.js', '.cjs', '.mts', '.mjs', '.cts', '.ts', ''];
+    return filename[0] === '!' || !validExtensions.includes(extname(filename));
+}
 
 async function* readPaths(dir: string, shouldDebug: boolean): AsyncGenerator<string> {
-    const files = await readdir(dir, { withFileTypes: true });
-    for (const file of files) {
-        const fullPath = pathpsx.join(dir, file.name);
-        if (file.isDirectory()) {
-            if (!file.name.startsWith('!')) {
-                yield* readPaths(fullPath, shouldDebug);
+    try {
+        const files = await readdir(dir);
+        for (const file of files) {
+            const { fullPath, fileStats, base } = await deriveFileInfo(dir, file);
+
+            if (fileStats.isDirectory()) {
+                // TODO: refactor so that i dont repeat myself for files (line 71)
+                if (isSkippable(base)) {
+                    if (shouldDebug) console.info(`ignored directory: ${fullPath}`);
+                } else {
+                    yield* readPaths(fullPath, shouldDebug);
+                }
+            } else {
+                if (isSkippable(base)) {
+                    if (shouldDebug) console.info(`ignored: ${fullPath}`);
+                } else {
+                    yield 'file:///' + fullPath;
+                }
             }
-        } else if (!file.name.startsWith('!')) {
-            yield "file:///"+resolve(fullPath);
         }
+    } catch (err) {
+        throw err;
     }
 }
 
 // recieved sern config
 const [{ config, preloads, commandDir }] = await once(process, 'message'),
-    { paths } = config as SernConfig;
+    { paths } = config as sernConfig;
 
 for (const preload of preloads) {
+
     console.log("preloading: ", preload);
     await import('file:///' + resolve(preload));
 }
@@ -52,19 +78,21 @@ for await (const absPath of filePaths) {
         commandModule = commandModule.default;
     }
 
+    if (typeof config === 'function') {
+        config = config(absPath, commandModule);
+    }
+
+    try {
+        commandModule = commandModule.getInstance();
+    } catch {}
+
     if ((PUBLISHABLE & commandModule.type) != 0) {
         // assign defaults
         const filename = basename(absPath);
         const filenameNoExtension = filename.substring(0, filename.lastIndexOf('.'));
         commandModule.name ??= filenameNoExtension;
         commandModule.description ??= '';
-        commandModule.meta = {
-            absPath
-        }
         commandModule.absPath = absPath;
-        if (typeof config === 'function') {
-            config = config(absPath, commandModule);
-        }
         modules.push({ commandModule, config });
     }
 }
@@ -122,23 +150,8 @@ const makePublishData = ({ commandModule, config }: Record<string, Record<string
             description: makeDescription(applicationType, commandModule.description as string),
             absPath: commandModule.absPath as string,
             options: optionsTransformer((commandModule?.options ?? []) as Typeable[]),
-            dm_permission: config?.dmPermission ?? false,
+            dm_permission: config?.dmPermission,
             default_member_permissions: serialize(config?.defaultMemberPermissions),
-            //@ts-ignore
-            integration_types: (config?.integrationTypes ?? ['Guild']).map(
-                (s: string) => {
-                    if(s === "Guild") {
-                        return "0"
-                    } else if (s == "User") {
-                        return "1"
-                    } else {
-                        throw Error("IntegrationType is not one of Guild (0) or User (1)");
-                    }
-                }),
-            //@ts-ignore
-            contexts: config?.contexts ?? undefined,
-            name_localizations: commandModule.name_localizations,
-            description_localizations: commandModule.description_localizations
         },
         config,
     };
@@ -146,9 +159,12 @@ const makePublishData = ({ commandModule, config }: Record<string, Record<string
 
 // We can use these objects to publish to DAPI
 const publishableData = modules.map(makePublishData),
-    token = process.env.token || process.env.DISCORD_TOKEN;
+    token = process.env.token || process.env.DISCORD_TOKEN,
+    appid = process.env.applicationId || process.env.APPLICATION_ID;
 
 assert(token, 'Could not find a token for this bot in .env or commandline. Do you have DISCORD_TOKEN in env?');
+assert(appid, 'Could not find an application id for this bot in .env or commandline. Do you have APPLICATION_ID in env?');
+
 // partition globally published and guilded commands
 const [globalCommands, guildedCommands] = publishableData.reduce(
     ([globals, guilded], module) => {
@@ -165,7 +181,7 @@ const spin = ora(`Publishing ${cyanBright('Global')} commands`);
 
 globalCommands.length && spin.start();
 
-const rest = await Rest.create(token);
+const rest = Rest.create(appid, token);
 const res = await rest.updateGlobal(globalCommands);
 
 let globalCommandsResponse: unknown;
@@ -176,29 +192,25 @@ if (res.ok) {
     globalCommandsResponse = await res.json();
 } else {
     spin.fail(`Failed to publish global commands [Code: ${redBright(res.status)}]`);
-    let err: Error
-    console.error("Status Text ", res.statusText);
     switch(res.status) {
-        case 400 : {
-            const validation_errors = await res.json()
-            console.error('errors:', inspect(validation_errors, { depth: Infinity }));
-            console.error("Modules with validation errors:" 
-                          + inspect(Object.keys(validation_errors.errors).map(idx => globalCommands[idx as any])))
+        case 400 : 
             throw Error("400: Ensure your commands have proper fields and data with nothing left out");
-        }
-        case 404 : {
-            console.error('errors:', inspect(await res.json(), { depth: Infinity }));
+        case 404 : 
             throw Error("Forbidden 404. Is you application id and/or token correct?")
-        } 
-        case 429: {
-            console.error('errors:', inspect(await res.json(), { depth: Infinity }));
-            err = Error('Chill out homie, too many requests') 
-        } break;
-        default: {
-            console.error('errors:', inspect(await res.json(), { depth: Infinity }));
-            throw Error(res.status.toString() + " error")
-        }
+        case 429: 
+            throw Error('Chill out homie, too many requests')
     }
+    console.error('errors:',
+        await res
+            .json()
+            .then((res) => {
+                const errors = Object.values(res?.errors ?? {});
+                // @ts-ignore
+                return errors.map((err) => err?.name?._errors);
+            })
+            .catch(() => "No errors found (Unparsable json for a request with bad status code). Read the status code.")
+    );
+    console.error("Status Text ", res.statusText);
 }
 
 function associateGuildIdsWithData(data: PublishableModule[]): Map<string, PublishableData[]> {
@@ -221,6 +233,7 @@ function associateGuildIdsWithData(data: PublishableModule[]): Map<string, Publi
     return guildIdMap;
 }
 const guildCommandMap = associateGuildIdsWithData(guildedCommands);
+
 let guildCommandMapResponse = new Map<string, Record<string, unknown>>();
 
 for (const [guildId, array] of guildCommandMap.entries()) {
@@ -236,21 +249,12 @@ for (const [guildId, array] of guildCommandMap.entries()) {
     } else {
         spin.fail(`[${redBright(guildId)}] Failed to update commands for guild, Reason: ${result.message}`);
         switch(response.status) {
-            case 400 : {
-                console.error(inspect(result, { depth: Infinity }))
-                console.error("Modules with validation errors:" 
-                + inspect(Object.keys(result.errors).map(idx => array[idx as any])))
-
+            case 400 : 
                 throw Error("400: Ensure your commands have proper fields and data and nothing left out");
-            }
-            case 404 : {
-                console.error(inspect(result, { depth: Infinity }))
+            case 404 : 
                 throw Error("Forbidden 404. Is you application id and/or token correct?")
-            }
-            case 429: {
-                console.error(inspect(result, { depth: Infinity }))
+            case 429: 
                 throw Error('Chill out homie, too many requests')
-            }
         }
     }
 }
@@ -258,6 +262,7 @@ const remoteData = {
     global: globalCommandsResponse,
     ...Object.fromEntries(guildCommandMapResponse),
 };
+
 await writeFile(resolve(cacheDir, 'command-data-remote.json'), JSON.stringify(remoteData, null, 4), 'utf8');
 
 // TODO: add this in a verbose flag

src/index.ts

@@ -23,7 +23,7 @@ program
 program
     .command('plugins')
     .description('Install plugins from https://github.com/sern-handler/awesome-plugins')
-    .argument('[names...]', 'Names of plugins to install')
+    .option('-n --name', 'Name of plugin')
     .action((...args) => importDynamic('plugins.js').then((m) => m.plugins(...args)));
 
 program
@@ -40,29 +40,28 @@ program //
             .option('-W --suppress-warnings', 'suppress experimental warning')
             .option('-i, --import [scriptPath...]', 'Prerequire a script to load into publisher')
             .option('-t, --token [token]')
+            .option('--appId [applicationId]')
             .argument('[path]', 'path with respect to current working directory that will locate all published files')
             .action(async (...args) => importDynamic('publish.js').then((m) => m.publish(...args)))
-    ).addCommand(
+    )
+    .addCommand(
         new Command('list') //
             .description('List all slash commands')
-            .action(async (...args) => importDynamic('list.js').then((m) => m.list(...args))))
-    .addCommand(
-        new Command('clear')
-            .description('Clear and reset commands-data-remote.json and the api')
-            .option('-y, --yes', "Say yes to all prompts")
-            .option('-e, --env [path]', "Supply a path to a .env")
-            .action(async (...args) => importDynamic('command-clear.js').then((m) => m.commandClear(...args))));
+            .action(async (...args) => importDynamic('list.js').then((m) => m.list(...args)))
+    );
+
 program
     .command('build')
     .description('Build your bot')
     .option('-f --format [fmt]', 'The module system of your application. `cjs` or `esm`', 'esm')
     .option('-m --mode [mode]', 'the mode for sern to build in. `production` or `development`', 'development')
-    .option('-w --watch')
     .option('-W --suppress-warnings', 'suppress experimental warning')
     .option('-p --project [filePath]', 'build with the provided sern.build file')
     .option('-e --env', 'path to .env file')
-    .option('--source-maps', 'Whether to add source-maps to configuration', false)
     .option('--tsconfig [filePath]', 'Use this tsconfig')
     .action(async (...args) => importDynamic('build.js').then((m) => m.build(...args)));
-
+program
+    .command('watch')
+    .description('start a hmr session')
+    .action(async (...args) => importDynamic('watch.js').then((m) => m.watch(...args)))
 program.parse();

src/plugins/imageLoader.ts

@@ -0,0 +1,39 @@
+import fs from 'fs/promises';
+import path from 'node:path';
+import { require } from '../utilities/require.js';
+import { type Plugin } from 'esbuild';
+import { basename } from 'node:path';
+
+export const validExtensions = ['.ts', '.js', '.json', '.png', '.jpg', '.jpeg', '.webp'];
+
+//https://github.com/evanw/esbuild/issues/1051
+export const imageLoader = {
+    name: 'attachment-loader',
+    setup: (b) => {
+        const filter = new RegExp(`\.${validExtensions.slice(3).join('|')}$`);
+        b.onResolve({ filter }, (args) => {
+            //if the module is being imported, resolve the path and transform to the js stub
+            if (args.importer) {
+                const newPath = path
+                    .format({ ...path.parse(args.path), base: '', ext: '.js' })
+                    .split(path.sep)
+                    .join(path.posix.sep);
+                return { path: newPath, namespace: 'attachment-loader', external: true };
+            }
+            // if the file is actually the attachment, resolve the full dir
+            return { path: require.resolve(args.path, { paths: [args.resolveDir] }), namespace: 'attachment-loader' };
+        });
+
+        b.onLoad({ filter: /.*/, namespace: 'attachment-loader' }, async (args) => {
+            const base64 = await fs.readFile(args.path).then((s) => s.toString('base64'));
+            return {
+                contents: `
+                    var __toBuffer = (base64) => Buffer.from(base64, "base64");
+                    module.exports = {
+                        name: '${basename(args.path)}',
+                        attachment: __toBuffer("${base64}") 
+                    }`,
+            };
+        });
+    },
+} satisfies Plugin;

src/prompts/plugin.ts

@@ -0,0 +1,31 @@
+import type { Choice, PromptObject } from 'prompts';
+import { fetch } from 'undici';
+
+async function gimmechoices(): Promise<Choice[]> {
+    const link = `https://raw.githubusercontent.com/sern-handler/awesome-plugins/main/pluginlist.json`;
+
+    const resp = await fetch(link).catch(() => null);
+    if (!resp) return [{ title: 'No plugins found!', value: '', disabled: true }];
+    const data = (await resp.json()) as Data[];
+    const choices = data.map((e) => ({
+        title: e.name,
+        value: e,
+    }));
+
+    return choices;
+}
+
+export async function pluginsQ(): Promise<PromptObject> {
+    return {
+        name: 'list',
+        type: 'autocompleteMultiselect',
+        message: 'What plugins do you want to install?',
+        choices: await gimmechoices(),
+        min: 1,
+    };
+}
+
+interface Data {
+    name: string;
+    link: string;
+}

src/rest.ts

@@ -4,29 +4,19 @@ const baseURL = new URL('https://discord.com/api/v10/applications/');
 
 const excludedKeys = new Set(['command', 'absPath']);
 
-const publishablesIntoJson = (ps: PublishableModule[]) => {
-    const s = JSON.stringify(
+const publishablesIntoJson = (ps: PublishableModule[]) =>
+    JSON.stringify(
         ps.map((module) => module.data),
-        (key, value) => (excludedKeys.has(key) ? undefined : value), 4);
-    return s;
-}
+        (key, value) => (excludedKeys.has(key) ? undefined : value),
+        4
+    );
 
-export const create = async (token: string) => {
+export const create = (appid: string, token: string) => {
+    const globalURL = new URL(`${appid}/commands`, baseURL);
     const headers = {
         Authorization: 'Bot ' + token,
         'Content-Type': 'application/json',
     };
-    let me;
-    let appid: string;
-    try {
-        me = await fetch(new URL('@me', baseURL), { headers }).then(res => res.json());
-        appid = me.id;
-    } catch(e) {
-        console.log("Something went wrong while trying to fetch your application:");
-        throw e;
-    }
-    const globalURL = new URL(`${appid}/commands`, baseURL);
-    
     return {
         updateGlobal: (commands: PublishableModule[]) =>
             fetch(globalURL, {

src/types/config.d.ts

@@ -4,13 +4,16 @@ export interface sernConfig {
         base: string;
         commands: string;
     };
+    scripts?: {
+        prepublish?: string;
+    };
     buildPath: string;
     rest?: Record<string, Record<string, unknown>>;
 }
 
 export interface TheoreticalEnv {
     DISCORD_TOKEN: string;
-    APPLICATION_ID?: string;
-    MODE: 'production' | 'environment';
+    APPLICATION_ID: string;
+    MODE: 'PROD' | 'DEV';
     [name: string]: string;
 }

src/utilities/defaultEsbuildConfig.ts

@@ -1,11 +1,12 @@
 import type esbuild from 'esbuild';
 import { resolve } from 'path';
 
-export default (format: 'cjs' | 'esm', tsconfig: string|undefined, outdir='dist') => ({
+export default (format: 'cjs' | 'esm', tsconfig: string|undefined) =>
+    ({
         platform: 'node',
         format,
-        tsconfig,
+        tsconfig: tsconfig,
         logLevel: 'info',
         minify: false,
-        outdir: resolve(outdir),
+        outdir: resolve('dist'),
     } satisfies esbuild.BuildOptions);

src/utilities/edits.ts

@@ -1,7 +1,6 @@
 import { findUp } from 'find-up';
 import { readFile, rename, writeFile } from 'node:fs/promises';
 import { fromCwd } from './fromCwd.js';
-import { parseTsConfig } from './parseTsconfig.js';
 
 /**
  * It takes a string, finds the package.json file in the directory of the string, and changes the name
@@ -62,12 +61,10 @@ export async function editDirs(
     });
 
     if (tsconfig) {
-        const output = await parseTsConfig(tsconfig);
+        const output = JSON.parse(await readFile(tsconfig, 'utf8'));
         if (!output) throw new Error("Can't read your tsconfig.json.");
-        if (!output.compilerOptions) throw new Error("Can't find compilerOptions in your tsconfig.json.");
         output.compilerOptions.rootDir = srcName;
 
-        // This will strip comments/trailing commas from the tsconfig.json file
         await writeFile(tsconfig, JSON.stringify(output, null, 2));
     }
 

src/utilities/getConfig.ts

@@ -1,19 +1,18 @@
-import { findUp } from 'find-up';
 import { readFile } from 'node:fs/promises';
+import { findUp } from 'find-up';
 import assert from 'node:assert';
-
-
-export async function getConfig(): Promise<SernConfig> {
+export async function getConfig(): Promise<sernConfig> {
     const sernLocation = await findUp('sern.config.json');
     assert(sernLocation, "Can't find sern.config.json");
 
-    const output = JSON.parse(await readFile(sernLocation, 'utf8')) as SernConfig;
+    const output = JSON.parse(await readFile(sernLocation, 'utf8')) as sernConfig;
 
     assert(output, "Can't read your sern.config.json.");
 
     return output;
 }
-export interface SernConfig {
+
+export interface sernConfig {
     language: 'typescript' | 'javascript';
     defaultPrefix?: string;
     paths: {
@@ -21,7 +20,5 @@ export interface SernConfig {
         commands: string;
         events?: string;
     };
-    build?: {
-
-    }
+    buildPath: string;
 }

src/utilities/getLang.ts

@@ -0,0 +1,18 @@
+import { findUp } from 'find-up';
+import { readFile } from 'node:fs/promises';
+
+/**
+ * It finds the sern.config.json file, reads it, and returns the language property
+ * @returns The language of the project.
+ */
+export async function getLang(): Promise<'typescript' | 'javascript'> {
+    const sernLocation = await findUp('sern.config.json');
+
+    if (!sernLocation) throw new Error("Can't find sern.config.json");
+
+    const output = JSON.parse(await readFile(sernLocation, 'utf8'));
+
+    if (!output) throw new Error("Can't read your sern.config.json.");
+
+    return output.language;
+}

src/utilities/parseTsconfig.ts

@@ -1,50 +0,0 @@
-import { resolve } from 'node:path';
-import { readFile } from 'node:fs/promises';
-
-interface CompilerOptions {
-    target: string;
-    module: string;
-    lib: string[];
-    allowJs: boolean;
-    checkJs: boolean;
-    jsx: string;
-    declaration: boolean;
-    sourceMap: boolean;
-    outDir: string;
-    rootDir: string;
-    strict: boolean;
-    esModuleInterop: boolean;
-    forceConsistentCasingInFileNames: boolean;
-    noEmit: boolean;
-    importHelpers: boolean;
-    isolatedModules: boolean;
-    moduleResolution: string;
-    resolveJsonModule: boolean;
-    noEmitHelpers: boolean;
-}
-
-interface TsConfig {
-    compilerOptions: CompilerOptions;
-    files: string[];
-    include: string[];
-    exclude: string[];
-    extends: string;
-}
-
-const cleanJson = (json: string) =>
-    json
-        .replace(/\/\/.*$/gm, '')
-        .replace(/\/\*[\s\S]*?\*\//gm, '')
-        .replace(/,\s*([}\]])/g, '$1');
-
-export const parseTsConfig = async (path: string) => {
-    const absPath = resolve(path);
-    const fileContent = await readFile(absPath, 'utf-8');
-    const cleanContent = cleanJson(fileContent);
-
-    try {
-        return JSON.parse(cleanContent) as Partial<TsConfig>;
-    } catch (e) {
-        return null;
-    }
-};

src/utilities/preprocessor.ts

@@ -6,9 +6,9 @@ const processEnvType = (env: NodeJS.ProcessEnv) => {
     const envBuilder = new StringWriter();
 
     for (const key of entries) {
-        envBuilder.tab()
-                  .tab()
-                  .envField(key);
+        envBuilder.tab();
+        envBuilder.tab();
+        envBuilder.envField(key);
     }
     return envBuilder.build();
 };
@@ -37,14 +37,13 @@ const writeAmbientFile = async (path: string, define: Record<string, string>, wr
 
 const writeTsConfig = async (format: 'cjs' | 'esm', configPath: string, fw: FileWriter) => {
     //maybe better way to do this
+    const target = format === 'esm' ? { target: 'esnext' } : {};
     const sernTsConfig = {
         compilerOptions: {
-            //module determines top level await. CJS doesn't have that abliity afaik
-            module: format === 'cjs' ? 'node' : 'esnext',
             moduleResolution: 'node',
             strict: true,
             skipLibCheck: true,
-            target: 'esnext',
+            ...target,
             rootDirs: ['./generated', '../src'],
         },
         include: ['./ambient.d.ts', '../src'],
@@ -70,7 +69,6 @@ class StringWriter {
         return this;
     }
     envField(key: string) {
-        //if env field has space or parens, wrap key in ""
         if (/\s|\(|\)/g.test(key)) {
             this.fileString += `"${key}": string`;
         } else {

src/utilities/routebuilder.ts

@@ -1,92 +0,0 @@
-import { readdir, stat } from 'fs/promises';
-import { basename, join, parse, dirname } from 'path';
-import assert from 'assert';
-
-
-/**
- * Import any module based on the absolute path.
- * This can accept four types of exported modules
- * commonjs, javascript :
- * ```js
- * exports = commandModule({ })
- *
- * //or
- * exports.default = commandModule({ })
- * ```
- * esm javascript, typescript, and commonjs typescript
- * export default commandModule({})
- */
-export async function importModule<T>(absPath: string) {
-    let fileModule = await import(absPath);
-
-    let commandModule = fileModule.default;
-
-    assert(commandModule , `Found no export @ ${absPath}. Forgot to ignore with "!"? (!${basename(absPath)})?`);
-    if ('default' in commandModule ) {
-        commandModule = commandModule.default;
-    }
-    return { module: commandModule } as T;
-}
-
-
-export const fmtFileName = (fileName: string) => parse(fileName).name;
-
-
-export const getfilename = (path: string) => fmtFileName(basename(path));
-
-
-
-async function deriveFileInfo(dir: string, file: string) {
-    const fullPath = join(dir, file);
-    return { fullPath,
-             fileStats: await stat(fullPath),
-             base: basename(file) };
-}
-
-function parseWildcardName(filename: string): string | null {
-  const wildcardMatch = filename.match(/\[(.*?)\]/);
-  return wildcardMatch ? wildcardMatch[1] : null;
-}
-
-export class RouteEntry {
-    public import_path: string
-    public filename: string
-    public parent: string
-    public wildcardName: string | null;
-    constructor(public route: string) {
-        this.import_path = "file:///"+route
-        this.filename = getfilename(this.route)
-        this.parent = dirname(this.route);
-        this.wildcardName = parseWildcardName(this.filename);
-    }
-}
-
-export interface ReadPathsConfig {
-    dir: string
-    onDir?: (dir: string) => Promise<boolean>|boolean
-    onEntry?: (etry: RouteEntry) => RouteEntry
-}
-
-export async function* readPaths(
-    config: ReadPathsConfig
-): AsyncGenerator<RouteEntry> {
-    const files = await readdir(config.dir);
-    for (const file of files) {
-        const { fullPath, fileStats } = await deriveFileInfo(config.dir, file);
-        if (fileStats.isDirectory()) {
-            if(config.onDir && await config.onDir(fullPath)) {
-                yield* readPaths({ ...config, dir: fullPath });
-            } else {
-                yield* readPaths({ ...config, dir: fullPath });
-            }
-        } else {
-            const nowindowsPath = fullPath.replace(/\\/g, '/');
-            if(config.onEntry) {
-                yield config.onEntry(new RouteEntry(nowindowsPath));
-            } else {
-                yield new RouteEntry(nowindowsPath);
-            }
-        }
-    }
-}
-

templates/cf.js

@@ -1,117 +0,0 @@
-// i got this idea from chooks22
-"use modules";
-
-import { 
-    InteractionResponseFlags,
-    InteractionType,
-    verifyKey,
-    InteractionResponseType
-} from 'discord-interactions';
-//this will import all the modules statically
-
-class JsonResponse extends Response {
-  constructor(body, init) {
-    const jsonBody = JSON.stringify(body);
-    init = init || {
-      headers: {
-        'content-type': 'application/json;charset=UTF-8',
-      },
-    };
-    super(jsonBody, init);
-  }
-}
-
-function createContext(rawcontext) {
-    return rawcontext
-}
-async function executeModule(
-    emitter,
-    logger,
-    errHandler,
-    { module, task, args },
-) {
-    try {
-        await module.execute(args);
-        //emitter.emit('module.activate', /*resultPayload(PayloadType.Success, module)*/);
-    } catch(e) {
-        throw e 
-    }
-    
-}
-
-async function applyPlugins(module, payload) {
-    let success = true;
-    for (const plg of module.onEvent) {
-        const res = await plg.execute(payload);
-        if(!res.isOk()) {
-            success = false;
-        }
-    }
-    return success;
-}
-
-const router = Router();
-
-/**
- * A simple :wave: hello page to verify the worker is working.
- */
-router.get('/', (request, env) => {
-  return new Response(`👋 ${env.DISCORD_APPLICATION_ID}`);
-});
-
-/**
- * Main route for all requests sent from Discord.  All incoming messages will
- * include a JSON payload described here:
- * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
- */
-router.post('/', async (request, env) => {
-  const { isValid, interaction } = await server.verifyDiscordRequest(
-    request,
-    env,
-  );
-  if (!isValid || !interaction) {
-    return new Response('Bad request signature.', { status: 401 });
-  }
-
-  if (interaction.type === InteractionType.PING) {
-    // The `PING` message is used during the initial webhook handshake, and is
-    // required to configure the webhook in the developer portal.
-    return new JsonResponse({
-      type: InteractionResponseType.PONG,
-    });
-  }
-  if(interaction.type === InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE) {
-      "use autocomplete";
-  } else if (interaction.type === InteractionType.APPLICATION_COMMAND) {
-      "use slash";
-  }
-
-  console.error('Unknown Type');
-  return new JsonResponse({ error: 'Unknown Type' }, { status: 400 });
-});
-router.all('*', () => new Response('Not Found.', { status: 404 }));
-
-
-async function verifyDiscordRequest(request, env) {
-  const signature = request.headers.get('x-signature-ed25519');
-  const timestamp = request.headers.get('x-signature-timestamp');
-  const body = await request.text();
-  const isValidRequest =
-    signature &&
-    timestamp &&
-    verifyKey(body, signature, timestamp, env.DISCORD_PUBLIC_KEY);
-  if (!isValidRequest) {
-    return { isValid: false };
-  }
-
-  return { interaction: JSON.parse(body), isValid: true };
-}
-
-
-const server = {
-  verifyDiscordRequest: verifyDiscordRequest,
-  fetch: async function (request, env) {
-    return router.handle(request, env);
-  },
-};
-export default server;

templates/extra/Dockerfile.JS.sern

@@ -1,7 +1,5 @@
 FROM node:latest
 
-RUN npm install -g @sern/cli
-
 WORKDIR /app
 
 COPY package.json ./
@@ -10,6 +8,4 @@ RUN npm install
 
 COPY . .
 
-RUN sern build
-
-CMD node .
+CMD node src/index.js

templates/extra/Dockerfile.TS.sern

@@ -1,15 +1,15 @@
 FROM node:latest
 
-RUN npm install -g @sern/cli typescript@latest
-
 WORKDIR /app
 
 COPY package.json ./
 
 RUN npm install
 
+RUN npm install -D typescript
+
 COPY . .
 
-RUN sern build
+RUN tsc --build || npx -p typescript tsc --build
 
 CMD node dist/index.js

tsup.config.ts

@@ -1,6 +1,5 @@
 import { defineConfig } from 'tsup';
 import { createRequire } from 'node:module';
-
 const shared = {
     entry: [
         'src/index.ts',