@weborigami/origami 0.0.48 → 0.0.50

package/src/server/constructResponse.js

@@ -25,7 +25,7 @@ export default async function constructResponse(request, resource) {
   if (resource instanceof Response) {
     // Already a Response, return as is.
     return resource;
-  } else if (!resource) {
+  } else if (resource == null) {
     return null;
   }
 
@@ -42,14 +42,8 @@ export default async function constructResponse(request, resource) {
     mediaType = extension ? mediaTypeForExtension[extension] : undefined;
   }
 
-  if (
-    mediaType === undefined &&
-    !url.pathname.endsWith("/") &&
-    (Tree.isAsyncTree(resource) ||
-      isPlainObject(resource) ||
-      resource instanceof Array)
-  ) {
-    // Redirect to an index page for the result.
+  if (!url.pathname.endsWith("/") && Tree.isTreelike(resource)) {
+    // Treelike resource: redirect to its index page.
     const Location = `${request.url}/`;
     return new Response("ok", {
       headers: {

package/src/server/server.js

@@ -120,8 +120,11 @@ function keysFromUrl(url) {
     pathKeys[pathKeys.length - 1] = "index.html";
   }
 
-  // Add back the `!` to commands.
-  const commandKeys = parts.map((command) => `!${command}`);
+  // Decode the text of the commands, prefix spaces with a backslash, and add
+  // back the `!` character.
+  const commandKeys = parts.map(
+    (command) => `!${decodeURIComponent(command).replace(/ /g, "\\ ")}`
+  );
 
   const keys = [...pathKeys, ...commandKeys];
   return keys;

package/src/builtins/@apply.js

@@ -1,6 +0,0 @@
-/**
- * @this {import("@weborigami/types").AsyncTree|null}
- */
-export default async function apply(target, fn) {
-  return fn.call(this, target);
-}

package/src/builtins/@groupBy.js

@@ -1,37 +0,0 @@
-import { groupBy } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
-import addValueKeyToScope from "../common/addValueKeyToScope.js";
-import { toFunction } from "../common/utilities.js";
-import getTreeArgument from "../misc/getTreeArgument.js";
-
-/**
- * Return a new tree with the values from the original tree in groups.
- * The groups are determined by the given function.
- *
- * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
- * @typedef {import("@weborigami/async-tree").Treelike} Treelike
- * @typedef {import("../../index.ts").Invocable} Invocable
- *
- * @this {AsyncTree|null}
- * @param {Treelike} treelike
- * @param {Invocable} groupKeyFn
- */
-export default async function groupByBuiltin(treelike, groupKeyFn) {
-  const tree = await getTreeArgument(this, arguments, treelike, "@groupBy");
-
-  const fn = toFunction(groupKeyFn);
-  const baseScope = Scope.getScope(this);
-  async function extendedGroupKeyFn(value, key, tree) {
-    const scope = addValueKeyToScope(baseScope, value, key);
-    const sortKey = await fn.call(scope, value, key);
-    return sortKey;
-  }
-
-  const grouped = await groupBy(extendedGroupKeyFn)(tree);
-  const scoped = Scope.treeWithScope(grouped, this);
-  return scoped;
-}
-
-groupByBuiltin.usage = `@groupBy <tree>, [groupKeyFn]\tReturn a new tree with the original's values grouped`;
-groupByBuiltin.documentation =
-  "https://weborigami.org/cli/builtins.html#@group";

package/src/builtins/@isAsyncTree.js

@@ -1,17 +0,0 @@
-/** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-
-import { Tree } from "@weborigami/async-tree";
-
-/**
- * Return true if the value is an async tree.
- *
- * @this {AsyncTree|null}
- * @param {any} value
- */
-export default function isAsyncTree(value) {
-  return Tree.isAsyncTree(value);
-}
-
-isAsyncTree.usage = `@isAsyncTree <value>\tReturn true for an async tree`;
-isAsyncTree.documentation =
-  "https://weborigami.org/cli/builtins.html#isAsyncTree";

package/src/builtins/@mapDeep.js

@@ -1,22 +0,0 @@
-import { isPlainObject } from "@weborigami/async-tree";
-import treeMap from "./@map.js";
-
-export default function mapDeep(param1, param2) {
-  // Identify whether the valueFn/options are the first parameter
-  // or the second.
-  let source;
-  let options;
-  if (param2 === undefined) {
-    options = param1;
-  } else {
-    source = param1;
-    if (isPlainObject(param2)) {
-      options = param2;
-    } else {
-      options = { value: param2 };
-    }
-  }
-
-  options.deep = true;
-  return treeMap(source, options);
-}

package/src/builtins/@new.js

@@ -1,6 +0,0 @@
-export default function newBuiltin(constructor, ...args) {
-  return Reflect.construct(constructor, args);
-}
-
-newBuiltin.usage = "@new <classFn>\tCreate a new instance of the given class";
-newBuiltin.documentation = "https://weborigami.org/language/@new.html";

package/src/builtins/@parse/json.js

@@ -1,6 +0,0 @@
-export default async function parseJson(text) {
-  return text ? JSON.parse(text) : undefined;
-}
-
-parseJson.usage = `parseJson <text>\tParse text as JSON`;
-parseJson.documentation = "https://weborigami.org/cli/builtins.html#parseJson";

package/src/builtins/@parse/yaml.js

@@ -1,8 +0,0 @@
-import * as serialize from "../../common/serialize.js";
-
-export default async function parseYaml(text) {
-  return text ? serialize.parseYaml(String(text)) : undefined;
-}
-
-parseYaml.usage = `parseYaml <text>\tParse text as YAML (including JSON)`;
-parseYaml.documentation = "https://weborigami.org/cli/builtins.html#parseYaml";

package/src/builtins/@sortBy.js

@@ -1,37 +0,0 @@
-import { sortBy } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
-import addValueKeyToScope from "../common/addValueKeyToScope.js";
-import { toFunction } from "../common/utilities.js";
-import getTreeArgument from "../misc/getTreeArgument.js";
-
-/**
- * Return a new tree with the original's keys sorted using the given function to
- * obtain a sort key for each value in the tree.
- *
- * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
- * @typedef {import("@weborigami/async-tree").Treelike} Treelike
- * @typedef {import("../../index.ts").Invocable} Invocable
- *
- * @this {AsyncTree|null}
- * @param {Treelike} treelike
- * @param {Invocable} sortKeyFn
- */
-export default async function sortByBuiltin(treelike, sortKeyFn) {
-  const tree = await getTreeArgument(this, arguments, treelike, "@sortBy");
-
-  const fn = toFunction(sortKeyFn);
-  const baseScope = Scope.getScope(this);
-  async function extendedSortKeyFn(key, tree) {
-    const value = await tree.get(key);
-    const scope = addValueKeyToScope(baseScope, value, key);
-    const sortKey = await fn.call(scope, value, key);
-    return sortKey;
-  }
-
-  const sorted = sortBy(extendedSortKeyFn)(tree);
-  const scoped = Scope.treeWithScope(sorted, this);
-  return scoped;
-}
-
-sortByBuiltin.usage = `@sortBy <tree>, [sortKeyFn]\tReturn a new tree with the original's keys sorted`;
-sortByBuiltin.documentation = "https://weborigami.org/cli/builtins.html#@sort";

package/src/builtins/@with.js

@@ -1,22 +0,0 @@
-import { Tree } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
-import { toFunction } from "../common/utilities.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
-
-/**
- *
- * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
- * @typedef {import("@weborigami/async-tree").Treelike} Treelike
- * @typedef {import("../../index.ts").Invocable} Invocable
- *
- * @this {AsyncTree|null}
- * @param {Treelike} treelike
- * @param  {Invocable} invocable
- */
-export default function withTree(treelike, invocable) {
-  assertScopeIsDefined(this, "with");
-  const tree = Tree.from(treelike);
-  const fn = toFunction(invocable);
-  const scope = new Scope(tree, this);
-  return fn.call(scope);
-}