canonical, resolve: any size array

Author: scivision

+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

+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, "//");
 

+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

+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

+stdlib/resolve.m

@@ -10,7 +10,7 @@
 
 function r = resolve(p)
 arguments
-  p {mustBeTextScalar}
+  p string
 end
 
 r = stdlib.canonical(stdlib.absolute(p));

+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

+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));

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

test/TestCanonical.m

@@ -9,7 +9,7 @@
 {"not-exist/a/..", "not-exist"}, ...
 {"./not-exist", "not-exist"}
 };
-fun = {"native", "legacy"}
+backend = {"native", "legacy"}
 end
 
 methods(TestClassSetup)
@@ -22,16 +22,25 @@ function pkg_path(tc)
 
 methods(Test, TestTags="impure")
 
-function test_canonical(tc, p, fun)
+function test_canonical(tc, p, backend)
 try
-  c = stdlib.canonical(p{1}, false, fun);
+  c = stdlib.canonical(p{1}, false, backend);
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
+  tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError',  e.stack(1).file + ":" + string(e.stack(1).line) + " " + e.message)
   return
 end
 tc.verifyEqual(c, p{2})
 end
 
+function test_canonical_array(tc)
+tc.assumeFalse(isMATLABReleaseOlderThan('R2024a'))
+
+in = ["", "hi", "/ok", "not-exist/a/.."];
+c = stdlib.native.canonical(in);
+
+tc.verifyEqual(c, ["", "hi", filesep + "ok", "not-exist"])
+end
+
 end
 
 end

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