@slim-lang/core 1.2.4 → 1.2.8

package/package.json

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

package/run-dev-slim.js

@@ -12,7 +12,8 @@ const config = JSON.parse(
     fs.readFileSync("slimconfig.json", "utf8")
 );
 
-const entry = `dist/${config.main}.js`;
+const distDir = typeof config.dist === "string" && config.dist.trim() ? config.dist : "slim-dist";
+const entry = `${distDir}/${config.main}.js`;
 const hot = process.argv.includes("--hot");
 
 let app = null;
@@ -114,6 +115,7 @@ async function rebuild() {
 await rebuild();
 
 const watchTarget = config.watch ?? ".";
+const ignoreDirs = new RegExp(`(^|[\\\\/])(node_modules|${distDir}|\\.git)([\\\\/]|$)`);
 
 const watcher = chokidar.watch(watchTarget, {
     ignoreInitial: true,
@@ -121,7 +123,7 @@ const watcher = chokidar.watch(watchTarget, {
         stabilityThreshold: 150,
         pollInterval: 50
     },
-    ignored: p => /(^|[\\/])(node_modules|dist|\.git)([\\/]|$)/.test(p)
+    ignored: p => ignoreDirs.test(p)
 });
 
 watcher.on("all", (_, file) => {

package/run-slim.js

@@ -11,8 +11,9 @@ const root = process.cwd();
 
 const config = JSON.parse(readFileSync(path.join(root, 'slimconfig.json'), 'utf8'));
 const mainFile = config.main;
+const distDir = typeof config.dist === 'string' && config.dist.trim() ? config.dist : 'slim-dist';
 
-const dist = path.join(root, 'dist', `${mainFile}.js`);
+const dist = path.join(root, distDir, `${mainFile}.js`);
 const args = ['--enable-source-maps', '--no-warnings', dist];
 
 const proc = spawn('node', args, { stdio: 'inherit' });

package/src/bin/cli.js

@@ -15,9 +15,7 @@ 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"))
@@ -296,16 +294,35 @@ program
 
         if(params.check) {
             const githubRepo = pkg.repository.url.split("git+https://github.com/")[1].trim().split(".git")[0]
-            const res = await fetch("https://raw.githubusercontent.com/" + githubRepo + "/main/package.json")
-            const githubPkg = await res.json()
+            if(!/^[\w.-]+\/[\w.-]+$/.test(githubRepo)) {
+                error("Unable to determine a valid GitHub repository for version check")
+                return
+            }
+
+            try {
+                const res = await fetch("https://raw.githubusercontent.com/" + githubRepo + "/main/package.json")
+                if(!res.ok) {
+                    error(`Version check failed: received HTTP ${res.status} from GitHub`)
+                    return
+                }
 
-            if(githubPkg.version != pkg.version) {
-                log(`Your version is not compatible with the latest version of Slim:
+                const githubPkg = await res.json()
+                if(typeof githubPkg?.version !== "string" || !/^\d+\.\d+\.\d+/.test(githubPkg.version)) {
+                    error("Version check failed: unexpected response format")
+                    return
+                }
+
+                if(githubPkg.version != pkg.version) {
+                    log(`Your version is not compatible with the latest version of Slim:
     Current: ${githubPkg.version}
     Your's: ${pkg.version}`)
+                }
+                else {
+                    log(`You on the latest Slim version`)
+                }
             }
-            else {
-                log(`You on the latest Slim version`)
+            catch (err) {
+                error(`Version check failed: ${err?.message ?? err}`)
             }
             return
         }

package/src/bin/config.default.json

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

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, PACKAGE_ROOT } from "./modulePaths.js";
+import { getDistPath, resolveSlimSource, PACKAGE_ROOT, distDirName } from "./modulePaths.js";
 
 const compiled = new Set()
 
@@ -19,7 +19,7 @@ let useStyle = "import"
 
 function syncExternal() {
     const srcExternal = path.join(PACKAGE_ROOT, "src/external")
-    const distExternal = path.resolve("dist/external")
+    const distExternal = path.resolve(distDirName(), "external")
 
     if (!fs.existsSync(srcExternal)) return
 
@@ -117,7 +117,7 @@ function compileFile(slimFile, isEntry = false, mainEntry = null) {
     const { code: output, declarations: dts } = transform(code, abs, { jsdoc, declarations, check, uses: useStyle })
 
     const outputPath = isEntry
-        ? path.resolve(`dist/${mainEntry}.js`)
+        ? path.resolve(distDirName(), `${mainEntry}.js`)
         : getDistPath(abs)
 
     fs.mkdirSync(path.dirname(outputPath), { recursive: true })
@@ -128,8 +128,8 @@ function compileFile(slimFile, isEntry = false, mainEntry = null) {
 
 function cleanDist(slimFileClear) {
     const keep = new Set([
-        path.resolve(`dist/${slimFileClear}.js`),
-        path.resolve("dist/mappings.json"),
+        path.resolve(distDirName(), `${slimFileClear}.js`),
+        path.resolve(distDirName(), "mappings.json"),
     ])
 
     function addDirToKeep(dir) {
@@ -140,11 +140,11 @@ function cleanDist(slimFileClear) {
             if (entry.isDirectory()) addDirToKeep(full)
         }
     }
-    addDirToKeep(path.resolve("dist/external"))
+    addDirToKeep(path.resolve(distDirName(), "external"))
 
     for (const slimFile of compiled) {
         if (slimFile === path.resolve(`${slimFileClear}.slim`)) {
-            keep.add(path.resolve(`dist/${slimFileClear}.js`))
+            keep.add(path.resolve(distDirName(), `${slimFileClear}.js`))
         } else {
             keep.add(getDistPath(slimFile))
         }
@@ -173,7 +173,7 @@ function cleanDist(slimFileClear) {
         }
     }
 
-    walkAndClean(path.resolve("dist"))
+    walkAndClean(path.resolve(distDirName()))
 }
 
 function writeJsConfig() {
@@ -191,7 +191,7 @@ function writeJsConfig() {
             strict: false,
             skipLibCheck: true
         },
-        include: ["dist"]
+        include: [distDirName()]
     }
 
     fs.writeFileSync(configPath, JSON.stringify(config, null, 4) + "\n")

package/src/handlers/parserHandler.js

@@ -555,11 +555,7 @@ function parseTypesEdits(code) {
             let bodyContent = body.content.trim()
 
             const normalizedBody = bodyContent.replace(/;\s*$/, "").trim()
-            if (!/^return(?:\s+[\s\S]+)?$/.test(normalizedBody)) {
-                throw new TypeDefError(`The "${typeName}" type body must contain exactly one return statement`)
-            }
-
-            if (normalizedBody === "return") bodyContent = "return true"
+            if (normalizedBody === "" || normalizedBody === "return") bodyContent = "return true"
 
             edits.push({
                 start,

package/src/modulePaths.js

@@ -7,20 +7,32 @@ const slimExtension = ".slim"
 
 export const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..")
 
+function readConfig() {
+    try {
+        return JSON.parse(fs.readFileSync(path.join(process.cwd(), "slimconfig.json"), "utf8"))
+    } catch {
+        return {}
+    }
+}
+
 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)
+    const dir = readConfig().packages
+    projectPackagesCache = path.resolve(typeof dir === "string" && dir.trim() ? dir : "packages")
     return projectPackagesCache
 }
 
+let distDirCache = null
+export function distDirName() {
+    if (distDirCache) return distDirCache
+
+    const dir = readConfig().dist
+    distDirCache = typeof dir === "string" && dir.trim() ? dir : "slim-dist"
+    return distDirCache
+}
+
 function packageRoots() {
     const projectPackages = projectPackagesDir()
     const shippedPackages = path.join(PACKAGE_ROOT, "packages")
@@ -63,11 +75,12 @@ export function getDistPath(slimFile) {
     } else if (isWithin(projectRoot, abs)) {
         relative = path.relative(projectRoot, abs)
     } else {
+        // Drop leading "../" so out-of-project sources can't escape the dist dir.
         const stripped = path.relative(projectRoot, abs).split(path.sep).filter(seg => seg !== "..")
         relative = stripped.length ? path.join(...stripped) : path.basename(abs)
     }
 
-    return path.resolve("dist", relative.replace(/\.slim$/, ".js"))
+    return path.resolve(distDirName(), relative.replace(/\.slim$/, ".js"))
 }
 
 export function resolveSlimSource(raw, fromFile) {

package/src/test-runner.js

@@ -3,10 +3,11 @@ import path from "node:path"
 import { spawnSync } from "node:child_process"
 import { pathToFileURL } from "node:url"
 import { transform } from "./transform.js"
+import { distDirName } from "./modulePaths.js"
 
 const root = process.cwd()
 const runtimeImport = pathToFileURL(path.resolve("src/external/defaults.js")).href
-const outDir = path.resolve("dist/__slim_tests__")
+const outDir = path.resolve(distDirName(), "__slim_tests__")
 
 function findTests(target) {
     if (target) {
@@ -19,7 +20,7 @@ function findTests(target) {
         if (!fs.existsSync(dir)) return
         for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
             if (entry.isDirectory()) {
-                if (entry.name !== "node_modules" && entry.name !== "dist" && entry.name !== ".git") {
+                if (entry.name !== "node_modules" && entry.name !== distDirName() && entry.name !== ".git") {
                     walk(path.join(dir, entry.name))
                 }
             } else if (entry.name.endsWith(".test.slim")) {

package/src/transform.js

@@ -7,7 +7,7 @@ import { emitJsDoc, emitDeclarations, jsdocComment } from "./jsdoc.js"
 import { checkTypes, formatDiagnostics } from "./checker.js"
 import * as t from "@babel/types"
 import path from "node:path"
-import { getDistPath, resolveSlimImport, resolveSlimSource } from "./modulePaths.js"
+import { getDistPath, resolveSlimImport, resolveSlimSource, distDirName } from "./modulePaths.js"
 import {
     PRE_SOURCE,
     buildPreMap,
@@ -430,7 +430,7 @@ function resolvePath(raw, fromFile) {
 
 function getRuntimePath(sourceFile, entry) {
     const distFile = getDistPath(sourceFile)
-    const runtimeAbs = path.resolve(`dist/external/${entry}`)
+    const runtimeAbs = path.resolve(distDirName(), "external", entry)
     const rel = path.relative(path.dirname(distFile), runtimeAbs)
     const relFixed = rel.replace(/\\/g, "/")
     return relFixed.startsWith(".") ? relFixed : "./" + relFixed