@weborigami/language 0.6.6 → 0.6.7

package/index.ts

@@ -1,5 +1,11 @@
+/**
+ * Origami is a JavaScript project, but we use TypeScript as an internal tool to
+ * confirm our code is type safe.
+ */
+
 import { SyncOrAsyncMap, UnpackFunction } from "@weborigami/async-tree";
 
+// Re-export all exports from main.js
 export * from "./main.js";
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -11,7 +11,7 @@
     "typescript": "5.9.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.6.6",
+    "@weborigami/async-tree": "0.6.7",
     "exif-parser": "0.1.12",
     "watcher": "2.3.1",
     "yaml": "2.8.1"

package/src/project/projectRootFromPath.js

@@ -29,30 +29,40 @@ export default async function projectRootFromPath(dirname = process.cwd()) {
   let root;
   let value;
   // Use a plain FileMap to avoid loading extension handlers
-  const currentTree = new FileMap(dirname);
-  // Try looking for config file
-  value = await currentTree.get(configFileName);
-  if (value) {
-    // Found config file
-    root = new OrigamiFileMap(currentTree.path);
-  } else {
+  let currentFolder = new FileMap(dirname);
+  while (currentFolder) {
+    // Try looking for config file
+    value = await currentFolder.get(configFileName);
+    if (value) {
+      // Found config file
+      root = new OrigamiFileMap(currentFolder.path);
+      break;
+    }
+
     // Try looking for package.json
-    value = await currentTree.get(packageFileName);
+    value = await currentFolder.get(packageFileName);
     if (value) {
       // Found package.json
-      root = new OrigamiFileMap(currentTree.path);
+      root = new OrigamiFileMap(currentFolder.path);
+      break;
+    }
+
+    // Move up a folder and try again
+    const parentPath = path.dirname(currentFolder.path);
+    if (parentPath !== currentFolder.path) {
+      currentFolder = new FileMap(parentPath);
     } else {
-      // Move up a folder and try again
-      const parentPath = path.dirname(dirname);
-      if (parentPath !== dirname) {
-        root = await projectRootFromPath(parentPath);
-      } else {
-        // At filesystem root, use current working directory
-        root = new OrigamiFileMap(process.cwd());
-      }
+      // At filesystem root; not found
+      root = null;
+      break;
     }
   }
 
+  if (!root) {
+    // Default to using the provided folder as the project root
+    root = new OrigamiFileMap(dirname);
+  }
+
   mapPathToRoot.set(dirname, root);
   return root;
 }

package/src/protocols/files.js

@@ -1,25 +1,28 @@
 import os from "node:os";
 import path from "node:path";
-import process from "node:process";
 import OrigamiFileMap from "../runtime/OrigamiFileMap.js";
 
 /**
  *
- * @param {string[]} keys
+ * @param {any[]} args
  */
-export default async function files(...keys) {
+export default async function files(...args) {
+  const state = args.pop(); // Remaining args are the path
+
   // If path begins with `~`, treat it relative to the home directory.
-  // Otherwise, treat it relative to the current working directory.
-  let relativePath = keys.join(path.sep);
+  // Otherwise, treat it relative to the current container.
+  let relativePath = args.join(path.sep);
   let basePath;
   if (relativePath.startsWith("~")) {
     basePath = os.homedir();
     relativePath = relativePath.slice(2);
   } else {
-    basePath = process.cwd();
+    const { container } = state;
+    basePath = container.path;
   }
   const resolved = path.resolve(basePath, relativePath);
 
   const result = new OrigamiFileMap(resolved);
   return result;
 }
+files.needsState = true;

package/src/runtime/expressionObject.js

@@ -138,6 +138,9 @@ function defineProperty(object, propertyInfo, state, map) {
  * Return a normalized version of the property key for use in the keys() method.
  * Among other things, this adds trailing slashes to keys that correspond to
  * maplike values.
+ *
+ * @param {any} propertyInfo
+ * @param {object|null} [object]
  */
 export function normalizeKey(propertyInfo, object = null) {
   const { key, value, valueType } = propertyInfo;

package/test/project/projectRootFromPath.test.js

@@ -33,8 +33,8 @@ describe("projectRootFromPath", () => {
     assert.equal(resultPath, fileURLToPath(projectUrl));
   });
 
-  test("defaults to current working directory", async () => {
+  test("defaults to supplied directory", async () => {
     const root = await projectRootFromPath("/");
-    assert.equal(root.path, process.cwd());
+    assert.equal(root.path, "/");
   });
 });