@explorable-viz/fluid 0.7.25 → 0.7.28

package/dist/fluid/fluid.mjs

@@ -25986,6 +25986,7 @@ var mkCommand = (m) => {
   const $0 = v.cmdCommands;
   return $Tuple(v.cmdGroup, $Tuple(arrayMap(fst)($0), $Tuple((v1) => lookup4(v1)($0), void 0)));
 };
+var flagFieldsHasName = { name: (n) => (fields) => ({ flagNames: [n, ...fields.flagNames], flagActive: fields.flagActive }) };
 var modSemigroup = {
   append: (v) => (v1) => $Mod((x) => v1._1(v._1(x)), $DefaultProp(v1._2._1.tag === "Nothing" ? v._2._1 : v1._2._1, v1._2._2.tag === "Nothing" ? v._2._2 : v1._2._2), (x) => v1._3(v._3(x)))
 };
@@ -28364,6 +28365,41 @@ var graphEval2 = /* @__PURE__ */ graphEval(monadErrorAff);
 var fromFoldable29 = /* @__PURE__ */ (() => fromFoldableImpl(foldableList.foldr))();
 var Evaluate = (value0) => $Command("Evaluate", value0);
 var Publish = (value0) => (value1) => $Command("Publish", value0, value1);
+var publish = /* @__PURE__ */ (() => $Parser(
+  "MultP",
+  $MultPE(
+    parserFunctor.map(Publish)(parserFunctor.map(Folder)(option(readerAsk)((() => {
+      const $0 = help("root directory of website under dist/");
+      const $1 = $0._2._2.tag === "Nothing" ? Nothing : $0._2._2;
+      return $Mod(
+        (x) => $0._1({
+          optNames: [$OptName("OptShort", "w"), $OptName("OptLong", "website"), ...x.optNames],
+          optCompleter: x.optCompleter,
+          optNoArgError: x.optNoArgError
+        }),
+        $DefaultProp($Maybe("Just", "Misc"), $1.tag === "Nothing" ? Nothing : $1),
+        (x) => $0._3(x)
+      );
+    })()))),
+    $Parser(
+      "AltP",
+      flag$p(true)(foldableArray.foldMap(modMonoid)(identity3)([
+        $Mod(
+          flagFieldsHasName.name($OptName("OptLong", "local")),
+          $DefaultProp(Nothing, Nothing),
+          identity26
+        ),
+        $Mod(
+          flagFieldsHasName.name($OptName("OptShort", "l")),
+          $DefaultProp(Nothing, Nothing),
+          identity26
+        ),
+        help("Are you publishing from source (false), or an npm package (true)?")
+      ])),
+      $Parser("NilP", false)
+    )
+  )
+))();
 var parseImports = /* @__PURE__ */ $Parser(
   "BindP",
   /* @__PURE__ */ manyM(/* @__PURE__ */ option(readerAsk)(/* @__PURE__ */ (() => {
@@ -28400,7 +28436,7 @@ var copyOptions = {
   encoding: Nothing,
   shell: Nothing
 };
-var copyFiles = (website) => exec2("./node_modules/@explorable-viz/fluidscript/bundle-website.sh -w" + website + " -r true")(copyOptions)((v) => {
+var copyFiles = (website) => (b) => exec2(b ? "./node_modules/@explorable-viz/fluid/script/bundle-website.sh -w " + website + " -r true" : "./script/bundle-website.sh -w " + website)(copyOptions)((v) => {
   if (v.error.tag === "Just") {
     return log(showErrorImpl(v.error._1));
   }
@@ -28415,11 +28451,11 @@ var copyFiles = (website) => exec2("./node_modules/@explorable-viz/fluidscript/b
 });
 var dispatchCommand = (v) => {
   if (v.tag === "Evaluate") {
-    return output(v._1);
+    return _map((v$1) => {
+    })(output(v._1));
   }
   if (v.tag === "Publish") {
-    const $0 = v._1;
-    return _bind(_liftEffect(copyFiles(v._2)))(() => _bind(_liftEffect(log("Published")))(() => output($0)));
+    return _bind(_liftEffect(copyFiles(v._1)(v._2)))(() => _liftEffect(log("Published")));
   }
   fail();
 };
@@ -28428,7 +28464,7 @@ var callback = (v) => {
     return log(showErrorImpl(v._1));
   }
   if (v.tag === "Right") {
-    return log(intercalate4("\n")(removeDocWS(prettyVal(highlightableUnit).pretty(v._1)).lines));
+    return log("Success");
   }
   fail();
 };
@@ -28515,25 +28551,6 @@ var program = /* @__PURE__ */ (() => $Parser(
     })())
   )
 ))();
-var publish = /* @__PURE__ */ (() => $Parser(
-  "MultP",
-  $MultPE(
-    parserFunctor.map(Publish)(program),
-    parserFunctor.map(Folder)(option(readerAsk)((() => {
-      const $0 = help("root directory of website under dist/");
-      const $1 = $0._2._2.tag === "Nothing" ? Nothing : $0._2._2;
-      return $Mod(
-        (x) => $0._1({
-          optNames: [$OptName("OptShort", "w"), $OptName("OptLong", "website"), ...x.optNames],
-          optCompleter: x.optCompleter,
-          optNoArgError: x.optNoArgError
-        }),
-        $DefaultProp($Maybe("Just", "Misc"), $1.tag === "Nothing" ? Nothing : $1),
-        (x) => $0._3(x)
-      );
-    })()))
-  )
-))();
 var commandParser = /* @__PURE__ */ subparser(/* @__PURE__ */ (() => {
   const $0 = command("evaluate")(progDesc("Evaluate a file")({
     infoParser: parserFunctor.map(Evaluate)(program),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.7.25",
+  "version": "0.7.28",
   "description": "Fluid is an experimental programming language which integrates a bidirectional dynamic analysis to connect outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
   "main": "index.js",
   "repository": {
@@ -21,7 +21,7 @@
     "dist/fluid/",
     "script/bundle-website.sh",
     "script/util/clean.sh",
-    "script/util/lisp_case.sh"
+    "script/util/lisp-case.sh"
   ],
   "scripts": {
     "tidy": "./script/tidy.sh",

package/script/bundle-website.sh

@@ -27,6 +27,11 @@ SRC_PATH=${WEBSITE//./\/}
 SRC_PATH_LISP_CASE=$($LISP_CASE "$SRC_PATH")
 echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
 
+if [[ -e "website/$SRC_PATH.html" ]]; then
+   $CLEAN $SRC_PATH_LISP_CASE
+   cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
+fi
+
 shopt -s nullglob
 
 set +x

package/script/util/lisp-case.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+toLispCase() {
+   INPUT="$1"
+   RESULT=$(echo "$INPUT" | sed -E 's/([a-z0-9])([A-Z])/\1-\2/g' | tr '[:upper:]' '[:lower:]')
+   echo "$RESULT"
+}
+
+toLispCase "$1"