Merge branch 'nushell:main' into main

.gitattributes

@@ -0,0 +1 @@
+*.nuon diff=nuon

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
 
       - uses: hustcer/[email protected]
         with:
-          version: nightly
+          version: "0.100.0"
 
       - name: Show Nushell Version
         run: version

nupm/install.nu

@@ -13,7 +13,7 @@ def install-scripts [
     pkg_dir: path        # Package directory
     scripts_dir: path    # Target directory where to install
     --force(-f)          # Overwrite already installed scripts
-]: list<path> -> nothing {
+]: [list<path> -> nothing] {
     each {|script|
         let src_path = $pkg_dir | path join $script
 

nupm/publish.nu

@@ -176,7 +176,7 @@ export def main [
     }
 }
 
-def guess-url [] -> string {
+def guess-url []: nothing -> string {
     mut url = (do -i { ^git remote get-url origin | complete } | get stdout)
 
     if ($url | is-empty) {
@@ -191,7 +191,7 @@ def guess-url [] -> string {
     $url | str trim
 }
 
-def guess-revision [] -> string {
+def guess-revision []: nothing -> string {
     mut revision = (do -i { ^git describe --tags --abbrev=0 | complete }
         | get stdout)
 

nupm/status.nu

@@ -5,7 +5,7 @@ use utils/package.nu [open-package-file list-package-files]
 # Display status of a package
 export def main [
     path?: path  # path to the package
-] -> record<filename: string> {
+]: nothing -> record<filename: string> {
     let path = $path | default $env.PWD | path expand
 
     let pkg = open-package-file $path

nupm/utils/package.nu

@@ -27,13 +27,15 @@ export def open-package-file [dir: path] {
         )
     }
 
+    # TODO: Verify types of each field
+
     $package
 }
 
 # Lists files of a package
 #
 # This will be useful for file integrity checks
-export def list-package-files [pkg_dir: path, pkg: record] -> list<path> {
+export def list-package-files [pkg_dir: path, pkg: record]: nothing -> list<path> {
     let activation = match $pkg.type {
         'module' => $'use ($pkg.name)'
         'script' => {
@@ -60,9 +62,9 @@ export def list-package-files [pkg_dir: path, pkg: record] -> list<path> {
         }
     }
 
-    $files ++= ($pkg.scripts?
+    $files ++= [($pkg.scripts?
         | default []
-        | each {|script| $pkg_dir | path join $script})
+        | each {|script| $pkg_dir | path join $script})]
 
     $files
 }

nupm/utils/registry.nu

@@ -2,7 +2,7 @@
 
 use dirs.nu cache-dir
 use log.nu throw-error
-use misc.nu [check-cols url hash-file]
+use misc.nu [check-cols url hash-file hash-fn]
 
 # Columns of a registry file
 export const REG_COLS = [ name path hash ]
@@ -15,7 +15,7 @@ export def search-package [
     package: string  # Name of the package
     --registry: string  # Which registry to use (name or path)
     --exact-match  # Searched package name must match exactly
-] -> table {
+]: nothing -> table {
     let registries = if (not ($registry | is-empty)) and ($registry in $env.NUPM_REGISTRIES) {
         # If $registry is a valid column in $env.NUPM_REGISTRIES, use that
         { $registry : ($env.NUPM_REGISTRIES | get $registry) }
@@ -84,7 +84,7 @@ export def search-package [
                     http get $url | save --force $pkg_file_path
                 }
 
-                let new_hash = $pkg_file_path | hash-file
+                let new_hash = open $pkg_file_path | to nuon | hash-fn
 
                 open $pkg_file_path | insert hash_mismatch ($new_hash != $row.hash)
             }

scripts/print-nuon.nu

@@ -0,0 +1,31 @@
+#!/usr/bin/env nu
+
+def main [file: path]: [ nothing -> string ] {
+    if not ($file | path exists) {
+        error make {
+            msg: $"(ansi red_bold)file_not_found(ansi reset)",
+            label: {
+                text: "no such file",
+                span: (metadata $file).span,
+            },
+            help: $"`($file)` does not exist",
+        }
+    }
+
+    let content = open --raw $file
+
+    let data = try {
+        $content | from nuon
+    } catch {
+        error make {
+            msg: $"(ansi red_bold)invalid_nuon(ansi reset)",
+            label: {
+                text: "could not parse NUON",
+                span: (metadata $file).span,
+            },
+            help: $"`($file)` does not appear to be valid NUON",
+        }
+    }
+
+    $data | to nuon -i 4
+}

tests/mod.nu

@@ -128,7 +128,7 @@ export def nupm-status-module [] {
         let files = (nupm status tests/packages/spam_module).files
         assert ($files.0 ends-with (
             [tests packages spam_module spam_module mod.nu] | path join))
-        assert ($files.1 ends-with (
+        assert ($files.1.0 ends-with (
             [tests packages spam_module script.nu] | path join))
     }
 }
@@ -171,8 +171,3 @@ export def generate-local-registry [] {
         assert equal $actual $expected
     }
 }
-
-export def registry-files-no-newlines [] {
-    assert (ls tests/packages/registry/*nuon
-        | all { not (open $in.name --raw | str contains (char nl)) })
-}

tests/packages/registry/registry.nuon

@@ -1 +1,7 @@
-[[name, path, hash]; [spam_custom, spam_custom.nuon, "md5-90c14f51108a3c067d1f1e11f156ca98"], [spam_module, spam_module.nuon, "md5-c14d7a703fb0e587cf19934c5a397619"], [spam_script, spam_script.nuon, "md5-d7724c6282cc7eb878178b79f8617e29"]]
+[
+    [name, path, hash];
+
+    [spam_custom, spam_custom.nuon, "md5-7b3a5119d1af5a025dae32bcfc7cab96"],
+    [spam_module, spam_module.nuon, "md5-618c7c8ed97b423f111790d97bcd8486"],
+    [spam_script, spam_script.nuon, "md5-ce1b060a68ebb42291e364b5daa6d47a"],
+]

tests/packages/spam_module/nupm.nuon

@@ -2,5 +2,5 @@
     name: spam_module,
     type: module,
     version: "0.1.0"
-    scripts: script.nu
+    scripts: [script.nu]
 }

toolkit.nu

@@ -31,3 +31,8 @@ export def print-nupm-env [] {
     print $'NU_LIB_DIRS: ($env.NU_LIB_DIRS?)'
     print $'NUPM_REGISTRIES: ($env.NUPM_REGISTRIES?)'
 }
+
+# turn on pretty diffs for NUON data files
+export def set-nuon-diff [] {
+    git config diff.nuon.textconv (pwd | path join scripts print-nuon.nu)
+}