@c6fc/spellcraft 0.0.2 → 0.0.3

package/package.json

@@ -7,7 +7,7 @@
   },
   "name": "@c6fc/spellcraft",
   "description": "Extensible JSonnet CLI platform",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "src/index.js",
   "directories": {
     "lib": "lib"

package/src/index.js

@@ -10,6 +10,8 @@ const { Jsonnet } = require("@hanazuki/node-jsonnet");
 
 const baseDir = process.cwd();
 
+const thisPackage = JSON.parse(fs.readFileSync("./package.json"));
+
 /**
  * @constant {object} defaultFileTypeHandlers
  * @description Default handlers for different file types based on their extensions.
@@ -328,30 +330,15 @@ exports.SpellFrame = class SpellFrame {
             console.log(`[+] Successfully installed ${npmPackage}.`);
         }
 
-        const packageJsonPath = path.join(npmPath, 'package.json');
-        if (!fs.existsSync(packageJsonPath)) {
-            throw new Error(`[!] Package ${npmPackage} is missing package.json at ${packageJsonPath}`);
-        }
-
-        const packageConfig = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-        const spellcraftConfig = packageConfig.config || packageConfig.spellcraft; // Allow 'spellcraft' key too
+        const spellcraftConfig = thisPackage.config || thisPackage.spellcraft; // Allow 'spellcraft' key too
 
         if (!name && !spellcraftConfig?.spellcraft_module_default_name) {
-            console.log("Package config:", packageConfig);
+            console.log("Package config:", thisPackage);
             throw new Error(`[!] No import name specified for ${npmPackage}, and it has no 'spellcraft_module_default_name' in its package.json config.`);
         }
 
-        // Check if this project is also a module, which shouldn't contain a spellcraft_modules directory.
-        const thisPackageJsonPath = path.join(baseDir, 'package.json');
-        if (!fs.existsSync(npmPath)) {
-            throw new Error(`[!] There's no package.json for your project. Create one with 'npm init' first`);
-        }
-
-        const thisPackageConfig = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-        const thisSpellcraftConfig = packageConfig.config || packageConfig.spellcraft; // Allow 'spellcraft' key too
-
         // Only link if this package is not a module itself.
-        if (!!!thisSpellcraftConfig?.spellcraft_module_default_name) {
+        if (!!!spellcraftConfig?.spellcraft_module_default_name) {
 
             const packagesDirPath = path.join(baseDir, 'spellcraft_modules');
             if (!fs.existsSync(packagesDirPath)) {
@@ -375,7 +362,7 @@ exports.SpellFrame = class SpellFrame {
                 npmPackage.split('@')[0]; // Handles name and name@version
 
             const packagesKey = name || spellcraftConfig.spellcraft_module_default_name;
-            packages[packagesKey] = npmPackageBaseName; // Store the clean package name
+            packages[npmPackage] = packagesKey; // Store the clean package name
 
             fs.writeFileSync(packagesFilePath, JSON.stringify(packages, null, "\t"));
             console.log(`[+] Linked ${npmPackage} as SpellCraft module '${packagesKey}'`);
@@ -405,15 +392,10 @@ exports.SpellFrame = class SpellFrame {
         // Path to the dynamically generated libsonnet file that imports all modules
         const dynamicModulesImportFile = path.resolve(__dirname, '../modules/modules');
 
-        // It's crucial this file is managed carefully.
-        // If it exists from a previous failed run or other reasons, it might cause issues.
-        // Option 1: Delete if exists (simple, ensures clean state for this run)
         if (fs.existsSync(dynamicModulesImportFile)) {
-            // console.warn(`[!] Warning: Stale '${path.basename(dynamicModulesImportFile)}' found. It will be overwritten.`);
-            fs.unlinkSync(dynamicModulesImportFile); // Or ensure it's correctly generated by loadModulesFromModuleDirectory
+            fs.unlinkSync(dynamicModulesImportFile);
         }
-        // Option 2: Ensure loadModulesFromModuleDirectory overwrites or creates it.
-        // loadModulesFromModuleDirectory now handles creation/overwriting.
+        
 
         this.loadModulesFromModuleDirectory(dynamicModulesImportFile);
 
@@ -459,10 +441,10 @@ exports.SpellFrame = class SpellFrame {
             return [];
         }
 
-        const spellcraftConfig = packageConfig.config || packageConfig.spellcraft; // Allow 'spellcraft' key too
+        const spellcraftConfig = thisPackage.config || thisPackage.spellcraft; // Allow 'spellcraft' key too
 
         if (!!spellcraftConfig?.spellcraft_module_default_name) {
-            console.log("This package is a SpellCraft module. Skipping directory-based module import.");
+            console.log("[-] This package is a SpellCraft module. Skipping directory-based module import.");
             return []
         }
 
@@ -495,7 +477,7 @@ exports.SpellFrame = class SpellFrame {
             return [];
         }
         
-        return Object.entries(packages).map(([moduleKey, npmPackageName]) => {
+        return Object.entries(packages).map(([npmPackageName, moduleKey]) => {
             return this.loadModuleByName(moduleKey, npmPackageName);
         }).filter(Boolean); // Filter out any undefined results if a module fails to load
     }
@@ -510,7 +492,7 @@ exports.SpellFrame = class SpellFrame {
     loadModuleByName(moduleKey, npmPackageName) {
         const packageJsonPath = path.join(baseDir, 'node_modules', npmPackageName, 'package.json');
         if (!fs.existsSync(packageJsonPath)) {
-            console.warn(`[!] package.json not found for module '${moduleKey}' (package: ${npmPackageName}) at ${packageJsonPath}. Skipping.`);
+            console.trace(`[!] package.json not found for module '${moduleKey}' (package: ${npmPackageName}) at ${packageJsonPath}. Skipping.`);
             return false;
         }