Identity manager

resources/resource_transformers/js/build.go

@@ -63,7 +63,7 @@ func (c *Client) BuildBundle(opts Options) (api.BuildResult, error) {
 func (c *Client) build(opts Options, transformCtx *resources.ResourceTransformationCtx) (api.BuildResult, error) {
 	dependencyManager := opts.DependencyManager
 	if transformCtx != nil {
-		dependencyManager = transformCtx.DependencyManager // TODO1
+		dependencyManager = transformCtx.DependencyManager
 	}
 	if dependencyManager == nil {
 		dependencyManager = identity.NopManager

resources/resource_transformers/js/options.go

@@ -70,13 +70,12 @@ type InternalOptions struct {
 
 	DependencyManager identity.Manager
 
-	// TODO1
 	Write                   bool // Set to false to write to memory.
 	AllowOverwrite          bool
 	Splitting               bool
 	TsConfig                string
 	EntryPoints             []string
-	ImportOnResolveFunc     func(string, api.OnResolveArgs) string
+	ImportOnResolveFunc     func(identity.Manager, string, api.OnResolveArgs) string
 	ImportOnLoadFunc        func(api.OnLoadArgs) string
 	ImportParamsOnLoadFunc  func(args api.OnLoadArgs) json.RawMessage
 	ErrorMessageResolveFunc func(api.Message) *ErrorMessageResolved
@@ -270,7 +269,7 @@ func createBuildPlugins(c *Client, depsManager identity.Manager, opts Options) (
 		}
 
 		if opts.ImportOnResolveFunc != nil {
-			if s := opts.ImportOnResolveFunc(impPath, args); s != "" {
+			if s := opts.ImportOnResolveFunc(depsManager, impPath, args); s != "" {
 				return api.OnResolveResult{Path: s, Namespace: NsHugoImportResolveFunc}, nil
 			}
 		}

tpl/js/batch.go

@@ -386,12 +386,15 @@ func (s scriptGroups) Sorted() []*scriptGroup {
 	return a
 }
 
+var _ identity.DependencyManagerProvider = (*batcher)(nil)
+
 type batcher struct {
 	mu           sync.Mutex
 	id           string
 	scriptGroups scriptGroups
 
-	client *Namespace
+	client            *Namespace
+	dependencyManager identity.Manager
 
 	configOptions *options
 
@@ -403,6 +406,10 @@ type batcher struct {
 	config js.ExternalOptions
 }
 
+func (b *batcher) GetDependencyManager() identity.Manager {
+	return b.dependencyManager
+}
+
 func (b *batcher) compile() error {
 	var err error
 	b.config, err = js.DecodeExternalOptions(b.configOptions.commit().opts)
@@ -652,6 +659,15 @@ func (p *Package) IsProbablyDependency(other identity.Identity) bool {
 
 	// TODO1 why is this called twice on change?
 
+	if b {
+		fmt.Println("M1", other)
+		return b
+	}
+
+	if p.origin.dependencyManager != nil {
+		b = depsFinder.Contains(other, p.origin.dependencyManager, -1) > 0
+	}
+
 	return b
 }
 
@@ -870,11 +886,12 @@ func (b *batcher) doBuild() (*Package, error) {
 	jsOpts := js.Options{
 		ExternalOptions: externalOptions,
 		InternalOptions: js.InternalOptions{
-			OutDir:         outDir,
-			Write:          true,
-			AllowOverwrite: true,
-			Splitting:      true,
-			ImportOnResolveFunc: func(imp string, args api.OnResolveArgs) string {
+			DependencyManager: b.dependencyManager,
+			OutDir:            outDir,
+			Write:             true,
+			AllowOverwrite:    true,
+			Splitting:         true,
+			ImportOnResolveFunc: func(depsManager identity.Manager, imp string, args api.OnResolveArgs) string {
 				if _, found := state.importResource.Get(imp); found {
 					return imp
 				}
@@ -889,6 +906,7 @@ func (b *batcher) doBuild() (*Package, error) {
 				if importContext.resourceGetter != nil {
 					resolved := importContext.resourceGetter.Get(imp)
 					if resolved != nil {
+						depsManager.AddIdentity(identity.FirstIdentity(resolved))
 						imp := js.PrefixHugoVirtual + resolved.(resource.PathProvider).Path()
 						state.importResource.Set(imp, resolved)
 						state.importerImportContext.Set(imp, importContext)

tpl/js/batch_integration_test.go

@@ -29,11 +29,6 @@ disableKinds = ["taxonomy", "term"]
 disableLiveReload = true
 baseURL = "https://example.com"
 
-# TOOD1
-[build]
-    [[build.cachebusters]]
-        source = '.*'
-        target = '.*'
 
 -- package.json --
 {

tpl/js/js.go

@@ -89,10 +89,11 @@ func (ns *Namespace) Batch(id string, store *maps.Scratch) (Batcher, error) {
 	key := path.Join(nsBundle, id)
 	b := store.GetOrCreate(key, func() any {
 		return &batcher{
-			id:            id,
-			scriptGroups:  make(map[string]*scriptGroup),
-			client:        ns,
-			configOptions: newOptions(),
+			id:                id,
+			scriptGroups:      make(map[string]*scriptGroup),
+			client:            ns,
+			dependencyManager: ns.d.Conf.NewIdentityManager("jsbatch"),
+			configOptions:     newOptions(),
 		}
 	})
 	return b.(Batcher), nil