From f0fb5ff1b162e86800a3b5b54e2a3ba0b91aaf35 Mon Sep 17 00:00:00 2001 From: jacob Date: Sun, 28 Apr 2024 13:50:56 -0500 Subject: [PATCH] step 1 --- src/commands/build.ts | 28 ++++++++++++++++++++-------- src/create-publish.mts | 2 +- src/utilities/getConfig.ts | 17 ----------------- templates/handler.js | 3 +++ 4 files changed, 24 insertions(+), 26 deletions(-) create mode 100644 templates/handler.js diff --git a/src/commands/build.ts b/src/commands/build.ts index 2c6a34c..4efdf36 100644 --- a/src/commands/build.ts +++ b/src/commands/build.ts @@ -12,7 +12,7 @@ import * as Preprocessor from '../utilities/preprocessor'; import { bold, magentaBright } from 'colorette'; import { readFile } from 'fs/promises' import { fileURLToPath} from 'node:url' -const validExtensions = ['.ts', '.js', '.json', '.png', '.jpg', '.jpeg', '.webp']; +const validExtensions = ['.ts', '.js' ]; type BuildOptions = { /** * Define __VERSION__ @@ -133,9 +133,6 @@ export async function build(options: Record) { const entryPoints = await glob(`./src/**/*{${validExtensions.join(',')}}`, { //for some reason, my ignore glob wasn't registering correctly' ignore: { - ignored: (p) => { - return p.name.endsWith('.d.ts') - }, childrenIgnored: p => p.isNamed('commands') }, }); @@ -188,14 +185,29 @@ export async function build(options: Record) { await writeFile("./dist/out.js", importedModulesTemplate); } else { - const entryPoints = await glob(`./src/**/*{${validExtensions.join(',')}}`, { - //for some reason, my ignore glob wasn't registering correctly' + const entryPoints = await glob(`./src/**/*{${validExtensions.join(',')}}`, { ignore: { - ignored: (p) => p.name.endsWith('.d.ts'), + childrenIgnored: p => p.isNamed('commands') }, }); - + const commandsPaths = await glob(`**/*`, { + ignore: { + ignored: p => p.isDirectory() + }, + cwd: "./src/commands/" + }); + const commandNames = commandsPaths.map(p.parse) + const commandsImports = commandNames.map(fname => { + return `import ${fname.name} from "./${p.join(`./commands/${fname.base}`).split(p.sep).join(p.posix.sep)}"` + }); + const commandMapTemplate = + `const commands = new Map();\n` + + commandNames.map(({ name }) => `commands.set(${name}.id, ${name})`).join("\n"); + + console.log(entryPoints) + console.log(commandsImports) + console.log(commandMapTemplate) const defVersion = () => JSON.stringify(packageJson().version); const define = { ...(buildConfig.define ?? {}), diff --git a/src/create-publish.mts b/src/create-publish.mts index 3593791..484094a 100644 --- a/src/create-publish.mts +++ b/src/create-publish.mts @@ -165,7 +165,7 @@ const makePublishData = ({ commandModule, config }: Record