starlight-cli 1.0.5 → 1.0.6

package/dist/index.js

@@ -1345,6 +1345,7 @@ const readlineSync = __nccwpck_require__(552);
 const fs = __nccwpck_require__(896);
 const Lexer = __nccwpck_require__(211);
 const Parser = __nccwpck_require__(222);
+const path = __nccwpck_require__(928);
 
 class ReturnValue {
   constructor(value) { this.value = value; }
@@ -1468,17 +1469,22 @@ this.global.define('str', arg => {
     }
     return result;
   }
- evalImport(node, env) {
-  const path = node.path;
+evalImport(node, env) {
+  const spec = node.path;
   let lib;
 
   try {
-    lib = require(path);
+    const resolved = require.resolve(spec, {
+      paths: [process.cwd()]
+    });
+    lib = require(resolved);
   } catch (e) {
-    const fullPath = path.endsWith('.sl') ? path : path + '.sl';
+    const fullPath = path.isAbsolute(spec)
+      ? spec
+      : path.join(process.cwd(), spec.endsWith('.sl') ? spec : spec + '.sl');
 
     if (!fs.existsSync(fullPath)) {
-      throw new Error(`Import not found: ${path}`);
+      throw new Error(`Import not found: ${spec}`);
     }
 
     const code = fs.readFileSync(fullPath, 'utf-8');
@@ -1493,30 +1499,28 @@ this.global.define('str', arg => {
       lib[key] = moduleEnv.store[key];
     }
 
-    // JS-style default export fallback
     lib.default = lib;
   }
 
-  for (const spec of node.specifiers) {
-    if (spec.type === 'DefaultImport') {
-      env.define(spec.local, lib.default ?? lib);
+  for (const imp of node.specifiers) {
+    if (imp.type === 'DefaultImport') {
+      env.define(imp.local, lib.default ?? lib);
     }
-
-    if (spec.type === 'NamespaceImport') {
-      env.define(spec.local, lib);
+    if (imp.type === 'NamespaceImport') {
+      env.define(imp.local, lib);
     }
-
-    if (spec.type === 'NamedImport') {
-      if (!(spec.imported in lib)) {
-        throw new Error(`Module '${path}' has no export '${spec.imported}'`);
+    if (imp.type === 'NamedImport') {
+      if (!(imp.imported in lib)) {
+        throw new Error(`Module '${spec}' has no export '${imp.imported}'`);
       }
-      env.define(spec.local, lib[spec.imported]);
+      env.define(imp.local, lib[imp.imported]);
     }
   }
 
   return null;
 }
 
+
   evalBlock(node, env) {
     let result = null;
     for (const stmt of node.body) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-cli",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Starlight Programming Language CLI",
   "bin": {
     "starlight": "index.js"

package/src/evaluator.js

@@ -2,6 +2,7 @@ const readlineSync = require('readline-sync');
 const fs = require('fs');
 const Lexer = require('./lexer');
 const Parser = require('./parser');
+const path = require('path');
 
 class ReturnValue {
   constructor(value) { this.value = value; }
@@ -125,17 +126,22 @@ this.global.define('str', arg => {
     }
     return result;
   }
- evalImport(node, env) {
-  const path = node.path;
+evalImport(node, env) {
+  const spec = node.path;
   let lib;
 
   try {
-    lib = require(path);
+    const resolved = require.resolve(spec, {
+      paths: [process.cwd()]
+    });
+    lib = require(resolved);
   } catch (e) {
-    const fullPath = path.endsWith('.sl') ? path : path + '.sl';
+    const fullPath = path.isAbsolute(spec)
+      ? spec
+      : path.join(process.cwd(), spec.endsWith('.sl') ? spec : spec + '.sl');
 
     if (!fs.existsSync(fullPath)) {
-      throw new Error(`Import not found: ${path}`);
+      throw new Error(`Import not found: ${spec}`);
     }
 
     const code = fs.readFileSync(fullPath, 'utf-8');
@@ -150,30 +156,28 @@ this.global.define('str', arg => {
       lib[key] = moduleEnv.store[key];
     }
 
-    // JS-style default export fallback
     lib.default = lib;
   }
 
-  for (const spec of node.specifiers) {
-    if (spec.type === 'DefaultImport') {
-      env.define(spec.local, lib.default ?? lib);
+  for (const imp of node.specifiers) {
+    if (imp.type === 'DefaultImport') {
+      env.define(imp.local, lib.default ?? lib);
     }
-
-    if (spec.type === 'NamespaceImport') {
-      env.define(spec.local, lib);
+    if (imp.type === 'NamespaceImport') {
+      env.define(imp.local, lib);
     }
-
-    if (spec.type === 'NamedImport') {
-      if (!(spec.imported in lib)) {
-        throw new Error(`Module '${path}' has no export '${spec.imported}'`);
+    if (imp.type === 'NamedImport') {
+      if (!(imp.imported in lib)) {
+        throw new Error(`Module '${spec}' has no export '${imp.imported}'`);
       }
-      env.define(spec.local, lib[spec.imported]);
+      env.define(imp.local, lib[imp.imported]);
     }
   }
 
   return null;
 }
 
+
   evalBlock(node, env) {
     let result = null;
     for (const stmt of node.body) {