squared 0.7.3 → 0.7.5

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

@@ -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
@@ -240,7 +242,7 @@ module Squared
                              else
                                npmopts :run
                              end
-                      OptionPartition.new(opts, list, session(dependbin, 'run'), project: self)
+                      OptionPartition.new(opts, list, session(dependbin, 'run'), project: self, strict: strict?)
                                      .add_first
                                      .append(delim: true, quote: false)
                       run(from: :run)
@@ -259,7 +261,7 @@ module Squared
                               list = npmopts :exec
                               session 'npm', 'exec'
                             end
-                      op = OptionPartition.new(args, list, cmd, project: self)
+                      op = OptionPartition.new(args, list, cmd, project: self, strict: strict?)
                       if op.empty?
                         op << package
                         if (args = readline('Enter arguments', force: false))
@@ -530,6 +532,7 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
+            ci = option('ci')
             om = lambda do |cmd|
               if omit
                 save = case save
@@ -567,7 +570,7 @@ module Squared
                 end
                 if nolockfile?('yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci')
+                elsif ci
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -603,15 +606,15 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif option('ci')
+                     elsif ci
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session 'npm'
-              cmd << (ci = option('ci') ? 'ci' : 'install')
+              cmd = session('npm', ci ? 'ci' : 'install')
               cmd << '--workspaces=false' if ws
+              cmd << '--force' if option('force')
               append_nocolor
               append_loglevel
               if omit
@@ -956,7 +959,7 @@ module Squared
                                                                          when :add, :update then OPT_BERRY[:add_a]
                                                                          else []
                                                                          end
-                                           end, cmd, project: self)
+                                           end, cmd, project: self, strict: strict?)
             if yarn == 1 && flag != :reinstall
               op << '--no-lockfile' if nolockfile?('yarn')
               op << '--ignore-engines' if option('ignore-engines')
@@ -1025,7 +1028,7 @@ module Squared
                        session('npm', flag)
                      ]
                    end
-            op = OptionPartition.new(*args, no: no, project: self)
+            op = OptionPartition.new(*args, no: no, project: self, strict: strict?)
             append_platform if flag == :install
             append_nocolor
           end
@@ -1045,7 +1048,8 @@ module Squared
               end
             end
             op.swap.concat(packages)
-            raise_error ArgumentError, 'no packages to add' if op.empty? && spec == 1
+            raise ArgumentError, 'no packages to add' if op.empty? && spec == 1
+
             op.append(quote: true)
               .clear(errors: true)
           else
@@ -1090,10 +1094,11 @@ module Squared
 
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
-            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
+            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self, strict: strict?)
             op.append?('out', Pathname.pwd + "#{project}-#{version}.tgz")
           else
-            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : npmopts(:pack), cmd, project: self)
+            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : npmopts(:pack), cmd, project: self,
+                                                                                          strict: strict?)
             unless pnpm?
               op.each do |opt|
                 next unless opt =~ op.values
@@ -1117,6 +1122,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
@@ -1127,7 +1133,7 @@ module Squared
             list.concat(OPT_TSC[:watch])
             cmd << '-w'
           end
-          op = OptionPartition.new(args, list, cmd, project: self, sep: ' ')
+          op = OptionPartition.new(args, list, cmd, project: self, strict: strict?, sep: ' ')
           unless p
             if b.is_a?(String)
               op.add_path(b)

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

@@ -131,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]
@@ -216,7 +216,8 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise_error "script: #{val}" if exception
+                              raise "script: #{val}" if exception
+
                               found |= 2
                               log.warn "run script \"#{val}\"".subhint('not indexed')
                             end
@@ -232,7 +233,7 @@ module Squared
                                      subject: name, hint: pyprojectfile)
                   end
                 when 'exec'
-                  format_desc action, nil, ':|command,args*'
+                  format_desc action, nil, 'command|:,args*'
                   task action do |_, args|
                     args = args.to_a
                     cmd = if (i = args.delete(':')) && !workspace.windows?
@@ -243,7 +244,7 @@ module Squared
                             command_args(args, min: 1, prefix: 'python')
                             args.join(' ')
                           end
-                    shell(cmd, name: :exec, chdir: path)
+                    run(cmd, send: :exec, banner: false)
                   end
                 end
               else
@@ -296,11 +297,24 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/uninstall,opts*"
                         task flag do |_, args|
-                          next unless (file = pip(flag, opts: args.to_a, banner: true)) && !silent?
-
-                          puts File.read(file)
+                          opts = args.to_a
+                          if has_value!(opts, 'u', 'uninstall')
+                            unless venv
+                              print_error('no venv detected', subject: name)
+                              exit 1
+                            end
+                            require 'tempfile'
+                            temp = Tempfile.new("#{name}-")
+                            temp.close
+                            requirement = Pathname.new(temp)
+                          end
+                          file = pip(flag, opts: opts, banner: requirement.nil?, requirement: requirement)
+                          puts File.read(file) unless silent?
+                          if requirement && confirm_basic('Uninstall?', file)
+                            pip(:uninstall, opts: ['y', "r=#{shell_quote(file)}"])
+                          end
                         end
                       when :uninstall
                         format_desc action, flag, 'package+,opts*'
@@ -590,7 +604,7 @@ module Squared
         def install(flag, opts = [], packages: [], banner: !silent?)
           if flag == :poetry
             OptionPartition.new(opts, OPT_POETRY[:install] + OPT_POETRY[:common], poetry_session('install'),
-                                project: self, single: singleopt(flag))
+                                project: self, strict: strict?, single: singleopt(flag))
           else
             op = append_pip(flag, opts, pipopts(:install), target: pip_session('install'))
           end
@@ -626,7 +640,7 @@ module Squared
                    cmd, opts = python_session('-m build', opts: opts)
                    OPT_PYTHON[:build]
                  end
-          op = OptionPartition.new(opts, list, cmd, project: self, single: singleopt(flag))
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, single: singleopt(flag))
           case flag
           when :hatch
             op.add_path(outdir) if !ENV['HATCH_BUILD_LOCATION'] && (outdir ||= op.shift)
@@ -662,7 +676,9 @@ module Squared
           from = symjoin flag, 'build'
           if flag == :meson
             cmd = session_output 'meson', 'compile', quote_option('C', basepath(outdir))
-            OptionPartition.new(op.extras, OPT_MESON[:compile], cmd, project: self).append unless op.empty?
+            unless op.empty?
+              OptionPartition.new(op.extras, OPT_MESON[:compile], cmd, project: self, strict: strict?).append
+            end
             run_s(op, cmd.done, from: from)
           else
             op.clear
@@ -685,7 +701,7 @@ module Squared
                    session 'twine', 'upload'
                    OPT_TWINE[:publish]
                  end
-          op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
+          op = OptionPartition.new(opts, list, @session, project: self, strict: strict?, single: singleopt(flag))
           dist = lambda do
             dir = basepath 'dist'
             return dir if dir.directory? && !dir.empty?
@@ -720,8 +736,8 @@ module Squared
         def python(*args, sync: true, banner: verbose?, with: nil, pass: PASS_PYTHON[:python], **kwargs)
           op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_PYTHON[:common],
                                    session('python', path: !venv?),
-                                   project: self, multiple: [/^-c/], single: singleopt(:python), args: true,
-                                   stdin: true)
+                                   project: self, strict: strict?, multiple: [/^-c/], single: singleopt(:python),
+                                   args: true, stdin: true)
           op.concat(args)
           if op.include?('-')
             op.exist?(add: true)
@@ -769,7 +785,12 @@ module Squared
           when :freeze
             venv_init
             op << '>'
-            op.add_quote(ret = basepath(op.detect { |val| op.exist?(val) } || DEP_PYTHON[4]))
+            ret = kwargs[:requirement] || begin
+              file = op.detect { |val| op.exist?(val) }
+              op.remove(file) if file
+              basepath(file || DEP_PYTHON[4])
+            end
+            op.add_quote(ret)
               .clear
           when :cache
             op.concat(args)
@@ -852,7 +873,7 @@ module Squared
           when :editable
             editable_set args.first
           when :venv
-            @venv = args.empty? || args.first.nil? ? nil : basepath(*args)
+            @venv = (basepath(*args) unless args.empty? || args.first.nil?)
           else
             super
           end
@@ -867,7 +888,7 @@ module Squared
         end
 
         def venv?
-          !venv.nil?
+          !venv.nil? && venv.directory? && !venv.empty?
         end
 
         def serve?
@@ -877,11 +898,18 @@ module Squared
         private
 
         def pip_session(*cmd)
-          session('pip', *cmd, *preopts, path: !venv?)
+          main = venv?
+          ret = session('pip', *cmd, *preopts, main: main, path: false)
+          return ret if main
+
+          python_session '-m', ret.to_s
         end
 
         def pip_output(*cmd)
-          session_output('pip', *cmd, *preopts, path: !venv?)
+          ret = session_output('pip', *cmd, path: false)
+          return ret if venv?
+
+          session_output 'python', '-m', ret.to_s
         end
 
         def python_session(*cmd, opts: nil)
@@ -910,12 +938,12 @@ module Squared
           pre = preopts(quiet: quiet)
           return session(name, *pre, *cmd, path: !venv?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, single: singleopt(name.to_sym))
+          op = OptionPartition.new(opts, common, project: self, strict: strict?, single: singleopt(name.to_sym))
           [session(name, *pre, *op.to_a, *cmd, path: !venv?), op.extras]
         end
 
         def append_pip(flag, opts, list, target: @session)
-          op = OptionPartition.new(opts, list, target, project: self, single: singleopt)
+          op = OptionPartition.new(opts, list, target, project: self, strict: strict?, single: singleopt)
           append_global(target: target)
           case flag
           when :install, :lock, :wheel, :editable, :upgrade
@@ -1172,7 +1200,7 @@ module Squared
                    :venv
                  end
           cmd, opts = python_session('-m', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_PYTHON[flag], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_PYTHON[flag], cmd, project: self, strict: strict?)
           op.append(dir, delim: true)
             .clear(pass: false)
           status ||= op.arg?(/\A-v+\z/)