mirror of
https://github.com/fleetbase/fleetbase.git
synced 2025-12-19 14:18:57 +00:00
fix: syntax error in extensions generator lib
This commit is contained in:
Ronald A. Richardson
@@ -19,24 +19,24 @@ module.exports = {
|
||||
*/
|
||||
included(app) {
|
||||
this._super.included.apply(this, arguments);
|
||||
|
||||
|
||||
console.log('[fleetbase-extensions-generator] ========================================');
|
||||
console.log('[fleetbase-extensions-generator] included() hook called');
|
||||
console.log('[fleetbase-extensions-generator] Project root:', this.project.root);
|
||||
|
||||
|
||||
// Discover extensions and cache them
|
||||
this._extensions = this.discoverExtensions();
|
||||
console.log('[fleetbase-extensions-generator] Found', this._extensions.length, 'extension(s)');
|
||||
|
||||
|
||||
// Generate files directly to app directory
|
||||
this.generateExtensionShims(this._extensions);
|
||||
this.generateExtensionLoaders(this._extensions);
|
||||
this.generateRouter(this._extensions);
|
||||
this.generateExtensionsManifest(this._extensions);
|
||||
|
||||
|
||||
// Set up file watching for extension.js files
|
||||
this.setupFileWatching();
|
||||
|
||||
|
||||
console.log('[fleetbase-extensions-generator] ========================================');
|
||||
},
|
||||
|
||||
@@ -50,42 +50,36 @@ module.exports = {
|
||||
|
||||
const chokidar = require('chokidar');
|
||||
const extensionPaths = [];
|
||||
|
||||
|
||||
// Collect all extension.js file paths
|
||||
for (const extension of this._extensions) {
|
||||
const extensionPath = path.join(
|
||||
this.project.root,
|
||||
'node_modules',
|
||||
extension.name,
|
||||
'addon',
|
||||
'extension.js'
|
||||
);
|
||||
|
||||
const extensionPath = path.join(this.project.root, 'node_modules', extension.name, 'addon', 'extension.js');
|
||||
|
||||
if (fs.existsSync(extensionPath)) {
|
||||
extensionPaths.push(extensionPath);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (extensionPaths.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
console.log('[fleetbase-extensions-generator] Watching', extensionPaths.length, 'extension file(s) for changes');
|
||||
|
||||
|
||||
// Watch extension files
|
||||
const watcher = chokidar.watch(extensionPaths, {
|
||||
persistent: true,
|
||||
ignoreInitial: true
|
||||
ignoreInitial: true,
|
||||
});
|
||||
|
||||
|
||||
watcher.on('change', (changedPath) => {
|
||||
console.log('[fleetbase-extensions-generator] Extension file changed:', changedPath);
|
||||
console.log('[fleetbase-extensions-generator] Regenerating extension files...');
|
||||
|
||||
|
||||
// Regenerate all extension files
|
||||
this.generateExtensionShims(this._extensions);
|
||||
this.generateExtensionLoaders(this._extensions);
|
||||
|
||||
|
||||
console.log('[fleetbase-extensions-generator] ✓ Regeneration complete');
|
||||
});
|
||||
},
|
||||
@@ -95,53 +89,47 @@ module.exports = {
|
||||
*/
|
||||
discoverExtensions() {
|
||||
console.log('[fleetbase-extensions-generator] Discovering extensions...');
|
||||
|
||||
|
||||
const extensions = [];
|
||||
const seenPackages = new Set();
|
||||
|
||||
const results = fg.sync([
|
||||
'node_modules/*/package.json',
|
||||
'node_modules/*/*/package.json'
|
||||
], {
|
||||
|
||||
const results = fg.sync(['node_modules/*/package.json', 'node_modules/*/*/package.json'], {
|
||||
cwd: this.project.root,
|
||||
absolute: true
|
||||
absolute: true,
|
||||
});
|
||||
|
||||
|
||||
for (const packagePath of results) {
|
||||
let packageData = null;
|
||||
|
||||
|
||||
try {
|
||||
const packageJson = fs.readFileSync(packagePath, 'utf8');
|
||||
packageData = JSON.parse(packageJson);
|
||||
} catch (e) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// Check if this is a Fleetbase extension
|
||||
if (!packageData ||
|
||||
!packageData.keywords ||
|
||||
!packageData.keywords.includes('fleetbase-extension') ||
|
||||
!packageData.keywords.includes('ember-engine')) {
|
||||
if (!packageData || !packageData.keywords || !packageData.keywords.includes('fleetbase-extension') || !packageData.keywords.includes('ember-engine')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// Skip duplicates
|
||||
if (seenPackages.has(packageData.name)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
seenPackages.add(packageData.name);
|
||||
|
||||
|
||||
const extension = {
|
||||
name: packageData.name,
|
||||
version: packageData.version,
|
||||
fleetbase: packageData.fleetbase || {}
|
||||
fleetbase: packageData.fleetbase || {},
|
||||
};
|
||||
|
||||
|
||||
extensions.push(extension);
|
||||
console.log('[fleetbase-extensions-generator] -', extension.name + '@' + extension.version);
|
||||
}
|
||||
|
||||
|
||||
return extensions;
|
||||
},
|
||||
|
||||
@@ -150,35 +138,29 @@ module.exports = {
|
||||
*/
|
||||
generateExtensionShims(extensions) {
|
||||
console.log('[fleetbase-extensions-generator] Generating extension shims...');
|
||||
|
||||
|
||||
const extensionsDir = path.join(this.project.root, 'app', 'extensions');
|
||||
|
||||
|
||||
// Create directory
|
||||
if (!fs.existsSync(extensionsDir)) {
|
||||
fs.mkdirSync(extensionsDir, { recursive: true });
|
||||
}
|
||||
|
||||
|
||||
let shimCount = 0;
|
||||
|
||||
|
||||
for (const extension of extensions) {
|
||||
const pkgName = extension.name;
|
||||
const mountName = this.getExtensionMountPath(pkgName);
|
||||
|
||||
|
||||
// Path to extension.js in the engine's addon directory
|
||||
const extensionPath = path.join(
|
||||
this.project.root,
|
||||
'node_modules',
|
||||
pkgName,
|
||||
'addon',
|
||||
'extension.js'
|
||||
);
|
||||
|
||||
const extensionPath = path.join(this.project.root, 'node_modules', pkgName, 'addon', 'extension.js');
|
||||
|
||||
// Check if extension.js exists
|
||||
if (!fs.existsSync(extensionPath)) {
|
||||
console.log('[fleetbase-extensions-generator] ! No extension.js found for', pkgName);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// Read the extension code
|
||||
let extensionCode;
|
||||
try {
|
||||
@@ -187,7 +169,7 @@ module.exports = {
|
||||
console.error('[fleetbase-extensions-generator] ! Failed to read extension.js for', pkgName, ':', error.message);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// Generate shim content
|
||||
const shimContent = `// GENERATED BY fleetbase-extensions-generator - DO NOT EDIT
|
||||
// Extension setup for ${pkgName}
|
||||
@@ -198,7 +180,7 @@ module.exports = {
|
||||
|
||||
${extensionCode}
|
||||
`;
|
||||
|
||||
|
||||
// Write shim file
|
||||
const shimPath = path.join(extensionsDir, `${mountName}.js`);
|
||||
try {
|
||||
@@ -209,7 +191,7 @@ ${extensionCode}
|
||||
console.error('[fleetbase-extensions-generator] ! Failed to write shim for', pkgName, ':', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log('[fleetbase-extensions-generator] Generated', shimCount, 'extension shim(s)');
|
||||
},
|
||||
|
||||
@@ -218,50 +200,39 @@ ${extensionCode}
|
||||
*/
|
||||
generateExtensionLoaders(extensions) {
|
||||
console.log('[fleetbase-extensions-generator] Generating extension loaders...');
|
||||
|
||||
|
||||
const utilsDir = path.join(this.project.root, 'app', 'utils');
|
||||
|
||||
|
||||
// Create directory
|
||||
if (!fs.existsSync(utilsDir)) {
|
||||
fs.mkdirSync(utilsDir, { recursive: true });
|
||||
}
|
||||
|
||||
const lines = [
|
||||
'// GENERATED BY fleetbase-extensions-generator - DO NOT EDIT',
|
||||
'// Extension loader map for dynamic imports',
|
||||
'',
|
||||
'export const EXTENSION_LOADERS = {'
|
||||
];
|
||||
|
||||
|
||||
const lines = ['// GENERATED BY fleetbase-extensions-generator - DO NOT EDIT', '// Extension loader map for dynamic imports', '', 'export const EXTENSION_LOADERS = {'];
|
||||
|
||||
let loaderCount = 0;
|
||||
|
||||
|
||||
for (const extension of extensions) {
|
||||
const pkgName = extension.name;
|
||||
|
||||
|
||||
// Check if extension.js exists
|
||||
const extensionPath = path.join(
|
||||
this.project.root,
|
||||
'node_modules',
|
||||
pkgName,
|
||||
'addon',
|
||||
'extension.js'
|
||||
);
|
||||
|
||||
const extensionPath = path.join(this.project.root, 'node_modules', pkgName, 'addon', 'extension.js');
|
||||
|
||||
if (!fs.existsSync(extensionPath)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
const mountName = this.getExtensionMountPath(pkgName);
|
||||
lines.push(` '${pkgName}': () => import('@fleetbase/console/extensions/${mountName}'),`);
|
||||
loaderCount++;
|
||||
}
|
||||
|
||||
|
||||
lines.push('};');
|
||||
lines.push('');
|
||||
|
||||
|
||||
const loadersContent = lines.join('\n');
|
||||
const loadersPath = path.join(utilsDir, 'extension-loaders.generated.js');
|
||||
|
||||
|
||||
try {
|
||||
fs.writeFileSync(loadersPath, loadersContent, 'utf8');
|
||||
console.log('[fleetbase-extensions-generator] \u2713 Generated app/utils/extension-loaders.generated.js with', loaderCount, 'loader(s)');
|
||||
@@ -275,59 +246,59 @@ ${extensionCode}
|
||||
*/
|
||||
generateRouter(extensions) {
|
||||
console.log('[fleetbase-extensions-generator] Generating router.js...');
|
||||
|
||||
|
||||
const routerMapFile = path.join(this.project.root, 'router.map.js');
|
||||
const routerFile = path.join(this.project.root, 'app', 'router.js');
|
||||
|
||||
|
||||
if (!fs.existsSync(routerMapFile)) {
|
||||
console.error('[fleetbase-extensions-generator] ! router.map.js not found at:', routerMapFile);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Read router.map.js (source template)
|
||||
const routerContent = fs.readFileSync(routerMapFile, 'utf8');
|
||||
|
||||
|
||||
// Separate extensions by mount location
|
||||
const consoleExtensions = [];
|
||||
const rootExtensions = [];
|
||||
|
||||
|
||||
for (const extension of extensions) {
|
||||
const mountLocation = extension.fleetbase?.route?.mountLocation || 'console';
|
||||
const route = extension.fleetbase?.route?.slug || this.getExtensionMountPath(extension.name);
|
||||
|
||||
|
||||
if (mountLocation === 'console') {
|
||||
consoleExtensions.push({ name: extension.name, route });
|
||||
} else if (mountLocation === 'root') {
|
||||
rootExtensions.push({ name: extension.name, route });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log('[fleetbase-extensions-generator] Console extensions:', consoleExtensions.length);
|
||||
console.log('[fleetbase-extensions-generator] Root extensions:', rootExtensions.length);
|
||||
|
||||
|
||||
// Parse and modify the router using simple string manipulation
|
||||
// (We'll use recast for proper AST manipulation)
|
||||
const recast = require('recast');
|
||||
const babelParser = require('recast/parsers/babel');
|
||||
|
||||
|
||||
const ast = recast.parse(routerContent, { parser: babelParser });
|
||||
|
||||
|
||||
let consoleAdded = 0;
|
||||
let rootAdded = 0;
|
||||
|
||||
|
||||
// Add console extensions
|
||||
if (consoleExtensions.length > 0) {
|
||||
consoleAdded = this.addConsoleExtensions(ast, consoleExtensions);
|
||||
}
|
||||
|
||||
|
||||
// Add root extensions
|
||||
if (rootExtensions.length > 0) {
|
||||
rootAdded = this.addRootExtensions(ast, rootExtensions);
|
||||
}
|
||||
|
||||
|
||||
// Generate output
|
||||
const output = recast.print(ast, { quote: 'single' }).code;
|
||||
|
||||
|
||||
try {
|
||||
fs.writeFileSync(routerFile, output, 'utf8');
|
||||
console.log('[fleetbase-extensions-generator] \u2713 Generated app/router.js');
|
||||
@@ -346,15 +317,16 @@ ${extensionCode}
|
||||
const types = recast.types;
|
||||
const n = types.namedTypes;
|
||||
const b = types.builders;
|
||||
|
||||
|
||||
let addedCount = 0;
|
||||
|
||||
|
||||
types.visit(ast, {
|
||||
visitCallExpression(path) {
|
||||
const node = path.node;
|
||||
|
||||
|
||||
// Look for this.route('console', ...) with path: '/'
|
||||
if (n.MemberExpression.check(node.callee) &&
|
||||
if (
|
||||
n.MemberExpression.check(node.callee) &&
|
||||
n.ThisExpression.check(node.callee.object) &&
|
||||
node.callee.property.name === 'route' &&
|
||||
node.arguments.length > 0 &&
|
||||
@@ -362,49 +334,36 @@ ${extensionCode}
|
||||
node.arguments[0].value === 'console' &&
|
||||
node.arguments.length > 1 &&
|
||||
n.ObjectExpression.check(node.arguments[1]) &&
|
||||
node.arguments[1].properties.some(p =>
|
||||
n.Property.check(p) &&
|
||||
p.key.name === 'path' &&
|
||||
n.Literal.check(p.value) &&
|
||||
p.value.value === '/'
|
||||
)) {
|
||||
|
||||
node.arguments[1].properties.some((p) => n.Property.check(p) && p.key.name === 'path' && n.Literal.check(p.value) && p.value.value === '/')
|
||||
) {
|
||||
// Find the function expression in the third argument (after path config)
|
||||
if (node.arguments.length > 2 && n.FunctionExpression.check(node.arguments[2])) {
|
||||
const functionExpression = node.arguments[2];
|
||||
|
||||
|
||||
// Add mount statements for each extension
|
||||
extensions.forEach(extension => {
|
||||
extensions.forEach((extension) => {
|
||||
// Check if already mounted
|
||||
if (!this.isEngineMounted(functionExpression.body.body, extension.name)) {
|
||||
const mountStatement = b.expressionStatement(
|
||||
b.callExpression(
|
||||
b.memberExpression(
|
||||
b.thisExpression(),
|
||||
b.identifier('mount')
|
||||
),
|
||||
[
|
||||
b.literal(extension.name),
|
||||
b.objectExpression([
|
||||
b.property('init', b.identifier('as'), b.literal(extension.route))
|
||||
])
|
||||
]
|
||||
)
|
||||
b.callExpression(b.memberExpression(b.thisExpression(), b.identifier('mount')), [
|
||||
b.literal(extension.name),
|
||||
b.objectExpression([b.property('init', b.identifier('as'), b.literal(extension.route))]),
|
||||
])
|
||||
);
|
||||
|
||||
|
||||
functionExpression.body.body.push(mountStatement);
|
||||
addedCount++;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
return false; // Don't traverse children
|
||||
}
|
||||
|
||||
|
||||
this.traverse(path);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
return addedCount;
|
||||
},
|
||||
|
||||
@@ -416,57 +375,47 @@ ${extensionCode}
|
||||
const types = recast.types;
|
||||
const n = types.namedTypes;
|
||||
const b = types.builders;
|
||||
|
||||
|
||||
let addedCount = 0;
|
||||
|
||||
|
||||
types.visit(ast, {
|
||||
visitCallExpression(path) {
|
||||
visitCallExpression: (path) => {
|
||||
const node = path.node;
|
||||
|
||||
|
||||
// Look for Router.map(function() { ... })
|
||||
if (n.MemberExpression.check(node.callee) &&
|
||||
if (
|
||||
n.MemberExpression.check(node.callee) &&
|
||||
n.Identifier.check(node.callee.object) &&
|
||||
node.callee.object.name === 'Router' &&
|
||||
node.callee.property.name === 'map' &&
|
||||
node.arguments.length > 0 &&
|
||||
n.FunctionExpression.check(node.arguments[0])) {
|
||||
|
||||
n.FunctionExpression.check(node.arguments[0])
|
||||
) {
|
||||
const functionExpression = node.arguments[0];
|
||||
|
||||
|
||||
// Add mount statements for each root extension
|
||||
extensions.forEach(extension => {
|
||||
extensions.forEach((extension) => {
|
||||
// Check if already mounted
|
||||
if (!this.isEngineMounted(functionExpression.body.body, extension.name)) {
|
||||
const mountStatement = b.expressionStatement(
|
||||
b.callExpression(
|
||||
b.memberExpression(
|
||||
b.thisExpression(),
|
||||
b.identifier('mount')
|
||||
),
|
||||
[
|
||||
b.literal(extension.name),
|
||||
b.objectExpression([
|
||||
b.property('init', b.identifier('as'), b.literal(extension.route))
|
||||
])
|
||||
]
|
||||
)
|
||||
b.callExpression(b.memberExpression(b.thisExpression(), b.identifier('mount')), [
|
||||
b.literal(extension.name),
|
||||
b.objectExpression([b.property('init', b.identifier('as'), b.literal(extension.route))]),
|
||||
])
|
||||
);
|
||||
|
||||
|
||||
functionExpression.body.body.push(mountStatement);
|
||||
addedCount++;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
return false; // Don't traverse children
|
||||
}
|
||||
|
||||
return false; // Don't traverse children
|
||||
}
|
||||
|
||||
|
||||
this.traverse(path);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
return addedCount;
|
||||
},
|
||||
|
||||
@@ -477,19 +426,21 @@ ${extensionCode}
|
||||
const recast = require('recast');
|
||||
const types = recast.types;
|
||||
const n = types.namedTypes;
|
||||
|
||||
|
||||
for (const statement of statements) {
|
||||
if (n.ExpressionStatement.check(statement) &&
|
||||
if (
|
||||
n.ExpressionStatement.check(statement) &&
|
||||
n.CallExpression.check(statement.expression) &&
|
||||
n.MemberExpression.check(statement.expression.callee) &&
|
||||
statement.expression.callee.property.name === 'mount' &&
|
||||
statement.expression.arguments.length > 0 &&
|
||||
n.Literal.check(statement.expression.arguments[0]) &&
|
||||
statement.expression.arguments[0].value === engineName) {
|
||||
statement.expression.arguments[0].value === engineName
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
},
|
||||
|
||||
@@ -498,17 +449,17 @@ ${extensionCode}
|
||||
*/
|
||||
generateExtensionsManifest(extensions) {
|
||||
console.log('[fleetbase-extensions-generator] Generating extensions manifest...');
|
||||
|
||||
|
||||
const publicDir = path.join(this.project.root, 'public');
|
||||
|
||||
|
||||
// Create directory
|
||||
if (!fs.existsSync(publicDir)) {
|
||||
fs.mkdirSync(publicDir, { recursive: true });
|
||||
}
|
||||
|
||||
|
||||
const manifestPath = path.join(publicDir, 'extensions.json');
|
||||
const manifestContent = JSON.stringify(extensions, null, 2);
|
||||
|
||||
|
||||
try {
|
||||
fs.writeFileSync(manifestPath, manifestContent, 'utf8');
|
||||
console.log('[fleetbase-extensions-generator] \u2713 Generated public/extensions.json');
|
||||
@@ -524,5 +475,5 @@ ${extensionCode}
|
||||
const segments = extensionName.split('/');
|
||||
let mountName = segments[1] || segments[0];
|
||||
return mountName.replace('-engine', '');
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
@@ -167,10 +167,7 @@ class RouterGeneratorPlugin extends Plugin {
|
||||
}
|
||||
|
||||
async build() {
|
||||
console.log('[RouterGenerator] ========================================');
|
||||
console.log('[RouterGenerator] Starting router generation...');
|
||||
console.log('[RouterGenerator] Project root:', this.projectRoot);
|
||||
console.log('[RouterGenerator] Output path:', this.outputPath);
|
||||
console.log('[RouterGenerator] Generating app/router.js...');
|
||||
|
||||
// Read discovered extensions from cache
|
||||
const extensionsCacheFile = path.join(this.inputPaths[0], 'extensions.json');
|
||||
@@ -211,13 +208,7 @@ class RouterGeneratorPlugin extends Plugin {
|
||||
const outputPath = path.join(this.outputPath, 'router.js');
|
||||
fs.writeFileSync(outputPath, output, 'utf8');
|
||||
|
||||
console.log('[RouterGenerator] ========================================');
|
||||
console.log('[RouterGenerator] ✓ Router generation complete');
|
||||
console.log('[RouterGenerator] Generated app/router.js');
|
||||
console.log('[RouterGenerator] - Console mounts:', consoleAdded);
|
||||
console.log('[RouterGenerator] - Root mounts:', rootAdded);
|
||||
console.log('[RouterGenerator] Output file:', outputPath);
|
||||
console.log('[RouterGenerator] ========================================');
|
||||
console.log(`[RouterGenerator] Generated app/router.js (${consoleAdded} console mounts, ${rootAdded} root mounts)`);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user