firefly-compiler 0.5.63 → 0.5.65

package/output/js/ff/compiler/ModuleCache.mjs

@@ -121,12 +121,11 @@ result_ = ff_core_Map.Map_add(result_, k_, v_, ff_core_Ordering.ff_core_Ordering
 return result_
 }
 
-export function modulePath_(packagePaths_, packagePair_, moduleName_) {
-const packagePath_ = ff_core_Option.Option_else(ff_core_Map.Map_get(packagePaths_, packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), (() => {
-return ff_core_Core.panic_(("Internal error - package path missing: " + ff_compiler_Syntax.PackagePair_groupName(packagePair_, ":")))
+export function modulePath_(packagePaths_, moduleKey_) {
+const packagePath_ = ff_core_Option.Option_else(ff_core_Map.Map_get(packagePaths_, moduleKey_.packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), (() => {
+return ff_core_Core.panic_(("Internal error - package path missing: " + ff_compiler_Syntax.PackagePair_groupName(moduleKey_.packagePair_, ":")))
 }));
-const file_ = (moduleName_ + ".ff");
-return ff_core_Path.Path_slash(packagePath_, file_)
+return ff_compiler_Syntax.ModuleKey_path(moduleKey_, packagePath_)
 }
 
 export async function new_$(version_, $task) {
@@ -145,12 +144,11 @@ result_ = ff_core_Map.Map_add(result_, k_, v_, ff_core_Ordering.ff_core_Ordering
 return result_
 }
 
-export async function modulePath_$(packagePaths_, packagePair_, moduleName_, $task) {
-const packagePath_ = ff_core_Option.Option_else(ff_core_Map.Map_get(packagePaths_, packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), (() => {
-return ff_core_Core.panic_(("Internal error - package path missing: " + ff_compiler_Syntax.PackagePair_groupName(packagePair_, ":")))
+export async function modulePath_$(packagePaths_, moduleKey_, $task) {
+const packagePath_ = ff_core_Option.Option_else(ff_core_Map.Map_get(packagePaths_, moduleKey_.packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), (() => {
+return ff_core_Core.panic_(("Internal error - package path missing: " + ff_compiler_Syntax.PackagePair_groupName(moduleKey_.packagePair_, ":")))
 }));
-const file_ = (moduleName_ + ".ff");
-return (await ff_core_Path.Path_slash$(packagePath_, file_, $task))
+return (await ff_compiler_Syntax.ModuleKey_path$(moduleKey_, packagePath_, $task))
 }
 
 export function ModuleCache_remove(self_, keys_) {
@@ -167,14 +165,13 @@ export function ModuleCache_invalidate(self_, key_) {
 ff_core_Option.Option_each(ff_core_Map.Map_get(self_.parsedModules_, key_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_1) => {
 {
 const module_ = _1.first_;
-const moduleName_ = ff_core_String.String_dropLast(module_.file_, 3);
 ff_compiler_ModuleCache.ModuleCache_remove(self_, [key_]);
 ff_core_Map.Map_each(self_.parsedModules_, ((_1, _2) => {
 {
 const k_ = _1;
 const m_ = _2.first_;
 if(ff_core_List.List_any(m_.imports_, ((i_) => {
-return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_PackagePair.equals_(i_.package_, module_.packagePair_) && (i_.file_ === moduleName_))
+return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_ModuleKey.equals_(i_.moduleKey_, module_.moduleKey_)
 }))) {
 ff_compiler_ModuleCache.ModuleCache_remove(self_, [k_])
 }
@@ -186,13 +183,13 @@ return
 }))
 }
 
-export function ModuleCache_filesNotImporting(self_, packagePair_, moduleName_) {
+export function ModuleCache_filesNotImporting(self_, moduleKey_) {
 return ff_core_List.List_collect(ff_core_Map.Map_toList(self_.parsedModules_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_1) => {
 {
 const k_ = _1.first_;
 const m_ = _1.second_.first_;
 if((!ff_core_List.List_any(m_.imports_, ((i_) => {
-return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_PackagePair.equals_(i_.package_, packagePair_) && (i_.file_ === moduleName_))
+return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_ModuleKey.equals_(i_.moduleKey_, moduleKey_)
 })))) {
 return ff_core_Option.Some(k_)
 } else return ff_core_Option.None()
@@ -269,8 +266,8 @@ return _w1
 }))
 }
 
-export function ModuleCache_cacheParsedModule(self_, packagePaths_, packagePair_, moduleName_, body_) {
-const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, packagePair_, moduleName_);
+export function ModuleCache_cacheParsedModule(self_, packagePaths_, moduleKey_, body_) {
+const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, moduleKey_);
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.parsedModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (() => {
@@ -280,8 +277,8 @@ return result_
 }))
 }
 
-export function ModuleCache_cacheResolvedModule(self_, packagePaths_, packagePair_, moduleName_, body_) {
-const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, packagePair_, moduleName_);
+export function ModuleCache_cacheResolvedModule(self_, packagePaths_, moduleKey_, body_) {
+const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, moduleKey_);
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.resolvedModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (() => {
@@ -291,8 +288,8 @@ return result_
 }))
 }
 
-export function ModuleCache_cacheDerivedModule(self_, packagePaths_, packagePair_, moduleName_, body_) {
-const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, packagePair_, moduleName_);
+export function ModuleCache_cacheDerivedModule(self_, packagePaths_, moduleKey_, body_) {
+const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, moduleKey_);
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.derivedModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (() => {
@@ -302,8 +299,8 @@ return result_
 }))
 }
 
-export function ModuleCache_cacheInferredModule(self_, packagePaths_, packagePair_, moduleName_, body_) {
-const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, packagePair_, moduleName_);
+export function ModuleCache_cacheInferredModule(self_, packagePaths_, moduleKey_, body_) {
+const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, moduleKey_);
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.inferredModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (() => {
@@ -313,8 +310,8 @@ return result_
 }))
 }
 
-export function ModuleCache_cacheEmittedModule(self_, packagePaths_, packagePair_, moduleName_, isMainModule_, body_) {
-const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, packagePair_, moduleName_);
+export function ModuleCache_cacheEmittedModule(self_, packagePaths_, moduleKey_, isMainModule_, body_) {
+const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, moduleKey_);
 if((isMainModule_ || (!ff_core_Map.Map_contains(self_.emittedModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)))) {
 self_.emittedModules_ = ff_core_Map.Map_add(self_.emittedModules_, ff_core_Path.Path_absolute(path_), self_.version_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 try {
@@ -340,14 +337,13 @@ export async function ModuleCache_invalidate$(self_, key_, $task) {
 ff_core_Option.Option_each(ff_core_Map.Map_get(self_.parsedModules_, key_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_1) => {
 {
 const module_ = _1.first_;
-const moduleName_ = ff_core_String.String_dropLast(module_.file_, 3);
 ff_compiler_ModuleCache.ModuleCache_remove(self_, [key_]);
 ff_core_Map.Map_each(self_.parsedModules_, ((_1, _2) => {
 {
 const k_ = _1;
 const m_ = _2.first_;
 if(ff_core_List.List_any(m_.imports_, ((i_) => {
-return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_PackagePair.equals_(i_.package_, module_.packagePair_) && (i_.file_ === moduleName_))
+return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_ModuleKey.equals_(i_.moduleKey_, module_.moduleKey_)
 }))) {
 ff_compiler_ModuleCache.ModuleCache_remove(self_, [k_])
 }
@@ -359,13 +355,13 @@ return
 }))
 }
 
-export async function ModuleCache_filesNotImporting$(self_, packagePair_, moduleName_, $task) {
+export async function ModuleCache_filesNotImporting$(self_, moduleKey_, $task) {
 return ff_core_List.List_collect(ff_core_Map.Map_toList(self_.parsedModules_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_1) => {
 {
 const k_ = _1.first_;
 const m_ = _1.second_.first_;
 if((!ff_core_List.List_any(m_.imports_, ((i_) => {
-return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_PackagePair.equals_(i_.package_, packagePair_) && (i_.file_ === moduleName_))
+return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_ModuleKey.equals_(i_.moduleKey_, moduleKey_)
 })))) {
 return ff_core_Option.Some(k_)
 } else return ff_core_Option.None()
@@ -442,8 +438,8 @@ return _w1
 }))
 }
 
-export async function ModuleCache_cacheParsedModule$(self_, packagePaths_, packagePair_, moduleName_, body_, $task) {
-const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, packagePair_, moduleName_, $task));
+export async function ModuleCache_cacheParsedModule$(self_, packagePaths_, moduleKey_, body_, $task) {
+const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, moduleKey_, $task));
 return (await ff_core_Option.Option_else$(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.parsedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (async ($task) => {
@@ -453,8 +449,8 @@ return result_
 }), $task))
 }
 
-export async function ModuleCache_cacheResolvedModule$(self_, packagePaths_, packagePair_, moduleName_, body_, $task) {
-const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, packagePair_, moduleName_, $task));
+export async function ModuleCache_cacheResolvedModule$(self_, packagePaths_, moduleKey_, body_, $task) {
+const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, moduleKey_, $task));
 return (await ff_core_Option.Option_else$(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.resolvedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (async ($task) => {
@@ -464,8 +460,8 @@ return result_
 }), $task))
 }
 
-export async function ModuleCache_cacheDerivedModule$(self_, packagePaths_, packagePair_, moduleName_, body_, $task) {
-const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, packagePair_, moduleName_, $task));
+export async function ModuleCache_cacheDerivedModule$(self_, packagePaths_, moduleKey_, body_, $task) {
+const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, moduleKey_, $task));
 return (await ff_core_Option.Option_else$(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.derivedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (async ($task) => {
@@ -475,8 +471,8 @@ return result_
 }), $task))
 }
 
-export async function ModuleCache_cacheInferredModule$(self_, packagePaths_, packagePair_, moduleName_, body_, $task) {
-const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, packagePair_, moduleName_, $task));
+export async function ModuleCache_cacheInferredModule$(self_, packagePaths_, moduleKey_, body_, $task) {
+const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, moduleKey_, $task));
 return (await ff_core_Option.Option_else$(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.inferredModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return _w1.first_
 })), (async ($task) => {
@@ -486,8 +482,8 @@ return result_
 }), $task))
 }
 
-export async function ModuleCache_cacheEmittedModule$(self_, packagePaths_, packagePair_, moduleName_, isMainModule_, body_, $task) {
-const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, packagePair_, moduleName_, $task));
+export async function ModuleCache_cacheEmittedModule$(self_, packagePaths_, moduleKey_, isMainModule_, body_, $task) {
+const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, moduleKey_, $task));
 if((isMainModule_ || (!ff_core_Map.Map_contains(self_.emittedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)))) {
 self_.emittedModules_ = ff_core_Map.Map_add(self_.emittedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), self_.version_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 try {

package/output/js/ff/compiler/Parser.mjs

@@ -105,8 +105,8 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 // type Parser
-export function Parser(packagePair_, file_, tokens_, end_, targetIsNode_, lspHook_, lspEmittedArgumentHook_, offset_, nextUnificationVariableIndex_) {
-return {packagePair_, file_, tokens_, end_, targetIsNode_, lspHook_, lspEmittedArgumentHook_, offset_, nextUnificationVariableIndex_};
+export function Parser(moduleKey_, tokens_, end_, targetIsNode_, lspHook_, lspEmittedArgumentHook_, offset_, nextUnificationVariableIndex_) {
+return {moduleKey_, tokens_, end_, targetIsNode_, lspHook_, lspEmittedArgumentHook_, offset_, nextUnificationVariableIndex_};
 }
 
 // type Poly
@@ -116,12 +116,12 @@ return {generics_, constraints_};
 
 export const binaryOperators_ = [["||"], ["&&"], ["!=", "==", "!==", "==="], ["<=", ">=", "<", ">"], ["+", "-"], ["*", "/", "%"], ["^"]];
 
-export function new_(packagePair_, file_, tokens_, targetIsNode_, lspHook_) {
-return ff_compiler_Parser.Parser(packagePair_, file_, tokens_, ff_core_List.List_grabLast(tokens_), targetIsNode_, lspHook_, false, 0, 1)
+export function new_(moduleKey_, tokens_, targetIsNode_, lspHook_) {
+return ff_compiler_Parser.Parser(moduleKey_, tokens_, ff_core_List.List_grabLast(tokens_), targetIsNode_, lspHook_, false, 0, 1)
 }
 
-export async function new_$(packagePair_, file_, tokens_, targetIsNode_, lspHook_, $task) {
-return ff_compiler_Parser.Parser(packagePair_, file_, tokens_, ff_core_List.List_grabLast(tokens_), targetIsNode_, lspHook_, false, 0, 1)
+export async function new_$(moduleKey_, tokens_, targetIsNode_, lspHook_, $task) {
+return ff_compiler_Parser.Parser(moduleKey_, tokens_, ff_core_List.List_grabLast(tokens_), targetIsNode_, lspHook_, false, 0, 1)
 }
 
 export function Parser_fail(self_, at_, message_) {
@@ -245,7 +245,7 @@ ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon())
 };
 return p_
 })()
-: ff_compiler_Syntax.DPackage(location_, self_.packagePair_, ff_compiler_Syntax.Version(location_, 0, 0, 0), ff_compiler_Syntax.TargetNames(self_.targetIsNode_, (!self_.targetIsNode_))));
+: ff_compiler_Syntax.DPackage(location_, self_.moduleKey_.packagePair_, ff_compiler_Syntax.Version(location_, 0, 0, 0), ff_compiler_Syntax.TargetNames(self_.targetIsNode_, (!self_.targetIsNode_))));
 if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "package"))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), "Duplicate package definition"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
@@ -288,7 +288,7 @@ instances_.array.push(ff_compiler_Parser.Parser_parseInstanceDefinition(self_))
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs4(ff_compiler_Parser.Parser_current(self_), "data", "class", "capability", "newtype"))) {
 types_.array.push(ff_compiler_Parser.Parser_parseTypeDefinition(self_))
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "import"))) {
-imports_.array.push(ff_compiler_Parser.Parser_parseImportDefinition(self_, self_.packagePair_))
+imports_.array.push(ff_compiler_Parser.Parser_parseImportDefinition(self_, self_.moduleKey_.packagePair_))
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "include"))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), "Includes must be at the top of the file or below 'package'"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "dependency"))) {
@@ -302,7 +302,7 @@ if((!ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_com
 ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon())
 }
 };
-return ff_compiler_Syntax.Module(self_.file_, self_.packagePair_, ff_core_Array.Array_toList(imports_, 0, 9007199254740991), ff_core_Array.Array_toList(types_, 0, 9007199254740991), ff_core_Array.Array_toList(traits_, 0, 9007199254740991), ff_core_Array.Array_toList(instances_, 0, 9007199254740991), ff_core_Array.Array_toList(extends_, 0, 9007199254740991), ff_core_Array.Array_toList(lets_, 0, 9007199254740991), ff_core_Array.Array_toList(functions_, 0, 9007199254740991))
+return ff_compiler_Syntax.Module(self_.moduleKey_, ff_core_Array.Array_toList(imports_, 0, 9007199254740991), ff_core_Array.Array_toList(types_, 0, 9007199254740991), ff_core_Array.Array_toList(traits_, 0, 9007199254740991), ff_core_Array.Array_toList(instances_, 0, 9007199254740991), ff_core_Array.Array_toList(extends_, 0, 9007199254740991), ff_core_Array.Array_toList(lets_, 0, 9007199254740991), ff_core_Array.Array_toList(functions_, 0, 9007199254740991))
 }
 
 export function Parser_parseLetDefinition(self_) {
@@ -592,7 +592,7 @@ const packageName_ = ff_compiler_Parser.Parser_parseDashedName(self_);
 return ff_compiler_Syntax.PackagePair(userName_, packageName_)
 })()
 : currentPackagePair_);
-return ff_compiler_Syntax.DImport(ff_compiler_Token.Token_at(fileToken_), alias_, packagePair_, ff_core_Array.Array_toList(path_, 0, 9007199254740991), ff_compiler_Token.Token_raw(fileToken_))
+return ff_compiler_Syntax.DImport(ff_compiler_Token.Token_at(fileToken_), alias_, ff_compiler_Syntax.ModuleKey(packagePair_, ff_core_Array.Array_toList(path_, 0, 9007199254740991), ff_compiler_Token.Token_raw(fileToken_)))
 }
 
 export function Parser_parsePackageDefinition(self_) {
@@ -1749,7 +1749,7 @@ ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon())
 };
 return p_
 })())
-: ff_compiler_Syntax.DPackage(location_, self_.packagePair_, ff_compiler_Syntax.Version(location_, 0, 0, 0), ff_compiler_Syntax.TargetNames(self_.targetIsNode_, (!self_.targetIsNode_))));
+: ff_compiler_Syntax.DPackage(location_, self_.moduleKey_.packagePair_, ff_compiler_Syntax.Version(location_, 0, 0, 0), ff_compiler_Syntax.TargetNames(self_.targetIsNode_, (!self_.targetIsNode_))));
 if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "package"))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), "Duplicate package definition"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
@@ -1792,7 +1792,7 @@ instances_.array.push(ff_compiler_Parser.Parser_parseInstanceDefinition(self_))
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs4(ff_compiler_Parser.Parser_current(self_), "data", "class", "capability", "newtype"))) {
 types_.array.push(ff_compiler_Parser.Parser_parseTypeDefinition(self_))
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "import"))) {
-imports_.array.push(ff_compiler_Parser.Parser_parseImportDefinition(self_, self_.packagePair_))
+imports_.array.push(ff_compiler_Parser.Parser_parseImportDefinition(self_, self_.moduleKey_.packagePair_))
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "include"))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), "Includes must be at the top of the file or below 'package'"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 } else if((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "dependency"))) {
@@ -1806,7 +1806,7 @@ if((!ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_com
 ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon())
 }
 };
-return ff_compiler_Syntax.Module(self_.file_, self_.packagePair_, ff_core_Array.Array_toList(imports_, 0, 9007199254740991), ff_core_Array.Array_toList(types_, 0, 9007199254740991), ff_core_Array.Array_toList(traits_, 0, 9007199254740991), ff_core_Array.Array_toList(instances_, 0, 9007199254740991), ff_core_Array.Array_toList(extends_, 0, 9007199254740991), ff_core_Array.Array_toList(lets_, 0, 9007199254740991), ff_core_Array.Array_toList(functions_, 0, 9007199254740991))
+return ff_compiler_Syntax.Module(self_.moduleKey_, ff_core_Array.Array_toList(imports_, 0, 9007199254740991), ff_core_Array.Array_toList(types_, 0, 9007199254740991), ff_core_Array.Array_toList(traits_, 0, 9007199254740991), ff_core_Array.Array_toList(instances_, 0, 9007199254740991), ff_core_Array.Array_toList(extends_, 0, 9007199254740991), ff_core_Array.Array_toList(lets_, 0, 9007199254740991), ff_core_Array.Array_toList(functions_, 0, 9007199254740991))
 }
 
 export async function Parser_parseLetDefinition$(self_, $task) {
@@ -2096,7 +2096,7 @@ const packageName_ = ff_compiler_Parser.Parser_parseDashedName(self_);
 return ff_compiler_Syntax.PackagePair(userName_, packageName_)
 })())
 : currentPackagePair_);
-return ff_compiler_Syntax.DImport(ff_compiler_Token.Token_at(fileToken_), alias_, packagePair_, ff_core_Array.Array_toList(path_, 0, 9007199254740991), ff_compiler_Token.Token_raw(fileToken_))
+return ff_compiler_Syntax.DImport(ff_compiler_Token.Token_at(fileToken_), alias_, ff_compiler_Syntax.ModuleKey(packagePair_, ff_core_Array.Array_toList(path_, 0, 9007199254740991), ff_compiler_Token.Token_raw(fileToken_)))
 }
 
 export async function Parser_parsePackageDefinition$(self_, $task) {

package/output/js/ff/compiler/Resolver.mjs

@@ -117,7 +117,7 @@ return {at_, name_, asBound_};
 
 
 
-export function new_(packagePair_, moduleName_, lspHook_) {
+export function new_(lspHook_) {
 return ff_compiler_Resolver.Resolver(ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toSet([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toSet([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_compiler_Resolver.ResolverState(2), lspHook_)
 }
 
@@ -133,7 +133,7 @@ seen_ = ff_core_Map.Map_add(seen_, n_, item_, ff_core_Ordering.ff_core_Ordering_
 return items_
 }
 
-export async function new_$(packagePair_, moduleName_, lspHook_, $task) {
+export async function new_$(lspHook_, $task) {
 return ff_compiler_Resolver.Resolver(ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toSet([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toSet([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_compiler_Resolver.ResolverState(2), lspHook_)
 }
 
@@ -156,16 +156,11 @@ return result_
 }
 
 export function Resolver_resolveModule(self_, module_, otherModules_) {
-const moduleNamespace_ = ff_core_String.String_takeWhile(ff_core_String.String_reverse(ff_core_String.String_takeWhile(ff_core_String.String_reverse(ff_core_String.String_replace(module_.file_, "\\", "/")), ((_w1) => {
-return (_w1 !== 47)
-}))), ((_w1) => {
-return (_w1 !== 46)
-}));
 const self2_ = ff_compiler_Resolver.Resolver_processImports(self_, module_.imports_, otherModules_);
 const self3_ = ff_compiler_Resolver.Resolver_processDefinitions(self2_, module_, ff_core_Option.None());
 const errors_ = ff_core_Array.new_();
 const module2_ = (((_c) => {
-return ff_compiler_Syntax.Module(_c.file_, _c.packagePair_, _c.imports_, ff_compiler_Syntax.catchManyInto_(errors_, module_.types_, ((_w1) => {
+return ff_compiler_Syntax.Module(_c.moduleKey_, _c.imports_, ff_compiler_Syntax.catchManyInto_(errors_, module_.types_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolveTypeDefinition(self3_, _w1)
 })), ff_compiler_Syntax.catchManyInto_(errors_, module_.traits_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolveTraitDefinition(self3_, _w1)
@@ -269,7 +264,7 @@ for(let for_a = imports_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i+
 const import_ = for_a[for_i];
 do {
 const _1 = ff_core_List.List_find(modules_, ((_w1) => {
-return (ff_core_String.String_dropLast(_w1.file_, 3) === import_.file_)
+return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_ModuleKey.equals_(_w1.moduleKey_, import_.moduleKey_)
 }));
 if(_1.Some) {
 const module_ = _1.value_;
@@ -277,7 +272,7 @@ resolver_ = ff_compiler_Resolver.Resolver_processDefinitions(resolver_, module_,
 break
 }
 {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + import_.file_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + ff_compiler_Syntax.ModuleKey_importName(import_.moduleKey_))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 } while(false)
 };
@@ -286,7 +281,7 @@ return resolver_
 
 export function Resolver_processDefinitions(self_, module_, importAlias_) {
 function entry_(name_, unqualified_) {
-const full_ = ((((ff_compiler_Syntax.PackagePair_groupName(module_.packagePair_, ":") + "/") + ff_core_String.String_dropLast(module_.file_, 3)) + ".") + name_);
+const full_ = ff_compiler_Syntax.ModuleKey_qualifiedSymbol(module_.moduleKey_, name_);
 {
 const _1 = importAlias_;
 if(_1.None) {
@@ -304,7 +299,7 @@ return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(fu
 }
 }
 }
-const isCore_ = (((module_.packagePair_.group_ === "ff") && (module_.packagePair_.name_ === "core")) && (module_.file_ === "Core.ff"));
+const isCore_ = ((((module_.moduleKey_.packagePair_.group_ === "ff") && (module_.moduleKey_.packagePair_.name_ === "core")) && ff_core_List.ff_core_Equal_Equal$ff_core_List_List(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(module_.moduleKey_.folders_, [])) && (module_.moduleKey_.name_ === "Core"));
 const lets_ = ff_core_List.List_toMap(ff_core_List.List_flatMap(module_.lets_, ((_w1) => {
 return entry_(_w1.name_, isCore_)
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
@@ -1157,16 +1152,11 @@ return result_
 }
 
 export async function Resolver_resolveModule$(self_, module_, otherModules_, $task) {
-const moduleNamespace_ = ff_core_String.String_takeWhile(ff_core_String.String_reverse(ff_core_String.String_takeWhile(ff_core_String.String_reverse(ff_core_String.String_replace(module_.file_, "\\", "/")), ((_w1) => {
-return (_w1 !== 47)
-}))), ((_w1) => {
-return (_w1 !== 46)
-}));
 const self2_ = ff_compiler_Resolver.Resolver_processImports(self_, module_.imports_, otherModules_);
 const self3_ = ff_compiler_Resolver.Resolver_processDefinitions(self2_, module_, ff_core_Option.None());
 const errors_ = ff_core_Array.new_();
 const module2_ = (((_c) => {
-return ff_compiler_Syntax.Module(_c.file_, _c.packagePair_, _c.imports_, ff_compiler_Syntax.catchManyInto_(errors_, module_.types_, ((_w1) => {
+return ff_compiler_Syntax.Module(_c.moduleKey_, _c.imports_, ff_compiler_Syntax.catchManyInto_(errors_, module_.types_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolveTypeDefinition(self3_, _w1)
 })), ff_compiler_Syntax.catchManyInto_(errors_, module_.traits_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolveTraitDefinition(self3_, _w1)
@@ -1270,7 +1260,7 @@ for(let for_a = imports_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i+
 const import_ = for_a[for_i];
 do {
 const _1 = ff_core_List.List_find(modules_, ((_w1) => {
-return (ff_core_String.String_dropLast(_w1.file_, 3) === import_.file_)
+return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_ModuleKey.equals_(_w1.moduleKey_, import_.moduleKey_)
 }));
 if(_1.Some) {
 const module_ = _1.value_;
@@ -1278,7 +1268,7 @@ resolver_ = ff_compiler_Resolver.Resolver_processDefinitions(resolver_, module_,
 break
 }
 {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + import_.file_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + ff_compiler_Syntax.ModuleKey_importName(import_.moduleKey_))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 } while(false)
 };
@@ -1287,7 +1277,7 @@ return resolver_
 
 export async function Resolver_processDefinitions$(self_, module_, importAlias_, $task) {
 function entry_(name_, unqualified_) {
-const full_ = ((((ff_compiler_Syntax.PackagePair_groupName(module_.packagePair_, ":") + "/") + ff_core_String.String_dropLast(module_.file_, 3)) + ".") + name_);
+const full_ = ff_compiler_Syntax.ModuleKey_qualifiedSymbol(module_.moduleKey_, name_);
 {
 const _1 = importAlias_;
 if(_1.None) {
@@ -1305,7 +1295,7 @@ return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(fu
 }
 }
 }
-const isCore_ = (((module_.packagePair_.group_ === "ff") && (module_.packagePair_.name_ === "core")) && (module_.file_ === "Core.ff"));
+const isCore_ = ((((module_.moduleKey_.packagePair_.group_ === "ff") && (module_.moduleKey_.packagePair_.name_ === "core")) && ff_core_List.ff_core_Equal_Equal$ff_core_List_List(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(module_.moduleKey_.folders_, [])) && (module_.moduleKey_.name_ === "Core"));
 const lets_ = ff_core_List.List_toMap(ff_core_List.List_flatMap(module_.lets_, ((_w1) => {
 return entry_(_w1.name_, isCore_)
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);

package/output/js/ff/compiler/Substitution.mjs

@@ -130,7 +130,7 @@ return ff_compiler_Substitution.Substitution_substituteInstanceDefinition(self_,
 const _1 = module_;
 {
 const _c = _1;
-return ff_compiler_Syntax.Module(_c.file_, _c.packagePair_, _c.imports_, _c.types_, _c.traits_, instances_, extends_, lets_, functions_)
+return ff_compiler_Syntax.Module(_c.moduleKey_, _c.imports_, _c.types_, _c.traits_, instances_, extends_, lets_, functions_)
 }
 }
 }
@@ -567,7 +567,7 @@ return ff_compiler_Substitution.Substitution_substituteInstanceDefinition(self_,
 const _1 = module_;
 {
 const _c = _1;
-return ff_compiler_Syntax.Module(_c.file_, _c.packagePair_, _c.imports_, _c.types_, _c.traits_, instances_, extends_, lets_, functions_)
+return ff_compiler_Syntax.Module(_c.moduleKey_, _c.imports_, _c.types_, _c.traits_, instances_, extends_, lets_, functions_)
 }
 }
 }