feat(tsbundle): add npmextra-driven custom bundles, base64-ts output and interactive init wizard
This commit is contained in:
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@git.zone/tsbundle',
|
||||
version: '2.6.3',
|
||||
version: '2.7.0',
|
||||
description: 'a multi-bundler tool supporting esbuild, rolldown, and rspack for painless bundling of web projects'
|
||||
}
|
||||
|
||||
@@ -12,3 +12,25 @@ export interface IEnvTransportOptions {
|
||||
mode: 'test' | 'production';
|
||||
argv: ICliOptions;
|
||||
}
|
||||
|
||||
// Custom bundle configuration types
|
||||
export type TOutputMode = 'bundle' | 'base64ts';
|
||||
export type TBundler = 'esbuild' | 'rolldown' | 'rspack';
|
||||
|
||||
export interface IBundleConfig {
|
||||
from: string;
|
||||
to: string;
|
||||
outputMode?: TOutputMode;
|
||||
bundler?: TBundler;
|
||||
production?: boolean;
|
||||
includeFiles?: string[];
|
||||
}
|
||||
|
||||
export interface ITsbundleConfig {
|
||||
bundles: IBundleConfig[];
|
||||
}
|
||||
|
||||
export interface IBase64File {
|
||||
path: string;
|
||||
contentBase64: string;
|
||||
}
|
||||
|
||||
203
ts/mod_custom/index.ts
Normal file
203
ts/mod_custom/index.ts
Normal file
@@ -0,0 +1,203 @@
|
||||
import * as plugins from './plugins.js';
|
||||
import * as paths from '../paths.js';
|
||||
import * as interfaces from '../interfaces/index.js';
|
||||
import { TsBundle } from '../tsbundle.class.tsbundle.js';
|
||||
import { HtmlHandler } from '../mod_html/index.js';
|
||||
import { Base64TsOutput } from '../mod_output/index.js';
|
||||
|
||||
const TEMP_DIR = '.nogit/tsbundle-temp';
|
||||
|
||||
export class CustomBundleHandler {
|
||||
private cwd: string;
|
||||
private config: interfaces.ITsbundleConfig;
|
||||
|
||||
constructor(cwd: string = paths.cwd) {
|
||||
this.cwd = cwd;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load configuration from npmextra.json
|
||||
*/
|
||||
public async loadConfig(): Promise<boolean> {
|
||||
const npmextraInstance = new plugins.npmextra.Npmextra(this.cwd);
|
||||
this.config = npmextraInstance.dataFor<interfaces.ITsbundleConfig>('@git.zone/tsbundle', {
|
||||
bundles: [],
|
||||
});
|
||||
|
||||
if (!this.config.bundles || this.config.bundles.length === 0) {
|
||||
console.log('No bundle configuration found.');
|
||||
console.log('Run `tsbundle init` to create one.');
|
||||
return false;
|
||||
}
|
||||
|
||||
console.log(`Found ${this.config.bundles.length} bundle configuration(s)`);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Process all configured bundles
|
||||
*/
|
||||
public async processAllBundles(): Promise<void> {
|
||||
for (let i = 0; i < this.config.bundles.length; i++) {
|
||||
const bundleConfig = this.config.bundles[i];
|
||||
console.log(`\nProcessing bundle ${i + 1}/${this.config.bundles.length}: ${bundleConfig.from} -> ${bundleConfig.to}`);
|
||||
await this.processSingleBundle(bundleConfig);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Process a single bundle configuration
|
||||
*/
|
||||
private async processSingleBundle(bundleConfig: interfaces.IBundleConfig): Promise<void> {
|
||||
const outputMode = bundleConfig.outputMode || 'bundle';
|
||||
const bundler = bundleConfig.bundler || 'esbuild';
|
||||
|
||||
// Determine temp output path
|
||||
const tempDir = plugins.path.join(this.cwd, TEMP_DIR);
|
||||
const tempBundlePath = plugins.path.join(tempDir, `bundle-${Date.now()}.js`);
|
||||
|
||||
// Ensure temp directory exists
|
||||
await plugins.fs.directory(tempDir).create();
|
||||
|
||||
// Build the bundle to temp location
|
||||
const tsbundle = new TsBundle();
|
||||
await tsbundle.build(
|
||||
this.cwd,
|
||||
bundleConfig.from,
|
||||
tempBundlePath,
|
||||
{
|
||||
bundler,
|
||||
production: bundleConfig.production || false,
|
||||
}
|
||||
);
|
||||
|
||||
if (outputMode === 'base64ts') {
|
||||
await this.handleBase64TsOutput(bundleConfig, tempBundlePath);
|
||||
} else {
|
||||
await this.handleBundleOutput(bundleConfig, tempBundlePath);
|
||||
}
|
||||
|
||||
// Clean up temp file
|
||||
const tempFileExists = await plugins.fs.file(tempBundlePath).exists();
|
||||
if (tempFileExists) {
|
||||
await plugins.fs.file(tempBundlePath).delete();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle base64ts output mode
|
||||
*/
|
||||
private async handleBase64TsOutput(
|
||||
bundleConfig: interfaces.IBundleConfig,
|
||||
tempBundlePath: string
|
||||
): Promise<void> {
|
||||
const base64Output = new Base64TsOutput(this.cwd);
|
||||
|
||||
// Add the bundle itself
|
||||
const bundleContent = await plugins.fs.file(tempBundlePath).read();
|
||||
base64Output.addFile('bundle.js', bundleContent);
|
||||
|
||||
// Add included files
|
||||
if (bundleConfig.includeFiles && bundleConfig.includeFiles.length > 0) {
|
||||
for (const pattern of bundleConfig.includeFiles) {
|
||||
await base64Output.addFilesFromGlob(pattern);
|
||||
}
|
||||
}
|
||||
|
||||
// Write the TypeScript output
|
||||
await base64Output.writeToFile(bundleConfig.to);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle standard bundle output mode
|
||||
*/
|
||||
private async handleBundleOutput(
|
||||
bundleConfig: interfaces.IBundleConfig,
|
||||
tempBundlePath: string
|
||||
): Promise<void> {
|
||||
// Move bundle to final destination
|
||||
const toPath = plugins.smartpath.transform.toAbsolute(bundleConfig.to, this.cwd) as string;
|
||||
const toDir = plugins.path.dirname(toPath);
|
||||
await plugins.fs.directory(toDir).create();
|
||||
|
||||
const bundleContent = await plugins.fs.file(tempBundlePath).read();
|
||||
await plugins.fs.file(toPath).write(bundleContent);
|
||||
console.log(`Bundle written to: ${bundleConfig.to}`);
|
||||
|
||||
// Process included files (copy them)
|
||||
if (bundleConfig.includeFiles && bundleConfig.includeFiles.length > 0) {
|
||||
const htmlHandler = new HtmlHandler();
|
||||
const outputDir = plugins.path.dirname(toPath);
|
||||
|
||||
for (const pattern of bundleConfig.includeFiles) {
|
||||
await this.copyIncludedFiles(pattern, outputDir);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy files matching a pattern to the output directory
|
||||
*/
|
||||
private async copyIncludedFiles(pattern: string, outputDir: string): Promise<void> {
|
||||
const absolutePattern = plugins.smartpath.transform.toAbsolute(pattern, this.cwd) as string;
|
||||
const patternDir = plugins.path.dirname(absolutePattern);
|
||||
const patternBase = plugins.path.basename(absolutePattern);
|
||||
const isGlobPattern = patternBase.includes('*');
|
||||
|
||||
if (isGlobPattern) {
|
||||
const dirPath = patternDir.replace(/\/\*\*$/, '');
|
||||
const dirExists = await plugins.fs.directory(dirPath).exists();
|
||||
if (!dirExists) {
|
||||
console.log(`Directory does not exist: ${dirPath}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const isRecursive = pattern.includes('**');
|
||||
let entries;
|
||||
if (isRecursive) {
|
||||
entries = await plugins.fs.directory(dirPath).recursive().list();
|
||||
} else {
|
||||
entries = await plugins.fs.directory(dirPath).list();
|
||||
}
|
||||
|
||||
const filePattern = patternBase.replace('*', '.*');
|
||||
const regex = new RegExp(filePattern);
|
||||
|
||||
for (const entry of entries) {
|
||||
if (!entry.isDirectory && regex.test(entry.name)) {
|
||||
const fullPath = plugins.path.join(dirPath, entry.path);
|
||||
const relativePath = plugins.path.relative(this.cwd, fullPath);
|
||||
const destPath = plugins.path.join(outputDir, plugins.path.basename(entry.path));
|
||||
await plugins.fs.directory(plugins.path.dirname(destPath)).create();
|
||||
await plugins.fs.file(fullPath).copy(destPath);
|
||||
console.log(`Copied: ${relativePath} -> ${destPath}`);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const fileExists = await plugins.fs.file(absolutePattern).exists();
|
||||
if (!fileExists) {
|
||||
console.log(`File does not exist: ${absolutePattern}`);
|
||||
return;
|
||||
}
|
||||
const fileName = plugins.path.basename(absolutePattern);
|
||||
const destPath = plugins.path.join(outputDir, fileName);
|
||||
await plugins.fs.file(absolutePattern).copy(destPath);
|
||||
console.log(`Copied: ${pattern} -> ${destPath}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Run the custom bundle command
|
||||
*/
|
||||
export async function runCustomBundles(): Promise<void> {
|
||||
const handler = new CustomBundleHandler();
|
||||
const hasConfig = await handler.loadConfig();
|
||||
|
||||
if (!hasConfig) {
|
||||
return;
|
||||
}
|
||||
|
||||
await handler.processAllBundles();
|
||||
console.log('\nCustom bundle processing complete!');
|
||||
}
|
||||
1
ts/mod_custom/plugins.ts
Normal file
1
ts/mod_custom/plugins.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from '../plugins.js';
|
||||
377
ts/mod_init/index.ts
Normal file
377
ts/mod_init/index.ts
Normal file
@@ -0,0 +1,377 @@
|
||||
import * as plugins from './plugins.js';
|
||||
import * as paths from '../paths.js';
|
||||
import * as interfaces from '../interfaces/index.js';
|
||||
|
||||
// Preset configurations
|
||||
const PRESETS: Record<string, { description: string; config: interfaces.IBundleConfig }> = {
|
||||
element: {
|
||||
description: 'Web component / element bundle',
|
||||
config: {
|
||||
from: './ts_web/index.ts',
|
||||
to: './dist_bundle/bundle.js',
|
||||
outputMode: 'bundle',
|
||||
bundler: 'esbuild',
|
||||
},
|
||||
},
|
||||
website: {
|
||||
description: 'Full website with HTML and assets',
|
||||
config: {
|
||||
from: './ts_web/index.ts',
|
||||
to: './dist_serve/bundle.js',
|
||||
outputMode: 'bundle',
|
||||
bundler: 'esbuild',
|
||||
includeFiles: ['./html/**/*.html', './assets/**/*'],
|
||||
},
|
||||
},
|
||||
npm: {
|
||||
description: 'NPM package bundle (from ts/)',
|
||||
config: {
|
||||
from: './ts/index.ts',
|
||||
to: './dist_bundle/bundle.js',
|
||||
outputMode: 'bundle',
|
||||
bundler: 'esbuild',
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export class InitHandler {
|
||||
private cwd: string;
|
||||
private npmextraPath: string;
|
||||
|
||||
constructor(cwd: string = paths.cwd) {
|
||||
this.cwd = cwd;
|
||||
this.npmextraPath = plugins.path.join(this.cwd, 'npmextra.json');
|
||||
}
|
||||
|
||||
/**
|
||||
* Load existing npmextra.json or create empty config
|
||||
*/
|
||||
private async loadExistingConfig(): Promise<any> {
|
||||
const fileExists = await plugins.fs.file(this.npmextraPath).exists();
|
||||
if (fileExists) {
|
||||
const content = (await plugins.fs.file(this.npmextraPath).encoding('utf8').read()) as string;
|
||||
try {
|
||||
return JSON.parse(content);
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
/**
|
||||
* Save config to npmextra.json
|
||||
*/
|
||||
private async saveConfig(config: any): Promise<void> {
|
||||
const content = JSON.stringify(config, null, 2);
|
||||
await plugins.fs.file(this.npmextraPath).encoding('utf8').write(content);
|
||||
console.log(`\n✅ Configuration saved to npmextra.json`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Run the interactive init wizard
|
||||
*/
|
||||
public async runWizard(): Promise<void> {
|
||||
console.log('\n🚀 tsbundle configuration wizard\n');
|
||||
console.log('This wizard will help you configure bundle settings in npmextra.json.\n');
|
||||
|
||||
const npmextraJson = await this.loadExistingConfig();
|
||||
|
||||
if (!npmextraJson['@git.zone/tsbundle']) {
|
||||
npmextraJson['@git.zone/tsbundle'] = { bundles: [] };
|
||||
}
|
||||
|
||||
const existingBundles = npmextraJson['@git.zone/tsbundle'].bundles || [];
|
||||
|
||||
if (existingBundles.length > 0) {
|
||||
console.log(`Found ${existingBundles.length} existing bundle configuration(s):\n`);
|
||||
existingBundles.forEach((bundle: interfaces.IBundleConfig, i: number) => {
|
||||
console.log(` ${i + 1}. ${bundle.from} → ${bundle.to} (${bundle.outputMode || 'bundle'})`);
|
||||
});
|
||||
console.log('');
|
||||
}
|
||||
|
||||
let addMore = true;
|
||||
while (addMore) {
|
||||
const bundle = await this.configureSingleBundle();
|
||||
if (bundle) {
|
||||
npmextraJson['@git.zone/tsbundle'].bundles.push(bundle);
|
||||
console.log(`\n✅ Bundle configuration added!`);
|
||||
}
|
||||
|
||||
const continueInteract = new plugins.smartinteract.SmartInteract();
|
||||
continueInteract.addQuestions([
|
||||
{
|
||||
type: 'confirm',
|
||||
name: 'addAnother',
|
||||
message: 'Would you like to add another bundle configuration?',
|
||||
default: false,
|
||||
},
|
||||
]);
|
||||
const answers = await continueInteract.runQueue();
|
||||
addMore = answers.getAnswerFor('addAnother');
|
||||
}
|
||||
|
||||
await this.saveConfig(npmextraJson);
|
||||
|
||||
console.log('\n📋 Final configuration:\n');
|
||||
const bundles = npmextraJson['@git.zone/tsbundle'].bundles;
|
||||
bundles.forEach((bundle: interfaces.IBundleConfig, i: number) => {
|
||||
console.log(` Bundle ${i + 1}:`);
|
||||
console.log(` From: ${bundle.from}`);
|
||||
console.log(` To: ${bundle.to}`);
|
||||
console.log(` Mode: ${bundle.outputMode || 'bundle'}`);
|
||||
console.log(` Bundler: ${bundle.bundler || 'esbuild'}`);
|
||||
if (bundle.includeFiles && bundle.includeFiles.length > 0) {
|
||||
console.log(` Include: ${bundle.includeFiles.join(', ')}`);
|
||||
}
|
||||
console.log('');
|
||||
});
|
||||
|
||||
console.log('Run `tsbundle` to build your bundles.\n');
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure a single bundle interactively
|
||||
*/
|
||||
private async configureSingleBundle(): Promise<interfaces.IBundleConfig | null> {
|
||||
// First, ask for preset or custom
|
||||
const presetInteract = new plugins.smartinteract.SmartInteract();
|
||||
presetInteract.addQuestions([
|
||||
{
|
||||
type: 'list',
|
||||
name: 'preset',
|
||||
message: 'Choose a configuration:',
|
||||
choices: [
|
||||
{ name: 'element - Web component / element bundle', value: 'element' },
|
||||
{ name: 'website - Full website with HTML and assets', value: 'website' },
|
||||
{ name: 'npm - NPM package bundle (from ts/)', value: 'npm' },
|
||||
{ name: 'custom - Configure manually', value: 'custom' },
|
||||
],
|
||||
default: 'element',
|
||||
},
|
||||
]);
|
||||
|
||||
const presetAnswers = await presetInteract.runQueue();
|
||||
const selectedPreset = presetAnswers.getAnswerFor('preset') as string;
|
||||
|
||||
// If custom, go to full manual configuration
|
||||
if (selectedPreset === 'custom') {
|
||||
return this.configureManualBundle();
|
||||
}
|
||||
|
||||
// Show preset config and ask if user wants to use it or customize
|
||||
const preset = PRESETS[selectedPreset];
|
||||
console.log(`\n📦 ${preset.description}:`);
|
||||
console.log(` From: ${preset.config.from}`);
|
||||
console.log(` To: ${preset.config.to}`);
|
||||
console.log(` Mode: ${preset.config.outputMode}`);
|
||||
console.log(` Bundler: ${preset.config.bundler}`);
|
||||
if (preset.config.includeFiles && preset.config.includeFiles.length > 0) {
|
||||
console.log(` Include: ${preset.config.includeFiles.join(', ')}`);
|
||||
}
|
||||
|
||||
const confirmInteract = new plugins.smartinteract.SmartInteract();
|
||||
confirmInteract.addQuestions([
|
||||
{
|
||||
type: 'list',
|
||||
name: 'action',
|
||||
message: 'Use this configuration?',
|
||||
choices: [
|
||||
{ name: 'Yes, use as-is', value: 'use' },
|
||||
{ name: 'Customize it', value: 'customize' },
|
||||
],
|
||||
default: 'use',
|
||||
},
|
||||
]);
|
||||
|
||||
const confirmAnswers = await confirmInteract.runQueue();
|
||||
const action = confirmAnswers.getAnswerFor('action') as string;
|
||||
|
||||
if (action === 'use') {
|
||||
// Return the preset config directly
|
||||
return { ...preset.config };
|
||||
}
|
||||
|
||||
// Customize: pre-fill with preset values
|
||||
return this.configureManualBundle(preset.config);
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure a bundle manually with optional pre-filled values
|
||||
*/
|
||||
private async configureManualBundle(
|
||||
prefill?: Partial<interfaces.IBundleConfig>
|
||||
): Promise<interfaces.IBundleConfig> {
|
||||
const interact = new plugins.smartinteract.SmartInteract();
|
||||
|
||||
// Basic configuration questions
|
||||
interact.addQuestions([
|
||||
{
|
||||
type: 'input',
|
||||
name: 'from',
|
||||
message: 'Entry point TypeScript file:',
|
||||
default: prefill?.from || './ts_web/index.ts',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
name: 'to',
|
||||
message: 'Output file path:',
|
||||
default: prefill?.to || './dist_bundle/bundle.js',
|
||||
},
|
||||
{
|
||||
type: 'list',
|
||||
name: 'outputMode',
|
||||
message: 'Output mode:',
|
||||
choices: [
|
||||
{ name: 'bundle - Standard JavaScript bundle file', value: 'bundle' },
|
||||
{
|
||||
name: 'base64ts - TypeScript file with base64-encoded content (for Deno compile)',
|
||||
value: 'base64ts',
|
||||
},
|
||||
],
|
||||
default: prefill?.outputMode || 'bundle',
|
||||
},
|
||||
{
|
||||
type: 'list',
|
||||
name: 'bundler',
|
||||
message: 'Bundler to use:',
|
||||
choices: [
|
||||
{ name: 'esbuild (fastest, recommended)', value: 'esbuild' },
|
||||
{ name: 'rolldown (Rust-based, Rollup compatible)', value: 'rolldown' },
|
||||
{ name: 'rspack (Webpack compatible)', value: 'rspack' },
|
||||
],
|
||||
default: prefill?.bundler || 'esbuild',
|
||||
},
|
||||
{
|
||||
type: 'confirm',
|
||||
name: 'production',
|
||||
message: 'Enable production mode (minification)?',
|
||||
default: prefill?.production || false,
|
||||
},
|
||||
{
|
||||
type: 'confirm',
|
||||
name: 'hasIncludeFiles',
|
||||
message: 'Include additional files (HTML, assets)?',
|
||||
default: prefill?.includeFiles && prefill.includeFiles.length > 0 ? true : false,
|
||||
},
|
||||
]);
|
||||
|
||||
const answers = await interact.runQueue();
|
||||
|
||||
const bundle: interfaces.IBundleConfig = {
|
||||
from: answers.getAnswerFor('from'),
|
||||
to: answers.getAnswerFor('to'),
|
||||
outputMode: answers.getAnswerFor('outputMode') as interfaces.TOutputMode,
|
||||
bundler: answers.getAnswerFor('bundler') as interfaces.TBundler,
|
||||
production: answers.getAnswerFor('production'),
|
||||
};
|
||||
|
||||
// Update default output path based on mode
|
||||
if (bundle.outputMode === 'base64ts' && bundle.to === './dist_bundle/bundle.js') {
|
||||
const suggestInteract = new plugins.smartinteract.SmartInteract();
|
||||
suggestInteract.addQuestions([
|
||||
{
|
||||
type: 'input',
|
||||
name: 'to',
|
||||
message: 'For base64ts mode, suggest a .ts output path:',
|
||||
default: './ts/embedded-bundle.ts',
|
||||
},
|
||||
]);
|
||||
const suggestAnswers = await suggestInteract.runQueue();
|
||||
bundle.to = suggestAnswers.getAnswerFor('to');
|
||||
}
|
||||
|
||||
// Handle include files
|
||||
if (answers.getAnswerFor('hasIncludeFiles')) {
|
||||
bundle.includeFiles = await this.configureIncludeFiles(prefill?.includeFiles);
|
||||
}
|
||||
|
||||
return bundle;
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure files to include
|
||||
*/
|
||||
private async configureIncludeFiles(prefill?: string[]): Promise<string[]> {
|
||||
const includeFiles: string[] = [];
|
||||
let addMore = true;
|
||||
|
||||
// If we have prefilled values, show them first
|
||||
if (prefill && prefill.length > 0) {
|
||||
console.log('\nPre-configured include patterns:');
|
||||
prefill.forEach((p) => console.log(` - ${p}`));
|
||||
|
||||
const keepInteract = new plugins.smartinteract.SmartInteract();
|
||||
keepInteract.addQuestions([
|
||||
{
|
||||
type: 'confirm',
|
||||
name: 'keepPrefill',
|
||||
message: 'Keep these patterns?',
|
||||
default: true,
|
||||
},
|
||||
]);
|
||||
const keepAnswers = await keepInteract.runQueue();
|
||||
if (keepAnswers.getAnswerFor('keepPrefill')) {
|
||||
includeFiles.push(...prefill);
|
||||
}
|
||||
}
|
||||
|
||||
console.log('\nAdd files or glob patterns to include (e.g., ./html/index.html, ./assets/**/*):\n');
|
||||
|
||||
// Ask if user wants to add more patterns
|
||||
const addInteract = new plugins.smartinteract.SmartInteract();
|
||||
addInteract.addQuestions([
|
||||
{
|
||||
type: 'confirm',
|
||||
name: 'addPatterns',
|
||||
message: includeFiles.length > 0 ? 'Add more patterns?' : 'Add include patterns?',
|
||||
default: includeFiles.length === 0,
|
||||
},
|
||||
]);
|
||||
const addAnswers = await addInteract.runQueue();
|
||||
addMore = addAnswers.getAnswerFor('addPatterns');
|
||||
|
||||
while (addMore) {
|
||||
const fileInteract = new plugins.smartinteract.SmartInteract();
|
||||
fileInteract.addQuestions([
|
||||
{
|
||||
type: 'input',
|
||||
name: 'pattern',
|
||||
message: 'File or glob pattern:',
|
||||
default: includeFiles.length === 0 ? './html/index.html' : '',
|
||||
},
|
||||
]);
|
||||
|
||||
const fileAnswers = await fileInteract.runQueue();
|
||||
const pattern = fileAnswers.getAnswerFor('pattern');
|
||||
|
||||
if (pattern && pattern.trim()) {
|
||||
includeFiles.push(pattern.trim());
|
||||
console.log(` Added: ${pattern}`);
|
||||
}
|
||||
|
||||
const continueInteract = new plugins.smartinteract.SmartInteract();
|
||||
continueInteract.addQuestions([
|
||||
{
|
||||
type: 'confirm',
|
||||
name: 'addMore',
|
||||
message: 'Add another file/pattern?',
|
||||
default: false,
|
||||
},
|
||||
]);
|
||||
const continueAnswers = await continueInteract.runQueue();
|
||||
addMore = continueAnswers.getAnswerFor('addMore');
|
||||
}
|
||||
|
||||
return includeFiles;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Run the init command
|
||||
*/
|
||||
export async function runInit(): Promise<void> {
|
||||
const handler = new InitHandler();
|
||||
await handler.runWizard();
|
||||
}
|
||||
5
ts/mod_init/plugins.ts
Normal file
5
ts/mod_init/plugins.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
export * from '../plugins.js';
|
||||
|
||||
import * as smartinteract from '@push.rocks/smartinteract';
|
||||
|
||||
export { smartinteract };
|
||||
113
ts/mod_output/index.ts
Normal file
113
ts/mod_output/index.ts
Normal file
@@ -0,0 +1,113 @@
|
||||
import * as plugins from './plugins.js';
|
||||
import * as paths from '../paths.js';
|
||||
import * as interfaces from '../interfaces/index.js';
|
||||
|
||||
export class Base64TsOutput {
|
||||
private files: interfaces.IBase64File[] = [];
|
||||
private cwd: string;
|
||||
|
||||
constructor(cwd: string = paths.cwd) {
|
||||
this.cwd = cwd;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a file with its content to the output
|
||||
*/
|
||||
public addFile(filePath: string, content: Buffer | string): void {
|
||||
const contentBuffer = typeof content === 'string' ? Buffer.from(content, 'utf-8') : content;
|
||||
const contentBase64 = contentBuffer.toString('base64');
|
||||
this.files.push({
|
||||
path: filePath,
|
||||
contentBase64,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Add files matching a glob pattern
|
||||
*/
|
||||
public async addFilesFromGlob(pattern: string): Promise<void> {
|
||||
const absolutePattern = plugins.smartpath.transform.toAbsolute(pattern, this.cwd) as string;
|
||||
const patternDir = plugins.path.dirname(absolutePattern);
|
||||
const patternBase = plugins.path.basename(absolutePattern);
|
||||
|
||||
// Check if it's a directory pattern or file pattern
|
||||
const isGlobPattern = patternBase.includes('*');
|
||||
|
||||
if (isGlobPattern) {
|
||||
// Handle glob patterns
|
||||
const dirPath = patternDir.replace(/\/\*\*$/, '');
|
||||
const dirExists = await plugins.fs.directory(dirPath).exists();
|
||||
if (!dirExists) {
|
||||
console.log(`Directory does not exist: ${dirPath}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const isRecursive = pattern.includes('**');
|
||||
let entries;
|
||||
if (isRecursive) {
|
||||
entries = await plugins.fs.directory(dirPath).recursive().list();
|
||||
} else {
|
||||
entries = await plugins.fs.directory(dirPath).list();
|
||||
}
|
||||
|
||||
// Filter by pattern if needed
|
||||
const filePattern = patternBase.replace('*', '.*');
|
||||
const regex = new RegExp(filePattern);
|
||||
|
||||
for (const entry of entries) {
|
||||
if (!entry.isDirectory && regex.test(entry.name)) {
|
||||
const fullPath = plugins.path.join(dirPath, entry.path);
|
||||
const relativePath = plugins.path.relative(this.cwd, fullPath);
|
||||
const content = await plugins.fs.file(fullPath).read();
|
||||
this.addFile(relativePath, content);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Handle single file path
|
||||
const fileExists = await plugins.fs.file(absolutePattern).exists();
|
||||
if (!fileExists) {
|
||||
console.log(`File does not exist: ${absolutePattern}`);
|
||||
return;
|
||||
}
|
||||
const relativePath = plugins.path.relative(this.cwd, absolutePattern);
|
||||
const content = await plugins.fs.file(absolutePattern).read();
|
||||
this.addFile(relativePath, content);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate TypeScript file content
|
||||
*/
|
||||
public generateTypeScript(): string {
|
||||
const filesJson = JSON.stringify(this.files, null, 2);
|
||||
return `// Auto-generated by tsbundle - do not edit
|
||||
export const files: { path: string; contentBase64: string }[] = ${filesJson};
|
||||
`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Write the TypeScript file to disk
|
||||
*/
|
||||
public async writeToFile(outputPath: string): Promise<void> {
|
||||
const absolutePath = plugins.smartpath.transform.toAbsolute(outputPath, this.cwd) as string;
|
||||
const outputDir = plugins.path.dirname(absolutePath);
|
||||
await plugins.fs.directory(outputDir).create();
|
||||
const content = this.generateTypeScript();
|
||||
await plugins.fs.file(absolutePath).encoding('utf8').write(content);
|
||||
console.log(`Generated base64ts output: ${outputPath}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all collected files
|
||||
*/
|
||||
public getFiles(): interfaces.IBase64File[] {
|
||||
return this.files;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear all collected files
|
||||
*/
|
||||
public clear(): void {
|
||||
this.files = [];
|
||||
}
|
||||
}
|
||||
1
ts/mod_output/plugins.ts
Normal file
1
ts/mod_output/plugins.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from '../plugins.js';
|
||||
@@ -4,8 +4,10 @@ import * as path from 'path';
|
||||
export { path };
|
||||
|
||||
// pushrocks scope
|
||||
import * as npmextra from '@push.rocks/npmextra';
|
||||
import * as smartcli from '@push.rocks/smartcli';
|
||||
import * as smartfs from '@push.rocks/smartfs';
|
||||
import * as smartinteract from '@push.rocks/smartinteract';
|
||||
import * as smartlog from '@push.rocks/smartlog';
|
||||
import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
|
||||
import * as smartpath from '@push.rocks/smartpath';
|
||||
@@ -13,8 +15,10 @@ import * as smartpromise from '@push.rocks/smartpromise';
|
||||
import * as smartspawn from '@push.rocks/smartspawn';
|
||||
|
||||
export {
|
||||
npmextra,
|
||||
smartcli,
|
||||
smartfs,
|
||||
smartinteract,
|
||||
smartlog,
|
||||
smartlogDestinationLocal,
|
||||
smartpath,
|
||||
|
||||
@@ -1,70 +1,23 @@
|
||||
import * as plugins from './plugins.js';
|
||||
import { TsBundle } from './tsbundle.class.tsbundle.js';
|
||||
import { HtmlHandler } from './mod_html/index.js';
|
||||
import { logger } from './tsbundle.logging.js';
|
||||
import { AssetsHandler } from './mod_assets/index.js';
|
||||
import { runCustomBundles } from './mod_custom/index.js';
|
||||
import { runInit } from './mod_init/index.js';
|
||||
|
||||
export const runCli = async () => {
|
||||
const tsBundleCli = new plugins.smartcli.Smartcli();
|
||||
|
||||
// Default command: run custom bundles from npmextra.json
|
||||
tsBundleCli.standardCommand().subscribe(async (argvArg) => {
|
||||
const tsbundle = new TsBundle();
|
||||
await tsbundle.build(process.cwd(), argvArg.from, argvArg.to, argvArg);
|
||||
return;
|
||||
await runCustomBundles();
|
||||
});
|
||||
|
||||
tsBundleCli.addCommand('element').subscribe(async (argvArg) => {
|
||||
const tsbundle = new TsBundle();
|
||||
await tsbundle.build(
|
||||
process.cwd(),
|
||||
'./ts_web/index.ts',
|
||||
'./dist_bundle/bundle.js',
|
||||
argvArg,
|
||||
);
|
||||
// Explicit custom command (same as default)
|
||||
tsBundleCli.addCommand('custom').subscribe(async (argvArg) => {
|
||||
await runCustomBundles();
|
||||
});
|
||||
|
||||
tsBundleCli.addCommand('npm').subscribe(async (argvArg) => {
|
||||
const tsbundle = new TsBundle();
|
||||
const htmlHandler = new HtmlHandler();
|
||||
await tsbundle.build(
|
||||
process.cwd(),
|
||||
'./ts/index.ts',
|
||||
'./dist_bundle/bundle.js',
|
||||
argvArg,
|
||||
);
|
||||
});
|
||||
|
||||
tsBundleCli.addCommand('website').subscribe(async (argvArg) => {
|
||||
const tsbundle = new TsBundle();
|
||||
|
||||
// lets deal with the html
|
||||
const htmlHandler = new HtmlHandler();
|
||||
await tsbundle.build(
|
||||
process.cwd(),
|
||||
'./ts_web/index.ts',
|
||||
'./dist_serve/bundle.js',
|
||||
argvArg,
|
||||
);
|
||||
const htmlDirPath = plugins.path.join(process.cwd(), './html');
|
||||
let htmlFiles: string[] = [];
|
||||
const htmlDirExists = await plugins.fs.directory(htmlDirPath).exists();
|
||||
if (htmlDirExists) {
|
||||
const entries = await plugins.fs
|
||||
.directory(htmlDirPath)
|
||||
.filter(/\.html$/)
|
||||
.list();
|
||||
htmlFiles = entries.map((entry) => plugins.path.basename(entry.path));
|
||||
}
|
||||
for (const htmlFile of htmlFiles) {
|
||||
await htmlHandler.processHtml({
|
||||
from: `./html/${htmlFile}`,
|
||||
to: `./dist_serve/${htmlFile}`,
|
||||
minify: true,
|
||||
});
|
||||
}
|
||||
|
||||
// lets deal with the assets
|
||||
const assetsHandler = new AssetsHandler();
|
||||
await assetsHandler.processAssets();
|
||||
// Interactive init wizard
|
||||
tsBundleCli.addCommand('init').subscribe(async (argvArg) => {
|
||||
await runInit();
|
||||
});
|
||||
|
||||
tsBundleCli.startParse();
|
||||
|
||||
Reference in New Issue
Block a user