Rename -web to -playground

Author: davesnx

.github/workflows/ci.yml

@@ -50,7 +50,6 @@ jobs:
       - name: Web build
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          cd website
           npm ci
           npm run build-production
 
@@ -136,17 +135,17 @@ jobs:
       - name: Create archives for Github release
         run: |
           cd _release/platform-darwin-x64
-          mv Bin.exe query-json
+          mv query-json.exe query-json
           zip -r ../../query-json-darwin-x64.zip .
           cd ../..
 
           cd _release/platform-linux-x64
-          mv Bin.exe query-json
+          mv query-json.exe query-json
           zip -r ../../query-json-linux-x64.zip .
           cd ../..
 
           cd _release/platform-windows-x64
-          mv Bin.exe query-json
+          mv query-json.exe query-json
           zip -r ../../query-json-windows-x64.zip .
           cd ../..
 

Makefile

@@ -64,8 +64,12 @@ create-switch: ## Create opam switch
 	opam switch create . 5.1.0 --deps-only --with-test -y
 
 .PHONY: install
-install:
+install: ## Install opam deps
 	opam install . --deps-only --with-test --with-doc --with-dev-setup -y
 
+.PHONY: npm-install
+npm-install: ## Install npm dependencies
+	npm install
+
 .PHONY: init
 init: setup-githooks create-switch pin install install-npm ## Create a local dev enviroment

dune-project

@@ -16,7 +16,7 @@
 (source
  (github davesnx/query-json))
 
-(implicit_transitive_deps false)
+(implicit_transitive_deps true)
 
 (version 0.5.10)
 
@@ -47,27 +47,9 @@
 ))
 
 (package
- (name query-json-js)
- (synopsis "Faster, simpler and more portable implementation of `jq` in Reason. Shipped as a JavaScript library.")
- (description "query-json is a faster and simpler re-implementation of jq's language in Reason, compiled to a native binary and as a JavaScript library.
-
-  It's a CLI to run small programs against JSON, the same idea as sed but for JSON files.
-
-  Play around with it in the online playground: https://query-json.netlify.app")
- (depends
-  ocaml
-  reason
-  dune
-  yojson
-  cmdliner
-  js_of_ocaml
-  js_of_ocaml-compiler
-))
-
-(package
- (name query-json-web)
+ (name query-json-playground)
  (allow_empty)
- (synopsis "query-json-web is the web playground for query-json, written in jsoo and jsoo-react.")
+ (synopsis "query-json-playground is the web playground for query-json, written in jsoo and jsoo-react.")
  (description "query-json is a faster and simpler re-implementation of jq's language in Reason, compiled to a native binary and as a JavaScript library.
 
   It's a CLI to run small programs against JSON, the same idea as sed but for JSON files.

js/Js.ml

@@ -1 +1 @@
-let run = QueryJsonJs.run;
+let run = QueryJsonCore.Main.run;

js/QueryJsonJs.re

@@ -1,11 +1,5 @@
-(library
- (name QueryJsonJs)
- (public_name query-json-js)
- (modules QueryJsonJs)
- (libraries query-json.core yojson cmdliner js_of_ocaml))
-
 (executable
  (name Js)
  (modes js)
  (modules Js)
- (libraries query-json-js yojson cmdliner js_of_ocaml))
+ (libraries query-json.core))

js/QueryJsonJs.rei

@@ -2,11 +2,9 @@
   "name": "query-json-website",
   "version": "0.0.0",
   "scripts": {
-    "start": "run-p --aggregate-output dev serve",
-    "dev": "webpack -w",
-    "build": "webpack",
-    "build-production": "vite build",
-    "serve": "vite preview"
+    "start": "run-p --aggregate-output build preview",
+    "build": "vite build",
+    "preview": "vite preview"
   },
   "dependencies": {
     "@emotion/css": "^11.7.1",

js/dune

@@ -2,7 +2,7 @@
 opam-version: "2.0"
 version: "0.5.10"
 synopsis:
-  "query-json-web is the web playground for query-json, written in jsoo and jsoo-react."
+  "query-json-playground is the web playground for query-json, written in jsoo and jsoo-react."
 description: """
 query-json is a faster and simpler re-implementation of jq's language in Reason, compiled to a native binary and as a JavaScript library.
 

package.json

@@ -46,3 +46,25 @@ let parse = (~debug=false, input): result(Ast.expression, string) => {
     Error(make(~input, ~start=loc_start, ~end_=loc_end));
   };
 };
+
+let run = (query, json) => {
+  let result =
+    parse(query)
+    |> Result.map(Compiler.compile)
+    |> Result.bind(_, runtime => {
+         switch (Json.parseString(json)) {
+         | Ok(input) => runtime(input)
+         | Error(err) => Error(err)
+         }
+       });
+
+  switch (result) {
+  | Ok(res) =>
+    Ok(
+      res
+      |> List.map(Json.toString(~colorize=false, ~summarize=false))
+      |> String.concat("\n"),
+    )
+  | Error(e) => Error(e)
+  };
+};

query-json-js.opam

@@ -7,6 +7,7 @@ import polyfillNode from "rollup-plugin-polyfill-node"
 import vitePluginRequire from "vite-plugin-require"
 
 const isProd = process.env.NODE_ENV === 'production';
+
 const monacoEditorPlugin = MonacoEditorPlugin({
   languages: ['json'],
   languageWorkers: ['json']

query-json-web.opam renamed to query-json-playground.opam

@@ -179,7 +179,7 @@ let make = () => {
     switch (state.json, state.query) {
     | (Some(_), "")
     | (None, _) => None
-    | (Some(json), _) => Some(QueryJsonJs.run(state.query, json))
+    | (Some(json), _) => Some(QueryJsonCore.Main.run(state.query, json))
     };
 
   let onShareClick = _ => {

source/Main.re

@@ -1,7 +1,14 @@
 (executable
  (name Website)
  (modes js)
- (libraries query-json-js js_of_ocaml jsoo-react.lib ojs jsoo-css brr jsonoo)
+ (libraries
+  query-json.core
+  js_of_ocaml
+  jsoo-react.lib
+  ojs
+  jsoo-css
+  brr
+  jsonoo)
  (preprocess
   (pps jsoo-react.ppx ppx_jsobject_conv)))