1.0.81 src

Author: SlimerDude

extras/src/build/fan/BuildPod.fan

@@ -446,12 +446,23 @@ abstract class BuildPod : BuildScript
     {
       c := Compiler(ci)
       c.frontend
+
       esmDir := Env.cur.homeDir.plus(`lib/es/esm/`)
+      if (Env.cur.vars.containsKey("FAN_ESM_DIR"))
+        esmDir = Env.cur.vars["FAN_ESM_DIR"].toUri.toFile
+
       Env.cur.homeDir.plus(`lib/js/node_modules/${podName}.js`).out.writeChars(c.js).flush.close
       if (c.esm != null)
+      {
         esmDir.plus(`${podName}.js`).out.writeChars(c.esm).flush.close
-      if (c.tsDecl != null)
-        esmDir.plus(`${podName}.d.ts`).out.writeChars(c.tsDecl).flush.close
+
+        // write ts declarations
+        t := Type.find("nodeJs::GenTsDecl", false)
+        if (t == null) return
+        decl := esmDir.plus(`${podName}.d.ts`).out
+        t.make([decl, c.pod, ["allTypes":true]])->run
+        decl.flush.close
+      }
     }
     catch (CompilerErr err)
     {

extras/src/buildpods.fan

@@ -27,6 +27,7 @@ class Build : BuildGroup
       `compilerJs/build.fan`,
       `compilerEs/build.fan`,
       `fandoc/build.fan`,
+      `markdown/build.fan`,
       `concurrent/build.fan`,
       `util/build.fan`,
       `nodeJs/build.fan`,

extras/src/compiler/fan/ast/Expr.fan

@@ -1114,13 +1114,14 @@ class FieldExpr : NameExpr
   {
     s := StrBuf.make
     if (target != null) s.add(target).add(".");
+    if (isSafe) s.add("?")
     if (!useAccessor) s.add("@")
     s.add(name)
     return s.toStr
   }
 
   CField? field       // resolved field
-  Bool useAccessor    // false if access using '*' storage operator
+  Bool useAccessor    // false if access using '&' storage operator
 }
 
 **************************************************************************
@@ -1755,4 +1756,5 @@ enum class ShortcutOp
   const Str methodName
   const Bool isOperator
   const Str symbol
-}
+}
+

extras/src/compiler/fan/ast/Stmt.fan

@@ -38,6 +38,12 @@ abstract class Stmt : Node
   **
   abstract Bool isDefiniteAssign(|Expr lhs->Bool| f)
 
+  **
+  ** Is this statement a field initialization for a once storage field.
+  ** This is used in compilerEs to skip initializing fields to "_once_"
+  **
+  virtual Bool isOnceFieldInit() { false }
+
 //////////////////////////////////////////////////////////////////////////
 // Tree
 //////////////////////////////////////////////////////////////////////////
@@ -112,6 +118,14 @@ class ExprStmt : Stmt
 
   override Bool isDefiniteAssign(|Expr lhs->Bool| f) { expr.isDefiniteAssign(f) }
 
+  override Bool isOnceFieldInit()
+  {
+    if (expr.id !== ExprId.assign) return false
+    x := ((BinaryExpr)expr).lhs as FieldExpr
+    if (x === null) return false
+    return x.field.isOnce
+  }
+
   override Void walkChildren(Visitor v, VisitDepth depth)
   {
     expr = walkExpr(v, depth, expr)
@@ -657,4 +671,5 @@ enum class StmtId
   continueStmt,
   tryStmt,
   switchStmt
-}
+}
+