Reverse-merge common files from rescript-support

Author: cannorin

lib/DataTypes/Text.fs

@@ -103,3 +103,11 @@ module Text =
     | Indent x -> isMultiLine x
     | Concat (x, y) -> isMultiLine x || isMultiLine y
     | Empty | Str _ -> false
+
+  /// Get the length of a text. Indents are ignored.
+  let rec length = function
+    | Empty -> 0
+    | Newline -> 1
+    | Str s -> s.Length
+    | Concat (x, y) -> length x + length y
+    | Indent x -> length x

lib/DataTypes/Trie.fs

@@ -7,10 +7,6 @@ type Trie<'k, 'v when 'k: comparison> = {
 
 type Trie<'k when 'k: comparison> = Trie<'k, unit>
 
-type WeakTrie<'k when 'k: comparison> = {
-  children: Map<'k, WeakTrie<'k>>
-}
-
 module Trie =
   let empty<'k, 'v when 'k: comparison> : Trie<'k, 'v> =
     { value = None; children = Map.empty }
@@ -165,6 +161,10 @@ module Trie =
   let toMap (t: Trie<'k, 'v>) : Map<'k list, 'v> = t |> fold (fun state ks v -> Map.add ks v state) Map.empty
   let ofMap (xs: Map<'k list, 'v>) : Trie<'k, 'v> = xs |> Map.fold (fun state ks v -> add ks v state) empty
 
+type WeakTrie<'k when 'k: comparison> = {
+  children: Map<'k, WeakTrie<'k>>
+}
+
 module WeakTrie =
   let empty<'k when 'k: comparison> : WeakTrie<'k> = { children = Map.empty }
 

lib/Extensions.fs

@@ -42,7 +42,7 @@ module String =
   let escape (s: string) =
     s
      .Replace("\\", "\\\\")
-     .Replace("'", "\\'").Replace("\"", "\\\"")
+     .Replace("\"", "\\\"")
      .Replace("\b", "\\b").Replace("\n", "\\n").Replace("\r", "\\r")
      .Replace("\t", "\\t")
 
@@ -51,6 +51,10 @@ module String =
       state.Replace(e, "\\" + e)
     ) s
 
+  open Fable.Core
+  [<Emit("$0.normalize()")>]
+  let normalize (_: string) : string = jsNative
+
 module Option =
   let iterNone f = function
     | Some x -> Some x
@@ -71,6 +75,14 @@ module List =
       ) ([], [])
     List.rev xs1, List.rev xs2
 
+  let splitChoice3 (xs: Choice<'t1, 't2, 't3> list) : 't1 list * 't2 list * 't3 list =
+    let xs1, xs2, xs3 =
+      xs |> List.fold (fun (xs1, xs2, xs3) -> function
+        | Choice1Of3 x -> x :: xs1, xs2, xs3
+        | Choice2Of3 x -> xs1, x :: xs2, xs3
+        | Choice3Of3 x -> xs1, xs2, x :: xs3) ([], [], [])
+    List.rev xs1, List.rev xs2, List.rev xs3
+
 module Map =
   let addNoOverwrite k v m =
     m |> Map.change k (function None -> Some v | Some v -> Some v)

lib/Naming.fs

@@ -127,33 +127,27 @@ let toCase (case: Case) (str: string) =
   | _, _ -> wordsToCase case words
 
 module Keywords =
-  let keywords =
-    Set.ofList [
-      "and"; "as"; "assert"; "asr"; "begin"; "class";
-      "constraint"; "do"; "done"; "downto"; "else"; "end";
-      "exception"; "external"; "false"; "for"; "fun"; "function";
-      "functor"; "if"; "in"; "include"; "inherit"; "initializer";
-      "land"; "lazy"; "let"; "lor"; "lsl"; "lsr";
-      "lxor"; "match"; "method"; "mod"; "module"; "mutable";
-      "new"; "nonrec"; "object"; "of"; "open"; "or";
-      "private"; "rec"; "sig"; "struct"; "then"; "to";
-      "true"; "try"; "type"; "val"; "virtual"; "when";
-      "while"; "with"
-    ]
-
   let esKeywords =
     Set.ofList [
       "Readonly"; "Partial"; "Pick";
       "HTMLDialogElement"; "HTMLWebViewElement"
     ]
 
-  let primitives = Set.ofList [ "string"; "obj"; "unit"; "float"; "bool"; "int" ]
-  let basicTypes = Set.ofList [ "list"; "array"; "option" ]
-
 let removeQuotesAndTrim (s: string) =
   if String.IsNullOrEmpty s then ""
   else
     let c = s.[0]
     if (c = '\"' || c = ''')
     then s.Trim(c).Trim()
     else s.Trim()
+
+let isValidJSIdentifier (s: string) =
+  if String.IsNullOrEmpty s then false
+  else
+    let cs = s.ToCharArray()
+    if cs[0] |> Char.IsDigit then false
+    else
+      cs |> Array.forall (fun c ->
+        Char.IsLetterOrDigit(c)
+        || c = '_' || c = '$'
+      )