@thigasdevelopment/luam 1.0.2 → 1.0.3

package/luam.mjs

@@ -7154,7 +7154,7 @@ import { tmpdir } from "node:os";
 import { join as join2 } from "node:path";
 
 // src/cli/version.ts
-var VERSION = true ? "1.0.2" : "0.0.0-dev";
+var VERSION = true ? "1.0.3" : "0.0.0-dev";
 var PROGRAM_NAME = "luam";
 var PROGRAM_DESCRIPTION = "luam \u2014 the Luam compiler for Multi Theft Auto resources.";
 
@@ -7909,6 +7909,22 @@ function walk(root, directory, excluded, tree) {
     }
   }
 }
+function listRootFiles(root, excluded = []) {
+  let entries3;
+  try {
+    entries3 = readdirSync(root, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const files = [];
+  for (const entry of entries3) {
+    const path = normalizePattern(entry.name);
+    if (entry.isFile() && path.length > 0 && !isExcludedPath(path, excluded)) {
+      files.push(path);
+    }
+  }
+  return files.sort();
+}
 function listProjectFiles(root, roots, excluded = []) {
   const tree = { files: [], errors: [] };
   const seen = /* @__PURE__ */ new Set();
@@ -8736,6 +8752,7 @@ function assembleResource(project, options, onStep) {
 }
 
 // src/build/asset-resolution.ts
+var EMPTY_ASSET = "config-empty-asset";
 var MISSING_ASSET = "config-missing-asset";
 var OUTPUT_COLLISION = "config-output-collision";
 var MANIFEST_OUTPUT = "meta.xml";
@@ -8770,6 +8787,13 @@ function reservedOutput(destination) {
   }
   return destination === LIBRARY_DIRECTORY || destination.startsWith(`${LIBRARY_DIRECTORY}/`) ? `the generated "${LIBRARY_DIRECTORY}" directory` : null;
 }
+function emptyAssetMessage(root, from, base) {
+  if (base.length > 0 && !isDirectory2(root, base)) {
+    return `"${from}" is listed in "assets" but "${base}" is not a directory in "${normalizePattern(root)}".`;
+  }
+  const where = base.length === 0 ? `"${normalizePattern(root)}"` : `"${base}"`;
+  return `"${from}" is listed in "assets" but matched no file under ${where}.`;
+}
 function collect(root, mapping, excluded, diagnostics) {
   const from = normalizePattern(mapping.from);
   const to = normalizePattern(mapping.to);
@@ -8786,7 +8810,11 @@ function collect(root, mapping, excluded, diagnostics) {
   for (const message of tree.errors) {
     diagnostics.push(cliError(MISSING_ASSET, message));
   }
-  return tree.files.filter((path) => matchesPattern(pattern, path)).map((path) => ({ path: joinDestination(to, suffixBelow(base, path)), source: path, isDownloaded: true }));
+  const matched = tree.files.filter((path) => matchesPattern(pattern, path));
+  if (matched.length === 0 && tree.errors.length === 0) {
+    diagnostics.push(cliWarning(EMPTY_ASSET, emptyAssetMessage(root, from, base)));
+  }
+  return matched.map((path) => ({ path: joinDestination(to, suffixBelow(base, path)), source: path, isDownloaded: true }));
 }
 function reject(assets, diagnostics) {
   const seen = /* @__PURE__ */ new Map();
@@ -8887,7 +8915,13 @@ var MISSING_SOURCE = "config-missing-source";
 var NO_SOURCES = "config-no-sources";
 var SIDE_CONFLICT = "config-source-side-conflict";
 var TEST_SOURCE = "config-test-source";
+var UNMATCHED_SOURCE = "config-unmatched-source";
 var UNREADABLE_SOURCE = "build-source-unreadable";
+var NAMED_LIMIT = 5;
+var REMEDIES = [
+  'Add a pattern to "sources", move the file under a directory "sources" already names,',
+  'or put it in the project root, where a file no pattern names is built with the side its "#!" directive declares.'
+].join(" ");
 function checkLiterals(root, resolver, found, diagnostics) {
   for (const pattern of resolver.patterns.filter(isLiteralPattern)) {
     if (isTestPath(pattern)) {
@@ -8905,6 +8939,29 @@ function checkLiterals(root, resolver, found, diagnostics) {
     }
   }
 }
+function collectRootSources(root, resolver, excluded, files, diagnostics) {
+  for (const path of listRootFiles(root, excluded)) {
+    if (!path.endsWith(SOURCE_EXTENSION) || isTestPath(path) || resolver.resolve(path).matches.length > 0) {
+      continue;
+    }
+    const source = readSource(root, path, diagnostics);
+    if (source !== null) {
+      files.push({ path, source });
+    }
+  }
+}
+function describePaths(paths) {
+  const named2 = paths.slice(0, NAMED_LIMIT).map((path) => `"${path}"`).join(", ");
+  const rest = paths.length - NAMED_LIMIT;
+  return rest > 0 ? `${named2} and ${rest} more` : named2;
+}
+function reportNothingBuilt(root, excluded) {
+  const paths = listProjectFiles(root, [""], excluded).files.filter((path) => path.endsWith(SOURCE_EXTENSION) && !isTestPath(path));
+  if (paths.length === 0) {
+    return cliError(NO_SOURCES, `No "${SOURCE_EXTENSION}" source files matched "sources" in "${normalizePattern(root)}".`);
+  }
+  return cliError(UNMATCHED_SOURCE, `No "sources" pattern matched ${describePaths(paths)} in "${normalizePattern(root)}". ${REMEDIES}`);
+}
 function readSource(root, path, diagnostics) {
   try {
     return readFileSync7(resolve9(root, path), "utf8");
@@ -8934,9 +8991,10 @@ function discoverSources(root, sources, excluded = []) {
       files.push({ path, source, environment: resolution.environment });
     }
   }
+  collectRootSources(root, resolver, excluded, files, diagnostics);
   checkLiterals(root, resolver, matched, diagnostics);
   if (files.length === 0 && diagnostics.length === 0) {
-    diagnostics.push(cliError(NO_SOURCES, `No "${SOURCE_EXTENSION}" source files matched "sources" in "${normalizePattern(root)}".`));
+    diagnostics.push(reportNothingBuilt(root, excluded));
   }
   return { files: files.sort((left, right) => left.path.localeCompare(right.path)), resolver, diagnostics };
 }
@@ -25240,20 +25298,28 @@ function watchSources(root, sources, onChange, debounceMs = DEFAULT_DEBOUNCE_MS)
   };
   const isWatched = (directory, filename) => {
     const path = normalizePattern(relative5(root, resolve14(directory, filename)));
-    return path.endsWith(SOURCE_EXTENSION) && resolver.resolve(path).matches.length > 0;
+    if (!path.endsWith(SOURCE_EXTENSION) || isTestPath(path)) {
+      return false;
+    }
+    return resolver.resolve(path).matches.length > 0 || !path.includes("/");
   };
-  for (const entry of resolver.roots) {
-    const absolute = resolve14(root, entry);
+  const observe = (absolute, recursive) => {
     if (!existsSync9(absolute)) {
-      continue;
+      return;
     }
     watchers.push(
-      watch(absolute, { recursive: true }, (_event, filename) => {
+      watch(absolute, { recursive }, (_event, filename) => {
         if (filename !== null && isWatched(absolute, filename.toString())) {
           schedule();
         }
       })
     );
+  };
+  for (const entry of resolver.roots) {
+    observe(resolve14(root, entry), true);
+  }
+  if (!resolver.roots.includes("")) {
+    observe(root, false);
   }
   return {
     close: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@thigasdevelopment/luam",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "The Luam compiler for Multi Theft Auto resources.",
     "keywords": [
         "mta",

package/template/luam.manifest

@@ -7,14 +7,15 @@ compiler = {
     oop = false,
 }
 
+# The layout for a project with folders. A ".luam" file in the project root is built without it.
 sources = {
     server = { 'src/server/**/*.luam' },
     client = { 'src/client/**/*.luam' },
     shared = { 'src/shared/**/*.luam' },
 }
 
-assets = {
-    { from = 'assets/**/*', to = 'assets' },
-}
+# assets = {
+#     { from = 'assets/**/*', to = 'assets' },
+# }
 
 outDir = 'build'