feat: refine scoping rules & names

.envrc

@@ -1 +1 @@
-use nix
+eval "$(nix print-dev-env -f shell.nix)"

README.md

@@ -16,7 +16,7 @@ code without having to perform a full evaluation. This could be used, e.g. to sh
 - **Isolation**: Modules are imported into the Nix store, enforcing boundaries and preventing relative path access.
 - **Introspection**: Unlike legacy modules, code is specified in its final form instead of as prototypes (functions), leading to much better and simpler introspective analysis.
 - **Simplicity**: The system is kept purposefully simple and flexible in order to remain performant and flexible.
-- **Scoping**: Each module and member has access to `self`, `super`, `atom`, `pub` and `std`.
+- **Scoping**: Each module and member has access to `mod`, `pre`, `atom`, and `std`.
 - **Standard Library**: Includes a standard library (`std`) augmented with `builtins`.
 
 ## How It Works
@@ -27,11 +27,10 @@ code without having to perform a full evaluation. This could be used, e.g. to sh
    - Subdirectories with `mod.nix`: Treated as nested modules.
 
 2. **Scoping**:
-   - `self`: Current module, includes `outPath` for accessing non-Nix files.
-   - `super`: Parent module (if applicable).
-   - `atom`: Top-level module.
+   - `mod`: Current module, includes `outPath` for accessing non-Nix files.
+   - `pre`: Parent module (if applicable).
+   - `atom`: Top-level module and external dependencies.
    - `std`: Standard library and `builtins`.
-   - `pub`: External resources, such as other atoms, free-form nix expressions, remote sources, etc.
 
 3. **Composition**: Modules are composed recursively, with `mod.nix` contents taking precedence.
 
@@ -53,7 +52,7 @@ in
 * Break out large functions or code blocks into their own files
 * Organize related functionality into subdirectories with their own "mod.nix" files.
 * Leverage provided scopes for clean, modular code.
-* Use `"${self}"` when needing to access non-Nix files within a module.
+* Use `"${mod}/foo.nix"` when needing to access non-Nix files within a module.
 
 ## Future Work
 

default.nix

@@ -3,6 +3,7 @@ let
   filterMap = scopedImport { std = builtins; } ./std/set/filterMap.nix;
   parse = scopedImport { std = builtins; } ./std/file/parse.nix;
   compose = import ./.;
+  cond = set: if set._if or true then set else { };
 
   filterMod = builtins.filterSource (
     path: type:
@@ -14,49 +15,63 @@ let
 
 in
 {
-  pub ? { },
+  extern ? { },
 }:
 dir:
 let
+  std = compose { } ./std // builtins;
+  atom' = builtins.removeAttrs (extern // atom // { inherit extern; }) [
+    "atom"
+    (baseNameOf dir)
+  ];
   atom = fix (
-    f: super: dir:
+    f: pre: dir:
     let
       contents = builtins.readDir dir;
-      self =
+
+      hasMod = contents."mod.nix" or null == "regular";
+
+      mod = if hasMod then scope "${dir + "/mod.nix"}" else { };
+
+      scope = scopedImport (
+        {
+          inherit std;
+          atom = atom';
+          mod = builtins.removeAttrs self [ "mod" ] // {
+            outPath = filterMod dir;
+          };
+        }
+        // cond {
+          _if = pre != { };
+          inherit pre;
+        }
+      );
+
+      g =
+        name: type:
         let
-          import' = scopedImport (
-            {
-              inherit atom;
-              std = compose { } ./std // builtins;
-              self = self // {
-                outPath = filterMod dir;
-              };
-            }
-            // (if super != { } then { inherit super; } else { })
-            // (if pub != { } then { inherit pub; } else { })
-          );
-          mod =
-            if contents ? "mod.nix" && contents."mod.nix" == "regular" then
-              import' "${dir + "/mod.nix"}"
-            else
-              { };
+          path = dir + "/${name}";
+          file = parse name;
         in
-        filterMap (
-          name: type:
-          let
-            path = dir + "/${name}";
-            file = parse name;
-          in
-          if type == "directory" then
-            { ${name} = f self path; }
-          else if type == "regular" && file.ext or null == "nix" && name != "mod.nix" then
-            { ${file.name} = import' "${path}"; }
-          else
-            null # Ignore other file types
-        ) contents
-        // mod;
+        if type == "directory" then
+          {
+            ${name} = f (
+              self
+              // cond {
+                _if = pre != { };
+                inherit pre;
+              }
+            ) path;
+          }
+        else if type == "regular" && file.ext or null == "nix" && name != "mod.nix" then
+          { ${file.name} = scope "${path}"; }
+        else
+          null # Ignore other file types
+      ;
+
+      self = filterMap g contents // mod;
     in
-    if !(contents."mod.nix" or null == "regular") then
+    if !hasMod then
       { } # Base case: no module
     else
       self

dev/pkgs.nix

@@ -1,4 +1,4 @@
 let
-  inherit (pub.pins) nixpkgs;
+  inherit (atom.pins) nixpkgs;
 in
 import nixpkgs { }

dev/shell.nix

@@ -1,5 +1,5 @@
 {
-  pkgs ? self.pkgs,
+  pkgs ? mod.pkgs,
 }:
 pkgs.mkShell {
   packages = with pkgs; [

shell.nix

@@ -1,6 +1,6 @@
 let
   dev = import ./. {
-    pub = {
+    extern = {
       pins = import ./npins;
     };
   } ./dev;

test/bld/bar/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
   bar = atom.foo + 2;
-  baz = self.bar + 4;
+  baz = mod.bar + 4;
 }

test/bld/bar/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/bar/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
   bar = atom.foo + 2;
-  baz = self.bar + 4;
+  baz = mod.bar + 4;
 }

test/bld/buzz/bar/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/fuzz/bar/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
   bar = atom.foo + 2;
-  baz = self.bar + 4;
+  baz = mod.bar + 4;
 }

test/bld/buzz/fuzz/bar/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/fuzz/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
-  bar = super.bar + 2;
-  baz = self.bar + 4;
+  bar = pre.bar + 2;
+  baz = mod.bar + 4;
 }

test/bld/buzz/fuzz/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/fuzz/wuzz/bar/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
   bar = atom.foo + 2;
-  baz = self.bar + 4;
+  baz = mod.bar + 4;
 }

test/bld/buzz/fuzz/wuzz/bar/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/fuzz/wuzz/cuzz/bar/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
   bar = atom.foo + 2;
-  baz = self.bar + 4;
+  baz = mod.bar + 4;
 }

test/bld/buzz/fuzz/wuzz/cuzz/bar/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/fuzz/wuzz/cuzz/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
   bar = atom.foo + 2;
-  baz = self.bar + 4;
+  baz = mod.bar + 4;
 }

test/bld/buzz/fuzz/wuzz/cuzz/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/fuzz/wuzz/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
-  bar = super.bar + 2;
-  baz = self.bar + 4;
+  bar = pre.bar + 2;
+  baz = mod.bar + 4;
 }

test/bld/buzz/fuzz/wuzz/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/buzz/mod.nix

@@ -1,5 +1,5 @@
 {
   foo = 1;
-  bar = super.foo + 2;
-  baz = self.bar + 4;
+  bar = pre.foo + 2;
+  baz = mod.bar + 4;
 }

test/bld/buzz/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }

test/bld/mod.nix

@@ -1,7 +1,7 @@
 {
   foo = 1;
   bar = atom.foo + 2;
-  baz = self.bar + 4;
+  baz = mod.bar + 4;
   test = std.set.filterMap;
-  x = builtins.readFile "${self}/bum";
+  x = builtins.readFile "${mod}/bum";
 }

test/bld/next/mod.nix

@@ -1,5 +1,5 @@
 {
 
-  g = super.foo + 4;
-  h = self.g + 3;
+  g = pre.foo + 4;
+  h = mod.g + 3;
 }