Default for checkPackageVersions chamnged to 0 in API

.gitignore

@@ -3,6 +3,7 @@ aplcore
 CONTINUE.dws
 conga.crash
 /packages/*
+/TestResults/
 !/packages/apl-dependencies.txt
 !/packages/apl-buildlist.json
 /packages_dev/*

APLSource/Cider/API/AddNuGetDependencies.aplf

@@ -0,0 +1 @@
+ AddNuGetDependencies←{##.AddNuGetDependencies ⍵}

APLSource/Cider/API/GetAliasFileContent.aplf

@@ -1,2 +1 @@
- r←GetAliasFileContent
- r←##.GetAliasFileContent
+ GetAliasFileContent←{⍺←⊢ ⋄ ⍺ ##.GetAliasFileContent ⍵}

APLSource/Cider/API/GetNuGetDependencies.aplf

@@ -0,0 +1 @@
+ GetNuGetDependencies←{⍺←⊢ ⋄ ⍺ ##.GetNuGetDependencies ⍵}

APLSource/Cider/API/GetTatinDependencies.aplf

@@ -0,0 +1 @@
+ GetTatinDependencies←{⍺←⊢ ⋄ ⍺ ##.GetTatinDependencies ⍵}

APLSource/Cider/API/ListNuGetDependencies.aplf

@@ -0,0 +1 @@
+ ListNuGetDependencies←{##.ListNuGetDependencies ⍵}

APLSource/Cider/API/ListTatinDependencies.aplf

@@ -0,0 +1 @@
+ ListTatinDependencies←{##.ListTatinDependencies ⍵}

APLSource/Cider/API/ProjectConfig.aplf

@@ -1 +1 @@
- ProjectConfig←{⍺←⊢ ⋄ 1:shy←⍺ ##.ProjectConfig ⍵}
+ ProjectConfig←{1:shy←##.ProjectConfig ⍵}

APLSource/Cider/API/WriteProjectConfigFile.aplf

@@ -1 +1 @@
- WriteProjectConfigFile←{⍺←⊢ ⋄ ⍺ ##.WriteProjectConfigFile ⍵}
+ WriteProjectConfigFile←{⍺←⊢ ⋄ 1:shy←⍺ ##.WriteProjectConfigFile ⍵}

APLSource/Cider/AddNuGetDependencies.aplf

@@ -1,33 +1,36 @@
- r←AddNuGetDependencies (packages path);NuGet;ns;config;nuget_dir;configfile
-⍝ Either add one or more NuGet packages
-
+ list←AddNuGetDependencies(packages projectFolder);NuGet;msg;cfg;nuGetFolder;package;buff;targetNamespace
+⍝ Add one or more NuGet packages to the NuGet-folder define in the config file of `projectFolder`.
+⍝ * `packages` must be either a nested vector with package names or a comma-separated list of package names
+⍝ * `projectFolder` must carry a Cider config files used to establish the NuGet folder.\\
+⍝ Returns a list with the names that got installed or at least updated.
  :If 1=≡packages
-     packages←{1↓¨(⍵∊',;')⊂⍵}';',packages
+     packages←','(≠⊆⊢)packages
  :EndIf
- path←FilesAndDirs.EnforceSlash path
-
- 'Unable to locate NuGet API' ⎕SIGNAL (0≡NuGet←FindNuGetAPI ⍬)/11
- ns←path{3::0 ⋄ ⊃⍵[⍵[;2]⍳⊂⍺;1]}ListOpenProjects 0 ⍝ namespace project loaded into
- config←Get_JSON5 configfile←path,'/cider.config'
-
- :If 0=⎕NC 'config.CIDER.dependencies.nuget'
-     config.CIDER.dependencies.nuget←'nuget-packages'
-     config Put_JSON5 configfile
+ :If IsAlias projectFolder
+     projectFolder←GetFolderFromAlias2 projectFolder
  :EndIf
-
- nuget_dir←path,'/',{0::⍵ ⋄ config.CIDER.dependencies.nuget}'nuget-packages'
-
- r←NuGet.Setup nuget_dir
- →(∨/'error:'⍷⎕C r)⍴0
-
- r←NuGet.Add (⊂nuget_dir),packages
- →(∨/'error:'⍷⎕C r)⍴0
-
- :If ns≢0 ⍝ We have a project namespace
-     :If 2=⎕NC 'ns'
-         ns←⍎ns
-     :EndIf
-     'dotnet'ns.⎕NS''
-     ns.dotnet.⎕USING←NuGet.Using nuget_dir
-     r←'NuGet dependencies established in ',(⍕ns),'.dotnet'
+ 'No Cider config file found'Assert F.Exists projectFolder,'/cider.config'
+ cfg←ReadProjectConfigFile projectFolder
+ nuGetFolder←projectFolder,'/',⊃GetNuGetDependencyFolders cfg
+ targetNamespace←''
+ :If '='∊buff←2⊃⎕NPARTS nuGetFolder
+     targetNamespace←{⍵↓⍨⍵⍳'='}buff
+     nuGetFolder←(-1+≢targetNamespace)↓nuGetFolder
  :EndIf
+ :If 0<≢nuGetFolder
+     nuGetFolder←FilesAndDirs.EnforceSlash nuGetFolder  ⍝ .NET requirement
+     {}⎕MKDIR⍣(~⎕NEXISTS nuGetFolder)⊣nuGetFolder
+     'Unable to locate NuGet API'Assert 0≢NuGet←FindNuGetAPI ⍬
+     msg←NuGet.Setup nuGetFolder
+     msg Assert~∨/'error:'⍷⎕C msg
+     list←''
+     :For package :In packages
+         :Trap 99
+             msg←NuGet.Add(⊂nuGetFolder),⊂package
+             :If ~∨/'error:'⍷⎕C msg
+                 list,←⊂package
+             :EndIf
+         :EndTrap
+     :EndFor
+ :EndIf
+⍝Done

APLSource/Cider/AddTatinDependencies.aplf

@@ -1,4 +1,15 @@
- r←AddTatinDependencies(packageIDs targetFolder)
-⍝ Add  one or more Tatin packages as dependencies
+ r←AddTatinDependencies(packageIDs projectFolder dev);targetFolder;cfg;ref
+⍝ Add one or more Tatin packages as dependencies.
+⍝ `dev` is a flag that decides whether `dependencies` or `dependencies_dev` is the target.
+ :If 1<≡packageIDs
+     packageIDs←⊃1↓,/',',¨packageIDs
+ :EndIf
+ cfg←ReadProjectConfigFile projectFolder
+ :If dev
+     ref←cfg.CIDER.dependencies_dev
+ :Else
+     ref←cfg.CIDER.dependencies
+ :EndIf
+ targetFolder←projectFolder,'/',{⍵↑⍨¯1+⍵⍳'='}ref.tatin
  r←⎕SE.Tatin.InstallPackages packageIDs targetFolder
 ⍝Done

APLSource/Cider/CheckForTatinPackages.aplf

@@ -4,7 +4,7 @@
 ⍝ * when the user goes for re-installing the packages, a 2 is returned
 ⍝ * when she does not a 3 is returned
  status←0
- folders←GetTatinDepedencyFolders config
+ folders←GetTatinDependencyFolders config
  :If 0<≢folders
      folders←{'='∊⍵:⍵↑⍨¯1+⍵⍳'=' ⋄ ⍵}¨folders
  :AndIf 0<≢folders←(0<≢¨folders)/folders

APLSource/Cider/CheckPackagesStatus.aplf

@@ -7,7 +7,7 @@
 ⍝ 1 means yes, check, but ask before updating
 ⍝ 2 means update without further ado
  r←⍬
- folders←GetTatinDepedencyFolders config
+ folders←GetTatinDependencyFolders config
  :If 0<≢folders
      :If 0≢parms.checkPackageVersions
      :AndIf 2>pkgStatus

APLSource/Cider/CheckTargetNamespaceAndLinkFolder.aplf

@@ -22,7 +22,7 @@
      :EndIf
      :If parms.batch
           ⍝ With `batch` being true there is nothing we can do but throw an error
-         'Both the target and the source folder are not empty'Assert 0
+         ('Both the target (',(⍕ref),') and the source folder are not empty')Assert 0
      :Else
          :If C.YesOrNo'Target "',(⍕ref),'" is not empty - recreate?'
              ⎕EX⍕ref                                 ⍝ It might be a class, so we first delete it...

APLSource/Cider/CreateOpenParms.aplf

@@ -14,7 +14,7 @@
  parms.verbose←GetGlobalVerboseDefault
  parms.batch←0
  parms.watch←(1+HasDotNet)⊃'ns' 'both'
- parms.checkPackageVersions←⍬      ⍝ ⍬ means the user will be asked; 0 means don't. 1 means yes, check, but ask before updating, 2 means update
+ parms.checkPackageVersions←0      ⍝ ⍬ means the user will be asked; 0 means don't. 1 means yes, check, but ask before updating, 2 means update
  :If ~(⊂y)∊''⍬
  :AndIf 9=⎕NC'y'
      :If 9=y.⎕NC'projectSpace'

APLSource/Cider/CreateRefs.aplf

@@ -3,4 +3,4 @@
  A←APLTreeUtils2
  F←FilesAndDirs
  C←CommTools
- G←APLTreeUtils2
+ G←APLGit2

APLSource/Cider/GetAliasFileContent.aplf

@@ -1,6 +1,6 @@
- r←GetAliasFileContent;filename;buff
+ r←{filename}GetAliasFileContent dummy;filename;buff
  r←0 2⍴''
- filename←GetCiderAliasFilename
+ filename←{0<⎕NC ⍵:⍎⍵ ⋄ GetCiderAliasFilename}'filename'
  :If F.Exists filename
  :AndIf 0<≢buff←⊃F.NGET filename 1
  :AndIf 0<≢buff←(0<≢¨buff)/buff

APLSource/Cider/GetCiderGlobalConfigHomeFolder.aplf

@@ -8,7 +8,7 @@
 ⍝ and if so copies the content over.
 ⍝ This is a temporary measure since the parent for the .cider folder was changed on
 ⍝ Windows from APPDATA\ to the user's home directory.
-⍝ Nothing changed on other platform
+⍝ Nothing did change on other platforms.
  :If 'Win'≡3↑A.GetOperatingSystem ⍬
  :AndIf ~⎕NEXISTS folder,'config.json'
      oldFolder←(2 ⎕NQ #'GetEnvironment' 'APPDATA'),'/.cider/'

APLSource/Cider/GetFolderFromAlias.aplo

@@ -1,15 +1,13 @@
  parms←(fns GetFolderFromAlias)parms;data;alias;msg;alias_;folder
-⍝ Translates the alias in "folder" (if any) into a path from a parameter namespace.\\
-⍝ If an alias is defined it is saved, possibly by overwriting the old one.
- :If '[]'≡parms.folder[1,≢parms.folder]
-     alias←parms.folder~'[]'
+⍝ Translates the alias in "folder" (if any) into a path from a parameter namespace and save
+⍝ the folder in parms under the name "folder".\\
+⍝ If the alias is unknown an error is thrown.\\
+ :If IsAlias parms.folder
+     alias←1↓¯1↓parms.folder
      folder←GetFolderFromAlias2 alias
-     :If 0<≢folder
-         parms.folder←folder
-         :If 0=≢parms.alias
-             parms.alias←alias
-         :EndIf
-     :Else
-         (alias,'" is not a valid alias')⎕SIGNAL 11
+     ('"',alias,'" is not a valid alias')Assert 0<≢folder
+     parms.folder←folder
+     :If 0=≢parms.alias
+         parms.alias←alias
      :EndIf
  :EndIf

APLSource/Cider/GetFolderFromAlias2.aplf

@@ -1,11 +1,12 @@
- folder←GetFolderFromAlias2 alias;filename;data
-⍝ Translates the alias in "folder" (if any) into a path.\\
-⍝ In case the alias does not exist an empty vector is returned.\\
-⍝ If an alias is defined it is saved, possibly by overwriting the old one.
+ folder←{globalAliasFilename}GetFolderFromAlias2 alias;data
+⍝ Translates an alias (if any) into a folder.\\
+⍝ In case no global alias file can be found an empty vector is returned.\\
+⍝ If the alias cannot be found an error is thrown.\\
+⍝ `globalAliasFilename` should only be specified by test cases
  folder←''
- filename←GetCiderAliasFilename
- :If F.Exists filename
-     :If 0<≢data←⊃F.NGET filename 1
+ globalAliasFilename←{0<⎕NC ⍵:⍎⍵ ⋄ GetCiderAliasFilename}'globalAliasFilename'
+ :If F.Exists globalAliasFilename
+     :If 0<≢data←⊃F.NGET globalAliasFilename 1
          data←↑{'='(≠⊆⊢)⍵}¨data
          alias←⎕C alias~'[]'
          :If (⊂alias)∊data[;1]

APLSource/Cider/GetNuGetDependencies.aplf

@@ -0,0 +1,9 @@
+ r←name GetNuGetDependencies config;ref
+⍝ Use this to return the content of "nuget" in either "dependencies" or "dependencies_dev" (defined by "name")
+⍝ but an empty vector in case the "nuget" sub-key does not exist
+ r←''
+ :If 0<config.CIDER.⎕NC name
+     ref←config.CIDER.⍎name
+ :AndIf 0<ref.⎕NC'nuget'
+     r,←ref⍎'nuget'
+ :EndIf

APLSource/Cider/GetNuGetDependencyFolders.aplf

@@ -0,0 +1,8 @@
+ r←GetNuGetDependencyFolders config
+ ⍝ Returns a vector of two-item vectors with (path namespaceName) from the project `config` namespace.
+ ⍝ `r` might be empty in case there are no Tatin dependencies, otherwise it is a vector character vectors
+ ⍝ with relative path and optionally the name of a target namespace (separated by "=").
+ ⍝ Returns a nested vector in case we extend it for development one day.
+ r←''
+ r,←⊂'dependencies'GetNuGetDependencies config
+ r~←⊂''

APLSource/Cider/GetProjectPath.aplf

@@ -16,7 +16,7 @@
          path←2⊃list[index;]
      :EndSelect
  :Else
-     aliasDefs←P.GetAliasFileContent
+     aliasDefs←P.GetAliasFileContent ⍬
      path←Args._1
      :If path≡'[?]'
          :If 0=≢path←SelectFromAliases aliasDefs

APLSource/Cider/GetDependencies.aplf → APLSource/Cider/GetTatinDependencies.aplf

@@ -1,8 +1,9 @@
- r←name GetDependencies config;ref
+ r←name GetTatinDependencies config;ref
 ⍝ Use this to return the content of "tatin" in either "dependencies" or "dependencies_dev" (defined by "name")
 ⍝ but an empty vector in case the "tatin" sub-key does not exist
  r←''
  :If 0<config.CIDER.⎕NC name
      ref←config.CIDER.⍎name
+ :AndIf 0<ref.⎕NC'tatin'
      r,←ref⍎'tatin'
  :EndIf

APLSource/Cider/GetTatinDepedencyFolders.aplf → APLSource/Cider/GetTatinDependencyFolders.aplf

@@ -1,8 +1,8 @@
- r←GetTatinDepedencyFolders config
+ r←GetTatinDependencyFolders config
  ⍝ Returns a vector of two-item vectors with (path namespaceName) from the project `config` namespace.
  ⍝ `r` might be empty in case there are no Tatin dependencies, otherwise it is a vector character vectors
  ⍝ with relative path and optionally the name of a target namespace (separated by "=").
  r←''
- r,←⊂'dependencies'GetDependencies config
- r,←⊂'dependencies_dev'GetDependencies config
+ r,←⊂'dependencies'GetTatinDependencies config
+ r,←⊂'dependencies_dev'GetTatinDependencies config
  r~←⊂''

APLSource/Cider/History.apla

@@ -1,5 +1,16 @@
 (
- '* 0.34.1 ⋄ 2023-09-15'
+ '* 0.35.0 ⋄ 2023-09-22'
+ '  * User commands implemented:'
+ '    * `]Cider.AddTatinDependencies`'
+ '    * `]Cider.AddNuGetDependencies`'
+ '    * `]Cider.ListTatinDependencies`'
+ '    * `]Cider.ListNuGetDependencies`'
+ '  * API equivalents for the newly introduced user commands implemented: `AddTatinDependencies`, '
+ '    `AddNuGetDependencies`, `ListTatinDependencies`, `ListNuGetDependencies`'
+ '  * `OpenProject` now loads NuGet dependencies, if any'
+ '  * The default of `checkPackageVersions` in `CreateOpenParms` is now 0, preventing the API function from'
+ '    asking the user. (The user command `OpenProject` will asign `⍬` however)'
+ '  * `]Cider.UpdateCider` added as a user command, though the corresponding API function is still missing'
  '  * Bug fixes:'
  '    * There were refs missing in the user command script in case of DEVELOPMENT←1'
  '* 0.34.0 ⋄ 2023-09-14'

APLSource/Cider/InitPackage.aplf

@@ -0,0 +1,8 @@
+ InitPackage;⎕TRAP
+⍝ Executed by Tatin when the Cider package is loaded
+ CreateRefs
+ :If 0
+     ⎕TRAP←0 'S'
+     ∘∘∘   ⍝TODO⍝
+ :EndIf
+⍝Done

APLSource/Cider/IsAlias.aplf

@@ -0,0 +1,2 @@
+ r←IsAlias path
+ r←']['≡2↑¯1⌽path

APLSource/Cider/ListNuGetDependencies.aplf

@@ -1,10 +1,14 @@
- r←ListNuGetDependencies path;NuGet;nuget_dir
-⍝ List NuGet Dependencies (what a useful comment!)
-
- NuGet←FindNuGetAPI ''
- nuget_dir←path,'/',{0::⍵ ⋄ config.CIDER.dependencies.nuget}'nuget-packages'
- :If ⎕NEXISTS nuget_dir
-     r←NuGet.Packages nuget_dir
- :Else
-     r←'No dependencies found'
+ r←ListNuGetDependencies projectFolder;NuGet;cfg;nuGetFolder
+ r←0 2⍴''
+ NuGet←FindNuGetAPI''
+ :If IsAlias projectFolder
+     projectFolder←GetFolderFromAlias2 projectFolder
+ :EndIf
+ 'No Cider config file found'Assert F.Exists projectFolder,'/cider.config'
+ cfg←ReadProjectConfigFile projectFolder
+ :If 0<≢nuGetFolder←⊃GetNuGetDependencyFolders cfg
+     nuGetFolder←{~'='∊2⊃⎕NPARTS ⍵:⍵ ⋄ ⊃{⍺,{⍵↑⍨¯1+⍵⍳'='}⍵}/⎕NPARTS ⍵}nuGetFolder
+ :AndIf ⎕NEXISTS projectFolder,'/',nuGetFolder
+ :AndIf 0<≢F.ListFiles projectFolder,'/',nuGetFolder,'/*.csproj'
+     r←↑NuGet.Packages projectFolder,'/',nuGetFolder
  :EndIf

APLSource/Cider/ListOpenProjects.aplf

@@ -14,7 +14,7 @@
          r[;2]←DropTrailingSlash¨r[;2]
          r[;2]←F.EnforceSlash¨r[;2]
          :If verboseFlag
-             :If 0<≢aliases←GetAliasFileContent
+             :If 0<≢aliases←GetAliasFileContent ⍬
                  aliases[;2]←DropTrailingSlash¨aliases[;2]
              :AndIf 0<≢aliases←(aliases[;2]∊r[;2])⌿aliases
                  r,←⊂''

APLSource/Cider/ListTatinDependencies.aplf

@@ -0,0 +1,24 @@
+ r←ListTatinDependencies projectFolder;cfgFilename;cfg;buildFilenames;buildLists;b;tatinFolders;buildFolders
+⍝ `y` must point to a project, either as alias ([]) or as a projectFolder.
+⍝ The actualt Tatin dependency folders are established from the project config file.
+ r←0 5⍴''
+ :If IsAlias projectFolder
+     projectFolder←GetFolderFromAlias2 projectFolder
+ :EndIf
+ cfgFilename←projectFolder,'/cider.config'
+ 'No Cider config file found'Assert F.Exists cfgFilename
+ cfg←ReadProjectConfigFile cfgFilename
+ tatinFolders←GetTatinDependencyFolders cfg
+ :If 0<≢tatinFolders
+     tatinFolders←{⍵↑⍨¯1+⍵⍳'='}¨tatinFolders
+     buildFolders←(⊂projectFolder,'/'),¨tatinFolders
+     buildFilenames←buildFolders,¨⊂'/apl-buildlist.json'
+     b←F.Exists¨buildFilenames
+ :AndIf 0<≢buildFilenames←b/buildFilenames
+     '"dependencies" and "dependencies_dev" do not point to existing folders'Assert∨/b
+     buildLists←{⎕JSON⍠('Dialect' 'JSON5')⊣⊃F.NGET ⍵}¨buildFilenames
+     r←⍉∘↑¨(⊂¨' ',¨¨buildLists.packageID),¨buildLists.(principal url)
+     r←(⊂¨b/tatinFolders,¨'/'),¨r
+     r←{⍵,'? '[1+'https://tatin.dev/'∘≡¨⍵[;4]]}¨r
+     r←⊃⍪/r
+ :EndIf