Merge pull request #714 from Stansom/main

JS: Fix export bug, support multiple type imports, and ensure type import semicolon consistency

Author: Olical

dev/typescript/moped.ts

@@ -5,3 +5,6 @@ export interface IMoped {
   countWheels: () => number;
   getEngineDisplacement: () => number;
 }
+
+export type ConvertOptions = string;
+export type OptimizationOptions = number;

dev/typescript/sandbox.ts

@@ -72,7 +72,7 @@ import { minus } from "../javascript/math.js";
 
 minus(1, 2);
 
-import type { IMoped } from "./moped.ts";
+import type { IMoped } from "./moped.ts"
 
 class Moped implements IMoped {
   wheels: number
@@ -324,3 +324,13 @@ for (let user of users) {
 }
 
 process.stderr.write("error! some error occurred");
+
+import {
+  type ConvertOptions as CrateConvertOptions,
+  type OptimizationOptions,
+} from "./moped";
+
+export const expFn = () => "export fn";
+expFn()
+export function funFun() { return "export function Fun" }
+export { }

fnl/conjure/client/javascript/import-replacer.fnl

@@ -17,11 +17,13 @@
 
 (fn is-type-import? [node code]
   (let [first-child (node:child 0)
-        second-child (node:child 1)]
-    (and first-child
+        second-child (node:child 1)
+        contains-type (string.find (tsc.get-text second-child code) "type")]
+    (or (and first-child
          (= (tsc.get-text first-child code) "import")
          second-child
-         (= (tsc.get-text second-child code) "type"))))
+         (= (tsc.get-text second-child code) "type"))
+        contains-type)))
 
 (fn clean-named-imports [node code]
   (let [text (tsc.get-text node code)]
@@ -34,7 +36,8 @@
   (if (and source.resolved-path source.text)
       (-> (tsc.get-text node code)
           (string.gsub (vim.pesc source.text)
-                       (string.format "\"%s\"" source.resolved-path)))
+                       (string.format "\"%s\"" source.resolved-path))
+          (.. ";"))
       (tsc.get-text node code)))
 
 (fn transform-plain-import [source]

fnl/conjure/client/javascript/stdio.fnl

@@ -134,7 +134,7 @@
 
 ;; To get rid of the "Uncaught SyntaxError: Unexpected token 'export'", 
 ;; the REPL silently evaluates the following expression: 
-(set M.initialise-repl-code "1+1")
+(set M.initialise-repl-code "")
 
 (fn repl-command-for-filetype []
   (if
@@ -162,6 +162,7 @@
            :on-success
            (fn []
              (display-repl-status :started)
+             (let [repl (state :repl)] (repl.send "1+1;"))
              (with-repl-or-warn
                  (fn [repl]
                    (repl.send

fnl/conjure/client/javascript/transformers.fnl

@@ -82,6 +82,17 @@
 (set node-handlers.call_expression
      (ir.call-expression node-handlers.default))
 
+(set node-handlers.export_statement
+     (fn [node code]
+       (let [child (node:child 1)]
+         (case (child:type)
+           (where (or "interface_declaration" "class_declaration")) 
+           (node-handlers.default node code)
+
+           "export_clause" ""
+
+           _ (node-handlers.default child code)))))
+
 (each [_ t (pairs
              [:expression_statement
               :variable_declaration
@@ -90,11 +101,11 @@
               :break_statement
               :continue_statement
               :debugger_statement
-              :export_statement
               :class_declaration
               :field_definition
               :public_field_definition
-              :function_declaration])]
+              :function_declaration ])]
+
   (set (. node-handlers t) handle-statement))
 
 (fn M.transform [s]