fix(xq): adopt xq file name convention

close #614

BREAKING CHANGE: File name changes require exist-db 5.3 min version

README.md

@@ -88,30 +88,30 @@ Since if would be impractical to go through all possible combinations of option
 ├── LICENSE
 ├── README.md
 ├── admin
-│   ├── controller.xql
+│   ├── controller.xq
 │   ├── index.html
 │   └── security.html
 ├── build
 │   ├── exide_demo-1.0.0-dev.xar
 │   └── exide_demo-1.0.0.xar
 ├── build.xml
 ├── collection.xconf
-├── controller.xql
+├── controller.xq
 ├── cypress.json
 ├── error-page.html
 ├── expath-pkg.xml
 ├── icon.png
 ├── index.html
 ├── modules
-│   ├── app.xql
+│   ├── app.xqm
 │   ├── config.xqm
 │   └── view.xql
 ├── node_modules
 │   └── pruned …
 ├── package-lock.json
 ├── package.json
-├── post-install.xql
-├── pre-install.xql
+├── post-install.xq
+├── pre-install.xq
 ├── repo.xml
 ├── reports
 │   ├── screenshots
@@ -160,7 +160,7 @@ Since if would be impractical to go through all possible combinations of option
     │   └── rest_spec.js
     └── xqs
         ├── test-runner.xq
-        ├── test-suite.xql
+        ├── test-suite.xqm
         └── xqSuite.js
 ```
 
@@ -174,22 +174,22 @@ Since if would be impractical to go through all possible combinations of option
 │   └── plain_demo-1.0.0.xar
 ├── build.xml
 ├── collection.xconf
-├── controller.xql
+├── controller.xq
 ├── cypress.json
 ├── error-page.html
 ├── expath-pkg.xml
 ├── icon.png
 ├── index.html
 ├── modules
-│   ├── app.xql
+│   ├── app.xqm
 │   ├── config.xqm
 │   └── view.xql
 ├── node_modules
 │   └── pruned …
 ├── package-lock.json
 ├── package.json
-├── post-install.xql
-├── pre-install.xql
+├── post-install.xq
+├── pre-install.xq
 ├── repo.xml
 ├── reports
 │   ├── screenshots
@@ -215,7 +215,7 @@ Since if would be impractical to go through all possible combinations of option
     │   └── rest_spec.js
     └── xqs
         ├── test-runner.xq
-        ├── test-suite.xql
+        ├── test-suite.xqm
         └── xqSuite.js
 ```
 
@@ -254,7 +254,7 @@ Since if would be impractical to go through all possible combinations of option
     │   └── rest_spec.js
     └── xqs
         ├── test-runner.xq
-        ├── test-suite.xql
+        ├── test-suite.xqm
         └── xqSuite.js
 ```
 
@@ -272,16 +272,16 @@ Since if would be impractical to go through all possible combinations of option
 │   └── pruned …
 ├── package-lock.json
 ├── package.json
-├── post-install.xql
-├── pre-install.xql
+├── post-install.xq
+├── pre-install.xq
 ├── repo.xml
 └── test
     ├── mocha
     │   ├── app_spec.js
     │   └── rest_spec.js
     └── xqs
         ├── test-runner.xq
-        ├── test-suite.xql
+        ├── test-suite.xqm
         └── xqSuite.js
 ```
 

generators/app/index.js

@@ -139,7 +139,7 @@ module.exports = class extends Generator {
       type: 'confirm',
       name: 'post',
       message: 'Would you like to generate a post-install script?',
-      default: 'post-install.xql'
+      default: 'post-install.xq'
     },
     // TODO multi authors see #41
     {
@@ -414,9 +414,9 @@ module.exports = class extends Generator {
         apptype: this.props.apptype[1],
         status: this.props.status,
         pre: this.props.pre,
-        prexq: 'pre-install.xql',
+        prexq: 'pre-install.xq',
         post: this.props.post,
-        postxq: 'post-install.xql',
+        postxq: 'post-install.xq',
         setperm: this.props.setperm,
         website: this.props.website,
         license: this.props.license[0],
@@ -439,8 +439,8 @@ module.exports = class extends Generator {
 
     // Unit Test
     this.fs.copyTpl(
-      this.templatePath('specs/xqs/test-suite.xql'),
-      this.destinationPath('test/xqs/test-suite.xql'), {
+      this.templatePath('specs/xqs/test-suite.xqm'),
+      this.destinationPath('test/xqs/test-suite.xqm'), {
         apptype: this.props.apptype[0],
         short: this.props.short,
         defcoll: this.props.defcoll,
@@ -553,8 +553,8 @@ module.exports = class extends Generator {
 
       // XQuery
       this.fs.copyTpl(
-        this.templatePath('xq/controller.xql'),
-        this.destinationPath('controller.xql'), {
+        this.templatePath('xq/controller.xq'),
+        this.destinationPath('controller.xq'), {
           apptype: this.props.apptype[0],
           mysec: this.props.mysec
         })
@@ -569,8 +569,8 @@ module.exports = class extends Generator {
           version: this.props.version
         })
       this.fs.copyTpl(
-        this.templatePath('xq/app.xql'),
-        this.destinationPath('modules/app.xql'), {
+        this.templatePath('xq/app.xqm'),
+        this.destinationPath('modules/app.xqm'), {
           short: this.props.short,
           defcoll: this.props.defcoll,
           defuri: this.props.defuri,
@@ -643,8 +643,8 @@ module.exports = class extends Generator {
     // Pre-install
     if (this.props.pre) {
       this.fs.copyTpl(
-        this.templatePath('xq/pre-install.xql'),
-        this.destinationPath('pre-install.xql'), {
+        this.templatePath('xq/pre-install.xq'),
+        this.destinationPath('pre-install.xq'), {
           version: this.props.version,
           author: this.props.author,
           website: this.props.website
@@ -654,8 +654,8 @@ module.exports = class extends Generator {
     // Post-install
     if (this.props.post) {
       this.fs.copyTpl(
-        this.templatePath('xq/post-install.xql'),
-        this.destinationPath('post-install.xql'), {
+        this.templatePath('xq/post-install.xq'),
+        this.destinationPath('post-install.xq'), {
           apptype: this.props.apptype[0],
           version: this.props.version,
           author: this.props.author,

generators/app/templates/expath-pkg.xml

@@ -2,6 +2,6 @@
 <package xmlns="http://expath.org/ns/pkg" name="<%- defuri %>/<%- defcoll %>/<%- short %>"
   abbrev="<%- short %>" version="<%- version %>" spec="1.0">
     <title><%- desc %></title>
-    <dependency processor="http://exist-db.org" semver-min="5.0.0"/>
+    <dependency processor="http://exist-db.org" semver-min="5.3.0"/>
     <%_ if (apptype !== 'empty') { %><dependency package="http://exist-db.org/html-templating" semver-min="1.0.2"/><% } -%>
 </package>

generators/app/templates/pages/index.html

@@ -13,7 +13,7 @@ <h1 data-template="config:app-title">Generated page</h1>
     <p>
       This is the entry page into your application and was generated by yeoman. It uses HTML templates for a clean separation of HTML views and application logic.</p>
     <p>To add your own template functions, start by editing the XQuery module:
-      <pre>app.xql</pre>.</p>
+      <pre>app.xqm</pre>.</p>
   </div>  
   <div class="row">
       <div class="col-md-6">

generators/app/templates/specs/integration/landing_spec.js

@@ -3,7 +3,7 @@ describe('The landing page', function () {
   it <%_ if (apptype == 'empty') { %>.skip <% } _%> ('should load ', function () {
     cy.visit('/exist/<%- defcoll %>/<%- short %>/index.html')
       .get('.alert')
-      .contains('app.xql')
+      .contains('app.xqm')
   })
 
   <%_ if (mysec) { %>

generators/app/templates/specs/xqs/test-runner.xq

@@ -7,12 +7,12 @@ xquery version "3.1";
  : @see http://www.exist-db.org/exist/apps/doc/xqsuite
  :)
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
-import module namespace tests="<%- defuri %>/<%- defcoll %>/<%- short %>/tests" at "test-suite.xql";
+import module namespace tests="<%- defuri %>/<%- defcoll %>/<%- short %>/tests" at "test-suite.xqm";
 
 declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
 declare option output:method "json";
 declare option output:media-type "application/json";
 
 test:suite(
-  inspect:module-functions(xs:anyURI("test-suite.xql"))
+  inspect:module-functions(xs:anyURI("test-suite.xqm"))
 )

generators/app/templates/specs/xqs/test-suite.xql → generators/app/templates/specs/xqs/test-suite.xqm

@@ -9,7 +9,7 @@ xquery version "3.1";
 
 module namespace tests = "<%- defuri %>/<%- defcoll %>/<%- short %>/tests";
 <%_ if (apptype !== 'empty') { %>
-import module namespace app = "<%- defuri %>/<%- defcoll %>/<%- short %>/templates" at "../../modules/app.xql";
+import module namespace app = "<%- defuri %>/<%- defcoll %>/<%- short %>/templates" at "../../modules/app.xqm";
  <% } -%>
 
 declare namespace test="http://exist-db.org/xquery/xqsuite";

generators/app/templates/xq/view.xql

@@ -1,5 +1,5 @@
 (:~
- : This is the main XQuery which will (by default) be called by controller.xql
+ : This is the main XQuery which will (by default) be called by controller.xq
  : to process any URI ending with ".html". It receives the HTML from
  : the controller and passes it to the templating system.
  :
@@ -16,7 +16,7 @@ import module namespace lib="http://exist-db.org/xquery/html-templating/lib";
  :)
 
 import module namespace config="<%- defuri %>/<%- defcoll %>/<%- short %>/config" at "config.xqm";
-import module namespace app="<%- defuri %>/<%- defcoll %>/<%- short %>/templates" at "app.xql";
+import module namespace app="<%- defuri %>/<%- defcoll %>/<%- short %>/templates" at "app.xqm";
 
 
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";

test/generated-pkg/app-eXide-default.js

@@ -27,7 +27,7 @@ describe('eXide style …', function () {
 
   describe('exist design has …', function () {
     it('default files', function (done) {
-      assert.file(['repo.xml', 'modules/app.xql', 'post-install.xql', 'pre-install.xql', 'test/xqs/test-suite.xql'])
+      assert.file(['repo.xml', 'modules/app.xqm', 'post-install.xq', 'pre-install.xq', 'test/xqs/test-suite.xqm'])
       done()
     })
 
@@ -72,7 +72,7 @@ describe('eXide style …', function () {
 
   // Checking Xquery files requires updates to xqlint
   // it('linted XQuery', function () {
-  //   let xq = fs.readFileSync('modules/app.xql')
+  //   let xq = fs.readFileSync('modules/app.xqm')
   //   let xql = new xmldoc.XmlDocument(xq).toString()
   //   expect(doc).xml.to.be.valid()
   // })

test/generated-pkg/app-eXide-plain.js

@@ -26,12 +26,12 @@ describe('eXide plain app', function () {
         admin: 'admin',
         adminpw: 'pw123'
       })
-    assert.noFile(['resources/images/bold.gif', 'pre-install.xql', 'test/cypress/integration/secure_spec.js', '.travis.yml', 'resources/css/exist-2.2.css'])
+    assert.noFile(['resources/images/bold.gif', 'pre-install.xq', 'test/cypress/integration/secure_spec.js', '.travis.yml', 'resources/css/exist-2.2.css'])
   })
 
   describe('plain package has', function () {
     it('recommended files', function (done) {
-      assert.file(['expath-pkg.xml', 'modules/config.xqm', 'test/xqs/test-runner.xq', 'controller.xql', '.dockerignore', 'resources/images/powered-by.svg'])
+      assert.file(['expath-pkg.xml', 'modules/config.xqm', 'test/xqs/test-runner.xq', 'controller.xq', '.dockerignore', 'resources/images/powered-by.svg'])
       done()
     })
 

test/generated-pkg/app-empty.js

@@ -19,7 +19,7 @@ describe('empty package', function () {
         github: false,
         atom: false
       })
-    assert.noFile(['modules/app.xql', 'templates/page.html', 'test/cypress/integration/login-ok_spec.js', 'index.html'])
+    assert.noFile(['modules/app.xqm', 'templates/page.html', 'test/cypress/integration/login-ok_spec.js', 'index.html'])
   })
 
   describe('empty has', function () {

test/generated-pkg/app-lib.js

@@ -21,12 +21,12 @@ describe('library package', function () {
         atom: false,
         ci: 'travis'
       })
-    assert.noFile(['modules/app.xql', 'modules/test-suite.xql', 'templates/page.html', 'reports/screenshots/.gitkeep', 'controller.xql', 'collection.xconf'])
+    assert.noFile(['modules/app.xqm', 'modules/test-suite.xqm', 'templates/page.html', 'reports/screenshots/.gitkeep', 'controller.xq', 'collection.xconf'])
   })
 
   describe('library has', function () {
     it('only recommended files', function (done) {
-      assert.file(['repo.xml', 'README.md', '.git/config', '.gitignore', 'test/xqs/test-suite.xql'])
+      assert.file(['repo.xml', 'README.md', '.git/config', '.gitignore', 'test/xqs/test-suite.xqm'])
       done()
     })
 
@@ -51,7 +51,7 @@ describe('library package', function () {
     })
 
     it('xqs does not call app module', function (done) {
-      assert.noFileContent('test/xqs/test-suite.xql', 'import module namespace app')
+      assert.noFileContent('test/xqs/test-suite.xqm', 'import module namespace app')
       done()
     })
 

test/generated-pkg/app-mysec.js

@@ -26,7 +26,7 @@ describe('eXide style …', function () {
 
   describe('secure exist design has …', function () {
     it('default files and restricted area', function (done) {
-      assert.file(['admin/controller.xql', 'admin/index.html', 'templates/login-panel.html', 'pre-install.xql', 'test/cypress/integration/login-ok_spec.js'])
+      assert.file(['admin/controller.xq', 'admin/index.html', 'templates/login-panel.html', 'pre-install.xq', 'test/cypress/integration/login-ok_spec.js'])
       done()
     })