feat: code to enable dsl1 in 23.10.0

.gitignore

@@ -39,3 +39,4 @@ temp
 plugins-prod
 sandbox
 wave-tests
+.DS_Store

modules/nextflow/src/main/groovy/nextflow/NextflowMeta.groovy

@@ -45,9 +45,10 @@ class NextflowMeta {
  boolean recursion
 
  void setDsl( float num ) {
- if( num == 1 )
- throw new IllegalArgumentException(DSL1_EOL_MESSAGE)
- if( num != 2 )
+// if( num == 1 )
+// throw new IllegalArgumentException(DSL1_EOL_MESSAGE)
+// if( num != 2 )
+ if( num != 2 && num != 1 )
  throw new IllegalArgumentException("Not a valid DSL version number: $num")
  if( num == 2 && !ignoreWarnDsl2 )
  log.warn1 "DSL 2 PREVIEW MODE IS DEPRECATED - USE THE STABLE VERSION INSTEAD. Read more at https://www.nextflow.io/docs/latest/dsl2.html#dsl2-migration-notes"
@@ -148,9 +149,10 @@ class NextflowMeta {
  }
 
  void enableDsl(String value) {
- if( value == '1' )
- throw new AbortOperationException(DSL1_EOL_MESSAGE)
- if( value != '2' ) {
+// if( value == '1' )
+// throw new AbortOperationException(DSL1_EOL_MESSAGE)
+// if( value != '2' ) {
+ if( value !in ['1','2'] ) {
  throw new AbortOperationException("Invalid Nextflow DSL value: $value")
  }
  this.enable.dsl = value=='1' ? 1f : 2f

modules/nextflow/src/main/groovy/nextflow/script/BaseScript.groovy

@@ -16,6 +16,9 @@
 
 package nextflow.script
 
+import groovy.transform.PackageScope
+import nextflow.processor.TaskProcessor
+
 import java.lang.reflect.InvocationTargetException
 import java.nio.file.Paths
 
@@ -32,6 +35,8 @@ import nextflow.exception.AbortOperationException
 @Slf4j
 abstract class BaseScript extends Script implements ExecutionContext {
 
+ private TaskProcessor taskProcessor
+
  private Session session
 
  private ProcessFactory processFactory
@@ -56,13 +61,22 @@ abstract class BaseScript extends Script implements ExecutionContext {
  (ScriptBinding)super.getBinding()
  }
 
+ /**
+ * Access to the last *process* object -- only for testing purpose
+ */
+ @PackageScope
+ TaskProcessor getTaskProcessor() { taskProcessor }
+
  /**
  * Holds the configuration object which will used to execution the user tasks
  */
  @Deprecated
  protected Map getConfig() {
  final msg = "The access of `config` object is deprecated"
- throw new DeprecationException(msg)
+ if( NF.dsl2 )
+ throw new DeprecationException(msg)
+ log.warn(msg)
+ session.getConfig()
  }
 
  /**
@@ -95,7 +109,9 @@ abstract class BaseScript extends Script implements ExecutionContext {
  meta.addDefinition(process)
  }
  else {
- throw new UnsupportedOperationException("DSL1 is not supported anymore")
+ // legacy process definition an execution
+ taskProcessor = processFactory.createProcessor(name, body)
+ taskProcessor.run()
  }
  }
 
@@ -106,6 +122,8 @@ abstract class BaseScript extends Script implements ExecutionContext {
  * @return The result of workflow execution
  */
  protected workflow(Closure<BodyDef> workflowBody) {
+ if(!NF.isDsl2())
+ throw new IllegalStateException("Module feature not enabled -- Set `nextflow.enable.dsl=2` to allow the definition of workflow components")
  // launch the execution
  final workflow = new WorkflowDef(this, workflowBody)
  // capture the main (unnamed) workflow definition
@@ -120,6 +138,8 @@ abstract class BaseScript extends Script implements ExecutionContext {
  }
 
  protected IncludeDef include( IncludeDef include ) {
+ if(!NF.isDsl2())
+ throw new IllegalStateException("Module feature not enabled -- Set `nextflow.enable.dsl=2` to import module files")
  if(ExecutionStack.withinWorkflow())
  throw new IllegalStateException("Include statement is not allowed within a workflow definition")
  include .setSession(session)
@@ -137,10 +157,20 @@ abstract class BaseScript extends Script implements ExecutionContext {
  */
  @Override
  Object invokeMethod(String name, Object args) {
- binding.invokeMethod(name, args)
+ if(NF.isDsl2())
+ binding.invokeMethod(name, args)
+ else
+ super.invokeMethod(name, args)
+ }
+
+ private runDsl1() {
+ session.notifyBeforeWorkflowExecution()
+ final ret = runScript()
+ session.notifyAfterWorkflowExecution()
+ return ret
  }
 
- private run0() {
+ private runDsl2() {
  final result = runScript()
  if( meta.isModule() ) {
  return result
@@ -189,7 +219,8 @@ abstract class BaseScript extends Script implements ExecutionContext {
  setup()
  ExecutionStack.push(this)
  try {
- run0()
+// run0()
+ NF.dsl2 ? runDsl2() : runDsl1()
  }
  catch( InvocationTargetException e ) {
  // provide the exception cause which is more informative than InvocationTargetException