@weborigami/origami 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,9 +17,9 @@
     "typescript": "5.6.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.2.0",
-    "@weborigami/language": "0.2.0",
-    "@weborigami/types": "0.2.0",
+    "@weborigami/async-tree": "0.2.1",
+    "@weborigami/language": "0.2.1",
+    "@weborigami/types": "0.2.1",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.10.0",

package/src/calc/calc.js

@@ -2,6 +2,7 @@ import { Tree } from "@weborigami/async-tree";
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 
 export function add(...args) {
+  console.warn(`Warning: "add" is deprecated. Use the "+" operator instead.`);
   const numbers = args.map((arg) => Number(arg));
   return numbers.reduce((acc, val) => acc + val, 0);
 }
@@ -12,6 +13,9 @@ export function and(...args) {
 }
 
 export function divide(a, b) {
+  console.warn(
+    `Warning: "divide" is deprecated. Use the "/" operator instead.`
+  );
   return Number(a) / Number(b);
 }
 
@@ -52,6 +56,9 @@ export async function ifBuiltin(value, trueResult, falseResult) {
 ifBuiltin.key = "if";
 
 export function multiply(...args) {
+  console.warn(
+    `Warning: "multiply" is deprecated. Use the "*" operator instead.`
+  );
   const numbers = args.map((arg) => Number(arg));
   return numbers.reduce((acc, val) => acc * val, 1);
 }
@@ -67,5 +74,8 @@ export function or(...args) {
 }
 
 export function subtract(a, b) {
+  console.warn(
+    `Warning: "subtract" is deprecated. Use the "-" operator instead.`
+  );
   return Number(a) - Number(b);
 }

package/src/help/help.yaml

@@ -1,34 +1,3 @@
-calc:
-  description: Perform math operations
-  commands:
-    add:
-      args: (a, b, ...)
-      description: Add the numbers
-    # and:
-    #   args: (a, b, ...)
-    #   description: Return true if all the arguments are true
-    divide:
-      args: (a, b)
-      description: Divide a by b
-    # equals:
-    #   args: (a, b)
-    #   description: Return true if a equals b
-    # if:
-    #   args: (a, b, c)
-    #   description: If a is true return b, otherwise c
-    multiply:
-      args: (a, b, ...)
-      description: Multiply the numbers
-    # not:
-    #   args: (value)
-    #   description: Return true if a is false and vice versa
-    # or:
-    #   args: (a, b, ...)
-    #   description: Return true if any of the arguments are true
-    subtract:
-      args: (a, b)
-      description: Subtract b from a
-
 dev:
   description: Develop and debug Origami projects
   commands:
@@ -97,6 +66,8 @@ js:
   commands:
     Array:
       description: JavaScript Array class
+    BigInt:
+      description: JavaScript BigInt class
     Boolean:
       description: JavaScript Boolean class
     Date:

package/src/js.js

@@ -5,6 +5,7 @@ async function fetchWrapper(resource, options) {
 
 export default {
   Array,
+  BigInt,
   Boolean,
   Date,
   Error,

package/src/server/constructResponse.js

@@ -43,6 +43,9 @@ export default async function constructResponse(request, resource) {
 
   if (!isPacked(resource) && typeof resource.pack === "function") {
     resource = await resource.pack();
+    if (typeof resource === "function") {
+      resource = await resource();
+    }
   }
 
   let mediaType;

package/src/server/server.js

@@ -87,26 +87,28 @@ export async function handleRequest(request, response, tree) {
   // Ask the tree for the resource with those keys.
   let resource;
   try {
-    resource = await Tree.traverse(extendedTree, ...keys);
+    resource = await Tree.traverseOrThrow(extendedTree, ...keys);
+
     // If resource is a function, invoke to get the object we want to return.
     // For a POST request, pass the data to the function.
     if (typeof resource === "function") {
       resource = data ? await resource(data) : await resource();
     }
+
+    // Construct the response.
+    const constructed = await constructResponse(request, resource);
+    if (!constructed) {
+      return false;
+    }
+
+    // Copy the construct response to the ServerResponse and return true if
+    // the response was valid.
+    return copyResponse(constructed, response);
   } catch (/** @type {any} */ error) {
+    // Display an error
     respondWithError(response, error);
     return true;
   }
-
-  // Construct the response.
-  const constructed = await constructResponse(request, resource);
-  if (!constructed) {
-    return false;
-  }
-
-  // Copy the construct response to the ServerResponse and return true if
-  // the response was valid.
-  return copyResponse(constructed, response);
 }
 
 function keysFromUrl(url) {

package/src/text/origamiHighlightDefinition.js

@@ -36,7 +36,7 @@ export default function origamiHighlightDefinition(hljs) {
         // Treat identifier containing a period before an open paren or backtick as a variable
         className: "variable",
         begin:
-          /\b[^(){}\[\]<>\-=,/:\`"'«»\\ →⇒\t\n\r]+\.[^(){}\[\]<>\?!&\|\-=,/:\`"'«»\\ →⇒\t\n\r]+(?=(\(|\`))\b/,
+          /\b[^(){}\[\]<>\?!\|=,/:\`"'«»\\→⇒… \t\n\r]+\.[^(){}\[\]<>\?!\|=,/:\`"'«»\\→⇒… \t\n\r]+(?=(\(|\`))\b/,
       },
       {
         className: "built_in",
@@ -44,13 +44,14 @@ export default function origamiHighlightDefinition(hljs) {
         begin: /\b[A-Za-z][A-Za-z0-9]*(?=(\(|\`))\b/,
       },
       {
-        // Treat remaining identifiers as variables
-        className: "variable",
-        begin: /\b[^(){}\[\]<>\?!&\|\-=,/:\`"'«»\\ →⇒\t\n\r]+\b/,
+        className: "operator",
+        begin:
+          /===|!==|==|!=|<=|<|>=|>|\*|\*\*|\/|%|\+|-|=>|⇒|->|→|=|:|\.\.\.|…|&&|&|\|\||\||!|\^|~|\?\?|\?|#!/,
       },
       {
-        className: "operator",
-        begin: /===|!==|==|!=|=>|⇒|->|→|=|\.\.\.|…|&&|\|\||!|\?\?/,
+        // Treat remaining identifiers as variables
+        className: "variable",
+        begin: /\b[^(){}\[\]<>\?!\|=,/:\`"'«»\\→⇒… \t\n\r]+\b/,
       },
     ],
   };