diff --git a/pkg/content_manager_int_test.go b/pkg/content_manager_int_test.go
index 476d2a9..e5a6431 100644
--- a/pkg/content_manager_int_test.go
+++ b/pkg/content_manager_int_test.go
@@ -28,6 +28,14 @@ func TestPullOnePage(t *testing.T) {
testPullContent(t, "test_cases/pull_tests/one_page", "", "/content/mysite/us/.content.xml", nil, "")
}
+func TestPullCqTemplateNormal(t *testing.T) {
+ testPullContent(t, "test_cases/pull_tests/cq_template", "", "apps/mysite/components/tabs/_cq_template/.content.xml", nil, "")
+}
+
+func TestPullCqTemplateFlatten(t *testing.T) {
+ testPullContent(t, "test_cases/pull_tests/cq_template", "", "apps/mysite/components/tabs/_cq_template.xml", nil, "")
+}
+
func testPullContent(t *testing.T, expectedDir string, relDir string, relFile string, filterRoots []string, filterFile string) {
aem := pkg.DefaultAEM()
contentManager := pkg.NewContentManager(aem)
diff --git a/pkg/test_cases/main_content/META-INF/MANIFEST.MF b/pkg/test_cases/main_content/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..0e4c49b
--- /dev/null
+++ b/pkg/test_cases/main_content/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Content-Package-Roots: /apps/mysite,/conf/mysite,/content/mysite
+Content-Package-Type: mixed
+Content-Package-Id: my_packages:test-content
+
diff --git a/pkg/test_cases/main_content/META-INF/vault/config.xml b/pkg/test_cases/main_content/META-INF/vault/config.xml
new file mode 100644
index 0000000..b525f1c
--- /dev/null
+++ b/pkg/test_cases/main_content/META-INF/vault/config.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/test_cases/main_content/META-INF/vault/definition/.content.xml b/pkg/test_cases/main_content/META-INF/vault/definition/.content.xml
new file mode 100644
index 0000000..1f38a93
--- /dev/null
+++ b/pkg/test_cases/main_content/META-INF/vault/definition/.content.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/test_cases/main_content/META-INF/vault/filter.xml b/pkg/test_cases/main_content/META-INF/vault/filter.xml
new file mode 100644
index 0000000..644c959
--- /dev/null
+++ b/pkg/test_cases/main_content/META-INF/vault/filter.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/pkg/test_cases/main_content/META-INF/vault/nodetypes.cnd b/pkg/test_cases/main_content/META-INF/vault/nodetypes.cnd
new file mode 100644
index 0000000..78fa1be
--- /dev/null
+++ b/pkg/test_cases/main_content/META-INF/vault/nodetypes.cnd
@@ -0,0 +1,145 @@
+<'sling'='http://sling.apache.org/jcr/sling/1.0'>
+<'cq'='http://www.day.com/jcr/cq/1.0'>
+<'nt'='http://www.jcp.org/jcr/nt/1.0'>
+<'jcr'='http://www.jcp.org/jcr/1.0'>
+<'mix'='http://www.jcp.org/jcr/mix/1.0'>
+<'rep'='internal'>
+<'dam'='http://www.day.com/dam/1.0'>
+
+[sling:Resource]
+ mixin
+ - sling:resourceType (string)
+
+[cq:ClientLibraryFolder] > sling:Folder
+ - dependencies (string) multiple
+ - categories (string) multiple
+ - embed (string) multiple
+ - channels (string) multiple
+
+[sling:Folder] > nt:folder
+ - * (undefined) multiple
+ - * (undefined)
+ + * (nt:base) = sling:Folder version
+
+[cq:Page] > nt:hierarchyNode
+ orderable primaryitem jcr:content
+ + jcr:content (nt:base) = nt:unstructured
+ + * (nt:base) = nt:base version
+
+[cq:Taggable]
+ mixin
+ - cq:tags (string) multiple
+
+[sling:OrderedFolder] > sling:Folder
+ orderable
+ + * (nt:base) = sling:OrderedFolder version
+
+[cq:Component] > mix:title, nt:folder, sling:ResourceSuperType
+ - dialogPath (string)
+ - cq:noDecoration (boolean)
+ - allowedChildren (string) multiple
+ - * (undefined)
+ - cq:isContainer (boolean)
+ - allowedParents (string) multiple
+ - * (undefined) multiple
+ - cq:cellName (string)
+ - componentGroup (string)
+ + dialog (nt:base) = nt:unstructured
+ + design_dialog (nt:base) = nt:unstructured
+ + cq:htmlTag (nt:base) = nt:unstructured
+ + * (nt:base) = nt:base multiple version
+ + cq:infoProviders (nt:base) = nt:unstructured
+ + cq:editConfig (cq:EditConfig) = cq:EditConfig
+ + icon.png (nt:file)
+ + cq:childEditConfig (cq:EditConfig) = cq:EditConfig
+ + thumbnail.png (nt:file)
+ + virtual (nt:base) = sling:Folder
+
+[sling:ResourceSuperType]
+ mixin
+ - sling:resourceSuperType (string)
+
+[cq:EditConfig] > nt:hierarchyNode, nt:unstructured
+ orderable
+ - cq:dialogMode (string) < 'auto', 'floating', 'inline'
+ - cq:emptyText (string)
+ - cq:layout (string) < 'editbar', 'rollover', 'auto'
+ - cq:inherit (boolean)
+ - cq:actions (string) multiple
+ + cq:inplaceEditing (cq:InplaceEditingConfig) = cq:InplaceEditingConfig
+ + cq:actionConfigs (nt:base) = nt:unstructured
+ + cq:listeners (nt:base) = cq:EditListenersConfig
+ + cq:formParameters (nt:base) = nt:unstructured
+ + cq:dropTargets (nt:base) = nt:unstructured
+
+[cq:InplaceEditingConfig] > nt:unstructured
+ orderable
+ - editorType (string)
+ - configPath (string)
+ - active (boolean)
+ + config (nt:unstructured) = nt:unstructured
+
+[cq:EditListenersConfig]
+ - afteredit (string)
+ - aftermove (string)
+ - afterremove (string)
+ - afterinsert (string)
+ - * (undefined)
+ - afterdelete (string)
+ - * (undefined) multiple
+ - aftercreate (string)
+ + * (nt:base) = nt:base multiple version
+
+[cq:ReplicationStatus]
+ mixin
+ - cq:lastReplicatedBy (string) ignore
+ - cq:lastPublished (date) ignore
+ - cq:lastReplicationStatus (string) ignore
+ - cq:lastPublishedBy (string) ignore
+ - cq:lastReplicationAction (string) ignore
+ - cq:lastReplicated (date) ignore
+
+[rep:RepoAccessControllable]
+ mixin
+ + rep:repoPolicy (rep:Policy) protected ignore
+
+[cq:PageContent] > cq:OwnerTaggable, cq:ReplicationStatus, mix:created, mix:title, nt:unstructured, sling:Resource, sling:VanityPath
+ orderable
+ - cq:lastModified (date)
+ - cq:template (string)
+ - pageTitle (string)
+ - offTime (date)
+ - hideInNav (boolean)
+ - cq:lastModifiedBy (string)
+ - onTime (date)
+ - jcr:language (string)
+ - cq:allowedTemplates (string) multiple
+ - cq:designPath (string)
+ - navTitle (string)
+
+[cq:OwnerTaggable] > cq:Taggable
+ mixin
+
+[sling:VanityPath]
+ mixin
+ - sling:vanityPath (string) multiple
+ - sling:redirect (boolean)
+ - sling:vanityOrder (long)
+ - sling:redirectStatus (long)
+
+[cq:Template] > mix:title, nt:hierarchyNode
+ - * (undefined) multiple
+ - allowedChildren (string) multiple
+ - allowedParents (string) multiple
+ - ranking (long)
+ - * (undefined)
+ + thumbnail.png (nt:file)
+ + workflows (nt:base)
+ + * (nt:base) = nt:base multiple version
+ + jcr:content (nt:base)
+ + icon.png (nt:file)
+
+[dam:Thumbnails]
+ mixin
+ + dam:thumbnails (nt:folder)
+
diff --git a/pkg/test_cases/main_content/META-INF/vault/properties.xml b/pkg/test_cases/main_content/META-INF/vault/properties.xml
new file mode 100644
index 0000000..9d94483
--- /dev/null
+++ b/pkg/test_cases/main_content/META-INF/vault/properties.xml
@@ -0,0 +1,21 @@
+
+
+
+FileVault Package Properties
+admin
+test-content
+2024-10-04T00:03:44.258Z
+admin
+false
+2024-10-04T00:03:44.358Z
+2
+
+mixed
+false
+
+2
+
+my_packages
+2024-10-04T00:03:44.258Z
+admin
+
diff --git a/pkg/test_cases/main_content/jcr_root/.content.xml b/pkg/test_cases/main_content/jcr_root/.content.xml
new file mode 100644
index 0000000..8ea9f2a
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/.content.xml
@@ -0,0 +1,6 @@
+
+
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/.content.xml b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/.content.xml
new file mode 100644
index 0000000..cbb48e7
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/.content.xml
@@ -0,0 +1,8 @@
+
+
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/css.txt b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/css.txt
new file mode 100644
index 0000000..f852363
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/css.txt
@@ -0,0 +1,3 @@
+#base=css
+
+site.css
\ No newline at end of file
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/css/site.css b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/css/site.css
new file mode 100644
index 0000000..3a86ca3
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/css/site.css
@@ -0,0 +1 @@
+body,html{background:#ececec;color:#202020;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:1pc;line-height:1.5;margin:0}@media(prefers-color-scheme:dark){body,html{background:#131313;color:#dfdfdf}}a{color:#2020e0}@media(prefers-color-scheme:dark){a{color:#dfdf1f}}button,input,optgroup,select,textarea{font:inherit}.cmp-helloworld__item-label{margin-bottom:0}.cmp-helloworld__item-output{margin-top:0}.cmp-navigation__item--level-0:hover>.cmp-navigation__group{background:#ececec}main.container{padding:.5em 1em}footer.experiencefragment{border-top:1px solid #202020;padding:.5em 1em}@media(prefers-color-scheme:dark){footer.experiencefragment{border-color:#dfdfdf}}footer.experiencefragment .cmp-separator__horizontal-rule{border:0;margin:0}header.experiencefragment{border-bottom:1px solid #202020;padding:.5em 1em}@media(prefers-color-scheme:dark){header.experiencefragment{border-bottom-color:#dfdfdf}}header.experiencefragment a{color:#202020;text-decoration:none}@media(prefers-color-scheme:dark){header.experiencefragment a{color:#dfdfdf}}header.experiencefragment a:focus,header.experiencefragment a:hover{color:#2020e0;text-decoration:underline}@media(prefers-color-scheme:dark){header.experiencefragment a:focus,header.experiencefragment a:hover{color:#dfdf1f}}header.experiencefragment .cmp-container{display:grid;grid-template-columns:4fr 1fr 1fr}header.experiencefragment .cmp-navigation__group{list-style:none;margin:0;padding:0}header.experiencefragment .cmp-navigation__item--level-0{display:grid;grid-template-columns:1fr 3fr}header.experiencefragment .cmp-navigation__item--level-0>.cmp-navigation__group{display:grid;grid-template-columns:repeat(3,1fr)}header.experiencefragment .cmp-navigation__item-link{display:block}header.experiencefragment .cmp-navigation__item--active>.cmp-navigation__item-link{font-weight:700}header.experiencefragment .cmp-languagenavigation{position:relative}header.experiencefragment .cmp-languagenavigation:before{background-image:url('data:image/svg+xml;utf8,');background-repeat:no-repeat;content:" ";display:block;height:1.5em}@media(prefers-color-scheme:dark){header.experiencefragment .cmp-languagenavigation:before{background-image:url('data:image/svg+xml;utf8,')}}header.experiencefragment .cmp-languagenavigation>.cmp-languagenavigation__group{background:#ececec;border:1px solid #202020;border-top:0;padding:0 8px;position:absolute;top:34px;-webkit-transition-delay:.5s;transition-delay:.5s;visibility:hidden;width:20em}@media(prefers-color-scheme:dark){header.experiencefragment .cmp-languagenavigation>.cmp-languagenavigation__group{background:#131313;border-color:#dfdfdf}}header.experiencefragment .cmp-languagenavigation:hover>.cmp-languagenavigation__group{-webkit-transition-delay:0s;transition-delay:0s;visibility:visible}header.experiencefragment .cmp-languagenavigation__group{list-style:none;margin:0;padding:0}header.experiencefragment .cmp-languagenavigation__item-title{font-size:x-small;text-transform:uppercase}header.experiencefragment .cmp-languagenavigation__item--level-0{margin-bottom:.5em}header.experiencefragment .cmp-languagenavigation__item--level-1{display:inline}header.experiencefragment .cmp-languagenavigation__item--level-1:not(:first-child):before{content:" | "}header.experiencefragment .cmp-languagenavigation__item--active>.cmp-languagenavigation__item-link{font-weight:700}header.experiencefragment .cmp-search__field{display:-webkit-box;display:-ms-flexbox;display:flex;margin:-3px 0}header.experiencefragment .cmp-search__input{height:26px}
\ No newline at end of file
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/js.txt b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/js.txt
new file mode 100644
index 0000000..ffaf1af
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/js.txt
@@ -0,0 +1,3 @@
+#base=js
+
+site.js
\ No newline at end of file
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/js/site.js b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/js/site.js
new file mode 100644
index 0000000..1ca7fa6
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/clientlibs/clientlib-site/js/site.js
@@ -0,0 +1 @@
+!function(){var e={356:function(){!function(){"use strict";var e='[data-cmp-is="helloworld"]',t='[data-cmp-hook-helloworld="property"]',n='[data-cmp-hook-helloworld="model"]';function o(e){e&&e.element&&function(e){e.element.removeAttribute("data-cmp-is");var o=e.element.querySelectorAll(t);o=1==o.length?o[0].textContent:null;var r=e.element.querySelectorAll(n);r=1==r.length?r[0].textContent:null,console&&console.log&&console.log("HelloWorld component JavaScript example","\nText property:\n",o,"\nModel message:\n",r)}(e)}function r(){for(var t=document.querySelectorAll(e),n=0;n0&&n.forEach((function(t){t.querySelectorAll&&[].slice.call(t.querySelectorAll(e)).forEach((function(e){new o({element:e})}))}))}))})).observe(l,{subtree:!0,childList:!0,characterData:!0})}"loading"!==document.readyState?r():document.addEventListener("DOMContentLoaded",r)}()}},t={};function n(o){var r=t[o];if(void 0!==r)return r.exports;var l=t[o]={exports:{}};return e[o](l,l.exports,n),l.exports}n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,{a:t}),t},n.d=function(e,t){for(var o in t)n.o(t,o)&&!n.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:t[o]})},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},function(){"use strict";n(356)}()}();
\ No newline at end of file
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/.content.xml b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/.content.xml
new file mode 100644
index 0000000..3fad355
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/.content.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/_cq_dialog.xml b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/_cq_dialog.xml
new file mode 100644
index 0000000..16d3907
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/_cq_dialog.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/_cq_editConfig.xml b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/_cq_editConfig.xml
new file mode 100644
index 0000000..614b8f8
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/_cq_editConfig.xml
@@ -0,0 +1,4 @@
+
+
diff --git a/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/helloworld.html b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/helloworld.html
new file mode 100644
index 0000000..c090093
--- /dev/null
+++ b/pkg/test_cases/main_content/jcr_root/apps/mysite/components/helloworld/helloworld.html
@@ -0,0 +1,26 @@
+
+
+
Hello World Component
+
+
Text property:
+
${properties.text}
+
+
+
Model message:
+
${model.message}
+
+