@microlight/core 0.7.0 → 0.8.0

package/dist/scripts/parseJSONFromDotJSFile.js

@@ -0,0 +1,74 @@
+import fs from 'fs';
+import { parse } from '@babel/parser';
+export const parseJSONFromDotJSFile = filePath => {
+  console.log(filePath);
+  // Read the contents of the file as UTF-8 text
+  const content = fs.readFileSync(filePath, 'utf-8');
+  try {
+    // Parse the file content into an Abstract Syntax Tree (AST)
+    // sourceType: 'module' allows ES6 import/export syntax
+    // plugins enable parsing of JSX and TypeScript syntax
+    const ast = parse(content, {
+      sourceType: 'module',
+      plugins: ['jsx', 'typescript']
+    });
+
+    // Search through the top-level statements (ast.program.body)
+    // to find the 'export default' statement
+    // Find the export default declaration
+    const exportDecl = ast.program.body.find(node => node.type === 'ExportDefaultDeclaration');
+
+    // If no export default is found, return null
+    if (!exportDecl) return null;
+
+    // Get the exported object, either direct or via identifier
+    // Get what's being exported (the declaration)
+    let objectAst = exportDecl.declaration;
+    // If the export is a variable (e.g., export default taskConfig)
+    if (objectAst.type === 'Identifier') {
+      // Find the variable declaration in the file
+      // (e.g., const taskConfig = { ... })
+      const varDecl = ast.program.body.find(node => node.type === 'VariableDeclaration' && node.declarations.some(d => d.id.name === objectAst.name));
+      if (varDecl) {
+        // Get the actual object from the variable declaration
+        objectAst = varDecl.declarations[0].init;
+      }
+    }
+
+    // Convert AST to string, replacing function values with null
+    // Convert the AST object to a string, with a custom replacer function
+    const cleanObject = JSON.stringify(objectAst, (key, value) => {
+      // If the value is a function (any type of function), replace it with null
+      if (value?.type === 'FunctionExpression' || value?.type === 'ArrowFunctionExpression' || value?.type === 'FunctionDeclaration') {
+        return null;
+      }
+      // Keep all other values as is
+      return value;
+    });
+
+    // Parse the cleaned object to get the final result
+    // Parse the string back to an object
+    // Replace AST-specific property names with prefixed versions
+    // This prevents these technical properties from conflicting with task properties
+    const taskConfig = JSON.parse(cleanObject.replace(/"type":|"start":|"end":|"loc":|"range":/g, '"_$1":'));
+
+    // Extract only the properties we care about
+    // Remove all the AST-specific properties using destructuring
+    // ...finalConfig contains all the remaining properties we want to keep
+    const {
+      _type,
+      _start,
+      _end,
+      _loc,
+      _range,
+      ...finalConfig
+    } = taskConfig;
+
+    // Return the clean task configuration object
+    return finalConfig;
+  } catch (err) {
+    // If any error occurs during parsing, log it and return null
+    console.error(`Error parsing task file ${filePath}:`, err);
+    return null;
+  }
+};

package/dist/scripts/prepareFolders.js

@@ -3,9 +3,10 @@ import path from 'path';
 // import { join, relative, dirname } from 'path';
 import fs from 'fs';
 const tasksDir = path.join(process.cwd(), 'src', 'tasks');
-const outputFile = path.resolve(process.cwd(), '.microlight', 'folderMap.js');
-const taskMapFile = path.resolve(process.cwd(), '.microlight', 'taskMap.js');
-const taskMap = (await import(taskMapFile))?.default;
+const outputFile = path.resolve(process.cwd(), '.microlight', 'folderMap.json');
+const taskMapFile = path.resolve(process.cwd(), '.microlight', 'taskMap.json');
+const taskMap = JSON.parse(fs.readFileSync(taskMapFile, 'utf-8'));
+// const taskMap = (await import(taskMapFile))?.default;
 let taskMapByFileName = {};
 Object.keys(taskMap).forEach(function (slug) {
   const task = taskMap[slug];
@@ -20,7 +21,14 @@ if (!fs.existsSync(tasksDir)) {
 }
 const getFolderFiles = function () {
   // Find all folder files
-  const folderPatterns = ['__ml.js', 'ml.js', 'ml.folder.js', '**/microlight.folder.js'];
+  const folderPatterns = [
+  // '__ml.js',
+  // 'ml.js',
+  '**/.mlrc'
+  // 'ml.folder.js',
+  // '**/microlight.folder.js',
+  // '**/microlight.folder.json',
+  ];
   const folderFiles = glob.sync(folderPatterns, {
     cwd: tasksDir,
     absolute: false
@@ -38,7 +46,10 @@ export async function prepareFolders() {
     folderName.pop();
     folderName = folderName.join('/');
     // console.log(folderName);
-    let folder = (await import(filePath))?.default;
+    // let folder = (await import(filePath))?.default;
+    const folder = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+    // let folder = (await parseJSONFromDotJSFile(filePath));
+
     // console.log(folder.default);
     // const taskName = path.basename(filePath, '.task.js');
     return [folderName, folder];
@@ -103,7 +114,7 @@ export async function prepareFolders() {
   // })
 
   // Write the generated code to a file
-  const outputCode = 'export default ' + JSON.stringify(folderMap, null, 2);
+  const outputCode = JSON.stringify(folderMap, null, 2);
 
   // Create the output directory if it doesn't exist
   const outputDir = path.dirname(outputFile);

package/dist/scripts/prepareTasks.js

@@ -3,9 +3,8 @@ import path from 'path';
 // import { join, relative, dirname } from 'path';
 import fs from 'fs';
 import { parse } from '@babel/parser';
-import * as babel from '@babel/core';
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
+// import generate from '@babel/generator';
+import generator from '@babel/generator';
 const tasksDir = path.join(process.cwd(), 'src', 'tasks');
 
 // Create tasks directory if it doesn't exist
@@ -55,6 +54,8 @@ ${cases}
 const parseTaskFile = filePath => {
   // Read the contents of the file as UTF-8 text
   const content = fs.readFileSync(filePath, 'utf-8');
+  // console.log(filePath);
+  // console.log(content);
   try {
     // Parse the file content into an Abstract Syntax Tree (AST)
     // sourceType: 'module' allows ES6 import/export syntax
@@ -68,7 +69,7 @@ const parseTaskFile = filePath => {
     // to find the 'export default' statement
     // Find the export default declaration
     const exportDecl = ast.program.body.find(node => node.type === 'ExportDefaultDeclaration');
-
+    // console.log(exportDecl);
     // If no export default is found, return null
     if (!exportDecl) return null;
 
@@ -86,37 +87,64 @@ const parseTaskFile = filePath => {
       }
     }
 
+    // console.log(objectAst);
+    // fs.writeFileSync('./temp/objectAst.json', JSON.stringify(objectAst,null,2), 'utf-8');
+
     // Convert AST to string, replacing function values with null
     // Convert the AST object to a string, with a custom replacer function
     const cleanObject = JSON.stringify(objectAst, (key, value) => {
       // If the value is a function (any type of function), replace it with null
       if (value?.type === 'FunctionExpression' || value?.type === 'ArrowFunctionExpression' || value?.type === 'FunctionDeclaration') {
         return null;
+        // return function(){};
       }
       // Keep all other values as is
       return value;
-    });
+    }, 2);
+    // fs.writeFileSync('./temp/cleanObject.json', cleanObject, 'utf-8');
 
     // Parse the cleaned object to get the final result
     // Parse the string back to an object
     // Replace AST-specific property names with prefixed versions
     // This prevents these technical properties from conflicting with task properties
+    // let task = {}
+    // cleanObject.properties.forEach(function(node){
+    //   task[node.key.name]='something';
+    // })
+    // const output = generate(JSON.parse(cleanObject), { /* options */ });
+    const output = generator.default(JSON.parse(cleanObject), {
+      jsonCompatible: true
+      // quotes: 'double',
+      // compact: false
+    });
+
+    // Parse and stringify to remove null values and ensure proper JSON formatting
+    // const jsonOutput = JSON.stringify(
+    //   JSON.parse(output.code, (key, value) => value === null ? undefined : value),
+    //   null,
+    //   2
+    // );
+    output.code = output.code.replace('fn:\n', '');
+
+    // let task = JSON.parse(output.code);
+    const task = eval(`(${output.code})`);
+    const jsonString = JSON.stringify(eval(`(${output.code})`), null, 2);
+    // console.log(jsonString);
+
+    // fs.writeFileSync('./temp/output.json', output.code, 'utf-8');
+    // fs.writeFileSync('./temp/jsonString.json', jsonString, 'utf-8');
+    // fs.writeFileSync('./temp/output.json', JSON.stringify(output.code,null,2), 'utf-8');
+
     const taskConfig = JSON.parse(cleanObject.replace(/"type":|"start":|"end":|"loc":|"range":/g, '"_$1":'));
+    // fs.writeFileSync('./temp/taskConfig.json', JSON.stringify(taskConfig,null,2), 'utf-8');
 
+    // fs.writeFileSync('./temp/taskConfig.json', JSON.stringify(taskConfig,null,2), 'utf-8');
     // Extract only the properties we care about
     // Remove all the AST-specific properties using destructuring
     // ...finalConfig contains all the remaining properties we want to keep
-    const {
-      _type,
-      _start,
-      _end,
-      _loc,
-      _range,
-      ...finalConfig
-    } = taskConfig;
 
     // Return the clean task configuration object
-    return finalConfig;
+    return task;
   } catch (err) {
     // If any error occurs during parsing, log it and return null
     console.error(`Error parsing task file ${filePath}:`, err);
@@ -140,8 +168,8 @@ export async function prepareTasksIndex() {
     folderName.pop();
     folderName = folderName.join('/');
     // return [taskName, task.default];
-    return [task?.default?.slug, {
-      ...task?.default,
+    return [task?.slug, {
+      ...task,
       ...{
         __file_name: taskName,
         __folder: folderName
@@ -156,8 +184,8 @@ export async function prepareTasksIndex() {
   // console.log(taskMap);
 
   // Write the generated code to a file
-  const outputCode = 'export default ' + JSON.stringify(taskMap, null, 2);
-  const outputFile = path.resolve(process.cwd(), '.microlight', 'taskMap.js');
+  const outputCode = JSON.stringify(taskMap, null, 2);
+  const outputFile = path.resolve(process.cwd(), '.microlight', 'taskMap.json');
   // Create the output directory if it doesn't exist
   const outputDir = path.dirname(outputFile);
   if (!fs.existsSync(outputDir)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microlight/core",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "private": false,
   "type": "module",
   "scripts": {
@@ -14,7 +14,7 @@
     "prepare:tasks": "microlight-core prepare tasks",
     "prepare:folders": "microlight-core prepare folders",
     "prepare:server": "microlight-core prepare server",
-    "prepare": "microlight-core prepare all",
+    "prepare2": "microlight-core prepare all",
     "start": "next start",
     "lint": "next lint"
   },
@@ -26,6 +26,7 @@
     "microlight-core": "./bin/microlight-core.js"
   },
   "dependencies": {
+    "@babel/generator": "^7.26.10",
     "@babel/parser": "^7.26.10",
     "@mui/joy": "^5.0.0-beta.51",
     "async": "^3.2.6",