@slim-lang/core 1.2.0 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slim-lang/core",
-	"version": "1.2.0",
+	"version": "1.2.3",
 	"description": "Slim extends JavaScript with runtime types, structs, operators, and components, compiling to plain Javascript",
 	"main": "index.js",
 	"type": "module",

package/packages/slim/helpers/string.js

@@ -0,0 +1,43 @@
+import "./C:/Users/zeral/AppData/Local/Temp/claude/D--dev-slim-github/72243d74-23bd-4f88-a955-b7ed76b7e749/scratchpad/myapp/dist/external/core.js";
+import * as crypto from "node:crypto";
+import { SHA256, QuickHash } from "../types/hash.js";
+let _slimType = {};
+export const StringHelper = __typed_variable__({
+  len(str) {
+    let _slimType2 = {};
+    __typed_parameter__(str, __type_spec__(__type_ref__("string")), _slimType2, "str", false, `function "len": argument<0> "str" expected string, got ${type(str)}`);
+    if (type(str) == "string") return __typed_return__(str.length, __type_spec__(__type_ref__("int")), "len");
+  },
+  truncate(str, maxLength) {
+    let _slimType3 = {},
+      _slimType4 = {};
+    __typed_parameter__(str, __type_spec__(__type_ref__("string")), _slimType3, "str", false, `function "truncate": argument<0> "str" expected string, got ${type(str)}`);
+    __typed_parameter__(maxLength, __type_spec__(__type_ref__("int")), _slimType4, "maxLength", false, `function "truncate": argument<1> "maxLength" expected int, got ${type(maxLength)}`);
+    if (str.length > maxLength) {
+      return __typed_return__(str.slice(0, maxLength) + '...', __type_spec__(__type_ref__("string")), "truncate");
+    }
+    return __typed_return__(str, __type_spec__(__type_ref__("string")), "truncate");
+  },
+  hash(str) {
+    let _slimType5 = {};
+    __typed_parameter__(str, __type_spec__(__type_ref__("string")), _slimType5, "str", false, `function "hash": argument<0> "str" expected string, got ${type(str)}`);
+    return __typed_return__(crypto.createHash("sha256").update(str).digest("hex"), __type_spec__(__type_ref__("SHA256", () => SHA256)), "hash");
+  },
+  quickHash(str) {
+    let _slimType6 = {};
+    __typed_parameter__(str, __type_spec__(__type_ref__("string")), _slimType6, "str", false, `function "quickHash": argument<0> "str" expected string, got ${type(str)}`);
+    let hash = 0;
+    for (let i = 0; i < str.length; i++) {
+      hash = (hash << 5) - hash + str.charCodeAt(i);
+      hash |= 0;
+    }
+    return __typed_return__(hash, __type_spec__(__type_ref__("QuickHash", () => QuickHash)), "quickHash");
+  }
+}, __type_spec__(__type_ref__("object")), _slimType, "StringHelper");
+export { StringHelper as default };
+try {
+  __lock_object__(StringHelper);
+} catch (__err__) {
+  __handle_sync_error__(__err__);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJtYXBwaW5ncyI6Ijs7OztBQUdBLGFBQUFBLFlBQUEsR0FBQUMsa0JBQUEsQ0FBNEM7RUFDNUNDLElBQUFDLEdBQUE7SUFBQSxJQUFBQyxVQUFBO0lBQUFDLG1CQUFBLENBQUFGLEdBQUEsRUFBQUcsYUFBQSxDQUFBQyxZQUFBLGFBQUFILFVBQUEsMEVBQUFJLElBQUEsQ0FBQUwsR0FBQTtJQUNBLElBQUFLLElBQUEsQ0FBQUwsR0FBQSxDQUFxQixxQkFBQU0sZ0JBQUEsQ0FBQU4sR0FBQSxDQUFBTyxNQUFBLEVBQUFKLGFBQUEsQ0FBQUMsWUFBQTtFQUNyQjtFQUNBSSxTQUFBUixHQUFBLEVBQUFTLFNBQUE7SUFBQSxJQUFBQyxVQUFBO01BQUFDLFVBQUE7SUFBQVQsbUJBQUEsQ0FBQUYsR0FBQSxFQUFBRyxhQUFBLENBQUFDLFlBQUEsYUFBQU0sVUFBQSwrRUFBQUwsSUFBQSxDQUFBTCxHQUFBO0lBQUFFLG1CQUFBLENBQUFPLFNBQUEsRUFBQU4sYUFBQSxDQUFBQyxZQUFBLFVBQUFPLFVBQUEsd0ZBQUFOLElBQUEsQ0FBQUksU0FBQTtJQUNBLElBQUFULEdBQUEsQ0FBQU8sTUFBQSxHQUFBRSxTQUFBO01BQ0EsT0FBQUgsZ0JBQUEsQ0FBQU4sR0FBQSxDQUFBWSxLQUFBLElBQUFILFNBQUEsV0FBQU4sYUFBQSxDQUFBQyxZQUFBO0lBQ0E7SUFDQSxPQUFBRSxnQkFBQSxDQUFBTixHQUFBLEVBQUFHLGFBQUEsQ0FBQUMsWUFBQTtFQUNBO0VBQ0FTLEtBQUFiLEdBQUE7SUFBQSxJQUFBYyxVQUFBO0lBQUFaLG1CQUFBLENBQUFGLEdBQUEsRUFBQUcsYUFBQSxDQUFBQyxZQUFBLGFBQUFVLFVBQUEsMkVBQUFULElBQUEsQ0FBQUwsR0FBQTtJQUNBLE9BQUFNLGdCQUFBLENBQUFTLE1BQUEsQ0FBQUMsVUFBQSxXQUFBQyxNQUFBLENBQUFqQixHQUFBLEVBQUFrQixNQUFBLFNBQUFmLGFBQUEsQ0FBQUMsWUFBQSxpQkFBQWUsTUFBQTtFQUNBO0VBQ0FDLFVBQUFwQixHQUFBO0lBQUEsSUFBQXFCLFVBQUE7SUFBQW5CLG1CQUFBLENBQUFGLEdBQUEsRUFBQUcsYUFBQSxDQUFBQyxZQUFBLGFBQUFpQixVQUFBLGdGQUFBaEIsSUFBQSxDQUFBTCxHQUFBO0lBQ0EsSUFBQWEsSUFBQTtJQUNBLFNBQUFTLENBQUEsTUFBQUEsQ0FBQSxHQUFBdEIsR0FBQSxDQUFBTyxNQUFBLEVBQUFlLENBQUE7TUFDQVQsSUFBQSxJQUFBQSxJQUFBLFNBQUFBLElBQUEsR0FBQWIsR0FBQSxDQUFBdUIsVUFBQSxDQUFBRCxDQUFBO01BQ0FULElBQUE7SUFDQTtJQUNBLE9BQUFQLGdCQUFBLENBQUFPLElBQUEsRUFBQVYsYUFBQSxDQUFBQyxZQUFBLG9CQUFBb0IsU0FBQTtFQUNBO0FBQ0EsQ0FyQkEsRUFBQXJCLGFBQUEsQ0FBQUMsWUFBQSxhQUFBcUIsU0FBQTtBQUFBLFNBQUE1QixZQUFBLElBQUE2QixPQUFBO0FBcUJFO0VBRUZDLGVBQUEsQ0FBQTlCLFlBQUEsQ0FBaUI7QUFBQSxTQUFBK0IsT0FBQTtFQUFBQyxxQkFBQSxDQUFBRCxPQUFBO0FBQUEiLCJuYW1lcyI6WyJTdHJpbmdIZWxwZXIiLCJfX3R5cGVkX3ZhcmlhYmxlX18iLCJsZW4iLCJzdHIiLCJfc2xpbVR5cGUyIiwiX190eXBlZF9wYXJhbWV0ZXJfXyIsIl9fdHlwZV9zcGVjX18iLCJfX3R5cGVfcmVmX18iLCJ0eXBlIiwiX190eXBlZF9yZXR1cm5fXyIsImxlbmd0aCIsInRydW5jYXRlIiwibWF4TGVuZ3RoIiwiX3NsaW1UeXBlMyIsIl9zbGltVHlwZTQiLCJzbGljZSIsImhhc2giLCJfc2xpbVR5cGU1IiwiY3J5cHRvIiwiY3JlYXRlSGFzaCIsInVwZGF0ZSIsImRpZ2VzdCIsIlNIQTI1NiIsInF1aWNrSGFzaCIsIl9zbGltVHlwZTYiLCJpIiwiY2hhckNvZGVBdCIsIlF1aWNrSGFzaCIsIl9zbGltVHlwZSIsImRlZmF1bHQiLCJfX2xvY2tfb2JqZWN0X18iLCJfX2Vycl9fIiwiX19oYW5kbGVfc3luY19lcnJvcl9fIl0sImlnbm9yZUxpc3QiOltdLCJzb3VyY2VzIjpbIkQ6XFxkZXZcXHNsaW0tZ2l0aHViXFxwYWNrYWdlc1xcc2xpbVxcaGVscGVyc1xcc3RyaW5nLnNsaW0iXSwic291cmNlc0NvbnRlbnQiOlsidXNlICogYXMgY3J5cHRvIGZyb20gXCJub2RlOmNyeXB0b1wiXHJcbnVzZSB7IFNIQTI1NiwgUXVpY2tIYXNoIH0gZnJvbSBAc2xpbS90eXBlcy9oYXNoXHJcblxyXG5leHBvcnQgZGVmYXVsdCBjb25zdCBTdHJpbmdIZWxwZXI6IG9iamVjdCA9IHtcclxuICAgIGxlbihzdHI6IHN0cmluZyk6IGludCB7XHJcbiAgICAgICAgaWYoa2luZG9mIHN0ciA9PSBcInN0cmluZ1wiKSByZXR1cm4gc3RyLmxlbmd0aFxyXG4gICAgfSxcclxuICAgIHRydW5jYXRlKHN0cjogc3RyaW5nLCBtYXhMZW5ndGg6IGludCk6IHN0cmluZyB7XHJcbiAgICAgICAgaWYgKHN0ci5sZW5ndGggPiBtYXhMZW5ndGgpIHtcclxuICAgICAgICAgICAgcmV0dXJuIHN0ci5zbGljZSgwLCBtYXhMZW5ndGgpICsgJy4uLic7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiBzdHI7XHJcbiAgICB9LFxyXG4gICAgaGFzaChzdHI6IHN0cmluZyk6IFNIQTI1NiB7XHJcbiAgICAgICAgcmV0dXJuIGNyeXB0by5jcmVhdGVIYXNoKFwic2hhMjU2XCIpLnVwZGF0ZShzdHIpLmRpZ2VzdChcImhleFwiKVxyXG4gICAgfSxcclxuICAgIHF1aWNrSGFzaChzdHI6IHN0cmluZyk6IFF1aWNrSGFzaCB7XHJcbiAgICAgICAgbGV0IGhhc2ggPSAwO1xyXG4gICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgc3RyLmxlbmd0aDsgaSsrKSB7XHJcbiAgICAgICAgICAgIGhhc2ggPSAoaGFzaCA8PCA1KSAtIGhhc2ggKyBzdHIuY2hhckNvZGVBdChpKTtcclxuICAgICAgICAgICAgaGFzaCB8PSAwO1xyXG4gICAgICAgIH1cclxuICAgICAgICByZXR1cm4gaGFzaDtcclxuICAgIH1cclxufVxyXG5cclxubG9jayBTdHJpbmdIZWxwZXI7Il19

package/packages/slim/types/hash.js

@@ -0,0 +1,11 @@
+import "./C:/Users/zeral/AppData/Local/Temp/claude/D--dev-slim-github/72243d74-23bd-4f88-a955-b7ed76b7e749/scratchpad/myapp/dist/external/core.js";
+export const SHA256 = __type_def__("SHA256", v => {
+  return __sizeof__(v) == 64;
+}, {});
+export const QuickHash = __type_def__("QuickHash", v => {
+  return __sizeof__(v) == 8;
+}, {});
+try {} catch (__err__) {
+  __handle_sync_error__(__err__);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJtYXBwaW5ncyI6IjtBQUFBLGFBQUFBLE1BQUEsR0FBQUMsWUFBQSxXQUFBQyxDQUFBO0VBQUEsT0FBQUMsVUFBQSxDQUFBRCxDQUFBO0FBQUEsTUFFQztBQUNELGFBQUFFLFNBQUEsR0FBQUgsWUFBQSxjQUFBQyxDQUFBO0VBQUEsT0FBQUMsVUFBQSxDQUFBRCxDQUFBO0FBQUE7QUFBQSxjQUFBRyxPQUFBO0VBQUFDLHFCQUFBLENBQUFELE9BQUE7QUFBQSIsIm5hbWVzIjpbIlNIQTI1NiIsIl9fdHlwZV9kZWZfXyIsInYiLCJfX3NpemVvZl9fIiwiUXVpY2tIYXNoIiwiX19lcnJfXyIsIl9faGFuZGxlX3N5bmNfZXJyb3JfXyJdLCJpZ25vcmVMaXN0IjpbXSwic291cmNlcyI6WyJEOlxcZGV2XFxzbGltLWdpdGh1YlxccGFja2FnZXNcXHNsaW1cXHR5cGVzXFxoYXNoLnNsaW0iXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IHR5cGUgU0hBMjU2KHYpIHtcclxuICAgIHJldHVybiBzaXplb2YgdiA9PSA2NFxyXG59XHJcbmV4cG9ydCB0eXBlIFF1aWNrSGFzaCh2KSB7XHJcbiAgICByZXR1cm4gc2l6ZW9mIHYgPT0gOFxyXG59Il19

package/run-dev-slim.js

@@ -1,7 +1,13 @@
 import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
 import chokidar from "chokidar";
 import { spawn } from "child_process";
 
+// This script ships in the package; the compiler sits next to it there.
+const packageRoot = path.dirname(fileURLToPath(import.meta.url));
+const compileScript = path.join(packageRoot, "src", "compile.js");
+
 const config = JSON.parse(
     fs.readFileSync("slimconfig.json", "utf8")
 );
@@ -68,7 +74,7 @@ function stop() {
 
 function compile() {
     return new Promise(resolve => {
-        const compiler = spawn("node", ["src/compile.js"], {
+        const compiler = spawn("node", [compileScript], {
             stdio: "inherit"
         });
 

package/run-slim.js

@@ -7,10 +7,12 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const config = JSON.parse(readFileSync(path.join(__dirname, 'slimconfig.json'), 'utf8'));
+const root = process.cwd();
+
+const config = JSON.parse(readFileSync(path.join(root, 'slimconfig.json'), 'utf8'));
 const mainFile = config.main;
 
-const dist = path.join(__dirname, 'dist', `${mainFile}.js`);
+const dist = path.join(root, 'dist', `${mainFile}.js`);
 const args = ['--enable-source-maps', '--no-warnings', dist];
 
 const proc = spawn('node', args, { stdio: 'inherit' });

package/src/bin/cli.js

@@ -5,6 +5,7 @@ import { execSync } from "child_process";
 import { readFile } from 'node:fs/promises';
 import path from "node:path"
 import fs from "node:fs"
+import { fileURLToPath } from "node:url"
 
 import { log, error, parseValue } from "./helpers.js"
 import { runTests } from "../test-runner.js"
@@ -14,6 +15,14 @@ import pkg from "../../package.json" with { type: "json" };
 import defaultConfig from "./config.default.json" with { type: "json" };
 
 const root = process.cwd()
+// Toolchain scripts (compiler, runners) live inside the package, which is only
+// the same as the project root during local development. Resolve them from this
+// file's location so the commands work when installed from npm too.
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..")
+const compileScript = JSON.stringify(path.join(packageRoot, "src", "compile.js"))
+const runScript = JSON.stringify(path.join(packageRoot, "run-slim.js"))
+const devScript = JSON.stringify(path.join(packageRoot, "run-dev-slim.js"))
+
 const program = new Command();
 const slimConfigPath = path.join(root, "slimconfig.json")
 const packagePath = path.join(root, "package.json")
@@ -72,7 +81,7 @@ program
         if(!params.check) process.env.SLIM_NO_CHECK = "1"
 
         if(!params.silent) log("Building...")
-        execSync("node src/compile.js", { stdio: "inherit" });
+        execSync(`node ${compileScript}`, { stdio: "inherit" });
         if(!params.silent) log("Ready!")
     });
 
@@ -90,7 +99,7 @@ program
         if(params.dev) process.env.SLIM_DEV = "1"
         if(!params.check) process.env.SLIM_NO_CHECK = "1"
         if(!params.silent) log(params.dev ? "Building and running (dev)..." : "Building and running...")
-        execSync("node src/compile.js && node run-slim.js", { stdio: "inherit" });
+        execSync(`node ${compileScript} && node ${runScript}`, { stdio: "inherit" });
     });
 
 program
@@ -143,11 +152,11 @@ program
 
         if(dev) {
             log("Starting Slim dev server (watch + live reload)...")
-            execSync(`node run-dev-slim.js${params.hot ? " --hot" : ""}`, { stdio: "inherit" });
+            execSync(`node ${devScript}${params.hot ? " --hot" : ""}`, { stdio: "inherit" });
         }
         else {
             log("Starting Slim server...")
-            execSync("node src/compile.js && node run-slim.js", { stdio: "inherit" });
+            execSync(`node ${compileScript} && node ${runScript}`, { stdio: "inherit" });
         }
     });
 

package/src/bin/config.default.json

@@ -1,5 +1,6 @@
 {
     "main": "path/to/your/files",
     "usePackages": true,
-    "uses": "import"
+    "uses": "import",
+    "packages": "packages"
 }

package/src/bin/helpers.js

@@ -2,6 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import { rm, mkdir } from 'node:fs/promises';
 import chalk from "chalk";
+import { projectPackagesDir } from "../modulePaths.js";
+
+export { projectPackagesDir };
 
 export const formatError = chalk.red.bold
 export const formatSuccess = chalk.green.bold
@@ -30,10 +33,10 @@ export function error(...text) {
 }
 
 export function isPackageExists(name) {
-	return fs.existsSync(path.join(rootPath, "packages", name))
+	return fs.existsSync(path.join(projectPackagesDir(), name))
 }
 export function getPackagePath(name) {
-	return path.join(rootPath, "packages", name)
+	return path.join(projectPackagesDir(), name)
 }
 
 export async function deleteDirectory(dirPath) {

package/src/bin/spm.js

@@ -1,9 +1,9 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { Command } from "commander";
 import { formatError, formatBold, formatItalic, formatSuccess, createFolder, createFile } from "./helpers.js"
 import pkg from "../../package.json" with { type: "json" };
-import { log, isPackageExists, rootPath, deleteDirectory, loading, delay } from "./helpers.js";
+import { log, isPackageExists, rootPath, deleteDirectory, loading, delay, projectPackagesDir } from "./helpers.js";
 
 import fs from "node:fs"
 import path from "node:path"
@@ -27,7 +27,7 @@ function errlog(...args) {
 	console.log(formatError(...args))
 }
 
-const packagesPath = path.join(rootPath, "packages")
+const packagesPath = projectPackagesDir()
 
 function renderObject(obj, indent = 0) {
     let output = "";
@@ -73,7 +73,7 @@ spm
 spm
     .command("list")
 	.action(() => {
-		const targetDir = path.join(rootPath, "packages")
+		const targetDir = packagesPath
 		if (!fs.existsSync(targetDir)) {
 			spmlog("No packages installed (the packages/ directory does not exist)")
 			return
@@ -186,7 +186,7 @@ spm
 					}
 				}
 
-				const res = await deleteDirectory(path.join(rootPath, "packages", name))
+				const res = await deleteDirectory(path.join(packagesPath, name))
 
 				if (res) {
 					removeLockEntry(name)
@@ -257,7 +257,7 @@ spm
 			await loading({
 				startMsg: `Creating path for ${name}`,
 				callback: async ({ fail, ok }) => {
-					const packagePath = path.join(rootPath, "packages", name)
+					const packagePath = path.join(packagesPath, name)
 
 					if (isExists) return fail("Package is already exists")
 					else {
@@ -336,7 +336,7 @@ spm
 			const githubRepo = SPMContent.github.repo
 			const version = SPMContent.version
 			const description = SPMContent.description
-			const packagePath = path.join("packages", name)
+			const packagePath = path.join(packagesPath, name)
 
 			if ("github" in SPMContent && "repo" in SPMContent.github) {
 				await loading({
@@ -445,7 +445,7 @@ spm
 				spmlog(formatError("No GitHub repository specified"));
 			}
 		} else {
-			spmlog(formatError(`No package founded: /packages/${name}`));
+			spmlog(formatError(`No package founded: ${path.relative(process.cwd(), path.join(packagesPath, name)) || name}`));
 		}
 	});
 

package/src/checker.js

@@ -5,8 +5,6 @@ import { computeLineStarts, offsetToLineCol } from "./sourcemap.js"
 
 const traverse = _traverse.default ?? _traverse
 
-// Check annotations before lowering; report only definite type conflicts.
-
 const NUMERIC = new Set(["int", "float", "number"])
 const KNOWN = new Set([
     "int", "float", "number", "string", "bool", "null", "undefined",
@@ -87,7 +85,6 @@ function normalize(label) {
     return trimmed
 }
 
-// Resolve inherited fields so structs can cross module boundaries.
 function resolveStruct(name, env, seen = new Set()) {
     const definition = env.structs.get(name)
     if (!definition) return null
@@ -135,7 +132,6 @@ export function createEnvironment() {
     }
 }
 
-// Module declarations keyed by absolute source path.
 const moduleTypes = new Map()
 
 function signatureFor(name, path_, env) {
@@ -149,7 +145,7 @@ const BUILTIN_CLASSES = new Set(["Map", "Set", "Date", "Promise", "RegExp", "Err
 function isOpen(label, env) {
     const base = baseName(label)
     if (!base) return true
-    // Custom validators shadow built-ins and cannot be evaluated statically.
+
     if (env.customTypes.has(base)) return true
     if (KNOWN.has(base) || BUILTIN_CLASSES.has(base)) return false
     if (env.structs.has(base) || env.enums.has(base)) return false
@@ -217,7 +213,6 @@ function acceptsAtom(target, source, env) {
     return false
 }
 
-// A union needs one compatible arm; array literals need every element to fit.
 export function accepts(target, source, env, requireAll = false) {
     if (!target || !source) return true
 
@@ -598,7 +593,6 @@ function checkStructLiteral(structName, node, path_, env, report) {
     }
 }
 
-// Inspect lowered match expressions to preserve exhaustiveness checks.
 function matchExpression(node) {
     if (!t.isCallExpression(node) || node.arguments.length !== 1) return null
 
@@ -839,7 +833,6 @@ function buildModuleTypes(ast, env) {
     return record
 }
 
-// Import known declarations; unresolved modules remain unchecked.
 function seedImports(env, imports, wildcards) {
     const merge = (record, name, local) => {
         if (record.structs.has(name)) env.structs.set(local, record.structs.get(name))
@@ -850,7 +843,6 @@ function seedImports(env, imports, wildcards) {
 
     const sources = new Set([...wildcards, ...imports.map(entry => entry.source)])
 
-    // Local declarations override explicit and transitive imports.
     for (const source of sources) {
         const record = moduleTypes.get(source)
         if (!record) continue

package/src/compile.js

@@ -7,7 +7,7 @@ import { readFile } from 'fs/promises';
 import { Debug } from "./external/core.js";
 import { stripComments } from "./parser.js";
 import { UseError } from "./external/classErrors.js";
-import { getDistPath, resolveSlimSource } from "./modulePaths.js";
+import { getDistPath, resolveSlimSource, PACKAGE_ROOT } from "./modulePaths.js";
 
 const compiled = new Set()
 
@@ -18,7 +18,7 @@ let check = true
 let useStyle = "import"
 
 function syncExternal() {
-    const srcExternal = path.resolve("src/external")
+    const srcExternal = path.join(PACKAGE_ROOT, "src/external")
     const distExternal = path.resolve("dist/external")
 
     if (!fs.existsSync(srcExternal)) return

package/src/modulePaths.js

@@ -1,9 +1,35 @@
 import fs from "node:fs"
 import path from "node:path"
 import { isBuiltin } from "node:module"
+import { fileURLToPath } from "node:url"
 
 const slimExtension = ".slim"
 
+export const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..")
+
+let projectPackagesCache = null
+export function projectPackagesDir() {
+    if (projectPackagesCache) return projectPackagesCache
+
+    let dir = "packages"
+    try {
+        const config = JSON.parse(fs.readFileSync(path.join(process.cwd(), "slimconfig.json"), "utf8"))
+        if (typeof config.packages === "string" && config.packages.trim()) dir = config.packages
+    } catch {}
+
+    projectPackagesCache = path.resolve(dir)
+    return projectPackagesCache
+}
+
+function packageRoots() {
+    const projectPackages = projectPackagesDir()
+    const shippedPackages = path.join(PACKAGE_ROOT, "packages")
+
+    return projectPackages === shippedPackages
+        ? [projectPackages]
+        : [projectPackages, shippedPackages]
+}
+
 function isWithin(parent, target) {
     const relative = path.relative(parent, target)
     return relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative)
@@ -31,23 +57,23 @@ export function getDistPath(slimFile) {
 }
 
 export function resolveSlimSource(raw, fromFile) {
-    // Node builtins (e.g. "node:crypto", "fs", "path") are not Slim sources;
-    // leave them for the JS import to resolve untouched.
     if (isBuiltin(raw)) return null
 
     if (raw.startsWith("@")) {
-        const packagesRoot = path.resolve("packages")
         const packageName = raw.slice("@".length)
-        const fileSource = path.resolve(packagesRoot, packageName + slimExtension)
+        const roots = packageRoots()
 
-        if (fs.existsSync(fileSource)) return fileSource
+        for (const packagesRoot of roots) {
+            const fileSource = path.join(packagesRoot, packageName + slimExtension)
+            if (fs.existsSync(fileSource)) return fileSource
 
-        const directorySource = path.resolve(packagesRoot, packageName, "main.slim")
-        if (fs.existsSync(directorySource)) return directorySource
+            const directorySource = path.join(packagesRoot, packageName, "main.slim")
+            if (fs.existsSync(directorySource)) return directorySource
+        }
 
         if (isNodeModule(raw)) return null
 
-        return fileSource
+        return path.join(roots[0], packageName + slimExtension)
     }
 
     if (raw.endsWith(".js")) return null

package/src/parser.js

@@ -43,7 +43,6 @@ function wordOperatorEdits(code) {
     for (const token of tokenize(code)) {
         if (token.type === "ws" || token.type === "newline" || token.type === "comment") continue
 
-        // Lower word operators only after an operand.
         const replacement = token.type === "name" ? replacements[token.value] : undefined
         if (replacement && endsExpression(prev)) {
             edits.push({ start: token.start, end: token.end, replacement })
@@ -290,7 +289,6 @@ function functionEdits(text) {
     })
 }
 
-// Cache tokens for whole-file and extracted-body scans.
 const tokenCache = new Map()
 
 function tokensFor(src) {
@@ -309,7 +307,6 @@ function tokensFor(src) {
     return entry
 }
 
-// Match brackets by tokens so literals and comments do not affect depth.
 function readBalanced(src, pos, open = "{", close = "}") {
     const { tokens, starts } = tokensFor(src)
     let index = starts.get(pos)
@@ -329,8 +326,6 @@ function readBalanced(src, pos, open = "{", close = "}") {
     return -1
 }
 
-// Read balanced arguments after matching a construct head.
-// Return type may be introduced by `->` or `:` (e.g. `func f(): number`).
 const returnArrow = /\s*(?:->|:)\s*/y
 
 function headMatcher(head, tail) {
@@ -462,7 +457,6 @@ function topLevelWhen(str) {
     return -1
 }
 
-// Recursively lower nested match expressions without touching strings.
 function lowerMatches(str) {
     if (!str.includes("match")) return str
 
@@ -627,8 +621,6 @@ function structuralEdits(text) {
                     let rest = line.slice(idx + 1).trim()
                     if (!field) continue
 
-                    // Optional fields may be written as `*key` or `key?`; normalize
-                    // both to the `*key` form the struct runtime understands.
                     let optional = false
                     if (field.startsWith("*")) { optional = true; field = field.slice(1).trim() }
                     if (field.endsWith("?")) { optional = true; field = field.slice(0, -1).trim() }
@@ -688,8 +680,6 @@ function structuralEdits(text) {
                 const head = declarationHead.exec(src)
                 if (!head) return null
 
-                // `export default const X: T = ...` is not valid JS as a single
-                // statement; lower it to a typed declaration plus `export default X`.
                 const leadingDefault = src.slice(0, i).match(/export\s+default\s+$/)
                 const start = leadingDefault ? i - leadingDefault[0].length : i
 
@@ -708,10 +698,6 @@ function structuralEdits(text) {
             },
             ({ keyword, name, type, expr, exprStart, defaultExport }) => {
                 const pattern = name.startsWith("{") || name.startsWith("[")
-                // Keep the declaration exported so the module wrapper leaves it at
-                // top level, then re-export the binding as default. Emitting a bare
-                // `const` plus `export default X` would trap the `const` in the
-                // module's try/catch, leaving the default export undefined.
                 const prefix = defaultExport ? "export " : ""
                 const head = pattern
                     ? `${prefix}${keyword} ${name} = __typed_pattern__(`
@@ -730,7 +716,6 @@ function structuralEdits(text) {
             /(\w[\w$.]*(?:\[.*?\])?)\s*(?:=>\s*([\w$]+))?\s*\n((?:\s*\|(?!\|)[^\n]+\n?)+)/g,
             (match, source, alias, pipes) => {
                 const steps = [...pipes.matchAll(/\|\s*([\w$]+)\(([^)]*)\)/g)]
-                // Preserve non-pipe bars, such as multiline union types.
                 if (steps.length === 0) return match
 
                 const callbackMethods = new Set([

package/src/transform.js

@@ -28,9 +28,6 @@ function getTypeReferenceName(typeText) {
     return withoutGeneric.split("::")[0]
 }
 
-// Builtin type names are always matched by label; they must never be resolved
-// through a same-named binding in scope (e.g. a `const string` variable would
-// otherwise shadow the primitive `string` type).
 const BUILTIN_TYPE_NAMES = new Set([
     "int", "float", "number", "string", "bool", "null", "undefined",
     "object", "array", "function", "any", "element"
@@ -439,7 +436,6 @@ function getRuntimePath(sourceFile, entry) {
     return relFixed.startsWith(".") ? relFixed : "./" + relFixed
 }
 
-// DOM globals select the full runtime; pure code uses the portable core.
 const DOM_RUNTIME = new Set([
     "htmlToVdom", "HTMLElement", "__html__",
     "__flush_events__", "__bind_events__", "__lifecycle__",
@@ -460,13 +456,6 @@ function usesDom(ast) {
     return found
 }
 
-// `use` mirrors `import`: `use { X } from Y` is a named import, `use * as X`
-// a namespace import, and a bare `use X from Y` a default import — exactly like
-// `import X from Y`. Named exports (including Slim's `export const`/`export func`)
-// must therefore be brought in with braces: `use { X } from Y`.
-//
-// When `bareIsDefault` is false (the legacy `"uses": "named"` config style), a
-// bare `use X from Y` instead lowers to a named import `import { X } from Y`.
 function parseSpecifiers(name, bareIsDefault = true) {
     const trimmed = name.trim()
 
@@ -485,7 +474,6 @@ function parseSpecifiers(name, bareIsDefault = true) {
         })
     }
 
-    // `use X as Y from Z` renames a named export (there is no `import X as Y`).
     const aliasMatch = trimmed.match(/^([\w$]+)\s+as\s+([\w$]+)$/)
     if (aliasMatch) {
         return [t.importSpecifier(t.identifier(aliasMatch[2]), t.identifier(aliasMatch[1]))]
@@ -530,8 +518,6 @@ function formatSyntaxError(err, originalCode, sourceFile, mapped) {
 }
 
 export function transform(code, sourceFile = "input.ps", options = {}) {
-    // `"uses": "named"` (or "legacy") restores the old bare-import style where a
-    // bare `use X from Y` is a named import; the default mirrors `import`.
     const bareIsDefault = options.uses !== "named" && options.uses !== "legacy"
     const asyncFunctions = new Set()
     const imports = new Map()
@@ -601,7 +587,6 @@ export function transform(code, sourceFile = "input.ps", options = {}) {
         }
     })
 
-    // Check annotations before lowering or writing output.
     if (options.check !== false) {
         const moduleImports = []
         const moduleWildcards = []