Fixes #113, Fixes #112

instantiations · May 10, 2022 · 63b2972 · 63b2972
1 parent 2ceb386
commit 63b2972
Show file tree

Hide file tree

Showing 13 changed files with 108 additions and 88 deletions.
diff --git a/source/.configmaps b/source/.configmaps
@@ -1,7 +1,7 @@
 [
 	{
 		#conditions : [ ],
-		#ts : 3826518433,
+		#ts : 3829653476,
 		#comment : '',
 		#formatVersion : '1.1',
 		#applications : OrderedCollection [
@@ -17,18 +17,18 @@
 			},
 			{
 				#name : 'TonelLoaderInteractiveApp',
-				#versionName : 'V 11.0.0  [504]',
-				#ts : 3825333811
+				#versionName : '1.6.0',
+				#ts : 3829651015
 			},
 			{
 				#name : 'TonelLoaderModel',
-				#versionName : '1.5.3',
-				#ts : 3827303214
+				#versionName : '1.6.0',
+				#ts : 3829648988
 			},
 			{
 				#name : 'TonelReaderModel',
-				#versionName : '1.5.1',
-				#ts : 3826106857
+				#versionName : '1.6.0',
+				#ts : 3829651795
 			},
 			{
 				#name : 'TonelTools',
@@ -42,11 +42,11 @@
 			}
 		],
 		#name : 'ENVY/Image Tonel',
-		#versionName : '1.5.3'
+		#versionName : ''
 	},
 	{
 		#conditions : [ ],
-		#ts : 3826518422,
+		#ts : 3827317298,
 		#comment : '',
 		#formatVersion : '1.1',
 		#applications : OrderedCollection [
@@ -72,6 +72,6 @@
 			}
 		],
 		#name : 'Test ENVY/Image Tonel',
-		#versionName : '1.5.3'
+		#versionName : ''
 	}
 ]
diff --git a/source/TonelLoaderInteractiveApp/TonelLoaderInteractivePrereqStrategy.class.st b/source/TonelLoaderInteractiveApp/TonelLoaderInteractivePrereqStrategy.class.st
@@ -20,12 +20,14 @@ TonelLoaderInteractivePrereqStrategy >> prerequisitesFor: tonelApplication curre
 	 Answers:
 		<EmShadowApplication>
 	 "
-
-	^EtPrerequisiteCollectingPrompter 
-		prompt: ('Please select the prequisites for %1 (chains will be resolved after selection)' 
+
+	^EtPrerequisiteCollectingPrompter
+		prompt: (
+			'Please select the prequisites for %1 (chains will be resolved after selection)'
 				bindWith: tonelApplication name)
-		chooseFrom: (self loader systemLoadedApplications 
+		chooseFrom: (
+			self loader systemLoadedApplications
 				reject: [:anApp | tonelApplication allDependentApplications includes: anApp])
 		current: aCollection
-		alwaysRequired: (Set with: Kernel)	"$NLS$ Please select the prequisites for %1 (chains will be resolved after selection)"
+		alwaysRequired: (Set with: Kernel) "$NLS$ Please select the prequisites for %1 (chains will be resolved after selection)"
 ]
diff --git a/source/TonelLoaderModel/TonelLoader.class.st b/source/TonelLoaderModel/TonelLoader.class.st
@@ -64,16 +64,19 @@ TonelLoader class >> settings [
 
 { #category : 'accessing' }
 TonelLoader >> addLoadedApplication: aTonelApplication [
+	"Adds aTonelApplication to the list of loaded applications of receiver.
+	 It also replaces the prerequisites of receiver applications to point to the 
+	 loaded Application instead of aTonelApplication."
 
 	self loadedApplications add: aTonelApplication.
 	self updatePrerequisitesFrom: aTonelApplication
 ]
 
 { #category : 'resolving' }
-TonelLoader >> addPrerequisite: emApplication to: tonelApplication [
+TonelLoader >> addMissingPrerequisite: emApplication to: tonelApplication [
 	"Adds emApplication as a prerequisite of tonelApplication."
 
-	self prerequisitesStrategy addPrerequisite: emApplication to: tonelApplication
+	self prerequisitesStrategy addMissingPrerequisite: emApplication to: tonelApplication
 ]
 
 { #category : 'strategies-convenience' }

diff --git a/source/TonelLoaderModel/TonelLoaderApplication.class.st b/source/TonelLoaderModel/TonelLoaderApplication.class.st
@@ -23,6 +23,22 @@ TonelLoaderApplication >> accountForPoolDictionaryClasses [
 
 ]
 
+{ #category : 'querying' }
+TonelLoaderApplication >> addAllDependentsInto: aCollection [
+	"Adds all the dependent applications of receiver into aCollection,
+	 ignore them if they're already included in that collection.
+	 	 
+	 Answers:
+		<Collection>
+	 "
+
+	self dependentApplications do: [:each |
+		(aCollection includes: each)
+			ifFalse: [
+				aCollection add: each.
+				each addAllDependentsInto: aCollection]]
+]
+
 { #category : 'querying' }
 TonelLoaderApplication >> allDefinedClassNames [
 
@@ -31,25 +47,16 @@ TonelLoaderApplication >> allDefinedClassNames [
 
 { #category : 'querying' }
 TonelLoaderApplication >> allDependentApplications [
-	"Return the complete set of applications which are dependent
-	 on the receiver starting with its direct dependents. Sort them
-	 alphabetically; then add all of their dependents (sorted
-	 alphabetically and so on). No dependent may appear before
-	 one of its prerequisites."
-
-	| result new |
+		"Return the complete set of applications which are dependent
+		 on the receiver starting with its direct dependents. Sort them
+		 alphabetically; then add all of their dependents (sorted
+		 alphabetically and so on). No dependent may appear before
+		 one of its prerequisites."
 
-	result := OrderedCollection new.
-	new := self dependentApplications.
-	[ new isEmpty ] whileFalse: [ | temp |
-		temp := Set new.
-		new do: [ :app |
-			result remove: app ifAbsent: [ ].
-			app dependentApplications do: [ :dep |
-				temp add: dep ] ].
-		result addAll: new. "make them be at the end"
-		new := temp asSortedCollection: Class sortBlock ].
-	^ result
+	| result |
+	result := Set new.
+	self addAllDependentsInto: result.
+	^(result asSortedCollection: Class sortBlock) asOrderedCollection
 ]
 
 { #category : 'accessing' }
@@ -248,7 +255,7 @@ TonelLoaderApplication >> hasSamePrerequisitesAs: anApplication [
 	 NOTE: Comparison is based only on the names of prerequisites."
 
 	^(anApplication prerequisites collect: [:each | each name asSymbol]) asSortedCollection =
-		(self computePrerequisites collect: [:each | each name asSymbol]) asSortedCollection
+		(self prerequisites collect: [:each | each name asSymbol]) asSortedCollection
 ]
 
 { #category : 'testing' }

diff --git a/source/TonelLoaderModel/TonelLoaderApplicationPrereqStrategy.class.st b/source/TonelLoaderModel/TonelLoaderApplicationPrereqStrategy.class.st
@@ -2,16 +2,47 @@ Class {
 	#name : 'TonelLoaderApplicationPrereqStrategy',
 	#superclass : 'TonelLoaderStrategy',
 	#instVars : [
-		'fixesMismatchs'
+		'fixesMismatchs',
+		'addsMissingPrerequisites'
 	],
 	#category : 'TonelLoaderModel'
 }
 
 { #category : 'api' }
-TonelLoaderApplicationPrereqStrategy >> addPrerequisite: emApplication to: tonelApplication [
+TonelLoaderApplicationPrereqStrategy >> addMissingPrerequisite: emApplication to: tonelApplication [
 	"Add emApplication as a prerequisite to tonelApplication."
 
-	tonelApplication addPrerequisite: emApplication
+	self addsMissingPrerequisites ifTrue: [tonelApplication addPrerequisite: emApplication]
+]
+
+{ #category : 'configuring' }
+TonelLoaderApplicationPrereqStrategy >> addsMissingPrerequisites [
+	"Answers whether missing prereqs will be added to a loaded application
+	 if one of the defined classes is a subclass of a class in an application 
+	 not defined as prerequisite, or if it extends a class in an aplication not 
+	 defined as prerequisite."
+
+	^addsMissingPrerequisites ifNil: [addsMissingPrerequisites := self computeAddsMissingPrerequisites]
+]
+
+{ #category : 'configuring' }
+TonelLoaderApplicationPrereqStrategy >> addsMissingPrerequisites: aBoolean [
+	"Sets whether missing prereqs will be added to a loaded application
+	 if one of the defined classes is a subclass of a class in an application 
+	 not defined as prerequisite, or if it extends a class in an aplication not 
+	 defined as prerequisite."
+
+	addsMissingPrerequisites := aBoolean
+]
+
+{ #category : 'initializing',
+  #vaVisibility : 'private' }
+TonelLoaderApplicationPrereqStrategy >> computeAddsMissingPrerequisites [
+		"By default we add all missing prerequisites."
+
+		^true
+
+
 ]
 
 { #category : 'api' }

diff --git a/source/TonelLoaderModel/TonelLoaderApplicationPrereqsTableStrategy.class.st b/source/TonelLoaderModel/TonelLoaderApplicationPrereqsTableStrategy.class.st
@@ -8,7 +8,7 @@ Class {
 }
 
 { #category : 'api' }
-TonelLoaderApplicationPrereqsTableStrategy >> addPrerequisite: emApplication to: tonelApplication [
+TonelLoaderApplicationPrereqsTableStrategy >> addMissingPrerequisite: emApplication to: tonelApplication [
 	"Add emApplication as a prerequisite to tonelApplication.
 	 NOTE: Since we base prerequisites on a table, we only won't add anything that is not in the table."
 

diff --git a/source/TonelLoaderModel/TonelLoaderComputedPrerequisitesStrategy.class.st b/source/TonelLoaderModel/TonelLoaderComputedPrerequisitesStrategy.class.st
@@ -4,6 +4,22 @@ Class {
 	#category : 'TonelLoaderModel'
 }
 
+{ #category : 'initializing',
+  #vaVisibility : 'private' }
+TonelLoaderComputedPrerequisitesStrategy >> computeAddsMissingPrerequisites [
+	"Determine whether we add missing prerequisites based on whether there was 
+	 prerequisite metadata in the package definition of the loader applications.
+	 
+	 NOTE: This is so because if there is package prerequisite metadata it 
+	 likely means the code was exported from VAST, and already defines what are
+	 the prerequisites. If it doesn't have any metadata, it's likely that the packages 
+	 come from another dialect, and we need to to compute the missing prerequisites."
+
+	^self loader applications noneSatisfy: [:each | each packageDefinition hasPrerequisitesMetadata]
+
+
+]
+
 { #category : 'lookup' }
 TonelLoaderComputedPrerequisitesStrategy >> concretePrerequisitesOf: aTonelApplication [
 	"Answer the immediate prerequisite application of aTonelApplication."

diff --git a/source/TonelLoaderModel/TonelLoaderSubApplication.class.st b/source/TonelLoaderModel/TonelLoaderSubApplication.class.st
@@ -162,7 +162,7 @@ TonelLoaderSubApplication >> checkClassExtensionsExcepting: classNames [
 				ifNil: [ 
 					self error: (TonelMsg03 bindWith: self name with: extClass name) ] 
 				ifNotNil: [ :rootClass |
-					self loader addPrerequisite: rootClass controller rootApplication to: self] ] ].
+					self loader addMissingPrerequisite: rootClass controller rootApplication to: self] ] ].
 ]
 
 { #category : 'loading' }
@@ -175,7 +175,7 @@ TonelLoaderSubApplication >> checkSuperclassesExcepting: classDefinitions [
 			  emRootApp |
 			emRootApp := rootClass controller rootApplication.
 			emRootApp ~= (Smalltalk classAt: self rootTonelApplication name asSymbol)
-				ifTrue: [self loader addPrerequisite: emRootApp to: self]]].
+				ifTrue: [self loader addMissingPrerequisite: emRootApp to: self]]].
 
 	self subApplications
 		do: [:tonelSubApp | tonelSubApp checkSuperclassesExcepting: classDefinitions]

diff --git a/source/TonelReaderModel/TonelReaderPackageDefinition.class.st b/source/TonelReaderModel/TonelReaderPackageDefinition.class.st
@@ -78,6 +78,13 @@ TonelReaderPackageDefinition >> extensions [
 	^extensions ifNil: [extensions := Dictionary new]
 ]
 
+{ #category : 'testing' }
+TonelReaderPackageDefinition >> hasPrerequisitesMetadata [
+	"Answers whether receiver has metadata describing the app prerequisites."
+
+	^self metadata includesKey: #vaPrerequisites
+]
+
 { #category : 'initializing',
   #vaVisibility : 'private' }
 TonelReaderPackageDefinition >> initializeFromMetadata: aDictionary [

diff --git a/source/TonelSystemExtensions/Collection.extension.st b/source/TonelSystemExtensions/Collection.extension.st
diff --git a/source/TonelSystemExtensions/SequenceableCollection.extension.st b/source/TonelSystemExtensions/SequenceableCollection.extension.st
diff --git a/source/TonelSystemExtensions/TonelSystemExtensions.class.st b/source/TonelSystemExtensions/TonelSystemExtensions.class.st
diff --git a/source/TonelSystemExtensions/package.st b/source/TonelSystemExtensions/package.st