@webhandle/external-resource-manager 1.0.2 → 1.0.4

package/external-resource-manager.mjs

@@ -39,6 +39,11 @@ export default class ExternalResourceManager {
 	 * of the URLs we've already rendered here.
 	 */
 	alreadyRenderedUrls = new Set()
+	
+	/**
+	 * To make sure we don't provide a resource twice, track which ones we've already provided.
+	 */
+	alreadyProvidedNames = new Set()
 
 	constructor(options) {
 		Object.assign(this, options)
@@ -53,6 +58,26 @@ export default class ExternalResourceManager {
 		}
 	}
 	
+	expandURLList(resource) {
+		let urls
+		if(typeof resource.url === 'string') {
+			urls = resource.url.split('\n').map(line => line.trim()).filter(line => !!line)
+		}
+		else if(Array.isArray(resource.url)) {
+			urls = resource.url
+		}
+		
+		if(!urls) {
+			return [resource]
+		}
+		if(urls.length === 1) {
+			return [resource]
+		}
+		
+		
+
+	}
+	
 	includeResource(resource) {
 		if(!resource) {
 			return
@@ -60,24 +85,27 @@ export default class ExternalResourceManager {
 		if(typeof resource === 'object' && resource instanceof Resource === false) {
 			resource = new Resource(resource)
 		}
-		this._noteSatisfies(resource)
-		if(this.alreadySatisfied.has(resource.url)) {
-			// We've already got a resource which satisfies this url
-			this.differentlySatisfiedResource.push(resource)
-			return
-		}
-		if(resource.satisfies && Array.isArray(resource.satisfies)) {
-			// We're going to remove any previously included resource which is satisfied
-			// by this resource
-			for(let included of this.includedResources) {
-				if(resource.satisfies.includes(included.url)) {
-					this.includedResources.delete(included)
-					this.differentlySatisfiedResource.push(resource)
+		let resources = this.expandURLList(resource)
+		for(let resource of resources) {
+			this._noteSatisfies(resource)
+			if(this.alreadySatisfied.has(resource.url)) {
+				// We've already got a resource which satisfies this url
+				this.differentlySatisfiedResource.push(resource)
+				return
+			}
+			if(resource.satisfies && Array.isArray(resource.satisfies)) {
+				// We're going to remove any previously included resource which is satisfied
+				// by this resource
+				for(let included of this.includedResources) {
+					if(resource.satisfies.includes(included.url)) {
+						this.includedResources.delete(included)
+						this.differentlySatisfiedResource.push(resource)
+					}
 				}
+				this._noteSatisfies(resource)
 			}
-			this._noteSatisfies(resource)
+			this.includedResources.add(resource)
 		}
-		this.includedResources.add(resource)
 	}
 	
 	provideResource(resource) {

package/importmap-generator-creator.mjs

@@ -9,8 +9,13 @@ export default function createImportmapGenerator(webhandle) {
 			if(resource.rendered) {
 				continue
 			}
-			found = true
 			
+			if(manager.alreadyProvidedNames.has('module:' + resource.name)) {
+				resource.rendered = true
+				continue
+			}
+
+			found = true
 			if(resource.data && !resource.url) {
 				let content = `export default ${JSON.stringify(resource.data)}`
 				let url = `data:text/javascript,${content}`
@@ -28,6 +33,7 @@ export default function createImportmapGenerator(webhandle) {
 			}
 			if (resource.mimeType === 'application/javascript' && resource.resourceType === 'module') {
 				imports[resource.name] = vrsc + resource.url
+				manager.alreadyProvidedNames.add('module:' + resource.name)
 			}
 		}
 

package/initialize-webhandle-component.mjs

@@ -16,6 +16,7 @@ initializeWebhandleComponent.templatePaths = ['views']
 
 initializeWebhandleComponent.setup = async function (webhandle, config) {
 	let compmanager = new ComponentManager()
+	compmanager.config = config
 
 	let generator = createImportmapGenerator(webhandle)
 	let cssRender = createTextCssRenderer(webhandle)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webhandle/external-resource-manager",
-	"version": "1.0.2",
+	"version": "1.0.4",
 	"description": "",
 	"main": "external-resource-manager.js",
 	"scripts": {