@api-client/core 0.5.8 → 0.5.11

package/build/src/lib/parsers/UriTemplate.js

@@ -0,0 +1,419 @@
+import { UrlEncoder } from './UrlEncoder.js';
+const cache = new Map();
+/**
+ * pattern to identify expressions [operator, variable-list] in template
+ */
+const EXPRESSION_PATTERN = /\{([^a-zA-Z0-9%_]?)([^}]+)(\}|$)/g;
+/**
+ * pattern to identify variables [name, explode, maxlength] in variable-list
+ */
+const VARIABLE_PATTERN = /^([^*:.](?:\.?[^*:.])*)((\*)|:(\d+))?$/;
+/**
+ * pattern to verify variable name integrity
+ */
+const VARIABLE_NAME_PATTERN = /[^a-zA-Z0-9%_.]/;
+/**
+ * pattern to verify literal integrity
+ */
+const LITERAL_PATTERN = /[<>{}"`^| \\]/;
+var DataType;
+(function (DataType) {
+    // undefined/null
+    DataType[DataType["nil"] = 0] = "nil";
+    // string
+    DataType[DataType["string"] = 1] = "string";
+    // object
+    DataType[DataType["object"] = 2] = "object";
+    // array
+    DataType[DataType["array"] = 3] = "array";
+})(DataType || (DataType = {}));
+class Data {
+    data;
+    cache;
+    constructor(data) {
+        this.data = data;
+        this.cache = {};
+    }
+    get(key) {
+        const { data } = this;
+        const d = {
+            type: DataType.nil,
+            val: [],
+            strictEncode: [],
+            encodeReserved: [],
+        };
+        if (this.cache[key] !== undefined) {
+            // we've already processed this key
+            return this.cache[key];
+        }
+        this.cache[key] = d;
+        let value;
+        if (typeof data === 'function') {
+            value = data(key);
+        }
+        else if (typeof data[key] === 'function') {
+            value = data[key](key);
+        }
+        else {
+            value = data[key];
+        }
+        // generalize input into [ [name1, value1], [name2, value2], … ]
+        // so expansion has to deal with a single data structure only
+        if (value === undefined || value === null) {
+            // undefined and null values are to be ignored completely
+            return d;
+        }
+        else if (Array.isArray(value)) {
+            value.forEach((v) => {
+                if (v !== undefined && v !== null) {
+                    // arrays don't have names
+                    d.val.push([undefined, v]);
+                }
+            });
+            if (d.val.length) {
+                d.type = DataType.array;
+            }
+        }
+        else if (String(Object.prototype.toString.call(value)) === '[object Object]') {
+            Object.keys(value).forEach((k) => {
+                const v = value[k];
+                if (v !== undefined && v !== null) {
+                    d.val.push([k, v]);
+                }
+            });
+            if (d.val.length) {
+                d.type = DataType.object;
+            }
+        }
+        else {
+            d.type = DataType.string;
+            d.val.push([undefined, String(value)]);
+        }
+        return d;
+    }
+}
+const operators = {
+    // Simple string expansion
+    '': {
+        prefix: '',
+        separator: ',',
+        named: false,
+        empty_name_separator: false,
+        encode: 'strictEncode'
+    },
+    // Reserved character strings
+    '+': {
+        prefix: '',
+        separator: ',',
+        named: false,
+        empty_name_separator: false,
+        encode: 'encodeReserved'
+    },
+    // Fragment identifiers prefixed by '#'
+    '#': {
+        prefix: '#',
+        separator: ',',
+        named: false,
+        empty_name_separator: false,
+        encode: 'encodeReserved'
+    },
+    // Name labels or extensions prefixed by '.'
+    '.': {
+        prefix: '.',
+        separator: '.',
+        named: false,
+        empty_name_separator: false,
+        encode: 'strictEncode'
+    },
+    // Path segments prefixed by '/'
+    '/': {
+        prefix: '/',
+        separator: '/',
+        named: false,
+        empty_name_separator: false,
+        encode: 'strictEncode'
+    },
+    // Path parameter name or name=value pairs prefixed by ';'
+    ';': {
+        prefix: ';',
+        separator: ';',
+        named: true,
+        empty_name_separator: false,
+        encode: 'strictEncode'
+    },
+    // Query component beginning with '?' and consisting
+    // of name=value pairs separated by '&'; an
+    '?': {
+        prefix: '?',
+        separator: '&',
+        named: true,
+        empty_name_separator: true,
+        encode: 'strictEncode'
+    },
+    // Continuation of query-style &name=value pairs
+    // within a literal query component.
+    '&': {
+        prefix: '&',
+        separator: '&',
+        named: true,
+        empty_name_separator: true,
+        encode: 'strictEncode'
+    }
+    // The operator characters equals ("="), comma (","), exclamation ("!"),
+    // at sign ("@"), and pipe ("|") are reserved for future extensions.
+};
+/**
+ * Processor for URI templates: http://tools.ietf.org/html/rfc6570
+ */
+export class UriTemplate {
+    expression;
+    parts;
+    /**
+     * Allows to ache and reuse cached instances.
+     *
+     * @param uri The URI string.
+     * @returns
+     */
+    static fromUri(uri) {
+        let cached = cache.get(uri);
+        if (!cached) {
+            cached = new UriTemplate(uri);
+            cache.set(uri, cached);
+        }
+        return cached;
+    }
+    /**
+     * @param expression The URI string.
+     */
+    constructor(expression) {
+        this.expression = expression;
+    }
+    /**
+     * Expands the template with the given map values.
+     *
+     * @param map The map with values
+     * @param opts Processing options
+     * @returns The expanded URI.
+     */
+    expand(map, opts = {}) {
+        let result = '';
+        if (!this.parts || !this.parts.length) {
+            this.parse();
+        }
+        const data = new Data(map);
+        for (const part of this.parts) {
+            const item = typeof part === 'string' ? part : UriTemplate.expand(part, data, opts);
+            result += item;
+        }
+        return result;
+    }
+    /**
+     * Parses the template into action tokens.
+     */
+    parse() {
+        const { expression } = this;
+        const parts = [];
+        let pos = 0;
+        function checkLiteral(literal) {
+            if (literal.match(LITERAL_PATTERN)) {
+                throw new Error(`Invalid Literal "${literal}"`);
+            }
+            return literal;
+        }
+        EXPRESSION_PATTERN.lastIndex = 0;
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const eMatch = EXPRESSION_PATTERN.exec(expression);
+            if (eMatch === null) {
+                // push trailing literal
+                parts.push(checkLiteral(expression.substring(pos)));
+                break;
+            }
+            else {
+                // push leading literal
+                parts.push(checkLiteral(expression.substring(pos, eMatch.index)));
+                pos = eMatch.index + eMatch[0].length;
+            }
+            if (!operators[eMatch[1]]) {
+                throw new Error(`Unknown Operator "${eMatch[1]}" in "${eMatch[0]}"`);
+            }
+            else if (!eMatch[3]) {
+                throw new Error(`Unclosed Expression "${eMatch[0]}"`);
+            }
+            // parse variable-list
+            const varParts = eMatch[2].split(',');
+            const vars = [];
+            for (var i = 0, l = varParts.length; i < l; i++) {
+                const vMatch = varParts[i].match(VARIABLE_PATTERN);
+                if (vMatch === null) {
+                    throw new Error(`Invalid Variable "${varParts[i]}" in "${eMatch[0]}"`);
+                }
+                else if (vMatch[1].match(VARIABLE_NAME_PATTERN)) {
+                    throw new Error(`Invalid Variable Name "${vMatch[1]}" in ""${eMatch[0]}"`);
+                }
+                vars[i] = {
+                    name: vMatch[1],
+                    explode: !!vMatch[3],
+                    maxlength: vMatch[4] && parseInt(vMatch[4], 10) || undefined,
+                };
+            }
+            if (!vars.length) {
+                throw new Error(`Expression Missing Variable(s) "${eMatch[0]}"`);
+            }
+            parts.push({
+                expression: eMatch[0],
+                operator: eMatch[1],
+                variables: vars,
+            });
+        }
+        if (!parts.length) {
+            // template doesn't contain any expressions
+            // so it is a simple literal string
+            // this probably should fire a warning or something?
+            parts.push(checkLiteral(expression));
+        }
+        this.parts = parts;
+    }
+    static expand(expression, data, opts = {}) {
+        const options = operators[expression.operator];
+        const type = options.named ? 'Named' : 'Unnamed';
+        const { variables } = expression;
+        const buffer = [];
+        for (const variable of variables) {
+            const d = data.get(variable.name);
+            if (d.type === DataType.nil && opts && opts.strict) {
+                throw new Error(`Missing expansion value for variable "${variable.name}"`);
+            }
+            if (d.type === DataType.nil && opts.ignoreMissing) {
+                buffer.push(expression.expression);
+                continue;
+            }
+            if (!d.val.length) {
+                if (d.type !== DataType.nil) {
+                    // empty variables (empty string) still lead to a separator being appended!
+                    buffer.push('');
+                }
+                continue;
+            }
+            if (d.type > DataType.string && variable.maxlength) {
+                throw new Error(`Invalid expression: Prefix modifier not applicable to variable "${variable.name}"`);
+            }
+            buffer.push(UriTemplate[`expand${type}`](d, options, variable.explode, variable.explode && options.separator || ',', variable.maxlength, variable.name));
+        }
+        if (buffer.length) {
+            return options.prefix + buffer.join(options.separator);
+        }
+        // prefix is not prepended for empty expressions
+        return '';
+    }
+    /**
+     * Expands a named variable.
+     */
+    static expandNamed(d, options, explode, separator, length, name) {
+        let result = '';
+        const { encode, empty_name_separator } = options;
+        const _encode = !d[encode].length;
+        let _name = d.type === DataType.object ? '' : UrlEncoder[encode](name);
+        d.val.forEach((item, index) => {
+            let _value;
+            if (length) {
+                // maxlength must be determined before encoding can happen
+                _value = UrlEncoder[encode](item[1].substring(0, length));
+                if (d.type === DataType.object) {
+                    // apply maxlength to keys of objects as well
+                    _name = UrlEncoder[encode](item[0].substring(0, length));
+                }
+            }
+            else if (_encode) {
+                // encode value
+                _value = UrlEncoder[encode](item[1]);
+                if (d.type === DataType.object) {
+                    // encode name and cache encoded value
+                    _name = UrlEncoder[encode](item[0]);
+                    d[encode].push([_name, _value]);
+                }
+                else {
+                    // cache encoded value
+                    d[encode].push([undefined, _value]);
+                }
+            }
+            else {
+                // values are already encoded and can be pulled from cache
+                _value = d[encode][index][1];
+                if (d.type === DataType.object) {
+                    _name = d[encode][index][0];
+                }
+            }
+            if (result) {
+                result += separator;
+            }
+            if (!explode) {
+                if (!index) {
+                    result += UrlEncoder[encode](name) + (empty_name_separator || _value ? '=' : '');
+                }
+                if (d.type === DataType.object) {
+                    result += `${_name},`;
+                }
+                result += _value;
+            }
+            else {
+                result += _name + (empty_name_separator || _value ? '=' : '') + _value;
+            }
+        });
+        return result;
+    }
+    /**
+     * Expands an unnamed variable.
+     */
+    static expandUnnamed(d, options, explode, separator, length) {
+        let result = '';
+        const { encode, empty_name_separator } = options;
+        const _encode = !d[encode].length;
+        d.val.forEach((item, index) => {
+            let _value;
+            if (length) {
+                // maxlength must be determined before encoding can happen
+                _value = UrlEncoder[encode](item[1].substring(0, length));
+            }
+            else if (_encode) {
+                // encode and cache value
+                _value = UrlEncoder[encode](item[1]);
+                d[encode].push([
+                    d.type === DataType.object ? UrlEncoder[encode](item[0]) : undefined,
+                    _value
+                ]);
+            }
+            else {
+                // value already encoded, pull from cache
+                _value = d[encode][index][1];
+            }
+            if (result) {
+                // unless we're the first value, prepend the separator
+                result += separator;
+            }
+            if (d.type === DataType.object) {
+                let _name;
+                if (length) {
+                    // maxlength also applies to keys of objects
+                    _name = UrlEncoder[encode](item[0].substring(0, length));
+                }
+                else {
+                    // at this point the name must already be encoded
+                    _name = d[encode][index][0];
+                }
+                result += _name;
+                if (explode) {
+                    // explode-modifier separates name and value by "="
+                    result += (empty_name_separator || _value ? '=' : '');
+                }
+                else {
+                    // no explode-modifier separates name and value by ","
+                    result += ',';
+                }
+            }
+            result += _value;
+        });
+        return result;
+    }
+}
+//# sourceMappingURL=UriTemplate.js.map

package/build/src/lib/parsers/UriTemplate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UriTemplate.js","sourceRoot":"","sources":["../../../../src/lib/parsers/UriTemplate.ts"],"names":[],"mappings":"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"}

package/build/src/lib/parsers/UrlEncoder.d.ts

@@ -48,4 +48,9 @@ export declare class UrlEncoder {
      * @returns string with no encoded URL component encoded sequences
      */
     static decodeQueryString(str: string, replacePlus?: boolean): string;
+    static strictEncode(str: string): string;
+    /**
+     * For URI templates encodes the URL string without encoding the reserved characters.
+     */
+    static encodeReserved(str: string): string;
 }

package/build/src/lib/parsers/UrlEncoder.js

@@ -70,5 +70,54 @@ export class UrlEncoder {
         }
         return decodeURIComponent(result);
     }
+    static strictEncode(str) {
+        if (!str) {
+            return str;
+        }
+        const escaped = {
+            '!': '%21',
+            "'": '%27',
+            '(': '%28',
+            ')': '%29',
+        };
+        return encodeURIComponent(str).replace(/\*/g, '%2A')
+            // @ts-ignore
+            .replace(/[!'()*]/g, (c) => escaped[c]);
+    }
+    /**
+     * For URI templates encodes the URL string without encoding the reserved characters.
+     */
+    static encodeReserved(str) {
+        if (!str) {
+            return str;
+        }
+        const expression = /%(21|23|24|26|27|28|29|2A|2B|2C|2F|3A|3B|3D|3F|40|5B|5D)/ig;
+        const map = {
+            // gen-delims
+            '%3A': ':',
+            '%2F': '/',
+            '%3F': '?',
+            '%23': '#',
+            '%5B': '[',
+            '%5D': ']',
+            '%40': '@',
+            // sub-delims
+            '%21': '!',
+            '%24': '$',
+            '%26': '&',
+            '%27': '\'',
+            '%28': '(',
+            '%29': ')',
+            '%2A': '*',
+            '%2B': '+',
+            '%2C': ',',
+            '%3B': ';',
+            '%3D': '='
+        };
+        let result = UrlEncoder.strictEncode(str);
+        // @ts-ignore
+        result = result.replace(expression, (c) => map[c]);
+        return result;
+    }
 }
 //# sourceMappingURL=UrlEncoder.js.map

package/build/src/lib/parsers/UrlEncoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"UrlEncoder.js","sourceRoot":"","sources":["../../../../src/lib/parsers/UrlEncoder.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,UAAU;IACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;IACH,MAAM,CAAC,iBAAiB,CAAC,GAAW,EAAE,WAAqB;QACzD,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,GAAG,CAAC;SACZ;QACD,YAAY;QACZ,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACtD,SAAS;QACT,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,WAAW,EAAE;YACf,qCAAqC;YACrC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SACtC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,iBAAiB,CAAC,GAAW,EAAE,WAAqB;QACzD,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,GAAG,CAAC;SACZ;QACD,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,IAAI,WAAW,EAAE;YACf,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACpC;QACD,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CACF"}
+{"version":3,"file":"UrlEncoder.js","sourceRoot":"","sources":["../../../../src/lib/parsers/UrlEncoder.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,UAAU;IACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;IACH,MAAM,CAAC,iBAAiB,CAAC,GAAW,EAAE,WAAqB;QACzD,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,GAAG,CAAC;SACZ;QACD,YAAY;QACZ,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACtD,SAAS;QACT,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,WAAW,EAAE;YACf,qCAAqC;YACrC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SACtC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,iBAAiB,CAAC,GAAW,EAAE,WAAqB;QACzD,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,GAAG,CAAC;SACZ;QACD,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,IAAI,WAAW,EAAE;YACf,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACpC;QACD,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,GAAW;QAC7B,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,GAAG,CAAC;SACZ;QACD,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,KAAK;SACX,CAAC;QACF,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;YACpD,aAAa;aACZ,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,GAAW;QAC/B,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,GAAG,CAAC;SACZ;QACD,MAAM,UAAU,GAAG,4DAA4D,CAAC;QAChF,MAAM,GAAG,GAAG;YACV,aAAa;YACb,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,aAAa;YACb,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;SACX,CAAC;QACF,IAAI,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC1C,aAAa;QACb,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

package/build/src/models/Environment.js

@@ -150,6 +150,7 @@ export class Environment {
             result.server = server.toJSON();
         }
         if (this.security) {
+            // TODO: When this is defined then call toJSON().
             result.security = this.security;
         }
         return result;

package/build/src/models/Environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"Environment.js","sourceRoot":"","sources":["../../../src/models/Environment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Environment.js","sourceRoot":"","sources":["../../../src/models/Environment.ts"],"names":[],"mappings":"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"}

package/build/src/models/HttpProject.d.ts

@@ -441,6 +441,10 @@ export declare class HttpProject extends ProjectParent {
      * @param opts The environment read options
      */
     readEnvironments(opts?: IReadEnvironmentOptions): Promise<Environment[]>;
+    /**
+     * @returns Returns the effective environments. If the project has been initialized with an environment then it is returned. Otherwise other environments.
+     */
+    getEnvironments(): Environment[];
     /**
      * Makes a copy of this project.
      */
@@ -474,7 +478,6 @@ export declare class HttpProject extends ProjectParent {
      * @returns The current list of schemas in the project.
      */
     listSchemas(): ProjectSchema[];
-    getEnvironments(): Environment[];
     /**
      * Iterates over requests in the project.
      */

package/build/src/models/HttpProject.js

@@ -791,6 +791,15 @@ export class HttpProject extends ProjectParent {
         }
         return result.reverse();
     }
+    /**
+     * @returns Returns the effective environments. If the project has been initialized with an environment then it is returned. Otherwise other environments.
+     */
+    getEnvironments() {
+        if (Array.isArray(this.initEnvironments)) {
+            return this.initEnvironments;
+        }
+        return super.getEnvironments();
+    }
     /**
      * Makes a copy of this project.
      */
@@ -919,12 +928,6 @@ export class HttpProject extends ProjectParent {
         }
         return this.definitions.schemas;
     }
-    getEnvironments() {
-        if (Array.isArray(this.initEnvironments)) {
-            return this.initEnvironments;
-        }
-        return super.getEnvironments();
-    }
     /**
      * Iterates over requests in the project.
      */