@slim-lang/core 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slim-lang/core",
-	"version": "1.2.0",
+	"version": "1.2.2",
 	"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/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,9 @@ let check = true
 let useStyle = "import"
 
 function syncExternal() {
-    const srcExternal = path.resolve("src/external")
+    // The runtime ships inside the package; the compiled output goes to the
+    // project's own dist/ (so this works both locally and when installed).
+    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,27 @@
 import fs from "node:fs"
 import path from "node:path"
 import { isBuiltin } from "node:module"
+import { fileURLToPath } from "node:url"
 
 const slimExtension = ".slim"
 
+// Root of the installed toolchain package (…/src/modulePaths.js -> package root).
+// Locally this equals the project root; when installed it points into
+// node_modules/@slim-lang/core, where the shipped stdlib (@slim/*) lives.
+export const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..")
+
+// `@`-imports resolve against the project's own packages/ (spm installs) first,
+// then the stdlib shipped inside the package. When run locally the two are the
+// same directory.
+function packageRoots() {
+    const projectPackages = path.resolve("packages")
+    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)
@@ -36,18 +54,22 @@ export function resolveSlimSource(raw, fromFile) {
     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
+        // Not found in any root: return the project-local path so errors point
+        // at the user's own packages/ directory.
+        return path.join(roots[0], packageName + slimExtension)
     }
 
     if (raw.endsWith(".js")) return null