funcity 0.9.0 → 1.0.0

package/README.md

@@ -68,7 +68,7 @@ const text = await runScriptOnceToText(script, variables, logs);
 console.log(text);
 ```
 
-In other words, Funcity is a processing system that brings the power of functional programming to text template processors, enabling seamless integration into applications!
+In other words, funcity is a processing system that brings the power of functional programming to text template processors, enabling seamless integration into applications!
 
 ### Features
 

package/dist/index.cjs

@@ -1,11 +1,11 @@
 /*!
  * name: funcity
- * version: 0.9.0
+ * version: 1.0.0
  * description: A functional language interpreter with text processing
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/funcity
- * git.commit.hash: 44d20b9861b32b8f70452b8a5bd2a39e3484ba26
+ * git.commit.hash: af915b0e39fdf322e1c830e97cc77121ffca2d83
  */
 
 "use strict";
@@ -284,6 +284,16 @@ const tokenizeCodeTokens = (context, stopOnClose, finalizeUnknownOnEot) => {
       const location = context.cursor.location("start");
       tokens.push({
         kind: "eol",
+        source: "newline",
+        range: { start: location, end: location }
+      });
+      context.cursor.skip(1);
+    } else if (ch === ";") {
+      finalizeUnknown();
+      const location = context.cursor.location("start");
+      tokens.push({
+        kind: "eol",
+        source: "semicolon",
         range: { start: location, end: location }
       });
       context.cursor.skip(1);
@@ -965,6 +975,14 @@ const parseListExpression = (cursor, logs) => {
     }
     switch (token.kind) {
       case "eol": {
+        cursor.skipToken();
+        if (token.source === "semicolon") {
+          logs.push({
+            type: "error",
+            description: "Semicolon is not allowed in list expression",
+            range: token.range
+          });
+        }
         continue;
       }
     }
@@ -2026,29 +2044,37 @@ const _ge = async (arg0, arg1) => {
 const _now = async () => {
   return /* @__PURE__ */ new Date();
 };
-const concatInner = (args) => {
+const concatInner = (sep, args) => {
   let v = "";
+  let f = true;
   for (const arg of args) {
+    let as;
     if (typeof arg === "string") {
-      v = v + arg;
+      as = arg;
     } else {
       const iterable = asIterable(arg);
       if (iterable) {
-        v = v + concatInner(iterable);
+        as = concatInner(sep, iterable);
       } else {
-        v = v + String(arg);
+        as = convertToString(arg);
       }
     }
+    if (f) {
+      v = v + as;
+      f = false;
+    } else {
+      v = v + sep + as;
+    }
   }
   return v;
 };
 const _concat = async (...args) => {
-  const r = concatInner(args);
+  const r = concatInner("", args);
   return r;
 };
 const _join = async (arg0, ...args) => {
-  const sep = String(arg0);
-  const r = args.map((v) => String(v)).join(sep);
+  const sep = convertToString(arg0);
+  const r = concatInner(sep, args);
   return r;
 };
 const _trim = async (arg0) => {
@@ -2266,22 +2292,22 @@ const _reduce = async (arg0, arg1, arg2) => {
   return acc;
 };
 const _match = async (arg0, arg1) => {
-  const re = arg0 instanceof RegExp ? arg0 : new RegExp(String(arg0), "g");
-  const results = String(arg1).match(re);
+  const re = arg0 instanceof RegExp ? arg0 : new RegExp(convertToString(arg0), "g");
+  const results = convertToString(arg1).match(re);
   return results;
 };
 const _replace = async (arg0, arg1, arg2) => {
-  const re = arg0 instanceof RegExp ? arg0 : new RegExp(String(arg0), "g");
-  const replace = String(arg1);
-  const results = String(arg2).replace(re, replace);
+  const re = arg0 instanceof RegExp ? arg0 : new RegExp(convertToString(arg0), "g");
+  const replace = convertToString(arg1);
+  const results = convertToString(arg2).replace(re, replace);
   return results;
 };
 const _regex = async (arg0, arg1) => {
   if (arg1) {
-    const re = new RegExp(String(arg0), String(arg1));
+    const re = new RegExp(convertToString(arg0), convertToString(arg1));
     return re;
   } else {
-    const re = new RegExp(String(arg0));
+    const re = new RegExp(convertToString(arg0));
     return re;
   }
 };
@@ -2387,7 +2413,8 @@ const standardVariables = Object.freeze({
   regex: _regex,
   bind: _bind,
   url: _url,
-  delay: _delay
+  delay: _delay,
+  console
 });
 const buildCandidateVariables = (...variablesList) => {
   return combineVariables(standardVariables, ...variablesList);