From 33b93b20e98b67bb34fad153af4673d73ddc6ffc Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 7 Oct 2022 16:32:07 +0300 Subject: [PATCH] refactor: translateFinal -> finalTranslate to make it more consistent with naming from nixpkgs and home-manager --- src/apps/translate-index/default.nix | 2 +- src/apps/translate/default.nix | 2 +- src/default.nix | 2 +- .../functions.translators/implementation.nix | 2 +- .../interfaces.translator/implementation.nix | 4 ++-- .../interfaces.translator/interface.nix | 4 ++-- .../haskell/translators/hackage/default.nix | 2 +- .../nodejs/translators/npm/default.nix | 2 +- .../translators/package-json/default.nix | 2 +- .../php/translators/composer-json/default.nix | 2 +- .../php/translators/packagist/default.nix | 4 ++-- .../rust/translators/cargo-toml/default.nix | 2 +- .../rust/translators/crates-io/default.nix | 4 ++-- src/utils/default.nix | 2 +- tests/unit/test_pure_translators.py | 20 +++++++++---------- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/apps/translate-index/default.nix b/src/apps/translate-index/default.nix index 85da1e73..440442eb 100644 --- a/src/apps/translate-index/default.nix +++ b/src/apps/translate-index/default.nix @@ -54,7 +54,7 @@ in if [ ! -e "$bin" ]; then echo "building executable for translator $translator" ${callNixWithD2N} build -o "$bin" " - dream2nix.framework.translators.$translator.translateBinFinal + dream2nix.framework.translators.$translator.finalTranslateBin " fi done diff --git a/src/apps/translate/default.nix b/src/apps/translate/default.nix index 8dab4193..6f94d2ad 100644 --- a/src/apps/translate/default.nix +++ b/src/apps/translate/default.nix @@ -51,7 +51,7 @@ utils.writePureShellScriptBin translateBin="$TRANSLATOR_DIR/$translator" else translateBin=$(${callNixWithD2N} build --print-out-paths --no-link " - dream2nix.framework.translators.$translator.translateBinFinal + dream2nix.framework.translators.$translator.finalTranslateBin ") fi diff --git a/src/default.nix b/src/default.nix index 77667870..971902d9 100644 --- a/src/default.nix +++ b/src/default.nix @@ -502,7 +502,7 @@ in let l.forEach projectsPureUnresolved (proj: let translator = getTranslator proj.translator; - dreamLock'' = translator.translateFinal { + dreamLock'' = translator.finalTranslate { inherit source tree discoveredProjects; project = proj; }; diff --git a/src/modules/functions.translators/implementation.nix b/src/modules/functions.translators/implementation.nix index ef396e11..896b1ce7 100644 --- a/src/modules/functions.translators/implementation.nix +++ b/src/modules/functions.translators/implementation.nix @@ -47,7 +47,7 @@ (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile '''$1'''))); dreamLock' = - dream2nix.framework.translatorsBySubsystem.${subsystem}.${name}.translateFinal + dream2nix.framework.translatorsBySubsystem.${subsystem}.${name}.finalTranslate translatorArgs; # simpleTranslate2 puts dream-lock in result dreamLock = dreamLock'.result or dreamLock'; diff --git a/src/modules/interfaces.translator/implementation.nix b/src/modules/interfaces.translator/implementation.nix index f23be908..5dcc0136 100644 --- a/src/modules/interfaces.translator/implementation.nix +++ b/src/modules/interfaces.translator/implementation.nix @@ -4,7 +4,7 @@ ... }: { config = { - translateFinal = args: + finalTranslate = args: if config.translate != null then config.translate @@ -19,7 +19,7 @@ } ) else null; - translateBinFinal = + finalTranslateBin = if config.translate != null then framework.functions.translators.wrapPureTranslator diff --git a/src/modules/interfaces.translator/interface.nix b/src/modules/interfaces.translator/interface.nix index 2a99443b..1b07929a 100644 --- a/src/modules/interfaces.translator/interface.nix +++ b/src/modules/interfaces.translator/interface.nix @@ -46,7 +46,7 @@ in { type = t.nullOr (t.functionTo t.attrs); default = null; }; - translateFinal = lib.mkOption { + finalTranslate = lib.mkOption { type = t.nullOr (t.functionTo t.attrs); readOnly = true; description = '' @@ -57,7 +57,7 @@ in { type = t.nullOr t.package; default = null; }; - translateBinFinal = lib.mkOption { + finalTranslateBin = lib.mkOption { type = t.nullOr t.package; readOnly = true; description = '' diff --git a/src/subsystems/haskell/translators/hackage/default.nix b/src/subsystems/haskell/translators/hackage/default.nix index 24971301..02616d61 100644 --- a/src/subsystems/haskell/translators/hackage/default.nix +++ b/src/subsystems/haskell/translators/hackage/default.nix @@ -68,7 +68,7 @@ popd # execute cabal-plan translator - ${translators.cabal-plan.translateBinFinal} $TMPDIR/newJsonInput + ${translators.cabal-plan.finalTranslateBin} $TMPDIR/newJsonInput # finalize dream-lock. Add source and export default package # set correct package version under `packages` diff --git a/src/subsystems/nodejs/translators/npm/default.nix b/src/subsystems/nodejs/translators/npm/default.nix index eb024cdc..172ceedc 100644 --- a/src/subsystems/nodejs/translators/npm/default.nix +++ b/src/subsystems/nodejs/translators/npm/default.nix @@ -50,7 +50,7 @@ popd # call package-lock translator - ${translators.package-lock.translateBinFinal} $TMPDIR/newJsonInput + ${translators.package-lock.finalTranslateBin} $TMPDIR/newJsonInput # get resolved package version export version=$(npm view $candidate version) diff --git a/src/subsystems/nodejs/translators/package-json/default.nix b/src/subsystems/nodejs/translators/package-json/default.nix index 4b27d149..dc4949d1 100644 --- a/src/subsystems/nodejs/translators/package-json/default.nix +++ b/src/subsystems/nodejs/translators/package-json/default.nix @@ -50,7 +50,7 @@ jq ".source = \"$newSource\"" -c -r $jsonInput > $TMPDIR/newJsonInput popd - ${translators.package-lock.translateBinFinal} $TMPDIR/newJsonInput + ${translators.package-lock.finalTranslateBin} $TMPDIR/newJsonInput ''; # inherit options from package-lock translator diff --git a/src/subsystems/php/translators/composer-json/default.nix b/src/subsystems/php/translators/composer-json/default.nix index 0a07618a..4b1940cc 100644 --- a/src/subsystems/php/translators/composer-json/default.nix +++ b/src/subsystems/php/translators/composer-json/default.nix @@ -66,7 +66,7 @@ jq ".source = \"$newSource\"" -c -r $jsonInput > $TMPDIR/newJsonInput popd - ${translators.composer-lock.translateBinFinal} $TMPDIR/newJsonInput + ${translators.composer-lock.finalTranslateBin} $TMPDIR/newJsonInput ''; # inherit options from composer-lock translator diff --git a/src/subsystems/php/translators/packagist/default.nix b/src/subsystems/php/translators/packagist/default.nix index 44e93cb2..2a35d542 100644 --- a/src/subsystems/php/translators/packagist/default.nix +++ b/src/subsystems/php/translators/packagist/default.nix @@ -61,10 +61,10 @@ if [ -f $TMPDIR/source/composer.lock ] then echo 'Translating with composer-lock' - ${translators.composer-lock.translateBinFinal} $TMPDIR/newJsonInput + ${translators.composer-lock.finalTranslateBin} $TMPDIR/newJsonInput else echo 'Translating with composer-json' - ${translators.composer-json.translateBinFinal} $TMPDIR/newJsonInput + ${translators.composer-json.finalTranslateBin} $TMPDIR/newJsonInput fi # add main package source info to dream-lock.json diff --git a/src/subsystems/rust/translators/cargo-toml/default.nix b/src/subsystems/rust/translators/cargo-toml/default.nix index 80661a90..0c0d6b26 100644 --- a/src/subsystems/rust/translators/cargo-toml/default.nix +++ b/src/subsystems/rust/translators/cargo-toml/default.nix @@ -39,7 +39,7 @@ popd if [ $cargoResult -eq 0 ]; then - ${translators.cargo-lock.translateBinFinal} $TMPDIR/newJsonInput + ${translators.cargo-lock.finalTranslateBin} $TMPDIR/newJsonInput else echo "cargo failed to generate the lockfile" exit 1 diff --git a/src/subsystems/rust/translators/crates-io/default.nix b/src/subsystems/rust/translators/crates-io/default.nix index 131f4593..bd8eaa58 100644 --- a/src/subsystems/rust/translators/crates-io/default.nix +++ b/src/subsystems/rust/translators/crates-io/default.nix @@ -55,9 +55,9 @@ # we don't need to run cargo-toml translator if Cargo.lock exists if [ -f "$TMPDIR/source/Cargo.lock" ]; then - ${translators.cargo-lock.translateBinFinal} $TMPDIR/newJsonInput + ${translators.cargo-lock.finalTranslateBin} $TMPDIR/newJsonInput else - ${translators.cargo-toml.translateBinFinal} $TMPDIR/newJsonInput + ${translators.cargo-toml.finalTranslateBin} $TMPDIR/newJsonInput fi # add main package source info to dream-lock.json diff --git a/src/utils/default.nix b/src/utils/default.nix index 604ef339..aad60557 100644 --- a/src/utils/default.nix +++ b/src/utils/default.nix @@ -206,7 +206,7 @@ in '' dreamLockPath="${project.dreamLockPath}" - ${translator.translateBinFinal} ${argsJsonFile} + ${translator.finalTranslateBin} ${argsJsonFile} # aggregate source hashes if [ "${l.toJSON aggregate}" == "true" ]; then diff --git a/tests/unit/test_pure_translators.py b/tests/unit/test_pure_translators.py index ae6fbc84..f304c924 100644 --- a/tests/unit/test_pure_translators.py +++ b/tests/unit/test_pure_translators.py @@ -65,7 +65,7 @@ def check_format_sourceSpec(sourceSpec): @pytest.mark.parametrize("p", projects) def test_packageName(p): defaultPackage = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -81,7 +81,7 @@ def test_packageName(p): @pytest.mark.parametrize("p", projects) def test_exportedPackages(p): exportedPackages = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -97,7 +97,7 @@ def test_exportedPackages(p): @pytest.mark.parametrize("p", projects) def test_extraObjects(p): extraObjects = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -121,7 +121,7 @@ def test_extraObjects(p): @pytest.mark.parametrize("p", projects) def test_location(p): location = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -136,7 +136,7 @@ def test_location(p): @pytest.mark.parametrize("p", projects) def test_serializedRawObjects(p): serializedRawObjects = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -159,7 +159,7 @@ def test_serializedRawObjects(p): @pytest.mark.parametrize("p", projects) def test_subsystemName(p): subsystemName = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -175,7 +175,7 @@ def test_subsystemName(p): @pytest.mark.parametrize("p", projects) def test_subsystemAttrs(p): subsystemAttrs = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -191,7 +191,7 @@ def test_subsystemAttrs(p): @pytest.mark.parametrize("p", projects) def test_translatorName(p): translatorName = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -207,7 +207,7 @@ def test_translatorName(p): @pytest.mark.parametrize("p", projects) def test_extractors(p): finalObjects = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'], @@ -241,7 +241,7 @@ def test_extractors(p): @pytest.mark.parametrize("p", projects) def test_keys(p): objectsByKey = nix_ffi.eval( - f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.translateFinal", + f"framework.translatorsBySubsystem.{p['subsystem']}.{p['translator']}.finalTranslate", params=dict( project=p['project'], source=p['source'],