canonical, resolve: any size array

scivision · scivision · commit df17d96889a9 · 2025-08-04T14:18:49.000-04:00
diff --git a/+stdlib/+native/canonical.m b/+stdlib/+native/canonical.m
@@ -1,15 +1,20 @@
 function c = canonical(file, strict)
+arguments
+  file string
+  strict (1,1) logical = false
+end
+
+rp = matlab.io.internal.filesystem.resolvePath(file);
+c = string({rp.ResolvedPath});
 
-if stdlib.strempty(file)
-  c = "";
+if strict
   return
 end
 
-p = matlab.io.internal.filesystem.resolvePath(file);
-c = p.ResolvedPath;
-
-if ~strict && stdlib.strempty(c)
-  c = string(stdlib.normalize(file));
+for i = 1:numel(file)
+  if strlength(c(i)) == 0 && strlength(file(i)) > 0
+    c(i) = stdlib.normalize(file(i));
+  end
 end
 
 end
diff --git a/+stdlib/+native/normalize.m b/+stdlib/+native/normalize.m
@@ -1,6 +1,9 @@
 function n = normalize(p)
+arguments
+  p (1,1) string
+end
 
-n = stdlib.posix(string(p));
+n = stdlib.posix(p);
 
 uncslash = ispc() && startsWith(n, "//");
 
diff --git a/+stdlib/+native/parent.m b/+stdlib/+native/parent.m
@@ -14,7 +14,7 @@
 i = stdlib.strempty(p);
 p(i) = ".";
 
-i = ispc() & strcmp(p(~i), stdlib.root_name(pth));
+i = ispc() & strcmp(p(~i), stdlib.root_name(pth(~i)));
 p(i) = strcat(p(i), filesep);
 
 end
diff --git a/+stdlib/absolute.m b/+stdlib/absolute.m
@@ -18,7 +18,7 @@
 function c = absolute(p, base)
 arguments
   p string
-  base {mustBeTextScalar} = pwd()
+  base (1,1) string = pwd()
 end
 
 i = stdlib.is_absolute(p);
@@ -29,6 +29,10 @@
   base = fullfile(pwd(), base);
 end
 
-c(~i) = fullfile(base, p(~i));
+i = ~i;
+c(i) = base;
+
+i = i & ~stdlib.strempty(p);
+c(i) = fullfile(base, p(i));
 
 end
diff --git a/+stdlib/canonical.m b/+stdlib/canonical.m
@@ -14,13 +14,16 @@
 
 function c = canonical(p, strict, backend)
 arguments
-  p {mustBeTextScalar}
+  p string
   strict (1,1) logical = false
   backend (1,:) string = ["native", "legacy"]
 end
 
-fun = hbackend(backend, "canonical", 'R2024a');
-
-c = fun(p, strict);
+if isscalar(p)
+  fun = hbackend(backend, "canonical", 'R2024a');
+  c = fun(p, strict);
+else
+  c = stdlib.native.canonical(p, strict);
+end
 
 end
diff --git a/+stdlib/resolve.m b/+stdlib/resolve.m
@@ -10,7 +10,7 @@
 
 function r = resolve(p)
 arguments
-  p {mustBeTextScalar}
+  p string
 end
 
 r = stdlib.canonical(stdlib.absolute(p));
diff --git a/+stdlib/suffix.m b/+stdlib/suffix.m
@@ -7,8 +7,7 @@
 
 [~, n, s] = fileparts(p);
 
-if stdlib.strempty(n)
-  s = n;
-end
+i = stdlib.strempty(n);
+s(i) = n(i);
 
 end
diff --git a/+stdlib/with_suffix.m b/+stdlib/with_suffix.m
@@ -9,7 +9,7 @@
 function f = with_suffix(p, suffix)
 arguments
   p string
-  suffix {mustBeTextScalar}
+  suffix string
 end
 
 f = extractBefore(p, stdlib.suffix(p));
diff --git a/test/TestAbsolute.m b/test/TestAbsolute.m
@@ -72,6 +72,16 @@ function test_absolute2arg(tc, p2)
 tc.verifyEqual(rabs, string(r))
 end
 
+
+function test_absolute_array(tc)
+
+in = ["", "hi"];
+r = stdlib.absolute(in);
+
+tc.verifyEqual(r, [pwd(), fullfile(pwd(), "hi")])
+
+end
+
 end
 
 end
diff --git a/test/TestCanonical.m b/test/TestCanonical.m
@@ -32,6 +32,13 @@ function test_canonical(tc, p, fun)
 tc.verifyEqual(c, p{2})
 end
 
+function test_canonical_array(tc)
+in = ["", "hi", "/ok", "not-exist/a/.."];
+c = stdlib.canonical(in);
+
+tc.verifyEqual(c, ["", "hi", filesep + "ok", "not-exist"])
+end
+
 end
 
 end
diff --git a/test/TestParent.m b/test/TestParent.m
@@ -24,6 +24,14 @@ function test_parent(tc, p, backend)
 tc.verifyEqual(pr, p{2}, sprintf("parent(%s, %s)", p{1}, backend))
 end
 
+function test_parent_array(tc)
+in =  ["",  ".", "..", "../..", "a/", "a/b", "ab/.parent", "ab/.parent.txt", "a/b/../.parent.txt"];
+exp = [".", ".", ".", "..",     ".",  "a",   "ab",         "ab",             fullfile("a", "b", "..")];
+
+out = stdlib.parent(in, "native");
+tc.verifyEqual(out, exp)
+end
+
 end
 
 end
diff --git a/test/TestResolve.m b/test/TestResolve.m
@@ -78,6 +78,18 @@ function test_resolve_fullpath(tc, p)
 tc.verifyEqual(stdlib.resolve(a), b)
 end
 
+function test_resolve_array(tc)
+in = ["", "hi", "/ok", "not-exist/a/.."];
+c = stdlib.resolve(in);
+
+exp = [pwd(), fullfile(pwd(), "hi"), filesep + "ok", fullfile(pwd(), "not-exist")];
+if ispc()
+  exp(3) = fullfile(pwd(), "ok");
+end
+
+tc.verifyEqual(c, exp)
+end
+
 end
 
 end
diff --git a/test/TestSuffix.m b/test/TestSuffix.m
@@ -22,6 +22,13 @@ function pkg_path(tc)
 function test_suffix(tc, p)
 tc.verifyEqual(stdlib.suffix(p{1}), p{2})
 end
+
+function test_suffix_array(tc)
+in = ["", ".txt", "a/b/c.txt", "a/b/c.txt.gz", "a/b/c"];
+exp = ["", "", ".txt", ".gz", ""];
+out = stdlib.suffix(in);
+tc.verifyEqual(out, exp)
+end
 end
 
 end
diff --git a/test/TestWithSuffix.m b/test/TestWithSuffix.m
@@ -27,6 +27,15 @@ function test_with_suffix(tc, p)
 r = p{3};
 
 tc.verifyEqual(stdlib.with_suffix(p{1}, p{2}), r)
+end
+
+function test_with_suffix_array(tc)
+in = ["", ".txt", "a/b/c.txt", "a/b/c.txt.gz", "a/b/c"];
+new = [".txt", ".gz", "", ".bz", ".nc"];
+exp = [".txt", ".txt.gz", "a/b/c", "a/b/c.txt.bz", "a/b/c.nc"];
+out = stdlib.with_suffix(in, new);
+tc.verifyEqual(out, exp)
+
 end
 end
 
