tests

apps/chat/contract/chat_contract.rs

@@ -9,7 +9,7 @@
 #![allow(unused_parens)]
 #![allow(unused_variables)]
 #![allow(unused_assignments)]
-mod module_31a2fc18 {
+mod module_2e7a6383 {
     pub mod Chat_contract {
         use super::*;
         type DateTime = ();
@@ -1889,46 +1889,46 @@ mod module_31a2fc18 {
         on_startup!(());
     }
 }
-pub use module_31a2fc18::*;
+pub use module_2e7a6383::*;
 #[path = "../../../deps/spiral/lib/spiral/async__contract.rs"]
-mod module_2335f2f5;
-pub use module_2335f2f5::*;
+mod module_763b9e6c;
+pub use module_763b9e6c::*;
 #[path = "../../../deps/spiral/lib/spiral/common_contract.rs"]
-mod module_652e6d81;
-pub use module_652e6d81::*;
+mod module_18f1c018;
+pub use module_18f1c018::*;
 #[path = "../../../deps/spiral/lib/spiral/crypto_contract.rs"]
-mod module_dd5f95ef;
-pub use module_dd5f95ef::*;
+mod module_c0301e36;
+pub use module_c0301e36::*;
 #[path = "../../../deps/spiral/lib/spiral/date_time_contract.rs"]
-mod module_ca5e6cb2;
-pub use module_ca5e6cb2::*;
+mod module_e5abed0b;
+pub use module_e5abed0b::*;
 #[path = "../../../deps/spiral/lib/spiral/file_system_contract.rs"]
-mod module_5ab1faf0;
-pub use module_5ab1faf0::*;
+mod module_336d1dc9;
+pub use module_336d1dc9::*;
 #[path = "../../../deps/spiral/lib/spiral/lib_contract.rs"]
-mod module_b386774b;
-pub use module_b386774b::*;
+mod module_12dde172;
+pub use module_12dde172::*;
 #[path = "../../../deps/spiral/lib/spiral/networking_contract.rs"]
-mod module_ce497f72;
-pub use module_ce497f72::*;
+mod module_7e35832b;
+pub use module_7e35832b::*;
 #[path = "../../../deps/spiral/lib/spiral/platform_contract.rs"]
-mod module_9a61edd3;
-pub use module_9a61edd3::*;
+mod module_afd02cca;
+pub use module_afd02cca::*;
 #[path = "../../../deps/spiral/lib/spiral/runtime_contract.rs"]
-mod module_502d7e30;
-pub use module_502d7e30::*;
+mod module_a3c64389;
+pub use module_a3c64389::*;
 #[path = "../../../deps/spiral/lib/spiral/sm_contract.rs"]
-mod module_34f67952;
-pub use module_34f67952::*;
+mod module_8f227ecb;
+pub use module_8f227ecb::*;
 #[path = "../../../deps/spiral/lib/spiral/threading_contract.rs"]
-mod module_11c0c5c2;
-pub use module_11c0c5c2::*;
+mod module_e08c16fb;
+pub use module_e08c16fb::*;
 #[path = "../../../deps/spiral/lib/spiral/trace_contract.rs"]
-mod module_28ecba0d;
-pub use module_28ecba0d::*;
+mod module_702ddcb4;
+pub use module_702ddcb4::*;
 #[path = "../../../lib/fsharp/Common_contract.rs"]
-mod module_ad43931;
-pub use module_ad43931::*;
+mod module_eb7e4788;
+pub use module_eb7e4788::*;
 pub mod Polyglot {
-    pub use crate::module_ad43931::Polyglot::*;
+    pub use crate::module_eb7e4788::Polyglot::*;
 }

apps/spiral/Supervisor.dib

@@ -473,7 +473,7 @@ let persistCode (input: {| backend : Backend option; input: SpiralInput; package
             (if spir then $"{moduleName}_real*-" else ""),
             if spi then moduleName else ""
 
-    let libLinkTargetPath = workspaceRoot </> "deps/spiral/lib/spiral"
+    let libLinkTargetPath = workspaceRoot </> "../spiral/lib/spiral"
     let libLinkPath = packageDir </> "spiral"
 
     let packagesModule =
@@ -489,7 +489,7 @@ let persistCode (input: {| backend : Backend option; input: SpiralInput; package
 
     let packageDir' =
         if input.packages |> Array.isEmpty
-        then workspaceRoot </> "deps/spiral/lib"
+        then workspaceRoot </> "../spiral/lib"
         else
             libLinkPath |> SpiralFileSystem.link_directory libLinkTargetPath
             packageDir

apps/spiral/Supervisor.fs

@@ -360,7 +360,7 @@ module Supervisor =
                 (if spir then $"{moduleName}_real*-" else ""),
                 if spi then moduleName else ""
 
-        let libLinkTargetPath = workspaceRoot </> "deps/spiral/lib/spiral"
+        let libLinkTargetPath = workspaceRoot </> "../spiral/lib/spiral"
         let libLinkPath = packageDir </> "spiral"
 
         let packagesModule =
@@ -376,7 +376,7 @@ module Supervisor =
 
         let packageDir' =
             if input.packages |> Array.isEmpty
-            then workspaceRoot </> "deps/spiral/lib"
+            then workspaceRoot </> "../spiral/lib"
             else
                 libLinkPath |> SpiralFileSystem.link_directory libLinkTargetPath
                 packageDir

apps/spiral/supervisor.ts

@@ -1,4 +1,4 @@
-import * as crypto from "../../lib/spiral/crypto"
+import * as crypto from "../../deps/spiral/lib/spiral/crypto"
 import * as path from "path"
 import * as fs from "fs"
 
@@ -60,7 +60,7 @@ export const getFileTokenRange = async (workspaceRoot: string, text: string) =>
   const codeFile = path.join(codeDir, text.indexOf("//// real\n") >= 0 ? "main_real.spir" : "main.spi")
   const tokensFile = path.join(codeDir, "tokens.json")
 
-  console.log(`supervisor.getFileTokenRange / codeDir: ${codeDir}`)
+  console.log(`polyglot/apps/spiral/supervisor.ts/getFileTokenRange / codeDir: ${codeDir}`)
 
   if (!(await fileExists(codeFile))) {
     await fs.promises.writeFile(codeFile, text, "utf8")
@@ -82,7 +82,8 @@ export const getFileTokenRange = async (workspaceRoot: string, text: string) =>
     }
     await sleep(60)
   }
-  console.log(`supervisor.getFileTokenRange / elapsed: ${Date.now() - start} / retries: ${retries} / tokensText.length: ${tokensText.length}`)
+  console.log(`polyglot/apps/spiral/supervisor.ts/getFileTokenRange / ` +
+        `elapsed: ${Date.now() - start} / retries: ${retries} / tokensText.length: ${tokensText.length}`)
 
   const tokens = new Uint32Array(JSON.parse(tokensText))
 

apps/spiral/temp/cube/cube.py

@@ -1,12 +1,5 @@
 from __future__ import annotations
 from abc import abstractmethod
-from collections.abc import Callable
-from dataclasses import dataclass
-from math import (sin, cos)
-import os
-import sys
-sys.path.insert(0, f'{os.path.dirname(__file__)}/../../../../lib/python/fable')
-from typing import (Any, Protocol)
 from fable_modules.fable_library.array_ import fill
 from fable_modules.fable_library.async_ import (sleep, start_immediate)
 from fable_modules.fable_library.async_builder import (singleton as singleton_1, Async)
@@ -20,6 +13,13 @@
 from fable_modules.fable_library.thread import sleep as sleep_1
 from fable_modules.fable_library.types import (Array, Union, Record, to_string)
 from fable_modules.fable_library.util import (IEnumerable_1, to_enumerable)
+from collections.abc import Callable
+from dataclasses import dataclass
+from math import (sin, cos)
+import os
+import sys
+sys.path.insert(0, f'{os.path.dirname(__file__)}/../../../../lib/python/fable')
+from typing import (Any, Protocol)
 
 class IOsEnviron(Protocol):
     @abstractmethod

apps/spiral/temp/cube/cube.rs

@@ -11,7 +11,7 @@
 #![allow(unused_assignments)]
 use fable_library_rust::NativeArray_::array_from;
 use fable_library_rust::String_::fromString;
-mod module_62c167ba {
+mod module_3e76c43 {
     pub mod Cube {
         use super::*;
         use fable_library_rust::Async_::Async;
@@ -456,48 +456,48 @@ mod module_62c167ba {
         }
     }
 }
-pub use module_62c167ba::*;
+pub use module_3e76c43::*;
 #[path = "../../../../deps/spiral/lib/spiral/async_.rs"]
-mod module_2335f2f5;
-pub use module_2335f2f5::*;
+mod module_763b9e6c;
+pub use module_763b9e6c::*;
 #[path = "../../../../deps/spiral/lib/spiral/common.rs"]
-mod module_652e6d81;
-pub use module_652e6d81::*;
+mod module_18f1c018;
+pub use module_18f1c018::*;
 #[path = "../../../../deps/spiral/lib/spiral/crypto.rs"]
-mod module_dd5f95ef;
-pub use module_dd5f95ef::*;
+mod module_c0301e36;
+pub use module_c0301e36::*;
 #[path = "../../../../deps/spiral/lib/spiral/date_time.rs"]
-mod module_ca5e6cb2;
-pub use module_ca5e6cb2::*;
+mod module_e5abed0b;
+pub use module_e5abed0b::*;
 #[path = "../../../../deps/spiral/lib/spiral/file_system.rs"]
-mod module_5ab1faf0;
-pub use module_5ab1faf0::*;
+mod module_336d1dc9;
+pub use module_336d1dc9::*;
 #[path = "../../../../deps/spiral/lib/spiral/lib.rs"]
-mod module_b386774b;
-pub use module_b386774b::*;
+mod module_12dde172;
+pub use module_12dde172::*;
 #[path = "../../../../deps/spiral/lib/spiral/networking.rs"]
-mod module_ce497f72;
-pub use module_ce497f72::*;
+mod module_7e35832b;
+pub use module_7e35832b::*;
 #[path = "../../../../deps/spiral/lib/spiral/platform.rs"]
-mod module_9a61edd3;
-pub use module_9a61edd3::*;
+mod module_afd02cca;
+pub use module_afd02cca::*;
 #[path = "../../../../deps/spiral/lib/spiral/runtime.rs"]
-mod module_502d7e30;
-pub use module_502d7e30::*;
+mod module_a3c64389;
+pub use module_a3c64389::*;
 #[path = "../../../../deps/spiral/lib/spiral/sm.rs"]
-mod module_34f67952;
-pub use module_34f67952::*;
+mod module_8f227ecb;
+pub use module_8f227ecb::*;
 #[path = "../../../../deps/spiral/lib/spiral/threading.rs"]
-mod module_11c0c5c2;
-pub use module_11c0c5c2::*;
+mod module_e08c16fb;
+pub use module_e08c16fb::*;
 #[path = "../../../../deps/spiral/lib/spiral/trace.rs"]
-mod module_28ecba0d;
-pub use module_28ecba0d::*;
+mod module_702ddcb4;
+pub use module_702ddcb4::*;
 #[path = "./lib/fsharp/Common.rs"]
-mod module_ad43931;
-pub use module_ad43931::*;
+mod module_eb7e4788;
+pub use module_eb7e4788::*;
 pub mod Polyglot {
-    pub use crate::module_ad43931::Polyglot::*;
+    pub use crate::module_eb7e4788::Polyglot::*;
 }
 pub fn main() {
     let args = std::env::args().skip(1).map(fromString).collect();

lib/fsharp/common.py

@@ -1,16 +1,16 @@
 from __future__ import annotations
+from fable_modules.fable_library.reflection import (TypeInfo, union_type)
+from fable_modules.fable_library.types import (Array, Union)
 from collections.abc import Callable
 from typing import Any
 from .....deps.spiral.lib.spiral.lib import SpiralTrace_trace
 from .....deps.spiral.lib.spiral.trace import US0
-from fable_modules.fable_library.reflection import (TypeInfo, union_type)
-from fable_modules.fable_library.types import (Array, Union)
 
 nl: str = "\n"
 
 q: str = "\""
 
-def _expr190() -> TypeInfo:
+def _expr262() -> TypeInfo:
     return union_type("Polyglot.Common.TraceLevel", [], TraceLevel, lambda: [[], [], [], [], []])
 
 
@@ -25,7 +25,7 @@ def cases() -> list[str]:
         return ["Verbose", "Debug", "Info", "Warning", "Critical"]
 
 
-TraceLevel_reflection = _expr190
+TraceLevel_reflection = _expr262
 
 def to_trace_level(_arg: TraceLevel) -> US0:
     if _arg.tag == 1: