Implement auth and transfer commands #1298
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -335,3 +335,19 @@ depsOnly = | |
| ( O.long "deps-only" | ||
| <> O.help "Build depedencies only" | ||
| ) | ||
|
|
||
| publicKeyPath :: Parser FilePath | ||
| publicKeyPath = | ||
| O.strOption | ||
| ( O.short 'i' | ||
| <> O.metavar "PUBLIC_KEY_PATH" | ||
| <> O.help "Select the path of the public key to use for authenticating operations of the package" | ||
| ) | ||
|
|
||
| privateKeyPath :: Parser FilePath | ||
| privateKeyPath = | ||
| O.strOption | ||
| ( O.short 'i' | ||
| <> O.metavar "PRIVATE_KEY_PATH" | ||
| <> O.help "The path of the private key to use for signing the operation" | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -23,6 +23,7 @@ import Optparse as Optparse | |||||
| import Record as Record | ||||||
| import Registry.PackageName as PackageName | ||||||
| import Spago.Bin.Flags as Flags | ||||||
| import Spago.Command.Auth as Auth | ||||||
| import Spago.Command.Build as Build | ||||||
| import Spago.Command.Bundle as Bundle | ||||||
| import Spago.Command.Docs as Docs | ||||||
|
|
@@ -33,7 +34,7 @@ import Spago.Command.Init as Init | |||||
| import Spago.Command.Ls (LsPathsArgs, LsDepsArgs, LsPackagesArgs) | ||||||
| import Spago.Command.Ls as Ls | ||||||
| import Spago.Command.Publish as Publish | ||||||
| import Spago.Command.Registry (RegistryInfoArgs, RegistryPackageSetsArgs, RegistrySearchArgs, RegistryTransferArgs) | ||||||
| import Spago.Command.Registry as RegistryCmd | ||||||
| import Spago.Command.Repl as Repl | ||||||
| import Spago.Command.Run as Run | ||||||
|
|
@@ -203,13 +204,15 @@ data Command a | |||||
| | RegistryInfo RegistryInfoArgs | ||||||
| | RegistryPackageSets RegistryPackageSetsArgs | ||||||
| | RegistrySearch RegistrySearchArgs | ||||||
| | RegistryTransfer RegistryTransferArgs | ||||||
| | Repl ReplArgs | ||||||
| | Run RunArgs | ||||||
| | Sources SourcesArgs | ||||||
| | Test TestArgs | ||||||
| | Upgrade UpgradeArgs | ||||||
| | GraphModules GraphModulesArgs | ||||||
| | GraphPackages GraphPackagesArgs | ||||||
| | Auth Auth.AuthArgs | ||||||
|
|
||||||
| commandParser :: forall (a :: Row Type). String -> Parser (Command a) -> String -> Mod CommandFields (SpagoCmd a) | ||||||
| commandParser command_ parser_ description_ = | ||||||
|
|
@@ -222,29 +225,22 @@ commandParser command_ parser_ description_ = | |||||
| argParser :: Parser (SpagoCmd ()) | ||||||
| argParser = | ||||||
| O.hsubparser $ Foldable.fold | ||||||
| [ commandParser "auth" (Auth <$> authArgsParser) "Authenticate as the owner of a package, to allow transfer and unpiblish operations" | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| , commandParser "build" (Build <$> buildArgsParser) "Compile the project" | ||||||
| , commandParser "bundle" (Bundle <$> bundleArgsParser) "Bundle the project in a single file" | ||||||
| , commandParser "docs" (Docs <$> docsArgsParser) "Generate docs for the project and its dependencies" | ||||||
| , commandParser "fetch" (Fetch <$> fetchArgsParser) "Downloads all of the project's dependencies" | ||||||
| , O.command "graph" | ||||||
| ( O.info | ||||||
| ( O.hsubparser $ Foldable.fold | ||||||
| [ commandParser "modules" (GraphModules <$> graphModulesArgsParser) "Generate a graph of the project's modules" | ||||||
| , commandParser "packages" (GraphPackages <$> graphPackagesArgsParser) "Generate a graph of the project's dependencies" | ||||||
| ] | ||||||
| ) | ||||||
| (O.progDesc "Generate a graph of modules or dependencies") | ||||||
| ) | ||||||
| , commandParser "init" (Init <$> initArgsParser) "Initialise a new project" | ||||||
| , commandParser "install" (Install <$> installArgsParser) "Compile the project's dependencies" | ||||||
| , O.command "ls" | ||||||
| ( O.info | ||||||
| ( O.hsubparser $ Foldable.fold | ||||||
|
|
@@ -255,26 +251,26 @@ argParser = | |||||
| ) | ||||||
| (O.progDesc "List packages or dependencies") | ||||||
| ) | ||||||
| , commandParser "publish" (Publish <$> publishArgsParser) "Publish a package" | ||||||
| , O.command "registry" | ||||||
| ( O.info | ||||||
| ( O.hsubparser $ Foldable.fold | ||||||
| [ commandParser "search" (RegistrySearch <$> registrySearchArgsParser) "Search for package names in the Registry" | ||||||
| , commandParser "info" (RegistryInfo <$> registryInfoArgsParser) "Query the Registry for information about packages and versions" | ||||||
| , commandParser "package-sets" (RegistryPackageSets <$> registryPackageSetsArgsParser) "List the available package sets" | ||||||
| , commandParser "transfer" (RegistryTransfer <$> registryTransferArgsParser) "Transfer a package you own to a different remote location" | ||||||
| ] | ||||||
| ) | ||||||
| (O.progDesc "Commands to interact with the Registry") | ||||||
| ) | ||||||
| , commandParser "repl" (Repl <$> replArgsParser) "Start a REPL" | ||||||
| , commandParser "run" (Run <$> runArgsParser) "Run the project" | ||||||
| , commandParser "sources" (Sources <$> sourcesArgsParser) "List all the source paths (globs) for the dependencies of the project" | ||||||
| , commandParser "test" (Test <$> testArgsParser) "Test the project" | ||||||
| , commandParser "uninstall" (Uninstall <$> uninstallArgsParser) "Remove dependencies from a package" | ||||||
| , commandParser "upgrade" (Upgrade <$> upgradeArgsParser) "Upgrade to the latest package set, or to the latest versions of Registry packages" | ||||||
| ] | ||||||
|
|
||||||
| -- https://stackoverflow.com/questions/45395369/how-to-get-console-log-line-numbers-shown-in-nodejs | ||||||
| -- TODO: veryVerbose = CLI.switch "very-verbose" 'V' "Enable more verbosity: timestamps and source locations" | ||||||
|
|
||||||
|
|
@@ -463,6 +459,12 @@ registryPackageSetsArgsParser = | |||||
| , latest: Flags.latest | ||||||
| } | ||||||
|
|
||||||
| registryTransferArgsParser :: Parser RegistryTransferArgs | ||||||
| registryTransferArgsParser = | ||||||
| Optparse.fromRecord | ||||||
| { privateKeyPath: Flags.privateKeyPath | ||||||
| } | ||||||
|
|
||||||
| graphModulesArgsParser :: Parser GraphModulesArgs | ||||||
| graphModulesArgsParser = Optparse.fromRecord | ||||||
| { dot: Flags.dot | ||||||
|
|
@@ -496,6 +498,11 @@ lsDepsArgsParser = Optparse.fromRecord | |||||
| , pure: Flags.pureLockfile | ||||||
| } | ||||||
|
|
||||||
| authArgsParser :: Parser Auth.AuthArgs | ||||||
| authArgsParser = Optparse.fromRecord | ||||||
| { keyPath: Flags.publicKeyPath | ||||||
| } | ||||||
|
|
||||||
| data Cmd a = Cmd'SpagoCmd (SpagoCmd a) | Cmd'VersionCmd Boolean | ||||||
|
|
||||||
| parseArgs :: Effect (Cmd ()) | ||||||
|
|
@@ -545,8 +552,10 @@ main = do | |||||
| Init args@{ useSolver } -> do | ||||||
| -- Fetch the registry here so we can select the right package set later | ||||||
| env <- mkRegistryEnv offline | ||||||
|
|
||||||
| setVersion <- parseSetVersion args.setVersion | ||||||
| void $ runSpago env $ Init.run { mode: args.mode, setVersion, useSolver } | ||||||
|
|
||||||
| Fetch args -> do | ||||||
| { env, fetchOpts } <- mkFetchEnv (Record.merge { isRepl: false, migrateConfig, offline } args) | ||||||
| void $ runSpago env (Fetch.run fetchOpts) | ||||||
|
|
@@ -559,8 +568,11 @@ main = do | |||||
| RegistryPackageSets args -> do | ||||||
| env <- mkRegistryEnv offline | ||||||
| void $ runSpago env (RegistryCmd.packageSets args) | ||||||
| RegistryTransfer args -> do | ||||||
| { env } <- mkFetchEnv { packages: mempty, selectedPackage: Nothing, pure: false, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig: false, offline } | ||||||
| void $ runSpago env (RegistryCmd.transfer args) | ||||||
| Install args -> do | ||||||
| { env, fetchOpts } <- mkFetchEnv (Record.merge { isRepl: false, migrateConfig, offline } args) | ||||||
| dependencies <- runSpago env (Fetch.run fetchOpts) | ||||||
| let | ||||||
| buildArgs = Record.merge | ||||||
|
|
@@ -670,7 +682,10 @@ main = do | |||||
| Upgrade args -> do | ||||||
| setVersion <- parseSetVersion args.setVersion | ||||||
| { env } <- mkFetchEnv { packages: mempty, selectedPackage: Nothing, pure: false, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline } | ||||||
| runSpago env (Upgrade.run { setVersion }) | ||||||
| Auth args -> do | ||||||
| { env } <- mkFetchEnv { packages: mempty, selectedPackage: Nothing, pure: false, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline } | ||||||
| runSpago env $ Auth.run args | ||||||
| -- TODO: add selected to graph commands | ||||||
| GraphModules args -> do | ||||||
| { env, fetchOpts } <- mkFetchEnv { packages: mempty, selectedPackage: Nothing, pure: false, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline } | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ package: | |
| - exceptions | ||
| - filterable | ||
| - foldable-traversable | ||
| - foreign | ||
| - functions | ||
| - identity | ||
| - integers | ||
|
|
@@ -39,3 +40,4 @@ package: | |
| - stringutils | ||
| - transformers | ||
| - tuples | ||
| - unsafe-coerce | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,6 +55,8 @@ import Registry.Internal.Codec as Reg.Internal.Codec | |
| import Registry.Internal.Parsing as Reg.Internal.Parsing | ||
| import Registry.License as License | ||
| import Registry.Location as Location | ||
| import Registry.Owner (Owner) | ||
| import Registry.Owner as Owner | ||
| import Registry.PackageName as PackageName | ||
| import Registry.Range as Range | ||
| import Registry.Sha256 as Sha256 | ||
|
|
@@ -100,6 +102,7 @@ type PublishConfig = | |
| , location :: Maybe Location | ||
| , include :: Maybe (Array FilePath) | ||
| , exclude :: Maybe (Array FilePath) | ||
| , owners :: Maybe (Array Owner) | ||
| } | ||
|
|
||
| publishConfigCodec :: CJ.Codec PublishConfig | ||
|
|
@@ -109,6 +112,7 @@ publishConfigCodec = CJ.named "PublishConfig" $ CJS.objectStrict | |
| $ CJS.recordPropOptional @"location" publishLocationCodec | ||
| $ CJS.recordPropOptional @"include" (CJ.array CJ.string) | ||
| $ CJS.recordPropOptional @"exclude" (CJ.array CJ.string) | ||
| $ CJS.recordPropOptional @"owners" (CJ.array Owner.codec) | ||
| $ CJS.record | ||
|
|
||
| -- This codec duplicates `Location.codec` from the Registry library, but with | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,15 +7,13 @@ module Spago.FS | |
| , ensureFileSync | ||
| , exists | ||
| , getInBetweenPaths | ||
| , ls | ||
| , mkdirp | ||
| , moveSync | ||
| , readJsonFile | ||
| , readTextFile | ||
| , readYamlDocFile | ||
| , readYamlFile | ||
| , writeFile | ||
| , writeJsonFile | ||
| , writeTextFile | ||
|
|
@@ -33,8 +31,6 @@ import Effect.Uncurried (EffectFn2, runEffectFn2) | |
| import Node.FS.Aff as FS.Aff | ||
| import Node.FS.Perms (Perms) | ||
| import Node.FS.Perms as Perms | ||
| import Node.FS.Sync as FS.Sync | ||
| import Spago.Json as Json | ||
| import Spago.Yaml as Yaml | ||
|
|
@@ -116,14 +112,6 @@ readYamlDocFile codec path = do | |
| result <- Aff.attempt $ FS.Aff.readTextFile UTF8 path | ||
| pure (lmap Aff.message result >>= Yaml.parseYamlDoc codec >>> lmap CJ.DecodeError.print) | ||
|
|
||
| foreign import getInBetweenPathsImpl :: EffectFn2 FilePath FilePath (Array FilePath) | ||
|
|
||
| getInBetweenPaths :: forall m. MonadEffect m => FilePath -> FilePath -> m (Array FilePath) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,8 +8,11 @@ import Data.Array as Array | |
| import Data.Bifunctor (lmap) | ||
| import Data.Codec.JSON as CJ | ||
| import Data.Either (Either) | ||
| import Foreign (Foreign) | ||
| import JSON (JSON) | ||
| import JSON as JSON | ||
| import JSON.Path as JSON.Path | ||
| import Unsafe.Coerce (unsafeCoerce) | ||
|
|
||
| -- | Print a type as a formatted JSON string | ||
| printJson :: forall a. CJ.Codec a -> a -> String | ||
|
|
@@ -31,3 +34,7 @@ printConfigError (DecodeError { path, message, causes }) = | |
| false -> Array.foldMap printConfigError causes | ||
| -- If there are none, then we have reached a leaf, and can print the actual error | ||
| true -> [ JSON.Path.print path <> ": " <> message ] | ||
|
|
||
| -- | Decode a Foreign into JSON | ||
| unsafeFromForeign :: Foreign -> JSON | ||
| unsafeFromForeign = unsafeCoerce | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| import { globSync } from 'glob'; | ||
| import path from "node:path"; | ||
| import { fileURLToPath } from "node:url"; | ||
|
|
||
| export function getDocsSearchAppPath() { | ||
| const fileName = fileURLToPath(import.meta.url); | ||
| const absoluteDir = path.dirname(fileName); | ||
| const basename = path.basename(absoluteDir); | ||
|
|
||
| // unbundled dev build | ||
| if (basename == "Docs.Search.IndexBuilder") { | ||
| return path.join(absoluteDir, "..", "..", "bin", "docs-search-app.js"); | ||
| } | ||
| // bundled production build | ||
| if (basename === "bin") { | ||
| return path.join(absoluteDir, "docs-search-app.js"); | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this mean that I can "take over" somebody else's package by doing this before they get to it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, this is dependent on me having the right to commit the public key to the repo?