Make Add recurse into unscripted namespaces (#725)

Author: abrudz

StartupSession/Link/Add.aplf

@@ -1,4 +1,4 @@
- msg←Add items;added;item;name;ns;unfound;unlinked;⎕IO;⎕ML;setconfig;opts;lines;z;type;⎕TRAP
+ msg←{api}Add items;added;item;name;ns;unfound;unlinked;⎕IO;⎕ML;setconfig;opts;lines;z;type;⎕TRAP;unnamed
  ⎕IO ⎕ML←1 1
  preProcessOpts ⍝ Make sure opts is a namespace
  (msg setconfig)←Config.GetConfig opts
@@ -16,29 +16,43 @@
      :EndIf
      items←' '(≠⊆⊢)⍣(1=≡,items)⊢items
      items←{⊃⌽⍵}¨⎕RSI ⎕XSI∘U.ContainerNs¨items  ⍝ fully qualified name
-     added←unlinked←unfound←0⍴⊂''
+     added←unlinked←unfound←unnamed←0⍴⊂''
      :For item :In items
          :If ~(# U.NameClass item)∊0 ¯1
              (ns name)←U.SplitNs item
              :If (⎕NC item)∊3 4
                  z←Stop item(⎕STOP item)
                  z←Trace item(⎕TRACE item)
              :EndIf
-
-             :If ~0∊⍴ns name Fix''  ⍝ was linked and fixed
+             :If ~U.IsNamedRef ns⍎'⎕THIS'
+                 unnamed,←⊂ns
+             :ElseIf ~0∊⍴ns name Fix''  ⍝ was linked and fixed
                  added,←⊂item
+                 :If 9(0⍴⊂'')≡40 62 ⎕ATX item ⍝ unscripted namespace
+                     :If U.IsNamedNs item
+                         (added unlinked unfound unnamed),←1 Add(item,'.')∘,¨(⍎item).⎕NL-⍳9
+                     :Else
+                         unnamed,←⊂item
+                     :EndIf
+                 :EndIf
              :Else
                  unlinked,←⊂item
              :EndIf
          :Else
              unfound,←⊂item
          :EndIf
      :EndFor
-     msg←0⍴⊂''
-     :If ×≢added ⋄ msg,←⊂'Added:',∊' ',¨added ⋄ :EndIf
-     :If ×≢unlinked ⋄ msg,←⊂'Not in a linked namespace:',∊' ',¨unlinked ⋄ :EndIf
-     :If ×≢unfound ⋄ msg,←⊂'Not found:',∊' ',¨unfound ⋄ :EndIf
-     msg←1↓U.FmtLines msg
+     :If 900⌶⍬
+     :OrIf 1≢api ⍝ can be an opts ns
+         msg←0⍴⊂''
+         :If ×≢added ⋄ msg,←⊂'Added:',∊' ',¨added ⋄ :EndIf
+         :If ×≢unlinked ⋄ msg,←⊂'Not in a linked namespace:',∊' ',¨unlinked ⋄ :EndIf
+         :If ×≢unfound ⋄ msg,←⊂'Not found:',∊' ',¨unfound ⋄ :EndIf
+         :If ×≢unnamed ⋄ msg,←⊂'Not properly named:',∊' ',¨unnamed ⋄ :EndIf
+         msg←1↓U.FmtLines msg
+     :Else
+         msg←added unlinked unfound unnamed
+     :EndIf
  :Else
      U.Resignal 1
  :EndTrap

StartupSession/Link/Utils.apln

@@ -779,12 +779,12 @@
               :EndSelect
           :CaseList 3.1 3.2 4.1 4.2 ⍝ tradfn/dfn/tradop/dop - v18.0 cannot get source of functions "as typed"
               src←⎕NULL
-              :If IS181 
+              :If IS181
                   :Select a←##.ALWAYSREFORMAT
                   :CaseList 0 1
-                      :Trap 11 
-                          src←(SRC_BEST SRC_NORMALIZED)[1+a] ns.⎕ATX name 
-                      :EndTrap 
+                      :Trap 11
+                          src←(SRC_BEST SRC_NORMALIZED)[1+a]ns.⎕ATX name
+                      :EndTrap
                   :Case 2
                       src←ns.⎕NR name
                   :EndSelect
@@ -1218,7 +1218,7 @@
           :If file
               files←,⊂dest ⋄ oldfiles←,⊂''  ⍝ file name explicitly provided
           :Else
-              (files oldfiles)←2↑opts(1 DetermineFileName)(count/⊂ns)names names(count/⊂'') ⍬ ⍝ names are known to exist so don't provide source
+              (files oldfiles)←2↑opts(1 DetermineFileName)(count/⊂ns)names names(count/⊂'')⍬ ⍝ names are known to exist so don't provide source
               :If opts.(singlefile∧caseCode)
                   opts.dir←⊃files ⍝ replace with case coded name
               :EndIf
@@ -2097,18 +2097,20 @@
           opts←⊢
       :Case 2  ⍝ ambivalent or dyadic
           'opts'⎕NS ⍬
-          names←'all' 'arrays' 'beforeRead' 'beforeWrite' 'caseCode' 'codeExtensions' 'extended' 'fastLoad' 'flatten' 'forceExtensions' 'forceFilenames' 'getFilename' 'overwrite' 'proceed' 'recursive' 'source' 'sysVars' 'typeExtensions' 'watch' 'create' 'ignoreconfig' 'text'
-          :For name :In names
-              lc←0 CaseText name
-              :If ×args.⎕NC lc
-              :AndIf 0≢val←args⍎lc  ⍝ UCMD interface defaults unset modifiers to 0 - so don't execute them
-                  :Select name
-                  :CaseList 'codeExtensions' 'customExtensions' 'typeExtensions' ⋄ val←this⍎val
-                  :Case 'arrays' ⋄ :If val≡,'1' ⋄ val←1 ⋄ :EndIf  ⍝ link issue #192 - ]link.create -arrays=1 doesn't work
-                  :EndSelect
-                  name opts.{⍎⍺,'←⍵'}val
-              :EndIf
-          :EndFor
+          :If 9=40 ⎕ATX'args' ⍝ args has been parsed
+              names←'all' 'arrays' 'beforeRead' 'beforeWrite' 'caseCode' 'codeExtensions' 'extended' 'fastLoad' 'flatten' 'forceExtensions' 'forceFilenames' 'getFilename' 'overwrite' 'proceed' 'recursive' 'source' 'sysVars' 'typeExtensions' 'watch' 'create' 'ignoreconfig' 'text'
+              :For name :In names
+                  lc←0 CaseText name
+                  :If ×args.⎕NC lc
+                  :AndIf 0≢val←args⍎lc  ⍝ UCMD interface defaults unset modifiers to 0 - so don't execute them
+                      :Select name
+                      :CaseList 'codeExtensions' 'customExtensions' 'typeExtensions' ⋄ val←this⍎val
+                      :Case 'arrays' ⋄ :If val≡,'1' ⋄ val←1 ⋄ :EndIf  ⍝ link issue #192 - ]link.create -arrays=1 doesn't work
+                      :EndSelect
+                      name opts.{⍎⍺,'←⍵'}val
+                  :EndIf
+              :EndFor
+          :EndIf
       :EndSelect
       :Trap debug↓0   ⍝ link issue #217
           ⍝ must not use :With because of link issue #163

Test/test_add.aplf

@@ -36,7 +36,7 @@
 ⍝ Add multiple variables while simultaneously defining them
  ⎕CS name
  a←1
- z←⎕SE.Link.Add 'a' ⍝ Test scalar name - issue #688
+ z←⎕SE.Link.Add'a' ⍝ Test scalar name - issue #688
  z←⎕SE.Link.Add'b c←2 3'
  ⎕CS here
  assert'''123''≡∊{⊃⎕NGET(''',folder,'/'',⍵,''.apla'')1}¨''abc''' ⍝ result is actually a vector of vectors of vectors
@@ -47,5 +47,11 @@
  ⎕CS here
  assert'''121 2''≡∊{⊃⎕NGET(''',folder,'/'',⍵,''.apla'')1}¨''abc''' ⍝ 1 2 (1 2)
 
+⍝ Add children
+ 'sub1.sub2'ns.⎕NS ⍬
+  2 ns.sub1.sub2.⎕FIX src←,⊂'foo←{ five }'
+ z←⎕SE.Link.Add name,'.sub1'
+ assert'src≡⊃⎕NGET''',folder,'/sub1/sub2/foo.aplf'' 1'
+
  CleanUp folder name
  ok←1

Test/test_bugs.aplf

@@ -1,7 +1,8 @@
  ok←test_bugs(folder name);engine;foo;newbody;nr;opts;props;ref;root;search;server;src;src2;sub;todelete;unlikelyclass;unlikelyfile;unlikelyname;var;warn;z;f;b
     ⍝ Github issues
  name ⎕NS''
- QMKDIR Retry⊢folder ⍝ folder must be non-existent
+ 3 ⎕NDELETE folder    ⍝ folder must be non-existent
+ QMKDIR Retry⊢folder
 
           ⍝ link issue #335
  z←name'abc'⎕SE.Link.Fix,⊂'[1⋄2⋄3]'
@@ -71,18 +72,18 @@
  z←LinkCreate'#.unlikelyname.sub'folder
  assert'3=CountLinks'
  props←'Namespace' '' 'Source' 'Files'
- z←{(~⍵[;1]∊IGNORE_LINKS)⌿⍵}⎕SE.Link.Status ''
+ z←{(~⍵[;1]∊IGNORE_LINKS)⌿⍵}⎕SE.Link.Status''
  'link issue #142'assert'(props⍪ ''⎕SE.unlikelyname'' ''#.unlikelyname'' ''#.unlikelyname.sub'',3 3⍴''←→'' folder 1)≡z'
  z←{(~⍵[;1]∊IGNORE_LINKS)⌿⍵}⎕SE.Link.Status ⎕SE
  'link issue #142'assert'(props,[.5] ''⎕SE.unlikelyname'' ''←→'' folder 1 )≡z'
 
  {}'(all:1)'⎕SE.Link.Break ⍬
  'link issue #284'assert'{6::1 ⋄ (⎕SE.Link.Links.ns~IGNORE_LINKS)≡,⊂''⎕SE.unlikelyname''}⍬'
  :If ~TESTS_LINKED
-    {}'(all:''⎕SE'')'⎕SE.Link.Break ⍬
-    'link issue #284'assert'{6::1 ⋄ 0=CountLinks}⍬'
+     {}'(all:''⎕SE'')'⎕SE.Link.Break ⍬
+     'link issue #284'assert'{6::1 ⋄ 0=CountLinks}⍬'
  :Else
-    Log 'Not testing "]link.break -all=⎕SE" because ',(⍕⎕THIS),' is linked'
+     Log'Not testing "]link.break -all=⎕SE" because ',(⍕⎕THIS),' is linked'
  :EndIf
 
  ⎕EX'⎕SE.unlikelyname' '#.unlikelyname'
@@ -212,8 +213,8 @@
  z←⎕SE.Link.GetItemName f←1 NTREE folder
  'link issue #128'assert'({⍵[⍋⍵]}z)≡({⍵[⍋⍵]} 1 NSTREE name)'
  :If ⎕SE.Link.U.ISWIN
-     b←('/' ⎕R '\\')f ⍝ file names with backslashes
-     'link issue #482' assert 'z≡⎕SE.Link.GetItemName b'
+     b←('/'⎕R'\\')f ⍝ file names with backslashes
+     'link issue #482'assert'z≡⎕SE.Link.GetItemName b'
  :EndIf
  z←⎕SE.Link.GetFileName'⎕SE.nope' '⎕SE.nope.nope',name∘,¨'.nope' '.sub.nope' '.nope.nope'
  z,←⎕SE.Link.GetItemName'/nope.aplf' '/nope/nope.aplf',folder∘,¨'/nope.nope' '/sub/nope.nope' '/nope/nope.nope'
@@ -267,7 +268,7 @@
  (⍎name).{⎕THIS.jsondict←⎕SE.Dyalog.Array.Deserialise ⍵}'(var:42 ⋄ list:1 2 3)'  ⍝ ⎕JSON'{"var":42,"list":[1,2,3]}' hits Mantis 18652
       ⍝'link issue #177'assertError'z←(⍎name).{⎕SE.UCMD''z←]Link.Add jsondict.list''}⍬'('Not a properly named namespace')0 ⍝ UCMD may trigger any error number
  z←(⍎name).{⎕SE.UCMD']Link.Add jsondict.list'}⍬
- 'link issue #177'assert'∨/''⎕SE.Link.Add: Not a properly named namespace:''⍷z'  ⍝ link issue #217 - UCMD must not error
+ 'link issue #177'assert'∨/''properly named''⍷z'  ⍝ link issue #217 - UCMD must not error
 
  ⎕EX name,'.jsondict'
  {}⎕SE.Link.Break name
@@ -294,7 +295,7 @@
  #.jsondict←#.⎕JSON'{"var":42,"list":[1,2,3]}'
       ⍝'link issue #177'assertError'#.{⎕SE.UCMD''z←]Link.Add jsondict.list''}⍬' 'Not a properly named namespace' 0  ⍝ UCMD may trigger any error number
  z←#.{⎕SE.UCMD']Link.Add jsondict.list'}⍬
- 'link issue #177'assert'∨/''⎕SE.Link.Add: Not a properly named namespace:''⍷z'  ⍝ link issue #217 - UCMD must not error
+ 'link issue #177'assert'∨/''properly named''⍷z'  ⍝ link issue #217 - UCMD must not error
  ⎕EX'#.jsondict' ⋄ '#.jsondict'⎕NS'' ⋄ #.jsondict.(var list)←42(1 2 3)
  z←#.{⎕SE.UCMD']Link.Add jsondict.list'}⍬
  'link issue #177'assert'⎕NEXISTS ''',folder,'/jsondict-0/list-0.apla'''