diff --git a/packages/@jsonql/koa/index.js b/packages/@jsonql/koa/index.js index f7df12b228ee0b46e8f4707c189ba695f3cd9cd9..bc32779c34929de9c15b7f0296c8e6910b8234c2 100644 --- a/packages/@jsonql/koa/index.js +++ b/packages/@jsonql/koa/index.js @@ -18,7 +18,7 @@ import { configCheck } from './src/options' import { getDebug } from './src/utils' const debug = getDebug('main') // main -export default function jsonqlKoa(config = {}) { +function jsonqlKoa(config = {}) { // first check the config const opts = configCheck(config) debug('[jsonql-koa] init opts', opts) @@ -45,3 +45,7 @@ export default function jsonqlKoa(config = {}) { // finally return compose(middlewares) } + +export { + jsonqlKoa +} diff --git a/packages/@jsonql/koa/package.json b/packages/@jsonql/koa/package.json index 261d09c2283eecaec724b9a3cad82480b38fc351..d26c989bdadf859045f40f4ee64f3f4d6269f8a3 100644 --- a/packages/@jsonql/koa/package.json +++ b/packages/@jsonql/koa/package.json @@ -72,7 +72,7 @@ "esm": "^3.2.25", "fs-extra": "^8.1.0", "jsonql-constants": "^1.8.3", - "jsonql-contract": "^1.7.9", + "jsonql-contract": "^1.7.12", "jsonql-errors": "^1.1.3", "jsonql-jwt": "^1.3.2", "jsonql-node-client": "^1.1.9", @@ -81,13 +81,14 @@ "jsonql-utils": "^0.6.10", "jsonql-web-console": "^0.4.3", "koa": "^2.8.1", + "koa-bodyparser": "^4.2.1", "koa-compose": "^4.1.0", + "koa-cors": "0.0.16", "lodash": "^4.17.15" }, "devDependencies": { "ava": "^2.4.0", "jwt-decode": "^2.2.0", - "koa-bodyparser": "^4.2.1", "nyc": "^14.1.1", "request": "^2.88.0", "server-io-core": "^1.2.0", diff --git a/packages/@jsonql/koa/tests/auth.test.js b/packages/@jsonql/koa/tests/auth.test.js index 6f627ba8e155132abf7d8413e32d6df7acdc830a..9081738d2b043819f32b52bb3b3ca522a8c9befa 100644 --- a/packages/@jsonql/koa/tests/auth.test.js +++ b/packages/@jsonql/koa/tests/auth.test.js @@ -7,7 +7,7 @@ const { createQuery } = require('jsonql-utils') const fsx = require('fs-extra') const { merge } = require('lodash') const { HELLO_FN } = require('jsonql-constants') -const jsonqlMiddleware = require(join(__dirname, '..', 'index')) +// const jsonqlMiddleware = require(join(__dirname, '..', 'index')) const { type, headers, dirs, bearer, contractKeyName } = require('./fixtures/options') const createServer = require('./helpers/server') const myKey = '4670994sdfkl'; diff --git a/packages/@jsonql/koa/tests/contractWithAuth.test.js b/packages/@jsonql/koa/tests/contractWithAuth.test.js index beb345c8e20686b9df508d93af58485782596349..811f04947a0e3c644b5465d9469c6bac036345b1 100644 --- a/packages/@jsonql/koa/tests/contractWithAuth.test.js +++ b/packages/@jsonql/koa/tests/contractWithAuth.test.js @@ -22,7 +22,6 @@ test.before((t) => { test.after( () => { fsx.removeSync(join(dirs.contractDir, dir)) - }) diff --git a/packages/@jsonql/koa/tests/fail.test.js b/packages/@jsonql/koa/tests/fail.test.js index c7a6acd6b05423220d53529bc3f2c8c348a504ef..a5e69c663de12bfd9cdc2df3bba1b82e471089e7 100644 --- a/packages/@jsonql/koa/tests/fail.test.js +++ b/packages/@jsonql/koa/tests/fail.test.js @@ -3,7 +3,7 @@ const test = require('ava') const superkoa = require('superkoa') const { join } = require('path') const debug = require('debug')('jsonql-koa:test:fail') -const jsonqlMiddleware = require(join(__dirname, '..', 'index')) +// const jsonqlMiddleware = require(join(__dirname, '..', 'index')) const { type, headers, dirs } = require('./fixtures/options') const fsx = require('fs-extra') diff --git a/packages/@jsonql/koa/tests/helpers/browser.js b/packages/@jsonql/koa/tests/helpers/browser.js index bdabdc3bf6deb6f25af61e843360fba2a22a76af..bfe55df7848c7d97dc3a698abf15066cc5191bb8 100644 --- a/packages/@jsonql/koa/tests/helpers/browser.js +++ b/packages/@jsonql/koa/tests/helpers/browser.js @@ -2,7 +2,7 @@ const serverIoCore = require('server-io-core') const { join } = require('path') -const jsonqlKoa = require('../../main') +const { jsonqlKoa } = require('../../main') const baseDir = join(__dirname, '..', 'fixtures') diff --git a/packages/@jsonql/koa/tests/helpers/server.js b/packages/@jsonql/koa/tests/helpers/server.js index 4c69beac390017230e93199b4a404d3b09571be4..92b4e289e4a4ba032ec3c302f04d710f85bcec55 100644 --- a/packages/@jsonql/koa/tests/helpers/server.js +++ b/packages/@jsonql/koa/tests/helpers/server.js @@ -3,7 +3,7 @@ const Koa = require('koa') const { join } = require('path') const bodyparser = require('koa-bodyparser') -const jsonqlKoa = require('../../main') +const { jsonqlKoa } = require('../../main') console.info(jsonqlKoa) const { type, headers, dirs } = require('../fixtures/options') const fsx = require('fs-extra') @@ -12,7 +12,7 @@ const myKey = '4670994sdfkl'; module.exports = (config={}, dir = '') => { const app = new Koa() app.use(bodyparser()) - app.use(jsonqlKoa.default( + app.use(jsonqlKoa( Object.assign({},{ resolverDir: dirs.resolverDir, contractDir: join(dirs.contractDir, dir) diff --git a/packages/@jsonql/koa/tests/helpers/sub-server.js b/packages/@jsonql/koa/tests/helpers/sub-server.js index 29bd9b87f1224a6ed4f5ff43224cb28d2d093e97..63aed5b382febe78ee28d1bf727c0820bf3eb3bd 100644 --- a/packages/@jsonql/koa/tests/helpers/sub-server.js +++ b/packages/@jsonql/koa/tests/helpers/sub-server.js @@ -2,7 +2,7 @@ const { join } = require('path') const fixturesDir = join(__dirname, '..', 'fixtures') const serverIoCore = require('server-io-core') -const jsonqlKoa = require('../../main') +const { jsonqlKoa } = require('../../main') function startSubServer(msPort) { return serverIoCore({ diff --git a/packages/@jsonql/koa/tests/node-client.donttest.js b/packages/@jsonql/koa/tests/node-client.donttest.js index c749becfb686ee48801ba099c8ed97a42277fd3e..67d007a9a147a3688294b876a3cb85be4b429f85 100644 --- a/packages/@jsonql/koa/tests/node-client.donttest.js +++ b/packages/@jsonql/koa/tests/node-client.donttest.js @@ -6,7 +6,7 @@ const debug = require('debug')('jsonql-koa:test:node-client') const nodeClient = require('jsonql-node-client') const serverIoCore = require('server-io-core') // setup -const jsonqlKoa = require('../') +// const jsonqlKoa = require('../') const hello = require('./helpers/hello') const baseDir = join(__dirname, 'fixtures') const clientContractDir = join(__dirname, 'fixtures', 'tmp', 'client6002') diff --git a/packages/contract-cli/package.json b/packages/contract-cli/package.json index 740acd4715cd62b9f8d3a70d055bdb24f88848a9..1ac575fdfa917dedfdcc282281687baffbf4a96c 100755 --- a/packages/contract-cli/package.json +++ b/packages/contract-cli/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-contract", - "version": "1.7.12", + "version": "1.7.13", "description": "JS API / command line tool to generate the contract.json for jsonql", "main": "index.js", "files": [ @@ -24,7 +24,7 @@ "test:watch": "DEBUG=jsonql-contract:* ava tests/watch.test.js", "test:config": "DEBUG=jsonql-contract:* ava tests/config-params.test.js", "test:custom": "DEBUG=jsonql-contract:* ava tests/custom-login.test.js", - "test:debug": "DEBUG=jsonql-contract:* ava tests/koa-debug.test.js" + "test:debug": "DEBUG=jsonql-contract* ava tests/koa-debug.test.js" }, "keywords": [ "jsonql", diff --git a/packages/contract-cli/src/ast/jsdoc.js b/packages/contract-cli/src/ast/jsdoc.js index 7ab0195ee7d6a5378d69168210003f4be85b341f..3c560aa9c4a66b394f34b182c81c953b555d858b 100644 --- a/packages/contract-cli/src/ast/jsdoc.js +++ b/packages/contract-cli/src/ast/jsdoc.js @@ -105,7 +105,7 @@ const foldParams = function(params) { p.keys = children[p.name] } return p; - }); + }) } return params; } @@ -153,8 +153,12 @@ const search = function(output, name = '') { // @TODO find out what the hells going on here return res.longname === 'module.exports' }).map(res => { + let resolverName = res.meta.code.value || res.meta.code.name + debug(`----------------${resolverName}---------------------`) + debug('res.meta', inspect(res.meta, false, null)) + debug('res.params', inspect(res.params, false, null)) return { - name: res.meta.code.value || res.meta.code.name, + name: resolverName, description: res.description || false, params: res.params ? ( foldParams( processParams(res.params) ) || false ) : ( res.undocumented ? false : [] ), @@ -172,6 +176,7 @@ const search = function(output, name = '') { */ const searchForParams = function(output) { const result = search(output) + // debug('searchForParams', result) if (result.name && !result.params) { debug(`params is no defined?`, result) debug(output) diff --git a/packages/contract-cli/tests/koa-debug.test.js b/packages/contract-cli/tests/koa-debug.test.js index 1d7db19ec9dd4b6510b57d54ee27dddb286f820e..de0885fe54a59fb7974b31f9bff0a3e84eca9ca7 100644 --- a/packages/contract-cli/tests/koa-debug.test.js +++ b/packages/contract-cli/tests/koa-debug.test.js @@ -20,7 +20,7 @@ test(`It should able to generate a contract without error`, async t => { returnAs: 'json' }) - debug(result) + debug('%O', result) t.truthy(result.query) }) diff --git a/packages/koa/package.json b/packages/koa/package.json index 4af2a80f90ad621a4b660917562443cd7f6c8784..e52215fa2e39c02be7671ea8be11869c7f50b98e 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -72,7 +72,7 @@ "esm": "^3.2.25", "fs-extra": "^8.1.0", "jsonql-constants": "^1.8.3", - "jsonql-contract": "^1.7.11", + "jsonql-contract": "^1.7.12", "jsonql-errors": "^1.1.3", "jsonql-jwt": "^1.3.2", "jsonql-node-client": "^1.1.9", diff --git a/packages/node-client/package.json b/packages/node-client/package.json index 7bfc26b80421895e050cad69442e41306e72d22e..25bc255b12f7f7c7f141100de3dd5b027954c188 100755 --- a/packages/node-client/package.json +++ b/packages/node-client/package.json @@ -39,14 +39,15 @@ "debug": "^4.1.1", "fs-extra": "^8.1.0", "jsonql-constants": "^1.8.3", - "jsonql-contract": "^1.7.9", + "jsonql-contract": "^1.7.12", "jsonql-errors": "^1.1.3", "jsonql-jwt": "^1.3.2", "jsonql-params-validator": "^1.4.11", "jsonql-utils": "^0.6.10", "lodash.merge": "^4.6.2", "node-cache": "^4.2.1", - "request": "^2.88.0" + "request": "^2.88.0", + "superkoa": "^1.0.3" }, "devDependencies": { "ava": "^2.4.0",