squared 0.7.2 → 0.7.4

data/lib/squared/workspace/project/node.rb

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
+          common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
           install_a: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
                         package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
@@ -72,16 +72,14 @@ module Squared
         }.freeze
         OPT_TSC = {
           base: %w[all b|build init listFilesOnly locale=b p|project=p showConfig w|watch].freeze,
-          compiler: %w[allowArbitraryExtensions=!? allowImportingTsExtensions=!? allowJs=!?
-                       allowSyntheticDefaultImports=!? allowUmdGlobalAccess=!? allowUnreachableCode=!?
-                       allowUnusedLabels=!? alwaysStrict=!? assumeChangesOnlyAffectDirectDependencies=!? baseUrl=p
+          compiler: %w[allowArbitraryExtensions=!? allowImportingTsExtensions=!? allowJs=!? allowUmdGlobalAccess=!?
+                       allowUnreachableCode=!? allowUnusedLabels=!? assumeChangesOnlyAffectDirectDependencies=!?
                        charset=b checkJs=!? composite=!? customConditions=q d|declaration=!? declarationDir=p
                        declarationMap=!? diagnostics=!? disableReferencedProjectLoad=!? disableSizeLimit=!?
-                       disableSolutionSearching=!? downlevelIteration=!? emitBOM=!? emitDeclarationOnly=!?
-                       emitDecoratorMetadata=!? erasableSyntaxOnly=!? esModuleInterop=!? exactOptionalPropertyTypes=!?
-                       experimentalDecorators=!? explainFiles=!? extendedDiagnostics=!?
-                       forceConsistentCasingInFileNames=!? generateCpuProfile=b importHelpers=!?
-                       importsNotUsedAsValues=b incremental=!? inlineSourceMap=!? inlineSources=!?
+                       disableSolutionSearching=!? emitBOM=!? emitDeclarationOnly=!? emitDecoratorMetadata=!?
+                       erasableSyntaxOnly=!? exactOptionalPropertyTypes=!? experimentalDecorators=!? explainFiles=!?
+                       extendedDiagnostics=!? forceConsistentCasingInFileNames=!? generateCpuProfile=b ignoreConfig=!?
+                       importHelpers=!? importsNotUsedAsValues=b incremental=!? inlineSourceMap=!? inlineSources=!?
                        isolatedDeclarations=!? isolatedModules=!? jsx=b jsxFactory=q jsxFragmentFactory=q
                        jsxImportSource=q keyofStringsOnly=!? lib=q libReplacement=!? listEmittedFiles=!? listFiles=!?
                        mapRoot=p maxNodeModuleJsDepth=i m|module=b moduleDetection=b moduleResolution=b moduleSuffixes=b
@@ -89,18 +87,22 @@ module Squared
                        noFallthroughCasesInSwitch=!? noImplicitAny=!? noImplicitOverride=!? noImplicitReturns=!?
                        noImplicitThis=!? noImplicitUseStrict=!? noLib=!? noPropertyAccessFromIndexSignature=!?
                        noResolve=!? noStrictGenericChecks=!? noUncheckedIndexedAccess=!? noUncheckedSideEffectImports=!?
-                       noUnusedLocals=!? noUnusedParameters=!? outDir=p outFile=p paths=q plugins=b
-                       preserveConstEnums=!? preserveSymlinks=!? preserveValueImports=!? preserveWatchOutput=!?
-                       pretty=!? reactNamespace=b removeComments=!? resolveJsonModule=!? resolvePackageJsonExports=!?
-                       resolvePackageJsonImports=!? rewriteRelativeImportExtensions=!? rootDir=p rootDirs=p
-                       skipDefaultLibCheck=!? skipLibCheck=!? sourceMap=!? sourceRoot=p stopBuildOnErrors=!? strict=!?
+                       noUnusedLocals=!? noUnusedParameters=!? outDir=p paths=q plugins=b preserveConstEnums=!?
+                       preserveSymlinks=!? preserveValueImports=!? preserveWatchOutput=!? pretty=!? reactNamespace=b
+                       removeComments=!? resolveJsonModule=!? resolvePackageJsonExports=!? resolvePackageJsonImports=!?
+                       rewriteRelativeImportExtensions=!? rootDir=p rootDirs=p skipDefaultLibCheck=!? skipLibCheck=!?
+                       sourceMap=!? sourceRoot=p stableTypeOrdering=!? stopBuildOnErrors=!? strict=!?
                        strictBindCallApply=!? strictBuiltinIteratorReturn=!? strictFunctionTypes=!? strictNullChecks=!?
                        strictPropertyInitialization=!? stripInternal=!? suppressExcessPropertyErrors=!?
                        suppressImplicitAnyIndexErrors=!? t|target=b traceResolution=!? tsBuildInfoFile=p typeRoots=p
                        types=b useDefineForClassFields=!? useUnknownInCatchVariables=!? verbatimModuleSyntax=!?].freeze,
           build: %w[clean=!? dry=!? force=!? v|verbose=!?].freeze,
           watch: %w[excludeDirectories=p excludeFiles=p fallbackPolling=b synchronousWatchDirectory=!? watchDirectory=b
-                    watchFile=b].freeze
+                    watchFile=b].freeze,
+          v5: {
+            compiler: %w[allowSyntheticDefaultImports=!? alwaysStrict=!? baseUrl=p downlevelIteration=!?
+                         esModuleInterop=!? outFile=p].freeze
+          }.freeze
         }.freeze
         PASS_NODE = {
           tsc: %w[excludeDirectories excludeFiles customConditions lib moduleSuffixes plugins rootDirs typeRoots
@@ -552,31 +554,36 @@ module Squared
             end
             yarn = dependtype(:yarn)
             if yarn > 0
-              cmd = session('yarn', flag || 'install')
-              append_loglevel
-              if yarn == 1
-                cmd << '--ignore-engines' if option('ignore-engines')
-                cmd << '--ignore-scripts' if option('ignore-scripts')
-                cmd << '--force' if option('force')
+              if !flag && yarn > 1 && prod?
+                cmd = session 'yarn', 'workspaces focus --all --production'
               else
-                cmd << '--mode=skip-build' if option('ignore-scripts')
-                cmd << '--check-cache' if !flag && option('force')
-              end
-              if nolockfile?('yarn')
-                cmd << '--no-lockfile'
-              elsif option('ci')
+                cmd = session('yarn', flag || 'install')
                 if yarn == 1
-                  cmd << '--frozen-lockfile'
-                elsif !flag
-                  cmd << '--immutable' << '--refresh-lockfile'
+                  cmd << '--production' if prod?
+                  cmd << '--ignore-engines' if option('ignore-engines')
+                  cmd << '--ignore-scripts' if option('ignore-scripts')
+                  cmd << '--force' if option('force')
+                else
+                  cmd << '--mode=skip-build' if option('ignore-scripts')
+                  cmd << '--check-cache' if !flag && option('force')
+                end
+                if nolockfile?('yarn')
+                  cmd << '--no-lockfile'
+                elsif option('ci')
+                  if yarn == 1
+                    cmd << '--frozen-lockfile'
+                  elsif !flag
+                    cmd << '--immutable' << '--refresh-lockfile'
+                  end
+                end
+                if add
+                  cmd << '-W' if yarn == 1 && option('w', 'ignore-workspace-root-check', notequals: '0')
+                  rm.call(cmd)
+                  om.call(cmd)
+                  cmd << '--exact' if exact
                 end
               end
-              if add
-                cmd << '-W' if yarn == 1 && option('w', 'ignore-workspace-root-check', notequals: '0')
-                rm.call(cmd)
-                om.call(cmd)
-                cmd << '--exact' if exact
-              end
+              append_loglevel
             elsif pnpm?
               cmd = session('pnpm', flag || 'install')
               append_nocolor
@@ -587,6 +594,7 @@ module Squared
                 cmd << '--save-exact' if exact
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
+                cmd << '--prod' if prod?
                 append_platform
               end
               option('public-hoist-pattern') do |val|
@@ -611,6 +619,8 @@ module Squared
               if omit
                 cmd << "--omit=#{save || omit}"
                 save = nil
+              elsif !add && prod?
+                cmd << '--include=prod'
               end
               unless ci
                 if add
@@ -634,7 +644,7 @@ module Squared
         end
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
-          cmd = session(pnpm? ? 'pnpm' : 'npm', 'outdated')
+          cmd = session(pnpm? && exist?('pnpm-lock.yaml') ? 'pnpm' : 'npm', 'outdated')
           dryrun = has_value?(opts, 'd', 'dry-run') || dryrun?
           unless dryrun
             log.info cmd.to_s
@@ -1109,6 +1119,7 @@ module Squared
           b = kwargs[:build]
           w = kwargs[:watch]
           list = OPT_TSC[:base] + OPT_TSC[:compiler]
+          list.concat(Array(kwargs.fetch(:legacy, 5)).flat_map { |n| OPT_TSC.fetch(:"v#{n}", {}).fetch(:compiler, []) })
           cmd = session 'tsc', if p
                                  quote_option 'p', basepath(p)
                                elsif b

data/lib/squared/workspace/project/python.rb

@@ -12,8 +12,8 @@ module Squared
                     installer=b o|outdir=p].freeze,
           venv: %w[clear copies symlinks system-site-packages upgrade upgrade-deps without-scm-ignore-files without-pip
                    prompt=q].freeze,
-          virtualenv: %w[always-copy clear copies download q|quiet never-download no-download no-periodic-update no-pip
-                         no-seed no-setuptools no-vcs-ignore read-only-app-data reset-app-data symlink-app-data symlinks
+          virtualenv: %w[always-copy clear copies download never-download no-download no-periodic-update no-pip no-seed
+                         no-setuptools no-vcs-ignore q|quiet read-only-app-data reset-app-data symlink-app-data symlinks
                          system-site-packages with-traceback without-pip upgrade-embed-wheels v|verbose=+ activators=q
                          app-data=p creator=b discovery=b extra-search-dir=p pip=b prompt=q p|python=q seeder=b
                          setuptools=b try-first-with=q].freeze
@@ -34,14 +34,16 @@ module Squared
           install: %w[break-system-packages compile dry-run force-reinstall I|ignore-installed no-compile
                       no-warn-conflicts no-warn-script-location U|upgrade user prefix=p report=p root=p
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
-          install_a: %w[ignore-requires-python no-index pre extra-index-url=q f|find-links=q i|index-url=q no-binary=q
-                        only-binary=q].freeze,
-          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps prefer-binary
-                        require-hashes use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p src=p].freeze,
+          install_a: %w[no-index pre prefer-binary all-releases=b extra-index-url=q f|find-links=q i|index-url=q
+                        no-binary=q only-binary=q only-final=b].freeze,
+          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps require-hashes
+                        use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p requirements-from-script=p
+                        src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
+          install_d: %w[ignore-requires-python uploaded-prior-to=q].freeze,
           hash: %w[a|algorithm].freeze,
-          list: %w[e|editable exclude-editable include-editable l|local no-index not-required o|outdated pre u|uptodate
-                   user exclude=b extra-index-url=q format=b f|find-links=q i|index-url=q path=p].freeze,
+          list: %w[e|editable exclude-editable include-editable l|local not-required o|outdated u|uptodate user
+                   exclude=b format=b path=p].freeze,
           lock: %w[o|output=p].freeze,
           show: %w[f|files].freeze,
           uninstall: %w[break-system-packages y|yes r|requirement=p root-user-action=b].freeze,
@@ -91,7 +93,7 @@ module Squared
             debug: %w[platform].freeze,
             install: %w[C config-settings c constraint extra-index-url no-binary only-binary platform
                         r requirement].freeze,
-            list: %w[exclude extra-index-url].freeze
+            list: %w[exclude extra-index-url no-binary only-binary].freeze
           }.freeze
         }.freeze
         private_constant :DEP_PYTHON, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_PDM, :OPT_HATCH, :OPT_TWINE,
@@ -117,7 +119,8 @@ module Squared
           end
         end
 
-        attr_reader :venv, :editable
+        attr_reader :venv
+        attr_accessor :editable
 
         def initialize(*, editable: '.', asdf: 'python', **kwargs)
           super
@@ -128,7 +131,7 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          dependfile_set DEP_PYTHON
+          dependfile_set(DEP_PYTHON, default: 2)
           serve_set kwargs[:serve]
           editable_set editable
           venv_set kwargs[:venv]
@@ -137,10 +140,10 @@ module Squared
         subtasks({
           'venv' => %i[exec create remove show].freeze,
           'pip' => %i[upgrade uninstall wheel reinstall freeze].freeze,
-          'install' => %i[requirement target upgrade editable poetry].freeze,
+          'install' => %i[upgrade requirement target editable user poetry].freeze,
           'outdated' => %i[major minor patch].freeze,
           'build' => %i[poetry pdm hatch meson python].freeze,
-          'publish' => %i[poetry pdm hatch twine].freeze,
+          'publish' => %i[twine poetry pdm hatch].freeze,
           'run' => nil,
           'exec' => nil
         })
@@ -348,8 +351,12 @@ module Squared
                           depend(flag, args.extras, target: path)
                         end
                       else
-                        next if flag == :poetry && !poetry?
-
+                        case flag
+                        when :user
+                          next if venv
+                        when :poetry
+                          next unless poetry?
+                        end
                         task flag do |_, args|
                           install flag, args.to_a
                         end
@@ -374,8 +381,11 @@ module Squared
                       end
                       break if be
                     when 'publish'
-                      next if (be = backend?(flag)) == false
-
+                      if flag == :twine
+                        next unless twine?
+                      elsif (be = backend?(flag)) == false
+                        next
+                      end
                       format_desc(action, flag, 'test?,opts*', after: case flag
                                                                       when :hatch then 'artifacts?'
                                                                       when :twine then 'dist?'
@@ -588,10 +598,10 @@ module Squared
           when :editable
             op << quote_option('e', op.pop || editable || '.')
             op.clear
-          when :upgrade
+          when :user, :upgrade
             op.concat(packages)
             raise_error 'no packages listed', hint: flag if op.empty?
-            op << '--upgrade'
+            op << "--#{flag}"
             op.append
             python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
           end
@@ -987,7 +997,7 @@ module Squared
 
               if found
                 line.chomp!($1) if line =~ /(?<=[\d"'{}\[\]]|true|false)(\s*#.*)$/
-                break if line.match?(/^\s*\[(?:[\w.\-" ]+|".+"|'.+')\]\s*$/)
+                break if line.match?(/^\s*\[(?:[\w.\-"' ]+|".+"|'.+')\]\s*$/)
 
                 if ch
                   val = line.rstrip
@@ -1075,6 +1085,7 @@ module Squared
           if pip_install?(flag)
             ret.concat(OPT_PIP[:install_a])
             ret.concat(OPT_PIP[:install_b]) unless flag == :index
+            ret.concat(OPT_PIP[:install_d])
             case flag
             when :install
               ret.concat(OPT_PIP[:install_c] + OPT_PIP[:debug])
@@ -1083,6 +1094,8 @@ module Squared
             when :download, :index
               ret.concat(OPT_PIP[:debug])
             end
+          elsif flag == :list
+            ret.concat(OPT_PIP[:install_a])
           end
           ret
         end
@@ -1170,9 +1183,17 @@ module Squared
           if poetry?
             requires = read_pyproject 'tool.poetry', 'requires-poetry'
             args << "poetry#{requires}"
+          elsif setuptools? && !virtualenv?
+            args << 'setuptools' << 'wheel'
           end
           pip(:install, *args, banner: false) unless args.empty?
-          success?(ret, banner, !status) { |ret| puts(ret && dir.directory? ? "Success: #{dir}" : 'Failed') }
+          success?(ret, banner, !status) { |out| puts(out && dir.directory? ? "Success: #{dir}" : 'Failed') }
+        end
+
+        def venv_package?(val)
+          return false unless venv
+
+          !Dir.glob("lib/**/site-packages/#{val}", base: venv).empty?
         end
 
         def pip_install?(flag)
@@ -1206,6 +1227,10 @@ module Squared
           dependtype == 1
         end
 
+        def twine?
+          venv_package?('twine')
+        end
+
         def virtualenv?
           @virtualenv ||= exist?('virtualenv.ini') || !ENV['VIRTUALENV_PYTHON'].nil?
         end