api-doc-validator - npm Package Compare versions

Comparing version 1.14.4 to 1.15.0

lib/annotations/baseUrl.js

cli.js

		@@ -121,3 +121,3 @@ #!/usr/bin/env node
		promises.push(
		generateApiClient(endpoints.filter(e => !!e.call), config.apiClient, {
		generateApiClient(endpoints, config.apiClient, {
		baseUrl: config.baseUrl,
		@@ -124,0 +124,0 @@ schemas,

lib/annotations/index.js

		module.exports = {
		namespace: require('./namespace'),
		schema: require('./schema'),
		baseUrl: require('./baseUrl'),
		url: require('./url'),
		@@ -5,0 +6,0 @@ params: require('./params'),

lib/filesToEndpoints.js

		@@ -15,2 +15,4 @@ const parseComments = require('./parseComments');

		const mainAnnotations = ['url', 'baseUrl', 'schema'];

		return Promise
		@@ -22,3 +24,3 @@ .all(files.map(function (file) {

		if (!list.some(item => item.name === 'url' \|\| item.name === 'schema')) {
		if (list.every(item => !mainAnnotations.includes(item.name))) {
		return;
		@@ -25,0 +27,0 @@ }

lib/generate/apiClient.js

		@@ -31,2 +31,40 @@ const fs = require('fs');

		var baseUrlHash = {};

		for (let {baseUrl, namespace, file} of endpoints) {
		if (!baseUrl) continue;

		if (baseUrlHash.hasOwnProperty(namespace)) {
		let ns = file && file + '\|' + namespace;

		if (ns && !baseUrlHash.hasOwnProperty(ns)) {
		baseUrlHash[ns] = baseUrl;
		continue;
		}

		throw new Error(`Duplicate baseUrl ${JSON.stringify(baseUrl)}`);
		}

		baseUrlHash[namespace] = baseUrl;
		}

		if (baseUrl) {
		baseUrlHash['default'] = baseUrl;
		}

		for (let e of endpoints) {
		if (e.baseUrl) continue;

		let baseUrl = (
		(e.file && baseUrlHash[e.file + '\|' + e.namespace]) \|\|
		(e.namespace !== 'default' && baseUrlHash[e.namespace])
		);

		if (baseUrl) {
		e.baseUrl = baseUrl;
		}
		}

		endpoints = endpoints.filter(e => !!e.call);

		stream.write(
		@@ -46,6 +84,7 @@ mainTpl

		endpoints.forEach(function (endpoint, n) {
		var {parts} = endpoint.call;
		var root = ns;
		var last = parts.length - 1;
		for (let n = 0; n < endpoints.length; n++) {
		let endpoint = endpoints[n];
		let {parts} = endpoint.call;
		let root = ns;
		let last = parts.length - 1;

		@@ -59,3 +98,3 @@ parts.forEach(function (prop, i) {
		});
		});
		}

		@@ -62,0 +101,0 @@ const toString = function (indent, method, tag) {

lib/templates/api-client.js

		@@ -138,3 +138,3 @@ const {pathToRegexp, compile: createToPath} = require('path-to-regexp');

		const url = e.url.toPath(params);
		const url = (e.baseUrl \|\| '') + e.url.toPath(params);

		@@ -141,0 +141,0 @@ const res = await Api.request({

package.json

		{
		"name": "api-doc-validator",
		"version": "1.14.4",
		"version": "1.15.0",
		"description": "api doc and validator",
		@@ -5,0 +5,0 @@ "main": "index.js",

README.md

New alerts