pinejs-client-fetch 1.0.1 → 1.0.2

package/build/index.d.ts

@@ -1,4 +1,5 @@
-import { PinejsClientCore, Params, AnyObject } from 'pinejs-client-core';
+import type { Params, AnyObject } from 'pinejs-client-core';
+import { PinejsClientCore } from 'pinejs-client-core';
 export type { PinejsClientCore } from 'pinejs-client-core';
 interface BackendParams {
     fetch?: typeof fetch;

package/build/index.js

@@ -42,9 +42,9 @@ class PineFetch extends pinejs_client_core_1.PinejsClientCore {
         }
     }
     _request(_a) {
-        var _b, _c;
-        var { url, body } = _a, options = __rest(_a, ["url", "body"]);
         return __awaiter(this, void 0, void 0, function* () {
+            var _b, _c;
+            var { url, body } = _a, options = __rest(_a, ["url", "body"]);
             const normalizedBody = body == null
                 ? null
                 : typeof body === 'object'

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAAyE;AAQzE,MAAa,YAAa,SAAQ,KAAK;IAGtC,YACQ,IAAY,EACZ,MAAc,EACd,eAAuB;QAE9B,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAJzB,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAQ;QALxB,SAAI,GAAG,6BAA6B,CAAC;IAQ5C,CAAC;CACD;AAVD,oCAUC;AAED,MAAqB,SAAU,SAAQ,qCAA2B;IACjE,YAAY,MAAc,EAAS,aAA4B;QAC9D,KAAK,CAAC,MAAM,CAAC,CAAC;QADoB,kBAAa,GAAb,aAAa,CAAe;QAE9D,IACC,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,CAAA,KAAK,UAAU;YAC1C,OAAO,KAAK,KAAK,UAAU,EAC1B;YACD,MAAM,IAAI,KAAK,CACd,+DAA+D,CAC/D,CAAC;SACF;IACF,CAAC;IAEK,QAAQ,CAAC,EAOF;;YAPE,EACd,GAAG,EACH,IAAI,OAKQ,EAJT,OAAO,cAHI,eAId,CADU;;YAKV,MAAM,cAAc,GACnB,IAAI,IAAI,IAAI;gBACX,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ;oBAC1B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBACtB,CAAC,CAAC,IAAI,CAAC;YAGT,MAAM,mBAAmB,GAAG,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,KAAK,mCAAI,KAAK,CAAC;YAE/D,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,GAAG,kCAC1C,OAAO,KACV,IAAI,EAAE,cAAc,IACnB,CAAC;YAEH,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE;gBAC3B,IAAI,YAAY,GAAG,eAAe,CAAC;gBACnC,IAAI;oBACH,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;iBACrC;gBAAC,WAAM;iBAEP;gBACD,MAAM,IAAI,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;aACxE;YACD,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;;KACvB;CACD;AA/CD,4BA+CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,2DAAsD;AAQtD,MAAa,YAAa,SAAQ,KAAK;IAGtC,YACQ,IAAY,EACZ,MAAc,EACd,eAAuB;QAE9B,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAJzB,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAQ;QALxB,SAAI,GAAG,6BAA6B,CAAC;IAQ5C,CAAC;CACD;AAVD,oCAUC;AAED,MAAqB,SAAU,SAAQ,qCAA2B;IACjE,YACC,MAAc,EACP,aAA4B;QAEnC,KAAK,CAAC,MAAM,CAAC,CAAC;QAFP,kBAAa,GAAb,aAAa,CAAe;QAGnC,IACC,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,CAAA,KAAK,UAAU;YAC1C,OAAO,KAAK,KAAK,UAAU,EAC1B,CAAC;YACF,MAAM,IAAI,KAAK,CACd,+DAA+D,CAC/D,CAAC;QACH,CAAC;IACF,CAAC;IAEK,QAAQ,CAAC,EAOF;;;gBAPE,EACd,GAAG,EACH,IAAI,OAKQ,EAJT,OAAO,cAHI,eAId,CADU;YAKV,MAAM,cAAc,GACnB,IAAI,IAAI,IAAI;gBACX,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ;oBACzB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBACtB,CAAC,CAAC,IAAI,CAAC;YAGV,MAAM,mBAAmB,GAAG,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,KAAK,mCAAI,KAAK,CAAC;YAE/D,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,GAAG,kCAC1C,OAAO,KACV,IAAI,EAAE,cAAc,IACnB,CAAC;YAEH,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;gBAC5B,IAAI,YAAY,GAAG,eAAe,CAAC;gBACnC,IAAI,CAAC;oBACJ,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACtC,CAAC;gBAAC,WAAM,CAAC;gBAET,CAAC;gBACD,MAAM,IAAI,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YACzE,CAAC;YACD,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC;KAAA;CACD;AAlDD,4BAkDC"}

package/build/index.umd.js

@@ -37,6 +37,9 @@
 	};
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.PinejsClientCore = void 0;
+	function isArray(value) {
+	    return Array.isArray(value);
+	}
 	const noop = () => {
 	};
 	const deprecated = (() => {
@@ -62,7 +65,7 @@
 	const isString = (v) => typeof v === 'string';
 	const isBoolean = (v) => v === true || v === false;
 	const isDate = (v) => Object.prototype.toString.call(v) === '[object Date]';
-	const isObject = (v) => typeof v != null && typeof v === 'object';
+	const isObject = (v) => v != null && typeof v === 'object';
 	const isValidOption = (key) => {
 	    return (key === '$select' ||
 	        key === '$filter' ||
@@ -80,6 +83,11 @@
 	    $expand: '$expand: a: $count: ...',
 	    $orderby: "$orderby: { a: { $count: ... }, $dir: 'asc' }",
 	};
+	const durationTimepartFlagEntries = [
+	    ['hours', 'H'],
+	    ['minutes', 'M'],
+	    ['seconds', 'S'],
+	];
 	class Poll {
 	    constructor(requestFn, intervalTime = 10000) {
 	        this.intervalTime = intervalTime;
@@ -140,7 +148,7 @@
 	    }
 	    start() {
 	        this.stopped = false;
-	        this.runRequest();
+	        void this.runRequest();
 	    }
 	    stop() {
 	        if (this.pollInterval) {
@@ -175,7 +183,7 @@
 	    if (isString(resource)) {
 	        resource = encodeURIComponent(resource);
 	    }
-	    else if (Array.isArray(resource)) {
+	    else if (isArray(resource)) {
 	        resource = resource.map(encodeURIComponent).join('/');
 	    }
 	    else {
@@ -208,7 +216,7 @@
 	    if (isString(strOrArray)) {
 	        return strOrArray;
 	    }
-	    else if (Array.isArray(strOrArray)) {
+	    else if (isArray(strOrArray)) {
 	        return strOrArray.join(separator);
 	    }
 	    else {
@@ -237,7 +245,7 @@
 	};
 	const addParentKey = (filter, parentKey, operator = ' eq ') => {
 	    if (parentKey != null) {
-	        if (Array.isArray(filter)) {
+	        if (isArray(filter)) {
 	            if (filter.length === 1) {
 	                filter = filter[0];
 	            }
@@ -250,7 +258,7 @@
 	        }
 	        return [escapeResource(parentKey), operator, filter];
 	    }
-	    if (Array.isArray(filter)) {
+	    if (isArray(filter)) {
 	        return filter;
 	    }
 	    return [`${filter}`];
@@ -271,7 +279,7 @@
 	        const filterStr = escapeValue(filter);
 	        return addParentKey(filterStr, parentKey, op);
 	    }
-	    else if (Array.isArray(filter)) {
+	    else if (isArray(filter)) {
 	        const filterArr = handleFilterArray(filter);
 	        const filterStr = bracketJoin(filterArr, op);
 	        return addParentKey(filterStr, parentKey);
@@ -303,7 +311,7 @@
 	        operands.push(escapeValue(filter));
 	        return [`${fnName}(${operands.join()})`];
 	    }
-	    else if (Array.isArray(filter)) {
+	    else if (isArray(filter)) {
 	        const filterArr = handleFilterArray(filter);
 	        let filterStr = filterArr.map((subArr) => subArr.join('')).join(',');
 	        filterStr = `${fnName}(${filterStr})`;
@@ -363,15 +371,40 @@
 	        case '$isof':
 	        case '$cast':
 	            return filterFunction(filter, operator, parentKey);
+	        case '$duration': {
+	            const durationValue = filter;
+	            if (!isObject(durationValue)) {
+	                throw new Error(`Expected type for ${operator}, got: ${typeof filter}`);
+	            }
+	            let durationString = 'P';
+	            if (durationValue.days) {
+	                durationString += `${durationValue.days}D`;
+	            }
+	            let timePart = '';
+	            for (const [partKey, partFlag] of durationTimepartFlagEntries) {
+	                if (durationValue[partKey]) {
+	                    timePart += `${durationValue[partKey]}${partFlag}`;
+	                }
+	            }
+	            if (timePart.length > 0) {
+	                durationString += `T${timePart}`;
+	            }
+	            if (durationString.length <= 1) {
+	                throw new Error(`Expected ${operator} to include duration properties, got: ${typeof filter}`);
+	            }
+	            if (durationValue.negative) {
+	                durationString = `-${durationString}`;
+	            }
+	            return addParentKey(`duration'${durationString}'`, parentKey);
+	        }
 	        case '$raw': {
-	            filter = filter;
-	            if (isString(filter)) {
-	                filter = `(${filter})`;
-	                return addParentKey(filter, parentKey);
+	            const filterx = filter;
+	            if (isString(filterx)) {
+	                return addParentKey(`(${filterx})`, parentKey);
 	            }
-	            else if (!isPrimitive(filter)) {
-	                if (Array.isArray(filter)) {
-	                    const [rawFilter, ...params] = filter;
+	            else if (!isPrimitive(filterx)) {
+	                if (Array.isArray(filterx)) {
+	                    const [rawFilter, ...params] = filterx;
 	                    if (!isString(rawFilter)) {
 	                        throw new Error(`First element of array for ${operator} must be a string, got: ${typeof rawFilter}`);
 	                    }
@@ -381,24 +414,24 @@
 	                    }
 	                    return applyBinds(rawFilter, mappedParams, parentKey);
 	                }
-	                else if (isObject(filter)) {
-	                    const filterStr = filter.$string;
+	                else if (isObject(filterx)) {
+	                    const filterStr = filterx.$string;
 	                    if (!isString(filterStr)) {
 	                        throw new Error(`$string element of object for ${operator} must be a string, got: ${typeof filterStr}`);
 	                    }
 	                    const mappedParams = {};
-	                    for (const index in filter) {
+	                    for (const index in filterx) {
 	                        if (index !== '$string') {
 	                            if (!/^[a-zA-Z0-9]+$/.test(index)) {
 	                                throw new Error(`${operator} param names must contain only [a-zA-Z0-9], got: ${index}`);
 	                            }
-	                            mappedParams[index] = filter[index];
+	                            mappedParams[index] = filterx[index];
 	                        }
 	                    }
 	                    return applyBinds(filterStr, mappedParams, parentKey);
 	                }
 	            }
-	            throw new Error(`Expected string/array/object for ${operator}, got: ${typeof filter}`);
+	            throw new Error(`Expected string/array/object for ${operator}, got: ${typeof filterx}`);
 	        }
 	        case '$': {
 	            const resource = escapeResource(filter);
@@ -408,7 +441,8 @@
 	            let keys = ['$count'];
 	            if (parentKey != null &&
 	                isObject(filter) &&
-	                (Object.keys(filter).length === 0 || filter.hasOwnProperty('$filter'))) {
+	                (Object.keys(filter).length === 0 ||
+	                    Object.prototype.hasOwnProperty.call(filter, '$filter'))) {
 	                keys = parentKey.slice(0, parentKey.length - 1);
 	                keys.push(handleOptions('$filter', { $count: filter }, parentKey[parentKey.length - 1]));
 	                return [keys.join('/')];
@@ -430,7 +464,7 @@
 	                const filterStr = escapeValue(filter);
 	                return addParentKey(filterStr, parentKey, ' eq ');
 	            }
-	            else if (Array.isArray(filter)) {
+	            else if (isArray(filter)) {
 	                if (filter.every(isPrimitive)) {
 	                    const filterStr = handleFilterArray(filter, undefined, 1);
 	                    const inStr = bracketJoin(filterStr, ', ').join('');
@@ -519,7 +553,7 @@
 	        const filterStr = escapeValue(filter);
 	        return addParentKey(filterStr, parentKey);
 	    }
-	    else if (Array.isArray(filter)) {
+	    else if (isArray(filter)) {
 	        const filterArr = handleFilterArray(filter);
 	        const filterStr = bracketJoin(filterArr, joinStr !== null && joinStr !== void 0 ? joinStr : ' or ');
 	        return addParentKey(filterStr, parentKey);
@@ -539,12 +573,12 @@
 	        }
 	        return orderby;
 	    }
-	    else if (Array.isArray(orderby)) {
+	    else if (isArray(orderby)) {
 	        if (orderby.length === 0) {
 	            throw new Error(`'$orderby' arrays have to have at least 1 element`);
 	        }
 	        const result = orderby.map((value) => {
-	            if (Array.isArray(value)) {
+	            if (isArray(value)) {
 	                throw new Error(`'$orderby' cannot have nested arrays`);
 	            }
 	            return buildOrderBy(value);
@@ -552,8 +586,7 @@
 	        return join(result);
 	    }
 	    else if (isObject(orderby)) {
-	        const { $dir } = orderby, restOrderby = __rest(orderby, ["$dir"]);
-	        const $orderby = restOrderby;
+	        const _a = orderby, { $dir } = _a, $orderby = __rest(_a, ["$dir"]);
 	        const result = mapObj($orderby, (dirOrOptions, key) => {
 	            let propertyPath = key;
 	            let dir = $dir;
@@ -562,7 +595,8 @@
 	            }
 	            else {
 	                const keys = Object.keys(dirOrOptions);
-	                if (!dirOrOptions.hasOwnProperty('$count') || keys.length > 1) {
+	                if (!Object.prototype.hasOwnProperty.call(dirOrOptions, '$count') ||
+	                    keys.length > 1) {
 	                    throw new Error(`When using '${ODataOptionCodeExampleMap['$orderby']}' you can only specify $count, got: '${JSON.stringify(keys)}'`);
 	                }
 	                propertyPath = handleOptions('$orderby', dirOrOptions, propertyPath);
@@ -597,19 +631,20 @@
 	            compiledValue = buildOrderBy(value);
 	            break;
 	        case '$top':
-	        case '$skip':
+	        case '$skip': {
 	            const num = value;
 	            if (!NumberIsFinite(num)) {
 	                throw new Error(`'${option}' option has to be a number`);
 	            }
 	            compiledValue = '' + num;
 	            break;
-	        case '$select':
+	        }
+	        case '$select': {
 	            const select = value;
 	            if (isString(select)) {
 	                compiledValue = join(select);
 	            }
-	            else if (Array.isArray(select)) {
+	            else if (isArray(select)) {
 	                if (select.length === 0) {
 	                    throw new Error(`'${option}' arrays have to have at least 1 element`);
 	                }
@@ -619,6 +654,7 @@
 	                throw new Error(`'${option}' option has to be either a string or array`);
 	            }
 	            break;
+	        }
 	        default:
 	            if (option[0] === '@') {
 	                if (!isPrimitive(value)) {
@@ -626,7 +662,7 @@
 	                }
 	                compiledValue = '' + escapeValue(value);
 	            }
-	            else if (Array.isArray(value)) {
+	            else if (isArray(value)) {
 	                compiledValue = join(value);
 	            }
 	            else if (isString(value)) {
@@ -642,14 +678,15 @@
 	    return `${option}=${compiledValue}`;
 	};
 	const handleOptions = (optionOperation, options, parentKey) => {
-	    if (options.hasOwnProperty('$count')) {
+	    if (Object.prototype.hasOwnProperty.call(options, '$count')) {
 	        const keys = Object.keys(options);
 	        if (keys.length > 1) {
 	            throw new Error(`When using '${ODataOptionCodeExampleMap[optionOperation]}' you can only specify $count, got: '${JSON.stringify(keys)}'`);
 	        }
 	        options = options.$count;
 	        parentKey += '/$count';
-	        if (Object.keys(options).length > (options.hasOwnProperty('$filter') ? 1 : 0)) {
+	        if (Object.keys(options).length >
+	            (Object.prototype.hasOwnProperty.call(options, '$filter') ? 1 : 0)) {
 	            if (optionOperation === '$expand') {
 	                deprecated.non$filterOptionIn$expand$count();
 	            }
@@ -686,7 +723,7 @@
 	            const jsonValue = JSON.stringify(value);
 	            throw new Error(`'$expand: ${key}: ${jsonValue}' is invalid, use '$expand: ${key}: $expand: ${jsonValue}' instead.`);
 	        }
-	        if (Array.isArray(value)) {
+	        if (isArray(value)) {
 	            throw new Error(`'$expand: ${key}: [...]' is invalid, use '$expand: ${key}: {...}' instead.`);
 	        }
 	        if (key.endsWith('/$count')) {
@@ -708,7 +745,7 @@
 	    if (isPrimitive(expand)) {
 	        return escapeResource(expand);
 	    }
-	    else if (Array.isArray(expand)) {
+	    else if (isArray(expand)) {
 	        const expandStr = handleExpandArray(expand);
 	        return join(expandStr);
 	    }
@@ -720,6 +757,17 @@
 	        throw new Error(`Unknown type for expand '${typeof expand}'`);
 	    }
 	};
+	const getRetryAfterHeaderDelayMs = (getRetryAfterHeader, err) => {
+	    const retryAfterRaw = getRetryAfterHeader === null || getRetryAfterHeader === void 0 ? void 0 : getRetryAfterHeader(err);
+	    if (typeof retryAfterRaw !== 'string') {
+	        return;
+	    }
+	    const retryAfterSeconds = parseInt(retryAfterRaw, 10);
+	    if (!Number.isInteger(retryAfterSeconds) || retryAfterSeconds < 0) {
+	        return;
+	    }
+	    return retryAfterSeconds * 1000;
+	};
 	const validParams = [
 	    'apiPrefix',
 	    'passthrough',
@@ -749,8 +797,8 @@
 	        return code == null || code === 429 || (code >= 500 && code < 600);
 	    }
 	    callWithRetry(fnCall, retry) {
-	        var _a, _b, _c, _d, _e, _f;
 	        return __awaiter(this, void 0, void 0, function* () {
+	            var _a, _b, _c, _d, _e, _f, _g;
 	            if (retry === false || (retry == null && this.retry === false)) {
 	                return yield fnCall();
 	            }
@@ -772,8 +820,9 @@
 	                throw new Error('pinejs-client maxDelayMs must be greater than or equal to minDelayMs');
 	            }
 	            const onRetryHandler = (_d = retryParameters.onRetry) !== null && _d !== void 0 ? _d : retryDefaultParameters.onRetry;
+	            const getRetryAfterHeader = (_e = retryParameters.getRetryAfterHeader) !== null && _e !== void 0 ? _e : retryDefaultParameters.getRetryAfterHeader;
 	            let attempt = 1;
-	            const canRetryHandler = (_f = (_e = retryParameters.canRetry) !== null && _e !== void 0 ? _e : retryDefaultParameters.canRetry) !== null && _f !== void 0 ? _f : this.canRetryDefaultHandler;
+	            const canRetryHandler = (_g = (_f = retryParameters.canRetry) !== null && _f !== void 0 ? _f : retryDefaultParameters.canRetry) !== null && _g !== void 0 ? _g : this.canRetryDefaultHandler;
 	            while (true) {
 	                try {
 	                    return yield fnCall();
@@ -782,8 +831,12 @@
 	                    if (attempt >= maxAttempts || !canRetryHandler(err)) {
 	                        throw err;
 	                    }
-	                    const delayMs = Math.min(Math.pow(2, (attempt - 1)) * minDelayMs, maxDelayMs);
+	                    let delayMs = Math.min(Math.pow(2, (attempt - 1)) * minDelayMs, maxDelayMs);
 	                    attempt++;
+	                    const retryAfterDelayMs = getRetryAfterHeaderDelayMs(getRetryAfterHeader, err);
+	                    if (retryAfterDelayMs != null && retryAfterDelayMs > delayMs) {
+	                        delayMs = retryAfterDelayMs;
+	                    }
 	                    onRetryHandler === null || onRetryHandler === void 0 ? void 0 : onRetryHandler(err, delayMs, attempt, maxAttempts);
 	                    yield new Promise((resolve) => {
 	                        setTimeout(resolve, delayMs);
@@ -822,26 +875,26 @@
 	                throw new Error('`get(url)` is no longer supported, please use `get({ url })` instead.');
 	            }
 	            const result = yield this.request(Object.assign(Object.assign({}, params), { method: 'GET' }));
-	            return this.transformGetResult(params)(result);
+	            return this._transformGetResult(params, result);
 	        });
 	    }
-	    transformGetResult(params) {
-	        const singular = params.id != null;
-	        return (data) => {
-	            if (!isObject(data)) {
-	                throw new Error(`Response was not a JSON object: '${typeof data}'`);
-	            }
-	            if (data.d == null) {
-	                throw new Error("Invalid response received, the 'd' property is missing.");
-	            }
-	            if (singular) {
-	                if (data.d.length > 1) {
-	                    throw new Error('Returned multiple results when only one was expected.');
-	                }
-	                return data.d[0];
+	    _transformGetResult(params, data) {
+	        if (!isObject(data)) {
+	            throw new Error(`Response was not a JSON object: '${typeof data}'`);
+	        }
+	        if (data.d == null) {
+	            throw new Error("Invalid response received, the 'd' property is missing.");
+	        }
+	        if (params.id != null) {
+	            if (data.d.length > 1) {
+	                throw new Error('Returned multiple results when only one was expected.');
 	            }
-	            return data.d;
-	        };
+	            return data.d[0];
+	        }
+	        return data.d;
+	    }
+	    transformGetResult(params) {
+	        return (data) => this._transformGetResult(params, data);
 	    }
 	    subscribe(params) {
 	        if (isString(params)) {
@@ -936,9 +989,7 @@
 	        else {
 	            params.method = params.method.toUpperCase();
 	        }
-	        const { body: defaultBody } = params;
-	        const { passthrough: defaultPassthrough } = params;
-	        const transformFn = params.method === 'GET' ? this.transformGetResult(params) : undefined;
+	        const { body: defaultBody, passthrough: defaultPassthrough } = params;
 	        return (parameterAliases, body, passthrough) => __awaiter(this, void 0, void 0, function* () {
 	            if (body != null) {
 	                params.body = Object.assign(Object.assign({}, defaultBody), body);
@@ -967,8 +1018,8 @@
 	                params.url = compiledUrl;
 	            }
 	            const result = yield this.request(params);
-	            if (transformFn != null) {
-	                return transformFn(result);
+	            if (params.method === 'GET') {
+	                return this._transformGetResult(params, result);
 	            }
 	            return result;
 	        });
@@ -989,7 +1040,8 @@
 	            }
 	            let url = escapeResource(params.resource);
 	            let { options } = params;
-	            if (options === null || options === void 0 ? void 0 : options.hasOwnProperty('$count')) {
+	            if (options != null &&
+	                Object.prototype.hasOwnProperty.call(options, '$count')) {
 	                const keys = Object.keys(options);
 	                if (keys.length > 1) {
 	                    throw new Error(`When using '$expand: a: $count: ...' you can only specify $count, got: '${JSON.stringify(keys)}'`);
@@ -997,7 +1049,7 @@
 	                url += '/$count';
 	                options = options.$count;
 	            }
-	            if (params.hasOwnProperty('id')) {
+	            if (Object.prototype.hasOwnProperty.call(params, 'id')) {
 	                const { id } = params;
 	                if (id == null) {
 	                    throw new Error('If the id property is set it must be non-null');
@@ -1110,9 +1162,9 @@
 	        }
 	    }
 	    _request(_a) {
-	        var _b, _c;
-	        var { url, body } = _a, options = __rest(_a, ["url", "body"]);
 	        return __awaiter(this, void 0, void 0, function* () {
+	            var _b, _c;
+	            var { url, body } = _a, options = __rest(_a, ["url", "body"]);
 	            const normalizedBody = body == null
 	                ? null
 	                : typeof body === 'object'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinejs-client-fetch",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "This module provides the nodejs interface for the pinejs API using request.",
   "main": "build/index.js",
   "browser": "build/index.umd.js",
@@ -29,36 +29,37 @@
   },
   "scripts": {
     "build": "tsc && rollup -c",
-    "lint": "balena-lint --typescript src tests",
-    "lint-fix": "balena-lint --typescript --fix src tests",
+    "lint": "balena-lint -t tsconfig.dev.json src tests",
+    "lint-fix": "balena-lint -t tsconfig.dev.json --fix src tests",
     "test:node": "mocha -r ts-node/register --reporter spec tests/**/*.spec.ts",
     "test:browser": "karma start",
     "test": "npm run build && npm run test:node && npm run test:browser && npm run lint",
-    "prepack": "npm run build"
+    "prepack": "npm run build",
+    "prepare": "node -e \"try { (await import('husky')).default() } catch (e) { if (e.code !== 'ERR_MODULE_NOT_FOUND') throw e }\" --input-type module"
   },
   "devDependencies": {
-    "@balena/lint": "^6.2.1",
+    "@balena/lint": "^8.0.2",
     "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-node-resolve": "^7.1.3",
-    "@types/chai": "^4.3.3",
-    "@types/chai-as-promised": "^7.1.5",
+    "@types/chai": "^4.3.16",
+    "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^9.1.1",
-    "balena-config-karma": "^4.0.0",
-    "chai": "^4.3.6",
-    "chai-as-promised": "^7.1.1",
+    "balena-config-karma": "^4.0.2",
+    "chai": "^4.4.1",
+    "chai-as-promised": "^7.1.2",
     "fetch-ponyfill": "^7.1.0",
-    "husky": "^4.2.5",
-    "karma": "^5.0.9",
-    "lint-staged": "^13.1.0",
-    "mocha": "^10.0.0",
-    "rollup": "^2.10.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "husky": "^9.0.11",
+    "karma": "^5.2.3",
+    "lint-staged": "^15.2.5",
+    "mocha": "^10.4.0",
+    "rollup": "^2.79.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "pinejs-client-core": "^6.12.3"
+    "pinejs-client-core": "^6.14.7"
   },
   "versionist": {
-    "publishedAt": "2023-01-19T15:22:28.616Z"
+    "publishedAt": "2024-06-06T15:44:29.125Z"
   }
 }

package/CHANGELOG.md

@@ -1,43 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file
-automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## 1.0.1 - 2023-01-19
-
-* Flowzone: use inherited secrets [Page-]
-
-## 1.0.0 - 2023-01-19
-
-* Update to pinejs-client-core 6.x [Pagan Gazzard]
-
-## 0.3.1 - 2022-09-26
-
-* Delete redundant .resinci.yml [Thodoris Greasidis]
-
-## 0.3.0 - 2022-09-22
-
-* Replace balenaCI with flowzone [Thodoris Greasidis]
-* Specify node 12 as the minimum supported node engine in the package.json [Thodoris Greasidis]
-
-# v0.2.2
-## (2021-06-30)
-
-* Delete CODEOWNERS [Thodoris Greasidis]
-
-# v0.2.1
-## (2020-06-02)
-
-* Test on browser using the umd build [Thodoris Greasidis]
-* Fix the umd build for the latest pinejs client [Thodoris Greasidis]
-
-# v0.2.0
-## (2020-06-02)
-
-* Add test cases [Thodoris Greasidis]
-* Initial code commit [Thodoris Greasidis]
-
-## v0.1.0 - 2020-05-14
-
-* Initialize repository