Fix #107

Author: cannorin

lib/Parser.fs

@@ -1085,9 +1085,8 @@ let private getAllLocalReferences (ctx: #IContext<#IOptions>) (sourceFiles: Ts.S
     | _ -> ()
     n.forEachChild(go sourceFile)
 
-  and goSourceFile sourceFile =
-    for statement in sourceFile.statements do
-      go sourceFile statement |> ignore
+  and goSourceFile (sourceFile: Ts.SourceFile) =
+    sourceFile.forEachChild(go sourceFile) |> ignore
 
   for sourceFile in sourceFiles do goSourceFile sourceFile
 
@@ -1111,33 +1110,30 @@ let createDependencyGraph (sourceFiles: Ts.SourceFile seq) =
       let specifier = (!!e : Ts.StringLiteral).text
       if specifier.StartsWith(".") then
         tryFindDefinitionFile sourceFile specifier
-        |> Option.map (fun target ->
-          graph <- graph |> Graph.add sourceFile.fileName target.fileName
-          target)
-      else None
-    else None
-
-  let rec go (sourceFile: Ts.SourceFile) (n: Ts.Node) : unit option =
-    match n.kind with
-    | Ts.SyntaxKind.ImportEqualsDeclaration ->
-      let n = n :?> Ts.ImportEqualsDeclaration
-      if (!!n.moduleReference : Ts.Node).kind = Ts.SyntaxKind.ExternalModuleReference then
-        (!!n.moduleReference : Ts.ExternalModuleReference).expression
+        |> Option.iter (fun target ->
+          graph <- graph |> Graph.add sourceFile.fileName target.fileName)
+
+  let go (sourceFile: Ts.SourceFile) (ns: Ts.Node seq) =
+    for n in ns do
+      match n.kind with
+      | Ts.SyntaxKind.ImportEqualsDeclaration ->
+        let n = n :?> Ts.ImportEqualsDeclaration
+        if (!!n.moduleReference : Ts.Node).kind = Ts.SyntaxKind.ExternalModuleReference then
+          (!!n.moduleReference : Ts.ExternalModuleReference).expression
+          |> handleModuleSpecifier sourceFile
+      | Ts.SyntaxKind.ImportDeclaration ->
+        let n = n :?> Ts.ImportDeclaration
+        n.moduleSpecifier
         |> handleModuleSpecifier sourceFile
-        |> Option.iter goSourceFile
-    | Ts.SyntaxKind.ImportDeclaration ->
-      let n = n :?> Ts.ImportDeclaration
-      n.moduleSpecifier
-      |> handleModuleSpecifier sourceFile
-      |> Option.iter goSourceFile
-    | _ -> ()
-    n.forEachChild(go sourceFile)
+      | _ -> ()
+    ns |> Seq.collect (fun n -> n.getChildren(sourceFile))
 
-  and goSourceFile (sourceFile: Ts.SourceFile) =
-    for statement in sourceFile.statements do
-      go sourceFile statement |> ignore
+  let goSourceFile (sourceFile: Ts.SourceFile) =
+    let mutable nodes : Ts.Node seq = !!sourceFile.statements
+    while not (nodes |> Seq.isEmpty) do
+      nodes <- go sourceFile nodes
 
-  for sourceFile in sourceFiles do goSourceFile sourceFile
+  for source in sourceFiles do goSourceFile source
   graph
 
 let assertFileExistsAndHasCorrectExtension (fileName: string) =
@@ -1198,8 +1194,7 @@ let parse (ctx: ParserContext) : Input =
     |> Seq.filter (fun sf -> targets |> Set.contains sf.fileName)
   let sources =
     srcs
-    |> Seq.toList
-    |> List.map (fun src ->
+    |> Seq.map (fun src ->
       ctx.logger.tracef "* parsing %s..." src.fileName
       let references =
         Seq.concat [
@@ -1217,6 +1212,7 @@ let parse (ctx: ParserContext) : Input =
         fileName = src.fileName
         hasNoDefaultLib = src.hasNoDefaultLib
         references = references })
+    |> List.ofSeq
 
   let info =
     match sources with

package.json

@@ -39,6 +39,7 @@
     "@types/vscode": "^1.63.1",
     "@types/yargs": "17.0.9",
     "cassandra-driver": "^4.6.3",
+    "cdk8s": "^2.2.41",
     "monaco-editor": "0.33.0",
     "react-player": "2.9.0",
     "webpack": "5.70.0",

src/Targets/JsOfOCaml/Writer.fs

@@ -1756,12 +1756,12 @@ let emitFlattenedDefinitions (ctx: Context) (stmts: Statement list) : text list
   let inline emitTypeName name args =
     Type.appOpt (str (Naming.flattenedTypeName name)) args
 
-  let rec go prefix (ctx: Context) (v: Statement) =
+  let rec go (prefix: unit -> string) (ctx: Context) (v: Statement) =
     match v with
     | Enum e ->
       let fn = ctx |> Context.getFullName [e.name]
       [
-        yield tprintf "%s %s = " prefix (Naming.flattenedTypeName fn.name) + GetSelfTyText.enumCases e e.cases
+        yield tprintf "%s %s = " (prefix()) (Naming.flattenedTypeName fn.name) + GetSelfTyText.enumCases e e.cases
         for c in e.cases do
           yield tprintf "and %s = " (Naming.flattenedTypeName (fn.name @ [c.name])) + GetSelfTyText.enumCases e [c]
       ]
@@ -1782,12 +1782,12 @@ let emitFlattenedDefinitions (ctx: Context) (stmts: Statement list) : text list
               | [] -> Prim prim
               | _  -> App (APrim prim, c.typeParams |> List.map (fun tp -> TypeVar tp.name), UnknownLocation)
             emitType_ ctx target
-        [prefix @+ " " @+ emitTypeName fn.name typrm +@ " = " + selfTyText]
+        [prefix() @+ " " @+ emitTypeName fn.name typrm +@ " = " + selfTyText]
     | TypeAlias { name = name; typeParams = typeParams; target = target } ->
       let fn = ctx |> Context.getFullName [name]
       let typrm = typeParams |> List.map (fun x -> tprintf "'%s" x.name)
       let selfTyText = emitType_ ctx target
-      [prefix @+ " " @+ emitTypeName fn.name typrm +@ " = " + selfTyText]
+      [prefix() @+ " " @+ emitTypeName fn.name typrm +@ " = " + selfTyText]
       // TODO: emit extends of type parameters
     | Module m -> m.statements |> List.collect (go prefix (ctx |> Context.ofChildNamespace m.name))
     | Global m -> m.statements |> List.collect (go prefix (ctx |> Context.ofRoot))
@@ -1835,7 +1835,7 @@ let emitFlattenedDefinitions (ctx: Context) (stmts: Statement list) : text list
     for a in aim |> Map.toList |> List.map fst do
       yield genAnonymousInterface (getPrefix()) a
     for stmt in stmts do
-      yield! go (getPrefix()) ctx stmt
+      yield! go getPrefix ctx stmt
   ]
 
 let emitStatementsWithStructuredText (ctx: Context) (stmts: Statement list) (st: StructuredText) =

yarn.lock

@@ -826,6 +826,15 @@ cassandra-driver@^4.6.3:
     adm-zip "^0.5.3"
     long "^2.2.0"
 
+cdk8s@^2.2.41:
+  version "2.2.41"
+  resolved "https://registry.yarnpkg.com/cdk8s/-/cdk8s-2.2.41.tgz#7bf007fb095dfc85117bb50073bc7dac0610298b"
+  integrity sha512-89iFXZ76JNfLh4yVeCfa8Y+0MIIAhP5oSlA+6gpdcWCQLnlRAEMY+NW9LxKfTuLdTwCF26EpltW6nBJyjf08xw==
+  dependencies:
+    fast-json-patch "^2.2.1"
+    follow-redirects "^1.14.9"
+    yaml "2.0.0-7"
+
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -1252,6 +1261,11 @@ express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -1268,6 +1282,13 @@ fast-glob@^3.1.1:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-json-patch@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-2.2.1.tgz#18150d36c9ab65c7209e7d4eb113f4f8eaabe6d9"
+  integrity sha512-4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -1325,6 +1346,11 @@ follow-redirects@^1.0.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
   integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
+follow-redirects@^1.14.9:
+  version "1.14.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
+  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+
 [email protected]:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -2819,6 +2845,11 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
+[email protected]:
+  version "2.0.0-7"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.0.0-7.tgz#9799d9d85dfc8f01e4cc425e18e09215364beef1"
+  integrity sha512-RbI2Tm3hl9AoHY4wWyWvGvJfFIbHOzuzaxum6ez1A0vve+uXgNor03Wys4t+2sgjJSVSe+B2xerd1/dnvqHlOA==
+
 yargs-parser@^21.0.0:
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"